diff --git a/.editorconfig b/.editorconfig
index c7a381b730..9ae52b8bbd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,6 +21,7 @@ csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
+# trim_trailing_whitespace = true
 
 # Indentation preferences
 csharp_indent_block_contents = true
@@ -133,11 +134,28 @@ csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 space_within_single_line_array_initializer_braces = true
 
+#Net Analyzer
+dotnet_analyzer_diagnostic.category-Performance.severity = none #error - Uncomment when all violations are fixed.
+
+# CA1802: Use literals where appropriate
+dotnet_diagnostic.CA1802.severity = warning
+# CA1820: Test for empty strings using string length
+dotnet_diagnostic.CA1820.severity = warning
+# CA1821: Remove empty finalizers
+dotnet_diagnostic.CA1821.severity = warning
+# CA1825: Avoid zero-length array allocations
+dotnet_diagnostic.CA1825.severity = warning
+#CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
+dotnet_diagnostic.CA1847.severity = warning
+
 # Wrapping preferences
 csharp_wrap_before_ternary_opsigns = false
 
+# Avalonia DevAnalyzer preferences
+dotnet_diagnostic.AVADEV2001.severity = error
+
 # Xaml files
-[*.xaml]
+[*.{xaml,axaml}]
 indent_size = 2
 
 # Xml project files
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index c5a719ce90..df070c35cf 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
+github: avaloniaui
 open_collective: avalonia
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 46e8665945..2f63750cdc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,7 +21,7 @@
 - [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Documentation with user documentation
 
 ## Breaking changes
-<!--- List any breaking changes here. When the PR is merged please add an entry to https://github.com/AvaloniaUI/Avalonia/wiki/Breaking-Changes -->
+<!--- List any breaking changes here. -->
 
 ## Obsoletions / Deprecations
 <!--- Obsolete and Deprecated attributes on APIs MUST only be included when discussed with Core team. @grokys, @kekekeks & @danwalmsley -->
diff --git a/.gitignore b/.gitignore
index 9b15011929..61a3b53de1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,13 +192,12 @@ dirs.sln
 
 
 ##################
-# XCode
+# Xcode
 ##################
 Index/
 Logs/
 ModuleCache.noindex/
 Build/Intermediates.noindex/
-info.plist
 build-intermediate
 obj-Direct2D1/
 obj-Skia/
@@ -213,3 +212,7 @@ coc-settings.json
 *.map
 src/Web/Avalonia.Web.Blazor/wwwroot/*.js
 src/Web/Avalonia.Web.Blazor/Interop/Typescript/*.js
+node_modules
+src/Web/Avalonia.Web.Blazor/webapp/package-lock.json
+src/Web/Avalonia.Web.Blazor/wwwroot
+src/Web/Avalonia.Web/wwwroot
diff --git a/.gitmodules b/.gitmodules
index 2d11fdfa9e..032bc879cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
 	path = src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
 	url = https://github.com/kekekeks/XamlX.git
+[submodule "nukebuild/il-repack"]
+	path = nukebuild/il-repack
+	url = https://github.com/Gillibald/il-repack
diff --git a/.ncrunch/ControlCatalog.v3.ncrunchproject b/.ncrunch/Avalonia.IntegrationTests.Appium.v3.ncrunchproject
similarity index 100%
rename from .ncrunch/ControlCatalog.v3.ncrunchproject
rename to .ncrunch/Avalonia.IntegrationTests.Appium.v3.ncrunchproject
diff --git a/.ncrunch/Avalonia.IntegrationTests.Win32.v3.ncrunchproject b/.ncrunch/Avalonia.IntegrationTests.Win32.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/Avalonia.IntegrationTests.Win32.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Avalonia.Web.Blazor.v3.ncrunchproject b/.ncrunch/Avalonia.Web.Blazor.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/Avalonia.Web.Blazor.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Avalonia.Web.v3.ncrunchproject b/.ncrunch/Avalonia.Web.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/Avalonia.Web.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Avalonia.Win32.net6.0.v3.ncrunchproject b/.ncrunch/Avalonia.Win32.net6.0.v3.ncrunchproject
index 28b692bb51..95a483b433 100644
--- a/.ncrunch/Avalonia.Win32.net6.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Win32.net6.0.v3.ncrunchproject
@@ -1,7 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <AdditionalFilesToIncludeForProject>
-      <Value>..\..\tools\MicroComGenerator\bin\Debug\net6.0\**.*</Value>
-    </AdditionalFilesToIncludeForProject>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Avalonia.Win32.netstandard2.0.v3.ncrunchproject b/.ncrunch/Avalonia.Win32.netstandard2.0.v3.ncrunchproject
index 28b692bb51..95a483b433 100644
--- a/.ncrunch/Avalonia.Win32.netstandard2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Win32.netstandard2.0.v3.ncrunchproject
@@ -1,7 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <AdditionalFilesToIncludeForProject>
-      <Value>..\..\tools\MicroComGenerator\bin\Debug\net6.0\**.*</Value>
-    </AdditionalFilesToIncludeForProject>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/ControlCatalog.Blazor.Web.v3.ncrunchproject b/.ncrunch/ControlCatalog.Blazor.Web.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/ControlCatalog.Blazor.Web.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/ControlCatalog.net6.0.v3.ncrunchproject b/.ncrunch/ControlCatalog.net6.0.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/ControlCatalog.net6.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/ControlCatalog.netstandard2.0.v3.ncrunchproject b/.ncrunch/ControlCatalog.netstandard2.0.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/ControlCatalog.netstandard2.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/IntegrationTestApp.v3.ncrunchproject b/.ncrunch/IntegrationTestApp.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/IntegrationTestApp.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/MobileSandbox.Android.v3.ncrunchproject b/.ncrunch/MobileSandbox.Android.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/MobileSandbox.Android.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/MobileSandbox.Desktop.v3.ncrunchproject b/.ncrunch/MobileSandbox.Desktop.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/MobileSandbox.Desktop.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/MobileSandbox.iOS.v3.ncrunchproject b/.ncrunch/MobileSandbox.iOS.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/MobileSandbox.iOS.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/MobileSandbox.net6.0.v3.ncrunchproject b/.ncrunch/MobileSandbox.net6.0.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/MobileSandbox.net6.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/MobileSandbox.netstandard2.0.v3.ncrunchproject b/.ncrunch/MobileSandbox.netstandard2.0.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/MobileSandbox.netstandard2.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/_build.v3.ncrunchproject b/.ncrunch/_build.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/_build.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.nuke b/.nuke
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
new file mode 100644
index 0000000000..5bbc3d6915
--- /dev/null
+++ b/.nuke/build.schema.json
@@ -0,0 +1,148 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Build Schema",
+  "$ref": "#/definitions/build",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "configuration"
+        },
+        "Continue": {
+          "type": "boolean",
+          "description": "Indicates to continue a previously failed build attempt"
+        },
+        "ForceNugetVersion": {
+          "type": "string",
+          "description": "force-nuget-version"
+        },
+        "Help": {
+          "type": "boolean",
+          "description": "Shows the help text for this build assembly"
+        },
+        "Host": {
+          "type": "string",
+          "description": "Host for execution. Default is 'automatic'",
+          "enum": [
+            "AppVeyor",
+            "AzurePipelines",
+            "Bamboo",
+            "Bitbucket",
+            "Bitrise",
+            "GitHubActions",
+            "GitLab",
+            "Jenkins",
+            "Rider",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
+          ]
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
+        "Plan": {
+          "type": "boolean",
+          "description": "Shows the execution plan (HTML)"
+        },
+        "Profile": {
+          "type": "array",
+          "description": "Defines the profiles to load",
+          "items": {
+            "type": "string"
+          }
+        },
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "Skip": {
+          "type": "array",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
+          "items": {
+            "type": "string",
+            "enum": [
+              "CiAzureLinux",
+              "CiAzureOSX",
+              "CiAzureWindows",
+              "Clean",
+              "Compile",
+              "CompileHtmlPreviewer",
+              "CompileNative",
+              "CreateIntermediateNugetPackages",
+              "CreateNugetPackages",
+              "GenerateCppHeaders",
+              "Package",
+              "RunCoreLibsTests",
+              "RunDesignerTests",
+              "RunHtmlPreviewerTests",
+              "RunLeakTests",
+              "RunRenderTests",
+              "RunTests",
+              "ZipFiles"
+            ]
+          }
+        },
+        "SkipPreviewer": {
+          "type": "boolean",
+          "description": "skip-previewer"
+        },
+        "SkipTests": {
+          "type": "boolean",
+          "description": "skip-tests"
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded. Default is Avalonia.sln"
+        },
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "type": "string",
+            "enum": [
+              "CiAzureLinux",
+              "CiAzureOSX",
+              "CiAzureWindows",
+              "Clean",
+              "Compile",
+              "CompileHtmlPreviewer",
+              "CompileNative",
+              "CreateIntermediateNugetPackages",
+              "CreateNugetPackages",
+              "GenerateCppHeaders",
+              "Package",
+              "RunCoreLibsTests",
+              "RunDesignerTests",
+              "RunHtmlPreviewerTests",
+              "RunLeakTests",
+              "RunRenderTests",
+              "RunTests",
+              "ZipFiles"
+            ]
+          }
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/.nuke/parameters.json b/.nuke/parameters.json
new file mode 100644
index 0000000000..42521bb7dd
--- /dev/null
+++ b/.nuke/parameters.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "./build.schema.json",
+  "Solution": ""
+}
\ No newline at end of file
diff --git a/Avalonia.Desktop.slnf b/Avalonia.Desktop.slnf
new file mode 100644
index 0000000000..6ba05332be
--- /dev/null
+++ b/Avalonia.Desktop.slnf
@@ -0,0 +1,60 @@
+{
+  "solution": {
+    "path": "Avalonia.sln",
+    "projects": [
+      "packages\\Avalonia\\Avalonia.csproj",
+      "samples\\ControlCatalog.NetCore\\ControlCatalog.NetCore.csproj",
+      "samples\\ControlCatalog\\ControlCatalog.csproj",
+      "samples\\IntegrationTestApp\\IntegrationTestApp.csproj",
+      "samples\\MiniMvvm\\MiniMvvm.csproj",
+      "samples\\SampleControls\\ControlSamples.csproj",
+      "samples\\Sandbox\\Sandbox.csproj",
+      "src\\Avalonia.Base\\Avalonia.Base.csproj",
+      "src\\Avalonia.Build.Tasks\\Avalonia.Build.Tasks.csproj",
+      "src\\Avalonia.Controls.ColorPicker\\Avalonia.Controls.ColorPicker.csproj",
+      "src\\Avalonia.Controls.DataGrid\\Avalonia.Controls.DataGrid.csproj",
+      "src\\Avalonia.Controls\\Avalonia.Controls.csproj",
+      "src\\Avalonia.DesignerSupport\\Avalonia.DesignerSupport.csproj",
+      "src\\Avalonia.Desktop\\Avalonia.Desktop.csproj",
+      "src\\Avalonia.Diagnostics\\Avalonia.Diagnostics.csproj",
+      "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj",
+      "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj",
+      "src\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj",
+      "src\\Avalonia.Headless\\Avalonia.Headless.csproj",
+      "src\\Avalonia.MicroCom\\Avalonia.MicroCom.csproj",
+      "src\\Avalonia.Native\\Avalonia.Native.csproj",
+      "src\\Avalonia.OpenGL\\Avalonia.OpenGL.csproj",
+      "src\\Avalonia.ReactiveUI\\Avalonia.ReactiveUI.csproj",
+      "src\\Avalonia.Remote.Protocol\\Avalonia.Remote.Protocol.csproj",
+      "src\\Avalonia.Themes.Fluent\\Avalonia.Themes.Fluent.csproj",
+      "src\\Avalonia.Themes.Simple\\Avalonia.Themes.Simple.csproj",
+      "src\\Avalonia.X11\\Avalonia.X11.csproj",
+      "src\\Linux\\Avalonia.LinuxFramebuffer\\Avalonia.LinuxFramebuffer.csproj",
+      "src\\Markup\\Avalonia.Markup.Xaml.Loader\\Avalonia.Markup.Xaml.Loader.csproj",
+      "src\\Markup\\Avalonia.Markup.Xaml\\Avalonia.Markup.Xaml.csproj",
+      "src\\Markup\\Avalonia.Markup\\Avalonia.Markup.csproj",
+      "src\\Skia\\Avalonia.Skia\\Avalonia.Skia.csproj",
+      "src\\Windows\\Avalonia.Direct2D1\\Avalonia.Direct2D1.csproj",
+      "src\\Windows\\Avalonia.Win32.Interop\\Avalonia.Win32.Interop.csproj",
+      "src\\Windows\\Avalonia.Win32\\Avalonia.Win32.csproj",
+      "src\\tools\\DevAnalyzers\\DevAnalyzers.csproj",
+      "src\\tools\\DevGenerators\\DevGenerators.csproj",
+      "tests\\Avalonia.Base.UnitTests\\Avalonia.Base.UnitTests.csproj",
+      "tests\\Avalonia.Benchmarks\\Avalonia.Benchmarks.csproj",
+      "tests\\Avalonia.Controls.DataGrid.UnitTests\\Avalonia.Controls.DataGrid.UnitTests.csproj",
+      "tests\\Avalonia.Controls.UnitTests\\Avalonia.Controls.UnitTests.csproj",
+      "tests\\Avalonia.DesignerSupport.TestApp\\Avalonia.DesignerSupport.TestApp.csproj",
+      "tests\\Avalonia.DesignerSupport.Tests\\Avalonia.DesignerSupport.Tests.csproj",
+      "tests\\Avalonia.Direct2D1.RenderTests\\Avalonia.Direct2D1.RenderTests.csproj",
+      "tests\\Avalonia.Direct2D1.UnitTests\\Avalonia.Direct2D1.UnitTests.csproj",
+      "tests\\Avalonia.IntegrationTests.Appium\\Avalonia.IntegrationTests.Appium.csproj",
+      "tests\\Avalonia.LeakTests\\Avalonia.LeakTests.csproj",
+      "tests\\Avalonia.Markup.UnitTests\\Avalonia.Markup.UnitTests.csproj",
+      "tests\\Avalonia.Markup.Xaml.UnitTests\\Avalonia.Markup.Xaml.UnitTests.csproj",
+      "tests\\Avalonia.ReactiveUI.UnitTests\\Avalonia.ReactiveUI.UnitTests.csproj",
+      "tests\\Avalonia.Skia.RenderTests\\Avalonia.Skia.RenderTests.csproj",
+      "tests\\Avalonia.Skia.UnitTests\\Avalonia.Skia.UnitTests.csproj",
+      "tests\\Avalonia.UnitTests\\Avalonia.UnitTests.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/Avalonia.sln b/Avalonia.sln
index c3e86734d8..e2f04ddc35 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -5,48 +5,26 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals", "src\Avalonia.Visuals\Avalonia.Visuals.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout", "src\Avalonia.Layout\Avalonia.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32", "src\Windows\Avalonia.Win32\Avalonia.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity", "src\Avalonia.Interactivity\Avalonia.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling", "src\Avalonia.Styling\Avalonia.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Default", "src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Simple", "src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Diagnostics", "src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation", "src\Avalonia.Animation\Avalonia.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling.UnitTests", "tests\Avalonia.Styling.UnitTests\Avalonia.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.UnitTests", "tests\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals.UnitTests", "tests\Avalonia.Visuals.UnitTests\Avalonia.Visuals.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout.UnitTests", "tests\Avalonia.Layout.UnitTests\Avalonia.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.Direct2D1.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1.UnitTests", "tests\Avalonia.Direct2D1.UnitTests\Avalonia.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.UnitTests", "tests\Avalonia.Markup.Xaml.UnitTests\Avalonia.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
@@ -60,7 +38,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		src\Shared\IsExternalInit.cs = src\Shared\IsExternalInit.cs
 		src\Shared\ModuleInitializer.cs = src\Shared\ModuleInitializer.cs
+		src\Shared\SourceGeneratorAttributes.cs = src\Shared\SourceGeneratorAttributes.cs
+		src\Avalonia.Base\Compatibility\StringCompatibilityExtensions.cs = src\Avalonia.Base\Compatibility\StringCompatibilityExtensions.cs
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI", "src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
@@ -77,8 +58,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{7CF9
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Android", "src\Android\Avalonia.Android\Avalonia.Android.csproj", "{7B92AF71-6287-4693-9DCB-BD5B6E927E23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.AndroidTestApplication", "src\Android\Avalonia.AndroidTestApplication\Avalonia.AndroidTestApplication.csproj", "{FF69B927-C545-49AE-8E16-3D14D621AA12}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.iOS", "src\iOS\Avalonia.iOS\Avalonia.iOS.csproj", "{4488AD85-1495-4809-9AA4-DDFE0A48527E}"
@@ -95,10 +74,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog", "samples\C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Desktop", "samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj", "{2B888490-D14A-4BCA-AB4B-48676FA93C9B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{57E0455D-D565-44BB-B069-EE1AA20F8337}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{52F55355-D120-42AC-8116-8410A7D602FA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.TestApp", "tests\Avalonia.DesignerSupport.TestApp\Avalonia.DesignerSupport.TestApp.csproj", "{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualizationDemo", "samples\VirtualizationDemo\VirtualizationDemo.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}"
@@ -116,20 +91,23 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}"
 	ProjectSection(SolutionItems) = preProject
 		build\ApiDiff.props = build\ApiDiff.props
+		build\AvaloniaPublicKey.props = build\AvaloniaPublicKey.props
 		build\Base.props = build\Base.props
 		build\Binding.props = build\Binding.props
 		build\CoreLibraries.props = build\CoreLibraries.props
+		build\DevAnalyzers.props = build\DevAnalyzers.props
 		build\EmbedXaml.props = build\EmbedXaml.props
 		build\HarfBuzzSharp.props = build\HarfBuzzSharp.props
-		build\iOSWorkarounds.props = build\iOSWorkarounds.props
+		build\ImageSharp.props = build\ImageSharp.props
 		build\JetBrains.Annotations.props = build\JetBrains.Annotations.props
 		build\JetBrains.dotMemoryUnit.props = build\JetBrains.dotMemoryUnit.props
-		build\Magick.NET-Q16-AnyCPU.props = build\Magick.NET-Q16-AnyCPU.props
 		build\Microsoft.CSharp.props = build\Microsoft.CSharp.props
 		build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props
 		build\Moq.props = build\Moq.props
+		build\NetAnalyzers.props = build\NetAnalyzers.props
 		build\NetCore.props = build\NetCore.props
 		build\NetFX.props = build\NetFX.props
+		build\NullableEnable.props = build\NullableEnable.props
 		build\ReactiveUI.props = build\ReactiveUI.props
 		build\ReferenceCoreLibraries.props = build\ReferenceCoreLibraries.props
 		build\Rx.props = build\Rx.props
@@ -137,6 +115,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\SharedVersion.props = build\SharedVersion.props
 		build\SharpDX.props = build\SharpDX.props
 		build\SkiaSharp.props = build\SkiaSharp.props
+		build\SourceGenerators.props = build\SourceGenerators.props
 		build\SourceLink.props = build\SourceLink.props
 		build\System.Drawing.Common.props = build\System.Drawing.Common.props
 		build\System.Memory.props = build\System.Memory.props
@@ -177,8 +156,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.OpenGL", "src\Aval
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Native", "src\Avalonia.Native\Avalonia.Native.csproj", "{12A91A62-C064-42CA-9A8C-A1272F354388}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesktopRuntime", "src\Avalonia.DesktopRuntime\Avalonia.DesktopRuntime.csproj", "{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{E870DCD7-F46A-498D-83FC-D0FD13E0A11C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia", "packages\Avalonia\Avalonia.csproj", "{D49233F8-F29C-47DD-9975-C4C9E4502720}"
@@ -189,8 +166,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Build.Tasks", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "nukebuild\_build.csproj", "{3F00BC43-5095-477F-93D8-E65B08179A00}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation.UnitTests", "tests\Avalonia.Animation.UnitTests\Avalonia.Animation.UnitTests.csproj", "{AF227847-E65C-4BE9-BCE9-B551357788E0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.X11", "src\Avalonia.X11\Avalonia.X11.csproj", "{41B02319-965D-4945-8005-C1A3D1224165}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformSanityChecks", "samples\PlatformSanityChecks\PlatformSanityChecks.csproj", "{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}"
@@ -205,8 +180,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.FreeDesktop", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.DataGrid.UnitTests", "tests\Avalonia.Controls.DataGrid.UnitTests\Avalonia.Controls.DataGrid.UnitTests.csproj", "{351337F5-D66F-461B-A957-4EF60BDB4BA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeEmbedSample", "samples\interop\NativeEmbedSample\NativeEmbedSample.csproj", "{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Fluent", "src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj", "{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless", "src\Avalonia.Headless\Avalonia.Headless.csproj", "{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}"
@@ -221,1968 +194,353 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MicroCom", "src\Av
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniMvvm", "samples\MiniMvvm\MiniMvvm.csproj", "{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestApp", "samples\IntegrationTestApp\IntegrationTestApp.csproj", "{676D6BFD-029D-4E43-BFC7-3892265CE251}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.IntegrationTests.Appium", "tests\Avalonia.IntegrationTests.Appium\Avalonia.IntegrationTests.Appium.csproj", "{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Web.Blazor", "src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj", "{25831348-EB2A-483E-9576-E8F6528674A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Web", "samples\ControlCatalog.Web\ControlCatalog.Web.csproj", "{C08E9894-AA92-426E-BF56-033E262CAD3E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsInteropTest", "samples\interop\WindowsInteropTest\WindowsInteropTest.csproj", "{26A98DA1-D89D-4A95-8152-349F404DA2E2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\SampleControls\ControlSamples.csproj", "{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.PlatformSupport", "src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj", "{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevAnalyzers", "src\tools\DevAnalyzers\DevAnalyzers.csproj", "{2B390431-288C-435C-BB6B-A374033BD8D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ColorPicker", "src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj", "{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{EABE2161-989B-42BF-BD8D-1E34B20C21F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevGenerators", "src\tools\DevGenerators\DevGenerators.csproj", "{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Web", "src\Web\Avalonia.Web\Avalonia.Web.csproj", "{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox", "samples\MobileSandbox\MobileSandbox.csproj", "{3B8519C1-2F51-4F12-A348-120AB91D4532}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.Android", "samples\MobileSandbox.Android\MobileSandbox.Android.csproj", "{C90FE60B-B01E-4F35-91D6-379D6966030F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.iOS", "samples\MobileSandbox.iOS\MobileSandbox.iOS.csproj", "{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.Desktop", "samples\MobileSandbox.Desktop\MobileSandbox.Desktop.csproj", "{62D392C9-81CF-487F-92E8-598B2AF3FDCE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Blazor.Web", "samples\ControlCatalog.Blazor.Web\ControlCatalog.Blazor.Web.csproj", "{6A710364-AE6D-40BD-968B-024311527AC2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Web", "samples\ControlCatalog.Web\ControlCatalog.Web.csproj", "{8B3E8405-DE18-4048-A459-9CA4AC3319A2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|iPhone = Ad-Hoc|iPhone
-		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|iPhone = AppStore|iPhone
-		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
 		Debug|Any CPU = Debug|Any CPU
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
 		Release|Any CPU = Release|Any CPU
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhone.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhone.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhone.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhone.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhone.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhone.Build.0 = Debug|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhone.ActiveCfg = Release|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhone.Build.0 = Release|iPhone
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhone.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhone.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhone.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhone.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhone.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhone.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhone.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhone.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhone.Build.0 = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhone.Build.0 = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhone.Build.0 = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Release|iPhone.Build.0 = Release|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{878FEFE0-CD14-41CB-90B0-DBCB163E8F15}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhone.Build.0 = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhone.Build.0 = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhone.Build.0 = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhone.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhone.Build.0 = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhone.Build.0 = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhone.Build.0 = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhone.Build.0 = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhone.Build.0 = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhone.Build.0 = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhone.Build.0 = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhone.Build.0 = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhone.Build.0 = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhone.Build.0 = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhone.Build.0 = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhone.Build.0 = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|Any CPU.Build.0 = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhone.Build.0 = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhone.Build.0 = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhone.Build.0 = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhone.Build.0 = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhone.Build.0 = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhone.Build.0 = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhone.Build.0 = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.Build.0 = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C90FE60B-B01E-4F35-91D6-379D6966030F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C90FE60B-B01E-4F35-91D6-379D6966030F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C90FE60B-B01E-4F35-91D6-379D6966030F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{C90FE60B-B01E-4F35-91D6-379D6966030F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C90FE60B-B01E-4F35-91D6-379D6966030F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A710364-AE6D-40BD-968B-024311527AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A710364-AE6D-40BD-968B-024311527AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A710364-AE6D-40BD-968B-024311527AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A710364-AE6D-40BD-968B-024311527AC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2190,14 +548,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{76716382-3159-460E-BDA6-C5715CF606D7} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{2905FF23-53FB-45E6-AA49-6AF47A172056} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{DB070A10-BF39-4752-8456-86E9D5928478} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{99135EAB-653D-47E4-A378-C96E1278CA44} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{3E53A01A-B331-47F3-B828-4A5717E77A24} = {8B6A8209-894F-4BA1-B880-965FD453982C}
@@ -2205,15 +558,12 @@ Global
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23} = {7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F}
-		{FF69B927-C545-49AE-8E16-3D14D621AA12} = {7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F}
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E} = {0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{88060192-33D5-4932-B0F9-8BD2763E857D} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{57E0455D-D565-44BB-B069-EE1AA20F8337} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{52F55355-D120-42AC-8116-8410A7D602FA} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{FBCAF3D0-2808-4934-8E96-3F607594517B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{A0CC0258-D18C-4AB3-854F-7101680FC3F9} = {9B9E3891-2366-4253-A952-D08BCEB71098}
@@ -2231,19 +581,30 @@ Global
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{D49233F8-F29C-47DD-9975-C4C9E4502720} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
-		{AF227847-E65C-4BE9-BCE9-B551357788E0} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{41B02319-965D-4945-8005-C1A3D1224165} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{909A8CBD-7D0E-42FD-B841-022AD8925820} = {8B6A8209-894F-4BA1-B880-965FD453982C}
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{676D6BFD-029D-4E43-BFC7-3892265CE251} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{25831348-EB2A-483E-9576-E8F6528674A5} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
-		{C08E9894-AA92-426E-BF56-033E262CAD3E} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{2B390431-288C-435C-BB6B-A374033BD8D1} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{76D39FF6-6B4F-46C4-93CD-E6FC4665739E} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
+		{3B8519C1-2F51-4F12-A348-120AB91D4532} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{C90FE60B-B01E-4F35-91D6-379D6966030F} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{62D392C9-81CF-487F-92E8-598B2AF3FDCE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{6A710364-AE6D-40BD-968B-024311527AC2} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{8B3E8405-DE18-4048-A459-9CA4AC3319A2} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
diff --git a/Directory.Build.props b/Directory.Build.props
index 835decc672..42daa2df7f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,11 @@
 <Project>
+  <Import Project="$(MSBuildThisFileDirectory)/build/AvaloniaPublicKey.props"/>
   <PropertyGroup>
       <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath>
       <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
       <!-- https://github.com/dotnet/msbuild/issues/2661 -->
       <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
       <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
+      <RunApiCompat>False</RunApiCompat>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000000..73954c7f4d
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup Condition="$(NETCoreSdkVersion.StartsWith('7.0'))">
+    <DefineConstants>$(DefineConstants);NET7SDK</DefineConstants>
+  </PropertyGroup>  
+</Project>
diff --git a/Documentation/build.md b/Documentation/build.md
index ddd38be887..fd6b26337c 100644
--- a/Documentation/build.md
+++ b/Documentation/build.md
@@ -1,8 +1,8 @@
 # Windows
 
-Avalonia requires at least Visual Studio 2022 and dotnet 6 SDK 6.0.100 to build on all platforms.
+Avalonia requires at least Visual Studio 2022 and dotnet 7-rc2 SDK 7.0.100-rc.2 to build on all platforms.
 
-###  Clone the Avalonia repository
+##  Clone the Avalonia repository
 
 ```
 git clone https://github.com/AvaloniaUI/Avalonia.git
@@ -10,15 +10,30 @@ cd Avalonia
 git submodule update --init
 ```
 
-### Install the required version of the .NET Core SDK
+## Install the required version of the .NET Core SDK
 
 Go to https://dotnet.microsoft.com/download/visual-studio-sdks and install the latest version of the .NET Core SDK compatible with Avalonia UI. Make sure to download the SDK (not just the "runtime") package. The version compatible is indicated within the [global.json](https://github.com/AvaloniaUI/Avalonia/blob/master/global.json) file. Note that Avalonia UI does not always use the latest version and is hardcoded to use the last version known to be compatible (SDK releases may break the builds from time-to-time).
 
-###  Open in Visual Studio
+##  Build and Run Avalonia
 
-Open the `Avalonia.sln` solution in Visual Studio 2022 or newer. The free Visual Studio Community edition works fine. Build and run the `Samples\ControlCatalog.Desktop` or `ControlCatalog.NetCore` project to see the sample application.
+```
+cd samples\ControlCatalog.NetCore
+dotnet restore
+dotnet run
+```
+
+##  Opening in Visual Studio
 
-### Troubleshooting
+If you want to open Avalonia in Visual Studio you have two options:
+
+- Avalonia.sln: This contains the whole of Avalonia in including desktop, mobile and web. You must have a number of dotnet workloads installed in order to build everything in this solution
+- Avalonia.Desktop.slnf: This solution filter opens only the parts of Avalonia required to run on desktop. This requires no extra workloads to be installed.
+
+Avalonia requires Visual Studio 2022 or newer. The free Visual Studio Community edition works fine.
+
+Build and run `ControlCatalog.NetCore` project to see the sample application.
+
+### Visual Studio Troubleshooting
 
  * **Error CS0006: Avalonia.DesktopRuntime.dll could not be found**
 
@@ -35,16 +50,15 @@ It's *not* possible to build the *whole* project on Linux/macOS. You can only bu
 
 MonoDevelop, Xamarin Studio and Visual Studio for Mac aren't capable of properly opening our solution. You can use Rider (at least 2017.2 EAP) or VSCode instead. They will fail to load most of platform specific projects, but you don't need them to run on .NET Core.
 
-###  Install the latest version of the .NET Core SDK
+##  Install the latest version of the .NET Core SDK
 
 Go to https://www.microsoft.com/net/core and follow the instructions for your OS. Make sure to download the SDK (not just the "runtime") package.
 
-###  Additional requirements for macOS
+##  Additional requirements for macOS
 
 The build process needs [Xcode](https://developer.apple.com/xcode/) to build the native library.  Following the install instructions at the [Xcode](https://developer.apple.com/xcode/) website to properly install.
 
-
-###  Clone the Avalonia repository
+##  Clone the Avalonia repository
 
 ```
 git clone https://github.com/AvaloniaUI/Avalonia.git
@@ -52,7 +66,7 @@ cd Avalonia
 git submodule update --init --recursive
 ```
 
-### Build native libraries (macOS only)
+## Build native libraries (macOS only)
 
 On macOS it is necessary to build and manually install the respective native libraries using [Xcode](https://developer.apple.com/xcode/). Execute the build script in the root project with the `CompileNative` task. It will build the headers, build the libraries, and place them in the appropriate place to allow .NET to find them at compilation and run time.
 
@@ -60,7 +74,7 @@ On macOS it is necessary to build and manually install the respective native lib
 ./build.sh CompileNative
 ```
 
-###  Build and Run Avalonia
+##  Build and Run Avalonia
 
 ```
 cd samples/ControlCatalog.NetCore
diff --git a/NOTICE.md b/NOTICE.md
index 92fd725957..e97fc654c9 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -111,7 +111,7 @@ DEALINGS IN THE SOFTWARE.
 
 # Metsys.Bson
 
-Copyright (c) 2010, Karl Seguin - http://www.openmymind.net/
+Copyright (c) 2010, Karl Seguin - https://www.openmymind.net/
 All rights reserved.
  
 Redistribution and use in source and binary forms, with or without
@@ -302,4 +302,4 @@ https://github.com/chromium/chromium
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/NuGet.Config b/NuGet.Config
index 7a1f28bea7..7d2bd8abd2 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,5 +5,6 @@
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://nuget.avaloniaui.net/repository/avalonia-devdeps/index.json" protocolVersion="3" />
+    <add key="skiasharp" value="https://aka.ms/skiasharp-eap/index.json" />
   </packageSources>
 </configuration>
diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml
new file mode 100644
index 0000000000..43253ac6be
--- /dev/null
+++ b/azure-pipelines-integrationtests.yml
@@ -0,0 +1,83 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+jobs:
+- job: Mac
+  pool:
+    name: 'AvaloniaMacPool'
+
+  steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 6.0.401'
+    inputs:
+      version: 6.0.401
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 7.0.100'
+    inputs:
+      version: 7.0.100
+      
+  - script: system_profiler SPDisplaysDataType |grep Resolution
+  
+  - script: |
+      pkill node
+      appium &
+      pkill IntegrationTestApp
+      ./build.sh CompileNative
+      rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")")
+      pkill IntegrationTestApp
+      ./samples/IntegrationTestApp/bundle.sh
+      open -n ./samples/IntegrationTestApp/bin/Debug/net7.0/osx-arm64/publish/IntegrationTestApp.app
+      pkill IntegrationTestApp
+
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'test'
+      projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj'
+
+  - script: |
+      pkill IntegrationTestApp
+      pkill node
+
+
+- job: Windows
+  pool:
+    vmImage: 'windows-2022'
+
+  steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 6.0.401'
+    inputs:
+      version: 6.0.401
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 7.0.100'
+    inputs:
+      version: 7.0.100
+
+  - task: Windows Application Driver@0
+    inputs:
+      OperationType: 'Start'
+      AgentResolution: '4K'
+    displayName: 'Start WinAppDriver'
+  
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'build'
+      projects: 'samples/IntegrationTestApp/IntegrationTestApp.csproj'
+
+  - task: DotNetCoreCLI@2
+    retryCountOnTaskFailure: 3
+    inputs:
+      command: 'test'
+      projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj'
+
+  - task: Windows Application Driver@0
+    inputs:
+      OperationType: 'Stop'
+    displayName: 'Stop WinAppDriver'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ede5aec0e8..a3bbc33418 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,6 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
-    
   - task: PowerShell@2
     displayName: Get PR Number
     inputs:
@@ -31,14 +30,20 @@ jobs:
     vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 3.1.414'
+    displayName: 'Use .NET Core SDK 6.0.401'
     inputs:
-      version: 3.1.414
+      version: 6.0.401
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.100'
+    displayName: 'Use .NET Core SDK 7.0'
+    inputs:
+      version: 7.0.100
+
+  - task: CmdLine@2
+    displayName: 'Install Workloads'
     inputs:
-      version: 6.0.100
+      script: |
+       dotnet workload install wasm-tools wasm-experimental
 
   - task: CmdLine@2
     displayName: 'Run Build'
@@ -59,25 +64,24 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macos-12'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 3.1.414'
+    displayName: 'Use .NET Core SDK 6.0.401'
     inputs:
-      version: 3.1.414
+      version: 6.0.401
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.100'
+    displayName: 'Use .NET Core SDK 7.0.100'
     inputs:
-      version: 6.0.100
-      
+      version: 7.0.100
+
   - task: CmdLine@2
-    displayName: 'Install Mono 5.18'
+    displayName: 'Install Workloads'
     inputs:
       script: |
-        curl -o ./mono.pkg https://download.mono-project.com/archive/5.18.0/macos-10-universal/MonoFramework-MDK-5.18.0.225.macos10.xamarin.universal.pkg 
-        sudo installer -verbose -pkg ./mono.pkg -target /
-
+       dotnet workload install wasm-tools wasm-experimental
+      
   - task: CmdLine@2
     displayName: 'Generate avalonia-native'
     inputs:
@@ -91,10 +95,10 @@ jobs:
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx11.1'
+      sdk: 'macosx12.3'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
-      xcodeVersion: '12' # Options: 8, 9, default, specifyPath
+      xcodeVersion: '13' # Options: 8, 9, default, specifyPath
       args: '-derivedDataPath ./'
 
   - task: CmdLine@2
@@ -134,26 +138,26 @@ jobs:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 3.1.414'
+    displayName: 'Use .NET Core SDK 6.0.401'
     inputs:
-      version: 3.1.414
+      version: 6.0.401
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.100'
+    displayName: 'Use .NET Core SDK 7.0.100'
     inputs:
-      version: 6.0.100
+      version: 7.0.100
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
     inputs:
       script: |
-       dotnet workload install android
+       dotnet workload install android ios wasm-tools wasm-experimental
 
   - task: CmdLine@2
     displayName: 'Install Nuke'
     inputs:
       script: |
-       dotnet tool install --global Nuke.GlobalTool --version 0.24.0 
+       dotnet tool install --global Nuke.GlobalTool --version 6.2.1 
 
   - task: CmdLine@2
     displayName: 'Run Nuke'
diff --git a/build.cmd b/build.cmd
new file mode 100644
index 0000000000..b08cc590f4
--- /dev/null
+++ b/build.cmd
@@ -0,0 +1,7 @@
+:; set -eo pipefail
+:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+:; ${SCRIPT_DIR}/build.sh "$@"
+:; exit $?
+
+@ECHO OFF
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*
diff --git a/build.ps1 b/build.ps1
index 985e8abcee..997e5b423f 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,13 +1,12 @@
 [CmdletBinding()]
 Param(
-    #[switch]$CustomParam,
     [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
     [string[]]$BuildArguments
 )
 
-Write-Output "Windows PowerShell $($Host.Version)"
+Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"
 
-Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { exit 1 }
+Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { Write-Error $_ -ErrorAction Continue; exit 1 }
 $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 
 ###########################################################################
@@ -15,15 +14,15 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 ###########################################################################
 
 $BuildProjectFile = "$PSScriptRoot\nukebuild\_build.csproj"
-$TempDirectory = "$PSScriptRoot\\.tmp"
+$TempDirectory = "$PSScriptRoot\\.nuke\temp"
 
 $DotNetGlobalFile = "$PSScriptRoot\\global.json"
-$DotNetInstallUrl = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1"
+$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
 $DotNetChannel = "Current"
 
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 $env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
-$env:NUGET_XMLDOC_MODE = "skip"
+$env:DOTNET_MULTILEVEL_LOOKUP = 0
 
 ###########################################################################
 # EXECUTION
@@ -34,38 +33,37 @@ function ExecSafe([scriptblock] $cmd) {
     if ($LASTEXITCODE) { exit $LASTEXITCODE }
 }
 
-# If global.json exists, load expected version
-if (Test-Path $DotNetGlobalFile) {
-    $DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
-    if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
-        $DotNetVersion = $DotNetGlobal.sdk.version
-    }
-}
-
-# If dotnet is installed locally, and expected version is not set or installation matches the expected version
+# If dotnet CLI is installed globally and it matches requested version, use for execution
 if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
-     (!(Test-Path variable:DotNetVersion) -or $(& dotnet --version) -eq $DotNetVersion)) {
+     $(dotnet --version) -and $LASTEXITCODE -eq 0) {
     $env:DOTNET_EXE = (Get-Command "dotnet").Path
 }
 else {
-    $DotNetDirectory = "$TempDirectory\dotnet-win"
-    $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
-
     # Download install script
     $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
-    mkdir -force $TempDirectory > $null
+    New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
     (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
 
+    # If global.json exists, load expected version
+    if (Test-Path $DotNetGlobalFile) {
+        $DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
+        if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
+            $DotNetVersion = $DotNetGlobal.sdk.version
+        }
+    }
+
     # Install by channel or version
+    $DotNetDirectory = "$TempDirectory\dotnet-win"
     if (!(Test-Path variable:DotNetVersion)) {
-        ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
+        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
     } else {
-        ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
+        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
     }
-
-    $env:PATH="$DotNetDirectory;$env:PATH"
+    $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
 }
 
-Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
+Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
 
-ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile -- $BuildArguments }
+ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
+ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
diff --git a/build.sh b/build.sh
index 9532b4fbe0..76919a5351 100755
--- a/build.sh
+++ b/build.sh
@@ -1,16 +1,6 @@
 #!/usr/bin/env bash
 
-echo $(bash --version 2>&1 | head -n 1)
-
-#CUSTOMPARAM=0
-BUILD_ARGUMENTS=()
-for i in "$@"; do
-    case $(echo $1 | awk '{print tolower($0)}') in
-        # -custom-param) CUSTOMPARAM=1;;
-        *) BUILD_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
+bash --version 2>&1 | head -n 1
 
 set -eo pipefail
 SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
@@ -20,11 +10,53 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 ###########################################################################
 
 BUILD_PROJECT_FILE="$SCRIPT_DIR/nukebuild/_build.csproj"
+TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
+
+DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
+DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
+DOTNET_CHANNEL="Current"
 
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export NUGET_XMLDOC_MODE="skip"
+export DOTNET_MULTILEVEL_LOOKUP=0
 
-dotnet --info
+###########################################################################
+# EXECUTION
+###########################################################################
 
-dotnet run --project "$BUILD_PROJECT_FILE" -- ${BUILD_ARGUMENTS[@]}
+function FirstJsonValue {
+    perl -nle 'print $1 if m{"'"$1"'": "([^"]+)",?}' <<< "${@:2}"
+}
+
+# If dotnet CLI is installed globally and it matches requested version, use for execution
+if [ -x "$(command -v dotnet)" ] && dotnet --version &>/dev/null; then
+    export DOTNET_EXE="$(command -v dotnet)"
+else
+    # Download install script
+    DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
+    mkdir -p "$TEMP_DIRECTORY"
+    curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
+    chmod +x "$DOTNET_INSTALL_FILE"
+
+    # If global.json exists, load expected version
+    if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
+        DOTNET_VERSION=$(FirstJsonValue "version" "$(cat "$DOTNET_GLOBAL_FILE")")
+        if [[ "$DOTNET_VERSION" == ""  ]]; then
+            unset DOTNET_VERSION
+        fi
+    fi
+
+    # Install by channel or version
+    DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
+    if [[ -z ${DOTNET_VERSION+x} ]]; then
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --channel "$DOTNET_CHANNEL" --no-path
+    else
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
+    fi
+    export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
+fi
+
+echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
+
+"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
+"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
diff --git a/build/ApiCompatAttributeExcludeList.txt b/build/ApiCompatAttributeExcludeList.txt
new file mode 100644
index 0000000000..1df5a30ec3
--- /dev/null
+++ b/build/ApiCompatAttributeExcludeList.txt
@@ -0,0 +1,2 @@
+T:Avalonia.Metadata.NotClientImplementableAttribute
+T:Avalonia.Metadata.UnstableAttribute
diff --git a/build/AvaloniaPublicKey.props b/build/AvaloniaPublicKey.props
new file mode 100644
index 0000000000..89215635c0
--- /dev/null
+++ b/build/AvaloniaPublicKey.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <AvaloniaPublicKey>0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87</AvaloniaPublicKey>
+  </PropertyGroup>
+</Project>
diff --git a/build/CoreLibraries.props b/build/CoreLibraries.props
index 3fccad2641..00a1e3094b 100644
--- a/build/CoreLibraries.props
+++ b/build/CoreLibraries.props
@@ -1,22 +1,12 @@
 <Project>
   <ItemGroup>
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Base/Avalonia.Base.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Animation/Avalonia.Animation.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Input/Avalonia.Input.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Interactivity/Avalonia.Interactivity.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Layout/Avalonia.Layout.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Visuals/Avalonia.Visuals.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Styling/Avalonia.Styling.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.OpenGL/Avalonia.OpenGL.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Dialogs/Avalonia.Dialogs.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup/Avalonia.Markup.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.MicroCom/Avalonia.MicroCom.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj" />
   </ItemGroup>
 </Project>
diff --git a/build/DevAnalyzers.props b/build/DevAnalyzers.props
new file mode 100644
index 0000000000..14e4f6a563
--- /dev/null
+++ b/build/DevAnalyzers.props
@@ -0,0 +1,9 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\tools\DevAnalyzers\DevAnalyzers.csproj"
+                      PrivateAssets="all"
+                      ReferenceOutputAssembly="false"
+                      OutputItemType="Analyzer"
+                      SetTargetFramework="TargetFramework=netstandard2.0"/>
+  </ItemGroup>
+</Project>
diff --git a/build/HarfBuzzSharp.props b/build/HarfBuzzSharp.props
index 1d84d5289a..620ec58ff3 100644
--- a/build/HarfBuzzSharp.props
+++ b/build/HarfBuzzSharp.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.178" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2-preview.178" />
-    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="2.8.2-preview.178"/>
+    <PackageReference Include="HarfBuzzSharp" Version="2.8.2.1-preview.108" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.1-preview.108" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="2.8.2.1-preview.108" />
   </ItemGroup>
 </Project>
diff --git a/build/ImageSharp.props b/build/ImageSharp.props
new file mode 100644
index 0000000000..178c274ac9
--- /dev/null
+++ b/build/ImageSharp.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
+  </ItemGroup>
+</Project>
diff --git a/build/JetBrains.dotMemoryUnit.props b/build/JetBrains.dotMemoryUnit.props
index eb4e2b6f15..5d74d474cf 100644
--- a/build/JetBrains.dotMemoryUnit.props
+++ b/build/JetBrains.dotMemoryUnit.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
+    <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
   </ItemGroup>
 </Project>
diff --git a/build/Magick.NET-Q16-AnyCPU.props b/build/Magick.NET-Q16-AnyCPU.props
deleted file mode 100644
index 21d9cdcb1f..0000000000
--- a/build/Magick.NET-Q16-AnyCPU.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="7.9.0.2" />
-  </ItemGroup>
-</Project>
diff --git a/build/NetAnalyzers.props b/build/NetAnalyzers.props
new file mode 100644
index 0000000000..dfca9ecf9e
--- /dev/null
+++ b/build/NetAnalyzers.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+  </PropertyGroup>
+</Project>
diff --git a/build/NetFX.props b/build/NetFX.props
index 8ffc9ec561..14adb54035 100644
--- a/build/NetFX.props
+++ b/build/NetFX.props
@@ -1,7 +1,6 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
index c3b136d41d..1911c02677 100644
--- a/build/ReactiveUI.props
+++ b/build/ReactiveUI.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="13.2.10" />
+    <PackageReference Include="ReactiveUI" Version="18.3.1" />
   </ItemGroup>
 </Project>
diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index dad40cccb7..5838519596 100644
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@@ -2,16 +2,16 @@
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Avalonia</Product>
-    <Version>0.10.999</Version>
+    <Version>11.0.999</Version>
     <Copyright>Copyright 2022 &#169; The AvaloniaUI Project</Copyright>
     <PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>CS1591</NoWarn>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>Icon.png</PackageIcon>
-    <PackageDescription>Avalonia is a cross-platform UI framework for .NET providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, MacOS and with experimental support for Android, iOS and WebAssembly.</PackageDescription>
+    <PackageDescription>Avalonia is a cross-platform UI framework for .NET providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, macOS and with experimental support for Android, iOS and WebAssembly.</PackageDescription>
     <PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags>
     <PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes>
     <RepositoryType>git</RepositoryType>
diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
index bb370256f9..31619399f9 100644
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.0-preview.178" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.178" />
-    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.0-preview.178"/>
+    <PackageReference Include="SkiaSharp" Version="2.88.1" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.1" />
   </ItemGroup>
 </Project>
diff --git a/build/SourceGenerators.props b/build/SourceGenerators.props
new file mode 100644
index 0000000000..4929578b60
--- /dev/null
+++ b/build/SourceGenerators.props
@@ -0,0 +1,10 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectReference 
+      Include="$(MSBuildThisFileDirectory)/../src/tools/DevGenerators/DevGenerators.csproj"
+      OutputItemType="Analyzer" 
+      ReferenceOutputAssembly="false"
+      PrivateAssets="all" />
+    <Compile Include="$(MSBuildThisFileDirectory)/../src/Shared/SourceGeneratorAttributes.cs" />
+  </ItemGroup>
+</Project>
diff --git a/build/SourceLink.props b/build/SourceLink.props
index 9f05848881..dd7ecc8d2a 100644
--- a/build/SourceLink.props
+++ b/build/SourceLink.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <!-- Workaround for https://github.com/dotnet/sdk/issues/11105 -->
diff --git a/build/XUnit.props b/build/XUnit.props
index a75e1bac86..17ead91aa3 100644
--- a/build/XUnit.props
+++ b/build/XUnit.props
@@ -1,14 +1,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.0" />
-    <PackageReference Include="xunit.abstractions" Version="2.0.1" />
-    <PackageReference Include="xunit.assert" Version="2.3.0" />
-    <PackageReference Include="xunit.core" Version="2.3.0" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.3.0" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.3.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
+    <PackageReference Include="xunit.assert" Version="2.4.1" />
+    <PackageReference Include="xunit.core" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
   </ItemGroup>
   <PropertyGroup>
diff --git a/dirs.proj b/dirs.proj
index 74d7b482cc..f1eaae8a4a 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -9,25 +9,24 @@
     <ProjectReference Remove="**/*.shproj" />
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/PortableXaml/**/*.*proj" />
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/*.*proj" />
-    <ProjectReference Remove="tests/Avalonia.ReactiveUI.Events.UnitTests/Avalonia.ReactiveUI.Events.UnitTests.csproj" />
-    <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
-    <ProjectReference Remove="src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS')">
-    <ProjectReference Remove="src/iOS/**/*.*proj" />
-    <ProjectReference Remove="samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj" />
+    <!-- Exclude iOS, Android and Web samples from build -->
+    <ProjectReference Remove="samples/*.iOS/*.csproj" />
+    <ProjectReference Remove="samples/*.Android/*.csproj" />
+    <ProjectReference Remove="samples/*.Web/*.csproj" />
   </ItemGroup>
   <ItemGroup Condition="!$([MSBuild]::IsOsPlatform('Windows')) OR '$(MSBuildRuntimeType)' != 'Full'">
     <ProjectReference Remove="src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj" />
     <ProjectReference Remove="samples/interop/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.Desktop/*.*proj" />
   </ItemGroup>
-  <!-- Build android projects only on Windows, where we have installed android workload -->
+
+  <!-- Build android and iOS projects only on Windows, where we have installed android workload -->
   <ItemGroup Condition="!$([MSBuild]::IsOsPlatform('Windows'))">
     <ProjectReference Remove="src/Android/**/*.*proj" />
+    <ProjectReference Remove="src/iOS/**/*.*proj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SlnGen" Version="2.0.40" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.VisualStudio.SlnGen" Version="8.5.17" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
index 1f93ed27c3..a9318b212f 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,10 @@
 {
     "sdk": {
-        "version": "6.0.100"
+        "version": "7.0.100",
+        "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
-        "Xamarin.Legacy.Sdk": "0.1.2-alpha6",
         "MSBuild.Sdk.Extras": "3.0.22",
         "AggregatePackage.NuGet.Sdk" : "0.1.12"
     }
diff --git a/native/Avalonia.Native/inc/rendertarget.h b/native/Avalonia.Native/inc/rendertarget.h
index 2b0338d099..a59915777f 100644
--- a/native/Avalonia.Native/inc/rendertarget.h
+++ b/native/Avalonia.Native/inc/rendertarget.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#include "com.h"
+#include "comimpl.h"
+#include "avalonia-native.h"
 
 @protocol IRenderTarget
 -(void) setNewLayer: (CALayer*) layer;
diff --git a/native/Avalonia.Native/src/OSX/AutoFitContentView.h b/native/Avalonia.Native/src/OSX/AutoFitContentView.h
new file mode 100644
index 0000000000..7f1f764141
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AutoFitContentView.h
@@ -0,0 +1,17 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#pragma once
+
+#import <Foundation/Foundation.h>
+#include "avalonia-native.h"
+
+@interface AutoFitContentView : NSView
+-(AutoFitContentView* _Nonnull) initWithContent: (NSView* _Nonnull) content;
+-(void) ShowTitleBar: (bool) show;
+-(void) SetTitleBarHeightHint: (double) height;
+
+-(void) ShowBlur: (bool) show;
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/AutoFitContentView.mm b/native/Avalonia.Native/src/OSX/AutoFitContentView.mm
new file mode 100644
index 0000000000..0fa4540726
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AutoFitContentView.mm
@@ -0,0 +1,106 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#include "AvnView.h"
+#include "AutoFitContentView.h"
+#include "WindowInterfaces.h"
+#include "WindowProtocol.h"
+
+@implementation AutoFitContentView
+{
+    NSVisualEffectView* _titleBarMaterial;
+    NSBox* _titleBarUnderline;
+    NSView* _content;
+    NSVisualEffectView* _blurBehind;
+    double _titleBarHeightHint;
+    bool _settingSize;
+}
+
+-(AutoFitContentView* _Nonnull) initWithContent:(NSView *)content
+{
+    _titleBarHeightHint = -1;
+    _content = content;
+    _settingSize = false;
+
+    [self setAutoresizesSubviews:true];
+    [self setWantsLayer:true];
+
+    _titleBarMaterial = [NSVisualEffectView new];
+    [_titleBarMaterial setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
+    [_titleBarMaterial setMaterial:NSVisualEffectMaterialTitlebar];
+    [_titleBarMaterial setWantsLayer:true];
+    _titleBarMaterial.hidden = true;
+
+    _titleBarUnderline = [NSBox new];
+    _titleBarUnderline.boxType = NSBoxSeparator;
+    _titleBarUnderline.fillColor = [NSColor underPageBackgroundColor];
+    _titleBarUnderline.hidden = true;
+
+    [self addSubview:_titleBarMaterial];
+    [self addSubview:_titleBarUnderline];
+
+    _blurBehind = [NSVisualEffectView new];
+    [_blurBehind setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
+    [_blurBehind setMaterial:NSVisualEffectMaterialLight];
+    [_blurBehind setWantsLayer:true];
+    _blurBehind.hidden = true;
+
+    [_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+
+    [self addSubview:_blurBehind];
+    [self addSubview:_content];
+
+    [self setWantsLayer:true];
+    return self;
+}
+
+-(void) ShowBlur:(bool)show
+{
+    _blurBehind.hidden = !show;
+}
+
+-(void) ShowTitleBar: (bool) show
+{
+    _titleBarMaterial.hidden = !show;
+    _titleBarUnderline.hidden = !show;
+}
+
+-(void) SetTitleBarHeightHint: (double) height
+{
+    _titleBarHeightHint = height;
+
+    [self setFrameSize:self.frame.size];
+}
+
+-(void)setFrameSize:(NSSize)newSize
+{
+    if(_settingSize)
+    {
+        return;
+    }
+
+    _settingSize = true;
+    [super setFrameSize:newSize];
+
+    auto window = (id <AvnWindowProtocol>) [self window];
+
+    // TODO get actual titlebar size
+
+    double height = _titleBarHeightHint == -1 ? [window getExtendedTitleBarHeight] : _titleBarHeightHint;
+
+    NSRect tbar;
+    tbar.origin.x = 0;
+    tbar.origin.y = newSize.height - height;
+    tbar.size.width = newSize.width;
+    tbar.size.height = height;
+
+    [_titleBarMaterial setFrame:tbar];
+    tbar.size.height = height < 1 ? 0 : 1;
+    [_titleBarUnderline setFrame:tbar];
+
+    _settingSize = false;
+}
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
index 85fcf20034..ace4a71a56 100644
--- a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
@@ -7,6 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		18391068E48EF96E3DB5FDAB /* ResizeScope.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391E45702740FE9DD69695 /* ResizeScope.mm */; };
+		1839125F057B0A4EB1760058 /* WindowImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 183919BF108EB72A029F7671 /* WindowImpl.mm */; };
+		183914E50CF6D2EFC1667F7C /* WindowInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391DB45C7D892E61BF388C /* WindowInterfaces.h */; };
+		1839151F32D1BB1AB51A7BB6 /* AvnPanelWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391884C7476DA4E53A492D /* AvnPanelWindow.mm */; };
+		183916173528EC2737DBE5E1 /* WindowBaseImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 183915BFF0E234CD3604A7CD /* WindowBaseImpl.h */; };
+		1839171DCC651B0638603AC4 /* INSWindowHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391BBB7782C296D424071F /* INSWindowHolder.h */; };
+		1839179A55FC1421BEE83330 /* WindowBaseImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391676ECF0E983F4964357 /* WindowBaseImpl.mm */; };
+		183919D91DB9AAB5D700C2EA /* WindowImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391CD090AA776E7E841AC9 /* WindowImpl.h */; };
+		18391AA7E0BBA74D184C5734 /* AutoFitContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1839166350F32661F3ABD70F /* AutoFitContentView.mm */; };
+		18391AC16726CBC45856233B /* AvnWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1839155B28B20FFB672D29C6 /* AvnWindow.mm */; };
+		18391AC65ADD7DDD33FBE737 /* PopupImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 183910513F396141938832B5 /* PopupImpl.h */; };
+		18391C28BF1823B5464FDD36 /* ResizeScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 1839171D898F9BFC1373631A /* ResizeScope.h */; };
+		18391CF07316F819E76B617C /* IWindowStateChanged.h in Headers */ = {isa = PBXBuildFile; fileRef = 183913C6BFD6856BD42D19FD /* IWindowStateChanged.h */; };
+		18391D4EB311BC7EF8B8C0A6 /* AvnView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1839132D0E2454D911F1D1F9 /* AvnView.mm */; };
+		18391D8CD1756DC858DC1A09 /* PopupImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391BB698579F40F1783F31 /* PopupImpl.mm */; };
+		18391E1381E2D5BFD60265A9 /* AutoFitContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391654EF0E7AB3D3AB4071 /* AutoFitContentView.h */; };
+		18391ED5F611FF62C45F196D /* AvnView.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391D1669284AD2EC9E866A /* AvnView.h */; };
+		18391F1E2411C79405A9943A /* WindowProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 1839122E037567BDD1D09DEB /* WindowProtocol.h */; };
 		1A002B9E232135EE00021753 /* app.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002B9D232135EE00021753 /* app.mm */; };
 		1A1852DC23E05814008F0DED /* deadlock.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1852DB23E05814008F0DED /* deadlock.mm */; };
 		1A3E5EA823E9E83B00EDE661 /* rendertarget.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3E5EA723E9E83B00EDE661 /* rendertarget.mm */; };
@@ -28,11 +46,31 @@
 		AB00E4F72147CA920032A60A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB00E4F62147CA920032A60A /* main.mm */; };
 		AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB1E522B217613570091CD71 /* OpenGL.framework */; };
 		AB661C1E2148230F00291242 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB661C1D2148230F00291242 /* AppKit.framework */; };
-		AB661C202148286E00291242 /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB661C1F2148286E00291242 /* window.mm */; };
 		AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */; };
+		BC11A5BE2608D58F0017BAD0 /* automation.h in Headers */ = {isa = PBXBuildFile; fileRef = BC11A5BC2608D58F0017BAD0 /* automation.h */; };
+		BC11A5BF2608D58F0017BAD0 /* automation.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC11A5BD2608D58F0017BAD0 /* automation.mm */; };
+		ED3791C42862E1F40080BD62 /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		183910513F396141938832B5 /* PopupImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupImpl.h; sourceTree = "<group>"; };
+		1839122E037567BDD1D09DEB /* WindowProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowProtocol.h; sourceTree = "<group>"; };
+		1839132D0E2454D911F1D1F9 /* AvnView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnView.mm; sourceTree = "<group>"; };
+		183913C6BFD6856BD42D19FD /* IWindowStateChanged.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IWindowStateChanged.h; sourceTree = "<group>"; };
+		1839155B28B20FFB672D29C6 /* AvnWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnWindow.mm; sourceTree = "<group>"; };
+		183915BFF0E234CD3604A7CD /* WindowBaseImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowBaseImpl.h; sourceTree = "<group>"; };
+		18391654EF0E7AB3D3AB4071 /* AutoFitContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoFitContentView.h; sourceTree = "<group>"; };
+		1839166350F32661F3ABD70F /* AutoFitContentView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoFitContentView.mm; sourceTree = "<group>"; };
+		18391676ECF0E983F4964357 /* WindowBaseImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WindowBaseImpl.mm; sourceTree = "<group>"; };
+		1839171D898F9BFC1373631A /* ResizeScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResizeScope.h; sourceTree = "<group>"; };
+		18391884C7476DA4E53A492D /* AvnPanelWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnPanelWindow.mm; sourceTree = "<group>"; };
+		183919BF108EB72A029F7671 /* WindowImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WindowImpl.mm; sourceTree = "<group>"; };
+		18391BB698579F40F1783F31 /* PopupImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopupImpl.mm; sourceTree = "<group>"; };
+		18391BBB7782C296D424071F /* INSWindowHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = INSWindowHolder.h; sourceTree = "<group>"; };
+		18391CD090AA776E7E841AC9 /* WindowImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowImpl.h; sourceTree = "<group>"; };
+		18391D1669284AD2EC9E866A /* AvnView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AvnView.h; sourceTree = "<group>"; };
+		18391DB45C7D892E61BF388C /* WindowInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowInterfaces.h; sourceTree = "<group>"; };
+		18391E45702740FE9DD69695 /* ResizeScope.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResizeScope.mm; sourceTree = "<group>"; };
 		1A002B9D232135EE00021753 /* app.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = app.mm; sourceTree = "<group>"; };
 		1A1852DB23E05814008F0DED /* deadlock.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = deadlock.mm; sourceTree = "<group>"; };
 		1A3E5EA723E9E83B00EDE661 /* rendertarget.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = rendertarget.mm; sourceTree = "<group>"; };
@@ -46,7 +84,6 @@
 		37A4E71A2178846A00EACBCD /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../../inc; sourceTree = "<group>"; };
 		37A517B22159597E00FBA241 /* Screens.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Screens.mm; sourceTree = "<group>"; };
 		37C09D8721580FE4006A6758 /* SystemDialogs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemDialogs.mm; sourceTree = "<group>"; };
-		37C09D8A21581EF2006A6758 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
 		37DDA9AF219330F8002E132B /* AvnString.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnString.mm; sourceTree = "<group>"; };
 		37DDA9B121933371002E132B /* AvnString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AvnString.h; sourceTree = "<group>"; };
 		37E2330E21583241000CB7E2 /* KeyTransform.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyTransform.mm; sourceTree = "<group>"; };
@@ -60,10 +97,12 @@
 		AB00E4F62147CA920032A60A /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		AB1E522B217613570091CD71 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		AB661C1D2148230F00291242 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
-		AB661C1F2148286E00291242 /* window.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = window.mm; sourceTree = "<group>"; };
 		AB661C212148288600291242 /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
 		AB7A61EF2147C815003C5833 /* libAvalonia.Native.OSX.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libAvalonia.Native.OSX.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platformthreading.mm; sourceTree = "<group>"; };
+		BC11A5BC2608D58F0017BAD0 /* automation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = automation.h; sourceTree = "<group>"; };
+		BC11A5BD2608D58F0017BAD0 /* automation.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = automation.mm; sourceTree = "<group>"; };
+		ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -71,6 +110,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED3791C42862E1F40080BD62 /* UniformTypeIdentifiers.framework in Frameworks */,
 				1A3E5EB023E9FE8300EDE661 /* QuartzCore.framework in Frameworks */,
 				1A3E5EAA23E9F26C00EDE661 /* IOSurface.framework in Frameworks */,
 				AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */,
@@ -85,6 +125,7 @@
 		AB661C1C2148230E00291242 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */,
 				522D5958258159C1006F7F7A /* Carbon.framework */,
 				1A3E5EAF23E9FE8300EDE661 /* QuartzCore.framework */,
 				1A3E5EA923E9F26C00EDE661 /* IOSurface.framework */,
@@ -97,6 +138,8 @@
 		AB7A61E62147C814003C5833 = {
 			isa = PBXGroup;
 			children = (
+				BC11A5BC2608D58F0017BAD0 /* automation.h */,
+				BC11A5BD2608D58F0017BAD0 /* automation.mm */,
 				1A1852DB23E05814008F0DED /* deadlock.mm */,
 				1A002B9D232135EE00021753 /* app.mm */,
 				37DDA9B121933371002E132B /* AvnString.h */,
@@ -112,8 +155,6 @@
 				AB661C212148288600291242 /* common.h */,
 				379860FE214DA0C000CD0246 /* KeyTransform.h */,
 				37E2330E21583241000CB7E2 /* KeyTransform.mm */,
-				AB661C1F2148286E00291242 /* window.mm */,
-				37C09D8A21581EF2006A6758 /* window.h */,
 				AB00E4F62147CA920032A60A /* main.mm */,
 				37155CE3233C00EB0034DCE9 /* menu.h */,
 				520624B222973F4100C4DCEF /* menu.mm */,
@@ -124,6 +165,24 @@
 				37C09D8721580FE4006A6758 /* SystemDialogs.mm */,
 				AB7A61F02147C815003C5833 /* Products */,
 				AB661C1C2148230E00291242 /* Frameworks */,
+				18391676ECF0E983F4964357 /* WindowBaseImpl.mm */,
+				183915BFF0E234CD3604A7CD /* WindowBaseImpl.h */,
+				18391BBB7782C296D424071F /* INSWindowHolder.h */,
+				183919BF108EB72A029F7671 /* WindowImpl.mm */,
+				18391CD090AA776E7E841AC9 /* WindowImpl.h */,
+				183913C6BFD6856BD42D19FD /* IWindowStateChanged.h */,
+				18391E45702740FE9DD69695 /* ResizeScope.mm */,
+				1839171D898F9BFC1373631A /* ResizeScope.h */,
+				1839132D0E2454D911F1D1F9 /* AvnView.mm */,
+				18391D1669284AD2EC9E866A /* AvnView.h */,
+				1839166350F32661F3ABD70F /* AutoFitContentView.mm */,
+				18391654EF0E7AB3D3AB4071 /* AutoFitContentView.h */,
+				18391884C7476DA4E53A492D /* AvnPanelWindow.mm */,
+				1839122E037567BDD1D09DEB /* WindowProtocol.h */,
+				1839155B28B20FFB672D29C6 /* AvnWindow.mm */,
+				18391DB45C7D892E61BF388C /* WindowInterfaces.h */,
+				18391BB698579F40F1783F31 /* PopupImpl.mm */,
+				183910513F396141938832B5 /* PopupImpl.h */,
 			);
 			sourceTree = "<group>";
 		};
@@ -143,6 +202,17 @@
 			buildActionMask = 2147483647;
 			files = (
 				37155CE4233C00EB0034DCE9 /* menu.h in Headers */,
+				BC11A5BE2608D58F0017BAD0 /* automation.h in Headers */,
+				183916173528EC2737DBE5E1 /* WindowBaseImpl.h in Headers */,
+				1839171DCC651B0638603AC4 /* INSWindowHolder.h in Headers */,
+				183919D91DB9AAB5D700C2EA /* WindowImpl.h in Headers */,
+				18391CF07316F819E76B617C /* IWindowStateChanged.h in Headers */,
+				18391C28BF1823B5464FDD36 /* ResizeScope.h in Headers */,
+				18391ED5F611FF62C45F196D /* AvnView.h in Headers */,
+				18391E1381E2D5BFD60265A9 /* AutoFitContentView.h in Headers */,
+				18391F1E2411C79405A9943A /* WindowProtocol.h in Headers */,
+				183914E50CF6D2EFC1667F7C /* WindowInterfaces.h in Headers */,
+				18391AC65ADD7DDD33FBE737 /* PopupImpl.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -213,6 +283,7 @@
 				AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */,
 				1A3E5EA823E9E83B00EDE661 /* rendertarget.mm in Sources */,
 				1A3E5EAE23E9FB1300EDE661 /* cgl.mm in Sources */,
+				BC11A5BF2608D58F0017BAD0 /* automation.mm in Sources */,
 				37E2330F21583241000CB7E2 /* KeyTransform.mm in Sources */,
 				520624B322973F4100C4DCEF /* menu.mm in Sources */,
 				37A517B32159597E00FBA241 /* Screens.mm in Sources */,
@@ -220,7 +291,14 @@
 				1A465D10246AB61600C5858B /* dnd.mm in Sources */,
 				AB00E4F72147CA920032A60A /* main.mm in Sources */,
 				37C09D8821580FE4006A6758 /* SystemDialogs.mm in Sources */,
-				AB661C202148286E00291242 /* window.mm in Sources */,
+				1839179A55FC1421BEE83330 /* WindowBaseImpl.mm in Sources */,
+				1839125F057B0A4EB1760058 /* WindowImpl.mm in Sources */,
+				18391068E48EF96E3DB5FDAB /* ResizeScope.mm in Sources */,
+				18391D4EB311BC7EF8B8C0A6 /* AvnView.mm in Sources */,
+				18391AA7E0BBA74D184C5734 /* AutoFitContentView.mm in Sources */,
+				1839151F32D1BB1AB51A7BB6 /* AvnPanelWindow.mm in Sources */,
+				18391AC16726CBC45856233B /* AvnWindow.mm in Sources */,
+				18391D8CD1756DC858DC1A09 /* PopupImpl.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
index 5d20a135b9..87a8312c38 100644
--- a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
@@ -56,10 +56,14 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "bin/Debug/netcoreapp3.1/ControlCatalog.NetCore.dll"
+            argument = "bin/Debug/net6.0/ControlCatalog.NetCore.dll"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/native/Avalonia.Native/src/OSX/AvnPanelWindow.mm b/native/Avalonia.Native/src/OSX/AvnPanelWindow.mm
new file mode 100644
index 0000000000..b49005de8a
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnPanelWindow.mm
@@ -0,0 +1,9 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#define IS_NSPANEL
+
+#include "AvnWindow.mm"
+
diff --git a/native/Avalonia.Native/src/OSX/AvnString.h b/native/Avalonia.Native/src/OSX/AvnString.h
index 3ce83d370a..3b750b11db 100644
--- a/native/Avalonia.Native/src/OSX/AvnString.h
+++ b/native/Avalonia.Native/src/OSX/AvnString.h
@@ -14,4 +14,5 @@ extern IAvnStringArray* CreateAvnStringArray(NSArray<NSString*>* array);
 extern IAvnStringArray* CreateAvnStringArray(NSArray<NSURL*>* array);
 extern IAvnStringArray* CreateAvnStringArray(NSString* string);
 extern IAvnString* CreateByteArray(void* data, int len);
+extern NSString* GetNSStringAndRelease(IAvnString* s);
 #endif /* AvnString_h */
diff --git a/native/Avalonia.Native/src/OSX/AvnString.mm b/native/Avalonia.Native/src/OSX/AvnString.mm
index cd0e2cdf94..5e50068c51 100644
--- a/native/Avalonia.Native/src/OSX/AvnString.mm
+++ b/native/Avalonia.Native/src/OSX/AvnString.mm
@@ -153,3 +153,19 @@ IAvnString* CreateByteArray(void* data, int len)
 {
     return new AvnStringImpl(data, len);
 }
+
+NSString* GetNSStringAndRelease(IAvnString* s)
+{
+    NSString* result = nil;
+    
+    if (s != nullptr)
+    {
+        char* p;
+        if (s->Pointer((void**)&p) == S_OK && p != nullptr)
+            result = [NSString stringWithUTF8String:p];
+        
+        s->Release();
+    }
+    
+    return result;
+}
diff --git a/native/Avalonia.Native/src/OSX/AvnView.h b/native/Avalonia.Native/src/OSX/AvnView.h
new file mode 100644
index 0000000000..86a68d34c5
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnView.h
@@ -0,0 +1,27 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+#pragma once
+#import <Foundation/Foundation.h>
+
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#include "common.h"
+#include "WindowImpl.h"
+#include "KeyTransform.h"
+
+@class AvnAccessibilityElement;
+
+@interface AvnView : NSView<NSTextInputClient, NSDraggingDestination>
+-(AvnView* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
+-(NSEvent* _Nonnull) lastMouseDownEvent;
+-(AvnPoint) translateLocalPoint:(AvnPoint)pt;
+-(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
+-(void) onClosed;
+
+-(AvnPlatformResizeReason) getResizeReason;
+-(void) setResizeReason:(AvnPlatformResizeReason)reason;
++ (AvnPoint)toAvnPoint:(CGPoint)p;
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
new file mode 100644
index 0000000000..4ae6ad5a00
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -0,0 +1,721 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "AvnView.h"
+#include "automation.h"
+#import "WindowInterfaces.h"
+
+@implementation AvnView
+{
+    ComPtr<WindowBaseImpl> _parent;
+    NSTrackingArea* _area;
+    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed;
+    AvnInputModifiers _modifierState;
+    NSEvent* _lastMouseDownEvent;
+    bool _lastKeyHandled;
+    AvnPixelSize _lastPixelSize;
+    NSObject<IRenderTarget>* _renderTarget;
+    AvnPlatformResizeReason _resizeReason;
+    AvnAccessibilityElement* _accessibilityChild;
+}
+
+- (void)onClosed
+{
+    @synchronized (self)
+    {
+        _parent = nullptr;
+    }
+}
+
+- (NSEvent*) lastMouseDownEvent
+{
+    return _lastMouseDownEvent;
+}
+
+- (void) updateRenderTarget
+{
+    [_renderTarget resize:_lastPixelSize withScale:static_cast<float>([[self window] backingScaleFactor])];
+    [self setNeedsDisplayInRect:[self frame]];
+}
+
+-(AvnView*)  initWithParent: (WindowBaseImpl*) parent
+{
+    self = [super init];
+    _renderTarget = parent->renderTarget;
+    [self setWantsLayer:YES];
+    [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize];
+
+    _parent = parent;
+    _area = nullptr;
+    _lastPixelSize.Height = 100;
+    _lastPixelSize.Width = 100;
+    [self registerForDraggedTypes: @[@"public.data", GetAvnCustomDataType()]];
+
+    _modifierState = AvnInputModifiersNone;
+    return self;
+}
+
+- (BOOL)isFlipped
+{
+    return YES;
+}
+
+- (BOOL)wantsUpdateLayer
+{
+    return YES;
+}
+
+- (void)setLayer:(CALayer *)layer
+{
+    [_renderTarget setNewLayer: layer];
+    [super setLayer: layer];
+}
+
+- (BOOL)isOpaque
+{
+    return YES;
+}
+
+- (BOOL)acceptsFirstResponder
+{
+    return true;
+}
+
+- (BOOL)acceptsFirstMouse:(NSEvent *)event
+{
+    return true;
+}
+
+- (BOOL)canBecomeKeyView
+{
+    return true;
+}
+
+-(void)setFrameSize:(NSSize)newSize
+{
+    [super setFrameSize:newSize];
+
+    if(_area != nullptr)
+    {
+        [self removeTrackingArea:_area];
+        _area = nullptr;
+    }
+
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
+    NSRect rect = NSZeroRect;
+    rect.size = newSize;
+
+    NSTrackingAreaOptions options = NSTrackingActiveAlways | NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingEnabledDuringMouseDrag;
+    _area = [[NSTrackingArea alloc] initWithRect:rect options:options owner:self userInfo:nullptr];
+    [self addTrackingArea:_area];
+
+    _parent->UpdateCursor();
+
+    auto fsize = [self convertSizeToBacking: [self frame].size];
+
+    if(_lastPixelSize.Width != (int)fsize.width || _lastPixelSize.Height != (int)fsize.height)
+    {
+        _lastPixelSize.Width = (int)fsize.width;
+        _lastPixelSize.Height = (int)fsize.height;
+        [self updateRenderTarget];
+
+        auto reason = [self inLiveResize] ? ResizeUser : _resizeReason;
+        
+        if(_parent->IsShown())
+        {
+            _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height}, reason);
+        }
+    }
+}
+
+- (void)updateLayer
+{
+    AvnInsidePotentialDeadlock deadlock;
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
+    _parent->BaseEvents->RunRenderPriorityJobs();
+
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
+    _parent->BaseEvents->Paint();
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    return;
+}
+
+-(void) setSwRenderedFrame: (AvnFramebuffer*) fb dispose: (IUnknown*) dispose
+{
+    @autoreleasepool {
+        [_renderTarget setSwFrame:fb];
+        dispose->Release();
+    }
+}
+
+- (AvnPoint) translateLocalPoint:(AvnPoint)pt
+{
+    pt.Y = [self bounds].size.height - pt.Y;
+    return pt;
+}
+
++ (AvnPoint)toAvnPoint:(CGPoint)p
+{
+    AvnPoint result;
+
+    result.X = p.x;
+    result.Y = p.y;
+
+    return result;
+}
+
+- (void) viewDidChangeBackingProperties
+{
+    auto fsize = [self convertSizeToBacking: [self frame].size];
+    _lastPixelSize.Width = (int)fsize.width;
+    _lastPixelSize.Height = (int)fsize.height;
+    [self updateRenderTarget];
+
+    if(_parent != nullptr)
+    {
+        _parent->BaseEvents->ScalingChanged([_parent->Window backingScaleFactor]);
+    }
+
+    [super viewDidChangeBackingProperties];
+}
+
+- (bool) ignoreUserInput:(bool)trigerInputWhenDisabled
+{
+    if(_parent == nullptr)
+    {
+        return TRUE;
+    }
+
+    auto parentWindow = _parent->GetWindowProtocol();
+
+    if(parentWindow == nil || ![parentWindow shouldTryToHandleEvents])
+    {
+        if(trigerInputWhenDisabled)
+        {
+            auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
+
+            if(window != nullptr)
+            {
+                window->WindowEvents->GotInputWhenDisabled();
+            }
+        }
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+- (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
+{
+    bool triggerInputWhenDisabled = type != Move && type != LeaveWindow;
+
+    if([self ignoreUserInput: triggerInputWhenDisabled])
+    {
+        return;
+    }
+
+    auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
+    auto avnPoint = [AvnView toAvnPoint:localPoint];
+    auto point = [self translateLocalPoint:avnPoint];
+    AvnVector delta = { 0, 0};
+
+    if(type == Wheel)
+    {
+        auto speed = 5;
+
+        if([event hasPreciseScrollingDeltas])
+        {
+            speed = 50;
+        }
+
+        delta.X = [event scrollingDeltaX] / speed;
+        delta.Y = [event scrollingDeltaY] / speed;
+
+        if(delta.X == 0 && delta.Y == 0)
+        {
+            return;
+        }
+    }
+    else if (type == Magnify)
+    {
+        delta.X = delta.Y = [event magnification];
+    }
+    else if (type == Rotate)
+    {
+        delta.X = delta.Y = [event rotation];
+    }
+    else if (type == Swipe)
+    {
+        delta.X = [event deltaX];
+        delta.Y = [event deltaY];
+    }
+
+    uint32 timestamp = static_cast<uint32>([event timestamp] * 1000);
+    auto modifiers = [self getModifiers:[event modifierFlags]];
+
+    if(type != Move ||
+            (
+                    [self window] != nil &&
+                            (
+                                    [[self window] firstResponder] == nil
+                                            || ![[[self window] firstResponder] isKindOfClass: [NSView class]]
+                            )
+            )
+            )
+        [self becomeFirstResponder];
+
+    if(_parent != nullptr)
+    {
+        _parent->BaseEvents->RawMouseEvent(type, timestamp, modifiers, point, delta);
+    }
+
+    [super mouseMoved:event];
+}
+
+- (BOOL) resignFirstResponder
+{
+    _parent->BaseEvents->LostFocus();
+    return YES;
+}
+
+- (void)mouseMoved:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+}
+
+- (void)mouseDown:(NSEvent *)event
+{
+    _isLeftPressed = true;
+    _lastMouseDownEvent = event;
+    [self mouseEvent:event withType:LeftButtonDown];
+}
+
+- (void)otherMouseDown:(NSEvent *)event
+{
+    _lastMouseDownEvent = event;
+
+    switch(event.buttonNumber)
+    {
+        case 2:
+        case 3:
+            _isMiddlePressed = true;
+            [self mouseEvent:event withType:MiddleButtonDown];
+            break;
+        case 4:
+            _isXButton1Pressed = true;
+            [self mouseEvent:event withType:XButton1Down];
+            break;
+        case 5:
+            _isXButton2Pressed = true;
+            [self mouseEvent:event withType:XButton2Down];
+            break;
+
+        default:
+            break;
+    }
+}
+
+- (void)rightMouseDown:(NSEvent *)event
+{
+    _isRightPressed = true;
+    _lastMouseDownEvent = event;
+    [self mouseEvent:event withType:RightButtonDown];
+}
+
+- (void)mouseUp:(NSEvent *)event
+{
+    _isLeftPressed = false;
+    [self mouseEvent:event withType:LeftButtonUp];
+}
+
+- (void)otherMouseUp:(NSEvent *)event
+{
+    switch(event.buttonNumber)
+    {
+        case 2:
+        case 3:
+            _isMiddlePressed = false;
+            [self mouseEvent:event withType:MiddleButtonUp];
+            break;
+        case 4:
+            _isXButton1Pressed = false;
+            [self mouseEvent:event withType:XButton1Up];
+            break;
+        case 5:
+            _isXButton2Pressed = false;
+            [self mouseEvent:event withType:XButton2Up];
+            break;
+
+        default:
+            break;
+    }
+}
+
+- (void)rightMouseUp:(NSEvent *)event
+{
+    _isRightPressed = false;
+    [self mouseEvent:event withType:RightButtonUp];
+}
+
+- (void)mouseDragged:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+    [super mouseDragged:event];
+}
+
+- (void)otherMouseDragged:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+    [super otherMouseDragged:event];
+}
+
+- (void)rightMouseDragged:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+    [super rightMouseDragged:event];
+}
+
+- (void)scrollWheel:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Wheel];
+    [super scrollWheel:event];
+}
+
+- (void)magnifyWithEvent:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Magnify];
+    [super magnifyWithEvent:event];
+}
+
+- (void)rotateWithEvent:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Rotate];
+    [super rotateWithEvent:event];
+}
+
+- (void)swipeWithEvent:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Swipe];
+    [super swipeWithEvent:event];
+}
+
+- (void)mouseEntered:(NSEvent *)event
+{
+    [super mouseEntered:event];
+}
+
+- (void)mouseExited:(NSEvent *)event
+{
+    [self mouseEvent:event withType:LeaveWindow];
+    [super mouseExited:event];
+}
+
+- (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
+{
+    if([self ignoreUserInput: false])
+    {
+        return;
+    }
+
+    auto key = s_KeyMap[[event keyCode]];
+
+    uint32_t timestamp = static_cast<uint32_t>([event timestamp] * 1000);
+    auto modifiers = [self getModifiers:[event modifierFlags]];
+
+    if(_parent != nullptr)
+    {
+        auto handled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key);
+        if (key != LeftCtrl && key != RightCtrl) {
+          _lastKeyHandled = handled;
+        } else {
+          _lastKeyHandled = false;
+        }
+    }
+}
+
+- (BOOL)performKeyEquivalent:(NSEvent *)event
+{
+    bool result = _lastKeyHandled;
+
+    _lastKeyHandled = false;
+
+    return result;
+}
+
+- (void)flagsChanged:(NSEvent *)event
+{
+    auto newModifierState = [self getModifiers:[event modifierFlags]];
+
+    bool isAltCurrentlyPressed = (_modifierState & Alt) == Alt;
+    bool isControlCurrentlyPressed = (_modifierState & Control) == Control;
+    bool isShiftCurrentlyPressed = (_modifierState & Shift) == Shift;
+    bool isCommandCurrentlyPressed = (_modifierState & Windows) == Windows;
+
+    bool isAltPressed = (newModifierState & Alt) == Alt;
+    bool isControlPressed = (newModifierState & Control) == Control;
+    bool isShiftPressed = (newModifierState & Shift) == Shift;
+    bool isCommandPressed = (newModifierState & Windows) == Windows;
+
+
+    if (isAltPressed && !isAltCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if (isAltCurrentlyPressed && !isAltPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    if (isControlPressed && !isControlCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if (isControlCurrentlyPressed && !isControlPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    if (isShiftPressed && !isShiftCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if(isShiftCurrentlyPressed && !isShiftPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    if(isCommandPressed && !isCommandCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if(isCommandCurrentlyPressed && ! isCommandPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    _modifierState = newModifierState;
+
+    [[self inputContext] handleEvent:event];
+    [super flagsChanged:event];
+}
+
+- (void)keyDown:(NSEvent *)event
+{
+    [self keyboardEvent:event withType:KeyDown];
+    [[self inputContext] handleEvent:event];
+    [super keyDown:event];
+}
+
+- (void)keyUp:(NSEvent *)event
+{
+    [self keyboardEvent:event withType:KeyUp];
+    [super keyUp:event];
+}
+
+- (AvnInputModifiers)getModifiers:(NSEventModifierFlags)mod
+{
+    unsigned int rv = 0;
+
+    if (mod & NSEventModifierFlagControl)
+        rv |= Control;
+    if (mod & NSEventModifierFlagShift)
+        rv |= Shift;
+    if (mod & NSEventModifierFlagOption)
+        rv |= Alt;
+    if (mod & NSEventModifierFlagCommand)
+        rv |= Windows;
+
+    if (_isLeftPressed)
+        rv |= LeftMouseButton;
+    if (_isMiddlePressed)
+        rv |= MiddleMouseButton;
+    if (_isRightPressed)
+        rv |= RightMouseButton;
+    if (_isXButton1Pressed)
+        rv |= XButton1MouseButton;
+    if (_isXButton2Pressed)
+        rv |= XButton2MouseButton;
+
+    return (AvnInputModifiers)rv;
+}
+
+- (BOOL)hasMarkedText
+{
+    return _lastKeyHandled;
+}
+
+- (NSRange)markedRange
+{
+    return NSMakeRange(NSNotFound, 0);
+}
+
+- (NSRange)selectedRange
+{
+    return NSMakeRange(NSNotFound, 0);
+}
+
+- (void)setMarkedText:(id)string selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
+{
+
+}
+
+- (void)unmarkText
+{
+
+}
+
+- (NSArray<NSString *> *)validAttributesForMarkedText
+{
+    return [NSArray new];
+}
+
+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)range actualRange:(NSRangePointer)actualRange
+{
+    return [NSAttributedString new];
+}
+
+- (void)insertText:(id)string replacementRange:(NSRange)replacementRange
+{
+    if(!_lastKeyHandled)
+    {
+        if(_parent != nullptr)
+        {
+            _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]);
+        }
+    }
+}
+
+- (NSUInteger)characterIndexForPoint:(NSPoint)point
+{
+    return 0;
+}
+
+- (NSRect)firstRectForCharacterRange:(NSRange)range actualRange:(NSRangePointer)actualRange
+{
+    CGRect result = { 0 };
+
+    return result;
+}
+
+- (NSDragOperation)triggerAvnDragEvent: (AvnDragEventType) type info: (id <NSDraggingInfo>)info
+{
+    auto localPoint = [self convertPoint:[info draggingLocation] toView:self];
+    auto avnPoint = [AvnView toAvnPoint:localPoint];
+    auto point = [self translateLocalPoint:avnPoint];
+    auto modifiers = [self getModifiers:[[NSApp currentEvent] modifierFlags]];
+    NSDragOperation nsop = [info draggingSourceOperationMask];
+
+    auto effects = ConvertDragDropEffects(nsop);
+    int reffects = (int)_parent->BaseEvents
+            ->DragEvent(type, point, modifiers, effects,
+                    CreateClipboard([info draggingPasteboard], nil),
+                    GetAvnDataObjectHandleFromDraggingInfo(info));
+
+    NSDragOperation ret = static_cast<NSDragOperation>(0);
+
+    // Ensure that the managed part didn't add any new effects
+    reffects = (int)effects & reffects;
+
+    // OSX requires exactly one operation
+    if((reffects & (int)AvnDragDropEffects::Copy) != 0)
+        ret = NSDragOperationCopy;
+    else if((reffects & (int)AvnDragDropEffects::Move) != 0)
+        ret = NSDragOperationMove;
+    else if((reffects & (int)AvnDragDropEffects::Link) != 0)
+        ret = NSDragOperationLink;
+    if(ret == 0)
+        ret = NSDragOperationNone;
+    return ret;
+}
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Enter info:sender];
+}
+
+- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender];
+}
+
+- (void)draggingExited:(id <NSDraggingInfo>)sender
+{
+    [self triggerAvnDragEvent: AvnDragEventType::Leave info:sender];
+}
+
+- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender] != NSDragOperationNone;
+}
+
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Drop info:sender] != NSDragOperationNone;
+}
+
+- (void)concludeDragOperation:(nullable id <NSDraggingInfo>)sender
+{
+
+}
+
+- (AvnPlatformResizeReason)getResizeReason
+{
+    return _resizeReason;
+}
+
+- (void)setResizeReason:(AvnPlatformResizeReason)reason
+{
+    _resizeReason = reason;
+}
+
+- (AvnAccessibilityElement *) accessibilityChild
+{
+    if (_accessibilityChild == nil)
+    {
+        auto peer = _parent->BaseEvents->GetAutomationPeer();
+
+        if (peer == nil)
+            return nil;
+
+        _accessibilityChild = [AvnAccessibilityElement acquire:peer];
+    }
+
+    return _accessibilityChild;
+}
+
+- (NSArray *)accessibilityChildren
+{
+    auto child = [self accessibilityChild];
+    return NSAccessibilityUnignoredChildrenForOnlyChild(child);
+}
+
+- (id)accessibilityHitTest:(NSPoint)point
+{
+    return [[self accessibilityChild] accessibilityHitTest:point];
+}
+
+- (id)accessibilityFocusedUIElement
+{
+    return [[self accessibilityChild] accessibilityFocusedUIElement];
+}
+
+@end
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
new file mode 100644
index 0000000000..4c7341f834
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -0,0 +1,484 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+
+#import <AppKit/AppKit.h>
+#import "WindowProtocol.h"
+#import "WindowBaseImpl.h"
+
+#ifdef IS_NSPANEL
+#define BASE_CLASS NSPanel
+#define CLASS_NAME AvnPanel
+#else
+#define BASE_CLASS NSWindow
+#define CLASS_NAME AvnWindow
+#endif
+
+#import <AppKit/AppKit.h>
+#include "common.h"
+#include "menu.h"
+#include "automation.h"
+#include "WindowBaseImpl.h"
+#include "WindowImpl.h"
+#include "AvnView.h"
+#include "WindowInterfaces.h"
+#include "PopupImpl.h"
+
+@implementation CLASS_NAME
+{
+    ComPtr<WindowBaseImpl> _parent;
+    bool _closed;
+    bool _isEnabled;
+    bool _canBecomeKeyWindow;
+    bool _isExtended;
+    bool _isTransitioningToFullScreen;
+    AvnMenu* _menu;
+}
+
+-(void) setIsExtended:(bool)value;
+{
+    _isExtended = value;
+}
+
+-(bool) isDialog
+{
+    return _parent->IsDialog();
+}
+
+-(double) getExtendedTitleBarHeight
+{
+    if(_isExtended)
+    {
+        for (id subview in self.contentView.superview.subviews)
+        {
+            if ([subview isKindOfClass:NSClassFromString(@"NSTitlebarContainerView")])
+            {
+                NSView *titlebarView = [subview subviews][0];
+
+                return (double)titlebarView.frame.size.height;
+            }
+        }
+
+        return -1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+- (void)performClose:(id _Nullable )sender
+{
+    if([[self delegate] respondsToSelector:@selector(windowShouldClose:)])
+    {
+        if(![[self delegate] windowShouldClose:self]) return;
+    }
+    else if([self respondsToSelector:@selector(windowShouldClose:)])
+    {
+        if(![self windowShouldClose:self]) return;
+    }
+
+    [self close];
+}
+
+- (void)pollModalSession:(nonnull NSModalSession)session
+{
+    auto response = [NSApp runModalSession:session];
+
+    if(response == NSModalResponseContinue)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self pollModalSession:session];
+        });
+    }
+    else if (!_closed)
+    {
+        [self orderOut:self];
+        [NSApp endModalSession:session];
+    }
+}
+
+-(void) showWindowMenuWithAppMenu
+{
+    if(_menu != nullptr)
+    {
+        auto appMenuItem = ::GetAppMenuItem();
+
+        if(appMenuItem != nullptr)
+        {
+            auto appMenu = [appMenuItem menu];
+
+            [appMenu removeItem:appMenuItem];
+
+            [_menu insertItem:appMenuItem atIndex:0];
+
+            [_menu setHasGlobalMenuItem:true];
+        }
+
+        [NSApp setMenu:_menu];
+    }
+    else
+    {
+        [self showAppMenuOnly];
+    }
+}
+
+-(void) showAppMenuOnly
+{
+    auto appMenuItem = ::GetAppMenuItem();
+
+    if(appMenuItem != nullptr)
+    {
+        auto appMenu = ::GetAppMenu();
+
+        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
+
+        [[appMenuItem menu] removeItem:appMenuItem];
+
+        if(_menu != nullptr)
+        {
+            [_menu setHasGlobalMenuItem:false];
+        }
+
+        [nativeAppMenu->GetNative() addItem:appMenuItem];
+
+        [NSApp setMenu:nativeAppMenu->GetNative()];
+    }
+}
+
+-(void) applyMenu:(AvnMenu *_Nullable)menu
+{
+    if(menu == nullptr)
+    {
+        menu = [AvnMenu new];
+    }
+
+    _menu = menu;
+}
+
+-(CLASS_NAME*_Nonnull)  initWithParent: (WindowBaseImpl*_Nonnull) parent contentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)styleMask;
+{
+    // https://jameshfisher.com/2020/07/10/why-is-the-contentrect-of-my-nswindow-ignored/
+    // create nswindow with specific contentRect, otherwise we wont be able to resize the window
+    // until several ms after the window is physically on the screen.
+    self = [super initWithContentRect:contentRect styleMask: styleMask backing:NSBackingStoreBuffered defer:false];
+
+    [self setReleasedWhenClosed:false];
+    _parent = parent;
+    [self setDelegate:self];
+    _closed = false;
+    _isEnabled = true;
+
+    [self backingScaleFactor];
+    [self setOpaque:NO];
+    [self setBackgroundColor: [NSColor clearColor]];
+
+    _isExtended = false;
+    _isTransitioningToFullScreen = false;
+
+    if(self.isDialog)
+    {
+        [self setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces|NSWindowCollectionBehaviorFullScreenAuxiliary];
+    }
+
+    return self;
+}
+
+- (BOOL)windowShouldClose:(NSWindow *_Nonnull)sender
+{
+    auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
+
+    if(window != nullptr)
+    {
+        return !window->WindowEvents->Closing();
+    }
+
+    return true;
+}
+
+- (void)windowDidChangeBackingProperties:(NSNotification *_Nonnull)notification
+{
+    [self backingScaleFactor];
+}
+
+
+
+- (void)windowWillClose:(NSNotification *_Nonnull)notification
+{
+    _closed = true;
+    if(_parent)
+    {
+        ComPtr<WindowBaseImpl> parent = _parent;
+        _parent = NULL;
+        
+        auto window = dynamic_cast<WindowImpl*>(parent.getRaw());
+        
+        if(window != nullptr)
+        {
+            window->SetParent(nullptr);
+        }
+        
+        parent->BaseEvents->Closed();
+        [parent->View onClosed];
+    }
+}
+
+-(BOOL)canBecomeKeyWindow
+{
+    if(_canBecomeKeyWindow)
+    {
+        // If the window has a child window being shown as a dialog then don't allow it to become the key window.
+        auto parent = dynamic_cast<WindowImpl*>(_parent.getRaw());
+        
+        if(parent != nullptr)
+        {
+            return parent->CanBecomeKeyWindow();
+        }
+
+        return true;
+    }
+    
+    return false;
+}
+
+#ifndef IS_NSPANEL
+-(BOOL)canBecomeMainWindow
+{
+    return true;
+}
+#endif
+
+-(void)setCanBecomeKeyWindow:(bool)value
+{
+    _canBecomeKeyWindow = value;
+}
+
+-(bool)shouldTryToHandleEvents
+{
+    return _isEnabled;
+}
+
+-(void) setEnabled:(bool)enable
+{
+    _isEnabled = enable;
+    
+    [[self standardWindowButton:NSWindowCloseButton] setEnabled:enable];
+    [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:enable];
+    [[self standardWindowButton:NSWindowZoomButton] setEnabled:enable];
+}
+
+-(void)becomeKeyWindow
+{
+    [self showWindowMenuWithAppMenu];
+
+    if(_parent != nullptr)
+    {
+        _parent->BaseEvents->Activated();
+    }
+
+    [super becomeKeyWindow];
+}
+
+- (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
+{
+    _parent->BringToFront();
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        @try {
+        [self invalidateShadow];
+        }
+        @finally{
+        }
+    });
+}
+
+- (void)windowDidMiniaturize:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowDidResize:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->StartStateTransition();
+    }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->EndStateTransition();
+
+        if(parent->Decorations() != SystemDecorationsFull && parent->WindowState() == Maximized)
+        {
+            NSRect screenRect = [[self screen] visibleFrame];
+            [self setFrame:screenRect display:YES];
+        }
+
+        if(parent->WindowState() == Minimized)
+        {
+            [self miniaturize:nullptr];
+        }
+
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *_Nonnull)notification
+{
+    _isTransitioningToFullScreen = true;
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->StartStateTransition();
+    }
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *_Nonnull)notification
+{
+    _isTransitioningToFullScreen = false;
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->EndStateTransition();
+        parent->WindowStateChanged();
+    }
+}
+
+- (BOOL)windowShouldZoom:(NSWindow *_Nonnull)window toFrame:(NSRect)newFrame
+{
+    return true;
+}
+
+-(void)windowDidResignKey:(NSNotification *)notification
+{
+    if(_parent)
+        _parent->BaseEvents->Deactivated();
+
+    [self showAppMenuOnly];
+    
+    [self invalidateShadow];
+}
+
+- (void)windowDidMove:(NSNotification *_Nonnull)notification
+{
+    AvnPoint position;
+
+    if(_parent != nullptr)
+    {
+        auto cparent = dynamic_cast<WindowImpl*>(_parent.getRaw());
+
+        if(cparent != nullptr)
+        {
+            if(!cparent->IsShown())
+            {
+                return;
+            }
+
+            if(cparent->WindowState() == Maximized)
+            {
+                cparent->SetWindowState(Normal);
+            }
+        }
+
+        _parent->GetPosition(&position);
+        _parent->BaseEvents->PositionChanged(position);
+    }
+}
+
+- (AvnPoint) translateLocalPoint:(AvnPoint)pt
+{
+    pt.Y = [self frame].size.height - pt.Y;
+    return pt;
+}
+
+- (void)sendEvent:(NSEvent *_Nonnull)event
+{
+    [super sendEvent:event];
+
+    /// This is to detect non-client clicks. This can only be done on Windows... not popups, hence the dynamic_cast.
+    if(_parent != nullptr && dynamic_cast<WindowImpl*>(_parent.getRaw()) != nullptr)
+    {
+        switch(event.type)
+        {
+            case NSEventTypeLeftMouseDown:
+            {
+                AvnView* view = _parent->View;
+                NSPoint windowPoint = [event locationInWindow];
+                NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];
+
+                if (!NSPointInRect(viewPoint, view.bounds))
+                {
+                    auto avnPoint = [AvnView toAvnPoint:windowPoint];
+                    auto point = [self translateLocalPoint:avnPoint];
+                    AvnVector delta = { 0, 0 };
+
+                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
+                }
+                
+                if(!_isTransitioningToFullScreen)
+                {
+                    _parent->BringToFront();
+                }
+            }
+            break;
+
+            case NSEventTypeMouseEntered:
+            {
+                _parent->UpdateCursor();
+            }
+                break;
+
+            case NSEventTypeMouseExited:
+            {
+                [[NSCursor arrowCursor] set];
+            }
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+- (void)disconnectParent {
+    _parent = nullptr;
+}
+
+@end
+
diff --git a/native/Avalonia.Native/src/OSX/INSWindowHolder.h b/native/Avalonia.Native/src/OSX/INSWindowHolder.h
new file mode 100644
index 0000000000..3c5010966b
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/INSWindowHolder.h
@@ -0,0 +1,17 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H
+#define AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H
+
+@class AvnView;
+
+struct INSWindowHolder
+{
+    virtual NSWindow* _Nonnull GetNSWindow () = 0;
+    virtual AvnView* _Nonnull GetNSView () = 0;
+};
+
+#endif //AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H
diff --git a/native/Avalonia.Native/src/OSX/IWindowStateChanged.h b/native/Avalonia.Native/src/OSX/IWindowStateChanged.h
new file mode 100644
index 0000000000..f0905da3ac
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/IWindowStateChanged.h
@@ -0,0 +1,18 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_IWINDOWSTATECHANGED_H
+#define AVALONIA_NATIVE_OSX_IWINDOWSTATECHANGED_H
+
+struct IWindowStateChanged
+{
+    virtual void WindowStateChanged () = 0;
+    virtual void StartStateTransition () = 0;
+    virtual void EndStateTransition () = 0;
+    virtual SystemDecorations Decorations () = 0;
+    virtual AvnWindowState WindowState () = 0;
+};
+
+#endif //AVALONIA_NATIVE_OSX_IWINDOWSTATECHANGED_H
diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.h b/native/Avalonia.Native/src/OSX/PopupImpl.h
new file mode 100644
index 0000000000..451019a6a4
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.h
@@ -0,0 +1,9 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_POPUPIMPL_H
+#define AVALONIA_NATIVE_OSX_POPUPIMPL_H
+
+#endif //AVALONIA_NATIVE_OSX_POPUPIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.mm b/native/Avalonia.Native/src/OSX/PopupImpl.mm
new file mode 100644
index 0000000000..9820a9f052
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.mm
@@ -0,0 +1,57 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#include "WindowInterfaces.h"
+#include "AvnView.h"
+#include "WindowImpl.h"
+#include "automation.h"
+#include "menu.h"
+#include "common.h"
+#import "WindowBaseImpl.h"
+#import "WindowProtocol.h"
+#import <AppKit/AppKit.h>
+#include "PopupImpl.h"
+
+class PopupImpl : public virtual WindowBaseImpl, public IAvnPopup
+{
+private:
+    BEGIN_INTERFACE_MAP()
+    INHERIT_INTERFACE_MAP(WindowBaseImpl)
+    INTERFACE_MAP_ENTRY(IAvnPopup, IID_IAvnPopup)
+    END_INTERFACE_MAP()
+    virtual ~PopupImpl(){}
+    ComPtr<IAvnWindowEvents> WindowEvents;
+    PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
+    {
+        WindowEvents = events;
+        [Window setLevel:NSPopUpMenuWindowLevel];
+    }
+protected:
+    virtual NSWindowStyleMask GetStyle() override
+    {
+        return NSWindowStyleMaskBorderless;
+    }
+
+public:
+    virtual bool ShouldTakeFocusOnShow() override
+    {
+        return false;
+    }
+
+    virtual HRESULT Show(bool activate, bool isDialog) override
+    {
+        return WindowBaseImpl::Show(activate, true);
+    }
+};
+
+
+extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl)
+{
+    @autoreleasepool
+    {
+        IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events, gl));
+        return ptr;
+    }
+}
diff --git a/native/Avalonia.Native/src/OSX/ResizeScope.h b/native/Avalonia.Native/src/OSX/ResizeScope.h
new file mode 100644
index 0000000000..9a43c158fe
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/ResizeScope.h
@@ -0,0 +1,24 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_RESIZESCOPE_H
+#define AVALONIA_NATIVE_OSX_RESIZESCOPE_H
+
+#include "avalonia-native.h"
+
+@class AvnView;
+
+class ResizeScope
+{
+public:
+    ResizeScope(AvnView* _Nonnull view, AvnPlatformResizeReason reason);
+
+    ~ResizeScope();
+private:
+    AvnView* _Nonnull _view;
+    AvnPlatformResizeReason _restore;
+};
+
+#endif //AVALONIA_NATIVE_OSX_RESIZESCOPE_H
diff --git a/native/Avalonia.Native/src/OSX/ResizeScope.mm b/native/Avalonia.Native/src/OSX/ResizeScope.mm
new file mode 100644
index 0000000000..9f1177af8b
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/ResizeScope.mm
@@ -0,0 +1,18 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "ResizeScope.h"
+#include "AvnView.h"
+
+ResizeScope::ResizeScope(AvnView *view, AvnPlatformResizeReason reason) {
+    _view = view;
+    _restore = [view getResizeReason];
+    [view setResizeReason:reason];
+}
+
+ResizeScope::~ResizeScope() {
+    [_view setResizeReason:_restore];
+}
diff --git a/native/Avalonia.Native/src/OSX/Screens.mm b/native/Avalonia.Native/src/OSX/Screens.mm
index b9c75ed742..83ab1bfd01 100644
--- a/native/Avalonia.Native/src/OSX/Screens.mm
+++ b/native/Avalonia.Native/src/OSX/Screens.mm
@@ -41,9 +41,9 @@ public:
             ret->WorkingArea.X = [screen visibleFrame].origin.x;
             ret->WorkingArea.Y = ConvertPointY(ToAvnPoint([screen visibleFrame].origin)).Y - ret->WorkingArea.Height;
             
-            ret->PixelDensity = [screen backingScaleFactor];
+            ret->Scaling = [screen backingScaleFactor];
             
-            ret->Primary = index == 0;
+            ret->IsPrimary = index == 0;
             
             return S_OK;
         }
diff --git a/native/Avalonia.Native/src/OSX/SystemDialogs.mm b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
index a47221056b..e133a5d31f 100644
--- a/native/Avalonia.Native/src/OSX/SystemDialogs.mm
+++ b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
@@ -1,5 +1,6 @@
 #include "common.h"
-#include "window.h"
+#include "INSWindowHolder.h"
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 class SystemDialogs : public ComSingleObject<IAvnSystemDialogs, &IID_IAvnSystemDialogs>
 {
@@ -7,6 +8,7 @@ public:
     FORWARD_IUNKNOWN()
     virtual void SelectFolderDialog (IAvnWindow* parentWindowHandle,
                                      IAvnSystemDialogEvents* events,
+                                     bool allowMultiple,
                                      const char* title,
                                      const char* initialDirectory) override
     {
@@ -14,6 +16,7 @@ public:
         {
             auto panel = [NSOpenPanel openPanel];
             
+            panel.allowsMultipleSelection = allowMultiple;
             panel.canChooseDirectories = true;
             panel.canCreateDirectories = true;
             panel.canChooseFiles = false;
@@ -118,7 +121,15 @@ public:
                 {
                     auto allowedTypes = [filtersString componentsSeparatedByString:@";"];
                     
-                    panel.allowedFileTypes = allowedTypes;
+                    // Prefer allowedContentTypes if available
+                    if (@available(macOS 11.0, *))
+                    {
+                        panel.allowedContentTypes = ConvertToUTType(allowedTypes);
+                    }
+                    else
+                    {
+                        panel.allowedFileTypes = allowedTypes;
+                    }
                 }
             }
             
@@ -207,7 +218,18 @@ public:
                 {
                     auto allowedTypes = [filtersString componentsSeparatedByString:@";"];
                     
-                    panel.allowedFileTypes = allowedTypes;
+                    // Prefer allowedContentTypes if available
+                    if (@available(macOS 11.0, *))
+                    {
+                        panel.allowedContentTypes = ConvertToUTType(allowedTypes);
+                    }
+                    else
+                    {
+                        panel.allowedFileTypes = allowedTypes;
+                    }
+                    
+                    panel.allowsOtherFileTypes = false;
+                    panel.extensionHidden = false;
                 }
             }
             
@@ -250,6 +272,32 @@ public:
             }
         }
     }
+    
+private:
+    NSMutableArray* ConvertToUTType(NSArray<NSString*>* allowedTypes)
+    {
+        auto originalCount = [allowedTypes count];
+        auto mapped = [[NSMutableArray alloc] init];
+        
+        if (@available(macOS 11.0, *))
+        {
+            for (int i = 0; i < originalCount; i++)
+            {
+                auto utTypeStr = allowedTypes[i];
+                auto utType = [UTType typeWithIdentifier:utTypeStr];
+                if (utType == nil)
+                {
+                    utType = [UTType typeWithMIMEType:utTypeStr];
+                }
+                if (utType != nil)
+                {
+                    [mapped addObject:utType];
+                }
+            }
+        }
+
+        return mapped;
+    }
 
 };
 
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
new file mode 100644
index 0000000000..2baf3b09b5
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -0,0 +1,135 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
+#define AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
+
+#include "rendertarget.h"
+#include "INSWindowHolder.h"
+
+@class AutoFitContentView;
+@class AvnMenu;
+@protocol AvnWindowProtocol;
+
+class WindowBaseImpl : public virtual ComObject,
+                       public virtual IAvnWindowBase,
+                       public INSWindowHolder {
+
+public:
+    FORWARD_IUNKNOWN()
+
+BEGIN_INTERFACE_MAP()
+        INTERFACE_MAP_ENTRY(IAvnWindowBase, IID_IAvnWindowBase)
+    END_INTERFACE_MAP()
+
+    virtual ~WindowBaseImpl();
+
+    WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl, bool usePanel = false);
+
+    virtual HRESULT ObtainNSWindowHandle(void **ret) override;
+
+    virtual HRESULT ObtainNSWindowHandleRetained(void **ret) override;
+
+    virtual HRESULT ObtainNSViewHandle(void **ret) override;
+
+    virtual HRESULT ObtainNSViewHandleRetained(void **ret) override;
+
+    virtual NSWindow *GetNSWindow() override;
+
+    virtual AvnView *GetNSView() override;
+
+    virtual HRESULT Show(bool activate, bool isDialog) override;
+
+    virtual bool IsShown ();
+
+    virtual bool ShouldTakeFocusOnShow();
+
+    virtual HRESULT Hide() override;
+
+    virtual HRESULT Activate() override;
+
+    virtual HRESULT SetTopMost(bool value) override;
+
+    virtual HRESULT Close() override;
+
+    virtual HRESULT GetClientSize(AvnSize *ret) override;
+
+    virtual HRESULT GetFrameSize(AvnSize *ret) override;
+
+    virtual HRESULT GetScaling(double *ret) override;
+
+    virtual HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize) override;
+
+    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override;
+
+    virtual HRESULT Invalidate(__attribute__((unused)) AvnRect rect) override;
+
+    virtual HRESULT SetMainMenu(IAvnMenu *menu) override;
+
+    virtual HRESULT BeginMoveDrag() override;
+
+    virtual HRESULT BeginResizeDrag(__attribute__((unused)) AvnWindowEdge edge) override;
+
+    virtual HRESULT GetPosition(AvnPoint *ret) override;
+
+    virtual HRESULT SetPosition(AvnPoint point) override;
+
+    virtual HRESULT PointToClient(AvnPoint point, AvnPoint *ret) override;
+
+    virtual HRESULT PointToScreen(AvnPoint point, AvnPoint *ret) override;
+
+    virtual HRESULT ThreadSafeSetSwRenderedFrame(AvnFramebuffer *fb, IUnknown *dispose) override;
+
+    virtual HRESULT SetCursor(IAvnCursor *cursor) override;
+
+    virtual void UpdateCursor();
+
+    virtual HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget **ppv) override;
+
+    virtual HRESULT CreateNativeControlHost(IAvnNativeControlHost **retOut) override;
+
+    virtual HRESULT SetBlurEnabled(bool enable) override;
+
+    virtual HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
+            IAvnClipboard *clipboard, IAvnDndResultCallback *cb,
+            void *sourceHandle) override;
+
+    virtual bool IsDialog();
+
+    id<AvnWindowProtocol> GetWindowProtocol ();
+                           
+    virtual void BringToFront ();
+
+protected:
+    virtual NSWindowStyleMask GetStyle();
+
+    void UpdateStyle();
+
+private:
+    void CreateNSWindow (bool isDialog);
+    void CleanNSWindow ();
+
+    NSCursor *cursor;
+    ComPtr<IAvnGlContext> _glContext;
+    bool hasPosition;
+    NSSize lastSize;
+    NSSize lastMinSize;
+    NSSize lastMaxSize;
+    AvnMenu* lastMenu;
+    bool _inResize;
+
+protected:
+    AvnPoint lastPositionSet;
+    AutoFitContentView *StandardContainer;
+    bool _shown;
+
+public:
+    NSObject <IRenderTarget> *renderTarget;
+    NSWindow * Window;
+    ComPtr<IAvnWindowBaseEvents> BaseEvents;
+    AvnView *View;
+};
+
+#endif //AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
new file mode 100644
index 0000000000..77f53332cd
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -0,0 +1,603 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "common.h"
+#include "AvnView.h"
+#include "menu.h"
+#include "automation.h"
+#include "cursor.h"
+#include "ResizeScope.h"
+#include "AutoFitContentView.h"
+#import "WindowProtocol.h"
+#import "WindowInterfaces.h"
+#include "WindowBaseImpl.h"
+
+
+WindowBaseImpl::~WindowBaseImpl() {
+    View = nullptr;
+    Window = nullptr;
+}
+
+WindowBaseImpl::WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl, bool usePanel) {
+    _shown = false;
+    _inResize = false;
+    BaseEvents = events;
+    _glContext = gl;
+    renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext:gl];
+    View = [[AvnView alloc] initWithParent:this];
+    StandardContainer = [[AutoFitContentView new] initWithContent:View];
+
+    lastPositionSet = { 0, 0 };
+    hasPosition = false;
+    lastSize = NSSize { 100, 100 };
+    lastMaxSize = NSSize { CGFLOAT_MAX, CGFLOAT_MAX};
+    lastMinSize = NSSize { 0, 0 };
+
+    lastMenu = nullptr;
+    
+    CreateNSWindow(usePanel);
+    
+    [Window setContentView:StandardContainer];
+    [Window setStyleMask:NSWindowStyleMaskBorderless];
+    [Window setBackingType:NSBackingStoreBuffered];
+
+    [Window setContentMinSize:lastMinSize];
+    [Window setContentMaxSize:lastMaxSize];
+
+    [Window setOpaque:false];
+}
+
+HRESULT WindowBaseImpl::ObtainNSViewHandle(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge void *) View;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::ObtainNSViewHandleRetained(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge_retained void *) View;
+
+    return S_OK;
+}
+
+NSWindow *WindowBaseImpl::GetNSWindow() {
+    return Window;
+}
+
+AvnView *WindowBaseImpl::GetNSView() {
+    return View;
+}
+
+HRESULT WindowBaseImpl::ObtainNSWindowHandleRetained(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge_retained void *) Window;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::Show(bool activate, bool isDialog) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [Window setContentSize:lastSize];
+        
+        if(hasPosition)
+        {
+            SetPosition(lastPositionSet);
+        } else
+        {
+            [Window center];
+        }
+
+        UpdateStyle();
+        
+        [Window invalidateShadow];
+
+        if (ShouldTakeFocusOnShow() && activate) {
+            [Window orderFront:Window];
+            [Window makeKeyAndOrderFront:Window];
+            [Window makeFirstResponder:View];
+            [NSApp activateIgnoringOtherApps:YES];
+        } else {
+            [Window orderFront:Window];
+        }
+
+        _shown = true;
+
+        return S_OK;
+    }
+}
+
+bool WindowBaseImpl::IsShown ()
+{
+    return _shown;
+}
+
+bool WindowBaseImpl::ShouldTakeFocusOnShow() {
+    return true;
+}
+
+HRESULT WindowBaseImpl::ObtainNSWindowHandle(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge void *) Window;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::Hide() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window != nullptr) {
+            [Window orderOut:Window];
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Activate() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window != nullptr) {
+            [Window makeKeyAndOrderFront:nil];
+            [NSApp activateIgnoringOtherApps:YES];
+        }
+    }
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::SetTopMost(bool value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [Window setLevel:value ? NSFloatingWindowLevel : NSNormalWindowLevel];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Close() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window != nullptr) {
+            auto window = Window;
+            Window = nullptr;
+
+            try {
+                // Seems to throw sometimes on application exit.
+                [window close];
+            }
+            catch (NSException *) {}
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::GetClientSize(AvnSize *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr)
+            return E_POINTER;
+
+        ret->Width = lastSize.width;
+        ret->Height = lastSize.height;
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::GetFrameSize(AvnSize *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr)
+            return E_POINTER;
+
+        if(Window != nullptr && _shown){
+            auto frame = [Window frame];
+            ret->Width = frame.size.width;
+            ret->Height = frame.size.height;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::GetScaling(double *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr)
+            return E_POINTER;
+
+        if (Window == nullptr) {
+            *ret = 1;
+            return S_OK;
+        }
+
+        *ret = [Window backingScaleFactor];
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::SetMinMaxSize(AvnSize minSize, AvnSize maxSize) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        lastMinSize = ToNSSize(minSize);
+        lastMaxSize = ToNSSize(maxSize);
+
+        if(Window != nullptr) {
+            [Window setContentMinSize:lastMinSize];
+            [Window setContentMaxSize:lastMaxSize];
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Resize(double x, double y, AvnPlatformResizeReason reason) {
+    if (_inResize) {
+        return S_OK;
+    }
+
+    _inResize = true;
+
+    START_COM_CALL;
+    auto resizeBlock = ResizeScope(View, reason);
+
+    @autoreleasepool {
+        auto maxSize = lastMaxSize;
+        auto minSize = lastMinSize;
+
+        if (x < minSize.width) {
+            x = minSize.width;
+        }
+
+        if (y < minSize.height) {
+            y = minSize.height;
+        }
+
+        if (x > maxSize.width) {
+            x = maxSize.width;
+        }
+
+        if (y > maxSize.height) {
+            y = maxSize.height;
+        }
+
+        @try {
+            if(x != lastSize.width || y != lastSize.height) {
+                lastSize = NSSize{x, y};
+
+                if (!_shown) {
+                    BaseEvents->Resized(AvnSize{x, y}, reason);
+                } else if (Window != nullptr) {
+                    [Window setContentSize:lastSize];
+                    [Window invalidateShadow];
+                }
+            }
+        }
+        @finally {
+            _inResize = false;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Invalidate(__attribute__((unused)) AvnRect rect) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [View setNeedsDisplayInRect:[View frame]];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::SetMainMenu(IAvnMenu *menu) {
+    START_COM_CALL;
+
+    auto nativeMenu = dynamic_cast<AvnAppMenu *>(menu);
+
+    lastMenu = nativeMenu->GetNative();
+
+    if(Window != nullptr) {
+        [GetWindowProtocol() applyMenu:lastMenu];
+
+        if ([Window isKeyWindow]) {
+            [GetWindowProtocol() showWindowMenuWithAppMenu];
+        }
+    }
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::BeginMoveDrag() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        auto lastEvent = [View lastMouseDownEvent];
+
+        if (lastEvent == nullptr) {
+            return S_OK;
+        }
+
+        [Window performWindowDragWithEvent:lastEvent];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::BeginResizeDrag(__attribute__((unused)) AvnWindowEdge edge) {
+    START_COM_CALL;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::GetPosition(AvnPoint *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        if(Window != nullptr) {
+            auto frame = [Window frame];
+
+            ret->X = frame.origin.x;
+            ret->Y = frame.origin.y + frame.size.height;
+
+            *ret = ConvertPointY(*ret);
+        } else
+        {
+            *ret = lastPositionSet;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::SetPosition(AvnPoint point) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        lastPositionSet = point;
+        hasPosition = true;
+
+        if(Window != nullptr) {
+            [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(point))];
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::PointToClient(AvnPoint point, AvnPoint *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        point = ConvertPointY(point);
+        NSRect convertRect = [Window convertRectFromScreen:NSMakeRect(point.X, point.Y, 0.0, 0.0)];
+        auto viewPoint = NSMakePoint(convertRect.origin.x, convertRect.origin.y);
+
+        *ret = [View translateLocalPoint:ToAvnPoint(viewPoint)];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::PointToScreen(AvnPoint point, AvnPoint *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        auto cocoaViewPoint = ToNSPoint([View translateLocalPoint:point]);
+        NSRect convertRect = [Window convertRectToScreen:NSMakeRect(cocoaViewPoint.x, cocoaViewPoint.y, 0.0, 0.0)];
+        auto cocoaScreenPoint = NSPointFromCGPoint(NSMakePoint(convertRect.origin.x, convertRect.origin.y));
+        *ret = ConvertPointY(ToAvnPoint(cocoaScreenPoint));
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::ThreadSafeSetSwRenderedFrame(AvnFramebuffer *fb, IUnknown *dispose) {
+    START_COM_CALL;
+
+    [View setSwRenderedFrame:fb dispose:dispose];
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::SetCursor(IAvnCursor *cursor) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        Cursor *avnCursor = dynamic_cast<Cursor *>(cursor);
+        this->cursor = avnCursor->GetNative();
+        UpdateCursor();
+
+        if (avnCursor->IsHidden()) {
+            [NSCursor hide];
+        } else {
+            [NSCursor unhide];
+        }
+
+        return S_OK;
+    }
+}
+
+void WindowBaseImpl::UpdateCursor() {
+    if (cursor != nil) {
+        [cursor set];
+    }
+}
+
+HRESULT WindowBaseImpl::CreateGlRenderTarget(IAvnGlSurfaceRenderTarget **ppv) {
+    START_COM_CALL;
+
+    if (View == NULL)
+        return E_FAIL;
+    *ppv = [renderTarget createSurfaceRenderTarget];
+    return static_cast<HRESULT>(*ppv == nil ? E_FAIL : S_OK);
+}
+
+HRESULT WindowBaseImpl::CreateNativeControlHost(IAvnNativeControlHost **retOut) {
+    START_COM_CALL;
+
+    if (View == NULL)
+        return E_FAIL;
+    *retOut = ::CreateNativeControlHost(View);
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::SetBlurEnabled(bool enable) {
+    START_COM_CALL;
+
+    [StandardContainer ShowBlur:enable];
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point, IAvnClipboard *clipboard, IAvnDndResultCallback *cb, void *sourceHandle) {
+    START_COM_CALL;
+
+    auto item = TryGetPasteboardItem(clipboard);
+    [item setString:@"" forType:GetAvnCustomDataType()];
+    if (item == nil)
+        return E_INVALIDARG;
+    if (View == NULL)
+        return E_FAIL;
+
+    auto nsevent = [NSApp currentEvent];
+    auto nseventType = [nsevent type];
+
+    // If current event isn't a mouse one (probably due to malfunctioning user app)
+    // attempt to forge a new one
+    if (!((nseventType >= NSEventTypeLeftMouseDown && nseventType <= NSEventTypeMouseExited)
+            || (nseventType >= NSEventTypeOtherMouseDown && nseventType <= NSEventTypeOtherMouseDragged))) {
+        NSRect convertRect = [Window convertRectToScreen:NSMakeRect(point.X, point.Y, 0.0, 0.0)];
+        auto nspoint = NSMakePoint(convertRect.origin.x, convertRect.origin.y);
+        CGPoint cgpoint = NSPointToCGPoint(nspoint);
+        auto cgevent = CGEventCreateMouseEvent(NULL, kCGEventLeftMouseDown, cgpoint, kCGMouseButtonLeft);
+        nsevent = [NSEvent eventWithCGEvent:cgevent];
+        CFRelease(cgevent);
+    }
+
+    auto dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter:item];
+
+    auto dragItemImage = [NSImage imageNamed:NSImageNameMultipleDocuments];
+    NSRect dragItemRect = {(float) point.X, (float) point.Y, [dragItemImage size].width, [dragItemImage size].height};
+    [dragItem setDraggingFrame:dragItemRect contents:dragItemImage];
+
+    int op = 0;
+    int ieffects = (int) effects;
+    if ((ieffects & (int) AvnDragDropEffects::Copy) != 0)
+        op |= NSDragOperationCopy;
+    if ((ieffects & (int) AvnDragDropEffects::Link) != 0)
+        op |= NSDragOperationLink;
+    if ((ieffects & (int) AvnDragDropEffects::Move) != 0)
+        op |= NSDragOperationMove;
+    [View beginDraggingSessionWithItems:@[dragItem] event:nsevent
+                                 source:CreateDraggingSource((NSDragOperation) op, cb, sourceHandle)];
+    return S_OK;
+}
+
+bool WindowBaseImpl::IsDialog() {
+    return false;
+}
+
+NSWindowStyleMask WindowBaseImpl::GetStyle() {
+    return NSWindowStyleMaskBorderless;
+}
+
+void WindowBaseImpl::UpdateStyle() {
+    [Window setStyleMask:GetStyle()];
+}
+
+void WindowBaseImpl::CleanNSWindow() {
+    if(Window != nullptr) {
+        [GetWindowProtocol() disconnectParent];
+        [Window close];
+        Window = nullptr;
+    }
+}
+
+void WindowBaseImpl::CreateNSWindow(bool isDialog) {
+    if (isDialog) {
+        if (![Window isKindOfClass:[AvnPanel class]]) {
+            CleanNSWindow();
+
+            Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
+            
+            [Window setHidesOnDeactivate:false];
+        }
+    } else {
+        if (![Window isKindOfClass:[AvnWindow class]]) {
+            CleanNSWindow();
+
+            Window = [[AvnWindow alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
+        }
+    }
+}
+
+id <AvnWindowProtocol> WindowBaseImpl::GetWindowProtocol() {
+    if(Window == nullptr)
+    {
+        return nullptr;
+    }
+
+    return (id <AvnWindowProtocol>) Window;
+}
+
+void WindowBaseImpl::BringToFront()
+{
+    // do nothing.
+}
+
+extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events, IAvnGlContext* gl)
+{
+    @autoreleasepool
+    {
+        IAvnWindow* ptr = (IAvnWindow*)new WindowImpl(events, gl);
+        return ptr;
+    }
+}
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
new file mode 100644
index 0000000000..b4b1d4e70b
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -0,0 +1,108 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_WINDOWIMPL_H
+#define AVALONIA_NATIVE_OSX_WINDOWIMPL_H
+
+#import "WindowBaseImpl.h"
+#include "IWindowStateChanged.h"
+#include <list>
+
+class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
+{
+private:
+    bool _isEnabled;
+    bool _canResize;
+    bool _fullScreenActive;
+    SystemDecorations _decorations;
+    AvnWindowState _lastWindowState;
+    AvnWindowState _actualWindowState;
+    bool _inSetWindowState;
+    NSRect _preZoomSize;
+    bool _transitioningWindowState;
+    bool _isClientAreaExtended;
+    bool _isDialog;
+    WindowImpl* _parent;
+    std::list<WindowImpl*> _children;
+    AvnExtendClientAreaChromeHints _extendClientHints;
+
+    FORWARD_IUNKNOWN()
+BEGIN_INTERFACE_MAP()
+        INHERIT_INTERFACE_MAP(WindowBaseImpl)
+        INTERFACE_MAP_ENTRY(IAvnWindow, IID_IAvnWindow)
+    END_INTERFACE_MAP()
+    virtual ~WindowImpl()
+    {
+    }
+
+    ComPtr<IAvnWindowEvents> WindowEvents;
+
+    WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl);
+
+    void HideOrShowTrafficLights ();
+
+    virtual HRESULT Show (bool activate, bool isDialog) override;
+
+    virtual HRESULT SetEnabled (bool enable) override;
+
+    virtual HRESULT SetParent (IAvnWindow* parent) override;
+
+    void StartStateTransition () override ;
+
+    void EndStateTransition () override ;
+
+    SystemDecorations Decorations () override ;
+
+    AvnWindowState WindowState () override ;
+
+    void WindowStateChanged () override ;
+
+    bool UndecoratedIsMaximized ();
+
+    bool IsZoomed ();
+
+    void DoZoom();
+
+    virtual HRESULT SetCanResize(bool value) override;
+
+    virtual HRESULT SetDecorations(SystemDecorations value) override;
+
+    virtual HRESULT SetTitle (char* utf8title) override;
+
+    virtual HRESULT SetTitleBarColor(AvnColor color) override;
+
+    virtual HRESULT GetWindowState (AvnWindowState*ret) override;
+
+    virtual HRESULT TakeFocusFromChildren () override;
+
+    virtual HRESULT SetExtendClientArea (bool enable) override;
+
+    virtual HRESULT SetExtendClientAreaHints (AvnExtendClientAreaChromeHints hints) override;
+
+    virtual HRESULT GetExtendTitleBarHeight (double*ret) override;
+
+    virtual HRESULT SetExtendTitleBarHeight (double value) override;
+
+    void EnterFullScreenMode ();
+
+    void ExitFullScreenMode ();
+
+    virtual HRESULT SetWindowState (AvnWindowState state) override;
+
+    virtual bool IsDialog() override;
+    
+    virtual void BringToFront () override;
+    
+    bool CanBecomeKeyWindow ();
+
+protected:
+    virtual NSWindowStyleMask GetStyle() override;
+
+private:
+    void OnInitialiseNSWindow();
+    NSString *_lastTitle;
+};
+
+#endif //AVALONIA_NATIVE_OSX_WINDOWIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
new file mode 100644
index 0000000000..2443965957
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -0,0 +1,603 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "AutoFitContentView.h"
+#include "AvnView.h"
+#include "automation.h"
+#include "WindowProtocol.h"
+
+WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBaseImpl(events, gl) {
+    _isEnabled = true;
+    _children = std::list<WindowImpl*>();
+    _isClientAreaExtended = false;
+    _extendClientHints = AvnDefaultChrome;
+    _fullScreenActive = false;
+    _canResize = true;
+    _decorations = SystemDecorationsFull;
+    _transitioningWindowState = false;
+    _inSetWindowState = false;
+    _lastWindowState = Normal;
+    _actualWindowState = Normal;
+    _lastTitle = @"";
+    _parent = nullptr;
+    WindowEvents = events;
+
+    [Window setHasShadow:true];
+    
+    OnInitialiseNSWindow();
+}
+
+void WindowImpl::HideOrShowTrafficLights() {
+    if (Window == nil) {
+        return;
+    }
+
+    bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
+    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations == SystemDecorationsFull;
+    
+    [[Window standardWindowButton:NSWindowCloseButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowZoomButton] setHidden:!hasTrafficLights];
+}
+
+void WindowImpl::OnInitialiseNSWindow(){
+    [GetWindowProtocol() setCanBecomeKeyWindow:true];
+    
+    [Window disableCursorRects];
+    [Window setTabbingMode:NSWindowTabbingModeDisallowed];
+    [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+
+    [Window setTitle:_lastTitle];
+    
+    if(_isClientAreaExtended)
+    {
+        [GetWindowProtocol() setIsExtended:true];
+        SetExtendClientArea(true);
+    }
+}
+
+HRESULT WindowImpl::Show(bool activate, bool isDialog) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _isDialog = isDialog || _parent != nullptr;
+
+        WindowBaseImpl::Show(activate, isDialog);
+
+        HideOrShowTrafficLights();
+
+        return SetWindowState(_lastWindowState);
+    }
+}
+
+HRESULT WindowImpl::SetEnabled(bool enable) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _isEnabled = enable;
+        [GetWindowProtocol() setEnabled:enable];
+        UpdateStyle();
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if(_parent != nullptr)
+        {
+            _parent->_children.remove(this);
+        }
+
+        auto cparent = dynamic_cast<WindowImpl *>(parent);
+        
+        _parent = cparent;
+
+        _isDialog = _parent != nullptr;
+        
+        if(_parent != nullptr && Window != nullptr){
+            // If one tries to show a child window with a minimized parent window, then the parent window will be
+            // restored but macOS isn't kind enough to *tell* us that, so the window will be left in a non-interactive
+            // state. Detect this and explicitly restore the parent window ourselves to avoid this situation.
+            if (cparent->WindowState() == Minimized)
+                cparent->SetWindowState(Normal);
+
+            [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
+                
+            cparent->_children.push_back(this);
+                
+            UpdateStyle();
+        }
+
+        return S_OK;
+    }
+}
+
+void WindowImpl::BringToFront()
+{
+    if(Window != nullptr)
+    {
+        if ([Window isVisible] && ![Window isMiniaturized])
+        {
+            if(IsDialog())
+            {
+                Activate();
+            }
+            else
+            {
+                [Window orderFront:nullptr];
+            }
+        }
+        
+        [Window invalidateShadow];
+        
+        for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+        {
+            (*iterator)->BringToFront();
+        }
+    }
+}
+
+bool WindowImpl::CanBecomeKeyWindow()
+{
+    for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+    {
+        if((*iterator)->IsDialog())
+        {
+            return false;
+        }
+    }
+    
+    return true;
+}
+
+void WindowImpl::StartStateTransition() {
+    _transitioningWindowState = true;
+}
+
+void WindowImpl::EndStateTransition() {
+    _transitioningWindowState = false;
+}
+
+SystemDecorations WindowImpl::Decorations() {
+    return _decorations;
+}
+
+AvnWindowState WindowImpl::WindowState() {
+    return _lastWindowState;
+}
+
+void WindowImpl::WindowStateChanged() {
+    if (_shown && !_inSetWindowState && !_transitioningWindowState) {
+        AvnWindowState state;
+        GetWindowState(&state);
+
+        if (_lastWindowState != state) {
+            if (_isClientAreaExtended) {
+                if (_lastWindowState == FullScreen) {
+                    // we exited fs.
+                    if (_extendClientHints & AvnOSXThickTitleBar) {
+                        Window.toolbar = [NSToolbar new];
+                        Window.toolbar.showsBaselineSeparator = false;
+                    }
+
+                    [Window setTitlebarAppearsTransparent:true];
+
+                    [StandardContainer setFrameSize:StandardContainer.frame.size];
+                } else if (state == FullScreen) {
+                    // we entered fs.
+                    if (_extendClientHints & AvnOSXThickTitleBar) {
+                        Window.toolbar = nullptr;
+                    }
+
+                    [Window setTitlebarAppearsTransparent:false];
+
+                    [StandardContainer setFrameSize:StandardContainer.frame.size];
+                }
+            }
+
+            _lastWindowState = state;
+            _actualWindowState = state;
+            WindowEvents->WindowStateChanged(state);
+        }
+    }
+}
+
+bool WindowImpl::UndecoratedIsMaximized() {
+    auto windowSize = [Window frame];
+    auto available = [Window screen].visibleFrame;
+    return CGRectEqualToRect(windowSize, available);
+}
+
+bool WindowImpl::IsZoomed() {
+    return _decorations == SystemDecorationsFull ? [Window isZoomed] : UndecoratedIsMaximized();
+}
+
+void WindowImpl::DoZoom() {
+    switch (_decorations) {
+        case SystemDecorationsNone:
+        case SystemDecorationsBorderOnly:
+            [Window setFrame:[Window screen].visibleFrame display:true];
+            break;
+
+
+        case SystemDecorationsFull:
+            [Window performZoom:Window];
+            break;
+    }
+}
+
+HRESULT WindowImpl::SetCanResize(bool value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _canResize = value;
+        UpdateStyle();
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetDecorations(SystemDecorations value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        auto currentWindowState = _lastWindowState;
+        _decorations = value;
+
+        if (_fullScreenActive) {
+            return S_OK;
+        }
+
+        UpdateStyle();
+
+        HideOrShowTrafficLights();
+
+        switch (_decorations) {
+            case SystemDecorationsNone:
+                [Window setHasShadow:NO];
+                [Window setTitleVisibility:NSWindowTitleHidden];
+                [Window setTitlebarAppearsTransparent:YES];
+
+                if (currentWindowState == Maximized) {
+                    if (!UndecoratedIsMaximized()) {
+                        DoZoom();
+                    }
+                }
+                break;
+
+            case SystemDecorationsBorderOnly:
+                [Window setHasShadow:YES];
+                [Window setTitleVisibility:NSWindowTitleHidden];
+                [Window setTitlebarAppearsTransparent:YES];
+
+                if (currentWindowState == Maximized) {
+                    if (!UndecoratedIsMaximized()) {
+                        DoZoom();
+                    }
+                }
+                break;
+
+            case SystemDecorationsFull:
+                [Window setHasShadow:YES];
+                [Window setTitleVisibility:NSWindowTitleVisible];
+                [Window setTitlebarAppearsTransparent:NO];
+                [Window setTitle:_lastTitle];
+
+                if (currentWindowState == Maximized) {
+                    auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
+
+                    [View setFrameSize:newFrame];
+                }
+                break;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetTitle(char *utf8title) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _lastTitle = [NSString stringWithUTF8String:(const char *) utf8title];
+        [Window setTitle:_lastTitle];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetTitleBarColor(AvnColor color) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        float a = (float) color.Alpha / 255.0f;
+        float r = (float) color.Red / 255.0f;
+        float g = (float) color.Green / 255.0f;
+        float b = (float) color.Blue / 255.0f;
+
+        auto nscolor = [NSColor colorWithSRGBRed:r green:g blue:b alpha:a];
+
+        // Based on the titlebar color we have to choose either light or dark
+        // OSX doesnt let you set a foreground color for titlebar.
+        if ((r * 0.299 + g * 0.587 + b * 0.114) > 186.0f / 255.0f) {
+            [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
+        } else {
+            [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantDark]];
+        }
+
+        [Window setTitlebarAppearsTransparent:true];
+        [Window setBackgroundColor:nscolor];
+    }
+
+    return S_OK;
+}
+
+HRESULT WindowImpl::GetWindowState(AvnWindowState *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        if (([Window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen) {
+            *ret = FullScreen;
+            return S_OK;
+        }
+
+        if ([Window isMiniaturized]) {
+            *ret = Minimized;
+            return S_OK;
+        }
+
+        if (IsZoomed()) {
+            *ret = Maximized;
+            return S_OK;
+        }
+
+        *ret = Normal;
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::TakeFocusFromChildren() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window == nil)
+            return S_OK;
+        if ([Window isKeyWindow])
+            [Window makeFirstResponder:View];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetExtendClientArea(bool enable) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _isClientAreaExtended = enable;
+
+        if(Window != nullptr) {
+            if (enable) {
+                Window.titleVisibility = NSWindowTitleHidden;
+
+                [Window setTitlebarAppearsTransparent:true];
+
+                auto wantsTitleBar = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
+
+                if (wantsTitleBar) {
+                    [StandardContainer ShowTitleBar:true];
+                } else {
+                    [StandardContainer ShowTitleBar:false];
+                }
+
+                if (_extendClientHints & AvnOSXThickTitleBar) {
+                    Window.toolbar = [NSToolbar new];
+                    Window.toolbar.showsBaselineSeparator = false;
+                } else {
+                    Window.toolbar = nullptr;
+                }
+            } else {
+                Window.titleVisibility = NSWindowTitleVisible;
+                Window.toolbar = nullptr;
+                [Window setTitlebarAppearsTransparent:false];
+                View.layer.zPosition = 0;
+            }
+
+            [GetWindowProtocol() setIsExtended:enable];
+
+            HideOrShowTrafficLights();
+
+            UpdateStyle();
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetExtendClientAreaHints(AvnExtendClientAreaChromeHints hints) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _extendClientHints = hints;
+
+        SetExtendClientArea(_isClientAreaExtended);
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::GetExtendTitleBarHeight(double *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        *ret = [GetWindowProtocol() getExtendedTitleBarHeight];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetExtendTitleBarHeight(double value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [StandardContainer SetTitleBarHeightHint:value];
+        return S_OK;
+    }
+}
+
+void WindowImpl::EnterFullScreenMode() {
+    _fullScreenActive = true;
+
+    [Window setTitle:_lastTitle];
+    [Window toggleFullScreen:nullptr];
+}
+
+void WindowImpl::ExitFullScreenMode() {
+    [Window toggleFullScreen:nullptr];
+
+    _fullScreenActive = false;
+
+    SetDecorations(_decorations);
+}
+
+HRESULT WindowImpl::SetWindowState(AvnWindowState state) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        auto currentState = _actualWindowState;
+        _lastWindowState = state;
+
+        if (Window == nullptr) {
+            return S_OK;
+        }
+
+        if (_actualWindowState == state) {
+            return S_OK;
+        }
+
+        _inSetWindowState = true;
+
+        if (currentState == Normal) {
+            _preZoomSize = [Window frame];
+        }
+
+        if (_shown) {
+            _actualWindowState = _lastWindowState;
+
+            switch (state) {
+                case Maximized:
+                    if (currentState == FullScreen) {
+                        ExitFullScreenMode();
+                    }
+
+                    lastPositionSet.X = 0;
+                    lastPositionSet.Y = 0;
+
+                    if ([Window isMiniaturized]) {
+                        [Window deminiaturize:Window];
+                    }
+
+                    if (!IsZoomed()) {
+                        DoZoom();
+                    }
+                    break;
+
+                case Minimized:
+                    if (currentState == FullScreen) {
+                        ExitFullScreenMode();
+                    } else {
+                        [Window miniaturize:Window];
+                    }
+                    break;
+
+                case FullScreen:
+                    if ([Window isMiniaturized]) {
+                        [Window deminiaturize:Window];
+                    }
+
+                    EnterFullScreenMode();
+                    break;
+
+                case Normal:
+                    if ([Window isMiniaturized]) {
+                        [Window deminiaturize:Window];
+                    }
+
+                    if (currentState == FullScreen) {
+                        ExitFullScreenMode();
+                    }
+
+                    if (IsZoomed()) {
+                        if (_decorations == SystemDecorationsFull) {
+                            DoZoom();
+                        } else {
+                            [Window setFrame:_preZoomSize display:true];
+                            auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
+
+                            [View setFrameSize:newFrame];
+                        }
+
+                    }
+                    break;
+            }
+
+            WindowEvents->WindowStateChanged(_actualWindowState);
+        }
+
+
+        _inSetWindowState = false;
+
+        return S_OK;
+    }
+}
+
+bool WindowImpl::IsDialog() {
+    return _isDialog;
+}
+
+NSWindowStyleMask WindowImpl::GetStyle() {
+    unsigned long s = NSWindowStyleMaskBorderless;
+    
+    if(_actualWindowState == FullScreen)
+    {
+        s |= NSWindowStyleMaskFullScreen;
+    }
+
+    switch (_decorations) {
+        case SystemDecorationsNone:
+            s = s | NSWindowStyleMaskFullSizeContentView;
+            break;
+
+        case SystemDecorationsBorderOnly:
+            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
+            break;
+
+        case SystemDecorationsFull:
+            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable;
+
+            if (_canResize && _isEnabled) {
+                s = s | NSWindowStyleMaskResizable;
+            }
+            break;
+    }
+
+    if (!IsDialog()) {
+        s |= NSWindowStyleMaskMiniaturizable;
+    }
+
+    if (_isClientAreaExtended) {
+        s |= NSWindowStyleMaskFullSizeContentView | NSWindowStyleMaskTexturedBackground;
+    }
+    return s;
+}
diff --git a/native/Avalonia.Native/src/OSX/WindowInterfaces.h b/native/Avalonia.Native/src/OSX/WindowInterfaces.h
new file mode 100644
index 0000000000..6e6d62e85e
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowInterfaces.h
@@ -0,0 +1,17 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#include "WindowProtocol.h"
+#include "WindowBaseImpl.h"
+
+@interface AvnWindow : NSWindow <AvnWindowProtocol, NSWindowDelegate>
+-(AvnWindow* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent contentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)styleMask;
+@end
+
+@interface AvnPanel : NSPanel <AvnWindowProtocol, NSWindowDelegate>
+-(AvnPanel* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent contentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)styleMask;
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/WindowProtocol.h b/native/Avalonia.Native/src/OSX/WindowProtocol.h
new file mode 100644
index 0000000000..cb5f86bdb9
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowProtocol.h
@@ -0,0 +1,26 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#pragma once
+
+#import <AppKit/AppKit.h>
+
+@class AvnMenu;
+
+@protocol AvnWindowProtocol
+-(void) pollModalSession: (NSModalSession _Nonnull) session;
+-(bool) shouldTryToHandleEvents;
+-(void) setEnabled: (bool) enable;
+-(void) showAppMenuOnly;
+-(void) showWindowMenuWithAppMenu;
+-(void) applyMenu:(AvnMenu* _Nullable)menu;
+
+-(double) getExtendedTitleBarHeight;
+-(void) setIsExtended:(bool)value;
+-(void) disconnectParent;
+-(bool) isDialog;
+
+-(void) setCanBecomeKeyWindow:(bool)value;
+@end
diff --git a/native/Avalonia.Native/src/OSX/app.mm b/native/Avalonia.Native/src/OSX/app.mm
index 79175d9ff1..9cc9fc9523 100644
--- a/native/Avalonia.Native/src/OSX/app.mm
+++ b/native/Avalonia.Native/src/OSX/app.mm
@@ -73,12 +73,17 @@ ComPtr<IAvnApplicationEvents> _events;
     _isHandlingSendEvent = true;
     @try {
         [super sendEvent: event];
+        if ([event type] == NSEventTypeKeyUp && ([event modifierFlags] & NSEventModifierFlagCommand))
+        {
+            [[self keyWindow] sendEvent:event];
+        }
+        
     } @finally {
         _isHandlingSendEvent = oldHandling;
     }
 }
 
-// This is needed for certain embedded controls
+// This is needed for certain embedded controls DO NOT REMOVE..
 - (BOOL) isHandlingSendEvent
 {
     return _isHandlingSendEvent;
@@ -88,14 +93,16 @@ ComPtr<IAvnApplicationEvents> _events;
 {
     _isHandlingSendEvent = handlingSendEvent;
 }
-
 @end
 
-extern void InitializeAvnApp(IAvnApplicationEvents* events)
+extern void InitializeAvnApp(IAvnApplicationEvents* events, bool disableAppDelegate)
 {
-    NSApplication* app = [AvnApplication sharedApplication];
-    id delegate = [[AvnAppDelegate alloc] initWithEvents:events];
-    [app setDelegate:delegate];
+    if(!disableAppDelegate)
+    {
+        NSApplication* app = [AvnApplication sharedApplication];
+        id delegate = [[AvnAppDelegate alloc] initWithEvents:events];
+        [app setDelegate:delegate];
+    }
 }
 
 HRESULT AvnApplicationCommands::HideApp()
diff --git a/native/Avalonia.Native/src/OSX/automation.h b/native/Avalonia.Native/src/OSX/automation.h
new file mode 100644
index 0000000000..367df3619d
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/automation.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
+class IAvnAutomationPeer;
+
+@interface AvnAccessibilityElement : NSAccessibilityElement
++ (AvnAccessibilityElement *) acquire:(IAvnAutomationPeer *) peer;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
new file mode 100644
index 0000000000..d0c8d7a9db
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -0,0 +1,497 @@
+#include "common.h"
+#include "automation.h"
+#include "AvnString.h"
+#include "INSWindowHolder.h"
+#include "AvnView.h"
+
+@interface AvnAccessibilityElement (Events)
+- (void) raiseChildrenChanged;
+@end
+
+@interface AvnRootAccessibilityElement : AvnAccessibilityElement
+- (AvnView *) ownerView;
+- (AvnRootAccessibilityElement *) initWithPeer:(IAvnAutomationPeer *) peer owner:(AvnView*) owner;
+- (void) raiseFocusChanged;
+@end
+
+class AutomationNode : public ComSingleObject<IAvnAutomationNode, &IID_IAvnAutomationNode>
+{
+public:
+    FORWARD_IUNKNOWN()
+
+    AutomationNode(AvnAccessibilityElement* owner)
+    {
+        _owner = owner;
+    }
+    
+    AvnAccessibilityElement* GetOwner()
+    {
+        return _owner;
+    }
+    
+    virtual void Dispose() override
+    {
+        _owner = nil;
+    }
+    
+    virtual void ChildrenChanged () override
+    {
+        [_owner raiseChildrenChanged];
+    }
+    
+    virtual void PropertyChanged (AvnAutomationProperty property) override
+    {
+        
+    }
+    
+    virtual void FocusChanged () override
+    {
+        [(AvnRootAccessibilityElement*)_owner raiseFocusChanged];
+    }
+    
+private:
+    __strong AvnAccessibilityElement* _owner;
+};
+
+@implementation AvnAccessibilityElement
+{
+    IAvnAutomationPeer* _peer;
+    AutomationNode* _node;
+    NSMutableArray* _children;
+}
+
++ (AvnAccessibilityElement *)acquire:(IAvnAutomationPeer *)peer
+{
+    if (peer == nullptr)
+        return nil;
+    
+    auto instance = peer->GetNode();
+    
+    if (instance != nullptr)
+        return dynamic_cast<AutomationNode*>(instance)->GetOwner();
+    
+    if (peer->IsRootProvider())
+    {
+        auto window = peer->RootProvider_GetWindow();
+        auto holder = dynamic_cast<INSWindowHolder*>(window);
+        auto view = holder->GetNSView();
+        return [[AvnRootAccessibilityElement alloc] initWithPeer:peer owner:view];
+    }
+    else
+    {
+        return [[AvnAccessibilityElement alloc] initWithPeer:peer];
+    }
+}
+
+- (AvnAccessibilityElement *)initWithPeer:(IAvnAutomationPeer *)peer
+{
+    self = [super init];
+    _peer = peer;
+    _node = new AutomationNode(self);
+    _peer->SetNode(_node);
+    return self;
+}
+
+- (void)dealloc
+{
+    if (_node)
+        delete _node;
+    _node = nullptr;
+}
+
+- (NSString *)description
+{
+    return [NSString stringWithFormat:@"%@ '%@' (%p)",
+        GetNSStringAndRelease(_peer->GetClassName()),
+        GetNSStringAndRelease(_peer->GetName()),
+        _peer];
+}
+
+- (IAvnAutomationPeer *)peer
+{
+    return _peer;
+}
+
+- (BOOL)isAccessibilityElement
+{
+    return _peer->IsControlElement();
+}
+
+- (NSAccessibilityRole)accessibilityRole
+{
+    auto controlType = _peer->GetAutomationControlType();
+    
+    switch (controlType) {
+        case AutomationButton: return NSAccessibilityButtonRole;
+        case AutomationCalendar: return NSAccessibilityGridRole;
+        case AutomationCheckBox: return NSAccessibilityCheckBoxRole;
+        case AutomationComboBox: return NSAccessibilityPopUpButtonRole;
+        case AutomationComboBoxItem: return NSAccessibilityMenuItemRole;
+        case AutomationEdit: return NSAccessibilityTextFieldRole;
+        case AutomationHyperlink: return NSAccessibilityLinkRole;
+        case AutomationImage: return NSAccessibilityImageRole;
+        case AutomationListItem: return NSAccessibilityRowRole;
+        case AutomationList: return NSAccessibilityTableRole;
+        case AutomationMenu: return NSAccessibilityMenuBarRole;
+        case AutomationMenuBar: return NSAccessibilityMenuBarRole;
+        case AutomationMenuItem: return NSAccessibilityMenuItemRole;
+        case AutomationProgressBar: return NSAccessibilityProgressIndicatorRole;
+        case AutomationRadioButton: return NSAccessibilityRadioButtonRole;
+        case AutomationScrollBar: return NSAccessibilityScrollBarRole;
+        case AutomationSlider: return NSAccessibilitySliderRole;
+        case AutomationSpinner: return NSAccessibilityIncrementorRole;
+        case AutomationStatusBar: return NSAccessibilityTableRole;
+        case AutomationTab: return NSAccessibilityTabGroupRole;
+        case AutomationTabItem: return NSAccessibilityRadioButtonRole;
+        case AutomationText: return NSAccessibilityStaticTextRole;
+        case AutomationToolBar: return NSAccessibilityToolbarRole;
+        case AutomationToolTip: return NSAccessibilityPopoverRole;
+        case AutomationTree: return NSAccessibilityOutlineRole;
+        case AutomationTreeItem: return NSAccessibilityCellRole;
+        case AutomationCustom: return NSAccessibilityUnknownRole;
+        case AutomationGroup: return NSAccessibilityGroupRole;
+        case AutomationThumb: return NSAccessibilityHandleRole;
+        case AutomationDataGrid: return NSAccessibilityGridRole;
+        case AutomationDataItem: return NSAccessibilityCellRole;
+        case AutomationDocument: return NSAccessibilityStaticTextRole;
+        case AutomationSplitButton: return NSAccessibilityPopUpButtonRole;
+        case AutomationWindow: return NSAccessibilityWindowRole;
+        case AutomationPane: return NSAccessibilityGroupRole;
+        case AutomationHeader: return NSAccessibilityGroupRole;
+        case AutomationHeaderItem:  return NSAccessibilityButtonRole;
+        case AutomationTable: return NSAccessibilityTableRole;
+        case AutomationTitleBar: return NSAccessibilityGroupRole;
+        // Treat unknown roles as generic group container items. Returning
+        // NSAccessibilityUnknownRole is also possible but makes the screen
+       // reader focus on the item instead of passing focus to child items.
+        default: return NSAccessibilityGroupRole;
+    }
+}
+
+- (NSString *)accessibilityIdentifier
+{
+    return GetNSStringAndRelease(_peer->GetAutomationId());
+}
+
+- (NSString *)accessibilityTitle
+{
+    // StaticText exposes its text via the value property.
+    if (_peer->GetAutomationControlType() != AutomationText)
+    {
+        return GetNSStringAndRelease(_peer->GetName());
+    }
+    
+    return [super accessibilityTitle];
+}
+
+- (id)accessibilityValue
+{
+    if (_peer->IsRangeValueProvider())
+    {
+        return [NSNumber numberWithDouble:_peer->RangeValueProvider_GetValue()];
+    }
+    else if (_peer->IsToggleProvider())
+    {
+        switch (_peer->ToggleProvider_GetToggleState()) {
+            case 0: return [NSNumber numberWithBool:NO];
+            case 1: return [NSNumber numberWithBool:YES];
+            default: return [NSNumber numberWithInt:2];
+        }
+    }
+    else if (_peer->IsValueProvider())
+    {
+        return GetNSStringAndRelease(_peer->ValueProvider_GetValue());
+    }
+    else if (_peer->GetAutomationControlType() == AutomationText)
+    {
+        return GetNSStringAndRelease(_peer->GetName());
+    }
+
+    return [super accessibilityValue];
+}
+
+- (id)accessibilityMinValue
+{
+    if (_peer->IsRangeValueProvider())
+    {
+        return [NSNumber numberWithDouble:_peer->RangeValueProvider_GetMinimum()];
+    }
+    
+    return [super accessibilityMinValue];
+}
+
+- (id)accessibilityMaxValue
+{
+    if (_peer->IsRangeValueProvider())
+    {
+        return [NSNumber numberWithDouble:_peer->RangeValueProvider_GetMaximum()];
+    }
+    
+    return [super accessibilityMaxValue];
+}
+
+- (BOOL)isAccessibilityEnabled
+{
+    return _peer->IsEnabled();
+}
+
+- (BOOL)isAccessibilityFocused
+{
+    return _peer->HasKeyboardFocus();
+}
+
+- (NSArray *)accessibilityChildren
+{
+    if (_children == nullptr && _peer != nullptr)
+        [self recalculateChildren];
+    return _children;
+}
+
+- (NSRect)accessibilityFrame
+{
+    id topLevel = [self accessibilityTopLevelUIElement];
+    auto result = NSZeroRect;
+
+    if ([topLevel isKindOfClass:[AvnRootAccessibilityElement class]])
+    {
+        auto root = (AvnRootAccessibilityElement*)topLevel;
+        auto view = [root ownerView];
+        
+        if (view)
+        {
+            auto window = [view window];
+            auto bounds = ToNSRect(_peer->GetBoundingRectangle());
+            auto windowBounds = [view convertRect:bounds toView:nil];
+            auto screenBounds = [window convertRectToScreen:windowBounds];
+            result = screenBounds;
+        }
+    }
+
+    return result;
+}
+
+- (id)accessibilityParent
+{
+    auto parentPeer = _peer->GetParent();
+    return parentPeer ? [AvnAccessibilityElement acquire:parentPeer] : [NSApplication sharedApplication];
+}
+
+- (id)accessibilityTopLevelUIElement
+{
+    auto rootPeer = _peer->GetRootPeer();
+    return [AvnAccessibilityElement acquire:rootPeer];
+}
+
+- (id)accessibilityWindow
+{
+    id topLevel = [self accessibilityTopLevelUIElement];
+    return [topLevel isKindOfClass:[NSWindow class]] ? topLevel : nil;
+}
+
+- (BOOL)isAccessibilityExpanded
+{
+    if (!_peer->IsExpandCollapseProvider())
+        return NO;
+    return _peer->ExpandCollapseProvider_GetIsExpanded();
+}
+
+- (void)setAccessibilityExpanded:(BOOL)accessibilityExpanded
+{
+    if (!_peer->IsExpandCollapseProvider())
+        return;
+    if (accessibilityExpanded)
+        _peer->ExpandCollapseProvider_Expand();
+    else
+        _peer->ExpandCollapseProvider_Collapse();
+}
+
+- (BOOL)accessibilityPerformPress
+{
+    if (_peer->IsInvokeProvider())
+    {
+        _peer->InvokeProvider_Invoke();
+    }
+    else if (_peer->IsExpandCollapseProvider())
+    {
+        _peer->ExpandCollapseProvider_Expand();
+    }
+    else if (_peer->IsToggleProvider())
+    {
+        _peer->ToggleProvider_Toggle();
+    }
+    return YES;
+}
+
+- (BOOL)accessibilityPerformIncrement
+{
+    if (!_peer->IsRangeValueProvider())
+        return NO;
+    auto value = _peer->RangeValueProvider_GetValue();
+    value += _peer->RangeValueProvider_GetSmallChange();
+    _peer->RangeValueProvider_SetValue(value);
+    return YES;
+}
+
+- (BOOL)accessibilityPerformDecrement
+{
+    if (!_peer->IsRangeValueProvider())
+        return NO;
+    auto value = _peer->RangeValueProvider_GetValue();
+    value -= _peer->RangeValueProvider_GetSmallChange();
+    _peer->RangeValueProvider_SetValue(value);
+    return YES;
+}
+
+- (BOOL)accessibilityPerformShowMenu
+{
+    if (!_peer->IsExpandCollapseProvider())
+        return NO;
+    _peer->ExpandCollapseProvider_Expand();
+    return YES;
+}
+
+- (BOOL)isAccessibilitySelected
+{
+    if (_peer->IsSelectionItemProvider())
+        return _peer->SelectionItemProvider_IsSelected();
+    return NO;
+}
+
+- (BOOL)isAccessibilitySelectorAllowed:(SEL)selector
+{
+    if (selector == @selector(accessibilityPerformShowMenu))
+    {
+        return _peer->IsExpandCollapseProvider() && _peer->ExpandCollapseProvider_GetShowsMenu();
+    }
+    else if (selector == @selector(isAccessibilityExpanded))
+    {
+        return _peer->IsExpandCollapseProvider();
+    }
+    else if (selector == @selector(accessibilityPerformPress))
+    {
+        return _peer->IsInvokeProvider() || _peer->IsExpandCollapseProvider() || _peer->IsToggleProvider();
+    }
+    else if (selector == @selector(accessibilityPerformIncrement) ||
+             selector == @selector(accessibilityPerformDecrement) ||
+             selector == @selector(accessibilityMinValue) ||
+             selector == @selector(accessibilityMaxValue))
+    {
+        return _peer->IsRangeValueProvider();
+    }
+    
+    return [super isAccessibilitySelectorAllowed:selector];
+}
+
+- (void)raiseChildrenChanged
+{
+    auto changed = _children ? [NSMutableSet setWithArray:_children] : [NSMutableSet set];
+
+    [self recalculateChildren];
+    
+    if (_children)
+        [changed addObjectsFromArray:_children];
+
+    NSAccessibilityPostNotificationWithUserInfo(
+        self,
+        NSAccessibilityLayoutChangedNotification,
+        @{ NSAccessibilityUIElementsKey: [changed allObjects]});
+}
+
+- (void)raisePropertyChanged
+{
+}
+
+- (void)setAccessibilityFocused:(BOOL)accessibilityFocused
+{
+    if (accessibilityFocused)
+        _peer->SetFocus();
+}
+
+- (void)recalculateChildren
+{
+    auto childPeers = _peer->GetChildren();
+    auto childCount = childPeers != nullptr ? childPeers->GetCount() : 0;
+
+    if (childCount > 0)
+    {
+        _children = [[NSMutableArray alloc] initWithCapacity:childCount];
+        
+        for (int i = 0; i < childCount; ++i)
+        {
+            IAvnAutomationPeer* child;
+            
+            if (childPeers->Get(i, &child) == S_OK)
+            {
+                auto element = [AvnAccessibilityElement acquire:child];
+                [_children addObject:element];
+            }
+        }
+    }
+    else
+    {
+        _children = nil;
+    }
+}
+
+@end
+
+@implementation AvnRootAccessibilityElement
+{
+    AvnView* _owner;
+}
+
+- (AvnRootAccessibilityElement *)initWithPeer:(IAvnAutomationPeer *)peer owner:(AvnView *)owner
+{
+    self = [super initWithPeer:peer];
+    _owner = owner;
+
+    // Seems we need to raise a focus changed notification here if we have focus
+    auto focusedPeer = [self peer]->RootProvider_GetFocus();
+    id focused = [AvnAccessibilityElement acquire:focusedPeer];
+
+    if (focused)
+        NSAccessibilityPostNotification(focused, NSAccessibilityFocusedUIElementChangedNotification);
+    
+    return self;
+}
+
+- (AvnView *)ownerView
+{
+    return _owner;
+}
+
+- (id)accessibilityFocusedUIElement
+{
+    auto focusedPeer = [self peer]->RootProvider_GetFocus();
+    return [AvnAccessibilityElement acquire:focusedPeer];
+}
+
+- (id)accessibilityHitTest:(NSPoint)point
+{
+    auto clientPoint = [[_owner window] convertPointFromScreen:point];
+    auto localPoint = [_owner translateLocalPoint:ToAvnPoint(clientPoint)];
+    auto hit = [self peer]->RootProvider_GetPeerFromPoint(localPoint);
+    return [AvnAccessibilityElement acquire:hit];
+}
+
+- (id)accessibilityParent
+{
+    return _owner;
+}
+
+- (void)raiseFocusChanged
+{
+    id focused = [self accessibilityFocusedUIElement];
+    NSAccessibilityPostNotification(focused, NSAccessibilityFocusedUIElementChangedNotification);
+}
+
+// Although this method is marked as deprecated we get runtime warnings if we don't handle it.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
+- (void)accessibilityPerformAction:(NSAccessibilityActionName)action
+{
+    [_owner accessibilityPerformAction:action];
+}
+#pragma clang diagnostic pop
+
+@end
diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index 126c9aa87b..7ee7205776 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -27,17 +27,17 @@ extern IAvnMenuItem* CreateAppMenuItem();
 extern IAvnMenuItem* CreateAppMenuItemSeparator();
 extern IAvnApplicationCommands* CreateApplicationCommands();
 extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent);
-extern void SetAppMenu (NSString* appName, IAvnMenu* appMenu);
+extern void SetAppMenu(IAvnMenu *menu);
 extern void SetServicesMenu (IAvnMenu* menu);
 extern IAvnMenu* GetAppMenu ();
 extern NSMenuItem* GetAppMenuItem ();
 
-extern void InitializeAvnApp(IAvnApplicationEvents* events);
+extern void InitializeAvnApp(IAvnApplicationEvents* events, bool disableAppDelegate);
 extern NSApplicationActivationPolicy AvnDesiredActivationPolicy;
 extern NSPoint ToNSPoint (AvnPoint p);
+extern NSRect ToNSRect (AvnRect r);
 extern AvnPoint ToAvnPoint (NSPoint p);
 extern AvnPoint ConvertPointY (AvnPoint p);
-extern CGFloat PrimaryDisplayHeight();
 extern NSSize ToNSSize (AvnSize s);
 #ifdef DEBUG
 #define NSDebugLog(...) NSLog(__VA_ARGS__)
diff --git a/native/Avalonia.Native/src/OSX/controlhost.mm b/native/Avalonia.Native/src/OSX/controlhost.mm
index f8e9a3b6d1..5683a5a975 100644
--- a/native/Avalonia.Native/src/OSX/controlhost.mm
+++ b/native/Avalonia.Native/src/OSX/controlhost.mm
@@ -36,7 +36,10 @@ public:
     virtual void DestroyDefaultChild(void* child) override
     {
         // ARC will release the object for us
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wunused-value"
         (__bridge_transfer NSView*) child;
+        #pragma clang diagnostic pop
     }
 };
 
diff --git a/native/Avalonia.Native/src/OSX/cursor.mm b/native/Avalonia.Native/src/OSX/cursor.mm
index dc38294a18..8638a03531 100644
--- a/native/Avalonia.Native/src/OSX/cursor.mm
+++ b/native/Avalonia.Native/src/OSX/cursor.mm
@@ -1,6 +1,5 @@
 #include "common.h"
 #include "cursor.h"
-#include <map>
 
 class CursorFactory : public ComSingleObject<IAvnCursorFactory, &IID_IAvnCursorFactory>
 {
diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index 69f2995847..c29d4108d0 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -3,6 +3,8 @@
 #include "common.h"
 
 static NSString* s_appTitle = @"Avalonia";
+static int disableSetProcessName = 0;
+static bool disableAppDelegate = false;
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -111,11 +113,17 @@ public:
         @autoreleasepool
         {
             auto appTitle = [NSString stringWithUTF8String: utf8String];
-            
-            [[NSProcessInfo processInfo] setProcessName:appTitle];
-            
-            
-            SetProcessName(appTitle);
+            if (disableSetProcessName == 0)
+            {
+                [[NSProcessInfo processInfo] setProcessName:appTitle];
+                
+                SetProcessName(appTitle);
+            }
+            if (disableSetProcessName == 1)
+            {
+                auto rootMenu = [NSApp mainMenu];
+                [rootMenu setTitle:appTitle];
+            }
             
             return S_OK;
         }
@@ -133,6 +141,27 @@ public:
         }
     }
     
+    virtual HRESULT SetDisableSetProcessName(int disable)  override
+    {
+        START_COM_CALL;
+        
+        @autoreleasepool
+        {
+            disableSetProcessName = disable;
+            return S_OK;
+        }
+    }
+    
+    virtual HRESULT SetDisableAppDelegate(int disable) override
+    {
+        START_COM_CALL;
+        
+        @autoreleasepool {
+            disableAppDelegate = disable;
+            return S_OK;
+        }
+    }
+    
 };
 
 /// See "Using POSIX Threads in a Cocoa Application" section here:
@@ -175,7 +204,7 @@ public:
         @autoreleasepool{
             [[ThreadingInitializer new] do];
         }
-        InitializeAvnApp(events);
+        InitializeAvnApp(events, disableAppDelegate);
         return S_OK;
     };
     
@@ -335,14 +364,14 @@ public:
             return S_OK;
         }
     }
-    
+        
     virtual HRESULT SetAppMenu (IAvnMenu* appMenu) override
     {
         START_COM_CALL;
         
         @autoreleasepool
         {
-            ::SetAppMenu(s_appTitle, appMenu);
+            ::SetAppMenu(appMenu);
             return S_OK;
         }
     }
@@ -400,6 +429,15 @@ NSPoint ToNSPoint (AvnPoint p)
     return result;
 }
 
+NSRect ToNSRect (AvnRect r)
+{
+    return NSRect
+    {
+        NSPoint { r.X, r.Y },
+        NSSize { r.Width, r.Height }
+    };
+}
+
 AvnPoint ToAvnPoint (NSPoint p)
 {
     AvnPoint result;
@@ -418,7 +456,3 @@ AvnPoint ConvertPointY (AvnPoint p)
     return p;
 }
 
-CGFloat PrimaryDisplayHeight()
-{
-  return NSMaxY([[[NSScreen screens] firstObject] frame]);
-}
diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h
index 186fcf255b..ce46ac11e0 100644
--- a/native/Avalonia.Native/src/OSX/menu.h
+++ b/native/Avalonia.Native/src/OSX/menu.h
@@ -31,7 +31,6 @@ private:
     NSMenuItem* _native; // here we hold a pointer to an AvnMenuItem
     IAvnActionCallback* _callback;
     IAvnPredicateCallback* _predicate;
-    bool _isSeparator;
     bool _isCheckable;
     
 public:
diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 2dbe76bc6d..b05588a441 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -1,7 +1,6 @@
 
 #include "common.h"
 #include "menu.h"
-#include "window.h"
 #include "KeyTransform.h"
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h> /* For kVK_ constants, and TIS functions. */
@@ -74,8 +73,7 @@
 AvnAppMenuItem::AvnAppMenuItem(bool isSeparator)
 {
     _isCheckable = false;
-    _isSeparator = isSeparator;
-    
+
     if(isSeparator)
     {
         _native = [NSMenuItem separatorItem];
@@ -460,7 +458,7 @@ extern IAvnMenuItem* CreateAppMenuItemSeparator()
 static IAvnMenu* s_appMenu = nullptr;
 static NSMenuItem* s_appMenuItem = nullptr;
 
-extern void SetAppMenu (NSString* appName, IAvnMenu* menu)
+extern void SetAppMenu(IAvnMenu *menu)
 {
     s_appMenu = menu;
     
diff --git a/native/Avalonia.Native/src/OSX/rendertarget.mm b/native/Avalonia.Native/src/OSX/rendertarget.mm
index dc5c24e41e..1c22c91207 100644
--- a/native/Avalonia.Native/src/OSX/rendertarget.mm
+++ b/native/Avalonia.Native/src/OSX/rendertarget.mm
@@ -1,14 +1,10 @@
 #include "common.h"
 #include "rendertarget.h"
-#import <IOSurface/IOSurface.h>
 #import <IOSurface/IOSurfaceObjC.h>
 #import <QuartzCore/QuartzCore.h>
 
-#include <OpenGL/CGLIOSurface.h>
-#include <OpenGL/OpenGL.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/gl3.h>
-#include <OpenGL/gl3ext.h>
 
 @interface IOSurfaceHolder : NSObject
 @end
@@ -17,6 +13,7 @@
 {
     @public IOSurfaceRef surface;
     @public AvnPixelSize size;
+    @public bool hasContent;
     @public float scale;
     ComPtr<IAvnGlContext> _context;
     GLuint _framebuffer, _texture, _renderbuffer;
@@ -45,6 +42,7 @@
     self->scale = scale;
     self->size = size;
     self->_context = context;
+    self->hasContent = false;
     return self;
 }
 
@@ -96,6 +94,7 @@
     _context->MakeCurrent(release.getPPV());
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     glFlush();
+    self->hasContent = true;
 }
 
 -(void) dealloc
@@ -174,6 +173,8 @@ static IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(IOSurfaceRenderTarget* ta
         @synchronized (lock) {
             if(_layer == nil)
                 return;
+            if(!surface->hasContent)
+                return;
             [CATransaction begin];
             [_layer setContents: nil];
             if(surface != nil)
@@ -182,8 +183,11 @@ static IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(IOSurfaceRenderTarget* ta
                 [_layer setContents: (__bridge IOSurface*) surface->surface];
             }
             [CATransaction commit];
-            [CATransaction flush];
         }
+        // This can trigger event processing on the main thread
+        // which might need to lock the renderer
+        // which can cause a deadlock. So flush call is outside of the lock
+        [CATransaction flush];
     }
     else
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -217,6 +221,7 @@ static IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(IOSurfaceRenderTarget* ta
             memcpy(pSurface + y*sstride, pFb + y*fstride, wbytes);
         }
         IOSurfaceUnlock(surf, 0, nil);
+        surface->hasContent = true;
         [self updateLayer];
         return S_OK;
     }
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
deleted file mode 100644
index 1dc091a48d..0000000000
--- a/native/Avalonia.Native/src/OSX/window.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef window_h
-#define window_h
-
-class WindowBaseImpl;
-
-@interface AvnView : NSView<NSTextInputClient, NSDraggingDestination>
--(AvnView* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
--(NSEvent* _Nonnull) lastMouseDownEvent;
--(AvnPoint) translateLocalPoint:(AvnPoint)pt;
--(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
--(void) onClosed;
--(AvnPixelSize) getPixelSize;
--(AvnPlatformResizeReason) getResizeReason;
--(void) setResizeReason:(AvnPlatformResizeReason)reason;
-+ (AvnPoint)toAvnPoint:(CGPoint)p;
-@end
-
-@interface AutoFitContentView : NSView
--(AutoFitContentView* _Nonnull) initWithContent: (NSView* _Nonnull) content;
--(void) ShowTitleBar: (bool) show;
--(void) SetTitleBarHeightHint: (double) height;
--(void) SetContent: (NSView* _Nonnull) content;
--(void) ShowBlur: (bool) show;
-@end
-
-@interface AvnWindow : NSWindow <NSWindowDelegate>
-+(void) closeAll;
--(AvnWindow* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
--(void) setCanBecomeKeyAndMain;
--(void) pollModalSession: (NSModalSession _Nonnull) session;
--(void) restoreParentWindow;
--(bool) shouldTryToHandleEvents;
--(void) setEnabled: (bool) enable;
--(void) showAppMenuOnly;
--(void) showWindowMenuWithAppMenu;
--(void) applyMenu:(NSMenu* _Nullable)menu;
--(double) getScaling;
--(double) getExtendedTitleBarHeight;
--(void) setIsExtended:(bool)value;
--(bool) isDialog;
-@end
-
-struct INSWindowHolder
-{
-    virtual AvnWindow* _Nonnull GetNSWindow () = 0;
-};
-
-struct IWindowStateChanged
-{
-    virtual void WindowStateChanged () = 0;
-    virtual void StartStateTransition () = 0;
-    virtual void EndStateTransition () = 0;
-    virtual SystemDecorations Decorations () = 0;
-    virtual AvnWindowState WindowState () = 0;
-};
-
-class ResizeScope
-{
-public:
-    ResizeScope(AvnView* _Nonnull view, AvnPlatformResizeReason reason)
-    {
-        _view = view;
-        _restore = [view getResizeReason];
-        [view setResizeReason:reason];
-    }
-    
-    ~ResizeScope()
-    {
-        [_view setResizeReason:_restore];
-    }
-private:
-    AvnView* _Nonnull _view;
-    AvnPlatformResizeReason _restore;
-};
-
-#endif /* window_h */
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
deleted file mode 100644
index 40180274e1..0000000000
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ /dev/null
@@ -1,2529 +0,0 @@
-#include "common.h"
-#include "window.h"
-#include "KeyTransform.h"
-#include "cursor.h"
-#include "menu.h"
-#include <OpenGL/gl.h>
-#include "rendertarget.h"
-
-class WindowBaseImpl : public virtual ComSingleObject<IAvnWindowBase, &IID_IAvnWindowBase>, public INSWindowHolder
-{
-private:
-    NSCursor* cursor;
-
-public:
-    FORWARD_IUNKNOWN()
-    virtual ~WindowBaseImpl()
-    {
-        View = NULL;
-        Window = NULL;
-    }
-    AutoFitContentView* StandardContainer;
-    AvnView* View;
-    AvnWindow* Window;
-    ComPtr<IAvnWindowBaseEvents> BaseEvents;
-    ComPtr<IAvnGlContext> _glContext;
-    NSObject<IRenderTarget>* renderTarget;
-    AvnPoint lastPositionSet;
-    NSString* _lastTitle;
-    IAvnMenu* _mainMenu;
-    
-    bool _shown;
-    bool _inResize;
-    
-    WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl)
-    {
-        _shown = false;
-        _inResize = false;
-        _mainMenu = nullptr;
-        BaseEvents = events;
-        _glContext = gl;
-        renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext: gl];
-        View = [[AvnView alloc] initWithParent:this];
-        StandardContainer = [[AutoFitContentView new] initWithContent:View];
-
-        Window = [[AvnWindow alloc] initWithParent:this];
-        [Window setContentView: StandardContainer];
-        
-        lastPositionSet.X = 100;
-        lastPositionSet.Y = 100;
-        _lastTitle = @"";
-        
-        [Window setStyleMask:NSWindowStyleMaskBorderless];
-        [Window setBackingType:NSBackingStoreBuffered];
-        
-        [Window setOpaque:false];
-    }
-    
-    virtual HRESULT ObtainNSWindowHandle(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge void*)Window;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainNSWindowHandleRetained(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge_retained void*)Window;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainNSViewHandle(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge void*)View;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainNSViewHandleRetained(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge_retained void*)View;
-        
-        return S_OK;
-    }
-    
-    virtual AvnWindow* GetNSWindow() override
-    {
-        return Window;
-    }
-    
-    virtual HRESULT Show(bool activate, bool isDialog) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            SetPosition(lastPositionSet);
-            UpdateStyle();
-            
-            [Window setTitle:_lastTitle];
-            
-            if(ShouldTakeFocusOnShow() && activate)
-            {
-                [Window orderFront: Window];
-                [Window makeKeyAndOrderFront:Window];
-                [Window makeFirstResponder:View];
-                [NSApp activateIgnoringOtherApps:YES];
-            }
-            else
-            {
-                [Window orderFront: Window];
-            }
-            
-            _shown = true;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual bool ShouldTakeFocusOnShow()
-    {
-        return true;
-    }
-    
-    virtual HRESULT Hide () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window != nullptr)
-            {
-                [Window orderOut:Window];
-                [Window restoreParentWindow];
-            }
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Activate () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window != nullptr)
-            {
-                [Window makeKeyAndOrderFront:nil];
-                [NSApp activateIgnoringOtherApps:YES];
-            }
-        }
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT SetTopMost (bool value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [Window setLevel: value ? NSFloatingWindowLevel : NSNormalWindowLevel];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Close() override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if (Window != nullptr)
-            {
-                auto window = Window;
-                Window = nullptr;
-                
-                try{
-                    // Seems to throw sometimes on application exit.
-                    [window close];
-                }
-                catch(NSException*){}
-            }
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetClientSize(AvnSize* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-                return E_POINTER;
-            
-            auto frame = [View frame];
-            ret->Width = frame.size.width;
-            ret->Height = frame.size.height;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetFrameSize(AvnSize* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-                return E_POINTER;
-            
-            auto frame = [Window frame];
-            ret->Width = frame.size.width;
-            ret->Height = frame.size.height;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetScaling (double* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-                return E_POINTER;
-            
-            if(Window == nullptr)
-            {
-                *ret = 1;
-                return S_OK;
-            }
-            
-            *ret = [Window backingScaleFactor];
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetMinMaxSize (AvnSize minSize, AvnSize maxSize) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [Window setMinSize: ToNSSize(minSize)];
-            [Window setMaxSize: ToNSSize(maxSize)];
-        
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
-    {
-        if(_inResize)
-        {
-            return S_OK;
-        }
-        
-        _inResize = true;
-        
-        START_COM_CALL;
-        auto resizeBlock = ResizeScope(View, reason);
-        
-        @autoreleasepool
-        {
-            auto maxSize = [Window maxSize];
-            auto minSize = [Window minSize];
-            
-            if (x < minSize.width)
-            {
-                x = minSize.width;
-            }
-            
-            if (y < minSize.height)
-            {
-                y = minSize.height;
-            }
-            
-            if (x > maxSize.width)
-            {
-                x = maxSize.width;
-            }
-            
-            if (y > maxSize.height)
-            {
-                y = maxSize.height;
-            }
-            
-            @try
-            {
-                if(!_shown)
-                {
-                    BaseEvents->Resized(AvnSize{x,y}, reason);
-                }
-                
-                [Window setContentSize:NSSize{x,y}];
-                [Window invalidateShadow];
-            }
-            @finally
-            {
-                _inResize = false;
-            }
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Invalidate (AvnRect rect) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [View setNeedsDisplayInRect:[View frame]];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetMainMenu(IAvnMenu* menu) override
-    {
-        START_COM_CALL;
-        
-        _mainMenu = menu;
-        
-        auto nativeMenu = dynamic_cast<AvnAppMenu*>(menu);
-        
-        auto nsmenu = nativeMenu->GetNative();
-        
-        [Window applyMenu:nsmenu];
-        
-        if ([Window isKeyWindow])
-        {
-            [Window showWindowMenuWithAppMenu];
-        }
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT BeginMoveDrag () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            auto lastEvent = [View lastMouseDownEvent];
-            
-            if(lastEvent == nullptr)
-            {
-                return S_OK;
-            }
-            
-            [Window performWindowDragWithEvent:lastEvent];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT BeginResizeDrag (AvnWindowEdge edge) override
-    {
-        START_COM_CALL;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT GetPosition (AvnPoint* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            auto frame = [Window frame];
-            
-            ret->X = frame.origin.x;
-            ret->Y = frame.origin.y + frame.size.height;
-            
-            *ret = ConvertPointY(*ret);
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetPosition (AvnPoint point) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            lastPositionSet = point;
-            [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(point))];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT PointToClient (AvnPoint point, AvnPoint* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            point = ConvertPointY(point);
-            auto viewPoint = [Window convertScreenToBase:ToNSPoint(point)];
-            
-            *ret = [View translateLocalPoint:ToAvnPoint(viewPoint)];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT PointToScreen (AvnPoint point, AvnPoint* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            auto cocoaViewPoint =  ToNSPoint([View translateLocalPoint:point]);
-            auto cocoaScreenPoint = [Window convertBaseToScreen:cocoaViewPoint];
-            *ret = ConvertPointY(ToAvnPoint(cocoaScreenPoint));
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT ThreadSafeSetSwRenderedFrame(AvnFramebuffer* fb, IUnknown* dispose) override
-    {
-        START_COM_CALL;
-        
-        [View setSwRenderedFrame: fb dispose: dispose];
-        return S_OK;
-    }
-    
-    virtual HRESULT SetCursor(IAvnCursor* cursor) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            Cursor* avnCursor = dynamic_cast<Cursor*>(cursor);
-            this->cursor = avnCursor->GetNative();
-            UpdateCursor();
-            
-            if(avnCursor->IsHidden())
-            {
-                [NSCursor hide];
-            }
-            else
-            {
-                [NSCursor unhide];
-            }
-            
-            return S_OK;
-        }
-    }
-
-    virtual void UpdateCursor()
-    {
-        if (cursor != nil)
-        {
-            [cursor set];
-        }
-    }
-    
-    virtual HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget** ppv) override
-    {
-        START_COM_CALL;
-        
-        if(View == NULL)
-            return E_FAIL;
-        *ppv = [renderTarget createSurfaceRenderTarget];
-        return *ppv == nil ? E_FAIL : S_OK;
-    }
-    
-    virtual HRESULT CreateNativeControlHost(IAvnNativeControlHost** retOut) override
-    {
-        START_COM_CALL;
-        
-        if(View == NULL)
-            return E_FAIL;
-        *retOut = ::CreateNativeControlHost(View);
-        return S_OK;
-    }
-    
-    virtual HRESULT SetBlurEnabled (bool enable) override
-    {
-        START_COM_CALL;
-        
-        [StandardContainer ShowBlur:enable];
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
-                                              IAvnClipboard* clipboard, IAvnDndResultCallback* cb,
-                                              void* sourceHandle) override
-    {
-        START_COM_CALL;
-        
-        auto item = TryGetPasteboardItem(clipboard);
-        [item setString:@"" forType:GetAvnCustomDataType()];
-        if(item == nil)
-            return E_INVALIDARG;
-        if(View == NULL)
-            return E_FAIL;
-        
-        auto nsevent = [NSApp currentEvent];
-        auto nseventType = [nsevent type];
-        
-        // If current event isn't a mouse one (probably due to malfunctioning user app)
-        // attempt to forge a new one
-        if(!((nseventType >= NSEventTypeLeftMouseDown && nseventType <= NSEventTypeMouseExited)
-           || (nseventType >= NSEventTypeOtherMouseDown && nseventType <= NSEventTypeOtherMouseDragged)))
-        {
-            auto nspoint = [Window convertBaseToScreen: ToNSPoint(point)];
-            CGPoint cgpoint = NSPointToCGPoint(nspoint);
-            auto cgevent = CGEventCreateMouseEvent(NULL, kCGEventLeftMouseDown, cgpoint, kCGMouseButtonLeft);
-            nsevent = [NSEvent eventWithCGEvent: cgevent];
-            CFRelease(cgevent);
-        }
-        
-        auto dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter: item];
-        
-        auto dragItemImage = [NSImage imageNamed:NSImageNameMultipleDocuments];
-        NSRect dragItemRect = {(float)point.X, (float)point.Y, [dragItemImage size].width, [dragItemImage size].height};
-        [dragItem setDraggingFrame: dragItemRect contents: dragItemImage];
-        
-        int op = 0; int ieffects = (int)effects;
-        if((ieffects & (int)AvnDragDropEffects::Copy) != 0)
-            op |= NSDragOperationCopy;
-        if((ieffects & (int)AvnDragDropEffects::Link) != 0)
-            op |= NSDragOperationLink;
-        if((ieffects & (int)AvnDragDropEffects::Move) != 0)
-            op |= NSDragOperationMove;
-        [View beginDraggingSessionWithItems: @[dragItem] event: nsevent
-                                     source: CreateDraggingSource((NSDragOperation) op, cb, sourceHandle)];
-        return S_OK;
-    }
-
-    virtual bool IsDialog()
-    {
-        return false;
-    }
-    
-protected:
-    virtual NSWindowStyleMask GetStyle()
-    {
-        return NSWindowStyleMaskBorderless;
-    }
-    
-    void UpdateStyle()
-    {
-        [Window setStyleMask: GetStyle()];
-    }
-    
-public:
-    virtual void OnResized ()
-    {
-        
-    }
-};
-
-class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
-{
-private:
-    bool _canResize;
-    bool _fullScreenActive;
-    SystemDecorations _decorations;
-    AvnWindowState _lastWindowState;
-    AvnWindowState _actualWindowState;
-    bool _inSetWindowState;
-    NSRect _preZoomSize;
-    bool _transitioningWindowState;
-    bool _isClientAreaExtended;
-    bool _isDialog;
-    AvnExtendClientAreaChromeHints _extendClientHints;
-    
-    FORWARD_IUNKNOWN()
-    BEGIN_INTERFACE_MAP()
-    INHERIT_INTERFACE_MAP(WindowBaseImpl)
-    INTERFACE_MAP_ENTRY(IAvnWindow, IID_IAvnWindow)
-    END_INTERFACE_MAP()
-    virtual ~WindowImpl()
-    {
-    }
-    
-    ComPtr<IAvnWindowEvents> WindowEvents;
-    WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
-    {
-        _isClientAreaExtended = false;
-        _extendClientHints = AvnDefaultChrome;
-        _fullScreenActive = false;
-        _canResize = true;
-        _decorations = SystemDecorationsFull;
-        _transitioningWindowState = false;
-        _inSetWindowState = false;
-        _lastWindowState = Normal;
-        _actualWindowState = Normal;
-        WindowEvents = events;
-        [Window setCanBecomeKeyAndMain];
-        [Window disableCursorRects];
-        [Window setTabbingMode:NSWindowTabbingModeDisallowed];
-        [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-    }
-    
-    void HideOrShowTrafficLights ()
-    {
-        if (Window == nil)
-        {
-            return;
-        }
-        
-        for (id subview in Window.contentView.superview.subviews) {
-            if ([subview isKindOfClass:NSClassFromString(@"NSTitlebarContainerView")]) {
-                NSView *titlebarView = [subview subviews][0];
-                for (id button in titlebarView.subviews) {
-                    if ([button isKindOfClass:[NSButton class]])
-                    {
-                        if(_isClientAreaExtended)
-                        {
-                            auto wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-                            
-                            [button setHidden: !wantsChrome];
-                        }
-                        else
-                        {
-                            [button setHidden: (_decorations != SystemDecorationsFull)];
-                        }
-                        
-                        [button setWantsLayer:true];
-                    }
-                }
-            }
-        }
-    }
-    
-    virtual HRESULT Show (bool activate, bool isDialog) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _isDialog = isDialog;
-            WindowBaseImpl::Show(activate, isDialog);
-            
-            HideOrShowTrafficLights();
-            
-            return SetWindowState(_lastWindowState);
-        }
-    }
-    
-    virtual HRESULT SetEnabled (bool enable) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [Window setEnabled:enable];
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetParent (IAvnWindow* parent) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(parent == nullptr)
-                return E_POINTER;
-
-            auto cparent = dynamic_cast<WindowImpl*>(parent);
-            if(cparent == nullptr)
-                return E_INVALIDARG;
-            
-            // If one tries to show a child window with a minimized parent window, then the parent window will be
-            // restored but MacOS isn't kind enough to *tell* us that, so the window will be left in a non-interactive
-            // state. Detect this and explicitly restore the parent window ourselves to avoid this situation.
-            if (cparent->WindowState() == Minimized)
-                cparent->SetWindowState(Normal);
-            
-            [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
-            [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
-            
-            UpdateStyle();
-            
-            return S_OK;
-        }
-    }
-    
-    void StartStateTransition () override
-    {
-        _transitioningWindowState = true;
-    }
-    
-    void EndStateTransition () override
-    {
-        _transitioningWindowState = false;
-    }
-    
-    SystemDecorations Decorations () override
-    {
-        return _decorations;
-    }
-    
-    AvnWindowState WindowState () override
-    {
-        return _lastWindowState;
-    }
-    
-    void WindowStateChanged () override
-    {
-        if(_shown && !_inSetWindowState && !_transitioningWindowState)
-        {
-            AvnWindowState state;
-            GetWindowState(&state);
-            
-            if(_lastWindowState != state)
-            {
-                if(_isClientAreaExtended)
-                {
-                    if(_lastWindowState == FullScreen)
-                    {
-                        // we exited fs.
-                       if(_extendClientHints & AvnOSXThickTitleBar)
-                       {
-                          Window.toolbar = [NSToolbar new];
-                          Window.toolbar.showsBaselineSeparator = false;
-                       }
-
-                       [Window setTitlebarAppearsTransparent:true];
-
-                       [StandardContainer setFrameSize: StandardContainer.frame.size];
-                    }
-                    else if(state == FullScreen)
-                    {
-                        // we entered fs.
-                        if(_extendClientHints & AvnOSXThickTitleBar)
-                        {
-                            Window.toolbar = nullptr;
-                        }
-                       
-                        [Window setTitlebarAppearsTransparent:false];
-                        
-                        [StandardContainer setFrameSize: StandardContainer.frame.size];
-                    }
-                }
-                
-                _lastWindowState = state;
-                _actualWindowState = state;
-                WindowEvents->WindowStateChanged(state);
-            }
-        }
-    }
-    
-    bool UndecoratedIsMaximized ()
-    {
-        auto windowSize = [Window frame];
-        auto available = [Window screen].visibleFrame;
-        return CGRectEqualToRect(windowSize, available);
-    }
-    
-    bool IsZoomed ()
-    {
-        return _decorations == SystemDecorationsFull ? [Window isZoomed] : UndecoratedIsMaximized();
-    }
-    
-    void DoZoom()
-    {
-        switch (_decorations)
-        {
-            case SystemDecorationsNone:
-            case SystemDecorationsBorderOnly:
-                [Window setFrame:[Window screen].visibleFrame display:true];
-                break;
-
-            
-            case SystemDecorationsFull:
-                [Window performZoom:Window];
-                break;
-        }
-    }
-    
-    virtual HRESULT SetCanResize(bool value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _canResize = value;
-            UpdateStyle();
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetDecorations(SystemDecorations value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            auto currentWindowState = _lastWindowState;
-            _decorations = value;
-            
-            if(_fullScreenActive)
-            {
-                return S_OK;
-            }
-            
-            UpdateStyle();
-            
-            HideOrShowTrafficLights();
-
-            switch (_decorations)
-            {
-                case SystemDecorationsNone:
-                    [Window setHasShadow:NO];
-                    [Window setTitleVisibility:NSWindowTitleHidden];
-                    [Window setTitlebarAppearsTransparent:YES];
-                    
-                    if(currentWindowState == Maximized)
-                    {
-                        if(!UndecoratedIsMaximized())
-                        {
-                            DoZoom();
-                        }
-                    }
-                    break;
-
-                case SystemDecorationsBorderOnly:
-                    [Window setHasShadow:YES];
-                    [Window setTitleVisibility:NSWindowTitleHidden];
-                    [Window setTitlebarAppearsTransparent:YES];
-                    
-                    if(currentWindowState == Maximized)
-                    {
-                        if(!UndecoratedIsMaximized())
-                        {
-                            DoZoom();
-                        }
-                    }
-                    break;
-
-                case SystemDecorationsFull:
-                    [Window setHasShadow:YES];
-                    [Window setTitleVisibility:NSWindowTitleVisible];
-                    [Window setTitlebarAppearsTransparent:NO];
-                    [Window setTitle:_lastTitle];
-                    
-                    if(currentWindowState == Maximized)
-                    {
-                        auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
-                        
-                        [View setFrameSize:newFrame];
-                    }
-                    break;
-            }
-
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetTitle (char* utf8title) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _lastTitle = [NSString stringWithUTF8String:(const char*)utf8title];
-            [Window setTitle:_lastTitle];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetTitleBarColor(AvnColor color) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            float a = (float)color.Alpha / 255.0f;
-            float r = (float)color.Red / 255.0f;
-            float g = (float)color.Green / 255.0f;
-            float b = (float)color.Blue / 255.0f;
-            
-            auto nscolor = [NSColor colorWithSRGBRed:r green:g blue:b alpha:a];
-            
-            // Based on the titlebar color we have to choose either light or dark
-            // OSX doesnt let you set a foreground color for titlebar.
-            if ((r*0.299 + g*0.587 + b*0.114) > 186.0f / 255.0f)
-            {
-                [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
-            }
-            else
-            {
-                [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantDark]];
-            }
-            
-            [Window setTitlebarAppearsTransparent:true];
-            [Window setBackgroundColor:nscolor];
-        }
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT GetWindowState (AvnWindowState*ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            if(([Window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen)
-            {
-                *ret = FullScreen;
-                return S_OK;
-            }
-            
-            if([Window isMiniaturized])
-            {
-                *ret = Minimized;
-                return S_OK;
-            }
-            
-            if(IsZoomed())
-            {
-                *ret = Maximized;
-                return S_OK;
-            }
-            
-            *ret = Normal;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT TakeFocusFromChildren () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window == nil)
-                return S_OK;
-            if([Window isKeyWindow])
-                [Window makeFirstResponder: View];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetExtendClientArea (bool enable) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _isClientAreaExtended = enable;
-            
-            if(enable)
-            {
-                Window.titleVisibility = NSWindowTitleHidden;
-                
-                [Window setTitlebarAppearsTransparent:true];
-                
-                auto wantsTitleBar = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-                
-                if (wantsTitleBar)
-                {
-                    [StandardContainer ShowTitleBar:true];
-                }
-                else
-                {
-                    [StandardContainer ShowTitleBar:false];
-                }
-                
-                if(_extendClientHints & AvnOSXThickTitleBar)
-                {
-                    Window.toolbar = [NSToolbar new];
-                    Window.toolbar.showsBaselineSeparator = false;
-                }
-                else
-                {
-                    Window.toolbar = nullptr;
-                }
-            }
-            else
-            {
-                Window.titleVisibility = NSWindowTitleVisible;
-                Window.toolbar = nullptr;
-                [Window setTitlebarAppearsTransparent:false];
-                View.layer.zPosition = 0;
-            }
-            
-            [Window setIsExtended:enable];
-            
-            HideOrShowTrafficLights();
-            
-            UpdateStyle();
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetExtendClientAreaHints (AvnExtendClientAreaChromeHints hints) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _extendClientHints = hints;
-            
-            SetExtendClientArea(_isClientAreaExtended);
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetExtendTitleBarHeight (double*ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            *ret = [Window getExtendedTitleBarHeight];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetExtendTitleBarHeight (double value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [StandardContainer SetTitleBarHeightHint:value];
-            return S_OK;
-        }
-    }
-    
-    void EnterFullScreenMode ()
-    {
-        _fullScreenActive = true;
-        
-        [Window setTitle:_lastTitle];
-        [Window toggleFullScreen:nullptr];
-    }
-    
-    void ExitFullScreenMode ()
-    {
-        [Window toggleFullScreen:nullptr];
-        
-        _fullScreenActive = false;
-        
-        SetDecorations(_decorations);
-    }
-    
-    virtual HRESULT SetWindowState (AvnWindowState state) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window == nullptr)
-            {
-                return  S_OK;
-            }
-            
-            if(_actualWindowState == state)
-            {
-                return S_OK;
-            }
-            
-            _inSetWindowState = true;
-            
-            auto currentState = _actualWindowState;
-            _lastWindowState = state;
-            
-            if(currentState == Normal)
-            {
-                _preZoomSize = [Window frame];
-            }
-            
-            if(_shown)
-            {
-                switch (state) {
-                    case Maximized:
-                        if(currentState == FullScreen)
-                        {
-                            ExitFullScreenMode();
-                        }
-                        
-                        lastPositionSet.X = 0;
-                        lastPositionSet.Y = 0;
-                        
-                        if([Window isMiniaturized])
-                        {
-                            [Window deminiaturize:Window];
-                        }
-                        
-                        if(!IsZoomed())
-                        {
-                            DoZoom();
-                        }
-                        break;
-                        
-                    case Minimized:
-                        if(currentState == FullScreen)
-                        {
-                            ExitFullScreenMode();
-                        }
-                        else
-                        {
-                            [Window miniaturize:Window];
-                        }
-                        break;
-                        
-                    case FullScreen:
-                        if([Window isMiniaturized])
-                        {
-                            [Window deminiaturize:Window];
-                        }
-                        
-                        EnterFullScreenMode();
-                        break;
-                        
-                    case Normal:
-                        if([Window isMiniaturized])
-                        {
-                            [Window deminiaturize:Window];
-                        }
-                        
-                        if(currentState == FullScreen)
-                        {
-                            ExitFullScreenMode();
-                        }
-                        
-                        if(IsZoomed())
-                        {
-                            if(_decorations == SystemDecorationsFull)
-                            {
-                                DoZoom();
-                            }
-                            else
-                            {
-                                [Window setFrame:_preZoomSize display:true];
-                                auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
-                                
-                                [View setFrameSize:newFrame];
-                            }
-                            
-                        }
-                        break;
-                }
-                
-                _actualWindowState = _lastWindowState;
-                WindowEvents->WindowStateChanged(_actualWindowState);
-            }
-            
-            
-            _inSetWindowState = false;
-            
-            return S_OK;
-        }
-    }
-
-    virtual void OnResized () override
-    {
-        if(_shown && !_inSetWindowState && !_transitioningWindowState)
-        {
-            WindowStateChanged();
-        }
-    }
-    
-    virtual bool IsDialog() override
-    {
-        return _isDialog;
-    }
-    
-protected:
-    virtual NSWindowStyleMask GetStyle() override
-    {
-        unsigned long s = NSWindowStyleMaskBorderless;
-
-        switch (_decorations)
-        {
-            case SystemDecorationsNone:
-                s = s | NSWindowStyleMaskFullSizeContentView;
-                break;
-
-            case SystemDecorationsBorderOnly:
-                s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
-                break;
-
-            case SystemDecorationsFull:
-                s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskBorderless;
-                
-                if(_canResize)
-                {
-                    s = s | NSWindowStyleMaskResizable;
-                }
-                break;
-        }
-
-        if([Window parentWindow] == nullptr)
-        {
-            s |= NSWindowStyleMaskMiniaturizable;
-        }
-        
-        if(_isClientAreaExtended)
-        {
-            s |= NSWindowStyleMaskFullSizeContentView | NSWindowStyleMaskTexturedBackground;
-        }
-        return s;
-    }
-};
-
-NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEventTrackingRunLoopMode, NSModalPanelRunLoopMode, NSRunLoopCommonModes, NSConnectionReplyMode, nil];
-
-@implementation AutoFitContentView
-{
-    NSVisualEffectView* _titleBarMaterial;
-    NSBox* _titleBarUnderline;
-    NSView* _content;
-    NSVisualEffectView* _blurBehind;
-    double _titleBarHeightHint;
-    bool _settingSize;
-}
-
--(AutoFitContentView* _Nonnull) initWithContent:(NSView *)content
-{
-    _titleBarHeightHint = -1;
-    _content = content;
-    _settingSize = false;
-
-    [self setAutoresizesSubviews:true];
-    [self setWantsLayer:true];
-    
-    _titleBarMaterial = [NSVisualEffectView new];
-    [_titleBarMaterial setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
-    [_titleBarMaterial setMaterial:NSVisualEffectMaterialTitlebar];
-    [_titleBarMaterial setWantsLayer:true];
-    _titleBarMaterial.hidden = true;
-    
-    _titleBarUnderline = [NSBox new];
-    _titleBarUnderline.boxType = NSBoxSeparator;
-    _titleBarUnderline.fillColor = [NSColor underPageBackgroundColor];
-    _titleBarUnderline.hidden = true;
-    
-    [self addSubview:_titleBarMaterial];
-    [self addSubview:_titleBarUnderline];
-    
-    _blurBehind = [NSVisualEffectView new];
-    [_blurBehind setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-    [_blurBehind setMaterial:NSVisualEffectMaterialLight];
-    [_blurBehind setWantsLayer:true];
-    _blurBehind.hidden = true;
-    
-    [_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    [_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    
-    [self addSubview:_blurBehind];
-    [self addSubview:_content];
-    
-    [self setWantsLayer:true];
-    return self;
-}
-
--(void) ShowBlur:(bool)show
-{
-    _blurBehind.hidden = !show;
-}
-
--(void) ShowTitleBar: (bool) show
-{
-    _titleBarMaterial.hidden = !show;
-    _titleBarUnderline.hidden = !show;
-}
-
--(void) SetTitleBarHeightHint: (double) height
-{
-    _titleBarHeightHint = height;
-    
-    [self setFrameSize:self.frame.size];
-}
-
--(void)setFrameSize:(NSSize)newSize
-{
-    if(_settingSize)
-    {
-        return;
-    }
-    
-    _settingSize = true;
-    [super setFrameSize:newSize];
-    
-    auto window = objc_cast<AvnWindow>([self window]);
-    
-    // TODO get actual titlebar size
-    
-    double height = _titleBarHeightHint == -1 ? [window getExtendedTitleBarHeight] : _titleBarHeightHint;
-    
-    NSRect tbar;
-    tbar.origin.x = 0;
-    tbar.origin.y = newSize.height - height;
-    tbar.size.width = newSize.width;
-    tbar.size.height = height;
-    
-    [_titleBarMaterial setFrame:tbar];
-    tbar.size.height = height < 1 ? 0 : 1;
-    [_titleBarUnderline setFrame:tbar];
-
-    _settingSize = false;
-}
-
--(void) SetContent: (NSView* _Nonnull) content
-{
-    if(content != nullptr)
-    {
-        [content removeFromSuperview];
-        [self addSubview:content];
-        _content = content;
-    }
-}
-@end
-
-@implementation AvnView
-{
-    ComPtr<WindowBaseImpl> _parent;
-    ComPtr<IUnknown> _swRenderedFrame;
-    AvnFramebuffer _swRenderedFrameBuffer;
-    bool _queuedDisplayFromThread;
-    NSTrackingArea* _area;
-    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed, _isMouseOver;
-    AvnInputModifiers _modifierState;
-    NSEvent* _lastMouseDownEvent;
-    bool _lastKeyHandled;
-    AvnPixelSize _lastPixelSize;
-    NSObject<IRenderTarget>* _renderTarget;
-    AvnPlatformResizeReason _resizeReason;
-}
-
-- (void)onClosed
-{
-    @synchronized (self)
-    {
-        _parent = nullptr;
-    }
-}
-
--(AvnPixelSize) getPixelSize
-{
-    return _lastPixelSize;
-}
-
-- (NSEvent*) lastMouseDownEvent
-{
-    return _lastMouseDownEvent;
-}
-
-- (void) updateRenderTarget
-{
-    [_renderTarget resize:_lastPixelSize withScale: [[self window] backingScaleFactor]];
-    [self setNeedsDisplayInRect:[self frame]];
-}
-
--(AvnView*)  initWithParent: (WindowBaseImpl*) parent
-{
-    self = [super init];
-    _renderTarget = parent->renderTarget;
-    [self setWantsLayer:YES];
-    [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize];
-    
-    _parent = parent;
-    _area = nullptr;
-    _lastPixelSize.Height = 100;
-    _lastPixelSize.Width = 100;
-    [self registerForDraggedTypes: @[@"public.data", GetAvnCustomDataType()]];
-    
-    _modifierState = AvnInputModifiersNone;
-    return self;
-}
-
-- (BOOL)isFlipped
-{
-    return YES;
-}
-
-- (BOOL)wantsUpdateLayer
-{
-    return YES;
-}
-
-- (void)setLayer:(CALayer *)layer
-{
-    [_renderTarget setNewLayer: layer];
-    [super setLayer: layer];
-}
-
-- (BOOL)isOpaque
-{
-    return YES;
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return true;
-}
-
-- (BOOL)acceptsFirstMouse:(NSEvent *)event
-{
-    return true;
-}
-
-- (BOOL)canBecomeKeyView
-{
-    return true;
-}
-
--(void)setFrameSize:(NSSize)newSize
-{
-    [super setFrameSize:newSize];
-    
-    if(_area != nullptr)
-    {
-        [self removeTrackingArea:_area];
-        _area = nullptr;
-    }
-
-    if (_parent == nullptr)
-    {
-        return;
-    }
-
-    NSRect rect = NSZeroRect;
-    rect.size = newSize;
-    
-    NSTrackingAreaOptions options = NSTrackingActiveAlways | NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingEnabledDuringMouseDrag;
-    _area = [[NSTrackingArea alloc] initWithRect:rect options:options owner:self userInfo:nullptr];
-    [self addTrackingArea:_area];
-    
-    _parent->UpdateCursor();
-    
-    auto fsize = [self convertSizeToBacking: [self frame].size];
-    
-    if(_lastPixelSize.Width != (int)fsize.width || _lastPixelSize.Height != (int)fsize.height)
-    {
-        _lastPixelSize.Width = (int)fsize.width;
-        _lastPixelSize.Height = (int)fsize.height;
-        [self updateRenderTarget];
-    
-        auto reason = [self inLiveResize] ? ResizeUser : _resizeReason;
-        _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height}, reason);
-    }
-}
-
-- (void)updateLayer
-{
-    AvnInsidePotentialDeadlock deadlock;
-    if (_parent == nullptr)
-    {
-        return;
-    }
-    
-    _parent->BaseEvents->RunRenderPriorityJobs();
-    
-    if (_parent == nullptr)
-    {
-        return;
-    }
-        
-    _parent->BaseEvents->Paint();
-}
-
-- (void)drawRect:(NSRect)dirtyRect
-{
-    return;
-}
-
--(void) setSwRenderedFrame: (AvnFramebuffer*) fb dispose: (IUnknown*) dispose
-{
-    @autoreleasepool {
-        [_renderTarget setSwFrame:fb];
-        dispose->Release();
-    }
-}
-
-- (AvnPoint) translateLocalPoint:(AvnPoint)pt
-{
-    pt.Y = [self bounds].size.height - pt.Y;
-    return pt;
-}
-
-+ (AvnPoint)toAvnPoint:(CGPoint)p
-{
-    AvnPoint result;
-    
-    result.X = p.x;
-    result.Y = p.y;
-    
-    return result;
-}
-
-- (void) viewDidChangeBackingProperties
-{
-    auto fsize = [self convertSizeToBacking: [self frame].size];
-    _lastPixelSize.Width = (int)fsize.width;
-    _lastPixelSize.Height = (int)fsize.height;
-    [self updateRenderTarget];
-    
-    if(_parent != nullptr)
-    {
-        _parent->BaseEvents->ScalingChanged([_parent->Window backingScaleFactor]);
-    }
-    
-    [super viewDidChangeBackingProperties];
-}
-
-- (bool) ignoreUserInput:(bool)trigerInputWhenDisabled
-{
-    auto parentWindow = objc_cast<AvnWindow>([self window]);
-    
-    if(parentWindow == nil || ![parentWindow shouldTryToHandleEvents])
-    {
-        if(trigerInputWhenDisabled)
-        {
-            auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
-            
-            if(window != nullptr)
-            {
-                window->WindowEvents->GotInputWhenDisabled();
-            }
-        }
-        
-        return TRUE;
-    }
-    
-    return FALSE;
-}
-
-- (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
-{
-    bool triggerInputWhenDisabled = type != Move;
-    
-    if([self ignoreUserInput: triggerInputWhenDisabled])
-    {
-        return;
-    }
-    
-    auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
-    auto avnPoint = [AvnView toAvnPoint:localPoint];
-    auto point = [self translateLocalPoint:avnPoint];
-    AvnVector delta;
-    
-    if(type == Wheel)
-    {
-        auto speed = 5;
-        
-        if([event hasPreciseScrollingDeltas])
-        {
-            speed = 50;
-        }
-        
-        delta.X = [event scrollingDeltaX] / speed;
-        delta.Y = [event scrollingDeltaY] / speed;
-        
-        if(delta.X == 0 && delta.Y == 0)
-        {
-            return;
-        }
-    }
-    else if (type == Magnify)
-    {
-        delta.X = delta.Y = [event magnification];
-    }
-    else if (type == Rotate)
-    {
-        delta.X = delta.Y = [event rotation];
-    }
-    else if (type == Swipe)
-    {
-        delta.X = [event deltaX];
-        delta.Y = [event deltaY];
-    }
-    
-    auto timestamp = [event timestamp] * 1000;
-    auto modifiers = [self getModifiers:[event modifierFlags]];
-    
-    if(type != AvnRawMouseEventType::Move ||
-       (
-           [self window] != nil &&
-           (
-                [[self window] firstResponder] == nil
-                || ![[[self window] firstResponder] isKindOfClass: [NSView class]]
-           )
-       )
-    )
-        [self becomeFirstResponder];
-    
-    if(_parent != nullptr)
-    {
-        _parent->BaseEvents->RawMouseEvent(type, timestamp, modifiers, point, delta);
-    }
-    
-    [super mouseMoved:event];
-}
-
-- (BOOL) resignFirstResponder
-{
-    _parent->BaseEvents->LostFocus();
-    return YES;
-}
-
-- (void)mouseMoved:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-}
-
-- (void)mouseDown:(NSEvent *)event
-{
-    _isLeftPressed = true;
-    _lastMouseDownEvent = event;
-    [self mouseEvent:event withType:LeftButtonDown];
-}
-
-- (void)otherMouseDown:(NSEvent *)event
-{
-    _lastMouseDownEvent = event;
-
-    switch(event.buttonNumber)
-    {
-        case 2:
-        case 3:
-            _isMiddlePressed = true;
-            [self mouseEvent:event withType:MiddleButtonDown];
-            break;
-        case 4:
-            _isXButton1Pressed = true;
-            [self mouseEvent:event withType:XButton1Down];
-            break;
-        case 5:
-            _isXButton2Pressed = true;
-            [self mouseEvent:event withType:XButton2Down];
-            break;
-    }
-}
-
-- (void)rightMouseDown:(NSEvent *)event
-{
-    _isRightPressed = true;
-    _lastMouseDownEvent = event;
-    [self mouseEvent:event withType:RightButtonDown];
-}
-
-- (void)mouseUp:(NSEvent *)event
-{
-    _isLeftPressed = false;
-    [self mouseEvent:event withType:LeftButtonUp];
-}
-
-- (void)otherMouseUp:(NSEvent *)event
-{
-    switch(event.buttonNumber)
-    {
-        case 2:
-        case 3:
-            _isMiddlePressed = false;
-            [self mouseEvent:event withType:MiddleButtonUp];
-            break;
-        case 4:
-            _isXButton1Pressed = false;
-            [self mouseEvent:event withType:XButton1Up];
-            break;
-        case 5:
-            _isXButton2Pressed = false;
-            [self mouseEvent:event withType:XButton2Up];
-            break;
-    }
-}
-
-- (void)rightMouseUp:(NSEvent *)event
-{
-    _isRightPressed = false;
-    [self mouseEvent:event withType:RightButtonUp];
-}
-
-- (void)mouseDragged:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-    [super mouseDragged:event];
-}
-
-- (void)otherMouseDragged:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-    [super otherMouseDragged:event];
-}
-
-- (void)rightMouseDragged:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-    [super rightMouseDragged:event];
-}
-
-- (void)scrollWheel:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Wheel];
-    [super scrollWheel:event];
-}
-
-- (void)magnifyWithEvent:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Magnify];
-    [super magnifyWithEvent:event];
-}
-
-- (void)rotateWithEvent:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Rotate];
-    [super rotateWithEvent:event];
-}
-
-- (void)swipeWithEvent:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Swipe];
-    [super swipeWithEvent:event];
-}
-
-- (void)mouseEntered:(NSEvent *)event
-{
-    _isMouseOver = true;
-    [super mouseEntered:event];
-}
-
-- (void)mouseExited:(NSEvent *)event
-{
-    _isMouseOver = false;
-    [self mouseEvent:event withType:LeaveWindow];
-    [super mouseExited:event];
-} 
-
-- (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
-{
-    if([self ignoreUserInput: false])
-    {
-        return;
-    }
-    
-    auto key = s_KeyMap[[event keyCode]];
-    
-    auto timestamp = [event timestamp] * 1000;
-    auto modifiers = [self getModifiers:[event modifierFlags]];
-     
-    if(_parent != nullptr)
-    {
-        _lastKeyHandled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key);
-    }
-}
-
-- (BOOL)performKeyEquivalent:(NSEvent *)event
-{
-    bool result = _lastKeyHandled;
-    
-    _lastKeyHandled = false;
-    
-    return result;
-}
-
-- (void)flagsChanged:(NSEvent *)event
-{
-    auto newModifierState = [self getModifiers:[event modifierFlags]];
-    
-    bool isAltCurrentlyPressed = (_modifierState & Alt) == Alt;
-    bool isControlCurrentlyPressed = (_modifierState & Control) == Control;
-    bool isShiftCurrentlyPressed = (_modifierState & Shift) == Shift;
-    bool isCommandCurrentlyPressed = (_modifierState & Windows) == Windows;
-    
-    bool isAltPressed = (newModifierState & Alt) == Alt;
-    bool isControlPressed = (newModifierState & Control) == Control;
-    bool isShiftPressed = (newModifierState & Shift) == Shift;
-    bool isCommandPressed = (newModifierState & Windows) == Windows;
-    
-    
-    if (isAltPressed && !isAltCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if (isAltCurrentlyPressed && !isAltPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    if (isControlPressed && !isControlCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if (isControlCurrentlyPressed && !isControlPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    if (isShiftPressed && !isShiftCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if(isShiftCurrentlyPressed && !isShiftPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    if(isCommandPressed && !isCommandCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if(isCommandCurrentlyPressed && ! isCommandPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    _modifierState = newModifierState;
-    
-    [[self inputContext] handleEvent:event];
-    [super flagsChanged:event];
-}
-
-- (void)keyDown:(NSEvent *)event
-{
-    [self keyboardEvent:event withType:KeyDown];
-    [[self inputContext] handleEvent:event];
-    [super keyDown:event];
-}
-
-- (void)keyUp:(NSEvent *)event
-{
-    [self keyboardEvent:event withType:KeyUp];
-    [super keyUp:event];
-}
-
-- (AvnInputModifiers)getModifiers:(NSEventModifierFlags)mod
-{
-    unsigned int rv = 0;
-    
-    if (mod & NSEventModifierFlagControl)
-        rv |= Control;
-    if (mod & NSEventModifierFlagShift)
-        rv |= Shift;
-    if (mod & NSEventModifierFlagOption)
-        rv |= Alt;
-    if (mod & NSEventModifierFlagCommand)
-        rv |= Windows;
-    
-    if (_isLeftPressed)
-        rv |= LeftMouseButton;
-    if (_isMiddlePressed)
-        rv |= MiddleMouseButton;
-    if (_isRightPressed)
-        rv |= RightMouseButton;
-    if (_isXButton1Pressed)
-        rv |= XButton1MouseButton;
-    if (_isXButton2Pressed)
-        rv |= XButton2MouseButton;
-    
-    return (AvnInputModifiers)rv;
-}
-
-- (BOOL)hasMarkedText
-{
-    return _lastKeyHandled;
-}
-
-- (NSRange)markedRange
-{
-    return NSMakeRange(NSNotFound, 0);
-}
-
-- (NSRange)selectedRange
-{
-    return NSMakeRange(NSNotFound, 0);
-}
-
-- (void)setMarkedText:(id)string selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
-{
-    
-}
-
-- (void)unmarkText
-{
-    
-}
-
-- (NSArray<NSString *> *)validAttributesForMarkedText
-{
-    return [NSArray new];
-}
-
-- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)range actualRange:(NSRangePointer)actualRange
-{
-    return [NSAttributedString new];
-}
-
-- (void)insertText:(id)string replacementRange:(NSRange)replacementRange
-{
-    if(!_lastKeyHandled)
-    {
-        if(_parent != nullptr)
-        {
-            _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]);
-        }
-    }
-}
-
-- (NSUInteger)characterIndexForPoint:(NSPoint)point
-{
-    return 0;
-}
-
-- (NSRect)firstRectForCharacterRange:(NSRange)range actualRange:(NSRangePointer)actualRange
-{
-    CGRect result;
-    
-    return result;
-}
-
-- (NSDragOperation)triggerAvnDragEvent: (AvnDragEventType) type info: (id <NSDraggingInfo>)info
-{
-    auto localPoint = [self convertPoint:[info draggingLocation] toView:self];
-    auto avnPoint = [AvnView toAvnPoint:localPoint];
-    auto point = [self translateLocalPoint:avnPoint];
-    auto modifiers = [self getModifiers:[[NSApp currentEvent] modifierFlags]];
-    NSDragOperation nsop = [info draggingSourceOperationMask];
-   
-        auto effects = ConvertDragDropEffects(nsop);
-    int reffects = (int)_parent->BaseEvents
-    ->DragEvent(type, point, modifiers, effects,
-                CreateClipboard([info draggingPasteboard], nil),
-                GetAvnDataObjectHandleFromDraggingInfo(info));
-    
-    NSDragOperation ret = 0;
-    
-    // Ensure that the managed part didn't add any new effects
-    reffects = (int)effects & (int)reffects;
-    
-    // OSX requires exactly one operation
-    if((reffects & (int)AvnDragDropEffects::Copy) != 0)
-        ret = NSDragOperationCopy;
-    else if((reffects & (int)AvnDragDropEffects::Move) != 0)
-        ret = NSDragOperationMove;
-    else if((reffects & (int)AvnDragDropEffects::Link) != 0)
-        ret = NSDragOperationLink;
-    if(ret == 0)
-        ret = NSDragOperationNone;
-    return ret;
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Enter info:sender];
-}
-
-- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender];
-}
-
-- (void)draggingExited:(id <NSDraggingInfo>)sender
-{
-    [self triggerAvnDragEvent: AvnDragEventType::Leave info:sender];
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender] != NSDragOperationNone;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Drop info:sender] != NSDragOperationNone;
-}
-
-- (void)concludeDragOperation:(nullable id <NSDraggingInfo>)sender
-{
-    
-}
-
-- (AvnPlatformResizeReason)getResizeReason
-{
-    return _resizeReason;
-}
-
-- (void)setResizeReason:(AvnPlatformResizeReason)reason
-{
-    _resizeReason = reason;
-}
-
-@end
-
-
-@implementation AvnWindow
-{
-    ComPtr<WindowBaseImpl> _parent;
-    bool _canBecomeKeyAndMain;
-    bool _closed;
-    bool _isEnabled;
-    bool _isExtended;
-    AvnMenu* _menu;
-    double _lastScaling;
-}
-
--(void) setIsExtended:(bool)value;
-{
-    _isExtended = value;
-}
-
--(bool) isDialog
-{
-    return _parent->IsDialog();
-}
-
--(double) getScaling
-{
-    return _lastScaling;
-}
-
--(double) getExtendedTitleBarHeight
-{
-    if(_isExtended)
-    {
-        for (id subview in self.contentView.superview.subviews)
-        {
-            if ([subview isKindOfClass:NSClassFromString(@"NSTitlebarContainerView")])
-            {
-                NSView *titlebarView = [subview subviews][0];
-
-                return (double)titlebarView.frame.size.height;
-            }
-        }
-
-        return -1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-+(void)closeAll
-{
-    [[NSApplication sharedApplication] terminate:self];
-}
-
-- (void)performClose:(id)sender
-{
-    if([[self delegate] respondsToSelector:@selector(windowShouldClose:)])
-    {
-        if(![[self delegate] windowShouldClose:self]) return;
-    }
-    else if([self respondsToSelector:@selector(windowShouldClose:)])
-    {
-        if(![self windowShouldClose:self]) return;
-    }
-
-    [self close];
-}
-
-- (void)pollModalSession:(nonnull NSModalSession)session
-{
-    auto response = [NSApp runModalSession:session];
-    
-    if(response == NSModalResponseContinue)
-    {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self pollModalSession:session];
-        });
-    }
-    else if (!_closed)
-    {
-        [self orderOut:self];
-        [NSApp endModalSession:session];
-    }
-}
-
--(void) showWindowMenuWithAppMenu
-{
-    if(_menu != nullptr)
-    {
-        auto appMenuItem = ::GetAppMenuItem();
-        
-        if(appMenuItem != nullptr)
-        {
-            auto appMenu = [appMenuItem menu];
-            
-            [appMenu removeItem:appMenuItem];
-            
-            [_menu insertItem:appMenuItem atIndex:0];
-            
-            [_menu setHasGlobalMenuItem:true];
-        }
-        
-        [NSApp setMenu:_menu];
-    }
-    else
-    {
-        [self showAppMenuOnly];
-    }
-}
-
--(void) showAppMenuOnly
-{
-    auto appMenuItem = ::GetAppMenuItem();
-    
-    if(appMenuItem != nullptr)
-    {
-        auto appMenu = ::GetAppMenu();
-        
-        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
-        
-        [[appMenuItem menu] removeItem:appMenuItem];
-        
-        if(_menu != nullptr)
-        {
-            [_menu setHasGlobalMenuItem:false];
-        }
-        
-        [nativeAppMenu->GetNative() addItem:appMenuItem];
-        
-        [NSApp setMenu:nativeAppMenu->GetNative()];
-    }
-    else
-    {
-        [NSApp setMenu:nullptr];
-    }
-}
-
--(void) applyMenu:(AvnMenu *)menu
-{
-    if(menu == nullptr)
-    {
-        menu = [AvnMenu new];
-    }
-    
-    _menu = menu;
-}
-
--(void) setCanBecomeKeyAndMain
-{
-    _canBecomeKeyAndMain = true;
-}
-
--(AvnWindow*)  initWithParent: (WindowBaseImpl*) parent
-{
-    self = [super init];
-    [self setReleasedWhenClosed:false];
-    _parent = parent;
-    [self setDelegate:self];
-    _closed = false;
-    _isEnabled = true;
-    
-    _lastScaling = [self backingScaleFactor];
-    [self setOpaque:NO];
-    [self setBackgroundColor: [NSColor clearColor]];
-    _isExtended = false;
-    return self;
-}
-
-- (BOOL)windowShouldClose:(NSWindow *)sender
-{
-    auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
-    
-    if(window != nullptr)
-    {
-        return !window->WindowEvents->Closing();
-    }
-    
-    return true;
-}
-
-- (void)windowDidChangeBackingProperties:(NSNotification *)notification
-{
-    _lastScaling = [self backingScaleFactor];
-}
-
-- (void)windowWillClose:(NSNotification *)notification
-{
-    _closed = true;
-    if(_parent)
-    {
-        ComPtr<WindowBaseImpl> parent = _parent;
-        _parent = NULL;
-        [self restoreParentWindow];
-        parent->BaseEvents->Closed();
-        [parent->View onClosed];
-    }
-}
-
--(BOOL)canBecomeKeyWindow
-{
-    if (_canBecomeKeyAndMain)
-    {
-        // If the window has a child window being shown as a dialog then don't allow it to become the key window.
-        for(NSWindow* uch in [self childWindows])
-        {
-            auto ch = objc_cast<AvnWindow>(uch);
-            if(ch == nil)
-                continue;
-            if (ch.isDialog)
-                return false;
-        }
-        
-        return true;
-    }
-    
-    return false;
-}
-
--(BOOL)canBecomeMainWindow
-{
-    return _canBecomeKeyAndMain;
-}
-
--(bool)shouldTryToHandleEvents
-{
-    return _isEnabled;
-}
-
--(void) setEnabled:(bool)enable
-{
-    _isEnabled = enable;
-}
-
--(void)becomeKeyWindow
-{
-    [self showWindowMenuWithAppMenu];
-    
-    if(_parent != nullptr)
-    {
-        _parent->BaseEvents->Activated();
-    }
-
-    [super becomeKeyWindow];
-}
-
--(void) restoreParentWindow;
-{
-    auto parent = objc_cast<AvnWindow>([self parentWindow]);
-    if(parent != nil)
-    {
-        [parent removeChildWindow:self];
-    }
-}
-
-- (void)windowDidMiniaturize:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowDidDeminiaturize:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowDidResize:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowWillExitFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->StartStateTransition();
-    }
-}
-
-- (void)windowDidExitFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->EndStateTransition();
-        
-        if(parent->Decorations() != SystemDecorationsFull && parent->WindowState() == Maximized)
-        {
-            NSRect screenRect = [[self screen] visibleFrame];
-            [self setFrame:screenRect display:YES];
-        }
-        
-        if(parent->WindowState() == Minimized)
-        {
-            [self miniaturize:nullptr];
-        }
-        
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowWillEnterFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->StartStateTransition();
-    }
-}
-
-- (void)windowDidEnterFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->EndStateTransition();
-        parent->WindowStateChanged();
-    }
-}
-
-- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame
-{
-    return true;
-}
-
--(void)resignKeyWindow
-{
-    if(_parent)
-        _parent->BaseEvents->Deactivated();
-    
-    [self showAppMenuOnly];
-    
-    [super resignKeyWindow];
-}
-
-- (void)windowDidMove:(NSNotification *)notification
-{
-    AvnPoint position;
-    
-    if(_parent != nullptr)
-    {
-        _parent->GetPosition(&position);
-        _parent->BaseEvents->PositionChanged(position);
-    }
-}
-
-- (AvnPoint) translateLocalPoint:(AvnPoint)pt
-{
-    pt.Y = [self frame].size.height - pt.Y;
-    return pt;
-}
-
-- (void)sendEvent:(NSEvent *)event
-{
-    [super sendEvent:event];
-    
-    /// This is to detect non-client clicks. This can only be done on Windows... not popups, hence the dynamic_cast.
-    if(_parent != nullptr && dynamic_cast<WindowImpl*>(_parent.getRaw()) != nullptr)
-    {
-        switch(event.type)
-        {
-            case NSEventTypeLeftMouseDown:
-            {
-                AvnView* view = _parent->View;
-                NSPoint windowPoint = [event locationInWindow];
-                NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];
-                
-                if (!NSPointInRect(viewPoint, view.bounds))
-                {
-                    auto avnPoint = [AvnView toAvnPoint:windowPoint];
-                    auto point = [self translateLocalPoint:avnPoint];
-                    AvnVector delta;
-                   
-                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, [event timestamp] * 1000, AvnInputModifiersNone, point, delta);
-                }
-            }
-            break;
-                
-            case NSEventTypeMouseEntered:
-            {
-                _parent->UpdateCursor();
-            }
-            break;
-                
-            case NSEventTypeMouseExited:
-            {
-                [[NSCursor arrowCursor] set];
-            }
-            break;
-                
-            default:
-                break;
-        }
-    }
-}
-@end
-
-class PopupImpl : public virtual WindowBaseImpl, public IAvnPopup
-{
-private:
-    BEGIN_INTERFACE_MAP()
-    INHERIT_INTERFACE_MAP(WindowBaseImpl)
-    INTERFACE_MAP_ENTRY(IAvnPopup, IID_IAvnPopup)
-    END_INTERFACE_MAP()
-    virtual ~PopupImpl(){}
-    ComPtr<IAvnWindowEvents> WindowEvents;
-    PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
-    {
-        WindowEvents = events;
-        [Window setLevel:NSPopUpMenuWindowLevel];
-    }
-protected:
-    virtual NSWindowStyleMask GetStyle() override
-    {
-        return NSWindowStyleMaskBorderless;
-    }
-    
-    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if (Window != nullptr)
-            {
-                [Window setContentSize:NSSize{x, y}];
-            
-                [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(lastPositionSet))];
-            }
-            
-            return S_OK;
-        }
-    }
-public:
-    virtual bool ShouldTakeFocusOnShow() override
-    {
-        return false;
-    }
-};
-
-extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl)
-{
-    @autoreleasepool
-    {
-        IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events, gl));
-        return ptr;
-    }
-}
-
-extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events, IAvnGlContext* gl)
-{
-    @autoreleasepool
-    {
-        IAvnWindow* ptr = (IAvnWindow*)new WindowImpl(events, gl);
-        return ptr;
-    }
-}
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index 72d90abbf3..2295c0beda 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -23,6 +23,7 @@ using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using static Nuke.Common.Tools.Xunit.XunitTasks;
 using static Nuke.Common.Tools.VSWhere.VSWhereTasks;
+using MicroCom.CodeGenerator;
 
 /*
  Before editing this file, install support plugin for your IDE,
@@ -36,25 +37,6 @@ partial class Build : NukeBuild
 {
     [Solution("Avalonia.sln")] readonly Solution Solution;
 
-    static Lazy<string> MsBuildExe = new Lazy<string>(() =>
-    {
-        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            return null;
-
-        var msBuildDirectory = VSWhere("-latest -nologo -property installationPath -format value -prerelease").FirstOrDefault().Text;
-
-        if (!string.IsNullOrWhiteSpace(msBuildDirectory))
-        {
-            string msBuildExe = Path.Combine(msBuildDirectory, @"MSBuild\Current\Bin\MSBuild.exe");
-            if (!System.IO.File.Exists(msBuildExe))
-                msBuildExe = Path.Combine(msBuildDirectory, @"MSBuild\15.0\Bin\MSBuild.exe");
-
-            return msBuildExe;
-        }
-
-        return null;
-    }, false);
-
     BuildParameters Parameters { get; set; }
     protected override void OnBuildInitialized()
     {
@@ -89,25 +71,28 @@ partial class Build : NukeBuild
         }
         ExecWait("dotnet version:", "dotnet", "--info");
         ExecWait("dotnet workloads:", "dotnet", "workload list");
+        Information("Processor count: " + Environment.ProcessorCount);
+        Information("Available RAM: " + GC.GetGCMemoryInfo().TotalAvailableMemoryBytes / 0x100000 + "MB");
     }
 
-    IReadOnlyCollection<Output> MsBuildCommon(
-        string projectFile,
-        Configure<MSBuildSettings> configurator = null)
+    DotNetConfigHelper ApplySettingCore(DotNetConfigHelper c)
     {
-        return MSBuild(c => c
-            .SetProjectFile(projectFile)
-            // This is required for VS2019 image on Azure Pipelines
-            .When(Parameters.IsRunningOnWindows &&
-                  Parameters.IsRunningOnAzure, _ => _
-                .AddProperty("JavaSdkDirectory", GetVariable<string>("JAVA_HOME_11_X64")))
-            .AddProperty("PackageVersion", Parameters.Version)
+        if (Parameters.IsRunningOnAzure)
+            c.AddProperty("JavaSdkDirectory", GetVariable<string>("JAVA_HOME_11_X64"));
+        c.AddProperty("PackageVersion", Parameters.Version)
             .AddProperty("iOSRoslynPathHackRequired", true)
-            .SetProcessToolPath(MsBuildExe.Value)
             .SetConfiguration(Parameters.Configuration)
-            .SetVerbosity(MSBuildVerbosity.Minimal)
-            .Apply(configurator));
+            .SetVerbosity(DotNetVerbosity.Minimal);
+        return c;
     }
+    DotNetBuildSettings ApplySetting(DotNetBuildSettings c, Configure<DotNetBuildSettings> configurator = null) =>
+        ApplySettingCore(c).Build.Apply(configurator);
+
+    DotNetPackSettings ApplySetting(DotNetPackSettings c, Configure<DotNetPackSettings> configurator = null) =>
+        ApplySettingCore(c).Pack.Apply(configurator);
+
+    DotNetTestSettings ApplySetting(DotNetTestSettings c, Configure<DotNetTestSettings> configurator = null) =>
+        ApplySettingCore(c).Test.Apply(configurator);
 
     Target Clean => _ => _.Executes(() =>
     {
@@ -149,28 +134,36 @@ partial class Build : NukeBuild
     Target Compile => _ => _
         .DependsOn(Clean, CompileNative)
         .DependsOn(CompileHtmlPreviewer)
-        .Executes(async () =>
+        .Executes(() =>
         {
-            if (Parameters.IsRunningOnWindows)
-                MsBuildCommon(Parameters.MSBuildSolution, c => c
-                    .SetProcessArgumentConfigurator(a => a.Add("/r"))
-                    .AddTargets("Build")
-                );
-
-            else
-                DotNetBuild(c => c
-                    .SetProjectFile(Parameters.MSBuildSolution)
-                    .AddProperty("PackageVersion", Parameters.Version)
-                    .SetConfiguration(Parameters.Configuration)
-                );
+            DotNetBuild(c => ApplySetting(c)
+                .SetProjectFile(Parameters.MSBuildSolution)
+            );
         });
 
     void RunCoreTest(string projectName)
     {
         Information($"Running tests from {projectName}");
         var project = Solution.GetProject(projectName).NotNull("project != null");
+        // Nuke and MSBuild tools have build-in helpers to get target frameworks from the project.
+        // Unfortunately, it gets broken with every second SDK update, so we had to do it manually.
+        var fileXml = XDocument.Parse(File.ReadAllText(project.Path));
+        var targetFrameworks = fileXml.Descendants("TargetFrameworks")
+            .FirstOrDefault()?.Value.Split(';').Select(f => f.Trim());
+        if (targetFrameworks is null)
+        {
+            var targetFramework = fileXml.Descendants("TargetFramework").FirstOrDefault()?.Value;
+            if (targetFramework is not null)
+            {
+                targetFrameworks = new[] { targetFramework };
+            }
+        }
+        if (targetFrameworks is null)
+        {
+            throw new InvalidOperationException("No target frameworks were found in the test project");
+        }
 
-        foreach (var fw in project.GetTargetFrameworks())
+        foreach (var fw in targetFrameworks)
         {
             if (fw.StartsWith("net4")
                 && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
@@ -182,14 +175,13 @@ partial class Build : NukeBuild
 
             Information($"Running for {projectName} ({fw}) ...");
 
-            DotNetTest(c => c
+            DotNetTest(c => ApplySetting(c)
                 .SetProjectFile(project)
-                .SetConfiguration(Parameters.Configuration)
                 .SetFramework(fw)
                 .EnableNoBuild()
                 .EnableNoRestore()
                 .When(Parameters.PublishTestResults, _ => _
-                    .SetLogger("trx")
+                    .SetLoggers("trx")
                     .SetResultsDirectory(Parameters.TestResultsRoot)));
         }
     }
@@ -214,17 +206,11 @@ partial class Build : NukeBuild
         .DependsOn(Compile)
         .Executes(() =>
         {
-            RunCoreTest("Avalonia.Animation.UnitTests");
             RunCoreTest("Avalonia.Base.UnitTests");
             RunCoreTest("Avalonia.Controls.UnitTests");
             RunCoreTest("Avalonia.Controls.DataGrid.UnitTests");
-            RunCoreTest("Avalonia.Input.UnitTests");
-            RunCoreTest("Avalonia.Interactivity.UnitTests");
-            RunCoreTest("Avalonia.Layout.UnitTests");
             RunCoreTest("Avalonia.Markup.UnitTests");
             RunCoreTest("Avalonia.Markup.Xaml.UnitTests");
-            RunCoreTest("Avalonia.Styling.UnitTests");
-            RunCoreTest("Avalonia.Visuals.UnitTests");
             RunCoreTest("Avalonia.Skia.UnitTests");
             RunCoreTest("Avalonia.ReactiveUI.UnitTests");
         });
@@ -247,8 +233,6 @@ partial class Build : NukeBuild
             RunCoreTest("Avalonia.DesignerSupport.Tests");
         });
 
-    [PackageExecutable("JetBrains.dotMemoryUnit", "dotMemoryUnit.exe")] readonly Tool DotMemoryUnit;
-
     Target RunLeakTests => _ => _
         .OnlyWhenStatic(() => !Parameters.SkipTests && Parameters.IsRunningOnWindows)
         .DependsOn(Compile)
@@ -256,12 +240,9 @@ partial class Build : NukeBuild
         {
             void DoMemoryTest()
             {
-                var testAssembly = "tests\\Avalonia.LeakTests\\bin\\Release\\net461\\Avalonia.LeakTests.dll";
-                DotMemoryUnit(
-                    $"{XunitPath.DoubleQuoteIfNeeded()} --propagate-exit-code -- {testAssembly}",
-                    timeout: 120_000);
+                RunCoreTest("Avalonia.LeakTests");
             }
-            ControlFlow.ExecuteWithRetry(DoMemoryTest, waitInSeconds: 3);
+            ControlFlow.ExecuteWithRetry(DoMemoryTest, delay: TimeSpan.FromMilliseconds(3));
         });
 
     Target ZipFiles => _ => _
@@ -269,19 +250,7 @@ partial class Build : NukeBuild
         .Executes(() =>
         {
             var data = Parameters;
-            var pathToProjectSource = RootDirectory / "samples" / "ControlCatalog.NetCore";
-            var pathToPublish = pathToProjectSource / "bin" / data.Configuration / "publish";
-
-            DotNetPublish(c => c
-                .SetProject(pathToProjectSource / "ControlCatalog.NetCore.csproj")
-                .EnableNoBuild()
-                .SetConfiguration(data.Configuration)
-                .AddProperty("PackageVersion", data.Version)
-                .AddProperty("PublishDir", pathToPublish));
-
-            Zip(data.ZipCoreArtifacts, data.BinRoot);
             Zip(data.ZipNuGetArtifacts, data.NugetRoot);
-            Zip(data.ZipTargetControlCatalogNetCoreDir, pathToPublish);
         });
 
     Target CreateIntermediateNugetPackages => _ => _
@@ -289,15 +258,7 @@ partial class Build : NukeBuild
         .After(RunTests)
         .Executes(() =>
         {
-            if (Parameters.IsRunningOnWindows)
-
-                MsBuildCommon(Parameters.MSBuildSolution, c => c
-                    .AddTargets("Pack"));
-            else
-                DotNetPack(c => c
-                    .SetProject(Parameters.MSBuildSolution)
-                    .SetConfiguration(Parameters.Configuration)
-                    .AddProperty("PackageVersion", Parameters.Version));
+            DotNetPack(c => ApplySetting(c).SetProject(Parameters.MSBuildSolution));
         });
 
     Target CreateNugetPackages => _ => _
@@ -335,6 +296,14 @@ partial class Build : NukeBuild
         .DependsOn(Package)
         .DependsOn(ZipFiles);
 
+    Target GenerateCppHeaders => _ => _.Executes(() =>
+    {
+        var file = MicroComCodeGenerator.Parse(
+            File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl"));
+        File.WriteAllText(RootDirectory / "native" / "Avalonia.Native" / "inc" / "avalonia-native.h",
+            file.GenerateCppHeader());
+    });
+
 
     public static int Main() =>
         RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs
index a92c988fbd..dfa914d1db 100644
--- a/nukebuild/BuildParameters.cs
+++ b/nukebuild/BuildParameters.cs
@@ -51,14 +51,12 @@ public partial class Build
         public AbsolutePath NugetIntermediateRoot { get; }
         public AbsolutePath NugetRoot { get; }
         public AbsolutePath ZipRoot { get; }
-        public AbsolutePath BinRoot { get; }
         public AbsolutePath TestResultsRoot { get; }
         public string DirSuffix { get; }
         public List<string> BuildDirs { get; }
         public string FileZipSuffix { get; }
         public AbsolutePath ZipCoreArtifacts { get; }
         public AbsolutePath ZipNuGetArtifacts { get; }
-        public AbsolutePath ZipTargetControlCatalogNetCoreDir { get; }
 
 
         public BuildParameters(Build b)
@@ -76,11 +74,11 @@ public partial class Build
             MSBuildSolution = RootDirectory / "dirs.proj";
 
             // PARAMETERS
-            IsLocalBuild = Host == HostType.Console;
+            IsLocalBuild = NukeBuild.IsLocalBuild;
             IsRunningOnUnix = Environment.OSVersion.Platform == PlatformID.Unix ||
                               Environment.OSVersion.Platform == PlatformID.MacOSX;
             IsRunningOnWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            IsRunningOnAzure = Host == HostType.AzurePipelines ||
+            IsRunningOnAzure = Host is AzurePipelines ||
                                Environment.GetEnvironmentVariable("LOGNAME") == "vsts";
 
             if (IsRunningOnAzure)
@@ -121,14 +119,12 @@ public partial class Build
             NugetRoot = ArtifactsDir / "nuget";
             NugetIntermediateRoot = RootDirectory / "build-intermediate" / "nuget";
             ZipRoot = ArtifactsDir / "zip";
-            BinRoot = ArtifactsDir / "bin";
             TestResultsRoot = ArtifactsDir / "test-results";
             BuildDirs = GlobDirectories(RootDirectory, "**bin").Concat(GlobDirectories(RootDirectory, "**obj")).ToList();
             DirSuffix = Configuration;
             FileZipSuffix = Version + ".zip";
             ZipCoreArtifacts = ZipRoot / ("Avalonia-" + FileZipSuffix);
             ZipNuGetArtifacts = ZipRoot / ("Avalonia-NuGet-" + FileZipSuffix);
-            ZipTargetControlCatalogNetCoreDir = ZipRoot / ("ControlCatalog.NetCore-" + FileZipSuffix);
         }
 
         string GetVersion()
diff --git a/nukebuild/BuildTasksPatcher.cs b/nukebuild/BuildTasksPatcher.cs
index e3766ae23f..5fd331035a 100644
--- a/nukebuild/BuildTasksPatcher.cs
+++ b/nukebuild/BuildTasksPatcher.cs
@@ -17,8 +17,12 @@ public class BuildTasksPatcher
             {
                 if (entry.Name == "Avalonia.Build.Tasks.dll")
                 {
-                    var temp = Path.Combine(Path.GetTempPath(), Guid.NewGuid() + ".dll");
+                    var tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+                    Directory.CreateDirectory(tempDir);
+                    var temp = Path.Combine(tempDir, Guid.NewGuid() + ".dll");
                     var output = temp + ".output";
+                    File.Copy(typeof(Microsoft.Build.Framework.ITask).Assembly.GetModules()[0].FullyQualifiedName,
+                        Path.Combine(tempDir, "Microsoft.Build.Framework.dll"));
                     var patched = new MemoryStream();
                     try
                     {
@@ -57,10 +61,8 @@ public class BuildTasksPatcher
                     {
                         try
                         {
-                            if (File.Exists(temp))
-                                File.Delete(temp);
-                            if (File.Exists(output))
-                                File.Delete(output);
+                            if(Directory.Exists(tempDir))
+                                Directory.Delete(tempDir, true);
                         }
                         catch
                         {
diff --git a/nukebuild/DotNetConfigHelper.cs b/nukebuild/DotNetConfigHelper.cs
new file mode 100644
index 0000000000..eca1e2684d
--- /dev/null
+++ b/nukebuild/DotNetConfigHelper.cs
@@ -0,0 +1,57 @@
+using System.Globalization;
+using JetBrains.Annotations;
+using Nuke.Common.Tools.DotNet;
+// ReSharper disable ReturnValueOfPureMethodIsNotUsed
+
+public class DotNetConfigHelper
+{
+    public DotNetBuildSettings Build;
+    public DotNetPackSettings Pack;
+    public DotNetTestSettings Test;
+
+    public DotNetConfigHelper(DotNetBuildSettings s)
+    {
+        Build = s;
+    }
+
+    public DotNetConfigHelper(DotNetPackSettings s)
+    {
+        Pack = s;
+    }
+
+    public DotNetConfigHelper(DotNetTestSettings s)
+    {
+        Test = s;
+    }
+
+    public DotNetConfigHelper AddProperty(string key, bool value) =>
+        AddProperty(key, value.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
+    public DotNetConfigHelper AddProperty(string key, string value)
+    {
+        Build = Build?.AddProperty(key, value);
+        Pack = Pack?.AddProperty(key, value);
+        Test = Test?.AddProperty(key, value);
+
+        return this;
+    }
+
+    public DotNetConfigHelper SetConfiguration(string configuration)
+    {
+        Build = Build?.SetConfiguration(configuration);
+        Pack = Pack?.SetConfiguration(configuration);
+        Test = Test?.SetConfiguration(configuration);
+        return this;
+    }
+
+    public DotNetConfigHelper SetVerbosity(DotNetVerbosity verbosity)
+    {
+        Build = Build?.SetVerbosity(verbosity);
+        Pack = Pack?.SetVerbosity(verbosity);
+        Test = Test?.SetVerbosity(verbosity);
+        return this;
+    }
+
+    public static implicit operator DotNetConfigHelper(DotNetBuildSettings s) => new DotNetConfigHelper(s);
+    public static implicit operator DotNetConfigHelper(DotNetPackSettings s) => new DotNetConfigHelper(s);
+    public static implicit operator DotNetConfigHelper(DotNetTestSettings s) => new DotNetConfigHelper(s);
+}
diff --git a/nukebuild/MicroComGen.cs b/nukebuild/MicroComGen.cs
deleted file mode 100644
index b1e546cb97..0000000000
--- a/nukebuild/MicroComGen.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.IO;
-using MicroCom.CodeGenerator;
-using Nuke.Common;
-
-partial class Build : NukeBuild
-{
-    Target GenerateCppHeaders => _ => _.Executes(() =>
-    {
-        var file = MicroComCodeGenerator.Parse(
-            File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl"));
-        File.WriteAllText(RootDirectory / "native" / "Avalonia.Native" / "inc" / "avalonia-native.h",
-            file.GenerateCppHeader());
-    });
-}
\ No newline at end of file
diff --git a/nukebuild/Shims.cs b/nukebuild/Shims.cs
index 1ac14bf622..6f79972ad6 100644
--- a/nukebuild/Shims.cs
+++ b/nukebuild/Shims.cs
@@ -49,7 +49,11 @@ public partial class Build
                         {
                             if (fsEntry is FileInfo)
                             {
+#if NET6
                                 var relPath = Path.GetRelativePath(rootPath, fsEntry.FullName);
+#else
+                                var relPath = GetRelativePath(rootPath, fsEntry.FullName);
+#endif
                                 AddFile(fsEntry.FullName, relPath);
                             }
                         }
@@ -78,6 +82,17 @@ public partial class Build
         }
     }
 
+    private static string GetRelativePath(string relativeTo, string path)
+    {
+        var uri = new Uri(relativeTo);
+        var rel = Uri.UnescapeDataString(uri.MakeRelativeUri(new Uri(path)).ToString()).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+        if (rel.Contains(Path.DirectorySeparatorChar.ToString()) == false)
+        {
+            rel = $".{Path.DirectorySeparatorChar}{rel}";
+        }
+        return rel;
+    }
+
     class NumergeNukeLogger : INumergeLogger
     {
         public void Log(NumergeLogLevel level, string message)
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 52b60b7d0f..92d9732e91 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -1,42 +1,48 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
-    <NoWarn>CS0649;CS0169</NoWarn>
+    <NoWarn>CS0649;CS0169;SYSLIB0011</NoWarn>
+    <NukeTelemetryVersion>1</NukeTelemetryVersion>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
-
+ 
+ <Import Project="..\build\JetBrains.dotMemoryUnit.props" />
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.0.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
-    <PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
+    <PackageReference Include="Nuke.Common" Version="6.2.1" />
     <PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
-    <PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
-    <PackageReference Include="MicroCom.CodeGenerator" Version="0.10.4" />
+    <PackageReference Include="MicroCom.CodeGenerator" Version="0.11.0" />
     <!-- Keep in sync with Avalonia.Build.Tasks -->
-    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="SourceLink" Version="1.1.0" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" PrivateAssets="All" />
+    <PackageReference Include="xunit.runner.console" Version="2.4.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
     <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
-    <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
 
     <!-- Common build related files -->
-    <None Include="..\build.ps1" />
-    <None Include="..\build.sh" />
-    <None Include="..\.nuke" />
-    <None Include="..\global.json" Condition="Exists('..\global.json')" />
-    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
-    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
-    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
-    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
-    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
     <Compile Remove="Numerge/**/*.*" />
     <Compile Include="Numerge/Numerge/**/*.cs" />
   </ItemGroup>
 
+  	<ItemGroup>
+		<EmbeddedResource Include="$(NuGetPackageRoot)sourcelink/1.1.0/tools/pdbstr.exe"></EmbeddedResource>
+	</ItemGroup>
+    
+  <ItemGroup>
+    <Compile Remove="il-repack\ILRepack\Application.cs" />
+  </ItemGroup>
+    
+  <ItemGroup>
+    <Folder Include="Numerge\Numerge.Console\" />
+  </ItemGroup>
+
 </Project>
diff --git a/nukebuild/il-repack b/nukebuild/il-repack
new file mode 160000
index 0000000000..892f079ea8
--- /dev/null
+++ b/nukebuild/il-repack
@@ -0,0 +1 @@
+Subproject commit 892f079ea8cb0c178f0a68f53a7a7eac13acdda9
diff --git a/nukebuild/numerge.config b/nukebuild/numerge.config
index e4e15d693d..d1c0408241 100644
--- a/nukebuild/numerge.config
+++ b/nukebuild/numerge.config
@@ -11,11 +11,6 @@
           "Id": "Avalonia.Build.Tasks",
           "IgnoreMissingFrameworkBinaries": true,
           "DoNotMergeDependencies": true
-        },
-        {
-          "Id": "Avalonia.DesktopRuntime",
-          "IgnoreMissingFrameworkBinaries": true,
-          "IgnoreMissingFrameworkDependencies": true
         }
       ]
     }
diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 4b28527465..4d0ed866a3 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -8,7 +8,9 @@
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" >
         <PrivateAssets>all</PrivateAssets>
-      </ProjectReference>  
+        <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+        <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+      </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index d64c2c5afc..53b668b523 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -3,7 +3,6 @@
     <_AvaloniaUseExternalMSBuild>$(AvaloniaUseExternalMSBuild)</_AvaloniaUseExternalMSBuild>
     <_AvaloniaUseExternalMSBuild Condition="'$(_AvaloniaForceInternalMSBuild)' == 'true'">false</_AvaloniaUseExternalMSBuild>
     <AvaloniaXamlReportImportance Condition="'$(AvaloniaXamlReportImportance)' == ''">low</AvaloniaXamlReportImportance>
-    <_AvaloniaPatchComInterop Condition="'$(_AvaloniaPatchComInterop)' == ''">false</_AvaloniaPatchComInterop>
     <_AvaloniaSkipXamlCompilation Condition="'$(_AvaloniaSkipXamlCompilation)' == ''">false</_AvaloniaSkipXamlCompilation>
     <AvaloniaUseCompiledBindingsByDefault Condition="'$(AvaloniaUseCompiledBindingsByDefault)' == ''">false</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
@@ -76,7 +75,6 @@
       Output="$(AvaloniaResourcesTemporaryFilePath)"
       Root="$(MSBuildProjectDirectory)"
       Resources="@(AvaloniaResource)"
-      EmbeddedResources="@(EmbeddedResources)"
       ReportImportance="$(AvaloniaXamlReportImportance)"/>
     <Exec 
       Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
@@ -111,7 +109,6 @@
       AssemblyOriginatorKeyFile="$(AssemblyOriginatorKeyFile)"
       SignAssembly="$(SignAssembly)"
       DelaySign="$(DelaySign)"
-      EnableComInteropPatching="$(_AvaloniaPatchComInterop)"
       SkipXamlCompilation="$(_AvaloniaSkipXamlCompilation)"
       DebuggerLaunch="$(AvaloniaXamlIlDebuggerLaunch)"
       DefaultCompileBindings="$(AvaloniaUseCompiledBindingsByDefault)"
diff --git a/readme.md b/readme.md
index 96c7937559..c2be487af3 100644
--- a/readme.md
+++ b/readme.md
@@ -1,11 +1,11 @@
 [![Telegram](https://raw.githubusercontent.com/Patrolavia/telegram-badge/master/chat.svg)](https://t.me/Avalonia)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) [![Discord](https://img.shields.io/badge/discord-join%20chat-46BC99)]( https://aka.ms/dotnet-discord) [![Build Status](https://dev.azure.com/AvaloniaUI/AvaloniaUI/_apis/build/status/AvaloniaUI.Avalonia)](https://dev.azure.com/AvaloniaUI/AvaloniaUI/_build/latest?definitionId=4) [![Backers on Open Collective](https://opencollective.com/Avalonia/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/Avalonia/sponsors/badge.svg)](#sponsors) ![License](https://img.shields.io/github/license/avaloniaui/avalonia.svg)
 <br />
-[![NuGet](https://img.shields.io/nuget/v/Avalonia.svg)](https://www.nuget.org/packages/Avalonia) [![downloads](https://img.shields.io/nuget/dt/avalonia)](https://www.nuget.org/packages/Avalonia) [![MyGet](https://img.shields.io/myget/avalonia-ci/vpre/Avalonia.svg?label=myget)](https://www.myget.org/gallery/avalonia-ci) ![Size](https://img.shields.io/github/repo-size/avaloniaui/avalonia.svg) 
+[![NuGet](https://img.shields.io/nuget/v/Avalonia.svg)](https://www.nuget.org/packages/Avalonia) [![downloads](https://img.shields.io/nuget/dt/avalonia)](https://www.nuget.org/packages/Avalonia)  ![Size](https://img.shields.io/github/repo-size/avaloniaui/avalonia.svg) 
 
 ## 📖 About 
 
-Avalonia is a cross-platform UI framework for dotnet, providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, MacOs. Avalonia is mature and production ready. We also have in beta release support for iOS, Android and in early stages support for browser via WASM.
+Avalonia is a cross-platform UI framework for dotnet, providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, macOS. Avalonia is mature and production ready. We also have in beta release support for iOS, Android and in early stages support for browser via WASM.
 
 ![image](https://user-images.githubusercontent.com/4672627/152126443-932966cf-57e7-4e77-9be6-62463a66b9f8.png)
 
@@ -70,11 +70,15 @@ For more information see the [.NET Foundation Code of Conduct](https://dotnetfou
 
 Avalonia is licenced under the [MIT licence](licence.md).
 
-## Support Avalonia
+## Donate
 
-**BTC**: bc1q05wx78qemgy9x6ytl5ljk2xrt00yqargyjm8gx
+Donating to the project is a fantastic way to thank our valued contributors for their hard work. Your donations are shared among our community and awarded for significant contributions.  
+
+If you need support see Commercial Support section below.
+
+Donate with BTC or use [Open Collective](https://opencollective.com/avalonia).
 
-This will be shared with the community and awarded for significant contributions.
+**BTC**: bc1q05wx78qemgy9x6ytl5ljk2xrt00yqargyjm8gx
 
 ### Backers
 
@@ -98,6 +102,11 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a>
 <a href="https://baseheadinc.com/" target="_blank"><img height="50" src="https://baseheadinc.com/wp-content/uploads/2020/09/BH-Logo-for-Site-Header-New.png"></a>
 
+## Commercial Support 
+
+We have a range of [support plans available](https://avaloniaui.net/support) for those looking to partner with the creators of Avalonia, enabling access to the best support at every step of the development process.
+
+*Please note that donations are not considered payment for commercial support agreements. Please contact us to discuss your needs first. [team@avaloniaui.net](mailto://team@avaloniaui.net)*
 ## .NET Foundation
 
 This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
diff --git a/samples/BindingDemo/App.xaml b/samples/BindingDemo/App.xaml
index 9260dd280f..175e838616 100644
--- a/samples/BindingDemo/App.xaml
+++ b/samples/BindingDemo/App.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="BindingDemo.App">
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+        <FluentTheme />
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml"/>
     </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index 2c6ff74e5e..056d3bf552 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 516acfe4b9..a43ea4539a 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -10,35 +10,33 @@
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\AboutAssets.txt" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="..\..\build\Assets\Icon.png">
       <Link>Resources\drawable\Icon.png</Link>
     </AndroidResource>
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
-    <DebugSymbols>True</DebugSymbols>
-    <RunAOTCompilation>False</RunAOTCompilation>
-    <EnableLLVM>True</EnableLLVM>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-    <RunAOTCompilation>False</RunAOTCompilation>
+  <PropertyGroup Condition="'$(RunAOTCompilation)'=='' and '$(Configuration)'=='Release' and '$(TF_BUILD)'==''">
+    <RunAOTCompilation>True</RunAOTCompilation>
   </PropertyGroup>
+  
+  <!-- PropertyGroup Condition="'$(RunAOTCompilation)'=='True'">
+    <EnableLLVM>True</EnableLLVM>
+    <AndroidAotAdditionalArguments>no-write-symbols,nodebug</AndroidAotAdditionalArguments>
+    <AndroidAotMode>Hybrid</AndroidAotMode>
+    <AndroidGenerateJniMarshalMethods>True</AndroidGenerateJniMarshalMethods>
+  </PropertyGroup -->
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+  <PropertyGroup Condition="'$(AndroidEnableProfiler)'=='True'">
+    <IsEmulator Condition="'$(IsEmulator)' == ''">True</IsEmulator>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel" Version="2.3.1.3" />
+    <AndroidEnvironment Condition="'$(IsEmulator)'=='True'" Include="environment.emulator.txt" />
+    <AndroidEnvironment Condition="'$(IsEmulator)'!='True'" Include="environment.device.txt" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
diff --git a/samples/ControlCatalog.Android/EmbedSample.Android.cs b/samples/ControlCatalog.Android/EmbedSample.Android.cs
new file mode 100644
index 0000000000..250121fc53
--- /dev/null
+++ b/samples/ControlCatalog.Android/EmbedSample.Android.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.Android;
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.Android;
+
+public class EmbedSampleAndroid : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        var parentContext = (parent as AndroidViewControlHandle)?.View.Context
+            ?? global::Android.App.Application.Context;
+
+        if (isSecond)
+        {
+            var webView = new global::Android.Webkit.WebView(parentContext);
+            webView.LoadUrl("https://www.android.com/");
+
+            return new AndroidViewControlHandle(webView);
+        }
+        else
+        {
+            var button = new global::Android.Widget.Button(parentContext) { Text = "Hello world" };
+            var clickCount = 0;
+            button.Click += (sender, args) =>
+            {
+                clickCount++;
+                button.Text = $"Click count {clickCount}";
+            };
+
+            return new AndroidViewControlHandle(button);
+        }
+    }
+}
diff --git a/samples/ControlCatalog.Android/MainActivity.cs b/samples/ControlCatalog.Android/MainActivity.cs
index b02083c39d..62c582610c 100644
--- a/samples/ControlCatalog.Android/MainActivity.cs
+++ b/samples/ControlCatalog.Android/MainActivity.cs
@@ -1,18 +1,12 @@
 using Android.App;
-using Android.OS;
 using Android.Content.PM;
+using Avalonia;
 using Avalonia.Android;
 
 namespace ControlCatalog.Android
 {
-    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleInstance, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
-    public class MainActivity : AvaloniaActivity
+    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    public class MainActivity : AvaloniaMainActivity
     {
-        protected override void OnCreate(Bundle? savedInstanceState)
-        {
-            base.OnCreate(savedInstanceState);
-
-            Content = new MainView();
-        }
     }
 }
diff --git a/samples/ControlCatalog.Android/Properties/AndroidManifest.xml b/samples/ControlCatalog.Android/Properties/AndroidManifest.xml
index aa570ec504..6f551d2b01 100644
--- a/samples/ControlCatalog.Android/Properties/AndroidManifest.xml
+++ b/samples/ControlCatalog.Android/Properties/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
-	<application android:label="ControlCatalog.Android" android:icon="@drawable/Icon"></application>
+  <application android:label="ControlCatalog.Android" android:icon="@drawable/Icon"></application>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/samples/ControlCatalog.Android/SplashActivity.cs b/samples/ControlCatalog.Android/SplashActivity.cs
index 9729713833..908b5f082a 100644
--- a/samples/ControlCatalog.Android/SplashActivity.cs
+++ b/samples/ControlCatalog.Android/SplashActivity.cs
@@ -1,15 +1,23 @@
 using Android.App;
 using Android.Content;
+using Android.Content.PM;
 using Android.OS;
-using Application = Android.App.Application;
-
-using Avalonia;
+using Avalonia.Android;
 
 namespace ControlCatalog.Android
 {
     [Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
-    public class SplashActivity : Activity
+    public class SplashActivity : AvaloniaSplashActivity<App>
     {
+        protected override Avalonia.AppBuilder CustomizeAppBuilder(Avalonia.AppBuilder builder)
+        {
+            return base.CustomizeAppBuilder(builder)
+                 .AfterSetup(_ =>
+                 {
+                     Pages.EmbedSample.Implementation = new EmbedSampleAndroid();
+                 });
+        }
+
         protected override void OnCreate(Bundle? savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
@@ -19,13 +27,6 @@ namespace ControlCatalog.Android
         {
             base.OnResume();
 
-            if (Avalonia.Application.Current == null)
-            {
-                AppBuilder.Configure<App>()
-                    .UseAndroid()
-                    .SetupWithoutStarting();
-            }
-
             StartActivity(new Intent(Application.Context, typeof(MainActivity)));
         }
     }
diff --git a/samples/ControlCatalog.Android/environment.device.txt b/samples/ControlCatalog.Android/environment.device.txt
new file mode 100644
index 0000000000..107d68ca1b
--- /dev/null
+++ b/samples/ControlCatalog.Android/environment.device.txt
@@ -0,0 +1 @@
+DOTNET_DiagnosticPorts=127.0.0.1:9000,suspend
diff --git a/samples/ControlCatalog.Android/environment.emulator.txt b/samples/ControlCatalog.Android/environment.emulator.txt
new file mode 100644
index 0000000000..299a0ec30b
--- /dev/null
+++ b/samples/ControlCatalog.Android/environment.emulator.txt
@@ -0,0 +1 @@
+DOTNET_DiagnosticPorts=10.0.2.2:9001,suspend
diff --git a/samples/ControlCatalog.Web/App.razor b/samples/ControlCatalog.Blazor.Web/App.razor
similarity index 100%
rename from samples/ControlCatalog.Web/App.razor
rename to samples/ControlCatalog.Blazor.Web/App.razor
diff --git a/samples/ControlCatalog.Blazor.Web/App.razor.cs b/samples/ControlCatalog.Blazor.Web/App.razor.cs
new file mode 100644
index 0000000000..8cc0095f20
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/App.razor.cs
@@ -0,0 +1,17 @@
+using Avalonia;
+using Avalonia.Web.Blazor;
+
+namespace ControlCatalog.Blazor.Web;
+
+public partial class App
+{
+    protected override void OnParametersSet()
+    {
+        AppBuilder.Configure<ControlCatalog.App>()
+            .UseBlazor()
+            // .With(new SkiaOptions { CustomGpuFactory = null }) // uncomment to disable GPU/GL rendering
+            .SetupWithSingleViewLifetime();
+
+        base.OnParametersSet();
+    }
+}
diff --git a/samples/ControlCatalog.Blazor.Web/ControlCatalog.Blazor.Web.csproj b/samples/ControlCatalog.Blazor.Web/ControlCatalog.Blazor.Web.csproj
new file mode 100644
index 0000000000..03fb31f0d3
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/ControlCatalog.Blazor.Web.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+    <Nullable>enable</Nullable>
+    <EmccTotalMemory>16777216</EmccTotalMemory>
+    <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
+    <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-rc.1.22427.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-rc.1.22427.2" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj" />
+    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
+
+  <Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.props" />
+  <Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.targets" />
+
+</Project>
+
diff --git a/samples/ControlCatalog.Web/Pages/Index.razor b/samples/ControlCatalog.Blazor.Web/Pages/Index.razor
similarity index 100%
rename from samples/ControlCatalog.Web/Pages/Index.razor
rename to samples/ControlCatalog.Blazor.Web/Pages/Index.razor
diff --git a/samples/ControlCatalog.Blazor.Web/Program.cs b/samples/ControlCatalog.Blazor.Web/Program.cs
new file mode 100644
index 0000000000..d71b125fa1
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/Program.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using ControlCatalog.Blazor.Web;
+
+public class Program
+{
+    public static async Task  Main(string[] args)
+    {
+        await CreateHostBuilder(args).Build().RunAsync();
+    }
+
+    public static WebAssemblyHostBuilder CreateHostBuilder(string[] args)
+    {
+        var builder = WebAssemblyHostBuilder.CreateDefault(args);
+        
+        builder.RootComponents.Add<App>("#app");
+
+        builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+
+        return builder;
+    }
+}
+
+
+
+
diff --git a/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json b/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json
new file mode 100644
index 0000000000..ad2b1e30f6
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json
@@ -0,0 +1,22 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:13961",
+      "sslPort": 44319
+    }
+  },
+  "profiles": {
+    "ControlCatalog.Web": {
+      "commandName": "Project",
+      "dotnetRunMessages": "true",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/samples/ControlCatalog.Web/Shared/MainLayout.razor b/samples/ControlCatalog.Blazor.Web/Shared/MainLayout.razor
similarity index 100%
rename from samples/ControlCatalog.Web/Shared/MainLayout.razor
rename to samples/ControlCatalog.Blazor.Web/Shared/MainLayout.razor
diff --git a/samples/ControlCatalog.Blazor.Web/_Imports.razor b/samples/ControlCatalog.Blazor.Web/_Imports.razor
new file mode 100644
index 0000000000..0e6d11b419
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/_Imports.razor
@@ -0,0 +1,10 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
+@using Microsoft.JSInterop
+@using ControlCatalog.Blazor.Web.Shared
+@using SkiaSharp
diff --git a/samples/ControlCatalog.Blazor.Web/wwwroot/css/app.css b/samples/ControlCatalog.Blazor.Web/wwwroot/css/app.css
new file mode 100644
index 0000000000..49ca14e162
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/wwwroot/css/app.css
@@ -0,0 +1,56 @@
+html, body {
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    margin: 0;
+    height: 100vh;
+    overflow: hidden;
+    touch-action: none;
+}
+
+a, .btn-link {
+    color: #0366d6;
+}
+
+.btn-primary {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
+
+.content {
+    padding-top: 1.1rem;
+}
+
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+#blazor-error-ui .dismiss {
+    cursor: pointer;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
+}
+
+#app, .page {
+    height: 100%;
+}
diff --git a/samples/ControlCatalog.Web/wwwroot/favicon.ico b/samples/ControlCatalog.Blazor.Web/wwwroot/favicon.ico
similarity index 100%
rename from samples/ControlCatalog.Web/wwwroot/favicon.ico
rename to samples/ControlCatalog.Blazor.Web/wwwroot/favicon.ico
diff --git a/samples/ControlCatalog.Blazor.Web/wwwroot/index.html b/samples/ControlCatalog.Blazor.Web/wwwroot/index.html
new file mode 100644
index 0000000000..cad9123836
--- /dev/null
+++ b/samples/ControlCatalog.Blazor.Web/wwwroot/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>Avalonia Sample</title>
+    <base href="/" />
+    <link href="css/app.css" rel="stylesheet" />
+</head>
+
+<body>
+    <div id="app">Powered by Avalonia</div>
+
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+    <script src="_framework/blazor.webassembly.js"></script>
+</body>
+</html>
diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
index 2d4fc45171..e4c83dca49 100644
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@@ -4,20 +4,49 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RuntimeFrameworkVersion>6.0.8</RuntimeFrameworkVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(RunNativeAotCompilation)' == 'true'">
+    <IlcTrimMetadata>true</IlcTrimMetadata>
+    <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json</RestoreAdditionalProjectSources>
+    <NativeAotCompilerVersion>7.0.0-*</NativeAotCompilerVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\src\Avalonia.X11\NativeDialogs\Gtk.cs" Link="NativeControls\Gtk\Gtk.cs" />
+  </ItemGroup>
+
   <ItemGroup>
+    <Content Include="NativeControls\Gtk\nodes.mp4">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Headless.Vnc\Avalonia.Headless.Vnc.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
+    <!-- For native controls test -->
+    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RunNativeAotCompilation)' == 'true'">
+    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
+    <!-- Cross-compilation for Windows x64-arm64 and Linux x64-arm64 -->
+    <PackageReference Condition="'$(RuntimeIdentifier)'=='win-arm64'" Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
+    <PackageReference Condition="'$(RuntimeIdentifier)'=='linux-arm64'" Include="runtime.linux-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
   </ItemGroup>
 
   <PropertyGroup>
     <!-- For Microsoft.CodeAnalysis -->
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <Import Project="..\..\build\SampleApp.props" />
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Gtk/EmbedSample.Gtk.cs b/samples/ControlCatalog.NetCore/NativeControls/Gtk/EmbedSample.Gtk.cs
new file mode 100644
index 0000000000..81a5ba536f
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Gtk/EmbedSample.Gtk.cs
@@ -0,0 +1,34 @@
+using System.IO;
+using System.Diagnostics;
+using Avalonia.Platform;
+using Avalonia.Controls.Platform;
+using System;
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.NetCore;
+
+public class EmbedSampleGtk : INativeDemoControl
+{
+    private Process _mplayer;
+
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        if (isSecond)
+        {
+            var chooser = GtkHelper.CreateGtkFileChooser(parent.Handle);
+            if (chooser != null)
+                return chooser;
+        }
+
+        var control = createDefault();
+        var nodes = Path.GetFullPath(Path.Combine(typeof(EmbedSample).Assembly.GetModules()[0].FullyQualifiedName,
+            "..", "NativeControls", "Gtk", "nodes.mp4"));
+        _mplayer = Process.Start(new ProcessStartInfo("mplayer",
+            $"-vo x11 -zoom -loop 0 -wid {control.Handle.ToInt64()} \"{nodes}\"")
+        {
+            UseShellExecute = false,
+
+        });
+        return control;
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Gtk/GtkHelper.cs b/samples/ControlCatalog.NetCore/NativeControls/Gtk/GtkHelper.cs
new file mode 100644
index 0000000000..b1fef7c013
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Gtk/GtkHelper.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform.Interop;
+using Avalonia.X11.Interop;
+using Avalonia.X11.NativeDialogs;
+using static Avalonia.X11.NativeDialogs.Gtk;
+using static Avalonia.X11.NativeDialogs.Glib;
+
+namespace ControlCatalog.NetCore;
+
+internal class GtkHelper
+{
+    class FileChooser : INativeControlHostDestroyableControlHandle
+    {
+        private readonly IntPtr _widget;
+
+        public FileChooser(IntPtr widget, IntPtr xid)
+        {
+            _widget = widget;
+            Handle = xid;
+        }
+
+        public IntPtr Handle { get; }
+        public string HandleDescriptor => "XID";
+
+        public void Destroy()
+        {
+            RunOnGlibThread(() =>
+            {
+                gtk_widget_destroy(_widget);
+                return 0;
+            }).Wait();
+        }
+    }
+
+
+    public static INativeControlHostDestroyableControlHandle CreateGtkFileChooser(IntPtr parentXid)
+    {
+        return GtkInteropHelper.RunOnGlibThread(() =>
+        {
+            using (var title = new Utf8Buffer("Embedded"))
+            {
+                var widget = gtk_file_chooser_dialog_new(title, IntPtr.Zero, GtkFileChooserAction.SelectFolder,
+                    IntPtr.Zero);
+                gtk_widget_realize(widget);
+                var xid = gdk_x11_window_get_xid(gtk_widget_get_window(widget));
+                gtk_window_present(widget);
+                return new FileChooser(widget, xid);
+            }
+        }).Result;
+    }
+}
diff --git a/samples/interop/NativeEmbedSample/nodes-license.md b/samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes-license.md
similarity index 100%
rename from samples/interop/NativeEmbedSample/nodes-license.md
rename to samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes-license.md
diff --git a/samples/interop/NativeEmbedSample/nodes.mp4 b/samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes.mp4
similarity index 100%
rename from samples/interop/NativeEmbedSample/nodes.mp4
rename to samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes.mp4
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Mac/EmbedSample.Mac.cs b/samples/ControlCatalog.NetCore/NativeControls/Mac/EmbedSample.Mac.cs
new file mode 100644
index 0000000000..7967c9c073
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Mac/EmbedSample.Mac.cs
@@ -0,0 +1,29 @@
+using System;
+
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+using ControlCatalog.Pages;
+
+using MonoMac.Foundation;
+using MonoMac.WebKit;
+
+namespace ControlCatalog.NetCore;
+
+public class EmbedSampleMac : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        // Note: We are using MonoMac for example purposes
+        // It shouldn't be used in production apps
+        MacHelper.EnsureInitialized();
+
+        var webView = new WebView();
+        Dispatcher.UIThread.Post(() =>
+        {
+            webView.MainFrame.LoadRequest(new NSUrlRequest(new NSUrl(
+                isSecond ? "https://bing.com" : "https://google.com/")));
+        });
+        return new MacOSViewHandle(webView);
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Mac/MacHelper.cs b/samples/ControlCatalog.NetCore/NativeControls/Mac/MacHelper.cs
new file mode 100644
index 0000000000..5b3bc9abf1
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Mac/MacHelper.cs
@@ -0,0 +1,38 @@
+using System;
+
+using Avalonia.Controls.Platform;
+using MonoMac.AppKit;
+
+namespace ControlCatalog.NetCore;
+
+internal class MacHelper
+{
+    private static bool _isInitialized;
+
+    public static void EnsureInitialized()
+    {
+        if (_isInitialized)
+            return;
+        _isInitialized = true;
+        NSApplication.Init();
+    }
+}
+
+internal class MacOSViewHandle : INativeControlHostDestroyableControlHandle
+{
+    private NSView _view;
+
+    public MacOSViewHandle(NSView view)
+    {
+        _view = view;
+    }
+
+    public IntPtr Handle => _view?.Handle ?? IntPtr.Zero;
+    public string HandleDescriptor => "NSView";
+
+    public void Destroy()
+    {
+        _view.Dispose();
+        _view = null;
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Win/EmbedSample.Win.cs b/samples/ControlCatalog.NetCore/NativeControls/Win/EmbedSample.Win.cs
new file mode 100644
index 0000000000..77982db0ca
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Win/EmbedSample.Win.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Text;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.NetCore;
+
+public class EmbedSampleWin : INativeDemoControl
+{
+    private const string RichText =
+        @"{\rtf1\ansi\ansicpg1251\deff0\nouicompat\deflang1049{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+{\colortbl ;\red255\green0\blue0;\red0\green77\blue187;\red0\green176\blue80;\red155\green0\blue211;\red247\green150\blue70;\red75\green172\blue198;}
+{\*\generator Riched20 6.3.9600}\viewkind4\uc1 
+\pard\sa200\sl276\slmult1\f0\fs22\lang9 <PREFIX>I \i am\i0  a \cf1\b Rich Text \cf0\b0\fs24 control\cf2\fs28 !\cf3\fs32 !\cf4\fs36 !\cf1\fs40 !\cf5\fs44 !\cf6\fs48 !\cf0\fs44\par
+}";
+
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        WinApi.LoadLibrary("Msftedit.dll");
+        var handle = WinApi.CreateWindowEx(0, "RICHEDIT50W",
+            @"Rich Edit",
+            0x800000 | 0x10000000 | 0x40000000 | 0x800000 | 0x10000 | 0x0004, 0, 0, 1, 1, parent.Handle,
+            IntPtr.Zero, WinApi.GetModuleHandle(null), IntPtr.Zero);
+        var st = new WinApi.SETTEXTEX { Codepage = 65001, Flags = 0x00000008 };
+        var text = RichText.Replace("<PREFIX>", isSecond ? "\\qr " : "");
+        var bytes = Encoding.UTF8.GetBytes(text);
+        WinApi.SendMessage(handle, 0x0400 + 97, ref st, bytes);
+        return new Win32WindowControlHandle(handle, "HWND");
+    }
+}
+
+internal class Win32WindowControlHandle : PlatformHandle, INativeControlHostDestroyableControlHandle
+{
+    public Win32WindowControlHandle(IntPtr handle, string descriptor) : base(handle, descriptor)
+    {
+    }
+
+    public void Destroy()
+    {
+        _ = WinApi.DestroyWindow(Handle);
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Win/WinApi.cs b/samples/ControlCatalog.NetCore/NativeControls/Win/WinApi.cs
new file mode 100644
index 0000000000..47d368f7a4
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Win/WinApi.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace ControlCatalog.NetCore;
+
+internal unsafe class WinApi
+{
+    public enum CommonControls : uint
+    {
+        ICC_LISTVIEW_CLASSES = 0x00000001, // listview, header
+        ICC_TREEVIEW_CLASSES = 0x00000002, // treeview, tooltips
+        ICC_BAR_CLASSES = 0x00000004, // toolbar, statusbar, trackbar, tooltips
+        ICC_TAB_CLASSES = 0x00000008, // tab, tooltips
+        ICC_UPDOWN_CLASS = 0x00000010, // updown
+        ICC_PROGRESS_CLASS = 0x00000020, // progress
+        ICC_HOTKEY_CLASS = 0x00000040, // hotkey
+        ICC_ANIMATE_CLASS = 0x00000080, // animate
+        ICC_WIN95_CLASSES = 0x000000FF,
+        ICC_DATE_CLASSES = 0x00000100, // month picker, date picker, time picker, updown
+        ICC_USEREX_CLASSES = 0x00000200, // comboex
+        ICC_COOL_CLASSES = 0x00000400, // rebar (coolbar) control
+        ICC_INTERNET_CLASSES = 0x00000800,
+        ICC_PAGESCROLLER_CLASS = 0x00001000, // page scroller
+        ICC_NATIVEFNTCTL_CLASS = 0x00002000, // native font control
+        ICC_STANDARD_CLASSES = 0x00004000,
+        ICC_LINK_CLASS = 0x00008000
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct INITCOMMONCONTROLSEX
+    {
+        public int dwSize;
+        public uint dwICC;
+    }
+
+    [DllImport("Comctl32.dll")]
+    public static extern void InitCommonControlsEx(ref INITCOMMONCONTROLSEX init);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern bool DestroyWindow(IntPtr hwnd);
+
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr LoadLibrary(string lib);
+
+
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr GetModuleHandle(string lpModuleName);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr CreateWindowEx(
+        int dwExStyle,
+        string lpClassName,
+        string lpWindowName,
+        uint dwStyle,
+        int x,
+        int y,
+        int nWidth,
+        int nHeight,
+        IntPtr hWndParent,
+        IntPtr hMenu,
+        IntPtr hInstance,
+        IntPtr lpParam);
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct SETTEXTEX
+    {
+        public uint Flags;
+        public uint Codepage;
+    }
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SendMessageW")]
+    public static extern IntPtr SendMessage(IntPtr hWnd, int Msg, ref SETTEXTEX wParam, byte[] lParam);
+}
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 0c8fd9465c..b1bacc6483 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
@@ -7,11 +7,12 @@ using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Dialogs;
 using Avalonia.Headless;
 using Avalonia.LogicalTree;
 using Avalonia.Threading;
 
+using ControlCatalog.Pages;
+
 namespace ControlCatalog.NetCore
 {
     static class Program
@@ -52,7 +53,11 @@ namespace ControlCatalog.NetCore
             else if (args.Contains("--full-headless"))
             {
                 return builder
-                    .UseHeadless(true)
+                    .UseHeadless(new AvaloniaHeadlessPlatformOptions
+                    {
+                        UseHeadlessDrawing = true,
+                        UseCompositor = true
+                    })
                     .AfterSetup(_ =>
                     {
                         DispatcherTimer.RunOnce(async () =>
@@ -62,12 +67,11 @@ namespace ControlCatalog.NetCore
                             var tc = window.GetLogicalDescendants().OfType<TabControl>().First();
                             foreach (var page in tc.Items.Cast<TabItem>().ToList())
                             {
-                                // Skip DatePicker because of some layout bug in grid
-                                if (page.Header.ToString() == "DatePicker")
+                                if (page.Header.ToString() == "DatePicker" || page.Header.ToString() == "TreeView")
                                     continue;
                                 Console.WriteLine("Selecting " + page.Header);
                                 tc.SelectedItem = page;
-                                await Task.Delay(500);
+                                await Task.Delay(50);
                             }
                             Console.WriteLine("Selecting the first page");
                             tc.SelectedItem = tc.Items.OfType<object>().First();
@@ -76,7 +80,7 @@ namespace ControlCatalog.NetCore
                             for (var c = 0; c < 3; c++)
                             {
                                 GC.Collect(2, GCCollectionMode.Forced);
-                                await Task.Delay(500);
+                                await Task.Delay(50);
                             }
 
                             void FormatMem(string metric, long bytes)
@@ -86,7 +90,6 @@ namespace ControlCatalog.NetCore
 
                             FormatMem("GC allocated bytes", GC.GetTotalMemory(true));
                             FormatMem("WorkingSet64", Process.GetCurrentProcess().WorkingSet64);
-
                         }, TimeSpan.FromSeconds(1));
                     })
                     .StartWithClassicDesktopLifetime(args);
@@ -110,14 +113,21 @@ namespace ControlCatalog.NetCore
                 {
                     EnableMultiTouch = true,
                     UseDBusMenu = true,
-                    EnableIme = true,
+                    EnableIme = true
                 })
-                .With(new Win32PlatformOptions
+                .UseSkia()
+                .AfterSetup(builder =>
                 {
-                    EnableMultitouch = true
+                    builder.Instance!.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
+                    {
+                        StartupScreenIndex = 1,
+                    });
+
+                    EmbedSample.Implementation = OperatingSystem.IsWindows() ? (INativeDemoControl)new EmbedSampleWin()
+                        : OperatingSystem.IsMacOS() ? new EmbedSampleMac()
+                        : OperatingSystem.IsLinux() ? new EmbedSampleGtk()
+                        : null;
                 })
-                .UseSkia()
-                .UseManagedSystemDialogs()
                 .LogToTrace();
 
         static void SilenceConsole()
diff --git a/samples/ControlCatalog.NetCore/app.manifest b/samples/ControlCatalog.NetCore/app.manifest
new file mode 100644
index 0000000000..db90057191
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="ControlCatalog.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+</assembly>
diff --git a/samples/ControlCatalog.Web/App.razor.cs b/samples/ControlCatalog.Web/App.razor.cs
deleted file mode 100644
index a150824ac3..0000000000
--- a/samples/ControlCatalog.Web/App.razor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia.Web.Blazor;
-
-namespace ControlCatalog.Web;
-
-public partial class App
-{
-    protected override void OnParametersSet()
-    {
-        WebAppBuilder.Configure<ControlCatalog.App>()
-            .SetupWithSingleViewLifetime();
-
-        base.OnParametersSet();
-    }
-}
diff --git a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
index 520bbdf32b..06a5466619 100644
--- a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
+++ b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
@@ -1,41 +1,44 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
-    <Nullable>enable</Nullable>
-    <WasmBuildNative>True</WasmBuildNative>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+    <WasmMainJSPath>main.js</WasmMainJSPath>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+    <WasmBuildNative>true</WasmBuildNative>
+    <EmccFlags>-sVERBOSE -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <BlazorLinkerDescriptor Include="LinkerConfig.xml" />
-  </ItemGroup>
-
-  <!-- In debug, make builds faster by reducing optimizations -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <WasmNativeStrip>false</WasmNativeStrip>
-    <EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>
-    <RunAOTCompilation>false</RunAOTCompilation>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <Optimize>true</Optimize>
-    <WasmNativeStrip>true</WasmNativeStrip>
-    <EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
-    <EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
-    <RunAOTCompilation>false</RunAOTCompilation>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <RunAOTCompilation>true</RunAOTCompilation>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>full</TrimMode>
+    <WasmBuildNative>true</WasmBuildNative>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <EmccCompileOptimizationFlag>-O2</EmccCompileOptimizationFlag>
+    <EmccLinkOptimizationFlag>-O2</EmccLinkOptimizationFlag>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all"/>
+    <TrimmerRootDescriptor Include="Roots.xml" />
   </ItemGroup>
 
-  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.targets" />
-  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.CompilationTuning.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\..\src\Web\Avalonia.Web\Avalonia.Web.csproj" />
+    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
+  </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj"/>
-    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"/>
+    <WasmExtraFilesToDeploy Include="index.html" />
+    <WasmExtraFilesToDeploy Include="main.js" />
+    <WasmExtraFilesToDeploy Include="embed.js" />
+    <WasmExtraFilesToDeploy Include="favicon.ico" />
+    <WasmExtraFilesToDeploy Include="Logo.svg" />
+    <WasmExtraFilesToDeploy Include="app.css" />
   </ItemGroup>
 
+  <Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.props" />
+  <Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.targets" />
 </Project>
diff --git a/samples/ControlCatalog.Web/EmbedSample.Browser.cs b/samples/ControlCatalog.Web/EmbedSample.Browser.cs
new file mode 100644
index 0000000000..5cfbb608cc
--- /dev/null
+++ b/samples/ControlCatalog.Web/EmbedSample.Browser.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Runtime.InteropServices.JavaScript;
+using Avalonia.Platform;
+using Avalonia.Web;
+
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.Web;
+
+public class EmbedSampleWeb : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        if (isSecond)
+        {
+            var iframe = EmbedInterop.CreateElement("iframe");
+            iframe.SetProperty("src", "https://www.youtube.com/embed/kZCIporjJ70");
+
+            return new JSObjectControlHandle(iframe);
+        }
+        else
+        {
+            var defaultHandle = (JSObjectControlHandle)createDefault();
+
+            _ = JSHost.ImportAsync("embed.js", "./embed.js").ContinueWith(_ =>
+            {
+                EmbedInterop.AddAppButton(defaultHandle.Object);
+            });
+
+            return defaultHandle;
+        }
+    }
+}
+
+internal static partial class EmbedInterop
+{
+    [JSImport("globalThis.document.createElement")]
+    public static partial JSObject CreateElement(string tagName);
+
+    [JSImport("addAppButton", "embed.js")]
+    public static partial void AddAppButton(JSObject parentObject);
+}
diff --git a/samples/ControlCatalog.Web/LinkerConfig.xml b/samples/ControlCatalog.Web/LinkerConfig.xml
deleted file mode 100644
index 5839a0fe03..0000000000
--- a/samples/ControlCatalog.Web/LinkerConfig.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  This file specifies which parts of the BCL or Blazor packages must not be
-  stripped by the IL Linker even if they aren't referenced by user code.
--->
-<linker>
-  <assembly fullname="mscorlib">
-    <!--
-      Preserve the methods in WasmRuntime because its methods are called by 
-      JavaScript client-side code to implement timers.
-      Fixes: https://github.com/dotnet/blazor/issues/239
-    -->
-    <type fullname="System.Threading.WasmRuntime"/>
-  </assembly>
-
-  <assembly fullname="System.Core">
-    <!--
-      System.Linq.Expressions* is required by Json.NET and any 
-      expression.Compile caller. The assembly isn't stripped.
-    -->
-    <type fullname="System.Linq.Expressions*"/>
-  </assembly>
-  <!--
-    In this example, the app's entry point assembly is listed. The assembly
-    isn't stripped by the IL Linker.
-  -->
-  <assembly fullname="ControlCatalog" preserve="All" />
-</linker>
diff --git a/samples/ControlCatalog.Web/Logo.svg b/samples/ControlCatalog.Web/Logo.svg
new file mode 100644
index 0000000000..9685a23af1
--- /dev/null
+++ b/samples/ControlCatalog.Web/Logo.svg
@@ -0,0 +1,5 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.4661 34.928C30.5364 34.928 30.6052 34.928 30.6754 34.928C32.8596 34.928 34.654 33.2918 34.9053 31.1752L34.9356 16.9955C34.6872 7.56697 26.9662 0 17.4777 0C7.83263 0 0.0137329 7.8189 0.0137329 17.464C0.0137329 27.0059 7.66618 34.7631 17.1687 34.928H30.4661Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5239 5.948C12.0268 5.948 7.42967 9.80117 6.286 14.954C7.38092 15.2609 8.18385 16.2664 8.18385 17.4593C8.18385 18.6523 7.38092 19.6577 6.286 19.9647C7.42966 25.1175 12.0268 28.9706 17.5239 28.9706C19.525 28.9706 21.4068 28.4601 23.0462 27.562V28.8927H29.0352V17.9365C29.0407 17.7908 29.0352 17.6063 29.0352 17.4593C29.0352 11.1018 23.8814 5.948 17.5239 5.948ZM12.0098 17.4593C12.0098 14.414 14.4786 11.9452 17.5239 11.9452C20.5693 11.9452 23.038 14.414 23.038 17.4593C23.038 20.5047 20.5693 22.9734 17.5239 22.9734C14.4786 22.9734 12.0098 20.5047 12.0098 17.4593Z" fill="#8B44AC"/>
+<path d="M7.36841 17.4517C7.36841 18.4691 6.54368 19.2938 5.52631 19.2938C4.50894 19.2938 3.6842 18.4691 3.6842 17.4517C3.6842 16.4343 4.50894 15.6096 5.52631 15.6096C6.54368 15.6096 7.36841 16.4343 7.36841 17.4517Z" fill="#8B44AC"/>
+</svg>
diff --git a/samples/ControlCatalog.Web/Program.cs b/samples/ControlCatalog.Web/Program.cs
index d1a7925813..7d05c8e462 100644
--- a/samples/ControlCatalog.Web/Program.cs
+++ b/samples/ControlCatalog.Web/Program.cs
@@ -1,29 +1,22 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
+using System.Runtime.Versioning;
+using Avalonia;
+using Avalonia.Web;
+using ControlCatalog;
 using ControlCatalog.Web;
 
-public class Program
+[assembly:SupportedOSPlatform("browser")]
+
+internal partial class Program
 {
-    public static async Task  Main(string[] args)
+    private static void Main(string[] args)
     {
-        await CreateHostBuilder(args).Build().RunAsync();
+        BuildAvaloniaApp()
+            .AfterSetup(_ =>
+            {
+                ControlCatalog.Pages.EmbedSample.Implementation = new EmbedSampleWeb();
+            }).SetupBrowserApp("out");
     }
 
-    public static WebAssemblyHostBuilder CreateHostBuilder(string[] args)
-    {
-        var builder = WebAssemblyHostBuilder.CreateDefault(args);
-        
-        builder.RootComponents.Add<App>("#app");
-
-        builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-
-        return builder;
-    }
+    public static AppBuilder BuildAvaloniaApp()
+           => AppBuilder.Configure<App>();
 }
-
-
-
-
diff --git a/samples/ControlCatalog.Web/Properties/launchSettings.json b/samples/ControlCatalog.Web/Properties/launchSettings.json
deleted file mode 100644
index e4da60f7ca..0000000000
--- a/samples/ControlCatalog.Web/Properties/launchSettings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:13961",
-      "sslPort": 44319
-    }
-  },
-  "profiles": {
-    "ControlCatalog.Web - IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "ControlCatalog.Web": {
-      "commandName": "Project",
-      "dotnetRunMessages": "true",
-      "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
diff --git a/samples/ControlCatalog.Web/Roots.xml b/samples/ControlCatalog.Web/Roots.xml
new file mode 100644
index 0000000000..b07fd86fa2
--- /dev/null
+++ b/samples/ControlCatalog.Web/Roots.xml
@@ -0,0 +1,7 @@
+<linker>
+  <assembly fullname="ControlCatalog" preserve="All" />
+  <assembly fullname="ControlCatalog.Web" preserve="All" />
+  <assembly fullname="Avalonia.Themes.Fluent" preserve="All" />
+  <assembly fullname="Avalonia.Themes.Simple" preserve="All" />
+  <assembly fullname="Avalonia.Controls.ColorPicker" preserve="All" />
+</linker>
diff --git a/samples/ControlCatalog.Web/Shared/MainLayout.razor.css b/samples/ControlCatalog.Web/Shared/MainLayout.razor.css
deleted file mode 100644
index 43c355a47a..0000000000
--- a/samples/ControlCatalog.Web/Shared/MainLayout.razor.css
+++ /dev/null
@@ -1,70 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-.main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-    }
-
-    .top-row a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    .top-row.auth {
-        justify-content: space-between;
-    }
-
-    .top-row a, .top-row .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .main > div {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
diff --git a/samples/ControlCatalog.Web/_Imports.razor b/samples/ControlCatalog.Web/_Imports.razor
deleted file mode 100644
index 04c7a8690e..0000000000
--- a/samples/ControlCatalog.Web/_Imports.razor
+++ /dev/null
@@ -1,11 +0,0 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.AspNetCore.Components.WebAssembly.Http
-@using Microsoft.JSInterop
-@using ControlCatalog.Web
-@using ControlCatalog.Web.Shared
-@using SkiaSharp
diff --git a/samples/ControlCatalog.Web/app.css b/samples/ControlCatalog.Web/app.css
new file mode 100644
index 0000000000..27680f6e1a
--- /dev/null
+++ b/samples/ControlCatalog.Web/app.css
@@ -0,0 +1,49 @@
+#out {
+    height: 100vh;
+    width: 100vw
+}
+
+#avalonia-splash {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    color: whitesmoke;
+    background: #171C2C;
+    font-family: 'Nunito', sans-serif;
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+}
+
+#avalonia-splash a{
+    color: whitesmoke;
+    text-decoration: none;
+}
+
+.center {
+    display: flex;
+    justify-content: center;
+    height: 250px;
+}
+
+.splash-close {
+    animation: slide 0.5s linear 1s forwards;
+}
+
+@keyframes slide {
+    0% {
+        top: 0%;
+    }
+
+    50% {
+        opacity: 80%;
+    }
+
+    100% {
+        top: 100%;
+        overflow: hidden;
+        opacity: 0;
+        display: none;
+        visibility: collapse;
+    }
+}
diff --git a/samples/ControlCatalog.Web/embed.js b/samples/ControlCatalog.Web/embed.js
new file mode 100644
index 0000000000..f393c80314
--- /dev/null
+++ b/samples/ControlCatalog.Web/embed.js
@@ -0,0 +1,11 @@
+export function addAppButton(parent) {
+    var button = globalThis.document.createElement('button');
+    button.innerText = 'Hello world';
+    var clickCount = 0;
+    button.onclick = () => {
+        clickCount++;
+        button.innerText = 'Click count ' + clickCount;
+    };
+    parent.appendChild(button);
+    return button;
+}
diff --git a/samples/ControlCatalog.Web/favicon.ico b/samples/ControlCatalog.Web/favicon.ico
new file mode 100644
index 0000000000..da8d49ff9b
Binary files /dev/null and b/samples/ControlCatalog.Web/favicon.ico differ
diff --git a/samples/ControlCatalog.Web/index.html b/samples/ControlCatalog.Web/index.html
new file mode 100644
index 0000000000..226ae70695
--- /dev/null
+++ b/samples/ControlCatalog.Web/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!--  Licensed to the .NET Foundation under one or more agreements. -->
+<!-- The .NET Foundation licenses this file to you under the MIT license. -->
+<html>
+
+<head>
+    <title>AvaloniaUI - ControlCatalog</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="modulepreload" href="./main.js" />
+    <link rel="modulepreload" href="./dotnet.js" />
+    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="stylesheet" href="./app.css" />
+</head>
+
+<body style="margin: 0px">
+    <div id="out">
+        <div id="avalonia-splash">
+            <div class="center">
+                <h2>Powered by</h2>
+                <a class="navbar-brand" href="https://www.avaloniaui.net/" target="_blank">
+                    <img src="Logo.svg" alt="Avalonia Logo" width="30" height="24" />
+                    Avalonia
+                </a>
+            </div>
+        </div>
+    </div>
+    <script type='module' src="./main.js"></script>
+</body>
+
+</html>
diff --git a/samples/ControlCatalog.Web/main.js b/samples/ControlCatalog.Web/main.js
new file mode 100644
index 0000000000..87f8a4f943
--- /dev/null
+++ b/samples/ControlCatalog.Web/main.js
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+import { dotnet } from './dotnet.js'
+import { registerAvaloniaModule } from './avalonia.js';
+
+const is_browser = typeof window != "undefined";
+if (!is_browser) throw new Error(`Expected to be running in a browser`);
+
+const dotnetRuntime = await dotnet
+    .withDiagnosticTracing(false)
+    .withApplicationArgumentsFromQuery()
+    .create();
+
+await registerAvaloniaModule(dotnetRuntime);
+
+const config = dotnetRuntime.getConfig();
+
+await dotnetRuntime.runMainAndExit(config.mainAssemblyName, ["dotnet", "is", "great!"]);
diff --git a/samples/ControlCatalog.Web/runtimeconfig.template.json b/samples/ControlCatalog.Web/runtimeconfig.template.json
new file mode 100644
index 0000000000..8f0557352c
--- /dev/null
+++ b/samples/ControlCatalog.Web/runtimeconfig.template.json
@@ -0,0 +1,11 @@
+{
+    "wasmHostProperties": {
+        "perHostConfig": [
+            {
+                "name": "browser",
+                "html-path": "index.html",
+                "Host": "browser"
+            }
+        ]
+    }
+}
diff --git a/samples/ControlCatalog.Web/wwwroot/css/app.css b/samples/ControlCatalog.Web/wwwroot/css/app.css
deleted file mode 100644
index d2a8dc525c..0000000000
--- a/samples/ControlCatalog.Web/wwwroot/css/app.css
+++ /dev/null
@@ -1,90 +0,0 @@
-html, body {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    margin: 0;
-    height: 100vh;
-    overflow: hidden;
-    touch-action: none;
-}
-
-a, .btn-link {
-    color: #0366d6;
-}
-
-.btn-primary {
-    color: #fff;
-    background-color: #1b6ec2;
-    border-color: #1861ac;
-}
-
-.content {
-    padding-top: 1.1rem;
-}
-
-.valid.modified:not([type=checkbox]) {
-    outline: 1px solid #26b050;
-}
-
-.invalid {
-    outline: 1px solid red;
-}
-
-.validation-message {
-    color: red;
-}
-
-#blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
-
-.canvas-container {
-    opacity:1;
-    background-color:#ccc;
-    position:fixed;
-    width:100%;
-    height:100%;
-    top:0px;
-    left:0px;
-    z-index:500;
-}
-
-canvas
-{
-    opacity:1;
-    background-color:#ccc;
-    position:fixed;
-    width:100%;
-    height:100%;
-    top:0px;
-    left:0px;
-    z-index:500;
-}
-
-#app, .page {
-    height: 100%;
-}
-
-.overlay{
-    opacity:0.0;
-    background-color:#ccc;
-    position:fixed;
-    width:100vw;
-    height:100vh;
-    top:0px;
-    left:0px;
-    z-index:1000;
-}
diff --git a/samples/ControlCatalog.Web/wwwroot/index.html b/samples/ControlCatalog.Web/wwwroot/index.html
deleted file mode 100644
index 7ea600673a..0000000000
--- a/samples/ControlCatalog.Web/wwwroot/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>Avalonia Sample</title>
-    <base href="/" />
-    <link href="css/app.css" rel="stylesheet" />
-</head>
-
-<body>
-    <div id="app">Powered by Avalonia</div>
-
-    <div id="blazor-error-ui">
-        An unhandled error has occurred.
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
-    <script src="js/app.js"></script>
-    <script src="_framework/blazor.webassembly.js"></script>
-</body>
-</html>
diff --git a/samples/ControlCatalog.Web/wwwroot/js/app.js b/samples/ControlCatalog.Web/wwwroot/js/app.js
deleted file mode 100644
index 5f282702bb..0000000000
--- a/samples/ControlCatalog.Web/wwwroot/js/app.js
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/samples/ControlCatalog.iOS/AppDelegate.cs b/samples/ControlCatalog.iOS/AppDelegate.cs
index f1c2241003..f8caffed14 100644
--- a/samples/ControlCatalog.iOS/AppDelegate.cs
+++ b/samples/ControlCatalog.iOS/AppDelegate.cs
@@ -13,6 +13,13 @@ namespace ControlCatalog
     [Register("AppDelegate")]
     public partial class AppDelegate : AvaloniaAppDelegate<App>
     {
-        
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+        {
+            return base.CustomizeAppBuilder(builder)
+                .AfterSetup(_ =>
+                {
+                    Pages.EmbedSample.Implementation = new EmbedSampleIOS();
+                });
+        }
     }
 }
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
index db1e16166a..74d5b2fd8c 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
+++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
@@ -1,186 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>{57E0455D-D565-44BB-B069-EE1AA20F8337}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <RootNamespace>ControlCatalog.iOS</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>ControlCatalogiOS</AssemblyName>
-    <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
-    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <ProvisioningType>automatic</ProvisioningType>
+    <ProvisioningType>manual</ProvisioningType>
+    <TargetFramework>net6.0-ios</TargetFramework>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
+    <!-- temporal workaround for our GL interface backend -->
+    <UseInterpreter>True</UseInterpreter>
+    <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
+    <!--    <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>-->
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>x86_64</MtouchArch>
-    <MtouchLink>None</MtouchLink>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchSdkVersion>9.1</MtouchSdkVersion>
-    <MtouchProfiling>False</MtouchProfiling>
-    <MtouchFastDev>False</MtouchFastDev>
-    <MtouchNoSymbolStrip>False</MtouchNoSymbolStrip>
-    <MtouchUseLlvm>False</MtouchUseLlvm>
-    <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchEnableBitcode>False</MtouchEnableBitcode>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
-    <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
-    <MtouchFloat32>False</MtouchFloat32>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>true</MtouchDebug>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhone\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <BuildIpa>True</BuildIpa>
-    <CodesignProvision>Automatic:AdHoc</CodesignProvision>
-    <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\AppStore</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <CodesignProvision>Automatic:AppStore</CodesignProvision>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AppDelegate.cs" />
-    <None Include="Info.plist" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <InterfaceDefinition Include="Resources\LaunchScreen.xib" />
-    <Content Include="Entitlements.plist" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.iOS" />
-  </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj">
-      <Project>{4488AD85-1495-4809-9AA4-DDFE0A48527E}</Project>
-      <Name>Avalonia.iOS</Name>
-      <IsAppExtension>false</IsAppExtension>
-      <IsWatchApp>false</IsWatchApp>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
-      <Project>{3E53A01A-B331-47F3-B828-4A5717E77A24}</Project>
-      <Name>Avalonia.Markup.Xaml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
-      <Project>{6417E941-21BC-467B-A771-0DE389353CE6}</Project>
-      <Name>Avalonia.Markup</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj">
-      <Project>{7062AE20-5DCC-4442-9645-8195BDECE63E}</Project>
-      <Name>Avalonia.Diagnostics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
-      <Project>{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}</Project>
-      <Name>Avalonia.Themes.Default</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
-      <Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
-      <Name>Avalonia.Skia</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj">
-      <Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
-      <Name>ControlCatalog</Name>
-    </ProjectReference>
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" />
+    <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
+    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\build\LegacyProject.targets" />
-  <Import Project="..\..\build\SkiaSharp.props" />
-  <Import Project="..\..\build\HarfBuzzSharp.props" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/ControlCatalog.iOS/EmbedSample.iOS.cs b/samples/ControlCatalog.iOS/EmbedSample.iOS.cs
new file mode 100644
index 0000000000..ad86d2b578
--- /dev/null
+++ b/samples/ControlCatalog.iOS/EmbedSample.iOS.cs
@@ -0,0 +1,38 @@
+using System;
+using Avalonia.Platform;
+using CoreGraphics;
+using Foundation;
+using UIKit;
+using WebKit;
+using Avalonia.iOS;
+using ControlCatalog.Pages;
+
+namespace ControlCatalog;
+
+public class EmbedSampleIOS : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        if (isSecond)
+        {
+            var webView = new WKWebView(CGRect.Empty, new WKWebViewConfiguration());
+            webView.LoadRequest(new NSUrlRequest(new NSUrl("https://www.apple.com/")));
+
+            return new UIViewControlHandle(webView);
+        }
+        else
+        {
+            var button = new UIButton();
+            var clickCount = 0;
+            button.SetTitle("Hello world", UIControlState.Normal);
+            button.BackgroundColor = UIColor.Blue;
+            button.AddTarget((_, _) =>
+            {
+                clickCount++;
+                button.SetTitle($"Click count {clickCount}", UIControlState.Normal);
+            }, UIControlEvent.TouchDown);
+
+            return new UIViewControlHandle(button);
+        }
+    }
+}
diff --git a/samples/ControlCatalog.iOS/Info.plist b/samples/ControlCatalog.iOS/Info.plist
index 216fd9c333..6ffe3ba662 100644
--- a/samples/ControlCatalog.iOS/Info.plist
+++ b/samples/ControlCatalog.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDisplayName</key>
 	<string>ControlCatalog.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.companyname.ControlCatalog.iOS</string>
+	<string>Avalonia.ControlCatalog</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -13,7 +13,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
-	<string>8.0</string>
+	<string>10.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -28,6 +28,7 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
@@ -38,5 +39,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIStatusBarHidden</key>
+	<true/>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/samples/ControlCatalog.iOS/Main.cs b/samples/ControlCatalog.iOS/Main.cs
index fe039ba69e..2400115041 100644
--- a/samples/ControlCatalog.iOS/Main.cs
+++ b/samples/ControlCatalog.iOS/Main.cs
@@ -9,7 +9,7 @@ namespace ControlCatalog.iOS
         {
             // if you want to use a different Application Delegate class from "AppDelegate"
             // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog.iOS/Properties/AssemblyInfo.cs b/samples/ControlCatalog.iOS/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0a5a598651..0000000000
--- a/samples/ControlCatalog.iOS/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ControlCatalog.iOS")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ControlCatalog.iOS")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("57e0455d-d565-44bb-b069-ee1aa20f8337")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/ControlCatalog.iOS/Resources/LaunchScreen.xib b/samples/ControlCatalog.iOS/Resources/LaunchScreen.xib
index be4abb2b43..5d3ccc97db 100644
--- a/samples/ControlCatalog.iOS/Resources/LaunchScreen.xib
+++ b/samples/ControlCatalog.iOS/Resources/LaunchScreen.xib
@@ -11,7 +11,7 @@
 			<rect key="frame" x="0.0" y="0.0" width="480" height="480" />
 			<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
 			<subviews>
-				<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2016 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
+				<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2022 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
 					minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
 					<rect key="frame" x="20" y="439" width="441" height="21" />
 					<fontDescription key="fontDescription" type="system" pointSize="17" />
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index d0e1bd885e..b228e72f72 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -5,6 +5,13 @@
              x:CompileBindings="True"
              Name="Avalonia ControlCatalog"
              x:Class="ControlCatalog.App">
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
   <Application.Styles>
     <Style Selector="TextBlock.h1, TextBlock.h2, TextBlock.h3">
       <Setter Property="TextWrapping" Value="Wrap" />
@@ -29,7 +36,6 @@
     <Style Selector="Label.h3">
       <Setter Property="FontSize" Value="12" />
     </Style>
-    <StyleInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
   </Application.Styles>
   <TrayIcon.Icons>
     <TrayIcons>
@@ -43,6 +49,7 @@
                 <NativeMenuItemSeparator />
                 <NativeMenuItem Header="Option 3" ToggleType="CheckBox" IsChecked="True" Command="{Binding ToggleCommand}" />
                 <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Restore Defaults" Command="{Binding ToggleCommand}" />
+                <NativeMenuItem Header="Disabled option" IsEnabled="False" />
               </NativeMenu>
             </NativeMenuItem>
             <NativeMenuItem Header="Exit" Command="{Binding ExitCommand}" />
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index f6d382f99d..750c1082a6 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
-using Avalonia.Themes.Default;
+using Avalonia.Themes.Simple;
 using Avalonia.Themes.Fluent;
 using ControlCatalog.ViewModels;
 
@@ -18,21 +18,31 @@ namespace ControlCatalog
             DataContext = new ApplicationViewModel();
         }
 
+        public static readonly StyleInclude ColorPickerFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        {
+            Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml")
+        };
+
+        public static readonly StyleInclude ColorPickerSimple = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        {
+            Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml")
+        };
+
         public static readonly StyleInclude DataGridFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
         {
             Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml")
         };
 
-        public static readonly StyleInclude DataGridDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        public static readonly StyleInclude DataGridSimple = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
         {
-            Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Default.xaml")
+            Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml")
         };
 
         public static FluentTheme Fluent = new FluentTheme(new Uri("avares://ControlCatalog/Styles"));
 
-        public static SimpleTheme Default = new SimpleTheme(new Uri("avares://ControlCatalog/Styles"));
+        public static SimpleTheme Simple = new SimpleTheme(new Uri("avares://ControlCatalog/Styles"));
 
-        public static Styles DefaultLight = new Styles
+        public static Styles SimpleLight = new Styles
         {
             new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
             {
@@ -46,10 +56,10 @@ namespace ControlCatalog
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml")
             },
-            Default
+            Simple
         };
 
-        public static Styles DefaultDark = new Styles
+        public static Styles SimpleDark = new Styles
         {
             new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
             {
@@ -63,13 +73,14 @@ namespace ControlCatalog
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml")
             },
-            Default
+            Simple
         };
 
         public override void Initialize()
         {
             Styles.Insert(0, Fluent);
-            Styles.Insert(1, DataGridFluent);
+            Styles.Insert(1, ColorPickerFluent);
+            Styles.Insert(2, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 
@@ -78,11 +89,6 @@ namespace ControlCatalog
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
             {
                 desktopLifetime.MainWindow = new MainWindow();
-
-                this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
-                {
-                    StartupScreenIndex = 1,
-                });
             }
             else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
             {
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 7864459e77..2654574a3e 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>    
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>    
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -13,6 +14,9 @@
     <AvaloniaResource Include="Assets\*" />
     <AvaloniaResource Include="Assets\Fonts\*" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Pages\NativeEmbedPage.xaml" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Bold.ttf" />
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
@@ -23,11 +27,25 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AvaloniaResource Update="Pages\NativeEmbedPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Pages\NativeEmbedPage.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/ControlCatalog/Converter/HexConverter.cs b/samples/ControlCatalog/Converter/HexConverter.cs
new file mode 100644
index 0000000000..31cce5ba67
--- /dev/null
+++ b/samples/ControlCatalog/Converter/HexConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+
+namespace ControlCatalog.Converter;
+
+public class HexConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        var str = value?.ToString();
+        if (str == null)
+            return AvaloniaProperty.UnsetValue;
+        if (int.TryParse(str, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out int x))
+            return (decimal)x;
+        return AvaloniaProperty.UnsetValue;
+
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        try
+        {
+            if (value is decimal d)
+                return ((int)d).ToString("X8");
+            return AvaloniaProperty.UnsetValue;
+        }
+        catch
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Converter/MathSubtractConverter.cs b/samples/ControlCatalog/Converter/MathSubtractConverter.cs
new file mode 100644
index 0000000000..6f3c99abe8
--- /dev/null
+++ b/samples/ControlCatalog/Converter/MathSubtractConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace ControlCatalog.Converter;
+
+public class MathSubtractConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is double dv && parameter is double dp)
+        {
+            return dv - dp;
+        }
+        return double.NaN;
+    }
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
diff --git a/samples/ControlCatalog/DecoratedWindow.xaml b/samples/ControlCatalog/DecoratedWindow.xaml
index 5251a2fa55..c778b31c42 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml
+++ b/samples/ControlCatalog/DecoratedWindow.xaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="ControlCatalog.DecoratedWindow"
         Title="Avalonia Control Gallery"
-        xmlns:local="clr-namespace:ControlCatalog" HasSystemDecorations="False" Name="Window">
+        xmlns:local="clr-namespace:ControlCatalog" SystemDecorations="None" Name="Window">
         <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="Decorated">
diff --git a/samples/ControlCatalog/DecoratedWindow.xaml.cs b/samples/ControlCatalog/DecoratedWindow.xaml.cs
index a1383b9107..ed30b7f491 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml.cs
+++ b/samples/ControlCatalog/DecoratedWindow.xaml.cs
@@ -15,7 +15,7 @@ namespace ControlCatalog
 
         void SetupSide(string name, StandardCursorType cursor, WindowEdge edge)
         {
-            var ctl = this.FindControl<Control>(name);
+            var ctl = this.Get<Control>(name);
             ctl.Cursor = new Cursor(cursor);
             ctl.PointerPressed += (i, e) =>
             {
@@ -26,7 +26,7 @@ namespace ControlCatalog
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-            this.FindControl<Control>("TitleBar").PointerPressed += (i, e) =>
+            this.Get<Control>("TitleBar").PointerPressed += (i, e) =>
             {
                 PlatformImpl?.BeginMoveDrag(e);
             };
@@ -38,12 +38,12 @@ namespace ControlCatalog
             SetupSide("TopRight", StandardCursorType.TopRightCorner, WindowEdge.NorthEast);
             SetupSide("BottomLeft", StandardCursorType.BottomLeftCorner, WindowEdge.SouthWest);
             SetupSide("BottomRight", StandardCursorType.BottomRightCorner, WindowEdge.SouthEast);
-            this.FindControl<Button>("MinimizeButton").Click += delegate { this.WindowState = WindowState.Minimized; };
-            this.FindControl<Button>("MaximizeButton").Click += delegate
+            this.Get<Button>("MinimizeButton").Click += delegate { this.WindowState = WindowState.Minimized; };
+            this.Get<Button>("MaximizeButton").Click += delegate
             {
                 WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
             };
-            this.FindControl<Button>("CloseButton").Click += delegate
+            this.Get<Button>("CloseButton").Click += delegate
             {
                 Close();
             };
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 7beb496ab5..0d7a1ea4d7 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -2,8 +2,8 @@
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:ControlSamples;assembly=ControlSamples"
-             xmlns:pages="clr-namespace:ControlCatalog.Pages"
-             xmlns:models="clr-namespace:ControlCatalog.Models">
+             xmlns:models="clr-namespace:ControlCatalog.Models"
+             xmlns:pages="clr-namespace:ControlCatalog.Pages">
   <Grid>
     <Grid.Styles>
       <Style Selector="TextBlock.h2">
@@ -12,10 +12,16 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
       </Style>
     </Grid.Styles>
-    <controls:HamburgerMenu Name="Sidebar">
+      <controls:HamburgerMenu Name="Sidebar">
+        <TabItem Header="Composition">
+        <pages:CompositionPage/>
+      </TabItem>
       <TabItem Header="Acrylic">
         <pages:AcrylicPage />
       </TabItem>
+      <TabItem Header="AdornerLayer">
+        <pages:AdornerLayerPage />
+      </TabItem>
       <TabItem Header="AutoCompleteBox">
         <pages:AutoCompleteBoxPage />
       </TabItem>
@@ -40,6 +46,12 @@
       <TabItem Header="CheckBox">
         <pages:CheckBoxPage />
       </TabItem>
+      <TabItem Header="Clipboard">
+        <pages:ClipboardPage />
+      </TabItem>
+      <TabItem Header="ColorPicker">
+        <pages:ColorPickerPage />
+      </TabItem>
       <TabItem Header="ComboBox">
         <pages:ComboBoxPage />
       </TabItem>
@@ -63,6 +75,9 @@
       <TabItem Header="CalendarDatePicker">
         <pages:CalendarDatePickerPage />
       </TabItem>
+      <TabItem Header="Dialogs">
+        <pages:DialogsPage />
+      </TabItem>
       <TabItem Header="Drag+Drop">
         <pages:DragAndDropPage />
       </TabItem>
@@ -103,7 +118,10 @@
       <TabItem Header="OpenGL">
         <pages:OpenGlPage />
       </TabItem>
-      <TabItem Header="Pointers (Touch)">
+      <TabItem Header="Platform Information">
+        <pages:PlatformInfoPage />
+      </TabItem>
+      <TabItem Header="Pointers">
         <pages:PointersPage />
       </TabItem>
       <TabItem Header="ProgressBar">
@@ -115,7 +133,7 @@
       <TabItem Header="RelativePanel">
         <pages:RelativePanelPage />
       </TabItem>
-      <TabItem Header="ScrollViewer">
+        <TabItem Header="ScrollViewer">
         <pages:ScrollViewerPage />
       </TabItem>
       <TabItem Header="Slider">
@@ -142,12 +160,18 @@
       <TabItem Header="ToolTip">
         <pages:ToolTipPage />
       </TabItem>
+      <TabItem Header="TransitioningContentControl">
+        <pages:TransitioningContentControlPage />
+      </TabItem>
       <TabItem Header="TreeView">
         <pages:TreeViewPage />
       </TabItem>
       <TabItem Header="Viewbox">
         <pages:ViewboxPage />
       </TabItem>
+      <TabItem Header="Native Embed">
+        <pages:NativeEmbedPage />
+      </TabItem>
       <TabItem Header="Window Customizations">
         <pages:WindowCustomizationsPage />
       </TabItem>
@@ -169,8 +193,8 @@
               <ComboBox.Items>
                 <models:CatalogTheme>FluentLight</models:CatalogTheme>
                 <models:CatalogTheme>FluentDark</models:CatalogTheme>
-                <models:CatalogTheme>DefaultLight</models:CatalogTheme>
-                <models:CatalogTheme>DefaultDark</models:CatalogTheme>
+                <models:CatalogTheme>SimpleLight</models:CatalogTheme>
+                <models:CatalogTheme>SimpleDark</models:CatalogTheme>
               </ComboBox.Items>
             </ComboBox>
             <ComboBox x:Name="TransparencyLevels"
@@ -184,6 +208,14 @@
                 <WindowTransparencyLevel>Mica</WindowTransparencyLevel>
               </ComboBox.Items>
             </ComboBox>
+            <ComboBox x:Name="FlowDirection"
+                      HorizontalAlignment="Stretch"
+                      SelectedIndex="0">
+              <ComboBox.Items>
+                <FlowDirection>LeftToRight</FlowDirection>
+                <FlowDirection>RightToLeft</FlowDirection>
+              </ComboBox.Items>
+            </ComboBox>
             <ComboBox HorizontalAlignment="Stretch"
                       Items="{Binding WindowStates}"
                       SelectedItem="{Binding WindowState}" />
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 79cf07c8d9..7001eb41ea 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -2,10 +2,10 @@ using System;
 using System.Collections;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
-using Avalonia.Platform;
 using Avalonia.Themes.Fluent;
 using ControlCatalog.Models;
 using ControlCatalog.Pages;
@@ -18,30 +18,24 @@ namespace ControlCatalog
         {
             AvaloniaXamlLoader.Load(this);
 
-            var sideBar = this.FindControl<TabControl>("Sidebar");
+            var sideBar = this.Get<TabControl>("Sidebar");
 
-            if (AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().IsDesktop)
+            if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime)
             {
-                IList tabItems = ((IList)sideBar.Items);
-                tabItems.Add(new TabItem()
-                {
-                    Header = "Dialogs",
-                    Content = new DialogsPage()
-                });
-                tabItems.Add(new TabItem()
+                var tabItems = (sideBar.Items as IList);
+                tabItems?.Add(new TabItem()
                 {
                     Header = "Screens",
                     Content = new ScreenPage()
                 });
-
             }
 
-            var themes = this.Find<ComboBox>("Themes");
+            var themes = this.Get<ComboBox>("Themes");
             themes.SelectionChanged += (sender, e) =>
             {
                 if (themes.SelectedItem is CatalogTheme theme)
                 {
-                    var themeStyle = Application.Current.Styles[0];
+                    var themeStyle = Application.Current!.Styles[0];
                     if (theme == CatalogTheme.FluentLight)
                     {
                         if (App.Fluent.Mode != FluentThemeMode.Light)
@@ -49,7 +43,8 @@ namespace ControlCatalog
                             App.Fluent.Mode = FluentThemeMode.Light;
                         }
                         Application.Current.Styles[0] = App.Fluent;
-                        Application.Current.Styles[1] = App.DataGridFluent;
+                        Application.Current.Styles[1] = App.ColorPickerFluent;
+                        Application.Current.Styles[2] = App.DataGridFluent;
                     }
                     else if (theme == CatalogTheme.FluentDark)
                     {
@@ -59,24 +54,36 @@ namespace ControlCatalog
                             App.Fluent.Mode = FluentThemeMode.Dark;
                         }
                         Application.Current.Styles[0] = App.Fluent;
-                        Application.Current.Styles[1] = App.DataGridFluent;
+                        Application.Current.Styles[1] = App.ColorPickerFluent;
+                        Application.Current.Styles[2] = App.DataGridFluent;
                     }
-                    else if (theme == CatalogTheme.DefaultLight)
+                    else if (theme == CatalogTheme.SimpleLight)
                     {
-                        App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Light;
-                        Application.Current.Styles[0] = App.DefaultLight;
-                        Application.Current.Styles[1] = App.DataGridDefault;
+                        App.Simple.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Light;
+                        Application.Current.Styles[0] = App.SimpleLight;
+                        Application.Current.Styles[1] = App.ColorPickerSimple;
+                        Application.Current.Styles[2] = App.DataGridSimple;
                     }
-                    else if (theme == CatalogTheme.DefaultDark)
+                    else if (theme == CatalogTheme.SimpleDark)
                     {
-                        App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Dark;
-                        Application.Current.Styles[0] = App.DefaultDark;
-                        Application.Current.Styles[1] = App.DataGridDefault;
+                        App.Simple.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Dark;
+                        Application.Current.Styles[0] = App.SimpleDark;
+                        Application.Current.Styles[1] = App.ColorPickerSimple;
+                        Application.Current.Styles[2] = App.DataGridSimple;
                     }
                 }
             };
 
-            var decorations = this.Find<ComboBox>("Decorations");
+            var flowDirections = this.Get<ComboBox>("FlowDirection");
+            flowDirections.SelectionChanged += (sender, e) =>
+            {
+                if (flowDirections.SelectedItem is FlowDirection flowDirection)
+                {
+                    this.FlowDirection = flowDirection;
+                }
+            };
+
+            var decorations = this.Get<ComboBox>("Decorations");
             decorations.SelectionChanged += (sender, e) =>
             {
                 if (VisualRoot is Window window
@@ -86,8 +93,8 @@ namespace ControlCatalog
                 }
             };
 
-            var transparencyLevels = this.Find<ComboBox>("TransparencyLevels");
-            IDisposable backgroundSetter = null, paneBackgroundSetter = null;
+            var transparencyLevels = this.Get<ComboBox>("TransparencyLevels");
+            IDisposable? backgroundSetter = null, paneBackgroundSetter = null;
             transparencyLevels.SelectionChanged += (sender, e) =>
             {
                 backgroundSetter?.Dispose();
@@ -105,7 +112,7 @@ namespace ControlCatalog
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            var decorations = this.Find<ComboBox>("Decorations");
+            var decorations = this.Get<ComboBox>("Decorations");
             if (VisualRoot is Window window)
                 decorations.SelectedIndex = (int)window.SystemDecorations;
         }
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 1e4bf2de38..d5513904c0 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -18,15 +18,15 @@
     <NativeMenu>
       <NativeMenuItem Header="File">
         <NativeMenu>
-          <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Open" Clicked="OnOpenClicked" Gesture="Ctrl+O"/>
-          <NativeMenuItemSeperator/><!-- Uses incorrect spelling to demonstrate backwards compatibility -->
+          <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Open" Click="OnOpenClicked" Gesture="Ctrl+O"/>
+          <NativeMenuItemSeparator/>
           <NativeMenuItem Icon="/Assets/github_icon.png" Header="Recent">
             <NativeMenu/>
           </NativeMenuItem>
           <NativeMenuItemSeparator/>
           <NativeMenuItem Header="{x:Static local:MainWindow.MenuQuitHeader}"
                           Gesture="{x:Static local:MainWindow.MenuQuitGesture}"
-                          Clicked="OnCloseClicked" />
+                          Click="OnCloseClicked" />
         </NativeMenu>
       </NativeMenuItem>
       <NativeMenuItem Header="Edit">
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 20591103b7..c589f41442 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -11,26 +11,14 @@ namespace ControlCatalog
 {
     public class MainWindow : Window
     {
-        private WindowNotificationManager _notificationArea;
-        private NativeMenu _recentMenu;
+        private NativeMenu? _recentMenu;
 
         public MainWindow()
         {
             this.InitializeComponent();
 
-            //Renderer.DrawFps = true;
-            //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
-
-            _notificationArea = new WindowNotificationManager(this)
-            {
-                Position = NotificationPosition.TopRight,
-                MaxItems = 3
-            };
-
-            DataContext = new MainWindowViewModel(_notificationArea);
-            _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu;
-
-            ExtendClientAreaChromeHints = Avalonia.Platform.ExtendClientAreaChromeHints.OSXThickTitleBar;
+            DataContext = new MainWindowViewModel();
+            _recentMenu = ((NativeMenu.GetMenu(this)?.Items[0] as NativeMenuItem)?.Menu?.Items[2] as NativeMenuItem)?.Menu;
         }
 
         public static string MenuQuitHeader => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Quit Avalonia" : "E_xit";
@@ -41,7 +29,7 @@ namespace ControlCatalog
 
         public void OnOpenClicked(object sender, EventArgs args)
         {
-            _recentMenu.Items.Insert(0, new NativeMenuItem("Item " + (_recentMenu.Items.Count + 1)));
+            _recentMenu?.Items.Insert(0, new NativeMenuItem("Item " + (_recentMenu.Items.Count + 1)));
         }
 
         public void OnCloseClicked(object sender, EventArgs args)
diff --git a/samples/ControlCatalog/Models/CatalogTheme.cs b/samples/ControlCatalog/Models/CatalogTheme.cs
index f7be8e0014..37224ed26e 100644
--- a/samples/ControlCatalog/Models/CatalogTheme.cs
+++ b/samples/ControlCatalog/Models/CatalogTheme.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ControlCatalog.Models
+namespace ControlCatalog.Models
 {
     public enum CatalogTheme
     {
         FluentLight,
         FluentDark,
-        DefaultLight,
-        DefaultDark
+        SimpleLight,
+        SimpleDark
     }
 }
diff --git a/samples/ControlCatalog/Models/Countries.cs b/samples/ControlCatalog/Models/Countries.cs
index e138f97491..20b6a85137 100644
--- a/samples/ControlCatalog/Models/Countries.cs
+++ b/samples/ControlCatalog/Models/Countries.cs
@@ -237,7 +237,7 @@ namespace ControlCatalog.Models
             yield return new Country("Zimbabwe", "SUB-SAHARAN AFRICA", 12236805, 390580, 31.3, 0, 0, 67.69, 1900, 90.7, 26.8, 28.01, 21.84);
         }
 
-        static IReadOnlyList<Country> _all;
+        static IReadOnlyList<Country>? _all;
 
         public static IReadOnlyList<Country> All
         {
@@ -253,4 +253,4 @@ namespace ControlCatalog.Models
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog/Models/GDPValueConverter.cs b/samples/ControlCatalog/Models/GDPValueConverter.cs
index 1ca3e9c8e4..cad1574e7a 100644
--- a/samples/ControlCatalog/Models/GDPValueConverter.cs
+++ b/samples/ControlCatalog/Models/GDPValueConverter.cs
@@ -14,7 +14,7 @@ namespace ControlCatalog.Models
 {
     public class GDPValueConverter : IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             if (value is int gdp)
             {
@@ -29,7 +29,7 @@ namespace ControlCatalog.Models
             return value;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }
diff --git a/samples/ControlCatalog/Models/Person.cs b/samples/ControlCatalog/Models/Person.cs
index cd70fa3959..99bc50250b 100644
--- a/samples/ControlCatalog/Models/Person.cs
+++ b/samples/ControlCatalog/Models/Person.cs
@@ -13,8 +13,8 @@ namespace ControlCatalog.Models
 {
     public class Person : INotifyDataErrorInfo, INotifyPropertyChanged
     {
-        string _firstName;
-        string _lastName;
+        string _firstName = string.Empty;
+        string _lastName = string.Empty;
         bool _isBanned;
         private int _age;
 
@@ -76,7 +76,7 @@ namespace ControlCatalog.Models
 
         Dictionary<string, List<string>> _errorLookup = new Dictionary<string, List<string>>();
 
-        void SetError(string propertyName, string error)
+        void SetError(string propertyName, string? error)
         {
             if (string.IsNullOrEmpty(error))
             {
@@ -85,14 +85,14 @@ namespace ControlCatalog.Models
             }
             else
             {
-                if (_errorLookup.TryGetValue(propertyName, out List<string> errorList))
+                if (_errorLookup.TryGetValue(propertyName, out var errorList))
                 {
                     errorList.Clear();
-                    errorList.Add(error);
+                    errorList.Add(error!);
                 }
                 else
                 {
-                    var errors = new List<string> { error };
+                    var errors = new List<string> { error! };
                     _errorLookup.Add(propertyName, errors);
                 }
 
@@ -102,8 +102,8 @@ namespace ControlCatalog.Models
 
         public bool HasErrors => _errorLookup.Count > 0;
 
-        public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         void OnErrorsChanged(string propertyName)
         {
@@ -114,12 +114,12 @@ namespace ControlCatalog.Models
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public IEnumerable GetErrors(string propertyName)
+        public IEnumerable GetErrors(string? propertyName)
         {
-            if (_errorLookup.TryGetValue(propertyName, out List<string> errorList))
+            if (propertyName is { } && _errorLookup.TryGetValue(propertyName, out var errorList))
                 return errorList;
             else
-                return null;
+                return Array.Empty<object>();
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/AdornerLayerPage.xaml b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml
new file mode 100644
index 0000000000..598844d695
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml
@@ -0,0 +1,66 @@
+<UserControl x:Class="ControlCatalog.Pages.AdornerLayerPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d:DesignHeight="800"
+             d:DesignWidth="400"
+             mc:Ignorable="d">
+
+  <DockPanel>
+    <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto" Margin="16" DockPanel.Dock="Top">
+      <TextBlock Grid.Column="0" Grid.Row="0">Rotation</TextBlock>
+      <Slider Name="rotation" Maximum="360" Grid.Column="1" Grid.Row="0"/>
+    </Grid>
+
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Top">
+      <Button Name="AddAdorner" 
+              Click="AddAdorner_OnClick"
+              Content="Add Adorner" 
+              Margin="6" />
+      <Button Name="RemoveAdorner" 
+              Click="RemoveAdorner_OnClick"
+              Content="Remove Adorner"
+              Margin="6" />
+    </StackPanel>
+
+    <Grid ColumnDefinitions="24,Auto,24" 
+          RowDefinitions="24,Auto,24"
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center">
+      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="1" Grid.Row="0"/>
+      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="0" Grid.Row="1"/>
+      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="2" Grid.Row="1"/>
+      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="1" Grid.Row="2"/>
+
+      <LayoutTransformControl Name="layoutTransform" Grid.Column="1" Grid.Row="1">
+        <LayoutTransformControl.LayoutTransform>
+          <RotateTransform Angle="{Binding #rotation.Value}"/>
+        </LayoutTransformControl.LayoutTransform>
+
+        <Button Name="AdornerButton"
+                Content="Adorned Button" 
+                HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center" VerticalAlignment="Stretch" 
+                Width="200" Height="42">
+          <AdornerLayer.Adorner>
+            <Canvas x:Name="AdornerCanvas"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="Cyan"
+                    IsHitTestVisible="False"
+                    Opacity="0.3"
+                    IsVisible="True">
+              <Line StartPoint="-10000,0" EndPoint="10000,0" Stroke="Cyan" StrokeThickness="1" />
+              <Line StartPoint="-10000,42" EndPoint="10000,42" Stroke="Cyan" StrokeThickness="1" />
+              <Line StartPoint="0,-10000" EndPoint="0,10000" Stroke="Cyan" StrokeThickness="1" />
+              <Line StartPoint="200,-10000" EndPoint="200,10000" Stroke="Cyan" StrokeThickness="1" />
+            </Canvas>
+          </AdornerLayer.Adorner>
+        </Button>
+
+      </LayoutTransformControl>
+    </Grid>
+  </DockPanel>
+
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs
new file mode 100644
index 0000000000..0cf4a6633c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs
@@ -0,0 +1,48 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class AdornerLayerPage : UserControl
+    {
+        private Control? _adorner;
+
+        public AdornerLayerPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void RemoveAdorner_OnClick(object? sender, RoutedEventArgs e)
+        {
+            var adornerButton = this.FindControl<Button>("AdornerButton");
+            if (adornerButton is { })
+            {
+                var adorner = AdornerLayer.GetAdorner(adornerButton);
+                if (adorner is { })
+                {
+                    _adorner = adorner;
+                }
+                AdornerLayer.SetAdorner(adornerButton, null);
+            }
+        }
+
+        private void AddAdorner_OnClick(object? sender, RoutedEventArgs e)
+        {
+            var adornerButton = this.FindControl<Button>("AdornerButton");
+            if (adornerButton is { })
+            {
+                if (_adorner is { })
+                {
+                    AdornerLayer.SetAdorner(adornerButton, _adorner);
+                }
+            }
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 46f3705ffd..faa12bc8da 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -28,7 +28,7 @@
       </StackPanel>
       <StackPanel>
         <TextBlock Text="MinimumPopulateDelay: 1s" />
-        <AutoCompleteBox MinimumPopulateDelay="1" />
+        <AutoCompleteBox MinimumPopulateDelay="00:00:01" />
       </StackPanel>
       <StackPanel>
         <TextBlock Text="MaxDropDownHeight: 60" />
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 574cc79a7d..bc18327f12 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -1,8 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
-using Avalonia.Markup;
 using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -126,13 +124,13 @@ namespace ControlCatalog.Pages
             binding.Bindings.Add(new Binding("Name"));
             binding.Bindings.Add(new Binding("Abbreviation"));
 
-            var multibindingBox = this.FindControl<AutoCompleteBox>("MultiBindingBox");
+            var multibindingBox = this.Get<AutoCompleteBox>("MultiBindingBox");
             multibindingBox.ValueMemberBinding = binding;
 
-            var asyncBox = this.FindControl<AutoCompleteBox>("AsyncBox");
+            var asyncBox = this.Get<AutoCompleteBox>("AsyncBox");
             asyncBox.AsyncPopulator = PopulateAsync;
 
-            var customAutocompleteBox = this.FindControl<AutoCompleteBox>("CustomAutocompleteBox");
+            var customAutocompleteBox = this.Get<AutoCompleteBox>("CustomAutocompleteBox");
             customAutocompleteBox.Items = Sentences.SelectMany(x => x);
             customAutocompleteBox.TextFilter = LastWordContains;
             customAutocompleteBox.TextSelector = AppendWord;
@@ -144,11 +142,12 @@ namespace ControlCatalog.Pages
                     .OfType<AutoCompleteBox>();
         }
 
-        private bool StringContains(string str, string query)
+        private bool StringContains(string str, string? query)
         {
+            if (query == null) return false;
             return str.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0;
         }
-        private async Task<IEnumerable<object>> PopulateAsync(string searchText, CancellationToken cancellationToken)
+        private async Task<IEnumerable<object>> PopulateAsync(string? searchText, CancellationToken cancellationToken)
         {
             await Task.Delay(TimeSpan.FromSeconds(1.5), cancellationToken);
 
@@ -157,40 +156,44 @@ namespace ControlCatalog.Pages
                       .ToList();
         }
 
-        private bool LastWordContains(string searchText, string item)
+        private bool LastWordContains(string? searchText, string? item)
         {
-            var words = searchText.Split(' ');
-            var options = Sentences.Select(x => x.First).ToArray();
+            var words = searchText?.Split(' ') ?? Array.Empty<string>();
+            var options = Sentences.Select(x => x.First)
+                .ToArray<LinkedListNode<string>?>();
             for (var i = 0; i < words.Length; ++i)
             {
                 var word = words[i];
-                for (var j = 0; j < options.Length; ++j)
+                for (var j = 0; word is { } && j < options.Length; ++j)
                 {
-                    var option = options[j];
-                    if (option == null)
-                        continue;
-
-                    if (i == words.Length - 1)
-                    {
-                        options[j] = option.Value.ToLower().Contains(word.ToLower()) ? option : null;
-                    }
-                    else
+                    if (options[i] is { } option)
                     {
-                        options[j] = option.Value.Equals(word, StringComparison.InvariantCultureIgnoreCase) ? option.Next : null;
+                        if (i == words.Length - 1)
+                        {
+                            options[j] = option.Value.ToLower().Contains(word.ToLower()) ? option : null;
+                        }
+                        else
+                        {
+                            options[j] = option.Value.Equals(word, StringComparison.InvariantCultureIgnoreCase) ? option.Next : null;
+                        }
                     }
                 }
             }
 
             return options.Any(x => x != null && x.Value == item);
         }
-        private string AppendWord(string text, string item)
+        private string AppendWord(string? text, string? item)
         {
-            string[] parts = text.Split(' ');
-            if (parts.Length == 0)
-                return item;
+            if (item is { })
+            {
+                string[] parts = text?.Split(' ') ?? Array.Empty<string>();
+                if (parts.Length == 0)
+                    return item;
 
-            parts[parts.Length - 1] = item;
-            return string.Join(" ", parts);
+                parts[parts.Length - 1] = item;
+                return string.Join(" ", parts);
+            }
+            return string.Empty;
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
index c5042baccb..e7450075ad 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
@@ -21,20 +21,23 @@ namespace ControlCatalog.Pages
         public void OnSpin(object sender, SpinEventArgs e)
         {
             var spinner = (ButtonSpinner)sender;
-            var txtBox = (TextBlock)spinner.Content;
 
-            int value = Array.IndexOf(_mountains, txtBox.Text);
-            if (e.Direction == SpinDirection.Increase)
-                value++;
-            else
-                value--;
+            if (spinner.Content is TextBlock txtBox)
+            {
+                int value = Array.IndexOf(_mountains, txtBox.Text);
+                if (e.Direction == SpinDirection.Increase)
+                    value++;
+                else
+                    value--;
 
-            if (value < 0)
-                value = _mountains.Length - 1;
-            else if (value >= _mountains.Length)
-                value = 0;
+                if (value < 0)
+                    value = _mountains.Length - 1;
+                else if (value >= _mountains.Length)
+                    value = 0;
+
+                txtBox.Text = _mountains[value];
+            }
 
-            txtBox.Text = _mountains[value];
         }
 
         private readonly string[] _mountains = new[]
diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml b/samples/ControlCatalog/Pages/ButtonsPage.xaml
index 7de0872eae..8a474a203d 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml
@@ -90,6 +90,7 @@
               </Style>
             </Button.Styles>
           </Button>
+          <Button Classes="accent">Accent</Button>
         </StackPanel>
 
         <StackPanel Orientation="Vertical"
@@ -147,6 +148,35 @@
       </StackPanel>
     </Border>
 
+    <!-- DropDownButton -->
+    <Border Classes="header-border">
+      <StackPanel Orientation="Vertical"
+                  Spacing="4">
+        <TextBlock Text="DropDownButton"
+                   Classes="header" />
+        <TextBlock TextWrapping="Wrap">A button with an added drop-down chevron to visually indicate it has a flyout with additional actions.</TextBlock>
+      </StackPanel>
+    </Border>
+
+    <Border Classes="thin"
+            Padding="15">
+      <StackPanel Orientation="Vertical"
+                  Spacing="8">
+        <DropDownButton Flyout="{StaticResource SharedMenuFlyout}">
+          <TextBlock Text="Drop Down Button" />
+        </DropDownButton>
+        <DropDownButton Padding="0,0,8,0">
+          <Border Background="Teal"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Height="32"
+                  Width="32" />
+        </DropDownButton>
+        <DropDownButton IsEnabled="False">Disabled</DropDownButton>
+        <DropDownButton />
+      </StackPanel>
+    </Border>
+
     <!-- SplitButton -->
     <Border Classes="header-border">
       <StackPanel Orientation="Vertical"
@@ -169,7 +199,8 @@
           <TextBlock Text="Disabled" />
         </SplitButton>
         <SplitButton Flyout="{StaticResource SharedMenuFlyout}"
-                     Content="Re-themed">
+                     Content="Re-themed"
+                     Foreground="White">
           <SplitButton.Styles>
             <Style>
               <Style.Resources>
diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
index 5594bab176..2d63f1fee9 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
@@ -11,7 +11,7 @@ namespace ControlCatalog.Pages
         {
             InitializeComponent();
 
-            this.FindControl<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
+            this.Get<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
         }
 
         private void InitializeComponent()
@@ -19,10 +19,10 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
 
-        public void OnRepeatButtonClick(object sender, object args)
+        public void OnRepeatButtonClick(object? sender, object args)
         {
             repeatButtonClickCount++;
-            var textBlock = this.FindControl<TextBlock>("RepeatButtonTextBlock");
+            var textBlock = this.Get<TextBlock>("RepeatButtonTextBlock");
             textBlock.Text = $"Repeat Button: {repeatButtonClickCount}";
         }
     }
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 2fe16ba8e3..aef96802f4 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -10,8 +10,7 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <StackPanel Orientation="Vertical"
-                  Width="200">
+      <StackPanel Orientation="Vertical">
         <TextBlock Text="SelectedDateFormat: Short"/>
         <CalendarDatePicker Name="DatePicker1"
                     SelectedDateFormat="Short"
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
index 95bdeb363a..2cd6e547f6 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
@@ -10,11 +10,11 @@ namespace ControlCatalog.Pages
         {
             InitializeComponent();
             
-            var dp1 = this.FindControl<CalendarDatePicker>("DatePicker1");
-            var dp2 = this.FindControl<CalendarDatePicker>("DatePicker2");
-            var dp3 = this.FindControl<CalendarDatePicker>("DatePicker3");
-            var dp4 = this.FindControl<CalendarDatePicker>("DatePicker4");
-            var dp5 = this.FindControl<CalendarDatePicker>("DatePicker5");
+            var dp1 = this.Get<CalendarDatePicker>("DatePicker1");
+            var dp2 = this.Get<CalendarDatePicker>("DatePicker2");
+            var dp3 = this.Get<CalendarDatePicker>("DatePicker3");
+            var dp4 = this.Get<CalendarDatePicker>("DatePicker4");
+            var dp5 = this.Get<CalendarDatePicker>("DatePicker5");
 
             dp1.SelectedDate = DateTime.Today;
             dp2.SelectedDate = DateTime.Today.AddDays(10);
@@ -23,7 +23,7 @@ namespace ControlCatalog.Pages
 
             dp4.TemplateApplied += (s, e) =>
             {
-                dp4.BlackoutDates.AddDatesInPast();
+                dp4.BlackoutDates?.AddDatesInPast();
             };
             
         }
diff --git a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
index e3e9a3444e..e0f4268016 100644
--- a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
@@ -11,11 +11,11 @@ namespace ControlCatalog.Pages
             this.InitializeComponent();
 
             var today = DateTime.Today; 
-            var cal1 = this.FindControl<Calendar>("DisplayDatesCalendar");
+            var cal1 = this.Get<Calendar>("DisplayDatesCalendar");
             cal1.DisplayDateStart = today.AddDays(-25);
             cal1.DisplayDateEnd = today.AddDays(25);
 
-            var cal2 = this.FindControl<Calendar>("BlackoutDatesCalendar");
+            var cal2 = this.Get<Calendar>("BlackoutDatesCalendar");
             cal2.BlackoutDates.AddDatesInPast();
             cal2.BlackoutDates.Add(new CalendarDateRange(today.AddDays(6)));
         }
diff --git a/samples/ControlCatalog/Pages/CanvasPage.xaml b/samples/ControlCatalog/Pages/CanvasPage.xaml
index 0c0d897f04..416164f391 100644
--- a/samples/ControlCatalog/Pages/CanvasPage.xaml
+++ b/samples/ControlCatalog/Pages/CanvasPage.xaml
@@ -4,7 +4,7 @@
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A panel which lays out its children by explicit coordinates</TextBlock>
     <Canvas Background="Yellow" Width="300" Height="400">
-      <Rectangle Fill="Blue" Width="63" Height="41" Canvas.Left="40" Canvas.Top="31">
+      <Rectangle Fill="Blue" Width="63" Height="41" Canvas.Left="40" Canvas.Top="31" RadiusX="10" RadiusY="10">
         <Rectangle.OpacityMask>
           <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
             <LinearGradientBrush.GradientStops>
@@ -12,8 +12,9 @@
               <GradientStop Offset="1" Color="Transparent"/>
             </LinearGradientBrush.GradientStops>
           </LinearGradientBrush>
-        </Rectangle.OpacityMask>     
+        </Rectangle.OpacityMask>
       </Rectangle>
+      <Rectangle Fill="hsva(240, 83%, 73%, 90%)" Stroke="hsl(5, 85%, 85%)" StrokeThickness="2" Width="40" Height="20" Canvas.Left="150" Canvas.Top="10" RadiusX="10" RadiusY="5" />
       <Ellipse Fill="Green" Width="58" Height="58" Canvas.Left="88" Canvas.Top="100"/>
       <Path Fill="Orange" Data="M 0,0 c 0,0 50,0 50,-50 c 0,0 50,0 50,50 h -50 v 50 l -50,-50 Z" Canvas.Left="30" Canvas.Top="250"/>
       <Path Fill="OrangeRed" Canvas.Left="180" Canvas.Top="250">
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index 4a53c9026f..1c2d768966 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -29,6 +29,7 @@
         <ComboBoxItem>None</ComboBoxItem>
         <ComboBoxItem>Slide</ComboBoxItem>
         <ComboBoxItem>Crossfade</ComboBoxItem>
+        <ComboBoxItem>3D Rotation</ComboBoxItem>
       </ComboBox>
     </StackPanel>
 
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
index 66180d4ccb..c6aab5c4d5 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
@@ -16,6 +16,11 @@ namespace ControlCatalog.Pages
         public CarouselPage()
         {
             this.InitializeComponent();
+            _carousel = this.Get<Carousel>("carousel");
+            _left = this.Get<Button>("left");
+            _right = this.Get<Button>("right");
+            _transition = this.Get<ComboBox>("transition");
+            _orientation = this.Get<ComboBox>("orientation");
             _left.Click += (s, e) => _carousel.Previous();
             _right.Click += (s, e) => _carousel.Next();
             _transition.SelectionChanged += TransitionChanged;
@@ -25,14 +30,10 @@ namespace ControlCatalog.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-            _carousel = this.FindControl<Carousel>("carousel");
-            _left = this.FindControl<Button>("left");
-            _right = this.FindControl<Button>("right");
-            _transition = this.FindControl<ComboBox>("transition");
-            _orientation = this.FindControl<ComboBox>("orientation");
+
         }
 
-        private void TransitionChanged(object sender, SelectionChangedEventArgs e)
+        private void TransitionChanged(object? sender, SelectionChangedEventArgs e)
         {
             switch (_transition.SelectedIndex)
             {
@@ -45,6 +46,9 @@ namespace ControlCatalog.Pages
                 case 2:
                     _carousel.PageTransition = new CrossFade(TimeSpan.FromSeconds(0.25));
                     break;
+                case 3:
+                    _carousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), _orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
+                    break;
             }
         }
     }
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
new file mode 100644
index 0000000000..4199a9780f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="ControlCatalog.Pages.ClipboardPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Orientation="Vertical" Spacing="4">
+    <TextBlock Classes="h2">Example of ClipboardPage capabilities</TextBlock>
+
+    <Button Click="CopyText" Content="Copy text to clipboard" />
+    <Button Click="PasteText" Content="Paste text from clipboard" />
+    <Button Click="CopyTextDataObject" Content="Copy text to clipboard (data object)" />
+    <Button Click="PasteTextDataObject" Content="Paste text from clipboard (data object)" />
+
+    <Button Click="CopyFilesDataObject" Content="Copy files to clipboard (data object)" />
+    <Button Click="PasteFilesDataObject" Content="Paste files from clipboard (data object)" />
+
+    <Button Click="GetFormats" Content="Get clipboard formats" />
+    <Button Click="Clear" Content="Clear clipboard" />
+
+    <TextBox x:Name="ClipboardContent"
+             MinHeight="100"
+             AcceptsReturn="True"
+             Watermark="Text to copy of file names per line" />
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
new file mode 100644
index 0000000000..ef3d2bbafa
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class ClipboardPage : UserControl
+    {
+        public ClipboardPage()
+        {
+            InitializeComponent();
+        }
+
+        private TextBox ClipboardContent => this.Get<TextBox>("ClipboardContent");
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private async void CopyText(object? sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard && ClipboardContent is { } clipboardContent)
+                await clipboard.SetTextAsync(clipboardContent.Text ?? String.Empty);
+        }
+
+        private async void PasteText(object? sender, RoutedEventArgs args)
+        {
+            if(Application.Current!.Clipboard is { } clipboard)
+            {
+                ClipboardContent.Text = await clipboard.GetTextAsync();
+            }
+        }
+
+        private async void CopyTextDataObject(object? sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard)
+            {
+                var dataObject = new DataObject();
+                dataObject.Set(DataFormats.Text, ClipboardContent.Text ?? string.Empty);
+                await clipboard.SetDataObjectAsync(dataObject);
+            }
+        }
+
+        private async void PasteTextDataObject(object? sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard)
+            {
+                ClipboardContent.Text = await clipboard.GetDataAsync(DataFormats.Text) as string ?? string.Empty;
+            }
+        }
+
+        private async void CopyFilesDataObject(object? sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard)
+            {
+                var files = (ClipboardContent.Text ?? String.Empty)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+                if (files.Length == 0)
+                {
+                    return;
+                }
+                var dataObject = new DataObject();
+                dataObject.Set(DataFormats.FileNames, files);
+                await clipboard.SetDataObjectAsync(dataObject);
+            }
+        }
+
+        private async void PasteFilesDataObject(object? sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard)
+            {
+                var fiels = await clipboard.GetDataAsync(DataFormats.FileNames) as IEnumerable<string>;
+                ClipboardContent.Text = fiels != null ? string.Join(Environment.NewLine, fiels) : string.Empty;
+            }
+        }
+
+        private async void GetFormats(object sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard)
+            {
+                var formats = await clipboard.GetFormatsAsync();
+                ClipboardContent.Text = string.Join(Environment.NewLine, formats);
+            }
+        }
+
+        private async void Clear(object sender, RoutedEventArgs args)
+        {
+            if (Application.Current!.Clipboard is { } clipboard)
+            {
+                await clipboard.ClearAsync();
+            }
+                
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
new file mode 100644
index 0000000000..c0bb95ae92
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -0,0 +1,76 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:Avalonia.Controls;assembly=Avalonia.Controls.ColorPicker"
+             xmlns:primitives="clr-namespace:Avalonia.Controls.Primitives;assembly=Avalonia.Controls"
+             xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+             mc:Ignorable="d"
+             d:DesignWidth="800"
+             d:DesignHeight="450"
+             x:Class="ControlCatalog.Pages.ColorPickerPage">
+
+  <UserControl.Resources>
+  </UserControl.Resources>
+
+  <Grid x:Name="LayoutRoot"
+        ColumnDefinitions="Auto,10,Auto"
+        RowDefinitions="Auto,Auto">
+    <ColorView Grid.Column="0"
+               Grid.Row="0"
+               ColorSpectrumShape="Ring" />
+    <ColorPicker Grid.Column="0"
+                 Grid.Row="1"
+                 HsvColor="hsv(120, 1, 1)"
+                 Margin="0,50,0,0">
+      <ColorPicker.Palette>
+        <controls:FlatHalfColorPalette />
+      </ColorPicker.Palette>
+    </ColorPicker>
+    <Grid Grid.Column="2"
+          Grid.Row="0"
+          RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+      <ColorSpectrum x:Name="ColorSpectrum1"
+                     Grid.Row="0"
+                     Color="Red"
+                     CornerRadius="10"
+                     Height="256"
+                     Width="256" />
+      <!-- HSV Sliders -->
+      <ColorSlider Grid.Row="1"
+                   Margin="0,10,0,0"
+                   ColorComponent="Component1"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="2"
+                   ColorComponent="Component2"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="3"
+                   ColorComponent="Component3"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="4"
+                   ColorComponent="Alpha"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <!-- RGB Sliders -->
+      <!--<ColorSlider Grid.Row="5"
+                   Margin="0,10,0,0"
+                   ColorComponent="Component1"
+                   ColorModel="Rgba"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="6"
+                   ColorComponent="Component2"
+                   ColorModel="Rgba"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="7"
+                   ColorComponent="Component3"
+                   ColorModel="Rgba"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />-->
+      <ColorPreviewer Grid.Row="8"
+                      IsAccentColorsVisible="False"
+                      HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+    </Grid>
+  </Grid>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
new file mode 100644
index 0000000000..52d63ded32
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
@@ -0,0 +1,36 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+
+namespace ControlCatalog.Pages
+{
+    public partial class ColorPickerPage : UserControl
+    {
+        public ColorPickerPage()
+        {
+            InitializeComponent();
+
+            var layoutRoot = this.GetControl<Grid>("LayoutRoot");
+
+            // ColorPicker added from code-behind
+            var colorPicker = new ColorPicker()
+            {
+                Color = Colors.Blue,
+                Margin = new Thickness(0, 50, 0, 0),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Palette = new MaterialHalfColorPalette(),
+            };
+            Grid.SetColumn(colorPicker, 2);
+            Grid.SetRow(colorPicker, 1);
+            
+            layoutRoot.Children.Add(colorPicker);
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index 64e80a8e11..9f2fbb88f3 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -86,6 +86,16 @@
                         <sys:Exception />
                     </DataValidationErrors.Error>
                 </ComboBox>
+
+                <ComboBox PlaceholderText="Scaled" Width="166" RenderTransformOrigin="0,0">
+                    <ComboBox.RenderTransform>
+                      <ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
+                    </ComboBox.RenderTransform>
+                    <ComboBoxItem>Inline Items</ComboBoxItem>
+                    <ComboBoxItem>Inline Item 2</ComboBoxItem>
+                    <ComboBoxItem>Inline Item 3</ComboBoxItem>
+                    <ComboBoxItem>Inline Item 4</ComboBoxItem>
+                </ComboBox>
             </WrapPanel>
 
             <CheckBox IsChecked="{Binding WrapSelection}">WrapSelection</CheckBox>
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
index d304bf227d..6d624c9a07 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
@@ -17,7 +17,7 @@ namespace ControlCatalog.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-            var fontComboBox = this.Find<ComboBox>("fontComboBox");
+            var fontComboBox = this.Get<ComboBox>("fontComboBox");
             fontComboBox.Items = FontManager.Current.GetInstalledFontFamilyNames().Select(x => new FontFamily(x));
             fontComboBox.SelectedIndex = 0;
         }
diff --git a/samples/ControlCatalog/Pages/CompositionPage.axaml b/samples/ControlCatalog/Pages/CompositionPage.axaml
new file mode 100644
index 0000000000..22c5c88941
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CompositionPage.axaml
@@ -0,0 +1,45 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:pages="clr-namespace:ControlCatalog.Pages"
+             x:Class="ControlCatalog.Pages.CompositionPage">
+    <StackPanel>
+        <TextBlock Classes="h1">Implicit animations</TextBlock>
+        <Grid ColumnDefinitions="*,10,40" Margin="0 0 40 0">
+            <ItemsControl x:Name="Items">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.DataTemplates>
+                    <DataTemplate DataType="pages:CompositionPageColorItem">
+                        <Border 
+                            pages:CompositionPage.EnableAnimations="True"
+                            Padding="10" BorderBrush="Gray" BorderThickness="2"
+                            Background="{Binding ColorBrush}" Width="100" Height="100" Margin="10">
+                            <TextBlock Text="{Binding ColorHexValue}"/>
+                        </Border>
+                    </DataTemplate>
+                </ItemsControl.DataTemplates>
+            </ItemsControl>
+            <GridSplitter Margin="2" BorderThickness="1" BorderBrush="Gray" 
+                          Background="#e0e0e0" Grid.Column="1"
+                          ResizeDirection="Columns" ResizeBehavior="PreviousAndNext"
+            />
+            <Border Grid.Column="2">
+                <LayoutTransformControl
+                    HorizontalAlignment="Center"
+            
+                    MinWidth="30">
+                    <LayoutTransformControl.LayoutTransform>
+                        <RotateTransform Angle="90"/>
+                    </LayoutTransformControl.LayoutTransform>
+            
+                    <TextBlock>Resize me</TextBlock>
+                </LayoutTransformControl>
+            </Border>
+        </Grid>
+
+     
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/CompositionPage.axaml.cs b/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
new file mode 100644
index 0000000000..61e0ed5acb
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Rendering.Composition;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.VisualTree;
+
+namespace ControlCatalog.Pages;
+
+public partial class CompositionPage : UserControl
+{
+    private ImplicitAnimationCollection? _implicitAnimations;
+
+    public CompositionPage()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        this.Get<ItemsControl>("Items").Items = CreateColorItems();
+    }
+
+    private List<CompositionPageColorItem> CreateColorItems()
+    {
+        var list = new List<CompositionPageColorItem>();
+
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 255, 185, 0)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 231, 72, 86)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 0, 120, 215)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 0, 153, 188)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 122, 117, 116)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 118, 118, 118)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 255, 141, 0)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 232, 17, 35)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 0, 99, 177)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 45, 125, 154)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 93, 90, 88)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 76, 74, 72)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 247, 99, 12)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 234, 0, 94)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 142, 140, 216)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 0, 183, 195)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 104, 118, 138)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 105, 121, 126)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 202, 80, 16)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 195, 0, 82)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 107, 105, 214)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 3, 131, 135)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 81, 92, 107)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 74, 84, 89)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 218, 59, 1)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 227, 0, 140)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 135, 100, 184)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 0, 178, 148)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 86, 124, 115)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 100, 124, 100)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 239, 105, 80)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 191, 0, 119)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 116, 77, 169)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 1, 133, 116)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 72, 104, 96)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 82, 94, 84)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 209, 52, 56)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 194, 57, 179)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 177, 70, 194)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 0, 204, 106)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 73, 130, 5)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 132, 117, 69)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 255, 67, 67)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 154, 0, 137)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 136, 23, 152)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 16, 137, 62)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 16, 124, 16)));
+        list.Add(new CompositionPageColorItem(Color.FromArgb(255, 126, 115, 95)));
+
+        return list;
+    }
+    
+    private void EnsureImplicitAnimations()
+    {
+        if (_implicitAnimations == null)
+        {
+            var compositor = ElementComposition.GetElementVisual(this)!.Compositor;
+
+            var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+            offsetAnimation.Target = "Offset";
+            offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+            offsetAnimation.Duration = TimeSpan.FromMilliseconds(400);
+
+            var rotationAnimation = compositor.CreateScalarKeyFrameAnimation();
+            rotationAnimation.Target = "RotationAngle";
+            rotationAnimation.InsertKeyFrame(.5f, 0.160f);
+            rotationAnimation.InsertKeyFrame(1f, 0f);
+            rotationAnimation.Duration = TimeSpan.FromMilliseconds(400);
+
+            var animationGroup = compositor.CreateAnimationGroup();
+            animationGroup.Add(offsetAnimation);
+            animationGroup.Add(rotationAnimation);
+
+            _implicitAnimations = compositor.CreateImplicitAnimationCollection();
+            _implicitAnimations["Offset"] = animationGroup;
+        }
+    }
+
+    public static void SetEnableAnimations(Border border, bool value)
+    {
+        var page = border.FindAncestorOfType<CompositionPage>();
+        if (page == null)
+        {
+            border.AttachedToVisualTree += delegate { SetEnableAnimations(border, true); };
+            return;
+        }
+
+        if (ElementComposition.GetElementVisual(page) == null)
+            return;
+
+        page.EnsureImplicitAnimations();
+        if (border.GetVisualParent() is Visual visualParent 
+            && ElementComposition.GetElementVisual(visualParent) is CompositionVisual compositionVisual)
+        {
+            compositionVisual.ImplicitAnimations = page._implicitAnimations;
+        }
+    }
+}
+
+public class CompositionPageColorItem
+{
+    public Color Color { get; private set; }
+
+    public SolidColorBrush ColorBrush
+    {
+        get { return new SolidColorBrush(Color); }
+    }
+
+    public String ColorHexValue
+    {
+        get { return Color.ToString().Substring(3).ToUpperInvariant(); }
+    }
+
+    public CompositionPageColorItem(Color color)
+    {
+        Color = color;
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
index 10f9ee1de8..8bd1f4d85a 100644
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
@@ -18,29 +18,29 @@ namespace ControlCatalog.Pages
 
             DataContext = new ContextPageViewModel();
 
-            _textBox = this.FindControl<TextBox>("TextBox");
+            _textBox = this.Get<TextBox>("TextBox");
 
-            var cutButton = this.FindControl<Button>("CutButton");
+            var cutButton = this.Get<Button>("CutButton");
             cutButton.Click += CloseFlyout;
 
-            var copyButton = this.FindControl<Button>("CopyButton");
+            var copyButton = this.Get<Button>("CopyButton");
             copyButton.Click += CloseFlyout;
 
-            var pasteButton = this.FindControl<Button>("PasteButton");
+            var pasteButton = this.Get<Button>("PasteButton");
             pasteButton.Click += CloseFlyout;
 
-            var clearButton = this.FindControl<Button>("ClearButton");
+            var clearButton = this.Get<Button>("ClearButton");
             clearButton.Click += CloseFlyout;
 
-            var customContextRequestedBorder = this.FindControl<Border>("CustomContextRequestedBorder");
+            var customContextRequestedBorder = this.Get<Border>("CustomContextRequestedBorder");
             customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);
 
-            var cancellableContextBorder = this.FindControl<Border>("CancellableContextBorder");
+            var cancellableContextBorder = this.Get<Border>("CancellableContextBorder");
             cancellableContextBorder.ContextFlyout!.Closing += ContextFlyoutPage_Closing;
             cancellableContextBorder.ContextFlyout!.Opening += ContextFlyoutPage_Opening;
         }
 
-        private ContextPageViewModel _model;
+        private ContextPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
@@ -52,35 +52,35 @@ namespace ControlCatalog.Pages
             base.OnDataContextChanged(e);
         }
 
-        private void ContextFlyoutPage_Closing(object sender, CancelEventArgs e)
+        private void ContextFlyoutPage_Closing(object? sender, CancelEventArgs e)
         {
             var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelCloseCheckBox");
-            e.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+            e.Cancel = cancelCloseCheckBox?.IsChecked ?? false;
         }
 
-        private void ContextFlyoutPage_Opening(object sender, EventArgs e)
+        private void ContextFlyoutPage_Opening(object? sender, EventArgs e)
         {
             if (e is CancelEventArgs cancelArgs)
             {
                 var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelOpenCheckBox");
-                cancelArgs.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+                cancelArgs.Cancel = cancelCloseCheckBox?.IsChecked ?? false;
             }
         }
 
-        private void CloseFlyout(object sender, RoutedEventArgs e)
+        private void CloseFlyout(object? sender, RoutedEventArgs e)
         {
-            _textBox.ContextFlyout.Hide();
+            _textBox.ContextFlyout?.Hide();
         }
 
-        public void CustomContextRequested(object sender, ContextRequestedEventArgs e)
+        public void CustomContextRequested(object? sender, ContextRequestedEventArgs e)
         {
-            var border = (Border)sender;
-            var textBlock = (TextBlock)border.Child;
-
-            textBlock.Text = e.TryGetPosition(border, out var point)
-                ? $"Context was requested with pointer at: {point.X:N0}, {point.Y:N0}"
-                : "Context was requested without pointer";
-            e.Handled = true;
+            if (sender is Border border && border.Child is TextBlock textBlock)
+            {
+                textBlock.Text = e.TryGetPosition(border, out var point)
+                    ? $"Context was requested with pointer at: {point.X:N0}, {point.Y:N0}"
+                    : "Context was requested without pointer";
+                e.Handled = true;
+            }
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
index da016e9a75..96fcb54650 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
@@ -15,15 +15,15 @@ namespace ControlCatalog.Pages
             this.InitializeComponent();
             DataContext = new ContextPageViewModel();
 
-            var customContextRequestedBorder = this.FindControl<Border>("CustomContextRequestedBorder");
+            var customContextRequestedBorder = this.Get<Border>("CustomContextRequestedBorder");
             customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);
 
-            var cancellableContextBorder = this.FindControl<Border>("CancellableContextBorder");
+            var cancellableContextBorder = this.Get<Border>("CancellableContextBorder");
             cancellableContextBorder.ContextMenu!.ContextMenuClosing += ContextFlyoutPage_Closing;
             cancellableContextBorder.ContextMenu!.ContextMenuOpening += ContextFlyoutPage_Opening;
         }
 
-        private ContextPageViewModel _model;
+        private ContextPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
@@ -35,30 +35,31 @@ namespace ControlCatalog.Pages
             base.OnDataContextChanged(e);
         }
 
-        private void ContextFlyoutPage_Closing(object sender, CancelEventArgs e)
+        private void ContextFlyoutPage_Closing(object? sender, CancelEventArgs e)
         {
             var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelCloseCheckBox");
-            e.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+            e.Cancel = cancelCloseCheckBox?.IsChecked ?? false;
         }
 
-        private void ContextFlyoutPage_Opening(object sender, EventArgs e)
+        private void ContextFlyoutPage_Opening(object? sender, EventArgs e)
         {
             if (e is CancelEventArgs cancelArgs)
             {
                 var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelOpenCheckBox");
-                cancelArgs.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+                cancelArgs.Cancel = cancelCloseCheckBox?.IsChecked ?? false;
             }
         }
 
-        public void CustomContextRequested(object sender, ContextRequestedEventArgs e)
+        public void CustomContextRequested(object? sender, ContextRequestedEventArgs e)
         {
-            var border = (Border)sender;
-            var textBlock = (TextBlock)border.Child;
+            if (sender is Border border && border.Child is TextBlock textBlock)
+            {
+                textBlock.Text = e.TryGetPosition(border, out var point)
+                    ? $"Context was requested with pointer at: {point.X:N0}, {point.Y:N0}"
+                    : "Context was requested without pointer";
+                e.Handled = true;
+            }
 
-            textBlock.Text = e.TryGetPosition(border, out var point)
-                ? $"Context was requested with pointer at: {point.X:N0}, {point.Y:N0}"
-                : "Context was requested without pointer";
-            e.Handled = true;
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index f7e3cf2441..27272a9ff7 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -10,11 +10,24 @@
         <TextBlock Text="{Binding}"/>
       </StackPanel>
     </DataTemplate>
+    <ControlTheme x:Key="GdpCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+      <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
+    </ControlTheme>
   </UserControl.Resources>
   <UserControl.Styles>
-    <Style Selector="DataGridCell.gdp">
+    <Style Selector="DataGridColumnHeader:nth-last-child(1)">
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="DataGridCell:nth-last-child(1)">
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="DataGrid#dataGridGrouping DataGridRow:nth-child(5n+3)">
+      <Setter Property="Foreground" Value="Red" />
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="DataGrid#dataGridGrouping DataGridRow:nth-last-child(5n+1)">
+      <Setter Property="Foreground" Value="Blue" />
       <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
     </Style>
   </UserControl.Styles>
   <Grid RowDefinitions="Auto,Auto,*">
@@ -31,7 +44,9 @@
         <DockPanel>
           <CheckBox x:Name="ShowGDP"  IsChecked="True"  Content="Toggle GDP Column Visibility"
                     DockPanel.Dock="Top"/>
-          <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All">
+          <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All"
+                    RowBackground="#1000"
+                    AlternatingRowBackground="#1fff">
             <DataGrid.Columns>
               <!-- Using HeaderTemplate -->
               <DataGridTextColumn Header="Country" HeaderTemplate="{StaticResource Demo.DataTemplates.CountryHeader}" Binding="{Binding Name}" Width="6*" />
@@ -39,7 +54,8 @@
               <DataGridTextColumn Header="Region" Binding="{CompiledBinding Region}" Width="4*" x:DataType="local:Country" />
               <DataGridTextColumn Header="Population" Binding="{Binding Population}" Width="3*" />
               <DataGridTextColumn Header="Area" Binding="{Binding Area}" Width="3*" />
-              <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*" CellStyleClasses="gdp"
+              <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*"
+                                  CellTheme="{StaticResource GdpCell}"
                                   MinWidth="200"
                                   IsVisible="{Binding #ShowGDP.IsChecked}"/>
             </DataGrid.Columns>
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
index c010d38eac..3565d113bc 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
@@ -21,7 +21,7 @@ namespace ControlCatalog.Pages
             var dataGridSortDescription = DataGridSortDescription.FromPath(nameof(Country.Region), ListSortDirection.Ascending, new ReversedStringComparer());
             var collectionView1 = new DataGridCollectionView(Countries.All);
             collectionView1.SortDescriptions.Add(dataGridSortDescription);
-            var dg1 = this.FindControl<DataGrid>("dataGrid1");
+            var dg1 = this.Get<DataGrid>("dataGrid1");
             dg1.IsReadOnly = true;
             dg1.LoadingRow += Dg1_LoadingRow;
             dg1.Sorting += (s, a) =>
@@ -37,7 +37,7 @@ namespace ControlCatalog.Pages
             };
             dg1.Items = collectionView1;
 
-            var dg2 = this.FindControl<DataGrid>("dataGridGrouping");
+            var dg2 = this.Get<DataGrid>("dataGridGrouping");
             dg2.IsReadOnly = true;
 
             var collectionView2 = new DataGridCollectionView(Countries.All);
@@ -45,7 +45,7 @@ namespace ControlCatalog.Pages
 
             dg2.Items = collectionView2;
 
-            var dg3 = this.FindControl<DataGrid>("dataGridEdit");
+            var dg3 = this.Get<DataGrid>("dataGridEdit");
             dg3.IsReadOnly = false;
 
             var items = new List<Person>
@@ -58,11 +58,11 @@ namespace ControlCatalog.Pages
 
             dg3.Items = collectionView3;
 
-            var addButton = this.FindControl<Button>("btnAdd");
+            var addButton = this.Get<Button>("btnAdd");
             addButton.Click += (a, b) => collectionView3.AddNew();
         }
 
-        private void Dg1_LoadingRow(object sender, DataGridRowEventArgs e)
+        private void Dg1_LoadingRow(object? sender, DataGridRowEventArgs e)
         {
             e.Row.Header = e.Row.GetIndex() + 1;
         }
@@ -74,7 +74,7 @@ namespace ControlCatalog.Pages
 
         private class ReversedStringComparer : IComparer<object>, IComparer
         {
-            public int Compare(object x, object y)
+            public int Compare(object? x, object? y)
             {
                 if (x is string left && y is string right)
                 {
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
index 29cd939520..6217d39b21 100644
--- a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
@@ -13,17 +13,17 @@
                 Margin="16"
                 HorizontalAlignment="Stretch"
                 Spacing="16">
-      <TextBlock FontSize="18">A simple DatePicker with a header</TextBlock>
+      <TextBlock FontSize="18">A simple DatePicker</TextBlock>
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <DatePicker Header="Pick a date" />
+          <DatePicker />
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;DatePicker Header="Pick a date" /&gt;
+                &lt;DatePicker/&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>
@@ -33,7 +33,7 @@
       
       <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
               BorderThickness="1" Padding="15">
-        <DatePicker Header="Pick a date">
+        <DatePicker >
           <DataValidationErrors.Error>
             <sys:Exception /> 
           </DataValidationErrors.Error>
@@ -79,24 +79,24 @@
       
       <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
               BorderThickness="1" Padding="15">
-        <TimePicker Header="Pick a time">
+        <TimePicker>
           <DataValidationErrors.Error>
             <sys:Exception /> 
           </DataValidationErrors.Error>
         </TimePicker>
       </Border>
 
-      <TextBlock FontSize="18">A TimePicker with a header and minute increments specified.</TextBlock>
+      <TextBlock FontSize="18">A TimePicker with minute increments specified.</TextBlock>
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <TimePicker Header="Arrival time" MinuteIncrement="15" />
+          <TimePicker MinuteIncrement="15" />
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;TimePicker Header="Arrival time" MinuteIncrement="15" /&gt;
+                &lt;TimePicker MinuteIncrement="15" /&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>
@@ -107,13 +107,13 @@
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <TimePicker ClockIdentifier="12HourClock" Header="12 hour clock" />
+          <TimePicker ClockIdentifier="12HourClock"/>
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;TimePicker ClockIdentifier="12HourClock" Header="12 hour clock" /&gt;
+                &lt;TimePicker ClockIdentifier="12HourClock" /&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>
@@ -124,13 +124,13 @@
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <TimePicker ClockIdentifier="24HourClock" Header="24 hour clock" />
+          <TimePicker ClockIdentifier="24HourClock" />
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;TimePicker ClockIdentifier="24HourClock" Header="24 hour clock" /&gt;
+                &lt;TimePicker ClockIdentifier="24HourClock" /&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
index 6c7ae3437e..11f504f4db 100644
--- a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
@@ -9,12 +9,12 @@ namespace ControlCatalog.Pages
         public DateTimePickerPage()
         {
             this.InitializeComponent();
-            this.FindControl<TextBlock>("DatePickerDesc").Text = "Use a DatePicker to let users set a date in your app, " +
+            this.Get<TextBlock>("DatePickerDesc").Text = "Use a DatePicker to let users set a date in your app, " +
                 "for example to schedule an appointment. The DatePicker displays three controls for month, day, and year. " +
                 "These controls are easy to use with touch or mouse, and they can be styled and configured in several different ways. " +
                 "Order of month, day, and year is dynamically set based on user date settings";
 
-            this.FindControl<TextBlock>("TimePickerDesc").Text = "Use a TimePicker to let users set a time in your app, for example " +
+            this.Get<TextBlock>("TimePickerDesc").Text = "Use a TimePicker to let users set a time in your app, for example " +
                 "to set a reminder. The TimePicker displays three controls for hour, minute, and AM / PM(if necessary).These controls " +
                 "are easy to use with touch or mouse, and they can be styled and configured in several different ways. " +
                 "12 - hour or 24 - hour clock and visiblility of AM / PM is dynamically set based on user time settings, or can be overridden.";
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 6ac9dcfe22..cc23ef796a 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -1,29 +1,57 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.DialogsPage">
-  <StackPanel Orientation="Vertical" Spacing="4" Margin="4">
-      <CheckBox Name="UseFilters">Use filters</CheckBox>
-      <Button Name="OpenFile">_Open File</Button>
-      <Button Name="OpenMultipleFiles">Open _Multiple File</Button>
-      <Button Name="SaveFile">_Save File</Button>
-      <Button Name="SelectFolder">Select Fo_lder</Button>
-      <Button Name="OpenBoth">Select _Both</Button>
+<UserControl x:Class="ControlCatalog.Pages.DialogsPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Margin="4"
+              Orientation="Vertical"
+              Spacing="4">
 
-      <TextBlock x:Name="PickerLastResultsVisible"
-                 Classes="h2"
-                 IsVisible="False"
-                 Text="Last picker results:" />
-      <ItemsPresenter x:Name="PickerLastResults" />
+    <TextBlock Text="Windows:" />
 
-      <TextBlock Margin="0, 8, 0, 0"
-                 Classes="h1"
-                 Text="Window dialogs" />
-      <Button Name="DecoratedWindow">Decorated _window</Button>
-      <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button>
-      <Button Name="Dialog">_Dialog</Button>
-      <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button>
-      <Button Name="OwnedWindow">Own_ed window</Button>
-      <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button>
+    <Expander Header="Window dialogs">
+      <StackPanel Spacing="4">
+        <Button Name="DecoratedWindow">Decorated _window</Button>
+        <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button>
+        <Button Name="Dialog" ToolTip.Tip="Shows a dialog">_Dialog</Button>
+        <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button>
+        <Button Name="OwnedWindow">Own_ed window</Button>
+        <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button>
+      </StackPanel>
+    </Expander>
+
+    <TextBlock Margin="0,20,0,0" Text="Pickers:" />
+
+    <CheckBox Name="UseFilters">Use filters</CheckBox>
+    <Expander Header="FilePicker API">
+      <StackPanel Spacing="4">
+        <CheckBox Name="ForceManaged">Force managed dialog</CheckBox>
+        <CheckBox Name="OpenMultiple">Open multiple</CheckBox>
+        <Button Name="OpenFolderPicker">Select Fo_lder</Button>
+        <Button Name="OpenFilePicker">_Open File</Button>
+        <Button Name="SaveFilePicker">_Save File</Button>
+        <Button Name="OpenFileFromBookmark">Open File Bookmark</Button>
+        <Button Name="OpenFolderFromBookmark">Open Folder Bookmark</Button>
+      </StackPanel>
+    </Expander>
+    <Expander Header="Legacy OpenFileDialog">
+      <StackPanel Spacing="4">
+        <Button Name="OpenFile">_Open File</Button>
+        <Button Name="OpenMultipleFiles">Open _Multiple File</Button>
+        <Button Name="SaveFile">_Save File</Button>
+        <Button Name="SelectFolder">Select Fo_lder</Button>
+        <Button Name="OpenBoth">Select _Both</Button>
+      </StackPanel>
+    </Expander>
+
+    <TextBlock x:Name="PickerLastResultsVisible"
+               Classes="h2"
+               IsVisible="False"
+               Text="Last picker results:" />
+    <ItemsPresenter x:Name="PickerLastResults" />
+
+    <TextBox Name="BookmarkContainer" Watermark="Bookmark" />
+    <TextBox Name="OpenedFileContent"
+             MaxLines="10"
+             Watermark="Picked file content" />
 
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index e96b7aff08..67e9ef4e40 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -1,13 +1,20 @@
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Dialogs;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
-#pragma warning disable 4014
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+
+#pragma warning disable CS0618 // Type or member is obsolete
+#nullable enable
 
 namespace ControlCatalog.Pages
 {
@@ -17,15 +24,18 @@ namespace ControlCatalog.Pages
         {
             this.InitializeComponent();
 
-            var results = this.FindControl<ItemsPresenter>("PickerLastResults");
-            var resultsVisible = this.FindControl<TextBlock>("PickerLastResultsVisible");
+            var results = this.Get<ItemsPresenter>("PickerLastResults");
+            var resultsVisible = this.Get<TextBlock>("PickerLastResultsVisible");
+            var bookmarkContainer = this.Get<TextBox>("BookmarkContainer");
+            var openedFileContent = this.Get<TextBox>("OpenedFileContent");
+            var openMultiple = this.Get<CheckBox>("OpenMultiple");
 
-            string lastSelectedDirectory = null;
+            IStorageFolder? lastSelectedDirectory = null;
 
             List<FileDialogFilter> GetFilters()
             {
-                if (this.FindControl<CheckBox>("UseFilters").IsChecked != true)
-                    return null;
+                if (this.Get<CheckBox>("UseFilters").IsChecked != true)
+                    return new List<FileDialogFilter>();
                 return  new List<FileDialogFilter>
                 {
                     new FileDialogFilter
@@ -40,60 +50,84 @@ namespace ControlCatalog.Pages
                 };
             }
 
-            this.FindControl<Button>("OpenFile").Click += async delegate
+            List<FilePickerFileType>? GetFileTypes()
+            {
+                if (this.Get<CheckBox>("UseFilters").IsChecked != true)
+                    return null;
+                return new List<FilePickerFileType>
+                {
+                    FilePickerFileTypes.All,
+                    FilePickerFileTypes.TextPlain
+                };
+            }
+
+            this.Get<Button>("OpenFile").Click += async delegate
             {
+                // Almost guaranteed to exist
+                var uri = Assembly.GetEntryAssembly()?.GetModules().FirstOrDefault()?.FullyQualifiedName;
+                var initialFileName = uri == null ? null : System.IO.Path.GetFileName(uri);
+                var initialDirectory = uri == null ? null : System.IO.Path.GetDirectoryName(uri);
+
                 var result = await new OpenFileDialog()
                 {
                     Title = "Open file",
                     Filters = GetFilters(),
-                    Directory = lastSelectedDirectory,
-                    // Almost guaranteed to exist
-                    InitialFileName = Assembly.GetEntryAssembly()?.GetModules().FirstOrDefault()?.FullyQualifiedName
+                    Directory = initialDirectory,
+                    InitialFileName = initialFileName
                 }.ShowAsync(GetWindow());
                 results.Items = result;
                 resultsVisible.IsVisible = result?.Any() == true;
             };
-            this.FindControl<Button>("OpenMultipleFiles").Click += async delegate
+            this.Get<Button>("OpenMultipleFiles").Click += async delegate
             {
                 var result = await new OpenFileDialog()
                 {
                     Title = "Open multiple files",
                     Filters = GetFilters(),
-                    Directory = lastSelectedDirectory,
+                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
                     AllowMultiple = true
                 }.ShowAsync(GetWindow());
                 results.Items = result;
                 resultsVisible.IsVisible = result?.Any() == true;
             };
-            this.FindControl<Button>("SaveFile").Click += async delegate
+            this.Get<Button>("SaveFile").Click += async delegate
             {
+                var filters = GetFilters();
                 var result = await new SaveFileDialog()
                 {
                     Title = "Save file",
-                    Filters = GetFilters(),
-                    Directory = lastSelectedDirectory,
+                    Filters = filters,
+                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+                    DefaultExtension = filters?.Any() == true ? "txt" : null,
                     InitialFileName = "test.txt"
                 }.ShowAsync(GetWindow());
                 results.Items = new[] { result };
                 resultsVisible.IsVisible = result != null;
             };
-            this.FindControl<Button>("SelectFolder").Click += async delegate
+            this.Get<Button>("SelectFolder").Click += async delegate
             {
                 var result = await new OpenFolderDialog()
                 {
                     Title = "Select folder",
-                    Directory = lastSelectedDirectory,
+                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null
                 }.ShowAsync(GetWindow());
-                lastSelectedDirectory = result;
-                results.Items = new [] { result };
-                resultsVisible.IsVisible = result != null;
+                if (string.IsNullOrEmpty(result))
+                {
+                    resultsVisible.IsVisible = false;
+                }
+                else
+                {
+                    lastSelectedDirectory = new BclStorageFolder(new System.IO.DirectoryInfo(result));
+                    results.Items = new[] { result };
+                    resultsVisible.IsVisible = true;
+                }
             };
-            this.FindControl<Button>("OpenBoth").Click += async delegate
+            this.Get<Button>("OpenBoth").Click += async delegate
             {
                 var result = await new OpenFileDialog()
                 {
                     Title = "Select both",
-                    Directory = lastSelectedDirectory,
+                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
                     AllowMultiple = true
                 }.ShowManagedAsync(GetWindow(), new ManagedFileDialogOptions
                 {
@@ -102,35 +136,35 @@ namespace ControlCatalog.Pages
                 results.Items = result;
                 resultsVisible.IsVisible = result?.Any() == true;
             };
-            this.FindControl<Button>("DecoratedWindow").Click += delegate
+            this.Get<Button>("DecoratedWindow").Click += delegate
             {
                 new DecoratedWindow().Show();
             };
-            this.FindControl<Button>("DecoratedWindowDialog").Click += delegate
+            this.Get<Button>("DecoratedWindowDialog").Click += delegate
             {
-                new DecoratedWindow().ShowDialog(GetWindow());
+                _ = new DecoratedWindow().ShowDialog(GetWindow());
             };
-            this.FindControl<Button>("Dialog").Click += delegate
+            this.Get<Button>("Dialog").Click += delegate
             {
                 var window = CreateSampleWindow();
                 window.Height = 200;
-                window.ShowDialog(GetWindow());
+                _ = window.ShowDialog(GetWindow());
             };
-            this.FindControl<Button>("DialogNoTaskbar").Click += delegate
+            this.Get<Button>("DialogNoTaskbar").Click += delegate
             {
                 var window = CreateSampleWindow();
                 window.Height = 200;
                 window.ShowInTaskbar = false;
-                window.ShowDialog(GetWindow());
+                _ = window.ShowDialog(GetWindow());
             };
-            this.FindControl<Button>("OwnedWindow").Click += delegate
+            this.Get<Button>("OwnedWindow").Click += delegate
             {
                 var window = CreateSampleWindow();
 
                 window.Show(GetWindow());
             };
 
-            this.FindControl<Button>("OwnedWindowNoTaskbar").Click += delegate
+            this.Get<Button>("OwnedWindowNoTaskbar").Click += delegate
             {
                 var window = CreateSampleWindow();
 
@@ -138,12 +172,178 @@ namespace ControlCatalog.Pages
 
                 window.Show(GetWindow());
             };
+
+            this.Get<Button>("OpenFilePicker").Click += async delegate
+            {
+                var result = await GetStorageProvider().OpenFilePickerAsync(new FilePickerOpenOptions()
+                {
+                    Title = "Open file",
+                    FileTypeFilter = GetFileTypes(),
+                    SuggestedStartLocation = lastSelectedDirectory,
+                    AllowMultiple = openMultiple.IsChecked == true
+                });
+
+                await SetPickerResult(result);
+            };
+            this.Get<Button>("SaveFilePicker").Click += async delegate
+            {
+                var fileTypes = GetFileTypes();
+                var file = await GetStorageProvider().SaveFilePickerAsync(new FilePickerSaveOptions()
+                {
+                    Title = "Save file",
+                    FileTypeChoices = fileTypes,
+                    SuggestedStartLocation = lastSelectedDirectory,
+                    SuggestedFileName = "FileName",
+                    DefaultExtension = fileTypes?.Any() == true ? "txt" : null,
+                    ShowOverwritePrompt = false
+                });
+
+                if (file is not null && file.CanOpenWrite)
+                {
+                    // Sync disposal of StreamWriter is not supported on WASM
+#if NET6_0_OR_GREATER
+                    await using var stream = await file.OpenWriteAsync();
+                    await using var reader = new System.IO.StreamWriter(stream);
+#else
+                    using var stream = await file.OpenWriteAsync();
+                    using var reader = new System.IO.StreamWriter(stream);
+#endif
+                    await reader.WriteLineAsync(openedFileContent.Text);
+
+                    lastSelectedDirectory = await file.GetParentAsync();
+                }
+
+                await SetPickerResult(file is null ? null : new [] {file});
+            };
+            this.Get<Button>("OpenFolderPicker").Click += async delegate
+            {
+                var folders = await GetStorageProvider().OpenFolderPickerAsync(new FolderPickerOpenOptions()
+                {
+                    Title = "Folder file",
+                    SuggestedStartLocation = lastSelectedDirectory,
+                    AllowMultiple = openMultiple.IsChecked == true
+                });
+
+                await SetPickerResult(folders);
+
+                lastSelectedDirectory = folders.FirstOrDefault();
+            };
+            this.Get<Button>("OpenFileFromBookmark").Click += async delegate
+            {
+                var file = bookmarkContainer.Text is not null
+                    ? await GetStorageProvider().OpenFileBookmarkAsync(bookmarkContainer.Text)
+                    : null;
+
+                await SetPickerResult(file is null ? null : new[] { file });
+            };
+            this.Get<Button>("OpenFolderFromBookmark").Click += async delegate
+            {
+                var folder = bookmarkContainer.Text is not null
+                    ? await GetStorageProvider().OpenFolderBookmarkAsync(bookmarkContainer.Text)
+                    : null;
+
+                await SetPickerResult(folder is null ? null : new[] { folder });
+                
+                lastSelectedDirectory = folder;
+            };
+
+            async Task SetPickerResult(IReadOnlyCollection<IStorageItem>? items)
+            {
+                items ??= Array.Empty<IStorageItem>();
+                bookmarkContainer.Text = items.FirstOrDefault(f => f.CanBookmark) is { } f ? await f.SaveBookmarkAsync() : "Can't bookmark";
+                var mappedResults = new List<string>();
+
+                if (items.FirstOrDefault() is IStorageItem item)
+                {
+                    var resultText = item is IStorageFile ? "File:" : "Folder:";
+                    resultText += Environment.NewLine;
+
+                    var props = await item.GetBasicPropertiesAsync();
+                    resultText += @$"Size: {props.Size}
+DateCreated: {props.DateCreated}
+DateModified: {props.DateModified}
+CanBookmark: {item.CanBookmark}
+";
+                    if (item is IStorageFile file)
+                    {
+                        resultText += @$"
+CanOpenRead: {file.CanOpenRead}
+CanOpenWrite: {file.CanOpenWrite}
+Content:
+";
+                        if (file.CanOpenRead)
+                        {
+#if NET6_0_OR_GREATER
+                            await using var stream = await file.OpenReadAsync();
+#else
+                            using var stream = await file.OpenReadAsync();
+#endif
+                            using var reader = new System.IO.StreamReader(stream);
+
+                            // 4GB file test, shouldn't load more than 10000 chars into a memory.
+                            const int length = 10000;
+                            var buffer = ArrayPool<char>.Shared.Rent(length);
+                            try
+                            {
+                                var charsRead = await reader.ReadAsync(buffer, 0, length);
+                                resultText += new string(buffer, 0, charsRead);
+                            }
+                            finally
+                            {
+                                ArrayPool<char>.Shared.Return(buffer);
+                            }
+                        }
+                    }
+
+                    openedFileContent.Text = resultText;
+
+                    lastSelectedDirectory = await item.GetParentAsync();
+                    if (lastSelectedDirectory is not null)
+                    {
+                        mappedResults.Add(FullPathOrName(lastSelectedDirectory));
+                    }
+
+                    foreach (var selectedItem in items)
+                    {
+                        mappedResults.Add("+> " + FullPathOrName(selectedItem));
+                        if (selectedItem is IStorageFolder folder)
+                        {
+                            foreach (var innerItems in await folder.GetItemsAsync())
+                            {
+                                mappedResults.Add("++> " + FullPathOrName(innerItems));
+                            }
+                        }
+                    }
+                }
+
+                results.Items = mappedResults;
+                resultsVisible.IsVisible = mappedResults.Any();
+            }
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            var openedFileContent = this.Get<TextBox>("OpenedFileContent");
+            try
+            {
+                var storageProvider = GetStorageProvider();
+                openedFileContent.Text = $@"CanOpen: {storageProvider.CanOpen}
+CanSave: {storageProvider.CanSave}
+CanPickFolder: {storageProvider.CanPickFolder}";
+            }
+            catch (Exception ex)
+            {
+                openedFileContent.Text = "Storage provider is not available: " + ex.Message;
+            }
         }
 
         private Window CreateSampleWindow()
         {
             Button button;
-            
+            Button dialogButton;
+
             var window = new Window
             {
                 Height = 200,
@@ -157,7 +357,14 @@ namespace ControlCatalog.Pages
                         (button = new Button
                         {
                             HorizontalAlignment = HorizontalAlignment.Center,
-                            Content = "Click to close"
+                            Content = "Click to close",
+                            IsDefault = true
+                        }),
+                        (dialogButton = new Button
+                        {
+                            HorizontalAlignment = HorizontalAlignment.Center,
+                            Content = "Dialog",
+                            IsDefault = false
                         })
                     }
                 },
@@ -165,11 +372,32 @@ namespace ControlCatalog.Pages
             };
 
             button.Click += (_, __) => window.Close();
+            dialogButton.Click += (_, __) =>
+            {
+                var dialog = CreateSampleWindow();
+                dialog.Height = 200;
+                dialog.ShowDialog(window);
+            };
 
             return window;
         }
 
-        Window GetWindow() => (Window)this.VisualRoot;
+        private IStorageProvider GetStorageProvider()
+        {
+            var forceManaged = this.Get<CheckBox>("ForceManaged").IsChecked ?? false;
+            return forceManaged
+                ? new ManagedStorageProvider<Window>(GetWindow(), null)
+                : GetTopLevel().StorageProvider;
+        }
+
+        private static string FullPathOrName(IStorageItem? item)
+        {
+            if (item is null) return "(null)";
+            return item.TryGetUri(out var uri) ? uri.ToString() : item.Name;
+        }
+
+        Window GetWindow() => this.VisualRoot as Window ?? throw new NullReferenceException("Invalid Owner");
+        TopLevel GetTopLevel() => this.VisualRoot as TopLevel ?? throw new NullReferenceException("Invalid Owner");
 
         private void InitializeComponent()
         {
@@ -177,3 +405,4 @@ namespace ControlCatalog.Pages
         }
     }
 }
+#pragma warning restore CS0618 // Type or member is obsolete
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
index 1bf8bfa99b..3f8a023060 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
@@ -11,7 +11,13 @@
                 Padding="16"
                 BorderBrush="{DynamicResource SystemAccentColor}"
                 BorderThickness="2">
-          <TextBlock Name="DragStateText" TextWrapping="Wrap">Drag Me</TextBlock>
+          <TextBlock Name="DragStateText" TextWrapping="Wrap">Drag Me (text)</TextBlock>
+        </Border>
+        <Border Name="DragMeFiles"
+                Padding="16"
+                BorderBrush="{DynamicResource SystemAccentColor}"
+                BorderThickness="2">
+          <TextBlock Name="DragStateFiles" TextWrapping="Wrap">Drag Me (files)</TextBlock>
         </Border>
         <Border Name="DragMeCustom"
                 Padding="16"
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
index ae1ec326cd..e384db88b3 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
@@ -1,12 +1,9 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Markup.Xaml;
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System;
 using System.Linq;
 using System.Reflection;
-using System.Text;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages
 {
@@ -17,21 +14,22 @@ namespace ControlCatalog.Pages
         public DragAndDropPage()
         {
             this.InitializeComponent();
-            _DropState = this.Find<TextBlock>("DropState");
+            _DropState = this.Get<TextBlock>("DropState");
 
             int textCount = 0;
             SetupDnd("Text", d => d.Set(DataFormats.Text,
                 $"Text was dragged {++textCount} times"), DragDropEffects.Copy | DragDropEffects.Move | DragDropEffects.Link);
 
             SetupDnd("Custom", d => d.Set(CustomFormat, "Test123"), DragDropEffects.Move);
+            SetupDnd("Files", d => d.Set(DataFormats.FileNames, new[] { Assembly.GetEntryAssembly()?.GetModules().FirstOrDefault()?.FullyQualifiedName }), DragDropEffects.Copy);
         }
 
         void SetupDnd(string suffix, Action<DataObject> factory, DragDropEffects effects)
         {
-            var dragMe = this.Find<Border>("DragMe" + suffix);
-            var dragState = this.Find<TextBlock>("DragState"+suffix);
+            var dragMe = this.Get<Border>("DragMe" + suffix);
+            var dragState = this.Get<TextBlock>("DragState" + suffix);
 
-            async void DoDrag(object sender, Avalonia.Input.PointerPressedEventArgs e)
+            async void DoDrag(object? sender, Avalonia.Input.PointerPressedEventArgs e)
             {
                 var dragData = new DataObject();
                 factory(dragData);
@@ -57,7 +55,7 @@ namespace ControlCatalog.Pages
                 }
             }
 
-            void DragOver(object sender, DragEventArgs e)
+            void DragOver(object? sender, DragEventArgs e)
             {
                 if (e.Source is Control c && c.Name == "MoveTarget")
                 {
@@ -75,7 +73,7 @@ namespace ControlCatalog.Pages
                     e.DragEffects = DragDropEffects.None;
             }
 
-            void Drop(object sender, DragEventArgs e)
+            void Drop(object? sender, DragEventArgs e)
             {
                 if (e.Source is Control c && c.Name == "MoveTarget")
                 {
@@ -85,11 +83,11 @@ namespace ControlCatalog.Pages
                 {
                     e.DragEffects = e.DragEffects & (DragDropEffects.Copy);
                 }
-                
+
                 if (e.Data.Contains(DataFormats.Text))
                     _DropState.Text = e.Data.GetText();
                 else if (e.Data.Contains(DataFormats.FileNames))
-                    _DropState.Text = string.Join(Environment.NewLine, e.Data.GetFileNames());
+                    _DropState.Text = string.Join(Environment.NewLine, e.Data.GetFileNames() ?? Array.Empty<string>());
                 else if (e.Data.Contains(CustomFormat))
                     _DropState.Text = "Custom: " + e.Data.Get(CustomFormat);
             }
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml b/samples/ControlCatalog/Pages/ExpanderPage.xaml
index cef473af04..8c8702c665 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml
@@ -8,26 +8,48 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <Expander Header="Expand Up" ExpandDirection="Up">
+      <Expander Header="Expand Up" ExpandDirection="Up"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-      <Expander Header="Expand Down" ExpandDirection="Down">
+      <Expander Header="Expand Down" ExpandDirection="Down"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-      <Expander Header="Expand Left" ExpandDirection="Left">
+      <Expander Header="Expand Left" ExpandDirection="Left"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-      <Expander Header="Expand Right" ExpandDirection="Right">
+      <Expander Header="Expand Right" ExpandDirection="Right"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-    </StackPanel>    
+      <Expander ExpandDirection="Down"
+                CornerRadius="{Binding CornerRadius}">
+        <Expander.Header>
+          <Button Content="Control in Header" />
+        </Expander.Header>
+        <StackPanel>
+          <TextBlock>Expanded content</TextBlock>
+        </StackPanel>
+      </Expander>
+      <Expander Header="Disabled"
+                IsEnabled="False"
+                ExpandDirection="Down"
+                CornerRadius="{Binding CornerRadius}">
+        <StackPanel>
+          <TextBlock>Expanded content</TextBlock>
+        </StackPanel>
+      </Expander>
+      <CheckBox IsChecked="{Binding Rounded}">Rounded</CheckBox>
+    </StackPanel>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
index 52166d1a5f..e8a080899a 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
@@ -8,6 +9,7 @@ namespace ControlCatalog.Pages
         public ExpanderPage()
         {
             this.InitializeComponent();
+            DataContext = new ExpanderPageViewModel();
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
index 0803d178b9..7db6d9d334 100644
--- a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
@@ -20,7 +20,7 @@ namespace ControlCatalog.Pages
             SetXamlTexts();
         }
 
-        private void Afp_DoubleTapped(object sender, RoutedEventArgs e)
+        private void Afp_DoubleTapped(object? sender, RoutedEventArgs e)
         {
             if (sender is Panel p)
             {
@@ -35,7 +35,7 @@ namespace ControlCatalog.Pages
 
         private void SetXamlTexts()
         {
-            var bfxt = this.FindControl<TextBlock>("ButtonFlyoutXamlText");
+            var bfxt = this.Get<TextBlock>("ButtonFlyoutXamlText");
             bfxt.Text = "<Button Content=\"Click me!\">\n" +
                         "    <Button.Flyout>\n" +
                         "        <Flyout>\n" +
@@ -45,7 +45,7 @@ namespace ControlCatalog.Pages
                         "        </Flyout>\n" +
                         "    </Button.Flyout>\n</Button>";
 
-            var mfxt = this.FindControl<TextBlock>("MenuFlyoutXamlText");
+            var mfxt = this.Get<TextBlock>("MenuFlyoutXamlText");
             mfxt.Text = "<Button Content=\"Click me!\">\n" +
                     "    <Button.Flyout>\n" +
                     "        <MenuFlyout>\n" +
@@ -54,7 +54,7 @@ namespace ControlCatalog.Pages
                     "        </MenuFlyout>\n" +
                     "    </Button.Flyout>\n</Button>";
 
-            var afxt = this.FindControl<TextBlock>("AttachedFlyoutXamlText");
+            var afxt = this.Get<TextBlock>("AttachedFlyoutXamlText");
             afxt.Text = "<Panel Name=\"AttachedFlyoutPanel\">\n" +
                 "    <FlyoutBase.AttachedFlyout>\n" +
                 "        <Flyout>\n" +
@@ -66,7 +66,7 @@ namespace ControlCatalog.Pages
                 "\n\n In DoubleTapped handler:\n" +
                 "FlyoutBase.ShowAttachedFlyout(AttachedFlyoutPanel);";
 
-            var sfxt = this.FindControl<TextBlock>("SharedFlyoutXamlText");
+            var sfxt = this.Get<TextBlock>("SharedFlyoutXamlText");
             sfxt.Text = "Declare a flyout in Resources:\n" +
                 "<Window.Resources>\n" +
                 "    <Flyout x:Key=\"SharedFlyout\">\n" +
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index d8f4d6d5a2..45043aa5af 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -17,9 +17,9 @@ namespace ControlCatalog.Pages
         public ImagePage()
         {
             InitializeComponent();
-            _bitmapImage = this.FindControl<Image>("bitmapImage");
-            _drawingImage = this.FindControl<Image>("drawingImage");
-            _croppedImage = this.FindControl<Image>("croppedImage");
+            _bitmapImage = this.Get<Image>("bitmapImage");
+            _drawingImage = this.Get<Image>("drawingImage");
+            _croppedImage = this.Get<Image>("croppedImage");
         }
 
         private void InitializeComponent()
@@ -50,8 +50,11 @@ namespace ControlCatalog.Pages
             if (_croppedImage != null)
             {
                 var comboxBox = (ComboBox)sender;
-                var croppedBitmap = _croppedImage.Source as CroppedBitmap;
-                croppedBitmap.SourceRect = GetCropRect(comboxBox.SelectedIndex);
+                if (_croppedImage.Source is CroppedBitmap croppedBitmap)
+                {
+                    croppedBitmap.SourceRect = GetCropRect(comboxBox.SelectedIndex);
+                }
+                
             }
         }
 
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
index 8305d72d1f..1d42b92096 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
@@ -53,10 +53,12 @@
         <ComboBoxItem>UniformGrid - Horizontal</ComboBoxItem>
       </ComboBox>
       <Button Command="{Binding AddItem}">Add Item</Button>
+      <Button Command="{Binding RemoveItem}">Remove Item</Button>
       <Button Command="{Binding RandomizeHeights}">Randomize Heights</Button>
       <Button Command="{Binding ResetItems}">Reset items</Button>
       <Button x:Name="scrollToLast">Scroll to Last</Button>
       <Button x:Name="scrollToRandom">Scroll to Random</Button>
+      <Button x:Name="scrollToSelected">Scroll to Selected</Button>
     </StackPanel>
     <Border BorderThickness="1" BorderBrush="{DynamicResource SystemControlHighlightBaseMediumLowBrush}" Margin="0 0 0 16">
       <ScrollViewer Name="scroller"
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
index 6f0f8fcde0..0fd2176acd 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
@@ -15,21 +15,25 @@ namespace ControlCatalog.Pages
         private readonly ItemsRepeaterPageViewModel _viewModel;
         private ItemsRepeater _repeater;
         private ScrollViewer _scroller;
+        private int _selectedIndex;
         private Button _scrollToLast;
         private Button _scrollToRandom;
+        private Button _scrollToSelected;
         private Random _random = new Random(0);
 
         public ItemsRepeaterPage()
         {
             this.InitializeComponent();
-            _repeater = this.FindControl<ItemsRepeater>("repeater");
-            _scroller = this.FindControl<ScrollViewer>("scroller");
-            _scrollToLast = this.FindControl<Button>("scrollToLast");
-            _scrollToRandom = this.FindControl<Button>("scrollToRandom");
+            _repeater = this.Get<ItemsRepeater>("repeater");
+            _scroller = this.Get<ScrollViewer>("scroller");
+            _scrollToLast = this.Get<Button>("scrollToLast");
+            _scrollToRandom = this.Get<Button>("scrollToRandom");
+            _scrollToSelected = this.Get<Button>("scrollToSelected");
             _repeater.PointerPressed += RepeaterClick;
             _repeater.KeyDown += RepeaterOnKeyDown;
             _scrollToLast.Click += scrollToLast_Click;
             _scrollToRandom.Click += scrollToRandom_Click;
+            _scrollToSelected.Click += scrollToSelected_Click;
             DataContext = _viewModel = new ItemsRepeaterPageViewModel();
         }
 
@@ -40,8 +44,10 @@ namespace ControlCatalog.Pages
 
         public void OnSelectTemplateKey(object sender, SelectTemplateEventArgs e)
         {
-            var item = (ItemsRepeaterPageViewModel.Item)e.DataContext;
-            e.TemplateKey = (item.Index % 2 == 0) ? "even" : "odd";
+            if (e.DataContext is ItemsRepeaterPageViewModel.Item item)
+            {
+                e.TemplateKey = (item.Index % 2 == 0) ? "even" : "odd";
+            }
         }
 
         private void LayoutChanged(object sender, SelectionChangedEventArgs e)
@@ -111,19 +117,22 @@ namespace ControlCatalog.Pages
         private void ScrollTo(int index)
         {
             System.Diagnostics.Debug.WriteLine("Scroll to " + index);
-            var layoutManager = ((TopLevel)VisualRoot).LayoutManager;
+            var layoutManager = ((TopLevel)VisualRoot!).LayoutManager;
             var element = _repeater.GetOrCreateElement(index);
             layoutManager.ExecuteLayoutPass();
             element.BringIntoView();
         }
 
-        private void RepeaterClick(object sender, PointerPressedEventArgs e)
+        private void RepeaterClick(object? sender, PointerPressedEventArgs e)
         {
-            var item = (e.Source as TextBlock)?.DataContext as ItemsRepeaterPageViewModel.Item;
-            _viewModel.SelectedItem = item;
+            if ((e.Source as TextBlock)?.DataContext is ItemsRepeaterPageViewModel.Item item)
+            {
+                _viewModel.SelectedItem = item;
+                _selectedIndex = _viewModel.Items.IndexOf(item);
+            }
         }
 
-        private void RepeaterOnKeyDown(object sender, KeyEventArgs e)
+        private void RepeaterOnKeyDown(object? sender, KeyEventArgs e)
         {
             if (e.Key == Key.F5)
             {
@@ -131,14 +140,19 @@ namespace ControlCatalog.Pages
             }
         }
 
-        private void scrollToLast_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void scrollToLast_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             ScrollTo(_viewModel.Items.Count - 1);
         }
 
-        private void scrollToRandom_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void scrollToRandom_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             ScrollTo(_random.Next(_viewModel.Items.Count - 1));
         }
+
+        private void scrollToSelected_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            ScrollTo(_selectedIndex);
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
index a14978fd2c..f05e5fd033 100644
--- a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
@@ -7,7 +7,7 @@ namespace ControlCatalog.Pages
 {
     public class LabelsPage : UserControl
     {
-        private Person _person;
+        private Person? _person;
 
         public LabelsPage()
         {
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml.cs b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
index 5999510b6c..52c122f2bc 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
@@ -22,7 +22,7 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
         
-        private MenuPageViewModel _model;
+        private MenuPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
diff --git a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
new file mode 100644
index 0000000000..89e636112c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
@@ -0,0 +1,68 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="using:ControlCatalog.Pages"
+             d:DesignHeight="800"
+             d:DesignWidth="400"
+             x:Class="ControlCatalog.Pages.NativeEmbedPage">
+  <DockPanel>
+    <Menu DockPanel.Dock="Top">
+      <MenuItem Header="Test">
+        <MenuItem Header="SubMenu">
+          <MenuItem Header="Item 1"/>
+          <MenuItem Header="Item 2"/>
+          <MenuItem Header="Item 3"/>
+        </MenuItem>
+        <MenuItem Header="Item 1"/>
+        <MenuItem Header="Item 2"/>
+        <MenuItem Header="Item 3"/>
+      </MenuItem>
+    </Menu>
+    <DockPanel DockPanel.Dock="Top">
+      <Button DockPanel.Dock="Right" Click="ShowPopupDelay">Show popup (delay)</Button>
+      <Button DockPanel.Dock="Right" Click="ShowPopup">Show popup</Button>
+      <Border DockPanel.Dock="Right" Background="#c0c0c0">
+        <ToolTip.Tip>
+          <ToolTip>
+            <TextBlock>Text</TextBlock>
+          </ToolTip>
+        </ToolTip.Tip>
+        <TextBlock VerticalAlignment="Center">Tooltip</TextBlock>
+      </Border>
+      <TextBox Text="Lorem ipsum dolor sit amet"/>
+
+    </DockPanel>
+    <Grid ColumnDefinitions="*,5,*"
+          RowDefinitions="*,5,*">
+      <Grid.Styles>
+        <Style Selector="DockPanel#FirstPanel:not(.mobile), DockPanel#SecondPanel:not(.mobile)">
+          <Setter Property="Grid.RowSpan" Value="3" />
+        </Style>
+        <Style Selector="DockPanel#SecondPanel:not(.mobile)">
+          <Setter Property="Grid.Column" Value="2" />
+        </Style>
+
+        <Style Selector="DockPanel#FirstPanel.mobile, DockPanel#SecondPanel.mobile">
+          <Setter Property="Grid.ColumnSpan" Value="3" />
+        </Style>
+        <Style Selector="DockPanel#SecondPanel.mobile">
+          <Setter Property="Grid.Row" Value="2" />
+        </Style>
+      </Grid.Styles>
+
+      <DockPanel x:Name="FirstPanel">
+        <CheckBox x:Name="firstVisible" DockPanel.Dock="Top"
+                  IsChecked="True" Content="Visible" />
+        <local:EmbedSample IsVisible="{Binding #firstVisible.IsChecked}"/>
+      </DockPanel>
+      <GridSplitter Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />
+      <GridSplitter Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Height="5" VerticalAlignment="Stretch" />
+      <DockPanel x:Name="SecondPanel">
+        <CheckBox x:Name="secondVisible" DockPanel.Dock="Top"
+                  IsChecked="True" Content="Visible" />
+        <local:EmbedSample IsSecond="True" IsVisible="{Binding #secondVisible.IsChecked}"/>
+      </DockPanel>
+    </Grid>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
new file mode 100644
index 0000000000..83554c007d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Avalonia.Platform;
+using Avalonia.Interactivity;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Markup.Xaml;
+using Avalonia;
+
+namespace ControlCatalog.Pages
+{
+    public class NativeEmbedPage : UserControl
+    {
+        public NativeEmbedPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public async void ShowPopupDelay(object sender, RoutedEventArgs args)
+        {
+            await Task.Delay(3000);
+            ShowPopup(sender, args);
+        }
+
+        public void ShowPopup(object sender, RoutedEventArgs args)
+        {
+            new ContextMenu()
+            {
+                Items = new List<MenuItem>
+            {
+                new MenuItem() { Header = "Test" }, new MenuItem() { Header = "Test" }
+            }
+            }.Open((Control)sender);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == BoundsProperty)
+            {
+                var isMobile = change.GetNewValue<Rect>().Width < 1200;
+                this.Find<DockPanel>("FirstPanel")!.Classes.Set("mobile", isMobile);
+                this.Find<DockPanel>("SecondPanel")!.Classes.Set("mobile", isMobile);
+            }
+        }
+    }
+
+    public class EmbedSample : NativeControlHost
+    {
+        public static INativeDemoControl? Implementation { get; set; }
+
+        static EmbedSample()
+        {
+
+        }
+
+        public bool IsSecond { get; set; }
+
+        protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
+        {
+            return Implementation?.CreateControl(IsSecond, parent, () => base.CreateNativeControlCore(parent))
+                ?? base.CreateNativeControlCore(parent);
+        }
+
+        protected override void DestroyNativeControlCore(IPlatformHandle control)
+        {
+            base.DestroyNativeControlCore(control);
+        }
+    }
+
+    public interface INativeDemoControl
+    {
+        /// <param name="isSecond">Used to specify which control should be displayed as a demo</param>
+        /// <param name="parent"></param>
+        /// <param name="createDefault"></param>
+        IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault);
+    }
+}
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
index eadf92b602..bfd49a2c00 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
@@ -1,18 +1,33 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
     public class NotificationsPage : UserControl
     {
+        private NotificationViewModel _viewModel;
+
         public NotificationsPage()
         {
             this.InitializeComponent();
+
+            _viewModel = new NotificationViewModel();
+
+            DataContext = _viewModel;
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            _viewModel.NotificationManager = new Avalonia.Controls.Notifications.WindowNotificationManager(VisualRoot as TopLevel);
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index 9ddc6b6228..045ba4a059 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -1,6 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="clr-namespace:System;assembly=netstandard"
+             xmlns:converter="clr-namespace:ControlCatalog.Converter"
              x:Class="ControlCatalog.Pages.NumericUpDownPage">
   <StackPanel Orientation="Vertical" Spacing="4"
               MaxWidth="800">
@@ -54,18 +55,18 @@
       <Grid Grid.Row="0" Grid.Column="2" Margin="8" RowDefinitions="Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto, Auto">
         <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Minimum:</TextBlock>
         <NumericUpDown Grid.Row="0" Grid.Column="1" Value="{Binding #upDown.Minimum}"
-                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Margin="2" HorizontalAlignment="Center"/>
+                       NumberFormat="{Binding #upDown.NumberFormat}" VerticalAlignment="Center" Margin="2" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Maximum:</TextBlock>
         <NumericUpDown Grid.Row="1" Grid.Column="1" Value="{Binding #upDown.Maximum}"
-                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Margin="2" HorizontalAlignment="Center"/>
+                       NumberFormat="{Binding #upDown.NumberFormat}" VerticalAlignment="Center" Margin="2" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Increment:</TextBlock>
         <NumericUpDown Grid.Row="2" Grid.Column="1" Value="{Binding #upDown.Increment}" VerticalAlignment="Center"
                        Margin="2" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Value:</TextBlock>
-        <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #upDown.Value}" VerticalAlignment="Center"
+        <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding DecimalValue}" VerticalAlignment="Center"
                        Margin="2" HorizontalAlignment="Center"/>
 
 
@@ -76,27 +77,38 @@
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="upDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of decimal NumericUpDown:</Label>
         <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
-                       CultureInfo="en-US" VerticalAlignment="Center" Value="{Binding DecimalValue}"
+                       VerticalAlignment="Center" Value="{Binding DecimalValue}"
                        Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
 
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="DoubleUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of double NumericUpDown:</Label>
         <NumericUpDown Name="DoubleUpDown" Minimum="0" Maximum="10" Increment="0.5"
-                       CultureInfo="en-US" VerticalAlignment="Center" Value="{Binding DoubleValue}"
+                       VerticalAlignment="Center" Value="{Binding DoubleValue}"
                        Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
       
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="ValidationUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">NumericUpDown with Validation Errors:</Label>
         <NumericUpDown x:Name="ValidationUpDown" Minimum="0" Maximum="10" Increment="0.5"
-                       CultureInfo="en-US" VerticalAlignment="Center"
+                       VerticalAlignment="Center"
                        Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}">
           <DataValidationErrors.Error>
             <sys:Exception /> 
           </DataValidationErrors.Error>
         </NumericUpDown>
       </StackPanel>
+
+      <StackPanel Orientation="Vertical" Margin="10">
+        <Label Target="HexUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">NumericUpDown in HEX mode:</Label>
+        <NumericUpDown x:Name="HexUpDown" Value="0"
+                       VerticalAlignment="Center">
+          <NumericUpDown.TextConverter>
+            <converter:HexConverter></converter:HexConverter>
+          </NumericUpDown.TextConverter>
+        </NumericUpDown>
+        
+      </StackPanel>
     </WrapPanel>
 
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index 5856194430..edd4921632 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Xaml;
 using MiniMvvm;
 
@@ -28,16 +26,16 @@ namespace ControlCatalog.Pages
 
     public class NumbersPageViewModel : ViewModelBase
     {
-        private IList<FormatObject> _formats;
-        private FormatObject _selectedFormat;
-        private IList<Location> _spinnerLocations;
+        private IList<FormatObject>? _formats;
+        private FormatObject? _selectedFormat;
+        private IList<Location>? _spinnerLocations;
 
         private double _doubleValue;
         private decimal _decimalValue;
 
         public NumbersPageViewModel()
         {
-            SelectedFormat = Formats.FirstOrDefault();
+            _selectedFormat = Formats.FirstOrDefault();
         }
 
         public double DoubleValue
@@ -84,17 +82,12 @@ namespace ControlCatalog.Pages
             }
         }
 
-        public IList<CultureInfo> Cultures { get; } = new List<CultureInfo>()
-        {
-            new CultureInfo("en-US"),
-            new CultureInfo("en-GB"),
-            new CultureInfo("fr-FR"),
-            new CultureInfo("ar-DZ"),
-            new CultureInfo("zh-CN"),
-            new CultureInfo("cs-CZ")
-        };
+        // Trimmed-mode friendly where we might not have cultures
+        public IList<CultureInfo?> Cultures { get; } = CultureInfo.GetCultures(CultureTypes.SpecificCultures)
+            .Where(c => new[] { "en-US", "en-GB", "fr-FR", "ar-DZ", "zh-CH", "cs-CZ" }.Contains(c.Name))
+            .ToArray();
 
-        public FormatObject SelectedFormat
+        public FormatObject? SelectedFormat
         {
             get { return _selectedFormat; }
             set { this.RaiseAndSetIfChanged(ref _selectedFormat, value); }
@@ -103,7 +96,7 @@ namespace ControlCatalog.Pages
 
     public class FormatObject
     {
-        public string Value { get; set; }
-        public string Name { get; set; }
+        public string? Value { get; set; }
+        public string? Name { get; set; }
     }
 }
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index cb79bf219a..a126fbefe5 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -68,7 +68,7 @@ namespace ControlCatalog.Pages
             set => SetAndRaise(DiscoProperty, ref _disco, value);
         }
 
-        private string _info;
+        private string _info = string.Empty;
 
         public static readonly DirectProperty<OpenGlPageControl, string> InfoProperty =
             AvaloniaProperty.RegisterDirect<OpenGlPageControl, string>("Info", o => o.Info, (o, v) => o.Info = v);
@@ -90,7 +90,6 @@ namespace ControlCatalog.Pages
         private int _vertexBufferObject;
         private int _indexBufferObject;
         private int _vertexArrayObject;
-        private GlExtrasInterface _glExt;
 
         private string GetShader(bool fragment, string shader)
         {
@@ -206,7 +205,7 @@ namespace ControlCatalog.Pages
         public OpenGlPageControl()
         {
             var name = typeof(OpenGlPage).Assembly.GetManifestResourceNames().First(x => x.Contains("teapot.bin"));
-            using (var sr = new BinaryReader(typeof(OpenGlPage).Assembly.GetManifestResourceStream(name)))
+            using (var sr = new BinaryReader(typeof(OpenGlPage).Assembly.GetManifestResourceStream(name)!))
             {
                 var buf = new byte[sr.ReadInt32()];
                 sr.Read(buf, 0, buf.Length);
@@ -258,7 +257,6 @@ namespace ControlCatalog.Pages
         protected unsafe override void OnOpenGlInit(GlInterface GL, int fb)
         {
             CheckError(GL);
-            _glExt = new GlExtrasInterface(GL);
 
             Info = $"Renderer: {GL.GetString(GL_RENDERER)} Version: {GL.GetString(GL_VERSION)}";
             
@@ -298,8 +296,8 @@ namespace ControlCatalog.Pages
                 GL.BufferData(GL_ELEMENT_ARRAY_BUFFER, new IntPtr(_indices.Length * sizeof(ushort)), new IntPtr(pdata),
                     GL_STATIC_DRAW);
             CheckError(GL);
-            _vertexArrayObject = _glExt.GenVertexArray();
-            _glExt.BindVertexArray(_vertexArrayObject);
+            _vertexArrayObject = GL.GenVertexArray();
+            GL.BindVertexArray(_vertexArrayObject);
             CheckError(GL);
             GL.VertexAttribPointer(positionLocation, 3, GL_FLOAT,
                 0, vertexSize, IntPtr.Zero);
@@ -316,12 +314,13 @@ namespace ControlCatalog.Pages
             // Unbind everything
             GL.BindBuffer(GL_ARRAY_BUFFER, 0);
             GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-            _glExt.BindVertexArray(0);
+            GL.BindVertexArray(0);
             GL.UseProgram(0);
 
             // Delete all resources.
-            GL.DeleteBuffers(2, new[] { _vertexBufferObject, _indexBufferObject });
-            _glExt.DeleteVertexArrays(1, new[] { _vertexArrayObject });
+            GL.DeleteBuffer(_vertexBufferObject);
+            GL.DeleteBuffer(_indexBufferObject);
+            GL.DeleteVertexArray(_vertexArrayObject);
             GL.DeleteProgram(_shaderProgram);
             GL.DeleteShader(_fragmentShader);
             GL.DeleteShader(_vertexShader);
@@ -338,7 +337,7 @@ namespace ControlCatalog.Pages
 
             GL.BindBuffer(GL_ARRAY_BUFFER, _vertexBufferObject);
             GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBufferObject);
-            _glExt.BindVertexArray(_vertexArrayObject);
+            GL.BindVertexArray(_vertexArrayObject);
             GL.UseProgram(_shaderProgram);
             CheckError(GL);
             var projection =
@@ -346,7 +345,7 @@ namespace ControlCatalog.Pages
                     0.01f, 1000);
 
 
-            var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, -1, 0));
+            var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, 1, 0));
             var model = Matrix4x4.CreateFromYawPitchRoll(_yaw, _pitch, _roll);
             var modelLoc = GL.GetUniformLocationString(_shaderProgram, "uModel");
             var viewLoc = GL.GetUniformLocationString(_shaderProgram, "uView");
@@ -369,34 +368,5 @@ namespace ControlCatalog.Pages
             if (_disco > 0.01)
                 Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
         }
-
-        class GlExtrasInterface : GlInterfaceBase<GlInterface.GlContextInfo>
-        {
-            public GlExtrasInterface(GlInterface gl) : base(gl.GetProcAddress, gl.ContextInfo)
-            {
-            }
-            
-            public delegate void GlDeleteVertexArrays(int count, int[] buffers);
-            [GlMinVersionEntryPoint("glDeleteVertexArrays", 3,0)]
-            [GlExtensionEntryPoint("glDeleteVertexArraysOES", "GL_OES_vertex_array_object")]
-            public GlDeleteVertexArrays DeleteVertexArrays { get; }
-            
-            public delegate void GlBindVertexArray(int array);
-            [GlMinVersionEntryPoint("glBindVertexArray", 3,0)]
-            [GlExtensionEntryPoint("glBindVertexArrayOES", "GL_OES_vertex_array_object")]
-            public GlBindVertexArray BindVertexArray { get; }
-            public delegate void GlGenVertexArrays(int n, int[] rv);
-        
-            [GlMinVersionEntryPoint("glGenVertexArrays",3,0)]
-            [GlExtensionEntryPoint("glGenVertexArraysOES", "GL_OES_vertex_array_object")]
-            public GlGenVertexArrays GenVertexArrays { get; }
-            
-            public int GenVertexArray()
-            {
-                var rv = new int[1];
-                GenVertexArrays(1, rv);
-                return rv[0];
-            }
-        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
new file mode 100644
index 0000000000..a60f54d10e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
@@ -0,0 +1,51 @@
+<UserControl x:Class="ControlCatalog.Pages.PlatformInfoPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d:DesignHeight="800"
+             d:DesignWidth="400"
+             mc:Ignorable="d">
+  <StackPanel Spacing="20">
+    <TextBlock Text="{Binding PlatformInfo}" />
+
+    <StackPanel TextElement.Foreground="White">
+      <StackPanel Orientation="Horizontal">
+        <Border Height="100" Width="100" Background="{OnFormFactor Gray, Desktop=Green}">
+          <TextBlock Text="Desktop" />
+        </Border>
+        <Border Height="100" Width="100" Background="{OnFormFactor Gray, Mobile=Green}">
+          <TextBlock Text="Mobile" />
+        </Border>
+      </StackPanel>
+      <WrapPanel>
+        <Border Height="100" Width="100" Background="{OnPlatform Gray, Windows=Green}">
+          <TextBlock Text="Windows" />
+        </Border>
+        <Border Height="100" Width="100" Background="{OnPlatform Gray, macOS=Green}">
+          <TextBlock Text="macOS" />
+        </Border>
+        <Border Height="100" Width="100" Background="{OnPlatform Gray, Linux=Green}">
+          <TextBlock Text="Linux" />
+        </Border>
+        <Border Height="100" Width="100" Background="{OnPlatform Gray, Browser=Green}">
+          <TextBlock Text="Browser" />
+        </Border>
+        <Border Height="100" Width="100" Background="{OnPlatform Gray, iOS=Green}">
+          <TextBlock Text="iOS" />
+        </Border>
+        <Border Height="100" Width="100" Background="{OnPlatform Gray, Android=Green}">
+          <TextBlock Text="Android" />
+        </Border>
+        <Border Height="100" Width="100">
+          <Border.Background>
+            <OnPlatform Default="Gray" >
+              <On Options="macOS, Linux, Windows" Content="Green" />
+            </OnPlatform>
+          </Border.Background>
+          <TextBlock Text="Win, Lin or Mac" />
+        </Border>
+      </WrapPanel>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs
new file mode 100644
index 0000000000..1f37451782
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs
@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
+
+namespace ControlCatalog.Pages
+{
+    public class PlatformInfoPage : UserControl
+    {
+        public PlatformInfoPage()
+        {
+            this.InitializeComponent();
+            DataContext = new PlatformInformationViewModel();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/PointerCanvas.cs b/samples/ControlCatalog/Pages/PointerCanvas.cs
new file mode 100644
index 0000000000..7d26da8603
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PointerCanvas.cs
@@ -0,0 +1,235 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Threading;
+
+namespace ControlCatalog.Pages;
+
+public class PointerCanvas : Control
+{
+    private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+    private int _events;
+    private IDisposable? _statusUpdated;
+    private Dictionary<int, PointerPoints> _pointers = new();
+    private PointerPointProperties? _lastProperties;
+    private PointerUpdateKind? _lastNonOtherUpdateKind;
+    class PointerPoints
+    {
+        struct CanvasPoint
+        {
+            public IBrush Brush;
+            public Point Point;
+            public double Radius;
+            public double? Pressure;
+        }
+
+        readonly CanvasPoint[] _points = new CanvasPoint[1000];
+        int _index;
+
+        public void Render(DrawingContext context, bool drawPoints)
+        {
+            CanvasPoint? prev = null;
+            for (var c = 0; c < _points.Length; c++)
+            {
+                var i = (c + _index) % _points.Length;
+                var pt = _points[i];
+                var pressure = (pt.Pressure ?? prev?.Pressure ?? 0.5);
+                var thickness = pressure * 10;
+                var radius = pressure * pt.Radius;
+
+                if (drawPoints)
+                {
+                    if (pt.Brush != null)
+                    {
+                        context.DrawEllipse(pt.Brush, null, pt.Point, radius, radius);
+                    }
+                }
+                else
+                {
+                    if (prev.HasValue && prev.Value.Brush != null && pt.Brush != null
+                        && prev.Value.Pressure != null && pt.Pressure != null)
+                    {
+                        var linePen = new Pen(Brushes.Black, thickness, null, PenLineCap.Round, PenLineJoin.Round);
+                        context.DrawLine(linePen, prev.Value.Point, pt.Point);
+                    }
+                }
+                prev = pt;
+            }
+
+        }
+
+        void AddPoint(Point pt, IBrush brush, double radius, float? pressure = null)
+        {
+            _points[_index] = new CanvasPoint { Point = pt, Brush = brush, Radius = radius, Pressure = pressure };
+            _index = (_index + 1) % _points.Length;
+        }
+
+        public void HandleEvent(PointerEventArgs e, Visual v)
+        {
+            e.Handled = true;
+            var currentPoint = e.GetCurrentPoint(v);
+            if (e.RoutedEvent == PointerPressedEvent)
+                AddPoint(currentPoint.Position, Brushes.Green, 10);
+            else if (e.RoutedEvent == PointerReleasedEvent)
+                AddPoint(currentPoint.Position, Brushes.Red, 10);
+            else
+            {
+                var pts = e.GetIntermediatePoints(v);
+                for (var c = 0; c < pts.Count; c++)
+                {
+                    var pt = pts[c];
+                    AddPoint(pt.Position, c == pts.Count - 1 ? Brushes.Blue : Brushes.Black,
+                        c == pts.Count - 1 ? 5 : 2, pt.Properties.Pressure);
+                }
+            }
+        }
+    }
+
+    private int _threadSleep;
+    public static DirectProperty<PointerCanvas, int> ThreadSleepProperty =
+        AvaloniaProperty.RegisterDirect<PointerCanvas, int>(nameof(ThreadSleep), c => c.ThreadSleep, (c, v) => c.ThreadSleep = v);
+
+    public int ThreadSleep
+    {
+        get => _threadSleep;
+        set => SetAndRaise(ThreadSleepProperty, ref _threadSleep, value);
+    }
+
+    private bool _drawOnlyPoints;
+    public static DirectProperty<PointerCanvas, bool> DrawOnlyPointsProperty =
+        AvaloniaProperty.RegisterDirect<PointerCanvas, bool>(nameof(DrawOnlyPoints), c => c.DrawOnlyPoints, (c, v) => c.DrawOnlyPoints = v);
+
+    public bool DrawOnlyPoints
+    {
+        get => _drawOnlyPoints;
+        set => SetAndRaise(DrawOnlyPointsProperty, ref _drawOnlyPoints, value);
+    }
+
+    private string? _status;
+    public static DirectProperty<PointerCanvas, string?> StatusProperty =
+        AvaloniaProperty.RegisterDirect<PointerCanvas, string?>(nameof(DrawOnlyPoints), c => c.Status, (c, v) => c.Status = v,
+            defaultBindingMode: Avalonia.Data.BindingMode.TwoWay);
+
+    public string? Status
+    {
+        get => _status;
+        set => SetAndRaise(StatusProperty, ref _status, value);
+    }
+
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+
+        _statusUpdated = DispatcherTimer.Run(() =>
+        {
+            if (_stopwatch.Elapsed.TotalMilliseconds > 250)
+            {
+                Status = $@"Events per second: {(_events / _stopwatch.Elapsed.TotalSeconds)}
+PointerUpdateKind: {_lastProperties?.PointerUpdateKind}
+Last PointerUpdateKind != Other: {_lastNonOtherUpdateKind}
+IsLeftButtonPressed: {_lastProperties?.IsLeftButtonPressed}
+IsRightButtonPressed: {_lastProperties?.IsRightButtonPressed}
+IsMiddleButtonPressed: {_lastProperties?.IsMiddleButtonPressed}
+IsXButton1Pressed: {_lastProperties?.IsXButton1Pressed}
+IsXButton2Pressed: {_lastProperties?.IsXButton2Pressed}
+IsBarrelButtonPressed: {_lastProperties?.IsBarrelButtonPressed}
+IsEraser: {_lastProperties?.IsEraser}
+IsInverted: {_lastProperties?.IsInverted}
+Pressure: {_lastProperties?.Pressure}
+XTilt: {_lastProperties?.XTilt}
+YTilt: {_lastProperties?.YTilt}
+Twist: {_lastProperties?.Twist}";
+                _stopwatch.Restart();
+                _events = 0;
+            }
+
+            return true;
+        }, TimeSpan.FromMilliseconds(10));
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnDetachedFromVisualTree(e);
+
+        _statusUpdated?.Dispose();
+    }
+
+    void HandleEvent(PointerEventArgs e)
+    {
+        _events++;
+
+        if (_threadSleep != 0)
+        {
+            Thread.Sleep(_threadSleep);
+        }
+        InvalidateVisual();
+
+        var lastPointer = e.GetCurrentPoint(this);
+        _lastProperties = lastPointer.Properties;
+
+        if (_lastProperties?.PointerUpdateKind != PointerUpdateKind.Other)
+        {
+            _lastNonOtherUpdateKind = _lastProperties?.PointerUpdateKind;
+        }
+
+        if (e.RoutedEvent == PointerReleasedEvent && e.Pointer.Type == PointerType.Touch)
+        {
+            _pointers.Remove(e.Pointer.Id);
+            return;
+        }
+
+        if (e.Pointer.Type != PointerType.Pen
+            || lastPointer.Properties.Pressure > 0)
+        {
+            if (!_pointers.TryGetValue(e.Pointer.Id, out var pt))
+                _pointers[e.Pointer.Id] = pt = new PointerPoints();
+            pt.HandleEvent(e, this);
+        }
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        context.FillRectangle(Brushes.White, Bounds);
+        foreach (var pt in _pointers.Values)
+            pt.Render(context, _drawOnlyPoints);
+        base.Render(context);
+    }
+
+    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    {
+        if (e.ClickCount == 2)
+        {
+            _pointers.Clear();
+            InvalidateVisual();
+            return;
+        }
+
+        HandleEvent(e);
+        base.OnPointerPressed(e);
+    }
+
+    protected override void OnPointerMoved(PointerEventArgs e)
+    {
+        HandleEvent(e);
+        base.OnPointerMoved(e);
+    }
+
+    protected override void OnPointerReleased(PointerReleasedEventArgs e)
+    {
+        HandleEvent(e);
+        base.OnPointerReleased(e);
+    }
+
+    protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+    {
+        _lastProperties = null;
+        base.OnPointerCaptureLost(e);
+    }
+}
diff --git a/samples/ControlCatalog/Pages/PointerContactsTab.cs b/samples/ControlCatalog/Pages/PointerContactsTab.cs
new file mode 100644
index 0000000000..b6aabebf99
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PointerContactsTab.cs
@@ -0,0 +1,109 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+
+namespace ControlCatalog.Pages;
+
+public class PointerContactsTab : Control
+{
+    class PointerInfo
+    {
+        public Point Point { get; set; }
+        public Color Color { get; set; }
+    }
+
+    private static Color[] AllColors = new[]
+    {
+            Colors.Aqua,
+            Colors.Beige,
+            Colors.Chartreuse,
+            Colors.Coral,
+            Colors.Fuchsia,
+            Colors.Crimson,
+            Colors.Lavender,
+            Colors.Orange,
+            Colors.Orchid,
+            Colors.ForestGreen,
+            Colors.SteelBlue,
+            Colors.PapayaWhip,
+            Colors.PaleVioletRed,
+            Colors.Goldenrod,
+            Colors.Maroon,
+            Colors.Moccasin,
+            Colors.Navy,
+            Colors.Wheat,
+            Colors.Violet,
+            Colors.Sienna,
+            Colors.Indigo,
+            Colors.Honeydew
+        };
+
+    private Dictionary<IPointer, PointerInfo> _pointers = new Dictionary<IPointer, PointerInfo>();
+
+    public PointerContactsTab()
+    {
+        ClipToBounds = true;
+    }
+
+    void UpdatePointer(PointerEventArgs e)
+    {
+        if (!_pointers.TryGetValue(e.Pointer, out var info))
+        {
+            if (e.RoutedEvent == PointerMovedEvent)
+                return;
+            var colors = AllColors.Except(_pointers.Values.Select(c => c.Color)).ToArray();
+            var color = colors[new Random().Next(0, colors.Length - 1)];
+            _pointers[e.Pointer] = info = new PointerInfo { Color = color };
+        }
+
+        info.Point = e.GetPosition(this);
+        InvalidateVisual();
+    }
+
+    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    {
+        UpdatePointer(e);
+        e.Pointer.Capture(this);
+        e.Handled = true;
+        base.OnPointerPressed(e);
+    }
+
+    protected override void OnPointerMoved(PointerEventArgs e)
+    {
+        UpdatePointer(e);
+        e.Handled = true;
+        base.OnPointerMoved(e);
+    }
+
+    protected override void OnPointerReleased(PointerReleasedEventArgs e)
+    {
+        _pointers.Remove(e.Pointer);
+        e.Handled = true;
+        InvalidateVisual();
+    }
+
+    protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+    {
+        _pointers.Remove(e.Pointer);
+        InvalidateVisual();
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        context.FillRectangle(Brushes.Transparent, new Rect(default, Bounds.Size));
+        foreach (var pt in _pointers.Values)
+        {
+            var brush = new ImmutableSolidColorBrush(pt.Color);
+
+            context.DrawEllipse(brush, null, pt.Point, 75, 75);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/PointersPage.cs b/samples/ControlCatalog/Pages/PointersPage.cs
deleted file mode 100644
index 2901013cea..0000000000
--- a/samples/ControlCatalog/Pages/PointersPage.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-
-namespace ControlCatalog.Pages;
-
-public class PointersPage : Decorator
-{
-    public PointersPage()
-    {
-        Child = new TabControl
-        {
-            Items = new[]
-            {
-                new TabItem() { Header = "Contacts", Content = new PointerContactsTab() },
-                new TabItem() { Header = "IntermediatePoints", Content = new PointerIntermediatePointsTab() }
-            }
-        };
-    }
-    
-    
-    class PointerContactsTab : Control
-    {
-        class PointerInfo
-        {
-            public Point Point { get; set; }
-            public Color Color { get; set; }
-        }
-
-        private static Color[] AllColors = new[]
-        {
-            Colors.Aqua,
-            Colors.Beige, 
-            Colors.Chartreuse, 
-            Colors.Coral,
-            Colors.Fuchsia,
-            Colors.Crimson,
-            Colors.Lavender, 
-            Colors.Orange,
-            Colors.Orchid,
-            Colors.ForestGreen,
-            Colors.SteelBlue,
-            Colors.PapayaWhip,
-            Colors.PaleVioletRed,
-            Colors.Goldenrod,
-            Colors.Maroon,
-            Colors.Moccasin,
-            Colors.Navy,
-            Colors.Wheat,
-            Colors.Violet,
-            Colors.Sienna,
-            Colors.Indigo,
-            Colors.Honeydew
-        };
-        
-        private Dictionary<IPointer, PointerInfo> _pointers = new Dictionary<IPointer, PointerInfo>();
-
-        public PointerContactsTab()
-        {
-            ClipToBounds = true;
-        }
-        
-        void UpdatePointer(PointerEventArgs e)
-        {
-            if (!_pointers.TryGetValue(e.Pointer, out var info))
-            {
-                if (e.RoutedEvent == PointerMovedEvent)
-                    return;
-                var colors = AllColors.Except(_pointers.Values.Select(c => c.Color)).ToArray();
-                var color = colors[new Random().Next(0, colors.Length - 1)];
-                _pointers[e.Pointer] = info = new PointerInfo {Color = color};
-            }
-
-            info.Point = e.GetPosition(this);
-            InvalidateVisual();
-        }
-        
-        protected override void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            UpdatePointer(e);
-            e.Pointer.Capture(this);
-            e.Handled = true;
-            base.OnPointerPressed(e);
-        }
-
-        protected override void OnPointerMoved(PointerEventArgs e)
-        {
-            UpdatePointer(e);
-            e.Handled = true;
-            base.OnPointerMoved(e);
-        }
-
-        protected override void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            _pointers.Remove(e.Pointer);
-            e.Handled = true;
-            InvalidateVisual();
-        }
-
-        protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
-        {
-            _pointers.Remove(e.Pointer);
-            InvalidateVisual();
-        }
-
-        public override void Render(DrawingContext context)
-        {
-            context.FillRectangle(Brushes.Transparent, new Rect(default, Bounds.Size));
-            foreach (var pt in _pointers.Values)
-            {
-                var brush = new ImmutableSolidColorBrush(pt.Color);
-
-                context.DrawEllipse(brush, null, pt.Point, 75, 75);
-            }
-        }
-    }
-
-    public class PointerIntermediatePointsTab : Decorator
-    {
-        public PointerIntermediatePointsTab()
-        {
-            this[TextBlock.ForegroundProperty] = Brushes.Black;
-            var slider = new Slider
-            {
-                Margin = new Thickness(5),
-                Minimum = 0,
-                Maximum = 500
-            };
-
-            var status = new TextBlock()
-            {
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-            };
-            Child = new Grid
-            {
-                Children =
-                {
-                    new PointerCanvas(slider, status),
-                    new Border
-                    {
-                        Background = Brushes.LightYellow,
-                        Child = new StackPanel
-                        {
-                            Children =
-                            {
-                                new StackPanel
-                                {
-                                    Orientation = Orientation.Horizontal,
-                                    Children =
-                                    {
-                                        new TextBlock { Text = "Thread sleep:" },
-                                        new TextBlock()
-                                        {
-                                            [!TextBlock.TextProperty] =slider.GetObservable(Slider.ValueProperty)
-                                                .Select(x=>x.ToString()).ToBinding()
-                                        }
-                                    }
-                                },
-                                slider
-                            }
-                        },
-
-                        HorizontalAlignment = HorizontalAlignment.Right,
-                        VerticalAlignment = VerticalAlignment.Top,
-                        Width = 300,
-                        Height = 60
-                    },
-                    status
-                }
-            };
-        }
-
-        class PointerCanvas : Control
-        {
-            private readonly Slider _slider;
-            private readonly TextBlock _status;
-            private int _events;
-            private Stopwatch _stopwatch = Stopwatch.StartNew();
-            private Dictionary<int, PointerPoints> _pointers = new();
-            class PointerPoints
-            {
-                struct CanvasPoint
-                {
-                    public IBrush Brush;
-                    public Point Point;
-                    public double Radius;
-                }
-
-                readonly CanvasPoint[] _points = new CanvasPoint[1000];
-                int _index;
-                
-                public  void Render(DrawingContext context)
-                {
-                    
-                    CanvasPoint? prev = null;
-                    for (var c = 0; c < _points.Length; c++)
-                    {
-                        var i = (c + _index) % _points.Length;
-                        var pt = _points[i];
-                        if (prev.HasValue && prev.Value.Brush != null && pt.Brush != null)
-                            context.DrawLine(new Pen(Brushes.Black), prev.Value.Point, pt.Point);
-                        prev = pt;
-                        if (pt.Brush != null)
-                            context.DrawEllipse(pt.Brush, null, pt.Point, pt.Radius, pt.Radius);
-
-                    }
-
-                }
-
-                void AddPoint(Point pt, IBrush brush, double radius)
-                {
-                    _points[_index] = new CanvasPoint { Point = pt, Brush = brush, Radius = radius };
-                    _index = (_index + 1) % _points.Length;
-                }
-
-                public void HandleEvent(PointerEventArgs e, Visual v)
-                {
-                    e.Handled = true;
-                    if (e.RoutedEvent == PointerPressedEvent)
-                        AddPoint(e.GetPosition(v), Brushes.Green, 10);
-                    else if (e.RoutedEvent == PointerReleasedEvent)
-                        AddPoint(e.GetPosition(v), Brushes.Red, 10);
-                    else
-                    {
-                        var pts = e.GetIntermediatePoints(v);
-                        for (var c = 0; c < pts.Count; c++)
-                        {
-                            var pt = pts[c];
-                            AddPoint(pt.Position, c == pts.Count - 1 ? Brushes.Blue : Brushes.Black,
-                                c == pts.Count - 1 ? 5 : 2);
-                        }
-                    }
-                }
-            }
-            
-            public PointerCanvas(Slider slider, TextBlock status)
-            {
-                _slider = slider;
-                _status = status;
-                DispatcherTimer.Run(() =>
-                {
-                    if (_stopwatch.Elapsed.TotalSeconds > 1)
-                    {
-                        _status.Text = "Events per second: " + (_events / _stopwatch.Elapsed.TotalSeconds);
-                        _stopwatch.Restart();
-                        _events = 0;
-                    }
-
-                    return this.GetVisualRoot() != null;
-                }, TimeSpan.FromMilliseconds(10));
-            }
-
-
-            void HandleEvent(PointerEventArgs e)
-            {
-                _events++;
-                Thread.Sleep((int)_slider.Value);
-                InvalidateVisual();
-
-                if (e.RoutedEvent == PointerReleasedEvent && e.Pointer.Type == PointerType.Touch)
-                {
-                    _pointers.Remove(e.Pointer.Id);
-                    return;
-                }
-
-                if (!_pointers.TryGetValue(e.Pointer.Id, out var pt))
-                    _pointers[e.Pointer.Id] = pt = new PointerPoints();
-                pt.HandleEvent(e, this);
-                
-                
-            }
-            
-            public override void Render(DrawingContext context)
-            {
-                context.FillRectangle(Brushes.White, Bounds);
-                foreach(var pt in _pointers.Values)
-                    pt.Render(context);
-                base.Render(context);
-            }
-
-            protected override void OnPointerPressed(PointerPressedEventArgs e)
-            {
-                if (e.ClickCount == 2)
-                {
-                    _pointers.Clear();
-                    InvalidateVisual();
-                    return;
-                }
-                
-                HandleEvent(e);
-                base.OnPointerPressed(e);
-            }
-
-            protected override void OnPointerMoved(PointerEventArgs e)
-            {
-                HandleEvent(e);
-                base.OnPointerMoved(e);
-            }
-
-            protected override void OnPointerReleased(PointerReleasedEventArgs e)
-            {
-                HandleEvent(e);
-                base.OnPointerReleased(e);
-            }
-        }
-    
-    }
-}
diff --git a/samples/ControlCatalog/Pages/PointersPage.xaml b/samples/ControlCatalog/Pages/PointersPage.xaml
new file mode 100644
index 0000000000..c39106f29e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PointersPage.xaml
@@ -0,0 +1,66 @@
+<UserControl x:Class="ControlCatalog.Pages.PointersPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:ControlCatalog.Pages">
+  <TabControl>
+    <TabItem Header="Contacts">
+      <local:PointerContactsTab />
+    </TabItem>
+    <TabItem Header="IntermediatePoints">
+      <Panel TextElement.Foreground="Black">
+        <local:PointerCanvas x:Name="IntermediatePointsCanvas"
+                             DrawOnlyPoints="True"
+                             Status="{Binding #Status1TextBlock.Text, Mode=OneWayToSource}"
+                             ThreadSleep="{Binding #ThreadSleepSlider.Value}" />
+        <Border Width="300"
+                Height="60"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top">
+          <StackPanel Background="LightYellow">
+            <TextBlock Text="{Binding #ThreadSleepSlider.Value, StringFormat='Thread sleep: {0} / 500'}" />
+            <Slider x:Name="ThreadSleepSlider"
+                    Value="50"
+                    Maximum="500"
+                    Minimum="0" />
+          </StackPanel>
+        </Border>
+        <TextBlock x:Name="Status1TextBlock"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Top" />
+      </Panel>
+    </TabItem>
+    <TabItem Header="Pressure">
+      <Panel TextElement.Foreground="Black">
+        <local:PointerCanvas x:Name="PressureCanvas"
+                             DrawOnlyPoints="False"
+                             Status="{Binding #Status2TextBlock.Text, Mode=OneWayToSource}"
+                             ThreadSleep="0" />
+        <TextBlock x:Name="Status2TextBlock"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Top" />
+      </Panel>
+    </TabItem>
+    <TabItem Header="Capture">
+      <WrapPanel>
+        <Border Name="BorderCapture1"
+                MinWidth="250"
+                MinHeight="170"
+                Margin="5"
+                Padding="50"
+                Background="{DynamicResource SystemAccentColor}"
+                ToolTip.Placement="Bottom">
+          <TextBlock>Capture 1</TextBlock>
+        </Border>
+        <Border Name="BorderCapture2"
+                MinWidth="250"
+                MinHeight="170"
+                Margin="5"
+                Padding="50"
+                Background="{DynamicResource SystemAccentColor}"
+                ToolTip.Placement="Bottom">
+          <TextBlock>Capture 2</TextBlock>
+        </Border>
+      </WrapPanel>
+    </TabItem>
+  </TabControl>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/PointersPage.xaml.cs b/samples/ControlCatalog/Pages/PointersPage.xaml.cs
new file mode 100644
index 0000000000..16d7ecceb5
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PointersPage.xaml.cs
@@ -0,0 +1,81 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages;
+
+public class PointersPage : UserControl
+{
+    public PointersPage()
+    {
+        this.InitializeComponent();
+
+        var border1 = this.Get<Border>("BorderCapture1");
+        var border2 = this.Get<Border>("BorderCapture2");
+
+        border1.PointerPressed += Border_PointerPressed;
+        border1.PointerReleased += Border_PointerReleased;
+        border1.PointerCaptureLost += Border_PointerCaptureLost;
+        border1.PointerMoved += Border_PointerUpdated;
+        border1.PointerEntered += Border_PointerUpdated;
+        border1.PointerExited += Border_PointerUpdated;
+
+        border2.PointerPressed += Border_PointerPressed;
+        border2.PointerReleased += Border_PointerReleased;
+        border2.PointerCaptureLost += Border_PointerCaptureLost;
+        border2.PointerMoved += Border_PointerUpdated;
+        border2.PointerEntered += Border_PointerUpdated;
+        border2.PointerExited += Border_PointerUpdated;
+    }
+
+    private void Border_PointerUpdated(object? sender, PointerEventArgs e)
+    {
+        if (sender is Border border && border.Child is TextBlock textBlock)
+        {
+            var position = e.GetPosition(border);
+            textBlock.Text = @$"Type: {e.Pointer.Type}
+Captured: {e.Pointer.Captured == sender}
+PointerId: {e.Pointer.Id}
+Position: {(int)position.X} {(int)position.Y}";
+            e.Handled = true;
+        }
+    }
+
+    private void Border_PointerCaptureLost(object? sender, PointerCaptureLostEventArgs e)
+    {
+        if (sender is Border border && border.Child is TextBlock textBlock)
+        {
+            textBlock.Text = @$"Type: {e.Pointer.Type}
+Captured: {e.Pointer.Captured == sender}
+PointerId: {e.Pointer.Id}
+Position: ??? ???";
+            e.Handled = true;
+
+        }
+    }
+
+    private void Border_PointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        if (e.Pointer.Captured == sender)
+        {
+            e.Pointer.Capture(null);
+            e.Handled = true;
+        }
+        else if (e.Pointer.Captured is not null)
+        {
+            throw new InvalidOperationException("How?");
+        }
+    }
+
+    private void Border_PointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        e.Pointer.Capture(sender as Border);
+        e.Handled = true;
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ProgressBarPage.xaml b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
index db7d7d3280..8e73f1d0f5 100644
--- a/samples/ControlCatalog/Pages/ProgressBarPage.xaml
+++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
@@ -1,22 +1,37 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="ControlCatalog.Pages.ProgressBarPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A progress bar control</TextBlock>
-    <StackPanel>
+    <StackPanel Spacing="5">
+      <StackPanel Orientation="Horizontal" Spacing="5">
+        <TextBlock VerticalAlignment="Center">Maximum</TextBlock>
+        <NumericUpDown x:Name="maximum" Value="100" VerticalAlignment="Center"/>
+      </StackPanel>
+      <StackPanel Orientation="Horizontal" Spacing="5">
+        <TextBlock VerticalAlignment="Center">Minimum</TextBlock>
+        <NumericUpDown x:Name="minimum" Value="0" VerticalAlignment="Center"/>
+      </StackPanel>
+      <StackPanel Orientation="Horizontal" Spacing="5">
+        <TextBlock VerticalAlignment="Center">Progress Text Format</TextBlock>
+        <TextBox x:Name="stringFormat" Text="{}{0:0}%" VerticalAlignment="Center"/>
+      </StackPanel>
       <CheckBox x:Name="showProgress" Margin="10,16,0,0" Content="Show Progress Text" />
       <CheckBox x:Name="isIndeterminate" Margin="10,16,0,0" Content="Toggle Indeterminate" />
       <StackPanel Orientation="Horizontal" Margin="0,16,0,0" HorizontalAlignment="Center" Spacing="16">
         <StackPanel Spacing="16">
-          <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #hprogress.Value}" />
+          <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #hprogress.Value}" 
+                       Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}" ProgressTextFormat="{Binding #stringFormat.Text}"/>
         </StackPanel>
-        <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #vprogress.Value}" Orientation="Vertical" />
+        <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #vprogress.Value}" Orientation="Vertical" 
+                     Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}" ProgressTextFormat="{Binding #stringFormat.Text}"/>
       </StackPanel>
       <StackPanel Margin="16">
-        <Slider Name="hprogress" Maximum="100" Value="40" />
-        <Slider Name="vprogress" Maximum="100" Value="60" />
+        <Slider Name="hprogress" Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}" Value="40" />
+        <Slider Name="vprogress" Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}" Value="60" />
       </StackPanel>
 
       <StackPanel Spacing="10">
-        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
+        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" 
+                     Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.value}"/>
         <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
         <ProgressBar VerticalAlignment="Center" Value="50" />
         <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index caad8b0854..ff62b834c4 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -2,10 +2,10 @@ using System;
 using System.Globalization;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Threading;
 
 namespace ControlCatalog.Pages
 {
@@ -13,11 +13,15 @@ namespace ControlCatalog.Pages
     {
         private double _leftMost;
 
+        protected override bool BypassFlowDirectionPolicies => true;
+
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            Window w = (Window)VisualRoot;
-            w.PositionChanged += (sender, args) => InvalidateVisual();
+            if(VisualRoot is Window w)
+            {
+                w.PositionChanged += (_, _) => InvalidateVisual();
+            }
         }
 
         public override void Render(DrawingContext context)
@@ -25,7 +29,7 @@ namespace ControlCatalog.Pages
             base.Render(context);
             if (!(VisualRoot is Window w))
             {
-                return;                
+                return;
             }
             var screens = w.Screens.All;
             var scaling = ((IRenderRoot)w).RenderScaling;
@@ -38,7 +42,7 @@ namespace ControlCatalog.Pages
                     if (screen.Bounds.X / 10f < _leftMost)
                     {
                         _leftMost = screen.Bounds.X / 10f;
-                        InvalidateVisual();
+                        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
                         return;
                     }
 
@@ -58,10 +62,10 @@ namespace ControlCatalog.Pages
                         CreateFormattedText($"WorkArea: {screen.WorkingArea.Width}:{screen.WorkingArea.Height}");
                     context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 20));
 
-                    formattedText = CreateFormattedText($"Scaling: {screen.PixelDensity * 100}%");
+                    formattedText = CreateFormattedText($"Scaling: {screen.Scaling * 100}%");
                     context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 40));
 
-                    formattedText = CreateFormattedText($"Primary: {screen.Primary}");
+                    formattedText = CreateFormattedText($"IsPrimary: {screen.IsPrimary}");
                     context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 60));
 
                     formattedText =
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
index f49b13091b..bd0214c72e 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
@@ -52,7 +52,7 @@ namespace ControlCatalog.Pages
 
         private IBitmap LoadBitmap(string uri)
         {
-            var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+            var assets = AvaloniaLocator.Current!.GetService<IAssetLoader>()!;
             return new Bitmap(assets.Open(new Uri(uri)));
         }
 
@@ -60,7 +60,7 @@ namespace ControlCatalog.Pages
         {
             private Dock _tabPlacement;
 
-            public TabItemViewModel[] Tabs { get; set; }
+            public TabItemViewModel[]? Tabs { get; set; }
 
             public Dock TabPlacement
             {
@@ -71,10 +71,10 @@ namespace ControlCatalog.Pages
 
         private class TabItemViewModel
         {
-            public string Header { get; set; }
-            public string Text { get; set; }
-            public IBitmap Image { get; set; }
-            public bool IsEnabled { get; set; } = true;           
+            public string? Header { get; set; }
+            public string? Text { get; set; }
+            public IBitmap? Image { get; set; }
+            public bool IsEnabled { get; set; } = true;
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
index f0630cf534..6d7135a90f 100644
--- a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
@@ -38,7 +38,7 @@ namespace ControlCatalog.Pages
 
         private class TabStripItemViewModel
         {
-            public string Header { get; set; }
+            public string? Header { get; set; }
             public bool IsEnabled { get; set; } = true;
         }
     }
diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml b/samples/ControlCatalog/Pages/TextBlockPage.xaml
index 9998a20d42..6bb428e2c7 100644
--- a/samples/ControlCatalog/Pages/TextBlockPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml
@@ -117,6 +117,17 @@
           <TextBlock Text="👪 👨‍👩‍👧 👨‍👩‍👧‍👦" />
         </StackPanel>
       </Border>
+      <Border>
+        <SelectableTextBlock SelectionBrush="LightBlue" Margin="10" TextWrapping="Wrap">
+          This <Span FontWeight="Bold">is</Span> a
+          <Span Background="Silver" Foreground="Maroon">TextBlock</Span>
+          with <Span TextDecorations="Underline">several</Span>
+          <Span FontStyle="Italic">Span</Span> elements,
+          <Span Foreground="Blue">
+            using a <Bold>variety</Bold> of <Italic>styles</Italic>
+          </Span>.
+        </SelectableTextBlock>
+      </Border>
     </WrapPanel>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index f15ac8ffd6..e3d0c5e4e2 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -18,7 +18,7 @@
           </TextBox.ContextFlyout>
         </TextBox>
         <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Watermark="Numeric with watermark" x:Name="numericWatermark"/>
+        <TextBox Width="200" Watermark="Numeric with watermark" TextInputOptions.ContentType="Number" />
         <TextBox Width="200"
                  Watermark="Floating Watermark"
                  UseFloatingWatermark="True"
@@ -34,6 +34,7 @@
         <TextBox Width="200"
                  Watermark="Password Box"
                  Classes="revealPasswordButton"
+                 TextInputOptions.ContentType="Password"
                  UseFloatingWatermark="True"
                  PasswordChar="*"
                  Text="Password" />
@@ -65,6 +66,12 @@
                  FontFamily="Comic Sans MS"
                  InputMethod.IsInputMethodEnabled="False"
                  Foreground="Red"/>
+        <TextBox AcceptsReturn="True" 
+                 TextWrapping="Wrap" 
+                 Width="200" 
+                 Height="125"
+                 LineHeight="32"
+                 Text="Multiline TextBox with TextWrapping and increased LineHeight.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
       </StackPanel>
       <StackPanel Orientation="Vertical" Spacing="8" Margin="8">
         <Label Classes="h2" Target="{Binding #firstResMFont}">res_m fonts</Label>
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
index 9eeefebb02..cd5f790312 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
@@ -13,12 +13,6 @@ namespace ControlCatalog.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-
-            this.Get<TextBox>("numericWatermark")
-                .TextInputOptionsQuery += (s, a) =>
-                {
-                    a.ContentType = Avalonia.Input.TextInput.TextInputContentType.Number;
-                };
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
new file mode 100644
index 0000000000..a410577d27
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -0,0 +1,82 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:ControlCatalog.ViewModels"
+             xmlns:converter="clr-namespace:ControlCatalog.Converter"
+             xmlns:system="using:System"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:TransitioningContentControlPageViewModel"
+             x:CompileBindings="True"
+             x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
+
+    <UserControl.DataContext>
+        <vm:TransitioningContentControlPageViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="HeaderedContentControl">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="HeaderCol" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding Header}" 
+                                              Grid.Column="0" 
+                                              VerticalAlignment="Center" />
+                            <ContentPresenter Content="{TemplateBinding Content}" 
+                                              Grid.Column="1" 
+                                              VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Styles>
+  
+  <UserControl.Resources>
+    <converter:MathSubtractConverter x:Key="MathSubtractConverter" />
+    <system:Double x:Key="TopMargin">8</system:Double>
+  </UserControl.Resources>
+  
+    <DockPanel LastChildFill="True" 
+               Height="{Binding Path=Bounds.Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}, Converter={StaticResource MathSubtractConverter},ConverterParameter={StaticResource TopMargin}}">
+
+        <TextBlock DockPanel.Dock="Top" Classes="h2">The TransitioningContentControl control allows you to show a page transition whenever the Content changes.</TextBlock>
+
+        <ExperimentalAcrylicBorder DockPanel.Dock="Bottom" Margin="10" CornerRadius="5" >
+            <ExperimentalAcrylicBorder.Material>
+                <ExperimentalAcrylicMaterial BackgroundSource="Digger" TintColor="White" />
+            </ExperimentalAcrylicBorder.Material>
+            
+            <StackPanel Margin="5" Spacing="5" Grid.IsSharedSizeScope="True">
+                <HeaderedContentControl Header="Select a transition">
+                     <ComboBox Items="{Binding PageTransitions}" SelectedItem="{Binding SelectedTransition}" />
+                </HeaderedContentControl>
+                <HeaderedContentControl Header="Duration">
+                     <NumericUpDown Value="{Binding Duration}" Increment="250" Minimum="100" />
+                </HeaderedContentControl>
+                <HeaderedContentControl Header="Clip to Bounds">
+                    <ToggleSwitch IsChecked="{Binding ClipToBounds}" />
+                </HeaderedContentControl>
+            </StackPanel>
+        </ExperimentalAcrylicBorder>
+
+        <Button DockPanel.Dock="Left" Command="{Binding PrevImage}" Content="&lt;" />
+        <Button DockPanel.Dock="Right" Command="{Binding NextImage}" Content=">" />
+        
+        <Border ClipToBounds="{Binding ClipToBounds}" Margin="5">
+            <TransitioningContentControl Content="{Binding SelectedImage}"
+                                         PageTransition="{Binding SelectedTransition.Transition}" >
+                <TransitioningContentControl.ContentTemplate>
+                    <DataTemplate DataType="Bitmap">
+                        <Image Source="{Binding}"  />
+                    </DataTemplate>
+                </TransitioningContentControl.ContentTemplate>
+            </TransitioningContentControl>
+        </Border>
+    </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
new file mode 100644
index 0000000000..2851a6c890
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class TransitioningContentControlPage : UserControl
+    {
+        public TransitioningContentControlPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs b/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs
index 7eea7b0657..868c72df5c 100644
--- a/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs
@@ -10,7 +10,7 @@ namespace ControlCatalog.ViewModels
         {
             ExitCommand = MiniCommand.Create(() =>
             {
-                if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
                 {
                     lifetime.Shutdown();
                 }
diff --git a/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs b/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
index b46ffeb007..4cfb00625e 100644
--- a/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
@@ -9,7 +9,7 @@ namespace ControlCatalog.ViewModels
 {
     public class ContextPageViewModel
     {
-        public Control View { get; set; }
+        public Control? View { get; set; }
         public ContextPageViewModel()
         {
             OpenCommand = MiniCommand.CreateFromTask(Open);
@@ -53,14 +53,14 @@ namespace ControlCatalog.ViewModels
             var window = View?.GetVisualRoot() as Window;
             if (window == null)
                 return;
-            var dialog = new OpenFileDialog();
-            var result = await dialog.ShowAsync(window);
+
+            var result = await window.StorageProvider.OpenFilePickerAsync(new Avalonia.Platform.Storage.FilePickerOpenOptions() { AllowMultiple = true });
 
             if (result != null)
             {
-                foreach (var path in result)
+                foreach (var file in result)
                 {
-                    System.Diagnostics.Debug.WriteLine($"Opened: {path}");
+                    System.Diagnostics.Debug.WriteLine($"Opened: {file.Name}");
                 }
             }
         }
diff --git a/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs b/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
index f1cc0637dc..d73ab810eb 100644
--- a/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
@@ -18,7 +18,7 @@ namespace ControlCatalog.ViewModels
                 .Select(x => new StandardCursorModel(x))
                 .ToList();
 
-            var loader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+            var loader = AvaloniaLocator.Current!.GetService<IAssetLoader>()!;
             var s = loader.Open(new Uri("avares://ControlCatalog/Assets/avalonia-32.png"));
             var bitmap = new Bitmap(s);
             CustomCursor = new Cursor(bitmap, new PixelPoint(16, 16));
diff --git a/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs b/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
new file mode 100644
index 0000000000..aa7f710ee0
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
@@ -0,0 +1,27 @@
+using Avalonia;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class ExpanderPageViewModel : ViewModelBase
+    {
+        private object _cornerRadius = AvaloniaProperty.UnsetValue;
+        private bool _rounded;
+
+        public object CornerRadius
+        {
+            get => _cornerRadius;
+            private set => RaiseAndSetIfChanged(ref _cornerRadius, value);
+        }
+
+        public bool Rounded
+        {
+            get => _rounded;
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _rounded, value))
+                    CornerRadius = _rounded ? new CornerRadius(25) : AvaloniaProperty.UnsetValue;
+            }
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
index ee1fa6ae77..3973c73662 100644
--- a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
@@ -14,7 +14,7 @@ namespace ControlCatalog.ViewModels
 
         public ItemsRepeaterPageViewModel()
         {
-            Items = CreateItems();
+            _items = CreateItems();
         }
 
         public ObservableCollection<Item> Items
@@ -23,12 +23,25 @@ namespace ControlCatalog.ViewModels
             set => this.RaiseAndSetIfChanged(ref _items, value);
         }
 
-        public Item SelectedItem { get; set; }
+        public Item? SelectedItem { get; set; }
 
         public void AddItem()
         {
             var index = SelectedItem != null ? Items.IndexOf(SelectedItem) : -1;
-            Items.Insert(index + 1, new Item(index + 1) { Text = $"New Item {_newItemIndex++}" });
+            Items.Insert(index + 1, new Item(index + 1, $"New Item {_newItemIndex++}"));
+        }
+
+        public void RemoveItem()
+        {
+            if (SelectedItem is not null)
+            {
+                Items.Remove(SelectedItem);
+                SelectedItem = null;
+            }
+            else if (Items.Count > 0)
+            {
+                Items.RemoveAt(Items.Count - 1);
+            }
         }
 
         public void RandomizeHeights()
@@ -53,19 +66,20 @@ namespace ControlCatalog.ViewModels
             _newGenerationIndex++;
 
             return new ObservableCollection<Item>(
-                Enumerable.Range(1, 100000).Select(i => new Item(i)
-                {
-                    Text = $"Item {i.ToString()} {suffix}"
-                }));
+                Enumerable.Range(1, 100000).Select(i => new Item(i, $"Item {i.ToString()} {suffix}")));
         }
 
         public class Item : ViewModelBase
         {
             private double _height = double.NaN;
 
-            public Item(int index) => Index = index;
+            public Item(int index, string text)
+            {
+                Index = index;
+                Text = text;
+            }
             public int Index { get; }
-            public string Text { get; set; }
+            public string Text { get; }
             
             public double Height 
             {
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 2b0c30f311..b79eff780c 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -16,45 +16,28 @@ namespace ControlCatalog.ViewModels
 
         private bool _isMenuItemChecked = true;
         private WindowState _windowState;
-        private WindowState[] _windowStates;
+        private WindowState[] _windowStates = Array.Empty<WindowState>();
         private int _transparencyLevel;
-        private ExtendClientAreaChromeHints _chromeHints;
+        private ExtendClientAreaChromeHints _chromeHints = ExtendClientAreaChromeHints.PreferSystemChrome;
         private bool _extendClientAreaEnabled;
-        private bool _systemTitleBarEnabled;        
+        private bool _systemTitleBarEnabled;
         private bool _preferSystemChromeEnabled;
         private double _titleBarHeight;
 
-        public MainWindowViewModel(IManagedNotificationManager notificationManager)
+        public MainWindowViewModel()
         {
-            _notificationManager = notificationManager;
-
-            ShowCustomManagedNotificationCommand = MiniCommand.Create(() =>
-            {
-                NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
-            });
-
-            ShowManagedNotificationCommand = MiniCommand.Create(() =>
-            {
-                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
-            });
-
-            ShowNativeNotificationCommand = MiniCommand.Create(() =>
-            {
-                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
-            });
-
             AboutCommand = MiniCommand.CreateFromTask(async () =>
             {
                 var dialog = new AboutAvaloniaDialog();
 
-                var mainWindow = (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
-
-                await dialog.ShowDialog(mainWindow);
+                if ((App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow is { } mainWindow)
+                {
+                    await dialog.ShowDialog(mainWindow);
+                }
             });
-
             ExitCommand = MiniCommand.Create(() =>
             {
-                (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).Shutdown();
+                (App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown();
             });
 
             ToggleMenuItemCheckedCommand = MiniCommand.Create(() =>
@@ -142,24 +125,12 @@ namespace ControlCatalog.ViewModels
             set { this.RaiseAndSetIfChanged(ref _windowStates, value); }
         }
 
-        public IManagedNotificationManager NotificationManager
-        {
-            get { return _notificationManager; }
-            set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
-        }
-
         public bool IsMenuItemChecked
         {
             get { return _isMenuItemChecked; }
             set { this.RaiseAndSetIfChanged(ref _isMenuItemChecked, value); }
         }
 
-        public MiniCommand ShowCustomManagedNotificationCommand { get; }
-
-        public MiniCommand ShowManagedNotificationCommand { get; }
-
-        public MiniCommand ShowNativeNotificationCommand { get; }
-
         public MiniCommand AboutCommand { get; }
 
         public MiniCommand ExitCommand { get; }
diff --git a/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs b/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs
index 1e4a764efc..190bb4c8a3 100644
--- a/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs
@@ -5,9 +5,9 @@ namespace ControlCatalog.ViewModels
 {
     public class MenuItemViewModel
     {
-        public string Header { get; set; }
-        public ICommand Command { get; set; }
-        public object CommandParameter { get; set; }
-        public IList<MenuItemViewModel> Items { get; set; }
+        public string? Header { get; set; }
+        public ICommand? Command { get; set; }
+        public object? CommandParameter { get; set; }
+        public IList<MenuItemViewModel>? Items { get; set; }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
index ecbd59c5d7..16051c3c05 100644
--- a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
@@ -10,7 +10,7 @@ namespace ControlCatalog.ViewModels
 {
     public class MenuPageViewModel
     {
-        public Control View { get; set; }
+        public Control? View { get; set; }
         public MenuPageViewModel()
         {
             OpenCommand = MiniCommand.CreateFromTask(Open);
@@ -74,14 +74,13 @@ namespace ControlCatalog.ViewModels
             var window = View?.GetVisualRoot() as Window;
             if (window == null)
                 return;
-            var dialog = new OpenFileDialog();
-            var result = await dialog.ShowAsync(window);
+            var result = await window.StorageProvider.OpenFilePickerAsync(new Avalonia.Platform.Storage.FilePickerOpenOptions() { AllowMultiple = true });
 
             if (result != null)
             {
-                foreach (var path in result)
+                foreach (var file in result)
                 {
-                    System.Diagnostics.Debug.WriteLine($"Opened: {path}");
+                    System.Diagnostics.Debug.WriteLine($"Opened: {file.Name}");
                 }
             }
         }
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 2052481015..a31f164a2a 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -6,25 +6,48 @@ namespace ControlCatalog.ViewModels
 {
     public class NotificationViewModel
     {
-        public NotificationViewModel(INotificationManager manager)
+        public WindowNotificationManager? NotificationManager { get; set; }
+
+        public NotificationViewModel()
         {
+            ShowCustomManagedNotificationCommand = MiniCommand.Create(() =>
+            {
+                NotificationManager?.Show(new NotificationViewModel() { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" , NotificationManager = NotificationManager});
+            });
+
+            ShowManagedNotificationCommand = MiniCommand.Create(() =>
+            {
+                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
+            });
+
+            ShowNativeNotificationCommand = MiniCommand.Create(() =>
+            {
+                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
+            });
+
             YesCommand = MiniCommand.Create(() =>
             {
-                manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
+                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
             });
 
             NoCommand = MiniCommand.Create(() =>
             {
-                manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
+                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
             });
         }
 
-        public string Title { get; set; }
-        public string Message { get; set; }
+        public string? Title { get; set; }
+        public string? Message { get; set; }
 
         public MiniCommand YesCommand { get; }
 
         public MiniCommand NoCommand { get; }
 
+        public MiniCommand ShowCustomManagedNotificationCommand { get; }
+
+        public MiniCommand ShowManagedNotificationCommand { get; }
+
+        public MiniCommand ShowNativeNotificationCommand { get; }
+
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/PlatformInformationViewModel.cs b/samples/ControlCatalog/ViewModels/PlatformInformationViewModel.cs
new file mode 100644
index 0000000000..e4f6c3ac73
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/PlatformInformationViewModel.cs
@@ -0,0 +1,54 @@
+using Avalonia;
+using Avalonia.Platform;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels;
+#nullable enable
+
+public class PlatformInformationViewModel : ViewModelBase
+{
+    public PlatformInformationViewModel()
+    {
+        var runtimeInfo = AvaloniaLocator.Current.GetService<IRuntimePlatform>()?.GetRuntimeInfo();
+
+        if (runtimeInfo is { } info)
+        {
+            if (info.IsBrowser)
+            {
+                if (info.IsDesktop)
+                {
+                    PlatformInfo = "Platform: Desktop (browser)";
+                }
+                else if (info.IsMobile)
+                {
+                    PlatformInfo = "Platform: Mobile (browser)";
+                }
+                else
+                {
+                    PlatformInfo = "Platform: Unknown (browser) - please report";
+                }
+            }
+            else
+            {
+                if (info.IsDesktop)
+                {
+                    PlatformInfo = "Platform: Desktop (native)";
+                }
+                else if (info.IsMobile)
+                {
+                    PlatformInfo = "Platform: Mobile (native)";
+                }
+                else
+                {
+                    PlatformInfo = "Platform: Unknown (native) - please report";
+                }
+            }
+        }
+        else
+        {
+            
+        }
+    }
+    
+    public string PlatformInfo { get; }
+}
diff --git a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
new file mode 100644
index 0000000000..83892247e6
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
@@ -0,0 +1,309 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class TransitioningContentControlPageViewModel : ViewModelBase
+    {
+        public TransitioningContentControlPageViewModel()
+        {
+            var assetLoader = AvaloniaLocator.Current?.GetService<IAssetLoader>()!;
+
+            var images = new string[] 
+            { 
+                "delicate-arch-896885_640.jpg", 
+                "hirsch-899118_640.jpg", 
+                "maple-leaf-888807_640.jpg" 
+            };
+
+            foreach (var image in images)
+            {
+                var path = $"avares://ControlCatalog/Assets/{image}";
+                Images.Add(new Bitmap(assetLoader.Open(new Uri(path))));
+            }
+
+            SetupTransitions();
+
+            _SelectedTransition = PageTransitions[1];
+            _SelectedImage = Images[0];
+        }
+
+        public List<PageTransition> PageTransitions { get; } = new List<PageTransition>();
+
+        public List<Bitmap> Images { get; } = new List<Bitmap>();
+
+
+        private Bitmap _SelectedImage;
+
+        /// <summary>
+        /// Gets or Sets the selected image
+        /// </summary>
+        public Bitmap SelectedImage
+        {
+            get { return _SelectedImage; }
+            set { this.RaiseAndSetIfChanged(ref _SelectedImage, value); }
+        }
+
+
+        private PageTransition _SelectedTransition;
+
+        /// <summary>
+        /// Gets or sets the transition to play
+        /// </summary>
+        public PageTransition SelectedTransition
+        {
+            get { return _SelectedTransition; }
+            set { this.RaiseAndSetIfChanged(ref _SelectedTransition, value); }
+        }
+
+
+
+        private bool _ClipToBounds;
+
+        /// <summary>
+        /// Gets or sets if the content should be clipped to bounds
+        /// </summary>
+        public bool ClipToBounds
+        {
+            get { return _ClipToBounds; }
+            set { this.RaiseAndSetIfChanged(ref _ClipToBounds, value); }
+        }
+
+
+        private int _Duration = 500;
+
+        /// <summary>
+        /// Gets or Sets the duration
+        /// </summary>
+        public int Duration 
+        {
+            get { return _Duration; }
+            set 
+            { 
+                this.RaiseAndSetIfChanged(ref _Duration , value);
+                SetupTransitions();
+            }
+        }
+
+        private void SetupTransitions()
+        {
+            if (PageTransitions.Count == 0)
+            {
+                PageTransitions.AddRange(new[] 
+                {
+                    new PageTransition("None"),
+                    new PageTransition("CrossFade"),
+                    new PageTransition("Slide horizontally"),
+                    new PageTransition("Slide vertically"),
+                    new PageTransition("Composite"),
+                    new PageTransition("Custom")
+                });
+            }
+
+            PageTransitions[1].Transition = new CrossFade(TimeSpan.FromMilliseconds(Duration));
+            PageTransitions[2].Transition = new PageSlide(TimeSpan.FromMilliseconds(Duration), PageSlide.SlideAxis.Horizontal);
+            PageTransitions[3].Transition = new PageSlide(TimeSpan.FromMilliseconds(Duration), PageSlide.SlideAxis.Vertical);
+
+            var compositeTransition = new CompositePageTransition();
+            compositeTransition.PageTransitions.Add(PageTransitions[1].Transition!);
+            compositeTransition.PageTransitions.Add(PageTransitions[2].Transition!);
+            compositeTransition.PageTransitions.Add(PageTransitions[3].Transition!);
+            PageTransitions[4].Transition = compositeTransition;
+
+            PageTransitions[5].Transition = new CustomTransition(TimeSpan.FromMilliseconds(Duration));
+        }
+
+        public void NextImage()
+        {
+            var index = Images.IndexOf(SelectedImage) + 1;
+            
+            if (index >= Images.Count)
+            {
+                index = 0;
+            }
+
+            SelectedImage = Images[index];
+        }
+
+        public void PrevImage()
+        {
+            var index = Images.IndexOf(SelectedImage) - 1;
+
+            if (index < 0)
+            {
+                index = Images.Count-1;
+            }
+
+            SelectedImage = Images[index];
+        }
+    }
+
+    public class PageTransition : ViewModelBase
+    {
+        public PageTransition(string displayTitle)
+        {
+            DisplayTitle = displayTitle;
+        }
+
+        public string DisplayTitle { get; }
+
+
+        private IPageTransition? _Transition;
+
+        /// <summary>
+        /// Gets or sets the transition
+        /// </summary>
+        public IPageTransition? Transition
+        {
+            get { return _Transition; }
+            set { this.RaiseAndSetIfChanged(ref _Transition, value); }
+        }
+
+        public override string ToString()
+        {
+            return DisplayTitle;
+        }
+
+    }
+
+    public class CustomTransition : IPageTransition
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomTransition"/> class.
+        /// </summary>
+        public CustomTransition()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomTransition"/> class.
+        /// </summary>
+        /// <param name="duration">The duration of the animation.</param>
+        public CustomTransition(TimeSpan duration)
+        {
+            Duration = duration;
+        }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public TimeSpan Duration { get; set; }
+
+        public async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            var tasks = new List<Task>();
+            var parent = GetVisualParent(from, to);
+            var scaleProperty = ScaleTransform.ScaleYProperty;
+
+            if (from != null)
+            {
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = scaleProperty, Value = 1d } },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = scaleProperty,
+                                    Value = 0d
+                                }
+                            },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(from, null, cancellationToken));
+            }
+
+            if (to != null)
+            {
+                to.IsVisible = true;
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = scaleProperty,
+                                    Value = 0d
+                                }
+                            },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = scaleProperty, Value = 1d } },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(to, null, cancellationToken));
+            }
+
+            await Task.WhenAll(tasks);
+
+            if (from != null && !cancellationToken.IsCancellationRequested)
+            {
+                from.IsVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the common visual parent of the two control.
+        /// </summary>
+        /// <param name="from">The from control.</param>
+        /// <param name="to">The to control.</param>
+        /// <returns>The common parent.</returns>
+        /// <exception cref="ArgumentException">
+        /// The two controls do not share a common parent.
+        /// </exception>
+        /// <remarks>
+        /// Any one of the parameters may be null, but not both.
+        /// </remarks>
+        private static IVisual GetVisualParent(IVisual? from, IVisual? to)
+        {
+            var p1 = (from ?? to)!.VisualParent;
+            var p2 = (to ?? from)!.VisualParent;
+
+            if (p1 != null && p2 != null && p1 != p2)
+            {
+                throw new ArgumentException("Controls for PageSlide must have same parent.");
+            }
+
+            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs b/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
index c03379330f..80d4844f7a 100644
--- a/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
@@ -92,7 +92,7 @@ namespace ControlCatalog.ViewModels
 
         public class Node
         {
-            private ObservableCollection<Node> _children;
+            private ObservableCollection<Node>? _children;
             private int _childIndex = 10;
 
             public Node()
@@ -106,7 +106,7 @@ namespace ControlCatalog.ViewModels
                 Header = parent.Header + ' ' + index;
             }
 
-            public Node Parent { get; }
+            public Node? Parent { get; }
             public string Header { get; }
             public bool AreChildrenInitialized => _children != null;
             public ObservableCollection<Node> Children => _children ??= CreateChildren();
diff --git a/samples/IntegrationTestApp/App.axaml b/samples/IntegrationTestApp/App.axaml
new file mode 100644
index 0000000000..a833e096df
--- /dev/null
+++ b/samples/IntegrationTestApp/App.axaml
@@ -0,0 +1,7 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="IntegrationTestApp.App">
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+    </Application.Styles>
+</Application>
diff --git a/samples/IntegrationTestApp/App.axaml.cs b/samples/IntegrationTestApp/App.axaml.cs
new file mode 100644
index 0000000000..022931366d
--- /dev/null
+++ b/samples/IntegrationTestApp/App.axaml.cs
@@ -0,0 +1,24 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace IntegrationTestApp
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                desktop.MainWindow = new MainWindow();
+            }
+
+            base.OnFrameworkInitializationCompleted();
+        }
+    }
+}
diff --git a/samples/IntegrationTestApp/IntegrationTestApp.csproj b/samples/IntegrationTestApp/IntegrationTestApp.csproj
new file mode 100644
index 0000000000..0a761d70ba
--- /dev/null
+++ b/samples/IntegrationTestApp/IntegrationTestApp.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CFBundleName>IntegrationTestApp</CFBundleName>
+    <CFBundleIdentifier>net.avaloniaui.avalonia.integrationtestapp</CFBundleIdentifier>
+    <NSHighResolutionCapable>true</NSHighResolutionCapable>
+    <CFBundleShortVersionString>1.0.0</CFBundleShortVersionString>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
+  </ItemGroup>
+  
+  <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\SampleApp.props" />
+  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  
+</Project>
diff --git a/samples/IntegrationTestApp/MacOSIntegration.cs b/samples/IntegrationTestApp/MacOSIntegration.cs
new file mode 100644
index 0000000000..f700a5b4e2
--- /dev/null
+++ b/samples/IntegrationTestApp/MacOSIntegration.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Controls;
+
+namespace IntegrationTestApp
+{
+    public static class MacOSIntegration
+    {
+        [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "sel_registerName")]
+        private static extern IntPtr GetHandle(string name);
+        
+        [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]
+        private static extern long Int64_objc_msgSend(IntPtr receiver, IntPtr selector);
+
+        private static readonly IntPtr s_orderedIndexSelector;
+
+        static MacOSIntegration()
+        {
+            s_orderedIndexSelector = GetHandle("orderedIndex");;
+        }
+        
+        public static long GetOrderedIndex(Window window)
+        {
+            return Int64_objc_msgSend(window.PlatformImpl!.Handle.Handle, s_orderedIndexSelector);
+        }
+    }
+}
diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
new file mode 100644
index 0000000000..76ecfcc622
--- /dev/null
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -0,0 +1,137 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="IntegrationTestApp.MainWindow"
+        Name="MainWindow"
+        Title="IntegrationTestApp">
+  <NativeMenu.Menu>
+    <NativeMenu>
+      <NativeMenuItem Header="File">
+        <NativeMenu>
+          <NativeMenuItem Header="Open..."/>
+        </NativeMenu>
+      </NativeMenuItem>
+      <NativeMenuItem Header="View">
+        <NativeMenu/>
+      </NativeMenuItem>  
+    </NativeMenu>
+  </NativeMenu.Menu>
+  <DockPanel>
+    <NativeMenuBar DockPanel.Dock="Top"/>
+    
+    <TabControl TabStripPlacement="Left" Name="MainTabs">
+      <TabItem Header="Automation">
+        <StackPanel>
+          <TextBlock Name="TextBlockWithName">TextBlockWithName</TextBlock>
+          <TextBlock Name="NotTheAutomationId" AutomationProperties.AutomationId="TextBlockWithNameAndAutomationId">
+            TextBlockWithNameAndAutomationId
+          </TextBlock>
+          <TextBlock Name="TextBlockAsLabel">Label for TextBox</TextBlock>
+          <TextBox Name="LabeledByTextBox" AutomationProperties.LabeledBy="{Binding #TextBlockAsLabel}">
+            Foo
+          </TextBox>
+        </StackPanel>
+      </TabItem>
+      
+      <TabItem Header="Button">
+        <StackPanel>
+          <Button Name="DisabledButton" IsEnabled="False">
+            Disabled Button
+          </Button>
+          <Button Name="BasicButton">
+            Basic Button
+          </Button>
+          <Button Name="ButtonWithTextBlock">
+            <TextBlock>Button with TextBlock</TextBlock>
+          </Button>
+          <Button Name="ButtonWithAcceleratorKey" HotKey="Ctrl+B">Button with Accelerator Key</Button>
+        </StackPanel>
+      </TabItem>
+
+      <TabItem Header="CheckBox">
+        <StackPanel>
+          <CheckBox Name="UncheckedCheckBox">Unchecked</CheckBox>
+          <CheckBox Name="CheckedCheckBox" IsChecked="True">Checked</CheckBox>
+          <CheckBox Name="ThreeStateCheckBox" IsThreeState="True" IsChecked="{x:Null}">ThreeState</CheckBox>
+        </StackPanel>
+      </TabItem>
+
+      <TabItem Header="ComboBox">
+        <StackPanel>
+          <ComboBox Name="BasicComboBox">
+            <ComboBoxItem>Item 0</ComboBoxItem>
+            <ComboBoxItem>Item 1</ComboBoxItem>
+          </ComboBox>
+          <Button Name="ComboBoxSelectionClear">Clear Selection</Button>
+          <Button Name="ComboBoxSelectFirst">Select First</Button>
+        </StackPanel>
+      </TabItem>
+
+      <TabItem Header="Gestures">
+        <DockPanel>
+          <DockPanel DockPanel.Dock="Top">
+            <Button Name="ResetGestures" DockPanel.Dock="Right">Reset</Button>
+            <TextBlock Name="LastGesture" />
+          </DockPanel>
+          <Panel>
+            <Border Name="GestureBorder" Background="Blue"
+                    AutomationProperties.AccessibilityView="Content"
+                    AutomationProperties.ControlTypeOverride="Image"/>
+            <Border Name="GestureBorder2" Background="Green" IsVisible="False"
+                    AutomationProperties.AccessibilityView="Content"
+                    AutomationProperties.ControlTypeOverride="Image"/>
+          </Panel>
+        </DockPanel>
+      </TabItem>
+
+      <TabItem Header="ListBox">
+        <DockPanel>
+          <StackPanel DockPanel.Dock="Bottom">
+            <Button Name="ListBoxSelectionClear">Clear Selection</Button>
+          </StackPanel>
+          <ListBox Name="BasicListBox" Items="{Binding ListBoxItems}" SelectionMode="Multiple"/>
+        </DockPanel>
+      </TabItem>
+      
+      <TabItem Header="Menu">
+        <DockPanel>
+          <Menu DockPanel.Dock="Top">
+            <MenuItem Name="RootMenuItem" Header="_Root">
+              <MenuItem Name="Child1MenuItem" Header="_Child 1" InputGesture="Ctrl+O" Click="MenuClicked"/>
+              <MenuItem Name="Child2MenuItem" Header="C_hild 2">
+                <MenuItem Name="GrandchildMenuItem" Header="_Grandchild" Click="MenuClicked"/>
+              </MenuItem>
+            </MenuItem>
+          </Menu>
+          <StackPanel>
+            <TextBlock Name="ClickedMenuItem">None</TextBlock>
+            <Button Name="MenuClickedMenuItemReset">Reset</Button>
+            <TextBox Name="MenuFocusTest"/>
+          </StackPanel>
+        </DockPanel>
+      </TabItem>
+      
+      <TabItem Header="Window">
+        <StackPanel>
+          <TextBox Name="ShowWindowSize" Watermark="Window Size"/>
+          <ComboBox Name="ShowWindowMode" SelectedIndex="0">
+            <ComboBoxItem>NonOwned</ComboBoxItem>
+            <ComboBoxItem>Owned</ComboBoxItem>
+            <ComboBoxItem>Modal</ComboBoxItem>
+          </ComboBox>
+          <ComboBox Name="ShowWindowLocation" SelectedIndex="0">
+            <ComboBoxItem>Manual</ComboBoxItem>
+            <ComboBoxItem>CenterScreen</ComboBoxItem>
+            <ComboBoxItem>CenterOwner</ComboBoxItem>
+          </ComboBox>
+          <Button Name="ShowWindow">Show Window</Button>
+          <Button Name="SendToBack">Send to Back</Button>
+          <Button Name="ExitFullscreen">Exit Fullscreen</Button>
+          <Button Name="RestoreAll">Restore All</Button>
+        </StackPanel>
+      </TabItem>
+    </TabControl>
+  </DockPanel>
+</Window>
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
new file mode 100644
index 0000000000..e8fb455c35
--- /dev/null
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -0,0 +1,185 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Automation;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+using Microsoft.CodeAnalysis;
+
+namespace IntegrationTestApp
+{
+    public class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+            InitializeViewMenu();
+            InitializeGesturesTab();
+            this.AttachDevTools();
+            AddHandler(Button.ClickEvent, OnButtonClick);
+            ListBoxItems = Enumerable.Range(0, 100).Select(x => "Item " + x).ToList();
+            DataContext = this;
+        }
+
+        public List<string> ListBoxItems { get; }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void InitializeViewMenu()
+        {
+            var mainTabs = this.Get<TabControl>("MainTabs");
+            var viewMenu = (NativeMenuItem)NativeMenu.GetMenu(this).Items[1];
+
+            if (mainTabs.Items is not null)
+            {
+                foreach (TabItem tabItem in mainTabs.Items)
+                {
+                    var menuItem = new NativeMenuItem
+                    {
+                        Header = (string)tabItem.Header!,
+                        IsChecked = tabItem.IsSelected,
+                        ToggleType = NativeMenuItemToggleType.Radio,
+                    };
+
+                    menuItem.Click += (s, e) => tabItem.IsSelected = true;
+                    viewMenu?.Menu?.Items.Add(menuItem);
+                }
+            }
+        }
+
+        private void ShowWindow()
+        {
+            var sizeTextBox = this.GetControl<TextBox>("ShowWindowSize");
+            var modeComboBox = this.GetControl<ComboBox>("ShowWindowMode");
+            var locationComboBox = this.GetControl<ComboBox>("ShowWindowLocation");
+            var size = !string.IsNullOrWhiteSpace(sizeTextBox.Text) ? Size.Parse(sizeTextBox.Text) : (Size?)null;
+            var owner = (Window)this.GetVisualRoot()!;
+
+            var window = new ShowWindowTest
+            {
+                WindowStartupLocation = (WindowStartupLocation)locationComboBox.SelectedIndex,
+            };
+
+            if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
+            {
+                // Make sure the windows have unique names and AutomationIds.
+                var existing = lifetime.Windows.OfType<ShowWindowTest>().Count();
+                if (existing > 0)
+                {
+                    AutomationProperties.SetAutomationId(window, window.Name + (existing + 1));
+                    window.Title += $" {existing + 1}";
+                }
+            }
+            
+            if (size.HasValue)
+            {
+                window.Width = size.Value.Width;
+                window.Height = size.Value.Height;
+            }
+
+            sizeTextBox.Text = string.Empty;
+
+            switch (modeComboBox.SelectedIndex)
+            {
+                case 0:
+                    window.Show();
+                    break;
+                case 1:
+                    window.Show(owner);
+                    break;
+                case 2:
+                    window.ShowDialog(owner);
+                    break;
+            }
+        }
+
+        private void SendToBack()
+        {
+            var lifetime = (ClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime!;
+
+            foreach (var window in lifetime.Windows)
+            {
+                window.Activate();
+            }
+        }
+
+        private void RestoreAll()
+        {
+            var lifetime = (ClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime!;
+
+            foreach (var window in lifetime.Windows)
+            {
+                window.Show();
+                if (window.WindowState == WindowState.Minimized)
+                    window.WindowState = WindowState.Normal;
+            }
+        }
+
+        private void InitializeGesturesTab()
+        {
+            var gestureBorder = this.GetControl<Border>("GestureBorder");
+            var gestureBorder2 = this.GetControl<Border>("GestureBorder2");
+            var lastGesture = this.GetControl<TextBlock>("LastGesture");
+            var resetGestures = this.GetControl<Button>("ResetGestures");
+            gestureBorder.Tapped += (s, e) => lastGesture.Text = "Tapped";
+            
+            gestureBorder.DoubleTapped += (s, e) =>
+            {
+                lastGesture.Text = "DoubleTapped";
+
+                // Testing #8733
+                gestureBorder.IsVisible = false;
+                gestureBorder2.IsVisible = true;
+            };
+
+            gestureBorder2.DoubleTapped += (s, e) =>
+            {
+                lastGesture.Text = "DoubleTapped2";
+            };
+
+            Gestures.AddRightTappedHandler(gestureBorder, (s, e) => lastGesture.Text = "RightTapped");
+            
+            resetGestures.Click += (s, e) =>
+            {
+                lastGesture.Text = string.Empty;
+                gestureBorder.IsVisible = true;
+                gestureBorder2.IsVisible = false;
+            };
+        }
+
+        private void MenuClicked(object? sender, RoutedEventArgs e)
+        {
+            var clickedMenuItemTextBlock = this.Get<TextBlock>("ClickedMenuItem");
+            clickedMenuItemTextBlock.Text = (sender as MenuItem)?.Header?.ToString();
+        }
+
+        private void OnButtonClick(object? sender, RoutedEventArgs e)
+        {
+            var source = e.Source as Button;
+
+            if (source?.Name == "ComboBoxSelectionClear")
+                this.Get<ComboBox>("BasicComboBox").SelectedIndex = -1;
+            if (source?.Name == "ComboBoxSelectFirst")
+                this.Get<ComboBox>("BasicComboBox").SelectedIndex = 0;
+            if (source?.Name == "ListBoxSelectionClear")
+                this.Get<ListBox>("BasicListBox").SelectedIndex = -1;
+            if (source?.Name == "MenuClickedMenuItemReset")
+                this.Get<TextBlock>("ClickedMenuItem").Text = "None";
+            if (source?.Name == "ShowWindow")
+                ShowWindow();
+            if (source?.Name == "SendToBack")
+                SendToBack();
+            if (source?.Name == "ExitFullscreen")
+                WindowState = WindowState.Normal;
+            if (source?.Name == "RestoreAll")
+                RestoreAll();
+        }
+    }
+}
diff --git a/samples/IntegrationTestApp/Program.cs b/samples/IntegrationTestApp/Program.cs
new file mode 100644
index 0000000000..c09b249cfa
--- /dev/null
+++ b/samples/IntegrationTestApp/Program.cs
@@ -0,0 +1,22 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace IntegrationTestApp
+{
+    class Program
+    {
+        // Initialization code. Don't use any Avalonia, third-party APIs or any
+        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+        // yet and stuff might break.
+        public static void Main(string[] args) => BuildAvaloniaApp()
+            .StartWithClassicDesktopLifetime(args);
+
+        // Avalonia configuration, don't remove; also used by visual designer.
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace();
+    }
+}
diff --git a/samples/IntegrationTestApp/ShowWindowTest.axaml b/samples/IntegrationTestApp/ShowWindowTest.axaml
new file mode 100644
index 0000000000..17c359df51
--- /dev/null
+++ b/samples/IntegrationTestApp/ShowWindowTest.axaml
@@ -0,0 +1,40 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="IntegrationTestApp.ShowWindowTest"
+        Name="SecondaryWindow"
+        Title="Show Window Test">
+  <Grid ColumnDefinitions="Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+    <Label Grid.Column="0" Grid.Row="1">Client Size</Label>
+    <TextBox Name="ClientSize" Grid.Column="1" Grid.Row="1" IsReadOnly="True"
+             Text="{Binding ClientSize, Mode=OneWay}"/>
+    
+    <Label Grid.Column="0" Grid.Row="2">Frame Size</Label>
+    <TextBox Name="FrameSize" Grid.Column="1" Grid.Row="2" IsReadOnly="True"
+             Text="{Binding FrameSize, Mode=OneWay}"/>
+
+    <Label Grid.Column="0" Grid.Row="3">Position</Label>
+    <TextBox Name="Position" Grid.Column="1" Grid.Row="3" IsReadOnly="True"/>
+
+    <Label Grid.Column="0" Grid.Row="4">Owner Rect</Label>
+    <TextBox Name="OwnerRect" Grid.Column="1" Grid.Row="4" IsReadOnly="True"/>
+    
+    <Label Grid.Column="0" Grid.Row="5">Screen Rect</Label>
+    <TextBox Name="ScreenRect" Grid.Column="1" Grid.Row="5" IsReadOnly="True"/>
+
+    <Label Grid.Column="0" Grid.Row="6">Scaling</Label>
+    <TextBox Name="Scaling" Grid.Column="1" Grid.Row="6" IsReadOnly="True"/>
+    
+    <Label Grid.Column="0" Grid.Row="7">WindowState</Label>
+    <ComboBox Name="WindowState" Grid.Column="1" Grid.Row="7" SelectedIndex="{Binding WindowState}">
+      <ComboBoxItem>Normal</ComboBoxItem>
+      <ComboBoxItem>Minimized</ComboBoxItem>
+      <ComboBoxItem>Maximized</ComboBoxItem>
+      <ComboBoxItem>Fullscreen</ComboBoxItem>
+    </ComboBox>
+
+    <Label Grid.Column="0" Grid.Row="8">Order (mac)</Label>
+    <TextBox Name="Order" Grid.Column="1" Grid.Row="8" IsReadOnly="True"/>
+
+    <Button Name="HideButton" Grid.Row="9" Command="{Binding $parent[Window].Hide}">Hide</Button>
+  </Grid>
+</Window>
diff --git a/samples/IntegrationTestApp/ShowWindowTest.axaml.cs b/samples/IntegrationTestApp/ShowWindowTest.axaml.cs
new file mode 100644
index 0000000000..43875dd990
--- /dev/null
+++ b/samples/IntegrationTestApp/ShowWindowTest.axaml.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+
+namespace IntegrationTestApp
+{
+    public class ShowWindowTest : Window
+    {
+        private readonly DispatcherTimer? _timer;
+        private readonly TextBox? _orderTextBox;
+        
+        public ShowWindowTest()
+        {
+            InitializeComponent();
+            DataContext = this;
+            PositionChanged += (s, e) => this.GetControl<TextBox>("Position").Text = $"{Position}";
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                _orderTextBox = this.GetControl<TextBox>("Order");
+                _timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(250) };
+                _timer.Tick += TimerOnTick;
+                _timer.Start();
+            }
+        }
+        
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        protected override void OnOpened(EventArgs e)
+        {
+            base.OnOpened(e);
+            var scaling = PlatformImpl!.DesktopScaling;
+            this.GetControl<TextBox>("Position").Text = $"{Position}";
+            this.GetControl<TextBox>("ScreenRect").Text = $"{Screens.ScreenFromVisual(this)?.WorkingArea}";
+            this.GetControl<TextBox>("Scaling").Text = $"{scaling}";
+
+            if (Owner is not null)
+            {
+                var ownerRect = this.GetControl<TextBox>("OwnerRect");
+                var owner = (Window)Owner;
+                ownerRect.Text = $"{owner.Position}, {PixelSize.FromSize(owner.FrameSize!.Value, scaling)}";
+            }
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            _timer?.Stop();
+        }
+
+        private void TimerOnTick(object? sender, EventArgs e)
+        {
+            _orderTextBox!.Text = MacOSIntegration.GetOrderedIndex(this).ToString();
+        }
+    }
+}
diff --git a/samples/IntegrationTestApp/bundle.sh b/samples/IntegrationTestApp/bundle.sh
new file mode 100755
index 0000000000..505991582e
--- /dev/null
+++ b/samples/IntegrationTestApp/bundle.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+dotnet restore -r osx-arm64
+dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64 -p:_AvaloniaUseExternalMSBuild=false
\ No newline at end of file
diff --git a/samples/IntegrationTestApp/nuget.config b/samples/IntegrationTestApp/nuget.config
new file mode 100644
index 0000000000..6c273ab3d9
--- /dev/null
+++ b/samples/IntegrationTestApp/nuget.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+  To use the Avalonia CI feed to get unstable packages, move this file to the root of your solution.
+-->
+
+<configuration>
+  <packageSources>
+    <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
+  </packageSources>
+</configuration>
diff --git a/samples/MobileSandbox.Android/MainActivity.cs b/samples/MobileSandbox.Android/MainActivity.cs
new file mode 100644
index 0000000000..d65f0dec92
--- /dev/null
+++ b/samples/MobileSandbox.Android/MainActivity.cs
@@ -0,0 +1,12 @@
+using Android.App;
+using Android.Content.PM;
+using Avalonia;
+using Avalonia.Android;
+
+namespace MobileSandbox.Android
+{
+    [Activity(Label = "MobileSandbox.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    public class MainActivity : AvaloniaMainActivity
+    {
+    }
+}
diff --git a/samples/MobileSandbox.Android/MobileSandbox.Android.csproj b/samples/MobileSandbox.Android/MobileSandbox.Android.csproj
new file mode 100644
index 0000000000..94f0d31e4d
--- /dev/null
+++ b/samples/MobileSandbox.Android/MobileSandbox.Android.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ApplicationId>com.Avalonia.MobileSandbox</ApplicationId>
+    <ApplicationVersion>1</ApplicationVersion>
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+  </PropertyGroup>
+  <ItemGroup>
+    <AndroidResource Include="..\..\build\Assets\Icon.png">
+      <Link>Resources\drawable\Icon.png</Link>
+    </AndroidResource>
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(RunAOTCompilation)'=='' and '$(Configuration)'=='Release' and '$(TF_BUILD)'==''">
+    <RunAOTCompilation>True</RunAOTCompilation>
+  </PropertyGroup>
+  
+  <!-- PropertyGroup Condition="'$(RunAOTCompilation)'=='True'">
+    <EnableLLVM>True</EnableLLVM>
+    <AndroidAotAdditionalArguments>no-write-symbols,nodebug</AndroidAotAdditionalArguments>
+    <AndroidAotMode>Hybrid</AndroidAotMode>
+    <AndroidGenerateJniMarshalMethods>True</AndroidGenerateJniMarshalMethods>
+  </PropertyGroup -->
+
+  <PropertyGroup Condition="'$(AndroidEnableProfiler)'=='True'">
+    <IsEmulator Condition="'$(IsEmulator)' == ''">True</IsEmulator>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AndroidEnvironment Condition="'$(IsEmulator)'=='True'" Include="environment.emulator.txt" />
+    <AndroidEnvironment Condition="'$(IsEmulator)'!='True'" Include="environment.device.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj" />
+    <ProjectReference Include="..\MobileSandbox\MobileSandbox.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/MobileSandbox.Android/Properties/AndroidManifest.xml b/samples/MobileSandbox.Android/Properties/AndroidManifest.xml
new file mode 100644
index 0000000000..346db0ef58
--- /dev/null
+++ b/samples/MobileSandbox.Android/Properties/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
+  <application android:label="MobileSandbox.Android" android:icon="@drawable/Icon"></application>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
diff --git a/samples/MobileSandbox.Android/Resources/AboutResources.txt b/samples/MobileSandbox.Android/Resources/AboutResources.txt
new file mode 100644
index 0000000000..c2bca974c4
--- /dev/null
+++ b/samples/MobileSandbox.Android/Resources/AboutResources.txt
@@ -0,0 +1,44 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included 
+in your application as resource files.  Various Android APIs are designed to 
+operate on the resource IDs instead of dealing with images, strings or binary blobs 
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.axml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable/
+        icon.png
+
+    layout/
+        main.axml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
+instead operate on resource IDs.  When you compile an Android application that uses resources, 
+the build system will package the resources for distribution and generate a class called "R" 
+(this is an Android convention) that contains the tokens for each one of the resources 
+included. For example, for the above Resources layout, this is what the R class would expose:
+
+public class R {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
+to reference the layout/main.axml file, or R.strings.first_string to reference the first 
+string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/samples/MobileSandbox.Android/Resources/drawable/splash_screen.xml b/samples/MobileSandbox.Android/Resources/drawable/splash_screen.xml
new file mode 100644
index 0000000000..2e920b4b3b
--- /dev/null
+++ b/samples/MobileSandbox.Android/Resources/drawable/splash_screen.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item>
+    <color android:color="@color/splash_background"/>
+  </item>
+
+  <item android:drawable="@drawable/icon"
+        android:width="120dp"
+        android:height="120dp"
+        android:gravity="center" />
+
+</layer-list>
diff --git a/samples/MobileSandbox.Android/Resources/values/colors.xml b/samples/MobileSandbox.Android/Resources/values/colors.xml
new file mode 100644
index 0000000000..59279d5d32
--- /dev/null
+++ b/samples/MobileSandbox.Android/Resources/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="splash_background">#FFFFFF</color>
+</resources>
diff --git a/samples/MobileSandbox.Android/Resources/values/styles.xml b/samples/MobileSandbox.Android/Resources/values/styles.xml
new file mode 100644
index 0000000000..2759d2904a
--- /dev/null
+++ b/samples/MobileSandbox.Android/Resources/values/styles.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+
+  <style name="MyTheme">
+  </style>
+
+  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
+
+  <style name="MyTheme.Splash" parent ="MyTheme.NoActionBar">
+    <item name="android:windowBackground">@drawable/splash_screen</item>
+    <item name="android:windowContentOverlay">@null</item>
+  </style>
+
+</resources>
diff --git a/samples/MobileSandbox.Android/SplashActivity.cs b/samples/MobileSandbox.Android/SplashActivity.cs
new file mode 100644
index 0000000000..ced092554d
--- /dev/null
+++ b/samples/MobileSandbox.Android/SplashActivity.cs
@@ -0,0 +1,17 @@
+using Android.App;
+using Android.Content;
+using Avalonia.Android;
+
+namespace MobileSandbox.Android
+{
+    [Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
+    public class SplashActivity : AvaloniaSplashActivity<App>
+    {
+        protected override void OnResume()
+        {
+            base.OnResume();
+
+            StartActivity(new Intent(Application.Context, typeof(MainActivity)));
+        }
+    }
+}
diff --git a/samples/MobileSandbox.Android/environment.device.txt b/samples/MobileSandbox.Android/environment.device.txt
new file mode 100644
index 0000000000..107d68ca1b
--- /dev/null
+++ b/samples/MobileSandbox.Android/environment.device.txt
@@ -0,0 +1 @@
+DOTNET_DiagnosticPorts=127.0.0.1:9000,suspend
diff --git a/samples/MobileSandbox.Android/environment.emulator.txt b/samples/MobileSandbox.Android/environment.emulator.txt
new file mode 100644
index 0000000000..299a0ec30b
--- /dev/null
+++ b/samples/MobileSandbox.Android/environment.emulator.txt
@@ -0,0 +1 @@
+DOTNET_DiagnosticPorts=10.0.2.2:9001,suspend
diff --git a/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj b/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj
new file mode 100644
index 0000000000..1b83a3e567
--- /dev/null
+++ b/samples/MobileSandbox.Desktop/MobileSandbox.Desktop.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunNativeAotCompilation)' == 'true'">
+    <IlcTrimMetadata>true</IlcTrimMetadata>
+    <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json</RestoreAdditionalProjectSources>
+    <NativeAotCompilerVersion>7.0.0-*</NativeAotCompilerVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\src\Avalonia.X11\NativeDialogs\Gtk.cs" Link="NativeControls\Gtk\Gtk.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Headless.Vnc\Avalonia.Headless.Vnc.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
+    <ProjectReference Include="..\MobileSandbox\MobileSandbox.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
+    <!-- For native controls test -->
+    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RunNativeAotCompilation)' == 'true'">
+    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
+    <!-- Cross-compilation for Windows x64-arm64 and Linux x64-arm64 -->
+    <PackageReference Condition="'$(RuntimeIdentifier)'=='win-arm64'" Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
+    <PackageReference Condition="'$(RuntimeIdentifier)'=='linux-arm64'" Include="runtime.linux-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <!-- For Microsoft.CodeAnalysis -->
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <Import Project="..\..\build\SampleApp.props" />
+  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+</Project>
diff --git a/samples/MobileSandbox.Desktop/Program.cs b/samples/MobileSandbox.Desktop/Program.cs
new file mode 100644
index 0000000000..4d49a65994
--- /dev/null
+++ b/samples/MobileSandbox.Desktop/Program.cs
@@ -0,0 +1,21 @@
+using System;
+using Avalonia;
+
+namespace MobileSandbox.Desktop
+{
+    static class Program
+    {
+        [STAThread]
+        static int Main(string[] args) =>
+            BuildAvaloniaApp()
+                .StartWithClassicDesktopLifetime(args);
+
+        /// <summary>
+        /// This method is needed for IDE previewer infrastructure
+        /// </summary>
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace();
+    }
+}
diff --git a/samples/MobileSandbox.Desktop/app.manifest b/samples/MobileSandbox.Desktop/app.manifest
new file mode 100644
index 0000000000..db90057191
--- /dev/null
+++ b/samples/MobileSandbox.Desktop/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="ControlCatalog.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+</assembly>
diff --git a/samples/MobileSandbox.iOS/AppDelegate.cs b/samples/MobileSandbox.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..60214cc541
--- /dev/null
+++ b/samples/MobileSandbox.iOS/AppDelegate.cs
@@ -0,0 +1,22 @@
+using Foundation;
+using UIKit;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.iOS;
+using Avalonia.Logging;
+using Avalonia.Media;
+
+namespace MobileSandbox
+{
+    // The UIApplicationDelegate for the application. This class is responsible for launching the 
+    // User Interface of the application, as well as listening (and optionally responding) to 
+    // application events from iOS.
+    [Register("AppDelegate")]
+    public partial class AppDelegate : AvaloniaAppDelegate<App>
+    {
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+        {
+            return builder.LogToTrace(LogEventLevel.Debug, "IOSIME");
+        }
+    }
+}
diff --git a/samples/MobileSandbox.iOS/Entitlements.plist b/samples/MobileSandbox.iOS/Entitlements.plist
new file mode 100644
index 0000000000..0c67376eba
--- /dev/null
+++ b/samples/MobileSandbox.iOS/Entitlements.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/samples/MobileSandbox.iOS/Info.plist b/samples/MobileSandbox.iOS/Info.plist
new file mode 100644
index 0000000000..ff939d5592
--- /dev/null
+++ b/samples/MobileSandbox.iOS/Info.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>ControlCatalog.iOS</string>
+	<key>CFBundleIdentifier</key>
+	<string>Avalonia.ControlCatalog</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>13.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIStatusBarHidden</key>
+	<true/>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
+</plist>
diff --git a/samples/MobileSandbox.iOS/Main.cs b/samples/MobileSandbox.iOS/Main.cs
new file mode 100644
index 0000000000..fdd78bbb11
--- /dev/null
+++ b/samples/MobileSandbox.iOS/Main.cs
@@ -0,0 +1,15 @@
+using UIKit;
+
+namespace MobileSandbox.iOS
+{
+    public class Application
+    {
+        // This is the main entry point of the application.
+        static void Main(string[] args)
+        {
+            // if you want to use a different Application Delegate class from "AppDelegate"
+            // you can specify it here.
+            UIApplication.Main(args, null, typeof(AppDelegate));
+        }
+    }
+}
diff --git a/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj b/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj
new file mode 100644
index 0000000000..1bb12652d0
--- /dev/null
+++ b/samples/MobileSandbox.iOS/MobileSandbox.iOS.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <ProvisioningType>manual</ProvisioningType>
+    <TargetFramework>net6.0-ios</TargetFramework>
+    <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
+    <!-- temporal workaround for our GL interface backend -->
+    <UseInterpreter>True</UseInterpreter>
+    <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
+    <!--    <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>-->
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
+    <ProjectReference Include="..\MobileSandbox\MobileSandbox.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/MobileSandbox.iOS/Resources/LaunchScreen.xib b/samples/MobileSandbox.iOS/Resources/LaunchScreen.xib
new file mode 100644
index 0000000000..5d3ccc97db
--- /dev/null
+++ b/samples/MobileSandbox.iOS/Resources/LaunchScreen.xib
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+	<dependencies>
+		<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
+		<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
+	</dependencies>
+	<objects>
+		<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
+		<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
+		<view contentMode="scaleToFill" id="iN0-l3-epB">
+			<rect key="frame" x="0.0" y="0.0" width="480" height="480" />
+			<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
+			<subviews>
+				<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2022 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
+					minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+					<rect key="frame" x="20" y="439" width="441" height="21" />
+					<fontDescription key="fontDescription" type="system" pointSize="17" />
+					<color key="textColor" cocoaTouchSystemColor="darkTextColor" />
+					<nil key="highlightedColor" />
+				</label>
+				<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ControlCatalog.iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
+					minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+					<rect key="frame" x="20" y="140" width="441" height="43" />
+					<fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
+					<color key="textColor" cocoaTouchSystemColor="darkTextColor" />
+					<nil key="highlightedColor" />
+				</label>
+			</subviews>
+			<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
+			<constraints>
+				<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
+				<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
+				<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
+				<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
+				<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
+				<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
+			</constraints>
+			<nil key="simulatedStatusBarMetrics" />
+			<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
+			<point key="canvasLocation" x="548" y="455" />
+		</view>
+	</objects>
+</document>
diff --git a/samples/MobileSandbox/App.xaml b/samples/MobileSandbox/App.xaml
new file mode 100644
index 0000000000..f3210e8941
--- /dev/null
+++ b/samples/MobileSandbox/App.xaml
@@ -0,0 +1,9 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:CompileBindings="True"
+             Name="Mobile Sandbox"
+             x:Class="MobileSandbox.App">
+  <Application.Styles>
+    <FluentTheme Mode="Dark" />
+  </Application.Styles>
+</Application>
diff --git a/samples/MobileSandbox/App.xaml.cs b/samples/MobileSandbox/App.xaml.cs
new file mode 100644
index 0000000000..d32d9bb5a7
--- /dev/null
+++ b/samples/MobileSandbox/App.xaml.cs
@@ -0,0 +1,28 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace MobileSandbox
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+            {
+                desktopLifetime.MainWindow = new MainWindow();
+            }
+            else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
+            {
+                singleViewLifetime.MainView = new MainView();
+            }
+
+            base.OnFrameworkInitializationCompleted();
+        }
+    }
+}
diff --git a/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Bold.ttf b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Bold.ttf
new file mode 100644
index 0000000000..f6986468bd
Binary files /dev/null and b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Bold.ttf differ
diff --git a/samples/MobileSandbox/Assets/Fonts/SourceSansPro-BoldItalic.ttf b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-BoldItalic.ttf
new file mode 100644
index 0000000000..5c00b64faf
Binary files /dev/null and b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-BoldItalic.ttf differ
diff --git a/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Italic.ttf b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Italic.ttf
new file mode 100644
index 0000000000..82e8762011
Binary files /dev/null and b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Italic.ttf differ
diff --git a/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Regular.ttf b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Regular.ttf
new file mode 100644
index 0000000000..278ad8aa0a
Binary files /dev/null and b/samples/MobileSandbox/Assets/Fonts/SourceSansPro-Regular.ttf differ
diff --git a/samples/MobileSandbox/Assets/Fonts/WenQuanYiMicroHei-01.ttf b/samples/MobileSandbox/Assets/Fonts/WenQuanYiMicroHei-01.ttf
new file mode 100644
index 0000000000..61e2583a6c
Binary files /dev/null and b/samples/MobileSandbox/Assets/Fonts/WenQuanYiMicroHei-01.ttf differ
diff --git a/samples/MobileSandbox/Assets/avalonia-32.png b/samples/MobileSandbox/Assets/avalonia-32.png
new file mode 100644
index 0000000000..7b443e7a25
Binary files /dev/null and b/samples/MobileSandbox/Assets/avalonia-32.png differ
diff --git a/samples/MobileSandbox/Assets/test_icon.ico b/samples/MobileSandbox/Assets/test_icon.ico
new file mode 100644
index 0000000000..da8d49ff9b
Binary files /dev/null and b/samples/MobileSandbox/Assets/test_icon.ico differ
diff --git a/samples/MobileSandbox/MainView.xaml b/samples/MobileSandbox/MainView.xaml
new file mode 100644
index 0000000000..5f9f41f3a9
--- /dev/null
+++ b/samples/MobileSandbox/MainView.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="MobileSandbox.MainView"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Margin="100 50" Spacing="50">
+    <TextBlock Text="Login" Foreground="White" />
+    <TextBox Watermark="Text" />
+    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" AcceptsReturn="True" TextInputOptions.ReturnKeyType="Search" />
+    <TextBox Watermark="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
+    <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" />
+    <Button Content="Login" Command="{Binding ButtonCommand}" />
+  </StackPanel>
+</UserControl>
diff --git a/samples/MobileSandbox/MainView.xaml.cs b/samples/MobileSandbox/MainView.xaml.cs
new file mode 100644
index 0000000000..4b2b546b1c
--- /dev/null
+++ b/samples/MobileSandbox/MainView.xaml.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Windows.Input;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace MobileSandbox
+{
+    public class MainView : UserControl
+    {
+        public MainView()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            DataContext = this;
+        }
+
+        public void ButtonCommand()
+        {
+            Console.WriteLine("Button pressed");
+        }
+    }
+}
diff --git a/samples/MobileSandbox/MainWindow.xaml b/samples/MobileSandbox/MainWindow.xaml
new file mode 100644
index 0000000000..97ef98f028
--- /dev/null
+++ b/samples/MobileSandbox/MainWindow.xaml
@@ -0,0 +1,12 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:local="clr-namespace:MobileSandbox"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Name="MainWindow"
+        CanResize="False"
+        Width="720" Height="1280"
+        Title="Mobile Sandbox"
+        Icon="/Assets/test_icon.ico"
+        WindowStartupLocation="CenterScreen"
+        x:Class="MobileSandbox.MainWindow">
+  <local:MainView />
+</Window>
diff --git a/samples/MobileSandbox/MainWindow.xaml.cs b/samples/MobileSandbox/MainWindow.xaml.cs
new file mode 100644
index 0000000000..f2ff7cf0c8
--- /dev/null
+++ b/samples/MobileSandbox/MainWindow.xaml.cs
@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace MobileSandbox
+{
+    public class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+
+            //Renderer.DrawFps = true;
+            //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/MobileSandbox/MobileSandbox.csproj b/samples/MobileSandbox/MobileSandbox.csproj
new file mode 100644
index 0000000000..02e4c43960
--- /dev/null
+++ b/samples/MobileSandbox/MobileSandbox.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>    
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <AvaloniaResource Include="**\*.xaml">
+      <SubType>Designer</SubType>
+    </AvaloniaResource>
+    <AvaloniaResource Include="Assets\*" />
+    <AvaloniaResource Include="Assets\Fonts\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="Pages\NativeEmbedPage.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Bold.ttf" />
+    <EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
+    <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Italic.ttf" />
+    <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Regular.ttf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
+    <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
+    <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AvaloniaResource Update="Pages\NativeEmbedPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Pages\NativeEmbedPage.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <Import Project="..\..\build\BuildTargets.targets" />
+</Project>
diff --git a/samples/MobileSandbox/Views/CustomNotificationView.xaml b/samples/MobileSandbox/Views/CustomNotificationView.xaml
new file mode 100644
index 0000000000..29033ca5df
--- /dev/null
+++ b/samples/MobileSandbox/Views/CustomNotificationView.xaml
@@ -0,0 +1,19 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="MobileSandbox.Views.CustomNotificationView">
+    <Border Padding="12" MinHeight="20" Background="DodgerBlue">
+        <Grid ColumnDefinitions="Auto,*">
+            <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
+                <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>
+            </Panel>
+            <DockPanel Grid.Column="1">
+                <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
+                <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0" Orientation="Horizontal">
+                    <Button Content="No" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
+                    <Button Content="Yes" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding YesCommand}" />
+                </StackPanel>
+                <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
+            </DockPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/samples/MobileSandbox/Views/CustomNotificationView.xaml.cs b/samples/MobileSandbox/Views/CustomNotificationView.xaml.cs
new file mode 100644
index 0000000000..1db0f2bce3
--- /dev/null
+++ b/samples/MobileSandbox/Views/CustomNotificationView.xaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace MobileSandbox.Views
+{
+    public class CustomNotificationView : UserControl
+    {
+        public CustomNotificationView()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/PlatformSanityChecks/App.xaml b/samples/PlatformSanityChecks/App.xaml
index 25bab6ae35..1b9d64fca6 100644
--- a/samples/PlatformSanityChecks/App.xaml
+++ b/samples/PlatformSanityChecks/App.xaml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui">
     <Application.Styles>
-        <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
-        <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+        <SimpleTheme Mode="Light" />
     </Application.Styles>
 </Application>
diff --git a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
index 9660d2a90d..5c743aabdb 100644
--- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
+++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
   </ItemGroup>
 
diff --git a/samples/Previewer/App.xaml b/samples/Previewer/App.xaml
index 6bae1955af..1b9d64fca6 100644
--- a/samples/Previewer/App.xaml
+++ b/samples/Previewer/App.xaml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui">
     <Application.Styles>
-        <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
-        <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+        <SimpleTheme Mode="Light" />
     </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj
index c1d14cba26..2cc84168dc 100644
--- a/samples/Previewer/Previewer.csproj
+++ b/samples/Previewer/Previewer.csproj
@@ -9,6 +9,9 @@
     </Compile>
     <EmbeddedResource Include="**\*.xaml" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
+  </ItemGroup>
   
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
diff --git a/samples/RenderDemo/App.xaml b/samples/RenderDemo/App.xaml
index 66d97a6444..8ea792de19 100644
--- a/samples/RenderDemo/App.xaml
+++ b/samples/RenderDemo/App.xaml
@@ -3,6 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Application.Styles>
     <FluentTheme />
-    <StyleInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
   </Application.Styles>
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
 </Application>
diff --git a/samples/RenderDemo/App.xaml.cs b/samples/RenderDemo/App.xaml.cs
index 8054b06964..8f4e02df01 100644
--- a/samples/RenderDemo/App.xaml.cs
+++ b/samples/RenderDemo/App.xaml.cs
@@ -29,6 +29,10 @@ namespace RenderDemo
                .With(new Win32PlatformOptions
                {
                    OverlayPopups = true,
+               })
+               .With(new X11PlatformOptions
+               {
+                   UseCompositor = true
                })
                 .UsePlatformDetect()
                 .LogToTrace();
diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
index 4a8fb819ca..823a0fbbef 100644
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@@ -39,6 +39,9 @@
     <TabItem Header="Custom Animator">
       <pages:CustomAnimatorPage />
     </TabItem>
+    <TabItem Header="Spring Animation">
+      <pages:SpringAnimationsPage />
+    </TabItem>
     <TabItem Header="Clipping">
       <pages:ClippingPage />
     </TabItem>
@@ -60,11 +63,20 @@
     <TabItem Header="FormattedText">
       <pages:FormattedTextPage />
     </TabItem>
+    <TabItem Header="TextFormatter">
+      <pages:TextFormatterPage />
+    </TabItem>
     <TabItem Header="LineBounds">
       <pages:LineBoundsPage />
     </TabItem>
     <TabItem Header="Path Measurement">
       <pages:PathMeasurementPage />
     </TabItem>
+    <TabItem Header="Brushes">
+      <pages:BrushesPage />
+    </TabItem>
+    <TabItem Header="3D Transformation">
+      <pages:Transform3DPage />
+    </TabItem>
   </controls:HamburgerMenu>
 </Window>
diff --git a/samples/RenderDemo/Pages/BrushesPage.axaml b/samples/RenderDemo/Pages/BrushesPage.axaml
new file mode 100644
index 0000000000..9d5b6ee987
--- /dev/null
+++ b/samples/RenderDemo/Pages/BrushesPage.axaml
@@ -0,0 +1,71 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="RenderDemo.Pages.BrushesPage">
+  <Canvas Background="White" Width="480" Height="360">
+    <Rectangle Canvas.Left="20" Canvas.Top="20" Width="440" Height="50">
+      <Rectangle.Fill>
+        <LinearGradientBrush StartPoint="0,0" EndPoint="410,0">
+          <LinearGradientBrush.Transform>
+            <TransformGroup>
+              <ScaleTransform ScaleX="0.5" />
+              <SkewTransform />
+              <RotateTransform />
+              <TranslateTransform X="5" Y="15" />
+            </TransformGroup>
+          </LinearGradientBrush.Transform>
+          <LinearGradientBrush.GradientStops>
+            <GradientStop Color="Blue" Offset="0" />
+            <GradientStop Color="Green" Offset="0.5" />
+            <GradientStop Color="Lime" Offset="1" />
+          </LinearGradientBrush.GradientStops>
+        </LinearGradientBrush>
+      </Rectangle.Fill>
+    </Rectangle>
+    <TextBlock Canvas.Left="20" Canvas.Top="70" FontSize="30" Text="scale(0.5) on gradient" />
+    <Rectangle Canvas.Left="20" Canvas.Top="110" Width="440" Height="50">
+      <Rectangle.Fill>
+        <RadialGradientBrush Center="0.0,0.0" GradientOrigin="0.0,0.0" Radius="0.13636364">
+          <RadialGradientBrush.Transform>
+            <TransformGroup>
+              <ScaleTransform />
+              <SkewTransform AngleX="45" />
+              <RotateTransform />
+              <TranslateTransform X="240" Y="45" />
+            </TransformGroup>
+          </RadialGradientBrush.Transform>
+          <RadialGradientBrush.GradientStops>
+            <GradientStop Color="Black" Offset="0" />
+            <GradientStop Color="#FFFFA500" Offset="1" />
+          </RadialGradientBrush.GradientStops>
+        </RadialGradientBrush>
+      </Rectangle.Fill>
+    </Rectangle>
+    <TextBlock Canvas.Left="20" Canvas.Top="160" FontSize="30" Text="skewX(45) on gradient" />
+    <Rectangle Canvas.Left="20" Canvas.Top="210" Width="440" Height="50">
+      <Rectangle.Fill>
+        <VisualBrush TileMode="Tile" SourceRect="0,0,20,20" DestinationRect="0,0,20,20" Stretch="None">
+          <VisualBrush.Transform>
+            <TransformGroup>
+              <ScaleTransform ScaleX="2" ScaleY="2" />
+              <SkewTransform AngleX="45" />
+              <RotateTransform />
+              <TranslateTransform X="5" Y="5" />
+            </TransformGroup>
+          </VisualBrush.Transform>
+          <VisualBrush.Visual>
+            <Canvas Width="20" Height="20">
+              <Rectangle Canvas.Left="0" Canvas.Top="0" Width="10" Height="10" Fill="Maroon" />
+              <Rectangle Canvas.Left="10" Canvas.Top="0" Width="10" Height="10" Fill="Green" />
+              <Rectangle Canvas.Left="0" Canvas.Top="10" Width="10" Height="10" Fill="Blue" />
+              <Rectangle Canvas.Left="10" Canvas.Top="10" Width="10" Height="10" Fill="Yellow" />
+            </Canvas>
+          </VisualBrush.Visual>
+        </VisualBrush>
+      </Rectangle.Fill>
+    </Rectangle>
+    <TextBlock Canvas.Left="20" Canvas.Top="260" FontSize="30" Text="scale(2), skewX(45) on pattern" />
+  </Canvas>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/BrushesPage.axaml.cs b/samples/RenderDemo/Pages/BrushesPage.axaml.cs
new file mode 100644
index 0000000000..5852b72d9e
--- /dev/null
+++ b/samples/RenderDemo/Pages/BrushesPage.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RenderDemo.Pages;
+
+public class BrushesPage : UserControl
+{
+    public BrushesPage()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
+
diff --git a/samples/RenderDemo/Pages/CustomSkiaPage.cs b/samples/RenderDemo/Pages/CustomSkiaPage.cs
index 9c524a7932..bf27747154 100644
--- a/samples/RenderDemo/Pages/CustomSkiaPage.cs
+++ b/samples/RenderDemo/Pages/CustomSkiaPage.cs
@@ -40,14 +40,16 @@ namespace RenderDemo.Pages
             static Stopwatch St = Stopwatch.StartNew();
             public void Render(IDrawingContextImpl context)
             {
-                var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
-                if (canvas == null)
+                var leaseFeature = context.GetFeature<ISkiaSharpApiLeaseFeature>();
+                if (leaseFeature == null)
                     using (var c = new DrawingContext(context, false))
                     {
                         c.DrawText(_noSkia, new Point());
                     }
                 else
                 {
+                    using var lease = leaseFeature.Lease();
+                    var canvas = lease.SkCanvas;
                     canvas.Save();
                     // create the first shader
                     var colors = new SKColor[] {
diff --git a/samples/RenderDemo/Pages/DrawingPage.xaml b/samples/RenderDemo/Pages/DrawingPage.xaml
index 7bdadf586b..a658dbc089 100644
--- a/samples/RenderDemo/Pages/DrawingPage.xaml
+++ b/samples/RenderDemo/Pages/DrawingPage.xaml
@@ -1,134 +1,141 @@
-<UserControl 
-    xmlns="https://github.com/avaloniaui" 
+<UserControl
+    xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="RenderDemo.Pages.DrawingPage">
-    <UserControl.Styles>
-        <Style>
-            <Style.Resources>
-                <DrawingGroup x:Key="Bulb">
-                    <DrawingGroup.Transform>
-                        <MatrixTransform Matrix="1,0,0,1,0,-1028.4" />
-                    </DrawingGroup.Transform>
-                    <DrawingGroup>
-                        <DrawingGroup.Transform>
-                            <MatrixTransform Matrix="1,0,0,1.25,-10,1031.4" />
-                        </DrawingGroup.Transform>
-                        <GeometryDrawing Brush="#FF7F8C8D"
-                                         Geometry="F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z" />
-                    </DrawingGroup>
-                    <GeometryDrawing Brush="#FFF39C12"
-                                     Geometry="F1 M12,1030.4 C8.134,1030.4 5,1033.6 5,1037.6 5,1040.7 8.125,1043.5 9,1045.4 9.875,1047.2 9,1050.4 9,1050.4 L12,1049.9 15,1050.4 C15,1050.4 14.125,1047.2 15,1045.4 15.875,1043.5 19,1040.7 19,1037.6 19,1033.6 15.866,1030.4 12,1030.4 z" />
-                    <GeometryDrawing Brush="#FFF1C40F"
-                                     Geometry="F1 M12,1030.4 C15.866,1030.4 19,1033.6 19,1037.6 19,1040.7 15.875,1043.5 15,1045.4 14.125,1047.2 15,1050.4 15,1050.4 L12,1049.9 12,1030.4 z" />
-                    <GeometryDrawing Brush="#FFE67E22"
-                                     Geometry="F1 M9,1036.4 L8,1037.4 12,1049.4 16,1037.4 15,1036.4 14,1037.4 13,1036.4 12,1037.4 11,1036.4 10,1037.4 9,1036.4 z M9,1037.4 L10,1038.4 10.5,1037.9 11,1037.4 11.5,1037.9 12,1038.4 12.5,1037.9 13,1037.4 13.5,1037.9 14,1038.4 15,1037.4 15.438,1037.8 12,1048.1 8.5625,1037.8 9,1037.4 z" />
-                    <DrawingGroup>
-                        <DrawingGroup.Transform>
-                            <MatrixTransform Matrix="1,0,0,1,9,1045.4" />
-                        </DrawingGroup.Transform>
-                        <GeometryDrawing Brush="#FFBDC3C7">
-                            <GeometryDrawing.Geometry>
-                                <RectangleGeometry Rect="0,0,6,5" />
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                    </DrawingGroup>
-                    <GeometryDrawing Brush="#FF95A5A6"
-                                     Geometry="F1 M9,1045.4 L9,1050.4 12,1050.4 12,1049.4 15,1049.4 15,1048.4 12,1048.4 12,1047.4 15,1047.4 15,1046.4 12,1046.4 12,1045.4 9,1045.4 z" />
-                    <GeometryDrawing Brush="#FF7F8C8D"
-                                     Geometry="F1 M9,1046.4 L9,1047.4 12,1047.4 12,1046.4 9,1046.4 z M9,1048.4 L9,1049.4 12,1049.4 12,1048.4 9,1048.4 z" />
-                </DrawingGroup>
-            </Style.Resources>
-        </Style>
-    </UserControl.Styles>
-    <Grid RowDefinitions="Auto,Auto,Auto"
-          ColumnDefinitions="Auto,Auto,Auto,Auto">
-        <TextBlock Text="None"
-                   Margin="3" />
-        <Border Grid.Column="0"
-                Grid.Row="1"
-                VerticalAlignment="Top"
-                HorizontalAlignment="Left"
-                BorderThickness="1"
-                BorderBrush="Gray"
-                Margin="5">
-            <DrawingPresenter Drawing="{DynamicResource Bulb}" />
-        </Border>
-        <TextBlock Text="Fill"
-                   Margin="3"
-                   Grid.Column="1" />
-        <Border Grid.Column="1"
-                Grid.Row="1"
-                VerticalAlignment="Top"
-                HorizontalAlignment="Left"
-                BorderThickness="1"
-                BorderBrush="Gray"
-                Margin="5">
-            <DrawingPresenter Drawing="{DynamicResource Bulb}"
-                              Width="100"
-                              Height="50"
-                              Stretch="Fill" />
-        </Border>
-        <TextBlock Text="Uniform"
-                   Margin="3"
-                   Grid.Column="2" />
-        <Border Grid.Column="2"
-                Grid.Row="1"
-                VerticalAlignment="Top"
-                HorizontalAlignment="Left"
-                BorderThickness="1"
-                BorderBrush="Gray"
-                Margin="5">
-            <DrawingPresenter Drawing="{DynamicResource Bulb}"
-                              Width="100"
-                              Height="50"
-                              Stretch="Uniform" />
-        </Border>
-        <TextBlock Text="UniformToFill"
-                   Margin="3"
-                   Grid.Column="3" />
-        <Border Grid.Column="3"
-                Grid.Row="1"
-                VerticalAlignment="Top"
-                HorizontalAlignment="Left"
-                BorderThickness="1"
-                BorderBrush="Gray"
-                Margin="5">
-            <DrawingPresenter Drawing="{DynamicResource Bulb}"
-                              Width="100"
-                              Height="50"
-                              Stretch="UniformToFill" />
-        </Border>
+  <UserControl.Styles>
+    <Style>
+      <Style.Resources>
+        <DrawingGroup x:Key="Bulb">
+          <DrawingGroup.Transform>
+            <MatrixTransform Matrix="1,0,0,1,0,-1028.4" />
+          </DrawingGroup.Transform>
+          <DrawingGroup>
+            <DrawingGroup.Transform>
+              <MatrixTransform Matrix="1,0,0,1.25,-10,1031.4" />
+            </DrawingGroup.Transform>
+            <GeometryDrawing Brush="#FF7F8C8D"
+                             Geometry="F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z" />
+          </DrawingGroup>
+          <GeometryDrawing Brush="#FFF39C12"
+                           Geometry="F1 M12,1030.4 C8.134,1030.4 5,1033.6 5,1037.6 5,1040.7 8.125,1043.5 9,1045.4 9.875,1047.2 9,1050.4 9,1050.4 L12,1049.9 15,1050.4 C15,1050.4 14.125,1047.2 15,1045.4 15.875,1043.5 19,1040.7 19,1037.6 19,1033.6 15.866,1030.4 12,1030.4 z" />
+          <GeometryDrawing Brush="#FFF1C40F"
+                           Geometry="F1 M12,1030.4 C15.866,1030.4 19,1033.6 19,1037.6 19,1040.7 15.875,1043.5 15,1045.4 14.125,1047.2 15,1050.4 15,1050.4 L12,1049.9 12,1030.4 z" />
+          <GeometryDrawing Brush="#FFE67E22"
+                           Geometry="F1 M9,1036.4 L8,1037.4 12,1049.4 16,1037.4 15,1036.4 14,1037.4 13,1036.4 12,1037.4 11,1036.4 10,1037.4 9,1036.4 z M9,1037.4 L10,1038.4 10.5,1037.9 11,1037.4 11.5,1037.9 12,1038.4 12.5,1037.9 13,1037.4 13.5,1037.9 14,1038.4 15,1037.4 15.438,1037.8 12,1048.1 8.5625,1037.8 9,1037.4 z" />
+          <DrawingGroup>
+            <DrawingGroup.Transform>
+              <MatrixTransform Matrix="1,0,0,1,9,1045.4" />
+            </DrawingGroup.Transform>
+            <GeometryDrawing Brush="#FFBDC3C7">
+              <GeometryDrawing.Geometry>
+                <RectangleGeometry Rect="0,0,6,5" />
+              </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+          </DrawingGroup>
+          <GeometryDrawing Brush="#FF95A5A6"
+                           Geometry="F1 M9,1045.4 L9,1050.4 12,1050.4 12,1049.4 15,1049.4 15,1048.4 12,1048.4 12,1047.4 15,1047.4 15,1046.4 12,1046.4 12,1045.4 9,1045.4 z" />
+          <GeometryDrawing Brush="#FF7F8C8D"
+                           Geometry="F1 M9,1046.4 L9,1047.4 12,1047.4 12,1046.4 9,1046.4 z M9,1048.4 L9,1049.4 12,1049.4 12,1048.4 9,1048.4 z" />
+        </DrawingGroup>
+      </Style.Resources>
+    </Style>
+  </UserControl.Styles>
+  <Grid RowDefinitions="Auto,Auto,Auto"
+        ColumnDefinitions="Auto,Auto,Auto,Auto">
+    <TextBlock Text="None"
+               Margin="3" />
+    <Border Grid.Column="0"
+            Grid.Row="1"
+            VerticalAlignment="Top"
+            HorizontalAlignment="Left"
+            BorderThickness="1"
+            BorderBrush="Gray"
+            Margin="5">
+      <Image>
+        <Image.Source>
+          <DrawingImage Drawing="{DynamicResource Bulb}" />
+        </Image.Source>
+      </Image>
+    </Border>
+    <TextBlock Text="Fill"
+               Margin="3"
+               Grid.Column="1" />
+    <Border Grid.Column="1"
+            Grid.Row="1"
+            VerticalAlignment="Top"
+            HorizontalAlignment="Left"
+            BorderThickness="1"
+            BorderBrush="Gray"
+            Margin="5">
+      <Image Width="100" Height="50" Stretch="Fill">
+        <Image.Source>
+          <DrawingImage Drawing="{DynamicResource Bulb}" />
+        </Image.Source>
+      </Image>
+    </Border>
+    <TextBlock Text="Uniform"
+               Margin="3"
+               Grid.Column="2" />
+    <Border Grid.Column="2"
+            Grid.Row="1"
+            VerticalAlignment="Top"
+            HorizontalAlignment="Left"
+            BorderThickness="1"
+            BorderBrush="Gray"
+            Margin="5">
+      <Image Width="100" Height="50" Stretch="Uniform">
+        <Image.Source>
+          <DrawingImage Drawing="{DynamicResource Bulb}" />
+        </Image.Source>
+      </Image>
+    </Border>
+    <TextBlock Text="UniformToFill"
+               Margin="3"
+               Grid.Column="3" />
+    <Border Grid.Column="3"
+            Grid.Row="1"
+            VerticalAlignment="Top"
+            HorizontalAlignment="Left"
+            BorderThickness="1"
+            BorderBrush="Gray"
+            Margin="5">
+      <Image Width="100" Height="50" Stretch="UniformToFill">
+        <Image.Source>
+          <DrawingImage Drawing="{DynamicResource Bulb}" />
+        </Image.Source>
+      </Image>
+    </Border>
 
-        <!-- For comparison -->
+    <!-- For comparison -->
 
-        <Ellipse Grid.Row="2"
-                 Grid.Column="0"
-                 Width="100"
-                 Height="50"
-                 Stretch="None"
-                 Fill="Blue"
-                 Margin="5"/>
-        <Ellipse Grid.Row="2"
-                 Grid.Column="1"
-                 Width="100"
-                 Height="50"
-                 Stretch="Fill"
-                 Fill="Blue"
-                 Margin="5" />
-        <Ellipse Grid.Row="2"
-                 Grid.Column="2"
-                 Width="100"
-                 Height="50"
-                 Stretch="Uniform"
-                 Fill="Blue"
-                 Margin="5" />
-        <Ellipse Grid.Row="2"
-                 Grid.Column="3"
-                 Width="100"
-                 Height="50"
-                 Stretch="UniformToFill"
-                 Fill="Blue"
-                 Margin="5" />
+    <Ellipse Grid.Row="2"
+             Grid.Column="0"
+             Width="100"
+             Height="50"
+             Stretch="None"
+             Fill="Blue"
+             Margin="5"/>
+    <Ellipse Grid.Row="2"
+             Grid.Column="1"
+             Width="100"
+             Height="50"
+             Stretch="Fill"
+             Fill="Blue"
+             Margin="5" />
+    <Ellipse Grid.Row="2"
+             Grid.Column="2"
+             Width="100"
+             Height="50"
+             Stretch="Uniform"
+             Fill="Blue"
+             Margin="5" />
+    <Ellipse Grid.Row="2"
+             Grid.Column="3"
+             Width="100"
+             Height="50"
+             Stretch="UniformToFill"
+             Fill="Blue"
+             Margin="5" />
 
-    </Grid>
-</UserControl>
\ No newline at end of file
+  </Grid>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/FormattedTextPage.axaml.cs b/samples/RenderDemo/Pages/FormattedTextPage.axaml.cs
index 25e29c67a9..088a063690 100644
--- a/samples/RenderDemo/Pages/FormattedTextPage.axaml.cs
+++ b/samples/RenderDemo/Pages/FormattedTextPage.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Media.Immutable;
 
 namespace RenderDemo.Pages
 {
@@ -55,6 +56,14 @@ namespace RenderDemo.Pages
             formattedText.SetFontStyle(FontStyle.Italic, 28, 28);
 
             context.DrawText(formattedText, new Point(10, 0));
+
+            var geometry = formattedText.BuildGeometry(new Point(10 + formattedText.Width + 10, 0));
+
+            context.DrawGeometry(gradient, null, geometry);
+
+            var highlightGeometry = formattedText.BuildHighlightGeometry(new Point(10 + formattedText.Width + 10, 0));
+
+            context.DrawGeometry(null, new ImmutablePen(gradient.ToImmutable(), 2), highlightGeometry);
         }
     }
 }
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml b/samples/RenderDemo/Pages/GlyphRunPage.xaml
index c2914e8847..7db58e5286 100644
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml
@@ -2,13 +2,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:RenderDemo.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="RenderDemo.Pages.GlyphRunPage">
-  <Border
+  <Grid
+    ColumnDefinitions="*,*"
     Background="White">
-    <Image
-      x:Name="imageControl"
-      Stretch="None">
-    </Image>
-  </Border>
+    <local:GlyphRunControl Grid.Column="0"/>
+    <local:GlyphRunGeometryControl Grid.Column="1"/>
+  </Grid>
 </UserControl>
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
index 7f85606957..5c31e138e0 100644
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
@@ -9,14 +9,6 @@ namespace RenderDemo.Pages
 {
     public class GlyphRunPage : UserControl
     {
-        private Image _imageControl;
-        private GlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
-        private readonly Random _rand = new Random();
-        private ushort[] _glyphIndices = new ushort[1];
-        private char[] _characters = new char[1];
-        private float _fontSize = 20;
-        private int _direction = 10;
-
         public GlyphRunPage()
         {
             this.InitializeComponent();
@@ -25,19 +17,43 @@ namespace RenderDemo.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
+        }
+    }
 
-            _imageControl = this.FindControl<Image>("imageControl");
-            _imageControl.Source = new DrawingImage();
+    public class GlyphRunControl : Control
+    {
+        private IGlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
+        private readonly Random _rand = new Random();
+        private ushort[] _glyphIndices = new ushort[1];
+        private char[] _characters = new char[1];
+        private float _fontSize = 20;
+        private int _direction = 10;
 
-            DispatcherTimer.Run(() =>
+        private DispatcherTimer _timer;
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer = new DispatcherTimer
             {
-                UpdateGlyphRun();
+                Interval = TimeSpan.FromSeconds(1)
+            };
+
+            _timer.Tick += (s,e) =>
+            {
+                InvalidateVisual();
+            };
+
+            _timer.Start();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer.Stop();
 
-                return true;
-            }, TimeSpan.FromSeconds(1));
+            _timer = null;
         }
 
-        private void UpdateGlyphRun()
+        public override void Render(DrawingContext context)
         {
             var c = (char)_rand.Next(65, 90);
 
@@ -57,27 +73,70 @@ namespace RenderDemo.Pages
 
             _characters[0] = c;
 
-            var scale = (double)_fontSize / _glyphTypeface.DesignEmHeight;
+            var glyphRun = new GlyphRun(_glyphTypeface, _fontSize, _characters, _glyphIndices);
+
+            context.DrawGlyphRun(Brushes.Black, glyphRun);
+        }
+    }
+
+    public class GlyphRunGeometryControl : Control
+    {
+        private IGlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
+        private readonly Random _rand = new Random();
+        private ushort[] _glyphIndices = new ushort[1];
+        private char[] _characters = new char[1];
+        private float _fontSize = 20;
+        private int _direction = 10;
+
+        private DispatcherTimer _timer;
 
-            var drawingGroup = new DrawingGroup();
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromSeconds(1)
+            };
 
-            var glyphRunDrawing = new GlyphRunDrawing
+            _timer.Tick += (s, e) =>
             {
-                Foreground = Brushes.Black,
-                GlyphRun = new GlyphRun(_glyphTypeface, _fontSize, _characters, _glyphIndices)
+                InvalidateVisual();
             };
 
-            drawingGroup.Children.Add(glyphRunDrawing);
+            _timer.Start();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer.Stop();
+
+            _timer = null;
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            var c = (char)_rand.Next(65, 90);
 
-            var geometryDrawing = new GeometryDrawing
+            if (_fontSize + _direction > 200)
             {
-                Pen = new Pen(Brushes.Black),
-                Geometry = new RectangleGeometry { Rect = new Rect(glyphRunDrawing.GlyphRun.Size) }
-            };
+                _direction = -10;
+            }
+
+            if (_fontSize + _direction < 20)
+            {
+                _direction = 10;
+            }
+
+            _fontSize += _direction;
+
+            _glyphIndices[0] = _glyphTypeface.GetGlyph(c);
+
+            _characters[0] = c;
+
+            var glyphRun = new GlyphRun(_glyphTypeface, _fontSize, _characters, _glyphIndices);
 
-            drawingGroup.Children.Add(geometryDrawing);
+            var geometry = glyphRun.BuildGeometry();          
 
-            (_imageControl.Source as DrawingImage).Drawing = drawingGroup;
+            context.DrawGeometry(Brushes.Green, null, geometry);          
         }
     }
 }
diff --git a/samples/RenderDemo/Pages/PathMeasurementPage.cs b/samples/RenderDemo/Pages/PathMeasurementPage.cs
index 212377deae..cc5125609c 100644
--- a/samples/RenderDemo/Pages/PathMeasurementPage.cs
+++ b/samples/RenderDemo/Pages/PathMeasurementPage.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Diagnostics;
-using System.Drawing.Drawing2D;
-using System.Security.Cryptography;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Media.Immutable;
-using Avalonia.Threading;
-using Avalonia.Visuals.Media.Imaging;
 
 namespace RenderDemo.Pages
 {
diff --git a/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs b/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
index f263786ab7..f365b59c20 100644
--- a/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
+++ b/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
@@ -5,7 +5,6 @@ using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
-using Avalonia.Visuals.Media.Imaging;
 
 namespace RenderDemo.Pages
 {
diff --git a/samples/RenderDemo/Pages/SpringAnimationsPage.xaml b/samples/RenderDemo/Pages/SpringAnimationsPage.xaml
new file mode 100644
index 0000000000..26d572bb3f
--- /dev/null
+++ b/samples/RenderDemo/Pages/SpringAnimationsPage.xaml
@@ -0,0 +1,35 @@
+<UserControl 
+  xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  x:Class="RenderDemo.Pages.SpringAnimationsPage"
+  MaxWidth="600">
+  <UserControl.Resources>
+    <SpringEasing x:Key="SpringEasing" Mass="1" Stiffness="2000" Damping="20" InitialVelocity="0" />
+  </UserControl.Resources>
+  <UserControl.Styles>
+    <Style Selector="Border.spring">
+      <Style.Animations>
+        <Animation Duration="0:0:0.900" 
+                   IterationCount="Infinite" 
+                   PlaybackDirection="Normal" 
+                   Easing="{DynamicResource SpringEasing}">
+          <KeyFrame Cue="0%" KeySpline="">
+            <Setter Property="TranslateTransform.X" Value="-300"/>
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="TranslateTransform.X" Value="0" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+  </UserControl.Styles>
+  <Grid>
+    <Border Classes="spring" Background="Red" Width="50" Height="50">
+      <Border.RenderTransform>
+        <TransformGroup>
+          <TranslateTransform />
+        </TransformGroup>
+      </Border.RenderTransform>
+    </Border>
+  </Grid>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/SpringAnimationsPage.xaml.cs b/samples/RenderDemo/Pages/SpringAnimationsPage.xaml.cs
new file mode 100644
index 0000000000..78d3df2233
--- /dev/null
+++ b/samples/RenderDemo/Pages/SpringAnimationsPage.xaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RenderDemo.Pages;
+
+public class SpringAnimationsPage : UserControl
+{
+    public SpringAnimationsPage()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
diff --git a/samples/RenderDemo/Pages/TextFormatterPage.axaml b/samples/RenderDemo/Pages/TextFormatterPage.axaml
new file mode 100644
index 0000000000..4edf0852a2
--- /dev/null
+++ b/samples/RenderDemo/Pages/TextFormatterPage.axaml
@@ -0,0 +1,7 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="RenderDemo.Pages.TextFormatterPage">
+</UserControl>
diff --git a/samples/RenderDemo/Pages/TextFormatterPage.axaml.cs b/samples/RenderDemo/Pages/TextFormatterPage.axaml.cs
new file mode 100644
index 0000000000..57a5c7101f
--- /dev/null
+++ b/samples/RenderDemo/Pages/TextFormatterPage.axaml.cs
@@ -0,0 +1,118 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+
+namespace RenderDemo.Pages
+{
+    public class TextFormatterPage : UserControl
+    {
+        private TextLine _textLine;
+        
+        public TextFormatterPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+        
+        public override void Render(DrawingContext context)
+        {
+            _textLine?.Draw(context, new Point());
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var defaultRunProperties = new GenericTextRunProperties(Typeface.Default, foregroundBrush: Brushes.Black,
+                baselineAlignment: BaselineAlignment.Center);
+            var paragraphProperties = new GenericTextParagraphProperties(defaultRunProperties);
+
+            var control = new Button { Content = new TextBlock { Text = "ClickMe" } };
+            
+            Content = control;
+            
+            var textSource = new CustomTextSource(control, defaultRunProperties);
+
+            control.Measure(Size.Infinity);
+
+            _textLine =
+                TextFormatter.Current.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
+            
+            return base.MeasureOverride(availableSize);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var currentX = 0d;
+            
+            foreach (var textRun in _textLine.TextRuns)
+            {
+                if (textRun is ControlRun controlRun)
+                {
+                    controlRun.Control.Arrange(new Rect(new Point(currentX, 0), controlRun.Size));
+                }
+
+                if (textRun is DrawableTextRun drawableTextRun)
+                {
+                    currentX += drawableTextRun.Size.Width;
+                }
+            }
+            
+            return finalSize;
+        }
+
+        private class CustomTextSource : ITextSource
+        {
+            private readonly Control _control;
+            private readonly TextRunProperties _defaultProperties;
+            private readonly string _text = "<-Hello World->";
+
+            public CustomTextSource(Control control, TextRunProperties defaultProperties)
+            {
+                _control = control;
+                _defaultProperties = defaultProperties;
+            }
+            
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                if (textSourceIndex >= _text.Length * 2 + TextRun.DefaultTextSourceLength)
+                {
+                    return null;
+                }
+
+                if (textSourceIndex == _text.Length)
+                {
+                    return new ControlRun(_control, _defaultProperties);
+                }
+
+                return new TextCharacters(_text.AsMemory(), _defaultProperties);
+            }
+        }
+
+        private class ControlRun : DrawableTextRun
+        {
+            private readonly Control _control;
+
+            public ControlRun(Control control, TextRunProperties properties)
+            {
+                _control = control;
+                Properties = properties;
+            }
+
+            public Control Control => _control;
+            public override Size Size => _control.DesiredSize;
+            public override double Baseline => 0;
+            public override TextRunProperties Properties { get; }
+
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {
+                // noop
+            }
+        }
+    }
+}
diff --git a/samples/RenderDemo/Pages/Transform3DPage.axaml b/samples/RenderDemo/Pages/Transform3DPage.axaml
new file mode 100644
index 0000000000..30ed35bbac
--- /dev/null
+++ b/samples/RenderDemo/Pages/Transform3DPage.axaml
@@ -0,0 +1,210 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="700"
+             x:Class="RenderDemo.Pages.Transform3DPage">
+    <UserControl.Styles>
+        <Styles>
+            <Styles.Resources>
+                <Template x:Key="TestContent">
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,*" Margin="5">
+                        <TextBlock>I'm a text</TextBlock>
+                        <Button Grid.Row="0" Grid.Column="1" Content="A Button"></Button>
+                        <Slider Grid.Row="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Value="{Binding Depth}"
+                                Minimum="100"
+                                Maximum="300" />
+                    </Grid>
+                </Template>
+            </Styles.Resources>
+        </Styles>
+        <Style Selector="Border.Test">
+            <Setter Property="Width" Value="200" />
+            <Setter Property="Height" Value="200" />
+            <Setter Property="Child" Value="{StaticResource TestContent}" />
+            <Setter Property="BorderThickness" Value="2" />
+            <Setter Property="BorderBrush" Value="Black" />
+            <Setter Property="Grid.ColumnSpan" Value="2" />
+        </Style>
+        <Style Selector="TextBlock, Label, Slider">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="10,0,10,0" />
+        </Style>
+        <Style Selector="Border TextBlock">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style Selector="Border Button">
+            <Setter Property="Background" Value="White"></Setter>
+            <Setter Property="Foreground" Value="Black" />
+        </Style>
+        
+        <Style Selector="Border#B1">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="0" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="25%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="90" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Border#B2">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="90" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="25%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="180" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="75%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="450" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Border#B3">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="180" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="50%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="75%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="450" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="540" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Border#B4">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="270" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="25%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="50%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="450" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="630" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+    </UserControl.Styles>
+
+    <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="*, Auto, Auto, Auto, Auto, Auto, Auto, Auto">
+        <Grid.Clock>
+            <Clock />
+        </Grid.Clock>
+        <Border Name="B1" Background="DarkRed" Classes="Test">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+        <Border Name="B2" Grid.Row="0" Grid.Column="0" Classes="Test" Background="DarkGreen">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+        <Border Name="B3" Grid.Row="0" Grid.Column="0" Classes="Test" Background="DarkBlue">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+        <Border Name="B4" Grid.Row="0" Grid.Column="0" Classes="Test" Background="Orange">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+
+        <Label Grid.Column="0" Grid.Row="1">Depth: </Label>
+        <Slider Grid.Column="1" Grid.Row="1" Value="{Binding Depth}" Minimum="100" Maximum="300" />
+
+        <Border Grid.Row="0" Grid.Column="2" Classes="Test" ZIndex="-2">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                    <GradientStop Offset="0" Color="Red" />
+                    <GradientStop Offset="1" Color="Blue" />
+                </LinearGradientBrush>
+            </Border.Background>
+            <Border.Styles>
+                <Style Selector="Label">
+                    <Setter Property="VerticalAlignment" Value="Center" />
+                </Style>
+                <Style Selector="Slider">
+                    <Setter Property="Width" Value="100" />
+                </Style>
+            </Border.Styles>
+            <Border.RenderTransform>
+                <Rotate3DTransform Depth="{Binding Depth}"
+                                   CenterX="{Binding CenterX}"
+                                   CenterY="{Binding CenterY}"
+                                   CenterZ="{Binding CenterZ}"
+                                   AngleX="{Binding AngleX}"
+                                   AngleY="{Binding AngleY}"
+                                   AngleZ="{Binding AngleZ}" />
+            </Border.RenderTransform>
+        </Border>
+
+        <Label Grid.Row="1" Grid.Column="2">Center X: </Label>
+        <Slider Grid.Row="1" Grid.Column="3" Value="{Binding CenterX}" Minimum="-100" Maximum="100" />
+
+        <Label Grid.Row="2" Grid.Column="2">Center Y: </Label>
+        <Slider Grid.Row="2" Grid.Column="3" Value="{Binding CenterY}" Minimum="-100" Maximum="100" />
+
+        <Label Grid.Row="3" Grid.Column="2">Center Z: </Label>
+        <Slider Grid.Row="3" Grid.Column="3" Value="{Binding CenterZ}" Minimum="-100" Maximum="100" />
+
+        <Label Grid.Row="4" Grid.Column="2">Angle X: </Label>
+        <Slider Grid.Row="4" Grid.Column="3" Value="{Binding AngleX}" Minimum="-180" Maximum="180" />
+
+        <Label Grid.Row="5" Grid.Column="2">Angle Y: </Label>
+        <Slider Grid.Row="5" Grid.Column="3" Value="{Binding AngleY}" Minimum="-180" Maximum="180" />
+
+        <Label Grid.Row="6" Grid.Column="2">Angle Z: </Label>
+        <Slider Grid.Row="6" Grid.Column="3" Value="{Binding AngleZ}" Minimum="-180" Maximum="180" />
+    </Grid>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/Transform3DPage.axaml.cs b/samples/RenderDemo/Pages/Transform3DPage.axaml.cs
new file mode 100644
index 0000000000..5083189c4c
--- /dev/null
+++ b/samples/RenderDemo/Pages/Transform3DPage.axaml.cs
@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using RenderDemo.ViewModels;
+
+namespace RenderDemo.Pages;
+
+public class Transform3DPage : UserControl
+{
+    public Transform3DPage()
+    {
+        InitializeComponent();
+        this.DataContext = new Transform3DPageViewModel();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
+
diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj
index 54d5ca4b3b..3c62af1eaf 100644
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@@ -4,10 +4,15 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\src\Avalonia.Visuals\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
+    <Compile Include="..\..\src\Avalonia.Base\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
+    <Compile Update="Pages\TextFormatterPage.axaml.cs">
+      <DependentUpon>TextFormatterPage.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
diff --git a/samples/RenderDemo/ViewModels/Transform3DPageViewModel.cs b/samples/RenderDemo/ViewModels/Transform3DPageViewModel.cs
new file mode 100644
index 0000000000..c8d1d40e3a
--- /dev/null
+++ b/samples/RenderDemo/ViewModels/Transform3DPageViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using MiniMvvm;
+using Avalonia.Animation;
+
+namespace RenderDemo.ViewModels
+{
+    public class Transform3DPageViewModel : ViewModelBase
+    {
+        private double _depth = 200;
+
+        private double _centerX = 0;
+        private double _centerY = 0;
+        private double _centerZ = 0;
+        private double _angleX = 0;
+        private double _angleY = 0;
+        private double _angleZ = 0;
+        
+        public double Depth
+        {
+            get => _depth;
+            set => RaiseAndSetIfChanged(ref _depth, value);
+        }
+        
+        public double CenterX
+        {
+            get => _centerX;
+            set => RaiseAndSetIfChanged(ref _centerX, value);
+        }
+        public double CenterY
+        {
+            get => _centerY;
+            set => RaiseAndSetIfChanged(ref _centerY, value);
+        }
+        public double CenterZ
+        {
+            get => _centerZ;
+            set => RaiseAndSetIfChanged(ref _centerZ, value);
+        }
+        public double AngleX
+        {
+            get => _angleX;
+            set => RaiseAndSetIfChanged(ref _angleX, value);
+        }
+        public double AngleY
+        {
+            get => _angleY;
+            set => RaiseAndSetIfChanged(ref _angleY, value);
+        }
+        public double AngleZ
+        {
+            get => _angleZ;
+            set => RaiseAndSetIfChanged(ref _angleZ, value);
+        }
+    }
+}
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
index bbfd3d87ca..ab61dcde91 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
@@ -43,14 +43,13 @@ namespace ControlSamples
             _splitView = e.NameScope.Find<SplitView>("PART_NavigationPane");
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == BoundsProperty && _splitView is not null)
             {
-                var oldBounds = change.OldValue.GetValueOrDefault<Rect>();
-                var newBounds = change.NewValue.GetValueOrDefault<Rect>();
+                var (oldBounds, newBounds) = change.GetOldAndNewValue<Rect>();
                 EnsureSplitViewMode(oldBounds, newBounds);
             }
         }
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 1aa7f8ea04..fbc51414e3 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -1,6 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:catalog="using:ControlSamples">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:catalog="using:ControlSamples">
   <Design.PreviewWith>
     <Border Width="400"
             Height="150">
@@ -20,25 +20,136 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="PaneCompactWidth">40</x:Double>
-    <x:Double x:Key="PaneExpandWidth">200</x:Double>
-    <x:Double x:Key="HeaderHeight">36</x:Double>
-    <x:Double x:Key="NavigationItemHeight">36</x:Double>
-    <x:Double x:Key="HamburgerMenuButtonHeight">32</x:Double>
-    <Thickness x:Key="HeaderMarginCollapsedPane">12,0,0,0</Thickness>
-    <Thickness x:Key="HeaderMarginExpandedPane">52,0,0,0</Thickness>
-    <Thickness x:Key="HeaderMarginExpandedOverlayPane">212,0,0,0</Thickness>
-    <BoxShadows x:Key="NavigationItemShadow">1 1 1 1 #2000, 0 0 1 1 #2fff</BoxShadows>
-    <BoxShadows x:Key="NavigationContentShadow">0 0 1 1 #2000</BoxShadows>
-  </Styles.Resources>
+  <x:Double x:Key="PaneCompactWidth">40</x:Double>
+  <x:Double x:Key="PaneExpandWidth">220</x:Double>
+  <x:Double x:Key="HeaderHeight">36</x:Double>
+  <x:Double x:Key="NavigationItemHeight">36</x:Double>
+  <x:Double x:Key="HamburgerMenuButtonHeight">32</x:Double>
+  <Thickness x:Key="HeaderMarginCollapsedPane">12,0,0,0</Thickness>
+  <Thickness x:Key="HeaderMarginExpandedPane">52,0,0,0</Thickness>
+  <Thickness x:Key="HeaderMarginExpandedOverlayPane">212,0,0,0</Thickness>
+  <BoxShadows x:Key="NavigationItemShadow">1 1 1 1 #2000, 0 0 1 1 #2fff</BoxShadows>
+  <BoxShadows x:Key="NavigationContentShadow">0 0 1 1 #2000</BoxShadows>
+
+  <ControlTheme x:Key="NavigationButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="12,0,4,0" />
+    <Setter Property="Margin" Value="4,0,8,0" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          TextElement.FontFamily="{TemplateBinding FontFamily}"
+                          TextElement.FontSize="{TemplateBinding FontSize}"
+                          TextElement.FontWeight="{TemplateBinding FontWeight}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="HamburgerMenuTabItem" TargetType="TabItem">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="12,0,4,0" />
+    <Setter Property="Margin" Value="4,0,8,0" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <Border Name="PART_SelectedPipe"
+                    Width="{DynamicResource TabItemPipeThickness}"
+                    Height="{DynamicResource TabItemVerticalPipeHeight}"
+                    Margin="6,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    IsVisible="False"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"/>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}"
+                              Margin="0"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              TextElement.FontFamily="{TemplateBinding FontFamily}"
+                              TextElement.FontSize="{TemplateBinding FontSize}"
+                              TextElement.FontWeight="{TemplateBinding FontWeight}" />
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
+      
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource SystemChromeLowColor}" />
+        <Setter Property="BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+      </Style>
+    </Style>
+    
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+
+      <Style Selector="^ /template/ Border#PART_SelectedPipe">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
+  </ControlTheme>
 
   <!--  HamburgerMenu  -->
-  <Style Selector="catalog|HamburgerMenu">
+  <ControlTheme x:Key="{x:Type catalog:HamburgerMenu}" TargetType="catalog:HamburgerMenu">
     <Setter Property="Padding" Value="12 8 4 0" />
     <Setter Property="PaneBackground" Value="{DynamicResource SystemChromeMediumColor}" />
     <Setter Property="Background" Value="{DynamicResource SystemChromeMediumColor}" />
     <Setter Property="ContentBackground" Value="{DynamicResource SystemAltHighColor}" />
+    <Setter Property="ItemContainerTheme" Value="{StaticResource HamburgerMenuTabItem}"/>
+    <Setter Property="TabStripPlacement" Value="Left" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel Background="{TemplateBinding PaneBackground}">
@@ -46,7 +157,8 @@
                      CompactPaneLength="{StaticResource PaneCompactWidth}"
                      DisplayMode="Inline"
                      IsPaneOpen="True"
-                     OpenPaneLength="{StaticResource PaneExpandWidth}">
+                     OpenPaneLength="{StaticResource PaneExpandWidth}"
+                     PaneBackground="Transparent">
             <SplitView.Pane>
               <Grid Margin="0,0,1,5" RowDefinitions="Auto, *, Auto">
                 <Panel Height="{StaticResource HeaderHeight}" />
@@ -58,8 +170,7 @@
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   HorizontalAlignment="Stretch"
                                   ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}">
+                                  Items="{TemplateBinding Items}">
                     <ItemsPresenter.ItemsPanel>
                       <ItemsPanelTemplate>
                         <StackPanel x:Name="HamburgerItemsPanel"
@@ -70,7 +181,7 @@
                 </ScrollViewer>
                 <Button x:Name="SettingsButton"
                         Grid.Row="2"
-                        Classes="NavigationButton"
+                        Theme="{StaticResource NavigationButton}"
                         Content="Settings"
                         Flyout="{TemplateBinding (FlyoutBase.AttachedFlyout)}"
                         IsVisible="{Binding $parent[TabControl].(FlyoutBase.AttachedFlyout), Converter={x:Static ObjectConverters.IsNotNull}}" />
@@ -82,6 +193,7 @@
                   <TextBlock x:Name="HeaderHolder"
                              VerticalAlignment="Center"
                              Classes="h1"
+                             Margin="{StaticResource HeaderMarginExpandedPane}"
                              Text="{Binding $parent[TabControl].SelectedItem.Header, FallbackValue=''}">
                     <TextBlock.Transitions>
                       <Transitions>
@@ -119,7 +231,7 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Center"
-                        Classes="NavigationButton"
+                        Theme="{StaticResource NavigationButton}"
                         CornerRadius="4"
                         IsChecked="{Binding #PART_NavigationPane.IsPaneOpen, Mode=TwoWay}">
             <PathIcon Data="M3 17h18a1 1 0 0 1 .117 1.993L21 19H3a1 1 0 0 1-.117-1.993L3 17h18H3Zm0-6 18-.002a1 1 0 0 1 .117 1.993l-.117.007L3 13a1 1 0 0 1-.117-1.993L3 11l18-.002L3 11Zm0-6h18a1 1 0 0 1 .117 1.993L21 7H3a1 1 0 0 1-.117-1.993L3 5h18H3Z" Foreground="{TemplateBinding Foreground}" />
@@ -127,116 +239,26 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView TextBlock#HeaderHolder">
-    <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedPane}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[IsPaneOpen=True] TextBlock#HeaderHolder">
-    <Setter Property="Margin" Value="{StaticResource HeaderMarginCollapsedPane}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Overlay][IsPaneOpen=True] TextBlock#HeaderHolder">
-    <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedOverlayPane}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView">
-    <Setter Property="PaneBackground" Value="Transparent" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Overlay]">
-    <Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Overlay]">
-    <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Inline] Border#BackgroundBorder">
-    <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
-    <Setter Property="BoxShadow" Value="{StaticResource NavigationContentShadow}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
-    <Setter Property="CornerRadius" Value="8 0 0 0" />
-  </Style>
 
+    <Style Selector="^ /template/ SplitView[IsPaneOpen=True] TextBlock#HeaderHolder">
+      <Setter Property="Margin" Value="{StaticResource HeaderMarginCollapsedPane}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Overlay][IsPaneOpen=True] TextBlock#HeaderHolder">
+      <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedOverlayPane}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
+      <Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
+      <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Inline] Border#BackgroundBorder">
+      <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
+      <Setter Property="BoxShadow" Value="{StaticResource NavigationContentShadow}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
+      <Setter Property="CornerRadius" Value="8 0 0 0" />
+    </Style>
+  </ControlTheme>
 
-  <!--  HamburgerMenu TabItem  -->
-  <Style Selector="catalog|HamburgerMenu > TabItem, :is(Button).NavigationButton">
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Padding" Value="12,0,4,0" />
-    <Setter Property="Margin" Value="4,0,8,0" />
-    <Setter Property="CornerRadius" Value="8" />
-    <Setter Property="ClipToBounds" Value="False" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Panel>
-            <Border Name="PART_SelectedPipe"
-                    Width="{DynamicResource TabItemPipeThickness}"
-                    Height="{DynamicResource TabItemVerticalPipeHeight}"
-                    Margin="6,0,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Padding="{TemplateBinding Padding}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                              TextBlock.FontSize="{TemplateBinding FontSize}"
-                              TextBlock.FontWeight="{TemplateBinding FontWeight}" />
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector=":is(Button).NavigationButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Padding="{TemplateBinding Padding}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                          TextBlock.FontSize="{TemplateBinding FontSize}"
-                          TextBlock.FontWeight="{TemplateBinding FontWeight}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="Transparent" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemBaseHighColor}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem:pointerover /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
-    <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem:pressed /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
-    <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-  </Style>
-  <Style Selector=":is(Button).NavigationButton:pressed">
-    <Setter Property="RenderTransform" Value="none" />
-  </Style>
-</Styles>
+</ResourceDictionary>
diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
index 3d54036d29..23d45edf6a 100644
--- a/samples/Sandbox/MainWindow.axaml.cs
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Markup.Xaml;
 using Avalonia.Win32.WinRT.Composition;
 
diff --git a/samples/Sandbox/Sandbox.csproj b/samples/Sandbox/Sandbox.csproj
index 8f2812e048..eab654acb6 100644
--- a/samples/Sandbox/Sandbox.csproj
+++ b/samples/Sandbox/Sandbox.csproj
@@ -8,7 +8,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
   </ItemGroup>
   
   <Import Project="..\..\build\SampleApp.props" />
diff --git a/samples/VirtualizationDemo/App.xaml b/samples/VirtualizationDemo/App.xaml
index 3ad1dce794..eb5f0e4dca 100644
--- a/samples/VirtualizationDemo/App.xaml
+++ b/samples/VirtualizationDemo/App.xaml
@@ -1,9 +1,7 @@
-<Application
-    xmlns="https://github.com/avaloniaui" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="VirtualizationDemo.App">
-    <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-    </Application.Styles>
-</Application>
\ No newline at end of file
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="VirtualizationDemo.App">
+  <Application.Styles>
+    <SimpleTheme />
+  </Application.Styles>
+</Application>
diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
index 2c6ff74e5e..b27cfe77e8 100644
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
diff --git a/samples/interop/Direct3DInteropSample/App.paml b/samples/interop/Direct3DInteropSample/App.paml
index d9630eef58..e6d77dfaf4 100644
--- a/samples/interop/Direct3DInteropSample/App.paml
+++ b/samples/interop/Direct3DInteropSample/App.paml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui">
   <Application.Styles>
-    <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
-    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    <SimpleTheme Mode="Light" />
   </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index cd9963a2e5..f9ef4693d5 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -22,6 +22,7 @@
       </EmbeddedResource>
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="..\..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
         <ProjectReference Include="..\..\MiniMvvm\MiniMvvm.csproj" />
diff --git a/samples/interop/NativeEmbedSample/App.xaml b/samples/interop/NativeEmbedSample/App.xaml
deleted file mode 100644
index e35ade4087..0000000000
--- a/samples/interop/NativeEmbedSample/App.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="NativeEmbedSample.App">
-  <Application.Styles>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-  </Application.Styles>
-</Application>
diff --git a/samples/interop/NativeEmbedSample/App.xaml.cs b/samples/interop/NativeEmbedSample/App.xaml.cs
deleted file mode 100644
index cb17cfc35d..0000000000
--- a/samples/interop/NativeEmbedSample/App.xaml.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-
-namespace NativeEmbedSample
-{
-    public class App : Application
-    {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public override void OnFrameworkInitializationCompleted()
-        {
-            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
-                desktopLifetime.MainWindow = new MainWindow();
-
-            base.OnFrameworkInitializationCompleted();
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/EmbedSample.cs b/samples/interop/NativeEmbedSample/EmbedSample.cs
deleted file mode 100644
index ab9df11e19..0000000000
--- a/samples/interop/NativeEmbedSample/EmbedSample.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using Avalonia.Controls;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.WebKit;
-using Encoding = SharpDX.Text.Encoding;
-
-namespace NativeEmbedSample
-{
-    public class EmbedSample : NativeControlHost
-    {
-        public bool IsSecond { get; set; }
-        private Process _mplayer;
-
-        IPlatformHandle CreateLinux(IPlatformHandle parent)
-        {
-            if (IsSecond)
-            {
-                var chooser = GtkHelper.CreateGtkFileChooser(parent.Handle);
-                if (chooser != null)
-                    return chooser;
-            }
-
-            var control = base.CreateNativeControlCore(parent);
-            var nodes = Path.GetFullPath(Path.Combine(typeof(EmbedSample).Assembly.GetModules()[0].FullyQualifiedName,
-                "..",
-                "nodes.mp4"));
-            _mplayer = Process.Start(new ProcessStartInfo("mplayer",
-                $"-vo x11 -zoom -loop 0 -wid {control.Handle.ToInt64()} \"{nodes}\"")
-            {
-                UseShellExecute = false,
-
-            });
-            return control;
-        }
-
-        void DestroyLinux(IPlatformHandle handle)
-        {
-            _mplayer?.Kill();
-            _mplayer = null;
-            base.DestroyNativeControlCore(handle);
-        }
-
-        private const string RichText =
-            @"{\rtf1\ansi\ansicpg1251\deff0\nouicompat\deflang1049{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
-{\colortbl ;\red255\green0\blue0;\red0\green77\blue187;\red0\green176\blue80;\red155\green0\blue211;\red247\green150\blue70;\red75\green172\blue198;}
-{\*\generator Riched20 6.3.9600}\viewkind4\uc1 
-\pard\sa200\sl276\slmult1\f0\fs22\lang9 <PREFIX>I \i am\i0  a \cf1\b Rich Text \cf0\b0\fs24 control\cf2\fs28 !\cf3\fs32 !\cf4\fs36 !\cf1\fs40 !\cf5\fs44 !\cf6\fs48 !\cf0\fs44\par
-}";
-
-        IPlatformHandle CreateWin32(IPlatformHandle parent)
-        {
-            WinApi.LoadLibrary("Msftedit.dll");
-            var handle = WinApi.CreateWindowEx(0, "RICHEDIT50W",
-                @"Rich Edit",
-                0x800000 | 0x10000000 | 0x40000000 | 0x800000 | 0x10000 | 0x0004, 0, 0, 1, 1, parent.Handle,
-                IntPtr.Zero, WinApi.GetModuleHandle(null), IntPtr.Zero);
-            var st = new WinApi.SETTEXTEX { Codepage = 65001, Flags = 0x00000008 };
-            var text = RichText.Replace("<PREFIX>", IsSecond ? "\\qr " : "");
-            var bytes = Encoding.UTF8.GetBytes(text);
-            WinApi.SendMessage(handle, 0x0400 + 97, ref st, bytes);
-            return new PlatformHandle(handle, "HWND");
-
-        }
-
-        void DestroyWin32(IPlatformHandle handle)
-        {
-            WinApi.DestroyWindow(handle.Handle);
-        }
-
-        IPlatformHandle CreateOSX(IPlatformHandle parent)
-        {
-            // Note: We are using MonoMac for example purposes
-            // It shouldn't be used in production apps
-            MacHelper.EnsureInitialized();
-
-            var webView = new WebView();
-            Dispatcher.UIThread.Post(() =>
-            {
-                webView.MainFrame.LoadRequest(new NSUrlRequest(new NSUrl(
-                    IsSecond ? "https://bing.com": "https://google.com/")));
-            });
-            return new MacOSViewHandle(webView);
-
-        }
-
-        void DestroyOSX(IPlatformHandle handle)
-        {
-            ((MacOSViewHandle)handle).Dispose();
-        }
-        
-        protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                return CreateLinux(parent);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                return CreateWin32(parent);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                return CreateOSX(parent);
-            return base.CreateNativeControlCore(parent);
-        }
-
-        protected override void DestroyNativeControlCore(IPlatformHandle control)
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                DestroyLinux(control);
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                DestroyWin32(control);
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                DestroyOSX(control);
-            else
-                base.DestroyNativeControlCore(control);
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/GtkHelper.cs b/samples/interop/NativeEmbedSample/GtkHelper.cs
deleted file mode 100644
index e389a51ef5..0000000000
--- a/samples/interop/NativeEmbedSample/GtkHelper.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls.Platform;
-using Avalonia.Platform;
-using Avalonia.Platform.Interop;
-using Avalonia.X11.NativeDialogs;
-using static Avalonia.X11.NativeDialogs.Gtk;
-using static Avalonia.X11.NativeDialogs.Glib;
-namespace NativeEmbedSample
-{
-    public class GtkHelper
-    {
-        private static  Task<bool> s_gtkTask;
-        class FileChooser : INativeControlHostDestroyableControlHandle
-        {
-            private readonly IntPtr _widget;
-
-            public FileChooser(IntPtr widget, IntPtr xid)
-            {
-                _widget = widget;
-                Handle = xid;
-            }
-
-            public IntPtr Handle { get; }
-            public string HandleDescriptor => "XID";
-            public void Destroy()
-            {
-                RunOnGlibThread(() =>
-                {
-                    gtk_widget_destroy(_widget);
-                    return 0;
-                }).Wait();
-            }
-        }
-
-        
-        
-        public static IPlatformHandle CreateGtkFileChooser(IntPtr parentXid)
-        {
-            if (s_gtkTask == null)
-                s_gtkTask = StartGtk();
-            if (!s_gtkTask.Result)
-                return null;
-            return RunOnGlibThread(() =>
-            {
-                using (var title = new Utf8Buffer("Embedded"))
-                {
-                    var widget = gtk_file_chooser_dialog_new(title, IntPtr.Zero, GtkFileChooserAction.SelectFolder,
-                        IntPtr.Zero);
-                    gtk_widget_realize(widget);
-                    var xid = gdk_x11_window_get_xid(gtk_widget_get_window(widget));
-                    gtk_window_present(widget);
-                    return new FileChooser(widget,  xid);
-                }
-            }).Result;
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/MacHelper.cs b/samples/interop/NativeEmbedSample/MacHelper.cs
deleted file mode 100644
index 74a06a0a0c..0000000000
--- a/samples/interop/NativeEmbedSample/MacHelper.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using Avalonia.Platform;
-using MonoMac.AppKit;
-
-namespace NativeEmbedSample
-{
-    public class MacHelper
-    {
-        private static bool _isInitialized;
-
-        public static void EnsureInitialized()
-        {
-            if (_isInitialized)
-                return;
-            _isInitialized = true;
-            NSApplication.Init();
-        }
-    }
-
-    class MacOSViewHandle : IPlatformHandle, IDisposable
-    {
-        private NSView _view;
-
-        public MacOSViewHandle(NSView view)
-        {
-            _view = view;
-        }
-
-        public IntPtr Handle => _view?.Handle ?? IntPtr.Zero;
-        public string HandleDescriptor => "NSView";
-
-        public void Dispose()
-        {
-            _view.Dispose();
-            _view = null;
-        }
-    }
-
-}
diff --git a/samples/interop/NativeEmbedSample/MainWindow.xaml b/samples/interop/NativeEmbedSample/MainWindow.xaml
deleted file mode 100644
index f2161a1bea..0000000000
--- a/samples/interop/NativeEmbedSample/MainWindow.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
-        Width="1024" Height="800"
-        Title="Native embedding sample"
-        xmlns:local="clr-namespace:NativeEmbedSample"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="NativeEmbedSample.MainWindow">
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="Test">
-        <MenuItem Header="SubMenu">
-          <MenuItem Header="Item 1"/>
-          <MenuItem Header="Item 2"/>
-          <MenuItem Header="Item 3"/>  
-        </MenuItem>
-        <MenuItem Header="Item 1"/>
-        <MenuItem Header="Item 2"/>
-        <MenuItem Header="Item 3"/>  
-      </MenuItem>
-    </Menu>
-    <DockPanel DockPanel.Dock="Top">
-      <Button DockPanel.Dock="Right" Click="ShowPopupDelay">Show popup (delay)</Button>
-      <Button DockPanel.Dock="Right" Click="ShowPopup">Show popup</Button>
-      <Border DockPanel.Dock="Right" Background="#c0c0c0">
-        <ToolTip.Tip>
-          <ToolTip>
-              <TextBlock>Text</TextBlock>
-          </ToolTip>
-        </ToolTip.Tip>
-        <TextBlock>Tooltip</TextBlock>
-      </Border>
-      <TextBox Text="Lorem ipsum dolor sit amet"/>
-      
-    </DockPanel>
-    <Grid ColumnDefinitions="*,5,*">
-      <DockPanel>
-        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-          <CheckBox x:Name="firstVisible" IsChecked="True"/>
-          <TextBlock>Visible</TextBlock>
-        </StackPanel>
-        <local:EmbedSample IsVisible="{Binding #firstVisible.IsChecked}"/>
-      </DockPanel>
-      <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />
-      <DockPanel Grid.Column="2">
-        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-          <CheckBox x:Name="secondVisible" IsChecked="True"/>
-          <TextBlock>Visible</TextBlock>
-        </StackPanel>
-        <local:EmbedSample IsSecond="True" IsVisible="{Binding #secondVisible.IsChecked}"/>
-      </DockPanel>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/samples/interop/NativeEmbedSample/MainWindow.xaml.cs b/samples/interop/NativeEmbedSample/MainWindow.xaml.cs
deleted file mode 100644
index 4324aa2762..0000000000
--- a/samples/interop/NativeEmbedSample/MainWindow.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-
-namespace NativeEmbedSample
-{
-    public class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            AvaloniaXamlLoader.Load(this);
-            this.AttachDevTools();
-        }
-
-        public async void ShowPopupDelay(object sender, RoutedEventArgs args)
-        {
-            await Task.Delay(3000);
-            ShowPopup(sender, args);
-        }
-
-        public void ShowPopup(object sender, RoutedEventArgs args)
-        {
-
-            new ContextMenu()
-            {
-                Items = new List<MenuItem>
-                {
-                    new MenuItem() { Header = "Test" }, new MenuItem() { Header = "Test" }
-                }
-            }.Open((Control)sender);
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj b/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
deleted file mode 100644
index c25442b52c..0000000000
--- a/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
-    <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
-    <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
-
-    <AvaloniaResource Include="**\*.xaml">
-      <SubType>Designer</SubType>
-    </AvaloniaResource>
-    <None Remove="nodes.mp4" />
-    <Content Include="nodes.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Compile Include="..\..\..\src\Avalonia.X11\NativeDialogs\Gtk.cs" />
-  </ItemGroup>
-
-  <Import Project="..\..\..\build\SampleApp.props" />
-  <Import Project="..\..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\..\build\ReferenceCoreLibraries.props" />
-</Project>
diff --git a/samples/interop/NativeEmbedSample/Program.cs b/samples/interop/NativeEmbedSample/Program.cs
deleted file mode 100644
index baa7837667..0000000000
--- a/samples/interop/NativeEmbedSample/Program.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia;
-
-namespace NativeEmbedSample
-{
-    class Program
-    {
-        static int Main(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-
-        public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
-                .With(new AvaloniaNativePlatformOptions()
-                {
-                })
-                .UsePlatformDetect();
-
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/WinApi.cs b/samples/interop/NativeEmbedSample/WinApi.cs
deleted file mode 100644
index 8e5bcdf49e..0000000000
--- a/samples/interop/NativeEmbedSample/WinApi.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace NativeEmbedSample
-{
-    public unsafe class WinApi
-    {
-        public enum CommonControls : uint
-        {
-            ICC_LISTVIEW_CLASSES   = 0x00000001, // listview, header
-            ICC_TREEVIEW_CLASSES   = 0x00000002, // treeview, tooltips
-            ICC_BAR_CLASSES    = 0x00000004, // toolbar, statusbar, trackbar, tooltips
-            ICC_TAB_CLASSES    = 0x00000008, // tab, tooltips
-            ICC_UPDOWN_CLASS       = 0x00000010, // updown
-            ICC_PROGRESS_CLASS     = 0x00000020, // progress
-            ICC_HOTKEY_CLASS       = 0x00000040, // hotkey
-            ICC_ANIMATE_CLASS      = 0x00000080, // animate
-            ICC_WIN95_CLASSES      = 0x000000FF,
-            ICC_DATE_CLASSES       = 0x00000100, // month picker, date picker, time picker, updown
-            ICC_USEREX_CLASSES     = 0x00000200, // comboex
-            ICC_COOL_CLASSES       = 0x00000400, // rebar (coolbar) control
-            ICC_INTERNET_CLASSES   = 0x00000800,
-            ICC_PAGESCROLLER_CLASS = 0x00001000,  // page scroller
-            ICC_NATIVEFNTCTL_CLASS = 0x00002000,  // native font control
-            ICC_STANDARD_CLASSES   = 0x00004000,
-            ICC_LINK_CLASS     = 0x00008000
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct INITCOMMONCONTROLSEX
-        {
-            public int dwSize;
-            public uint dwICC;
-        }
-
-        [DllImport("Comctl32.dll")]
-        public static extern void InitCommonControlsEx(ref INITCOMMONCONTROLSEX init);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern bool DestroyWindow(IntPtr hwnd);
-
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr LoadLibrary(string lib);
-
-
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr GetModuleHandle(string lpModuleName);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern IntPtr CreateWindowEx(
-            int dwExStyle,
-            string lpClassName,
-            string lpWindowName,
-            uint dwStyle,
-            int x,
-            int y,
-            int nWidth,
-            int nHeight,
-            IntPtr hWndParent,
-            IntPtr hMenu,
-            IntPtr hInstance,
-            IntPtr lpParam);
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SETTEXTEX
-        {
-            public uint Flags;
-            public uint Codepage;
-        }
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SendMessageW")]
-        public static extern IntPtr SendMessage(IntPtr hWnd, int Msg, ref SETTEXTEX wParam, byte[] lParam);
-    }
-}
diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
index 0c18a1f58b..223a53d8c5 100644
--- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
+++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32.Interop\Avalonia.Win32.Interop.csproj" />
     <ProjectReference Include="..\..\ControlCatalog\ControlCatalog.csproj">
       <Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index b6491a5890..b6adbde738 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -1,19 +1,44 @@
 using System;
 using Android.Content;
 using Android.Runtime;
+using Android.Text;
 using Android.Views;
 using Android.Views.InputMethods;
+using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Input;
 using Avalonia.Input.TextInput;
 
 namespace Avalonia.Android
 {
-    class AndroidInputMethod<TView> : ITextInputMethodImpl
-        where TView: View, IInitEditorInfo
+    internal interface IAndroidInputMethod
+    {
+        public View View { get; }
+
+        public ITextInputMethodClient Client { get; }
+
+        public bool IsActive { get; }
+
+        public InputMethodManager IMM { get; }
+    }
+
+    enum CustomImeFlags
+    { 
+        ActionNone = 0x00000001,
+       ActionGo = 0x00000002,
+       ActionSearch = 0x00000003,
+       ActionSend = 0x00000004,
+       ActionNext = 0x00000005,
+       ActionDone = 0x00000006,
+       ActionPrevious = 0x00000007,
+    }
+
+    class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod
+        where TView : View, IInitEditorInfo
     {
         private readonly TView _host;
         private readonly InputMethodManager _imm;
-        private IInputElement _inputElement;
+        private ITextInputMethodClient _client;
+        private AvaloniaInputConnection _inputConnection;
 
         public AndroidInputMethod(TView host)
         {
@@ -28,49 +53,85 @@ namespace Avalonia.Android
             _host.ViewTreeObserver.AddOnGlobalLayoutListener(new SoftKeyboardListener(_host));
         }
 
+        public View View => _host;
+
+        public bool IsActive => Client != null;
+
+        public ITextInputMethodClient Client => _client;
+
+        public InputMethodManager IMM => _imm;
+
         public void Reset()
         {
-            _imm.RestartInput(_host);
+
         }
 
-        public void SetActive(bool active)
+        public void SetClient(ITextInputMethodClient client)
         {
-            if (active)
+            if (_client != null)
             {
+                _client.SurroundingTextChanged -= SurroundingTextChanged;
+            }
+
+            if(_inputConnection != null)
+            {
+                _inputConnection.ComposingText = null;
+                _inputConnection.ComposingRegion = default;
+            }
+
+            _client = client;
+
+            if (IsActive)
+            {
+                _client.SurroundingTextChanged += SurroundingTextChanged;
+
                 _host.RequestFocus();
-                Reset();
+
+                _imm.RestartInput(View);              
+
                 _imm.ShowSoftInput(_host, ShowFlags.Implicit);
-            }
-            else
-                _imm.HideSoftInputFromWindow(_host.WindowToken, HideSoftInputFlags.None);
-        }
 
-        public void SetCursorRect(Rect rect)
-        {
+                var surroundingText = Client.SurroundingText;
+
+                _imm.UpdateSelection(_host, surroundingText.AnchorOffset, surroundingText.CursorOffset, surroundingText.AnchorOffset, surroundingText.CursorOffset);
+            }
         }
 
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        private void SurroundingTextChanged(object sender, EventArgs e)
         {
-            if (_inputElement != null)
+            if (IsActive && _inputConnection != null)
             {
-                _inputElement.PointerReleased -= RestoreSoftKeyboard;
-            }
+                var surroundingText = Client.SurroundingText;
 
-            _inputElement = options.Source as InputElement;
+                _inputConnection.SurroundingText = surroundingText;
 
-            if (_inputElement == null)
-            {
-                _imm.HideSoftInputFromWindow(_host.WindowToken, HideSoftInputFlags.None);
+                _imm.UpdateSelection(_host, surroundingText.AnchorOffset, surroundingText.CursorOffset, surroundingText.AnchorOffset, surroundingText.CursorOffset);
+
+                if (_inputConnection.ComposingText != null && !_inputConnection.IsCommiting && surroundingText.AnchorOffset == surroundingText.CursorOffset)
+                {
+                    _inputConnection.CommitText(_inputConnection.ComposingText, 0);
+                    _inputConnection.SetSelection(surroundingText.AnchorOffset, surroundingText.CursorOffset);
+                }
             }
+        }
 
-            _host.InitEditorInfo((outAttrs) =>
+        public void SetCursorRect(Rect rect)
+        {
+            
+        }
+
+        public void SetOptions(TextInputOptions options)
+        {
+            _host.InitEditorInfo((topLevel, outAttrs) =>
             {
+                _inputConnection = new AvaloniaInputConnection(topLevel, this);
+
                 outAttrs.InputType = options.ContentType switch
                 {
                     TextInputContentType.Email => global::Android.Text.InputTypes.TextVariationEmailAddress,
                     TextInputContentType.Number => global::Android.Text.InputTypes.ClassNumber,
                     TextInputContentType.Password => global::Android.Text.InputTypes.TextVariationPassword,
-                    TextInputContentType.Phone => global::Android.Text.InputTypes.ClassPhone,
+                    TextInputContentType.Digits => global::Android.Text.InputTypes.ClassPhone,
                     TextInputContentType.Url => global::Android.Text.InputTypes.TextVariationUri,
                     _ => global::Android.Text.InputTypes.ClassText
                 };
@@ -84,15 +145,36 @@ namespace Avalonia.Android
                 if (options.Multiline)
                     outAttrs.InputType |= global::Android.Text.InputTypes.TextFlagMultiLine;
 
+                outAttrs.ImeOptions = options.ReturnKeyType switch
+                {
+                    TextInputReturnKeyType.Return => ImeFlags.NoEnterAction,
+                    TextInputReturnKeyType.Go => (ImeFlags)CustomImeFlags.ActionGo,
+                    TextInputReturnKeyType.Send => (ImeFlags)CustomImeFlags.ActionSend,
+                    TextInputReturnKeyType.Search => (ImeFlags)CustomImeFlags.ActionSearch,
+                    TextInputReturnKeyType.Next => (ImeFlags)CustomImeFlags.ActionNext,
+                    TextInputReturnKeyType.Previous => (ImeFlags)CustomImeFlags.ActionPrevious,
+                    _ => (ImeFlags)CustomImeFlags.ActionDone
+                };
+
                 outAttrs.ImeOptions |= ImeFlags.NoFullscreen | ImeFlags.NoExtractUi;
-            });
 
-            //_inputElement.PointerReleased += RestoreSoftKeyboard;
+                return _inputConnection;
+            });
         }
+    }
 
-        private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
+    public readonly struct ComposingRegion
+    {
+        private readonly int _start = -1;
+        private readonly int _end = -1;
+
+        public ComposingRegion(int start, int end)
         {
-            _imm.ShowSoftInput(_host, ShowFlags.Implicit);
+            _start = start;
+            _end = end;
         }
+
+        public int Start => _start;
+        public int End => _end;
     }
 }
diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 308be1325c..2b6d29e7c5 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -1,16 +1,15 @@
 using System;
-
+using Avalonia.Controls;
 using Avalonia.Android;
 using Avalonia.Android.Platform;
 using Avalonia.Android.Platform.Input;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
-using Avalonia.Skia;
+using Avalonia.Rendering.Composition;
+using Avalonia.OpenGL;
 
 namespace Avalonia
 {
@@ -18,9 +17,8 @@ namespace Avalonia
     {
         public static T UseAndroid<T>(this T builder) where T : AppBuilderBase<T>, new()
         {
-            var options = AvaloniaLocator.Current.GetService<AndroidPlatformOptions>() ?? new AndroidPlatformOptions();
             return builder
-                .UseWindowingSubsystem(() => AndroidPlatform.Initialize(options), "Android")
+                .UseWindowingSubsystem(() => AndroidPlatform.Initialize(), "Android")
                 .UseSkia();
         }
     }
@@ -28,50 +26,47 @@ namespace Avalonia
 
 namespace Avalonia.Android
 {
-    class AndroidPlatform : IPlatformSettings
+    class AndroidPlatform
     {
         public static readonly AndroidPlatform Instance = new AndroidPlatform();
         public static AndroidPlatformOptions Options { get; private set; }
 
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(4, 4);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => TimeSpan.FromMilliseconds(200);
-
-        public Size DoubleClickSize => TouchDoubleClickSize;
+        internal static Compositor Compositor { get; private set; }
 
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500);
-
-        public static void Initialize(AndroidPlatformOptions options)
+        public static void Initialize()
         {
-            Options = options;
+            Options = AvaloniaLocator.Current.GetService<AndroidPlatformOptions>() ?? new AndroidPlatformOptions();
 
             AvaloniaLocator.CurrentMutable
                 .Bind<IClipboard>().ToTransient<ClipboardImpl>()
                 .Bind<ICursorFactory>().ToTransient<CursorFactory>()
                 .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
                 .Bind<IKeyboardDevice>().ToSingleton<AndroidKeyboardDevice>()
-                .Bind<IPlatformSettings>().ToConstant(Instance)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformThreadingInterface>().ToConstant(new AndroidThreadingInterface())
-                .Bind<ISystemDialogImpl>().ToTransient<SystemDialogImpl>()
                 .Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoaderStub>()
                 .Bind<IRenderTimer>().ToConstant(new ChoreographerTimer())
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
 
-            SkiaPlatform.Initialize();
-
-            if (options.UseGpu)
+            if (Options.UseGpu)
             {
                 EglPlatformOpenGlInterface.TryInitialize();
             }
+            
+            if (Options.UseCompositor)
+            {
+                Compositor = new Compositor(
+                    AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(),
+                    AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>());
+            }
         }
     }
 
     public sealed class AndroidPlatformOptions
     {
-        public bool UseDeferredRendering { get; set; } = true;
+        public bool UseDeferredRendering { get; set; } = false;
         public bool UseGpu { get; set; } = true;
+        public bool UseCompositor { get; set; } = true;
     }
 }
diff --git a/src/Android/Avalonia.Android/AndroidThreadingInterface.cs b/src/Android/Avalonia.Android/AndroidThreadingInterface.cs
index e72f0aed90..de9149e9a1 100644
--- a/src/Android/Avalonia.Android/AndroidThreadingInterface.cs
+++ b/src/Android/Avalonia.Android/AndroidThreadingInterface.cs
@@ -14,6 +14,7 @@ namespace Avalonia.Android
     internal sealed class AndroidThreadingInterface : IPlatformThreadingInterface
     {
         private Handler _handler;
+        private static Thread s_uiThread;
 
         public AndroidThreadingInterface()
         {
@@ -26,46 +27,33 @@ namespace Avalonia.Android
         {
             if (interval.TotalMilliseconds < 10)
                 interval = TimeSpan.FromMilliseconds(10);
-            object l = new object();
+
             var stopped = false;
             Timer timer = null;
-            var scheduled = false;
             timer = new Timer(_ =>
             {
-                lock (l)
+                if (stopped)
+                    return;
+
+                EnsureInvokeOnMainThread(() =>
                 {
-                    if (stopped)
+                    try
                     {
-                        timer.Dispose();
-                        return;
+                        tick();
                     }
-                    if (scheduled)
-                        return;
-                    scheduled = true;
-                    EnsureInvokeOnMainThread(() =>
+                    finally
                     {
-                        try
-                        {
-                            tick();
-                        }
-                        finally
-                        {
-                            lock (l)
-                            {
-                                scheduled = false;
-                            }
-                        }
-                    });
-                }
-            }, null, TimeSpan.Zero, interval);
+                        if (!stopped)
+                            timer.Change(interval, Timeout.InfiniteTimeSpan);
+                    }
+                });
+            },
+            null, interval, Timeout.InfiniteTimeSpan);
 
             return Disposable.Create(() =>
             {
-                lock (l)
-                {
-                    stopped = true;
-                    timer.Dispose();
-                }
+                stopped = true;
+                timer.Dispose();
             });
         }
 
@@ -76,7 +64,25 @@ namespace Avalonia.Android
             EnsureInvokeOnMainThread(() => Signaled?.Invoke(null));
         }
 
-        public bool CurrentThreadIsLoopThread => Looper.MainLooper.Thread.Equals(Java.Lang.Thread.CurrentThread());
+        public bool CurrentThreadIsLoopThread
+        {
+            get
+            {
+                if (s_uiThread != null)
+                    return s_uiThread == Thread.CurrentThread;
+
+                var isOnMainThread = OperatingSystem.IsAndroidVersionAtLeast(23)
+                    ? Looper.MainLooper.IsCurrentThread
+                    : Looper.MainLooper.Thread.Equals(Java.Lang.Thread.CurrentThread());
+                if (isOnMainThread)
+                {
+                    s_uiThread = Thread.CurrentThread;
+                    return true;
+                }
+
+                return false;
+            }
+        }
         public event Action<DispatcherPriority?> Signaled;
     }
 }
diff --git a/src/Android/Avalonia.Android/AndroidViewControlHandle.cs b/src/Android/Avalonia.Android/AndroidViewControlHandle.cs
new file mode 100644
index 0000000000..e999d198c6
--- /dev/null
+++ b/src/Android/Avalonia.Android/AndroidViewControlHandle.cs
@@ -0,0 +1,32 @@
+#nullable enable
+
+using System;
+
+using Android.Views;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+namespace Avalonia.Android
+{
+    public class AndroidViewControlHandle : INativeControlHostDestroyableControlHandle
+    {
+        internal const string AndroidDescriptor = "JavaObjectHandle";
+
+        public AndroidViewControlHandle(View view)
+        {
+            View = view;
+        }
+
+        public View View { get; }
+
+        public string HandleDescriptor => AndroidDescriptor;
+
+        IntPtr IPlatformHandle.Handle => View.Handle;
+
+        public void Destroy()
+        {
+            View?.Dispose();
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index 6393ef3405..6688dde8f5 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Xamarin.Legacy.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-android;monoandroid11.0</TargetFrameworks>
+    <TargetFramework>net6.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
@@ -15,4 +15,5 @@
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Android/Avalonia.Android/AvaloniaActivity.cs b/src/Android/Avalonia.Android/AvaloniaActivity.cs
deleted file mode 100644
index fbadc257e2..0000000000
--- a/src/Android/Avalonia.Android/AvaloniaActivity.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Android.App;
-using Android.OS;
-using Android.Views;
-using Android.Content.PM;
-using AndroidX.AppCompat.App;
-using Android.Content.Res;
-using AndroidX.Lifecycle;
-
-namespace Avalonia.Android
-{
-    public abstract class AvaloniaActivity : AppCompatActivity
-    {
-        internal AvaloniaView View;
-        internal AvaloniaViewModel _viewModel;
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            View = new AvaloniaView(this);
-            SetContentView(View);
-
-            _viewModel = new ViewModelProvider(this).Get(Java.Lang.Class.FromType(typeof(AvaloniaViewModel))) as AvaloniaViewModel;
-
-            if (_viewModel.Content != null)
-            {
-                View.Content = _viewModel.Content;
-            }
-
-            base.OnCreate(savedInstanceState);
-        }
-        public object Content
-        {
-            get
-            {
-                return _viewModel.Content;
-            }
-            set
-            {
-                _viewModel.Content = value;
-                if (View != null)
-                    View.Content = value;
-            }
-        }
-
-        public override void OnConfigurationChanged(Configuration newConfig)
-        {
-            base.OnConfigurationChanged(newConfig);
-        }
-
-        protected override void OnDestroy()
-        {
-            View.Content = null;
-
-            base.OnDestroy();
-        }
-    }
-}
diff --git a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
new file mode 100644
index 0000000000..de8d02f188
--- /dev/null
+++ b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
@@ -0,0 +1,70 @@
+using System;
+using Android.App;
+using Android.Content;
+using Android.Content.Res;
+using Android.OS;
+using Android.Runtime;
+using AndroidX.AppCompat.App;
+using AndroidX.Lifecycle;
+
+namespace Avalonia.Android
+{
+    public abstract class AvaloniaMainActivity : AppCompatActivity, IActivityResultHandler
+    {
+        internal static object ViewContent;
+
+        public Action<int, Result, Intent> ActivityResult { get; set; }
+        internal AvaloniaView View;
+
+        protected override void OnCreate(Bundle savedInstanceState)
+        {
+            View = new AvaloniaView(this);
+            if (ViewContent != null)
+            {
+                View.Content = ViewContent;
+            }
+
+            if (Avalonia.Application.Current.ApplicationLifetime is SingleViewLifetime lifetime)
+            {
+                lifetime.View = View;
+            }
+
+            base.OnCreate(savedInstanceState);
+
+            SetContentView(View);
+        }
+
+        public object Content
+        {
+            get
+            {
+                return ViewContent;
+            }
+            set
+            {
+                ViewContent = value;
+                if (View != null)
+                    View.Content = value;
+            }
+        }
+
+        public override void OnConfigurationChanged(Configuration newConfig)
+        {
+            base.OnConfigurationChanged(newConfig);
+        }
+
+        protected override void OnDestroy()
+        {
+            View.Content = null;
+
+            base.OnDestroy();
+        }
+
+        protected override void OnActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
+        {
+            base.OnActivityResult(requestCode, resultCode, data);
+
+            ActivityResult?.Invoke(requestCode, resultCode, data);
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/AvaloniaSplashActivity.cs b/src/Android/Avalonia.Android/AvaloniaSplashActivity.cs
new file mode 100644
index 0000000000..5b5ebd1bd9
--- /dev/null
+++ b/src/Android/Avalonia.Android/AvaloniaSplashActivity.cs
@@ -0,0 +1,34 @@
+using Android.OS;
+using AndroidX.AppCompat.App;
+using AndroidX.Lifecycle;
+
+namespace Avalonia.Android
+{
+    public abstract class AvaloniaSplashActivity : AppCompatActivity
+    {
+        protected abstract AppBuilder CreateAppBuilder();
+
+        protected override void OnCreate(Bundle? savedInstanceState)
+        {
+            base.OnCreate(savedInstanceState);
+
+            var builder = CreateAppBuilder();
+
+            var lifetime = new SingleViewLifetime();
+
+            builder.SetupWithLifetime(lifetime);
+        }
+    }
+
+    public abstract class AvaloniaSplashActivity<TApp> : AvaloniaSplashActivity where TApp : Application, new()
+    {
+        protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder.UseAndroid();
+
+        protected override AppBuilder CreateAppBuilder()
+        {
+            var builder = AppBuilder.Configure<TApp>();
+
+            return CustomizeAppBuilder(builder);
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index 8de3657283..5267843bfc 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -12,19 +12,22 @@ namespace Avalonia.Android
 {
     public class AvaloniaView : FrameLayout
     {
-        private readonly EmbeddableControlRoot _root;
+        private EmbeddableControlRoot _root;
         private readonly ViewImpl _view;
 
-        private IDisposable? _timerSubscription;
+        private IDisposable _timerSubscription;
 
         public AvaloniaView(Context context) : base(context)
         {
-            _view = new ViewImpl(context);
+            _view = new ViewImpl(this);
             AddView(_view.View);
+
             _root = new EmbeddableControlRoot(_view);
             _root.Prepare();
         }
 
+        internal TopLevelImpl TopLevelImpl => _view;
+
         public object Content
         {
             get { return _root.Content; }
@@ -68,7 +71,7 @@ namespace Avalonia.Android
 
         class ViewImpl : TopLevelImpl
         {
-            public ViewImpl(Context context) : base(context)
+            public ViewImpl(AvaloniaView avaloniaView) : base(avaloniaView)
             {
                 View.Focusable = true;
                 View.FocusChange += ViewImpl_FocusChange;
diff --git a/src/Android/Avalonia.Android/AvaloniaViewModel.cs b/src/Android/Avalonia.Android/AvaloniaViewModel.cs
deleted file mode 100644
index 1b2c00987a..0000000000
--- a/src/Android/Avalonia.Android/AvaloniaViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Android
-{
-    internal class AvaloniaViewModel : AndroidX.Lifecycle.ViewModel
-    {
-        public object Content { get; set; }
-    }
-}
diff --git a/src/Android/Avalonia.Android/ChoreographerTimer.cs b/src/Android/Avalonia.Android/ChoreographerTimer.cs
index 1d898261a3..19dc7b4ab6 100644
--- a/src/Android/Avalonia.Android/ChoreographerTimer.cs
+++ b/src/Android/Avalonia.Android/ChoreographerTimer.cs
@@ -29,6 +29,9 @@ namespace Avalonia.Android
             _thread = new Thread(Loop);
             _thread.Start();
         }
+        
+        
+        public bool RunsInBackground => true;
 
         public event Action<TimeSpan> Tick
         {
diff --git a/src/Android/Avalonia.Android/IActivityResultHandler.cs b/src/Android/Avalonia.Android/IActivityResultHandler.cs
new file mode 100644
index 0000000000..14094ee185
--- /dev/null
+++ b/src/Android/Avalonia.Android/IActivityResultHandler.cs
@@ -0,0 +1,11 @@
+using System;
+using Android.App;
+using Android.Content;
+
+namespace Avalonia.Android
+{
+    public interface IActivityResultHandler
+    {
+        public Action<int, Result, Intent> ActivityResult { get; set; }
+    }
+}
diff --git a/src/Android/Avalonia.Android/IInitEditorInfo.cs b/src/Android/Avalonia.Android/IInitEditorInfo.cs
index 98fc4eafc1..46597c1367 100644
--- a/src/Android/Avalonia.Android/IInitEditorInfo.cs
+++ b/src/Android/Avalonia.Android/IInitEditorInfo.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Android.Views.InputMethods;
+using Avalonia.Android.Platform.SkiaPlatform;
 
 namespace Avalonia.Android
 {
-    interface IInitEditorInfo
+    internal interface IInitEditorInfo
     {
-        void InitEditorInfo(Action<EditorInfo> init);
+        void InitEditorInfo(Func<TopLevelImpl, EditorInfo, IInputConnection> init);
     }
 }
diff --git a/src/Android/Avalonia.Android/OpenGL/GlPlatformSurface.cs b/src/Android/Avalonia.Android/OpenGL/GlPlatformSurface.cs
index a9710039f8..e85ed11028 100644
--- a/src/Android/Avalonia.Android/OpenGL/GlPlatformSurface.cs
+++ b/src/Android/Avalonia.Android/OpenGL/GlPlatformSurface.cs
@@ -1,4 +1,5 @@
-using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 
 namespace Avalonia.Android.OpenGL
@@ -19,7 +20,8 @@ namespace Avalonia.Android.OpenGL
 
         public static GlPlatformSurface TryCreate(IEglWindowGlPlatformSurfaceInfo info)
         {
-            if (EglPlatformOpenGlInterface.TryCreate() is EglPlatformOpenGlInterface egl)
+            var feature = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+            if (feature is EglPlatformOpenGlInterface egl)
             {
                 return new GlPlatformSurface(egl, info);
             }
diff --git a/src/Android/Avalonia.Android/Platform/AndroidNativeControlHostImpl.cs b/src/Android/Avalonia.Android/Platform/AndroidNativeControlHostImpl.cs
new file mode 100644
index 0000000000..4738bd86f9
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/AndroidNativeControlHostImpl.cs
@@ -0,0 +1,139 @@
+#nullable enable
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+using Android.Views;
+using Android.Widget;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+namespace Avalonia.Android.Platform
+{
+    internal class AndroidNativeControlHostImpl : INativeControlHostImpl
+    {
+        private readonly AvaloniaView _avaloniaView;
+
+        public AndroidNativeControlHostImpl(AvaloniaView avaloniaView)
+        {
+            _avaloniaView = avaloniaView;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            return new AndroidViewControlHandle(new FrameLayout(_avaloniaView.Context!));
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var parent = new AndroidViewControlHandle(_avaloniaView);
+            AndroidNativeControlAttachment? attachment = null;
+            try
+            {
+                var child = create(parent);
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+#pragma warning disable IDE0017 // Simplify object initialization
+                attachment = new AndroidNativeControlAttachment(child);
+#pragma warning restore IDE0017 // Simplify object initialization
+                attachment.AttachedTo = this;
+                return attachment;
+            }
+            catch
+            {
+                attachment?.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            return new AndroidNativeControlAttachment(handle)
+            {
+                AttachedTo = this
+            };
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == AndroidViewControlHandle.AndroidDescriptor;
+
+        private class AndroidNativeControlAttachment : INativeControlHostControlTopLevelAttachment
+        {
+            private View? _view;
+            private AndroidNativeControlHostImpl? _attachedTo;
+
+            public AndroidNativeControlAttachment(IPlatformHandle child)
+            {
+                _view = (child as AndroidViewControlHandle)?.View
+                    ?? Java.Lang.Object.GetObject<View>(child.Handle, global::Android.Runtime.JniHandleOwnership.DoNotTransfer);
+            }
+
+            [MemberNotNull(nameof(_view))]
+            private void CheckDisposed()
+            {
+                if (_view == null)
+                    throw new ObjectDisposedException(nameof(AndroidNativeControlAttachment));
+            }
+
+            public void Dispose()
+            {
+                if (_view != null && _attachedTo?._avaloniaView is ViewGroup parent)
+                {
+                    parent.RemoveView(_view);
+                }
+                _attachedTo = null;
+                _view?.Dispose();
+                _view = null;
+            }
+
+            public INativeControlHostImpl? AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    CheckDisposed();
+
+                    var oldAttachedTo = _attachedTo;
+                    _attachedTo = (AndroidNativeControlHostImpl?)value;
+                    if (_attachedTo == null)
+                    {
+                        oldAttachedTo?._avaloniaView.RemoveView(_view);
+                    }
+                    else
+                    {
+                        _attachedTo._avaloniaView.AddView(_view);
+                    }
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is AndroidNativeControlHostImpl;
+
+            public void HideWithSize(Size size)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    return;
+
+                size *= _attachedTo._avaloniaView.TopLevelImpl.RenderScaling;
+                _view.Visibility = ViewStates.Gone;
+                _view.LayoutParameters = new FrameLayout.LayoutParams(Math.Max(1, (int)size.Width), Math.Max(1, (int)size.Height));
+                _view.RequestLayout();
+            }
+
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("The control isn't currently attached to a toplevel");
+
+                bounds *= _attachedTo._avaloniaView.TopLevelImpl.RenderScaling;
+                _view.Visibility = ViewStates.Visible;
+                _view.LayoutParameters = new FrameLayout.LayoutParams(Math.Max(1, (int)bounds.Width), Math.Max(1, (int)bounds.Height))
+                {
+                    LeftMargin = (int)bounds.X,
+                    TopMargin = (int)bounds.Y
+                };
+                _view.RequestLayout();
+            }
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 34784612f1..33501ece06 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -2,18 +2,22 @@ using System;
 using Android.Content;
 using Android.Graphics;
 using Android.OS;
+using Android.Runtime;
 using Android.Util;
 using Android.Views;
+using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle
+    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
     {
         bool _invalidateQueued;
         readonly object _lock = new object();
         private readonly Handler _handler;
-   
+
+        IntPtr IPlatformHandle.Handle =>
+            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, Holder.Surface.Handle);
 
         public InvalidationAwareSurfaceView(Context context) : base(context)
         {
@@ -25,7 +29,7 @@ namespace Avalonia.Android
         {
             lock (_lock)
             {
-                if(_invalidateQueued)
+                if (_invalidateQueued)
                     return;
                 _handler.Post(() =>
                 {
@@ -43,18 +47,6 @@ namespace Avalonia.Android
             }
         }
 
-        [Obsolete("deprecated")]
-        public override void Invalidate(global::Android.Graphics.Rect dirty)
-        {
-            Invalidate();
-        }
-
-        [Obsolete("deprecated")]
-        public override void Invalidate(int l, int t, int r, int b)
-        {
-            Invalidate();
-        }
-
         public void SurfaceChanged(ISurfaceHolder holder, Format format, int width, int height)
         {
             Log.Info("AVALONIA", "Surface Changed");
@@ -70,7 +62,7 @@ namespace Avalonia.Android
         public void SurfaceDestroyed(ISurfaceHolder holder)
         {
             Log.Info("AVALONIA", "Surface Destroyed");
-            
+
         }
 
         protected void DoDraw()
@@ -83,5 +75,9 @@ namespace Avalonia.Android
         }
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
+
+        public PixelSize Size => new PixelSize(Holder.SurfaceFrame.Width(), Holder.SurfaceFrame.Height());
+
+        public double Scaling => Resources.DisplayMetrics.Density;
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 0afb1db141..5f53eb36c8 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -1,13 +1,17 @@
 using System;
 using System.Collections.Generic;
+using Android.App;
 using Android.Content;
 using Android.Graphics;
+using Android.OS;
 using Android.Runtime;
+using Android.Text;
 using Android.Views;
 using Android.Views.InputMethods;
 using Avalonia.Android.OpenGL;
 using Avalonia.Android.Platform.Specific;
 using Avalonia.Android.Platform.Specific.Helpers;
+using Avalonia.Android.Platform.Storage;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Platform.Surfaces;
@@ -17,35 +21,41 @@ using Avalonia.Input.TextInput;
 using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Java.Lang;
+using Math = System.Math;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, ITopLevelImplWithTextInputMethod
+    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo,
+        ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost, ITopLevelImplWithStorageProvider
     {
         private readonly IGlPlatformSurface _gl;
         private readonly IFramebufferPlatformSurface _framebuffer;
 
         private readonly AndroidKeyboardEventsHelper<TopLevelImpl> _keyboardHelper;
-        private readonly AndroidTouchEventsHelper<TopLevelImpl> _touchHelper;
-        private readonly ITextInputMethodImpl _textInputMethod;
+        private readonly AndroidMotionEventsHelper _pointerHelper;
+        private readonly AndroidInputMethod<ViewImpl> _textInputMethod;
         private ViewImpl _view;
 
-        public TopLevelImpl(Context context, bool placeOnTop = false)
+        public TopLevelImpl(AvaloniaView avaloniaView, bool placeOnTop = false)
         {
-            _view = new ViewImpl(context, this, placeOnTop);
+            _view = new ViewImpl(avaloniaView.Context, this, placeOnTop);
             _textInputMethod = new AndroidInputMethod<ViewImpl>(_view);
             _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this);
-            _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
-                GetAvaloniaPointFromEvent);
-
+            _pointerHelper = new AndroidMotionEventsHelper(this);
             _gl = GlPlatformSurface.TryCreate(this);
             _framebuffer = new FramebufferManager(this);
 
-            RenderScaling = (int)_view.Resources.DisplayMetrics.Density;
+            RenderScaling = _view.Scaling;
 
             MaxClientSize = new PixelSize(_view.Resources.DisplayMetrics.WidthPixels,
                 _view.Resources.DisplayMetrics.HeightPixels).ToSize(RenderScaling);
+
+            NativeControlHost = new AndroidNativeControlHostImpl(avaloniaView);
+            StorageProvider = new AndroidStorageProvider((Activity)avaloniaView.Context);
         }
 
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e, int pointerIndex) =>
@@ -77,12 +87,14 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public IPlatformHandle Handle => _view;
 
-        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer };
+        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer, Handle };
 
         public IRenderer CreateRenderer(IRenderRoot root) =>
-            AndroidPlatform.Options.UseDeferredRendering
-            ? new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>()) { RenderOnlyOnRenderThread = true }
-            : new ImmediateRenderer(root);
+            AndroidPlatform.Options.UseCompositor
+                ? new CompositingRenderer(root, AndroidPlatform.Compositor)
+                : AndroidPlatform.Options.UseDeferredRendering
+                    ? new DeferredRenderer(root, AvaloniaLocator.Current.GetRequiredService<IRenderLoop>()) { RenderOnlyOnRenderThread = true }
+                    : new ImmediateRenderer(root);
 
         public virtual void Hide()
         {
@@ -141,22 +153,56 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             private readonly TopLevelImpl _tl;
             private Size _oldSize;
-            public ViewImpl(Context context,  TopLevelImpl tl, bool placeOnTop) : base(context)
+
+            public ViewImpl(Context context, TopLevelImpl tl, bool placeOnTop) : base(context)
             {
                 _tl = tl;
                 if (placeOnTop)
                     SetZOrderOnTop(true);
             }
 
+            public TopLevelImpl TopLevelImpl => _tl;
+
             protected override void Draw()
             {
                 _tl.Draw();
             }
 
+            protected override void DispatchDraw(global::Android.Graphics.Canvas canvas)
+            {
+                // Workaround issue #9230 on where screen remains gray after splash screen.
+                // base.DispatchDraw should punch a hole into the canvas so the surface
+                // can be seen below, but it does not.
+                if (OperatingSystem.IsAndroidVersionAtLeast(29))
+                {
+                    // Android 10+ does this (BlendMode was new)
+                    var paint = new Paint();
+                    paint.SetColor(0);
+                    paint.BlendMode = BlendMode.Clear;
+                    canvas.DrawRect(0, 0, Width, Height, paint);
+                }
+                else
+                {
+                    // Android 9 did this
+                    canvas.DrawColor(Color.Transparent, PorterDuff.Mode.Clear);
+                }
+
+                base.DispatchDraw(canvas);
+            }
+
+            protected override bool DispatchGenericPointerEvent(MotionEvent e)
+            {
+                bool callBase;
+                bool? result = _tl._pointerHelper.DispatchMotionEvent(e, out callBase);
+                bool baseResult = callBase ? base.DispatchGenericPointerEvent(e) : false;
+
+                return result != null ? result.Value : baseResult;
+            }
+
             public override bool DispatchTouchEvent(MotionEvent e)
             {
                 bool callBase;
-                bool? result = _tl._touchHelper.DispatchTouchEvent(e, out callBase);
+                bool? result = _tl._pointerHelper.DispatchMotionEvent(e, out callBase);
                 bool baseResult = callBase ? base.DispatchTouchEvent(e) : false;
 
                 return result != null ? result.Value : baseResult;
@@ -171,7 +217,6 @@ namespace Avalonia.Android.Platform.SkiaPlatform
                 return res != null ? res.Value : baseResult;
             }
 
-
             void ISurfaceHolderCallback.SurfaceChanged(ISurfaceHolder holder, Format format, int width, int height)
             {
                 var newSize = new PixelSize(width, height).ToSize(_tl.RenderScaling);
@@ -190,9 +235,9 @@ namespace Avalonia.Android.Platform.SkiaPlatform
                 return true;
             }
 
-            private Action<EditorInfo> _initEditorInfo;
+            private Func<TopLevelImpl, EditorInfo, IInputConnection> _initEditorInfo;
 
-            public void InitEditorInfo(Action<EditorInfo> init)
+            public void InitEditorInfo(Func<TopLevelImpl, EditorInfo, IInputConnection> init)
             {
                 _initEditorInfo = init;
             }
@@ -200,9 +245,11 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             public sealed override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
             {
                 if (_initEditorInfo != null)
-                    _initEditorInfo(outAttrs);
-
-                return base.OnCreateInputConnection(outAttrs);
+                {
+                    return _initEditorInfo(_tl, outAttrs);
+                }
+                   
+                return null;
             }
 
         }
@@ -216,18 +263,195 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);
 
-        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle =>
-            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, _view.Holder.Surface.Handle);
+        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle => ((IPlatformHandle)_view).Handle;
 
-        public PixelSize Size => new PixelSize(_view.Holder.SurfaceFrame.Width(), _view.Holder.SurfaceFrame.Height());
+        public PixelSize Size => _view.Size;
 
         public double Scaling => RenderScaling;
 
         public ITextInputMethodImpl TextInputMethod => _textInputMethod;
 
+        public INativeControlHostImpl NativeControlHost { get; }
+        
+        public IStorageProvider StorageProvider { get; }
+
         public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
         {
             throw new NotImplementedException();
         }
     }
+
+    internal class AvaloniaInputConnection : BaseInputConnection
+    {
+        private readonly TopLevelImpl _topLevel;
+        private readonly IAndroidInputMethod _inputMethod;
+
+        public AvaloniaInputConnection(TopLevelImpl topLevel, IAndroidInputMethod inputMethod) : base(inputMethod.View, true)
+        {
+            _topLevel = topLevel;
+            _inputMethod = inputMethod;
+        }
+
+        public TextInputMethodSurroundingText SurroundingText { get; set; }
+
+        public string ComposingText { get; internal set; }
+
+        public ComposingRegion? ComposingRegion { get; internal set; }
+
+        public bool IsComposing => !string.IsNullOrEmpty(ComposingText);
+        public bool IsCommiting { get; private set; }
+
+        public override bool SetComposingRegion(int start, int end)
+        {
+            //System.Diagnostics.Debug.WriteLine($"Composing Region: [{start}|{end}] {SurroundingText.Text?.Substring(start, end - start)}");
+
+            ComposingRegion = new ComposingRegion(start, end);
+
+            return base.SetComposingRegion(start, end);
+        }
+
+        public override bool SetComposingText(ICharSequence text, int newCursorPosition)
+        {
+            var composingText = text.ToString();
+
+            ComposingText = composingText;
+
+            _inputMethod.Client?.SetPreeditText(ComposingText);
+
+            return base.SetComposingText(text, newCursorPosition);
+        }
+
+        public override bool FinishComposingText()
+        {
+            if (!string.IsNullOrEmpty(ComposingText))
+            {
+                CommitText(ComposingText, ComposingText.Length);
+            }
+            else
+            {
+                ComposingRegion = new ComposingRegion(SurroundingText.CursorOffset, SurroundingText.CursorOffset);
+            }
+
+            return base.FinishComposingText();
+        }
+
+        public override ICharSequence GetTextBeforeCursorFormatted(int length, [GeneratedEnum] GetTextFlags flags)
+        {
+            if (!string.IsNullOrEmpty(SurroundingText.Text) && length > 0)
+            {
+                var start = System.Math.Max(SurroundingText.CursorOffset - length, 0);
+
+                var end = System.Math.Min(start + length - 1, SurroundingText.CursorOffset);
+
+                var text = SurroundingText.Text.Substring(start, end - start);
+
+                //System.Diagnostics.Debug.WriteLine($"Text Before: {text}");
+
+                return new Java.Lang.String(text);
+            }
+
+            return null;
+        }
+
+        public override ICharSequence GetTextAfterCursorFormatted(int length, [GeneratedEnum] GetTextFlags flags)
+        {
+            if (!string.IsNullOrEmpty(SurroundingText.Text))
+            {
+                var start = SurroundingText.CursorOffset;
+
+                var end = System.Math.Min(start + length, SurroundingText.Text.Length);
+
+                var text = SurroundingText.Text.Substring(start, end - start);
+
+                //System.Diagnostics.Debug.WriteLine($"Text After: {text}");
+
+                return new Java.Lang.String(text);
+            }
+
+            return null;
+        }
+
+        public override bool CommitText(ICharSequence text, int newCursorPosition)
+        {
+            IsCommiting = true;
+            var committedText = text.ToString();
+
+            _inputMethod.Client.SetPreeditText(null);
+
+            int? start, end;
+
+            if(SurroundingText.CursorOffset != SurroundingText.AnchorOffset)
+            {
+                start = Math.Min(SurroundingText.CursorOffset, SurroundingText.AnchorOffset);
+                end = Math.Max(SurroundingText.CursorOffset, SurroundingText.AnchorOffset);
+            }
+            else if (ComposingRegion != null)
+            {
+                start = ComposingRegion?.Start;
+                end = ComposingRegion?.End;
+
+                ComposingRegion = null;
+            }
+            else
+            {
+                start = end = _inputMethod.Client.SurroundingText.CursorOffset;
+            }
+
+            _inputMethod.Client.SelectInSurroundingText((int)start, (int)end);
+
+            var time = DateTime.Now.TimeOfDay;
+
+            var rawTextEvent = new RawTextInputEventArgs(KeyboardDevice.Instance, (ulong)time.Ticks, _topLevel.InputRoot, committedText);
+
+            _topLevel.Input(rawTextEvent);
+
+            ComposingText = null;
+
+            ComposingRegion = new ComposingRegion(newCursorPosition, newCursorPosition);
+
+            return base.CommitText(text, newCursorPosition);
+        }
+
+        public override bool DeleteSurroundingText(int beforeLength, int afterLength)
+        {
+            var surroundingText = _inputMethod.Client.SurroundingText;
+
+            var selectionStart = surroundingText.CursorOffset;
+
+            _inputMethod.Client.SelectInSurroundingText(selectionStart - beforeLength, selectionStart + afterLength);
+
+            _inputMethod.View.DispatchKeyEvent(new KeyEvent(KeyEventActions.Down, Keycode.ForwardDel));
+
+            surroundingText = _inputMethod.Client.SurroundingText;
+
+            selectionStart = surroundingText.CursorOffset;
+
+            ComposingRegion = new ComposingRegion(selectionStart, selectionStart);
+
+            return base.DeleteSurroundingText(beforeLength, afterLength);
+        }
+
+        public override bool SetSelection(int start, int end)
+        {
+            _inputMethod.Client.SelectInSurroundingText(start, end);
+
+            ComposingRegion = new ComposingRegion(start, end);
+
+            return base.SetSelection(start, end);
+        }
+
+        public override bool PerformEditorAction([GeneratedEnum] ImeAction actionCode)
+        {
+            switch (actionCode)
+            {
+                case ImeAction.Done:
+                    {
+                        _inputMethod.IMM.HideSoftInputFromWindow(_inputMethod.View.WindowToken, HideSoftInputFlags.ImplicitOnly);
+                        break;
+                    }
+            }
+
+            return base.PerformEditorAction(actionCode);
+        }
+    }
 }
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 2b2a9dd2b4..57f6469a42 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return DispatchKeyEventInternal(e, out callBase);
         }
 
-        string? UnicodeTextInput(KeyEvent keyEvent)
+        string UnicodeTextInput(KeyEvent keyEvent)
         {
             return keyEvent.Action == KeyEventActions.Multiple
                 && keyEvent.RepeatCount == 0
@@ -63,7 +63,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             {
                 var rawTextEvent = new RawTextInputEventArgs(
                   AndroidKeyboardDevice.Instance,
-                  Convert.ToUInt32(e.EventTime),
+                  Convert.ToUInt64(e.EventTime),
                   _view.InputRoot,
                   unicodeTextInput ?? Convert.ToChar(e.UnicodeChar).ToString()
                   );
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidMotionEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidMotionEventsHelper.cs
new file mode 100644
index 0000000000..6d0e6be0ad
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidMotionEventsHelper.cs
@@ -0,0 +1,251 @@
+using System;
+using System.Collections.Generic;
+
+using Android.Views;
+
+using Avalonia.Android.Platform.SkiaPlatform;
+using Avalonia.Collections.Pooled;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+
+#nullable enable
+
+namespace Avalonia.Android.Platform.Specific.Helpers
+{
+    internal class AndroidMotionEventsHelper : IDisposable
+    {
+        private static readonly PooledList<RawPointerPoint> s_intermediatePointsPooledList = new(ClearMode.Never);
+        private const float RadiansToDegree = (float)(180f * Math.PI);
+        private readonly TouchDevice _touchDevice;
+        private readonly MouseDevice _mouseDevice;
+        private readonly PenDevice _penDevice;
+        private readonly TopLevelImpl _view;
+        private bool _disposed;
+
+        public AndroidMotionEventsHelper(TopLevelImpl view)
+        {
+            _touchDevice = new TouchDevice();
+            _penDevice = new PenDevice();
+            _mouseDevice = new MouseDevice();
+            _view = view;
+        }
+
+        public bool? DispatchMotionEvent(MotionEvent e, out bool callBase)
+        {
+            callBase = true;
+            if (_disposed)
+            {
+                return null;
+            }
+
+            var eventTime = (ulong)DateTime.Now.Millisecond;
+            var inputRoot = _view.InputRoot;
+            var actionMasked = e.ActionMasked;
+            var modifiers = GetModifiers(e.MetaState, e.ButtonState);
+
+            if (actionMasked == MotionEventActions.Move)
+            {
+                for (int index = 0; index < e.PointerCount; index++)
+                {
+                    var toolType = e.GetToolType(index);
+                    var device = GetDevice(toolType);
+                    var eventType = toolType == MotionEventToolType.Finger ? RawPointerEventType.TouchUpdate : RawPointerEventType.Move;
+                    var point = CreatePoint(e, index);
+                    modifiers |= GetToolModifiers(toolType);
+
+                    // ButtonState reports only mouse buttons, but not touch or stylus pointer.
+                    if (toolType != MotionEventToolType.Mouse)
+                    {
+                        modifiers |= RawInputModifiers.LeftMouseButton;
+                    }
+
+                    var args = new RawTouchEventArgs(device, eventTime, inputRoot, eventType, point, modifiers, e.GetPointerId(index))
+                    {
+                        IntermediatePoints = new Lazy<IReadOnlyList<RawPointerPoint>?>(() =>
+                        {
+                            var site = e.HistorySize;
+                            s_intermediatePointsPooledList.Clear();
+                            s_intermediatePointsPooledList.Capacity = site;
+
+                            for (int pos = 0; pos < site; pos++)
+                            {
+                                s_intermediatePointsPooledList.Add(CreateHistoricalPoint(e, index, pos));
+                            }
+
+                            return s_intermediatePointsPooledList;
+                        })
+                    };
+                    _view.Input(args);
+                }
+            }
+            else
+            {
+                var index = e.ActionIndex;
+                var toolType = e.GetToolType(index);
+                var device = GetDevice(toolType);
+                modifiers |= GetToolModifiers(toolType);
+                var point = CreatePoint(e, index);
+
+                if (actionMasked == MotionEventActions.Scroll && toolType == MotionEventToolType.Mouse)
+                {
+                    var delta = new Vector(e.GetAxisValue(Axis.Hscroll), e.GetAxisValue(Axis.Vscroll));
+                    var args = new RawMouseWheelEventArgs(device, eventTime, inputRoot, point.Position, delta, RawInputModifiers.None);
+                    _view.Input(args);
+                }
+                else
+                {
+                    var eventType = GetActionType(e, actionMasked, toolType);
+                    if (eventType >= 0)
+                    {
+                        var args = new RawTouchEventArgs(device, eventTime, inputRoot, eventType, point, modifiers, e.GetPointerId(index));
+                        _view.Input(args);
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        private static RawInputModifiers GetModifiers(MetaKeyStates metaState, MotionEventButtonState buttonState)
+        {
+            var modifiers = RawInputModifiers.None;
+            if (metaState.HasAnyFlag(MetaKeyStates.ShiftOn))
+            {
+                modifiers |= RawInputModifiers.Shift;
+            }
+            if (metaState.HasAnyFlag(MetaKeyStates.CtrlOn))
+            {
+                modifiers |= RawInputModifiers.Control;
+            }
+            if (metaState.HasAnyFlag(MetaKeyStates.AltOn))
+            {
+                modifiers |= RawInputModifiers.Alt;
+            }
+            if (metaState.HasAnyFlag(MetaKeyStates.MetaOn))
+            {
+                modifiers |= RawInputModifiers.Meta;
+            }
+            if (buttonState.HasAnyFlag(MotionEventButtonState.Primary))
+            {
+                modifiers |= RawInputModifiers.LeftMouseButton;
+            }
+            if (buttonState.HasAnyFlag(MotionEventButtonState.Secondary))
+            {
+                modifiers |= RawInputModifiers.RightMouseButton;
+            }
+            if (buttonState.HasAnyFlag(MotionEventButtonState.Tertiary))
+            {
+                modifiers |= RawInputModifiers.MiddleMouseButton;
+            }
+            if (buttonState.HasAnyFlag(MotionEventButtonState.Back))
+            {
+                modifiers |= RawInputModifiers.XButton1MouseButton;
+            }
+            if (buttonState.HasAnyFlag(MotionEventButtonState.Forward))
+            {
+                modifiers |= RawInputModifiers.XButton2MouseButton;
+            }
+            if (buttonState.HasAnyFlag(MotionEventButtonState.StylusPrimary))
+            {
+                modifiers |= RawInputModifiers.PenBarrelButton;
+            }
+            return modifiers;
+        }
+
+#pragma warning disable CA1416 // Validate platform compatibility
+        private static RawPointerEventType GetActionType(MotionEvent e, MotionEventActions actionMasked, MotionEventToolType toolType)
+        {
+            var isTouch = toolType == MotionEventToolType.Finger;
+            var isMouse = toolType == MotionEventToolType.Mouse;
+            switch (actionMasked)
+            {
+                // DOWN
+                case MotionEventActions.Down when !isMouse:
+                case MotionEventActions.PointerDown when !isMouse:
+                    return isTouch ? RawPointerEventType.TouchBegin : RawPointerEventType.LeftButtonDown;
+                case MotionEventActions.ButtonPress:
+                    return e.ActionButton switch
+                    {
+                        MotionEventButtonState.Back => RawPointerEventType.XButton1Down,
+                        MotionEventButtonState.Forward => RawPointerEventType.XButton2Down,
+                        MotionEventButtonState.Primary => RawPointerEventType.LeftButtonDown,
+                        MotionEventButtonState.Secondary => RawPointerEventType.RightButtonDown,
+                        MotionEventButtonState.StylusPrimary => RawPointerEventType.LeftButtonDown,
+                        MotionEventButtonState.StylusSecondary => RawPointerEventType.RightButtonDown,
+                        MotionEventButtonState.Tertiary => RawPointerEventType.MiddleButtonDown,
+                        _ => RawPointerEventType.LeftButtonDown
+                    };
+                // UP
+                case MotionEventActions.Up when !isMouse:
+                case MotionEventActions.PointerUp when !isMouse:
+                    return isTouch ? RawPointerEventType.TouchEnd : RawPointerEventType.LeftButtonUp;
+                case MotionEventActions.ButtonRelease:
+                    return e.ActionButton switch
+                    {
+                        MotionEventButtonState.Back => RawPointerEventType.XButton1Up,
+                        MotionEventButtonState.Forward => RawPointerEventType.XButton2Up,
+                        MotionEventButtonState.Primary => RawPointerEventType.LeftButtonUp,
+                        MotionEventButtonState.Secondary => RawPointerEventType.RightButtonUp,
+                        MotionEventButtonState.StylusPrimary => RawPointerEventType.LeftButtonUp,
+                        MotionEventButtonState.StylusSecondary => RawPointerEventType.RightButtonUp,
+                        MotionEventButtonState.Tertiary => RawPointerEventType.MiddleButtonUp,
+                        _ => RawPointerEventType.LeftButtonUp
+                    };
+                // MOVE
+                case MotionEventActions.Outside:
+                case MotionEventActions.HoverMove:
+                case MotionEventActions.Move:
+                    return isTouch ? RawPointerEventType.TouchUpdate : RawPointerEventType.Move;
+                // CANCEL
+                case MotionEventActions.Cancel:
+                    return isTouch ? RawPointerEventType.TouchCancel : RawPointerEventType.LeaveWindow;
+                default:
+                    return (RawPointerEventType)(-1);
+            }
+        }
+#pragma warning restore CA1416 // Validate platform compatibility
+
+        private IPointerDevice GetDevice(MotionEventToolType type)
+        {
+            return type switch
+            {
+                MotionEventToolType.Mouse => _mouseDevice,
+                MotionEventToolType.Stylus => _penDevice,
+                MotionEventToolType.Eraser => _penDevice,
+                MotionEventToolType.Finger => _touchDevice,
+                _ => _touchDevice
+            };
+        }
+
+        private RawPointerPoint CreatePoint(MotionEvent e, int index)
+        {
+            return new RawPointerPoint
+            {
+                Position = new Point(e.GetX(index), e.GetY(index)) / _view.RenderScaling,
+                Pressure = Math.Min(e.GetPressure(index), 1), // android pressure can depend on the device, can be mixed up with "GetSize", may be larger than 1.0f on some devices
+                Twist = e.GetOrientation(index) * RadiansToDegree
+            };
+        }
+
+        private RawPointerPoint CreateHistoricalPoint(MotionEvent e, int index, int pos)
+        {
+            return new RawPointerPoint
+            {
+                Position = new Point(e.GetHistoricalX(index, pos), e.GetHistoricalY(index, pos)) / _view.RenderScaling,
+                Pressure = Math.Min(e.GetHistoricalPressure(index, pos), 1),
+                Twist = e.GetHistoricalOrientation(index, pos) * RadiansToDegree
+            };
+        }
+
+        private static RawInputModifiers GetToolModifiers(MotionEventToolType toolType)
+        {
+            // Android "Eraser" indicates Inverted pen OR actual Eraser. So we have to go both here.
+            return toolType == MotionEventToolType.Eraser ? RawInputModifiers.PenInverted | RawInputModifiers.PenEraser : RawInputModifiers.None;
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs
deleted file mode 100644
index 6142598514..0000000000
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using Android.Views;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Platform;
-
-namespace Avalonia.Android.Platform.Specific.Helpers
-{
-    public class AndroidTouchEventsHelper<TView> : IDisposable where TView : ITopLevelImpl, IAndroidView
-    {
-        private TView _view;
-        public bool HandleEvents { get; set; }
-
-        public AndroidTouchEventsHelper(TView view, Func<IInputRoot> getInputRoot, Func<MotionEvent, int, Point> getPointfunc)
-        {
-            this._view = view;
-            HandleEvents = true;
-            _getPointFunc = getPointfunc;
-            _getInputRoot = getInputRoot;
-        }
-
-        private TouchDevice _touchDevice = new TouchDevice();
-        private Func<MotionEvent, int, Point> _getPointFunc;
-        private Func<IInputRoot> _getInputRoot;
-
-        public bool? DispatchTouchEvent(MotionEvent e, out bool callBase)
-        {
-            if (!HandleEvents)
-            {
-                callBase = true;
-                return null;
-            }
-
-            var eventTime = DateTime.Now;
-
-            //Basic touch support
-            var pointerEventType = e.Action switch
-            {
-                MotionEventActions.Down => RawPointerEventType.TouchBegin,
-                MotionEventActions.Up => RawPointerEventType.TouchEnd,
-                MotionEventActions.Cancel => RawPointerEventType.TouchCancel,
-                _ => RawPointerEventType.TouchUpdate
-            };
-
-            if (e.Action.HasFlag(MotionEventActions.PointerDown))
-            {
-                pointerEventType = RawPointerEventType.TouchBegin;
-            }
-
-            if (e.Action.HasFlag(MotionEventActions.PointerUp))
-            {
-                pointerEventType = RawPointerEventType.TouchEnd;
-            }
-
-            for (int i = 0; i < e.PointerCount; i++)
-            {
-                //if point is in view otherwise it's possible avalonia not to find the proper window to dispatch the event
-                var point = _getPointFunc(e, i);
-
-                double x = _view.View.GetX();
-                double y = _view.View.GetY();
-                double r = x + _view.View.Width;
-                double b = y + _view.View.Height;
-
-                if (x <= point.X && r >= point.X && y <= point.Y && b >= point.Y)
-                {
-                    var inputRoot = _getInputRoot();
-
-                    var mouseEvent = new RawTouchEventArgs(_touchDevice, (uint)eventTime.Ticks, inputRoot,
-                        i == e.ActionIndex ? pointerEventType : RawPointerEventType.TouchUpdate, point, RawInputModifiers.None, e.GetPointerId(i));
-                    _view.Input(mouseEvent);
-                }
-            }
-
-            callBase = true;
-            //if return false events for move and up are not received!!!
-            return e.Action != MotionEventActions.Up;
-        }
-
-        public void Dispose()
-        {
-            HandleEvents = false;
-        }
-    }
-}
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
new file mode 100644
index 0000000000..a9b2e16d43
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -0,0 +1,269 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Provider;
+using Avalonia.Logging;
+using Avalonia.Platform.Storage;
+using Java.Lang;
+using AndroidUri = Android.Net.Uri;
+using Exception = System.Exception;
+using JavaFile = Java.IO.File;
+
+namespace Avalonia.Android.Platform.Storage;
+
+internal abstract class AndroidStorageItem : IStorageBookmarkItem
+{
+    private Context? _context;
+
+    protected AndroidStorageItem(Context context, AndroidUri uri)
+    {
+        _context = context;
+        Uri = uri;
+    }
+
+    internal AndroidUri Uri { get; }
+
+    protected Context Context => _context ?? throw new ObjectDisposedException(nameof(AndroidStorageItem));
+
+    public string Name => GetColumnValue(Context, Uri, MediaStore.IMediaColumns.DisplayName)
+                          ?? Uri.PathSegments?.LastOrDefault() ?? string.Empty;
+
+    public bool CanBookmark => true;
+
+    public Task<string?> SaveBookmarkAsync()
+    {
+        Context.ContentResolver?.TakePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
+        return Task.FromResult(Uri.ToString());
+    }
+
+    public Task ReleaseBookmarkAsync()
+    {
+        Context.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
+        return Task.CompletedTask;
+    }
+
+    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
+    {
+        uri = new Uri(Uri.ToString()!);
+        return true;
+    }
+
+    public abstract Task<StorageItemProperties> GetBasicPropertiesAsync();
+
+    protected string? GetColumnValue(Context context, AndroidUri contentUri, string column, string? selection = null, string[]? selectionArgs = null)
+    {
+        try
+        {
+            var projection = new[] { column };
+            using var cursor = context.ContentResolver!.Query(contentUri, projection, selection, selectionArgs, null);
+            if (cursor?.MoveToFirst() == true)
+            {
+                var columnIndex = cursor.GetColumnIndex(column);
+                if (columnIndex != -1)
+                    return cursor.GetString(columnIndex);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?.Log(this, "File metadata reader failed: '{Exception}'", ex);
+        }
+
+        return null;
+    }
+
+    public Task<IStorageFolder?> GetParentAsync()
+    {
+        using var javaFile = new JavaFile(Uri.Path!);
+
+        // Java file represents files AND directories. Don't be confused.
+        if (javaFile.ParentFile is {} parentFile
+            && AndroidUri.FromFile(parentFile) is {} androidUri)
+        {
+            return Task.FromResult<IStorageFolder?>(new AndroidStorageFolder(Context, androidUri));
+        }
+
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public void Dispose()
+    {
+        _context = null;
+    }
+}
+
+internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
+{
+    public AndroidStorageFolder(Context context, AndroidUri uri) : base(context, uri)
+    {
+    }
+
+    public override Task<StorageItemProperties> GetBasicPropertiesAsync()
+    {
+        return Task.FromResult(new StorageItemProperties());
+    }
+
+    public async Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+        using var javaFile = new JavaFile(Uri.Path!);
+
+        // Java file represents files AND directories. Don't be confused.
+        var files = await javaFile.ListFilesAsync().ConfigureAwait(false);
+        if (files is null)
+        {
+            return Array.Empty<IStorageItem>();
+        }
+
+        return files
+            .Select(f => (file: f, uri: AndroidUri.FromFile(f)))
+            .Where(t => t.uri is not null)
+            .Select(t => t.file switch
+            {
+                { IsFile: true } => (IStorageItem)new AndroidStorageFile(Context, t.uri!),
+                { IsDirectory: true } => new AndroidStorageFolder(Context, t.uri!),
+                _ => null
+            })
+            .Where(i => i is not null)
+            .ToArray()!;
+    }
+}
+
+internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkFile
+{
+    public AndroidStorageFile(Context context, AndroidUri uri) : base(context, uri)
+    {
+    }
+
+    public bool CanOpenRead => true;
+
+    public bool CanOpenWrite => true;
+
+    public Task<Stream> OpenReadAsync() => Task.FromResult(OpenContentStream(Context, Uri, false)
+        ?? throw new InvalidOperationException("Failed to open content stream"));
+
+    public Task<Stream> OpenWriteAsync() => Task.FromResult(OpenContentStream(Context, Uri, true)
+        ?? throw new InvalidOperationException("Failed to open content stream"));
+
+    private Stream? OpenContentStream(Context context, AndroidUri uri, bool isOutput)
+    {
+        var isVirtual = IsVirtualFile(context, uri);
+        if (isVirtual)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?.Log(this, "Content URI was virtual: '{Uri}'", uri);
+            return GetVirtualFileStream(context, uri, isOutput);
+        }
+
+        return isOutput
+            ? context.ContentResolver?.OpenOutputStream(uri)
+            : context.ContentResolver?.OpenInputStream(uri);
+    }
+
+    private bool IsVirtualFile(Context context, AndroidUri uri)
+    {
+        if (!DocumentsContract.IsDocumentUri(context, uri))
+            return false;
+
+        var value = GetColumnValue(context, uri, DocumentsContract.Document.ColumnFlags);
+        if (!string.IsNullOrEmpty(value) && int.TryParse(value, out var flagsInt))
+        {
+            var flags = (DocumentContractFlags)flagsInt;
+            return flags.HasFlag(DocumentContractFlags.VirtualDocument);
+        }
+
+        return false;
+    }
+
+    private Stream? GetVirtualFileStream(Context context, AndroidUri uri, bool isOutput)
+    {
+        var mimeTypes = context.ContentResolver?.GetStreamTypes(uri, FilePickerFileTypes.All.MimeTypes![0]);
+        if (mimeTypes?.Length >= 1)
+        {
+            var mimeType = mimeTypes[0];
+            var asset = context.ContentResolver!
+                .OpenTypedAssetFileDescriptor(uri, mimeType, null);
+
+            var stream = isOutput
+                ? asset?.CreateOutputStream()
+                : asset?.CreateInputStream();
+
+            return stream;
+        }
+
+        return null;
+    }
+
+    public override Task<StorageItemProperties> GetBasicPropertiesAsync()
+    {
+        ulong? size = null;
+        DateTimeOffset? itemDate = null;
+        DateTimeOffset? dateModified = null;
+
+        try
+        {
+            var projection = new[]
+            {
+                MediaStore.IMediaColumns.Size, MediaStore.IMediaColumns.DateAdded,
+                MediaStore.IMediaColumns.DateModified
+            };
+            using var cursor = Context.ContentResolver!.Query(Uri, projection, null, null, null);
+
+            if (cursor?.MoveToFirst() == true)
+            {
+                try
+                {
+                    var columnIndex = cursor.GetColumnIndex(MediaStore.IMediaColumns.Size);
+                    if (columnIndex != -1)
+                    {
+                        size = (ulong)cursor.GetLong(columnIndex);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
+                        .Log(this, "File Size metadata reader failed: '{Exception}'", ex);
+                }
+
+                try
+                {
+                    var columnIndex = cursor.GetColumnIndex(MediaStore.IMediaColumns.DateAdded);
+                    if (columnIndex != -1)
+                    {
+                        var longValue = cursor.GetLong(columnIndex);
+                        itemDate = longValue > 0 ? DateTimeOffset.FromUnixTimeMilliseconds(longValue) : null;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
+                        .Log(this, "File DateAdded metadata reader failed: '{Exception}'", ex);
+                }
+
+                try
+                {
+                    var columnIndex = cursor.GetColumnIndex(MediaStore.IMediaColumns.DateModified);
+                    if (columnIndex != -1)
+                    {
+                        var longValue = cursor.GetLong(columnIndex);
+                        dateModified = longValue > 0 ? DateTimeOffset.FromUnixTimeMilliseconds(longValue) : null;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
+                        .Log(this, "File DateAdded metadata reader failed: '{Exception}'", ex);
+                }
+            }
+        }
+        catch (UnsupportedOperationException)
+        {
+            // It's not possible to get parameters of some files/folders.
+        }
+
+        return Task.FromResult(new StorageItemProperties(size, itemDate, dateModified));
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
new file mode 100644
index 0000000000..62e43ff2ef
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
@@ -0,0 +1,184 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.App;
+using Android.Content;
+using Android.Provider;
+using Avalonia.Platform.Storage;
+using AndroidUri = Android.Net.Uri;
+
+namespace Avalonia.Android.Platform.Storage;
+
+internal class AndroidStorageProvider : IStorageProvider
+{
+    private readonly Activity _activity;
+    private int _lastRequestCode = 20000;
+
+    public AndroidStorageProvider(Activity activity)
+    {
+        _activity = activity;
+    }
+
+    public bool CanOpen => OperatingSystem.IsAndroidVersionAtLeast(19);
+
+    public bool CanSave => OperatingSystem.IsAndroidVersionAtLeast(19);
+
+    public bool CanPickFolder => OperatingSystem.IsAndroidVersionAtLeast(21);
+
+    public Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark)
+    {
+        var uri = AndroidUri.Parse(bookmark) ?? throw new ArgumentException("Couldn't parse Bookmark value", nameof(bookmark));
+        return Task.FromResult<IStorageBookmarkFolder?>(new AndroidStorageFolder(_activity, uri));
+    }
+
+    public Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark)
+    {
+        var uri = AndroidUri.Parse(bookmark) ?? throw new ArgumentException("Couldn't parse Bookmark value", nameof(bookmark));
+        return Task.FromResult<IStorageBookmarkFile?>(new AndroidStorageFile(_activity, uri));
+    }
+
+    public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+    {
+        var mimeTypes = options.FileTypeFilter?.Where(t => t != FilePickerFileTypes.All)
+            .SelectMany(f => f.MimeTypes ?? Array.Empty<string>()).Distinct().ToArray() ?? Array.Empty<string>();
+
+        var intent = new Intent(Intent.ActionOpenDocument)
+            .AddCategory(Intent.CategoryOpenable)
+            .PutExtra(Intent.ExtraAllowMultiple, options.AllowMultiple)
+            .SetType(FilePickerFileTypes.All.MimeTypes![0]);
+        if (mimeTypes.Length > 0)
+        {
+            intent = intent.PutExtra(Intent.ExtraMimeTypes, mimeTypes);
+        }
+
+        if (TryGetInitialUri(options.SuggestedStartLocation) is { } initialUri)
+        {
+            intent = intent.PutExtra(DocumentsContract.ExtraInitialUri, initialUri);
+        }
+
+        var pickerIntent = Intent.CreateChooser(intent, options.Title ?? "Select file");
+
+        var uris = await StartActivity(pickerIntent, false);
+        return uris.Select(u => new AndroidStorageFile(_activity, u)).ToArray();
+    }
+
+    public async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+    {
+        var mimeTypes = options.FileTypeChoices?.Where(t => t != FilePickerFileTypes.All)
+            .SelectMany(f => f.MimeTypes ?? Array.Empty<string>()).Distinct().ToArray() ?? Array.Empty<string>();
+
+        var intent = new Intent(Intent.ActionCreateDocument)
+            .AddCategory(Intent.CategoryOpenable)
+            .SetType(FilePickerFileTypes.All.MimeTypes![0]);
+        if (mimeTypes.Length > 0)
+        {
+            intent = intent.PutExtra(Intent.ExtraMimeTypes, mimeTypes);
+        }
+
+        if (options.SuggestedFileName is { } fileName)
+        {
+            if (options.DefaultExtension is { } ext)
+            {
+                fileName += ext.StartsWith('.') ? ext : "." + ext;
+            }
+            intent = intent.PutExtra(Intent.ExtraTitle, fileName);
+        }
+
+        if (TryGetInitialUri(options.SuggestedStartLocation) is { } initialUri)
+        {
+            intent = intent.PutExtra(DocumentsContract.ExtraInitialUri, initialUri);
+        }
+
+        var pickerIntent = Intent.CreateChooser(intent, options.Title ?? "Save file");
+
+        var uris = await StartActivity(pickerIntent, true);
+        return uris.Select(u => new AndroidStorageFile(_activity, u)).FirstOrDefault();
+    }
+
+    public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+    {
+        var intent = new Intent(Intent.ActionOpenDocumentTree)
+            .PutExtra(Intent.ExtraAllowMultiple, options.AllowMultiple);
+        if (TryGetInitialUri(options.SuggestedStartLocation) is { } initialUri)
+        {
+            intent = intent.PutExtra(DocumentsContract.ExtraInitialUri, initialUri);
+        }
+
+        var pickerIntent = Intent.CreateChooser(intent, options.Title ?? "Select folder");
+
+        var uris = await StartActivity(pickerIntent, false);
+        return uris.Select(u => new AndroidStorageFolder(_activity, u)).ToArray();
+    }
+
+    private async Task<List<AndroidUri>> StartActivity(Intent? pickerIntent, bool singleResult)
+    {
+        var resultList = new List<AndroidUri>(1);
+        var tcs = new TaskCompletionSource<Intent?>();
+        var currentRequestCode = _lastRequestCode++;
+
+        if (_activity is IActivityResultHandler mainActivity)
+        {
+            mainActivity.ActivityResult += OnActivityResult;
+        }
+        _activity.StartActivityForResult(pickerIntent, currentRequestCode);
+
+        var result = await tcs.Task;
+
+        if (result != null)
+        {
+            // ClipData first to avoid issue with multiple files selection.
+            if (!singleResult && result.ClipData is { } clipData)
+            {
+                for (var i = 0; i < clipData.ItemCount; i++)
+                {
+                    var uri = clipData.GetItemAt(i)?.Uri;
+                    if (uri != null)
+                    {
+                        resultList.Add(uri);
+                    }
+                }
+            }
+            else if (result.Data is { } uri)
+            {
+                resultList.Add(uri);
+            }
+        }
+
+        if (result?.HasExtra("error") == true)
+        {
+            throw new Exception(result.GetStringExtra("error"));
+        }
+
+        return resultList;
+
+        void OnActivityResult(int requestCode, Result resultCode, Intent data)
+        {
+            if (currentRequestCode != requestCode)
+            {
+                return;
+            }
+
+
+            if (_activity is IActivityResultHandler mainActivity)
+            {
+                mainActivity.ActivityResult -= OnActivityResult;
+            }
+
+            _ = tcs.TrySetResult(resultCode == Result.Ok ? data : null);
+        }
+    }
+
+    private static AndroidUri? TryGetInitialUri(IStorageFolder? folder)
+    {
+        if (OperatingSystem.IsAndroidVersionAtLeast(26)
+            && (folder as AndroidStorageItem)?.Uri is { } uri)
+        {
+            return uri;
+        }
+
+        return null;
+    }
+}
diff --git a/src/Android/Avalonia.Android/SingleViewLifetime.cs b/src/Android/Avalonia.Android/SingleViewLifetime.cs
new file mode 100644
index 0000000000..eef763a932
--- /dev/null
+++ b/src/Android/Avalonia.Android/SingleViewLifetime.cs
@@ -0,0 +1,26 @@
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace Avalonia.Android
+{
+    internal class SingleViewLifetime : ISingleViewApplicationLifetime
+    {
+        private AvaloniaView _view;
+
+        public AvaloniaView View
+        {
+            get => _view; internal set
+            {
+                if (_view != null)
+                {
+                    _view.Content = null;
+                    _view.Dispose();
+                }
+                _view = value;
+                _view.Content = MainView;
+            }
+        }
+
+        public Control MainView { get; set; }
+    }
+}
diff --git a/src/Android/Avalonia.Android/SystemDialogImpl.cs b/src/Android/Avalonia.Android/SystemDialogImpl.cs
deleted file mode 100644
index 1ed1f688b1..0000000000
--- a/src/Android/Avalonia.Android/SystemDialogImpl.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-
-namespace Avalonia.Android
-{
-    internal class SystemDialogImpl : ISystemDialogImpl
-    {
-        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
deleted file mode 100644
index 8cb7aa1cfd..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
-    <ApplicationId>com.Avalonia.AndroidTestApplication</ApplicationId>
-    <ApplicationVersion>1</ApplicationVersion>
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-    <AndroidPackageFormat>apk</AndroidPackageFormat>
-    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
-    <DebugSymbols>True</DebugSymbols>
-    <RunAOTCompilation>True</RunAOTCompilation>
-    <EnableLLVM>True</EnableLLVM>
-    <!--<AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>-->
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <None Remove="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <BundleAssemblies>True</BundleAssemblies>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <BundleAssemblies>True</BundleAssemblies>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
-    <ProjectReference Include="..\Avalonia.Android\Avalonia.Android.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
deleted file mode 100644
index 471b982d9e..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-using Avalonia.Android;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.Themes.Default;
-
-namespace Avalonia.AndroidTestApplication
-{
-    [Activity(Label = "Main",
-        MainLauncher = true,
-        Icon = "@drawable/icon",
-         Theme = "@style/Theme.AppCompat.NoActionBar",
-         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
-        LaunchMode = LaunchMode.SingleInstance/*,
-        ScreenOrientation = ScreenOrientation.Landscape*/)]
-    public class MainBaseActivity : AvaloniaActivity
-    {
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            if (Avalonia.Application.Current == null)
-            {
-                AppBuilder.Configure<App>()
-                    .UseAndroid()
-                    .SetupWithoutStarting();
-            }
-            base.OnCreate(savedInstanceState);
-            Content = App.CreateSimpleWindow();
-        }
-    }
-
-    public class App : Application
-    {
-        public override void Initialize()
-        {
-            Styles.Add(new DefaultTheme());
-
-            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
-            Styles.Add(baseLight);
-
-
-        }
-
-        // This provides a simple UI tree for testing input handling, drawing, etc
-        public static ContentControl CreateSimpleWindow()
-        {
-            ContentControl window = new ContentControl()
-            {
-                Background = Brushes.Red,
-                Content = new StackPanel
-                {
-                    Margin = new Thickness(30),
-                    Background = Brushes.Yellow,
-                    Children =
-                    {
-                        new TextBlock
-                        {
-                            Text = "TEXT BLOCK",
-                            Width = 300,
-                            Height = 40,
-                            Background = Brushes.White,
-                            Foreground = Brushes.Black
-                        },
-
-                        new Button
-                        {
-                            Content = "BUTTON",
-                            Width = 150,
-                            Height = 40,
-                            Background = Brushes.LightGreen,
-                            Foreground = Brushes.Black
-                        },
-
-                        CreateTextBox(Input.TextInput.TextInputContentType.Normal),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Password),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Email),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Url),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Phone),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Number),
-                    }
-                }
-            };
-
-            return window;
-        }
-
-        private static TextBox CreateTextBox(Input.TextInput.TextInputContentType contentType)
-        {
-            var textBox = new TextBox()
-            {
-                Margin = new Thickness(20, 10),
-                Watermark = contentType.ToString(),
-                BorderThickness = new Thickness(3),
-                FontSize = 20
-            };
-            textBox.TextInputOptionsQuery += (s, e) => { e.ContentType = contentType; };
-
-            return textBox;
-        }
-    }
-}
diff --git a/src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml b/src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml
deleted file mode 100644
index ad8134f628..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:label="Avalonia.AndroidTestApplication" android:icon="@drawable/Icon" android:hardwareAccelerated="true"></application>
-</manifest>
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/AboutResources.txt b/src/Android/Avalonia.AndroidTestApplication/Resources/AboutResources.txt
deleted file mode 100644
index 194ae28a59..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Resources/AboutResources.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.xml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable-hdpi/
-        icon.png
-
-    drawable-ldpi/
-        icon.png
-
-    drawable-mdpi/
-        icon.png
-
-    layout/
-        main.xml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called
-"Resource" that contains the tokens for each one of the resources included. For example, 
-for the above Resources layout, this is what the Resource class would expose:
-
-public class Resource {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
-to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/drawable/Icon.png b/src/Android/Avalonia.AndroidTestApplication/Resources/drawable/Icon.png
deleted file mode 100644
index 8074c4c571..0000000000
Binary files a/src/Android/Avalonia.AndroidTestApplication/Resources/drawable/Icon.png and /dev/null differ
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/values/Strings.xml b/src/Android/Avalonia.AndroidTestApplication/Resources/values/Strings.xml
deleted file mode 100644
index c8dca13c35..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Resources/values/Strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-  <string name="Hello">Hello World, Click Me!</string>
-  <string name="ApplicationName">Avalonia.AndroidTestApplication</string>
-</resources>
\ No newline at end of file
diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
deleted file mode 100644
index 50fc5ac73b..0000000000
--- a/src/Avalonia.Animation/Animatable.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using Avalonia.Data;
-
-#nullable enable
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Base class for all animatable objects.
-    /// </summary>
-    public class Animatable : AvaloniaObject
-    {
-        /// <summary>
-        /// Defines the <see cref="Clock"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IClock> ClockProperty =
-            AvaloniaProperty.Register<Animatable, IClock>(nameof(Clock), inherits: true);
-
-        /// <summary>
-        /// Defines the <see cref="Transitions"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Transitions?> TransitionsProperty =
-            AvaloniaProperty.Register<Animatable, Transitions?>(nameof(Transitions));
-
-        private bool _transitionsEnabled = true;
-        private Dictionary<ITransition, TransitionState>? _transitionState;
-
-        /// <summary>
-        /// Gets or sets the clock which controls the animations on the control.
-        /// </summary>
-        public IClock Clock
-        {
-            get => GetValue(ClockProperty);
-            set => SetValue(ClockProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the property transitions for the control.
-        /// </summary>
-        public Transitions? Transitions
-        {
-            get => GetValue(TransitionsProperty);
-            set => SetValue(TransitionsProperty, value);
-        }
-
-        /// <summary>
-        /// Enables transitions for the control.
-        /// </summary>
-        /// <remarks>
-        /// This method should not be called from user code, it will be called automatically by the framework
-        /// when a control is added to the visual tree.
-        /// </remarks>
-        protected void EnableTransitions()
-        {
-            if (!_transitionsEnabled)
-            {
-                _transitionsEnabled = true;
-
-                if (Transitions is object)
-                {
-                    AddTransitions(Transitions);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Disables transitions for the control.
-        /// </summary>
-        /// <remarks>
-        /// This method should not be called from user code, it will be called automatically by the framework
-        /// when a control is added to the visual tree.
-        /// </remarks>
-        protected void DisableTransitions()
-        {
-            if (_transitionsEnabled)
-            {
-                _transitionsEnabled = false;
-
-                if (Transitions is object)
-                {
-                    RemoveTransitions(Transitions);
-                }
-            }
-        }
-
-        protected sealed override void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            if (change.Property == TransitionsProperty && change.IsEffectiveValueChange)
-            {
-                var oldTransitions = change.OldValue.GetValueOrDefault<Transitions>();
-                var newTransitions = change.NewValue.GetValueOrDefault<Transitions>();
-
-                // When transitions are replaced, we add the new transitions before removing the old
-                // transitions, so that when the old transition being disposed causes the value to
-                // change, there is a corresponding entry in `_transitionStates`. This means that we
-                // need to account for any transitions present in both the old and new transitions
-                // collections.
-                if (newTransitions is object)
-                {
-                    var toAdd = (IList)newTransitions;
-
-                    if (newTransitions.Count > 0 && oldTransitions?.Count > 0)
-                    {
-                        toAdd = newTransitions.Except(oldTransitions).ToList();
-                    }
-
-                    newTransitions.CollectionChanged += TransitionsCollectionChanged;
-                    AddTransitions(toAdd);
-                }
-
-                if (oldTransitions is object)
-                {
-                    var toRemove = (IList)oldTransitions;
-
-                    if (oldTransitions.Count > 0 && newTransitions?.Count > 0)
-                    {
-                        toRemove = oldTransitions.Except(newTransitions).ToList();
-                    }
-
-                    oldTransitions.CollectionChanged -= TransitionsCollectionChanged;
-                    RemoveTransitions(toRemove);
-                }
-            }
-            else if (_transitionsEnabled &&
-                     Transitions is object &&
-                     _transitionState is object &&
-                     !change.Property.IsDirect &&
-                     change.Priority > BindingPriority.Animation)
-            {
-                for (var i = Transitions.Count -1; i >= 0; --i)
-                {
-                    var transition = Transitions[i];
-
-                    if (transition.Property == change.Property &&
-                        _transitionState.TryGetValue(transition, out var state))
-                    {
-                        var oldValue = state.BaseValue;
-                        var newValue = GetAnimationBaseValue(transition.Property);
-
-                        if (!Equals(oldValue, newValue))
-                        {
-                            state.BaseValue = newValue;
-
-                            // We need to transition from the current animated value if present,
-                            // instead of the old base value.
-                            var animatedValue = GetValue(transition.Property);
-
-                            if (!Equals(newValue, animatedValue))
-                            {
-                                oldValue = animatedValue;
-                            }
-
-                            state.Instance?.Dispose();
-                            state.Instance = transition.Apply(
-                                this,
-                                Clock ?? AvaloniaLocator.Current.GetRequiredService<IGlobalClock>(),
-                                oldValue,
-                                newValue);
-                            return;
-                        }
-                    }
-                }
-            }
-
-            base.OnPropertyChangedCore(change);
-        }
-
-        private void TransitionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (!_transitionsEnabled)
-            {
-                return;
-            }
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    AddTransitions(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    RemoveTransitions(e.OldItems!);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    RemoveTransitions(e.OldItems!);
-                    AddTransitions(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    throw new NotSupportedException("Transitions collection cannot be reset.");
-            }
-        }
-
-        private void AddTransitions(IList items)
-        {
-            if (!_transitionsEnabled)
-            {
-                return;
-            }
-
-            _transitionState ??= new Dictionary<ITransition, TransitionState>();
-
-            for (var i = 0; i < items.Count; ++i)
-            {
-                var t = (ITransition)items[i]!;
-
-                _transitionState.Add(t, new TransitionState
-                {
-                    BaseValue = GetAnimationBaseValue(t.Property),
-                });
-            }
-        }
-
-        private void RemoveTransitions(IList items)
-        {
-            if (_transitionState is null)
-            {
-                return;
-            }
-
-            for (var i = 0; i < items.Count; ++i)
-            {
-                var t = (ITransition)items[i]!;
-
-                if (_transitionState.TryGetValue(t, out var state))
-                {
-                    state.Instance?.Dispose();
-                    _transitionState.Remove(t);
-                }
-            }
-        }
-
-        private object? GetAnimationBaseValue(AvaloniaProperty property)
-        {
-            var value = this.GetBaseValue(property, BindingPriority.LocalValue);
-
-            if (value == AvaloniaProperty.UnsetValue)
-            {
-                value = GetValue(property);
-            }
-
-            return value;
-        }
-
-        private class TransitionState
-        {
-            public IDisposable? Instance { get; set; }
-            public object? BaseValue { get; set; }
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
deleted file mode 100644
index 03b2d17e44..0000000000
--- a/src/Avalonia.Animation/Animation.cs
+++ /dev/null
@@ -1,409 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Avalonia.Animation.Animators;
-using Avalonia.Animation.Easings;
-using Avalonia.Data;
-using Avalonia.Metadata;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Tracks the progress of an animation.
-    /// </summary>
-    public class Animation : AvaloniaObject, IAnimation
-    {
-        /// <summary>
-        /// Defines the <see cref="Duration"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, TimeSpan> DurationProperty =
-            AvaloniaProperty.RegisterDirect<Animation, TimeSpan>(
-                nameof(Duration),
-                o => o._duration,
-                (o, v) => o._duration = v);
-
-        /// <summary>
-        /// Defines the <see cref="IterationCount"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, IterationCount> IterationCountProperty =
-            AvaloniaProperty.RegisterDirect<Animation, IterationCount>(
-                nameof(IterationCount),
-                o => o._iterationCount,
-                (o, v) => o._iterationCount = v);
-
-        /// <summary>
-        /// Defines the <see cref="PlaybackDirection"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, PlaybackDirection> PlaybackDirectionProperty =
-            AvaloniaProperty.RegisterDirect<Animation, PlaybackDirection>(
-                nameof(PlaybackDirection),
-                o => o._playbackDirection,
-                (o, v) => o._playbackDirection = v);
-
-        /// <summary>
-        /// Defines the <see cref="FillMode"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, FillMode> FillModeProperty =
-            AvaloniaProperty.RegisterDirect<Animation, FillMode>(
-                nameof(FillMode),
-                o => o._fillMode,
-                (o, v) => o._fillMode = v);
-
-        /// <summary>
-        /// Defines the <see cref="Easing"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, Easing> EasingProperty =
-            AvaloniaProperty.RegisterDirect<Animation, Easing>(
-                nameof(Easing),
-                o => o._easing,
-                (o, v) => o._easing = v);
-
-        /// <summary>
-        /// Defines the <see cref="Delay"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, TimeSpan> DelayProperty =
-            AvaloniaProperty.RegisterDirect<Animation, TimeSpan>(
-                nameof(Delay),
-                o => o._delay,
-                (o, v) => o._delay = v);
-
-        /// <summary>
-        /// Defines the <see cref="DelayBetweenIterations"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, TimeSpan> DelayBetweenIterationsProperty =
-            AvaloniaProperty.RegisterDirect<Animation, TimeSpan>(
-                nameof(DelayBetweenIterations),
-                o => o._delayBetweenIterations,
-                (o, v) => o._delayBetweenIterations = v);
-
-        /// <summary>
-        /// Defines the <see cref="SpeedRatio"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Animation, double> SpeedRatioProperty =
-            AvaloniaProperty.RegisterDirect<Animation, double>(
-                nameof(SpeedRatio),
-                o => o._speedRatio,
-                (o, v) => o._speedRatio = v,
-                defaultBindingMode: BindingMode.TwoWay);
-
-        private TimeSpan _duration;
-        private IterationCount _iterationCount = new IterationCount(1);
-        private PlaybackDirection _playbackDirection;
-        private FillMode _fillMode;
-        private Easing _easing = new LinearEasing();
-        private TimeSpan _delay = TimeSpan.Zero;
-        private TimeSpan _delayBetweenIterations = TimeSpan.Zero;
-        private double _speedRatio = 1d;
-
-        /// <summary>
-        /// Gets or sets the active time of this animation.
-        /// </summary>
-        public TimeSpan Duration
-        {
-            get { return _duration; }
-            set { SetAndRaise(DurationProperty, ref _duration, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the repeat count for this animation.
-        /// </summary>
-        public IterationCount IterationCount
-        {
-            get { return _iterationCount; }
-            set { SetAndRaise(IterationCountProperty, ref _iterationCount, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the playback direction for this animation.
-        /// </summary>
-        public PlaybackDirection PlaybackDirection
-        {
-            get { return _playbackDirection; }
-            set { SetAndRaise(PlaybackDirectionProperty, ref _playbackDirection, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the value fill mode for this animation.
-        /// </summary> 
-        public FillMode FillMode
-        {
-            get { return _fillMode; }
-            set { SetAndRaise(FillModeProperty, ref _fillMode, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the easing function to be used for this animation.
-        /// </summary>
-        public Easing Easing
-        {
-            get { return _easing; }
-            set { SetAndRaise(EasingProperty, ref _easing, value); }
-        }
-
-        /// <summary> 
-        /// Gets or sets the initial delay time for this animation. 
-        /// </summary> 
-        public TimeSpan Delay
-        {
-            get { return _delay; }
-            set { SetAndRaise(DelayProperty, ref _delay, value); }
-        }
-
-        /// <summary> 
-        /// Gets or sets the delay time in between iterations.
-        /// </summary> 
-        public TimeSpan DelayBetweenIterations
-        {
-            get { return _delayBetweenIterations; }
-            set { SetAndRaise(DelayBetweenIterationsProperty, ref _delayBetweenIterations, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the speed multiple for this animation.
-        /// </summary> 
-        public double SpeedRatio
-        {
-            get { return _speedRatio; }
-            set { SetAndRaise(SpeedRatioProperty, ref _speedRatio, value); }
-        }
-
-        /// <summary>
-        /// Obsolete: Do not use this property, use <see cref="IterationCount"/> instead.
-        /// </summary>
-        /// <value></value>
-        [Obsolete("This property has been superceded by IterationCount.")]
-        public string RepeatCount
-        {
-            get { return IterationCount.ToString(); }
-            set
-            {
-                var val = value.ToUpper();
-                val = val.Replace("LOOP", "INFINITE");
-                val = val.Replace("NONE", "1");
-                IterationCount = IterationCount.Parse(val);
-            }
-        }
-
-        /// <summary>
-        /// Gets the children of the <see cref="Animation"/>.
-        /// </summary>
-        [Content]
-        public KeyFrames Children { get; } = new KeyFrames();
-
-        // Store values for the Animator attached properties for IAnimationSetter objects.
-        private static readonly Dictionary<IAnimationSetter, Type> s_animators = new Dictionary<IAnimationSetter, Type>();
-
-        /// <summary>
-        /// Gets the value of the Animator attached property for a setter.
-        /// </summary>
-        /// <param name="setter">The animation setter.</param>
-        /// <returns>The property animator type.</returns>
-        public static Type? GetAnimator(IAnimationSetter setter)
-        {
-            if (s_animators.TryGetValue(setter, out var type))
-            {
-                return type;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Sets the value of the Animator attached property for a setter.
-        /// </summary>
-        /// <param name="setter">The animation setter.</param>
-        /// <param name="value">The property animator value.</param>
-        public static void SetAnimator(IAnimationSetter setter, Type value)
-        {
-            s_animators[setter] = value;
-        }
-
-        private readonly static List<(Func<AvaloniaProperty, bool> Condition, Type Animator)> Animators = new List<(Func<AvaloniaProperty, bool>, Type)>
-        {
-            ( prop => typeof(bool).IsAssignableFrom(prop.PropertyType), typeof(BoolAnimator) ),
-            ( prop => typeof(byte).IsAssignableFrom(prop.PropertyType), typeof(ByteAnimator) ),
-            ( prop => typeof(Int16).IsAssignableFrom(prop.PropertyType), typeof(Int16Animator) ),
-            ( prop => typeof(Int32).IsAssignableFrom(prop.PropertyType), typeof(Int32Animator) ),
-            ( prop => typeof(Int64).IsAssignableFrom(prop.PropertyType), typeof(Int64Animator) ),
-            ( prop => typeof(UInt16).IsAssignableFrom(prop.PropertyType), typeof(UInt16Animator) ),
-            ( prop => typeof(UInt32).IsAssignableFrom(prop.PropertyType), typeof(UInt32Animator) ),
-            ( prop => typeof(UInt64).IsAssignableFrom(prop.PropertyType), typeof(UInt64Animator) ),
-            ( prop => typeof(float).IsAssignableFrom(prop.PropertyType), typeof(FloatAnimator) ),
-            ( prop => typeof(double).IsAssignableFrom(prop.PropertyType), typeof(DoubleAnimator) ),
-            ( prop => typeof(decimal).IsAssignableFrom(prop.PropertyType), typeof(DecimalAnimator) ),
-        };
-
-        /// <summary>
-        /// Registers a <see cref="Animator{T}"/> that can handle
-        /// a value type that matches the specified condition.
-        /// </summary>
-        /// <param name="condition">
-        /// The condition to which the <see cref="Animator{T}"/>
-        /// is to be activated and used.
-        /// </param>
-        /// <typeparam name="TAnimator">
-        /// The type of the animator to instantiate.
-        /// </typeparam>
-        public static void RegisterAnimator<TAnimator>(Func<AvaloniaProperty, bool> condition)
-            where TAnimator : IAnimator
-        {
-            Animators.Insert(0, (condition, typeof(TAnimator)));
-        }
-
-        private static Type? GetAnimatorType(AvaloniaProperty property)
-        {
-            foreach (var (condition, type) in Animators)
-            {
-                if (condition(property))
-                {
-                    return type;
-                }
-            }
-            return null;
-        }
-
-        private (IList<IAnimator> Animators, IList<IDisposable> subscriptions) InterpretKeyframes(Animatable control)
-        {
-            var handlerList = new List<(Type type, AvaloniaProperty property)>();
-            var animatorKeyFrames = new List<AnimatorKeyFrame>();
-            var subscriptions = new List<IDisposable>();
-
-            foreach (var keyframe in Children)
-            {
-                foreach (var setter in keyframe.Setters)
-                {
-                    if (setter.Property is null)
-                    {
-                        throw new InvalidOperationException("No Setter property assigned.");
-                    }
-
-                    var handler = Animation.GetAnimator(setter) ?? GetAnimatorType(setter.Property);
-
-                    if (handler == null)
-                    {
-                        throw new InvalidOperationException($"No animator registered for the property {setter.Property}. Add an animator to the Animation.Animators collection that matches this property to animate it.");
-                    }
-
-                    if (!handlerList.Contains((handler, setter.Property)))
-                        handlerList.Add((handler, setter.Property));
-
-                    var cue = keyframe.Cue;
-
-                    if (keyframe.TimingMode == KeyFrameTimingMode.TimeSpan)
-                    {
-                        cue = new Cue(keyframe.KeyTime.TotalSeconds / Duration.TotalSeconds);
-                    }
-
-                    var newKF = new AnimatorKeyFrame(handler, cue, keyframe.KeySpline);
-
-                    subscriptions.Add(newKF.BindSetter(setter, control));
-
-                    animatorKeyFrames.Add(newKF);
-                }
-            }
-
-            var newAnimatorInstances = new List<IAnimator>();
-
-            foreach (var (handlerType, property) in handlerList)
-            {
-                var newInstance = (IAnimator)Activator.CreateInstance(handlerType)!;
-                newInstance.Property = property;
-                newAnimatorInstances.Add(newInstance);
-            }
-
-            foreach (var keyframe in animatorKeyFrames)
-            {
-                var animator = newAnimatorInstances.First(a => a.GetType() == keyframe.AnimatorType &&
-                                                             a.Property == keyframe.Property);
-                animator.Add(keyframe);
-            }
-
-            return (newAnimatorInstances, subscriptions);
-        }
-
-        /// <inheritdoc/>
-        public IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
-        {
-            var (animators, subscriptions) = InterpretKeyframes(control);
-            if (animators.Count == 1)
-            {
-                var subscription = animators[0].Apply(this, control, clock, match, onComplete);
-                
-                if (subscription is not null)
-                {
-                    subscriptions.Add(subscription);
-                }
-            }
-            else
-            {
-                var completionTasks = onComplete != null ? new List<Task>() : null;
-                foreach (IAnimator animator in animators)
-                {
-                    Action? animatorOnComplete = null;
-                    if (onComplete != null)
-                    {
-                        var tcs = new TaskCompletionSource<object?>();
-                        animatorOnComplete = () => tcs.SetResult(null);
-                        completionTasks!.Add(tcs.Task);
-                    }
-
-                    var subscription = animator.Apply(this, control, clock, match, animatorOnComplete);
-
-                    if (subscription is not null)
-                    {
-                        subscriptions.Add(subscription);
-                    }
-                }
-
-                if (onComplete != null)
-                {
-                    Task.WhenAll(completionTasks!).ContinueWith(
-                        (_, state) => ((Action)state!).Invoke(),
-                        onComplete);
-                }
-            }
-            return new CompositeDisposable(subscriptions);
-        }
-
-        /// <inheritdoc/>
-        public Task RunAsync(Animatable control, IClock? clock = null)
-        {
-            return RunAsync(control, clock, default);
-        }
-
-        /// <inheritdoc/>
-        public Task RunAsync(Animatable control, IClock? clock = null, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.CompletedTask;
-            }
-
-            var run = new TaskCompletionSource<object?>();
-
-            if (this.IterationCount == IterationCount.Infinite)
-                run.SetException(new InvalidOperationException("Looping animations must not use the Run method."));
-
-            IDisposable? subscriptions = null, cancellation = null;
-            subscriptions = this.Apply(control, clock, Observable.Return(true), () =>
-            {
-                run.TrySetResult(null);
-                subscriptions?.Dispose();
-                cancellation?.Dispose();
-            });
-
-            cancellation = cancellationToken.Register(() =>
-            {
-                run.TrySetResult(null);
-                subscriptions?.Dispose();
-                cancellation?.Dispose();
-            });
-
-            return run.Task;
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/AnimatorKeyFrame.cs b/src/Avalonia.Animation/AnimatorKeyFrame.cs
deleted file mode 100644
index 8af31f2948..0000000000
--- a/src/Avalonia.Animation/AnimatorKeyFrame.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.ComponentModel;
-using Avalonia.Animation.Animators;
-using Avalonia.Data;
-using Avalonia.Reactive;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Defines a KeyFrame that is used for
-    /// <see cref="Animator{T}"/> objects.
-    /// </summary>
-    public class AnimatorKeyFrame : AvaloniaObject
-    {
-        public static readonly DirectProperty<AnimatorKeyFrame, object?> ValueProperty =
-            AvaloniaProperty.RegisterDirect<AnimatorKeyFrame, object?>(nameof(Value), k => k.Value, (k, v) => k.Value = v);
-
-        public AnimatorKeyFrame()
-        {
-
-        }
-
-        public AnimatorKeyFrame(Type? animatorType, Cue cue)
-        {
-            AnimatorType = animatorType;
-            Cue = cue;
-            KeySpline = null;
-        }
-
-        public AnimatorKeyFrame(Type? animatorType, Cue cue, KeySpline? keySpline)
-        {
-            AnimatorType = animatorType;
-            Cue = cue;
-            KeySpline = keySpline;
-        }
-
-        internal bool isNeutral;
-        public Type? AnimatorType { get; }
-        public Cue Cue { get; }
-        public KeySpline? KeySpline { get; }
-        public AvaloniaProperty? Property { get; private set; }
-
-        private object? _value;
-
-        public object? Value
-        {
-            get => _value;
-            set => SetAndRaise(ValueProperty, ref _value, value);
-        }
-
-        public IDisposable BindSetter(IAnimationSetter setter, Animatable targetControl)
-        {
-            Property = setter.Property;
-            var value = setter.Value;
-
-            if (value is IBinding binding)
-            {
-                return this.Bind(ValueProperty, binding, targetControl);
-            }
-            else
-            {
-                return this.Bind(ValueProperty, ObservableEx.SingleValue(value).ToBinding(), targetControl);
-            }
-        }
-
-        public T GetTypedValue<T>()
-        {
-            var typeConv = TypeDescriptor.GetConverter(typeof(T));
-
-            if (Value == null)
-            {
-                throw new ArgumentNullException($"KeyFrame value can't be null.");
-            }
-            if(Value is T typedValue)
-            {
-                return typedValue;
-            }
-            if (!typeConv.CanConvertTo(Value.GetType()))
-            {
-                throw new InvalidCastException($"KeyFrame value doesnt match property type.");
-            }
-
-            return (T)typeConv.ConvertTo(Value, typeof(T))!;
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/Animators/Animator`1.cs b/src/Avalonia.Animation/Animators/Animator`1.cs
deleted file mode 100644
index 248ca61c1d..0000000000
--- a/src/Avalonia.Animation/Animators/Animator`1.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Animation.Utils;
-using Avalonia.Collections;
-using Avalonia.Data;
-using Avalonia.Reactive;
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Base class for <see cref="Animator{T}"/> objects
-    /// </summary>
-    public abstract class Animator<T> : AvaloniaList<AnimatorKeyFrame>, IAnimator
-    {
-        /// <summary>
-        /// List of type-converted keyframes.
-        /// </summary>
-        private readonly List<AnimatorKeyFrame> _convertedKeyframes = new List<AnimatorKeyFrame>();
-
-        private bool _isVerifiedAndConverted;
-
-        /// <summary>
-        /// Gets or sets the target property for the keyframe.
-        /// </summary>
-        public AvaloniaProperty? Property { get; set; }
-
-        public Animator()
-        {
-            // Invalidate keyframes when changed.
-            this.CollectionChanged += delegate { _isVerifiedAndConverted = false; };
-        }
-
-        /// <inheritdoc/>
-        public virtual IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
-        {
-            if (!_isVerifiedAndConverted)
-                VerifyConvertKeyFrames();
-
-            var subject = new DisposeAnimationInstanceSubject<T>(this, animation, control, clock, onComplete);
-            return match.Subscribe(subject);
-        }
-
-        protected T InterpolationHandler(double animationTime, T neutralValue)
-        {
-            AnimatorKeyFrame firstKeyframe, lastKeyframe;
-
-            int kvCount = _convertedKeyframes.Count;
-            if (kvCount > 2)
-            {
-                if (animationTime <= 0.0)
-                {
-                    firstKeyframe = _convertedKeyframes[0];
-                    lastKeyframe = _convertedKeyframes[1];
-                }
-                else if (animationTime >= 1.0)
-                {
-                    firstKeyframe = _convertedKeyframes[_convertedKeyframes.Count - 2];
-                    lastKeyframe = _convertedKeyframes[_convertedKeyframes.Count - 1];
-                }
-                else
-                {
-                    int index = FindClosestBeforeKeyFrame(animationTime);
-                    firstKeyframe = _convertedKeyframes[index];
-                    lastKeyframe = _convertedKeyframes[index + 1];
-                }
-            }
-            else
-            {
-                firstKeyframe = _convertedKeyframes[0];
-                lastKeyframe = _convertedKeyframes[1];
-            }
-
-            double t0 = firstKeyframe.Cue.CueValue;
-            double t1 = lastKeyframe.Cue.CueValue;
-
-            double progress = (animationTime - t0) / (t1 - t0);
-
-            T oldValue, newValue;
-
-            if (!firstKeyframe.isNeutral && firstKeyframe.Value is T firstKeyframeValue)
-                oldValue = firstKeyframeValue;
-            else
-                oldValue = neutralValue;
-
-            if (!lastKeyframe.isNeutral && lastKeyframe.Value is T lastKeyframeValue)
-                newValue = lastKeyframeValue;
-            else
-                newValue = neutralValue;
-
-            if (lastKeyframe.KeySpline != null)
-                progress = lastKeyframe.KeySpline.GetSplineProgress(progress);
-
-            return Interpolate(progress, oldValue, newValue);
-        }
-
-        private int FindClosestBeforeKeyFrame(double time)
-        {
-            for (int i = 0; i < _convertedKeyframes.Count; i++)
-                if (_convertedKeyframes[i].Cue.CueValue > time)
-                    return i - 1;
-
-            throw new Exception("Index time is out of keyframe time range.");
-        }
-
-        public virtual IDisposable BindAnimation(Animatable control, IObservable<T> instance)
-        {
-            if (Property is null)
-                throw new InvalidOperationException("Animator has no property specified.");
-
-            return control.Bind((AvaloniaProperty<T>)Property, instance, BindingPriority.Animation);
-        }
-
-        /// <summary>
-        /// Runs the KeyFrames Animation.
-        /// </summary>
-        internal IDisposable Run(Animation animation, Animatable control, IClock? clock, Action? onComplete)
-        {
-            var instance = new AnimationInstance<T>(
-                animation,
-                control,
-                this,
-                clock ?? control.Clock ?? Clock.GlobalClock,
-                onComplete,
-                InterpolationHandler);
-            
-            return BindAnimation(control, instance);
-        }
-
-        /// <summary>
-        /// Interpolates in-between two key values given the desired progress time.
-        /// </summary>
-        public abstract T Interpolate(double progress, T oldValue, T newValue);
-
-        private void VerifyConvertKeyFrames()
-        {
-            foreach (AnimatorKeyFrame keyframe in this)
-            {
-                _convertedKeyframes.Add(keyframe);
-            }
-
-            AddNeutralKeyFramesIfNeeded();
-
-            _isVerifiedAndConverted = true;
-        }
-
-        private void AddNeutralKeyFramesIfNeeded()
-        {
-            bool hasStartKey, hasEndKey;
-            hasStartKey = hasEndKey = false;
-
-            // Check if there's start and end keyframes.
-            foreach (var frame in _convertedKeyframes)
-            {
-                if (frame.Cue.CueValue == 0.0d)
-                {
-                    hasStartKey = true;
-                }
-                else if (frame.Cue.CueValue == 1.0d)
-                {
-                    hasEndKey = true;
-                }
-            }
-
-            if (!hasStartKey || !hasEndKey)
-                AddNeutralKeyFrames(hasStartKey, hasEndKey);
-        }
-
-        private void AddNeutralKeyFrames(bool hasStartKey, bool hasEndKey)
-        {
-            if (!hasStartKey)
-            {
-                _convertedKeyframes.Insert(0, new AnimatorKeyFrame(null, new Cue(0.0d)) { Value = default(T), isNeutral = true });
-            }
-
-            if (!hasEndKey)
-            {
-                _convertedKeyframes.Add(new AnimatorKeyFrame(null, new Cue(1.0d)) { Value = default(T), isNeutral = true });
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt
deleted file mode 100644
index 973698f872..0000000000
--- a/src/Avalonia.Animation/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Compat issues with assembly Avalonia.Animation:
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
-Total Issues: 3
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
deleted file mode 100644
index d81d14bbff..0000000000
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Animation/Easing/Easing.cs b/src/Avalonia.Animation/Easing/Easing.cs
deleted file mode 100644
index 2f4b93dab1..0000000000
--- a/src/Avalonia.Animation/Easing/Easing.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-
-namespace Avalonia.Animation.Easings
-{
-    /// <summary>
-    /// Base class for all Easing classes.
-    /// </summary>
-    [TypeConverter(typeof(EasingTypeConverter))]
-    public abstract class Easing : IEasing
-    {
-        /// <inheritdoc/>
-        public abstract double Ease(double progress);
-
-        static Dictionary<string, Type>? _easingTypes;
-
-        static readonly Type s_thisType = typeof(Easing);
-
-        /// <summary>
-        /// Parses a Easing type string.
-        /// </summary>
-        /// <param name="e">The Easing type string.</param>
-        /// <returns>Returns the instance of the parsed type.</returns>
-        public static Easing Parse(string e)
-        {
-            if (e.Contains(','))
-            {
-                return new SplineEasing(KeySpline.Parse(e, CultureInfo.InvariantCulture));
-            }
-
-            if (_easingTypes == null)
-            {
-                _easingTypes = new Dictionary<string, Type>();
-
-                // Fetch the built-in easings.
-                var derivedTypes = typeof(Easing).Assembly.GetTypes()
-                                      .Where(p => p.Namespace == s_thisType.Namespace)
-                                      .Where(p => p.IsSubclassOf(s_thisType))
-                                      .Select(p => p).ToList();
-
-                foreach (var easingType in derivedTypes)
-                    _easingTypes.Add(easingType.Name, easingType);
-            }
-
-            if (_easingTypes.ContainsKey(e))
-            {
-                var type = _easingTypes[e];
-                return (Easing)Activator.CreateInstance(type)!;
-            }
-            else
-            {
-                throw new FormatException($"Easing \"{e}\" was not found in {s_thisType.Namespace} namespace.");
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/IAnimation.cs b/src/Avalonia.Animation/IAnimation.cs
deleted file mode 100644
index 436a765d27..0000000000
--- a/src/Avalonia.Animation/IAnimation.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Interface for Animation objects
-    /// </summary>
-    public interface IAnimation
-    {
-        /// <summary>
-        /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
-        /// </summary>
-        IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete = null);
-
-        /// <summary>
-        /// Run the animation on the specified control.
-        /// </summary>
-        Task RunAsync(Animatable control, IClock clock, CancellationToken cancellationToken = default);
-    }
-}
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
deleted file mode 100644
index 6a1d3539e2..0000000000
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Avalonia.Animation
-{
-    public interface IAnimationSetter
-    {
-        AvaloniaProperty? Property { get; set; }
-        object? Value { get; set; }
-    }
-}
diff --git a/src/Avalonia.Animation/IAnimator.cs b/src/Avalonia.Animation/IAnimator.cs
deleted file mode 100644
index f64ac9f913..0000000000
--- a/src/Avalonia.Animation/IAnimator.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Interface for Animator objects
-    /// </summary>
-    public interface IAnimator : IList<AnimatorKeyFrame>
-    {
-        /// <summary>
-        /// The target property.
-        /// </summary>
-        AvaloniaProperty? Property {get; set;}
-
-        /// <summary>
-        /// Applies the current KeyFrame group to the specified control.
-        /// </summary>
-        IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete);
-    }
-}
diff --git a/src/Avalonia.Animation/IClock.cs b/src/Avalonia.Animation/IClock.cs
deleted file mode 100644
index ae44102077..0000000000
--- a/src/Avalonia.Animation/IClock.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Animation
-{
-    public interface IClock : IObservable<TimeSpan>
-    {
-        PlayState PlayState { get; set; }
-    }
-}
diff --git a/src/Avalonia.Animation/IGlobalClock.cs b/src/Avalonia.Animation/IGlobalClock.cs
deleted file mode 100644
index b0455e2c80..0000000000
--- a/src/Avalonia.Animation/IGlobalClock.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Animation
-{
-    public interface IGlobalClock : IClock
-    {
-    }
-}
diff --git a/src/Avalonia.Animation/ITransition.cs b/src/Avalonia.Animation/ITransition.cs
deleted file mode 100644
index 241ca208d1..0000000000
--- a/src/Avalonia.Animation/ITransition.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Interface for Transition objects.
-    /// </summary>
-    public interface ITransition
-    {
-        /// <summary>
-        /// Applies the transition to the specified <see cref="Animatable"/>.
-        /// </summary>
-        IDisposable Apply(Animatable control, IClock clock, object? oldValue, object? newValue);
-
-        /// <summary>
-        /// Gets the property to be animated.
-        /// </summary>
-        AvaloniaProperty Property { get; set; }
-    
-    }
-}
diff --git a/src/Avalonia.Animation/Properties/AssemblyInfo.cs b/src/Avalonia.Animation/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6b539b075b..0000000000
--- a/src/Avalonia.Animation/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Metadata;
-using System.Runtime.CompilerServices;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Animators")]
-
-[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Animation.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
diff --git a/src/Avalonia.Base/Animation/Animatable.cs b/src/Avalonia.Base/Animation/Animatable.cs
new file mode 100644
index 0000000000..b045a32cd1
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animatable.cs
@@ -0,0 +1,254 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Base class for all animatable objects.
+    /// </summary>
+    public class Animatable : AvaloniaObject
+    {
+        /// <summary>
+        /// Defines the <see cref="Clock"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IClock> ClockProperty =
+            AvaloniaProperty.Register<Animatable, IClock>(nameof(Clock), inherits: true);
+
+        /// <summary>
+        /// Defines the <see cref="Transitions"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transitions?> TransitionsProperty =
+            AvaloniaProperty.Register<Animatable, Transitions?>(nameof(Transitions));
+
+        private bool _transitionsEnabled = true;
+        private Dictionary<ITransition, TransitionState>? _transitionState;
+
+        /// <summary>
+        /// Gets or sets the clock which controls the animations on the control.
+        /// </summary>
+        public IClock Clock
+        {
+            get => GetValue(ClockProperty);
+            set => SetValue(ClockProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the property transitions for the control.
+        /// </summary>
+        public Transitions? Transitions
+        {
+            get => GetValue(TransitionsProperty);
+            set => SetValue(TransitionsProperty, value);
+        }
+
+        /// <summary>
+        /// Enables transitions for the control.
+        /// </summary>
+        /// <remarks>
+        /// This method should not be called from user code, it will be called automatically by the framework
+        /// when a control is added to the visual tree.
+        /// </remarks>
+        protected void EnableTransitions()
+        {
+            if (!_transitionsEnabled)
+            {
+                _transitionsEnabled = true;
+
+                if (Transitions is object)
+                {
+                    AddTransitions(Transitions);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Disables transitions for the control.
+        /// </summary>
+        /// <remarks>
+        /// This method should not be called from user code, it will be called automatically by the framework
+        /// when a control is added to the visual tree.
+        /// </remarks>
+        protected void DisableTransitions()
+        {
+            if (_transitionsEnabled)
+            {
+                _transitionsEnabled = false;
+
+                if (Transitions is object)
+                {
+                    RemoveTransitions(Transitions);
+                }
+            }
+        }
+
+        protected sealed override void OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == TransitionsProperty && change.IsEffectiveValueChange)
+            {
+                var e = (AvaloniaPropertyChangedEventArgs<Transitions?>)change;
+                var oldTransitions = e.OldValue.GetValueOrDefault();
+                var newTransitions = e.NewValue.GetValueOrDefault();
+
+                // When transitions are replaced, we add the new transitions before removing the old
+                // transitions, so that when the old transition being disposed causes the value to
+                // change, there is a corresponding entry in `_transitionStates`. This means that we
+                // need to account for any transitions present in both the old and new transitions
+                // collections.
+                if (newTransitions is object)
+                {
+                    var toAdd = (IList)newTransitions;
+
+                    if (newTransitions.Count > 0 && oldTransitions?.Count > 0)
+                    {
+                        toAdd = newTransitions.Except(oldTransitions).ToList();
+                    }
+
+                    newTransitions.CollectionChanged += TransitionsCollectionChanged;
+                    AddTransitions(toAdd);
+                }
+
+                if (oldTransitions is object)
+                {
+                    var toRemove = (IList)oldTransitions;
+
+                    if (oldTransitions.Count > 0 && newTransitions?.Count > 0)
+                    {
+                        toRemove = oldTransitions.Except(newTransitions).ToList();
+                    }
+
+                    oldTransitions.CollectionChanged -= TransitionsCollectionChanged;
+                    RemoveTransitions(toRemove);
+                }
+            }
+            else if (_transitionsEnabled &&
+                     Transitions is object &&
+                     _transitionState is object &&
+                     !change.Property.IsDirect &&
+                     change.Priority > BindingPriority.Animation)
+            {
+                for (var i = Transitions.Count -1; i >= 0; --i)
+                {
+                    var transition = Transitions[i];
+
+                    if (transition.Property == change.Property &&
+                        _transitionState.TryGetValue(transition, out var state))
+                    {
+                        var oldValue = state.BaseValue;
+                        var newValue = GetAnimationBaseValue(transition.Property);
+
+                        if (!Equals(oldValue, newValue))
+                        {
+                            state.BaseValue = newValue;
+
+                            // We need to transition from the current animated value if present,
+                            // instead of the old base value.
+                            var animatedValue = GetValue(transition.Property);
+
+                            if (!Equals(newValue, animatedValue))
+                            {
+                                oldValue = animatedValue;
+                            }
+
+                            state.Instance?.Dispose();
+                            state.Instance = transition.Apply(
+                                this,
+                                Clock ?? AvaloniaLocator.Current.GetRequiredService<IGlobalClock>(),
+                                oldValue,
+                                newValue);
+                            return;
+                        }
+                    }
+                }
+            }
+
+            base.OnPropertyChangedCore(change);
+        }
+
+        private void TransitionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (!_transitionsEnabled)
+            {
+                return;
+            }
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    AddTransitions(e.NewItems!);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    RemoveTransitions(e.OldItems!);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    RemoveTransitions(e.OldItems!);
+                    AddTransitions(e.NewItems!);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    throw new NotSupportedException("Transitions collection cannot be reset.");
+            }
+        }
+
+        private void AddTransitions(IList items)
+        {
+            if (!_transitionsEnabled)
+            {
+                return;
+            }
+
+            _transitionState ??= new Dictionary<ITransition, TransitionState>();
+
+            for (var i = 0; i < items.Count; ++i)
+            {
+                var t = (ITransition)items[i]!;
+
+                _transitionState.Add(t, new TransitionState
+                {
+                    BaseValue = GetAnimationBaseValue(t.Property),
+                });
+            }
+        }
+
+        private void RemoveTransitions(IList items)
+        {
+            if (_transitionState is null)
+            {
+                return;
+            }
+
+            for (var i = 0; i < items.Count; ++i)
+            {
+                var t = (ITransition)items[i]!;
+
+                if (_transitionState.TryGetValue(t, out var state))
+                {
+                    state.Instance?.Dispose();
+                    _transitionState.Remove(t);
+                }
+            }
+        }
+
+        private object? GetAnimationBaseValue(AvaloniaProperty property)
+        {
+            var value = this.GetBaseValue(property, BindingPriority.LocalValue);
+
+            if (value == AvaloniaProperty.UnsetValue)
+            {
+                value = GetValue(property);
+            }
+
+            return value;
+        }
+
+        private class TransitionState
+        {
+            public IDisposable? Instance { get; set; }
+            public object? BaseValue { get; set; }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Animation/Animation.cs b/src/Avalonia.Base/Animation/Animation.cs
new file mode 100644
index 0000000000..e0883901fd
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animation.cs
@@ -0,0 +1,399 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Avalonia.Animation.Animators;
+using Avalonia.Animation.Easings;
+using Avalonia.Data;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Tracks the progress of an animation.
+    /// </summary>
+    public class Animation : AvaloniaObject, IAnimation
+    {
+        /// <summary>
+        /// Defines the <see cref="Duration"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, TimeSpan> DurationProperty =
+            AvaloniaProperty.RegisterDirect<Animation, TimeSpan>(
+                nameof(Duration),
+                o => o._duration,
+                (o, v) => o._duration = v);
+
+        /// <summary>
+        /// Defines the <see cref="IterationCount"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, IterationCount> IterationCountProperty =
+            AvaloniaProperty.RegisterDirect<Animation, IterationCount>(
+                nameof(IterationCount),
+                o => o._iterationCount,
+                (o, v) => o._iterationCount = v);
+
+        /// <summary>
+        /// Defines the <see cref="PlaybackDirection"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, PlaybackDirection> PlaybackDirectionProperty =
+            AvaloniaProperty.RegisterDirect<Animation, PlaybackDirection>(
+                nameof(PlaybackDirection),
+                o => o._playbackDirection,
+                (o, v) => o._playbackDirection = v);
+
+        /// <summary>
+        /// Defines the <see cref="FillMode"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, FillMode> FillModeProperty =
+            AvaloniaProperty.RegisterDirect<Animation, FillMode>(
+                nameof(FillMode),
+                o => o._fillMode,
+                (o, v) => o._fillMode = v);
+
+        /// <summary>
+        /// Defines the <see cref="Easing"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, Easing> EasingProperty =
+            AvaloniaProperty.RegisterDirect<Animation, Easing>(
+                nameof(Easing),
+                o => o._easing,
+                (o, v) => o._easing = v);
+
+        /// <summary>
+        /// Defines the <see cref="Delay"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, TimeSpan> DelayProperty =
+            AvaloniaProperty.RegisterDirect<Animation, TimeSpan>(
+                nameof(Delay),
+                o => o._delay,
+                (o, v) => o._delay = v);
+
+        /// <summary>
+        /// Defines the <see cref="DelayBetweenIterations"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, TimeSpan> DelayBetweenIterationsProperty =
+            AvaloniaProperty.RegisterDirect<Animation, TimeSpan>(
+                nameof(DelayBetweenIterations),
+                o => o._delayBetweenIterations,
+                (o, v) => o._delayBetweenIterations = v);
+
+        /// <summary>
+        /// Defines the <see cref="SpeedRatio"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, double> SpeedRatioProperty =
+            AvaloniaProperty.RegisterDirect<Animation, double>(
+                nameof(SpeedRatio),
+                o => o._speedRatio,
+                (o, v) => o._speedRatio = v,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        private TimeSpan _duration;
+        private IterationCount _iterationCount = new IterationCount(1);
+        private PlaybackDirection _playbackDirection;
+        private FillMode _fillMode;
+        private Easing _easing = new LinearEasing();
+        private TimeSpan _delay = TimeSpan.Zero;
+        private TimeSpan _delayBetweenIterations = TimeSpan.Zero;
+        private double _speedRatio = 1d;
+
+        /// <summary>
+        /// Gets or sets the active time of this animation.
+        /// </summary>
+        public TimeSpan Duration
+        {
+            get { return _duration; }
+            set { SetAndRaise(DurationProperty, ref _duration, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the repeat count for this animation.
+        /// </summary>
+        public IterationCount IterationCount
+        {
+            get { return _iterationCount; }
+            set { SetAndRaise(IterationCountProperty, ref _iterationCount, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the playback direction for this animation.
+        /// </summary>
+        public PlaybackDirection PlaybackDirection
+        {
+            get { return _playbackDirection; }
+            set { SetAndRaise(PlaybackDirectionProperty, ref _playbackDirection, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value fill mode for this animation.
+        /// </summary> 
+        public FillMode FillMode
+        {
+            get { return _fillMode; }
+            set { SetAndRaise(FillModeProperty, ref _fillMode, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the easing function to be used for this animation.
+        /// </summary>
+        public Easing Easing
+        {
+            get { return _easing; }
+            set { SetAndRaise(EasingProperty, ref _easing, value); }
+        }
+
+        /// <summary> 
+        /// Gets or sets the initial delay time for this animation. 
+        /// </summary> 
+        public TimeSpan Delay
+        {
+            get { return _delay; }
+            set { SetAndRaise(DelayProperty, ref _delay, value); }
+        }
+
+        /// <summary> 
+        /// Gets or sets the delay time in between iterations.
+        /// </summary> 
+        public TimeSpan DelayBetweenIterations
+        {
+            get { return _delayBetweenIterations; }
+            set { SetAndRaise(DelayBetweenIterationsProperty, ref _delayBetweenIterations, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the speed multiple for this animation.
+        /// </summary> 
+        public double SpeedRatio
+        {
+            get { return _speedRatio; }
+            set { SetAndRaise(SpeedRatioProperty, ref _speedRatio, value); }
+        }
+
+        /// <summary>
+        /// Gets the children of the <see cref="Animation"/>.
+        /// </summary>
+        [Content]
+        public KeyFrames Children { get; } = new KeyFrames();
+
+        // Store values for the Animator attached properties for IAnimationSetter objects.
+        private static readonly Dictionary<IAnimationSetter, (Type Type, Func<IAnimator> Factory)> s_animators = new();
+
+        /// <summary>
+        /// Gets the value of the Animator attached property for a setter.
+        /// </summary>
+        /// <param name="setter">The animation setter.</param>
+        /// <returns>The property animator type.</returns>
+        public static (Type Type, Func<IAnimator> Factory)? GetAnimator(IAnimationSetter setter)
+        {
+            if (s_animators.TryGetValue(setter, out var type))
+            {
+                return type;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the value of the Animator attached property for a setter.
+        /// </summary>
+        /// <param name="setter">The animation setter.</param>
+        /// <param name="value">The property animator value.</param>
+        public static void SetAnimator(IAnimationSetter setter, 
+#if NET6_0_OR_GREATER
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicMethods)]
+#endif
+            Type value)
+        {
+            s_animators[setter] = (value, () => (IAnimator)Activator.CreateInstance(value)!);
+        }
+
+        private readonly static List<(Func<AvaloniaProperty, bool> Condition, Type Animator, Func<IAnimator> Factory)> Animators = new()
+        {
+            ( prop => typeof(bool).IsAssignableFrom(prop.PropertyType), typeof(BoolAnimator), () => new BoolAnimator() ),
+            ( prop => typeof(byte).IsAssignableFrom(prop.PropertyType), typeof(ByteAnimator), () => new ByteAnimator() ),
+            ( prop => typeof(Int16).IsAssignableFrom(prop.PropertyType), typeof(Int16Animator), () => new Int16Animator() ),
+            ( prop => typeof(Int32).IsAssignableFrom(prop.PropertyType), typeof(Int32Animator), () => new Int32Animator() ),
+            ( prop => typeof(Int64).IsAssignableFrom(prop.PropertyType), typeof(Int64Animator), () => new Int64Animator() ),
+            ( prop => typeof(UInt16).IsAssignableFrom(prop.PropertyType), typeof(UInt16Animator), () => new UInt16Animator() ),
+            ( prop => typeof(UInt32).IsAssignableFrom(prop.PropertyType), typeof(UInt32Animator), () => new UInt32Animator() ),
+            ( prop => typeof(UInt64).IsAssignableFrom(prop.PropertyType), typeof(UInt64Animator), () => new UInt64Animator() ),
+            ( prop => typeof(float).IsAssignableFrom(prop.PropertyType), typeof(FloatAnimator), () => new FloatAnimator() ),
+            ( prop => typeof(double).IsAssignableFrom(prop.PropertyType), typeof(DoubleAnimator), () => new DoubleAnimator() ),
+            ( prop => typeof(decimal).IsAssignableFrom(prop.PropertyType), typeof(DecimalAnimator), () => new DecimalAnimator() ),
+        };
+
+        /// <summary>
+        /// Registers a <see cref="Animator{T}"/> that can handle
+        /// a value type that matches the specified condition.
+        /// </summary>
+        /// <param name="condition">
+        /// The condition to which the <see cref="Animator{T}"/>
+        /// is to be activated and used.
+        /// </param>
+        /// <typeparam name="TAnimator">
+        /// The type of the animator to instantiate.
+        /// </typeparam>
+        public static void RegisterAnimator<TAnimator>(Func<AvaloniaProperty, bool> condition)
+            where TAnimator : IAnimator, new()
+        {
+            Animators.Insert(0, (condition, typeof(TAnimator), () => new TAnimator()));
+        }
+
+        private static (Type Type, Func<IAnimator> Factory)? GetAnimatorType(AvaloniaProperty property)
+        {
+            foreach (var (condition, type, factory) in Animators)
+            {
+                if (condition(property))
+                {
+                    return (type, factory);
+                }
+            }
+            return null;
+        }
+
+        private (IList<IAnimator> Animators, IList<IDisposable> subscriptions) InterpretKeyframes(Animatable control)
+        {
+            var handlerList = new Dictionary<(Type type, AvaloniaProperty Property), Func<IAnimator>>();
+            var animatorKeyFrames = new List<AnimatorKeyFrame>();
+            var subscriptions = new List<IDisposable>();
+
+            foreach (var keyframe in Children)
+            {
+                foreach (var setter in keyframe.Setters)
+                {
+                    if (setter.Property is null)
+                    {
+                        throw new InvalidOperationException("No Setter property assigned.");
+                    }
+
+                    var handler = Animation.GetAnimator(setter) ?? GetAnimatorType(setter.Property);
+
+                    if (handler == null)
+                    {
+                        throw new InvalidOperationException($"No animator registered for the property {setter.Property}. Add an animator to the Animation.Animators collection that matches this property to animate it.");
+                    }
+
+                    var (type, factory) = handler.Value;
+
+                    if (!handlerList.ContainsKey((type, setter.Property)))
+                        handlerList[(type, setter.Property)] = factory;
+
+                    var cue = keyframe.Cue;
+
+                    if (keyframe.TimingMode == KeyFrameTimingMode.TimeSpan)
+                    {
+                        cue = new Cue(keyframe.KeyTime.TotalSeconds / Duration.TotalSeconds);
+                    }
+
+                    var newKF = new AnimatorKeyFrame(type, factory, cue, keyframe.KeySpline);
+
+                    subscriptions.Add(newKF.BindSetter(setter, control));
+
+                    animatorKeyFrames.Add(newKF);
+                }
+            }
+
+            var newAnimatorInstances = new List<IAnimator>();
+
+            foreach (var handler in handlerList)
+            {
+                var newInstance = handler.Value();
+                newInstance.Property = handler.Key.Property;
+                newAnimatorInstances.Add(newInstance);
+            }
+
+            foreach (var keyframe in animatorKeyFrames)
+            {
+                var animator = newAnimatorInstances.First(a => a.GetType() == keyframe.AnimatorType &&
+                                                             a.Property == keyframe.Property);
+                animator.Add(keyframe);
+            }
+
+            return (newAnimatorInstances, subscriptions);
+        }
+
+        /// <inheritdoc/>
+        public IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
+        {
+            var (animators, subscriptions) = InterpretKeyframes(control);
+            if (animators.Count == 1)
+            {
+                var subscription = animators[0].Apply(this, control, clock, match, onComplete);
+                
+                if (subscription is not null)
+                {
+                    subscriptions.Add(subscription);
+                }
+            }
+            else
+            {
+                var completionTasks = onComplete != null ? new List<Task>() : null;
+                foreach (IAnimator animator in animators)
+                {
+                    Action? animatorOnComplete = null;
+                    if (onComplete != null)
+                    {
+                        var tcs = new TaskCompletionSource<object?>();
+                        animatorOnComplete = () => tcs.SetResult(null);
+                        completionTasks!.Add(tcs.Task);
+                    }
+
+                    var subscription = animator.Apply(this, control, clock, match, animatorOnComplete);
+
+                    if (subscription is not null)
+                    {
+                        subscriptions.Add(subscription);
+                    }
+                }
+
+                if (onComplete != null)
+                {
+                    Task.WhenAll(completionTasks!).ContinueWith(
+                        (_, state) => ((Action)state!).Invoke(),
+                        onComplete);
+                }
+            }
+            return new CompositeDisposable(subscriptions);
+        }
+
+        /// <inheritdoc/>
+        public Task RunAsync(Animatable control, IClock? clock = null)
+        {
+            return RunAsync(control, clock, default);
+        }
+
+        /// <inheritdoc/>
+        public Task RunAsync(Animatable control, IClock? clock = null, CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.CompletedTask;
+            }
+
+            var run = new TaskCompletionSource<object?>();
+
+            if (this.IterationCount == IterationCount.Infinite)
+                run.SetException(new InvalidOperationException("Looping animations must not use the Run method."));
+
+            IDisposable? subscriptions = null, cancellation = null;
+            subscriptions = this.Apply(control, clock, Observable.Return(true), () =>
+            {
+                run.TrySetResult(null);
+                subscriptions?.Dispose();
+                cancellation?.Dispose();
+            });
+
+            cancellation = cancellationToken.Register(() =>
+            {
+                run.TrySetResult(null);
+                subscriptions?.Dispose();
+                cancellation?.Dispose();
+            });
+
+            return run.Task;
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Base/Animation/AnimationInstance`1.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimationInstance`1.cs
rename to src/Avalonia.Base/Animation/AnimationInstance`1.cs
diff --git a/src/Avalonia.Animation/AnimatorDrivenTransition.cs b/src/Avalonia.Base/Animation/AnimatorDrivenTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimatorDrivenTransition.cs
rename to src/Avalonia.Base/Animation/AnimatorDrivenTransition.cs
diff --git a/src/Avalonia.Base/Animation/AnimatorKeyFrame.cs b/src/Avalonia.Base/Animation/AnimatorKeyFrame.cs
new file mode 100644
index 0000000000..0356723f00
--- /dev/null
+++ b/src/Avalonia.Base/Animation/AnimatorKeyFrame.cs
@@ -0,0 +1,89 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Animation.Animators;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Defines a KeyFrame that is used for
+    /// <see cref="Animator{T}"/> objects.
+    /// </summary>
+    public class AnimatorKeyFrame : AvaloniaObject
+    {
+        public static readonly DirectProperty<AnimatorKeyFrame, object?> ValueProperty =
+            AvaloniaProperty.RegisterDirect<AnimatorKeyFrame, object?>(nameof(Value), k => k.Value, (k, v) => k.Value = v);
+
+        public AnimatorKeyFrame()
+        {
+
+        }
+
+        public AnimatorKeyFrame(Type? animatorType, Func<IAnimator>? animatorFactory, Cue cue)
+        {
+            AnimatorType = animatorType;
+            AnimatorFactory = animatorFactory;
+            Cue = cue;
+            KeySpline = null;
+        }
+
+        public AnimatorKeyFrame(Type? animatorType, Func<IAnimator>? animatorFactory, Cue cue, KeySpline? keySpline)
+        {
+            AnimatorType = animatorType;
+            AnimatorFactory = animatorFactory;
+            Cue = cue;
+            KeySpline = keySpline;
+        }
+
+        internal bool isNeutral;
+        public Type? AnimatorType { get; }
+        public Func<IAnimator>? AnimatorFactory { get; }
+        public Cue Cue { get; }
+        public KeySpline? KeySpline { get; }
+        public AvaloniaProperty? Property { get; private set; }
+
+        private object? _value;
+
+        public object? Value
+        {
+            get => _value;
+            set => SetAndRaise(ValueProperty, ref _value, value);
+        }
+
+        public IDisposable BindSetter(IAnimationSetter setter, Animatable targetControl)
+        {
+            Property = setter.Property;
+            var value = setter.Value;
+
+            if (value is IBinding binding)
+            {
+                return this.Bind(ValueProperty, binding, targetControl);
+            }
+            else
+            {
+                return this.Bind(ValueProperty, ObservableEx.SingleValue(value).ToBinding(), targetControl);
+            }
+        }
+
+        public T GetTypedValue<T>()
+        {
+            var typeConv = TypeDescriptor.GetConverter(typeof(T));
+
+            if (Value == null)
+            {
+                throw new ArgumentNullException($"KeyFrame value can't be null.");
+            }
+            if(Value is T typedValue)
+            {
+                return typedValue;
+            }
+            if (!typeConv.CanConvertTo(Value.GetType()))
+            {
+                throw new InvalidCastException($"KeyFrame value doesnt match property type.");
+            }
+
+            return (T)typeConv.ConvertTo(Value, typeof(T))!;
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/AnimatorTransitionObservable.cs b/src/Avalonia.Base/Animation/AnimatorTransitionObservable.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimatorTransitionObservable.cs
rename to src/Avalonia.Base/Animation/AnimatorTransitionObservable.cs
diff --git a/src/Avalonia.Base/Animation/Animators/Animator`1.cs b/src/Avalonia.Base/Animation/Animators/Animator`1.cs
new file mode 100644
index 0000000000..8765cfb4c9
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/Animator`1.cs
@@ -0,0 +1,183 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Animation.Utils;
+using Avalonia.Collections;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Base class for <see cref="Animator{T}"/> objects
+    /// </summary>
+    public abstract class Animator<T> : AvaloniaList<AnimatorKeyFrame>, IAnimator
+    {
+        /// <summary>
+        /// List of type-converted keyframes.
+        /// </summary>
+        private readonly List<AnimatorKeyFrame> _convertedKeyframes = new List<AnimatorKeyFrame>();
+
+        private bool _isVerifiedAndConverted;
+
+        /// <summary>
+        /// Gets or sets the target property for the keyframe.
+        /// </summary>
+        public AvaloniaProperty? Property { get; set; }
+
+        public Animator()
+        {
+            // Invalidate keyframes when changed.
+            this.CollectionChanged += delegate { _isVerifiedAndConverted = false; };
+        }
+
+        /// <inheritdoc/>
+        public virtual IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
+        {
+            if (!_isVerifiedAndConverted)
+                VerifyConvertKeyFrames();
+
+            var subject = new DisposeAnimationInstanceSubject<T>(this, animation, control, clock, onComplete);
+            return match.Subscribe(subject);
+        }
+
+        protected T InterpolationHandler(double animationTime, T neutralValue)
+        {
+            AnimatorKeyFrame firstKeyframe, lastKeyframe;
+
+            int kvCount = _convertedKeyframes.Count;
+            if (kvCount > 2)
+            {
+                if (animationTime <= 0.0)
+                {
+                    firstKeyframe = _convertedKeyframes[0];
+                    lastKeyframe = _convertedKeyframes[1];
+                }
+                else if (animationTime >= 1.0)
+                {
+                    firstKeyframe = _convertedKeyframes[_convertedKeyframes.Count - 2];
+                    lastKeyframe = _convertedKeyframes[_convertedKeyframes.Count - 1];
+                }
+                else
+                {
+                    int index = FindClosestBeforeKeyFrame(animationTime);
+                    firstKeyframe = _convertedKeyframes[index];
+                    lastKeyframe = _convertedKeyframes[index + 1];
+                }
+            }
+            else
+            {
+                firstKeyframe = _convertedKeyframes[0];
+                lastKeyframe = _convertedKeyframes[1];
+            }
+
+            double t0 = firstKeyframe.Cue.CueValue;
+            double t1 = lastKeyframe.Cue.CueValue;
+
+            double progress = (animationTime - t0) / (t1 - t0);
+
+            T oldValue, newValue;
+
+            if (!firstKeyframe.isNeutral && firstKeyframe.Value is T firstKeyframeValue)
+                oldValue = firstKeyframeValue;
+            else
+                oldValue = neutralValue;
+
+            if (!lastKeyframe.isNeutral && lastKeyframe.Value is T lastKeyframeValue)
+                newValue = lastKeyframeValue;
+            else
+                newValue = neutralValue;
+
+            if (lastKeyframe.KeySpline != null)
+                progress = lastKeyframe.KeySpline.GetSplineProgress(progress);
+
+            return Interpolate(progress, oldValue, newValue);
+        }
+
+        private int FindClosestBeforeKeyFrame(double time)
+        {
+            for (int i = 0; i < _convertedKeyframes.Count; i++)
+                if (_convertedKeyframes[i].Cue.CueValue > time)
+                    return i - 1;
+
+            throw new Exception("Index time is out of keyframe time range.");
+        }
+
+        public virtual IDisposable BindAnimation(Animatable control, IObservable<T> instance)
+        {
+            if (Property is null)
+                throw new InvalidOperationException("Animator has no property specified.");
+
+            return control.Bind((AvaloniaProperty<T>)Property, instance, BindingPriority.Animation);
+        }
+
+        /// <summary>
+        /// Runs the KeyFrames Animation.
+        /// </summary>
+        internal IDisposable Run(Animation animation, Animatable control, IClock? clock, Action? onComplete)
+        {
+            var instance = new AnimationInstance<T>(
+                animation,
+                control,
+                this,
+                clock ?? control.Clock ?? Clock.GlobalClock,
+                onComplete,
+                InterpolationHandler);
+            
+            return BindAnimation(control, instance);
+        }
+
+        /// <summary>
+        /// Interpolates in-between two key values given the desired progress time.
+        /// </summary>
+        public abstract T Interpolate(double progress, T oldValue, T newValue);
+
+        private void VerifyConvertKeyFrames()
+        {
+            foreach (AnimatorKeyFrame keyframe in this)
+            {
+                _convertedKeyframes.Add(keyframe);
+            }
+
+            AddNeutralKeyFramesIfNeeded();
+
+            _isVerifiedAndConverted = true;
+        }
+
+        private void AddNeutralKeyFramesIfNeeded()
+        {
+            bool hasStartKey, hasEndKey;
+            hasStartKey = hasEndKey = false;
+
+            // Check if there's start and end keyframes.
+            foreach (var frame in _convertedKeyframes)
+            {
+                if (frame.Cue.CueValue == 0.0d)
+                {
+                    hasStartKey = true;
+                }
+                else if (frame.Cue.CueValue == 1.0d)
+                {
+                    hasEndKey = true;
+                }
+            }
+
+            if (!hasStartKey || !hasEndKey)
+                AddNeutralKeyFrames(hasStartKey, hasEndKey);
+        }
+
+        private void AddNeutralKeyFrames(bool hasStartKey, bool hasEndKey)
+        {
+            if (!hasStartKey)
+            {
+                _convertedKeyframes.Insert(0, new AnimatorKeyFrame(null, null, new Cue(0.0d)) { Value = default(T), isNeutral = true });
+            }
+
+            if (!hasEndKey)
+            {
+                _convertedKeyframes.Add(new AnimatorKeyFrame(null, null, new Cue(1.0d)) { Value = default(T), isNeutral = true });
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
new file mode 100644
index 0000000000..07c147ef6d
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+using Avalonia.Logging;
+using Avalonia.Media;
+
+#nullable enable
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles all animations on properties
+    /// with <see cref="IBrush"/> as their type and
+    /// redirect them to the properly registered
+    /// animators in this class.
+    /// </summary>
+    public class BaseBrushAnimator : Animator<IBrush?>
+    {
+        private static readonly List<(Func<Type, bool> Match, Type AnimatorType, Func<IAnimator> AnimatorFactory)> _brushAnimators = new();
+
+        /// <summary>
+        /// Register an <see cref="Animator{T}"/> that handles a specific
+        /// <see cref="IBrush"/>'s descendant value type.
+        /// </summary>
+        /// <param name="condition">
+        /// The condition to which the <see cref="Animator{T}"/>
+        /// is to be activated and used.
+        /// </param>
+        /// <typeparam name="TAnimator">
+        /// The type of the animator to instantiate.
+        /// </typeparam>
+        public static void RegisterBrushAnimator<TAnimator>(Func<Type, bool> condition)
+            where TAnimator : IAnimator, new()
+        {
+            _brushAnimators.Insert(0, (condition, typeof(TAnimator), () => new TAnimator()));
+        }
+
+        /// <inheritdoc/>
+        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
+            IObservable<bool> match, Action? onComplete)
+        {
+            if (TryCreateCustomRegisteredAnimator(out var animator)
+                || TryCreateGradientAnimator(out animator)
+                || TryCreateSolidColorBrushAnimator(out animator))
+            {
+                return animator.Apply(animation, control, clock, match, onComplete);
+            }
+
+            Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
+                this,
+                "The animation's keyframe value types set is not supported.");
+
+            return base.Apply(animation, control, clock, match, onComplete);
+        }
+
+        /// <summary>
+        /// Fallback implementation of <see cref="IBrush"/> animation.
+        /// </summary>
+        public override IBrush? Interpolate(double progress, IBrush? oldValue, IBrush? newValue) => progress >= 0.5 ? newValue : oldValue;
+
+        private bool TryCreateGradientAnimator([NotNullWhen(true)] out IAnimator? animator)
+        {
+            IGradientBrush? firstGradient = null;
+            foreach (var keyframe in this)
+            {
+                if (keyframe.Value is IGradientBrush gradientBrush)
+                {
+                    firstGradient = gradientBrush;
+                    break;
+                }
+            }
+
+            if (firstGradient is null)
+            {
+                animator = null;
+                return false;
+            }
+
+            var gradientAnimator = new GradientBrushAnimator();
+            gradientAnimator.Property = Property;
+
+            foreach (var keyframe in this)
+            {
+                if (keyframe.Value is ISolidColorBrush solidColorBrush)
+                {
+                    gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), () => new GradientBrushAnimator(), keyframe.Cue, keyframe.KeySpline)
+                    {
+                        Value = GradientBrushAnimator.ConvertSolidColorBrushToGradient(firstGradient, solidColorBrush)
+                    });
+                }
+                else if (keyframe.Value is IGradientBrush)
+                {
+                    gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), () => new GradientBrushAnimator(), keyframe.Cue, keyframe.KeySpline)
+                    {
+                        Value = keyframe.Value
+                    });
+                }
+                else
+                {
+                    animator = null;
+                    return false;
+                }
+            }
+
+            animator = gradientAnimator;
+            return true;
+        }
+
+        private bool TryCreateSolidColorBrushAnimator([NotNullWhen(true)] out IAnimator? animator)
+        {
+            var solidColorBrushAnimator = new ISolidColorBrushAnimator();
+            solidColorBrushAnimator.Property = Property;
+
+            foreach (var keyframe in this)
+            {
+                if (keyframe.Value is ISolidColorBrush)
+                {
+                    solidColorBrushAnimator.Add(new AnimatorKeyFrame(typeof(ISolidColorBrushAnimator), () => new ISolidColorBrushAnimator(), keyframe.Cue, keyframe.KeySpline)
+                    {
+                        Value = keyframe.Value
+                    });
+                }
+                else
+                {
+                    animator = null;
+                    return false;
+                }
+            }
+
+            animator = solidColorBrushAnimator;
+            return true;
+        }
+
+        private bool TryCreateCustomRegisteredAnimator([NotNullWhen(true)] out IAnimator? animator)
+        {
+            if (_brushAnimators.Count > 0 && this[0].Value?.GetType() is Type firstKeyType)
+            {
+                foreach (var (match, animatorType, animatorFactory) in _brushAnimators)
+                {
+                    if (!match(firstKeyType))
+                        continue;
+
+                    animator = animatorFactory();
+                    if (animator != null)
+                    {
+                        animator.Property = Property;
+                        foreach (var keyframe in this)
+                        {
+                            animator.Add(new AnimatorKeyFrame(animatorType, animatorFactory, keyframe.Cue, keyframe.KeySpline)
+                            {
+                                Value = keyframe.Value
+                            });
+                        }
+
+                        return true;
+                    }
+                }
+            }
+
+            animator = null;
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/Animators/BoolAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/BoolAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoxShadowAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BoxShadowAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoxShadowsAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BoxShadowsAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/ByteAnimator.cs b/src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/ByteAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
diff --git a/src/Avalonia.Base/Animation/Animators/ColorAnimator.cs b/src/Avalonia.Base/Animation/Animators/ColorAnimator.cs
new file mode 100644
index 0000000000..72add21d69
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/ColorAnimator.cs
@@ -0,0 +1,79 @@
+// Original color interpolation code was written by Romain Guy and Francois Blavoet 
+// and adopted from LottieSharp Project (https://github.com/ascora/LottieSharp).
+
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Logging;
+using Avalonia.Media;
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that interpolates <see cref="Color"/> through 
+    /// gamma sRGB color space for better visual result.
+    /// </summary>
+    public class ColorAnimator : Animator<Color>
+    {
+        /// <summary>
+        /// Opto-electronic conversion function for the sRGB color space.
+        /// Takes a gamma-encoded sRGB value and converts it to a linear sRGB value.
+        /// </summary>
+        private static double OECF_sRGB(double linear)
+        {
+            // IEC 61966-2-1:1999
+            return linear <= 0.0031308d ? linear * 12.92d : (double)(Math.Pow(linear, 1.0d / 2.4d) * 1.055d - 0.055d);
+        }
+
+        /// <summary>
+        /// Electro-optical conversion function for the sRGB color space.
+        /// Takes a linear sRGB value and converts it to a gamma-encoded sRGB value.
+        /// </summary>
+        private static double EOCF_sRGB(double srgb)
+        {
+            // IEC 61966-2-1:1999
+            return srgb <= 0.04045d ? srgb / 12.92d : (double)Math.Pow((srgb + 0.055d) / 1.055d, 2.4d);
+        }
+
+        public override Color Interpolate(double progress, Color oldValue, Color newValue)
+        {
+            return InterpolateCore(progress, oldValue, newValue);
+        }
+
+        internal static Color InterpolateCore(double progress, Color oldValue, Color newValue)
+        {
+            // normalize sRGB values.
+            var oldA = oldValue.A / 255d;
+            var oldR = oldValue.R / 255d;
+            var oldG = oldValue.G / 255d;
+            var oldB = oldValue.B / 255d;
+
+            var newA = newValue.A / 255d;
+            var newR = newValue.R / 255d;
+            var newG = newValue.G / 255d;
+            var newB = newValue.B / 255d;
+
+            // convert from sRGB to linear
+            oldR = EOCF_sRGB(oldR);
+            oldG = EOCF_sRGB(oldG);
+            oldB = EOCF_sRGB(oldB);
+
+            newR = EOCF_sRGB(newR);
+            newG = EOCF_sRGB(newG);
+            newB = EOCF_sRGB(newB);
+
+            // compute the interpolated color in linear space
+            var a = oldA + progress * (newA - oldA);
+            var r = oldR + progress * (newR - oldR);
+            var g = oldG + progress * (newG - oldG);
+            var b = oldB + progress * (newB - oldB);
+
+            // convert back to sRGB in the [0..255] range
+            a *= 255d;
+            r = OECF_sRGB(r) * 255d;
+            g = OECF_sRGB(g) * 255d;
+            b = OECF_sRGB(b) * 255d;
+
+            return new Color((byte)Math.Round(a), (byte)Math.Round(r), (byte)Math.Round(g), (byte)Math.Round(b));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/CornerRadiusAnimator.cs b/src/Avalonia.Base/Animation/Animators/CornerRadiusAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/CornerRadiusAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/CornerRadiusAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/DecimalAnimator.cs b/src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/DecimalAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/DoubleAnimator.cs b/src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/DoubleAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/FloatAnimator.cs b/src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/FloatAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
diff --git a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
new file mode 100644
index 0000000000..4727ea1bfb
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+
+#nullable enable
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="SolidColorBrush"/> values. 
+    /// </summary>
+    public class GradientBrushAnimator : Animator<IGradientBrush?>
+    {
+        private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator();
+        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
+
+        public override IGradientBrush? Interpolate(double progress, IGradientBrush? oldValue, IGradientBrush? newValue)
+        {
+            if (oldValue is null || newValue is null)
+            {
+                return progress >= 0.5 ? newValue : oldValue;
+            }
+
+            switch (oldValue)
+            {
+                case IRadialGradientBrush oldRadial when newValue is IRadialGradientBrush newRadial:
+                    return new ImmutableRadialGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
+                        s_relativePointAnimator.Interpolate(progress, oldRadial.GradientOrigin, newRadial.GradientOrigin),
+                        s_doubleAnimator.Interpolate(progress, oldRadial.Radius, newRadial.Radius));
+
+                case IConicGradientBrush oldConic when newValue is IConicGradientBrush newConic:
+                    return new ImmutableConicGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
+                        s_doubleAnimator.Interpolate(progress, oldConic.Angle, newConic.Angle));
+
+                case ILinearGradientBrush oldLinear when newValue is ILinearGradientBrush newLinear:
+                    return new ImmutableLinearGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
+                        s_relativePointAnimator.Interpolate(progress, oldLinear.EndPoint, newLinear.EndPoint));
+
+                default:
+                    return progress >= 0.5 ? newValue : oldValue;
+            }
+        }
+
+        public override IDisposable BindAnimation(Animatable control, IObservable<IGradientBrush?> instance)
+        {
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
+            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
+        }
+
+        private IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
+        {
+            var resultCount = Math.Max(oldValue.Count, newValue.Count);
+            var stops = new ImmutableGradientStop[resultCount];
+
+            for (int index = 0, oldIndex = 0, newIndex = 0; index < resultCount; index++)
+            {
+                stops[index] = new ImmutableGradientStop(
+                    s_doubleAnimator.Interpolate(progress, oldValue[oldIndex].Offset, newValue[newIndex].Offset),
+                    ColorAnimator.InterpolateCore(progress, oldValue[oldIndex].Color, newValue[newIndex].Color));
+
+                if (oldIndex < oldValue.Count - 1)
+                {
+                    oldIndex++;
+                }
+
+                if (newIndex < newValue.Count - 1)
+                {
+                    newIndex++;
+                }
+            }
+            
+            return stops;
+        }
+
+        internal static IGradientBrush ConvertSolidColorBrushToGradient(IGradientBrush gradientBrush, ISolidColorBrush solidColorBrush)
+        {
+            switch (gradientBrush)
+            {
+                case IRadialGradientBrush oldRadial:
+                    return new ImmutableRadialGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldRadial.GradientStops), solidColorBrush.Opacity,
+                        oldRadial.Transform is { } ? new ImmutableTransform(oldRadial.Transform.Value) : null,
+                        oldRadial.TransformOrigin,
+                        oldRadial.SpreadMethod, oldRadial.Center, oldRadial.GradientOrigin, oldRadial.Radius);
+
+                case IConicGradientBrush oldConic:
+                    return new ImmutableConicGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldConic.GradientStops), solidColorBrush.Opacity,
+                        oldConic.Transform is { } ? new ImmutableTransform(oldConic.Transform.Value) : null,
+                        oldConic.TransformOrigin,
+                        oldConic.SpreadMethod, oldConic.Center, oldConic.Angle);
+
+                case ILinearGradientBrush oldLinear:
+                    return new ImmutableLinearGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldLinear.GradientStops), solidColorBrush.Opacity,
+                        oldLinear.Transform is { } ? new ImmutableTransform(oldLinear.Transform.Value) : null,
+                        oldLinear.TransformOrigin,
+                        oldLinear.SpreadMethod, oldLinear.StartPoint, oldLinear.EndPoint);
+
+                default:
+                    throw new NotSupportedException($"Gradient of type {gradientBrush?.GetType()} is not supported");
+            }
+
+            static IReadOnlyList<ImmutableGradientStop> CreateStopsFromSolidColorBrush(ISolidColorBrush solidColorBrush, IReadOnlyList<IGradientStop> baseStops)
+            {
+                var stops = new ImmutableGradientStop[baseStops.Count];
+                for (int index = 0; index < baseStops.Count; index++)
+                {
+                    stops[index] = new ImmutableGradientStop(baseStops[index].Offset, solidColorBrush.Color);
+                }
+                return stops;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/Animators/Int16Animator.cs b/src/Avalonia.Base/Animation/Animators/Int16Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Int16Animator.cs
rename to src/Avalonia.Base/Animation/Animators/Int16Animator.cs
diff --git a/src/Avalonia.Animation/Animators/Int32Animator.cs b/src/Avalonia.Base/Animation/Animators/Int32Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Int32Animator.cs
rename to src/Avalonia.Base/Animation/Animators/Int32Animator.cs
diff --git a/src/Avalonia.Animation/Animators/Int64Animator.cs b/src/Avalonia.Base/Animation/Animators/Int64Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Int64Animator.cs
rename to src/Avalonia.Base/Animation/Animators/Int64Animator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/PointAnimator.cs b/src/Avalonia.Base/Animation/Animators/PointAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/PointAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/PointAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/RectAnimator.cs b/src/Avalonia.Base/Animation/Animators/RectAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/RectAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/RectAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs b/src/Avalonia.Base/Animation/Animators/RelativePointAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/RelativePointAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/SizeAnimator.cs b/src/Avalonia.Base/Animation/Animators/SizeAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/SizeAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/SizeAnimator.cs
diff --git a/src/Avalonia.Base/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/SolidColorBrushAnimator.cs
new file mode 100644
index 0000000000..9256c7be5e
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/SolidColorBrushAnimator.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+
+#nullable enable
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="SolidColorBrush"/> values. 
+    /// </summary>
+    public class ISolidColorBrushAnimator : Animator<ISolidColorBrush?>
+    {
+        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
+
+        public override ISolidColorBrush? Interpolate(double progress, ISolidColorBrush? oldValue, ISolidColorBrush? newValue)
+        {
+            if (oldValue is null || newValue is null)
+            {
+                return progress >= 0.5 ? newValue : oldValue;
+            }
+
+            return new ImmutableSolidColorBrush(
+                ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color),
+                s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity));
+        }
+
+        public override IDisposable BindAnimation(Animatable control, IObservable<ISolidColorBrush?> instance)
+        {
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
+            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
+        }
+    }
+    
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/ThicknessAnimator.cs b/src/Avalonia.Base/Animation/Animators/ThicknessAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/ThicknessAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/ThicknessAnimator.cs
diff --git a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
new file mode 100644
index 0000000000..e12ca722f9
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.Media.Transformation;
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="Transform"/> properties.
+    /// </summary>
+    public class TransformAnimator : Animator<double>
+    {
+        DoubleAnimator? _doubleAnimator;
+
+        /// <inheritdoc/>
+        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> obsMatch, Action? onComplete)
+        {
+            var ctrl = (Visual)control;
+
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
+            // Check if the Target Property is Transform derived.
+            if (typeof(Transform).IsAssignableFrom(Property.OwnerType))
+            {
+                if (ctrl.RenderTransform is TransformOperations)
+                {
+                    // HACK: This animator cannot reasonably animate CSS transforms at the moment.
+                    return Disposable.Empty;
+                }
+
+                if (ctrl.RenderTransform == null)
+                {
+                    var normalTransform = new TransformGroup();
+
+                    // Add the transforms according to MS Expression Blend's 
+                    // default RenderTransform order.
+
+                    normalTransform.Children.Add(new ScaleTransform());
+                    normalTransform.Children.Add(new SkewTransform());
+                    normalTransform.Children.Add(new RotateTransform());
+                    normalTransform.Children.Add(new TranslateTransform());
+                    normalTransform.Children.Add(new Rotate3DTransform());
+
+                    ctrl.RenderTransform = normalTransform;
+                }
+
+                var renderTransformType = ctrl.RenderTransform.GetType();
+
+                if (_doubleAnimator == null)
+                {
+                    _doubleAnimator = new DoubleAnimator();
+
+                    foreach (AnimatorKeyFrame keyframe in this)
+                    {
+                        _doubleAnimator.Add(keyframe);
+                    }
+
+                    _doubleAnimator.Property = Property;
+                }
+
+                // It's a transform object so let's target that.
+                if (renderTransformType == Property.OwnerType)
+                {
+                    return _doubleAnimator.Apply(animation, (Transform) ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
+                }
+                // It's a TransformGroup and try finding the target there.
+                else if (renderTransformType == typeof(TransformGroup))
+                {
+                    foreach (Transform transform in ((TransformGroup)ctrl.RenderTransform).Children)
+                    {
+                        if (transform.GetType() == Property.OwnerType)
+                        {
+                            return _doubleAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
+                        }
+                    }
+                }
+
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Animations)?.Log(
+                    control,
+                    $"Cannot find the appropriate transform: \"{Property.OwnerType}\" in {control}.");
+            }
+            else
+            {
+                Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
+                    control,
+                    $"Cannot apply animation: Target property owner {Property.OwnerType} is not a Transform object.");
+            }
+            return null;
+        }
+
+        /// <inheritdocs/> 
+        public override double Interpolate(double p, double o, double n) => 0;
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformOperationsAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/TransformOperationsAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/UInt16Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/UInt16Animator.cs
rename to src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
diff --git a/src/Avalonia.Animation/Animators/UInt32Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/UInt32Animator.cs
rename to src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
diff --git a/src/Avalonia.Animation/Animators/UInt64Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/UInt64Animator.cs
rename to src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/VectorAnimator.cs b/src/Avalonia.Base/Animation/Animators/VectorAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/VectorAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/VectorAnimator.cs
diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Base/Animation/Clock.cs
similarity index 100%
rename from src/Avalonia.Animation/Clock.cs
rename to src/Avalonia.Base/Animation/Clock.cs
diff --git a/src/Avalonia.Animation/ClockBase.cs b/src/Avalonia.Base/Animation/ClockBase.cs
similarity index 100%
rename from src/Avalonia.Animation/ClockBase.cs
rename to src/Avalonia.Base/Animation/ClockBase.cs
diff --git a/src/Avalonia.Base/Animation/CompositePageTransition.cs b/src/Avalonia.Base/Animation/CompositePageTransition.cs
new file mode 100644
index 0000000000..62119a0051
--- /dev/null
+++ b/src/Avalonia.Base/Animation/CompositePageTransition.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Defines a composite page transition that can be used to combine multiple transitions.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Instantiate the <see cref="CompositePageTransition" /> in XAML and initialize the
+    /// <see cref="Transitions" /> property in order to have many animations triggered at once.
+    /// For example, you can combine <see cref="CrossFade"/> and <see cref="PageSlide"/>.
+    /// <code>
+    /// <![CDATA[
+    /// <reactiveUi:RoutedViewHost Router="{Binding Router}">
+    ///   <reactiveUi:RoutedViewHost.PageTransition>
+    ///     <CompositePageTransition>
+    ///       <PageSlide Duration="0.5" />
+    ///       <CrossFade Duration="0.5" />
+    ///     </CompositePageTransition>
+    ///   </reactiveUi:RoutedViewHost.PageTransition>
+    /// </reactiveUi:RoutedViewHost>
+    /// ]]>
+    /// </code>
+    /// </para>
+    /// </remarks>
+    public class CompositePageTransition : IPageTransition
+    {
+        /// <summary>
+        /// Gets or sets the transitions to be executed. Can be defined from XAML.
+        /// </summary>
+        [Content]
+        public List<IPageTransition> PageTransitions { get; set; } = new List<IPageTransition>();
+
+        /// <inheritdoc />
+        public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+        {
+            var transitionTasks = PageTransitions
+                .Select(transition => transition.Start(from, to, forward, cancellationToken))
+                .ToArray();
+            return Task.WhenAll(transitionTasks);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/CrossFade.cs b/src/Avalonia.Base/Animation/CrossFade.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/CrossFade.cs
rename to src/Avalonia.Base/Animation/CrossFade.cs
diff --git a/src/Avalonia.Animation/Cue.cs b/src/Avalonia.Base/Animation/Cue.cs
similarity index 100%
rename from src/Avalonia.Animation/Cue.cs
rename to src/Avalonia.Base/Animation/Cue.cs
diff --git a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs b/src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
similarity index 100%
rename from src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
rename to src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
diff --git a/src/Avalonia.Animation/Easing/BackEaseIn.cs b/src/Avalonia.Base/Animation/Easings/BackEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BackEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/BackEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/BackEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/BackEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BackEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/BackEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/BackEaseOut.cs b/src/Avalonia.Base/Animation/Easings/BackEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BackEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/BackEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/BounceEaseIn.cs b/src/Avalonia.Base/Animation/Easings/BounceEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BounceEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/BounceEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/BounceEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/BounceEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BounceEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/BounceEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/BounceEaseOut.cs b/src/Avalonia.Base/Animation/Easings/BounceEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BounceEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/BounceEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/CircularEaseIn.cs b/src/Avalonia.Base/Animation/Easings/CircularEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CircularEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/CircularEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/CircularEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/CircularEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CircularEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/CircularEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/CircularEaseOut.cs b/src/Avalonia.Base/Animation/Easings/CircularEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CircularEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/CircularEaseOut.cs
diff --git a/src/Avalonia.Base/Animation/Easings/CubicBezier.cs b/src/Avalonia.Base/Animation/Easings/CubicBezier.cs
new file mode 100644
index 0000000000..5c2487a516
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Easings/CubicBezier.cs
@@ -0,0 +1,306 @@
+// ReSharper disable InconsistentNaming
+// Ported from Chromium project https://github.com/chromium/chromium/blob/374d31b7704475fa59f7b2cb836b3b68afdc3d79/ui/gfx/geometry/cubic_bezier.cc
+
+using System;
+using Avalonia.Utilities;
+
+// ReSharper disable CompareOfFloatsByEqualityOperator
+// ReSharper disable CommentTypo
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable TooWideLocalVariableScope
+// ReSharper disable UnusedMember.Global
+#pragma warning disable 649
+
+namespace Avalonia.Animation.Easings
+{
+    /// <summary>
+    /// Represents a cubic bezier curve and can compute Y coordinate for a given X
+    /// </summary>
+    internal unsafe struct CubicBezier
+    {
+        const int CUBIC_BEZIER_SPLINE_SAMPLES = 11;
+        double ax_;
+        double bx_;
+        double cx_;
+
+        double ay_;
+        double by_;
+        double cy_;
+
+        double start_gradient_;
+        double end_gradient_;
+
+        double range_min_;
+        double range_max_;
+        private bool monotonically_increasing_;
+
+        fixed double spline_samples_[CUBIC_BEZIER_SPLINE_SAMPLES];
+
+        public CubicBezier(double p1x, double p1y, double p2x, double p2y) : this()
+        {
+            InitCoefficients(p1x, p1y, p2x, p2y);
+            InitGradients(p1x, p1y, p2x, p2y);
+            InitRange(p1y, p2y);
+            InitSpline();
+        }
+
+        public readonly double SampleCurveX(double t)
+        {
+            // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
+            return ((ax_ * t + bx_) * t + cx_) * t;
+        }
+
+        readonly double SampleCurveY(double t)
+        {
+            return ((ay_ * t + by_) * t + cy_) * t;
+        }
+
+        readonly double SampleCurveDerivativeX(double t)
+        {
+            return (3.0 * ax_ * t + 2.0 * bx_) * t + cx_;
+        }
+
+        readonly double SampleCurveDerivativeY(double t)
+        {
+            return (3.0 * ay_ * t + 2.0 * by_) * t + cy_;
+        }
+
+        public readonly double SolveWithEpsilon(double x, double epsilon)
+        {
+            if (x < 0.0)
+                return 0.0 + start_gradient_ * x;
+            if (x > 1.0)
+                return 1.0 + end_gradient_ * (x - 1.0);
+            return SampleCurveY(SolveCurveX(x, epsilon));
+        }
+        
+        void InitCoefficients(double p1x,
+            double p1y,
+            double p2x,
+            double p2y)
+        {
+            // Calculate the polynomial coefficients, implicit first and last control
+            // points are (0,0) and (1,1).
+            cx_ = 3.0 * p1x;
+            bx_ = 3.0 * (p2x - p1x) - cx_;
+            ax_ = 1.0 - cx_ - bx_;
+
+            cy_ = 3.0 * p1y;
+            by_ = 3.0 * (p2y - p1y) - cy_;
+            ay_ = 1.0 - cy_ - by_;
+
+#if DEBUG
+            // Bezier curves with x-coordinates outside the range [0,1] for internal
+            // control points may have multiple values for t for a given value of x.
+            // In this case, calls to SolveCurveX may produce ambiguous results.
+            monotonically_increasing_ = p1x >= 0 && p1x <= 1 && p2x >= 0 && p2x <= 1;
+#endif
+        }
+
+        void InitGradients(double p1x,
+            double p1y,
+            double p2x,
+            double p2y)
+        {
+            // End-point gradients are used to calculate timing function results
+            // outside the range [0, 1].
+            //
+            // There are four possibilities for the gradient at each end:
+            // (1) the closest control point is not horizontally coincident with regard to
+            //     (0, 0) or (1, 1). In this case the line between the end point and
+            //     the control point is tangent to the bezier at the end point.
+            // (2) the closest control point is coincident with the end point. In
+            //     this case the line between the end point and the far control
+            //     point is tangent to the bezier at the end point.
+            // (3) both internal control points are coincident with an endpoint. There
+            //     are two special case that fall into this category:
+            //     CubicBezier(0, 0, 0, 0) and CubicBezier(1, 1, 1, 1). Both are
+            //     equivalent to linear.
+            // (4) the closest control point is horizontally coincident with the end
+            //     point, but vertically distinct. In this case the gradient at the
+            //     end point is Infinite. However, this causes issues when
+            //     interpolating. As a result, we break down to a simple case of
+            //     0 gradient under these conditions.
+
+            if (p1x > 0)
+                start_gradient_ = p1y / p1x;
+            else if (p1y == 0 && p2x > 0)
+                start_gradient_ = p2y / p2x;
+            else if (p1y == 0 && p2y == 0)
+                start_gradient_ = 1;
+            else
+                start_gradient_ = 0;
+
+            if (p2x < 1)
+                end_gradient_ = (p2y - 1) / (p2x - 1);
+            else if (p2y == 1 && p1x < 1)
+                end_gradient_ = (p1y - 1) / (p1x - 1);
+            else if (p2y == 1 && p1y == 1)
+                end_gradient_ = 1;
+            else
+                end_gradient_ = 0;
+        }
+
+        const double kBezierEpsilon = 1e-7;
+
+        void InitRange(double p1y, double p2y)
+        {
+            range_min_ = 0;
+            range_max_ = 1;
+            if (0 <= p1y && p1y < 1 && 0 <= p2y && p2y <= 1)
+                return;
+
+            double epsilon = kBezierEpsilon;
+
+            // Represent the function's derivative in the form at^2 + bt + c
+            // as in sampleCurveDerivativeY.
+            // (Technically this is (dy/dt)*(1/3), which is suitable for finding zeros
+            // but does not actually give the slope of the curve.)
+            double a = 3.0 * ay_;
+            double b = 2.0 * by_;
+            double c = cy_;
+
+            // Check if the derivative is constant.
+            if (Math.Abs(a) < epsilon && Math.Abs(b) < epsilon)
+                return;
+
+            // Zeros of the function's derivative.
+            double t1;
+            double t2 = 0;
+
+            if (Math.Abs(a) < epsilon)
+            {
+                // The function's derivative is linear.
+                t1 = -c / b;
+            }
+            else
+            {
+                // The function's derivative is a quadratic. We find the zeros of this
+                // quadratic using the quadratic formula.
+                double discriminant = b * b - 4 * a * c;
+                if (discriminant < 0)
+                    return;
+                double discriminant_sqrt = Math.Sqrt(discriminant);
+                t1 = (-b + discriminant_sqrt) / (2 * a);
+                t2 = (-b - discriminant_sqrt) / (2 * a);
+            }
+
+            double sol1 = 0;
+            double sol2 = 0;
+
+            // If the solution is in the range [0,1] then we include it, otherwise we
+            // ignore it.
+
+            // An interesting fact about these beziers is that they are only
+            // actually evaluated in [0,1]. After that we take the tangent at that point
+            // and linearly project it out.
+            if (0 < t1 && t1 < 1)
+                sol1 = SampleCurveY(t1);
+
+            if (0 < t2 && t2 < 1)
+                sol2 = SampleCurveY(t2);
+
+            range_min_ = Math.Min(Math.Min(range_min_, sol1), sol2);
+            range_max_ = Math.Max(Math.Max(range_max_, sol1), sol2);
+        }
+
+        void InitSpline()
+        {
+            double delta_t = 1.0 / (CUBIC_BEZIER_SPLINE_SAMPLES - 1);
+            for (int i = 0; i < CUBIC_BEZIER_SPLINE_SAMPLES; i++)
+            {
+                spline_samples_[i] = SampleCurveX(i * delta_t);
+            }
+        }
+
+        const int kMaxNewtonIterations = 4;
+
+
+        public readonly double SolveCurveX(double x, double epsilon)
+        {
+            if (x < 0 || x > 1)
+                throw new ArgumentException();
+
+            double t0 = 0;
+            double t1 = 0;
+            double t2 = x;
+            double x2 = 0;
+            double d2;
+            int i;
+
+#if DEBUG
+            if (!monotonically_increasing_)
+                throw new InvalidOperationException();
+#endif
+
+            // Linear interpolation of spline curve for initial guess.
+            double delta_t = 1.0 / (CUBIC_BEZIER_SPLINE_SAMPLES - 1);
+            for (i = 1; i < CUBIC_BEZIER_SPLINE_SAMPLES; i++)
+            {
+                if (x <= spline_samples_[i])
+                {
+                    t1 = delta_t * i;
+                    t0 = t1 - delta_t;
+                    t2 = t0 + (t1 - t0) * (x - spline_samples_[i - 1]) /
+                        (spline_samples_[i] - spline_samples_[i - 1]);
+                    break;
+                }
+            }
+
+            // Perform a few iterations of Newton's method -- normally very fast.
+            // See https://en.wikipedia.org/wiki/Newton%27s_method.
+            double newton_epsilon = Math.Min(kBezierEpsilon, epsilon);
+            for (i = 0; i < kMaxNewtonIterations; i++)
+            {
+                x2 = SampleCurveX(t2) - x;
+                if (Math.Abs(x2) < newton_epsilon)
+                    return t2;
+                d2 = SampleCurveDerivativeX(t2);
+                if (Math.Abs(d2) < kBezierEpsilon)
+                    break;
+                t2 = t2 - x2 / d2;
+            }
+
+            if (Math.Abs(x2) < epsilon)
+                return t2;
+
+            // Fall back to the bisection method for reliability.
+            while (t0 < t1)
+            {
+                x2 = SampleCurveX(t2);
+                if (Math.Abs(x2 - x) < epsilon)
+                    return t2;
+                if (x > x2)
+                    t0 = t2;
+                else
+                    t1 = t2;
+                t2 = (t1 + t0) * .5;
+            }
+
+            // Failure.
+            return t2;
+        }
+
+        public readonly double Solve(double x)
+        {
+            return SolveWithEpsilon(x, kBezierEpsilon);
+        }
+
+        public readonly double SlopeWithEpsilon(double x, double epsilon)
+        {
+            x = MathUtilities.Clamp(x, 0.0, 1.0);
+            double t = SolveCurveX(x, epsilon);
+            double dx = SampleCurveDerivativeX(t);
+            double dy = SampleCurveDerivativeY(t);
+            return dy / dx;
+        }
+
+        public readonly double Slope(double x)
+        {
+            return SlopeWithEpsilon(x, kBezierEpsilon);
+        }
+
+        public readonly double RangeMin => range_min_;
+        public readonly double RangeMax => range_max_;
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Animation/Easings/CubicBezierEasing.cs b/src/Avalonia.Base/Animation/Easings/CubicBezierEasing.cs
new file mode 100644
index 0000000000..71582fa448
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Easings/CubicBezierEasing.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace Avalonia.Animation.Easings;
+
+public class CubicBezierEasing : IEasing
+{
+    private CubicBezier _bezier;
+    //cubic-bezier(0.25, 0.1, 0.25, 1.0)
+    internal CubicBezierEasing(Point controlPoint1, Point controlPoint2)
+    {
+        ControlPoint1 = controlPoint1;
+        ControlPoint2 = controlPoint2;
+        if (controlPoint1.X < 0 || controlPoint1.X > 1 || controlPoint2.X < 0 || controlPoint2.X > 1)
+            throw new ArgumentException();
+        _bezier = new CubicBezier(controlPoint1.X, controlPoint1.Y, controlPoint2.X, controlPoint2.Y);
+    }
+
+    public Point ControlPoint2 { get; set; }
+    public Point ControlPoint1 { get; set; }
+    
+    internal static IEasing Ease { get; } = new CubicBezierEasing(new Point(0.25, 0.1), new Point(0.25, 1));
+
+    double IEasing.Ease(double progress)
+    {
+        return _bezier.Solve(progress);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Animation/Easing/CubicEaseIn.cs b/src/Avalonia.Base/Animation/Easings/CubicEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CubicEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/CubicEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/CubicEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/CubicEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CubicEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/CubicEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/CubicEaseOut.cs b/src/Avalonia.Base/Animation/Easings/CubicEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CubicEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/CubicEaseOut.cs
diff --git a/src/Avalonia.Base/Animation/Easings/Easing.cs b/src/Avalonia.Base/Animation/Easings/Easing.cs
new file mode 100644
index 0000000000..d4f817ccc3
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Easings/Easing.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using Avalonia.SourceGenerator;
+
+namespace Avalonia.Animation.Easings
+{
+    /// <summary>
+    /// Base class for all Easing classes.
+    /// </summary>
+    [TypeConverter(typeof(EasingTypeConverter))]
+    public abstract partial class Easing : IEasing
+    {
+        /// <inheritdoc/>
+        public abstract double Ease(double progress);
+
+        private const string Namespace = "Avalonia.Animation.Easings";
+
+        [SubtypesFactory(typeof(Easing), Namespace)]
+        private static partial bool TryCreateEasingInstance(string type, [NotNullWhen(true)] out Easing? instance);
+
+        /// <summary>
+        /// Parses a Easing type string.
+        /// </summary>
+        /// <param name="e">The Easing type string.</param>
+        /// <returns>Returns the instance of the parsed type.</returns>
+        public static Easing Parse(string e)
+        {
+#if NETSTANDARD2_0
+            if (e.Contains(","))
+#else
+            if (e.Contains(','))
+#endif
+            {
+                return new SplineEasing(KeySpline.Parse(e, CultureInfo.InvariantCulture));
+            }
+
+            return TryCreateEasingInstance(e, out var easing)
+                ? easing
+                : throw new FormatException($"Easing \"{e}\" was not found in {Namespace} namespace.");
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs b/src/Avalonia.Base/Animation/Easings/EasingTypeConverter.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/EasingTypeConverter.cs
rename to src/Avalonia.Base/Animation/Easings/EasingTypeConverter.cs
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/ElasticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ElasticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/ElasticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/ElasticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ElasticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/ElasticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/ElasticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ElasticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/ElasticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseIn.cs b/src/Avalonia.Base/Animation/Easings/ExponentialEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ExponentialEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/ExponentialEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/ExponentialEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/ExponentialEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseOut.cs b/src/Avalonia.Base/Animation/Easings/ExponentialEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ExponentialEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/ExponentialEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/IEasing.cs b/src/Avalonia.Base/Animation/Easings/IEasing.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/IEasing.cs
rename to src/Avalonia.Base/Animation/Easings/IEasing.cs
diff --git a/src/Avalonia.Animation/Easing/LinearEasing.cs b/src/Avalonia.Base/Animation/Easings/LinearEasing.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/LinearEasing.cs
rename to src/Avalonia.Base/Animation/Easings/LinearEasing.cs
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/QuadraticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuadraticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/QuadraticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/QuadraticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuadraticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/QuadraticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuadraticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuadraticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/QuarticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuarticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/QuarticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/QuarticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuarticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuarticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/QuarticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuarticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuarticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/QuinticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuinticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/QuinticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/QuinticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuinticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuinticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/QuinticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuinticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuinticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/SineEaseIn.cs b/src/Avalonia.Base/Animation/Easings/SineEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SineEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/SineEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/SineEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/SineEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SineEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/SineEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/SineEaseOut.cs b/src/Avalonia.Base/Animation/Easings/SineEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SineEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/SineEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/SplineEasing.cs b/src/Avalonia.Base/Animation/Easings/SplineEasing.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SplineEasing.cs
rename to src/Avalonia.Base/Animation/Easings/SplineEasing.cs
diff --git a/src/Avalonia.Base/Animation/Easings/SpringEasing.cs b/src/Avalonia.Base/Animation/Easings/SpringEasing.cs
new file mode 100644
index 0000000000..70e74c639f
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Easings/SpringEasing.cs
@@ -0,0 +1,80 @@
+namespace Avalonia.Animation.Easings;
+
+/// <summary>
+/// Eases a <see cref="double"/> value using a user-defined spring formula.
+/// </summary>
+public class SpringEasing : Easing
+{
+    private readonly Spring _internalSpring;
+
+    /// <summary>
+    /// The spring mass.
+    /// </summary>
+    public double Mass
+    {
+        get => _internalSpring.Mass;
+        set
+        {
+            _internalSpring.Mass = value;
+        }
+    }
+
+    /// <summary>
+    /// The spring stiffness.
+    /// </summary>
+    public double Stiffness
+    {
+        get => _internalSpring.Stiffness;
+        set
+        {
+            _internalSpring.Stiffness = value;
+        }
+    }
+
+    /// <summary>
+    /// The spring damping.
+    /// </summary> 
+    public double Damping
+    {
+        get => _internalSpring.Damping;
+        set
+        {
+            _internalSpring.Damping = value;
+        }
+    }
+
+    /// <summary>
+    /// The spring initial velocity.
+    /// </summary>
+    public double InitialVelocity
+    {
+        get => _internalSpring.InitialVelocity;
+        set
+        {
+            _internalSpring.InitialVelocity = value;
+        }
+    }
+
+    public SpringEasing(double mass = 0d, double stiffness = 0d, double damping = 0d, double initialVelocity = 0d)
+    {
+        _internalSpring = new Spring();
+
+        Mass = mass;
+        Stiffness = stiffness;
+        Damping = damping;
+        InitialVelocity = initialVelocity;
+    }
+
+    public SpringEasing(Spring keySpline)
+    {
+        _internalSpring = keySpline;
+    }
+    
+    public SpringEasing()
+    {
+        _internalSpring = new Spring();
+    }
+
+    /// <inheritdoc/>
+    public override double Ease(double progress) => _internalSpring.GetSpringProgress(progress);
+}
diff --git a/src/Avalonia.Animation/FillMode.cs b/src/Avalonia.Base/Animation/FillMode.cs
similarity index 100%
rename from src/Avalonia.Animation/FillMode.cs
rename to src/Avalonia.Base/Animation/FillMode.cs
diff --git a/src/Avalonia.Base/Animation/IAnimation.cs b/src/Avalonia.Base/Animation/IAnimation.cs
new file mode 100644
index 0000000000..eda86ed106
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IAnimation.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Interface for Animation objects
+    /// </summary>
+    [NotClientImplementable]
+    public interface IAnimation
+    {
+        /// <summary>
+        /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
+        /// </summary>
+        IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete = null);
+
+        /// <summary>
+        /// Run the animation on the specified control.
+        /// </summary>
+        Task RunAsync(Animatable control, IClock clock, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IAnimationSetter.cs b/src/Avalonia.Base/Animation/IAnimationSetter.cs
new file mode 100644
index 0000000000..8c4ba95517
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IAnimationSetter.cs
@@ -0,0 +1,11 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    [NotClientImplementable]
+    public interface IAnimationSetter
+    {
+        AvaloniaProperty? Property { get; set; }
+        object? Value { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IAnimator.cs b/src/Avalonia.Base/Animation/IAnimator.cs
new file mode 100644
index 0000000000..06ba8dc329
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IAnimator.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Interface for Animator objects
+    /// </summary>
+    [NotClientImplementable]
+    public interface IAnimator : IList<AnimatorKeyFrame>
+    {
+        /// <summary>
+        /// The target property.
+        /// </summary>
+        AvaloniaProperty? Property {get; set;}
+
+        /// <summary>
+        /// Applies the current KeyFrame group to the specified control.
+        /// </summary>
+        IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete);
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IClock.cs b/src/Avalonia.Base/Animation/IClock.cs
new file mode 100644
index 0000000000..7b3b7b3924
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IClock.cs
@@ -0,0 +1,11 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    [NotClientImplementable]
+    public interface IClock : IObservable<TimeSpan>
+    {
+        PlayState PlayState { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IGlobalClock.cs b/src/Avalonia.Base/Animation/IGlobalClock.cs
new file mode 100644
index 0000000000..138dc07539
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IGlobalClock.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    [NotClientImplementable]
+    public interface IGlobalClock : IClock
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/IPageTransition.cs b/src/Avalonia.Base/Animation/IPageTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/IPageTransition.cs
rename to src/Avalonia.Base/Animation/IPageTransition.cs
diff --git a/src/Avalonia.Base/Animation/ITransition.cs b/src/Avalonia.Base/Animation/ITransition.cs
new file mode 100644
index 0000000000..639b92ce35
--- /dev/null
+++ b/src/Avalonia.Base/Animation/ITransition.cs
@@ -0,0 +1,23 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Interface for Transition objects.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ITransition
+    {
+        /// <summary>
+        /// Applies the transition to the specified <see cref="Animatable"/>.
+        /// </summary>
+        IDisposable Apply(Animatable control, IClock clock, object? oldValue, object? newValue);
+
+        /// <summary>
+        /// Gets the property to be animated.
+        /// </summary>
+        AvaloniaProperty Property { get; set; }
+    
+    }
+}
diff --git a/src/Avalonia.Animation/IterationCount.cs b/src/Avalonia.Base/Animation/IterationCount.cs
similarity index 100%
rename from src/Avalonia.Animation/IterationCount.cs
rename to src/Avalonia.Base/Animation/IterationCount.cs
diff --git a/src/Avalonia.Animation/IterationCountTypeConverter.cs b/src/Avalonia.Base/Animation/IterationCountTypeConverter.cs
similarity index 100%
rename from src/Avalonia.Animation/IterationCountTypeConverter.cs
rename to src/Avalonia.Base/Animation/IterationCountTypeConverter.cs
diff --git a/src/Avalonia.Animation/KeyFrame.cs b/src/Avalonia.Base/Animation/KeyFrame.cs
similarity index 100%
rename from src/Avalonia.Animation/KeyFrame.cs
rename to src/Avalonia.Base/Animation/KeyFrame.cs
diff --git a/src/Avalonia.Animation/KeyFrames.cs b/src/Avalonia.Base/Animation/KeyFrames.cs
similarity index 100%
rename from src/Avalonia.Animation/KeyFrames.cs
rename to src/Avalonia.Base/Animation/KeyFrames.cs
diff --git a/src/Avalonia.Animation/KeySpline.cs b/src/Avalonia.Base/Animation/KeySpline.cs
similarity index 100%
rename from src/Avalonia.Animation/KeySpline.cs
rename to src/Avalonia.Base/Animation/KeySpline.cs
diff --git a/src/Avalonia.Animation/KeySplineTypeConverter.cs b/src/Avalonia.Base/Animation/KeySplineTypeConverter.cs
similarity index 100%
rename from src/Avalonia.Animation/KeySplineTypeConverter.cs
rename to src/Avalonia.Base/Animation/KeySplineTypeConverter.cs
diff --git a/src/Avalonia.Base/Animation/PageSlide.cs b/src/Avalonia.Base/Animation/PageSlide.cs
new file mode 100644
index 0000000000..b22bc8b243
--- /dev/null
+++ b/src/Avalonia.Base/Animation/PageSlide.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Transitions between two pages by sliding them horizontally or vertically.
+    /// </summary>
+    public class PageSlide : IPageTransition
+    {
+        /// <summary>
+        /// The axis on which the PageSlide should occur
+        /// </summary>
+        public enum SlideAxis
+        {
+            Horizontal,
+            Vertical
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageSlide"/> class.
+        /// </summary>
+        public PageSlide()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageSlide"/> class.
+        /// </summary>
+        /// <param name="duration">The duration of the animation.</param>
+        /// <param name="orientation">The axis on which the animation should occur</param>
+        public PageSlide(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal)
+        {
+            Duration = duration;
+            Orientation = orientation;
+        }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public TimeSpan Duration { get; set; }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public SlideAxis Orientation { get; set; }
+        
+        /// <summary>
+        /// Gets or sets element entrance easing.
+        /// </summary>
+        public Easing SlideInEasing { get; set; } = new LinearEasing();
+        
+        /// <summary>
+        /// Gets or sets element exit easing.
+        /// </summary>
+        public Easing SlideOutEasing { get; set; } = new LinearEasing();
+
+        /// <inheritdoc />
+        public virtual async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            var tasks = new List<Task>();
+            var parent = GetVisualParent(from, to);
+            var distance = Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
+            var translateProperty = Orientation == SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
+
+            if (from != null)
+            {
+                var animation = new Animation
+                {
+                    Easing = SlideOutEasing,
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = translateProperty,
+                                    Value = forward ? -distance : distance
+                                }
+                            },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(from, null, cancellationToken));
+            }
+
+            if (to != null)
+            {
+                to.IsVisible = true;
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Easing = SlideInEasing,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = translateProperty,
+                                    Value = forward ? distance : -distance
+                                }
+                            },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(to, null, cancellationToken));
+            }
+
+            await Task.WhenAll(tasks);
+
+            if (from != null && !cancellationToken.IsCancellationRequested)
+            {
+                from.IsVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the common visual parent of the two control.
+        /// </summary>
+        /// <param name="from">The from control.</param>
+        /// <param name="to">The to control.</param>
+        /// <returns>The common parent.</returns>
+        /// <exception cref="ArgumentException">
+        /// The two controls do not share a common parent.
+        /// </exception>
+        /// <remarks>
+        /// Any one of the parameters may be null, but not both.
+        /// </remarks>
+        protected static IVisual GetVisualParent(IVisual? from, IVisual? to)
+        {
+            var p1 = (from ?? to)!.VisualParent;
+            var p2 = (to ?? from)!.VisualParent;
+
+            if (p1 != null && p2 != null && p1 != p2)
+            {
+                throw new ArgumentException("Controls for PageSlide must have same parent.");
+            }
+
+            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/PlayState.cs b/src/Avalonia.Base/Animation/PlayState.cs
similarity index 100%
rename from src/Avalonia.Animation/PlayState.cs
rename to src/Avalonia.Base/Animation/PlayState.cs
diff --git a/src/Avalonia.Animation/PlaybackDirection.cs b/src/Avalonia.Base/Animation/PlaybackDirection.cs
similarity index 100%
rename from src/Avalonia.Animation/PlaybackDirection.cs
rename to src/Avalonia.Base/Animation/PlaybackDirection.cs
diff --git a/src/Avalonia.Visuals/Animation/RenderLoopClock.cs b/src/Avalonia.Base/Animation/RenderLoopClock.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/RenderLoopClock.cs
rename to src/Avalonia.Base/Animation/RenderLoopClock.cs
diff --git a/src/Avalonia.Base/Animation/Spring.cs b/src/Avalonia.Base/Animation/Spring.cs
new file mode 100644
index 0000000000..03ada9196d
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Spring.cs
@@ -0,0 +1,143 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Avalonia;
+using Avalonia.Utilities;
+
+namespace Avalonia.Animation;
+
+/// <summary>
+/// Determines how an animation is used based on spring formula.
+/// </summary>
+[TypeConverter(typeof(SpringTypeConverter))]
+public class Spring
+{
+    private SpringSolver _springSolver;
+    private double _mass;
+    private double _stiffness;
+    private double _damping;
+    private double _initialVelocity;
+    private bool _isDirty;
+
+    /// <summary>
+    /// Create a <see cref="Spring"/>.
+    /// </summary>
+    public Spring()
+    {
+        _mass = 0.0;
+        _stiffness = 0.0;
+        _damping = 0.0;
+        _initialVelocity = 0.0;
+        _isDirty = true;
+    }
+
+    /// <summary>
+    /// Create a <see cref="Spring"/> with the given parameters.
+    /// </summary>
+    /// <param name="mass">The spring mass.</param>
+    /// <param name="stiffness">The spring stiffness.</param>
+    /// <param name="damping">The spring damping.</param>
+    /// <param name="initialVelocity">The spring initial velocity.</param>
+    public Spring(double mass, double stiffness, double damping, double initialVelocity)
+    {
+        _mass = mass;
+        _stiffness = stiffness;
+        _damping = damping;
+        _initialVelocity = initialVelocity;
+        _isDirty = true;
+    }
+
+    /// <summary>
+    /// Parse a <see cref="Spring"/> from a string. The string needs to contain 4 values in it.
+    /// </summary>
+    /// <param name="value">string with 4 values in it</param>
+    /// <param name="culture">culture of the string</param>
+    /// <exception cref="FormatException">Thrown if the string does not have 4 values</exception>
+    /// <returns>A <see cref="Spring"/> with the appropriate values set</returns>
+    public static Spring Parse(string value, CultureInfo? culture)
+    {
+        if (culture is null)
+        {
+            culture = CultureInfo.InvariantCulture;
+        }
+
+        using var tokenizer = new StringTokenizer(value, culture, exceptionMessage: $"Invalid Spring string: \"{value}\".");
+        return new Spring(tokenizer.ReadDouble(), tokenizer.ReadDouble(), tokenizer.ReadDouble(), tokenizer.ReadDouble());
+    }
+
+    /// <summary>
+    /// The spring mass.
+    /// </summary>
+    public double Mass
+    {
+        get => _mass;
+        set
+        {
+            _mass = value;
+            _isDirty = true;
+        }
+    }
+
+    /// <summary>
+    /// The spring stiffness.
+    /// </summary>
+    public double Stiffness
+    {
+        get => _stiffness;
+        set
+        {
+            _stiffness = value;
+            _isDirty = true;
+        }
+    }
+
+    /// <summary>
+    /// The spring damping.
+    /// </summary>
+    public double Damping
+    {
+        get => _damping;
+        set
+        {
+            _damping = value;
+            _isDirty = true;
+        }
+    }
+
+    /// <summary>
+    /// The spring initial velocity.
+    /// </summary>
+    public double InitialVelocity
+    {
+        get => _initialVelocity;
+        set
+        {
+            _initialVelocity = value;
+            _isDirty = true;
+        }
+    }
+
+    /// <summary>
+    /// Calculates spring progress from a linear progress.
+    /// </summary>
+    /// <param name="linearProgress">the linear progress</param>
+    /// <returns>The spring progress</returns>
+    public double GetSpringProgress(double linearProgress)
+    {
+        if (_isDirty)
+        {
+            Build();
+        }
+
+        return _springSolver.Solve(linearProgress);
+    }
+
+    /// <summary>
+    /// Create cached spring solver.
+    /// </summary>
+    private void Build()
+    {
+        _springSolver = new SpringSolver(_mass, _stiffness, _damping, _initialVelocity);
+        _isDirty = false;
+    }
+}
diff --git a/src/Avalonia.Base/Animation/SpringTypeConverter.cs b/src/Avalonia.Base/Animation/SpringTypeConverter.cs
new file mode 100644
index 0000000000..cfcf4c4a14
--- /dev/null
+++ b/src/Avalonia.Base/Animation/SpringTypeConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Avalonia.Animation;
+
+/// <summary>
+/// Converts string values to <see cref="Spring"/> values.
+/// </summary>
+public class SpringTypeConverter : TypeConverter
+{
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+    {
+        return sourceType == typeof(string);
+    }
+
+    public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
+    {
+        return Spring.Parse((string)value, CultureInfo.InvariantCulture);
+    }
+}
diff --git a/src/Avalonia.Animation/Transition.cs b/src/Avalonia.Base/Animation/Transition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transition.cs
rename to src/Avalonia.Base/Animation/Transition.cs
diff --git a/src/Avalonia.Animation/TransitionInstance.cs b/src/Avalonia.Base/Animation/TransitionInstance.cs
similarity index 100%
rename from src/Avalonia.Animation/TransitionInstance.cs
rename to src/Avalonia.Base/Animation/TransitionInstance.cs
diff --git a/src/Avalonia.Animation/TransitionObservableBase.cs b/src/Avalonia.Base/Animation/TransitionObservableBase.cs
similarity index 100%
rename from src/Avalonia.Animation/TransitionObservableBase.cs
rename to src/Avalonia.Base/Animation/TransitionObservableBase.cs
diff --git a/src/Avalonia.Animation/Transitions.cs b/src/Avalonia.Base/Animation/Transitions.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions.cs
rename to src/Avalonia.Base/Animation/Transitions.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs b/src/Avalonia.Base/Animation/Transitions/BoxShadowsTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/BoxShadowsTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs b/src/Avalonia.Base/Animation/Transitions/BrushTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/BrushTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/ColorTransition.cs b/src/Avalonia.Base/Animation/Transitions/ColorTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/ColorTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/ColorTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs b/src/Avalonia.Base/Animation/Transitions/CornerRadiusTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/CornerRadiusTransition.cs
diff --git a/src/Avalonia.Animation/Transitions/DoubleTransition.cs b/src/Avalonia.Base/Animation/Transitions/DoubleTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions/DoubleTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/DoubleTransition.cs
diff --git a/src/Avalonia.Animation/Transitions/FloatTransition.cs b/src/Avalonia.Base/Animation/Transitions/FloatTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions/FloatTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/FloatTransition.cs
diff --git a/src/Avalonia.Animation/Transitions/IntegerTransition.cs b/src/Avalonia.Base/Animation/Transitions/IntegerTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions/IntegerTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/IntegerTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs b/src/Avalonia.Base/Animation/Transitions/PointTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/PointTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs b/src/Avalonia.Base/Animation/Transitions/RelativePointTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/RelativePointTransition.cs
diff --git a/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
new file mode 100644
index 0000000000..239f3aea08
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Media;
+using Avalonia.Styling;
+
+namespace Avalonia.Animation;
+
+public class Rotate3DTransition: PageSlide
+{
+
+    /// <summary>
+    ///  Creates a new instance of the <see cref="Rotate3DTransition"/>
+    /// </summary>
+    /// <param name="duration">How long the rotation should take place</param>
+    /// <param name="orientation">The orientation of the rotation</param>
+    /// <param name="depth">Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height of the common parent of the visual being rotated</param>
+    public Rotate3DTransition(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal, double? depth = null)
+        : base(duration, orientation)
+    {
+        Depth = depth;
+    }
+    
+    /// <summary>
+    ///  Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height
+    ///  of the common parent of the visual being rotated.
+    /// </summary>
+    public double? Depth { get; set; }
+
+    /// <summary>
+    ///  Creates a new instance of the <see cref="Rotate3DTransition"/>
+    /// </summary>
+    public Rotate3DTransition() { }
+
+    /// <inheritdoc />
+    public override async Task Start(Visual? @from, Visual? to, bool forward, CancellationToken cancellationToken)
+    {
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
+        var tasks = new Task[from != null && to != null ? 2 : 1];
+        var parent = GetVisualParent(from, to);
+        var (rotateProperty, center) = Orientation switch
+        {
+            SlideAxis.Vertical => (Rotate3DTransform.AngleXProperty, parent.Bounds.Height),
+            SlideAxis.Horizontal => (Rotate3DTransform.AngleYProperty, parent.Bounds.Width),
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        var depthSetter = new Setter {Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center};
+        var centerZSetter = new Setter {Property = Rotate3DTransform.CenterZProperty, Value = -center / 2};
+
+        KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) => 
+            new() {
+                Setters =
+                {
+                    new Setter { Property = rotateProperty, Value = rotation },
+                    new Setter { Property = Visual.ZIndexProperty, Value = zIndex },
+                    new Setter { Property = Visual.IsVisibleProperty, Value = isVisible },
+                    centerZSetter,
+                    depthSetter
+                },
+                Cue = new Cue(cue)
+            };
+
+        if (from != null)
+        {
+            var animation = new Animation
+            {
+                Easing = SlideOutEasing,
+                Duration = Duration,
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    CreateKeyFrame(0d, 0d, 2),
+                    CreateKeyFrame(0.5d, 45d * (forward ? -1 : 1), 1),
+                    CreateKeyFrame(1d, 90d * (forward ? -1 : 1), 1, isVisible: false)
+                }
+            };
+
+            tasks[0] = animation.RunAsync(from, null, cancellationToken);
+        }
+
+        if (to != null)
+        {
+            to.IsVisible = true;
+            var animation = new Animation
+            {
+                Easing = SlideInEasing,
+                Duration = Duration,
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    CreateKeyFrame(0d, 90d * (forward ? 1 : -1), 1),
+                    CreateKeyFrame(0.5d, 45d * (forward ? 1 : -1), 1),
+                    CreateKeyFrame(1d, 0d, 2)
+                }
+            };
+
+            tasks[from != null ? 1 : 0] = animation.RunAsync(to, null, cancellationToken);
+        }
+
+        await Task.WhenAll(tasks);
+
+        if (!cancellationToken.IsCancellationRequested)
+        {
+            if (to != null)
+            {
+                to.ZIndex = 2;
+            }
+            
+            if (from != null)
+            {
+                from.IsVisible = false;
+                from.ZIndex = 1;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs b/src/Avalonia.Base/Animation/Transitions/SizeTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/SizeTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs b/src/Avalonia.Base/Animation/Transitions/ThicknessTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/ThicknessTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs b/src/Avalonia.Base/Animation/Transitions/TransformOperationsTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/TransformOperationsTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs b/src/Avalonia.Base/Animation/Transitions/VectorTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/VectorTransition.cs
diff --git a/src/Avalonia.Animation/Utils/BounceEaseUtils.cs b/src/Avalonia.Base/Animation/Utils/BounceEaseUtils.cs
similarity index 100%
rename from src/Avalonia.Animation/Utils/BounceEaseUtils.cs
rename to src/Avalonia.Base/Animation/Utils/BounceEaseUtils.cs
diff --git a/src/Avalonia.Animation/Utils/EasingUtils.cs b/src/Avalonia.Base/Animation/Utils/EasingUtils.cs
similarity index 100%
rename from src/Avalonia.Animation/Utils/EasingUtils.cs
rename to src/Avalonia.Base/Animation/Utils/EasingUtils.cs
diff --git a/src/Avalonia.Base/ApiCompatBaseline.txt b/src/Avalonia.Base/ApiCompatBaseline.txt
index 4701a83175..7f378d2f65 100644
--- a/src/Avalonia.Base/ApiCompatBaseline.txt
+++ b/src/Avalonia.Base/ApiCompatBaseline.txt
@@ -1,3 +1,4 @@
 Compat issues with assembly Avalonia.Base:
+MembersMustExist : Member 'public System.Int32 System.Int32 Avalonia.Threading.DispatcherPriority.value__' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Threading.IDispatcher.Post<T>(System.Action<T>, T, Avalonia.Threading.DispatcherPriority)' is present in the implementation but not in the contract.
-Total Issues: 1
+Total Issues: 2
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 376075df2a..bdb5882ef2 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -3,8 +3,15 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <AssemblyName>Avalonia.Base</AssemblyName>
     <RootNamespace>Avalonia</RootNamespace>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>    
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\*.trie" />
+    <AdditionalFiles Include="composition-schema.xml" />
+  </ItemGroup>
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\Binding.props" />
   <Import Project="..\..\build\Rx.props" />
@@ -12,4 +19,35 @@
   <Import Project="..\..\build\System.Memory.props" />
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+  <Import Project="..\..\build\SourceGenerators.props" />
+  <ItemGroup>
+    <Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
+    <Compile Include="..\Shared\StringCompatibilityExtensions.cs" Link="Compatibility\StringCompatibilityExtensions.cs" />
+  </ItemGroup>
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Base.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.ColorPicker, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.DataGrid, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.LeakTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Skia.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Win32, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Web.Blazor, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Dialogs, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Diagnostics, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Compatibility\" />
+    <Folder Include="Rendering\Composition\Utils" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 437339d3b2..6633eabb5d 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -5,6 +5,7 @@ using Avalonia.Data;
 using Avalonia.Diagnostics;
 using Avalonia.Logging;
 using Avalonia.PropertyStore;
+using Avalonia.Reactive;
 using Avalonia.Threading;
 
 namespace Avalonia
@@ -15,13 +16,13 @@ namespace Avalonia
     /// <remarks>
     /// This class is analogous to DependencyObject in WPF.
     /// </remarks>
-    public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged, IValueSink
+    public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged
     {
-        private IAvaloniaObject? _inheritanceParent;
+        private AvaloniaObject? _inheritanceParent;
         private List<IDisposable>? _directBindings;
         private PropertyChangedEventHandler? _inpcChanged;
         private EventHandler<AvaloniaPropertyChangedEventArgs>? _propertyChanged;
-        private List<IAvaloniaObject>? _inheritanceChildren;
+        private List<AvaloniaObject>? _inheritanceChildren;
         private ValueStore? _values;
         private bool _batchUpdate;
 
@@ -58,7 +59,7 @@ namespace Avalonia
         /// <value>
         /// The inheritance parent.
         /// </value>
-        protected IAvaloniaObject? InheritanceParent
+        protected AvaloniaObject? InheritanceParent
         {
             get
             {
@@ -320,14 +321,14 @@ namespace Avalonia
         /// <param name="property">The property.</param>
         /// <param name="value">The value.</param>
         /// <param name="priority">The priority of the value.</param>
-        public void SetValue(
+        public IDisposable? SetValue(
             AvaloniaProperty property,
             object? value,
             BindingPriority priority = BindingPriority.LocalValue)
         {
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            property.RouteSetValue(this, value, priority);
+            return property.RouteSetValue(this, value, priority);
         }
 
         /// <summary>
@@ -385,6 +386,26 @@ namespace Avalonia
             SetDirectValueUnchecked(property, value);
         }
 
+        /// <summary>
+        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <param name="source">The observable.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>
+        /// A disposable which can be used to terminate the binding.
+        /// </returns>
+        public IDisposable Bind(
+            AvaloniaProperty property,
+            IObservable<object?> source,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            source = source ?? throw new ArgumentNullException(nameof(source));
+
+            return property.RouteBind(this, source.ToBindingValue(), priority);
+        }
+
         /// <summary>
         /// Binds a <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
@@ -445,9 +466,8 @@ namespace Avalonia
         /// <summary>
         /// Coerces the specified <see cref="AvaloniaProperty"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
-        public void CoerceValue<T>(StyledPropertyBase<T> property)
+        public void CoerceValue(AvaloniaProperty property)
         {
             _values?.CoerceValue(property);
         }
@@ -475,19 +495,19 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        void IAvaloniaObject.AddInheritanceChild(IAvaloniaObject child)
+        internal void AddInheritanceChild(AvaloniaObject child)
         {
-            _inheritanceChildren ??= new List<IAvaloniaObject>();
+            _inheritanceChildren ??= new List<AvaloniaObject>();
             _inheritanceChildren.Add(child);
         }
         
         /// <inheritdoc/>
-        void IAvaloniaObject.RemoveInheritanceChild(IAvaloniaObject child)
+        internal void RemoveInheritanceChild(AvaloniaObject child)
         {
             _inheritanceChildren?.Remove(child);
         }
 
-        void IAvaloniaObject.InheritedPropertyChanged<T>(
+        internal void InheritedPropertyChanged<T>(
             AvaloniaProperty<T> property,
             Optional<T> oldValue,
             Optional<T> newValue)
@@ -504,7 +524,7 @@ namespace Avalonia
             return _propertyChanged?.GetInvocationList();
         }
 
-        void IValueSink.ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        internal void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             var property = (StyledPropertyBase<T>)change.Property;
 
@@ -543,7 +563,7 @@ namespace Avalonia
             }
         }
 
-        void IValueSink.Completed<T>(
+        internal void Completed<T>(
             StyledPropertyBase<T> property,
             IPriorityValueEntry entry,
             Optional<T> oldValue) 
@@ -554,7 +574,7 @@ namespace Avalonia
                 oldValue,
                 default,
                 BindingPriority.Unset);
-            ((IValueSink)this).ValueChanged(change);
+            ValueChanged(change);
         }
 
         /// <summary>
@@ -565,14 +585,11 @@ namespace Avalonia
         /// <param name="oldParent">The old inheritance parent.</param>
         internal void InheritanceParentChanged<T>(
             StyledPropertyBase<T> property,
-            IAvaloniaObject? oldParent)
+            AvaloniaObject? oldParent)
         {
-            var oldValue = oldParent switch
-            {
-                AvaloniaObject o => o.GetValueOrInheritedOrDefault(property),
-                null => property.GetDefaultValue(GetType()),
-                _ => oldParent.GetValue(property)
-            };
+            var oldValue = oldParent is not null ?
+                oldParent.GetValueOrInheritedOrDefault(property) :
+                property.GetDefaultValue(GetType());
 
             var newValue = GetInheritedOrDefault(property);
 
@@ -629,10 +646,12 @@ namespace Avalonia
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected virtual void UpdateDataValidation<T>(
-            AvaloniaProperty<T> property,
-            BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected virtual void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
         }
 
@@ -640,7 +659,7 @@ namespace Avalonia
         /// Called when a avalonia property changes on the object.
         /// </summary>
         /// <param name="change">The property change details.</param>
-        protected virtual void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected virtual void OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.IsEffectiveValueChange)
             {
@@ -652,7 +671,7 @@ namespace Avalonia
         /// Called when a avalonia property changes on the object.
         /// </summary>
         /// <param name="change">The property change details.</param>
-        protected virtual void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected virtual void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
         }
 
@@ -843,7 +862,7 @@ namespace Avalonia
 
             if (metadata.EnableDataValidation == true)
             {
-                UpdateDataValidation(property, value);
+                UpdateDataValidation(property, value.Type, value.Error);
             }
         }
 
@@ -916,7 +935,8 @@ namespace Avalonia
 
             public void Dispose()
             {
-                _subscription.Dispose();
+                // _subscription can be null, if Subscribe failed with an exception.
+                _subscription?.Dispose();
                 _owner._directBindings!.Remove(this);
             }
 
diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index 51237409bf..2d7bab6cd6 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -25,7 +25,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <param name="property">The property.</param>
@@ -44,7 +44,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <typeparam name="T">The property type.</typeparam>
@@ -64,7 +64,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <param name="property">The property.</param>
@@ -85,7 +85,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <typeparam name="T">The property type.</typeparam>
@@ -128,7 +128,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets a subject for a <see cref="AvaloniaProperty"/>.
+        /// Gets a subject for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <param name="property">The property.</param>
@@ -150,7 +150,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets a subject for a <see cref="AvaloniaProperty"/>.
+        /// Gets a subject for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <typeparam name="T">The property type.</typeparam>
         /// <param name="o">The object.</param>
@@ -230,30 +230,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="source">The observable.</param>
-        /// <param name="priority">The priority of the binding.</param>
-        /// <returns>
-        /// A disposable which can be used to terminate the binding.
-        /// </returns>
-        public static IDisposable Bind(
-            this IAvaloniaObject target,
-            AvaloniaProperty property,
-            IObservable<BindingValue<object?>> source,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-            source = source ?? throw new ArgumentNullException(nameof(source));
-
-            return property.RouteBind(target, source, priority);
-        }
-
-        /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
+        /// Binds an <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="target">The object.</param>
@@ -273,42 +250,22 @@ namespace Avalonia
             property = property ?? throw new ArgumentNullException(nameof(property));
             source = source ?? throw new ArgumentNullException(nameof(source));
 
-            return property switch
+            if (target is AvaloniaObject ao)
             {
-                StyledPropertyBase<T> styled => target.Bind(styled, source, priority),
-                DirectPropertyBase<T> direct => target.Bind(direct, source),
-                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
-            };
-        }
+                return property switch
+                {
+                    StyledPropertyBase<T> styled => ao.Bind(styled, source, priority),
+                    DirectPropertyBase<T> direct => ao.Bind(direct, source),
+                    _ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
+                };
+            }
 
-        /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="source">The observable.</param>
-        /// <param name="priority">The priority of the binding.</param>
-        /// <returns>
-        /// A disposable which can be used to terminate the binding.
-        /// </returns>
-        public static IDisposable Bind(
-            this IAvaloniaObject target,
-            AvaloniaProperty property,
-            IObservable<object?> source,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-            source = source ?? throw new ArgumentNullException(nameof(source));
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
 
-            return target.Bind(
-                property,
-                source.ToBindingValue(),
-                priority);
         }
 
         /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
+        /// Binds an <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
         /// <param name="target">The object.</param>
         /// <param name="property">The property.</param>
@@ -334,7 +291,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Binds a property on an <see cref="IAvaloniaObject"/> to an <see cref="IBinding"/>.
+        /// Binds a property on an <see cref="AvaloniaObject"/> to an <see cref="IBinding"/>.
         /// </summary>
         /// <param name="target">The object.</param>
         /// <param name="property">The property to bind.</param>
@@ -374,56 +331,6 @@ namespace Avalonia
             }
         }
 
-        /// <summary>
-        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        public static void ClearValue(this IAvaloniaObject target, AvaloniaProperty property)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            property.RouteClearValue(target);
-        }
-
-        /// <summary>
-        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        public static void ClearValue<T>(this IAvaloniaObject target, AvaloniaProperty<T> property)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            switch (property)
-            {
-                case StyledPropertyBase<T> styled:
-                    target.ClearValue(styled);
-                    break;
-                case DirectPropertyBase<T> direct:
-                    target.ClearValue(direct);
-                    break;
-                default:
-                    throw new NotSupportedException("Unsupported AvaloniaProperty type.");
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <returns>The value.</returns>
-        public static object? GetValue(this IAvaloniaObject target, AvaloniaProperty property)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            return property.RouteGetValue(target);
-        }
-
         /// <summary>
         /// Gets a <see cref="AvaloniaProperty"/> value.
         /// </summary>
@@ -436,12 +343,18 @@ namespace Avalonia
             target = target ?? throw new ArgumentNullException(nameof(target));
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            return property switch
+            if (target is AvaloniaObject ao)
             {
-                StyledPropertyBase<T> styled => target.GetValue(styled),
-                DirectPropertyBase<T> direct => target.GetValue(direct),
-                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
-            };
+                return property switch
+                {
+                    StyledPropertyBase<T> styled => ao.GetValue(styled),
+                    DirectPropertyBase<T> direct => ao.GetValue(direct),
+                    _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
+                };
+
+            }
+
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         /// <summary>
@@ -456,7 +369,7 @@ namespace Avalonia
         /// <see cref="AvaloniaProperty.UnsetValue"/>. Note that this method does not return
         /// property values that come from inherited or default values.
         /// 
-        /// For direct properties returns <see cref="GetValue(IAvaloniaObject, AvaloniaProperty)"/>.
+        /// For direct properties returns the current value of the property.
         /// </remarks>
         public static object? GetBaseValue(
             this IAvaloniaObject target,
@@ -466,7 +379,9 @@ namespace Avalonia
             target = target ?? throw new ArgumentNullException(nameof(target));
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            return property.RouteGetBaseValue(target, maxPriority);
+            if (target is AvaloniaObject ao)
+                return property.RouteGetBaseValue(ao, maxPriority);
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         /// <summary>
@@ -481,8 +396,7 @@ namespace Avalonia
         /// <see cref="Optional{T}.Empty"/>. Note that this method does not return property values
         /// that come from inherited or default values.
         /// 
-        /// For direct properties returns
-        /// <see cref="IAvaloniaObject.GetValue{T}(DirectPropertyBase{T})"/>.
+        /// For direct properties returns the current value of the property.
         /// </remarks>
         public static Optional<T> GetBaseValue<T>(
             this IAvaloniaObject target,
@@ -492,69 +406,18 @@ namespace Avalonia
             target = target ?? throw new ArgumentNullException(nameof(target));
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            return property switch
+            if (target is AvaloniaObject ao)
             {
-                StyledPropertyBase<T> styled => target.GetBaseValue(styled, maxPriority),
-                DirectPropertyBase<T> direct => target.GetValue(direct),
-                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
-            };
-        }
-
-        /// <summary>
-        /// Sets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="priority">The priority of the value.</param>
-        /// <returns>
-        /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
-        /// </returns>
-        public static IDisposable? SetValue(
-            this IAvaloniaObject target,
-            AvaloniaProperty property,
-            object? value,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            return property.RouteSetValue(target, value, priority);
-        }
-
-        /// <summary>
-        /// Sets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="priority">The priority of the value.</param>
-        /// <returns>
-        /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
-        /// </returns>
-        public static IDisposable? SetValue<T>(
-            this IAvaloniaObject target,
-            AvaloniaProperty<T> property,
-            T value,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
+                return property switch
+                {
+                    StyledPropertyBase<T> styled => ao.GetBaseValue(styled, maxPriority),
+                    DirectPropertyBase<T> direct => ao.GetValue(direct),
+                    _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
+                };
 
-            switch (property)
-            {
-                case StyledPropertyBase<T> styled:
-                    return target.SetValue(styled, value, priority);
-                case DirectPropertyBase<T> direct:
-                    target.SetValue(direct, value);
-                    return null;
-                default:
-                    throw new NotSupportedException("Unsupported AvaloniaProperty type.");
             }
+
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         /// <summary>
@@ -605,52 +468,6 @@ namespace Avalonia
             });
         }
 
-        /// <summary>
-        /// Subscribes to a property changed notifications for changes that originate from a
-        /// <typeparamref name="TTarget"/>.
-        /// </summary>
-        /// <typeparam name="TTarget">The type of the property change sender.</typeparam>
-        /// <param name="observable">The property changed observable.</param>
-        /// <param name="handler">Given a TTarget, returns the handler.</param>
-        /// <returns>A disposable that can be used to terminate the subscription.</returns>
-        [Obsolete("Use overload taking Action<TTarget, AvaloniaPropertyChangedEventArgs>.")]
-        public static IDisposable AddClassHandler<TTarget>(
-            this IObservable<AvaloniaPropertyChangedEventArgs> observable,
-            Func<TTarget, Action<AvaloniaPropertyChangedEventArgs>> handler)
-            where TTarget : class
-        {
-            return observable.Subscribe(e => SubscribeAdapter(e, handler));
-        }
-
-        /// <summary>
-        /// Gets a description of a property that van be used in observables.
-        /// </summary>
-        /// <param name="o">The object.</param>
-        /// <param name="property">The property</param>
-        /// <returns>The description.</returns>
-        private static string GetDescription(IAvaloniaObject o, AvaloniaProperty property)
-        {
-            return $"{o.GetType().Name}.{property.Name}";
-        }
-
-        /// <summary>
-        /// Observer method for <see cref="AddClassHandler{TTarget}(IObservable{AvaloniaPropertyChangedEventArgs},
-        /// Func{TTarget, Action{AvaloniaPropertyChangedEventArgs}})"/>.
-        /// </summary>
-        /// <typeparam name="TTarget">The sender type to accept.</typeparam>
-        /// <param name="e">The event args.</param>
-        /// <param name="handler">Given a TTarget, returns the handler.</param>
-        private static void SubscribeAdapter<TTarget>(
-            AvaloniaPropertyChangedEventArgs e,
-            Func<TTarget, Action<AvaloniaPropertyChangedEventArgs>> handler)
-            where TTarget : class
-        {
-            if (e.Sender is TTarget target)
-            {
-                handler(target)(e);
-            }
-        }
-
         private class BindingAdaptor : IBinding
         {
             private IObservable<object?> _source;
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index 3d1e898f50..46ba4082fb 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Data;
 using Avalonia.Data.Core;
+using Avalonia.Styling;
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -40,7 +41,7 @@ namespace Avalonia
         {
             _ = name ?? throw new ArgumentNullException(nameof(name));
 
-            if (name.Contains("."))
+            if (name.Contains('.'))
             {
                 throw new ArgumentException("'name' may not contain periods.");
             }
@@ -454,33 +455,24 @@ namespace Avalonia
             return Name;
         }
 
-        /// <summary>
-        /// Uses the visitor pattern to resolve an untyped property to a typed property.
-        /// </summary>
-        /// <typeparam name="TData">The type of user data passed.</typeparam>
-        /// <param name="visitor">The visitor which will accept the typed property.</param>
-        /// <param name="data">The user data to pass.</param>
-        public abstract void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
-            where TData : struct;
-
         /// <summary>
         /// Routes an untyped ClearValue call to a typed call.
         /// </summary>
         /// <param name="o">The object instance.</param>
-        internal abstract void RouteClearValue(IAvaloniaObject o);
+        internal abstract void RouteClearValue(AvaloniaObject o);
 
         /// <summary>
         /// Routes an untyped GetValue call to a typed call.
         /// </summary>
         /// <param name="o">The object instance.</param>
-        internal abstract object? RouteGetValue(IAvaloniaObject o);
+        internal abstract object? RouteGetValue(AvaloniaObject o);
 
         /// <summary>
         /// Routes an untyped GetBaseValue call to a typed call.
         /// </summary>
         /// <param name="o">The object instance.</param>
         /// <param name="maxPriority">The maximum priority for the value.</param>
-        internal abstract object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority);
+        internal abstract object? RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority);
 
         /// <summary>
         /// Routes an untyped SetValue call to a typed call.
@@ -492,7 +484,7 @@ namespace Avalonia
         /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
         /// </returns>
         internal abstract IDisposable? RouteSetValue(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             object? value,
             BindingPriority priority);
 
@@ -503,11 +495,12 @@ namespace Avalonia
         /// <param name="source">The binding source.</param>
         /// <param name="priority">The priority.</param>
         internal abstract IDisposable RouteBind(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             IObservable<BindingValue<object?>> source,
             BindingPriority priority);
 
-        internal abstract void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject? oldParent);
+        internal abstract void RouteInheritanceParentChanged(AvaloniaObject o, AvaloniaObject? oldParent);
+        internal abstract ISetterInstance CreateSetterInstance(IStyleable target, object? value);
 
         /// <summary>
         /// Overrides the metadata for the property on the specified type.
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
index 445f35aad2..45c67b9f48 100644
--- a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
@@ -55,7 +55,7 @@ namespace Avalonia
         /// </summary>
         /// <remarks>
         /// This will usually be true, except in
-        /// <see cref="AvaloniaObject.OnPropertyChangedCore{T}(AvaloniaPropertyChangedEventArgs{T})"/>
+        /// <see cref="AvaloniaObject.OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs)"/>
         /// which receives notifications for all changes to property values, whether a value with a higher
         /// priority is present or not. When this property is false, the change that is being signaled
         /// has not resulted in a change to the property value on the object.
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedExtensions.cs b/src/Avalonia.Base/AvaloniaPropertyChangedExtensions.cs
new file mode 100644
index 0000000000..a52d6d15ab
--- /dev/null
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedExtensions.cs
@@ -0,0 +1,43 @@
+namespace Avalonia
+{
+    /// <summary>
+    /// Provides extensions for <see cref="AvaloniaPropertyChangedEventArgs"/>.
+    /// </summary>
+    public static class AvaloniaPropertyChangedExtensions
+    {
+        /// <summary>
+        /// Gets a typed value from <see cref="AvaloniaPropertyChangedEventArgs.OldValue"/>.
+        /// </summary>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <param name="e">The event args.</param>
+        /// <returns>The value.</returns>
+        public static T GetOldValue<T>(this AvaloniaPropertyChangedEventArgs e)
+        {
+            return ((AvaloniaPropertyChangedEventArgs<T>)e).OldValue.GetValueOrDefault()!;
+        }
+
+        /// <summary>
+        /// Gets a typed value from <see cref="AvaloniaPropertyChangedEventArgs.NewValue"/>.
+        /// </summary>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <param name="e">The event args.</param>
+        /// <returns>The value.</returns>
+        public static T GetNewValue<T>(this AvaloniaPropertyChangedEventArgs e)
+        {
+            return ((AvaloniaPropertyChangedEventArgs<T>)e).NewValue.GetValueOrDefault()!;
+        }
+
+        /// <summary>
+        /// Gets a typed value from <see cref="AvaloniaPropertyChangedEventArgs.OldValue"/> and
+        /// <see cref="AvaloniaPropertyChangedEventArgs.NewValue"/>.
+        /// </summary>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <param name="e">The event args.</param>
+        /// <returns>The value.</returns>
+        public static (T oldValue, T newValue) GetOldAndNewValue<T>(this AvaloniaPropertyChangedEventArgs e)
+        {
+            var ev = (AvaloniaPropertyChangedEventArgs<T>)e;
+            return (ev.OldValue.GetValueOrDefault()!, ev.NewValue.GetValueOrDefault()!);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs b/src/Avalonia.Base/AvaloniaPropertyExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs
rename to src/Avalonia.Base/AvaloniaPropertyExtensions.cs
diff --git a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
index d86e723b38..62265d3c59 100644
--- a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
@@ -228,7 +228,7 @@ namespace Avalonia
             _ = type ?? throw new ArgumentNullException(nameof(type));
             _ = name ?? throw new ArgumentNullException(nameof(name));
 
-            if (name.Contains("."))
+            if (name.Contains('.'))
             {
                 throw new InvalidOperationException("Attached properties not supported.");
             }
diff --git a/src/Avalonia.Base/AvaloniaProperty`1.cs b/src/Avalonia.Base/AvaloniaProperty`1.cs
index 3937ee5658..14acc2c47f 100644
--- a/src/Avalonia.Base/AvaloniaProperty`1.cs
+++ b/src/Avalonia.Base/AvaloniaProperty`1.cs
@@ -30,21 +30,6 @@ namespace Avalonia
             _changed = new Subject<AvaloniaPropertyChangedEventArgs<TValue>>();
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AvaloniaProperty{TValue}"/> class.
-        /// </summary>
-        /// <param name="source">The property to copy.</param>
-        /// <param name="ownerType">The new owner type.</param>
-        /// <param name="metadata">Optional overridden metadata.</param>
-        [Obsolete("Use constructor with AvaloniaProperty<TValue> instead.", true)]
-        protected AvaloniaProperty(
-            AvaloniaProperty source,
-            Type ownerType,
-            AvaloniaPropertyMetadata? metadata)
-            : this(source as AvaloniaProperty<TValue> ?? throw new InvalidOperationException(), ownerType, metadata)
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AvaloniaProperty{TValue}"/> class.
         /// </summary>
diff --git a/src/Avalonia.Styling/ClassBindingManager.cs b/src/Avalonia.Base/ClassBindingManager.cs
similarity index 100%
rename from src/Avalonia.Styling/ClassBindingManager.cs
rename to src/Avalonia.Base/ClassBindingManager.cs
diff --git a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
index 2fe68e824d..35a391f2cb 100644
--- a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
@@ -81,7 +81,7 @@ namespace Avalonia.Collections
 
                 if (replace)
                 {
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"Item[{key}]"));
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"{CommonPropertyNames.IndexerName}[{key}]"));
 
                     if (CollectionChanged != null)
                     {
@@ -123,7 +123,7 @@ namespace Avalonia.Collections
             {
                 var e = new NotifyCollectionChangedEventArgs(
                     NotifyCollectionChangedAction.Remove,
-                    old.ToList(),
+                    old.ToArray(),
                     -1);
                 CollectionChanged(this, e);
             }
@@ -148,7 +148,7 @@ namespace Avalonia.Collections
             {
                 _inner.Remove(key);
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Count)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"Item[{key}]"));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"{CommonPropertyNames.IndexerName}[{key}]"));
 
                 if (CollectionChanged != null)
                 {
@@ -208,7 +208,7 @@ namespace Avalonia.Collections
         private void NotifyAdd(TKey key, TValue value)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Count)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"Item[{key}]"));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"{CommonPropertyNames.IndexerName}[{key}]"));
             
 
             if (CollectionChanged != null)
diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index 6414328e90..a05c9c5da3 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -222,7 +222,7 @@ namespace Avalonia.Collections
                 {
                     var e = ResetBehavior == ResetBehavior.Reset ?
                         EventArgsCache.ResetCollectionChanged :
-                        new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, _inner.ToList(), 0);
+                        new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, _inner.ToArray(), 0);
 
                     _inner.Clear();
 
@@ -394,7 +394,13 @@ namespace Avalonia.Collections
                         } while (en.MoveNext());
 
                         if (notificationItems is not null)
+                        {
                             NotifyAdd(notificationItems, index);
+                        }
+                        else
+                        {
+                            NotifyCountChanged();
+                        }
                     }
                 }
             }
diff --git a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
index fb70729cf8..c4684960d6 100644
--- a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
@@ -140,21 +140,6 @@ namespace Avalonia.Collections
             }
         }
 
-        [Obsolete("Causes memory leaks. Use DynamicData or similar instead.")]
-        public static IAvaloniaReadOnlyList<TDerived> CreateDerivedList<TSource, TDerived>(
-            this IAvaloniaReadOnlyList<TSource> collection,
-            Func<TSource, TDerived> select)
-        {
-            var result = new AvaloniaList<TDerived>();
-
-            collection.ForEachItem(
-                (i, item) => result.Insert(i, select(item)),
-                (i, item) => result.RemoveAt(i),
-                () => result.Clear());
-
-            return result;
-        }
-
         /// <summary>
         /// Listens for property changed events from all items in a collection.
         /// </summary>
diff --git a/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs b/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
index a6a5953827..cefbf642be 100644
--- a/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
+++ b/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
diff --git a/src/Avalonia.Base/Collections/Pooled/PooledList.cs b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
index 200a52fb0d..267c403ab7 100644
--- a/src/Avalonia.Base/Collections/Pooled/PooledList.cs
+++ b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
@@ -587,7 +587,7 @@ namespace Avalonia.Collections.Pooled
             if (size > 0 && _clearOnFree)
             {
                 // Clear the elements so that the gc can reclaim the references.
-                Array.Clear(_items, 0, _size);
+                Array.Clear(_items, 0, size);
             }
         }
 
@@ -1434,7 +1434,7 @@ namespace Avalonia.Collections.Pooled
         /// <summary>
         /// Returns the internal buffers to the ArrayPool.
         /// </summary>
-        public void Dispose()
+        public virtual void Dispose()
         {
             ReturnArray();
             _size = 0;
diff --git a/src/Avalonia.Visuals/Media/CombinedGeometry.cs b/src/Avalonia.Base/CombinedGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/CombinedGeometry.cs
rename to src/Avalonia.Base/CombinedGeometry.cs
diff --git a/src/Avalonia.Base/Controls/ChildNameScope.cs b/src/Avalonia.Base/Controls/ChildNameScope.cs
new file mode 100644
index 0000000000..1ceaff924c
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ChildNameScope.cs
@@ -0,0 +1,73 @@
+using System.Threading.Tasks;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    public class ChildNameScope : INameScope
+    {
+        private readonly INameScope _parentScope;
+        private readonly NameScope _inner = new NameScope();
+
+        public ChildNameScope(INameScope parentScope)
+        {
+            _parentScope = parentScope;
+        }
+        
+        public void Register(string name, object element) => _inner.Register(name, element);
+
+        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
+        {
+            var found = Find(name);
+            if (found != null)
+                return new SynchronousCompletionAsyncResult<object?>(found);
+            // Not found and both current and parent scope are in completed state
+            if(IsCompleted)
+                return new SynchronousCompletionAsyncResult<object?>((object?)null);
+            return DoFindAsync(name);
+        }
+
+        public SynchronousCompletionAsyncResult<object?> DoFindAsync(string name)
+        {
+            var src = new SynchronousCompletionAsyncResultSource<object?>();
+
+            void ParentSearch()
+            {
+                var parentSearch = _parentScope.FindAsync(name);
+                if (parentSearch.IsCompleted)
+                    src.SetResult(parentSearch.GetResult());
+                else
+                    parentSearch.OnCompleted(() => src.SetResult(parentSearch.GetResult()));
+            }
+            if (!_inner.IsCompleted)
+            {
+                // Guaranteed to be incomplete at this point
+                var innerSearch = _inner.FindAsync(name);
+                innerSearch.OnCompleted(() =>
+                {
+                    var value = innerSearch.GetResult();
+                    if (value != null)
+                        src.SetResult(value);
+                    else ParentSearch();
+                });
+            }
+            else
+                ParentSearch();
+
+            return src.AsyncResult;
+        }
+
+        public object? Find(string name)
+        {
+            var found = _inner.Find(name);
+            if (found != null)
+                return found;
+            if (_inner.IsCompleted)
+                return _parentScope.Find(name);
+            return null;
+        }
+
+        public void Complete() => _inner.Complete();
+
+        public bool IsCompleted => _inner.IsCompleted && _parentScope.IsCompleted;
+    }
+}
diff --git a/src/Avalonia.Base/Controls/Classes.cs b/src/Avalonia.Base/Controls/Classes.cs
new file mode 100644
index 0000000000..c3d3fbca46
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Classes.cs
@@ -0,0 +1,353 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Holds a collection of style classes for an <see cref="IStyledElement"/>.
+    /// </summary>
+    /// <remarks>
+    /// Similar to CSS, each control may have any number of styling classes applied.
+    /// </remarks>
+    public class Classes : AvaloniaList<string>, IPseudoClasses
+    {
+        private SafeEnumerableList<IClassesChangedListener>? _listeners;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Classes"/> class.
+        /// </summary>
+        public Classes()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Classes"/> class.
+        /// </summary>
+        /// <param name="items">The initial items.</param>
+        public Classes(IEnumerable<string> items)
+            : base(items)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Classes"/> class.
+        /// </summary>
+        /// <param name="items">The initial items.</param>
+        public Classes(params string[] items)
+            : base(items)
+        {            
+        }
+
+        /// <summary>
+        /// Gets the number of listeners subscribed to this collection for unit testing purposes.
+        /// </summary>
+        internal int ListenerCount => _listeners?.Count ?? 0;
+
+        /// <summary>
+        /// Parses a classes string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="Classes"/>.</returns>
+        public static Classes Parse(string s) => new Classes(s.Split(' '));
+
+        /// <summary>
+        /// Adds a style class to the collection.
+        /// </summary>
+        /// <param name="name">The class name.</param>
+        /// <remarks>
+        /// Only standard classes may be added via this method. To add pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override void Add(string name)
+        {
+            ThrowIfPseudoclass(name, "added");
+
+            if (!Contains(name))
+            {
+                base.Add(name);
+                NotifyChanged();
+            }
+        }
+
+        /// <summary>
+        /// Adds a style classes to the collection.
+        /// </summary>
+        /// <param name="names">The class names.</param>
+        /// <remarks>
+        /// Only standard classes may be added via this method. To add pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override void AddRange(IEnumerable<string> names)
+        {
+            var c = new List<string>();
+
+            foreach (var name in names)
+            {
+                ThrowIfPseudoclass(name, "added");
+
+                if (!Contains(name))
+                {
+                    c.Add(name);
+                }
+            }
+
+            base.AddRange(c);
+            NotifyChanged();
+        }
+
+        /// <summary>
+        /// Removes all non-pseudoclasses from the collection.
+        /// </summary>
+        public override void Clear()
+        {
+            for (var i = Count - 1; i >= 0; --i)
+            {
+                if (!this[i].StartsWith(":"))
+                {
+                    RemoveAt(i);
+                }
+            }
+
+            NotifyChanged();
+        }
+
+        /// <summary>
+        /// Inserts a style class into the collection.
+        /// </summary>
+        /// <param name="index">The index to insert the class at.</param>
+        /// <param name="name">The class name.</param>
+        /// <remarks>
+        /// Only standard classes may be added via this method. To add pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override void Insert(int index, string name)
+        {
+            ThrowIfPseudoclass(name, "added");
+
+            if (!Contains(name))
+            {
+                base.Insert(index, name);
+                NotifyChanged();
+            }
+        }
+
+        /// <summary>
+        /// Inserts style classes into the collection.
+        /// </summary>
+        /// <param name="index">The index to insert the class at.</param>
+        /// <param name="names">The class names.</param>
+        /// <remarks>
+        /// Only standard classes may be added via this method. To add pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override void InsertRange(int index, IEnumerable<string> names)
+        {
+            List<string>? toInsert = null;
+
+            foreach (var name in names)
+            {
+                ThrowIfPseudoclass(name, "added");
+
+                if (!Contains(name))
+                {
+                    toInsert ??= new List<string>();
+
+                    toInsert.Add(name);
+                }
+            }
+
+            if (toInsert != null)
+            {
+                base.InsertRange(index, toInsert);
+                NotifyChanged();
+            }
+        }
+
+        /// <summary>
+        /// Removes a style class from the collection.
+        /// </summary>
+        /// <param name="name">The class name.</param>
+        /// <remarks>
+        /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override bool Remove(string name)
+        {
+            ThrowIfPseudoclass(name, "removed");
+
+            if (base.Remove(name))
+            {
+                NotifyChanged();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Removes style classes from the collection.
+        /// </summary>
+        /// <param name="names">The class name.</param>
+        /// <remarks>
+        /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override void RemoveAll(IEnumerable<string> names)
+        {
+            List<string>? toRemove = null;
+
+            foreach (var name in names)
+            {
+                ThrowIfPseudoclass(name, "removed");
+
+                toRemove ??= new List<string>();
+
+                toRemove.Add(name);
+            }
+
+            if (toRemove != null)
+            {
+                base.RemoveAll(toRemove);
+                NotifyChanged();
+            }
+        }
+
+        /// <summary>
+        /// Removes a style class from the collection.
+        /// </summary>
+        /// <param name="index">The index of the class in the collection.</param>
+        /// <remarks>
+        /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public override void RemoveAt(int index)
+        {
+            var name = this[index];
+            ThrowIfPseudoclass(name, "removed");
+            base.RemoveAt(index);
+            NotifyChanged();
+        }
+
+        /// <summary>
+        /// Removes style classes from the collection.
+        /// </summary>
+        /// <param name="index">The first index to remove.</param>
+        /// <param name="count">The number of items to remove.</param>
+        public override void RemoveRange(int index, int count)
+        {
+            base.RemoveRange(index, count);
+            NotifyChanged();
+        }
+
+        /// <summary>
+        /// Removes all non-pseudoclasses in the collection and adds a new set.
+        /// </summary>
+        /// <param name="source">The new contents of the collection.</param>
+        public void Replace(IList<string> source)
+        {
+            List<string>? toRemove = null;
+
+            foreach (var name in source)
+            {
+                ThrowIfPseudoclass(name, "added");
+            }
+
+            foreach (var name in this)
+            {
+                if (!name.StartsWith(":"))
+                {
+                    toRemove ??= new List<string>();
+
+                    toRemove.Add(name);
+                }
+            }
+
+            if (toRemove != null)
+            {
+                base.RemoveAll(toRemove);
+            }
+
+            base.AddRange(source);
+            NotifyChanged();
+        }
+
+        /// <inheritdoc/>
+        void IPseudoClasses.Add(string name)
+        {
+            if (!Contains(name))
+            {
+                base.Add(name);
+                NotifyChanged();
+            }
+        }
+
+        /// <inheritdoc/>
+        bool IPseudoClasses.Remove(string name)
+        {
+            if (base.Remove(name))
+            {
+                NotifyChanged();
+                return true;
+            }
+
+            return false;
+        }
+
+        internal void AddListener(IClassesChangedListener listener)
+        {
+            (_listeners ??= new()).Add(listener);
+        }
+
+        internal void RemoveListener(IClassesChangedListener listener)
+        {
+            _listeners?.Remove(listener);
+        }
+
+        private void NotifyChanged()
+        {
+            if (_listeners is null)
+                return;
+            foreach (var listener in _listeners)
+                listener.Changed();
+        }
+
+        private void ThrowIfPseudoclass(string name, string operation)
+        {
+            if (name.StartsWith(":"))
+            {
+                throw new ArgumentException(
+                    $"The pseudoclass '{name}' may only be {operation} by the control itself.");
+            }
+        }
+
+        /// <summary>
+        /// Adds a or removes a  style class to/from the collection.
+        /// </summary>
+        /// <param name="name">The class names.</param>
+        /// <param name="value">If true adds the class, if false, removes it.</param>
+        /// <remarks>
+        /// Only standard classes may be added or removed via this method. To add pseudoclasses (classes
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
+        /// property.
+        /// </remarks>
+        public void Set(string name, bool value)
+        {
+            if (value)
+            {
+                if (!Contains(name))
+                    Add(name);
+            }
+            else
+                Remove(name);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/IClassesChangedListener.cs b/src/Avalonia.Base/Controls/IClassesChangedListener.cs
new file mode 100644
index 0000000000..b4de893c97
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IClassesChangedListener.cs
@@ -0,0 +1,14 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Internal interface for listening to changes in <see cref="Classes"/> in a more
+    /// performant manner than subscribing to CollectionChanged.
+    /// </summary>
+    internal interface IClassesChangedListener
+    {
+        /// <summary>
+        /// Notifies the listener that the <see cref="Classes"/> collection has changed.
+        /// </summary>
+        void Changed();
+    }
+}
diff --git a/src/Avalonia.Base/Controls/INameScope.cs b/src/Avalonia.Base/Controls/INameScope.cs
new file mode 100644
index 0000000000..a12e88c055
--- /dev/null
+++ b/src/Avalonia.Base/Controls/INameScope.cs
@@ -0,0 +1,46 @@
+using Avalonia.Metadata;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a name scope.
+    /// </summary>
+    [NotClientImplementable]
+    public interface INameScope
+    {
+        /// <summary>
+        /// Registers an element in the name scope.
+        /// </summary>
+        /// <param name="name">The element name.</param>
+        /// <param name="element">The element.</param>
+        void Register(string name, object element);
+
+        /// <summary>
+        /// Finds a named element in the name scope, waits for the scope to be completely populated before returning null
+        /// Returned task is configured to run any continuations synchronously.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>The element, or null if the name was not found.</returns>
+        SynchronousCompletionAsyncResult<object?> FindAsync(string name);
+        
+        /// <summary>
+        /// Finds a named element in the name scope, returns immediately, doesn't traverse the name scope stack
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>The element, or null if the name was not found.</returns>
+        object? Find(string name);
+
+        /// <summary>
+        /// Marks the name scope as completed, no further registrations will be allowed
+        /// </summary>
+        void Complete();
+        
+        /// <summary>
+        /// Returns whether further registrations are allowed on the scope
+        /// </summary>
+        bool IsCompleted { get; }
+
+
+    }
+}
diff --git a/src/Avalonia.Base/Controls/IPseudoClasses.cs b/src/Avalonia.Base/Controls/IPseudoClasses.cs
new file mode 100644
index 0000000000..438b05a8cf
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IPseudoClasses.cs
@@ -0,0 +1,30 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Exposes an interface for setting pseudoclasses on a <see cref="Classes"/> collection.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IPseudoClasses
+    {
+        /// <summary>
+        /// Adds a pseudoclass to the collection.
+        /// </summary>
+        /// <param name="name">The pseudoclass name.</param>
+        void Add(string name);
+
+        /// <summary>
+        /// Removes a pseudoclass from the collection.
+        /// </summary>
+        /// <param name="name">The pseudoclass name.</param>
+        bool Remove(string name);
+
+        /// <summary>
+        /// Returns whether a pseudoclass is present in the collection.
+        /// </summary>
+        /// <param name="name">The pseudoclass name.</param>
+        /// <returns>Whether the pseudoclass is present.</returns>
+        bool Contains(string name);
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/IResourceDictionary.cs b/src/Avalonia.Base/Controls/IResourceDictionary.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/IResourceDictionary.cs
rename to src/Avalonia.Base/Controls/IResourceDictionary.cs
diff --git a/src/Avalonia.Base/Controls/IResourceHost.cs b/src/Avalonia.Base/Controls/IResourceHost.cs
new file mode 100644
index 0000000000..286f0e36ef
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IResourceHost.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents an element which hosts resources.
+    /// </summary>
+    /// <remarks>
+    /// This interface is implemented by <see cref="StyledElement"/> and `Application`.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IResourceHost : IResourceNode
+    {
+        /// <summary>
+        /// Raised when the resources change on the element or an ancestor of the element.
+        /// </summary>
+        event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
+
+        /// <summary>
+        /// Notifies the resource host that one or more of its hosted resources has changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself. It is called when the resources hosted by this element have
+        /// changed, and is usually called by a resource dictionary or style hosted by the element
+        /// in response to a resource being added or removed.
+        /// </remarks>
+        void NotifyHostedResourcesChanged(ResourcesChangedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Base/Controls/IResourceNode.cs b/src/Avalonia.Base/Controls/IResourceNode.cs
new file mode 100644
index 0000000000..d6c900f97f
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IResourceNode.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents an object that can be queried for resources.
+    /// </summary>
+    /// <remarks>
+    /// The interface represents a common interface for both controls that host resources
+    /// (<see cref="IResourceHost"/>) and resource providers such as <see cref="ResourceDictionary"/>
+    /// (see <see cref="IResourceProvider"/>).
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IResourceNode
+    {
+        /// <summary>
+        /// Gets a value indicating whether the object has resources.
+        /// </summary>
+        bool HasResources { get; }
+
+        /// <summary>
+        /// Tries to find a resource within the object.
+        /// </summary>
+        /// <param name="key">The resource key.</param>
+        /// <param name="value">
+        /// When this method returns, contains the value associated with the specified key,
+        /// if the key is found; otherwise, null.
+        /// </param>
+        /// <returns>
+        /// True if the resource if found, otherwise false.
+        /// </returns>
+        bool TryGetResource(object key, out object? value);
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/IResourceProvider.cs b/src/Avalonia.Base/Controls/IResourceProvider.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/IResourceProvider.cs
rename to src/Avalonia.Base/Controls/IResourceProvider.cs
diff --git a/src/Avalonia.Base/Controls/ISetInheritanceParent.cs b/src/Avalonia.Base/Controls/ISetInheritanceParent.cs
new file mode 100644
index 0000000000..e85e025005
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ISetInheritanceParent.cs
@@ -0,0 +1,22 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines an interface through which a <see cref="StyledElement"/>'s inheritance parent can be set.
+    /// </summary>
+    /// <remarks>
+    /// You should not usually need to use this interface - it is for advanced scenarios only.
+    /// Additionally, <see cref="ISetLogicalParent"/> also sets the inheritance parent; this
+    /// interface is only needed where the logical and inheritance parents differ.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface ISetInheritanceParent
+    {
+        /// <summary>
+        /// Sets the control's inheritance parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void SetParent(IAvaloniaObject? parent);
+    }
+}
diff --git a/src/Avalonia.Base/Controls/ISetLogicalParent.cs b/src/Avalonia.Base/Controls/ISetLogicalParent.cs
new file mode 100644
index 0000000000..7f1b4b5d87
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ISetLogicalParent.cs
@@ -0,0 +1,21 @@
+using Avalonia.LogicalTree;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines an interface through which a <see cref="StyledElement"/>'s logical parent can be set.
+    /// </summary>
+    /// <remarks>
+    /// You should not usually need to use this interface - it is for advanced scenarios only.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface ISetLogicalParent
+    {
+        /// <summary>
+        /// Sets the control's parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void SetParent(ILogical? parent);
+    }
+}
diff --git a/src/Avalonia.Base/Controls/Metadata/PseudoClassesAttribute.cs b/src/Avalonia.Base/Controls/Metadata/PseudoClassesAttribute.cs
new file mode 100644
index 0000000000..30e8661e89
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Metadata/PseudoClassesAttribute.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+#nullable enable
+
+namespace Avalonia.Controls.Metadata
+{
+    /// <summary>
+    /// Defines all pseudoclasses by name referenced and implemented by a control.
+    /// </summary>
+    /// <remarks>
+    /// This is currently used for code-completion in certain IDEs.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class PseudoClassesAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PseudoClassesAttribute"/> class.
+        /// </summary>
+        /// <param name="pseudoClasses">The list of pseudoclass names.</param>
+        public PseudoClassesAttribute(params string[] pseudoClasses)
+        {
+            PseudoClasses = pseudoClasses;
+        }
+
+        /// <summary>
+        /// Gets the list of pseudoclass names.
+        /// </summary>
+        public IReadOnlyList<string> PseudoClasses { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/Metadata/TemplatePartAttribute.cs b/src/Avalonia.Base/Controls/Metadata/TemplatePartAttribute.cs
new file mode 100644
index 0000000000..3b8f971713
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Metadata/TemplatePartAttribute.cs
@@ -0,0 +1,55 @@
+// This source file is adapted from the Windows Presentation Foundation project. 
+// (https://github.com/dotnet/wpf/) 
+// 
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+
+#nullable enable
+
+namespace Avalonia.Controls.Metadata
+{
+    /// <summary>
+    /// Defines a control template part referenced by name in code.
+    /// Template part names should begin with the "PART_" prefix.
+    /// </summary>
+    /// <remarks>
+    /// Style authors should be able to identify the part type used for styling the specific control.
+    /// The part is usually required in the style and should have a specific predefined name.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class TemplatePartAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatePartAttribute"/> class.
+        /// </summary>
+        public TemplatePartAttribute()
+        {
+            Name = string.Empty;
+            Type = typeof(object);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatePartAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The part name used by the class to identify a required element in the style.</param>
+        /// <param name="type">The type of the element that should be used as a part with name.</param>
+        public TemplatePartAttribute(string name, Type type)
+        {
+            Name = name;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Gets or sets the part name used by the class to identify a required element in the style.
+        /// Template part names should begin with the "PART_" prefix.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the element that should be used as a part with name specified
+        /// in <see cref="Name"/>.
+        /// </summary>
+        public Type Type { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/NameScope.cs b/src/Avalonia.Base/Controls/NameScope.cs
new file mode 100644
index 0000000000..952401c00c
--- /dev/null
+++ b/src/Avalonia.Base/Controls/NameScope.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.LogicalTree;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements a name scope.
+    /// </summary>
+    public class NameScope : INameScope
+    {
+        /// <summary>
+        /// Defines the NameScope attached property.
+        /// </summary>
+        public static readonly AttachedProperty<INameScope> NameScopeProperty =
+            AvaloniaProperty.RegisterAttached<NameScope, StyledElement, INameScope>("NameScope");
+
+        /// <inheritdoc/>
+        public bool IsCompleted { get; private set; }
+        
+        private readonly Dictionary<string, object> _inner = new Dictionary<string, object>();
+
+        private readonly Dictionary<string, SynchronousCompletionAsyncResultSource<object?>> _pendingSearches =
+            new Dictionary<string, SynchronousCompletionAsyncResultSource<object?>>();
+        
+        /// <summary>
+        /// Gets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
+        /// </summary>
+        /// <param name="styled">The styled element.</param>
+        /// <returns>The value of the NameScope attached property.</returns>
+        public static INameScope GetNameScope(StyledElement styled)
+        {
+            _ = styled ?? throw new ArgumentNullException(nameof(styled));
+
+            return styled.GetValue(NameScopeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
+        /// </summary>
+        /// <param name="styled">The styled element.</param>
+        /// <param name="value">The value to set.</param>
+        public static void SetNameScope(StyledElement styled, INameScope value)
+        {
+            _ = styled ?? throw new ArgumentNullException(nameof(styled));
+
+            styled.SetValue(NameScopeProperty, value);
+        }
+
+        /// <inheritdoc />
+        public void Register(string name, object element)
+        {
+            if (IsCompleted)
+                throw new InvalidOperationException("NameScope is completed, no further registrations are allowed");
+
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+            _ = element ?? throw new ArgumentNullException(nameof(element));
+
+            if (_inner.TryGetValue(name, out var existing))
+            {
+                if (existing != element)
+                {
+                    throw new ArgumentException($"Control with the name '{name}' already registered.");
+                }
+            }
+            else
+            {
+                _inner.Add(name, element);
+                if (_pendingSearches.TryGetValue(name, out var tcs))
+                {
+                    _pendingSearches.Remove(name);
+                    tcs.SetResult(element);
+                }
+            }
+        }
+
+        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
+        {
+            var found = Find(name);
+            if (found != null)
+                return new SynchronousCompletionAsyncResult<object?>(found);
+            if (IsCompleted)
+                return new SynchronousCompletionAsyncResult<object?>((object?)null);
+            if (!_pendingSearches.TryGetValue(name, out var tcs))
+                // We are intentionally running continuations synchronously here
+                _pendingSearches[name] = tcs = new SynchronousCompletionAsyncResultSource<object?>();
+
+            return tcs.AsyncResult;
+        }
+
+        /// <inheritdoc />
+        public object? Find(string name)
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            _inner.TryGetValue(name, out var result);
+            return result;
+        }
+
+        public void Complete()
+        {
+            IsCompleted = true;
+            foreach (var kp in _pendingSearches)
+                kp.Value.TrySetResult(null);
+            _pendingSearches.Clear();
+        }
+
+        
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs b/src/Avalonia.Base/Controls/NameScopeExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/NameScopeExtensions.cs
rename to src/Avalonia.Base/Controls/NameScopeExtensions.cs
diff --git a/src/Avalonia.Styling/Controls/NameScopeLocator.cs b/src/Avalonia.Base/Controls/NameScopeLocator.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/NameScopeLocator.cs
rename to src/Avalonia.Base/Controls/NameScopeLocator.cs
diff --git a/src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs b/src/Avalonia.Base/Controls/PseudoClassesExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs
rename to src/Avalonia.Base/Controls/PseudoClassesExtensions.cs
diff --git a/src/Avalonia.Base/Controls/ResourceDictionary.cs b/src/Avalonia.Base/Controls/ResourceDictionary.cs
new file mode 100644
index 0000000000..d6197c50c6
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ResourceDictionary.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Collections;
+using Avalonia.Controls.Templates;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// An indexed dictionary of resources.
+    /// </summary>
+    public class ResourceDictionary : IResourceDictionary
+    {
+        private Dictionary<object, object?>? _inner;
+        private IResourceHost? _owner;
+        private AvaloniaList<IResourceProvider>? _mergedDictionaries;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResourceDictionary"/> class.
+        /// </summary>
+        public ResourceDictionary() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResourceDictionary"/> class.
+        /// </summary>
+        public ResourceDictionary(IResourceHost owner) => Owner = owner;
+
+        public int Count => _inner?.Count ?? 0;
+
+        public object? this[object key]
+        {
+            get
+            {
+                TryGetValue(key, out var value);
+                return value;
+            }
+            set
+            {
+                Inner[key] = value;
+                Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+            }
+        }
+
+        public ICollection<object> Keys => (ICollection<object>?)_inner?.Keys ?? Array.Empty<object>();
+        public ICollection<object?> Values => (ICollection<object?>?)_inner?.Values ?? Array.Empty<object?>();
+
+        public IResourceHost? Owner
+        {
+            get => _owner;
+            private set
+            {
+                if (_owner != value)
+                {
+                    _owner = value;
+                    OwnerChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        public IList<IResourceProvider> MergedDictionaries
+        {
+            get
+            {
+                if (_mergedDictionaries == null)
+                {
+                    _mergedDictionaries = new AvaloniaList<IResourceProvider>();
+                    _mergedDictionaries.ResetBehavior = ResetBehavior.Remove;
+                    _mergedDictionaries.ForEachItem(
+                        x =>
+                        {
+                            if (Owner is object)
+                            {
+                                x.AddOwner(Owner);
+                            }
+                        },
+                        x =>
+                        {
+                            if (Owner is object)
+                            {
+                                x.RemoveOwner(Owner);
+                            }
+                        }, 
+                        () => throw new NotSupportedException("Dictionary reset not supported"));
+                }
+
+                return _mergedDictionaries;
+            }
+        }
+
+        bool IResourceNode.HasResources
+        {
+            get
+            {
+                if (_inner?.Count > 0)
+                {
+                    return true;
+                }
+
+                if (_mergedDictionaries?.Count > 0)
+                {
+                    foreach (var i in _mergedDictionaries)
+                    {
+                        if (i.HasResources)
+                        {
+                            return true;
+                        }
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        bool ICollection<KeyValuePair<object, object?>>.IsReadOnly => false;
+
+        private Dictionary<object, object?> Inner => _inner ??= new();
+
+        public event EventHandler? OwnerChanged;
+
+        public void Add(object key, object? value)
+        {
+            Inner.Add(key, value);
+            Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+        }
+
+        public void AddDeferred(object key, Func<IServiceProvider?, object?> factory)
+        {
+            Inner.Add(key, new DeferredItem(factory));
+            Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+        }
+
+        public void Clear()
+        {
+            if (_inner?.Count > 0)
+            {
+                _inner.Clear();
+                Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+            }
+        }
+
+        public bool ContainsKey(object key) => _inner?.ContainsKey(key) ?? false;
+
+        public bool Remove(object key)
+        {
+            if (_inner?.Remove(key) == true)
+            {
+                Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool TryGetResource(object key, out object? value)
+        {
+            if (TryGetValue(key, out value))
+                return true;
+
+            if (_mergedDictionaries != null)
+            {
+                for (var i = _mergedDictionaries.Count - 1; i >= 0; --i)
+                {
+                    if (_mergedDictionaries[i].TryGetResource(key, out value))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            value = null;
+            return false;
+        }
+
+        public bool TryGetValue(object key, out object? value)
+        {
+            if (_inner is not null && _inner.TryGetValue(key, out value))
+            {
+                if (value is DeferredItem deffered)
+                {
+                    _inner[key] = value = deffered.Factory(null) switch
+                    {
+                        ITemplateResult t => t.Result,
+                        object v => v,
+                        _ => null,
+                    };
+                }
+                return true;
+            }
+
+            value = null;
+            return false;
+        }
+
+        public IEnumerator<KeyValuePair<object, object?>> GetEnumerator()
+        {
+            return _inner?.GetEnumerator() ?? Enumerable.Empty<KeyValuePair<object, object?>>().GetEnumerator();
+        }
+
+        void ICollection<KeyValuePair<object, object?>>.Add(KeyValuePair<object, object?> item)
+        {
+            Add(item.Key, item.Value);
+        }
+
+        bool ICollection<KeyValuePair<object, object?>>.Contains(KeyValuePair<object, object?> item)
+        {
+            return (_inner as ICollection<KeyValuePair<object, object?>>)?.Contains(item) ?? false;
+        }
+
+        void ICollection<KeyValuePair<object, object?>>.CopyTo(KeyValuePair<object, object?>[] array, int arrayIndex)
+        {
+            (_inner as ICollection<KeyValuePair<object, object?>>)?.CopyTo(array, arrayIndex);
+        }
+
+        bool ICollection<KeyValuePair<object, object?>>.Remove(KeyValuePair<object, object?> item)
+        {
+            if ((_inner as ICollection<KeyValuePair<object, object?>>)?.Remove(item) == true)
+            {
+                Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                return true;
+            }
+
+            return false;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        internal bool ContainsDeferredKey(object key)
+        {
+            if (_inner is not null && _inner.TryGetValue(key, out var result))
+            {
+                return result is DeferredItem;
+            }
+
+            return false;
+        }
+
+        void IResourceProvider.AddOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner != null)
+            {
+                throw new InvalidOperationException("The ResourceDictionary already has a parent.");
+            }
+            
+            Owner = owner;
+
+            var hasResources = _inner?.Count > 0;
+            
+            if (_mergedDictionaries is object)
+            {
+                foreach (var i in _mergedDictionaries)
+                {
+                    i.AddOwner(owner);
+                    hasResources |= i.HasResources;
+                }
+            }
+
+            if (hasResources)
+            {
+                owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+            }
+        }
+
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner == owner)
+            {
+                Owner = null;
+
+                var hasResources = _inner?.Count > 0;
+
+                if (_mergedDictionaries is object)
+                {
+                    foreach (var i in _mergedDictionaries)
+                    {
+                        i.RemoveOwner(owner);
+                        hasResources |= i.HasResources;
+                    }
+                }
+
+                if (hasResources)
+                {
+                    owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                }
+            }
+        }
+
+        private class DeferredItem
+        {
+            public DeferredItem(Func<IServiceProvider?, object?> factory) => Factory = factory;
+            public Func<IServiceProvider?, object?> Factory { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
new file mode 100644
index 0000000000..6121646107
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
@@ -0,0 +1,189 @@
+using System;
+using Avalonia.Data.Converters;
+using Avalonia.LogicalTree;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public static class ResourceNodeExtensions
+    {
+        /// <summary>
+        /// Finds the specified resource by searching up the logical tree and then global styles.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="key">The resource key.</param>
+        /// <returns>The resource, or <see cref="AvaloniaProperty.UnsetValue"/> if not found.</returns>
+        public static object? FindResource(this IResourceHost control, object key)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            if (control.TryFindResource(key, out var value))
+            {
+                return value;
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <summary>
+        /// Tries to the specified resource by searching up the logical tree and then global styles.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="key">The resource key.</param>
+        /// <param name="value">On return, contains the resource if found, otherwise null.</param>
+        /// <returns>True if the resource was found; otherwise false.</returns>
+        public static bool TryFindResource(this IResourceHost control, object key, out object? value)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            IResourceNode? current = control;
+
+            while (current != null)
+            {
+                if (current.TryGetResource(key, out value))
+                {
+                    return true;
+                }
+
+                current = (current as IStyledElement)?.StylingParent as IResourceNode;
+            }
+
+            value = null;
+            return false;
+        }
+
+        public static IObservable<object?> GetResourceObservable(
+            this IResourceHost control,
+            object key,
+            Func<object?, object?>? converter = null)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            return new ResourceObservable(control, key, converter);
+        }
+
+        public static IObservable<object?> GetResourceObservable(
+            this IResourceProvider resourceProvider,
+            object key,
+            Func<object?, object?>? converter = null)
+        {
+            resourceProvider = resourceProvider ?? throw new ArgumentNullException(nameof(resourceProvider));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            return new FloatingResourceObservable(resourceProvider, key, converter);
+        }
+
+        private class ResourceObservable : LightweightObservableBase<object?>
+        {
+            private readonly IResourceHost _target;
+            private readonly object _key;
+            private readonly Func<object?, object?>? _converter;
+
+            public ResourceObservable(IResourceHost target, object key, Func<object?, object?>? converter)
+            {
+                _target = target;
+                _key = key;
+                _converter = converter;
+            }
+
+            protected override void Initialize()
+            {
+                _target.ResourcesChanged += ResourcesChanged;
+            }
+
+            protected override void Deinitialize()
+            {
+                _target.ResourcesChanged -= ResourcesChanged;
+            }
+
+            protected override void Subscribed(IObserver<object?> observer, bool first)
+            {
+                observer.OnNext(Convert(_target.FindResource(_key)));
+            }
+
+            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
+            {
+                PublishNext(Convert(_target.FindResource(_key)));
+            }
+
+            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
+        }
+
+        private class FloatingResourceObservable : LightweightObservableBase<object?>
+        {
+            private readonly IResourceProvider _target;
+            private readonly object _key;
+            private readonly Func<object?, object?>? _converter;
+            private IResourceHost? _owner;
+
+            public FloatingResourceObservable(IResourceProvider target, object key, Func<object?, object?>? converter)
+            {
+                _target = target;
+                _key = key;
+                _converter = converter;
+            }
+
+            protected override void Initialize()
+            {
+                _target.OwnerChanged += OwnerChanged;
+                _owner = _target.Owner;
+
+                if (_owner is object)
+                {
+                    _owner.ResourcesChanged += ResourcesChanged;
+                }
+            }
+
+            protected override void Deinitialize()
+            {
+                _target.OwnerChanged -= OwnerChanged;
+                _owner = null;
+            }
+
+            protected override void Subscribed(IObserver<object?> observer, bool first)
+            {
+                if (_target.Owner is object)
+                {
+                    observer.OnNext(Convert(_target.Owner.FindResource(_key)));
+                }
+            }
+
+            private void PublishNext()
+            {
+                if (_target.Owner is object)
+                {
+                    PublishNext(Convert(_target.Owner.FindResource(_key)));
+                }
+            }
+
+            private void OwnerChanged(object? sender, EventArgs e)
+            {
+                if (_owner is object)
+                {
+                    _owner.ResourcesChanged -= ResourcesChanged;
+                }
+
+                _owner = _target.Owner;
+
+                if (_owner is object)
+                {
+                    _owner.ResourcesChanged += ResourcesChanged;
+                }
+
+                PublishNext();
+            }
+
+            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
+            {
+                PublishNext();
+            }
+
+            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs b/src/Avalonia.Base/Controls/ResourcesChangedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs
rename to src/Avalonia.Base/Controls/ResourcesChangedEventArgs.cs
diff --git a/src/Avalonia.Base/Controls/Templates/ITemplateResult.cs b/src/Avalonia.Base/Controls/Templates/ITemplateResult.cs
new file mode 100644
index 0000000000..6bd4d735a7
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Templates/ITemplateResult.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.Controls.Templates
+{
+    public interface ITemplateResult
+    {
+        public object? Result { get; }
+        public INameScope NameScope { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/Templates/TemplateResult.cs b/src/Avalonia.Base/Controls/Templates/TemplateResult.cs
new file mode 100644
index 0000000000..0e38c6c0ce
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Templates/TemplateResult.cs
@@ -0,0 +1,21 @@
+namespace Avalonia.Controls.Templates
+{
+    public class TemplateResult<T> : ITemplateResult
+    {
+        public T Result { get; }
+        public INameScope NameScope { get; }
+        object? ITemplateResult.Result => Result;
+
+        public TemplateResult(T result, INameScope nameScope)
+        {
+            Result = result;
+            NameScope = nameScope;
+        }
+
+        public void Deconstruct(out T result, out INameScope scope)
+        {
+            result = Result;
+            scope = NameScope;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Base/CornerRadius.cs
similarity index 100%
rename from src/Avalonia.Visuals/CornerRadius.cs
rename to src/Avalonia.Base/CornerRadius.cs
diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index 5353e8175d..4e47a720f0 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -99,14 +99,15 @@ namespace Avalonia.Data
 
         private sealed class TwoWayBindingDisposable : IDisposable
         {
-            private readonly IDisposable _first;
-            private readonly IDisposable _second;
+            private readonly IDisposable _toTargetSubscription;
+            private readonly IDisposable _fromTargetSubsription;
+
             private bool _isDisposed;
 
-            public TwoWayBindingDisposable(IDisposable first, IDisposable second)
+            public TwoWayBindingDisposable(IDisposable toTargetSubscription, IDisposable fromTargetSubsription)
             {
-                _first = first;
-                _second = second;
+                _toTargetSubscription = toTargetSubscription;
+                _fromTargetSubsription = fromTargetSubsription;
             }
 
             public void Dispose()
@@ -116,8 +117,8 @@ namespace Avalonia.Data
                     return;
                 }
 
-                _first.Dispose();
-                _second.Dispose();
+                _fromTargetSubsription.Dispose();
+                _toTargetSubscription.Dispose();
 
                 _isDisposed = true;
             }
diff --git a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
index 11d50afe93..c4f4362537 100644
--- a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
@@ -33,7 +33,14 @@ namespace Avalonia.Data.Converters
 
             if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d && d.Method.GetParameters().Length <= 1)
             {
-                return new MethodToCommandConverter(d);
+                if (d.Method.IsPrivate == false)
+                {
+                    return new MethodToCommandConverter(d);
+                }
+                else
+                {
+                    return new BindingNotification(new InvalidCastException("You can't bind to private methods!"), BindingErrorType.Error);
+                }
             }
 
             if (TypeUtilities.TryConvert(targetType, value, culture, out var result))
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
index 54785f18e8..4f755ff140 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
@@ -98,36 +98,36 @@ namespace Avalonia.Data.Core
 
         private void ValueChanged(object? value, bool notify)
         {
-            if (_subscriber is null)
-                return;
-
-            var notification = value as BindingNotification;
-
-            if (notification == null)
+            if (_subscriber is { } subscriber)
             {
-                LastValue = value != null ? new WeakReference<object?>(value) : NullReference;
+                var notification = value as BindingNotification;
+                var next = Next;
 
-                if (Next != null)
+                if (notification == null)
                 {
-                    Next.Target = LastValue;
+                    LastValue = value != null ? new WeakReference<object?>(value) : NullReference;
+                    if (next != null)
+                    {
+                        next.Target = LastValue;
+                    }
+                    else if (notify)
+                    {
+                        subscriber(value);
+                    }
                 }
-                else if (notify)
+                else
                 {
-                    _subscriber(value);
-                }
-            }
-            else
-            {
-                LastValue = notification.Value != null ? new WeakReference<object?>(notification.Value) : NullReference;
+                    LastValue = notification.Value != null ? new WeakReference<object?>(notification.Value) : NullReference;
 
-                if (Next != null)
-                {
-                    Next.Target = LastValue;
-                }
+                    if (next != null)
+                    {
+                        next.Target = LastValue;
+                    }
 
-                if (Next == null || notification.Error != null)
-                {
-                    _subscriber(value);
+                    if (next == null || notification.Error != null)
+                    {
+                        subscriber(value);
+                    }
                 }
             }
         }
diff --git a/src/Avalonia.Base/Data/Core/IPropertyInfo.cs b/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
index 4d80feb4ba..0cb8a937cc 100644
--- a/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
+++ b/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Data.Core
 {
+    [NotClientImplementable]
     public interface IPropertyInfo
     {
         string Name { get; }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
index 3c4120ad0b..cc6d92ceb7 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.ExceptionServices;
+using Avalonia.Utilities;
 
 namespace Avalonia.Data.Core.Plugins
 {
@@ -60,11 +61,10 @@ namespace Avalonia.Data.Core.Plugins
             return AvaloniaPropertyRegistry.Instance.FindRegistered(o, propertyName);
         }
 
-        private class Accessor : PropertyAccessorBase, IObserver<object?>
+        private class Accessor : PropertyAccessorBase, IWeakEventSubscriber<AvaloniaPropertyChangedEventArgs>
         {
             private readonly WeakReference<AvaloniaObject> _reference;
             private readonly AvaloniaProperty _property;
-            private IDisposable? _subscription;
 
             public Accessor(WeakReference<AvaloniaObject> reference, AvaloniaProperty property)
             {
@@ -95,29 +95,45 @@ namespace Avalonia.Data.Core.Plugins
                 return false;
             }
 
-            protected override void SubscribeCore()
+            void IWeakEventSubscriber<AvaloniaPropertyChangedEventArgs>.
+                OnEvent(object? notifyPropertyChanged, WeakEvent ev, AvaloniaPropertyChangedEventArgs e)
             {
-                _subscription = Instance?.GetObservable(_property).Subscribe(this);
+                if (e.Property == _property)
+                {
+                    SendCurrentValue();
+                }
             }
 
-            protected override void UnsubscribeCore()
+            protected override void SubscribeCore()
             {
-                _subscription?.Dispose();
-                _subscription = null;
+                SubscribeToChanges();
+                SendCurrentValue();
             }
 
-            void IObserver<object?>.OnCompleted()
+            protected override void UnsubscribeCore()
             {
+                var instance = Instance;
+
+                if (instance != null)
+                    WeakEvents.AvaloniaPropertyChanged.Unsubscribe(instance, this);
             }
 
-            void IObserver<object?>.OnError(Exception error)
+            private void SendCurrentValue()
             {
-                ExceptionDispatchInfo.Capture(error).Throw();
+                try
+                {
+                    var value = Value;
+                    PublishValue(value);
+                }
+                catch { }
             }
 
-            void IObserver<object?>.OnNext(object? value)
+            private void SubscribeToChanges()
             {
-                PublishValue(value);
+                var instance = Instance;
+
+                if (instance != null)
+                    WeakEvents.AvaloniaPropertyChanged.Subscribe(instance, this);
             }
         }
     }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index 33cecd10a7..91d69b5d3d 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Data.Core.Plugins
             new Dictionary<(Type, string), PropertyInfo?>();
 
         /// <inheritdoc/>
-        public bool Match(object obj, string propertyName) => GetFirstPropertyWithName(obj.GetType(), propertyName) != null;
+        public bool Match(object obj, string propertyName) => GetFirstPropertyWithName(obj, propertyName) != null;
 
         /// <summary>
         /// Starts monitoring the value of a property on an object.
@@ -36,7 +36,7 @@ namespace Avalonia.Data.Core.Plugins
             if (!reference.TryGetTarget(out var instance) || instance is null)
                 return null;
 
-            var p = GetFirstPropertyWithName(instance.GetType(), propertyName);
+            var p = GetFirstPropertyWithName(instance, propertyName);
 
             if (p != null)
             {
@@ -50,8 +50,16 @@ namespace Avalonia.Data.Core.Plugins
             }
         }
 
-        private PropertyInfo? GetFirstPropertyWithName(Type type, string propertyName)
+        private const BindingFlags PropertyBindingFlags =
+            BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+        
+        private PropertyInfo? GetFirstPropertyWithName(object instance, string propertyName)
         {
+            if (instance is IReflectableType reflectableType && instance is not Type)
+                return reflectableType.GetTypeInfo().GetProperty(propertyName, PropertyBindingFlags);
+
+            var type = instance.GetType();
+            
             var key = (type, propertyName);
 
             if (!_propertyLookup.TryGetValue(key, out var propertyInfo))
@@ -66,10 +74,7 @@ namespace Avalonia.Data.Core.Plugins
         {
             PropertyInfo? found = null;
 
-            const BindingFlags bindingFlags =
-                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
-
-            var properties = type.GetProperties(bindingFlags);
+            var properties = type.GetProperties(PropertyBindingFlags);
 
             foreach (PropertyInfo propertyInfo in properties)
             {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
index 160c7301f5..0d51a6ed36 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
@@ -22,19 +22,9 @@ namespace Avalonia.Data.Core.Plugins
 
             var method = GetFirstMethodWithName(instance.GetType(), methodName);
 
-            if (method != null)
+            if (method is not null)
             {
-                var parameters = method.GetParameters();
-
-                if (parameters.Length + (method.ReturnType == typeof(void) ? 0 : 1) > 8)
-                {
-                    var exception = new ArgumentException(
-                        "Cannot create a binding accessor for a method with more than 8 parameters or more than 7 parameters if it has a non-void return type.",
-                        nameof(methodName));
-                    return new PropertyError(new BindingNotification(exception, BindingErrorType.Error));
-                }
-
-                return new Accessor(reference, method, parameters);
+                return new Accessor(reference, method);
             }
             else
             {
@@ -65,13 +55,20 @@ namespace Avalonia.Data.Core.Plugins
 
             var methods = type.GetMethods(bindingFlags);
 
-            foreach (MethodInfo methodInfo in methods)
+            foreach (var methodInfo in methods)
             {
                 if (methodInfo.Name == methodName)
                 {
-                    found = methodInfo;
-
-                    break;
+                    var parameters = methodInfo.GetParameters();
+                    if (parameters.Length == 1 && parameters[0].ParameterType == typeof(object))
+                    {
+                        found = methodInfo;
+                        break;
+                    }
+                    else if (parameters.Length == 0)
+                    {
+                        found = methodInfo;
+                    }
                 }
             }
 
@@ -82,18 +79,20 @@ namespace Avalonia.Data.Core.Plugins
 
         private sealed class Accessor : PropertyAccessorBase
         {
-            public Accessor(WeakReference<object?> reference, MethodInfo method, ParameterInfo[] parameters)
+            public Accessor(WeakReference<object?> reference, MethodInfo method)
             {
                 _ = reference ?? throw new ArgumentNullException(nameof(reference));
                 _ = method ?? throw new ArgumentNullException(nameof(method));
 
                 var returnType = method.ReturnType;
-                bool hasReturn = returnType != typeof(void);
 
-                var signatureTypeCount = (hasReturn ? 1 : 0) + parameters.Length;
+                var parameters = method.GetParameters();
+
+                var signatureTypeCount = parameters.Length + 1;
 
                 var paramTypes = new Type[signatureTypeCount];
 
+
                 for (var i = 0; i < parameters.Length; i++)
                 {
                     ParameterInfo parameter = parameters[i];
@@ -101,16 +100,9 @@ namespace Avalonia.Data.Core.Plugins
                     paramTypes[i] = parameter.ParameterType;
                 }
 
-                if (hasReturn)
-                {
-                    paramTypes[paramTypes.Length - 1] = returnType;
+                paramTypes[paramTypes.Length - 1] = returnType;
 
-                    PropertyType = Expression.GetFuncType(paramTypes);
-                }
-                else
-                {
-                    PropertyType = Expression.GetActionType(paramTypes);
-                }
+                PropertyType = Expression.GetDelegateType(paramTypes);
 
                 if (method.IsStatic)
                 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
index 0288dbce91..6232fa39a1 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Data.Core.Plugins
             if (target is IObservable<object?> result)
             {
                 return result;
-            };
+            }
 
             // If the observable returns a value type then we need to call Observable.Select on it.
             // First get the type of T in `IObservable<T>`.
diff --git a/src/Avalonia.Base/Data/Core/PropertyPath.cs b/src/Avalonia.Base/Data/Core/PropertyPath.cs
index 665953c4a1..f5b3f92353 100644
--- a/src/Avalonia.Base/Data/Core/PropertyPath.cs
+++ b/src/Avalonia.Base/Data/Core/PropertyPath.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Data.Core
 
         public PropertyPath(IEnumerable<IPropertyPathElement> elements)
         {
-            Elements = elements.ToList();
+            Elements = elements.ToArray();
         }
     }
 
diff --git a/src/Avalonia.Base/Data/IBinding.cs b/src/Avalonia.Base/Data/IBinding.cs
index 9535cf608e..7d44bf09b5 100644
--- a/src/Avalonia.Base/Data/IBinding.cs
+++ b/src/Avalonia.Base/Data/IBinding.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Data
 {
     /// <summary>
     /// Holds a binding that can be applied to a property on an object.
     /// </summary>
+    [NotClientImplementable]
     public interface IBinding
     {
         /// <summary>
diff --git a/src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs b/src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs
similarity index 100%
rename from src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs
rename to src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs
diff --git a/src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs b/src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs
rename to src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index 9c4896b96c..86e4bffaa8 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Data;
 using Avalonia.Reactive;
-using Avalonia.Utilities;
+using Avalonia.Styling;
 
 namespace Avalonia
 {
@@ -29,21 +29,6 @@ namespace Avalonia
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectPropertyBase{TValue}"/> class.
-        /// </summary>
-        /// <param name="source">The property to copy.</param>
-        /// <param name="ownerType">The new owner type.</param>
-        /// <param name="metadata">Optional overridden metadata.</param>
-        [Obsolete("Use constructor with DirectPropertyBase<TValue> instead.", true)]
-        protected DirectPropertyBase(
-            AvaloniaProperty source,
-            Type ownerType,
-            AvaloniaPropertyMetadata metadata)
-            : this(source as DirectPropertyBase<TValue> ?? throw new InvalidOperationException(), ownerType, metadata)
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="DirectPropertyBase{TValue}"/> class.
         /// </summary>
@@ -121,31 +106,25 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
-        {
-            visitor.Visit(this, ref data);
-        }
-
-        /// <inheritdoc/>
-        internal override void RouteClearValue(IAvaloniaObject o)
+        internal override void RouteClearValue(AvaloniaObject o)
         {
             o.ClearValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        internal override object? RouteGetValue(IAvaloniaObject o)
+        internal override object? RouteGetValue(AvaloniaObject o)
         {
             return o.GetValue<TValue>(this);
         }
 
-        internal override object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+        internal override object? RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority)
         {
             return o.GetValue<TValue>(this);
         }
 
         /// <inheritdoc/>
         internal override IDisposable? RouteSetValue(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             object? value,
             BindingPriority priority)
         {
@@ -169,7 +148,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         internal override IDisposable RouteBind(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             IObservable<BindingValue<object?>> source,
             BindingPriority priority)
         {
@@ -177,9 +156,34 @@ namespace Avalonia
             return o.Bind<TValue>(this, adapter);
         }
 
-        internal override void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject? oldParent)
+        internal override void RouteInheritanceParentChanged(AvaloniaObject o, AvaloniaObject? oldParent)
         {
             throw new NotSupportedException("Direct properties do not support inheritance.");
         }
+
+        internal override ISetterInstance CreateSetterInstance(IStyleable target, object? value)
+        {
+            if (value is IBinding binding)
+            {
+                return new PropertySetterBindingInstance<TValue>(
+                    target,
+                    this,
+                    binding);
+            }
+            else if (value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(PropertyType))
+            {
+                return new PropertySetterTemplateInstance<TValue>(
+                    target,
+                    this,
+                    template);
+            }
+            else
+            {
+                return new PropertySetterInstance<TValue>(
+                    target,
+                    this,
+                    (TValue)value!);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Base/EnumExtensions.cs b/src/Avalonia.Base/EnumExtensions.cs
index 19eb42a700..9b74266b09 100644
--- a/src/Avalonia.Base/EnumExtensions.cs
+++ b/src/Avalonia.Base/EnumExtensions.cs
@@ -8,10 +8,6 @@ namespace Avalonia
     /// </summary>
     public static class EnumExtensions
     {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        [Obsolete("This method is obsolete. Use HasAllFlags instead.")]
-        public static bool HasFlagCustom<T>(this T value, T flag) where T : unmanaged, Enum
-            => value.HasAllFlags(flag);
             
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe bool HasAllFlags<T>(this T value, T flags) where T : unmanaged, Enum
diff --git a/src/Avalonia.Base/IAvaloniaObject.cs b/src/Avalonia.Base/IAvaloniaObject.cs
index 654528658f..3b0016903b 100644
--- a/src/Avalonia.Base/IAvaloniaObject.cs
+++ b/src/Avalonia.Base/IAvaloniaObject.cs
@@ -1,11 +1,13 @@
 using System;
 using Avalonia.Data;
+using Avalonia.Metadata;
 
 namespace Avalonia
 {
     /// <summary>
     /// Interface for getting/setting <see cref="AvaloniaProperty"/> values on an object.
     /// </summary>
+    [NotClientImplementable]
     public interface IAvaloniaObject
     {
         /// <summary>
@@ -17,42 +19,14 @@ namespace Avalonia
         /// Clears an <see cref="AvaloniaProperty"/>'s local value.
         /// </summary>
         /// <param name="property">The property.</param>
-        void ClearValue<T>(StyledPropertyBase<T> property);
-
-        /// <summary>
-        /// Clears an <see cref="AvaloniaProperty"/>'s local value.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        void ClearValue<T>(DirectPropertyBase<T> property);
-
-        /// <summary>
-        /// Gets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <returns>The value.</returns>
-        T GetValue<T>(StyledPropertyBase<T> property);
+        void ClearValue(AvaloniaProperty property);
 
         /// <summary>
         /// Gets a <see cref="AvaloniaProperty"/> value.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <returns>The value.</returns>
-        T GetValue<T>(DirectPropertyBase<T> property);
-
-        /// <summary>
-        /// Gets an <see cref="AvaloniaProperty"/> base value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="maxPriority">The maximum priority for the value.</param>
-        /// <remarks>
-        /// Gets the value of the property, if set on this object with a priority equal or lower to
-        /// <paramref name="maxPriority"/>, otherwise <see cref="Optional{T}.Empty"/>. Note that
-        /// this method does not return property values that come from inherited or default values.
-        /// </remarks>
-        Optional<T> GetBaseValue<T>(StyledPropertyBase<T> property, BindingPriority maxPriority);
+        object? GetValue(AvaloniaProperty property);
 
         /// <summary>
         /// Checks whether a <see cref="AvaloniaProperty"/> is animating.
@@ -71,93 +45,35 @@ namespace Avalonia
         /// <summary>
         /// Sets a <see cref="AvaloniaProperty"/> value.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <param name="value">The value.</param>
         /// <param name="priority">The priority of the value.</param>
         /// <returns>
         /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
         /// </returns>
-        IDisposable? SetValue<T>(
-            StyledPropertyBase<T> property,
-            T value,
+        IDisposable? SetValue(
+            AvaloniaProperty property,
+            object? value,
             BindingPriority priority = BindingPriority.LocalValue);
 
-        /// <summary>
-        /// Sets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        void SetValue<T>(DirectPropertyBase<T> property, T value);
-
         /// <summary>
         /// Binds a <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <param name="source">The observable.</param>
         /// <param name="priority">The priority of the binding.</param>
         /// <returns>
         /// A disposable which can be used to terminate the binding.
         /// </returns>
-        IDisposable Bind<T>(
-            StyledPropertyBase<T> property,
-            IObservable<BindingValue<T>> source,
+        IDisposable Bind(
+            AvaloniaProperty property,
+            IObservable<object?> source,
             BindingPriority priority = BindingPriority.LocalValue);
 
-        /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="source">The observable.</param>
-        /// <returns>
-        /// A disposable which can be used to terminate the binding.
-        /// </returns>
-        IDisposable Bind<T>(
-            DirectPropertyBase<T> property,
-            IObservable<BindingValue<T>> source);
-
         /// <summary>
         /// Coerces the specified <see cref="AvaloniaProperty"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
-        void CoerceValue<T>(StyledPropertyBase<T> property);
-
-        /// <summary>
-        /// Registers an object as an inheritance child.
-        /// </summary>
-        /// <param name="child">The inheritance child.</param>
-        /// <remarks>
-        /// Inheritance children will receive a call to
-        /// <see cref="InheritedPropertyChanged{T}(AvaloniaProperty{T}, Optional{T}, Optional{T})"/>
-        /// when an inheritable property value changes on the parent.
-        /// </remarks>
-        void AddInheritanceChild(IAvaloniaObject child);
-
-        /// <summary>
-        /// Unregisters an object as an inheritance child.
-        /// </summary>
-        /// <param name="child">The inheritance child.</param>
-        /// <remarks>
-        /// Removes an inheritance child that was added by a call to
-        /// <see cref="AddInheritanceChild(IAvaloniaObject)"/>.
-        /// </remarks>
-        void RemoveInheritanceChild(IAvaloniaObject child);
-
-        /// <summary>
-        /// Called when an inheritable property changes on an object registered as an inheritance
-        /// parent.
-        /// </summary>
-        /// <typeparam name="T">The type of the value.</typeparam>
-        /// <param name="property">The property that has changed.</param>
-        /// <param name="oldValue"></param>
-        /// <param name="newValue"></param>
-        void InheritedPropertyChanged<T>(
-            AvaloniaProperty<T> property,
-            Optional<T> oldValue,
-            Optional<T> newValue);
+        void CoerceValue(AvaloniaProperty property);
     }
 }
diff --git a/src/Avalonia.Base/IDataContextProvider.cs b/src/Avalonia.Base/IDataContextProvider.cs
new file mode 100644
index 0000000000..1d381cf4a5
--- /dev/null
+++ b/src/Avalonia.Base/IDataContextProvider.cs
@@ -0,0 +1,16 @@
+using Avalonia.Metadata;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines an element with a data context that can be used for binding.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IDataContextProvider : IAvaloniaObject
+    {
+        /// <summary>
+        /// Gets or sets the element's data context.
+        /// </summary>
+        object? DataContext { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/IDirectPropertyAccessor.cs b/src/Avalonia.Base/IDirectPropertyAccessor.cs
index e34483fa7b..476a36f372 100644
--- a/src/Avalonia.Base/IDirectPropertyAccessor.cs
+++ b/src/Avalonia.Base/IDirectPropertyAccessor.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia
 {
diff --git a/src/Avalonia.Base/IDirectPropertyMetadata.cs b/src/Avalonia.Base/IDirectPropertyMetadata.cs
index 4fd4a3a6b7..7d74470a13 100644
--- a/src/Avalonia.Base/IDirectPropertyMetadata.cs
+++ b/src/Avalonia.Base/IDirectPropertyMetadata.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia
 {
     /// <summary>
     /// Untyped interface to <see cref="DirectPropertyMetadata{TValue}"/>
     /// </summary>
+    [NotClientImplementable]
     public interface IDirectPropertyMetadata
     {
         /// <summary>
diff --git a/src/Avalonia.Styling/INamed.cs b/src/Avalonia.Base/INamed.cs
similarity index 100%
rename from src/Avalonia.Styling/INamed.cs
rename to src/Avalonia.Base/INamed.cs
diff --git a/src/Avalonia.Base/IStyledElement.cs b/src/Avalonia.Base/IStyledElement.cs
new file mode 100644
index 0000000000..4eed54de45
--- /dev/null
+++ b/src/Avalonia.Base/IStyledElement.cs
@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Metadata;
+using Avalonia.Styling;
+
+namespace Avalonia
+{
+    [NotClientImplementable]
+    public interface IStyledElement :
+        IStyleable,
+        IStyleHost,
+        ILogical,
+        IResourceHost,
+        IDataContextProvider,
+        ISupportInitialize
+    {
+        /// <summary>
+        /// Occurs when the control has finished initialization.
+        /// </summary>
+        event EventHandler? Initialized;
+
+        /// <summary>
+        /// Gets a value that indicates whether the element has finished initialization.
+        /// </summary>
+        bool IsInitialized { get; }
+
+        /// <summary>
+        /// Gets or sets the control's styling classes.
+        /// </summary>
+        new Classes Classes { get; set; }
+
+        /// <summary>
+        /// Gets the control's logical parent.
+        /// </summary>
+        IStyledElement? Parent { get; }
+    }
+}
diff --git a/src/Avalonia.Base/IStyledPropertyMetadata.cs b/src/Avalonia.Base/IStyledPropertyMetadata.cs
index 6b29b5f977..89990338e0 100644
--- a/src/Avalonia.Base/IStyledPropertyMetadata.cs
+++ b/src/Avalonia.Base/IStyledPropertyMetadata.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia
 {
     /// <summary>
     /// Untyped interface to <see cref="StyledPropertyMetadata{TValue}"/>
     /// </summary>
+    [NotClientImplementable]
     public interface IStyledPropertyMetadata
     {
         /// <summary>
diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Base/Input/AccessKeyHandler.cs
similarity index 100%
rename from src/Avalonia.Input/AccessKeyHandler.cs
rename to src/Avalonia.Base/Input/AccessKeyHandler.cs
diff --git a/src/Avalonia.Base/Input/Cursor.cs b/src/Avalonia.Base/Input/Cursor.cs
new file mode 100644
index 0000000000..8e79206f93
--- /dev/null
+++ b/src/Avalonia.Base/Input/Cursor.cs
@@ -0,0 +1,78 @@
+using System;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+
+#nullable enable
+
+namespace Avalonia.Input
+{
+    public enum StandardCursorType
+    {
+        Arrow,
+        Ibeam,
+        Wait,
+        Cross,
+        UpArrow,
+        SizeWestEast,
+        SizeNorthSouth,
+        SizeAll,
+        No,
+        Hand,
+        AppStarting,
+        Help,
+        TopSide,
+        BottomSide,
+        LeftSide,
+        RightSide,
+        TopLeftCorner,
+        TopRightCorner,
+        BottomLeftCorner,
+        BottomRightCorner,
+        DragMove,
+        DragCopy,
+        DragLink,
+        None,
+        
+        // Not available in GTK directly, see https://www.pixelbeat.org/programming/x_cursors/
+        // We might enable them later, preferably, by loading pixmax directly from theme with fallback image
+        // SizeNorthWestSouthEast,
+        // SizeNorthEastSouthWest,
+    }
+
+    public class Cursor : IDisposable
+    {
+        public static readonly Cursor Default = new Cursor(StandardCursorType.Arrow);
+
+        internal Cursor(ICursorImpl platformImpl)
+        {
+            PlatformImpl = platformImpl;
+        }
+
+        public Cursor(StandardCursorType cursorType)
+            : this(GetCursorFactory().GetCursor(cursorType))
+        {
+        }
+
+        public Cursor(IBitmap cursor, PixelPoint hotSpot)
+            : this(GetCursorFactory().CreateCursor(cursor.PlatformImpl.Item, hotSpot))
+        {
+        }
+
+        public ICursorImpl PlatformImpl { get; }
+
+        public void Dispose() => PlatformImpl.Dispose();
+
+        public static Cursor Parse(string s)
+        {
+            return Enum.TryParse<StandardCursorType>(s, true, out var t) ?
+                new Cursor(t) :
+                throw new ArgumentException($"Unrecognized cursor type '{s}'.");
+        }
+
+        private static ICursorFactory GetCursorFactory()
+        {
+            return AvaloniaLocator.Current.GetService<ICursorFactory>() ??
+                throw new Exception("Could not create Cursor: ICursorFactory not registered.");
+        }
+    }
+}
diff --git a/src/Avalonia.Input/DataFormats.cs b/src/Avalonia.Base/Input/DataFormats.cs
similarity index 100%
rename from src/Avalonia.Input/DataFormats.cs
rename to src/Avalonia.Base/Input/DataFormats.cs
diff --git a/src/Avalonia.Input/DataObject.cs b/src/Avalonia.Base/Input/DataObject.cs
similarity index 100%
rename from src/Avalonia.Input/DataObject.cs
rename to src/Avalonia.Base/Input/DataObject.cs
diff --git a/src/Avalonia.Base/Input/DragDrop.cs b/src/Avalonia.Base/Input/DragDrop.cs
new file mode 100644
index 0000000000..fe75f678e1
--- /dev/null
+++ b/src/Avalonia.Base/Input/DragDrop.cs
@@ -0,0 +1,54 @@
+using System.Threading.Tasks;
+using Avalonia.Input.Platform;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    public static class DragDrop
+    {
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation enters the element.
+        /// </summary>
+        public static readonly RoutedEvent<DragEventArgs> DragEnterEvent = RoutedEvent.Register<DragEventArgs>("DragEnter", RoutingStrategies.Bubble, typeof(DragDrop));
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation leaves the element.
+        /// </summary>
+        public static readonly RoutedEvent<DragEventArgs> DragLeaveEvent = RoutedEvent.Register<DragEventArgs>("DragLeave", RoutingStrategies.Bubble, typeof(DragDrop));
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation is updated while over the element.
+        /// </summary>
+        public static readonly RoutedEvent<DragEventArgs> DragOverEvent = RoutedEvent.Register<DragEventArgs>("DragOver", RoutingStrategies.Bubble, typeof(DragDrop));
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation should complete over the element.
+        /// </summary>
+        public static readonly RoutedEvent<DragEventArgs> DropEvent = RoutedEvent.Register<DragEventArgs>("Drop", RoutingStrategies.Bubble, typeof(DragDrop));
+
+        public static readonly AttachedProperty<bool> AllowDropProperty = AvaloniaProperty.RegisterAttached<Interactive, bool>("AllowDrop", typeof(DragDrop), inherits: true);
+
+        /// <summary>
+        /// Gets a value indicating whether the given element can be used as the target of a drag-and-drop operation. 
+        /// </summary>
+        public static bool GetAllowDrop(Interactive interactive)
+        {
+            return interactive.GetValue(AllowDropProperty);
+        }
+
+        /// <summary>
+        /// Sets a value indicating whether the given interactive can be used as the target of a drag-and-drop operation. 
+        /// </summary>
+        public static void SetAllowDrop(Interactive interactive, bool value)
+        {
+            interactive.SetValue(AllowDropProperty, value);
+        }
+
+        /// <summary>
+        /// Starts a dragging operation with the given <see cref="IDataObject"/> and returns the applied drop effect from the target.
+        /// <seealso cref="DataObject"/>
+        /// </summary>
+        public static Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects)
+        {
+            var src = AvaloniaLocator.Current.GetService<IPlatformDragSource>();
+            return src?.DoDragDrop(triggerEvent, data, allowedEffects) ?? Task.FromResult(DragDropEffects.None);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/DragDropDevice.cs b/src/Avalonia.Base/Input/DragDropDevice.cs
new file mode 100644
index 0000000000..3c91856dcd
--- /dev/null
+++ b/src/Avalonia.Base/Input/DragDropDevice.cs
@@ -0,0 +1,117 @@
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using System.Linq;
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Input
+{
+    public class DragDropDevice : IDragDropDevice
+    {
+        public static readonly DragDropDevice Instance = new DragDropDevice();
+        
+        private Interactive? _lastTarget = null;
+        
+        private Interactive? GetTarget(IInputRoot root, Point local)
+        {
+            var target = root.InputHitTest(local)?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
+            if (target != null && DragDrop.GetAllowDrop(target))
+                return target;
+            return null;
+        }
+        
+        private DragDropEffects RaiseDragEvent(Interactive? target, IInputRoot inputRoot, Point point, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data, KeyModifiers modifiers)
+        {
+            if (target == null)
+                return DragDropEffects.None;
+
+            var p = inputRoot.TranslatePoint(point, target);
+
+            if (!p.HasValue)
+                return DragDropEffects.None;
+
+            var args = new DragEventArgs(routedEvent, data, target, p.Value, modifiers)
+            {
+                RoutedEvent = routedEvent,
+                DragEffects = operation
+            };
+            target.RaiseEvent(args);
+            return args.DragEffects;
+        }
+        
+        private DragDropEffects DragEnter(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
+        {
+            _lastTarget = GetTarget(inputRoot, point);
+            return RaiseDragEvent(_lastTarget, inputRoot, point, DragDrop.DragEnterEvent, effects, data, modifiers);
+        }
+
+        private DragDropEffects DragOver(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
+        {
+            var target = GetTarget(inputRoot, point);
+
+            if (target == _lastTarget)
+                return RaiseDragEvent(target, inputRoot, point, DragDrop.DragOverEvent, effects, data, modifiers);
+            
+            try
+            {
+                if (_lastTarget != null)
+                    RaiseDragEvent(_lastTarget, inputRoot, point, DragDrop.DragLeaveEvent, effects, data, modifiers);
+                return RaiseDragEvent(target, inputRoot, point, DragDrop.DragEnterEvent, effects, data, modifiers);
+            }
+            finally
+            {
+                _lastTarget = target;
+            }            
+        }
+
+        private void DragLeave(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
+        {
+            if (_lastTarget == null)
+                return;
+            try
+            {
+                RaiseDragEvent(_lastTarget, inputRoot, point, DragDrop.DragLeaveEvent, effects, data, modifiers);
+            }
+            finally 
+            {
+                _lastTarget = null;
+            }
+        }
+
+        private DragDropEffects Drop(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
+        {
+            try
+            {
+                return RaiseDragEvent(_lastTarget, inputRoot, point, DragDrop.DropEvent, effects, data, modifiers);
+            }
+            finally 
+            {
+                _lastTarget = null;
+            }
+        }
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if (!e.Handled && e is RawDragEvent margs)
+                ProcessRawEvent(margs);
+        }
+
+        private void ProcessRawEvent(RawDragEvent e)
+        {
+            switch (e.Type)
+            {
+                case RawDragEventType.DragEnter:
+                    e.Effects = DragEnter(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
+                    break;
+                case RawDragEventType.DragOver:
+                    e.Effects = DragOver(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
+                    break;
+                case RawDragEventType.DragLeave:
+                    DragLeave(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
+                    break;
+                case RawDragEventType.Drop:
+                    e.Effects = Drop(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/DragDropEffects.cs b/src/Avalonia.Base/Input/DragDropEffects.cs
similarity index 100%
rename from src/Avalonia.Input/DragDropEffects.cs
rename to src/Avalonia.Base/Input/DragDropEffects.cs
diff --git a/src/Avalonia.Base/Input/DragEventArgs.cs b/src/Avalonia.Base/Input/DragEventArgs.cs
new file mode 100644
index 0000000000..41276e2f06
--- /dev/null
+++ b/src/Avalonia.Base/Input/DragEventArgs.cs
@@ -0,0 +1,44 @@
+using System;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class DragEventArgs : RoutedEventArgs
+    {
+        private Interactive _target;
+        private Point _targetLocation;
+
+        public DragDropEffects DragEffects { get; set; }
+
+        public IDataObject Data { get; private set; }
+
+        public KeyModifiers KeyModifiers { get; private set; }
+
+        public Point GetPosition(IVisual relativeTo)
+        {
+            var point = new Point(0, 0);
+
+            if (relativeTo == null)
+            {
+                throw new ArgumentNullException(nameof(relativeTo));
+            }
+
+            if (_target != null)
+            {
+                point = _target.TranslatePoint(_targetLocation, relativeTo) ?? point;
+            }
+
+            return point;
+        }
+
+        internal DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
+            : base(routedEvent)
+        {
+            Data = data;
+            _target = target;
+            _targetLocation = targetLocation;
+            KeyModifiers = keyModifiers;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs
new file mode 100644
index 0000000000..c7b5b8e27f
--- /dev/null
+++ b/src/Avalonia.Base/Input/FocusManager.cs
@@ -0,0 +1,244 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Manages focus for the application.
+    /// </summary>
+    public class FocusManager : IFocusManager
+    {
+        /// <summary>
+        /// The focus scopes in which the focus is currently defined.
+        /// </summary>
+        private readonly ConditionalWeakTable<IFocusScope, IInputElement?> _focusScopes =
+            new ConditionalWeakTable<IFocusScope, IInputElement?>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FocusManager"/> class.
+        /// </summary>
+        static FocusManager()
+        {
+            InputElement.PointerPressedEvent.AddClassHandler(
+                typeof(IInputElement),
+                new EventHandler<RoutedEventArgs>(OnPreviewPointerPressed),
+                RoutingStrategies.Tunnel);
+        }
+
+        /// <summary>
+        /// Gets the instance of the <see cref="IFocusManager"/>.
+        /// </summary>
+        public static IFocusManager? Instance => AvaloniaLocator.Current.GetService<IFocusManager>();
+
+        /// <summary>
+        /// Gets the currently focused <see cref="IInputElement"/>.
+        /// </summary>
+        public IInputElement? Current => KeyboardDevice.Instance?.FocusedElement;
+
+        /// <summary>
+        /// Gets the current focus scope.
+        /// </summary>
+        public IFocusScope? Scope
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Focuses a control.
+        /// </summary>
+        /// <param name="control">The control to focus.</param>
+        /// <param name="method">The method by which focus was changed.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        public void Focus(
+            IInputElement? control, 
+            NavigationMethod method = NavigationMethod.Unspecified,
+            KeyModifiers keyModifiers = KeyModifiers.None)
+        {
+            if (control != null)
+            {
+                var scope = GetFocusScopeAncestors(control)
+                    .FirstOrDefault();
+
+                if (scope != null)
+                {
+                    Scope = scope;
+                    SetFocusedElement(scope, control, method, keyModifiers);
+                }
+            }
+            else if (Current != null)
+            {
+                // If control is null, set focus to the topmost focus scope.
+                foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToArray())
+                {
+                    if (scope != Scope &&
+                        _focusScopes.TryGetValue(scope, out var element) &&
+                        element != null)
+                    {
+                        Focus(element, method);
+                        return;
+                    }
+                }
+
+                if (Scope is object)
+                {
+                    // Couldn't find a focus scope, clear focus.
+                    SetFocusedElement(Scope, null);
+                }
+            }
+        }
+
+        public IInputElement? GetFocusedElement(IInputElement e)
+        {
+            if (e is IFocusScope scope)
+            {
+                _focusScopes.TryGetValue(scope, out var result);
+                return result;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the currently focused element in the specified scope.
+        /// </summary>
+        /// <param name="scope">The focus scope.</param>
+        /// <param name="element">The element to focus. May be null.</param>
+        /// <param name="method">The method by which focus was changed.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        /// <remarks>
+        /// If the specified scope is the current <see cref="Scope"/> then the keyboard focus
+        /// will change.
+        /// </remarks>
+        public void SetFocusedElement(
+            IFocusScope scope,
+            IInputElement? element,
+            NavigationMethod method = NavigationMethod.Unspecified,
+            KeyModifiers keyModifiers = KeyModifiers.None)
+        {
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
+
+            if (_focusScopes.TryGetValue(scope, out var existingElement))
+            {
+                if (element != existingElement)
+                {
+                    _focusScopes.Remove(scope);
+                    _focusScopes.Add(scope, element);
+                }
+            }
+            else
+            {
+                _focusScopes.Add(scope, element);
+            }
+
+            if (Scope == scope)
+            {
+                KeyboardDevice.Instance?.SetFocusedElement(element, method, keyModifiers);
+            }
+        }
+
+        /// <summary>
+        /// Notifies the focus manager of a change in focus scope.
+        /// </summary>
+        /// <param name="scope">The new focus scope.</param>
+        public void SetFocusScope(IFocusScope scope)
+        {
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
+
+            if (!_focusScopes.TryGetValue(scope, out var e))
+            {
+                // TODO: Make this do something useful, i.e. select the first focusable
+                // control, select a control that the user has specified to have default
+                // focus etc.
+                e = scope as IInputElement;
+                _focusScopes.Add(scope, e);
+            }
+
+            Scope = scope;
+            Focus(e);
+        }
+
+        public void RemoveFocusScope(IFocusScope scope)
+        {
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
+            
+            if (_focusScopes.TryGetValue(scope, out _))
+            {
+                SetFocusedElement(scope, null);
+                _focusScopes.Remove(scope);
+            }
+
+            if (Scope == scope)
+            {
+                Scope = null;
+            }
+        }
+
+        public static bool GetIsFocusScope(IInputElement e) => e is IFocusScope;
+
+        /// <summary>
+        /// Checks if the specified element can be focused.
+        /// </summary>
+        /// <param name="e">The element.</param>
+        /// <returns>True if the element can be focused.</returns>
+        private static bool CanFocus(IInputElement e) => e.Focusable && e.IsEffectivelyEnabled && e.IsVisible;
+
+        /// <summary>
+        /// Gets the focus scope ancestors of the specified control, traversing popups.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The focus scopes.</returns>
+        private static IEnumerable<IFocusScope> GetFocusScopeAncestors(IInputElement control)
+        {
+            IInputElement? c = control;
+
+            while (c != null)
+            {
+                var scope = c as IFocusScope;
+
+                if (scope != null && c.VisualRoot?.IsVisible == true)
+                {
+                    yield return scope;
+                }
+
+                c = c.GetVisualParent<IInputElement>() ??
+                    ((c as IHostedVisualTreeRoot)?.Host as IInputElement);
+            }
+        }
+
+        /// <summary>
+        /// Global handler for pointer pressed events.
+        /// </summary>
+        /// <param name="sender">The event sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnPreviewPointerPressed(object? sender, RoutedEventArgs e)
+        {
+            if (sender is null)
+                return;
+
+            var ev = (PointerPressedEventArgs)e;
+            var visual = (IVisual)sender;
+
+            if (sender == e.Source && ev.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
+            {
+                IVisual? element = ev.Pointer?.Captured ?? e.Source as IInputElement;
+
+                while (element != null)
+                {
+                    if (element is IInputElement inputElement && CanFocus(inputElement))
+                    {
+                        Instance?.Focus(inputElement, NavigationMethod.Pointer, ev.KeyModifiers);
+
+                        break;
+                    }
+                    
+                    element = element.VisualParent;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
similarity index 100%
rename from src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs
rename to src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
diff --git a/src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/IGestureRecognizer.cs
similarity index 100%
rename from src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs
rename to src/Avalonia.Base/Input/GestureRecognizers/IGestureRecognizer.cs
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
new file mode 100644
index 0000000000..4f5585ab6c
--- /dev/null
+++ b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Diagnostics;
+using Avalonia.Threading;
+
+namespace Avalonia.Input.GestureRecognizers
+{
+    public class ScrollGestureRecognizer 
+        : StyledElement, // It's not an "element" in any way, shape or form, but TemplateBinding refuse to work otherwise
+            IGestureRecognizer
+    {
+        private bool _scrolling;
+        private Point _trackedRootPoint;
+        private IPointer? _tracking;
+        private IInputElement? _target;
+        private IGestureRecognizerActionsDispatcher? _actions;
+        private bool _canHorizontallyScroll;
+        private bool _canVerticallyScroll;
+        private int _gestureId;
+        
+        // Movement per second
+        private Vector _inertia;
+        private ulong? _lastMoveTimestamp;
+        
+        /// <summary>
+        /// Defines the <see cref="CanHorizontallyScroll"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollGestureRecognizer, bool> CanHorizontallyScrollProperty =
+            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(
+                nameof(CanHorizontallyScroll),
+                o => o.CanHorizontallyScroll,
+                (o, v) => o.CanHorizontallyScroll = v);
+
+        /// <summary>
+        /// Defines the <see cref="CanVerticallyScroll"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollGestureRecognizer, bool> CanVerticallyScrollProperty =
+            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(
+                nameof(CanVerticallyScroll),
+                o => o.CanVerticallyScroll,
+                (o, v) => o.CanVerticallyScroll = v);
+        
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        public bool CanHorizontallyScroll
+        {
+            get => _canHorizontallyScroll;
+            set => SetAndRaise(CanHorizontallyScrollProperty, ref _canHorizontallyScroll, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        public bool CanVerticallyScroll
+        {
+            get => _canVerticallyScroll;
+            set => SetAndRaise(CanVerticallyScrollProperty, ref _canVerticallyScroll, value);
+        }
+        
+
+        public void Initialize(IInputElement target, IGestureRecognizerActionsDispatcher actions)
+        {
+            _target = target;
+            _actions = actions;
+        }
+        
+        public void PointerPressed(PointerPressedEventArgs e)
+        {
+            if (e.Pointer.IsPrimary && 
+                (e.Pointer.Type == PointerType.Touch || e.Pointer.Type == PointerType.Pen))
+            {
+                EndGesture();
+                _tracking = e.Pointer;
+                _gestureId = ScrollGestureEventArgs.GetNextFreeId();
+                _trackedRootPoint = e.GetPosition(_target);
+            }
+        }
+
+        // Arbitrary chosen value, probably need to move that to platform settings or something
+        private const double ScrollStartDistance = 30;
+        
+        // Pixels per second speed that is considered to be the stop of inertial scroll
+        private const double InertialScrollSpeedEnd = 5;
+        
+        public void PointerMoved(PointerEventArgs e)
+        {
+            if (e.Pointer == _tracking)
+            {
+                var rootPoint = e.GetPosition(_target);
+                if (!_scrolling)
+                {
+                    if (CanHorizontallyScroll && Math.Abs(_trackedRootPoint.X - rootPoint.X) > ScrollStartDistance)
+                        _scrolling = true;
+                    if (CanVerticallyScroll && Math.Abs(_trackedRootPoint.Y - rootPoint.Y) > ScrollStartDistance)
+                        _scrolling = true;
+                    if (_scrolling)
+                    {
+                        _actions!.Capture(e.Pointer, this);
+                    }
+                }
+
+                if (_scrolling)
+                {
+                    var vector = _trackedRootPoint - rootPoint;
+                    var elapsed = _lastMoveTimestamp.HasValue && _lastMoveTimestamp < e.Timestamp ?
+                        TimeSpan.FromMilliseconds(e.Timestamp - _lastMoveTimestamp.Value) :
+                        TimeSpan.Zero;
+                    
+                    _lastMoveTimestamp = e.Timestamp;
+                    _trackedRootPoint = rootPoint;
+                    if (elapsed.TotalSeconds > 0)
+                        _inertia = vector / elapsed.TotalSeconds;
+                    _target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, vector));
+                    e.Handled = true;
+                }
+            }
+        }
+
+        public void PointerCaptureLost(IPointer pointer)
+        {
+            if (pointer == _tracking) EndGesture();
+        }
+
+        void EndGesture()
+        {
+            _tracking = null;
+            if (_scrolling)
+            {
+                _inertia = default;
+                _scrolling = false;
+                _target!.RaiseEvent(new ScrollGestureEndedEventArgs(_gestureId));
+                _gestureId = 0;
+                _lastMoveTimestamp = null;
+            }
+            
+        }
+        
+        
+        public void PointerReleased(PointerReleasedEventArgs e)
+        {
+            if (e.Pointer == _tracking && _scrolling)
+            {
+                e.Handled = true;
+                if (_inertia == default
+                    || e.Timestamp == 0
+                    || _lastMoveTimestamp == 0
+                    || e.Timestamp - _lastMoveTimestamp > 200)
+                    EndGesture();
+                else
+                {
+                    _tracking = null;
+                    var savedGestureId = _gestureId;
+                    var st = Stopwatch.StartNew();
+                    var lastTime = TimeSpan.Zero;
+                    DispatcherTimer.Run(() =>
+                    {
+                        // Another gesture has started, finish the current one
+                        if (_gestureId != savedGestureId)
+                        {
+                            return false;
+                        }
+
+                        var elapsedSinceLastTick = st.Elapsed - lastTime;
+                        lastTime = st.Elapsed;
+
+                        var speed = _inertia * Math.Pow(0.15, st.Elapsed.TotalSeconds);
+                        var distance = speed * elapsedSinceLastTick.TotalSeconds;
+                        _target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, distance));
+
+
+
+                        if (Math.Abs(speed.X) < InertialScrollSpeedEnd || Math.Abs(speed.Y) <= InertialScrollSpeedEnd)
+                        {
+                            EndGesture();
+                            return false;
+                        }
+
+                        return true;
+                    }, TimeSpan.FromMilliseconds(16), DispatcherPriority.Background);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
new file mode 100644
index 0000000000..82ed96d982
--- /dev/null
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -0,0 +1,147 @@
+using System;
+using Avalonia.Interactivity;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public static class Gestures
+    {
+        private static bool s_isDoubleTapped = false;
+        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = RoutedEvent.Register<TappedEventArgs>(
+            "Tapped",
+            RoutingStrategies.Bubble,
+            typeof(Gestures));
+
+        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = RoutedEvent.Register<TappedEventArgs>(
+            "DoubleTapped",
+            RoutingStrategies.Bubble,
+            typeof(Gestures));
+
+        public static readonly RoutedEvent<TappedEventArgs> RightTappedEvent = RoutedEvent.Register<TappedEventArgs>(
+            "RightTapped",
+            RoutingStrategies.Bubble,
+            typeof(Gestures));
+
+        public static readonly RoutedEvent<ScrollGestureEventArgs> ScrollGestureEvent =
+            RoutedEvent.Register<ScrollGestureEventArgs>(
+                "ScrollGesture", RoutingStrategies.Bubble, typeof(Gestures));
+
+        public static readonly RoutedEvent<ScrollGestureEndedEventArgs> ScrollGestureEndedEvent =
+            RoutedEvent.Register<ScrollGestureEndedEventArgs>(
+                "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
+        
+        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureMagnifyEvent =
+            RoutedEvent.Register<PointerDeltaEventArgs>(
+                "PointerMagnifyGesture", RoutingStrategies.Bubble, typeof(Gestures));
+        
+        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureRotateEvent =
+            RoutedEvent.Register<PointerDeltaEventArgs>(
+                "PointerRotateGesture", RoutingStrategies.Bubble, typeof(Gestures));
+        
+        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureSwipeEvent =
+            RoutedEvent.Register<PointerDeltaEventArgs>(
+                "PointerSwipeGesture", RoutingStrategies.Bubble, typeof(Gestures));
+
+        private static readonly WeakReference<IInteractive?> s_lastPress = new WeakReference<IInteractive?>(null);
+        private static Point s_lastPressPoint;
+
+        static Gestures()
+        {
+            InputElement.PointerPressedEvent.RouteFinished.Subscribe(PointerPressed);
+            InputElement.PointerReleasedEvent.RouteFinished.Subscribe(PointerReleased);
+        }
+
+        public static void AddTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.AddHandler(TappedEvent, handler);
+        }
+
+        public static void AddDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.AddHandler(DoubleTappedEvent, handler);
+        }
+
+        public static void AddRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.AddHandler(RightTappedEvent, handler);
+        }
+
+        public static void RemoveTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.RemoveHandler(TappedEvent, handler);
+        }
+
+        public static void RemoveDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.RemoveHandler(DoubleTappedEvent, handler);
+        }
+
+        public static void RemoveRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.RemoveHandler(RightTappedEvent, handler);
+        }
+
+        private static void PointerPressed(RoutedEventArgs ev)
+        {
+            if (ev.Source is null)
+            {
+                return;
+            }
+
+            if (ev.Route == RoutingStrategies.Bubble)
+            {
+                var e = (PointerPressedEventArgs)ev;
+                var visual = (IVisual)ev.Source;
+
+                if (e.ClickCount % 2 == 1)
+                {
+                    s_isDoubleTapped = false;
+                    s_lastPress.SetTarget(ev.Source);
+                    s_lastPressPoint = e.GetPosition((IVisual)ev.Source);
+                }
+                else if (e.ClickCount % 2 == 0 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
+                {
+                    if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
+                    {
+                        s_isDoubleTapped = true;
+                        e.Source.RaiseEvent(new TappedEventArgs(DoubleTappedEvent, e));
+                    }
+                }
+            }
+        }
+
+        private static void PointerReleased(RoutedEventArgs ev)
+        {
+            if (ev.Route == RoutingStrategies.Bubble)
+            {
+                var e = (PointerReleasedEventArgs)ev;
+
+                if (s_lastPress.TryGetTarget(out var target) && 
+                    target == e.Source &&
+                    e.InitialPressMouseButton is MouseButton.Left or MouseButton.Right)
+                {
+                    var point = e.GetCurrentPoint((IVisual)target);
+                    var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
+                    var tapSize = settings?.GetTapSize(point.Pointer.Type) ?? new Size(4, 4);
+                    var tapRect = new Rect(s_lastPressPoint, new Size())
+                        .Inflate(new Thickness(tapSize.Width, tapSize.Height));
+
+                    if (tapRect.ContainsExclusive(point.Position))
+                    {
+                        if (e.InitialPressMouseButton == MouseButton.Right)
+                        {
+                            e.Source.RaiseEvent(new TappedEventArgs(RightTappedEvent, e));
+                        }
+                        //s_isDoubleTapped needed here to prevent invoking Tapped event when DoubleTapped is called.
+                        //This behaviour matches UWP behaviour.
+                        else if (s_isDoubleTapped == false)
+                        {
+                            e.Source.RaiseEvent(new TappedEventArgs(TappedEvent, e));
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/GotFocusEventArgs.cs b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
new file mode 100644
index 0000000000..f3de55ebae
--- /dev/null
+++ b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
@@ -0,0 +1,25 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Holds arguments for a <see cref="InputElement.GotFocusEvent"/>.
+    /// </summary>
+    public class GotFocusEventArgs : RoutedEventArgs
+    {
+        internal GotFocusEventArgs()
+        {
+
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating how the change in focus occurred.
+        /// </summary>
+        public NavigationMethod NavigationMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets any key modifiers active at the time of focus.
+        /// </summary>
+        public KeyModifiers KeyModifiers { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/IAccessKeyHandler.cs b/src/Avalonia.Base/Input/IAccessKeyHandler.cs
new file mode 100644
index 0000000000..93a50968e2
--- /dev/null
+++ b/src/Avalonia.Base/Input/IAccessKeyHandler.cs
@@ -0,0 +1,38 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for classes that handle access keys for a window.
+    /// </summary>
+    [Unstable]
+    public interface IAccessKeyHandler
+    {
+        /// <summary>
+        /// Gets or sets the window's main menu.
+        /// </summary>
+        IMainMenu? MainMenu { get; set; }
+
+        /// <summary>
+        /// Sets the owner of the access key handler.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <remarks>
+        /// This method can only be called once, typically by the owner itself on creation.
+        /// </remarks>
+        void SetOwner(IInputRoot owner);
+
+        /// <summary>
+        /// Registers an input element to be associated with an access key.
+        /// </summary>
+        /// <param name="accessKey">The access key.</param>
+        /// <param name="element">The input element.</param>
+        void Register(char accessKey, IInputElement element);
+
+        /// <summary>
+        /// Unregisters the access keys associated with the input element.
+        /// </summary>
+        /// <param name="element">The input element.</param>
+        void Unregister(IInputElement element);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IClickableControl.cs b/src/Avalonia.Base/Input/IClickableControl.cs
new file mode 100644
index 0000000000..d6d887520b
--- /dev/null
+++ b/src/Avalonia.Base/Input/IClickableControl.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    internal interface IClickableControl
+    {
+        event EventHandler<RoutedEventArgs> Click;
+        void RaiseClick();
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are enabled.
+        /// </summary>
+        bool IsEffectivelyEnabled { get; }
+    }
+}
diff --git a/src/Avalonia.Input/ICloseable.cs b/src/Avalonia.Base/Input/ICloseable.cs
similarity index 100%
rename from src/Avalonia.Input/ICloseable.cs
rename to src/Avalonia.Base/Input/ICloseable.cs
diff --git a/src/Avalonia.Input/ICommandSource.cs b/src/Avalonia.Base/Input/ICommandSource.cs
similarity index 100%
rename from src/Avalonia.Input/ICommandSource.cs
rename to src/Avalonia.Base/Input/ICommandSource.cs
diff --git a/src/Avalonia.Input/ICustomKeyboardNavigation.cs b/src/Avalonia.Base/Input/ICustomKeyboardNavigation.cs
similarity index 100%
rename from src/Avalonia.Input/ICustomKeyboardNavigation.cs
rename to src/Avalonia.Base/Input/ICustomKeyboardNavigation.cs
diff --git a/src/Avalonia.Input/IDataObject.cs b/src/Avalonia.Base/Input/IDataObject.cs
similarity index 100%
rename from src/Avalonia.Input/IDataObject.cs
rename to src/Avalonia.Base/Input/IDataObject.cs
diff --git a/src/Avalonia.Base/Input/IFocusManager.cs b/src/Avalonia.Base/Input/IFocusManager.cs
new file mode 100644
index 0000000000..0c85cad2f7
--- /dev/null
+++ b/src/Avalonia.Base/Input/IFocusManager.cs
@@ -0,0 +1,50 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Manages focus for the application.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IFocusManager
+    {
+        /// <summary>
+        /// Gets the currently focused <see cref="IInputElement"/>.
+        /// </summary>
+        IInputElement? Current { get; }
+
+        /// <summary>
+        /// Gets the current focus scope.
+        /// </summary>
+        IFocusScope? Scope { get; }
+
+        /// <summary>
+        /// Focuses a control.
+        /// </summary>
+        /// <param name="control">The control to focus.</param>
+        /// <param name="method">The method by which focus was changed.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        void Focus(
+            IInputElement? control,
+            NavigationMethod method = NavigationMethod.Unspecified,
+            KeyModifiers keyModifiers = KeyModifiers.None);
+
+        /// <summary>
+        /// Notifies the focus manager of a change in focus scope.
+        /// </summary>
+        /// <param name="scope">The new focus scope.</param>
+        /// <remarks>
+        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
+        /// when it activates, e.g. when a Window is activated.
+        /// </remarks>
+        void SetFocusScope(IFocusScope scope);
+
+        /// <summary>
+        /// Notifies the focus manager that a focus scope has been removed.
+        /// </summary>
+        /// <param name="scope">The focus scope to be removed.</param>
+        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
+        /// when it deactivates or closes, e.g. when a Window is closed.
+        void RemoveFocusScope(IFocusScope scope);
+    }
+}
diff --git a/src/Avalonia.Input/IFocusScope.cs b/src/Avalonia.Base/Input/IFocusScope.cs
similarity index 100%
rename from src/Avalonia.Input/IFocusScope.cs
rename to src/Avalonia.Base/Input/IFocusScope.cs
diff --git a/src/Avalonia.Base/Input/IInputDevice.cs b/src/Avalonia.Base/Input/IInputDevice.cs
new file mode 100644
index 0000000000..fe4f584f18
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputDevice.cs
@@ -0,0 +1,15 @@
+using Avalonia.Input.Raw;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [NotClientImplementable]
+    public interface IInputDevice
+    {
+        /// <summary>
+        /// Processes raw event. Is called after preprocessing by InputManager
+        /// </summary>
+        /// <param name="ev"></param>
+        void ProcessRawEvent(RawInputEventArgs ev);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IInputElement.cs b/src/Avalonia.Base/Input/IInputElement.cs
new file mode 100644
index 0000000000..43ac87d008
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputElement.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Interactivity;
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines input-related functionality for a control.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInputElement : IInteractive, IVisual
+    {
+        /// <summary>
+        /// Occurs when the control receives focus.
+        /// </summary>
+        event EventHandler<GotFocusEventArgs>? GotFocus;
+
+        /// <summary>
+        /// Occurs when the control loses focus.
+        /// </summary>
+        event EventHandler<RoutedEventArgs>? LostFocus;
+
+        /// <summary>
+        /// Occurs when a key is pressed while the control has focus.
+        /// </summary>
+        event EventHandler<KeyEventArgs>? KeyDown;
+
+        /// <summary>
+        /// Occurs when a key is released while the control has focus.
+        /// </summary>
+        event EventHandler<KeyEventArgs>? KeyUp;
+
+        /// <summary>
+        /// Occurs when a user typed some text while the control has focus.
+        /// </summary>
+        event EventHandler<TextInputEventArgs>? TextInput;
+
+        /// <summary>
+        /// Occurs when the pointer enters the control.
+        /// </summary>
+        event EventHandler<PointerEventArgs>? PointerEntered;
+
+        /// <summary>
+        /// Occurs when the pointer leaves the control.
+        /// </summary>
+        event EventHandler<PointerEventArgs>? PointerExited;
+
+        /// <summary>
+        /// Occurs when the pointer is pressed over the control.
+        /// </summary>
+        event EventHandler<PointerPressedEventArgs>? PointerPressed;
+
+        /// <summary>
+        /// Occurs when the pointer moves over the control.
+        /// </summary>
+        event EventHandler<PointerEventArgs>? PointerMoved;
+
+        /// <summary>
+        /// Occurs when the pointer is released over the control.
+        /// </summary>
+        event EventHandler<PointerReleasedEventArgs>? PointerReleased;
+
+        /// <summary>
+        /// Occurs when the mouse wheel is scrolled over the control.
+        /// </summary>
+        event EventHandler<PointerWheelEventArgs>? PointerWheelChanged;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control can receive keyboard focus.
+        /// </summary>
+        bool Focusable { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is enabled for user interaction.
+        /// </summary>
+        bool IsEnabled { get; }
+
+        /// <summary>
+        /// Gets or sets the associated mouse cursor.
+        /// </summary>
+        Cursor? Cursor { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are enabled.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="IsEnabled"/> property is used to toggle the enabled state for individual
+        /// controls. The <see cref="IsEffectivelyEnabled"/> property takes into account the
+        /// <see cref="IsEnabled"/> value of this control and its parent controls.
+        /// </remarks>
+        bool IsEffectivelyEnabled { get; }
+        
+        /// <summary>
+        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
+        /// </summary>
+        bool IsKeyboardFocusWithin { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control is focused.
+        /// </summary>
+        bool IsFocused { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control is considered for hit testing.
+        /// </summary>
+        bool IsHitTestVisible { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the pointer is currently over the control.
+        /// </summary>
+        bool IsPointerOver { get; }
+
+        /// <summary>
+        /// Focuses the control.
+        /// </summary>
+        void Focus();
+
+        /// <summary>
+        /// Gets the key bindings for the element.
+        /// </summary>
+        List<KeyBinding> KeyBindings { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/IInputManager.cs b/src/Avalonia.Base/Input/IInputManager.cs
new file mode 100644
index 0000000000..658226a519
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputManager.cs
@@ -0,0 +1,37 @@
+using System;
+using Avalonia.Input.Raw;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Receives input from the windowing subsystem and dispatches it to interested parties
+    /// for processing.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInputManager
+    {
+        /// <summary>
+        /// Gets an observable that notifies on each input event received before
+        /// <see cref="Process"/>.
+        /// </summary>
+        IObservable<RawInputEventArgs> PreProcess { get; }
+
+        /// <summary>
+        /// Gets an observable that notifies on each input event received.
+        /// </summary>
+        IObservable<RawInputEventArgs> Process { get; }
+
+        /// <summary>
+        /// Gets an observable that notifies on each input event received after
+        /// <see cref="Process"/>.
+        /// </summary>
+        IObservable<RawInputEventArgs> PostProcess { get; }
+
+        /// <summary>
+        /// Processes a raw input event.
+        /// </summary>
+        /// <param name="e">The raw input event.</param>
+        void ProcessInput(RawInputEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IInputRoot.cs b/src/Avalonia.Base/Input/IInputRoot.cs
new file mode 100644
index 0000000000..344a4eefd7
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputRoot.cs
@@ -0,0 +1,31 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for top-level input elements.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInputRoot : IInputElement
+    {
+        /// <summary>
+        /// Gets or sets the access key handler.
+        /// </summary>
+        IAccessKeyHandler AccessKeyHandler { get; }
+
+        /// <summary>
+        /// Gets or sets the keyboard navigation handler.
+        /// </summary>
+        IKeyboardNavigationHandler KeyboardNavigationHandler { get; }
+
+        /// <summary>
+        /// Gets or sets the input element that the pointer is currently over.
+        /// </summary>
+        IInputElement? PointerOverElement { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether access keys are shown in the window.
+        /// </summary>
+        bool ShowAccessKeys { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/IKeyboardDevice.cs b/src/Avalonia.Base/Input/IKeyboardDevice.cs
new file mode 100644
index 0000000000..0b7b5aaecc
--- /dev/null
+++ b/src/Avalonia.Base/Input/IKeyboardDevice.cs
@@ -0,0 +1,56 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [Flags]
+    public enum KeyModifiers
+    {
+        None = 0,
+        Alt = 1,
+        Control = 2,
+        Shift = 4,
+        Meta = 8,
+    }
+
+    [Flags]
+    public enum KeyStates
+    {
+        None = 0,
+        Down = 1,
+        Toggled = 2,
+    }
+
+    [Flags]
+    public enum RawInputModifiers
+    {
+        None = 0,
+        Alt = 1,
+        Control = 2,
+        Shift = 4,
+        Meta = 8,
+
+        LeftMouseButton = 16,
+        RightMouseButton = 32,
+        MiddleMouseButton = 64,
+        XButton1MouseButton = 128,
+        XButton2MouseButton = 256,
+        KeyboardMask = Alt | Control | Shift | Meta,
+
+        PenInverted = 512,
+        PenEraser = 1024,
+        PenBarrelButton = 2048
+    }
+
+    [NotClientImplementable]
+    public interface IKeyboardDevice : IInputDevice, INotifyPropertyChanged
+    {
+        IInputElement? FocusedElement { get; }
+
+        void SetFocusedElement(
+            IInputElement? element, 
+            NavigationMethod method,
+            KeyModifiers modifiers);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs b/src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs
new file mode 100644
index 0000000000..3bcd6d6206
--- /dev/null
+++ b/src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs
@@ -0,0 +1,31 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for classes that handle keyboard navigation for a window.
+    /// </summary>
+    [Unstable]
+    public interface IKeyboardNavigationHandler
+    {
+        /// <summary>
+        /// Sets the owner of the keyboard navigation handler.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <remarks>
+        /// This method can only be called once, typically by the owner itself on creation.
+        /// </remarks>
+        void SetOwner(IInputRoot owner);
+
+        /// <summary>
+        /// Moves the focus in the specified direction.
+        /// </summary>
+        /// <param name="element">The current element.</param>
+        /// <param name="direction">The direction to move.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        void Move(
+            IInputElement element, 
+            NavigationDirection direction,
+            KeyModifiers keyModifiers = KeyModifiers.None);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IMainMenu.cs b/src/Avalonia.Base/Input/IMainMenu.cs
new file mode 100644
index 0000000000..213a979c28
--- /dev/null
+++ b/src/Avalonia.Base/Input/IMainMenu.cs
@@ -0,0 +1,34 @@
+using System;
+using Avalonia.Interactivity;
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for a window's main menu.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMainMenu : IVisual
+    {
+        /// <summary>
+        /// Gets a value indicating whether the menu is open.
+        /// </summary>
+        bool IsOpen { get; }
+
+        /// <summary>
+        /// Closes the menu.
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// Opens the menu in response to the Alt/F10 key.
+        /// </summary>
+        void Open();
+
+        /// <summary>
+        /// Occurs when the main menu closes.
+        /// </summary>
+        event EventHandler<RoutedEventArgs>? MenuClosed;
+    }
+}
diff --git a/src/Avalonia.Base/Input/IMouseDevice.cs b/src/Avalonia.Base/Input/IMouseDevice.cs
new file mode 100644
index 0000000000..00c436bf21
--- /dev/null
+++ b/src/Avalonia.Base/Input/IMouseDevice.cs
@@ -0,0 +1,12 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Represents a mouse device.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMouseDevice : IPointerDevice
+    {
+    }
+}
diff --git a/src/Avalonia.Input/INavigableContainer.cs b/src/Avalonia.Base/Input/INavigableContainer.cs
similarity index 100%
rename from src/Avalonia.Input/INavigableContainer.cs
rename to src/Avalonia.Base/Input/INavigableContainer.cs
diff --git a/src/Avalonia.Base/Input/IPenDevice.cs b/src/Avalonia.Base/Input/IPenDevice.cs
new file mode 100644
index 0000000000..1cc0fcf76d
--- /dev/null
+++ b/src/Avalonia.Base/Input/IPenDevice.cs
@@ -0,0 +1,10 @@
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Represents a pen/stylus device.
+    /// </summary>
+    public interface IPenDevice : IPointerDevice
+    {
+
+    }
+}
diff --git a/src/Avalonia.Base/Input/IPointer.cs b/src/Avalonia.Base/Input/IPointer.cs
new file mode 100644
index 0000000000..52605bb6ae
--- /dev/null
+++ b/src/Avalonia.Base/Input/IPointer.cs
@@ -0,0 +1,60 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Identifies specific pointer generated by input device.
+    /// </summary>
+    /// <remarks>
+    /// Some devices, for instance, touchscreen might generate a pointer on each physical contact.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IPointer
+    {
+        /// <summary>
+        /// Gets a unique identifier for the input pointer.
+        /// </summary>
+        int Id { get; }
+
+        /// <summary>
+        /// Captures pointer input to the specified control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <remarks>
+        /// When an element captures the pointer, it receives pointer input whether the cursor is 
+        /// within the control's bounds or not. The current pointer capture control is exposed
+        /// by the <see cref="Captured"/> property.
+        /// </remarks>
+        void Capture(IInputElement? control);
+
+        /// <summary>
+        /// Gets the control that is currently capturing by the pointer, if any.
+        /// </summary>
+        /// <remarks>
+        /// When an element captures the pointer, it receives pointer input whether the cursor is 
+        /// within the control's bounds or not. To set the pointer capture, call the 
+        /// <see cref="Capture"/> method.
+        /// </remarks>
+        IInputElement? Captured { get; }
+
+        /// <summary>
+        /// Gets the pointer device type.
+        /// </summary>
+        PointerType Type { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the input is from the primary pointer when multiple pointers are registered.
+        /// </summary>
+        bool IsPrimary { get; }
+    }
+
+    /// <summary>
+    /// Enumerates pointer device types.
+    /// </summary>
+    public enum PointerType
+    {
+        Mouse,
+        Touch,
+        Pen
+    }
+}
diff --git a/src/Avalonia.Base/Input/IPointerDevice.cs b/src/Avalonia.Base/Input/IPointerDevice.cs
new file mode 100644
index 0000000000..e0aebda9c5
--- /dev/null
+++ b/src/Avalonia.Base/Input/IPointerDevice.cs
@@ -0,0 +1,19 @@
+using Avalonia.Input.Raw;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [NotClientImplementable]
+    public interface IPointerDevice : IInputDevice
+    {
+        /// <summary>
+        /// Gets a pointer for specific event args.
+        /// </summary>
+        /// <remarks>
+        /// If pointer doesn't exist or wasn't yet created this method will return null.
+        /// </remarks>
+        /// <param name="ev">Raw pointer event args associated with the pointer.</param>
+        /// <returns>The pointer.</returns>
+        IPointer? TryGetPointer(RawPointerEventArgs ev);
+    }
+}
diff --git a/src/Avalonia.Base/Input/InputElement.cs b/src/Avalonia.Base/Input/InputElement.cs
new file mode 100644
index 0000000000..d0130258c3
--- /dev/null
+++ b/src/Avalonia.Base/Input/InputElement.cs
@@ -0,0 +1,703 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Data;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Input.TextInput;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Implements input-related functionality for a control.
+    /// </summary>
+    [PseudoClasses(":disabled", ":focus", ":focus-visible", ":focus-within", ":pointerover")]
+    public class InputElement : Interactive, IInputElement
+    {
+        /// <summary>
+        /// Defines the <see cref="Focusable"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> FocusableProperty =
+            AvaloniaProperty.Register<InputElement, bool>(nameof(Focusable));
+
+        /// <summary>
+        /// Defines the <see cref="IsEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsEnabledProperty =
+            AvaloniaProperty.Register<InputElement, bool>(nameof(IsEnabled), true);
+
+        /// <summary>
+        /// Defines the <see cref="IsEffectivelyEnabled"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsEffectivelyEnabledProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(
+                nameof(IsEffectivelyEnabled),
+                o => o.IsEffectivelyEnabled);
+
+        /// <summary>
+        /// Gets or sets associated mouse cursor.
+        /// </summary>
+        public static readonly StyledProperty<Cursor?> CursorProperty =
+            AvaloniaProperty.Register<InputElement, Cursor?>(nameof(Cursor), null, true);
+
+        /// <summary>
+        /// Defines the <see cref="IsKeyboardFocusWithin"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsKeyboardFocusWithinProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(
+                nameof(IsKeyboardFocusWithin),
+                o => o.IsKeyboardFocusWithin);
+        
+        /// <summary>
+        /// Defines the <see cref="IsFocused"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsFocusedProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsFocused), o => o.IsFocused);
+
+        /// <summary>
+        /// Defines the <see cref="IsHitTestVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsHitTestVisibleProperty =
+            AvaloniaProperty.Register<InputElement, bool>(nameof(IsHitTestVisible), true);
+
+        /// <summary>
+        /// Defines the <see cref="IsPointerOver"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsPointerOverProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsPointerOver), o => o.IsPointerOver);
+
+        /// <summary>
+        /// Defines the <see cref="IsTabStop"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsTabStopProperty =
+            KeyboardNavigation.IsTabStopProperty.AddOwner<InputElement>();
+
+        /// <summary>
+        /// Defines the <see cref="GotFocus"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<GotFocusEventArgs> GotFocusEvent =
+            RoutedEvent.Register<InputElement, GotFocusEventArgs>(nameof(GotFocus), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="LostFocus"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> LostFocusEvent =
+            RoutedEvent.Register<InputElement, RoutedEventArgs>(nameof(LostFocus), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="KeyDown"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<KeyEventArgs> KeyDownEvent =
+            RoutedEvent.Register<InputElement, KeyEventArgs>(
+                nameof(KeyDown),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="KeyUp"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<KeyEventArgs> KeyUpEvent =
+            RoutedEvent.Register<InputElement, KeyEventArgs>(
+                nameof(KeyUp),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="TabIndex"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> TabIndexProperty =
+            KeyboardNavigation.TabIndexProperty.AddOwner<InputElement>();
+
+        /// <summary>
+        /// Defines the <see cref="TextInput"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextInputEventArgs> TextInputEvent =
+            RoutedEvent.Register<InputElement, TextInputEventArgs>(
+                nameof(TextInput),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+        
+        /// <summary>
+        /// Defines the <see cref="TextInputMethodClientRequested"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextInputMethodClientRequestedEventArgs> TextInputMethodClientRequestedEvent =
+            RoutedEvent.Register<InputElement, TextInputMethodClientRequestedEventArgs>(
+                nameof(TextInputMethodClientRequested),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="PointerEntered"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerEventArgs> PointerEnteredEvent =
+            RoutedEvent.Register<InputElement, PointerEventArgs>(
+                nameof(PointerEntered),
+                RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="PointerExited"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerEventArgs> PointerExitedEvent =
+            RoutedEvent.Register<InputElement, PointerEventArgs>(
+                nameof(PointerExited),
+                RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="PointerMoved"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerEventArgs> PointerMovedEvent =
+            RoutedEvent.Register<InputElement, PointerEventArgs>(
+                nameof(PointerMoved),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="PointerPressed"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent =
+            RoutedEvent.Register<InputElement, PointerPressedEventArgs>(
+                nameof(PointerPressed),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="PointerReleased"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerReleasedEventArgs> PointerReleasedEvent =
+            RoutedEvent.Register<InputElement, PointerReleasedEventArgs>(
+                nameof(PointerReleased),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+        
+        /// <summary>
+        /// Defines the <see cref="PointerCaptureLost"/> routed event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerCaptureLostEventArgs> PointerCaptureLostEvent =
+            RoutedEvent.Register<InputElement, PointerCaptureLostEventArgs>(
+                nameof(PointerCaptureLost), 
+                RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="PointerWheelChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerWheelEventArgs> PointerWheelChangedEvent =
+            RoutedEvent.Register<InputElement, PointerWheelEventArgs>(
+                nameof(PointerWheelChanged),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="Tapped"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = Gestures.TappedEvent;
+
+        /// <summary>
+        /// Defines the <see cref="DoubleTapped"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = Gestures.DoubleTappedEvent;
+        
+        private bool _isEffectivelyEnabled = true;
+        private bool _isFocused;
+        private bool _isKeyboardFocusWithin;
+        private bool _isFocusVisible;
+        private bool _isPointerOver;
+        private GestureRecognizerCollection? _gestureRecognizers;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="InputElement"/> class.
+        /// </summary>
+        static InputElement()
+        {
+            IsEnabledProperty.Changed.Subscribe(IsEnabledChanged);
+
+            GotFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnGotFocus(e));
+            LostFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnLostFocus(e));
+            KeyDownEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyDown(e));
+            KeyUpEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyUp(e));
+            TextInputEvent.AddClassHandler<InputElement>((x, e) => x.OnTextInput(e));
+            PointerEnteredEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerEnteredCore(e));
+            PointerExitedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerExitedCore(e));
+            PointerMovedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerMoved(e));
+            PointerPressedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerPressed(e));
+            PointerReleasedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerReleased(e));
+            PointerCaptureLostEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerCaptureLost(e));
+            PointerWheelChangedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerWheelChanged(e));
+        }
+
+        public InputElement()
+        {
+            UpdatePseudoClasses(IsFocused, IsPointerOver);
+        }
+
+        /// <summary>
+        /// Occurs when the control receives focus.
+        /// </summary>
+        public event EventHandler<GotFocusEventArgs>? GotFocus
+        {
+            add { AddHandler(GotFocusEvent, value); }
+            remove { RemoveHandler(GotFocusEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the control loses focus.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? LostFocus
+        {
+            add { AddHandler(LostFocusEvent, value); }
+            remove { RemoveHandler(LostFocusEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a key is pressed while the control has focus.
+        /// </summary>
+        public event EventHandler<KeyEventArgs>? KeyDown
+        {
+            add { AddHandler(KeyDownEvent, value); }
+            remove { RemoveHandler(KeyDownEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a key is released while the control has focus.
+        /// </summary>
+        public event EventHandler<KeyEventArgs>? KeyUp
+        {
+            add { AddHandler(KeyUpEvent, value); }
+            remove { RemoveHandler(KeyUpEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a user typed some text while the control has focus.
+        /// </summary>
+        public event EventHandler<TextInputEventArgs>? TextInput
+        {
+            add { AddHandler(TextInputEvent, value); }
+            remove { RemoveHandler(TextInputEvent, value); }
+        }
+        
+        /// <summary>
+        /// Occurs when an input element gains input focus and input method is looking for the corresponding client
+        /// </summary>
+        public event EventHandler<TextInputMethodClientRequestedEventArgs>? TextInputMethodClientRequested
+        {
+            add { AddHandler(TextInputMethodClientRequestedEvent, value); }
+            remove { RemoveHandler(TextInputMethodClientRequestedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer enters the control.
+        /// </summary>
+        public event EventHandler<PointerEventArgs>? PointerEntered
+        {
+            add { AddHandler(PointerEnteredEvent, value); }
+            remove { RemoveHandler(PointerEnteredEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer leaves the control.
+        /// </summary>
+        public event EventHandler<PointerEventArgs>? PointerExited
+        {
+            add { AddHandler(PointerExitedEvent, value); }
+            remove { RemoveHandler(PointerExitedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer moves over the control.
+        /// </summary>
+        public event EventHandler<PointerEventArgs>? PointerMoved
+        {
+            add { AddHandler(PointerMovedEvent, value); }
+            remove { RemoveHandler(PointerMovedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer is pressed over the control.
+        /// </summary>
+        public event EventHandler<PointerPressedEventArgs>? PointerPressed
+        {
+            add { AddHandler(PointerPressedEvent, value); }
+            remove { RemoveHandler(PointerPressedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer is released over the control.
+        /// </summary>
+        public event EventHandler<PointerReleasedEventArgs>? PointerReleased
+        {
+            add { AddHandler(PointerReleasedEvent, value); }
+            remove { RemoveHandler(PointerReleasedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the control or its child control loses the pointer capture for any reason,
+        /// event will not be triggered for a parent control if capture was transferred to another child of that parent control
+        /// </summary>
+        public event EventHandler<PointerCaptureLostEventArgs>? PointerCaptureLost
+        {
+            add => AddHandler(PointerCaptureLostEvent, value);
+            remove => RemoveHandler(PointerCaptureLostEvent, value);
+        }
+        
+        /// <summary>
+        /// Occurs when the mouse is scrolled over the control.
+        /// </summary>
+        public event EventHandler<PointerWheelEventArgs>? PointerWheelChanged
+        {
+            add { AddHandler(PointerWheelChangedEvent, value); }
+            remove { RemoveHandler(PointerWheelChangedEvent, value); }
+        }
+        
+        /// <summary>
+        /// Occurs when a tap gesture occurs on the control.
+        /// </summary>
+        public event EventHandler<TappedEventArgs>? Tapped
+        {
+            add { AddHandler(TappedEvent, value); }
+            remove { RemoveHandler(TappedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a double-tap gesture occurs on the control.
+        /// </summary>
+        public event EventHandler<TappedEventArgs>? DoubleTapped
+        {
+            add { AddHandler(DoubleTappedEvent, value); }
+            remove { RemoveHandler(DoubleTappedEvent, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control can receive focus.
+        /// </summary>
+        public bool Focusable
+        {
+            get { return GetValue(FocusableProperty); }
+            set { SetValue(FocusableProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is enabled for user interaction.
+        /// </summary>
+        public bool IsEnabled
+        {
+            get { return GetValue(IsEnabledProperty); }
+            set { SetValue(IsEnabledProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets associated mouse cursor.
+        /// </summary>
+        public Cursor? Cursor
+        {
+            get { return GetValue(CursorProperty); }
+            set { SetValue(CursorProperty, value); }
+        }
+        
+        /// <summary>
+        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
+        /// </summary>
+        public bool IsKeyboardFocusWithin
+        {
+            get => _isKeyboardFocusWithin;
+            internal set => SetAndRaise(IsKeyboardFocusWithinProperty, ref _isKeyboardFocusWithin, value); 
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the control is focused.
+        /// </summary>
+        public bool IsFocused
+        {
+            get { return _isFocused; }
+            private set { SetAndRaise(IsFocusedProperty, ref _isFocused, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is considered for hit testing.
+        /// </summary>
+        public bool IsHitTestVisible
+        {
+            get { return GetValue(IsHitTestVisibleProperty); }
+            set { SetValue(IsHitTestVisibleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the pointer is currently over the control.
+        /// </summary>
+        public bool IsPointerOver
+        {
+            get { return _isPointerOver; }
+            internal set { SetAndRaise(IsPointerOverProperty, ref _isPointerOver, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether the control is included in tab navigation.
+        /// </summary>
+        public bool IsTabStop
+        {
+            get => GetValue(IsTabStopProperty);
+            set => SetValue(IsTabStopProperty, value);
+        }
+
+        /// <inheritdoc/>
+        public bool IsEffectivelyEnabled
+        {
+            get => _isEffectivelyEnabled;
+            private set
+            {
+                SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value);
+                PseudoClasses.Set(":disabled", !value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines the order in which elements receive focus when the
+        /// user navigates through controls by pressing the Tab key.
+        /// </summary>
+        public int TabIndex
+        {
+            get => GetValue(TabIndexProperty);
+            set => SetValue(TabIndexProperty, value);
+        }
+
+        public List<KeyBinding> KeyBindings { get; } = new List<KeyBinding>();
+
+        /// <summary>
+        /// Allows a derived class to override the enabled state of the control.
+        /// </summary>
+        /// <remarks>
+        /// Derived controls may wish to disable the enabled state of the control without overwriting the
+        /// user-supplied <see cref="IsEnabled"/> setting. This can be done by overriding this property
+        /// to return the overridden enabled state. If the value returned from <see cref="IsEnabledCore"/>
+        /// should change, then the derived control should call <see cref="UpdateIsEffectivelyEnabled()"/>.
+        /// </remarks>
+        protected virtual bool IsEnabledCore => IsEnabled;
+
+        public GestureRecognizerCollection GestureRecognizers
+            => _gestureRecognizers ?? (_gestureRecognizers = new GestureRecognizerCollection(this));
+
+        /// <summary>
+        /// Focuses the control.
+        /// </summary>
+        public void Focus()
+        {
+            FocusManager.Instance?.Focus(this);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTreeCore(e);
+
+            if (IsFocused)
+            {
+                FocusManager.Instance?.Focus(null);
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTreeCore(e);
+            UpdateIsEffectivelyEnabled();
+        }
+
+        /// <summary>
+        /// Called before the <see cref="GotFocus"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnGotFocus(GotFocusEventArgs e)
+        {
+            var isFocused = e.Source == this;
+            _isFocusVisible = isFocused && (e.NavigationMethod == NavigationMethod.Directional || e.NavigationMethod == NavigationMethod.Tab);
+            IsFocused = isFocused;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="LostFocus"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnLostFocus(RoutedEventArgs e)
+        {
+            _isFocusVisible = false;
+            IsFocused = false;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="KeyDown"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnKeyDown(KeyEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="KeyUp"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnKeyUp(KeyEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="TextInput"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnTextInput(TextInputEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerEntered"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerEntered(PointerEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerExited"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerExited(PointerEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerMoved"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerMoved(PointerEventArgs e)
+        {
+            if (_gestureRecognizers?.HandlePointerMoved(e) == true)
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerPressed"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            if (_gestureRecognizers?.HandlePointerPressed(e) == true)
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerReleased"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            if (_gestureRecognizers?.HandlePointerReleased(e) == true)
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerCaptureLost"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+        {
+            _gestureRecognizers?.HandlePointerCaptureLost(e);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerWheelChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsFocusedProperty)
+            {
+                UpdatePseudoClasses(change.GetNewValue<bool>(), null);
+            }
+            else if (change.Property == IsPointerOverProperty)
+            {
+                UpdatePseudoClasses(null, change.GetNewValue<bool>());
+            }
+            else if (change.Property == IsKeyboardFocusWithinProperty)
+            {
+                PseudoClasses.Set(":focus-within", change.GetNewValue<bool>());
+            }
+        }
+
+        /// <summary>
+        /// Updates the <see cref="IsEffectivelyEnabled"/> property value according to the parent
+        /// control's enabled state and <see cref="IsEnabledCore"/>.
+        /// </summary>
+        protected void UpdateIsEffectivelyEnabled()
+        {
+            UpdateIsEffectivelyEnabled(this.GetVisualParent<InputElement>());
+        }
+
+        private static void IsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            ((InputElement)e.Sender).UpdateIsEffectivelyEnabled();
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerEntered"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private void OnPointerEnteredCore(PointerEventArgs e)
+        {
+            IsPointerOver = true;
+            OnPointerEntered(e);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerExited"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private void OnPointerExitedCore(PointerEventArgs e)
+        {
+            IsPointerOver = false;
+            OnPointerExited(e);
+        }
+
+        /// <summary>
+        /// Updates the <see cref="IsEffectivelyEnabled"/> property based on the parent's
+        /// <see cref="IsEffectivelyEnabled"/>.
+        /// </summary>
+        /// <param name="parent">The parent control.</param>
+        private void UpdateIsEffectivelyEnabled(InputElement? parent)
+        {
+            IsEffectivelyEnabled = IsEnabledCore && (parent?.IsEffectivelyEnabled ?? true);
+
+            // PERF-SENSITIVE: This is called on entire hierarchy and using foreach or LINQ
+            // will cause extra allocations and overhead.
+            
+            var children = VisualChildren;
+
+            // ReSharper disable once ForCanBeConvertedToForeach
+            for (int i = 0; i < children.Count; ++i)
+            {
+                var child = children[i] as InputElement;
+
+                child?.UpdateIsEffectivelyEnabled(this);
+            }
+        }
+
+        private void UpdatePseudoClasses(bool? isFocused, bool? isPointerOver)
+        {
+            if (isFocused.HasValue)
+            {
+                PseudoClasses.Set(":focus", isFocused.Value);
+                PseudoClasses.Set(":focus-visible", _isFocusVisible);
+            }
+            
+            if (isPointerOver.HasValue)
+            {
+                PseudoClasses.Set(":pointerover", isPointerOver.Value);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/InputExtensions.cs b/src/Avalonia.Base/Input/InputExtensions.cs
similarity index 100%
rename from src/Avalonia.Input/InputExtensions.cs
rename to src/Avalonia.Base/Input/InputExtensions.cs
diff --git a/src/Avalonia.Input/InputManager.cs b/src/Avalonia.Base/Input/InputManager.cs
similarity index 100%
rename from src/Avalonia.Input/InputManager.cs
rename to src/Avalonia.Base/Input/InputManager.cs
diff --git a/src/Avalonia.Input/InputMethod.cs b/src/Avalonia.Base/Input/InputMethod.cs
similarity index 100%
rename from src/Avalonia.Input/InputMethod.cs
rename to src/Avalonia.Base/Input/InputMethod.cs
diff --git a/src/Avalonia.Input/Key.cs b/src/Avalonia.Base/Input/Key.cs
similarity index 100%
rename from src/Avalonia.Input/Key.cs
rename to src/Avalonia.Base/Input/Key.cs
diff --git a/src/Avalonia.Input/KeyBinding.cs b/src/Avalonia.Base/Input/KeyBinding.cs
similarity index 100%
rename from src/Avalonia.Input/KeyBinding.cs
rename to src/Avalonia.Base/Input/KeyBinding.cs
diff --git a/src/Avalonia.Base/Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
new file mode 100644
index 0000000000..39c9766105
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyEventArgs.cs
@@ -0,0 +1,19 @@
+using System;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    public class KeyEventArgs : RoutedEventArgs
+    {
+        internal KeyEventArgs()
+        {
+
+        }
+
+        public IKeyboardDevice? Device { get; set; }
+
+        public Key Key { get; set; }
+
+        public KeyModifiers KeyModifiers { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/KeyGesture.cs b/src/Avalonia.Base/Input/KeyGesture.cs
new file mode 100644
index 0000000000..1a6372d346
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyGesture.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines a keyboard input combination.
+    /// </summary>
+    public sealed class KeyGesture : IEquatable<KeyGesture>
+    {
+        private static readonly Dictionary<string, Key> s_keySynonyms = new Dictionary<string, Key>
+        {
+            { "+", Key.OemPlus }, { "-", Key.OemMinus }, { ".", Key.OemPeriod }, { ",", Key.OemComma }
+        };
+
+        public KeyGesture(Key key, KeyModifiers modifiers = KeyModifiers.None)
+        {
+            Key = key;
+            KeyModifiers = modifiers;
+        }
+
+        public bool Equals(KeyGesture? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Key == other.Key && KeyModifiers == other.KeyModifiers;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+
+            return obj is KeyGesture gesture && Equals(gesture);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((int)Key * 397) ^ (int)KeyModifiers;
+            }
+        }
+
+        public static bool operator ==(KeyGesture? left, KeyGesture? right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(KeyGesture? left, KeyGesture? right)
+        {
+            return !Equals(left, right);
+        }
+
+        public Key Key { get; }
+        
+        public KeyModifiers KeyModifiers { get; }
+
+        public static KeyGesture Parse(string gesture)
+        {
+            // string.Split can't be used here because "Ctrl++" is a perfectly valid key gesture
+
+            var key = Key.None;
+            var keyModifiers = KeyModifiers.None;
+
+            var cstart = 0;
+
+            for (var c = 0; c <= gesture.Length; c++)
+            {
+                var ch = c == gesture.Length ? '\0' : gesture[c];
+                bool isLast = c == gesture.Length;
+
+                if (isLast || (ch == '+' && cstart != c))
+                {
+                    var partSpan = gesture.AsSpan(cstart, c - cstart).Trim();
+
+                    if (isLast)
+                    {
+                        key = ParseKey(partSpan.ToString());
+                    }
+                    else
+                    {
+                        keyModifiers |= ParseModifier(partSpan);
+                    }
+
+                    cstart = c + 1;
+                }
+            }
+
+
+            return new KeyGesture(key, keyModifiers);
+        }
+
+        public override string ToString()
+        {
+            var s = StringBuilderCache.Acquire();
+
+            static void Plus(StringBuilder s)
+            {
+                if (s.Length > 0)
+                {
+                    s.Append("+");
+                }
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Control))
+            {
+                s.Append("Ctrl");
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Shift))
+            {
+                Plus(s);
+                s.Append("Shift");
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Alt))
+            {
+                Plus(s);
+                s.Append("Alt");
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Meta))
+            {
+                Plus(s);
+                s.Append("Cmd");
+            }
+
+            Plus(s);
+            s.Append(Key);
+
+            return StringBuilderCache.GetStringAndRelease(s);
+        }
+
+        public bool Matches(KeyEventArgs keyEvent) =>
+            keyEvent != null &&
+            keyEvent.KeyModifiers == KeyModifiers &&
+            ResolveNumPadOperationKey(keyEvent.Key) == ResolveNumPadOperationKey(Key);
+
+        // TODO: Move that to external key parser
+        private static Key ParseKey(string key)
+        {
+            if (s_keySynonyms.TryGetValue(key.ToLower(), out Key rv))
+                return rv;
+
+            return EnumHelper.Parse<Key>(key, true);
+        }
+
+        private static KeyModifiers ParseModifier(ReadOnlySpan<char> modifier)
+        {
+            if (modifier.Equals("ctrl".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            {
+                return KeyModifiers.Control;
+            }
+
+            if (modifier.Equals("cmd".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                modifier.Equals("win".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                modifier.Equals("⌘".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            {
+                return KeyModifiers.Meta;
+            }
+
+            return EnumHelper.Parse<KeyModifiers>(modifier.ToString(), true);
+        }
+
+        private Key ResolveNumPadOperationKey(Key key)
+        {
+            switch (key)
+            {
+                case Key.Add:
+                    return Key.OemPlus;
+                case Key.Subtract:
+                    return Key.OemMinus;
+                case Key.Decimal:
+                    return Key.OemPeriod;
+                default:
+                    return key;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
new file mode 100644
index 0000000000..0600b54618
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -0,0 +1,249 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class KeyboardDevice : IKeyboardDevice, INotifyPropertyChanged
+    {
+        private IInputElement? _focusedElement;
+        private IInputRoot? _focusedRoot;
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        public static IKeyboardDevice? Instance => AvaloniaLocator.Current.GetService<IKeyboardDevice>();
+
+        public IInputManager? InputManager => AvaloniaLocator.Current.GetService<IInputManager>();
+
+        public IFocusManager? FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
+        
+        // This should live in the FocusManager, but with the current outdated architecture
+        // the source of truth about the input focus is in KeyboardDevice
+        private readonly TextInputMethodManager _textInputManager = new TextInputMethodManager();
+
+        public IInputElement? FocusedElement => _focusedElement;
+
+        private void ClearFocusWithinAncestors(IInputElement? element)
+        {
+            var el = element;
+            
+            while (el != null)
+            {
+                if (el is InputElement ie)
+                {
+                    ie.IsKeyboardFocusWithin = false;
+                }
+
+                el = (IInputElement?)el.VisualParent;
+            }
+        }
+        
+        private void ClearFocusWithin(IInputElement element, bool clearRoot)
+        {
+            foreach (var visual in element.VisualChildren)
+            {
+                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
+                {
+                    ClearFocusWithin(el, true);
+                    break;
+                }
+            }
+            
+            if (clearRoot)
+            {
+                if (element is InputElement ie)
+                {
+                    ie.IsKeyboardFocusWithin = false;
+                }
+            }
+        }
+
+        private void SetIsFocusWithin(IInputElement? oldElement, IInputElement? newElement)
+        {
+            if (newElement == null && oldElement != null)
+            {
+                ClearFocusWithinAncestors(oldElement);
+                return;
+            }
+            
+            IInputElement? branch = null;
+
+            var el = newElement;
+
+            while (el != null)
+            {
+                if (el.IsKeyboardFocusWithin)
+                {
+                    branch = el;
+                    break;
+                }
+
+                el = el.VisualParent as IInputElement;
+            }
+
+            el = oldElement;
+
+            if (el != null && branch != null)
+            {
+                ClearFocusWithin(branch, false);
+            }
+
+            el = newElement;
+            
+            while (el != null && el != branch)
+            {
+                if (el is InputElement ie)
+                {
+                    ie.IsKeyboardFocusWithin = true;
+                }
+
+                el = el.VisualParent as IInputElement;
+            }
+        }
+        
+        private void ClearChildrenFocusWithin(IInputElement element, bool clearRoot)
+        {
+            foreach (var visual in element.VisualChildren)
+            {
+                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
+                {
+                    ClearChildrenFocusWithin(el, true);
+                    break;
+                }
+            }
+            
+            if (clearRoot && element is InputElement ie)
+            {
+                ie.IsKeyboardFocusWithin = false;
+            }
+        }
+
+        public void SetFocusedElement(
+            IInputElement? element, 
+            NavigationMethod method,
+            KeyModifiers keyModifiers)
+        {
+            if (element != FocusedElement)
+            {
+                var interactive = FocusedElement as IInteractive;
+
+                if (FocusedElement != null && 
+                    (!FocusedElement.IsAttachedToVisualTree ||
+                     _focusedRoot != element?.VisualRoot as IInputRoot) &&
+                    _focusedRoot != null)
+                {
+                    ClearChildrenFocusWithin(_focusedRoot, true);
+                }
+                
+                SetIsFocusWithin(FocusedElement, element);
+                _focusedElement = element;
+                _focusedRoot = _focusedElement?.VisualRoot as IInputRoot;
+
+                interactive?.RaiseEvent(new RoutedEventArgs
+                {
+                    RoutedEvent = InputElement.LostFocusEvent,
+                });
+
+                interactive = element as IInteractive;
+
+                interactive?.RaiseEvent(new GotFocusEventArgs
+                {
+                    RoutedEvent = InputElement.GotFocusEvent,
+                    NavigationMethod = method,
+                    KeyModifiers = keyModifiers,
+                });
+
+                _textInputManager.SetFocusedElement(element);
+                RaisePropertyChanged(nameof(FocusedElement));
+            }
+        }
+
+        protected void RaisePropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if(e.Handled)
+                return;
+
+            var element = FocusedElement ?? e.Root;
+
+            if (e is RawKeyEventArgs keyInput)
+            {
+                switch (keyInput.Type)
+                {
+                    case RawKeyEventType.KeyDown:
+                    case RawKeyEventType.KeyUp:
+                        var routedEvent = keyInput.Type == RawKeyEventType.KeyDown
+                            ? InputElement.KeyDownEvent
+                            : InputElement.KeyUpEvent;
+
+                        KeyEventArgs ev = new KeyEventArgs
+                        {
+                            RoutedEvent = routedEvent,
+                            Device = this,
+                            Key = keyInput.Key,
+                            KeyModifiers = keyInput.Modifiers.ToKeyModifiers(),
+                            Source = element,
+                        };
+
+                        IVisual? currentHandler = element;
+                        while (currentHandler != null && !ev.Handled && keyInput.Type == RawKeyEventType.KeyDown)
+                        {
+                            var bindings = (currentHandler as IInputElement)?.KeyBindings;
+                            if (bindings != null)
+                            {
+                                KeyBinding[]? bindingsCopy = null;
+
+                                // Create a copy of the KeyBindings list if there's a binding which matches the event.
+                                // If we don't do this the foreach loop will throw an InvalidOperationException when the KeyBindings list is changed.
+                                // This can happen when a new view is loaded which adds its own KeyBindings to the handler.
+                                foreach (var binding in bindings)
+                                {
+                                    if (binding.Gesture?.Matches(ev) == true)
+                                    {
+                                        bindingsCopy = bindings.ToArray();
+                                        break;
+                                    }
+                                }
+
+                                if (bindingsCopy is object)
+                                {
+                                    foreach (var binding in bindingsCopy)
+                                    {
+                                        if (ev.Handled)
+                                            break;
+                                        binding.TryHandle(ev);
+                                    }
+                                }
+                            }
+                            currentHandler = currentHandler.VisualParent;
+                        }
+
+                        element.RaiseEvent(ev);
+                        e.Handled = ev.Handled;
+                        break;
+                }
+            }
+
+            if (e is RawTextInputEventArgs text)
+            {
+                var ev = new TextInputEventArgs()
+                {
+                    Device = this,
+                    Text = text.Text,
+                    Source = element,
+                    RoutedEvent = InputElement.TextInputEvent
+                };
+
+                element.RaiseEvent(ev);
+                e.Handled = ev.Handled;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/KeyboardNavigation.cs b/src/Avalonia.Base/Input/KeyboardNavigation.cs
new file mode 100644
index 0000000000..042a9adf5f
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyboardNavigation.cs
@@ -0,0 +1,134 @@
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines attached properties that control keyboard navigation behaviour for a container.
+    /// </summary>
+    public static class KeyboardNavigation
+    {
+        /// <summary>
+        /// Defines the TabIndex attached property.
+        /// </summary>
+        public static readonly AttachedProperty<int> TabIndexProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, int>(
+                "TabIndex",
+                typeof(KeyboardNavigation),
+                int.MaxValue);
+
+        /// <summary>
+        /// Defines the TabNavigation attached property.
+        /// </summary>
+        /// <remarks>
+        /// The TabNavigation attached property defines how pressing the Tab key causes focus to
+        /// be navigated between the children of the container.
+        /// </remarks>
+        public static readonly AttachedProperty<KeyboardNavigationMode> TabNavigationProperty =
+            AvaloniaProperty.RegisterAttached<InputElement, KeyboardNavigationMode>(
+                "TabNavigation",
+                typeof(KeyboardNavigation));
+
+        /// <summary>
+        /// Defines the TabOnceActiveElement attached property.
+        /// </summary>
+        /// <remarks>
+        /// When focus enters a container which has its <see cref="TabNavigationProperty"/>
+        /// attached property set to <see cref="KeyboardNavigationMode.Once"/>, this property
+        /// defines to which child the focus should move.
+        /// </remarks>
+        public static readonly AttachedProperty<IInputElement?> TabOnceActiveElementProperty =
+            AvaloniaProperty.RegisterAttached<InputElement, IInputElement?>(
+                "TabOnceActiveElement",
+                typeof(KeyboardNavigation));
+
+        /// <summary>
+        /// Defines the IsTabStop attached property.
+        /// </summary>
+        /// <remarks>
+        /// The IsTabStop attached property determines whether the control is focusable by tab navigation. 
+        /// </remarks>
+        public static readonly AttachedProperty<bool> IsTabStopProperty =
+            AvaloniaProperty.RegisterAttached<InputElement, bool>(
+                "IsTabStop",
+                typeof(KeyboardNavigation), 
+                true);
+
+        /// <summary>
+        /// Gets the <see cref="TabIndexProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
+        public static int GetTabIndex(IInputElement element)
+        {
+            return ((AvaloniaObject)element).GetValue(TabIndexProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabIndexProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="value">The tab index.</param>
+        public static void SetTabIndex(IInputElement element, int value)
+        {
+            ((IAvaloniaObject)element).SetValue(TabIndexProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TabNavigationProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
+        public static KeyboardNavigationMode GetTabNavigation(InputElement element)
+        {
+            return element.GetValue(TabNavigationProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabNavigationProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <param name="value">The <see cref="KeyboardNavigationMode"/> for the container.</param>
+        public static void SetTabNavigation(InputElement element, KeyboardNavigationMode value)
+        {
+            element.SetValue(TabNavigationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TabOnceActiveElementProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The active element for the container.</returns>
+        public static IInputElement? GetTabOnceActiveElement(InputElement element)
+        {
+            return element.GetValue(TabOnceActiveElementProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabOnceActiveElementProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <param name="value">The active element for the container.</param>
+        public static void SetTabOnceActiveElement(InputElement element, IInputElement? value)
+        {
+            element.SetValue(TabOnceActiveElementProperty, value);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="IsTabStopProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <param name="value">Value indicating whether the container is a tab stop.</param>
+        public static void SetIsTabStop(InputElement element, bool value)
+        {
+            element.SetValue(IsTabStopProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IsTabStopProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>Whether the container is a tab stop.</returns>
+        public static bool GetIsTabStop(InputElement element)
+        {
+            return element.GetValue(IsTabStopProperty);
+        }
+    }
+}
diff --git a/src/Avalonia.Input/KeyboardNavigationHandler.cs b/src/Avalonia.Base/Input/KeyboardNavigationHandler.cs
similarity index 100%
rename from src/Avalonia.Input/KeyboardNavigationHandler.cs
rename to src/Avalonia.Base/Input/KeyboardNavigationHandler.cs
diff --git a/src/Avalonia.Input/KeyboardNavigationMode.cs b/src/Avalonia.Base/Input/KeyboardNavigationMode.cs
similarity index 100%
rename from src/Avalonia.Input/KeyboardNavigationMode.cs
rename to src/Avalonia.Base/Input/KeyboardNavigationMode.cs
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
new file mode 100644
index 0000000000..b4bc419223
--- /dev/null
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Input.Raw;
+using Avalonia.Interactivity;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Represents a mouse device.
+    /// </summary>
+    public class MouseDevice : IMouseDevice, IDisposable
+    {
+        private int _clickCount;
+        private Rect _lastClickRect;
+        private ulong _lastClickTime;
+
+        private readonly Pointer _pointer;
+        private bool _disposed;
+        private MouseButton _lastMouseDownButton;
+
+        public MouseDevice(Pointer? pointer = null)
+        {
+            _pointer = pointer ?? new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+        }
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if (!e.Handled && e is RawPointerEventArgs margs)
+                ProcessRawEvent(margs);
+        }
+
+        int ButtonCount(PointerPointProperties props)
+        {
+            var rv = 0;
+            if (props.IsLeftButtonPressed)
+                rv++;
+            if (props.IsMiddleButtonPressed)
+                rv++;
+            if (props.IsRightButtonPressed)
+                rv++;
+            if (props.IsXButton1Pressed)
+                rv++;
+            if (props.IsXButton2Pressed)
+                rv++;
+            return rv;
+        }
+
+        private void ProcessRawEvent(RawPointerEventArgs e)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            var mouse = (MouseDevice)e.Device;
+            if(mouse._disposed)
+                return;
+
+            var props = CreateProperties(e);
+            var keyModifiers = e.InputModifiers.ToKeyModifiers();
+            switch (e.Type)
+            {
+                case RawPointerEventType.LeaveWindow:
+                case RawPointerEventType.NonClientLeftButtonDown:
+                    LeaveWindow();
+                    break;
+                case RawPointerEventType.LeftButtonDown:
+                case RawPointerEventType.RightButtonDown:
+                case RawPointerEventType.MiddleButtonDown:
+                case RawPointerEventType.XButton1Down:
+                case RawPointerEventType.XButton2Down:
+                    if (ButtonCount(props) > 1)
+                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints, e.InputHitTestResult);
+                    else
+                        e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.LeftButtonUp:
+                case RawPointerEventType.RightButtonUp:
+                case RawPointerEventType.MiddleButtonUp:
+                case RawPointerEventType.XButton1Up:
+                case RawPointerEventType.XButton2Up:
+                    if (ButtonCount(props) != 0)
+                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints, e.InputHitTestResult);
+                    else
+                        e.Handled = MouseUp(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Move:
+                    e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Wheel:
+                    e.Handled = MouseWheel(mouse, e.Timestamp, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Magnify:
+                    e.Handled = GestureMagnify(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Rotate:
+                    e.Handled = GestureRotate(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Swipe:
+                    e.Handled = GestureSwipe(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+            }
+        }
+
+        private void LeaveWindow()
+        {
+        }
+
+        PointerPointProperties CreateProperties(RawPointerEventArgs args)
+        {
+            return new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind());
+        }
+
+        private bool MouseDown(IMouseDevice device, ulong timestamp, IInputElement root, Point p,
+            PointerPointProperties properties,
+            KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? root.InputHitTest(p);
+
+            if (source != null)
+            {
+                _pointer.Capture(source);
+                if (source != null)
+                {
+                    var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
+                    var doubleClickTime = settings.GetDoubleTapTime(PointerType.Mouse).TotalMilliseconds;
+                    var doubleClickSize = settings.GetDoubleTapSize(PointerType.Mouse);
+
+                    if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
+                    {
+                        _clickCount = 0;
+                    }
+
+                    ++_clickCount;
+                    _lastClickTime = timestamp;
+                    _lastClickRect = new Rect(p, new Size())
+                        .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
+                    _lastMouseDownButton = properties.PointerUpdateKind.GetMouseButton();
+                    var e = new PointerPressedEventArgs(source, _pointer, root, p, timestamp, properties, inputModifiers, _clickCount);
+                    source.RaiseEvent(e);
+                    return e.Handled;
+                }
+            }
+
+            return false;
+        }
+
+        private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties properties, KeyModifiers inputModifiers, Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints,
+            IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source is object)
+            {
+                var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
+                    p, timestamp, properties, inputModifiers, intermediatePoints);
+
+                source.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        private bool MouseUp(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties props,
+            KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source is not null)
+            {
+                var e = new PointerReleasedEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers,
+                    _lastMouseDownButton);
+
+                source?.RaiseEvent(e);
+                _pointer.Capture(null);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        private bool MouseWheel(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props,
+            Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            // KeyModifiers.Shift should scroll in horizontal direction. This does not work on every platform. 
+            // If Shift-Key is pressed and X is close to 0 we swap the Vector.
+            if (inputModifiers == KeyModifiers.Shift && MathUtilities.IsZero(delta.X))
+            {
+                delta = new Vector(delta.Y, delta.X);
+            }
+
+            if (source is not null)
+            {
+                var e = new PointerWheelEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+        
+        private bool GestureMagnify(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureMagnifyEvent, source,
+                    _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+        
+        private bool GestureRotate(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureRotateEvent, source,
+                    _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+        
+        private bool GestureSwipe(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureSwipeEvent, source, 
+                    _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+            _pointer?.Dispose();
+        }
+        
+        public IPointer? TryGetPointer(RawPointerEventArgs ev)
+        {
+            return _pointer;
+        }
+    }
+}
diff --git a/src/Avalonia.Input/Navigation/FocusExtensions.cs b/src/Avalonia.Base/Input/Navigation/FocusExtensions.cs
similarity index 100%
rename from src/Avalonia.Input/Navigation/FocusExtensions.cs
rename to src/Avalonia.Base/Input/Navigation/FocusExtensions.cs
diff --git a/src/Avalonia.Base/Input/Navigation/TabNavigation.cs b/src/Avalonia.Base/Input/Navigation/TabNavigation.cs
new file mode 100644
index 0000000000..cfd45f8262
--- /dev/null
+++ b/src/Avalonia.Base/Input/Navigation/TabNavigation.cs
@@ -0,0 +1,674 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input.Navigation
+{
+    /// <summary>
+    /// The implementation for default tab navigation.
+    /// </summary>
+    internal static class TabNavigation
+    {
+        public static IInputElement? GetNextTab(IInputElement e, bool goDownOnly)
+        {
+            return GetNextTab(e, GetGroupParent(e), goDownOnly);
+        }
+
+        public static IInputElement? GetNextTab(IInputElement? e, IInputElement container, bool goDownOnly)
+        {
+            var tabbingType = GetKeyNavigationMode(container);
+
+            if (e == null)
+            {
+                if (IsTabStop(container))
+                    return container;
+
+                // Using ActiveElement if set
+                var activeElement = GetActiveElement(container);
+                if (activeElement != null)
+                    return GetNextTab(null, activeElement, true);
+            }
+            else
+            {
+                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
+                {
+                    if (container != e)
+                    {
+                        if (goDownOnly)
+                            return null;
+                        var parentContainer = GetGroupParent(container);
+                        return GetNextTab(container, parentContainer, goDownOnly);
+                    }
+                }
+            }
+
+            // All groups
+            IInputElement? loopStartElement = null;
+            var nextTabElement = e;
+            var currentTabbingType = tabbingType;
+
+            // Search down inside the container
+            while ((nextTabElement = GetNextTabInGroup(nextTabElement, container, currentTabbingType)) != null)
+            {
+                // Avoid the endless loop here for Cycle groups
+                if (loopStartElement == nextTabElement)
+                    break;
+                if (loopStartElement == null)
+                    loopStartElement = nextTabElement;
+
+                var firstTabElementInside = GetNextTab(null, nextTabElement, true);
+                if (firstTabElementInside != null)
+                    return firstTabElementInside;
+
+                // If we want to continue searching inside the Once groups, we should change the navigation mode
+                if (currentTabbingType == KeyboardNavigationMode.Once)
+                    currentTabbingType = KeyboardNavigationMode.Contained;
+            }
+
+            // If there is no next element in the group (nextTabElement == null)
+
+            // Search up in the tree if allowed
+            // consider: Use original tabbingType instead of currentTabbingType
+            if (!goDownOnly && currentTabbingType != KeyboardNavigationMode.Contained && GetParent(container) != null)
+            {
+                return GetNextTab(container, GetGroupParent(container), false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetNextTabOutside(ICustomKeyboardNavigation e)
+        {
+            if (e is IInputElement container)
+            {
+                var last = GetLastInTree(container);
+
+                if (last is object)
+                    return GetNextTab(last, false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetPrevTab(IInputElement? e, IInputElement? container, bool goDownOnly)
+        {
+            if (e is null && container is null)
+                throw new InvalidOperationException("Either 'e' or 'container' must be non-null.");
+
+            if (container is null)
+                container = GetGroupParent(e!);
+
+            KeyboardNavigationMode tabbingType = GetKeyNavigationMode(container);
+
+            if (e == null)
+            {
+                // Using ActiveElement if set
+                var activeElement = GetActiveElement(container);
+                if (activeElement != null)
+                    return GetPrevTab(null, activeElement, true);
+                else
+                {
+                    // If we Shift+Tab on a container with KeyboardNavigationMode=Once, and ActiveElement is null
+                    // then we want to go to the first item (not last) within the container
+                    if (tabbingType == KeyboardNavigationMode.Once)
+                    {
+                        var firstTabElement = GetNextTabInGroup(null, container, tabbingType);
+                        if (firstTabElement == null)
+                        {
+                            if (IsTabStop(container))
+                                return container;
+                            if (goDownOnly)
+                                return null;
+
+                            return GetPrevTab(container, null, false);
+                        }
+                        else
+                        {
+                            return GetPrevTab(null, firstTabElement, true);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
+                {
+                    if (goDownOnly || container == e)
+                        return null;
+
+                    // FocusedElement should not be e otherwise we will delegate focus to the same element
+                    if (IsTabStop(container))
+                        return container;
+
+                    return GetPrevTab(container, null, false);
+                }
+            }
+
+            // All groups (except Once) - continue
+            IInputElement? loopStartElement = null;
+            IInputElement? nextTabElement = e;
+
+            // Look for element with the same TabIndex before the current element
+            while ((nextTabElement = GetPrevTabInGroup(nextTabElement, container, tabbingType)) != null)
+            {
+                if (nextTabElement == container && tabbingType == KeyboardNavigationMode.Local)
+                    break;
+
+                // At this point nextTabElement is TabStop or TabGroup
+                // In case it is a TabStop only return the element
+                if (IsTabStop(nextTabElement) && !IsGroup(nextTabElement))
+                    return nextTabElement;
+
+                // Avoid the endless loop here
+                if (loopStartElement == nextTabElement)
+                    break;
+                if (loopStartElement == null)
+                    loopStartElement = nextTabElement;
+
+                // At this point nextTabElement is TabGroup
+                var lastTabElementInside = GetPrevTab(null, nextTabElement, true);
+                if (lastTabElementInside != null)
+                    return lastTabElementInside;
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Contained)
+                return null;
+
+            if (e != container && IsTabStop(container))
+                return container;
+
+            // If end of the subtree is reached or there no other elements above
+            if (!goDownOnly && GetParent(container) != null)
+            {
+                return GetPrevTab(container, null, false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetPrevTabOutside(ICustomKeyboardNavigation e)
+        {
+            if (e is IInputElement container)
+            {
+                var first = GetFirstChild(container);
+
+                if (first is object)
+                    return GetPrevTab(first, null, false);
+            }
+
+            return null;
+        }
+
+        private static IInputElement? FocusedElement(IInputElement e)
+        {
+            var iie = e;
+            // Focus delegation is enabled only if keyboard focus is outside the container
+            if (iie != null && !iie.IsKeyboardFocusWithin)
+            {
+                var focusedElement = (FocusManager.Instance as FocusManager)?.GetFocusedElement(e);
+                if (focusedElement != null)
+                {
+                    if (!IsFocusScope(e))
+                    {
+                        // Verify if focusedElement is a visual descendant of e
+                        if (focusedElement is IVisual visualFocusedElement &&
+                            visualFocusedElement != e &&
+                            e.IsVisualAncestorOf(visualFocusedElement))
+                        {
+                            return focusedElement;
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetFirstChild(IInputElement e)
+        {
+            // If the element has a FocusedElement it should be its first child
+            if (FocusedElement(e) is IInputElement focusedElement)
+                return focusedElement;
+
+            // Return the first visible element.
+            var uiElement = e as InputElement;
+
+            if (uiElement is null || IsVisibleAndEnabled(uiElement))
+            {
+                if (e is IVisual elementAsVisual)
+                {
+                    var children = elementAsVisual.VisualChildren;
+                    var count = children.Count;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        if (children[i] is InputElement ie)
+                        {
+                            if (IsVisibleAndEnabled(ie))
+                                return ie;
+                            else
+                            {
+                                var firstChild = GetFirstChild(ie);
+                                if (firstChild != null)
+                                    return firstChild;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetLastChild(IInputElement e)
+        {
+            // If the element has a FocusedElement it should be its last child
+            if (FocusedElement(e) is IInputElement focusedElement)
+                return focusedElement;
+
+            // Return the last visible element.
+            var uiElement = e as InputElement;
+
+            if (uiElement == null || IsVisibleAndEnabled(uiElement))
+            {
+                var elementAsVisual = e as IVisual;
+
+                if (elementAsVisual != null)
+                {
+                    var children = elementAsVisual.VisualChildren;
+                    var count = children.Count;
+
+                    for (int i = count - 1; i >= 0; i--)
+                    {
+                        if (children[i] is InputElement ie)
+                        {
+                            if (IsVisibleAndEnabled(ie))
+                                return ie;
+                            else
+                            {
+                                var lastChild = GetLastChild(ie);
+                                if (lastChild != null)
+                                    return lastChild;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetFirstTabInGroup(IInputElement container)
+        {
+            IInputElement? firstTabElement = null;
+            int minIndexFirstTab = int.MinValue;
+
+            var currElement = container;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement))
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+
+                    if (currPriority < minIndexFirstTab || firstTabElement == null)
+                    {
+                        minIndexFirstTab = currPriority;
+                        firstTabElement = currElement;
+                    }
+                }
+            }
+            return firstTabElement;
+        }
+
+        private static IInputElement? GetLastInTree(IInputElement container)
+        {
+            IInputElement? result;
+            IInputElement? c = container;
+
+            do
+            {
+                result = c;
+                c = GetLastChild(c);
+            } while (c != null && !IsGroup(c));
+
+            if (c != null)
+                return c;
+
+            return result;
+        }
+
+        private static IInputElement? GetLastTabInGroup(IInputElement container)
+        {
+            IInputElement? lastTabElement = null;
+            int maxIndexFirstTab = int.MaxValue;
+            var currElement = GetLastInTree(container);
+            while (currElement != null && currElement != container)
+            {
+                if (IsTabStopOrGroup(currElement))
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+
+                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
+                    {
+                        maxIndexFirstTab = currPriority;
+                        lastTabElement = currElement;
+                    }
+                }
+                currElement = GetPreviousInTree(currElement, container);
+            }
+            return lastTabElement;
+        }
+
+        private static IInputElement? GetNextInTree(IInputElement e, IInputElement container)
+        {
+            IInputElement? result = null;
+
+            if (e == container || !IsGroup(e))
+                result = GetFirstChild(e);
+
+            if (result != null || e == container)
+                return result;
+
+            IInputElement? parent = e;
+            do
+            {
+                var sibling = GetNextSibling(parent);
+                if (sibling != null)
+                    return sibling;
+
+                parent = GetParent(parent);
+            } while (parent != null && parent != container);
+
+            return null;
+        }
+
+        private static IInputElement? GetNextSibling(IInputElement e)
+        {
+            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
+            {
+                var children = parentAsVisual.VisualChildren;
+                var count = children.Count;
+                var i = 0;
+
+                //go till itself
+                for (; i < count; i++)
+                {
+                    var vchild = children[i];
+                    if (vchild == elementAsVisual)
+                        break;
+                }
+                i++;
+                //search ahead
+                for (; i < count; i++)
+                {
+                    var visual = children[i];
+                    if (visual is IInputElement ie)
+                        return ie;
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetNextTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // None groups: Tab navigation is not supported
+            if (tabbingType == KeyboardNavigationMode.None)
+                return null;
+
+            // e == null or e == container -> return the first TabStopOrGroup
+            if (e == null || e == container)
+            {
+                return GetFirstTabInGroup(container);
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Once)
+                return null;
+
+            var nextTabElement = GetNextTabWithSameIndex(e, container);
+            if (nextTabElement != null)
+                return nextTabElement;
+
+            return GetNextTabWithNextIndex(e, container, tabbingType);
+        }
+
+        private static IInputElement? GetNextTabWithSameIndex(IInputElement e, IInputElement container)
+        {
+            var elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            var currElement = e;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority)
+                {
+                    return currElement;
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetNextTabWithNextIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // Find the next min index in the tree
+            // min (index>currentTabIndex)
+            IInputElement? nextTabElement = null;
+            IInputElement? firstTabElement = null;
+            int minIndexFirstTab = int.MinValue;
+            int minIndex = int.MinValue;
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+
+            IInputElement? currElement = container;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement))
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+                    if (currPriority > elementTabPriority)
+                    {
+                        if (currPriority < minIndex || nextTabElement == null)
+                        {
+                            minIndex = currPriority;
+                            nextTabElement = currElement;
+                        }
+                    }
+
+                    if (currPriority < minIndexFirstTab || firstTabElement == null)
+                    {
+                        minIndexFirstTab = currPriority;
+                        firstTabElement = currElement;
+                    }
+                }
+            }
+
+            // Cycle groups: if not found - return first element
+            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
+                nextTabElement = firstTabElement;
+
+            return nextTabElement;
+        }
+
+        private static IInputElement? GetPrevTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // None groups: Tab navigation is not supported
+            if (tabbingType == KeyboardNavigationMode.None)
+                return null;
+
+            // Search the last index inside the group
+            if (e == null)
+            {
+                return GetLastTabInGroup(container);
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Once)
+                return null;
+
+            if (e == container)
+                return null;
+
+            var nextTabElement = GetPrevTabWithSameIndex(e, container);
+            if (nextTabElement != null)
+                return nextTabElement;
+
+            return GetPrevTabWithPrevIndex(e, container, tabbingType);
+        }
+
+        private static IInputElement? GetPrevTabWithSameIndex(IInputElement e, IInputElement container)
+        {
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            var currElement = GetPreviousInTree(e, container);
+            while (currElement != null)
+            {
+                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority && currElement != container)
+                {
+                    return currElement;
+                }
+                currElement = GetPreviousInTree(currElement, container);
+            }
+            return null;
+        }
+
+        private static IInputElement? GetPrevTabWithPrevIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // Find the next max index in the tree
+            // max (index<currentTabIndex)
+            IInputElement? lastTabElement = null;
+            IInputElement? nextTabElement = null;
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            int maxIndexFirstTab = Int32.MaxValue;
+            int maxIndex = Int32.MaxValue;
+            var currElement = GetLastInTree(container);
+            while (currElement != null)
+            {
+                if (IsTabStopOrGroup(currElement) && currElement != container)
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+                    if (currPriority < elementTabPriority)
+                    {
+                        if (currPriority > maxIndex || nextTabElement == null)
+                        {
+                            maxIndex = currPriority;
+                            nextTabElement = currElement;
+                        }
+                    }
+
+                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
+                    {
+                        maxIndexFirstTab = currPriority;
+                        lastTabElement = currElement;
+                    }
+                }
+
+                currElement = GetPreviousInTree(currElement, container);
+            }
+
+            // Cycle groups: if not found - return first element
+            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
+                nextTabElement = lastTabElement;
+
+            return nextTabElement;
+        }
+
+        private static IInputElement? GetPreviousInTree(IInputElement e, IInputElement container)
+        {
+            if (e == container)
+                return null;
+
+            var result = GetPreviousSibling(e);
+
+            if (result != null)
+            {
+                if (IsGroup(result))
+                    return result;
+                else
+                    return GetLastInTree(result);
+            }
+            else
+                return GetParent(e);
+        }
+
+        private static IInputElement? GetPreviousSibling(IInputElement e)
+        {
+            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
+            {
+                var children = parentAsVisual.VisualChildren;
+                var count = children.Count;
+                IInputElement? prev = null;
+                
+                for (int i = 0; i < count; i++)
+                {
+                    var vchild = children[i];
+                    if (vchild == elementAsVisual)
+                        break;
+                    if (vchild is IInputElement ie && IsVisibleAndEnabled(ie))
+                        prev = ie;
+                }
+                return prev;
+            }
+            return null;
+        }
+
+        private static IInputElement? GetActiveElement(IInputElement e)
+        {
+            return ((AvaloniaObject)e).GetValue(KeyboardNavigation.TabOnceActiveElementProperty);
+        }
+
+        private static IInputElement GetGroupParent(IInputElement e) => GetGroupParent(e, false);
+
+        private static IInputElement GetGroupParent(IInputElement element, bool includeCurrent)
+        {
+            var result = element; // Keep the last non null element
+            var e = element;
+
+            // If we don't want to include the current element,
+            // start at the parent of the element.  If the element
+            // is the root, then just return it as the group parent.
+            if (!includeCurrent)
+            {
+                result = e;
+                e = GetParent(e);
+                if (e == null)
+                    return result;
+            }
+
+            while (e != null)
+            {
+                if (IsGroup(e))
+                    return e;
+
+                result = e;
+                e = GetParent(e);
+            }
+
+            return result;
+        }
+
+        private static IInputElement? GetParent(IInputElement e)
+        {
+            // For Visual - go up the visual parent chain until we find Visual.
+            if (e is IVisual v)
+                return v.FindAncestorOfType<IInputElement>();
+
+            // This will need to be implemented when we have non-visual input elements.
+            throw new NotSupportedException();
+        }
+
+        private static KeyboardNavigationMode GetKeyNavigationMode(IInputElement e)
+        {
+            return ((AvaloniaObject)e).GetValue(KeyboardNavigation.TabNavigationProperty);
+        }
+
+        private static bool IsFocusScope(IInputElement e) => FocusManager.GetIsFocusScope(e) || GetParent(e) == null;
+        private static bool IsGroup(IInputElement e) => GetKeyNavigationMode(e) != KeyboardNavigationMode.Continue;
+
+        private static bool IsTabStop(IInputElement e)
+        {
+            if (e is InputElement ie)
+                return ie.Focusable && KeyboardNavigation.GetIsTabStop(ie) && ie.IsVisible && ie.IsEnabled;
+            return false;
+        }
+
+        private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
+        private static bool IsVisibleAndEnabled(IInputElement e) => e.IsVisible && e.IsEnabled;
+    }
+}
diff --git a/src/Avalonia.Input/NavigationDirection.cs b/src/Avalonia.Base/Input/NavigationDirection.cs
similarity index 100%
rename from src/Avalonia.Input/NavigationDirection.cs
rename to src/Avalonia.Base/Input/NavigationDirection.cs
diff --git a/src/Avalonia.Input/NavigationMethod.cs b/src/Avalonia.Base/Input/NavigationMethod.cs
similarity index 100%
rename from src/Avalonia.Input/NavigationMethod.cs
rename to src/Avalonia.Base/Input/NavigationMethod.cs
diff --git a/src/Avalonia.Base/Input/PenDevice.cs b/src/Avalonia.Base/Input/PenDevice.cs
new file mode 100644
index 0000000000..31f34566be
--- /dev/null
+++ b/src/Avalonia.Base/Input/PenDevice.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Represents a pen/stylus device.
+    /// </summary>
+    public class PenDevice : IPenDevice, IDisposable
+    {
+        private readonly Dictionary<long, Pointer> _pointers = new();
+        private int _clickCount;
+        private Rect _lastClickRect;
+        private ulong _lastClickTime;
+        private MouseButton _lastMouseDownButton;
+
+        private bool _disposed;
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if (!e.Handled && e is RawPointerEventArgs margs)
+                ProcessRawEvent(margs);
+        }
+
+        private void ProcessRawEvent(RawPointerEventArgs e)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            if (!_pointers.TryGetValue(e.RawPointerId, out var pointer))
+            {
+                if (e.Type == RawPointerEventType.LeftButtonUp
+                    || e.Type == RawPointerEventType.TouchEnd)
+                    return;
+
+                _pointers[e.RawPointerId] = pointer = new Pointer(Pointer.GetNextFreeId(),
+                    PointerType.Pen, _pointers.Count == 0);
+            }
+            
+            var props = new PointerPointProperties(e.InputModifiers, e.Type.ToUpdateKind(),
+                e.Point.Twist, e.Point.Pressure, e.Point.XTilt, e.Point.YTilt);
+            var keyModifiers = e.InputModifiers.ToKeyModifiers();
+
+            bool shouldReleasePointer = false;
+            switch (e.Type)
+            {
+                case RawPointerEventType.LeaveWindow:
+                    shouldReleasePointer = true;
+                    break;
+                case RawPointerEventType.LeftButtonDown:
+                    e.Handled = PenDown(pointer, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.LeftButtonUp:
+                    e.Handled = PenUp(pointer, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Move:
+                    e.Handled = PenMove(pointer, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult, e.IntermediatePoints);
+                    break;
+            }
+
+            if (shouldReleasePointer)
+            {
+                pointer.Dispose();
+                _pointers.Remove(e.RawPointerId);
+            }
+        }
+
+        private bool PenDown(Pointer pointer, ulong timestamp,
+            IInputElement root, Point p, PointerPointProperties properties,
+            KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            var source = pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                pointer.Capture(source);
+                var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
+                var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Pen).TotalMilliseconds ?? 500;
+                var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Pen) ?? new Size(4, 4);
+
+                if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
+                {
+                    _clickCount = 0;
+                }
+
+                ++_clickCount;
+                _lastClickTime = timestamp;
+                _lastClickRect = new Rect(p, new Size())
+                    .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
+                _lastMouseDownButton = properties.PointerUpdateKind.GetMouseButton();
+                var e = new PointerPressedEventArgs(source, pointer, root, p, timestamp, properties, inputModifiers, _clickCount);
+                source.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        private bool PenMove(Pointer pointer, ulong timestamp,
+            IInputRoot root, Point p, PointerPointProperties properties,
+            KeyModifiers inputModifiers, IInputElement? hitTest,
+            Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints)
+        {
+            var source = pointer.Captured ?? hitTest;
+
+            if (source is not null)
+            {
+                var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, pointer, root,
+                    p, timestamp, properties, inputModifiers, intermediatePoints);
+
+                source.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        private bool PenUp(Pointer pointer, ulong timestamp,
+            IInputElement root, Point p, PointerPointProperties properties,
+            KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            var source = pointer.Captured ?? hitTest;
+
+            if (source is not null)
+            {
+                var e = new PointerReleasedEventArgs(source, pointer, root, p, timestamp, properties, inputModifiers,
+                    _lastMouseDownButton);
+
+                source?.RaiseEvent(e);
+                pointer.Capture(null);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+            var values = _pointers.Values.ToList();
+            _pointers.Clear();
+            _disposed = true;
+            foreach (var p in values)
+                p.Dispose();
+        }
+
+        public IPointer? TryGetPointer(RawPointerEventArgs ev)
+        {
+            return _pointers.TryGetValue(ev.RawPointerId, out var pointer)
+                ? pointer
+                : null;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/Platform/IClipboard.cs b/src/Avalonia.Base/Input/Platform/IClipboard.cs
new file mode 100644
index 0000000000..bf2a5a8602
--- /dev/null
+++ b/src/Avalonia.Base/Input/Platform/IClipboard.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.Platform
+{
+    [NotClientImplementable]
+    public interface IClipboard
+    {
+        Task<string> GetTextAsync();
+
+        Task SetTextAsync(string text);
+
+        Task ClearAsync();
+
+        Task SetDataObjectAsync(IDataObject data);
+        
+        Task<string[]> GetFormatsAsync();
+        
+        Task<object> GetDataAsync(string format);
+    }
+}
diff --git a/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs b/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
new file mode 100644
index 0000000000..8d1b93087e
--- /dev/null
+++ b/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.Platform
+{
+    [Unstable]
+    public interface IPlatformDragSource
+    {
+        Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects);
+    }
+}
diff --git a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs b/src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs
similarity index 100%
rename from src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
rename to src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs
diff --git a/src/Avalonia.Input/Pointer.cs b/src/Avalonia.Base/Input/Pointer.cs
similarity index 100%
rename from src/Avalonia.Input/Pointer.cs
rename to src/Avalonia.Base/Input/Pointer.cs
diff --git a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
new file mode 100644
index 0000000000..d5577d77af
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
@@ -0,0 +1,19 @@
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class PointerDeltaEventArgs : PointerEventArgs
+    {
+        public Vector Delta { get; set; }
+
+        internal PointerDeltaEventArgs(RoutedEvent routedEvent, IInteractive? source, 
+            IPointer pointer, IVisual rootVisual, Point rootVisualPosition, ulong timestamp,
+            PointerPointProperties properties, KeyModifiers modifiers, Vector delta) 
+            : base(routedEvent, source, pointer, rootVisual, rootVisualPosition,
+                timestamp, properties, modifiers)
+        {
+            Delta = delta;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
new file mode 100644
index 0000000000..f84dec42cb
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Input.Raw;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class PointerEventArgs : RoutedEventArgs
+    {
+        private readonly IVisual? _rootVisual;
+        private readonly Point _rootVisualPosition;
+        private readonly PointerPointProperties _properties;
+        private readonly Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
+
+        internal PointerEventArgs(RoutedEvent routedEvent,
+            IInteractive? source,
+            IPointer pointer,
+            IVisual? rootVisual, Point rootVisualPosition,
+            ulong timestamp,
+            PointerPointProperties properties,
+            KeyModifiers modifiers)
+           : base(routedEvent)
+        {
+            Source = source;
+            _rootVisual = rootVisual;
+            _rootVisualPosition = rootVisualPosition;
+            _properties = properties;
+            Pointer = pointer;
+            Timestamp = timestamp;
+            KeyModifiers = modifiers;
+        }
+
+        internal PointerEventArgs(RoutedEvent routedEvent,
+            IInteractive? source,
+            IPointer pointer,
+            IVisual? rootVisual, Point rootVisualPosition,
+            ulong timestamp,
+            PointerPointProperties properties,
+            KeyModifiers modifiers,
+            Lazy<IReadOnlyList<RawPointerPoint>?>? previousPoints)
+            : this(routedEvent, source, pointer, rootVisual, rootVisualPosition, timestamp, properties, modifiers)
+        {
+            _previousPoints = previousPoints;
+        }
+
+        /// <summary>
+        /// Gets specific pointer generated by input device.
+        /// </summary>
+        public IPointer Pointer { get; }
+
+        /// <summary>
+        /// Gets the time when the input occurred.
+        /// </summary>
+        public ulong Timestamp { get; }
+
+        /// <summary>
+        /// Gets a value that indicates which key modifiers were active at the time that the pointer event was initiated.
+        /// </summary>
+        public KeyModifiers KeyModifiers { get; }
+
+        private Point GetPosition(Point pt, IVisual? relativeTo)
+        {
+            if (_rootVisual == null)
+                return default;
+            if (relativeTo == null)
+                return pt;
+
+            return pt * _rootVisual.TransformToVisual(relativeTo) ?? default;
+        }
+
+        /// <summary>
+        /// Gets the pointer position relative to a control.
+        /// </summary>
+        /// <param name="relativeTo">The control.</param>
+        /// <returns>The pointer position in the control's coordinates.</returns>
+        public Point GetPosition(IVisual? relativeTo) => GetPosition(_rootVisualPosition, relativeTo);
+
+        /// <summary>
+        /// Returns the PointerPoint associated with the current event
+        /// </summary>
+        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
+        /// <returns></returns>
+        public PointerPoint GetCurrentPoint(IVisual? relativeTo)
+            => new PointerPoint(Pointer, GetPosition(relativeTo), _properties);
+
+        /// <summary>
+        /// Returns the PointerPoint associated with the current event
+        /// </summary>
+        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
+        /// <returns></returns>
+        public IReadOnlyList<PointerPoint> GetIntermediatePoints(IVisual? relativeTo)
+        {
+            var previousPoints = _previousPoints?.Value;            
+            if (previousPoints == null || previousPoints.Count == 0)
+                return new[] { GetCurrentPoint(relativeTo) };
+            var points = new PointerPoint[previousPoints.Count + 1];
+            for (var c = 0; c < previousPoints.Count; c++)
+            {
+                var pt = previousPoints[c];
+                var pointProperties = new PointerPointProperties(_properties, pt);
+                points[c] = new PointerPoint(Pointer, GetPosition(pt.Position, relativeTo), pointProperties);
+            }
+
+            points[points.Length - 1] = GetCurrentPoint(relativeTo);
+            return points;
+        }
+
+        /// <summary>
+        /// Returns the current pointer point properties
+        /// </summary>
+        protected PointerPointProperties Properties => _properties;
+    }
+    
+    public enum MouseButton
+    {
+        None,
+        Left,
+        Right,
+        Middle,
+        XButton1,
+        XButton2
+    }
+
+    public class PointerPressedEventArgs : PointerEventArgs
+    {
+        internal PointerPressedEventArgs(
+            IInteractive source,
+            IPointer pointer,
+            IVisual rootVisual, Point rootVisualPosition,
+            ulong timestamp,
+            PointerPointProperties properties,
+            KeyModifiers modifiers,
+            int clickCount = 1)
+            : base(InputElement.PointerPressedEvent, source, pointer, rootVisual, rootVisualPosition,
+                timestamp, properties, modifiers)
+        {
+            ClickCount = clickCount;
+        }
+
+        public int ClickCount { get; }
+    }
+
+    public class PointerReleasedEventArgs : PointerEventArgs
+    {
+        internal PointerReleasedEventArgs(
+            IInteractive source, IPointer pointer,
+            IVisual rootVisual, Point rootVisualPosition, ulong timestamp,
+            PointerPointProperties properties, KeyModifiers modifiers,
+            MouseButton initialPressMouseButton)
+            : base(InputElement.PointerReleasedEvent, source, pointer, rootVisual, rootVisualPosition,
+                timestamp, properties, modifiers)
+        {
+            InitialPressMouseButton = initialPressMouseButton;
+        }
+
+        /// <summary>
+        /// Gets the mouse button that triggered the corresponding PointerPressed event
+        /// </summary>
+        public MouseButton InitialPressMouseButton { get; }
+    }
+
+    public class PointerCaptureLostEventArgs : RoutedEventArgs
+    {
+        public IPointer Pointer { get; }
+
+        internal PointerCaptureLostEventArgs(IInteractive source, IPointer pointer) : base(InputElement.PointerCaptureLostEvent)
+        {
+            Pointer = pointer;
+            Source = source;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/PointerOverPreProcessor.cs b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
new file mode 100644
index 0000000000..e367f9f74f
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
@@ -0,0 +1,213 @@
+using System;
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Input
+{
+    internal class PointerOverPreProcessor : IObserver<RawInputEventArgs>
+    {
+        private IPointerDevice? _lastActivePointerDevice;
+        private (IPointer pointer, PixelPoint position)? _lastPointer;
+
+        private readonly IInputRoot _inputRoot;
+
+        public PointerOverPreProcessor(IInputRoot inputRoot)
+        {
+            _inputRoot = inputRoot ?? throw new ArgumentNullException(nameof(inputRoot));
+        }
+
+        public PixelPoint? LastPosition => _lastPointer?.position;
+        
+        public void OnCompleted()
+        {
+            ClearPointerOver();
+        }
+
+        public void OnError(Exception error)
+        {
+        }
+
+        public void OnNext(RawInputEventArgs value)
+        {
+            if (value is RawPointerEventArgs args
+                && args.Root == _inputRoot
+                && value.Device is IPointerDevice pointerDevice)
+            {
+                if (pointerDevice != _lastActivePointerDevice)
+                {
+                    ClearPointerOver();
+
+                    // Set last active device before processing input, because ClearPointerOver might be called and clear last device.
+                    _lastActivePointerDevice = pointerDevice;
+                }
+
+                if (args.Type is RawPointerEventType.LeaveWindow or RawPointerEventType.NonClientLeftButtonDown
+                    && _lastPointer is (var lastPointer, var lastPosition))
+                {
+                    _lastPointer = null;
+                    ClearPointerOver(lastPointer, args.Root, 0, args.Root.PointToClient(lastPosition),
+                        new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind()),
+                        args.InputModifiers.ToKeyModifiers());
+                }
+                else if (pointerDevice.TryGetPointer(args) is IPointer pointer
+                    && pointer.Type != PointerType.Touch)
+                {
+                    var element = pointer.Captured ?? args.InputHitTestResult;
+
+                    SetPointerOver(pointer, args.Root, element, args.Timestamp, args.Position,
+                        new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind()),
+                        args.InputModifiers.ToKeyModifiers());
+                }
+            }
+        }
+
+        public void SceneInvalidated(Rect dirtyRect)
+        {
+            if (_lastPointer is (var pointer, var position))
+            {
+                var clientPoint = _inputRoot.PointToClient(position);
+
+                if (dirtyRect.Contains(clientPoint))
+                {
+                    var element = pointer.Captured ?? _inputRoot.InputHitTest(clientPoint);
+                    SetPointerOver(pointer, _inputRoot, element, 0, clientPoint, PointerPointProperties.None, KeyModifiers.None);
+                }
+                else if (!_inputRoot.Bounds.Contains(clientPoint))
+                {
+                    ClearPointerOver(pointer, _inputRoot, 0, clientPoint, PointerPointProperties.None, KeyModifiers.None);
+                }
+            }
+        }
+
+        private void ClearPointerOver()
+        {
+            if (_lastPointer is (var pointer, var position))
+            {
+                var clientPoint = _inputRoot.PointToClient(position);
+                ClearPointerOver(pointer, _inputRoot, 0, clientPoint, PointerPointProperties.None, KeyModifiers.None);
+            }
+            _lastPointer = null;
+            _lastActivePointerDevice = null;
+        }
+
+        private void ClearPointerOver(IPointer pointer, IInputRoot root,
+            ulong timestamp, Point? position, PointerPointProperties properties, KeyModifiers inputModifiers)
+        {
+            var element = root.PointerOverElement;
+            if (element is null)
+            {
+                return;
+            }
+
+            // Do not pass rootVisual, when we have unknown position,
+            // so GetPosition won't return invalid values.
+            var e = new PointerEventArgs(InputElement.PointerExitedEvent, element, pointer,
+                position.HasValue ? root : null, position.HasValue ? position.Value : default,
+                timestamp, properties, inputModifiers);
+
+            if (element != null && !element.IsAttachedToVisualTree)
+            {
+                // element has been removed from visual tree so do top down cleanup
+                if (root.IsPointerOver)
+                {
+                    ClearChildrenPointerOver(e, root, true);
+                }
+            }
+            while (element != null)
+            {
+                e.Source = element;
+                e.Handled = false;
+                element.RaiseEvent(e);
+                element = (IInputElement?)element.VisualParent;
+            }
+
+            root.PointerOverElement = null;
+            _lastActivePointerDevice = null;
+            _lastPointer = null;
+        }
+
+        private void ClearChildrenPointerOver(PointerEventArgs e, IInputElement element, bool clearRoot)
+        {
+            foreach (IInputElement el in element.VisualChildren)
+            {
+                if (el.IsPointerOver)
+                {
+                    ClearChildrenPointerOver(e, el, true);
+                    break;
+                }
+            }
+            if (clearRoot)
+            {
+                e.Source = element;
+                e.Handled = false;
+                element.RaiseEvent(e);
+            }
+        }
+
+        private void SetPointerOver(IPointer pointer, IInputRoot root, IInputElement? element,
+            ulong timestamp, Point position, PointerPointProperties properties, KeyModifiers inputModifiers)
+        {
+            var pointerOverElement = root.PointerOverElement;
+
+            if (element != pointerOverElement)
+            {
+                if (element != null)
+                {
+                    SetPointerOverToElement(pointer, root, element, timestamp, position, properties, inputModifiers);
+                }
+                else
+                {
+                    ClearPointerOver(pointer, root, timestamp, position, properties, inputModifiers);
+                }
+            }
+
+            _lastPointer = (pointer, root.PointToScreen(position));
+        }
+
+        private void SetPointerOverToElement(IPointer pointer, IInputRoot root, IInputElement element,
+            ulong timestamp, Point position, PointerPointProperties properties, KeyModifiers inputModifiers)
+        {
+            IInputElement? branch = null;
+
+            IInputElement? el = element;
+
+            while (el != null)
+            {
+                if (el.IsPointerOver)
+                {
+                    branch = el;
+                    break;
+                }
+                el = (IInputElement?)el.VisualParent;
+            }
+
+            el = root.PointerOverElement;
+
+            var e = new PointerEventArgs(InputElement.PointerExitedEvent, el, pointer, root, position,
+                timestamp, properties, inputModifiers);
+            if (el != null && branch != null && !el.IsAttachedToVisualTree)
+            {
+                ClearChildrenPointerOver(e, branch, false);
+            }
+
+            while (el != null && el != branch)
+            {
+                e.Source = el;
+                e.Handled = false;
+                el.RaiseEvent(e);
+                el = (IInputElement?)el.VisualParent;
+            }
+
+            el = root.PointerOverElement = element;
+
+            e.RoutedEvent = InputElement.PointerEnteredEvent;
+
+            while (el != null && el != branch)
+            {
+                e.Source = el;
+                e.Handled = false;
+                el.RaiseEvent(e);
+                el = (IInputElement?)el.VisualParent;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/PointerPoint.cs b/src/Avalonia.Base/Input/PointerPoint.cs
new file mode 100644
index 0000000000..c51f286053
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerPoint.cs
@@ -0,0 +1,219 @@
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Provides basic properties for the input pointer associated with a single mouse, pen/stylus, or touch contact.
+    /// </summary>
+    public struct PointerPoint
+    {
+        public PointerPoint(IPointer pointer, Point position, PointerPointProperties properties)
+        {
+            Pointer = pointer;
+            Position = position;
+            Properties = properties;
+        }
+
+        /// <summary>
+        /// Gets specific pointer generated by input device.
+        /// </summary>
+        public IPointer Pointer { get; }
+
+        /// <summary>
+        /// Gets extended information about the input pointer.
+        /// </summary>
+        public PointerPointProperties Properties { get; }
+
+        /// <summary>
+        /// Gets the location of the pointer input in client coordinates.
+        /// </summary>
+        public Point Position { get; }
+    }
+
+    /// <summary>
+    /// Provides extended properties for a PointerPoint object.
+    /// </summary>
+    public struct PointerPointProperties
+    {
+        /// <summary>
+        /// Gets a value that indicates whether the pointer input was triggered by the primary action mode of an input device.
+        /// </summary>
+        public bool IsLeftButtonPressed { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the pointer input was triggered by the tertiary action mode of an input device.
+        /// </summary>
+        public bool IsMiddleButtonPressed { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the pointer input was triggered by the secondary action mode (if supported) of an input device.
+        /// </summary>
+        public bool IsRightButtonPressed { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the pointer input was triggered by the first extended mouse button (XButton1).
+        /// </summary>
+        public bool IsXButton1Pressed { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the pointer input was triggered by the second extended mouse button (XButton2).
+        /// </summary>
+        public bool IsXButton2Pressed { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the barrel button of the pen/stylus device is pressed.
+        /// </summary>
+        public bool IsBarrelButtonPressed { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the input is from a pen eraser.
+        /// </summary>
+        public bool IsEraser { get; } = false;
+
+        /// <summary>
+        /// Gets a value that indicates whether the digitizer pen is inverted.
+        /// </summary>
+        public bool IsInverted { get; } = false;
+
+        /// <summary>
+        /// Gets the clockwise rotation in degrees of a pen device around its own major axis (such as when the user spins the pen in their fingers).
+        /// </summary>
+        /// <returns>
+        /// A value between 0.0 and 359.0 in degrees of rotation. The default value is 0.0.
+        /// </returns>
+        public float Twist { get; } = 0.0F;
+
+        /// <summary>
+        /// Gets a value that indicates the force that the pointer device (typically a pen/stylus) exerts on the surface of the digitizer.
+        /// </summary>
+        /// <returns>
+        /// A value from 0 to 1.0. The default value is 0.5.
+        /// </returns>
+        public float Pressure { get; } = 0.5f;
+
+        /// <summary>
+        /// Gets the plane angle between the Y-Z plane and the plane that contains the Y axis and the axis of the input device (typically a pen/stylus).
+        /// </summary>
+        /// <returns>
+        /// The value is 0.0 when the finger or pen is perpendicular to the digitizer surface, between 0.0 and 90.0 when tilted to the right of perpendicular, and between 0.0 and -90.0 when tilted to the left of perpendicular. The default value is 0.0.
+        /// </returns>
+        public float XTilt { get; } = 0.0F;
+
+        /// <summary>
+        /// Gets the plane angle between the X-Z plane and the plane that contains the X axis and the axis of the input device (typically a pen/stylus).
+        /// </summary>
+        /// <returns>
+        /// The value is 0.0 when the finger or pen is perpendicular to the digitizer surface, between 0.0 and 90.0 when tilted towards the user, and between 0.0 and -90.0 when tilted away from the user. The default value is 0.0.
+        /// </returns>
+        public float YTilt { get; } = 0.0F;
+
+        /// <summary>
+        /// Gets the kind of pointer state change.
+        /// </summary>
+        public PointerUpdateKind PointerUpdateKind { get; } = PointerUpdateKind.LeftButtonPressed;
+
+        public PointerPointProperties()
+        {
+        }
+
+        public PointerPointProperties(RawInputModifiers modifiers, PointerUpdateKind kind)
+        {
+            PointerUpdateKind = kind;
+
+            IsLeftButtonPressed = modifiers.HasAllFlags(RawInputModifiers.LeftMouseButton);
+            IsMiddleButtonPressed = modifiers.HasAllFlags(RawInputModifiers.MiddleMouseButton);
+            IsRightButtonPressed = modifiers.HasAllFlags(RawInputModifiers.RightMouseButton);
+            IsXButton1Pressed = modifiers.HasAllFlags(RawInputModifiers.XButton1MouseButton);
+            IsXButton2Pressed = modifiers.HasAllFlags(RawInputModifiers.XButton2MouseButton);
+            IsInverted = modifiers.HasAllFlags(RawInputModifiers.PenInverted);
+            IsEraser = modifiers.HasAllFlags(RawInputModifiers.PenEraser);
+            IsBarrelButtonPressed = modifiers.HasAllFlags(RawInputModifiers.PenBarrelButton);
+
+            // The underlying input source might be reporting the previous state,
+            // so make sure that we reflect the current state
+
+            if (kind == PointerUpdateKind.LeftButtonPressed)
+                IsLeftButtonPressed = true;
+            if (kind == PointerUpdateKind.LeftButtonReleased)
+                IsLeftButtonPressed = false;
+            if (kind == PointerUpdateKind.MiddleButtonPressed)
+                IsMiddleButtonPressed = true;
+            if (kind == PointerUpdateKind.MiddleButtonReleased)
+                IsMiddleButtonPressed = false;
+            if (kind == PointerUpdateKind.RightButtonPressed)
+                IsRightButtonPressed = true;
+            if (kind == PointerUpdateKind.RightButtonReleased)
+                IsRightButtonPressed = false;
+            if (kind == PointerUpdateKind.XButton1Pressed)
+                IsXButton1Pressed = true;
+            if (kind == PointerUpdateKind.XButton1Released)
+                IsXButton1Pressed = false;
+            if (kind == PointerUpdateKind.XButton2Pressed)
+                IsXButton2Pressed = true;
+            if (kind == PointerUpdateKind.XButton2Released)
+                IsXButton2Pressed = false;
+        }
+
+        public PointerPointProperties(RawInputModifiers modifiers, PointerUpdateKind kind,
+            float twist, float pressure, float xTilt, float yTilt
+            ) : this (modifiers, kind)
+        {
+            Twist = twist;
+            Pressure = pressure;
+            XTilt = xTilt;
+            YTilt = yTilt;
+        }
+
+        internal PointerPointProperties(PointerPointProperties basedOn, RawPointerPoint rawPoint)
+        {
+            IsLeftButtonPressed = basedOn.IsLeftButtonPressed;
+            IsMiddleButtonPressed = basedOn.IsMiddleButtonPressed;
+            IsRightButtonPressed = basedOn.IsRightButtonPressed;
+            IsXButton1Pressed = basedOn.IsXButton1Pressed;
+            IsXButton2Pressed = basedOn.IsXButton2Pressed;
+            IsInverted = basedOn.IsInverted;
+            IsEraser = basedOn.IsEraser;
+            IsBarrelButtonPressed = basedOn.IsBarrelButtonPressed;
+
+            Twist = rawPoint.Twist;
+            Pressure = rawPoint.Pressure;
+            XTilt = rawPoint.XTilt;
+            YTilt = rawPoint.YTilt;
+        }
+
+        public static PointerPointProperties None { get; } = new PointerPointProperties();
+    }
+
+    public enum PointerUpdateKind
+    {
+        LeftButtonPressed,
+        MiddleButtonPressed,
+        RightButtonPressed,
+        XButton1Pressed,
+        XButton2Pressed,
+        LeftButtonReleased,
+        MiddleButtonReleased,
+        RightButtonReleased,
+        XButton1Released,
+        XButton2Released,
+        Other
+    }
+
+    public static class PointerUpdateKindExtensions
+    {
+        public static MouseButton GetMouseButton(this PointerUpdateKind kind)
+        {
+            if (kind == PointerUpdateKind.LeftButtonPressed || kind == PointerUpdateKind.LeftButtonReleased)
+                return MouseButton.Left;
+            if (kind == PointerUpdateKind.MiddleButtonPressed || kind == PointerUpdateKind.MiddleButtonReleased)
+                return MouseButton.Middle;
+            if (kind == PointerUpdateKind.RightButtonPressed || kind == PointerUpdateKind.RightButtonReleased)
+                return MouseButton.Right;
+            if (kind == PointerUpdateKind.XButton1Pressed || kind == PointerUpdateKind.XButton1Released)
+                return MouseButton.XButton1;
+            if (kind == PointerUpdateKind.XButton2Pressed || kind == PointerUpdateKind.XButton2Released)
+                return MouseButton.XButton2;
+            return MouseButton.None;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
new file mode 100644
index 0000000000..dbc06ec934
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
@@ -0,0 +1,19 @@
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class PointerWheelEventArgs : PointerEventArgs
+    {
+        public Vector Delta { get; set; }
+
+        internal PointerWheelEventArgs(IInteractive source, IPointer pointer, IVisual rootVisual,
+            Point rootVisualPosition, ulong timestamp,
+            PointerPointProperties properties, KeyModifiers modifiers, Vector delta) 
+            : base(InputElement.PointerWheelChangedEvent, source, pointer, rootVisual, rootVisualPosition,
+                timestamp, properties, modifiers)
+        {
+            Delta = delta;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/Raw/IDragDropDevice.cs b/src/Avalonia.Base/Input/Raw/IDragDropDevice.cs
new file mode 100644
index 0000000000..3bcc9fadd3
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/IDragDropDevice.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.Raw
+{
+    [NotClientImplementable]
+    public interface IDragDropDevice : IInputDevice
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Input/Raw/RawDragEvent.cs b/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
new file mode 100644
index 0000000000..c903aad684
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Avalonia.Input.Raw
+{
+    public class RawDragEvent : RawInputEventArgs
+    {
+        public Point Location { get; set; }
+        public IDataObject Data { get; }
+        public DragDropEffects Effects { get; set; }
+        public RawDragEventType Type { get; }
+        public KeyModifiers KeyModifiers { get; }
+
+        public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
+            IInputRoot root, Point location, IDataObject data, DragDropEffects effects, RawInputModifiers modifiers)
+            :base(inputDevice, 0, root)
+        {
+            Type = type;
+            Location = location;
+            Data = data;
+            Effects = effects;
+            KeyModifiers = modifiers.ToKeyModifiers();
+        }
+    }
+}
diff --git a/src/Avalonia.Input/Raw/RawDragEventType.cs b/src/Avalonia.Base/Input/Raw/RawDragEventType.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawDragEventType.cs
rename to src/Avalonia.Base/Input/Raw/RawDragEventType.cs
diff --git a/src/Avalonia.Input/Raw/RawInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawInputEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawInputEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawInputEventArgs.cs
diff --git a/src/Avalonia.Base/Input/Raw/RawInputHelpers.cs b/src/Avalonia.Base/Input/Raw/RawInputHelpers.cs
new file mode 100644
index 0000000000..9d329bae59
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawInputHelpers.cs
@@ -0,0 +1,27 @@
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Input
+{
+    internal static class RawInputHelpers
+    {
+        public static KeyModifiers ToKeyModifiers(this RawInputModifiers modifiers) =>
+            (KeyModifiers)(modifiers & RawInputModifiers.KeyboardMask);
+
+        public static PointerUpdateKind ToUpdateKind(this RawPointerEventType type) => type switch
+        {
+            RawPointerEventType.LeftButtonDown => PointerUpdateKind.LeftButtonPressed,
+            RawPointerEventType.LeftButtonUp => PointerUpdateKind.LeftButtonReleased,
+            RawPointerEventType.RightButtonDown => PointerUpdateKind.RightButtonPressed,
+            RawPointerEventType.RightButtonUp => PointerUpdateKind.RightButtonReleased,
+            RawPointerEventType.MiddleButtonDown => PointerUpdateKind.MiddleButtonPressed,
+            RawPointerEventType.MiddleButtonUp => PointerUpdateKind.MiddleButtonReleased,
+            RawPointerEventType.XButton1Down => PointerUpdateKind.XButton1Pressed,
+            RawPointerEventType.XButton1Up => PointerUpdateKind.XButton1Released,
+            RawPointerEventType.XButton2Down => PointerUpdateKind.XButton2Pressed,
+            RawPointerEventType.XButton2Up => PointerUpdateKind.XButton2Released,
+            RawPointerEventType.TouchBegin => PointerUpdateKind.LeftButtonPressed,
+            RawPointerEventType.TouchEnd => PointerUpdateKind.LeftButtonReleased,
+            _ => PointerUpdateKind.Other
+        };
+    }
+}
diff --git a/src/Avalonia.Input/Raw/RawKeyEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawKeyEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawMouseWheelEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawMouseWheelEventArgs.cs
diff --git a/src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs
new file mode 100644
index 0000000000..b8f6f99ae8
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Input.Raw
+{
+    public enum RawPointerEventType
+    {
+        LeaveWindow,
+        LeftButtonDown,
+        LeftButtonUp,
+        RightButtonDown,
+        RightButtonUp,
+        MiddleButtonDown,
+        MiddleButtonUp,
+        XButton1Down,
+        XButton1Up,
+        XButton2Down,
+        XButton2Up,
+        Move,
+        Wheel,
+        NonClientLeftButtonDown,
+        TouchBegin,
+        TouchUpdate,
+        TouchEnd,
+        TouchCancel,
+        Magnify,
+        Rotate,
+        Swipe
+    }
+
+    /// <summary>
+    /// A raw mouse event.
+    /// </summary>
+    public class RawPointerEventArgs : RawInputEventArgs
+    {
+        private RawPointerPoint _point;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
+        /// </summary>
+        /// <param name="device">The associated device.</param>
+        /// <param name="timestamp">The event timestamp.</param>
+        /// <param name="root">The root from which the event originates.</param>
+        /// <param name="type">The type of the event.</param>
+        /// <param name="position">The mouse position, in client DIPs.</param>
+        /// <param name="inputModifiers">The input modifiers.</param>
+        public RawPointerEventArgs(
+            IInputDevice device,
+            ulong timestamp,
+            IInputRoot root,
+            RawPointerEventType type,
+            Point position, 
+            RawInputModifiers inputModifiers)
+            : base(device, timestamp, root)
+        {
+            Contract.Requires<ArgumentNullException>(device != null);
+            Contract.Requires<ArgumentNullException>(root != null);
+
+            Point = new RawPointerPoint();
+            Position = position;
+            Type = type;
+            InputModifiers = inputModifiers;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
+        /// </summary>
+        /// <param name="device">The associated device.</param>
+        /// <param name="timestamp">The event timestamp.</param>
+        /// <param name="root">The root from which the event originates.</param>
+        /// <param name="type">The type of the event.</param>
+        /// <param name="point">The point properties and position, in client DIPs.</param>
+        /// <param name="inputModifiers">The input modifiers.</param>
+        public RawPointerEventArgs(
+            IInputDevice device,
+            ulong timestamp,
+            IInputRoot root,
+            RawPointerEventType type,
+            RawPointerPoint point, 
+            RawInputModifiers inputModifiers)
+            : base(device, timestamp, root)
+        {
+            Contract.Requires<ArgumentNullException>(device != null);
+            Contract.Requires<ArgumentNullException>(root != null);
+
+            Point = point;
+            Type = type;
+            InputModifiers = inputModifiers;
+        }
+
+        /// <summary>
+        /// Gets the raw pointer identifier.
+        /// </summary>
+        public long RawPointerId { get; set; }
+
+        /// <summary>
+        /// Gets the pointer properties and position, in client DIPs.
+        /// </summary>
+        public RawPointerPoint Point
+        {
+            get => _point;
+            set => _point = value;
+        }
+
+        /// <summary>
+        /// Gets the mouse position, in client DIPs.
+        /// </summary>
+        public Point Position
+        {
+            get => _point.Position;
+            set => _point.Position = value;
+        }
+
+        /// <summary>
+        /// Gets the type of the event.
+        /// </summary>
+        public RawPointerEventType Type { get; set; }
+
+        /// <summary>
+        /// Gets the input modifiers.
+        /// </summary>
+        public RawInputModifiers InputModifiers { get; set; }
+        
+        /// <summary>
+        /// Points that were traversed by a pointer since the previous relevant event,
+        /// only valid for Move and TouchUpdate
+        /// </summary>
+        public Lazy<IReadOnlyList<RawPointerPoint>?>? IntermediatePoints { get; set; }
+
+        internal IInputElement? InputHitTestResult { get; set; }
+    }
+
+    public struct RawPointerPoint
+    {
+        /// <summary>
+        /// Pointer position, in client DIPs.
+        /// </summary>
+        public Point Position { get; set; }
+
+        /// <inheritdoc cref="PointerPointProperties.Twist" />
+        public float Twist { get; set; }
+        /// <inheritdoc cref="PointerPointProperties.Pressure" />
+        public float Pressure { get; set; }
+        /// <inheritdoc cref="PointerPointProperties.XTilt" />
+        public float XTilt { get; set; }
+        /// <inheritdoc cref="PointerPointProperties.YTilt" />
+        public float YTilt { get; set; }
+
+
+        public RawPointerPoint()
+        {
+            this = default;
+            Pressure = 0.5f;
+        }
+    }
+}
diff --git a/src/Avalonia.Input/Raw/RawPointerGestureEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawPointerGestureEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawPointerGestureEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawPointerGestureEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawSizeEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawSizeEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawSizeEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawSizeEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawTextInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawTextInputEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
diff --git a/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
new file mode 100644
index 0000000000..3e842e6e3f
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace Avalonia.Input.Raw
+{
+    public class RawTouchEventArgs : RawPointerEventArgs
+    {
+        public RawTouchEventArgs(IInputDevice device, ulong timestamp, IInputRoot root,
+            RawPointerEventType type, Point position, RawInputModifiers inputModifiers,
+            long rawPointerId) 
+            : base(device, timestamp, root, type, position, inputModifiers)
+        {
+            RawPointerId = rawPointerId;
+        }
+
+        public RawTouchEventArgs(IInputDevice device, ulong timestamp, IInputRoot root,
+            RawPointerEventType type, RawPointerPoint point, RawInputModifiers inputModifiers,
+            long rawPointerId)
+            : base(device, timestamp, root, type, point, inputModifiers)
+        {
+            RawPointerId = rawPointerId;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
new file mode 100644
index 0000000000..fd1d0f42c3
--- /dev/null
+++ b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
@@ -0,0 +1,29 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    public class ScrollGestureEventArgs : RoutedEventArgs
+    {
+        public int Id { get; }
+        public Vector Delta { get; }
+        private static int _nextId = 1;
+
+        public static int GetNextFreeId() => _nextId++;
+
+        internal ScrollGestureEventArgs(int id, Vector delta) : base(Gestures.ScrollGestureEvent)
+        {
+            Id = id;
+            Delta = delta;
+        }
+    }
+
+    public class ScrollGestureEndedEventArgs : RoutedEventArgs
+    {
+        public int Id { get; }
+
+        internal ScrollGestureEndedEventArgs(int id) : base(Gestures.ScrollGestureEndedEvent)
+        {
+            Id = id;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TappedEventArgs.cs b/src/Avalonia.Base/Input/TappedEventArgs.cs
new file mode 100644
index 0000000000..8af6164fc1
--- /dev/null
+++ b/src/Avalonia.Base/Input/TappedEventArgs.cs
@@ -0,0 +1,22 @@
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class TappedEventArgs : RoutedEventArgs
+    {
+        private readonly PointerEventArgs lastPointerEventArgs;
+
+        internal TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
+            : base(routedEvent)
+        {
+            this.lastPointerEventArgs = lastPointerEventArgs;
+        }
+
+        public IPointer Pointer => lastPointerEventArgs.Pointer;
+        public KeyModifiers KeyModifiers => lastPointerEventArgs.KeyModifiers;
+        public ulong Timestamp => lastPointerEventArgs.Timestamp;
+        
+        public Point GetPosition(IVisual? relativeTo) => lastPointerEventArgs.GetPosition(relativeTo);
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs b/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
new file mode 100644
index 0000000000..325d745782
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
@@ -0,0 +1,55 @@
+using System;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input.TextInput
+{
+    public interface ITextInputMethodClient
+    {
+        /// <summary>
+        /// The cursor rectangle relative to the TextViewVisual
+        /// </summary>
+        Rect CursorRectangle { get; }
+        /// <summary>
+        /// Should be fired when cursor rectangle is changed inside the TextViewVisual
+        /// </summary>
+        event EventHandler? CursorRectangleChanged;
+        /// <summary>
+        /// The visual that's showing the text
+        /// </summary>
+        IVisual TextViewVisual { get; }
+        /// <summary>
+        /// Should be fired when text-hosting visual is changed
+        /// </summary>
+        event EventHandler? TextViewVisualChanged;
+        /// <summary>
+        /// Indicates if TextViewVisual is capable of displaying non-committed input on the cursor position
+        /// </summary>
+        bool SupportsPreedit { get; }
+        /// <summary>
+        /// Sets the non-committed input string
+        /// </summary>
+        void SetPreeditText(string? text);
+
+        /// <summary>
+        /// Indicates if text input client is capable of providing the text around the cursor
+        /// </summary>
+        bool SupportsSurroundingText { get; }
+        /// <summary>
+        /// Returns the text around the cursor, usually the current paragraph, the cursor position inside that text and selection start position
+        /// </summary>
+        TextInputMethodSurroundingText SurroundingText { get; }
+        /// <summary>
+        /// Should be fired when surrounding text changed
+        /// </summary>
+        event EventHandler? SurroundingTextChanged;
+
+        void SelectInSurroundingText(int start, int end);
+    }
+
+    public struct TextInputMethodSurroundingText
+    {
+        public string Text { get; set; }
+        public int CursorOffset { get; set; }
+        public int AnchorOffset { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/ITextInputMethodImpl.cs b/src/Avalonia.Base/Input/TextInput/ITextInputMethodImpl.cs
new file mode 100644
index 0000000000..be7ad81f81
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/ITextInputMethodImpl.cs
@@ -0,0 +1,19 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.TextInput
+{
+    [Unstable]
+    public interface ITextInputMethodImpl
+    {
+        void SetClient(ITextInputMethodClient? client);
+        void SetCursorRect(Rect rect);
+        void SetOptions(TextInputOptions options);
+        void Reset();
+    }
+    
+    [NotClientImplementable]
+    public interface ITextInputMethodRoot : IInputRoot
+    {
+        ITextInputMethodImpl? InputMethod { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/InputMethodManager.cs b/src/Avalonia.Base/Input/TextInput/InputMethodManager.cs
new file mode 100644
index 0000000000..4734224da4
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/InputMethodManager.cs
@@ -0,0 +1,129 @@
+using System;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input.TextInput
+{
+    internal class TextInputMethodManager
+    {
+        private ITextInputMethodImpl? _im;
+        private IInputElement? _focusedElement;
+        private ITextInputMethodClient? _client;
+        private readonly TransformTrackingHelper _transformTracker = new TransformTrackingHelper();
+
+        public TextInputMethodManager()
+        {
+            _transformTracker.MatrixChanged += UpdateCursorRect;
+            InputMethod.IsInputMethodEnabledProperty.Changed.Subscribe(OnIsInputMethodEnabledChanged);
+        }
+
+        private ITextInputMethodClient? Client
+        {
+            get => _client;
+            set
+            {
+                if(_client == value)
+                    return;
+                if (_client != null)
+                {
+                    _client.CursorRectangleChanged -= OnCursorRectangleChanged;
+                    _client.TextViewVisualChanged -= OnTextViewVisualChanged;
+                }
+
+                _client = value;
+                
+                if (_client != null)
+                {
+                    _client.CursorRectangleChanged += OnCursorRectangleChanged;
+                    _client.TextViewVisualChanged += OnTextViewVisualChanged;
+
+                    _im?.Reset();
+                    
+                    if (_focusedElement is StyledElement target)
+                    {
+                        _im?.SetOptions(TextInputOptions.FromStyledElement(target));
+                    }
+                    else
+                    {
+                        _im?.SetOptions(TextInputOptions.Default);
+                    }
+
+                    _transformTracker.SetVisual(_client?.TextViewVisual);
+                    UpdateCursorRect();
+                    
+                    _im?.SetClient(_client);
+                }
+                else
+                {
+                    _im?.SetClient(null);
+                    _transformTracker.SetVisual(null);
+                }
+            }
+        }
+
+        private void OnIsInputMethodEnabledChanged(AvaloniaPropertyChangedEventArgs<bool> obj)
+        {
+            if (ReferenceEquals(obj.Sender, _focusedElement))
+            {
+                TryFindAndApplyClient();
+            }
+        }
+
+        private void OnTextViewVisualChanged(object? sender, EventArgs e) 
+            => _transformTracker.SetVisual(_client?.TextViewVisual);
+
+        private void UpdateCursorRect()
+        {
+            if (_im == null || _client == null || _focusedElement?.VisualRoot == null)
+                return;
+
+            var transform = _focusedElement.TransformToVisual(_focusedElement.VisualRoot);
+            if (transform == null)
+                _im.SetCursorRect(default);
+            else
+                _im.SetCursorRect(_client.CursorRectangle.TransformToAABB(transform.Value));
+        }
+
+        private void OnCursorRectangleChanged(object? sender, EventArgs e)
+        {
+            if (sender == _client)
+                UpdateCursorRect();
+        }
+        
+        public void SetFocusedElement(IInputElement? element)
+        {
+            if(_focusedElement == element)
+                return;
+            _focusedElement = element;
+
+            var inputMethod = (element?.VisualRoot as ITextInputMethodRoot)?.InputMethod;
+
+            if (_im != inputMethod)
+            {
+                _im?.SetClient(null);
+            }
+            
+            _im = inputMethod;
+
+            TryFindAndApplyClient();
+        }
+
+        private void TryFindAndApplyClient()
+        {
+            if (_focusedElement is not InputElement focused ||
+                _im == null ||
+                !InputMethod.GetIsInputMethodEnabled(focused))
+            {
+                Client = null;
+                return;
+            }
+
+            var clientQuery = new TextInputMethodClientRequestedEventArgs
+            {
+                RoutedEvent = InputElement.TextInputMethodClientRequestedEvent
+            };
+
+            _focusedElement.RaiseEvent(clientQuery);
+            Client = clientQuery.Client;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/TextInputContentType.cs b/src/Avalonia.Base/Input/TextInput/TextInputContentType.cs
new file mode 100644
index 0000000000..02a9385354
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/TextInputContentType.cs
@@ -0,0 +1,62 @@
+namespace Avalonia.Input.TextInput
+{   
+    public enum TextInputContentType
+    {
+        /// <summary>
+        /// Default keyboard for the users configured input method.
+        /// </summary>
+        Normal = 0,
+        
+        /// <summary>
+        /// Display a keyboard that only has alphabetic characters.
+        /// </summary>
+        Alpha,
+        
+        /// <summary>
+        /// Display a numeric keypad only capable of numbers. i.e. Phone number
+        /// </summary>
+        Digits,
+        
+        /// <summary>
+        /// Display a numeric keypad for inputting a PIN.
+        /// </summary>
+        Pin,
+        
+        /// <summary>
+        /// Display a numeric keypad capable of inputting numbers including decimal seperator and sign.
+        /// </summary>
+        Number,
+        
+        /// <summary>
+        /// Display a keyboard for entering an email address.
+        /// </summary>
+        Email,
+        
+        /// <summary>
+        /// Display a keyboard for entering a URL.
+        /// </summary>
+        Url,
+        
+        /// <summary>
+        /// Display a keyboard for entering a persons name.
+        /// </summary>
+        Name,
+        
+        /// <summary>
+        /// Display a keyboard for entering sensitive data.
+        /// </summary>
+        Password,
+        
+        /// <summary>
+        /// Display a keyboard suitable for #tag and @mentions.
+        /// Not available on all platforms, will fallback to a suitable keyboard
+        /// when not available.
+        /// </summary>
+        Social,
+        
+        /// <summary>
+        /// Display a keyboard for entering a search keyword.
+        /// </summary>
+        Search
+    }
+}
diff --git a/src/Avalonia.Input/TextInput/TextInputMethodClientRequestedEventArgs.cs b/src/Avalonia.Base/Input/TextInput/TextInputMethodClientRequestedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/TextInput/TextInputMethodClientRequestedEventArgs.cs
rename to src/Avalonia.Base/Input/TextInput/TextInputMethodClientRequestedEventArgs.cs
diff --git a/src/Avalonia.Base/Input/TextInput/TextInputOptions.cs b/src/Avalonia.Base/Input/TextInput/TextInputOptions.cs
new file mode 100644
index 0000000000..c33f5641a8
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/TextInputOptions.cs
@@ -0,0 +1,256 @@
+namespace Avalonia.Input.TextInput;
+
+public class TextInputOptions
+{
+    public static TextInputOptions FromStyledElement(StyledElement avaloniaObject)
+    {
+        var result = new TextInputOptions
+        {
+            ContentType = GetContentType(avaloniaObject),
+            ReturnKeyType = GetReturnKeyType(avaloniaObject),
+            Multiline = GetMultiline(avaloniaObject),
+            AutoCapitalization = GetAutoCapitalization(avaloniaObject),
+            IsSensitive = GetIsSensitive(avaloniaObject),
+            Lowercase = GetLowercase(avaloniaObject),
+            Uppercase = GetUppercase(avaloniaObject)
+        };
+
+        return result;
+    }
+
+    public static readonly TextInputOptions Default = new();
+    
+    /// <summary>
+    /// Defines the <see cref="ContentType"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<TextInputContentType> ContentTypeProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, TextInputContentType>(
+            "ContentType",
+            defaultValue: TextInputContentType.Normal,
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="ContentTypeProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetContentType(StyledElement avaloniaObject, TextInputContentType value)
+    {
+        avaloniaObject.SetValue(ContentTypeProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="ContentTypeProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>TextInputContentType</returns>
+    public static TextInputContentType GetContentType(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(ContentTypeProperty);
+    }
+    
+    /// <summary>
+    /// The content type (mostly for determining the shape of the virtual keyboard)
+    /// </summary>
+    public TextInputContentType ContentType { get; set; }
+    
+    
+    /// <summary>
+    /// Defines the <see cref="ReturnKeyType"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<TextInputReturnKeyType> ReturnKeyTypeProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, TextInputReturnKeyType>(
+            "ReturnKeyType",
+            defaultValue: TextInputReturnKeyType.Default,
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="ReturnKeyTypeProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetReturnKeyType(StyledElement avaloniaObject, TextInputReturnKeyType value)
+    {
+        avaloniaObject.SetValue(ReturnKeyTypeProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="ReturnKeyTypeProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>TextInputReturnKeyType</returns>
+    public static TextInputReturnKeyType GetReturnKeyType(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(ReturnKeyTypeProperty);
+    }
+    
+    /// <summary>
+    /// Determines what the Return key says and how it behaves.
+    /// </summary>
+    public TextInputReturnKeyType ReturnKeyType { get; set; }
+    
+    /// <summary>
+    /// Defines the <see cref="Multiline"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> MultilineProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "Multiline",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="MultilineProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetMultiline(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(MultilineProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="MultilineProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if multiline</returns>
+    public static bool GetMultiline(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(MultilineProperty);
+    }
+        
+    /// <summary>
+    /// Text is multiline
+    /// </summary>
+    public bool Multiline { get; set; }
+    
+    /// <summary>
+    /// Defines the <see cref="Lowercase"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> LowercaseProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "Lowercase",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="LowercaseProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetLowercase(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(LowercaseProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="LowercaseProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if Lowercase</returns>
+    public static bool GetLowercase(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(LowercaseProperty);
+    }
+        
+    /// <summary>
+    /// Text is in lower case
+    /// </summary>
+    public bool Lowercase { get; set; }
+    
+    /// <summary>
+    /// Defines the <see cref="Uppercase"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> UppercaseProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "Uppercase",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="UppercaseProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetUppercase(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(UppercaseProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="UppercaseProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if Uppercase</returns>
+    public static bool GetUppercase(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(UppercaseProperty);
+    }
+        
+    /// <summary>
+    /// Text is in upper case
+    /// </summary>
+    public bool Uppercase { get; set; }
+        
+    /// <summary>
+    /// Defines the <see cref="AutoCapitalization"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> AutoCapitalizationProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "AutoCapitalization",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="AutoCapitalizationProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetAutoCapitalization(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(AutoCapitalizationProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="AutoCapitalizationProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if AutoCapitalization</returns>
+    public static bool GetAutoCapitalization(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(AutoCapitalizationProperty);
+    }
+    
+    /// <summary>
+    /// Automatically capitalize letters at the start of the sentence
+    /// </summary>
+    public bool AutoCapitalization { get; set; }
+        
+    /// <summary>
+    /// Defines the <see cref="IsSensitive"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> IsSensitiveProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "IsSensitive",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="IsSensitiveProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetIsSensitive(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(IsSensitiveProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="IsSensitiveProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if IsSensitive</returns>
+    public static bool GetIsSensitive(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(IsSensitiveProperty);
+    }
+    
+    /// <summary>
+    /// Text contains sensitive data like card numbers and should not be stored  
+    /// </summary>
+    public bool IsSensitive { get; set; }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs b/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs
new file mode 100644
index 0000000000..bc7193eff5
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs
@@ -0,0 +1,13 @@
+namespace Avalonia.Input.TextInput;
+
+public enum TextInputReturnKeyType
+{
+    Default,
+    Return,
+    Done,
+    Go,
+    Send,
+    Search,
+    Next,
+    Previous
+}
diff --git a/src/Avalonia.Input/TextInput/TransformTrackingHelper.cs b/src/Avalonia.Base/Input/TextInput/TransformTrackingHelper.cs
similarity index 100%
rename from src/Avalonia.Input/TextInput/TransformTrackingHelper.cs
rename to src/Avalonia.Base/Input/TextInput/TransformTrackingHelper.cs
diff --git a/src/Avalonia.Base/Input/TextInputEventArgs.cs b/src/Avalonia.Base/Input/TextInputEventArgs.cs
new file mode 100644
index 0000000000..787bf1abd3
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInputEventArgs.cs
@@ -0,0 +1,15 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    public class TextInputEventArgs : RoutedEventArgs
+    {
+        internal TextInputEventArgs()
+        {
+
+        }
+        public IKeyboardDevice? Device { get; set; }
+
+        public string? Text { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
new file mode 100644
index 0000000000..c98944359d
--- /dev/null
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Handles raw touch events
+    /// </summary>
+    /// <remarks>
+    /// This class is supposed to be used on per-toplevel basis, don't use a shared one
+    /// </remarks>
+    public class TouchDevice : IPointerDevice, IDisposable
+    {
+        private readonly Dictionary<long, Pointer> _pointers = new Dictionary<long, Pointer>();
+        private bool _disposed;
+        private int _clickCount;
+        private Rect _lastClickRect;
+        private ulong _lastClickTime;
+
+        RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
+        {
+            var rv = modifiers &= RawInputModifiers.KeyboardMask;
+            if (isLeftButtonDown)
+                rv |= RawInputModifiers.LeftMouseButton;
+            return rv;
+        }
+
+        public void ProcessRawEvent(RawInputEventArgs ev)
+        {
+            if (ev.Handled || _disposed)
+                return;
+            var args = (RawPointerEventArgs)ev;
+            if (!_pointers.TryGetValue(args.RawPointerId, out var pointer))
+            {
+                if (args.Type == RawPointerEventType.TouchEnd)
+                    return;
+                var hit = args.InputHitTestResult;
+
+                _pointers[args.RawPointerId] = pointer = new Pointer(Pointer.GetNextFreeId(),
+                    PointerType.Touch, _pointers.Count == 0);
+                pointer.Capture(hit);
+            }
+
+            var target = pointer.Captured ?? args.Root;
+            var updateKind = args.Type.ToUpdateKind();
+            var keyModifier = args.InputModifiers.ToKeyModifiers();
+
+            if (args.Type == RawPointerEventType.TouchBegin)
+            {
+                if (_pointers.Count > 1)
+                {
+                    _clickCount = 1;
+                    _lastClickTime = 0;
+                    _lastClickRect = new Rect();
+                }
+                else
+                {
+                    var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
+                    var doubleClickTime = settings.GetDoubleTapTime(PointerType.Touch).TotalMilliseconds;
+                    var doubleClickSize = settings.GetDoubleTapSize(PointerType.Touch);
+
+                    if (!_lastClickRect.Contains(args.Position)
+                        || ev.Timestamp - _lastClickTime > doubleClickTime)
+                    {
+                        _clickCount = 0;
+                    }
+                    ++_clickCount;
+                    _lastClickTime = ev.Timestamp;
+                    _lastClickRect = new Rect(args.Position, new Size())
+                        .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
+                }
+
+                target.RaiseEvent(new PointerPressedEventArgs(target, pointer,
+                    args.Root, args.Position, ev.Timestamp,
+                    new PointerPointProperties(GetModifiers(args.InputModifiers, true), updateKind),
+                    keyModifier, _clickCount));
+            }
+
+            if (args.Type == RawPointerEventType.TouchEnd)
+            {
+                _pointers.Remove(args.RawPointerId);
+                using (pointer)
+                {
+                    target.RaiseEvent(new PointerReleasedEventArgs(target, pointer,
+                        args.Root, args.Position, ev.Timestamp,
+                        new PointerPointProperties(GetModifiers(args.InputModifiers, false), updateKind),
+                        keyModifier, MouseButton.Left));
+                }
+            }
+
+            if (args.Type == RawPointerEventType.TouchCancel)
+            {
+                _pointers.Remove(args.RawPointerId);
+                using (pointer)
+                    pointer.Capture(null);
+            }
+
+            if (args.Type == RawPointerEventType.TouchUpdate)
+            {
+                target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, target, pointer, args.Root,
+                    args.Position, ev.Timestamp,
+                    new PointerPointProperties(GetModifiers(args.InputModifiers, true), updateKind),
+                    keyModifier, args.IntermediatePoints));
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+            var values = _pointers.Values.ToArray();
+            _pointers.Clear();
+            _disposed = true;
+            foreach (var p in values)
+                p.Dispose();
+        }
+
+        public IPointer? TryGetPointer(RawPointerEventArgs ev)
+        {
+            return _pointers.TryGetValue(ev.RawPointerId, out var pointer)
+                ? pointer
+                : null;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/VectorEventArgs.cs b/src/Avalonia.Base/Input/VectorEventArgs.cs
new file mode 100644
index 0000000000..3e8098f904
--- /dev/null
+++ b/src/Avalonia.Base/Input/VectorEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    public class VectorEventArgs : RoutedEventArgs
+    {
+        internal VectorEventArgs()
+        {
+
+        }
+
+        public Vector Vector { get; set; }
+    }
+}
diff --git a/src/Avalonia.Interactivity/EventRoute.cs b/src/Avalonia.Base/Interactivity/EventRoute.cs
similarity index 100%
rename from src/Avalonia.Interactivity/EventRoute.cs
rename to src/Avalonia.Base/Interactivity/EventRoute.cs
diff --git a/src/Avalonia.Base/Interactivity/IInteractive.cs b/src/Avalonia.Base/Interactivity/IInteractive.cs
new file mode 100644
index 0000000000..980bf54f1f
--- /dev/null
+++ b/src/Avalonia.Base/Interactivity/IInteractive.cs
@@ -0,0 +1,53 @@
+using System;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Interactivity
+{
+    /// <summary>
+    /// Interface for objects that raise routed events.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInteractive
+    {
+        /// <summary>
+        /// Gets the interactive parent of the object for bubbling and tunneling events.
+        /// </summary>
+        IInteractive? InteractiveParent { get; }
+
+        /// <summary>
+        /// Adds a handler for the specified routed event.
+        /// </summary>
+        /// <param name="routedEvent">The routed event.</param>
+        /// <param name="handler">The handler.</param>
+        /// <param name="routes">The routing strategies to listen to.</param>
+        /// <param name="handledEventsToo">Whether handled events should also be listened for.</param>
+        /// <returns>A disposable that terminates the event subscription.</returns>
+        void AddHandler(
+            RoutedEvent routedEvent,
+            Delegate handler,
+            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
+            bool handledEventsToo = false);
+
+        /// <summary>
+        /// Removes a handler for the specified routed event.
+        /// </summary>
+        /// <param name="routedEvent">The routed event.</param>
+        /// <param name="handler">The handler.</param>
+        void RemoveHandler(RoutedEvent routedEvent, Delegate handler);
+
+        /// <summary>
+        /// Adds the object's handlers for a routed event to an event route.
+        /// </summary>
+        /// <param name="routedEvent">The event.</param>
+        /// <param name="route">The event route.</param>
+        void AddToEventRoute(RoutedEvent routedEvent, EventRoute route);
+
+        /// <summary>
+        /// Raises a routed event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        void RaiseEvent(RoutedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Interactivity/Interactive.cs b/src/Avalonia.Base/Interactivity/Interactive.cs
similarity index 100%
rename from src/Avalonia.Interactivity/Interactive.cs
rename to src/Avalonia.Base/Interactivity/Interactive.cs
diff --git a/src/Avalonia.Interactivity/InteractiveExtensions.cs b/src/Avalonia.Base/Interactivity/InteractiveExtensions.cs
similarity index 100%
rename from src/Avalonia.Interactivity/InteractiveExtensions.cs
rename to src/Avalonia.Base/Interactivity/InteractiveExtensions.cs
diff --git a/src/Avalonia.Base/Interactivity/RoutedEvent.cs b/src/Avalonia.Base/Interactivity/RoutedEvent.cs
new file mode 100644
index 0000000000..37edb24cc1
--- /dev/null
+++ b/src/Avalonia.Base/Interactivity/RoutedEvent.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Reactive.Subjects;
+
+namespace Avalonia.Interactivity
+{
+    [Flags]
+    public enum RoutingStrategies
+    {
+        Direct = 0x01,
+        Tunnel = 0x02,
+        Bubble = 0x04,
+    }
+
+    public class RoutedEvent
+    {
+        private readonly Subject<(object, RoutedEventArgs)> _raised = new Subject<(object, RoutedEventArgs)>();
+        private readonly Subject<RoutedEventArgs> _routeFinished = new Subject<RoutedEventArgs>();
+
+        public RoutedEvent(
+            string name,
+            RoutingStrategies routingStrategies,
+            Type eventArgsType,
+            Type ownerType)
+        {
+            name = name ?? throw new ArgumentNullException(nameof(name));
+            eventArgsType = eventArgsType ?? throw new ArgumentNullException(nameof(name));
+            ownerType = ownerType ?? throw new ArgumentNullException(nameof(name));
+
+            if (!typeof(RoutedEventArgs).IsAssignableFrom(eventArgsType))
+            {
+                throw new InvalidCastException("eventArgsType must be derived from RoutedEventArgs.");
+            }
+
+            EventArgsType = eventArgsType;
+            Name = name;
+            OwnerType = ownerType;
+            RoutingStrategies = routingStrategies;
+        }
+
+        public Type EventArgsType { get; }
+
+        public string Name { get; }
+
+        public Type OwnerType { get; }
+
+        public RoutingStrategies RoutingStrategies { get; }
+
+        public bool HasRaisedSubscriptions => _raised.HasObservers;
+
+        public IObservable<(object, RoutedEventArgs)> Raised => _raised;
+        public IObservable<RoutedEventArgs> RouteFinished => _routeFinished;
+
+        public static RoutedEvent<TEventArgs> Register<TOwner, TEventArgs>(
+            string name,
+            RoutingStrategies routingStrategy)
+                where TEventArgs : RoutedEventArgs
+        {
+            name = name ?? throw new ArgumentNullException(nameof(name));
+
+            var routedEvent = new RoutedEvent<TEventArgs>(name, routingStrategy, typeof(TOwner));
+            RoutedEventRegistry.Instance.Register(typeof(TOwner), routedEvent);
+            return routedEvent;
+        }
+
+        public static RoutedEvent<TEventArgs> Register<TEventArgs>(
+            string name,
+            RoutingStrategies routingStrategy,
+            Type ownerType)
+                where TEventArgs : RoutedEventArgs
+        {
+            name = name ?? throw new ArgumentNullException(nameof(name));
+
+            var routedEvent = new RoutedEvent<TEventArgs>(name, routingStrategy, ownerType);
+            RoutedEventRegistry.Instance.Register(ownerType, routedEvent);
+            return routedEvent;
+        }
+
+        public IDisposable AddClassHandler(
+            Type targetType,
+            EventHandler<RoutedEventArgs> handler,
+            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
+            bool handledEventsToo = false)
+        {
+            return Raised.Subscribe(args =>
+            {
+                (object sender, RoutedEventArgs e) = args;
+
+                if (targetType.IsInstanceOfType(sender) &&
+                    (e.Route == RoutingStrategies.Direct || (e.Route & routes) != 0) &&
+                    (!e.Handled || handledEventsToo))
+                {
+                    handler(sender, e);
+                }
+            });
+        }
+
+        internal void InvokeRaised(object sender, RoutedEventArgs e)
+        {
+            _raised.OnNext((sender, e));
+        }
+
+        internal void InvokeRouteFinished(RoutedEventArgs e)
+        {
+            _routeFinished.OnNext(e);
+        }
+    }
+
+    public class RoutedEvent<TEventArgs> : RoutedEvent
+        where TEventArgs : RoutedEventArgs
+    {
+        public RoutedEvent(string name, RoutingStrategies routingStrategies, Type ownerType)
+            : base(name, routingStrategies, typeof(TEventArgs), ownerType)
+        {
+        }
+
+        public IDisposable AddClassHandler<TTarget>(
+            Action<TTarget, TEventArgs> handler,
+            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
+            bool handledEventsToo = false) where TTarget : class, IInteractive
+        {
+            void Adapter(object? sender, RoutedEventArgs e)
+            {
+                if (sender is TTarget target && e is TEventArgs args)
+                {
+                    handler(target, args);
+                }
+            }
+
+            return AddClassHandler(typeof(TTarget), Adapter, routes, handledEventsToo);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Interactivity/RoutedEventArgs.cs b/src/Avalonia.Base/Interactivity/RoutedEventArgs.cs
new file mode 100644
index 0000000000..2b660e7080
--- /dev/null
+++ b/src/Avalonia.Base/Interactivity/RoutedEventArgs.cs
@@ -0,0 +1,60 @@
+using System;
+
+namespace Avalonia.Interactivity
+{
+    /// <summary>
+    /// Provides state information and data specific to a routed event.
+    /// </summary>
+    public class RoutedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RoutedEventArgs"/> class.
+        /// </summary>
+        public RoutedEventArgs()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RoutedEventArgs"/> class.
+        /// </summary>
+        /// <param name="routedEvent">The routed event associated with these event args.</param>
+        public RoutedEventArgs(RoutedEvent? routedEvent)
+        {
+            RoutedEvent = routedEvent;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RoutedEventArgs"/> class.
+        /// </summary>
+        /// <param name="routedEvent">The routed event associated with these event args.</param>
+        /// <param name="source">The source object that raised the routed event.</param>
+        public RoutedEventArgs(RoutedEvent? routedEvent, IInteractive? source)
+        {
+            RoutedEvent = routedEvent;
+            Source = source;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the routed event has already been handled.
+        /// </summary>
+        /// <remarks>
+        /// Once handled, a routed event should be ignored.
+        /// </remarks>
+        public bool Handled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the routed event associated with these event args.
+        /// </summary>
+        public RoutedEvent? RoutedEvent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the routing strategy (direct, bubbling, or tunneling) of the routed event.
+        /// </summary>
+        public RoutingStrategies Route { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source object that raised the routed event.
+        /// </summary>
+        public IInteractive? Source { get; set; }
+    }
+}
diff --git a/src/Avalonia.Interactivity/RoutedEventRegistry.cs b/src/Avalonia.Base/Interactivity/RoutedEventRegistry.cs
similarity index 100%
rename from src/Avalonia.Interactivity/RoutedEventRegistry.cs
rename to src/Avalonia.Base/Interactivity/RoutedEventRegistry.cs
diff --git a/src/Avalonia.Layout/AttachedLayout.cs b/src/Avalonia.Base/Layout/AttachedLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/AttachedLayout.cs
rename to src/Avalonia.Base/Layout/AttachedLayout.cs
diff --git a/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
new file mode 100644
index 0000000000..749d2ecc2b
--- /dev/null
+++ b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Provides data for the <see cref="Layoutable.EffectiveViewportChanged"/> event.
+    /// </summary>
+    public class EffectiveViewportChangedEventArgs : EventArgs
+    {
+        internal EffectiveViewportChangedEventArgs(Rect effectiveViewport)
+        {
+            EffectiveViewport = effectiveViewport;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Rect"/> representing the effective viewport.
+        /// </summary>
+        /// <remarks>
+        /// The viewport is expressed in coordinates relative to the control that the event is
+        /// raised on.
+        /// </remarks>
+        public Rect EffectiveViewport { get; }
+    }
+}
diff --git a/src/Avalonia.Layout/ElementManager.cs b/src/Avalonia.Base/Layout/ElementManager.cs
similarity index 100%
rename from src/Avalonia.Layout/ElementManager.cs
rename to src/Avalonia.Base/Layout/ElementManager.cs
diff --git a/src/Avalonia.Base/Layout/FlowLayoutAlgorithm.cs b/src/Avalonia.Base/Layout/FlowLayoutAlgorithm.cs
new file mode 100644
index 0000000000..e6a95d1ffb
--- /dev/null
+++ b/src/Avalonia.Base/Layout/FlowLayoutAlgorithm.cs
@@ -0,0 +1,767 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Collections.Specialized;
+using Avalonia.Logging;
+
+namespace Avalonia.Layout
+{
+    internal class FlowLayoutAlgorithm
+    {
+        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
+        private readonly ElementManager _elementManager = new ElementManager();
+        private Size _lastAvailableSize;
+        private double _lastItemSpacing;
+        private bool _collectionChangePending;
+        private VirtualizingLayoutContext? _context;
+        private IFlowLayoutAlgorithmDelegates? _algorithmCallbacks;
+        private Rect _lastExtent;
+        private int _firstRealizedDataIndexInsideRealizationWindow = -1;
+        private int _lastRealizedDataIndexInsideRealizationWindow = -1;
+
+        // If the scroll orientation is the same as the follow orientation
+        // we will only have one line since we will never wrap. In that case
+        // we do not want to align the line. We could potentially switch the
+        // meaning of line alignment in this case, but I'll hold off on that
+        // feature until someone asks for it - This is not a common scenario
+        // anyway. 
+        private bool _scrollOrientationSameAsFlow;
+
+        public Rect LastExtent => _lastExtent;
+
+        private bool IsVirtualizingContext
+        {
+            get
+            {
+                if (_context != null)
+                {
+                    var rect = _context.RealizationRect;
+                    bool hasInfiniteSize = double.IsInfinity(rect.Height) || double.IsInfinity(rect.Width);
+                    return !hasInfiniteSize;
+                }
+                return false;
+            }
+        }
+
+        private Rect RealizationRect => IsVirtualizingContext ? _context!.RealizationRect : new Rect(Size.Infinity);
+
+        public void InitializeForContext(VirtualizingLayoutContext context, IFlowLayoutAlgorithmDelegates callbacks)
+        {
+            _algorithmCallbacks = callbacks;
+            _context = context;
+            _elementManager.SetContext(context);
+        }
+
+        public void UninitializeForContext(VirtualizingLayoutContext context)
+        {
+            if (IsVirtualizingContext)
+            {
+                // This layout is about to be detached. Let go of all elements
+                // being held and remove the layout state from the context.
+                _elementManager.ClearRealizedRange();
+            }
+
+            context.LayoutState = null;
+        }
+
+        public Size Measure(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            bool isWrapping,
+            double minItemSpacing,
+            double lineSpacing,
+            int maxItemsPerLine,
+            ScrollOrientation orientation,
+            bool disableVirtualization,
+            string? layoutId)
+        {
+            _orientation.ScrollOrientation = orientation;
+
+            // If minor size is infinity, there is only one line and no need to align that line.
+            _scrollOrientationSameAsFlow = double.IsInfinity(_orientation.Minor(availableSize));
+            var realizationRect = RealizationRect;
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: MeasureLayout Realization({Rect})",
+                layoutId,
+                realizationRect);
+
+            var suggestedAnchorIndex = _context!.RecommendedAnchorIndex;
+            if (_elementManager.IsIndexValidInData(suggestedAnchorIndex))
+            {
+                var anchorRealized = _elementManager.IsDataIndexRealized(suggestedAnchorIndex);
+                if (!anchorRealized)
+                {
+                    MakeAnchor(_context, suggestedAnchorIndex, availableSize);
+                }
+            }
+
+            _elementManager.OnBeginMeasure(orientation);
+
+            int anchorIndex = GetAnchorIndex(availableSize, isWrapping, minItemSpacing, layoutId);
+            Generate(GenerateDirection.Forward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
+            Generate(GenerateDirection.Backward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
+            if (isWrapping && IsReflowRequired())
+            {
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Reflow Pass", layoutId);
+                var firstElementBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
+                _orientation.SetMinorStart(ref firstElementBounds, 0);
+                _elementManager.SetLayoutBoundsForRealizedIndex(0, firstElementBounds);
+                Generate(GenerateDirection.Forward, 0 /*anchorIndex*/, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
+            }
+
+            RaiseLineArranged();
+            _collectionChangePending = false;
+            _lastExtent = EstimateExtent(availableSize, layoutId);
+            SetLayoutOrigin();
+
+            return new Size(_lastExtent.Width, _lastExtent.Height);
+        }
+
+        public Size Arrange(
+            Size finalSize,
+            VirtualizingLayoutContext context,
+            bool isWrapping,
+            LineAlignment lineAlignment,
+            string? layoutId)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: ArrangeLayout", layoutId);
+            ArrangeVirtualizingLayout(finalSize, lineAlignment, isWrapping, layoutId);
+
+            return new Size(
+                Math.Max(finalSize.Width, _lastExtent.Width),
+                Math.Max(finalSize.Height, _lastExtent.Height));
+        }
+
+        public void OnItemsSourceChanged(
+            object? source,
+            NotifyCollectionChangedEventArgs args,
+            VirtualizingLayoutContext context)
+        {
+            _elementManager.DataSourceChanged(source, args);
+            _collectionChangePending = true;
+        }
+
+        public Size MeasureElement(
+            ILayoutable element,
+            int index,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            var measureSize = _algorithmCallbacks!.Algorithm_GetMeasureSize(index, availableSize, context);
+            element.Measure(measureSize);
+            var provisionalArrangeSize = _algorithmCallbacks.Algorithm_GetProvisionalArrangeSize(index, measureSize, element.DesiredSize, context);
+            _algorithmCallbacks.Algorithm_OnElementMeasured(element, index, availableSize, measureSize, element.DesiredSize, provisionalArrangeSize, context);
+
+            return provisionalArrangeSize; 
+        }
+
+        private int GetAnchorIndex(
+            Size availableSize,
+            bool isWrapping,
+            double minItemSpacing,
+            string? layoutId)
+        {
+            int anchorIndex = -1;
+            var anchorPosition= new Point();
+            var context = _context;
+
+            if (!IsVirtualizingContext)
+            {
+                // Non virtualizing host, start generating from the element 0
+                anchorIndex = context!.ItemCount > 0 ? 0 : -1;
+            }
+            else
+            {       
+                bool isRealizationWindowConnected = _elementManager.IsWindowConnected(RealizationRect, _orientation.ScrollOrientation, _scrollOrientationSameAsFlow);
+                // Item spacing and size in non-virtualizing direction change can cause elements to reflow
+                // and get a new column position. In that case we need the anchor to be positioned in the 
+                // correct column.
+                bool needAnchorColumnRevaluation = isWrapping && (
+                    _orientation.Minor(_lastAvailableSize) != _orientation.Minor(availableSize) ||
+                    _lastItemSpacing != minItemSpacing ||
+                    _collectionChangePending);
+
+                var suggestedAnchorIndex = _context!.RecommendedAnchorIndex;
+
+                var isAnchorSuggestionValid = suggestedAnchorIndex >= 0 &&
+                    _elementManager.IsDataIndexRealized(suggestedAnchorIndex);
+
+                if (isAnchorSuggestionValid)
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Using suggested anchor {Anchor}", layoutId, suggestedAnchorIndex);
+                    anchorIndex = _algorithmCallbacks!.Algorithm_GetAnchorForTargetElement(
+                        suggestedAnchorIndex,
+                        availableSize,
+                        context!).Index;
+
+                    if (_elementManager.IsDataIndexRealized(anchorIndex))
+                    {
+                        var anchorBounds = _elementManager.GetLayoutBoundsForDataIndex(anchorIndex);
+                        if (needAnchorColumnRevaluation)
+                        {
+                            // We were provided a valid anchor, but its position might be incorrect because for example it is in
+                            // the wrong column. We do know that the anchor is the first element in the row, so we can force the minor position
+                            // to start at 0.
+                            anchorPosition = _orientation.MinorMajorPoint(0, _orientation.MajorStart(anchorBounds));
+                        }
+                        else
+                        {
+                            anchorPosition = new Point(anchorBounds.X, anchorBounds.Y);
+                        }
+                    }
+                    else if (anchorIndex >= 0)
+                    {
+                        // It is possible to end up in a situation during a collection change where GetAnchorForTargetElement returns an index
+                        // which is not in the realized range. Eg. insert one item at index 0 for a grid layout. 
+                        // SuggestedAnchor will be 1 (used to be 0) and GetAnchorForTargetElement will return 0 (left most item in row). However 0 is not in the
+                        // realized range yet. In this case we realize the gap between the target anchor and the suggested anchor.
+                        int firstRealizedDataIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(0);
+
+                        for (int i = firstRealizedDataIndex - 1; i >= anchorIndex; --i)
+                        {
+                            _elementManager.EnsureElementRealized(false /*forward*/, i, layoutId);
+                        }
+
+                        var anchorBounds = _elementManager.GetLayoutBoundsForDataIndex(suggestedAnchorIndex);
+                        anchorPosition = _orientation.MinorMajorPoint(0, _orientation.MajorStart(anchorBounds));
+                    }
+                }
+                else if (needAnchorColumnRevaluation || !isRealizationWindowConnected)
+                {
+                    if (needAnchorColumnRevaluation) { Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: NeedAnchorColumnReevaluation", layoutId); }
+                    if (!isRealizationWindowConnected) { Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Disconnected Window", layoutId); }
+
+                    // The anchor is based on the realization window because a connected ItemsRepeater might intersect the realization window
+                    // but not the visible window. In that situation, we still need to produce a valid anchor.
+                    var anchorInfo = _algorithmCallbacks!.Algorithm_GetAnchorForRealizationRect(availableSize, context!);
+                    anchorIndex = anchorInfo.Index;
+                    anchorPosition = _orientation.MinorMajorPoint(0, anchorInfo.Offset);
+                }
+                else
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Connected Window - picking first realized element as anchor", layoutId);
+                    // No suggestion - just pick first in realized range
+                    anchorIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(0);
+                    var firstElementBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
+                    anchorPosition = new Point(firstElementBounds.X, firstElementBounds.Y);
+                }
+            }
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Picked anchor: {Anchor}", layoutId, anchorIndex);
+            _firstRealizedDataIndexInsideRealizationWindow = _lastRealizedDataIndexInsideRealizationWindow = anchorIndex;
+            if (_elementManager.IsIndexValidInData(anchorIndex))
+            {
+                if (!_elementManager.IsDataIndexRealized(anchorIndex))
+                {
+                    // Disconnected, throw everything and create new anchor
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Disconnected Window - throwing away all realized elements", layoutId);
+                    _elementManager.ClearRealizedRange();
+
+                    var anchor = _context!.GetOrCreateElementAt(anchorIndex, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
+                    _elementManager.Add(anchor, anchorIndex);
+                }
+
+                var anchorElement = _elementManager.GetRealizedElement(anchorIndex);
+                var desiredSize = MeasureElement(anchorElement!, anchorIndex, availableSize, _context!);
+                var layoutBounds = new Rect(anchorPosition.X, anchorPosition.Y, desiredSize.Width, desiredSize.Height);
+                _elementManager.SetLayoutBoundsForDataIndex(anchorIndex, layoutBounds);
+
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Layout bounds of anchor {anchor} are ({Bounds})",
+                    layoutId,
+                    anchorIndex,
+                    layoutBounds);
+            }
+            else
+            {
+                // Throw everything away
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Anchor index is not valid - throwing away all realized elements",
+                    layoutId);
+                _elementManager.ClearRealizedRange();
+            }
+
+            // TODO: Perhaps we can track changes in the property setter
+            _lastAvailableSize = availableSize;
+            _lastItemSpacing = minItemSpacing;
+
+            return anchorIndex;
+        }
+
+        private void Generate(
+            GenerateDirection direction,
+            int anchorIndex,
+            Size availableSize,
+            double minItemSpacing,
+            double lineSpacing,
+            int maxItemsPerLine,
+            bool disableVirtualization,
+            string? layoutId)
+        {
+            if (anchorIndex != -1)
+            {
+                int step = (direction == GenerateDirection.Forward) ? 1 : -1;
+
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Generating {Direction} from anchor {Anchor}",
+                    layoutId,
+                    direction,
+                    anchorIndex);
+
+                int previousIndex = anchorIndex;
+                int currentIndex = anchorIndex + step;
+                var anchorBounds = _elementManager.GetLayoutBoundsForDataIndex(anchorIndex);
+                var lineOffset = _orientation.MajorStart(anchorBounds);
+                var lineMajorSize = _orientation.MajorSize(anchorBounds);
+                var countInLine = 1;
+                int count = 0;
+                bool lineNeedsReposition = false;
+
+                while (_elementManager.IsIndexValidInData(currentIndex) &&
+                    (disableVirtualization || ShouldContinueFillingUpSpace(previousIndex, direction)))
+                {
+                    // Ensure layout element.
+                    _elementManager.EnsureElementRealized(direction == GenerateDirection.Forward, currentIndex, layoutId);
+                    var currentElement = _elementManager.GetRealizedElement(currentIndex);
+                    var desiredSize = MeasureElement(currentElement!, currentIndex, availableSize, _context!);
+                    ++count;
+
+                    // Lay it out.
+                    var previousElement = _elementManager.GetRealizedElement(previousIndex);
+                    var currentBounds = new Rect(0, 0, desiredSize.Width, desiredSize.Height);
+                    var previousElementBounds = _elementManager.GetLayoutBoundsForDataIndex(previousIndex);
+
+                    if (direction == GenerateDirection.Forward)
+                    {
+                        double remainingSpace = _orientation.Minor(availableSize) - (_orientation.MinorStart(previousElementBounds) + _orientation.MinorSize(previousElementBounds) + minItemSpacing + _orientation.Minor(desiredSize));
+                        if (countInLine >= maxItemsPerLine || _algorithmCallbacks!.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
+                        {
+                            // No more space in this row. wrap to next row.
+                            _orientation.SetMinorStart(ref currentBounds, 0);
+                            _orientation.SetMajorStart(ref currentBounds, _orientation.MajorStart(previousElementBounds) + lineMajorSize + lineSpacing);
+
+                            if (lineNeedsReposition)
+                            {
+                                // reposition the previous line (countInLine items)
+                                for (int i = 0; i < countInLine; i++)
+                                {
+                                    var dataIndex = currentIndex - 1 - i;
+                                    var bounds = _elementManager.GetLayoutBoundsForDataIndex(dataIndex);
+                                    _orientation.SetMajorSize(ref bounds, lineMajorSize);
+                                    _elementManager.SetLayoutBoundsForDataIndex(dataIndex, bounds);
+                                }
+                            }
+
+                            // Setup for next line.
+                            lineMajorSize = _orientation.MajorSize(currentBounds);
+                            lineOffset = _orientation.MajorStart(currentBounds);
+                            lineNeedsReposition = false;
+                            countInLine = 1;
+                        }
+                        else
+                        {
+                            // More space is available in this row.
+                            _orientation.SetMinorStart(ref currentBounds, _orientation.MinorStart(previousElementBounds) + _orientation.MinorSize(previousElementBounds) + minItemSpacing);
+                            _orientation.SetMajorStart(ref currentBounds, lineOffset);
+                            lineMajorSize = Math.Max(lineMajorSize, _orientation.MajorSize(currentBounds));
+                            lineNeedsReposition = _orientation.MajorSize(previousElementBounds) != _orientation.MajorSize(currentBounds);
+                            countInLine++;
+                        }
+                    }
+                    else
+                    {
+                        // Backward 
+                        double remainingSpace = _orientation.MinorStart(previousElementBounds) - (_orientation.Minor(desiredSize) + minItemSpacing);
+                        if (countInLine >= maxItemsPerLine || _algorithmCallbacks!.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
+                        {
+                            // Does not fit, wrap to the previous row
+                            var availableSizeMinor = _orientation.Minor(availableSize);
+
+                            _orientation.SetMinorStart(ref currentBounds, !double.IsInfinity(availableSizeMinor) ? availableSizeMinor - _orientation.Minor(desiredSize) : 0);
+                            _orientation.SetMajorStart(ref currentBounds, lineOffset - _orientation.Major(desiredSize) - lineSpacing);
+
+                            if (lineNeedsReposition)
+                            {
+                                var previousLineOffset = _orientation.MajorStart(_elementManager.GetLayoutBoundsForDataIndex(currentIndex + countInLine + 1));
+                                // reposition the previous line (countInLine items)
+                                for (int i = 0; i < countInLine; i++)
+                                {
+                                    var dataIndex = currentIndex + 1 + i;
+                                    if (dataIndex != anchorIndex)
+                                    {
+                                        var bounds = _elementManager.GetLayoutBoundsForDataIndex(dataIndex);
+                                        _orientation.SetMajorStart(ref bounds, previousLineOffset - lineMajorSize - lineSpacing);
+                                        _orientation.SetMajorSize(ref bounds, lineMajorSize);
+                                        _elementManager.SetLayoutBoundsForDataIndex(dataIndex, bounds);
+                                        Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Corrected Layout bounds of element {Index} are ({Bounds})",
+                                            layoutId,
+                                            dataIndex,
+                                            bounds);
+                                    }
+                                }
+                            }
+
+                            // Setup for next line.
+                            lineMajorSize = _orientation.MajorSize(currentBounds);
+                            lineOffset = _orientation.MajorStart(currentBounds);
+                            lineNeedsReposition = false;
+                            countInLine = 1;
+                        }
+                        else
+                        {
+                            // Fits in this row. put it in the previous position
+                            _orientation.SetMinorStart(ref currentBounds, _orientation.MinorStart(previousElementBounds) - _orientation.Minor(desiredSize) - minItemSpacing);
+                            _orientation.SetMajorStart(ref currentBounds, lineOffset);
+                            lineMajorSize = Math.Max(lineMajorSize, _orientation.MajorSize(currentBounds));
+                            lineNeedsReposition = _orientation.MajorSize(previousElementBounds) != _orientation.MajorSize(currentBounds);
+                            countInLine++;
+                        }
+                    }
+
+                    _elementManager.SetLayoutBoundsForDataIndex(currentIndex, currentBounds);
+
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Layout bounds of element {Index} are ({Bounds}).",
+                        layoutId,
+                        currentIndex,
+                        currentBounds);
+                    previousIndex = currentIndex;
+                    currentIndex += step;
+                }
+
+                // If we did not reach the top or bottom of the extent, we realized one 
+                // extra item before we knew we were outside the realization window. Do not
+                // account for that element in the indices inside the realization window.
+                if (direction == GenerateDirection.Forward)
+                {
+                    int dataCount = _context!.ItemCount;
+                    _lastRealizedDataIndexInsideRealizationWindow = previousIndex == dataCount - 1 ? dataCount - 1 : previousIndex - 1;
+                    _lastRealizedDataIndexInsideRealizationWindow = Math.Max(0, _lastRealizedDataIndexInsideRealizationWindow);
+                }
+                else
+                {
+                    int dataCount = _context!.ItemCount;
+                    _firstRealizedDataIndexInsideRealizationWindow = previousIndex == 0 ? 0 : previousIndex + 1;
+                    _firstRealizedDataIndexInsideRealizationWindow = Math.Min(dataCount - 1, _firstRealizedDataIndexInsideRealizationWindow);
+                }
+
+                _elementManager.DiscardElementsOutsideWindow(direction == GenerateDirection.Forward, currentIndex);
+            }
+        }
+
+        private void MakeAnchor(
+            VirtualizingLayoutContext context,
+            int index,
+            Size availableSize)
+        {
+            _elementManager.ClearRealizedRange();
+            // FlowLayout requires that the anchor is the first element in the row.
+            var internalAnchor = _algorithmCallbacks!.Algorithm_GetAnchorForTargetElement(index, availableSize, context);
+
+            // No need to set the position of the anchor.
+            // (0,0) is fine for now since the extent can
+            // grow in any direction.
+            for (int dataIndex = internalAnchor.Index; dataIndex < index + 1; ++dataIndex)
+            {
+                var element = context.GetOrCreateElementAt(dataIndex, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
+                element.Measure(_algorithmCallbacks.Algorithm_GetMeasureSize(dataIndex, availableSize, context));
+                _elementManager.Add(element, dataIndex);
+            }
+        }
+
+        private bool IsReflowRequired()
+        {
+            // If first element is realized and is not at the very beginning we need to reflow.
+            return
+                _elementManager.GetRealizedElementCount() > 0 &&
+                _elementManager.GetDataIndexFromRealizedRangeIndex(0) == 0 &&
+                _orientation.MinorStart(_elementManager.GetLayoutBoundsForRealizedIndex(0)) != 0;
+        }
+
+        private bool ShouldContinueFillingUpSpace(
+            int index,
+            GenerateDirection direction)
+        {
+            bool shouldContinue = false;
+            if (!IsVirtualizingContext)
+            {
+                shouldContinue = true;
+            }
+            else
+            {
+                var realizationRect = _context!.RealizationRect;
+                var elementBounds = _elementManager.GetLayoutBoundsForDataIndex(index);
+
+                var elementMajorStart = _orientation.MajorStart(elementBounds);
+                var elementMajorEnd = _orientation.MajorEnd(elementBounds);
+                var rectMajorStart = _orientation.MajorStart(realizationRect);
+                var rectMajorEnd = _orientation.MajorEnd(realizationRect);
+
+                var elementMinorStart = _orientation.MinorStart(elementBounds);
+                var elementMinorEnd = _orientation.MinorEnd(elementBounds);
+                var rectMinorStart = _orientation.MinorStart(realizationRect);
+                var rectMinorEnd = _orientation.MinorEnd(realizationRect);
+
+                // Ensure that both minor and major directions are taken into consideration so that if the scrolling direction
+                // is the same as the flow direction we still stop at the end of the viewport rectangle.
+                shouldContinue =
+                    (direction == GenerateDirection.Forward && elementMajorStart < rectMajorEnd && elementMinorStart < rectMinorEnd) ||
+                    (direction == GenerateDirection.Backward && elementMajorEnd > rectMajorStart && elementMinorEnd > rectMinorStart);
+            }
+
+            return shouldContinue;
+        }
+
+        private Rect EstimateExtent(Size availableSize, string? layoutId)
+        {
+            ILayoutable? firstRealizedElement = null;
+            Rect firstBounds = new Rect();
+            ILayoutable? lastRealizedElement = null;
+            Rect lastBounds = new Rect();
+            int firstDataIndex = -1;
+            int lastDataIndex = -1;
+
+            if (_elementManager.GetRealizedElementCount() > 0)
+            {
+                firstRealizedElement = _elementManager.GetAt(0);
+                firstBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
+                firstDataIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(0);
+
+                int last = _elementManager.GetRealizedElementCount() - 1;
+                lastRealizedElement = _elementManager.GetAt(last);
+                lastDataIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(last);
+                lastBounds = _elementManager.GetLayoutBoundsForRealizedIndex(last);
+            }
+
+            Rect extent = _algorithmCallbacks!.Algorithm_GetExtent(
+                availableSize,
+                _context!,
+                firstRealizedElement,
+                firstDataIndex,
+                firstBounds,
+                lastRealizedElement,
+                lastDataIndex,
+                lastBounds);
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Extent: ({Bounds})", layoutId, extent);
+            return extent;
+        }
+
+        private void RaiseLineArranged()
+        {
+            var realizationRect = RealizationRect;
+            if (realizationRect.Width != 0.0f || realizationRect.Height != 0.0f)
+            {
+                int realizedElementCount = _elementManager.GetRealizedElementCount();
+                if (realizedElementCount > 0)
+                {
+                    int countInLine = 0;
+                    var previousElementBounds = _elementManager.GetLayoutBoundsForDataIndex(_firstRealizedDataIndexInsideRealizationWindow);
+                    var currentLineOffset = _orientation.MajorStart(previousElementBounds);
+                    var currentLineSize = _orientation.MajorSize(previousElementBounds);
+                    for (int currentDataIndex = _firstRealizedDataIndexInsideRealizationWindow; currentDataIndex <= _lastRealizedDataIndexInsideRealizationWindow; currentDataIndex++)
+                    {
+                        var currentBounds = _elementManager.GetLayoutBoundsForDataIndex(currentDataIndex);
+                        if (_orientation.MajorStart(currentBounds) != currentLineOffset)
+                        {
+                            // Staring a new line
+                            _algorithmCallbacks!.Algorithm_OnLineArranged(currentDataIndex - countInLine, countInLine, currentLineSize, _context!);
+                            countInLine = 0;
+                            currentLineOffset = _orientation.MajorStart(currentBounds);
+                            currentLineSize = 0;
+                        }
+
+                        currentLineSize = Math.Max(currentLineSize, _orientation.MajorSize(currentBounds));
+                        countInLine++;
+                        previousElementBounds = currentBounds;
+                    }
+
+                    // Raise for the last line.
+                    _algorithmCallbacks!.Algorithm_OnLineArranged(_lastRealizedDataIndexInsideRealizationWindow - countInLine + 1, countInLine, currentLineSize, _context!);
+                }
+            }
+        }
+
+        private void ArrangeVirtualizingLayout(
+            Size finalSize,
+            LineAlignment lineAlignment,
+            bool isWrapping,
+            string? layoutId)
+        {
+            // Walk through the realized elements one line at a time and 
+            // align them, Then call element.Arrange with the arranged bounds.
+            int realizedElementCount = _elementManager.GetRealizedElementCount();
+            if (realizedElementCount > 0)
+            {
+                var countInLine = 1;
+                var previousElementBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
+                var currentLineOffset = _orientation.MajorStart(previousElementBounds);
+                var spaceAtLineStart = _orientation.MinorStart(previousElementBounds);
+                var spaceAtLineEnd = 0.0;
+                var currentLineSize = _orientation.MajorSize(previousElementBounds);
+                for (int i = 1; i < realizedElementCount; i++)
+                {
+                    var currentBounds = _elementManager.GetLayoutBoundsForRealizedIndex(i);
+                    if (_orientation.MajorStart(currentBounds) != currentLineOffset)
+                    {
+                        spaceAtLineEnd = _orientation.Minor(finalSize) - _orientation.MinorStart(previousElementBounds) - _orientation.MinorSize(previousElementBounds);
+                        PerformLineAlignment(i - countInLine, countInLine, spaceAtLineStart, spaceAtLineEnd, currentLineSize, lineAlignment, isWrapping, finalSize, layoutId);
+                        spaceAtLineStart = _orientation.MinorStart(currentBounds);
+                        countInLine = 0;
+                        currentLineOffset = _orientation.MajorStart(currentBounds);
+                        currentLineSize = 0;
+                    }
+
+                    countInLine++; // for current element
+                    currentLineSize = Math.Max(currentLineSize, _orientation.MajorSize(currentBounds));
+                    previousElementBounds = currentBounds;
+                }
+
+                // Last line - potentially have a property to customize
+                // aligning the last line or not.
+                if (countInLine > 0)
+                {
+                    var spaceAtEnd = _orientation.Minor(finalSize) - _orientation.MinorStart(previousElementBounds) - _orientation.MinorSize(previousElementBounds);
+                    PerformLineAlignment(realizedElementCount - countInLine, countInLine, spaceAtLineStart, spaceAtEnd, currentLineSize, lineAlignment, isWrapping, finalSize, layoutId);
+                }
+            }
+        }
+
+        // Align elements within a line. Note that this does not modify LayoutBounds. So if we get
+        // repeated measures, the LayoutBounds remain the same in each layout.
+        private void PerformLineAlignment(
+            int lineStartIndex,
+            int countInLine,
+            double spaceAtLineStart,
+            double spaceAtLineEnd,
+            double lineSize,
+            LineAlignment lineAlignment,
+            bool isWrapping,
+            Size finalSize,
+            string? layoutId)
+        {
+            for (int rangeIndex = lineStartIndex; rangeIndex < lineStartIndex + countInLine; ++rangeIndex)
+            {
+                var bounds = _elementManager.GetLayoutBoundsForRealizedIndex(rangeIndex);
+                _orientation.SetMajorSize(ref bounds, lineSize);
+
+                if (!_scrollOrientationSameAsFlow)
+                {
+                    // Note: Space at start could potentially be negative
+                    if (spaceAtLineStart != 0 || spaceAtLineEnd != 0)
+                    {
+                        var totalSpace = spaceAtLineStart + spaceAtLineEnd;
+                        var minorStart = _orientation.MinorStart(bounds);
+                        switch (lineAlignment)
+                        {
+                            case LineAlignment.Start:
+                                {
+                                    _orientation.SetMinorStart(ref bounds, minorStart - spaceAtLineStart);
+                                    break;
+                                }
+
+                            case LineAlignment.End:
+                                {
+                                    _orientation.SetMinorStart(ref bounds, minorStart + spaceAtLineEnd);
+                                    break;
+                                }
+
+                            case LineAlignment.Center:
+                                {
+                                    _orientation.SetMinorStart(ref bounds, (minorStart - spaceAtLineStart) + (totalSpace / 2));
+                                    break;
+                                }
+
+                            case LineAlignment.SpaceAround:
+                                {
+                                    var interItemSpace = countInLine >= 1 ? totalSpace / (countInLine * 2) : 0;
+                                    _orientation.SetMinorStart(
+                                        ref bounds, 
+                                        (minorStart - spaceAtLineStart) + (interItemSpace * ((rangeIndex - lineStartIndex + 1) * 2 - 1)));
+                                    break;
+                                }
+
+                            case LineAlignment.SpaceBetween:
+                                {
+                                    var interItemSpace = countInLine > 1 ? totalSpace / (countInLine - 1) : 0;
+                                    _orientation.SetMinorStart(
+                                        ref bounds,
+                                        (minorStart - spaceAtLineStart) + (interItemSpace * (rangeIndex - lineStartIndex)));
+                                    break;
+                                }
+
+                            case LineAlignment.SpaceEvenly:
+                                {
+                                    var interItemSpace = countInLine >= 1 ? totalSpace / (countInLine + 1) : 0;
+                                    _orientation.SetMinorStart(
+                                        ref bounds,
+                                        (minorStart - spaceAtLineStart) + (interItemSpace * (rangeIndex - lineStartIndex + 1)));
+                                    break;
+                                }
+                        }
+                    }
+                }
+
+                bounds = bounds.Translate(-_lastExtent.Position);
+
+                if (!isWrapping)
+                {
+                    _orientation.SetMinorSize(
+                        ref bounds,
+                        Math.Max(_orientation.MinorSize(bounds), _orientation.Minor(finalSize)));
+                }
+
+                var element = _elementManager.GetAt(rangeIndex);
+
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Arranging element {Index} at ({Bounds})",
+                    layoutId,
+                    _elementManager.GetDataIndexFromRealizedRangeIndex(rangeIndex),
+                    bounds);
+                element.Arrange(bounds);
+            }
+        }
+
+        private void SetLayoutOrigin()
+        {
+            if (IsVirtualizingContext)
+            {
+                _context!.LayoutOrigin = new Point(_lastExtent.X, _lastExtent.Y);
+            }
+        }
+
+        public ILayoutable? GetElementIfRealized(int dataIndex)
+        {
+            if (_elementManager.IsDataIndexRealized(dataIndex))
+            {
+                return _elementManager.GetRealizedElement(dataIndex);
+            }
+
+            return null;
+        }
+
+        public bool TryAddElement0(ILayoutable element)
+        {
+            if (_elementManager.GetRealizedElementCount() == 0)
+            {
+                _elementManager.Add(element, 0);
+                return true;
+            }
+
+            return false;
+        }
+
+        public enum LineAlignment
+        {
+            Start,
+            Center,
+            End,
+            SpaceAround,
+            SpaceBetween,
+            SpaceEvenly,
+        }
+
+        private enum GenerateDirection
+        {
+            Forward,
+            Backward,
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/IEmbeddedLayoutRoot.cs b/src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs
similarity index 100%
rename from src/Avalonia.Layout/IEmbeddedLayoutRoot.cs
rename to src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs
diff --git a/src/Avalonia.Layout/IFlowLayoutAlgorithmDelegates.cs b/src/Avalonia.Base/Layout/IFlowLayoutAlgorithmDelegates.cs
similarity index 100%
rename from src/Avalonia.Layout/IFlowLayoutAlgorithmDelegates.cs
rename to src/Avalonia.Base/Layout/IFlowLayoutAlgorithmDelegates.cs
diff --git a/src/Avalonia.Base/Layout/ILayoutManager.cs b/src/Avalonia.Base/Layout/ILayoutManager.cs
new file mode 100644
index 0000000000..88d95c81fd
--- /dev/null
+++ b/src/Avalonia.Base/Layout/ILayoutManager.cs
@@ -0,0 +1,59 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Manages measuring and arranging of controls.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILayoutManager : IDisposable
+    {
+        /// <summary>
+        /// Raised when the layout manager completes a layout pass.
+        /// </summary>
+        event EventHandler LayoutUpdated;
+
+        /// <summary>
+        /// Notifies the layout manager that a control requires a measure.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void InvalidateMeasure(ILayoutable control);
+
+        /// <summary>
+        /// Notifies the layout manager that a control requires an arrange.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void InvalidateArrange(ILayoutable control);
+
+        /// <summary>
+        /// Executes a layout pass.
+        /// </summary>
+        /// <remarks>
+        /// You should not usually need to call this method explictly, the layout manager will
+        /// schedule layout passes itself.
+        /// </remarks>
+        void ExecuteLayoutPass();
+
+        /// <summary>
+        /// Executes the initial layout pass on a layout root.
+        /// </summary>
+        /// <remarks>
+        /// You should not usually need to call this method explictly, the layout root will call
+        /// it to carry out the initial layout of the control.
+        /// </remarks>
+        void ExecuteInitialLayoutPass();
+
+        /// <summary>
+        /// Registers a control as wanting to receive effective viewport notifications.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void RegisterEffectiveViewportListener(ILayoutable control);
+
+        /// <summary>
+        /// Registers a control as no longer wanting to receive effective viewport notifications.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void UnregisterEffectiveViewportListener(ILayoutable control);
+    }
+}
diff --git a/src/Avalonia.Base/Layout/ILayoutRoot.cs b/src/Avalonia.Base/Layout/ILayoutRoot.cs
new file mode 100644
index 0000000000..df15fc1a1d
--- /dev/null
+++ b/src/Avalonia.Base/Layout/ILayoutRoot.cs
@@ -0,0 +1,26 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines the root of a layoutable tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILayoutRoot : ILayoutable
+    {
+        /// <summary>
+        /// The size available to lay out the controls.
+        /// </summary>
+        Size ClientSize { get; }
+
+        /// <summary>
+        /// The scaling factor to use in layout.
+        /// </summary>
+        double LayoutScaling { get; }
+
+        /// <summary>
+        /// Associated instance of layout manager
+        /// </summary>
+        ILayoutManager LayoutManager { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Layout/ILayoutable.cs b/src/Avalonia.Base/Layout/ILayoutable.cs
new file mode 100644
index 0000000000..d8b546b04a
--- /dev/null
+++ b/src/Avalonia.Base/Layout/ILayoutable.cs
@@ -0,0 +1,122 @@
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines layout-related functionality for a control.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILayoutable : IVisual
+    {
+        /// <summary>
+        /// Gets the size that this element computed during the measure pass of the layout process.
+        /// </summary>
+        Size DesiredSize { get; }
+
+        /// <summary>
+        /// Gets the width of the element.
+        /// </summary>
+        double Width { get; }
+
+        /// <summary>
+        /// Gets the height of the element.
+        /// </summary>
+        double Height { get; }
+
+        /// <summary>
+        /// Gets the minimum width of the element.
+        /// </summary>
+        double MinWidth { get; }
+
+        /// <summary>
+        /// Gets the maximum width of the element.
+        /// </summary>
+        double MaxWidth { get; }
+
+        /// <summary>
+        /// Gets the minimum height of the element.
+        /// </summary>
+        double MinHeight { get; }
+
+        /// <summary>
+        /// Gets the maximum height of the element.
+        /// </summary>
+        double MaxHeight { get; }
+
+        /// <summary>
+        /// Gets the margin around the element.
+        /// </summary>
+        Thickness Margin { get; }
+
+        /// <summary>
+        /// Gets the element's preferred horizontal alignment in its parent.
+        /// </summary>
+        HorizontalAlignment HorizontalAlignment { get; }
+
+        /// <summary>
+        /// Gets the element's preferred vertical alignment in its parent.
+        /// </summary>
+        VerticalAlignment VerticalAlignment { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layout measure is valid.
+        /// </summary>
+        bool IsMeasureValid { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layouts arrange is valid.
+        /// </summary>
+        bool IsArrangeValid { get; }
+
+        /// <summary>
+        /// Gets the available size passed in the previous layout pass, if any.
+        /// </summary>
+        Size? PreviousMeasure { get; }
+
+        /// <summary>
+        /// Gets the layout rect passed in the previous layout pass, if any.
+        /// </summary>
+        Rect? PreviousArrange { get; }
+
+        /// <summary>
+        /// Creates the visual children of the control, if necessary
+        /// </summary>
+        void ApplyTemplate();
+
+        /// <summary>
+        /// Carries out a measure of the control.
+        /// </summary>
+        /// <param name="availableSize">The available size for the control.</param>
+        void Measure(Size availableSize);
+
+        /// <summary>
+        /// Arranges the control and its children.
+        /// </summary>
+        /// <param name="rect">The control's new bounds.</param>
+        void Arrange(Rect rect);
+
+        /// <summary>
+        /// Invalidates the measurement of the control and queues a new layout pass.
+        /// </summary>
+        void InvalidateMeasure();
+
+        /// <summary>
+        /// Invalidates the arrangement of the control and queues a new layout pass.
+        /// </summary>
+        void InvalidateArrange();
+
+        /// <summary>
+        /// Called when a child control's desired size changes.
+        /// </summary>
+        /// <param name="control">The child control.</param>
+        void ChildDesiredSizeChanged(ILayoutable control);
+
+        /// <summary>
+        /// Used by the <see cref="LayoutManager"/> to notify the control that its effective
+        /// viewport is changed.
+        /// </summary>
+        /// <param name="e">The viewport information.</param>
+        void EffectiveViewportChanged(EffectiveViewportChangedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Layout/LayoutContext.cs b/src/Avalonia.Base/Layout/LayoutContext.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutContext.cs
rename to src/Avalonia.Base/Layout/LayoutContext.cs
diff --git a/src/Avalonia.Layout/LayoutContextAdapter.cs b/src/Avalonia.Base/Layout/LayoutContextAdapter.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutContextAdapter.cs
rename to src/Avalonia.Base/Layout/LayoutContextAdapter.cs
diff --git a/src/Avalonia.Layout/LayoutExtensions.cs b/src/Avalonia.Base/Layout/LayoutExtensions.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutExtensions.cs
rename to src/Avalonia.Base/Layout/LayoutExtensions.cs
diff --git a/src/Avalonia.Base/Layout/LayoutHelper.cs b/src/Avalonia.Base/Layout/LayoutHelper.cs
new file mode 100644
index 0000000000..0851dbaea9
--- /dev/null
+++ b/src/Avalonia.Base/Layout/LayoutHelper.cs
@@ -0,0 +1,321 @@
+using System;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Provides helper methods needed for layout.
+    /// </summary>
+    public static class LayoutHelper
+    {
+        /// <summary>
+        /// Epsilon value used for certain layout calculations.
+        /// Based on the value in WPF LayoutDoubleUtil.
+        /// </summary>
+        public static double LayoutEpsilon { get; } = 0.00000153;
+
+        /// <summary>
+        /// Calculates a control's size based on its <see cref="ILayoutable.Width"/>,
+        /// <see cref="ILayoutable.Height"/>, <see cref="ILayoutable.MinWidth"/>,
+        /// <see cref="ILayoutable.MaxWidth"/>, <see cref="ILayoutable.MinHeight"/> and
+        /// <see cref="ILayoutable.MaxHeight"/>.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="constraints">The space available for the control.</param>
+        /// <returns>The control's size.</returns>
+        public static Size ApplyLayoutConstraints(ILayoutable control, Size constraints)
+        {
+            var minmax = new MinMax(control);
+
+            return new Size(
+                MathUtilities.Clamp(constraints.Width, minmax.MinWidth, minmax.MaxWidth),
+                MathUtilities.Clamp(constraints.Height, minmax.MinHeight, minmax.MaxHeight));
+        }
+
+        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding,
+            Thickness borderThickness)
+        {
+            if (IsParentLayoutRounded(control, out double scale))
+            {
+                padding = RoundLayoutThickness(padding, scale, scale);
+                borderThickness = RoundLayoutThickness(borderThickness, scale, scale);
+            }
+
+            if (control != null)
+            {
+                control.Measure(availableSize.Deflate(padding + borderThickness));
+                return control.DesiredSize.Inflate(padding + borderThickness);
+            }
+
+            return new Size().Inflate(padding + borderThickness);
+        }
+
+        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding)
+        {
+            if (IsParentLayoutRounded(control, out double scale))
+            {
+                padding = RoundLayoutThickness(padding, scale, scale);
+            }
+
+            if (control != null)
+            {
+                control.Measure(availableSize.Deflate(padding));
+                return control.DesiredSize.Inflate(padding);
+            }
+
+            return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+        }
+
+        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding, Thickness borderThickness)
+        {
+            if (IsParentLayoutRounded(child, out double scale))
+            {
+                padding = RoundLayoutThickness(padding, scale, scale);
+                borderThickness = RoundLayoutThickness(borderThickness, scale, scale);
+            }
+
+            return ArrangeChildInternal(child, availableSize, padding + borderThickness);
+        }
+
+        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding)
+        {
+            if(IsParentLayoutRounded(child, out double scale))
+                padding = RoundLayoutThickness(padding, scale, scale);
+
+            return ArrangeChildInternal(child, availableSize, padding);
+        }
+
+        private static Size ArrangeChildInternal(ILayoutable? child, Size availableSize, Thickness padding)
+        {
+            child?.Arrange(new Rect(availableSize).Deflate(padding));
+
+            return availableSize;
+        }
+
+        private static bool IsParentLayoutRounded(ILayoutable? child, out double scale)
+        {
+            var layoutableParent = (ILayoutable?)child?.GetVisualParent();
+
+            if (layoutableParent == null || !((Layoutable)layoutableParent).UseLayoutRounding)
+            {
+                scale = 1.0;
+                return false;
+            }
+
+            scale = GetLayoutScale(layoutableParent);
+            return true;
+        }
+
+        /// <summary>
+        /// Invalidates measure for given control and all visual children recursively.
+        /// </summary>
+        public static void InvalidateSelfAndChildrenMeasure(ILayoutable control)
+        {
+            void InnerInvalidateMeasure(IVisual target)
+            {
+                if (target is ILayoutable targetLayoutable)
+                {
+                    targetLayoutable.InvalidateMeasure();
+                }
+
+                var visualChildren = target.VisualChildren;
+                var visualChildrenCount = visualChildren.Count;
+
+                for (int i = 0; i < visualChildrenCount; i++)
+                {
+                    IVisual child = visualChildren[i];
+
+                    InnerInvalidateMeasure(child);
+                }
+            }
+
+            InnerInvalidateMeasure(control);
+        }
+
+        /// <summary>
+        /// Obtains layout scale of the given control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <exception cref="Exception">Thrown when control has no root or returned layout scaling is invalid.</exception>
+        public static double GetLayoutScale(ILayoutable control)
+        {
+            var visualRoot = control.VisualRoot;
+            
+            var result = (visualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
+
+            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
+            {
+                throw new Exception($"Invalid LayoutScaling returned from {visualRoot!.GetType()}");
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Rounds a size to integer values for layout purposes, compensating for high DPI screen
+        /// coordinates by rounding the size up to the nearest pixel.
+        /// </summary>
+        /// <param name="size">Input size.</param>
+        /// <param name="dpiScaleX">DPI along x-dimension.</param>
+        /// <param name="dpiScaleY">DPI along y-dimension.</param>
+        /// <returns>Value of size that will be rounded under screen DPI.</returns>
+        /// <remarks>
+        /// This is a layout helper method. It takes DPI into account and also does not return
+        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
+        /// associated with the UseLayoutRounding property and should not be used as a general rounding
+        /// utility.
+        /// </remarks>
+        public static Size RoundLayoutSizeUp(Size size, double dpiScaleX, double dpiScaleY)
+        {
+            return new Size(RoundLayoutValueUp(size.Width, dpiScaleX), RoundLayoutValueUp(size.Height, dpiScaleY));
+        }
+
+        /// <summary>
+        /// Rounds a thickness to integer values for layout purposes, compensating for high DPI screen
+        /// coordinates.
+        /// </summary>
+        /// <param name="thickness">Input thickness.</param>
+        /// <param name="dpiScaleX">DPI along x-dimension.</param>
+        /// <param name="dpiScaleY">DPI along y-dimension.</param>
+        /// <returns>Value of thickness that will be rounded under screen DPI.</returns>
+        /// <remarks>
+        /// This is a layout helper method. It takes DPI into account and also does not return
+        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
+        /// associated with the UseLayoutRounding property and should not be used as a general rounding
+        /// utility.
+        /// </remarks>
+        public static Thickness RoundLayoutThickness(Thickness thickness, double dpiScaleX, double dpiScaleY)
+        {
+            return new Thickness(
+                RoundLayoutValue(thickness.Left, dpiScaleX),
+                RoundLayoutValue(thickness.Top, dpiScaleY),
+                RoundLayoutValue(thickness.Right, dpiScaleX),
+                RoundLayoutValue(thickness.Bottom, dpiScaleY)
+            );
+        }
+
+        /// <summary>
+        /// Calculates the value to be used for layout rounding at high DPI by rounding the value
+        /// up or down to the nearest pixel.
+        /// </summary>
+        /// <param name="value">Input value to be rounded.</param>
+        /// <param name="dpiScale">Ratio of screen's DPI to layout DPI</param>
+        /// <returns>Adjusted value that will produce layout rounding on screen at high dpi.</returns>
+        /// <remarks>
+        /// This is a layout helper method. It takes DPI into account and also does not return
+        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
+        /// associated with the UseLayoutRounding property and should not be used as a general rounding
+        /// utility.
+        /// </remarks>
+        public static double RoundLayoutValue(double value, double dpiScale)
+        {
+            double newValue;
+
+            // If DPI == 1, don't use DPI-aware rounding.
+            if (!MathUtilities.IsOne(dpiScale))
+            {
+                newValue = Math.Round(value * dpiScale) / dpiScale;
+
+                // If rounding produces a value unacceptable to layout (NaN, Infinity or MaxValue),
+                // use the original value.
+                if (double.IsNaN(newValue) ||
+                    double.IsInfinity(newValue) ||
+                    MathUtilities.AreClose(newValue, double.MaxValue))
+                {
+                    newValue = value;
+                }
+            }
+            else
+            {
+                newValue = Math.Round(value);
+            }
+
+            return newValue;
+        }
+
+        /// <summary>
+        /// Calculates the value to be used for layout rounding at high DPI by rounding the value up
+        /// to the nearest pixel.
+        /// </summary>
+        /// <param name="value">Input value to be rounded.</param>
+        /// <param name="dpiScale">Ratio of screen's DPI to layout DPI</param>
+        /// <returns>Adjusted value that will produce layout rounding on screen at high dpi.</returns>
+        /// <remarks>
+        /// This is a layout helper method. It takes DPI into account and also does not return
+        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
+        /// associated with the UseLayoutRounding property and should not be used as a general rounding
+        /// utility.
+        /// </remarks>
+        public static double RoundLayoutValueUp(double value, double dpiScale)
+        {
+            double newValue;
+
+            // Round the value to avoid FP errors. This is needed because if `value` has a floating
+            // point precision error (e.g. 79.333333333333343) then when it's multiplied by
+            // `dpiScale` and rounded up, it will be rounded up to a value one greater than it
+            // should be.
+#if NET6_0_OR_GREATER
+            value = Math.Round(value, 8, MidpointRounding.ToZero);
+#else
+            // MidpointRounding.ToZero isn't available in netstandard2.0.
+            value = Math.Truncate(value * 1e8) / 1e8;
+#endif
+
+            // If DPI == 1, don't use DPI-aware rounding.
+            if (!MathUtilities.IsOne(dpiScale))
+            {
+                newValue = Math.Ceiling(value * dpiScale) / dpiScale;
+
+                // If rounding produces a value unacceptable to layout (NaN, Infinity or MaxValue),
+                // use the original value.
+                if (double.IsNaN(newValue) ||
+                    double.IsInfinity(newValue) ||
+                    MathUtilities.AreClose(newValue, double.MaxValue))
+                {
+                    newValue = value;
+                }
+            }
+            else
+            {
+                newValue = Math.Ceiling(value);
+            }
+
+            return newValue;
+        }
+
+        /// <summary>
+        /// Calculates the min and max height for a control. Ported from WPF.
+        /// </summary>
+        private readonly struct MinMax
+        {
+            public MinMax(ILayoutable e)
+            {
+                MaxHeight = e.MaxHeight;
+                MinHeight = e.MinHeight;
+                double l = e.Height;
+
+                double height = (double.IsNaN(l) ? double.PositiveInfinity : l);
+                MaxHeight = Math.Max(Math.Min(height, MaxHeight), MinHeight);
+
+                height = (double.IsNaN(l) ? 0 : l);
+                MinHeight = Math.Max(Math.Min(MaxHeight, height), MinHeight);
+
+                MaxWidth = e.MaxWidth;
+                MinWidth = e.MinWidth;
+                l = e.Width;
+
+                double width = (double.IsNaN(l) ? double.PositiveInfinity : l);
+                MaxWidth = Math.Max(Math.Min(width, MaxWidth), MinWidth);
+
+                width = (double.IsNaN(l) ? 0 : l);
+                MinWidth = Math.Max(Math.Min(MaxWidth, width), MinWidth);
+            }
+
+            public double MinWidth { get; }
+            public double MaxWidth { get; }
+            public double MinHeight { get; }
+            public double MaxHeight { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Layout/LayoutManager.cs b/src/Avalonia.Base/Layout/LayoutManager.cs
new file mode 100644
index 0000000000..826947c39a
--- /dev/null
+++ b/src/Avalonia.Base/Layout/LayoutManager.cs
@@ -0,0 +1,418 @@
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Avalonia.Logging;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Manages measuring and arranging of controls.
+    /// </summary>
+    public class LayoutManager : ILayoutManager, IDisposable
+    {
+        private const int MaxPasses = 3;
+        private readonly ILayoutRoot _owner;
+        private readonly LayoutQueue<ILayoutable> _toMeasure = new LayoutQueue<ILayoutable>(v => !v.IsMeasureValid);
+        private readonly LayoutQueue<ILayoutable> _toArrange = new LayoutQueue<ILayoutable>(v => !v.IsArrangeValid);
+        private readonly Action _executeLayoutPass;
+        private List<EffectiveViewportChangedListener>? _effectiveViewportChangedListeners;
+        private bool _disposed;
+        private bool _queued;
+        private bool _running;
+
+        public LayoutManager(ILayoutRoot owner)
+        {
+            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
+            _executeLayoutPass = ExecuteQueuedLayoutPass;
+        }
+
+        public virtual event EventHandler? LayoutUpdated;
+
+        /// <inheritdoc/>
+        public virtual void InvalidateMeasure(ILayoutable control)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (!control.IsAttachedToVisualTree)
+            {
+#if DEBUG
+                throw new AvaloniaInternalException(
+                    "LayoutManager.InvalidateMeasure called on a control that is detached from the visual tree.");
+#else
+                return;
+#endif
+            }
+
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateMeasure on wrong LayoutManager.");
+            }
+
+            _toMeasure.Enqueue(control);
+            _toArrange.Enqueue(control);
+            QueueLayoutPass();
+        }
+
+        /// <inheritdoc/>
+        public virtual void InvalidateArrange(ILayoutable control)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (!control.IsAttachedToVisualTree)
+            {
+#if DEBUG
+                throw new AvaloniaInternalException(
+                    "LayoutManager.InvalidateArrange called on a control that is detached from the visual tree.");
+#else
+                return;
+#endif
+            }
+
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateArrange on wrong LayoutManager.");
+            }
+
+            _toArrange.Enqueue(control);
+            QueueLayoutPass();
+        }
+
+        private void ExecuteQueuedLayoutPass()
+        {
+            if (!_queued)
+            {
+                return;
+            }
+            
+            ExecuteLayoutPass();
+        }
+
+        /// <inheritdoc/>
+        public virtual void ExecuteLayoutPass()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (!_running)
+            {
+                Stopwatch? stopwatch = null;
+
+                const LogEventLevel timingLogLevel = LogEventLevel.Information;
+                bool captureTiming = Logger.IsEnabled(timingLogLevel, LogArea.Layout);
+
+                if (captureTiming)
+                {
+                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(
+                        this,
+                        "Started layout pass. To measure: {Measure} To arrange: {Arrange}",
+                        _toMeasure.Count,
+                        _toArrange.Count);
+
+                    stopwatch = new Stopwatch();
+                    stopwatch.Start();
+                }
+
+                _toMeasure.BeginLoop(MaxPasses);
+                _toArrange.BeginLoop(MaxPasses);
+
+                try
+                {
+                    _running = true;
+
+                    for (var pass = 0; pass < MaxPasses; ++pass)
+                    {
+                        InnerLayoutPass();
+
+                        if (!RaiseEffectiveViewportChanged())
+                        {
+                            break;
+                        }
+                    }
+                }
+                finally
+                {
+                    _running = false;
+                }
+
+                _toMeasure.EndLoop();
+                _toArrange.EndLoop();
+
+                if (captureTiming)
+                {
+                    stopwatch!.Stop();
+
+                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(this, "Layout pass finished in {Time}", stopwatch.Elapsed);
+                }
+            }
+
+            _queued = false;
+            LayoutUpdated?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        public virtual void ExecuteInitialLayoutPass()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            try
+            {
+                _running = true;
+                Measure(_owner);
+                Arrange(_owner);
+            }
+            finally
+            {
+                _running = false;
+            }
+
+            // Running the initial layout pass may have caused some control to be invalidated
+            // so run a full layout pass now (this usually due to scrollbars; its not known
+            // whether they will need to be shown until the layout pass has run and if the
+            // first guess was incorrect the layout will need to be updated).
+            ExecuteLayoutPass();
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+            _toMeasure.Dispose();
+            _toArrange.Dispose();
+        }
+
+        void ILayoutManager.RegisterEffectiveViewportListener(ILayoutable control)
+        {
+            _effectiveViewportChangedListeners ??= new List<EffectiveViewportChangedListener>();
+            _effectiveViewportChangedListeners.Add(new EffectiveViewportChangedListener(
+                control,
+                CalculateEffectiveViewport(control)));
+        }
+
+        void ILayoutManager.UnregisterEffectiveViewportListener(ILayoutable control)
+        {
+            if (_effectiveViewportChangedListeners is object)
+            {
+                for (var i = _effectiveViewportChangedListeners.Count - 1; i >= 0; --i)
+                {
+                    if (_effectiveViewportChangedListeners[i].Listener == control)
+                    {
+                        _effectiveViewportChangedListeners.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        private void InnerLayoutPass()
+        {
+            for (var pass = 0; pass < MaxPasses; ++pass)
+            {
+                ExecuteMeasurePass();
+                ExecuteArrangePass();
+
+                if (_toMeasure.Count == 0)
+                {
+                    break;
+                }
+            }
+        }
+
+        private void ExecuteMeasurePass()
+        {
+            while (_toMeasure.Count > 0)
+            {
+                var control = _toMeasure.Dequeue();
+
+                if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
+                {
+                    Measure(control);
+                }
+            }
+        }
+
+        private void ExecuteArrangePass()
+        {
+            while (_toArrange.Count > 0)
+            {
+                var control = _toArrange.Dequeue();
+
+                if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
+                {
+                    Arrange(control);
+                }
+            }
+        }
+
+        private void Measure(ILayoutable control)
+        {
+            // Controls closest to the visual root need to be arranged first. We don't try to store
+            // ordered invalidation lists, instead we traverse the tree upwards, measuring the
+            // controls closest to the root first. This has been shown by benchmarks to be the
+            // fastest and most memory-efficient algorithm.
+            if (control.VisualParent is ILayoutable parent)
+            {
+                Measure(parent);
+            }
+
+            // If the control being measured has IsMeasureValid == true here then its measure was
+            // handed by an ancestor and can be ignored. The measure may have also caused the
+            // control to be removed.
+            if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
+            {
+                if (control is ILayoutRoot root)
+                {
+                    root.Measure(Size.Infinity);
+                }
+                else if (control.PreviousMeasure.HasValue)
+                {
+                    control.Measure(control.PreviousMeasure.Value);
+                }
+            }
+        }
+
+        private void Arrange(ILayoutable control)
+        {
+            if (control.VisualParent is ILayoutable parent)
+            {
+                Arrange(parent);
+            }
+
+            if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
+            {
+                if (control is IEmbeddedLayoutRoot embeddedRoot)
+                    control.Arrange(new Rect(embeddedRoot.AllocatedSize));
+                else if (control is ILayoutRoot root)
+                    control.Arrange(new Rect(root.DesiredSize));
+                else if (control.PreviousArrange != null)
+                {
+                    // Has been observed that PreviousArrange sometimes is null, probably a bug somewhere else.
+                    // Condition observed: control.VisualParent is Scrollbar, control is Border.
+                    control.Arrange(control.PreviousArrange.Value);
+                }
+            }
+        }
+
+        private void QueueLayoutPass()
+        {
+            if (!_queued && !_running)
+            {
+                _queued = true;
+                Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
+            }
+        }
+
+        private bool RaiseEffectiveViewportChanged()
+        {
+            var startCount = _toMeasure.Count + _toArrange.Count;
+
+            if (_effectiveViewportChangedListeners is object)
+            {
+                var count = _effectiveViewportChangedListeners.Count;
+                var pool = ArrayPool<EffectiveViewportChangedListener>.Shared;
+                var listeners = pool.Rent(count);
+
+                _effectiveViewportChangedListeners.CopyTo(listeners);
+
+                try
+                {
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var l = listeners[i];
+
+                        if (!l.Listener.IsAttachedToVisualTree)
+                        {
+                            continue;
+                        }
+
+                        var viewport = CalculateEffectiveViewport(l.Listener);
+
+                        if (viewport != l.Viewport)
+                        {
+                            l.Listener.EffectiveViewportChanged(new EffectiveViewportChangedEventArgs(viewport));
+                            l.Viewport = viewport;
+                        }
+                    }
+                }
+                finally
+                {
+                    pool.Return(listeners, clearArray: true);
+                }
+            }
+
+            return startCount != _toMeasure.Count + _toArrange.Count;
+        }
+
+        private Rect CalculateEffectiveViewport(IVisual control)
+        {
+            var viewport = new Rect(0, 0, double.PositiveInfinity, double.PositiveInfinity);
+            CalculateEffectiveViewport(control, control, ref viewport);
+            return viewport;
+        }
+
+        private void CalculateEffectiveViewport(IVisual target, IVisual control, ref Rect viewport)
+        {
+            // Recurse until the top level control.
+            if (control.VisualParent is object)
+            {
+                CalculateEffectiveViewport(target, control.VisualParent, ref viewport);
+            }
+            else
+            {
+                viewport = new Rect(control.Bounds.Size);
+            }
+
+            // Apply the control clip bounds if it's not the target control. We don't apply it to
+            // the target control because it may itself be clipped to bounds and if so the viewport
+            // we calculate would be of no use.
+            if (control != target && control.ClipToBounds)
+            {
+                viewport = control.Bounds.Intersect(viewport);
+            }
+
+            // Translate the viewport into this control's coordinate space.
+            viewport = viewport.Translate(-control.Bounds.Position);
+
+            if (control != target && control.RenderTransform is object)
+            {
+                var origin = control.RenderTransformOrigin.ToPixels(control.Bounds.Size);
+                var offset = Matrix.CreateTranslation(origin);
+                var renderTransform = (-offset) * control.RenderTransform.Value.Invert() * (offset);
+                viewport = viewport.TransformToAABB(renderTransform);
+            }
+        }
+
+        private class EffectiveViewportChangedListener
+        {
+            public EffectiveViewportChangedListener(ILayoutable listener, Rect viewport)
+            {
+                Listener = listener;
+                Viewport = viewport;
+            }
+
+            public ILayoutable Listener { get; }
+            public Rect Viewport { get; set; }
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/LayoutQueue.cs b/src/Avalonia.Base/Layout/LayoutQueue.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutQueue.cs
rename to src/Avalonia.Base/Layout/LayoutQueue.cs
diff --git a/src/Avalonia.Base/Layout/Layoutable.cs b/src/Avalonia.Base/Layout/Layoutable.cs
new file mode 100644
index 0000000000..527b63292d
--- /dev/null
+++ b/src/Avalonia.Base/Layout/Layoutable.cs
@@ -0,0 +1,843 @@
+using System;
+using Avalonia.Logging;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines how a control aligns itself horizontally in its parent control.
+    /// </summary>
+    public enum HorizontalAlignment
+    {
+        /// <summary>
+        /// The control stretches to fill the width of the parent control.
+        /// </summary>
+        Stretch,
+
+        /// <summary>
+        /// The control aligns itself to the left of the parent control.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// The control centers itself in the parent control.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// The control aligns itself to the right of the parent control.
+        /// </summary>
+        Right,
+    }
+
+    /// <summary>
+    /// Defines how a control aligns itself vertically in its parent control.
+    /// </summary>
+    public enum VerticalAlignment
+    {
+        /// <summary>
+        /// The control stretches to fill the height of the parent control.
+        /// </summary>
+        Stretch,
+
+        /// <summary>
+        /// The control aligns itself to the top of the parent control.
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// The control centers itself within the parent control.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// The control aligns itself to the bottom of the parent control.
+        /// </summary>
+        Bottom,
+    }
+
+    /// <summary>
+    /// Implements layout-related functionality for a control.
+    /// </summary>
+    public class Layoutable : Visual, ILayoutable
+    {
+        /// <summary>
+        /// Defines the <see cref="DesiredSize"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Layoutable, Size> DesiredSizeProperty =
+            AvaloniaProperty.RegisterDirect<Layoutable, Size>(nameof(DesiredSize), o => o.DesiredSize);
+
+        /// <summary>
+        /// Defines the <see cref="Width"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> WidthProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(Width), double.NaN);
+
+        /// <summary>
+        /// Defines the <see cref="Height"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> HeightProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(Height), double.NaN);
+
+        /// <summary>
+        /// Defines the <see cref="MinWidth"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinWidthProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MinWidth));
+
+        /// <summary>
+        /// Defines the <see cref="MaxWidth"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaxWidthProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxWidth), double.PositiveInfinity);
+
+        /// <summary>
+        /// Defines the <see cref="MinHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinHeightProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MinHeight));
+
+        /// <summary>
+        /// Defines the <see cref="MaxHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaxHeightProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxHeight), double.PositiveInfinity);
+
+        /// <summary>
+        /// Defines the <see cref="Margin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Thickness> MarginProperty =
+            AvaloniaProperty.Register<Layoutable, Thickness>(nameof(Margin));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalAlignmentProperty =
+            AvaloniaProperty.Register<Layoutable, HorizontalAlignment>(nameof(HorizontalAlignment));
+
+        /// <summary>
+        /// Defines the <see cref="VerticalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalAlignmentProperty =
+            AvaloniaProperty.Register<Layoutable, VerticalAlignment>(nameof(VerticalAlignment));
+
+        /// <summary>
+        /// Defines the <see cref="UseLayoutRoundingProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> UseLayoutRoundingProperty =
+            AvaloniaProperty.Register<Layoutable, bool>(nameof(UseLayoutRounding), defaultValue: true, inherits: true);
+
+        private bool _measuring;
+        private Size? _previousMeasure;
+        private Rect? _previousArrange;
+        private EventHandler<EffectiveViewportChangedEventArgs>? _effectiveViewportChanged;
+        private EventHandler? _layoutUpdated;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="Layoutable"/> class.
+        /// </summary>
+        static Layoutable()
+        {
+            AffectsMeasure<Layoutable>(
+                WidthProperty,
+                HeightProperty,
+                MinWidthProperty,
+                MaxWidthProperty,
+                MinHeightProperty,
+                MaxHeightProperty,
+                MarginProperty,
+                HorizontalAlignmentProperty,
+                VerticalAlignmentProperty);
+        }
+
+        /// <summary>
+        /// Occurs when the element's effective viewport changes.
+        /// </summary>
+        public event EventHandler<EffectiveViewportChangedEventArgs>? EffectiveViewportChanged
+        {
+            add
+            {
+                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.RegisterEffectiveViewportListener(this);
+                }
+
+                _effectiveViewportChanged += value;
+            }
+
+            remove
+            {
+                _effectiveViewportChanged -= value;
+
+                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a layout pass completes for the control.
+        /// </summary>
+        public event EventHandler? LayoutUpdated
+        {
+            add
+            {
+                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
+                }
+
+                _layoutUpdated += value;
+            }
+
+            remove
+            {
+                _layoutUpdated -= value;
+
+                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the element.
+        /// </summary>
+        public double Width
+        {
+            get { return GetValue(WidthProperty); }
+            set { SetValue(WidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the element.
+        /// </summary>
+        public double Height
+        {
+            get { return GetValue(HeightProperty); }
+            set { SetValue(HeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum width of the element.
+        /// </summary>
+        public double MinWidth
+        {
+            get { return GetValue(MinWidthProperty); }
+            set { SetValue(MinWidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum width of the element.
+        /// </summary>
+        public double MaxWidth
+        {
+            get { return GetValue(MaxWidthProperty); }
+            set { SetValue(MaxWidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum height of the element.
+        /// </summary>
+        public double MinHeight
+        {
+            get { return GetValue(MinHeightProperty); }
+            set { SetValue(MinHeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the element.
+        /// </summary>
+        public double MaxHeight
+        {
+            get { return GetValue(MaxHeightProperty); }
+            set { SetValue(MaxHeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the margin around the element.
+        /// </summary>
+        public Thickness Margin
+        {
+            get { return GetValue(MarginProperty); }
+            set { SetValue(MarginProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the element's preferred horizontal alignment in its parent.
+        /// </summary>
+        public HorizontalAlignment HorizontalAlignment
+        {
+            get { return GetValue(HorizontalAlignmentProperty); }
+            set { SetValue(HorizontalAlignmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the element's preferred vertical alignment in its parent.
+        /// </summary>
+        public VerticalAlignment VerticalAlignment
+        {
+            get { return GetValue(VerticalAlignmentProperty); }
+            set { SetValue(VerticalAlignmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the size that this element computed during the measure pass of the layout process.
+        /// </summary>
+        public Size DesiredSize
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layout measure is valid.
+        /// </summary>
+        public bool IsMeasureValid
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layouts arrange is valid.
+        /// </summary>
+        public bool IsArrangeValid
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines whether the element should be snapped to pixel
+        /// boundaries at layout time.
+        /// </summary>
+        public bool UseLayoutRounding
+        {
+            get { return GetValue(UseLayoutRoundingProperty); }
+            set { SetValue(UseLayoutRoundingProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the available size passed in the previous layout pass, if any.
+        /// </summary>
+        Size? ILayoutable.PreviousMeasure => _previousMeasure;
+
+        /// <summary>
+        /// Gets the layout rect passed in the previous layout pass, if any.
+        /// </summary>
+        Rect? ILayoutable.PreviousArrange => _previousArrange;
+
+        /// <summary>
+        /// Creates the visual children of the control, if necessary
+        /// </summary>
+        public virtual void ApplyTemplate()
+        {
+        }
+
+        /// <summary>
+        /// Carries out a measure of the control.
+        /// </summary>
+        /// <param name="availableSize">The available size for the control.</param>
+        public void Measure(Size availableSize)
+        {
+            if (double.IsNaN(availableSize.Width) || double.IsNaN(availableSize.Height))
+            {
+                throw new InvalidOperationException("Cannot call Measure using a size with NaN values.");
+            }
+
+            if (!IsMeasureValid || _previousMeasure != availableSize)
+            {
+                var previousDesiredSize = DesiredSize;
+                var desiredSize = default(Size);
+
+                IsMeasureValid = true;
+
+                try
+                {
+                    _measuring = true;
+                    desiredSize = MeasureCore(availableSize);
+                }
+                finally
+                {
+                    _measuring = false;
+                }
+
+                if (IsInvalidSize(desiredSize))
+                {
+                    throw new InvalidOperationException("Invalid size returned for Measure.");
+                }
+
+                DesiredSize = desiredSize;
+                _previousMeasure = availableSize;
+
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Measure requested {DesiredSize}", DesiredSize);
+
+                if (DesiredSize != previousDesiredSize)
+                {
+                    this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Arranges the control and its children.
+        /// </summary>
+        /// <param name="rect">The control's new bounds.</param>
+        public void Arrange(Rect rect)
+        {
+            if (IsInvalidRect(rect))
+            {
+                throw new InvalidOperationException("Invalid Arrange rectangle.");
+            }
+
+            if (!IsMeasureValid)
+            {
+                Measure(_previousMeasure ?? rect.Size);
+            }
+
+            if (!IsArrangeValid || _previousArrange != rect)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Arrange to {Rect} ", rect);
+
+                IsArrangeValid = true;
+                ArrangeCore(rect);
+                _previousArrange = rect;
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the measurement of the control and queues a new layout pass.
+        /// </summary>
+        public void InvalidateMeasure()
+        {
+            if (IsMeasureValid)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated measure");
+
+                IsMeasureValid = false;
+                IsArrangeValid = false;
+
+                if (((ILayoutable)this).IsAttachedToVisualTree)
+                {
+                    (VisualRoot as ILayoutRoot)?.LayoutManager.InvalidateMeasure(this);
+                    InvalidateVisual();
+                }
+                OnMeasureInvalidated();
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the arrangement of the control and queues a new layout pass.
+        /// </summary>
+        public void InvalidateArrange()
+        {
+            if (IsArrangeValid)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated arrange");
+
+                IsArrangeValid = false;
+                (VisualRoot as ILayoutRoot)?.LayoutManager?.InvalidateArrange(this);
+                InvalidateVisual();
+            }
+        }
+
+        /// <inheritdoc/>
+        void ILayoutable.ChildDesiredSizeChanged(ILayoutable control)
+        {
+            if (!_measuring)
+            {
+                InvalidateMeasure();
+            }
+        }
+
+        void ILayoutable.EffectiveViewportChanged(EffectiveViewportChangedEventArgs e)
+        {
+            _effectiveViewportChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the control's measurement.
+        /// </summary>
+        /// <typeparam name="T">The control which the property affects.</typeparam>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
+        /// </remarks>
+        protected static void AffectsMeasure<T>(params AvaloniaProperty[] properties)
+            where T : class, ILayoutable
+        {
+            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.InvalidateMeasure();
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(Invalidate);
+            }
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the control's arrangement.
+        /// </summary>
+        /// <typeparam name="T">The control which the property affects.</typeparam>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
+        /// </remarks>
+        protected static void AffectsArrange<T>(params AvaloniaProperty[] properties)
+            where T : class, ILayoutable
+        {
+            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.InvalidateArrange();
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(Invalidate);
+            }
+        }
+
+        /// <summary>
+        /// The default implementation of the control's measure pass.
+        /// </summary>
+        /// <param name="availableSize">The size available to the control.</param>
+        /// <returns>The desired size for the control.</returns>
+        /// <remarks>
+        /// This method calls <see cref="MeasureOverride(Size)"/> which is probably the method you
+        /// want to override in order to modify a control's arrangement.
+        /// </remarks>
+        protected virtual Size MeasureCore(Size availableSize)
+        {
+            if (IsVisible)
+            {
+                var margin = Margin;
+                var useLayoutRounding = UseLayoutRounding;
+                var scale = 1.0;
+
+                if (useLayoutRounding)
+                {
+                    scale = LayoutHelper.GetLayoutScale(this);
+                    margin = LayoutHelper.RoundLayoutThickness(margin, scale, scale);
+                }
+
+                ApplyStyling();
+                ApplyTemplate();
+
+                var constrained = LayoutHelper.ApplyLayoutConstraints(
+                    this,
+                    availableSize.Deflate(margin));
+                var measured = MeasureOverride(constrained);
+
+                var width = measured.Width;
+                var height = measured.Height;
+
+                {
+                    double widthCache = Width;
+
+                    if (!double.IsNaN(widthCache))
+                    {
+                        width = widthCache;
+                    }
+                }
+
+                width = Math.Min(width, MaxWidth);
+                width = Math.Max(width, MinWidth);
+
+                {
+                    double heightCache = Height;
+
+                    if (!double.IsNaN(heightCache))
+                    {
+                        height = heightCache;
+                    }
+                }
+
+                height = Math.Min(height, MaxHeight);
+                height = Math.Max(height, MinHeight);
+
+                if (useLayoutRounding)
+                {
+                    (width, height) = LayoutHelper.RoundLayoutSizeUp(new Size(width, height), scale, scale);
+                }
+
+                width = Math.Min(width, availableSize.Width);
+                height = Math.Min(height, availableSize.Height);
+
+                return NonNegative(new Size(width, height).Inflate(margin));
+            }
+            else
+            {
+                return new Size();
+            }
+        }
+
+        /// <summary>
+        /// Measures the control and its child elements as part of a layout pass.
+        /// </summary>
+        /// <param name="availableSize">The size available to the control.</param>
+        /// <returns>The desired size for the control.</returns>
+        protected virtual Size MeasureOverride(Size availableSize)
+        {
+            double width = 0;
+            double height = 0;
+
+            var visualChildren = VisualChildren;
+            var visualCount = visualChildren.Count;
+
+            for (var i = 0; i < visualCount; i++)
+            {
+                IVisual visual = visualChildren[i];
+
+                if (visual is ILayoutable layoutable)
+                {
+                    layoutable.Measure(availableSize);
+                    width = Math.Max(width, layoutable.DesiredSize.Width);
+                    height = Math.Max(height, layoutable.DesiredSize.Height);
+                }
+            }
+
+            return new Size(width, height);
+        }
+
+        /// <summary>
+        /// The default implementation of the control's arrange pass.
+        /// </summary>
+        /// <param name="finalRect">The control's new bounds.</param>
+        /// <remarks>
+        /// This method calls <see cref="ArrangeOverride(Size)"/> which is probably the method you
+        /// want to override in order to modify a control's arrangement.
+        /// </remarks>
+        protected virtual void ArrangeCore(Rect finalRect)
+        {
+            if (IsVisible)
+            {
+                var useLayoutRounding = UseLayoutRounding;
+                var scale = LayoutHelper.GetLayoutScale(this);
+
+                var margin = Margin;
+                var originX = finalRect.X + margin.Left;
+                var originY = finalRect.Y + margin.Top;
+
+                // Margin has to be treated separately because the layout rounding function is not linear
+                // f(a + b) != f(a) + f(b)
+                // If the margin isn't pre-rounded some sizes will be offset by 1 pixel in certain scales.
+                if (useLayoutRounding)
+                {
+                    margin = LayoutHelper.RoundLayoutThickness(margin, scale, scale);
+                }
+
+                var availableSizeMinusMargins = new Size(
+                    Math.Max(0, finalRect.Width - margin.Left - margin.Right),
+                    Math.Max(0, finalRect.Height - margin.Top - margin.Bottom));
+                var horizontalAlignment = HorizontalAlignment;
+                var verticalAlignment = VerticalAlignment;
+                var size = availableSizeMinusMargins;
+
+                if (horizontalAlignment != HorizontalAlignment.Stretch)
+                {
+                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - margin.Left - margin.Right));
+                }
+
+                if (verticalAlignment != VerticalAlignment.Stretch)
+                {
+                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - margin.Top - margin.Bottom));
+                }
+
+                size = LayoutHelper.ApplyLayoutConstraints(this, size);
+
+                if (useLayoutRounding)
+                {
+                    size = LayoutHelper.RoundLayoutSizeUp(size, scale, scale);
+                    availableSizeMinusMargins = LayoutHelper.RoundLayoutSizeUp(availableSizeMinusMargins, scale, scale);
+                }
+
+                size = ArrangeOverride(size).Constrain(size);
+
+                switch (horizontalAlignment)
+                {
+                    case HorizontalAlignment.Center:
+                    case HorizontalAlignment.Stretch:
+                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
+                        break;
+                    case HorizontalAlignment.Right:
+                        originX += availableSizeMinusMargins.Width - size.Width;
+                        break;
+                }
+
+                switch (verticalAlignment)
+                {
+                    case VerticalAlignment.Center:
+                    case VerticalAlignment.Stretch:
+                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
+                        break;
+                    case VerticalAlignment.Bottom:
+                        originY += availableSizeMinusMargins.Height - size.Height;
+                        break;
+                }
+
+                if (useLayoutRounding)
+                {
+                    originX = LayoutHelper.RoundLayoutValue(originX, scale);
+                    originY = LayoutHelper.RoundLayoutValue(originY, scale);
+                }
+
+                Bounds = new Rect(originX, originY, size.Width, size.Height);
+            }
+        }
+
+        /// <summary>
+        /// Positions child elements as part of a layout pass.
+        /// </summary>
+        /// <param name="finalSize">The size available to the control.</param>
+        /// <returns>The actual size used.</returns>
+        protected virtual Size ArrangeOverride(Size finalSize)
+        {
+            var arrangeRect = new Rect(finalSize);
+
+            var visualChildren = VisualChildren;
+            var visualCount = visualChildren.Count;
+
+            for (var i = 0; i < visualCount; i++)
+            {
+                IVisual visual = visualChildren[i];
+
+                if (visual is ILayoutable layoutable)
+                {
+                    layoutable.Arrange(arrangeRect);
+                }
+            }
+
+            return finalSize;
+        }
+
+        protected sealed override void InvalidateStyles()
+        {
+            base.InvalidateStyles();
+            InvalidateMeasure();
+        }
+
+        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTreeCore(e);
+
+            if (e.Root is ILayoutRoot r)
+            {
+                if (_layoutUpdated is object)
+                {
+                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
+                }
+
+                if (_effectiveViewportChanged is object)
+                {
+                    r.LayoutManager.RegisterEffectiveViewportListener(this);
+                }
+            }
+        }
+
+        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            if (e.Root is ILayoutRoot r)
+            {
+                if (_layoutUpdated is object)
+                {
+                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
+                }
+
+                if (_effectiveViewportChanged is object)
+                {
+                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
+                }
+            }
+
+            base.OnDetachedFromVisualTreeCore(e);
+        }
+
+        /// <summary>
+        /// Called by InvalidateMeasure
+        /// </summary>
+        protected virtual void OnMeasureInvalidated()
+        {
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsVisibleProperty)
+            {
+                DesiredSize = default;
+
+                // All changes to visibility cause the parent element to be notified.
+                this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
+
+                // We only invalidate outselves when visibility is changed to true.
+                if (change.GetNewValue<bool>())
+                {
+                    InvalidateMeasure();
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected sealed override void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
+        {
+            LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
+
+            base.OnVisualParentChanged(oldParent, newParent);
+        }
+
+        /// <summary>
+        /// Called when the layout manager raises a LayoutUpdated event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void LayoutManagedLayoutUpdated(object? sender, EventArgs e) => _layoutUpdated?.Invoke(this, e);
+
+        /// <summary>
+        /// Tests whether any of a <see cref="Rect"/>'s properties include negative values,
+        /// a NaN or Infinity.
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <returns>True if the rect is invalid; otherwise false.</returns>
+        private static bool IsInvalidRect(Rect rect)
+        {
+            return rect.Width < 0 || rect.Height < 0 ||
+                double.IsInfinity(rect.X) || double.IsInfinity(rect.Y) ||
+                double.IsInfinity(rect.Width) || double.IsInfinity(rect.Height) ||
+                double.IsNaN(rect.X) || double.IsNaN(rect.Y) ||
+                double.IsNaN(rect.Width) || double.IsNaN(rect.Height);
+        }
+
+        /// <summary>
+        /// Tests whether any of a <see cref="Size"/>'s properties include negative values,
+        /// a NaN or Infinity.
+        /// </summary>
+        /// <param name="size">The size.</param>
+        /// <returns>True if the size is invalid; otherwise false.</returns>
+        private static bool IsInvalidSize(Size size)
+        {
+            return size.Width < 0 || size.Height < 0 ||
+                double.IsInfinity(size.Width) || double.IsInfinity(size.Height) ||
+                double.IsNaN(size.Width) || double.IsNaN(size.Height);
+        }
+
+        /// <summary>
+        /// Ensures neither component of a <see cref="Size"/> is negative.
+        /// </summary>
+        /// <param name="size">The size.</param>
+        /// <returns>The non-negative size.</returns>
+        private static Size NonNegative(Size size)
+        {
+            return new Size(Math.Max(size.Width, 0), Math.Max(size.Height, 0));
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/NonVirtualizingLayout.cs b/src/Avalonia.Base/Layout/NonVirtualizingLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/NonVirtualizingLayout.cs
rename to src/Avalonia.Base/Layout/NonVirtualizingLayout.cs
diff --git a/src/Avalonia.Layout/NonVirtualizingLayoutContext.cs b/src/Avalonia.Base/Layout/NonVirtualizingLayoutContext.cs
similarity index 100%
rename from src/Avalonia.Layout/NonVirtualizingLayoutContext.cs
rename to src/Avalonia.Base/Layout/NonVirtualizingLayoutContext.cs
diff --git a/src/Avalonia.Layout/NonVirtualizingStackLayout.cs b/src/Avalonia.Base/Layout/NonVirtualizingStackLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/NonVirtualizingStackLayout.cs
rename to src/Avalonia.Base/Layout/NonVirtualizingStackLayout.cs
diff --git a/src/Avalonia.Layout/Orientation.cs b/src/Avalonia.Base/Layout/Orientation.cs
similarity index 100%
rename from src/Avalonia.Layout/Orientation.cs
rename to src/Avalonia.Base/Layout/Orientation.cs
diff --git a/src/Avalonia.Layout/OrientationBasedMeasures.cs b/src/Avalonia.Base/Layout/OrientationBasedMeasures.cs
similarity index 100%
rename from src/Avalonia.Layout/OrientationBasedMeasures.cs
rename to src/Avalonia.Base/Layout/OrientationBasedMeasures.cs
diff --git a/src/Avalonia.Base/Layout/StackLayout.cs b/src/Avalonia.Base/Layout/StackLayout.cs
new file mode 100644
index 0000000000..e3c2ab3817
--- /dev/null
+++ b/src/Avalonia.Base/Layout/StackLayout.cs
@@ -0,0 +1,364 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Collections.Specialized;
+using Avalonia.Data;
+using Avalonia.Logging;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Arranges elements into a single line (with spacing) that can be oriented horizontally or vertically.
+    /// </summary>
+    public class StackLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
+    {
+        /// <summary>
+        /// Defines the <see cref="DisableVirtualization"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> DisableVirtualizationProperty =
+            AvaloniaProperty.Register<StackLayout, bool>(nameof(DisableVirtualization));
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            AvaloniaProperty.Register<StackLayout, Orientation>(nameof(Orientation), Orientation.Vertical);
+
+        /// <summary>
+        /// Defines the <see cref="Spacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> SpacingProperty =
+            AvaloniaProperty.Register<StackLayout, double>(nameof(Spacing));
+
+        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
+
+        /// <summary>
+        /// Initializes a new instance of the StackLayout class.
+        /// </summary>
+        public StackLayout()
+        {
+            LayoutId = "StackLayout";
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether virtualization is disabled on the layout.
+        /// </summary>
+        public bool DisableVirtualization
+        {
+            get => GetValue(DisableVirtualizationProperty);
+            set => SetValue(DisableVirtualizationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the axis along which items are laid out.
+        /// </summary>
+        /// <value>
+        /// One of the enumeration values that specifies the axis along which items are laid out.
+        /// The default is Vertical.
+        /// </value>
+        public Orientation Orientation
+        {
+            get => GetValue(OrientationProperty);
+            set => SetValue(OrientationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a uniform distance (in pixels) between stacked items. It is applied in the
+        /// direction of the StackLayout's Orientation.
+        /// </summary>
+        public double Spacing
+        {
+            get => GetValue(SpacingProperty);
+            set => SetValue(SpacingProperty, value);
+        }
+
+        internal Rect GetExtent(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            ILayoutable? firstRealized,
+            int firstRealizedItemIndex,
+            Rect firstRealizedLayoutBounds,
+            ILayoutable? lastRealized,
+            int lastRealizedItemIndex,
+            Rect lastRealizedLayoutBounds)
+        {
+            var extent = new Rect();
+
+            // Constants
+            int itemsCount = context.ItemCount;
+            var stackState = (StackLayoutState)context.LayoutState!;
+            double averageElementSize = GetAverageElementSize(availableSize, context, stackState) + Spacing;
+
+            _orientation.SetMinorSize(ref extent, stackState.MaxArrangeBounds);
+            _orientation.SetMajorSize(ref extent, Math.Max(0.0f, itemsCount * averageElementSize - Spacing));
+            if (itemsCount > 0)
+            {
+                if (firstRealized != null)
+                {
+                    _orientation.SetMajorStart(
+                        ref extent,
+                        _orientation.MajorStart(firstRealizedLayoutBounds) - firstRealizedItemIndex * averageElementSize);
+                    var remainingItems = itemsCount - lastRealizedItemIndex - 1;
+                    _orientation.SetMajorSize(
+                        ref extent,
+                        _orientation.MajorEnd(lastRealizedLayoutBounds) -
+                            _orientation.MajorStart(extent) + 
+                            (remainingItems * averageElementSize));
+                }
+                else
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements",
+                        LayoutId);
+                }
+            }
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on average {Average}",
+                LayoutId, extent.Size, averageElementSize);
+            return extent;
+        }
+
+        internal void OnElementMeasured(
+            ILayoutable element,
+            int index,
+            Size availableSize,
+            Size measureSize,
+            Size desiredSize,
+            Size provisionalArrangeSize,
+            VirtualizingLayoutContext context)
+        {
+            if (context is VirtualizingLayoutContext virtualContext)
+            {
+                var stackState = (StackLayoutState)virtualContext.LayoutState!;
+                var provisionalArrangeSizeWinRt = provisionalArrangeSize;
+                stackState.OnElementMeasured(
+                    index,
+                    _orientation.Major(provisionalArrangeSizeWinRt),
+                    _orientation.Minor(provisionalArrangeSizeWinRt));
+            }
+        }
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
+            int index,
+            Size availableSize,
+            VirtualizingLayoutContext context) => availableSize;
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
+            int index,
+            Size measureSize,
+            Size desiredSize,
+            VirtualizingLayoutContext context)
+        {
+            var measureSizeMinor = _orientation.Minor(measureSize);
+            return _orientation.MinorMajorSize(
+                !double.IsInfinity(measureSizeMinor) ?
+                    Math.Max(measureSizeMinor, _orientation.Minor(desiredSize)) :
+                    _orientation.Minor(desiredSize),
+                _orientation.Major(desiredSize));
+        }
+
+        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => true;
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
+            Size availableSize,
+            VirtualizingLayoutContext context) => GetAnchorForRealizationRect(availableSize, context);
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
+            int targetIndex,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            double offset = double.NaN;
+            int index = -1;
+            int itemsCount = context.ItemCount;
+
+            if (targetIndex >= 0 && targetIndex < itemsCount)
+            {
+                index = targetIndex;
+                var state = (StackLayoutState)context.LayoutState!;
+                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
+                offset = index * averageElementSize + _orientation.MajorStart(state.FlowAlgorithm.LastExtent);
+            }
+
+            return new FlowLayoutAnchorInfo { Index = index, Offset = offset };
+        }
+
+        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            ILayoutable? firstRealized,
+            int firstRealizedItemIndex,
+            Rect firstRealizedLayoutBounds,
+            ILayoutable? lastRealized,
+            int lastRealizedItemIndex,
+            Rect lastRealizedLayoutBounds)
+        {
+            return GetExtent(
+                availableSize,
+                context,
+                firstRealized,
+                firstRealizedItemIndex,
+                firstRealizedLayoutBounds,
+                lastRealized,
+                lastRealizedItemIndex,
+                lastRealizedLayoutBounds);
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
+        {
+            OnElementMeasured(
+                element,
+                index,
+                availableSize,
+                measureSize,
+                desiredSize,
+                provisionalArrangeSize,
+                context);
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
+        {
+        }
+
+        internal FlowLayoutAnchorInfo GetAnchorForRealizationRect(
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            int anchorIndex = -1;
+            double offset = double.NaN;
+
+            // Constants
+            int itemsCount = context.ItemCount;
+            if (itemsCount > 0)
+            {
+                var realizationRect = context.RealizationRect;
+                var state = (StackLayoutState)context.LayoutState!;
+                var lastExtent = state.FlowAlgorithm.LastExtent;
+
+                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
+                double realizationWindowOffsetInExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
+                double majorSize = _orientation.MajorSize(lastExtent) == 0 ? Math.Max(0.0, averageElementSize * itemsCount - Spacing) : _orientation.MajorSize(lastExtent);
+                if (itemsCount > 0 &&
+                    _orientation.MajorSize(realizationRect) >= 0 &&
+                    // MajorSize = 0 will account for when a nested repeater is outside the realization rect but still being measured. Also,
+                    // note that if we are measuring this repeater, then we are already realizing an element to figure out the size, so we could
+                    // just keep that element alive. It also helps in XYFocus scenarios to have an element realized for XYFocus to find a candidate
+                    // in the navigating direction.
+                    realizationWindowOffsetInExtent + _orientation.MajorSize(realizationRect) >= 0 && realizationWindowOffsetInExtent <= majorSize)
+                {
+                    anchorIndex = (int) (realizationWindowOffsetInExtent / averageElementSize);
+                    anchorIndex = Math.Max(0, Math.Min(itemsCount - 1, anchorIndex));
+                    offset = anchorIndex* averageElementSize + _orientation.MajorStart(lastExtent);
+                }
+        }
+
+            return new FlowLayoutAnchorInfo { Index = anchorIndex, Offset = offset, };
+        }
+
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var state = context.LayoutState;
+            var stackState = state as StackLayoutState;
+            
+            if (stackState == null)
+            {
+                if (state != null)
+                {
+                    throw new InvalidOperationException("LayoutState must derive from StackLayoutState.");
+                }
+
+                // Custom deriving layouts could potentially be stateful.
+                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
+                stackState = new StackLayoutState();
+            }
+
+            stackState.InitializeForContext(context, this);
+        }
+
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var stackState = (StackLayoutState)context.LayoutState!;
+            stackState.UninitializeForContext(context);
+        }
+
+        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        {
+            ((StackLayoutState)context.LayoutState!).OnMeasureStart();
+
+            var desiredSize = GetFlowAlgorithm(context).Measure(
+                availableSize,
+                context,
+                false,
+                0,
+                Spacing,
+                int.MaxValue,
+                _orientation.ScrollOrientation,
+                DisableVirtualization,
+                LayoutId);
+
+            return new Size(desiredSize.Width, desiredSize.Height);
+        }
+
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        {
+            var value = GetFlowAlgorithm(context).Arrange(
+               finalSize,
+               context,
+               false,
+               FlowLayoutAlgorithm.LineAlignment.Start,
+               LayoutId);
+
+            return new Size(value.Width, value.Height);
+        }
+
+        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
+        {
+            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
+            // Always invalidate layout to keep the view accurate.
+            InvalidateLayout();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == OrientationProperty)
+            {
+                var orientation = change.GetNewValue<Orientation>();
+
+                //Note: For StackLayout Vertical Orientation means we have a Vertical ScrollOrientation.
+                //Horizontal Orientation means we have a Horizontal ScrollOrientation.
+                _orientation.ScrollOrientation = orientation == Orientation.Horizontal ? ScrollOrientation.Horizontal : ScrollOrientation.Vertical;
+            }
+
+            InvalidateLayout();
+        }
+
+        private double GetAverageElementSize(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            StackLayoutState stackLayoutState)
+        {
+            double averageElementSize = 0;
+
+            if (context.ItemCount > 0)
+            {
+                if (stackLayoutState.TotalElementsMeasured == 0)
+                {
+                    var tmpElement = context.GetOrCreateElementAt(0, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
+                    stackLayoutState.FlowAlgorithm.MeasureElement(tmpElement, 0, availableSize, context);
+                    context.RecycleElement(tmpElement);
+                }
+
+                averageElementSize = Math.Round(stackLayoutState.TotalElementSize / stackLayoutState.TotalElementsMeasured);
+            }
+
+            return averageElementSize;
+        }
+
+        private void InvalidateLayout() => InvalidateMeasure();
+
+        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((StackLayoutState)context.LayoutState!).FlowAlgorithm;
+    }
+}
diff --git a/src/Avalonia.Layout/StackLayoutState.cs b/src/Avalonia.Base/Layout/StackLayoutState.cs
similarity index 100%
rename from src/Avalonia.Layout/StackLayoutState.cs
rename to src/Avalonia.Base/Layout/StackLayoutState.cs
diff --git a/src/Avalonia.Base/Layout/UniformGridLayout.cs b/src/Avalonia.Base/Layout/UniformGridLayout.cs
new file mode 100644
index 0000000000..a7880a1545
--- /dev/null
+++ b/src/Avalonia.Base/Layout/UniformGridLayout.cs
@@ -0,0 +1,562 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Collections.Specialized;
+using Avalonia.Data;
+using Avalonia.Logging;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines constants that specify how items are aligned on the non-scrolling or non-virtualizing axis.
+    /// </summary>
+    public enum UniformGridLayoutItemsJustification
+    {
+        /// <summary>
+        /// Items are aligned with the start of the row or column, with extra space at the end.
+        /// Spacing between items does not change.
+        /// </summary>
+        Start = 0,
+
+        /// <summary>
+        /// Items are aligned in the center of the row or column, with extra space at the start and
+        /// end. Spacing between items does not change.
+        /// </summary>
+        Center = 1,
+
+        /// <summary>
+        /// Items are aligned with the end of the row or column, with extra space at the start.
+        /// Spacing between items does not change.
+        /// </summary>
+        End = 2,
+
+        /// <summary>
+        /// Items are aligned so that extra space is added evenly before and after each item.
+        /// </summary>
+        SpaceAround = 3,
+
+        /// <summary>
+        /// Items are aligned so that extra space is added evenly between adjacent items. No space
+        /// is added at the start or end.
+        /// </summary>
+        SpaceBetween = 4,
+
+        SpaceEvenly = 5,
+    };
+
+    /// <summary>
+    /// Defines constants that specify how items are sized to fill the available space.
+    /// </summary>
+    public enum UniformGridLayoutItemsStretch
+    {
+        /// <summary>
+        /// The item retains its natural size. Use of extra space is determined by the
+        /// <see cref="UniformGridLayout.ItemsJustification"/> property.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// The item is sized to fill the available space in the non-scrolling direction. Item size
+        /// in the scrolling direction is not changed.
+        /// </summary>
+        Fill = 1,
+
+        /// <summary>
+        /// The item is sized to both fill the available space in the non-scrolling direction and
+        /// maintain its aspect ratio.
+        /// </summary>
+        Uniform = 2,
+    };
+
+    /// <summary>
+    /// Positions elements sequentially from left to right or top to bottom in a wrapping layout.
+    /// </summary>
+    public class UniformGridLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
+    {
+        /// <summary>
+        /// Defines the <see cref="ItemsJustification"/> property.
+        /// </summary>
+        public static readonly StyledProperty<UniformGridLayoutItemsJustification> ItemsJustificationProperty =
+            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsJustification>(nameof(ItemsJustification));
+
+        /// <summary>
+        /// Defines the <see cref="ItemsStretch"/> property.
+        /// </summary>
+        public static readonly StyledProperty<UniformGridLayoutItemsStretch> ItemsStretchProperty =
+            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsStretch>(nameof(ItemsStretch));
+
+        /// <summary>
+        /// Defines the <see cref="MinColumnSpacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinColumnSpacingProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinColumnSpacing));
+
+        /// <summary>
+        /// Defines the <see cref="MinItemHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinItemHeightProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemHeight));
+
+        /// <summary>
+        /// Defines the <see cref="MinItemWidth"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinItemWidthProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemWidth));
+
+        /// <summary>
+        /// Defines the <see cref="MinRowSpacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinRowSpacingProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinRowSpacing));
+
+        /// <summary>
+        /// Defines the <see cref="MaximumRowsOrColumnsProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaximumRowsOrColumnsProperty =
+            AvaloniaProperty.Register<UniformGridLayout, int>(nameof(MaximumRowsOrColumns));
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            StackLayout.OrientationProperty.AddOwner<UniformGridLayout>();
+
+        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
+        private double _minItemWidth = double.NaN;
+        private double _minItemHeight = double.NaN;
+        private double _minRowSpacing;
+        private double _minColumnSpacing;
+        private UniformGridLayoutItemsJustification _itemsJustification;
+        private UniformGridLayoutItemsStretch _itemsStretch;
+        private int _maximumRowsOrColumns = int.MaxValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UniformGridLayout"/> class.
+        /// </summary>
+        public UniformGridLayout()
+        {
+            LayoutId = "UniformGridLayout";
+        } 
+
+        static UniformGridLayout()
+        {
+            OrientationProperty.OverrideDefaultValue<UniformGridLayout>(Orientation.Horizontal);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates how items are aligned on the non-scrolling or non-
+        /// virtualizing axis.
+        /// </summary>
+        /// <value>
+        /// An enumeration value that indicates how items are aligned. The default is Start.
+        /// </value>
+        public UniformGridLayoutItemsJustification ItemsJustification
+        {
+            get => GetValue(ItemsJustificationProperty);
+            set => SetValue(ItemsJustificationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates how items are sized to fill the available space.
+        /// </summary>
+        /// <value>
+        /// An enumeration value that indicates how items are sized to fill the available space.
+        /// The default is None.
+        /// </value>
+        /// <remarks>
+        /// This property enables adaptive layout behavior where the items are sized to fill the
+        /// available space along the non-scrolling axis, and optionally maintain their aspect ratio.
+        /// </remarks>
+        public UniformGridLayoutItemsStretch ItemsStretch
+        {
+            get => GetValue(ItemsStretchProperty);
+            set => SetValue(ItemsStretchProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum space between items on the horizontal axis.
+        /// </summary>
+        /// <remarks>
+        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
+        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
+        /// </remarks>
+        public double MinColumnSpacing
+        {
+            get => GetValue(MinColumnSpacingProperty);
+            set => SetValue(MinColumnSpacingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum height of each item.
+        /// </summary>
+        /// <value>
+        /// The minimum height (in pixels) of each item. The default is NaN, in which case the
+        /// height of the first item is used as the minimum.
+        /// </value>
+        public double MinItemHeight
+        {
+            get => GetValue(MinItemHeightProperty);
+            set => SetValue(MinItemHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum width of each item.
+        /// </summary>
+        /// <value>
+        /// The minimum width (in pixels) of each item. The default is NaN, in which case the width
+        /// of the first item is used as the minimum.
+        /// </value>
+        public double MinItemWidth
+        {
+            get => GetValue(MinItemWidthProperty);
+            set => SetValue(MinItemWidthProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum space between items on the vertical axis.
+        /// </summary>
+        /// <remarks>
+        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
+        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
+        /// </remarks>
+        public double MinRowSpacing
+        {
+            get => GetValue(MinRowSpacingProperty);
+            set => SetValue(MinRowSpacingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum row or column count.
+        /// </summary>
+        public int MaximumRowsOrColumns
+        {
+            get => GetValue(MaximumRowsOrColumnsProperty);
+            set => SetValue(MaximumRowsOrColumnsProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the axis along which items are laid out.
+        /// </summary>
+        /// <value>
+        /// One of the enumeration values that specifies the axis along which items are laid out.
+        /// The default is Vertical.
+        /// </value>
+        public Orientation Orientation
+        {
+            get => GetValue(OrientationProperty);
+            set => SetValue(OrientationProperty, value);
+        }
+
+        internal double LineSpacing => Orientation == Orientation.Horizontal ? _minRowSpacing : _minColumnSpacing;
+        internal double MinItemSpacing => Orientation == Orientation.Horizontal ? _minColumnSpacing : _minRowSpacing;
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
+            int index,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
+        }
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
+            int index,
+            Size measureSize,
+            Size desiredSize,
+            VirtualizingLayoutContext context)
+        {
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
+        }
+
+        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => remainingSpace < 0;
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            Rect bounds = new Rect(double.NaN, double.NaN, double.NaN, double.NaN);
+            int anchorIndex = -1;
+
+            int itemsCount = context.ItemCount;
+            var realizationRect = context.RealizationRect;
+            if (itemsCount > 0 && _orientation.MajorSize(realizationRect) > 0)
+            {
+                var gridState = (UniformGridLayoutState)context.LayoutState!;
+                var lastExtent = gridState.FlowAlgorithm.LastExtent;
+                var itemsPerLine = Math.Min( // note use of unsigned ints
+                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
+                    Math.Max(1u, (uint)_maximumRowsOrColumns));
+                var majorSize = (itemsCount / itemsPerLine) * GetMajorSizeWithSpacing(context);
+                var realizationWindowStartWithinExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
+                if ((realizationWindowStartWithinExtent + _orientation.MajorSize(realizationRect)) >= 0 && realizationWindowStartWithinExtent <= majorSize)
+                {
+                    double offset = Math.Max(0.0, _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent));
+                    int anchorRowIndex = (int)(offset / GetMajorSizeWithSpacing(context));
+
+                    anchorIndex = (int)Math.Max(0, Math.Min(itemsCount - 1, anchorRowIndex * itemsPerLine));
+                    bounds = GetLayoutRectForDataIndex(availableSize, anchorIndex, lastExtent, context);
+                }
+            }
+
+            return new FlowLayoutAnchorInfo
+            {
+                Index = anchorIndex,
+                Offset = _orientation.MajorStart(bounds)
+            };
+        }
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
+            int targetIndex,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            int index = -1;
+            double offset = double.NaN;
+            int count = context.ItemCount;
+            if (targetIndex >= 0 && targetIndex < count)
+            {
+                int itemsPerLine = (int)Math.Min( // note use of unsigned ints
+                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
+                    Math.Max(1u, _maximumRowsOrColumns));
+                int indexOfFirstInLine = (targetIndex / itemsPerLine) * itemsPerLine;
+                index = indexOfFirstInLine;
+                var state = (UniformGridLayoutState)context.LayoutState!;
+                offset = _orientation.MajorStart(GetLayoutRectForDataIndex(availableSize, indexOfFirstInLine, state.FlowAlgorithm.LastExtent, context));
+            }
+
+            return new FlowLayoutAnchorInfo
+            {
+                Index = index,
+                Offset = offset
+            };
+        }
+
+        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            ILayoutable? firstRealized,
+            int firstRealizedItemIndex,
+            Rect firstRealizedLayoutBounds,
+            ILayoutable? lastRealized,
+            int lastRealizedItemIndex,
+            Rect lastRealizedLayoutBounds)
+        {
+            var extent = new Rect();
+
+
+            // Constants
+            int itemsCount = context.ItemCount;
+            double availableSizeMinor = _orientation.Minor(availableSize);
+            int itemsPerLine =
+                (int)Math.Min( // note use of unsigned ints
+                    Math.Max(1u, !double.IsInfinity(availableSizeMinor)
+                        ? (uint)(availableSizeMinor / GetMinorSizeWithSpacing(context))
+                        : (uint)itemsCount),
+                Math.Max(1u, _maximumRowsOrColumns));
+            double lineSize = GetMajorSizeWithSpacing(context);
+
+            if (itemsCount > 0)
+            {
+                _orientation.SetMinorSize(
+                    ref extent,
+                    !double.IsInfinity(availableSizeMinor) && _itemsStretch == UniformGridLayoutItemsStretch.Fill ?
+                    availableSizeMinor :
+                    Math.Max(0.0, itemsPerLine * GetMinorSizeWithSpacing(context) - (double)MinItemSpacing));
+                _orientation.SetMajorSize(
+                    ref extent,
+                    Math.Max(0.0, (itemsCount / itemsPerLine) * lineSize - (double)LineSpacing));
+
+                if (firstRealized != null)
+                {
+                    _orientation.SetMajorStart(
+                        ref extent,
+                        _orientation.MajorStart(firstRealizedLayoutBounds) - (firstRealizedItemIndex / itemsPerLine) * lineSize);
+                    int remainingItems = itemsCount - lastRealizedItemIndex - 1;
+                    _orientation.SetMajorSize(
+                        ref extent,
+                        _orientation.MajorEnd(lastRealizedLayoutBounds) - _orientation.MajorStart(extent) + (remainingItems / itemsPerLine) * lineSize);
+                }
+                else
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements", LayoutId);
+                }
+            }
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on lineSize {LineSize} and items per line {ItemsPerLine}",
+                LayoutId, extent.Size, lineSize, itemsPerLine);
+            return extent;
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
+        {
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
+        {
+        }
+
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var state = context.LayoutState;
+            var gridState = state as UniformGridLayoutState;
+            
+            if (gridState == null)
+            {
+                if (state != null)
+                {
+                    throw new InvalidOperationException("LayoutState must derive from UniformGridLayoutState.");
+                }
+
+                // Custom deriving layouts could potentially be stateful.
+                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
+                gridState = new UniformGridLayoutState();
+            }
+
+            gridState.InitializeForContext(context, this);
+        }
+
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            gridState.UninitializeForContext(context);
+        }
+
+        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        {
+            // Set the width and height on the grid state. If the user already set them then use the preset. 
+            // If not, we have to measure the first element and get back a size which we're going to be using for the rest of the items.
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            gridState.EnsureElementSize(availableSize, context, _minItemWidth, _minItemHeight, _itemsStretch, Orientation, MinRowSpacing, MinColumnSpacing, _maximumRowsOrColumns);
+
+            var desiredSize = GetFlowAlgorithm(context).Measure(
+                availableSize,
+                context,
+                true,
+                MinItemSpacing,
+                LineSpacing,
+                _maximumRowsOrColumns,
+                _orientation.ScrollOrientation,
+                false,
+                LayoutId);
+
+            // If after Measure the first item is in the realization rect, then we revoke grid state's ownership,
+            // and only use the layout when to clear it when it's done.
+            gridState.EnsureFirstElementOwnership(context);
+
+            return desiredSize;
+        }
+
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        {
+            var value = GetFlowAlgorithm(context).Arrange(
+               finalSize,
+               context,
+               true,
+               (FlowLayoutAlgorithm.LineAlignment)_itemsJustification,
+               LayoutId);
+            return new Size(value.Width, value.Height);
+        }
+
+        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
+        {
+            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
+            // Always invalidate layout to keep the view accurate.
+            InvalidateLayout();
+
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            gridState.ClearElementOnDataSourceChange(context, args);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == OrientationProperty)
+            {
+                var orientation = change.GetNewValue<Orientation>();
+
+                //Note: For UniformGridLayout Vertical Orientation means we have a Horizontal ScrollOrientation. Horizontal Orientation means we have a Vertical ScrollOrientation.
+                //i.e. the properties are the inverse of each other.
+                var scrollOrientation = (orientation == Orientation.Horizontal) ? ScrollOrientation.Vertical : ScrollOrientation.Horizontal;
+                _orientation.ScrollOrientation = scrollOrientation;
+            }
+            else if (change.Property == MinColumnSpacingProperty)
+            {
+                _minColumnSpacing = change.GetNewValue<double>();
+            }
+            else if (change.Property == MinRowSpacingProperty)
+            {
+                _minRowSpacing = change.GetNewValue<double>();
+            }
+            else if (change.Property == ItemsJustificationProperty)
+            {
+                _itemsJustification = change.GetNewValue<UniformGridLayoutItemsJustification>();
+            }
+            else if (change.Property == ItemsStretchProperty)
+            {
+                _itemsStretch = change.GetNewValue<UniformGridLayoutItemsStretch>();
+            }
+            else if (change.Property == MinItemWidthProperty)
+            {
+                _minItemWidth = change.GetNewValue<double>();
+            }
+            else if (change.Property == MinItemHeightProperty)
+            {
+                _minItemHeight = change.GetNewValue<double>();
+            }
+            else if (change.Property == MaximumRowsOrColumnsProperty)
+            {
+                _maximumRowsOrColumns = change.GetNewValue<int>();
+            }
+
+            InvalidateLayout();
+        }
+
+        private double GetMinorSizeWithSpacing(VirtualizingLayoutContext context)
+        {
+            var minItemSpacing = MinItemSpacing;
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return _orientation.ScrollOrientation == ScrollOrientation.Vertical?
+                gridState.EffectiveItemWidth + minItemSpacing :
+                gridState.EffectiveItemHeight + minItemSpacing;
+        }
+
+        private double GetMajorSizeWithSpacing(VirtualizingLayoutContext context)
+        {
+            var lineSpacing = LineSpacing;
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return _orientation.ScrollOrientation == ScrollOrientation.Vertical ?
+                gridState.EffectiveItemHeight + lineSpacing :
+                gridState.EffectiveItemWidth + lineSpacing;
+        }
+
+        Rect GetLayoutRectForDataIndex(
+            Size availableSize,
+            int index,
+            Rect lastExtent,
+            VirtualizingLayoutContext context)
+        {
+            int itemsPerLine = (int)Math.Min( //note use of unsigned ints
+                Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
+                Math.Max(1u, _maximumRowsOrColumns));
+            int rowIndex = (int)(index / itemsPerLine);
+            int indexInRow = index - (rowIndex * itemsPerLine);
+
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            Rect bounds = _orientation.MinorMajorRect(
+                indexInRow * GetMinorSizeWithSpacing(context) + _orientation.MinorStart(lastExtent),
+                rowIndex * GetMajorSizeWithSpacing(context) + _orientation.MajorStart(lastExtent),
+                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemWidth : gridState.EffectiveItemHeight,
+                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemHeight : gridState.EffectiveItemWidth);
+
+            return bounds;
+        }
+
+        private void InvalidateLayout() => InvalidateMeasure();
+
+        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((UniformGridLayoutState)context.LayoutState!).FlowAlgorithm;
+    }
+}
diff --git a/src/Avalonia.Base/Layout/UniformGridLayoutState.cs b/src/Avalonia.Base/Layout/UniformGridLayoutState.cs
new file mode 100644
index 0000000000..65cdf4c94b
--- /dev/null
+++ b/src/Avalonia.Base/Layout/UniformGridLayoutState.cs
@@ -0,0 +1,204 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Collections.Specialized;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Represents the state of a <see cref="UniformGridLayout"/>.
+    /// </summary>
+    public class UniformGridLayoutState
+    {
+        // We need to measure the element at index 0 to know what size to measure all other items. 
+        // If FlowlayoutAlgorithm has already realized element 0 then we can use that. 
+        // If it does not, then we need to do context.GetElement(0) at which point we have requested an element and are on point to clear it.
+        // If we are responsible for clearing element 0 we keep m_cachedFirstElement valid. 
+        // If we are not (because FlowLayoutAlgorithm is holding it for us) then we just null out this field and use the one from FlowLayoutAlgorithm.
+        private ILayoutable? _cachedFirstElement;
+
+        internal FlowLayoutAlgorithm FlowAlgorithm { get; } = new FlowLayoutAlgorithm();
+        internal double EffectiveItemWidth { get; private set; }
+        internal double EffectiveItemHeight { get; private set; }
+
+        internal void InitializeForContext(VirtualizingLayoutContext context, IFlowLayoutAlgorithmDelegates callbacks)
+        {
+            FlowAlgorithm.InitializeForContext(context, callbacks);
+            context.LayoutState = this;
+        }
+
+        internal void UninitializeForContext(VirtualizingLayoutContext context)
+        {
+            FlowAlgorithm.UninitializeForContext(context);
+
+            if (_cachedFirstElement != null)
+            {
+                context.RecycleElement(_cachedFirstElement);
+            }
+        }
+
+        internal void EnsureElementSize(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            double layoutItemWidth,
+            double layoutItemHeight,
+            UniformGridLayoutItemsStretch stretch,
+            Orientation orientation,
+            double minRowSpacing,
+            double minColumnSpacing,
+            int maxItemsPerLine)
+        {
+            if (maxItemsPerLine == 0)
+            {
+                maxItemsPerLine = 1;
+            }
+
+            if (context.ItemCount > 0)
+            {
+                // If the first element is realized we don't need to cache it or to get it from the context
+                var realizedElement = FlowAlgorithm.GetElementIfRealized(0);
+                if (realizedElement != null)
+                {
+                    realizedElement.Measure(availableSize);
+                    SetSize(realizedElement, layoutItemWidth, layoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing, maxItemsPerLine);
+                    _cachedFirstElement = null;
+                }
+                else
+                {
+                    if (_cachedFirstElement == null)
+                    {
+                        // we only cache if we aren't realizing it
+                        _cachedFirstElement = context.GetOrCreateElementAt(
+                            0,
+                            ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle); // expensive
+                    }
+
+                    _cachedFirstElement.Measure(availableSize);
+
+                    SetSize(_cachedFirstElement, layoutItemWidth, layoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing, maxItemsPerLine);
+
+                    // See if we can move ownership to the flow algorithm. If we can, we do not need a local cache.
+                    bool added = FlowAlgorithm.TryAddElement0(_cachedFirstElement);
+                    if (added)
+                    {
+                        _cachedFirstElement = null;
+                    }
+                }
+            }
+        }
+
+        private void SetSize(
+            ILayoutable element,
+            double layoutItemWidth,
+            double layoutItemHeight,
+            Size availableSize,
+            UniformGridLayoutItemsStretch stretch,
+            Orientation orientation,
+            double minRowSpacing,
+            double minColumnSpacing,
+            int maxItemsPerLine)
+        {
+            if (maxItemsPerLine == 0)
+            {
+                maxItemsPerLine = 1;
+            }
+
+            EffectiveItemWidth = (double.IsNaN(layoutItemWidth) ? element.DesiredSize.Width : layoutItemWidth);
+            EffectiveItemHeight = (double.IsNaN(layoutItemHeight) ? element.DesiredSize.Height : layoutItemHeight);
+
+            var availableSizeMinor = orientation == Orientation.Horizontal ? availableSize.Width : availableSize.Height;
+            var minorItemSpacing = orientation == Orientation.Vertical ? minRowSpacing : minColumnSpacing;
+
+            var itemSizeMinor = orientation == Orientation.Horizontal ? EffectiveItemWidth : EffectiveItemHeight;
+
+            double extraMinorPixelsForEachItem = 0.0;
+            if (!double.IsInfinity(availableSizeMinor))
+            {
+                var numItemsPerColumn = (int)Math.Min(
+                    maxItemsPerLine,
+                    Math.Max(1.0, availableSizeMinor / (itemSizeMinor + minorItemSpacing)));
+                var usedSpace = (numItemsPerColumn * (itemSizeMinor + minorItemSpacing)) - minorItemSpacing;
+                var remainingSpace = availableSizeMinor - usedSpace;
+                extraMinorPixelsForEachItem = (int)(remainingSpace / numItemsPerColumn);
+            }
+
+            if (stretch == UniformGridLayoutItemsStretch.Fill)
+            {
+                if (orientation == Orientation.Horizontal)
+                {
+                    EffectiveItemWidth += extraMinorPixelsForEachItem;
+                }
+                else
+                {
+                    EffectiveItemHeight += extraMinorPixelsForEachItem;
+                }
+            }
+            else if (stretch == UniformGridLayoutItemsStretch.Uniform)
+            {
+                var itemSizeMajor = orientation == Orientation.Horizontal ? EffectiveItemHeight : EffectiveItemWidth;
+                var extraMajorPixelsForEachItem = itemSizeMajor * (extraMinorPixelsForEachItem / itemSizeMinor);
+                if (orientation == Orientation.Horizontal)
+                {
+                    EffectiveItemWidth += extraMinorPixelsForEachItem;
+                    EffectiveItemHeight += extraMajorPixelsForEachItem;
+                }
+                else
+                {
+                    EffectiveItemHeight += extraMinorPixelsForEachItem;
+                    EffectiveItemWidth += extraMajorPixelsForEachItem;
+                }
+            }
+        }
+
+        internal void EnsureFirstElementOwnership(VirtualizingLayoutContext context)
+        {
+            if (_cachedFirstElement != null && FlowAlgorithm.GetElementIfRealized(0) != null)
+            {
+                // We created the element, but then flowlayout algorithm took ownership, so we can clear it and
+                // let flowlayout algorithm do its thing.
+                context.RecycleElement(_cachedFirstElement);
+                _cachedFirstElement = null;
+            }
+        }
+
+        internal void ClearElementOnDataSourceChange(
+            VirtualizingLayoutContext context,
+            NotifyCollectionChangedEventArgs args)
+        {
+            if (_cachedFirstElement != null)
+            {
+                bool shouldClear = false;
+                switch (args.Action)
+                {
+                case NotifyCollectionChangedAction.Add:
+                    shouldClear = args.NewStartingIndex == 0;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    shouldClear = args.NewStartingIndex == 0 || args.OldStartingIndex == 0;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    shouldClear = args.OldStartingIndex == 0;
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    shouldClear = true;
+                    break;
+
+                case NotifyCollectionChangedAction.Move:
+                    throw new NotImplementedException();
+                }
+
+                if (shouldClear)
+                {
+                    context.RecycleElement(_cachedFirstElement);
+                    _cachedFirstElement = null;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/Utils/ListUtils.cs b/src/Avalonia.Base/Layout/Utils/ListUtils.cs
similarity index 100%
rename from src/Avalonia.Layout/Utils/ListUtils.cs
rename to src/Avalonia.Base/Layout/Utils/ListUtils.cs
diff --git a/src/Avalonia.Layout/VirtualLayoutContextAdapter.cs b/src/Avalonia.Base/Layout/VirtualLayoutContextAdapter.cs
similarity index 100%
rename from src/Avalonia.Layout/VirtualLayoutContextAdapter.cs
rename to src/Avalonia.Base/Layout/VirtualLayoutContextAdapter.cs
diff --git a/src/Avalonia.Layout/VirtualizingLayout.cs b/src/Avalonia.Base/Layout/VirtualizingLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/VirtualizingLayout.cs
rename to src/Avalonia.Base/Layout/VirtualizingLayout.cs
diff --git a/src/Avalonia.Layout/VirtualizingLayoutContext.cs b/src/Avalonia.Base/Layout/VirtualizingLayoutContext.cs
similarity index 100%
rename from src/Avalonia.Layout/VirtualizingLayoutContext.cs
rename to src/Avalonia.Base/Layout/VirtualizingLayoutContext.cs
diff --git a/src/Avalonia.Layout/WrapLayout/UvBounds.cs b/src/Avalonia.Base/Layout/WrapLayout/UvBounds.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/UvBounds.cs
rename to src/Avalonia.Base/Layout/WrapLayout/UvBounds.cs
diff --git a/src/Avalonia.Layout/WrapLayout/UvMeasure.cs b/src/Avalonia.Base/Layout/WrapLayout/UvMeasure.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/UvMeasure.cs
rename to src/Avalonia.Base/Layout/WrapLayout/UvMeasure.cs
diff --git a/src/Avalonia.Layout/WrapLayout/WrapItem.cs b/src/Avalonia.Base/Layout/WrapLayout/WrapItem.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/WrapItem.cs
rename to src/Avalonia.Base/Layout/WrapLayout/WrapItem.cs
diff --git a/src/Avalonia.Base/Layout/WrapLayout/WrapLayout.cs b/src/Avalonia.Base/Layout/WrapLayout/WrapLayout.cs
new file mode 100644
index 0000000000..52de1dd3b8
--- /dev/null
+++ b/src/Avalonia.Base/Layout/WrapLayout/WrapLayout.cs
@@ -0,0 +1,336 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Layout;
+using System;
+using System.Collections.Specialized;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Arranges elements by wrapping them to fit the available space.
+    /// When <see cref="Orientation"/> is set to Orientation.Horizontal, element are arranged in rows until the available width is reached and then to a new row.
+    /// When <see cref="Orientation"/> is set to Orientation.Vertical, element are arranged in columns until the available height is reached.
+    /// </summary>
+    public class WrapLayout : VirtualizingLayout
+    {
+        /// <summary>
+        /// Gets or sets a uniform Horizontal distance (in pixels) between items when <see cref="Orientation"/> is set to Horizontal,
+        /// or between columns of items when <see cref="Orientation"/> is set to Vertical.
+        /// </summary>
+        public double HorizontalSpacing
+        {
+            get { return (double)GetValue(HorizontalSpacingProperty); }
+            set { SetValue(HorizontalSpacingProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="HorizontalSpacing"/> dependency property.
+        /// </summary>
+        public static readonly StyledProperty<double> HorizontalSpacingProperty =
+            AvaloniaProperty.Register<WrapLayout, double>(nameof(HorizontalSpacing), 0);
+
+        /// <summary>
+        /// Gets or sets a uniform Vertical distance (in pixels) between items when <see cref="Orientation"/> is set to Vertical,
+        /// or between rows of items when <see cref="Orientation"/> is set to Horizontal.
+        /// </summary>
+        public double VerticalSpacing
+        {
+            get { return (double)GetValue(VerticalSpacingProperty); }
+            set { SetValue(VerticalSpacingProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="VerticalSpacing"/> dependency property.
+        /// </summary>
+        public static readonly StyledProperty<double> VerticalSpacingProperty =
+            AvaloniaProperty.Register<WrapLayout, double>(
+                nameof(VerticalSpacing), 0d);
+
+        /// <summary>
+        /// Gets or sets the orientation of the WrapLayout.
+        /// Horizontal means that child controls will be added horizontally until the width of the panel is reached, then a new row is added to add new child controls.
+        /// Vertical means that children will be added vertically until the height of the panel is reached, then a new column is added.
+        /// </summary>
+        public Orientation Orientation
+        {
+            get { return (Orientation)GetValue(OrientationProperty); }
+            set { SetValue(OrientationProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Orientation"/> dependency property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            AvaloniaProperty.Register<WrapLayout, Orientation>(
+                nameof(Orientation),
+                Orientation.Horizontal);
+
+        /// <inheritdoc />
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var state = new WrapLayoutState(context);
+            context.LayoutState = state;
+            base.InitializeForContextCore(context);
+        }
+
+        /// <inheritdoc />
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            context.LayoutState = null;
+            base.UninitializeForContextCore(context);
+        }
+
+        /// <inheritdoc />
+        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
+        {
+            var state = (WrapLayoutState)context.LayoutState!;
+
+            switch (args.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    state.RemoveFromIndex(args.NewStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    int minIndex = Math.Min(args.NewStartingIndex, args.OldStartingIndex);
+                    state.RemoveFromIndex(minIndex);
+
+                    state.RecycleElementAt(args.OldStartingIndex);
+                    state.RecycleElementAt(args.NewStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    state.RemoveFromIndex(args.OldStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    state.RemoveFromIndex(args.NewStartingIndex);
+                    state.RecycleElementAt(args.NewStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    state.Clear();
+                    break;
+            }
+
+            base.OnItemsChangedCore(context, source, args);
+        }
+
+        /// <inheritdoc />
+        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        {
+            var totalMeasure = UvMeasure.Zero;
+            var parentMeasure = new UvMeasure(Orientation, availableSize.Width, availableSize.Height);
+            var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
+            var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
+            var position = UvMeasure.Zero;
+
+            var state = (WrapLayoutState)context.LayoutState!;
+            if (state.Orientation != Orientation)
+            {
+                state.SetOrientation(Orientation);
+            }
+
+            if (spacingMeasure.Equals(state.Spacing) == false)
+            {
+                state.ClearPositions();
+                state.Spacing = spacingMeasure;
+            }
+
+            if (state.AvailableU != parentMeasure.U)
+            {
+                state.ClearPositions();
+                state.AvailableU = parentMeasure.U;
+            }
+
+            double currentV = 0;
+            for (int i = 0; i < context.ItemCount; i++)
+            {
+                bool measured = false;
+                WrapItem item = state.GetItemAt(i);
+                if (item.Measure == null)
+                {
+                    item.Element = context.GetOrCreateElementAt(i);
+                    item.Element.Measure(availableSize);
+                    item.Measure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
+                    measured = true;
+                }
+
+                UvMeasure currentMeasure = item.Measure.Value;
+                if (currentMeasure.U == 0)
+                {
+                    continue; // ignore collapsed items
+                }
+
+                if (item.Position == null)
+                {
+                    if (parentMeasure.U < position.U + currentMeasure.U)
+                    {
+                        // New Row
+                        position.U = 0;
+                        position.V += currentV + spacingMeasure.V;
+                        currentV = 0;
+                    }
+
+                    item.Position = position;
+                }
+
+                position = item.Position.Value;
+
+                double vEnd = position.V + currentMeasure.V;
+                if (vEnd < realizationBounds.VMin)
+                {
+                    // Item is "above" the bounds
+                    if (item.Element != null)
+                    {
+                        context.RecycleElement(item.Element);
+                        item.Element = null;
+                    }
+                }
+                else if (position.V > realizationBounds.VMax)
+                {
+                    // Item is "below" the bounds.
+                    if (item.Element != null)
+                    {
+                        context.RecycleElement(item.Element);
+                        item.Element = null;
+                    }
+
+                    // We don't need to measure anything below the bounds
+                    break;
+                }
+                else if (measured == false)
+                {
+                    // Always measure elements that are within the bounds
+                    item.Element = context.GetOrCreateElementAt(i);
+                    item.Element.Measure(availableSize);
+
+                    currentMeasure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
+                    if (currentMeasure.Equals(item.Measure) == false)
+                    {
+                        // this item changed size; we need to recalculate layout for everything after this
+                        state.RemoveFromIndex(i + 1);
+                        item.Measure = currentMeasure;
+
+                        // did the change make it go into the new row?
+                        if (parentMeasure.U < position.U + currentMeasure.U)
+                        {
+                            // New Row
+                            position.U = 0;
+                            position.V += currentV + spacingMeasure.V;
+                            currentV = 0;
+                        }
+
+                        item.Position = position;
+                    }
+                }
+
+                position.U += currentMeasure.U + spacingMeasure.U;
+                currentV = Math.Max(currentMeasure.V, currentV);
+            }
+
+            // update value with the last line
+            // if the the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
+            // if the last loop is (parentMeasure.U > currentMeasure.U) the currentMeasure isn't added to the total so add it here
+            // for the last condition it is zeros so adding it will make no difference
+            // this way is faster than an if condition in every loop for checking the last item
+            totalMeasure.U = parentMeasure.U;
+            
+            // Propagating an infinite size causes a crash. This can happen if the parent is scrollable and infinite in the opposite
+            // axis to the panel. Clearing to zero prevents the crash.
+            // This is likely an incorrect use of the control by the developer, however we need stability here so setting a default that wont crash.
+            if (double.IsInfinity(totalMeasure.U))
+            {
+                totalMeasure.U = 0.0;
+            }
+            
+            totalMeasure.V = state.GetHeight();
+
+            totalMeasure.U = Math.Ceiling(totalMeasure.U);
+
+            return Orientation == Orientation.Horizontal ? new Size(totalMeasure.U, totalMeasure.V) : new Size(totalMeasure.V, totalMeasure.U);
+        }
+
+        /// <inheritdoc />
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        {
+            if (context.ItemCount > 0)
+            {
+                var parentMeasure = new UvMeasure(Orientation, finalSize.Width, finalSize.Height);
+                var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
+                var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
+
+                var state = (WrapLayoutState)context.LayoutState!;
+                bool Arrange(WrapItem item, bool isLast = false)
+                {
+                    if (item.Measure.HasValue == false)
+                    {
+                        return false;
+                    }
+
+                    if (item.Position == null)
+                    {
+                        return false;
+                    }
+
+                    var desiredMeasure = item.Measure.Value;
+                    if (desiredMeasure.U == 0)
+                    {
+                        return true; // if an item is collapsed, avoid adding the spacing
+                    }
+
+                    UvMeasure position = item.Position.Value;
+
+                    // Stretch the last item to fill the available space
+                    if (isLast)
+                    {
+                        desiredMeasure.U = parentMeasure.U - position.U;
+                    }
+
+                    if (((position.V + desiredMeasure.V) >= realizationBounds.VMin) && (position.V <= realizationBounds.VMax))
+                    {
+                        // place the item
+                        var child = context.GetOrCreateElementAt(item.Index);
+                        if (Orientation == Orientation.Horizontal)
+                        {
+                            child.Arrange(new Rect(position.U, position.V, desiredMeasure.U, desiredMeasure.V));
+                        }
+                        else
+                        {
+                            child.Arrange(new Rect(position.V, position.U, desiredMeasure.V, desiredMeasure.U));
+                        }
+                    }
+                    else if (position.V > realizationBounds.VMax)
+                    {
+                        return false;
+                    }
+
+                    return true;
+                }
+
+                for (var i = 0; i < context.ItemCount; i++)
+                {
+                    bool continueArranging = Arrange(state.GetItemAt(i));
+                    if (continueArranging == false)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return finalSize;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == OrientationProperty || change.Property == HorizontalSpacingProperty || change.Property == VerticalSpacingProperty)
+            {
+                InvalidateMeasure();
+                InvalidateArrange();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs b/src/Avalonia.Base/Layout/WrapLayout/WrapLayoutState.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs
rename to src/Avalonia.Base/Layout/WrapLayout/WrapLayoutState.cs
diff --git a/src/Avalonia.Base/Logging/ILogSink.cs b/src/Avalonia.Base/Logging/ILogSink.cs
index 27558ba0ee..60709776c6 100644
--- a/src/Avalonia.Base/Logging/ILogSink.cs
+++ b/src/Avalonia.Base/Logging/ILogSink.cs
@@ -26,57 +26,6 @@ namespace Avalonia.Logging
             object? source,
             string messageTemplate);
 
-        /// <summary>
-        /// Logs an event.
-        /// </summary>
-        /// <param name="level">The log event level.</param>
-        /// <param name="area">The area that the event originates.</param>
-        /// <param name="source">The object from which the event originates.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="propertyValue0">Message property value.</param>
-        void Log<T0>(
-            LogEventLevel level,
-            string area,
-            object? source,
-            string messageTemplate,
-            T0 propertyValue0);
-
-        /// <summary>
-        /// Logs an event.
-        /// </summary>
-        /// <param name="level">The log event level.</param>
-        /// <param name="area">The area that the event originates.</param>
-        /// <param name="source">The object from which the event originates.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="propertyValue0">Message property value.</param>
-        /// <param name="propertyValue1">Message property value.</param>
-        void Log<T0, T1>(
-            LogEventLevel level,
-            string area,
-            object? source,
-            string messageTemplate,
-            T0 propertyValue0,
-            T1 propertyValue1);
-
-        /// <summary>
-        /// Logs an event.
-        /// </summary>
-        /// <param name="level">The log event level.</param>
-        /// <param name="area">The area that the event originates.</param>
-        /// <param name="source">The object from which the event originates.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="propertyValue0">Message property value.</param>
-        /// <param name="propertyValue1">Message property value.</param>
-        /// <param name="propertyValue2">Message property value.</param>
-        void Log<T0, T1, T2>(
-            LogEventLevel level,
-            string area,
-            object? source,
-            string messageTemplate,
-            T0 propertyValue0,
-            T1 propertyValue1,
-            T2 propertyValue2);
-
         /// <summary>
         /// Logs a new event.
         /// </summary>
diff --git a/src/Avalonia.Base/Logging/LogArea.cs b/src/Avalonia.Base/Logging/LogArea.cs
index c049f9e763..972a9a1e9d 100644
--- a/src/Avalonia.Base/Logging/LogArea.cs
+++ b/src/Avalonia.Base/Logging/LogArea.cs
@@ -8,41 +8,66 @@ namespace Avalonia.Logging
         /// <summary>
         /// The log event comes from the property system.
         /// </summary>
-        public const string Property = "Property";
+        public const string Property = nameof(Property);
 
         /// <summary>
         /// The log event comes from the binding system.
         /// </summary>
-        public const string Binding = "Binding";
+        public const string Binding = nameof(Binding);
 
         /// <summary>
         /// The log event comes from the animations system.
         /// </summary>
-        public const string Animations = "Animations";
+        public const string Animations = nameof(Animations);
 
         /// <summary>
         /// The log event comes from the visual system.
         /// </summary>
-        public const string Visual = "Visual";
+        public const string Visual = nameof(Visual);
 
         /// <summary>
         /// The log event comes from the layout system.
         /// </summary>
-        public const string Layout = "Layout";
+        public const string Layout = nameof(Layout);
 
         /// <summary>
         /// The log event comes from the control system.
         /// </summary>
-        public const string Control = "Control";
+        public const string Control = nameof(Control);
 
         /// <summary>
-        /// The log event comes from Win32Platform.
+        /// The log event comes from Win32 Platform.
         /// </summary>
         public const string Win32Platform = nameof(Win32Platform);
         
         /// <summary>
-        /// The log event comes from X11Platform.
+        /// The log event comes from X11 Platform.
         /// </summary>
         public const string X11Platform = nameof(X11Platform);
+
+        /// <summary>
+        /// The log event comes from Android Platform.
+        /// </summary>
+        public const string AndroidPlatform = nameof(AndroidPlatform);
+        
+        /// <summary>
+        /// The log event comes from iOS Platform.
+        /// </summary>
+        public const string IOSPlatform = nameof(IOSPlatform);
+
+        /// <summary>
+        /// The log event comes from LinuxFramebuffer Platform
+        /// </summary>
+        public const string LinuxFramebufferPlatform = nameof(LinuxFramebufferPlatform);
+
+        /// <summary>
+        /// The log event comes from FreeDesktop Platform
+        /// </summary>
+        public const string FreeDesktopPlatform = nameof(FreeDesktopPlatform);
+
+        /// <summary>
+        /// The log event comes from macOS Platform
+        /// </summary>
+        public const string macOSPlatform = nameof(macOSPlatform);
     }
 }
diff --git a/src/Avalonia.Base/Logging/TraceLogSink.cs b/src/Avalonia.Base/Logging/TraceLogSink.cs
index 02ed191d2c..fc3897fade 100644
--- a/src/Avalonia.Base/Logging/TraceLogSink.cs
+++ b/src/Avalonia.Base/Logging/TraceLogSink.cs
@@ -28,31 +28,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Trace.WriteLine(Format<object, object, object>(area, messageTemplate, source));
-            }
-        }
-
-        public void Log<T0>(LogEventLevel level, string area, object? source, string messageTemplate, T0 propertyValue0)
-        {
-            if (IsEnabled(level, area))
-            {
-                Trace.WriteLine(Format<T0, object, object>(area, messageTemplate, source, propertyValue0));
-            }
-        }
-
-        public void Log<T0, T1>(LogEventLevel level, string area, object? source, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
-        {
-            if (IsEnabled(level, area))
-            {
-                Trace.WriteLine(Format<T0, T1, object>(area, messageTemplate, source, propertyValue0, propertyValue1));
-            }
-        }
-
-        public void Log<T0, T1, T2>(LogEventLevel level, string area, object? source, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
-        {
-            if (IsEnabled(level, area))
-            {
-                Trace.WriteLine(Format(area, messageTemplate, source, propertyValue0, propertyValue1, propertyValue2));
+                Trace.WriteLine(Format<object, object, object>(area, messageTemplate, source, null));
             }
         }
 
@@ -68,11 +44,9 @@ namespace Avalonia.Logging
             string area,
             string template,
             object? source,
-            T0? v0 = default,
-            T1? v1 = default,
-            T2? v2 = default)
+            object?[]? values)
         {
-            var result = new StringBuilder(template.Length);
+            var result = StringBuilderCache.Acquire(template.Length);
             var r = new CharacterReader(template.AsSpan());
             var i = 0;
 
@@ -93,13 +67,7 @@ namespace Avalonia.Logging
                     if (r.Peek != '{')
                     {
                         result.Append('\'');
-                        result.Append(i++ switch
-                        {
-                            0 => v0,
-                            1 => v1,
-                            2 => v2,
-                            _ => null
-                        });
+                        result.Append(values?[i++]);
                         result.Append('\'');
                         r.TakeUntil('}');
                         r.Take();
@@ -121,7 +89,7 @@ namespace Avalonia.Logging
                 result.Append(')');
             }
 
-            return result.ToString();
+            return StringBuilderCache.GetStringAndRelease(result);
         }
 
         private static string Format(
@@ -130,7 +98,7 @@ namespace Avalonia.Logging
             object? source,
             object?[] v)
         {
-            var result = new StringBuilder(template.Length);
+            var result = StringBuilderCache.Acquire(template.Length);
             var r = new CharacterReader(template.AsSpan());
             var i = 0;
 
diff --git a/src/Avalonia.Base/LogicalTree/ChildIndexChangedEventArgs.cs b/src/Avalonia.Base/LogicalTree/ChildIndexChangedEventArgs.cs
new file mode 100644
index 0000000000..497596fcc1
--- /dev/null
+++ b/src/Avalonia.Base/LogicalTree/ChildIndexChangedEventArgs.cs
@@ -0,0 +1,28 @@
+#nullable enable
+using System;
+
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Event args for <see cref="IChildIndexProvider.ChildIndexChanged"/> event.
+    /// </summary>
+    public class ChildIndexChangedEventArgs : EventArgs
+    {
+        public static new ChildIndexChangedEventArgs Empty { get; } = new ChildIndexChangedEventArgs();
+
+        private ChildIndexChangedEventArgs()
+        {
+        }
+
+        public ChildIndexChangedEventArgs(ILogical child)
+        {
+            Child = child;
+        }
+
+        /// <summary>
+        /// Logical child which index was changed.
+        /// If null, all children should be reset.
+        /// </summary>
+        public ILogical? Child { get; }
+    }
+}
diff --git a/src/Avalonia.Styling/LogicalTree/ControlLocator.cs b/src/Avalonia.Base/LogicalTree/ControlLocator.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/ControlLocator.cs
rename to src/Avalonia.Base/LogicalTree/ControlLocator.cs
diff --git a/src/Avalonia.Styling/LogicalTree/IChildIndexProvider.cs b/src/Avalonia.Base/LogicalTree/IChildIndexProvider.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/IChildIndexProvider.cs
rename to src/Avalonia.Base/LogicalTree/IChildIndexProvider.cs
diff --git a/src/Avalonia.Base/LogicalTree/ILogical.cs b/src/Avalonia.Base/LogicalTree/ILogical.cs
new file mode 100644
index 0000000000..9cc2edff86
--- /dev/null
+++ b/src/Avalonia.Base/LogicalTree/ILogical.cs
@@ -0,0 +1,69 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Represents a node in the logical tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILogical
+    {
+        /// <summary>
+        /// Raised when the control is attached to a rooted logical tree.
+        /// </summary>
+        event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
+
+        /// <summary>
+        /// Raised when the control is detached from a rooted logical tree.
+        /// </summary>
+        event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
+
+        /// <summary>
+        /// Gets a value indicating whether the element is attached to a rooted logical tree.
+        /// </summary>
+        bool IsAttachedToLogicalTree { get; }
+
+        /// <summary>
+        /// Gets the logical parent.
+        /// </summary>
+        ILogical? LogicalParent { get; }
+
+        /// <summary>
+        /// Gets the logical children.
+        /// </summary>
+        IAvaloniaReadOnlyList<ILogical> LogicalChildren { get; }
+
+        /// <summary>
+        /// Notifies the control that it is being attached to a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself.
+        /// </remarks>
+        void NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e);
+
+        /// <summary>
+        /// Notifies the control that it is being detached from a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself.
+        /// </remarks>
+        void NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e);
+
+        /// <summary>
+        /// Notifies the control that a change has been made to resources that apply to it.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself.
+        /// </remarks>
+        void NotifyResourcesChanged(ResourcesChangedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Base/LogicalTree/ILogicalRoot.cs b/src/Avalonia.Base/LogicalTree/ILogicalRoot.cs
new file mode 100644
index 0000000000..ea0f554e96
--- /dev/null
+++ b/src/Avalonia.Base/LogicalTree/ILogicalRoot.cs
@@ -0,0 +1,12 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Represents a root of a logical tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILogicalRoot : ILogical
+    {
+    }
+}
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs b/src/Avalonia.Base/LogicalTree/LogicalExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
rename to src/Avalonia.Base/LogicalTree/LogicalExtensions.cs
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs b/src/Avalonia.Base/LogicalTree/LogicalTreeAttachmentEventArgs.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs
rename to src/Avalonia.Base/LogicalTree/LogicalTreeAttachmentEventArgs.cs
diff --git a/src/Avalonia.Base/Matrix.cs b/src/Avalonia.Base/Matrix.cs
new file mode 100644
index 0000000000..df6439b1b3
--- /dev/null
+++ b/src/Avalonia.Base/Matrix.cs
@@ -0,0 +1,582 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Numerics;
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// A 3x3 matrix.
+    /// </summary>
+    /// <remarks>Matrix layout:
+    ///         | 1st col | 2nd col | 3r col |
+    /// 1st row | scaleX  | skewY  | perspX  |
+    /// 2nd row | skewX  | scaleY  | perspY  |
+    /// 3rd row | transX  | transY  | perspZ  |
+    /// 
+    /// Note: Skia.SkMatrix uses a transposed layout (where for example skewX/skewY and persp0/transX are swapped).
+    /// </remarks>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Matrix : IEquatable<Matrix>
+    {
+        private readonly double _m11;
+        private readonly double _m12;
+        private readonly double _m13;
+        private readonly double _m21;
+        private readonly double _m22;
+        private readonly double _m23;
+        private readonly double _m31;
+        private readonly double _m32;
+        private readonly double _m33;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Matrix"/> struct (equivalent to a 2x3 Matrix without perspective).
+        /// </summary>
+        /// <param name="scaleX">The first element of the first row.</param>
+        /// <param name="skewY">The second element of the first row.</param>
+        /// <param name="skewX">The first element of the second row.</param>
+        /// <param name="scaleY">The second element of the second row.</param>
+        /// <param name="offsetX">The first element of the third row.</param>
+        /// <param name="offsetY">The second element of the third row.</param>
+        public Matrix(
+            double scaleX,
+            double skewY,
+            double skewX,
+            double scaleY,
+            double offsetX,
+            double offsetY) : this( scaleX, skewY, 0, skewX, scaleY, 0, offsetX, offsetY, 1)
+        {
+        }
+
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Matrix"/> struct.
+        /// </summary>
+        /// <param name="scaleX">The first element of the first row.</param>
+        /// <param name="skewY">The second element of the first row.</param>
+        /// <param name="perspX">The third element of the first row.</param>
+        /// <param name="skewX">The first element of the second row.</param>
+        /// <param name="scaleY">The second element of the second row.</param>
+        /// <param name="perspY">The third element of the second row.</param>
+        /// <param name="offsetX">The first element of the third row.</param>
+        /// <param name="offsetY">The second element of the third row.</param>
+        /// <param name="perspZ">The third element of the third row.</param>
+        public Matrix(
+            double scaleX,
+            double skewY,
+            double perspX,
+            double skewX,
+            double scaleY,
+            double perspY, 
+            double offsetX,
+            double offsetY,
+            double perspZ)
+        {
+            _m11 = scaleX;
+            _m12 = skewY;
+            _m13 = perspX;
+            _m21 = skewX;
+            _m22 = scaleY;
+            _m23 = perspY;
+            _m31 = offsetX;
+            _m32 = offsetY;
+            _m33 = perspZ;
+        }
+
+        /// <summary>
+        /// Returns the multiplicative identity matrix.
+        /// </summary>
+        public static Matrix Identity { get; } = new Matrix(
+            1.0, 0.0, 0.0,
+            0.0, 1.0, 0.0,
+            0.0, 0.0, 1.0);
+
+        /// <summary>
+        /// Returns whether the matrix is the identity matrix.
+        /// </summary>
+        public bool IsIdentity => Equals(Identity);
+
+        /// <summary>
+        /// HasInverse Property - returns true if this matrix is invertible, false otherwise.
+        /// </summary>
+        public bool HasInverse => !MathUtilities.IsZero(GetDeterminant());
+
+        /// <summary>
+        /// The first element of the first row (scaleX).
+        /// </summary>
+        public double M11 => _m11;
+
+        /// <summary>
+        /// The second element of the first row (skewY).
+        /// </summary>
+        public double M12 => _m12;
+
+        /// <summary>
+        /// The third element of the first row (perspX: input x-axis perspective factor).
+        /// </summary>
+        public double M13 => _m13;
+
+        /// <summary>
+        /// The first element of the second row (skewX).
+        /// </summary>
+        public double M21 => _m21;
+
+        /// <summary>
+        /// The second element of the second row (scaleY).
+        /// </summary>
+        public double M22 => _m22;
+
+        /// <summary>
+        /// The third element of the second row (perspY: input y-axis perspective factor).
+        /// </summary>
+        public double M23 => _m23;
+
+        /// <summary>
+        /// The first element of the third row (offsetX/translateX).
+        /// </summary>
+        public double M31 => _m31;
+
+        /// <summary>
+        /// The second element of the third row (offsetY/translateY).
+        /// </summary>
+        public double M32 => _m32;
+
+        /// <summary>
+        /// The third element of the third row (perspZ: perspective scale factor).
+        /// </summary>
+        public double M33 => _m33;
+
+        /// <summary>
+        /// Multiplies two matrices together and returns the resulting matrix.
+        /// </summary>
+        /// <param name="value1">The first source matrix.</param>
+        /// <param name="value2">The second source matrix.</param>
+        /// <returns>The product matrix.</returns>
+        public static Matrix operator *(Matrix value1, Matrix value2)
+        {
+            return new Matrix(
+                (value1.M11 * value2.M11) + (value1.M12 * value2.M21) + (value1.M13 * value2.M31),
+                (value1.M11 * value2.M12) + (value1.M12 * value2.M22) + (value1.M13 * value2.M32),
+                (value1.M11 * value2.M13) + (value1.M12 * value2.M23) + (value1.M13 * value2.M33),
+                (value1.M21 * value2.M11) + (value1.M22 * value2.M21) + (value1.M23 * value2.M31),
+                (value1.M21 * value2.M12) + (value1.M22 * value2.M22) + (value1.M23 * value2.M32),
+                (value1.M21 * value2.M13) + (value1.M22 * value2.M23) + (value1.M23 * value2.M33),
+                (value1.M31 * value2.M11) + (value1.M32 * value2.M21) + (value1.M33 * value2.M31),
+                (value1.M31 * value2.M12) + (value1.M32 * value2.M22) + (value1.M33 * value2.M32), 
+                (value1.M31 * value2.M13) + (value1.M32 * value2.M23) + (value1.M33 * value2.M33));
+        }
+
+        /// <summary>
+        /// Negates the given matrix by multiplying all values by -1.
+        /// </summary>
+        /// <param name="value">The source matrix.</param>
+        /// <returns>The negated matrix.</returns>
+        public static Matrix operator -(Matrix value)
+        {
+            return value.Invert();
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given matrices are equal.
+        /// </summary>
+        /// <param name="value1">The first source matrix.</param>
+        /// <param name="value2">The second source matrix.</param>
+        /// <returns>True if the matrices are equal; False otherwise.</returns>
+        public static bool operator ==(Matrix value1, Matrix value2)
+        {
+            return value1.Equals(value2);
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given matrices are not equal.
+        /// </summary>
+        /// <param name="value1">The first source matrix.</param>
+        /// <param name="value2">The second source matrix.</param>
+        /// <returns>True if the matrices are not equal; False if they are equal.</returns>
+        public static bool operator !=(Matrix value1, Matrix value2)
+        {
+            return !value1.Equals(value2);
+        }
+
+        /// <summary>
+        /// Creates a rotation matrix using the given rotation in radians.
+        /// </summary>
+        /// <param name="radians">The amount of rotation, in radians.</param>
+        /// <returns>A rotation matrix.</returns>
+        public static Matrix CreateRotation(double radians)
+        {
+            double cos = Math.Cos(radians);
+            double sin = Math.Sin(radians);
+            return new Matrix(cos, sin, -sin, cos, 0, 0);
+        }
+
+        /// <summary>
+        /// Creates a skew matrix from the given axis skew angles in radians.
+        /// </summary>
+        /// <param name="xAngle">The amount of skew along the X-axis, in radians.</param>
+        /// <param name="yAngle">The amount of skew along the Y-axis, in radians.</param>
+        /// <returns>A rotation matrix.</returns>
+        public static Matrix CreateSkew(double xAngle, double yAngle)
+        {
+            double tanX = Math.Tan(xAngle);
+            double tanY = Math.Tan(yAngle);
+            return new Matrix(1.0, tanY, tanX, 1.0, 0.0, 0.0);
+        }
+
+        /// <summary>
+        /// Creates a scale matrix from the given X and Y components.
+        /// </summary>
+        /// <param name="xScale">Value to scale by on the X-axis.</param>
+        /// <param name="yScale">Value to scale by on the Y-axis.</param>
+        /// <returns>A scaling matrix.</returns>
+        public static Matrix CreateScale(double xScale, double yScale)
+        {
+            return new Matrix(xScale, 0, 0, yScale, 0, 0);
+        }
+
+        /// <summary>
+        /// Creates a scale matrix from the given vector scale.
+        /// </summary>
+        /// <param name="scales">The scale to use.</param>
+        /// <returns>A scaling matrix.</returns>
+        public static Matrix CreateScale(Vector scales)
+        {
+            return CreateScale(scales.X, scales.Y);
+        }
+
+        /// <summary>
+        /// Creates a translation matrix from the given vector.
+        /// </summary>
+        /// <param name="position">The translation position.</param>
+        /// <returns>A translation matrix.</returns>
+        public static Matrix CreateTranslation(Vector position)
+        {
+            return CreateTranslation(position.X, position.Y);
+        }
+
+        /// <summary>
+        /// Creates a translation matrix from the given X and Y components.
+        /// </summary>
+        /// <param name="xPosition">The X position.</param>
+        /// <param name="yPosition">The Y position.</param>
+        /// <returns>A translation matrix.</returns>
+        public static Matrix CreateTranslation(double xPosition, double yPosition)
+        {
+            return new Matrix(1.0, 0.0, 0.0, 1.0, xPosition, yPosition);
+        }
+
+        /// <summary>
+        /// Converts an angle in degrees to radians.
+        /// </summary>
+        /// <param name="angle">The angle in degrees.</param>
+        /// <returns>The angle in radians.</returns>
+        public static double ToRadians(double angle)
+        {
+            return angle * 0.0174532925;
+        }
+        
+        /// <summary>
+        /// Appends another matrix as post-multiplication operation.
+        /// Equivalent to this * value;
+        /// </summary>
+        /// <param name="value">A matrix.</param>
+        /// <returns>Post-multiplied matrix.</returns>
+        public Matrix Append(Matrix value)
+        {
+            return this * value;
+        }
+
+        /// <summary>
+        /// Prepends another matrix as pre-multiplication operation.
+        /// Equivalent to value * this;
+        /// </summary>
+        /// <param name="value">A matrix.</param>
+        /// <returns>Pre-multiplied matrix.</returns>
+        public Matrix Prepend(Matrix value)
+        {
+            return value * this;
+        }
+
+        /// <summary>
+        /// Calculates the determinant for this matrix.
+        /// </summary>
+        /// <returns>The determinant.</returns>
+        /// <remarks>
+        /// The determinant is calculated by expanding the matrix with a third column whose
+        /// values are (0,0,1).
+        /// </remarks>
+        public double GetDeterminant()
+        {
+            // implemented using "Laplace expansion":
+            return _m11 * (_m22 * _m33 - _m23 * _m32)
+                 - _m12 * (_m21 * _m33 - _m23 * _m31)
+                 + _m13 * (_m21 * _m32 - _m22 * _m31);
+        }
+
+        /// <summary>
+        ///  Transforms the point with the matrix
+        /// </summary>
+        /// <param name="p">The point to be transformed</param>
+        /// <returns>The transformed point</returns>
+        public Point Transform(Point p)
+        {
+            Point transformedResult;
+            
+            // If this matrix contains a non-affine transform with need to extend
+            // the point to a 3D vector and flatten it back for 2d display
+            // by multiplying X and Y with the inverse of the Z axis.
+            // The code below also works with affine transformations, but for performance (and compatibility)
+            // reasons we will use the more complex calculation only if necessary
+            if (ContainsPerspective())
+            {
+                var m44 = new Matrix4x4(
+                    (float)M11, (float)M12, (float)M13, 0,
+                    (float)M21, (float)M22, (float)M23, 0,
+                    (float)M31, (float)M32, (float)M33, 0,
+                    0, 0, 0, 1
+                );
+            
+                var vector = new Vector3((float)p.X, (float)p.Y, 1);
+                var transformedVector = Vector3.Transform(vector, m44);
+                var z = 1 / transformedVector.Z;
+            
+                transformedResult = new Point(transformedVector.X * z, transformedVector.Y * z);
+            }
+            else
+            {
+                return new Point(
+                    (p.X * M11) + (p.Y * M21) + M31,
+                    (p.X * M12) + (p.Y * M22) + M32);
+            }
+
+            return transformedResult;
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the matrix is equal to the other given matrix.
+        /// </summary>
+        /// <param name="other">The other matrix to test equality against.</param>
+        /// <returns>True if this matrix is equal to other; False otherwise.</returns>
+        public bool Equals(Matrix other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _m11 == other.M11 &&
+                   _m12 == other.M12 &&
+                   _m13 == other.M13 &&
+                   _m21 == other.M21 &&
+                   _m22 == other.M22 &&
+                   _m23 == other.M23 &&
+                   _m31 == other.M31 &&
+                   _m32 == other.M32 &&
+                   _m33 == other.M33;
+            // ReSharper restore CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given Object is equal to this matrix instance.
+        /// </summary>
+        /// <param name="obj">The Object to compare against.</param>
+        /// <returns>True if the Object is equal to this matrix; False otherwise.</returns>
+        public override bool Equals(object? obj) => obj is Matrix other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this instance.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return (_m11, _m12, _m13, _m21, _m22, _m23, _m31, _m32, _m33).GetHashCode();
+        }
+
+        /// <summary>
+        ///  Determines if the current matrix contains perspective (non-affine) transforms (true) or only (affine) transforms that could be mapped into an 2x3 matrix (false).
+        /// </summary>
+        public bool ContainsPerspective()
+        {
+
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _m13 != 0 || _m23 != 0 || _m33 != 1;
+            // ReSharper restore CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a String representing this matrix instance.
+        /// </summary>
+        /// <returns>The string representation.</returns>
+        public override string ToString()
+        {
+            CultureInfo ci = CultureInfo.CurrentCulture;
+
+            string msg;
+            double[] values;
+
+            if (ContainsPerspective())
+            {
+                msg = "{{ {{M11:{0} M12:{1} M13:{2}}} {{M21:{3} M22:{4} M23:{5}}} {{M31:{6} M32:{7} M33:{8}}} }}";
+                values = new[] { M11, M12, M13, M21, M22, M23, M31, M32, M33 };
+            }
+            else
+            {
+                msg = "{{ {{M11:{0} M12:{1}}} {{M21:{2} M22:{3}}} {{M31:{4} M32:{5}}} }}";
+                values = new[] { M11, M12, M21, M22, M31, M32 };
+            }
+
+            return string.Format(
+                ci,
+                msg,
+                values.Select((v) => v.ToString(ci)).ToArray());
+        }
+
+        /// <summary>
+        /// Attempts to invert the Matrix.
+        /// </summary>
+        /// <returns>The inverted matrix or <see langword="null"/> when matrix is not invertible.</returns>
+        public bool TryInvert(out Matrix inverted)
+        {
+            double d = GetDeterminant();
+
+            if (MathUtilities.IsZero(d))
+            {
+                inverted = default;
+                
+                return false;
+            }
+
+            var invdet = 1 / d;
+            
+            inverted = new Matrix(
+                (_m22 * _m33 - _m32 * _m23) * invdet,
+                (_m13 * _m32 - _m12 * _m33) * invdet,
+                (_m12 * _m23 - _m13 * _m22) * invdet,
+                (_m23 * _m31 - _m21 * _m33) * invdet,
+                (_m11 * _m33 - _m13 * _m31) * invdet,
+                (_m21 * _m13 - _m11 * _m23) * invdet,
+                (_m21 * _m32 - _m31 * _m22) * invdet,
+                (_m31 * _m12 - _m11 * _m32) * invdet,
+                (_m11 * _m22 - _m21 * _m12) * invdet
+                );
+            
+            return true;
+        }
+
+        /// <summary>
+        /// Inverts the Matrix.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Matrix is not invertible.</exception>
+        /// <returns>The inverted matrix.</returns>
+        public Matrix Invert()
+        {
+            if (!TryInvert(out var inverted))
+            {
+                throw new InvalidOperationException("Transform is not invertible.");
+            }
+
+            return inverted;
+        }
+
+        /// <summary>
+        /// Parses a <see cref="Matrix"/> string.
+        /// </summary>
+        /// <param name="s">Six or nine comma-delimited double values (m11, m12, m21, m22, offsetX, offsetY[, perspX, perspY, perspZ]) that describe the new <see cref="Matrix"/></param>
+        /// <returns>The <see cref="Matrix"/>.</returns>
+        public static Matrix Parse(string s)
+        {
+            // initialize to satisfy compiler - only used when retrieved from string.
+            double v8 = 0;
+            double v9 = 0;
+
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Matrix."))
+            {
+                var v1 = tokenizer.ReadDouble();
+                var v2 = tokenizer.ReadDouble();
+                var v3 = tokenizer.ReadDouble();
+                var v4 = tokenizer.ReadDouble();
+                var v5 = tokenizer.ReadDouble();
+                var v6 = tokenizer.ReadDouble();
+                var persp = tokenizer.TryReadDouble(out var v7);
+                persp = persp && tokenizer.TryReadDouble(out v8);
+                persp = persp && tokenizer.TryReadDouble(out v9);
+
+                if (persp) 
+                    return new Matrix(v1, v2, v7, v3, v4, v8, v5, v6, v9);
+                else
+                    return new Matrix(v1, v2, v3, v4, v5, v6);
+            }
+        }
+
+        /// <summary>
+        /// Decomposes given matrix into transform operations.
+        /// </summary>
+        /// <param name="matrix">Matrix to decompose.</param>
+        /// <param name="decomposed">Decomposed matrix.</param>
+        /// <returns>The status of the operation.</returns>        
+        public static bool TryDecomposeTransform(Matrix matrix, out Decomposed decomposed)
+        {
+            decomposed = default;
+
+            var determinant = matrix.GetDeterminant();
+            
+            if (MathUtilities.IsZero(determinant) || matrix.ContainsPerspective())
+            {
+                return false;
+            }
+
+            var m11 = matrix.M11;
+            var m21 = matrix.M21;
+            var m12 = matrix.M12;
+            var m22 = matrix.M22;
+
+            // Translation.
+            decomposed.Translate = new Vector(matrix.M31, matrix.M32);
+
+            // Scale sign.
+            var scaleX = 1d;
+            var scaleY = 1d;
+
+            if (determinant < 0)
+            {
+                if (m11 < m22)
+                {
+                    scaleX *= -1d;
+                }
+                else
+                {
+                    scaleY *= -1d;
+                }
+            }
+
+            // X Scale.
+            scaleX *= Math.Sqrt(m11 * m11 + m12 * m12);
+
+            m11 /= scaleX;
+            m12 /= scaleX;
+
+            // XY Shear.
+            double scaledShear = m11 * m21 + m12 * m22;
+
+            m21 -= m11 * scaledShear;
+            m22 -= m12 * scaledShear;
+
+            // Y Scale.
+            scaleY *= Math.Sqrt(m21 * m21 + m22 * m22);
+
+            decomposed.Scale = new Vector(scaleX, scaleY);
+            decomposed.Skew = new Vector(scaledShear / scaleY, 0d);
+            decomposed.Angle = Math.Atan2(m12, m11);
+
+            return true;
+        }
+
+        public struct Decomposed
+        {
+            public Vector Translate;
+            public Vector Scale;
+            public Vector Skew;
+            public double Angle;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/AcrylicBackgroundSource.cs b/src/Avalonia.Base/Media/AcrylicBackgroundSource.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/AcrylicBackgroundSource.cs
rename to src/Avalonia.Base/Media/AcrylicBackgroundSource.cs
diff --git a/src/Avalonia.Visuals/Media/AlignmentX.cs b/src/Avalonia.Base/Media/AlignmentX.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/AlignmentX.cs
rename to src/Avalonia.Base/Media/AlignmentX.cs
diff --git a/src/Avalonia.Visuals/Media/AlignmentY.cs b/src/Avalonia.Base/Media/AlignmentY.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/AlignmentY.cs
rename to src/Avalonia.Base/Media/AlignmentY.cs
diff --git a/src/Avalonia.Visuals/Media/ArcSegment.cs b/src/Avalonia.Base/Media/ArcSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ArcSegment.cs
rename to src/Avalonia.Base/Media/ArcSegment.cs
diff --git a/src/Avalonia.Visuals/Media/BaselineAlignment.cs b/src/Avalonia.Base/Media/BaselineAlignment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BaselineAlignment.cs
rename to src/Avalonia.Base/Media/BaselineAlignment.cs
diff --git a/src/Avalonia.Visuals/Media/BezierSegment .cs b/src/Avalonia.Base/Media/BezierSegment .cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BezierSegment .cs
rename to src/Avalonia.Base/Media/BezierSegment .cs
diff --git a/src/Avalonia.Base/Media/BoxShadow.cs b/src/Avalonia.Base/Media/BoxShadow.cs
new file mode 100644
index 0000000000..cc97d89cfc
--- /dev/null
+++ b/src/Avalonia.Base/Media/BoxShadow.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using Avalonia.Animation.Animators;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public struct BoxShadow
+    {
+        public double OffsetX { get; set; }
+        public double OffsetY { get; set; }
+        public double Blur { get; set; }
+        public double Spread { get; set; }
+        public Color Color { get; set; }
+        public bool IsInset { get; set; }
+
+        static BoxShadow()
+        {
+            Animation.Animation.RegisterAnimator<BoxShadowAnimator>(prop =>
+                typeof(BoxShadow).IsAssignableFrom(prop.PropertyType));
+        }
+        
+        public bool Equals(in BoxShadow other)
+        {
+            return OffsetX.Equals(other.OffsetX) && OffsetY.Equals(other.OffsetY) && Blur.Equals(other.Blur) && Spread.Equals(other.Spread) && Color.Equals(other.Color);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is BoxShadow other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = OffsetX.GetHashCode();
+                hashCode = (hashCode * 397) ^ OffsetY.GetHashCode();
+                hashCode = (hashCode * 397) ^ Blur.GetHashCode();
+                hashCode = (hashCode * 397) ^ Spread.GetHashCode();
+                hashCode = (hashCode * 397) ^ Color.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public bool IsEmpty => OffsetX == 0 && OffsetY == 0 && Blur == 0 && Spread == 0;
+
+        private readonly static char[] s_Separator = new char[] { ' ', '\t' };
+
+        struct ArrayReader
+        {
+            private int _index;
+            private string[] _arr;
+
+            public ArrayReader(string[] arr)
+            {
+                _arr = arr;
+                _index = 0;
+            }
+
+            public bool TryReadString([MaybeNullWhen(false)] out string s)
+            {
+                s = null;
+                if (_index >= _arr.Length)
+                    return false;
+                s = _arr[_index];
+                _index++;
+                return true;
+            }
+
+            public string ReadString()
+            {
+                if(!TryReadString(out var rv))
+                    throw new FormatException();
+                return rv;
+            }
+        }
+
+        public override string ToString()
+        {
+            var sb = StringBuilderCache.Acquire();
+
+            if (IsEmpty)
+            {
+                return "none";
+            }
+
+            if (IsInset)
+            {
+                sb.Append("inset");
+            }
+
+            if (OffsetX != 0.0)
+            {
+                sb.AppendFormat(" {0}", OffsetX.ToString());
+            }
+
+            if (OffsetY != 0.0)
+            {
+                sb.AppendFormat(" {0}", OffsetY.ToString());
+            }
+            
+            if (Blur != 0.0)
+            {
+                sb.AppendFormat(" {0}", Blur.ToString());
+            }
+
+            if (Spread != 0.0)
+            {
+                sb.AppendFormat(" {0}", Spread.ToString());
+            }
+
+            sb.AppendFormat(" {0}", Color.ToString());
+
+            return StringBuilderCache.GetStringAndRelease(sb);
+        }
+
+        public static unsafe BoxShadow Parse(string s)
+        {
+            if(s == null)
+                throw new ArgumentNullException();
+            if (s.Length == 0)
+                throw new FormatException();
+
+            var p = s.Split(s_Separator, StringSplitOptions.RemoveEmptyEntries);
+            if (p.Length == 1 && p[0] == "none")
+                return default;
+            
+            if (p.Length < 3 || p.Length > 6)
+                throw new FormatException();
+            
+            bool inset = false;
+
+            var tokenizer = new ArrayReader(p);
+
+            string firstToken = tokenizer.ReadString();
+            if (firstToken == "inset")
+            {
+                inset = true;
+                firstToken = tokenizer.ReadString();
+            }
+
+            var offsetX = double.Parse(firstToken, CultureInfo.InvariantCulture);
+            var offsetY = double.Parse(tokenizer.ReadString(), CultureInfo.InvariantCulture);
+            double blur = 0;
+            double spread = 0;
+            
+
+            tokenizer.TryReadString(out var token3);
+            tokenizer.TryReadString(out var token4);
+            tokenizer.TryReadString(out var token5);
+
+            if (token4 != null) 
+                blur = double.Parse(token3!, CultureInfo.InvariantCulture);
+            if (token5 != null)
+                spread = double.Parse(token4!, CultureInfo.InvariantCulture);
+
+            var color = Color.Parse(token5 ?? token4 ?? token3!);
+            return new BoxShadow
+            {
+                IsInset = inset,
+                OffsetX = offsetX,
+                OffsetY = offsetY,
+                Blur = blur,
+                Spread = spread,
+                Color = color
+            };
+        }
+
+        public Rect TransformBounds(in Rect rect)
+            => IsInset ? rect : rect.Translate(new Vector(OffsetX, OffsetY)).Inflate(Spread + Blur);
+    }
+}
diff --git a/src/Avalonia.Base/Media/BoxShadows.cs b/src/Avalonia.Base/Media/BoxShadows.cs
new file mode 100644
index 0000000000..ab2694389f
--- /dev/null
+++ b/src/Avalonia.Base/Media/BoxShadows.cs
@@ -0,0 +1,153 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Animation.Animators;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public struct BoxShadows
+    {
+        private readonly BoxShadow _first;
+        private readonly BoxShadow[]? _list;
+        public int Count { get; }
+
+        static BoxShadows()
+        {
+            Animation.Animation.RegisterAnimator<BoxShadowsAnimator>(prop =>
+                typeof(BoxShadows).IsAssignableFrom(prop.PropertyType));
+        }
+        
+        public BoxShadows(BoxShadow shadow)
+        {
+            _first = shadow;
+            _list = null;
+            Count = _first.IsEmpty ? 0 : 1;
+        }
+
+        public BoxShadows(BoxShadow first, BoxShadow[] rest)
+        {
+            _first = first;
+            _list = rest;
+            Count = 1 + (rest?.Length ?? 0);
+        }
+
+        public BoxShadow this[int c]
+        {
+            get
+            {
+                if (c< 0 || c >= Count)
+                    throw new IndexOutOfRangeException();
+                if (c == 0)
+                    return _first;
+                return _list![c - 1];
+            }
+        }
+
+        public override string ToString()
+        {
+            var sb = StringBuilderCache.Acquire();
+
+            if (Count == 0)
+            {
+                return "none";
+            }
+
+            foreach (var boxShadow in this)
+            {
+                sb.AppendFormat("{0} ", boxShadow.ToString());
+            }
+
+            return StringBuilderCache.GetStringAndRelease(sb);
+
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public struct BoxShadowsEnumerator
+        {
+            private int _index;
+            private BoxShadows _shadows;
+
+            public BoxShadowsEnumerator(BoxShadows shadows)
+            {
+                _shadows = shadows;
+                _index = -1;
+            }
+
+            public BoxShadow Current => _shadows[_index];
+
+            public bool MoveNext()
+            {
+                _index++;
+                return _index < _shadows.Count;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public BoxShadowsEnumerator GetEnumerator() => new BoxShadowsEnumerator(this);
+
+        private static readonly char[] s_Separators = new[] { ',' };
+        public static BoxShadows Parse(string s)
+        {
+            var sp = s.Split(s_Separators, StringSplitOptions.RemoveEmptyEntries);
+            if (sp.Length == 0
+                || (sp.Length == 1 &&
+                    (string.IsNullOrWhiteSpace(sp[0])
+                     || sp[0] == "none")))
+                return new BoxShadows();
+
+            var first = BoxShadow.Parse(sp[0]);
+            if (sp.Length == 1)
+                return new BoxShadows(first);
+
+            var rest = new BoxShadow[sp.Length - 1];
+            for (var c = 0; c < rest.Length; c++)
+                rest[c] = BoxShadow.Parse(sp[c + 1]);
+            return new BoxShadows(first, rest);
+        }
+
+        public Rect TransformBounds(in Rect rect)
+        {
+            var final = rect;
+            foreach (var shadow in this)
+                final = final.Union(shadow.TransformBounds(rect));
+            return final;
+        }
+        
+        public bool HasInsetShadows
+        {
+            get
+            {
+                foreach(var boxShadow in this)
+                    if (!boxShadow.IsEmpty && boxShadow.IsInset)
+                        return true;
+                return false;
+            }
+        }
+        
+        public bool Equals(BoxShadows other)
+        {
+            if (other.Count != Count)
+                return false;
+            for(var c=0; c<Count ; c++)
+                if (!this[c].Equals(other[c]))
+                    return false;
+            return true;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is BoxShadows other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = 0;
+                foreach (var s in this)
+                    hashCode = (hashCode * 397) ^ s.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Brush.cs b/src/Avalonia.Base/Media/Brush.cs
new file mode 100644
index 0000000000..8d531e9394
--- /dev/null
+++ b/src/Avalonia.Base/Media/Brush.cs
@@ -0,0 +1,126 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Animation;
+using Avalonia.Animation.Animators;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how an area is painted.
+    /// </summary>
+    [TypeConverter(typeof(BrushConverter))]
+    public abstract class Brush : Animatable, IMutableBrush
+    {
+        /// <summary>
+        /// Defines the <see cref="Opacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> OpacityProperty =
+            AvaloniaProperty.Register<Brush, double>(nameof(Opacity), 1.0);
+
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITransform?> TransformProperty =
+            AvaloniaProperty.Register<Brush, ITransform?>(nameof(Transform));
+
+        /// <summary>
+        /// Defines the <see cref="TransformOrigin"/> property
+        /// </summary>
+        public static readonly StyledProperty<RelativePoint> TransformOriginProperty =
+            AvaloniaProperty.Register<Brush, RelativePoint>(nameof(TransformOrigin));
+
+        /// <inheritdoc/>
+        public event EventHandler? Invalidated;
+
+        static Brush()
+        {
+            Animation.Animation.RegisterAnimator<BaseBrushAnimator>(prop => typeof(IBrush).IsAssignableFrom(prop.PropertyType));
+            AffectsRender<Brush>(OpacityProperty, TransformProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity of the brush.
+        /// </summary>
+        public double Opacity
+        {
+            get { return GetValue(OpacityProperty); }
+            set { SetValue(OpacityProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform
+        {
+            get { return GetValue(TransformProperty); }
+            set { SetValue(TransformProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the origin of the brush <see cref="Transform"/>
+        /// </summary>
+        public RelativePoint TransformOrigin
+        {
+            get => GetValue(TransformOriginProperty);
+            set => SetValue(TransformOriginProperty, value);
+        }
+
+        /// <summary>
+        /// Parses a brush string.
+        /// </summary>
+        /// <param name="s">The brush string.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        public static IBrush Parse(string s)
+        {
+            _ = s ?? throw new ArgumentNullException(nameof(s));
+
+            if (s.Length > 0)
+            {
+                if (s[0] == '#')
+                {
+                    return new ImmutableSolidColorBrush(Color.Parse(s));
+                }
+
+                var brush = KnownColors.GetKnownBrush(s);
+                if (brush != null)
+                {
+                    return brush;
+                }
+            }
+
+            throw new FormatException($"Invalid brush string: '{s}'.");
+        }
+
+        /// <inheritdoc/>
+        public abstract IBrush ToImmutable();
+
+        /// <summary>
+        /// Marks a property as affecting the brush's visual representation.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a brush's static constructor, any change to the
+        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : Brush
+        {
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(e => Invalidate(e));
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/BrushConverter.cs b/src/Avalonia.Base/Media/BrushConverter.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BrushConverter.cs
rename to src/Avalonia.Base/Media/BrushConverter.cs
diff --git a/src/Avalonia.Visuals/Media/BrushExtensions.cs b/src/Avalonia.Base/Media/BrushExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BrushExtensions.cs
rename to src/Avalonia.Base/Media/BrushExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/BrushMappingMode.cs b/src/Avalonia.Base/Media/BrushMappingMode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BrushMappingMode.cs
rename to src/Avalonia.Base/Media/BrushMappingMode.cs
diff --git a/src/Avalonia.Visuals/Media/Brushes.cs b/src/Avalonia.Base/Media/Brushes.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Brushes.cs
rename to src/Avalonia.Base/Media/Brushes.cs
diff --git a/src/Avalonia.Visuals/Media/CharacterHit.cs b/src/Avalonia.Base/Media/CharacterHit.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/CharacterHit.cs
rename to src/Avalonia.Base/Media/CharacterHit.cs
diff --git a/src/Avalonia.Base/Media/Color.cs b/src/Avalonia.Base/Media/Color.cs
new file mode 100644
index 0000000000..5470a735b3
--- /dev/null
+++ b/src/Avalonia.Base/Media/Color.cs
@@ -0,0 +1,777 @@
+// Color conversion portions of this source file are adapted from the WinUI project
+// (https://github.com/microsoft/microsoft-ui-xaml)
+// and the Windows Community Toolkit project.
+// (https://github.com/CommunityToolkit/WindowsCommunityToolkit)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Globalization;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+using static Avalonia.Utilities.SpanHelpers;
+#endif
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// An ARGB color.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Color : IEquatable<Color>
+    {
+        private const double byteToDouble = 1.0 / 255;
+
+        static Color()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<ColorAnimator>(prop => typeof(Color).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// Gets the Alpha component of the color.
+        /// </summary>
+        public byte A { get; }
+
+        /// <summary>
+        /// Gets the Red component of the color.
+        /// </summary>
+        public byte R { get; }
+
+        /// <summary>
+        /// Gets the Green component of the color.
+        /// </summary>
+        public byte G { get; }
+
+        /// <summary>
+        /// Gets the Blue component of the color.
+        /// </summary>
+        public byte B { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="a">The alpha component.</param>
+        /// <param name="r">The red component.</param>
+        /// <param name="g">The green component.</param>
+        /// <param name="b">The blue component.</param>
+        public Color(byte a, byte r, byte g, byte b)
+        {
+            A = a;
+            R = r;
+            G = g;
+            B = b;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from alpha, red, green and blue components.
+        /// </summary>
+        /// <param name="a">The alpha component.</param>
+        /// <param name="r">The red component.</param>
+        /// <param name="g">The green component.</param>
+        /// <param name="b">The blue component.</param>
+        /// <returns>The color.</returns>
+        public static Color FromArgb(byte a, byte r, byte g, byte b)
+        {
+            return new Color(a, r, g, b);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from red, green and blue components.
+        /// </summary>
+        /// <param name="r">The red component.</param>
+        /// <param name="g">The green component.</param>
+        /// <param name="b">The blue component.</param>
+        /// <returns>The color.</returns>
+        public static Color FromRgb(byte r, byte g, byte b)
+        {
+            return new Color(0xff, r, g, b);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from an integer.
+        /// </summary>
+        /// <param name="value">The integer value.</param>
+        /// <returns>The color.</returns>
+        public static Color FromUInt32(uint value)
+        {
+            return new Color(
+                (byte)((value >> 24) & 0xff),
+                (byte)((value >> 16) & 0xff),
+                (byte)((value >> 8) & 0xff),
+                (byte)(value & 0xff)
+            );
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        public static Color Parse(string s)
+        {
+            if (s is null)
+            {
+                throw new ArgumentNullException(nameof(s));
+            }
+
+            if (TryParse(s, out Color color))
+            {
+                return color;
+            }
+
+            throw new FormatException($"Invalid color string: '{s}'.");
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        public static Color Parse(ReadOnlySpan<char> s)
+        {
+            if (TryParse(s, out Color color))
+            {
+                return color;
+            }
+
+            throw new FormatException($"Invalid color string: '{s.ToString()}'.");
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <param name="color">The parsed color</param>
+        /// <returns>The status of the operation.</returns>
+        public static bool TryParse(string s, out Color color)
+        {
+            color = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            if (s.Length == 0)
+            {
+                return false;
+            }
+
+            if (s[0] == '#' &&
+                TryParseHexFormat(s.AsSpan(), out color))
+            {
+                return true;
+            }
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible CSS format is "rbg(0,0,0)", Length = 10.
+
+            if (s.Length >= 10 &&
+                (s[0] == 'r' || s[0] == 'R') &&
+                (s[1] == 'g' || s[1] == 'G') &&
+                (s[2] == 'b' || s[2] == 'B') &&
+                TryParseCssFormat(s, out color))
+            {
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'l' || s[2] == 'L') &&
+                HslColor.TryParse(s, out HslColor hslColor))
+            {
+                color = hslColor.ToRgb();
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'v' || s[2] == 'V') &&
+                HsvColor.TryParse(s, out HsvColor hsvColor))
+            {
+                color = hsvColor.ToRgb();
+                return true;
+            }
+
+            var knownColor = KnownColors.GetKnownColor(s);
+
+            if (knownColor != KnownColor.None)
+            {
+                color = knownColor.ToColor();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <param name="color">The parsed color</param>
+        /// <returns>The status of the operation.</returns>
+        public static bool TryParse(ReadOnlySpan<char> s, out Color color)
+        {
+            if (s.Length == 0)
+            {
+                color = default;
+                return false;
+            }
+
+            if (s[0] == '#' &&
+                TryParseHexFormat(s, out color))
+            {
+                return true;
+            }
+
+            // At this point all parsing uses strings
+            var str = s.ToString();
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible CSS format is "rbg(0,0,0)", Length = 10.
+
+            if (s.Length >= 10 &&
+                (s[0] == 'r' || s[0] == 'R') &&
+                (s[1] == 'g' || s[1] == 'G') &&
+                (s[2] == 'b' || s[2] == 'B') &&
+                TryParseCssFormat(str, out color))
+            {
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'l' || s[2] == 'L') &&
+                HslColor.TryParse(str, out HslColor hslColor))
+            {
+                color = hslColor.ToRgb();
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'v' || s[2] == 'V') &&
+                HsvColor.TryParse(str, out HsvColor hsvColor))
+            {
+                color = hsvColor.ToRgb();
+                return true;
+            }
+
+            var knownColor = KnownColors.GetKnownColor(str);
+
+            if (knownColor != KnownColor.None)
+            {
+                color = knownColor.ToColor();
+                return true;
+            }
+
+            color = default;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Parses the given span of characters representing a hex color value into a new <see cref="Color"/>.
+        /// </summary>
+        private static bool TryParseHexFormat(ReadOnlySpan<char> s, out Color color)
+        {
+            static bool TryParseCore(ReadOnlySpan<char> input, ref Color color)
+            {
+                var alphaComponent = 0u;
+
+                if (input.Length == 6)
+                {
+                    alphaComponent = 0xff000000;
+                }
+                else if (input.Length != 8)
+                {
+                    return false;
+                }
+
+                if (!input.TryParseUInt(NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var parsed))
+                {
+                    return false;
+                }
+
+                color = FromUInt32(parsed | alphaComponent);
+
+                return true;
+            }
+
+            color = default;
+
+            ReadOnlySpan<char> input = s.Slice(1);
+
+            // Handle shorthand cases like #FFF (RGB) or #FFFF (ARGB).
+            if (input.Length == 3 || input.Length == 4)
+            {
+                var extendedLength = 2 * input.Length;
+                
+#if !BUILDTASK
+                Span<char> extended = stackalloc char[extendedLength];
+#else
+                char[] extended = new char[extendedLength];
+#endif
+
+                for (int i = 0; i < input.Length; i++)
+                {
+                    extended[2 * i + 0] = input[i];
+                    extended[2 * i + 1] = input[i];
+                }
+
+                return TryParseCore(extended, ref color);
+            }
+
+            return TryParseCore(input, ref color);
+        }
+
+        /// <summary>
+        /// Parses the given string representing a CSS color value into a new <see cref="Color"/>.
+        /// </summary>
+        private static bool TryParseCssFormat(string s, out Color color)
+        {
+            bool prefixMatched = false;
+
+            color = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            string workingString = s.Trim();
+
+            if (workingString.Length == 0 ||
+                workingString.IndexOf(",", StringComparison.Ordinal) < 0)
+            {
+                return false;
+            }
+
+            if (workingString.Length >= 11 &&
+                workingString.StartsWith("rgba(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(5, workingString.Length - 6);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false &&
+                workingString.Length >= 10 &&
+                workingString.StartsWith("rgb(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(4, workingString.Length - 5);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false)
+            {
+                return false;
+            }
+
+            string[] components = workingString.Split(',');
+
+            if (components.Length == 3) // RGB
+            {
+                if (InternalTryParseByte(components[0].AsSpan(), out byte red) &&
+                    InternalTryParseByte(components[1].AsSpan(), out byte green) &&
+                    InternalTryParseByte(components[2].AsSpan(), out byte blue))
+                {
+                    color = new Color(0xFF, red, green, blue);
+                    return true;
+                }
+            }
+            else if (components.Length == 4) // RGBA
+            {
+                if (InternalTryParseByte(components[0].AsSpan(), out byte red) &&
+                    InternalTryParseByte(components[1].AsSpan(), out byte green) &&
+                    InternalTryParseByte(components[2].AsSpan(), out byte blue) &&
+                    InternalTryParseDouble(components[3].AsSpan(), out double alpha))
+                {
+                    color = new Color((byte)Math.Round(alpha * 255.0), red, green, blue);
+                    return true;
+                }
+            }
+
+            // Local function to specially parse a byte value with an optional percentage sign
+            bool InternalTryParseByte(ReadOnlySpan<char> inString, out byte outByte)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%".AsSpan(), StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = inString.Slice(0, percentIndex).TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                        out double percentage);
+
+                    outByte = (byte)Math.Round((percentage / 100.0) * 255.0);
+                    return result;
+                }
+                else
+                {
+                    return inString.TryParseByte(NumberStyles.Number, CultureInfo.InvariantCulture,
+                        out outByte);
+                }
+            }
+
+            // Local function to specially parse a double value with an optional percentage sign
+            bool InternalTryParseDouble(ReadOnlySpan<char> inString, out double outDouble)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%".AsSpan(), StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = inString.Slice(0, percentIndex).TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                         out double percentage);
+
+                    outDouble = percentage / 100.0;
+                    return result;
+                }
+                else
+                {
+                    return inString.TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                        out outDouble);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the string representation of the color.
+        /// </summary>
+        /// <returns>
+        /// The string representation of the color.
+        /// </returns>
+        public override string ToString()
+        {
+            uint rgb = ToUint32();
+            return KnownColors.GetKnownColorName(rgb) ?? $"#{rgb.ToString("x8", CultureInfo.InvariantCulture)}";
+        }
+
+        /// <summary>
+        /// Returns the integer representation of the color.
+        /// </summary>
+        /// <returns>
+        /// The integer representation of the color.
+        /// </returns>
+        public uint ToUint32()
+        {
+            return ((uint)A << 24) | ((uint)R << 16) | ((uint)G << 8) | (uint)B;
+        }
+
+        /// <summary>
+        /// Returns the HSL color model equivalent of this RGB color.
+        /// </summary>
+        /// <returns>The HSL equivalent color.</returns>
+        public HslColor ToHsl()
+        {
+            // Don't use the HslColor(Color) constructor to avoid an extra HslColor
+            return Color.ToHsl(R, G, B, A);
+        }
+
+        /// <summary>
+        /// Returns the HSV color model equivalent of this RGB color.
+        /// </summary>
+        /// <returns>The HSV equivalent color.</returns>
+        public HsvColor ToHsv()
+        {
+            // Don't use the HsvColor(Color) constructor to avoid an extra HsvColor
+            return Color.ToHsv(R, G, B, A);
+        }
+
+        /// <inheritdoc/>
+        public bool Equals(Color other)
+        {
+            return A == other.A && R == other.R && G == other.G && B == other.B;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            return obj is Color other && Equals(other);
+        }
+
+        /// <inheritdoc/>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = A.GetHashCode();
+                hashCode = (hashCode * 397) ^ R.GetHashCode();
+                hashCode = (hashCode * 397) ^ G.GetHashCode();
+                hashCode = (hashCode * 397) ^ B.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// Converts the given RGB color to its HSL color equivalent.
+        /// </summary>
+        /// <param name="color">The color in the RGB color model.</param>
+        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
+        public static HslColor ToHsl(Color color)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsl(
+                (byteToDouble * color.R),
+                (byteToDouble * color.G),
+                (byteToDouble * color.B),
+                (byteToDouble * color.A));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSL color equivalent.
+        /// </summary>
+        /// <param name="red">The Red component in the RGB color model.</param>
+        /// <param name="green">The Green component in the RGB color model.</param>
+        /// <param name="blue">The Blue component in the RGB color model.</param>
+        /// <param name="alpha">The Alpha component.</param>
+        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
+        public static HslColor ToHsl(
+            byte red,
+            byte green,
+            byte blue,
+            byte alpha = 0xFF)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsl(
+                (byteToDouble * red),
+                (byteToDouble * green),
+                (byteToDouble * blue),
+                (byteToDouble * alpha));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSL color equivalent.
+        /// </summary>
+        /// <remarks>
+        /// Warning: No bounds checks or clamping is done on the input component values.
+        /// This method is for internal-use only and the caller must ensure bounds.
+        /// </remarks>
+        /// <param name="r">The Red component in the RGB color model within the range 0..1.</param>
+        /// <param name="g">The Green component in the RGB color model within the range 0..1.</param>
+        /// <param name="b">The Blue component in the RGB color model within the range 0..1.</param>
+        /// <param name="a">The Alpha component in the RGB color model within the range 0..1.</param>
+        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
+        internal static HslColor ToHsl(
+            double r,
+            double g,
+            double b,
+            double a = 1.0)
+        {
+            // Note: Conversion code is originally based on ColorHelper in the Windows Community Toolkit (licensed MIT)
+            // https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp/Helpers/ColorHelper.cs
+            // It has been modified.
+
+            double max = r >= g ? (r >= b ? r : b) : (g >= b ? g : b);
+            double min = r <= g ? (r <= b ? r : b) : (g <= b ? g : b);
+            double chroma = max - min;
+            double h1;
+
+            if (chroma == 0)
+            {
+                h1 = 0;
+            }
+            else if (max == r)
+            {
+                // The % operator doesn't do proper modulo on negative
+                // numbers, so we'll add 6 before using it
+                h1 = (((g - b) / chroma) + 6) % 6;
+            }
+            else if (max == g)
+            {
+                h1 = 2 + ((b - r) / chroma);
+            }
+            else
+            {
+                h1 = 4 + ((r - g) / chroma);
+            }
+
+            double lightness = 0.5 * (max + min);
+            double saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs((2 * lightness) - 1));
+
+            return new HslColor(a, 60 * h1, saturation, lightness, clampValues: false);
+        }
+
+        /// <summary>
+        /// Converts the given RGB color to its HSV color equivalent.
+        /// </summary>
+        /// <param name="color">The color in the RGB color model.</param>
+        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
+        public static HsvColor ToHsv(Color color)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsv(
+                (byteToDouble * color.R),
+                (byteToDouble * color.G),
+                (byteToDouble * color.B),
+                (byteToDouble * color.A));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSV color equivalent.
+        /// </summary>
+        /// <param name="red">The Red component in the RGB color model.</param>
+        /// <param name="green">The Green component in the RGB color model.</param>
+        /// <param name="blue">The Blue component in the RGB color model.</param>
+        /// <param name="alpha">The Alpha component.</param>
+        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
+        public static HsvColor ToHsv(
+            byte red,
+            byte green,
+            byte blue,
+            byte alpha = 0xFF)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsv(
+                (byteToDouble * red),
+                (byteToDouble * green),
+                (byteToDouble * blue),
+                (byteToDouble * alpha));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSV color equivalent.
+        /// </summary>
+        /// <remarks>
+        /// Warning: No bounds checks or clamping is done on the input component values.
+        /// This method is for internal-use only and the caller must ensure bounds.
+        /// </remarks>
+        /// <param name="r">The Red component in the RGB color model within the range 0..1.</param>
+        /// <param name="g">The Green component in the RGB color model within the range 0..1.</param>
+        /// <param name="b">The Blue component in the RGB color model within the range 0..1.</param>
+        /// <param name="a">The Alpha component in the RGB color model within the range 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
+        internal static HsvColor ToHsv(
+            double r,
+            double g,
+            double b,
+            double a = 1.0)
+        {
+            // Note: Conversion code is originally based on the C++ in WinUI (licensed MIT)
+            // https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/Common/ColorConversion.cpp
+            // This was used because it is the best documented and likely most optimized for performance
+            // Alpha support was added
+
+            double hue;
+            double saturation;
+            double value;
+
+            double max = r >= g ? (r >= b ? r : b) : (g >= b ? g : b);
+            double min = r <= g ? (r <= b ? r : b) : (g <= b ? g : b);
+
+            // The value, a number between 0 and 1, is the largest of R, G, and B (divided by 255).
+            // Conceptually speaking, it represents how much color is present.
+            // If at least one of R, G, B is 255, then there exists as much color as there can be.
+            // If RGB = (0, 0, 0), then there exists no color at all - a value of zero corresponds
+            // to black (i.e., the absence of any color).
+            value = max;
+
+            // The "chroma" of the color is a value directly proportional to the extent to which
+            // the color diverges from greyscale.  If, for example, we have RGB = (255, 255, 0),
+            // then the chroma is maximized - this is a pure yellow, no gray of any kind.
+            // On the other hand, if we have RGB = (128, 128, 128), then the chroma being zero
+            // implies that this color is pure greyscale, with no actual hue to be found.
+            var chroma = max - min;
+
+            // If the chrome is zero, then hue is technically undefined - a greyscale color
+            // has no hue.  For the sake of convenience, we'll just set hue to zero, since
+            // it will be unused in this circumstance.  Since the color is purely gray,
+            // saturation is also equal to zero - you can think of saturation as basically
+            // a measure of hue intensity, such that no hue at all corresponds to a
+            // nonexistent intensity.
+            if (chroma == 0)
+            {
+                hue = 0.0;
+                saturation = 0.0;
+            }
+            else
+            {
+                // In this block, hue is properly defined, so we'll extract both hue
+                // and saturation information from the RGB color.
+
+                // Hue can be thought of as a cyclical thing, between 0 degrees and 360 degrees.
+                // A hue of 0 degrees is red; 120 degrees is green; 240 degrees is blue; and 360 is back to red.
+                // Every other hue is somewhere between either red and green, green and blue, and blue and red,
+                // so every other hue can be thought of as an angle on this color wheel.
+                // These if/else statements determines where on this color wheel our color lies.
+                if (r == max)
+                {
+                    // If the red channel is the most pronounced channel, then we exist
+                    // somewhere between (-60, 60) on the color wheel - i.e., the section around 0 degrees
+                    // where red dominates.  We figure out where in that section we are exactly
+                    // by considering whether the green or the blue channel is greater - by subtracting green from blue,
+                    // then if green is greater, we'll nudge ourselves closer to 60, whereas if blue is greater, then
+                    // we'll nudge ourselves closer to -60.  We then divide by chroma (which will actually make the result larger,
+                    // since chroma is a value between 0 and 1) to normalize the value to ensure that we get the right hue
+                    // even if we're very close to greyscale.
+                    hue = 60 * (g - b) / chroma;
+                }
+                else if (g == max)
+                {
+                    // We do the exact same for the case where the green channel is the most pronounced channel,
+                    // only this time we want to see if we should tilt towards the blue direction or the red direction.
+                    // We add 120 to center our value in the green third of the color wheel.
+                    hue = 120 + (60 * (b - r) / chroma);
+                }
+                else // blue == max
+                {
+                    // And we also do the exact same for the case where the blue channel is the most pronounced channel,
+                    // only this time we want to see if we should tilt towards the red direction or the green direction.
+                    // We add 240 to center our value in the blue third of the color wheel.
+                    hue = 240 + (60 * (r - g) / chroma);
+                }
+
+                // Since we want to work within the range [0, 360), we'll add 360 to any value less than zero -
+                // this will bump red values from within -60 to -1 to 300 to 359.  The hue is the same at both values.
+                if (hue < 0.0)
+                {
+                    hue += 360.0;
+                }
+
+                // The saturation, our final HSV axis, can be thought of as a value between 0 and 1 indicating how intense our color is.
+                // To find it, we divide the chroma - the distance between the minimum and the maximum RGB channels - by the maximum channel (i.e., the value).
+                // This effectively normalizes the chroma - if the maximum is 0.5 and the minimum is 0, the saturation will be (0.5 - 0) / 0.5 = 1,
+                // meaning that although this color is not as bright as it can be, the dark color is as intense as it possibly could be.
+                // If, on the other hand, the maximum is 0.5 and the minimum is 0.25, then the saturation will be (0.5 - 0.25) / 0.5 = 0.5,
+                // meaning that this color is partially washed out.
+                // A saturation value of 0 corresponds to a greyscale color, one in which the color is *completely* washed out and there is no actual hue.
+                saturation = chroma / value;
+            }
+
+            return new HsvColor(a, hue, saturation, value, clampValues: false);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="Color"/> objects are equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are equal; otherwise, false.</returns>
+        public static bool operator ==(Color left, Color right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="Color"/> objects are not equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are not equal; otherwise, false.</returns>
+        public static bool operator !=(Color left, Color right)
+        {
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Colors.cs b/src/Avalonia.Base/Media/Colors.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Colors.cs
rename to src/Avalonia.Base/Media/Colors.cs
diff --git a/src/Avalonia.Base/Media/ConicGradientBrush.cs b/src/Avalonia.Base/Media/ConicGradientBrush.cs
new file mode 100644
index 0000000000..4b50019ddc
--- /dev/null
+++ b/src/Avalonia.Base/Media/ConicGradientBrush.cs
@@ -0,0 +1,55 @@
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with a swept circular gradient.
+    /// </summary>
+    public sealed class ConicGradientBrush : GradientBrush, IConicGradientBrush
+    {
+        /// <summary>
+        /// Defines the <see cref="Center"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativePoint> CenterProperty =
+            AvaloniaProperty.Register<ConicGradientBrush, RelativePoint>(
+                nameof(Center),
+                RelativePoint.Center);
+
+        /// <summary>
+        /// Defines the <see cref="Angle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> AngleProperty =
+            AvaloniaProperty.Register<ConicGradientBrush, double>(
+                nameof(Angle),
+                0);
+        
+        static ConicGradientBrush()
+        {
+            AffectsRender<ConicGradientBrush>(CenterProperty, AngleProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets the center point of the gradient.
+        /// </summary>
+        public RelativePoint Center
+        {
+            get { return GetValue(CenterProperty); }
+            set { SetValue(CenterProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the angle of the start and end of the sweep, measured from above the center point.
+        /// </summary>
+        public double Angle
+        {
+            get { return GetValue(AngleProperty); }
+            set { SetValue(AngleProperty, value); }
+        }
+
+        /// <inheritdoc/>
+        public override IBrush ToImmutable()
+        {
+            return new ImmutableConicGradientBrush(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/DashStyle.cs b/src/Avalonia.Base/Media/DashStyle.cs
new file mode 100644
index 0000000000..3a30b2d32f
--- /dev/null
+++ b/src/Avalonia.Base/Media/DashStyle.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Animation;
+using Avalonia.Collections;
+using Avalonia.Media.Immutable;
+
+#nullable enable
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
+    /// </summary>
+    public class DashStyle : Animatable, IDashStyle, IAffectsRender
+    {
+        /// <summary>
+        /// Defines the <see cref="Dashes"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AvaloniaList<double>> DashesProperty =
+            AvaloniaProperty.Register<DashStyle, AvaloniaList<double>>(nameof(Dashes));
+
+        /// <summary>
+        /// Defines the <see cref="Offset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> OffsetProperty =
+            AvaloniaProperty.Register<DashStyle, double>(nameof(Offset));
+
+        private static ImmutableDashStyle? s_dash;
+        private static ImmutableDashStyle? s_dot;
+        private static ImmutableDashStyle? s_dashDot;
+        private static ImmutableDashStyle? s_dashDotDot;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DashStyle"/> class.
+        /// </summary>
+        public DashStyle()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DashStyle"/> class.
+        /// </summary>
+        /// <param name="dashes">The dashes collection.</param>
+        /// <param name="offset">The dash sequence offset.</param>
+        public DashStyle(IEnumerable<double>? dashes, double offset)
+        {
+            Dashes = (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>());
+            Offset = offset;
+        }
+
+        static DashStyle()
+        {
+            void RaiseInvalidated(AvaloniaPropertyChangedEventArgs e)
+            {
+                ((DashStyle)e.Sender).Invalidated?.Invoke(e.Sender, EventArgs.Empty);
+            }
+
+            DashesProperty.Changed.Subscribe(RaiseInvalidated);
+            OffsetProperty.Changed.Subscribe(RaiseInvalidated);
+        }
+
+        /// <summary>
+        /// Represents a dashed <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle Dash => s_dash ??= new ImmutableDashStyle(new double[] { 2, 2 }, 1);
+
+        /// <summary>
+        /// Represents a dotted <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle Dot => s_dot ??= new ImmutableDashStyle(new double[] { 0, 2 }, 0);
+
+        /// <summary>
+        /// Represents a dashed dotted <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle DashDot => s_dashDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2 }, 1);
+
+        /// <summary>
+        /// Represents a dashed double dotted <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle DashDotDot => s_dashDotDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2, 0, 2 }, 1);
+
+        /// <summary>
+        /// Gets or sets the length of alternating dashes and gaps.
+        /// </summary>
+        public AvaloniaList<double> Dashes
+        {
+            get => GetValue(DashesProperty);
+            set => SetValue(DashesProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how far in the dash sequence the stroke will start.
+        /// </summary>
+        public double Offset
+        {
+            get => GetValue(OffsetProperty);
+            set => SetValue(OffsetProperty, value);
+        }
+
+        IReadOnlyList<double> IDashStyle.Dashes => Dashes;
+
+        /// <summary>
+        /// Raised when the dash style changes.
+        /// </summary>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Returns an immutable clone of the <see cref="DashStyle"/>.
+        /// </summary>
+        /// <returns></returns>
+        public ImmutableDashStyle ToImmutable() => new ImmutableDashStyle(Dashes, Offset);
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == DashesProperty)
+            {
+                var (oldValue, newValue) = change.GetOldAndNewValue<AvaloniaList<double>>();
+
+                if (oldValue is object)
+                {
+                    oldValue.CollectionChanged -= DashesChanged;
+                }
+
+                if (newValue is object)
+                {
+                    newValue.CollectionChanged += DashesChanged;
+                }
+            }
+        }
+
+        private void DashesChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            Invalidated?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Drawing.cs b/src/Avalonia.Base/Media/Drawing.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Drawing.cs
rename to src/Avalonia.Base/Media/Drawing.cs
diff --git a/src/Avalonia.Base/Media/DrawingCollection.cs b/src/Avalonia.Base/Media/DrawingCollection.cs
new file mode 100644
index 0000000000..a76f7743cc
--- /dev/null
+++ b/src/Avalonia.Base/Media/DrawingCollection.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Avalonia.Collections;
+
+namespace Avalonia.Media
+{
+    public sealed class DrawingCollection : AvaloniaList<Drawing>
+    {
+        public DrawingCollection()
+        {
+            ResetBehavior = ResetBehavior.Remove;
+        }
+
+        public DrawingCollection(IEnumerable<Drawing> items) : base(items)
+        {
+            ResetBehavior = ResetBehavior.Remove;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/DrawingContext.cs b/src/Avalonia.Base/Media/DrawingContext.cs
new file mode 100644
index 0000000000..d0f3b9e21a
--- /dev/null
+++ b/src/Avalonia.Base/Media/DrawingContext.cs
@@ -0,0 +1,451 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    public sealed class DrawingContext : IDisposable
+    {
+        private readonly bool _ownsImpl;
+        private int _currentLevel;
+
+
+        private static ThreadSafeObjectPool<Stack<PushedState>> StateStackPool { get; } =
+            ThreadSafeObjectPool<Stack<PushedState>>.Default;
+
+        private static ThreadSafeObjectPool<Stack<TransformContainer>> TransformStackPool { get; } =
+            ThreadSafeObjectPool<Stack<TransformContainer>>.Default;
+
+        private Stack<PushedState>? _states = StateStackPool.Get();
+
+        private Stack<TransformContainer>? _transformContainers = TransformStackPool.Get();
+
+        readonly struct TransformContainer
+        {
+            public readonly Matrix LocalTransform;
+            public readonly Matrix ContainerTransform;
+
+            public TransformContainer(Matrix localTransform, Matrix containerTransform)
+            {
+                LocalTransform = localTransform;
+                ContainerTransform = containerTransform;
+            }
+        }
+
+        public DrawingContext(IDrawingContextImpl impl)
+        {
+            PlatformImpl = impl;
+            _ownsImpl = true;
+        }
+        
+        public DrawingContext(IDrawingContextImpl impl, bool ownsImpl)
+        {
+            _ownsImpl = ownsImpl;
+            PlatformImpl = impl;
+        }
+
+        public IDrawingContextImpl PlatformImpl { get; }
+
+        private Matrix _currentTransform = Matrix.Identity;
+
+        private Matrix _currentContainerTransform = Matrix.Identity;
+
+        /// <summary>
+        /// Gets the current transform of the drawing context.
+        /// </summary>
+        public Matrix CurrentTransform
+        {
+            get { return _currentTransform; }
+            private set
+            {
+                _currentTransform = value;
+                var transform = _currentTransform * _currentContainerTransform;
+                PlatformImpl.Transform = transform;
+            }
+        }
+
+        //HACK: This is a temporary hack that is used in the render loop 
+        //to update TransformedBounds property
+        [Obsolete("HACK for render loop, don't use")]
+        public Matrix CurrentContainerTransform => _currentContainerTransform;
+
+        /// <summary>
+        /// Draws an image.
+        /// </summary>
+        /// <param name="source">The image.</param>
+        /// <param name="rect">The rect in the output to draw to.</param>
+        public void DrawImage(IImage source, Rect rect)
+        {
+            _ = source ?? throw new ArgumentNullException(nameof(source));
+
+            DrawImage(source, new Rect(source.Size), rect);
+        }
+
+        /// <summary>
+        /// Draws an image.
+        /// </summary>
+        /// <param name="source">The image.</param>
+        /// <param name="sourceRect">The rect in the image to draw.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        public void DrawImage(IImage source, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = default)
+        {
+            _ = source ?? throw new ArgumentNullException(nameof(source));
+
+            source.Draw(this, sourceRect, destRect, bitmapInterpolationMode);
+        }
+
+        /// <summary>
+        /// Draws a line.
+        /// </summary>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="p1">The first point of the line.</param>
+        /// <param name="p2">The second point of the line.</param>
+        public void DrawLine(IPen pen, Point p1, Point p2)
+        {
+            if (PenIsVisible(pen))
+            {
+                PlatformImpl.DrawLine(pen, p1, p2);
+            }
+        }
+
+        /// <summary>
+        /// Draws a geometry.
+        /// </summary>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        public void DrawGeometry(IBrush? brush, IPen? pen, Geometry geometry)
+        {
+            if (geometry.PlatformImpl is not null)
+                DrawGeometry(brush, pen, geometry.PlatformImpl);
+        }
+
+        /// <summary>
+        /// Draws a geometry.
+        /// </summary>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+        {
+            _ = geometry ?? throw new ArgumentNullException(nameof(geometry));
+
+            if (brush != null || PenIsVisible(pen))
+            {
+                PlatformImpl.DrawGeometry(brush, pen, geometry);
+            }
+        }
+
+        /// <summary>
+        /// Draws a rectangle with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="radiusX">The radius in the X dimension of the rounded corners.
+        ///     This value will be clamped to the range of 0 to Width/2
+        /// </param>
+        /// <param name="radiusY">The radius in the Y dimension of the rounded corners.
+        ///     This value will be clamped to the range of 0 to Height/2
+        /// </param>
+        /// <param name="boxShadows">Box shadow effect parameters</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        public void DrawRectangle(IBrush? brush, IPen? pen, Rect rect, double radiusX = 0, double radiusY = 0,
+            BoxShadows boxShadows = default)
+        {
+            if (brush == null && !PenIsVisible(pen))
+            {
+                return;
+            }
+
+            if (!MathUtilities.IsZero(radiusX))
+            {
+                radiusX = Math.Min(radiusX, rect.Width / 2);
+            }
+
+            if (!MathUtilities.IsZero(radiusY))
+            {
+                radiusY = Math.Min(radiusY, rect.Height / 2);
+            }
+
+            PlatformImpl.DrawRectangle(brush, pen, new RoundedRect(rect, radiusX, radiusY), boxShadows);
+        }
+
+        /// <summary>
+        /// Draws the outline of a rectangle.
+        /// </summary>
+        /// <param name="pen">The pen.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="cornerRadius">The corner radius.</param>
+        public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0.0f)
+        {
+            DrawRectangle(null, pen, rect, cornerRadius, cornerRadius);
+        }
+
+        /// <summary>
+        /// Draws an ellipse with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
+        /// <param name="center">The location of the center of the ellipse.</param>
+        /// <param name="radiusX">The horizontal radius of the ellipse.</param>
+        /// <param name="radiusY">The vertical radius of the ellipse.</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        public void DrawEllipse(IBrush? brush, IPen? pen, Point center, double radiusX, double radiusY)
+        {
+            if (brush == null && !PenIsVisible(pen))
+            {
+                return;
+            }
+
+            var originX = center.X - radiusX;
+            var originY = center.Y - radiusY;
+            var width = radiusX * 2;
+            var height = radiusY * 2;
+
+            PlatformImpl.DrawEllipse(brush, pen, new Rect(originX, originY, width, height));
+        }
+
+        /// <summary>
+        /// Draws a custom drawing operation
+        /// </summary>
+        /// <param name="custom">custom operation</param>
+        public void Custom(ICustomDrawOperation custom) => PlatformImpl.Custom(custom);
+
+        /// <summary>
+        /// Draws text.
+        /// </summary>
+        /// <param name="origin">The upper-left corner of the text.</param>
+        /// <param name="text">The text.</param>
+        public void DrawText(FormattedText text, Point origin)
+        {
+            _ = text ?? throw new ArgumentNullException(nameof(text));
+         
+           text.Draw(this, origin);            
+        }
+
+        /// <summary>
+        /// Draws a glyph run.
+        /// </summary>
+        /// <param name="foreground">The foreground brush.</param>
+        /// <param name="glyphRun">The glyph run.</param>
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        {
+            _ = glyphRun ?? throw new ArgumentNullException(nameof(glyphRun));
+
+            if (foreground != null)
+            {
+                PlatformImpl.DrawGlyphRun(foreground, glyphRun);
+            }
+        }
+
+        /// <summary>
+        /// Draws a filled rectangle.
+        /// </summary>
+        /// <param name="brush">The brush.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="cornerRadius">The corner radius.</param>
+        public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f)
+        {
+            DrawRectangle(brush, null, rect, cornerRadius, cornerRadius);
+        }
+
+        public readonly struct PushedState : IDisposable
+        {
+            private readonly int _level;
+            private readonly DrawingContext _context;
+            private readonly Matrix _matrix;
+            private readonly PushedStateType _type;
+
+            public enum PushedStateType
+            {
+                None,
+                Matrix,
+                Opacity,
+                Clip,
+                MatrixContainer,
+                GeometryClip,
+                OpacityMask,
+            }
+
+            public PushedState(DrawingContext context, PushedStateType type, Matrix matrix = default(Matrix))
+            {
+                if (context._states is null)
+                    throw new ObjectDisposedException(nameof(DrawingContext));
+
+                _context = context;
+                _type = type;
+                _matrix = matrix;
+                _level = context._currentLevel += 1;
+                context._states.Push(this);
+            }
+
+            public void Dispose()
+            {
+                if (_type == PushedStateType.None)
+                    return;
+                if (_context._states is null || _context._transformContainers is null)
+                    throw new ObjectDisposedException(nameof(DrawingContext));
+                if (_context._currentLevel != _level)
+                    throw new InvalidOperationException("Wrong Push/Pop state order");
+                _context._currentLevel--;
+                _context._states.Pop();
+                if (_type == PushedStateType.Matrix)
+                    _context.CurrentTransform = _matrix;
+                else if (_type == PushedStateType.Clip)
+                    _context.PlatformImpl.PopClip();
+                else if (_type == PushedStateType.Opacity)
+                    _context.PlatformImpl.PopOpacity();
+                else if (_type == PushedStateType.GeometryClip)
+                    _context.PlatformImpl.PopGeometryClip();
+                else if (_type == PushedStateType.OpacityMask)
+                    _context.PlatformImpl.PopOpacityMask();
+                else if (_type == PushedStateType.MatrixContainer)
+                {
+                    var cont = _context._transformContainers.Pop();
+                    _context._currentContainerTransform = cont.ContainerTransform;
+                    _context.CurrentTransform = cont.LocalTransform;
+                }
+            }
+        }
+
+
+        public PushedState PushClip(RoundedRect clip)
+        {
+            PlatformImpl.PushClip(clip);
+            return new PushedState(this, PushedState.PushedStateType.Clip);
+        }
+
+        /// <summary>
+        /// Pushes a clip rectangle.
+        /// </summary>
+        /// <param name="clip">The clip rectangle.</param>
+        /// <returns>A disposable used to undo the clip rectangle.</returns>
+        public PushedState PushClip(Rect clip)
+        {
+            PlatformImpl.PushClip(clip);
+            return new PushedState(this, PushedState.PushedStateType.Clip);
+        }
+
+        /// <summary>
+        /// Pushes a clip geometry.
+        /// </summary>
+        /// <param name="clip">The clip geometry.</param>
+        /// <returns>A disposable used to undo the clip geometry.</returns>
+        public PushedState PushGeometryClip(Geometry clip)
+        {
+            _ = clip ?? throw new ArgumentNullException(nameof(clip));
+
+            // HACK: This check was added when nullable annotations pointed out that we're potentially
+            // pushing a null value for the clip here. Ideally we'd return an empty PushedState here but
+            // I don't want to make that change as part of adding nullable annotations.
+            if (clip.PlatformImpl is null)
+                throw new InvalidOperationException("Cannot push empty geometry clip.");
+
+            PlatformImpl.PushGeometryClip(clip.PlatformImpl);
+            return new PushedState(this, PushedState.PushedStateType.GeometryClip);
+        }
+
+        /// <summary>
+        /// Pushes an opacity value.
+        /// </summary>
+        /// <param name="opacity">The opacity.</param>
+        /// <returns>A disposable used to undo the opacity.</returns>
+        public PushedState PushOpacity(double opacity)
+        //TODO: Eliminate platform-specific push opacity call
+        {
+            PlatformImpl.PushOpacity(opacity);
+            return new PushedState(this, PushedState.PushedStateType.Opacity);
+        }
+
+        /// <summary>
+        /// Pushes an opacity mask.
+        /// </summary>
+        /// <param name="mask">The opacity mask.</param>
+        /// <param name="bounds">
+        /// The size of the brush's target area. TODO: Are we sure this is needed?
+        /// </param>
+        /// <returns>A disposable to undo the opacity mask.</returns>
+        public PushedState PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            PlatformImpl.PushOpacityMask(mask, bounds);
+            return new PushedState(this, PushedState.PushedStateType.OpacityMask);
+        }
+
+        /// <summary>
+        /// Pushes a matrix post-transformation.
+        /// </summary>
+        /// <param name="matrix">The matrix</param>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushPostTransform(Matrix matrix) => PushSetTransform(CurrentTransform * matrix);
+
+        /// <summary>
+        /// Pushes a matrix pre-transformation.
+        /// </summary>
+        /// <param name="matrix">The matrix</param>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushPreTransform(Matrix matrix) => PushSetTransform(matrix * CurrentTransform);
+
+        /// <summary>
+        /// Sets the current matrix transformation.
+        /// </summary>
+        /// <param name="matrix">The matrix</param>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushSetTransform(Matrix matrix)
+        {
+            var oldMatrix = CurrentTransform;
+            CurrentTransform = matrix;
+
+            return new PushedState(this, PushedState.PushedStateType.Matrix, oldMatrix);
+        }
+
+        /// <summary>
+        /// Pushes a new transform context.
+        /// </summary>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushTransformContainer()
+        {
+            if (_transformContainers is null)
+                throw new ObjectDisposedException(nameof(DrawingContext));
+            _transformContainers.Push(new TransformContainer(CurrentTransform, _currentContainerTransform));
+            _currentContainerTransform = CurrentTransform * _currentContainerTransform;
+            _currentTransform = Matrix.Identity;
+            return new PushedState(this, PushedState.PushedStateType.MatrixContainer);
+        }
+
+        /// <summary>
+        /// Disposes of any resources held by the <see cref="DrawingContext"/>.
+        /// </summary>
+        public void Dispose()
+        {
+            if (_states is null || _transformContainers is null)
+                throw new ObjectDisposedException(nameof(DrawingContext));
+            while (_states.Count != 0)
+                _states.Peek().Dispose();
+            StateStackPool.Return(_states);
+            _states = null;
+            if (_transformContainers.Count != 0)
+                throw new InvalidOperationException("Transform container stack is non-empty");
+            TransformStackPool.Return(_transformContainers);
+            _transformContainers = null;
+            if (_ownsImpl)
+                PlatformImpl.Dispose();
+        }
+
+        private static bool PenIsVisible(IPen? pen)
+        {
+            return pen?.Brush != null && pen.Thickness > 0;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/DrawingGroup.cs b/src/Avalonia.Base/Media/DrawingGroup.cs
new file mode 100644
index 0000000000..e71f568207
--- /dev/null
+++ b/src/Avalonia.Base/Media/DrawingGroup.cs
@@ -0,0 +1,497 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public class DrawingGroup : Drawing
+    {
+        public static readonly StyledProperty<double> OpacityProperty =
+            AvaloniaProperty.Register<DrawingGroup, double>(nameof(Opacity), 1);
+
+        public static readonly StyledProperty<Transform> TransformProperty =
+            AvaloniaProperty.Register<DrawingGroup, Transform>(nameof(Transform));
+
+        public static readonly StyledProperty<Geometry> ClipGeometryProperty =
+            AvaloniaProperty.Register<DrawingGroup, Geometry>(nameof(ClipGeometry));
+
+        public static readonly StyledProperty<IBrush> OpacityMaskProperty =
+            AvaloniaProperty.Register<DrawingGroup, IBrush>(nameof(OpacityMask));
+
+        public static readonly DirectProperty<DrawingGroup, DrawingCollection> ChildrenProperty =
+            AvaloniaProperty.RegisterDirect<DrawingGroup, DrawingCollection>(
+                nameof(Children),
+                o => o.Children,
+                (o, v) => o.Children = v);
+
+        private DrawingCollection _children = new DrawingCollection();
+
+        public double Opacity
+        {
+            get => GetValue(OpacityProperty);
+            set => SetValue(OpacityProperty, value);
+        }
+
+        public Transform Transform
+        {
+            get => GetValue(TransformProperty);
+            set => SetValue(TransformProperty, value);
+        }
+
+        public Geometry ClipGeometry
+        {
+            get => GetValue(ClipGeometryProperty);
+            set => SetValue(ClipGeometryProperty, value);
+        }
+
+        public IBrush OpacityMask
+        {
+            get => GetValue(OpacityMaskProperty);
+            set => SetValue(OpacityMaskProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the collection that contains the child geometries.
+        /// </summary>
+        [Content]
+        public DrawingCollection Children
+        {
+            get => _children;
+            set
+            {
+                SetAndRaise(ChildrenProperty, ref _children, value);
+            }
+        }
+
+        public DrawingContext Open()
+        {
+            return new DrawingContext(new DrawingGroupDrawingContext(this));
+        }
+
+        public override void Draw(DrawingContext context)
+        {
+            using (context.PushPreTransform(Transform?.Value ?? Matrix.Identity))
+            using (context.PushOpacity(Opacity))
+            using (ClipGeometry != null ? context.PushGeometryClip(ClipGeometry) : default(DrawingContext.PushedState))
+            using (OpacityMask != null ? context.PushOpacityMask(OpacityMask, GetBounds()) : default(DrawingContext.PushedState))
+            {
+                foreach (var drawing in Children)
+                {
+                    drawing.Draw(context);
+                }
+            }
+        }
+
+        public override Rect GetBounds()
+        {
+            var rect = new Rect();
+
+            foreach (var drawing in Children)
+            {
+                rect = rect.Union(drawing.GetBounds());
+            }
+
+            if (Transform != null)
+            {
+                rect = rect.TransformToAABB(Transform.Value);
+            }
+
+            return rect;
+        }
+
+        private class DrawingGroupDrawingContext : IDrawingContextImpl
+        {
+            private readonly DrawingGroup _drawingGroup;
+            private readonly IPlatformRenderInterface _platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+
+            private Matrix _transform;
+
+            private bool _disposed;
+
+            // Root drawing created by this DrawingContext.
+            //
+            // If there is only a single child of the root DrawingGroup, _rootDrawing
+            // will reference the single child, and the root _currentDrawingGroup
+            // value will be null.  Otherwise, _rootDrawing will reference the
+            // root DrawingGroup, and be the same value as the root _currentDrawingGroup.
+            //
+            // Either way, _rootDrawing always references the root drawing.
+            protected Drawing? _rootDrawing;
+
+            // Current DrawingGroup that new children are added to
+            protected DrawingGroup? _currentDrawingGroup;
+
+            // Previous values of _currentDrawingGroup
+            private Stack<DrawingGroup?>? _previousDrawingGroupStack;
+
+            public DrawingGroupDrawingContext(DrawingGroup drawingGroup)
+            {
+                _drawingGroup = drawingGroup;
+            }
+
+            public Matrix Transform
+            {
+                get => _transform;
+                set
+                {
+                    _transform = value;
+                    PushTransform(new MatrixTransform(value));
+                }
+            }
+
+            public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
+            {
+                if ((brush == null) && (pen == null))
+                {
+                    return;
+                }
+
+                // Instantiate the geometry
+                var geometry = _platformRenderInterface.CreateEllipseGeometry(rect);
+
+                // Add Drawing to the Drawing graph
+                AddNewGeometryDrawing(brush, pen, new PlatformGeometry(geometry));
+            }
+
+            public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+            {
+                if (((brush == null) && (pen == null)) || (geometry == null))
+                {
+                    return;
+                }
+
+                AddNewGeometryDrawing(brush, pen, new PlatformGeometry(geometry));
+            }
+
+            public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+            {
+                if (foreground == null || glyphRun == null)
+                {
+                    return;
+                }
+
+                // Add a GlyphRunDrawing to the Drawing graph
+                GlyphRunDrawing glyphRunDrawing = new GlyphRunDrawing
+                {
+                    Foreground = foreground,
+                    GlyphRun = glyphRun,
+                };
+
+                // Add Drawing to the Drawing graph
+                AddDrawing(glyphRunDrawing);
+            }
+
+            public void DrawLine(IPen pen, Point p1, Point p2)
+            {
+                if (pen == null)
+                {
+                    return;
+                }
+
+                // Instantiate the geometry
+                var geometry = _platformRenderInterface.CreateLineGeometry(p1, p2);
+
+                // Add Drawing to the Drawing graph
+                AddNewGeometryDrawing(null, pen, new PlatformGeometry(geometry));
+            }
+
+            public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect, BoxShadows boxShadows = default)
+            {
+                if ((brush == null) && (pen == null))
+                {
+                    return;
+                }
+
+                // Instantiate the geometry
+                var geometry = _platformRenderInterface.CreateRectangleGeometry(rect.Rect);
+
+                // Add Drawing to the Drawing graph
+                AddNewGeometryDrawing(brush, pen, new PlatformGeometry(geometry));
+            }
+
+            public void Clear(Color color)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IDrawingContextLayerImpl CreateLayer(Size size)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Custom(ICustomDrawOperation custom)
+            {
+                throw new NotImplementedException();
+            }
+
+            public object? GetFeature(Type t) => null;
+
+            public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PopBitmapBlendMode()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PopClip()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PopGeometryClip()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PopOpacity()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PopOpacityMask()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PushClip(Rect clip)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PushClip(RoundedRect clip)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PushGeometryClip(IGeometryImpl clip)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PushOpacity(double opacity)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void PushOpacityMask(IBrush mask, Rect bounds)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Dispose()
+            {
+                // Dispose may be called multiple times without throwing
+                // an exception.
+                if (!_disposed)
+                {
+                    // Match any outstanding Push calls with a Pop
+                    if (_previousDrawingGroupStack != null)
+                    {
+                        int stackCount = _previousDrawingGroupStack.Count;
+                        for (int i = 0; i < stackCount; i++)
+                        {
+                            Pop();
+                        }
+                    }
+
+                    // Call CloseCore with the root DrawingGroup's children
+                    DrawingCollection rootChildren;
+
+                    if (_currentDrawingGroup != null)
+                    {
+                        // If we created a root DrawingGroup because multiple elements
+                        // exist at the root level, provide it's Children collection
+                        // directly.
+                        rootChildren = _currentDrawingGroup.Children;
+                    }
+                    else
+                    {
+                        // Create a new DrawingCollection if we didn't create a
+                        // root DrawingGroup because the root level only contained
+                        // a single child.
+                        //
+                        // This collection is needed by DrawingGroup.Open because
+                        // Open always replaces it's Children collection.  It isn't
+                        // strictly needed for Append, but always using a collection
+                        // simplifies the TransactionalAppend implementation (i.e.,
+                        // a seperate implemention isn't needed for a single element)
+                        rootChildren = new DrawingCollection();
+
+                        //
+                        // We may need to opt-out of inheritance through the new Freezable.
+                        // This is controlled by this.CanBeInheritanceContext.
+                        //
+                        if (_rootDrawing != null)
+                        {
+                            rootChildren.Add(_rootDrawing);
+                        }
+                    }
+
+                    // Inform our derived classes that Close was called
+                    _drawingGroup.Children = rootChildren;
+
+                    _disposed = true;
+                }
+            }
+
+            /// <summary>
+            /// Pop
+            /// </summary>
+            private void Pop()
+            {
+                // Verify that Pop hasn't been called too many times
+                if ((_previousDrawingGroupStack == null) || (_previousDrawingGroupStack.Count == 0))
+                {
+                    throw new InvalidOperationException("DrawingGroupStack count missmatch.");
+                }
+
+                // Restore the previous value of the current drawing group
+                _currentDrawingGroup = _previousDrawingGroupStack.Pop();
+            }
+
+            /// <summary>
+            ///     PushTransform -
+            ///     Push a Transform which will apply to all drawing operations until the corresponding
+            ///     Pop.
+            /// </summary>
+            /// <param name="transform"> The Transform to push. </param>
+            private void PushTransform(Transform transform)
+            {
+                // Instantiate a new drawing group and set it as the _currentDrawingGroup
+                var drawingGroup = PushNewDrawingGroup();
+
+                // Set the transform on the new DrawingGroup
+                drawingGroup.Transform = transform;
+            }
+
+            /// <summary>
+            /// Creates a new DrawingGroup for a Push* call by setting the
+            /// _currentDrawingGroup to a newly instantiated DrawingGroup,
+            /// and saving the previous _currentDrawingGroup value on the
+            /// _previousDrawingGroupStack.
+            /// </summary>
+            private DrawingGroup PushNewDrawingGroup()
+            {
+                // Instantiate a new drawing group
+                DrawingGroup drawingGroup = new DrawingGroup();
+
+                // Add it to the drawing graph, like any other Drawing
+                AddDrawing(drawingGroup);
+
+                // Lazily allocate the stack when it is needed because many uses
+                // of DrawingDrawingContext will have a depth of one.
+                if (null == _previousDrawingGroupStack)
+                {
+                    _previousDrawingGroupStack = new Stack<DrawingGroup?>(2);
+                }
+
+                // Save the previous _currentDrawingGroup value.
+                //
+                // If this is the first call, the value of _currentDrawingGroup
+                // will be null because AddDrawing doesn't create a _currentDrawingGroup
+                // for the first drawing.  Having null on the stack is valid, and simply
+                // denotes that this new DrawingGroup is the first child in the root
+                // DrawingGroup.  It is also possible for the first value on the stack
+                // to be non-null, which means that the root DrawingGroup has other
+                // children.
+                _previousDrawingGroupStack.Push(_currentDrawingGroup);
+
+                // Set this drawing group as the current one so that subsequent drawing's
+                // are added as it's children until Pop is called.
+                _currentDrawingGroup = drawingGroup;
+
+                return drawingGroup;
+            }
+
+            /// <summary>
+            /// Contains the functionality common to GeometryDrawing operations of
+            /// instantiating the GeometryDrawing, setting it's Freezable state,
+            /// and Adding it to the Drawing Graph.
+            /// </summary>
+            private void AddNewGeometryDrawing(IBrush? brush, IPen? pen, Geometry? geometry)
+            {
+                if (geometry == null)
+                {
+                    throw new ArgumentNullException(nameof(geometry));
+                }
+
+                // Instantiate the GeometryDrawing
+                GeometryDrawing geometryDrawing = new GeometryDrawing
+                {
+                    // We may need to opt-out of inheritance through the new Freezable.
+                    // This is controlled by this.CanBeInheritanceContext.
+                    Brush = brush,
+                    Pen = pen,
+                    Geometry = geometry
+                };
+
+                // Add it to the drawing graph
+                AddDrawing(geometryDrawing);
+            }
+
+            /// <summary>
+            /// Adds a new Drawing to the DrawingGraph.
+            ///
+            /// This method avoids creating a DrawingGroup for the common case
+            /// where only a single child exists in the root DrawingGroup.
+            /// </summary>
+            private void AddDrawing(Drawing newDrawing)
+            {
+                if (newDrawing == null)
+                {
+                    throw new ArgumentNullException(nameof(newDrawing));
+                }
+
+                if (_rootDrawing == null)
+                {
+                    // When a DrawingGroup is set, it should be made the root if
+                    // a root drawing didnt exist.
+                    Contract.Requires<NotSupportedException>(_currentDrawingGroup == null);
+
+                    // If this is the first Drawing being added, avoid creating a DrawingGroup
+                    // and set this drawing as the root drawing.  This optimizes the common
+                    // case where only a single child exists in the root DrawingGroup.
+                    _rootDrawing = newDrawing;
+                }
+                else if (_currentDrawingGroup == null)
+                {
+                    // When the second drawing is added at the root level, set a
+                    // DrawingGroup as the root and add both drawings to it.
+
+                    // Instantiate the DrawingGroup
+                    _currentDrawingGroup = new DrawingGroup();
+
+                    // Add both Children
+                    _currentDrawingGroup.Children.Add(_rootDrawing);
+                    _currentDrawingGroup.Children.Add(newDrawing);
+
+                    // Set the new DrawingGroup as the current
+                    _rootDrawing = _currentDrawingGroup;
+                }
+                else
+                {
+                    // If there already is a current drawing group, then simply add
+                    // the new drawing too it.
+                    _currentDrawingGroup.Children.Add(newDrawing);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/DrawingImage.cs b/src/Avalonia.Base/Media/DrawingImage.cs
new file mode 100644
index 0000000000..38ddbdfaed
--- /dev/null
+++ b/src/Avalonia.Base/Media/DrawingImage.cs
@@ -0,0 +1,88 @@
+using System;
+using Avalonia.Metadata;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// An <see cref="IImage"/> that uses a <see cref="Drawing"/> for content.
+    /// </summary>
+    public class DrawingImage : AvaloniaObject, IImage, IAffectsRender
+    {
+        public DrawingImage() 
+        { 
+        }
+
+        public DrawingImage(Drawing drawing)
+        {
+            Drawing = drawing;
+        }
+        /// <summary>
+        /// Defines the <see cref="Drawing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Drawing> DrawingProperty =
+            AvaloniaProperty.Register<DrawingImage, Drawing>(nameof(Drawing));
+
+        /// <inheritdoc/>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Gets or sets the drawing content.
+        /// </summary>
+        [Content]
+        public Drawing Drawing
+        {
+            get => GetValue(DrawingProperty);
+            set => SetValue(DrawingProperty, value);
+        }
+
+        /// <inheritdoc/>
+        public Size Size => Drawing?.GetBounds().Size ?? default;
+
+        /// <inheritdoc/>
+        void IImage.Draw(
+            DrawingContext context,
+            Rect sourceRect,
+            Rect destRect,
+            BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            var drawing = Drawing;
+
+            if (drawing == null)
+            {
+                return;
+            }
+
+            var bounds = drawing.GetBounds();
+            var scale = Matrix.CreateScale(
+                destRect.Width / sourceRect.Width,
+                destRect.Height / sourceRect.Height);
+            var translate = Matrix.CreateTranslation(
+                -sourceRect.X + destRect.X - bounds.X,
+                -sourceRect.Y + destRect.Y - bounds.Y);
+
+            using (context.PushClip(destRect))
+            using (context.PushPreTransform(translate * scale))
+            {
+                Drawing?.Draw(context);
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == DrawingProperty)
+            {
+                RaiseInvalidated(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/EllipseGeometry.cs b/src/Avalonia.Base/Media/EllipseGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/EllipseGeometry.cs
rename to src/Avalonia.Base/Media/EllipseGeometry.cs
diff --git a/src/Avalonia.Base/Media/ExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/ExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..0e485d0db8
--- /dev/null
+++ b/src/Avalonia.Base/Media/ExperimentalAcrylicMaterial.cs
@@ -0,0 +1,299 @@
+using System;
+
+namespace Avalonia.Media
+{
+    public class ExperimentalAcrylicMaterial : AvaloniaObject, IMutableExperimentalAcrylicMaterial
+    {
+        private Color _effectiveTintColor;
+        private Color _effectiveLuminosityColor;
+
+        static ExperimentalAcrylicMaterial()
+        {
+            AffectsRender<ExperimentalAcrylicMaterial>(
+                TintColorProperty,
+                BackgroundSourceProperty,
+                TintOpacityProperty,
+                MaterialOpacityProperty,
+                PlatformTransparencyCompensationLevelProperty);
+
+            TintColorProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+
+            TintOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+
+            MaterialOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+
+            PlatformTransparencyCompensationLevelProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+        }
+
+        /// <summary>
+        /// Defines the <see cref="TintColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> TintColorProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(TintColor));
+
+        /// <summary>
+        /// Defines the <see cref="BackgroundSource"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AcrylicBackgroundSource> BackgroundSourceProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, AcrylicBackgroundSource>(nameof(BackgroundSource));
+
+        /// <summary>
+        /// Defines the <see cref="TintOpacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> TintOpacityProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(TintOpacity), 0.8);
+
+        /// <summary>
+        /// Defines the <see cref="MaterialOpacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaterialOpacityProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(MaterialOpacity), 0.5);
+
+        /// <summary>
+        /// Defines the <see cref="PlatformTransparencyCompensationLevel"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> PlatformTransparencyCompensationLevelProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(PlatformTransparencyCompensationLevel), 0.0);
+
+        /// <summary>
+        /// Defines the <see cref="FallbackColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> FallbackColorProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(FallbackColor));
+
+        /// <inheritdoc/>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Gets or Sets the BackgroundSource <seealso cref="AcrylicBackgroundSource"/>.
+        /// </summary>
+        public AcrylicBackgroundSource BackgroundSource
+        {
+            get => GetValue(BackgroundSourceProperty);
+            set => SetValue(BackgroundSourceProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the TintColor.
+        /// </summary>
+        public Color TintColor
+        {
+            get => GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the Tint Opacity.
+        /// </summary>
+        public double TintOpacity
+        {
+            get => GetValue(TintOpacityProperty);
+            set => SetValue(TintOpacityProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the Fallback Color.
+        /// This is used on rendering plaforms that dont support acrylic.
+        /// </summary>
+        public Color FallbackColor
+        {
+            get => GetValue(FallbackColorProperty);
+            set => SetValue(FallbackColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the MaterialOpacity.
+        /// This makes the material more or less opaque.
+        /// </summary>
+        public double MaterialOpacity
+        {
+            get => GetValue(MaterialOpacityProperty);
+            set => SetValue(MaterialOpacityProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the PlatformTransparencyCompensationLevel.
+        /// This value defines the minimum <see cref="MaterialOpacity"/> that can be used.
+        /// It means material opacity is re-scaled from this value to 1.
+        /// </summary>
+        public double PlatformTransparencyCompensationLevel
+        {
+            get => GetValue(PlatformTransparencyCompensationLevelProperty);
+            set => SetValue(PlatformTransparencyCompensationLevelProperty, value);
+        }
+
+        Color IExperimentalAcrylicMaterial.MaterialColor => _effectiveLuminosityColor;
+
+        Color IExperimentalAcrylicMaterial.TintColor => _effectiveTintColor;
+
+        private static Color GetEffectiveTintColor(Color tintColor, double tintOpacity)
+        {
+            // Update tintColor's alpha with the combined opacity value
+            double tintOpacityModifier = GetTintOpacityModifier(tintColor);
+
+            return new Color((byte)(255 * ((255.0 / tintColor.A) * tintOpacity) * tintOpacityModifier), tintColor.R, tintColor.G, tintColor.B);
+        }
+
+        private static double GetTintOpacityModifier(Color tintColor)
+        {
+            // This method suppresses the maximum allowable tint opacity depending on the luminosity and saturation of a color by 
+            // compressing the range of allowable values - for example, a user-defined value of 100% will be mapped to 45% for pure 
+            // white (100% luminosity), 85% for pure black (0% luminosity), and 90% for pure gray (50% luminosity).  The intensity of 
+            // the effect increases linearly as luminosity deviates from 50%.  After this effect is calculated, we cancel it out
+            // linearly as saturation increases from zero.
+
+            const double midPoint = 0.5; // Mid point of HsvV range that these calculations are based on. This is here for easy tuning.
+
+            const double whiteMaxOpacity = 0.2; // 100% luminosity
+            const double midPointMaxOpacity = 0.45; // 50% luminosity
+            const double blackMaxOpacity = 0.45; // 0% luminosity
+
+            var hsv = tintColor.ToHsv();
+
+            double opacityModifier = midPointMaxOpacity;
+
+            if (hsv.V != midPoint)
+            {
+                // Determine maximum suppression amount
+                double lowestMaxOpacity = midPointMaxOpacity;
+                double maxDeviation = midPoint;
+
+                if (hsv.V > midPoint)
+                {
+                    lowestMaxOpacity = whiteMaxOpacity; // At white (100% hsvV)
+                    maxDeviation = 1 - maxDeviation;
+                }
+                else if (hsv.V < midPoint)
+                {
+                    lowestMaxOpacity = blackMaxOpacity; // At black (0% hsvV)
+                }
+
+                double maxOpacitySuppression = midPointMaxOpacity - lowestMaxOpacity;
+
+                // Determine normalized deviation from the midpoint
+                double deviation = Math.Abs(hsv.V - midPoint);
+                double normalizedDeviation = deviation / maxDeviation;
+
+                // If we have saturation, reduce opacity suppression to allow that color to come through more
+                if (hsv.S > 0)
+                {
+                    // Dampen opacity suppression based on how much saturation there is
+                    maxOpacitySuppression *= Math.Max(1 - (hsv.S * 2), 0.0);
+                }
+
+                double opacitySuppression = maxOpacitySuppression * normalizedDeviation;
+
+                opacityModifier = midPointMaxOpacity - opacitySuppression;
+            }
+
+            return opacityModifier;
+        }
+
+        private Color GetEffectiveLuminosityColor()
+        {
+            double? luminosityOpacity = MaterialOpacity;
+
+            return GetLuminosityColor(luminosityOpacity);
+        }
+
+        private static byte Trim(double value)
+        {
+            value = Math.Min(Math.Floor(value * 256), 255);
+
+            if (value < 0)
+            {
+                return 0;
+            }
+            else if (value > 255)
+            {
+                return 255;
+            }
+
+            return (byte)value;
+        }
+
+        private static float RGBMax(Color color)
+        {
+            if (color.R > color.G)
+                return (color.R > color.B) ? color.R : color.B;
+            else
+                return (color.G > color.B) ? color.G : color.B;
+        }
+
+        private static float RGBMin(Color color)
+        {
+            if (color.R < color.G)
+                return (color.R < color.B) ? color.R : color.B;
+            else
+                return (color.G < color.B) ? color.G : color.B;
+        }
+
+        // The tintColor passed into this method should be the original, unmodified color created using user values for TintColor + TintOpacity
+        private Color GetLuminosityColor(double? luminosityOpacity)
+        {
+            // Calculate the HSL lightness value of the color.
+            var max = (float)RGBMax(TintColor) / 255.0f;
+            var min = (float)RGBMin(TintColor) / 255.0f;
+
+            var lightness = (max + min) / 2.0;
+
+            lightness = 1 - ((1 - lightness) * (luminosityOpacity ?? 1));
+
+            lightness = 0.13 + (lightness * 0.74);
+
+            var luminosityColor = new Color(255, Trim(lightness), Trim(lightness), Trim(lightness));
+
+            var compensationMultiplier = 1 - PlatformTransparencyCompensationLevel;
+            return new Color((byte)(255 * Math.Max(Math.Min(PlatformTransparencyCompensationLevel + ((luminosityOpacity ?? 1) * compensationMultiplier), 1.0), 0.0)), luminosityColor.R, luminosityColor.G, luminosityColor.B);
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the brush's visual representation.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a brush's static constructor, any change to the
+        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : ExperimentalAcrylicMaterial
+        {
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(e => Invalidate(e));
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
+
+        public IExperimentalAcrylicMaterial ToImmutable()
+        {
+            return new ImmutableExperimentalAcrylicMaterial(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/FillRule.cs b/src/Avalonia.Base/Media/FillRule.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FillRule.cs
rename to src/Avalonia.Base/Media/FillRule.cs
diff --git a/src/Avalonia.Visuals/Media/FlowDirection.cs b/src/Avalonia.Base/Media/FlowDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FlowDirection.cs
rename to src/Avalonia.Base/Media/FlowDirection.cs
diff --git a/src/Avalonia.Visuals/Media/FontFallback.cs b/src/Avalonia.Base/Media/FontFallback.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontFallback.cs
rename to src/Avalonia.Base/Media/FontFallback.cs
diff --git a/src/Avalonia.Base/Media/FontFamily.cs b/src/Avalonia.Base/Media/FontFamily.cs
new file mode 100644
index 0000000000..da84861668
--- /dev/null
+++ b/src/Avalonia.Base/Media/FontFamily.cs
@@ -0,0 +1,230 @@
+using System;
+using Avalonia.Media.Fonts;
+
+namespace Avalonia.Media
+{
+    public sealed class FontFamily
+    {
+        public const string DefaultFontFamilyName = "$Default";
+
+        static FontFamily()
+        {
+            Default = new FontFamily(DefaultFontFamilyName);
+        }
+
+        /// <inheritdoc />
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:Avalonia.Media.FontFamily" /> class.
+        /// </summary>
+        /// <param name="name">The name of the <see cref="T:Avalonia.Media.FontFamily" />.</param>
+        public FontFamily(string name) : this(null, name)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:Avalonia.Media.FontFamily" /> class.
+        /// </summary>
+        /// <param name="baseUri">Specifies the base uri that is used to resolve font family assets.</param>
+        /// <param name="name">The name of the <see cref="T:Avalonia.Media.FontFamily" />.</param>
+        /// <exception cref="T:System.ArgumentException">Base uri must be an absolute uri.</exception>
+        public FontFamily(Uri? baseUri, string name)
+        {
+            if (string.IsNullOrEmpty(name))
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            var fontFamilySegment = GetFontFamilyIdentifier(name);
+
+            if (fontFamilySegment.Source != null)
+            {
+                if (baseUri != null && !baseUri.IsAbsoluteUri)
+                {
+                    throw new ArgumentException("Base uri must be an absolute uri.", nameof(baseUri));
+                }
+
+                Key = new FontFamilyKey(fontFamilySegment.Source, baseUri);
+            }
+
+            FamilyNames = new FamilyNameCollection(fontFamilySegment.Name);
+        }
+
+        /// <summary>
+        /// Represents the default font family
+        /// </summary>
+        public static FontFamily Default { get; }
+
+        /// <summary>
+        /// Gets the primary family name of the font family.
+        /// </summary>
+        /// <value>
+        /// The primary name of the font family.
+        /// </value>
+        public string Name => FamilyNames.PrimaryFamilyName;
+
+        /// <summary>
+        /// Gets the family names.
+        /// </summary>
+        /// <value>
+        /// The family familyNames.
+        /// </value>
+        public FamilyNameCollection FamilyNames { get; }
+
+        /// <summary>
+        /// Gets the key for associated assets.
+        /// </summary>
+        /// <value>
+        /// The family key.
+        /// </value>
+        /// <remarks>Key is only used for custom fonts.</remarks>
+        public FontFamilyKey? Key { get; }
+
+        /// <summary>
+        /// Returns <c>True</c> if this instance is the system's default.
+        /// </summary>
+        public bool IsDefault => Name.Equals(DefaultFontFamilyName);
+
+        /// <summary>
+        /// Implicit conversion of string to FontFamily
+        /// </summary>
+        /// <param name="s"></param>
+        public static implicit operator FontFamily(string s)
+        {
+            return new FontFamily(s);
+        }
+
+        private struct FontFamilyIdentifier
+        {
+            public FontFamilyIdentifier(string name, Uri? source)
+            {
+                Name = name;
+                Source = source;
+            }
+
+            public string Name { get; }
+
+            public Uri? Source { get; }
+        }
+
+        private static FontFamilyIdentifier GetFontFamilyIdentifier(string name)
+        {
+            var segments = name.Split('#');
+
+            switch (segments.Length)
+            {
+                case 1:
+                    {
+                        return new FontFamilyIdentifier(segments[0], null);
+                    }
+
+                case 2:
+                    {
+                        var source = segments[0].StartsWith("/")
+                            ? new Uri(segments[0], UriKind.Relative)
+                            : new Uri(segments[0], UriKind.RelativeOrAbsolute);
+
+                        return new FontFamilyIdentifier(segments[1], source);
+                    }
+
+                default:
+                    {
+                        return new FontFamilyIdentifier(name, null);
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Parses a <see cref="T:Avalonia.Media.FontFamily"/> string.
+        /// </summary>
+        /// <param name="s">The <see cref="T:Avalonia.Media.FontFamily"/> string.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException">
+        /// Specified family is not supported.
+        /// </exception>
+        public static FontFamily Parse(string s) => Parse(s, null);
+
+        /// <summary>
+        /// Parses a <see cref="T:Avalonia.Media.FontFamily"/> string.
+        /// </summary>
+        /// <param name="s">The <see cref="T:Avalonia.Media.FontFamily"/> string.</param>
+        /// <param name="baseUri">Specifies the base uri that is used to resolve font family assets.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException">
+        /// Specified family is not supported.
+        /// </exception>
+        public static FontFamily Parse(string s, Uri? baseUri)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                throw new ArgumentException("Specified family is not supported.", nameof(s));
+            }
+
+            return new FontFamily(baseUri, s);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="string" /> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string" /> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            if (Key != null)
+            {
+                return Key + "#" + FamilyNames;
+            }
+
+            return FamilyNames.ToString();
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// </returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((FamilyNames != null ? FamilyNames.GetHashCode() : 0) * 397) ^ (Key != null ? Key.GetHashCode() : 0);
+            }
+        }
+
+        public static bool operator !=(FontFamily? a, FontFamily? b)
+        {
+            return !(a == b);
+        }
+
+        public static bool operator ==(FontFamily? a, FontFamily? b)
+        {
+            if (ReferenceEquals(a, b))
+            {
+                return true;
+            }
+
+            return !(a is null) && a.Equals(b);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+
+            if (!(obj is FontFamily other))
+            {
+                return false;
+            }
+
+            if (!Equals(Key, other.Key))
+            {
+                return false;
+            }
+
+            return other.FamilyNames.Equals(FamilyNames);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/FontManager.cs b/src/Avalonia.Base/Media/FontManager.cs
new file mode 100644
index 0000000000..d92d003c2a
--- /dev/null
+++ b/src/Avalonia.Base/Media/FontManager.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Media.Fonts;
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    ///     The font manager is used to query the system's installed fonts and is responsible for caching loaded fonts.
+    ///     It is also responsible for the font fallback.
+    /// </summary>
+    public sealed class FontManager
+    {
+        private readonly ConcurrentDictionary<Typeface, IGlyphTypeface> _glyphTypefaceCache =
+            new ConcurrentDictionary<Typeface, IGlyphTypeface>();
+        private readonly FontFamily _defaultFontFamily;
+        private readonly IReadOnlyList<FontFallback>? _fontFallbacks;
+
+        public FontManager(IFontManagerImpl platformImpl)
+        {
+            PlatformImpl = platformImpl;
+
+            var options = AvaloniaLocator.Current.GetService<FontManagerOptions>();
+
+            _fontFallbacks = options?.FontFallbacks;
+
+            DefaultFontFamilyName = options?.DefaultFamilyName ?? PlatformImpl.GetDefaultFontFamilyName();
+
+            if (string.IsNullOrEmpty(DefaultFontFamilyName))
+            {
+                throw new InvalidOperationException("Default font family name can't be null or empty.");
+            }
+
+            _defaultFontFamily = new FontFamily(DefaultFontFamilyName);
+        }
+
+        public static FontManager Current
+        {
+            get
+            {
+                var current = AvaloniaLocator.Current.GetService<FontManager>();
+
+                if (current != null)
+                {
+                    return current;
+                }
+
+                var fontManagerImpl = AvaloniaLocator.Current.GetService<IFontManagerImpl>();
+
+                if (fontManagerImpl == null)
+                    throw new InvalidOperationException("No font manager implementation was registered.");
+
+                current = new FontManager(fontManagerImpl);
+
+                AvaloniaLocator.CurrentMutable.Bind<FontManager>().ToConstant(current);
+
+                return current;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public IFontManagerImpl PlatformImpl { get; }
+
+        /// <summary>
+        ///     Gets the system's default font family's name.
+        /// </summary>
+        public string DefaultFontFamilyName
+        {
+            get;
+        }
+
+        /// <summary>
+        ///     Get all installed font family names.
+        /// </summary>
+        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
+        public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false) =>
+            PlatformImpl.GetInstalledFontFamilyNames(checkForUpdates);
+
+        /// <summary>
+        ///     Returns a new <see cref="IGlyphTypeface"/>, or an existing one if a matching <see cref="IGlyphTypeface"/> exists.
+        /// </summary>
+        /// <param name="typeface">The typeface.</param>
+        /// <returns>
+        ///     The <see cref="IGlyphTypeface"/>.
+        /// </returns>
+        public IGlyphTypeface GetOrAddGlyphTypeface(Typeface typeface)
+        {
+            while (true)
+            {
+                if (_glyphTypefaceCache.TryGetValue(typeface, out var glyphTypeface))
+                {
+                    return glyphTypeface;
+                }
+
+                glyphTypeface = PlatformImpl.CreateGlyphTypeface(typeface);
+
+                if (_glyphTypefaceCache.TryAdd(typeface, glyphTypeface))
+                {
+                    return glyphTypeface;
+                }
+
+                if (typeface.FontFamily == _defaultFontFamily)
+                {
+                   throw new InvalidOperationException($"Could not create glyph typeface for: {typeface.FontFamily.Name}.");
+                }
+
+                typeface = new Typeface(_defaultFontFamily, typeface.Style, typeface.Weight);
+            }
+        }
+
+        /// <summary>
+        ///     Tries to match a specified character to a <see cref="Typeface"/> that supports specified font properties.
+        /// </summary>
+        /// <param name="codepoint">The codepoint to match against.</param>
+        /// <param name="fontStyle">The font style.</param>
+        /// <param name="fontWeight">The font weight.</param>
+        /// <param name="fontStretch">The font stretch.</param>
+        /// <param name="fontFamily">The font family. This is optional and used for fallback lookup.</param>
+        /// <param name="culture">The culture.</param>
+        /// <param name="typeface">The matching <see cref="Typeface"/>.</param>
+        /// <returns>
+        ///     <c>True</c>, if the <see cref="FontManager"/> could match the character to specified parameters, <c>False</c> otherwise.
+        /// </returns>
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight,
+            FontStretch fontStretch,
+            FontFamily? fontFamily, CultureInfo? culture, out Typeface typeface)
+        {
+            if(_fontFallbacks != null)
+            {
+                foreach (var fallback in _fontFallbacks)
+                {
+                    typeface = new Typeface(fallback.FontFamily, fontStyle, fontWeight, fontStretch);
+
+                    var glyphTypeface = typeface.GlyphTypeface;
+
+                    if(glyphTypeface.TryGetGlyph((uint)codepoint, out _)){
+                        return true;
+                    }
+                }
+            }
+
+            return PlatformImpl.TryMatchCharacter(codepoint, fontStyle, fontWeight, fontStretch, fontFamily, culture, out typeface);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/FontManagerOptions.cs b/src/Avalonia.Base/Media/FontManagerOptions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontManagerOptions.cs
rename to src/Avalonia.Base/Media/FontManagerOptions.cs
diff --git a/src/Avalonia.Base/Media/FontMetrics.cs b/src/Avalonia.Base/Media/FontMetrics.cs
new file mode 100644
index 0000000000..1cd01675db
--- /dev/null
+++ b/src/Avalonia.Base/Media/FontMetrics.cs
@@ -0,0 +1,58 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// The font metrics is holding information about a font's ascent, descent, etc. in design em units.
+    /// </summary>
+    public readonly struct FontMetrics
+    {
+        /// <summary>
+        ///     Gets the font design units per em.
+        /// </summary>
+        public short DesignEmHeight { get; init; }
+
+        /// <summary>
+        ///     A <see cref="bool"/> value indicating whether all glyphs in the font have the same advancement. 
+        /// </summary>
+        public bool IsFixedPitch { get; init; }
+
+        /// <summary>
+        ///     Gets the recommended distance above the baseline in design em size. 
+        /// </summary>
+        public int Ascent { get; init; }
+
+        /// <summary>
+        ///     Gets the recommended distance under the baseline in design em size. 
+        /// </summary>
+        public int Descent { get; init; }
+
+        /// <summary>
+        ///      Gets the recommended additional space between two lines of text in design em size. 
+        /// </summary>
+        public int LineGap { get; init; }
+
+        /// <summary>
+        ///     Gets the recommended line spacing of a formed text line.
+        /// </summary>
+        public int LineSpacing => Descent - Ascent + LineGap;
+
+        /// <summary>
+        ///     Gets a value that indicates the distance of the underline from the baseline in design em size.
+        /// </summary>
+        public int UnderlinePosition { get; init; }
+
+        /// <summary>
+        ///     Gets a value that indicates the thickness of the underline in design em size.
+        /// </summary>
+        public int UnderlineThickness { get; init; }
+
+        /// <summary>
+        ///     Gets a value that indicates the distance of the strikethrough from the baseline in design em size.
+        /// </summary>
+        public int StrikethroughPosition { get; init; }
+
+        /// <summary>
+        ///     Gets a value that indicates the thickness of the underline in design em size.
+        /// </summary>
+        public int StrikethroughThickness { get; init; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/FontSimulations.cs b/src/Avalonia.Base/Media/FontSimulations.cs
new file mode 100644
index 0000000000..2faf53f1d8
--- /dev/null
+++ b/src/Avalonia.Base/Media/FontSimulations.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    ///     Specifies algorithmic style simulations to be applied to the typeface.
+    ///     Bold and oblique simulations can be combined via bitwise OR operation.
+    /// </summary>
+    [Flags]
+    public enum FontSimulations : byte
+    {
+        /// <summary>
+        /// No simulations are performed.
+        /// </summary>
+        None = 0x0000,
+
+        /// <summary>
+        /// Algorithmic emboldening is performed.
+        /// </summary>
+        Bold = 0x0001,
+
+        /// <summary>
+        /// Algorithmic italicization is performed.
+        /// </summary>
+        Oblique = 0x0002
+    }
+}
diff --git a/src/Avalonia.Base/Media/FontStretch.cs b/src/Avalonia.Base/Media/FontStretch.cs
new file mode 100644
index 0000000000..b110475215
--- /dev/null
+++ b/src/Avalonia.Base/Media/FontStretch.cs
@@ -0,0 +1,19 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// FontStretch describes relative change from the normal aspect ratio
+    /// as specified by a font designer for the glyphs in a font.
+    /// </summary>
+    public enum FontStretch
+    {
+        Normal = 5, 
+        UltraCondensed = 1, 
+        ExtraCondensed = 2, 
+        Condensed = 3, 
+        SemiCondensed = 4,
+        SemiExpanded = 6, 
+        Expanded = 7, 
+        ExtraExpanded = 8,
+        UltraExpanded = 9
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/FontStyle.cs b/src/Avalonia.Base/Media/FontStyle.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontStyle.cs
rename to src/Avalonia.Base/Media/FontStyle.cs
diff --git a/src/Avalonia.Visuals/Media/FontWeight.cs b/src/Avalonia.Base/Media/FontWeight.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontWeight.cs
rename to src/Avalonia.Base/Media/FontWeight.cs
diff --git a/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs b/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
new file mode 100644
index 0000000000..eb42f6443b
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Fonts
+{
+    public sealed class FamilyNameCollection : IReadOnlyList<string>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FamilyNameCollection"/> class.
+        /// </summary>
+        /// <param name="familyNames">The family names.</param>
+        /// <exception cref="ArgumentException">familyNames</exception>
+        public FamilyNameCollection(string familyNames)
+        {
+            if (familyNames == null)
+            {
+                throw new ArgumentNullException(nameof(familyNames));
+            }
+
+            Names = Array.ConvertAll(familyNames.Split(','), p => p.Trim());
+
+            PrimaryFamilyName = Names[0];
+
+            HasFallbacks = Names.Count > 1;
+        }
+
+        /// <summary>
+        /// Gets the primary family name.
+        /// </summary>
+        /// <value>
+        /// The primary family name.
+        /// </value>
+        public string PrimaryFamilyName { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether fallbacks are defined.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if fallbacks are defined; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasFallbacks { get; }
+
+        /// <summary>
+        /// Gets the internal collection of names.
+        /// </summary>
+        /// <value>
+        /// The names.
+        /// </value>
+        internal IReadOnlyList<string> Names { get; }
+
+        /// <summary>
+        /// Returns an enumerator for the name collection.
+        /// </summary>
+        public ImmutableReadOnlyListStructEnumerator<string> GetEnumerator()
+        {
+            return new ImmutableReadOnlyListStructEnumerator<string>(this);
+        }
+
+        IEnumerator<string> IEnumerable<string>.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <summary>
+        /// Returns a <see cref="string" /> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="string" /> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            var builder = StringBuilderCache.Acquire();
+
+            for (var index = 0; index < Names.Count; index++)
+            {
+                builder.Append(Names[index]);
+
+                if (index == Names.Count - 1)
+                {
+                    break;
+                }
+
+                builder.Append(", ");
+            }
+
+            return StringBuilderCache.GetStringAndRelease(builder);
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// </returns>
+        public override int GetHashCode()
+        {
+            if (Count == 0)
+            {
+                return 0;
+            }
+
+            unchecked
+            {
+                int hash = 17;
+
+                for (var i = 0; i < Names.Count; i++)
+                {
+                    string name = Names[i];
+
+                    hash = hash * 23 + name.GetHashCode();
+                }
+
+                return hash;
+            }
+        }
+
+        public static bool operator !=(FamilyNameCollection? a, FamilyNameCollection? b)
+        {
+            return !(a == b);
+        }
+
+        public static bool operator ==(FamilyNameCollection? a, FamilyNameCollection? b)
+        {
+            if (ReferenceEquals(a, b))
+            {
+                return true;
+            }
+
+            return !(a is null) && a.Equals(b);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="object" />, is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="object" /> to compare with this instance.</param>
+        /// <returns>
+        ///   <c>true</c> if the specified <see cref="object" /> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object? obj)
+        {
+            if (!(obj is FamilyNameCollection other))
+            {
+                return false;
+            }
+
+            if (other.Count != Count)
+            {
+                return false;
+            }
+
+            for (int i = 0; i < Count; i++)
+            {
+                if (Names[i] != other.Names[i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public int Count => Names.Count;
+
+        public string this[int index] => Names[index];
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs b/src/Avalonia.Base/Media/Fonts/FontFamilyKey.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
rename to src/Avalonia.Base/Media/Fonts/FontFamilyKey.cs
diff --git a/src/Avalonia.Base/Media/Fonts/FontFamilyLoader.cs b/src/Avalonia.Base/Media/Fonts/FontFamilyLoader.cs
new file mode 100644
index 0000000000..365fb6e412
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/FontFamilyLoader.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Fonts
+{
+    public static class FontFamilyLoader
+    {
+        /// <summary>
+        /// Loads all font assets that belong to the specified <see cref="FontFamilyKey"/>
+        /// </summary>
+        /// <param name="fontFamilyKey"></param>
+        /// <returns></returns>
+        public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey) =>
+            IsFontTtfOrOtf(fontFamilyKey.Source) ?
+                GetFontAssetsByExpression(fontFamilyKey) :
+                GetFontAssetsBySource(fontFamilyKey);
+
+        /// <summary>
+        /// Searches for font assets at a given location and returns a quantity of found assets
+        /// </summary>
+        /// <param name="fontFamilyKey"></param>
+        /// <returns></returns>
+        private static IEnumerable<Uri> GetFontAssetsBySource(FontFamilyKey fontFamilyKey)
+        {
+            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
+            var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
+            return availableAssets.Where(x => IsFontTtfOrOtf(x));
+        }
+
+        /// <summary>
+        /// Searches for font assets at a given location and only accepts assets that fit to a given filename expression.
+        /// <para>File names can target multiple files with * wildcard. For example "FontFile*.ttf"</para>
+        /// </summary>
+        /// <param name="fontFamilyKey"></param>
+        /// <returns></returns>
+        private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
+        {
+            var (fileNameWithoutExtension, extension) = GetFileName(fontFamilyKey, out var location);
+            var filePattern = CreateFilePattern(fontFamilyKey, location, fileNameWithoutExtension);
+
+            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
+            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
+
+            return availableResources.Where(x => IsContainsFile(x, filePattern, extension));
+        }
+
+        private static (string fileNameWithoutExtension, string extension) GetFileName(
+            FontFamilyKey fontFamilyKey, out Uri location)
+        {
+            if (fontFamilyKey.Source.IsAbsoluteResm())
+            {
+                var fileName = GetFileNameAndExtension(fontFamilyKey.Source.GetUnescapeAbsolutePath(), '.');
+
+                var uriLocation = fontFamilyKey.Source.GetUnescapeAbsoluteUri()
+                    .Replace("." + fileName.fileNameWithoutExtension + fileName.extension, string.Empty);
+                location = new Uri(uriLocation, UriKind.RelativeOrAbsolute);
+
+                return fileName;
+            }
+
+            var filename = GetFileNameAndExtension(fontFamilyKey.Source.OriginalString);
+            var fullFilename = filename.fileNameWithoutExtension + filename.extension;
+
+            if (fontFamilyKey.BaseUri != null)
+            {
+                var relativePath = fontFamilyKey.Source.OriginalString
+                    .Replace(fullFilename, string.Empty);
+
+                location = new Uri(fontFamilyKey.BaseUri, relativePath);
+            }
+            else
+            {
+                var uriString = fontFamilyKey.Source
+                    .GetUnescapeAbsoluteUri()
+                    .Replace(fullFilename, string.Empty);
+                location = new Uri(uriString);
+            }
+
+            return filename;
+        }
+
+        private static string CreateFilePattern(
+            FontFamilyKey fontFamilyKey, Uri location, string fileNameWithoutExtension)
+        {
+            var path = location.GetUnescapeAbsolutePath();
+            var file = GetSubString(fileNameWithoutExtension, '*');
+            return fontFamilyKey.Source.IsAbsoluteResm()
+                ? path + "." + file
+                : path + file;
+        }
+
+        private static bool IsContainsFile(Uri x, string filePattern, string fileExtension)
+        {
+            var path = x.GetUnescapeAbsolutePath();
+            return path.IndexOf(filePattern, StringComparison.Ordinal) >= 0
+                   && path.EndsWith(fileExtension, StringComparison.Ordinal);
+        }
+
+        private static bool IsFontTtfOrOtf(Uri uri)
+        {
+            var sourceWithoutArguments = GetSubString(uri.OriginalString, '?');
+            return sourceWithoutArguments.EndsWith(".ttf", StringComparison.Ordinal)
+                   || sourceWithoutArguments.EndsWith(".otf", StringComparison.Ordinal);
+        }
+
+        private static (string fileNameWithoutExtension, string extension) GetFileNameAndExtension(
+            string path, char directorySeparator = '/')
+        {
+            var pathAsSpan = path.AsSpan();
+            pathAsSpan = IsPathRooted(pathAsSpan, directorySeparator) ?
+                pathAsSpan.Slice(1, path.Length - 1) :
+                pathAsSpan;
+
+            var extension = GetFileExtension(pathAsSpan);
+            if (extension.Length == pathAsSpan.Length)
+                return (extension.ToString(), string.Empty);
+
+            var fileName = GetFileName(pathAsSpan, directorySeparator, extension.Length);
+            return (fileName.ToString(), extension.ToString());
+        }
+
+        private static bool IsPathRooted(ReadOnlySpan<char> path, char directorySeparator) =>
+            path.Length > 0 && path[0] == directorySeparator;
+
+        private static ReadOnlySpan<char> GetFileExtension(ReadOnlySpan<char> path)
+        {
+            for (var i = path.Length - 1; i > 0; --i)
+            {
+                if (path[i] == '.')
+                    return path.Slice(i, path.Length - i);
+            }
+
+            return path;
+        }
+
+        private static ReadOnlySpan<char> GetFileName(ReadOnlySpan<char> path, char directorySeparator, int extensionLength)
+        {
+            for (var i = path.Length - extensionLength - 1; i >= 0; --i)
+            {
+                if (path[i] == directorySeparator)
+                    return path.Slice(i + 1, path.Length - i - extensionLength - 1);
+            }
+
+            return path.Slice(0, path.Length - extensionLength);
+        }
+
+        private static string GetSubString(string path, char separator)
+        {
+            for (var i = 0; i < path.Length; i++)
+            {
+                if (path[i] == separator)
+                    return path.Substring(0, i);
+            }
+
+            return path;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/FormattedText.cs b/src/Avalonia.Base/Media/FormattedText.cs
new file mode 100644
index 0000000000..90b9755493
--- /dev/null
+++ b/src/Avalonia.Base/Media/FormattedText.cs
@@ -0,0 +1,1626 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using Avalonia.Controls;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// The FormattedText class is targeted at programmers needing to add some simple text to a MIL visual.
+    /// </summary>
+    public class FormattedText
+    {
+        public const double DefaultRealToIdeal = 28800.0 / 96;
+        public const double DefaultIdealToReal = 1 / DefaultRealToIdeal;
+        public const int IdealInfiniteWidth = 0x3FFFFFFE;
+        public const double RealInfiniteWidth = IdealInfiniteWidth * DefaultIdealToReal;
+
+        public const double GreatestMultiplierOfEm = 100;
+
+        private const double MaxFontEmSize = RealInfiniteWidth / GreatestMultiplierOfEm;
+
+        // properties and format runs
+        private ReadOnlySlice<char> _text;
+        private readonly SpanVector _formatRuns = new SpanVector(null);
+        private SpanPosition _latestPosition;
+
+        private GenericTextParagraphProperties _defaultParaProps;
+
+        private double _maxTextWidth = double.PositiveInfinity;
+        private double[]? _maxTextWidths;
+        private double _maxTextHeight = double.PositiveInfinity;
+        private int _maxLineCount = int.MaxValue;
+        private TextTrimming _trimming = TextTrimming.WordEllipsis;
+
+        // text source callbacks
+        private TextSourceImplementation? _textSourceImpl;
+
+        // cached metrics
+        private CachedMetrics? _metrics;
+
+        /// <summary>
+        /// Construct a FormattedText object.
+        /// </summary>
+        /// <param name="textToFormat">String of text to be displayed.</param>
+        /// <param name="culture">Culture of text.</param>
+        /// <param name="flowDirection">Flow direction of text.</param>
+        /// <param name="typeface">Type face used to display text.</param>
+        /// <param name="emSize">Font em size in visual units (1/96 of an inch).</param>
+        /// <param name="foreground">Foreground brush used to render text.</param>
+        public FormattedText(
+            string textToFormat,
+            CultureInfo culture,
+            FlowDirection flowDirection,
+            Typeface typeface,
+            double emSize,
+            IBrush? foreground)
+        {
+            if (culture is null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            ValidateFlowDirection(flowDirection, nameof(flowDirection));
+
+            ValidateFontSize(emSize);
+
+            _text = textToFormat != null ?
+                new ReadOnlySlice<char>(textToFormat.AsMemory()) :
+                throw new ArgumentNullException(nameof(textToFormat));
+
+            var runProps = new GenericTextRunProperties(
+                typeface,
+                emSize,
+                null, // decorations
+                foreground,
+                null, // highlight background
+                BaselineAlignment.Baseline,
+                culture
+            );
+
+            _latestPosition = _formatRuns.SetValue(0, _text.Length, runProps, _latestPosition);
+
+            _defaultParaProps = new GenericTextParagraphProperties(
+                flowDirection,
+                TextAlignment.Left,
+                false,
+                false,
+                runProps,
+                TextWrapping.WrapWithOverflow,
+                0, // line height not specified
+                0, // indentation not specified
+                0
+            );
+
+            InvalidateMetrics();
+        }
+
+        private static void ValidateFontSize(double emSize)
+        {
+            if (emSize <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be greater than zero.");
+            }
+
+            if (emSize > MaxFontEmSize)
+            {
+                throw new ArgumentOutOfRangeException(nameof(emSize), $"The parameter value cannot be greater than '{MaxFontEmSize}'");
+            }
+
+            if (double.IsNaN(emSize))
+            {
+                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be a number.");
+            }
+        }
+
+        private static void ValidateFlowDirection(FlowDirection flowDirection, string parameterName)
+        {
+            if ((int)flowDirection < 0 || (int)flowDirection > (int)FlowDirection.RightToLeft)
+            {
+                throw new InvalidEnumArgumentException(parameterName, (int)flowDirection, typeof(FlowDirection));
+            }
+        }
+
+        private int ValidateRange(int startIndex, int count)
+        {
+            if (startIndex < 0 || startIndex > _text.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(startIndex));
+            }
+
+            var limit = startIndex + count;
+
+            if (count < 0 || limit < startIndex || limit > _text.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            return limit;
+        }
+
+        private void InvalidateMetrics()
+        {
+            _metrics = null;
+        }
+
+        /// <summary>
+        /// Sets foreground brush used for drawing text
+        /// </summary>
+        /// <param name="foregroundBrush">Foreground brush</param>
+        public void SetForegroundBrush(IBrush foregroundBrush)
+        {
+            SetForegroundBrush(foregroundBrush, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets foreground brush used for drawing text
+        /// </summary>
+        /// <param name="foregroundBrush">Foreground brush</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetForegroundBrush(IBrush? foregroundBrush, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.ForegroundBrush == foregroundBrush)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    foregroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                );
+
+#pragma warning restore 6506
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family name</param>
+        public void SetFontFamily(string fontFamily)
+        {
+            SetFontFamily(fontFamily, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family name</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontFamily(string fontFamily, int startIndex, int count)
+        {
+            if (fontFamily == null)
+            {
+                throw new ArgumentNullException(nameof(fontFamily));
+            }
+
+            SetFontFamily(new FontFamily(fontFamily), startIndex, count);
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family</param>
+        public void SetFontFamily(FontFamily fontFamily)
+        {
+            SetFontFamily(fontFamily, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontFamily(FontFamily fontFamily, int startIndex, int count)
+        {
+            if (fontFamily == null)
+            {
+                throw new ArgumentNullException(nameof(fontFamily));
+            }
+
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                var oldTypeface = runProps.Typeface;
+
+                if (fontFamily.Equals(oldTypeface.FontFamily))
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    new Typeface(fontFamily, oldTypeface.Style, oldTypeface.Weight),
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+
+#pragma warning restore 6506
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+
+        /// <summary>
+        /// Sets or changes the font em size measured in MIL units
+        /// </summary>
+        /// <param name="emSize">Font em size</param>
+        public void SetFontSize(double emSize)
+        {
+            SetFontSize(emSize, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font em size measured in MIL units
+        /// </summary>
+        /// <param name="emSize">Font em size</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontSize(double emSize, int startIndex, int count)
+        {
+            ValidateFontSize(emSize);
+
+            var limit = ValidateRange(startIndex, count);
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.FontRenderingEmSize == emSize)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    emSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                );
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+#pragma warning restore 6506
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the culture for the text object.
+        /// </summary>
+        /// <param name="culture">The new culture for the text object.</param>
+        public void SetCulture(CultureInfo culture)
+        {
+            SetCulture(culture, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the culture for the text object.
+        /// </summary>
+        /// <param name="culture">The new culture for the text object.</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetCulture(CultureInfo culture, int startIndex, int count)
+        {
+            if (culture is null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.CultureInfo == culture)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    culture
+                );
+
+#pragma warning restore 6506
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the font weight
+        /// </summary>
+        /// <param name="weight">Font weight</param>
+        public void SetFontWeight(FontWeight weight)
+        {
+            SetFontWeight(weight, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font weight
+        /// </summary>
+        /// <param name="weight">Font weight</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontWeight(FontWeight weight, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                var oldTypeface = runProps.Typeface;
+
+                if (oldTypeface.Weight == weight)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    new Typeface(oldTypeface.FontFamily, oldTypeface.Style, weight),
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506 
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the font style
+        /// </summary>
+        /// <param name="style">Font style</param>
+        public void SetFontStyle(FontStyle style)
+        {
+            SetFontStyle(style, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font style
+        /// </summary>
+        /// <param name="style">Font style</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontStyle(FontStyle style, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                var oldTypeface = runProps.Typeface;
+
+                if (oldTypeface.Style == style)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    new Typeface(oldTypeface.FontFamily, style, oldTypeface.Weight),
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics(); // invalidate cached metrics
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the type face
+        /// </summary>
+        /// <param name="typeface">Typeface</param>
+        public void SetFontTypeface(Typeface typeface)
+        {
+            SetFontTypeface(typeface, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the type face
+        /// </summary>
+        /// <param name="typeface">Typeface</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontTypeface(Typeface typeface, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.Typeface == typeface)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    typeface,
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the text decorations
+        /// </summary>
+        /// <param name="textDecorations">Text decorations</param>
+        public void SetTextDecorations(TextDecorationCollection textDecorations)
+        {
+            SetTextDecorations(textDecorations, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the text decorations
+        /// </summary>
+        /// <param name="textDecorations">Text decorations</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetTextDecorations(TextDecorationCollection textDecorations, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.TextDecorations == textDecorations)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    runProps.FontRenderingEmSize,
+                    textDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+            }
+        }
+
+        /// Note: enumeration is temporarily made private
+        /// because of PS #828532
+        /// 
+        /// <summary>
+        /// Strongly typed enumerator used for enumerating text lines
+        /// </summary>
+        private struct LineEnumerator : IEnumerator, IDisposable
+        {
+            private int _lineCount;
+            private double _totalHeight;
+            private TextLine? _nextLine;
+            private readonly TextFormatter _formatter;
+            private readonly FormattedText _that;
+            private readonly ITextSource _textSource;
+
+            // these are needed because _currentLine can be disposed before the next MoveNext() call
+            private double _previousHeight;
+
+            // line break before _currentLine, needed in case we have to reformat it with collapsing symbol
+            private TextLineBreak? _previousLineBreak;
+            private int _position;
+            private int _length;
+
+            internal LineEnumerator(FormattedText text)
+            {
+                _previousHeight = 0;
+                _length = 0;
+                _previousLineBreak = null;
+
+                _position = 0;
+                _lineCount = 0;
+                _totalHeight = 0;
+                Current = null;
+                _nextLine = null;
+                _formatter = TextFormatter.Current;
+                _that = text;
+                _textSource = _that._textSourceImpl ??= new TextSourceImplementation(_that);
+            }
+
+            public void Dispose()
+            {
+                Current = null;
+
+                _nextLine = null;
+            }
+
+            public int Position 
+            { 
+                get => _position; 
+                private set => _position = value;
+            }
+
+            public int Length 
+            { 
+                get => _length; 
+                private set => _length = value; 
+            }
+
+            /// <summary>
+            /// Gets the current text line in the collection
+            /// </summary>
+            public TextLine? Current { get; private set; }
+
+            /// <summary>
+            /// Gets the current text line in the collection
+            /// </summary>
+            object? IEnumerator.Current => Current;
+
+            /// <summary>
+            /// Gets the paragraph width used to format the current text line
+            /// </summary>
+            internal double CurrentParagraphWidth
+            {
+                get
+                {
+                    return MaxLineLength(_lineCount);
+                }
+            }
+
+            private double MaxLineLength(int line)
+            {
+                if (_that._maxTextWidths == null)
+                    return _that._maxTextWidth;
+                return _that._maxTextWidths[Math.Min(line, _that._maxTextWidths.Length - 1)];
+            }
+
+            /// <summary>
+            /// Advances the enumerator to the next text line of the collection
+            /// </summary>
+            /// <returns>true if the enumerator was successfully advanced to the next element;
+            /// false if the enumerator has passed the end of the collection</returns>
+            public bool MoveNext()
+            {
+                if (Current == null)
+                {   // this is the first line
+                    if (_that._text.Length == 0)
+                    {
+                        return false;
+                    }
+
+                    Current = FormatLine(
+                        _textSource,
+                        Position,
+                        MaxLineLength(_lineCount),
+                        _that._defaultParaProps!,
+                        null // no previous line break
+                        );
+
+                    // check if this line fits the text height
+                    if (_totalHeight + Current.Height > _that._maxTextHeight)
+                    {
+                        Current = null;
+
+                        return false;
+                    }
+                    Debug.Assert(_nextLine == null);
+                }
+                else
+                {
+                    // there is no next line or it didn't fit
+                    // either way we're finished
+                    if (_nextLine == null)
+                    {
+                        return false;
+                    }
+
+                    _totalHeight += _previousHeight;
+                    Position += Length;
+                    ++_lineCount;
+
+                    Current = _nextLine;
+                    _nextLine = null;
+                }
+
+                var currentLineBreak = Current.TextLineBreak;
+
+                // this line is guaranteed to fit the text height
+                Debug.Assert(_totalHeight + Current.Height <= _that._maxTextHeight);
+
+                // now, check if the next line fits, we need to do this on this iteration
+                // because we might need to add ellipsis to the current line
+                // as a result of the next line measurement
+
+                // maybe there is no next line at all
+                if (Position + Current.Length < _that._text.Length)
+                {
+                    bool nextLineFits;
+
+                    if (_lineCount + 1 >= _that._maxLineCount)
+                    {
+                        nextLineFits = false;
+                    }
+                    else
+                    {
+                        _nextLine = FormatLine(
+                            _textSource,
+                            Position + Current.Length,
+                            MaxLineLength(_lineCount + 1),
+                            _that._defaultParaProps,
+                            currentLineBreak
+                            );
+
+                        nextLineFits = (_totalHeight + Current.Height + _nextLine.Height <= _that._maxTextHeight);
+                    }
+
+                    if (!nextLineFits)
+                    {
+                        _nextLine = null;
+
+                        if (_that._trimming != TextTrimming.None && !Current.HasCollapsed)
+                        {
+                            // recreate the current line with ellipsis added
+                            // Note: Paragraph ellipsis is not supported today. We'll workaround
+                            // it here by faking a non-wrap text on finite column width.
+                            var currentWrap = _that._defaultParaProps!.TextWrapping;
+
+                            _that._defaultParaProps.SetTextWrapping(TextWrapping.NoWrap);
+
+                            Current = FormatLine(
+                                _that._textSourceImpl!,
+                                Position,
+                                MaxLineLength(_lineCount),
+                                _that._defaultParaProps,
+                                _previousLineBreak
+                                );
+
+                            currentLineBreak = Current.TextLineBreak;
+
+                            _that._defaultParaProps.SetTextWrapping(currentWrap);
+                        }
+                    }
+                }
+
+                _previousHeight = Current.Height;
+
+                Length = Current.Length;
+
+                _previousLineBreak = currentLineBreak;
+
+                return true;
+            }
+
+            /// <summary>
+            /// Wrapper of TextFormatter.FormatLine that auto-collapses the line if needed.
+            /// </summary>
+            private TextLine FormatLine(ITextSource textSource, int textSourcePosition, double maxLineLength, TextParagraphProperties paraProps, TextLineBreak? lineBreak)
+            {
+                var line = _formatter.FormatLine(
+                    textSource,
+                    textSourcePosition,
+                    maxLineLength,
+                    paraProps,
+                    lineBreak
+                    );
+
+                if (_that._trimming != TextTrimming.None && line.HasOverflowed && line.Length > 0)
+                {
+                    // what I really need here is the last displayed text run of the line
+                    // textSourcePosition + line.Length - 1 works except the end of paragraph case,
+                    // where line length includes the fake paragraph break run
+                    Debug.Assert(_that._text.Length > 0 && textSourcePosition + line.Length <= _that._text.Length + 1);
+
+                    var thatFormatRider = new SpanRider(
+                        _that._formatRuns,
+                        _that._latestPosition,
+                        Math.Min(textSourcePosition + line.Length - 1, _that._text.Length - 1)
+                        );
+
+                    var lastRunProps = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
+
+                    TextCollapsingProperties collapsingProperties = _that._trimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(maxLineLength, lastRunProps));
+
+                    var collapsedLine = line.Collapse(collapsingProperties);
+
+                    line = collapsedLine;
+                }
+                return line;
+            }
+
+
+            /// <summary>
+            /// Sets the enumerator to its initial position,
+            /// which is before the first element in the collection
+            /// </summary>
+            public void Reset()
+            {
+                Position = 0;
+                _lineCount = 0;
+                _totalHeight = 0;
+                Current = null;
+                _nextLine = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns an enumerator that can iterate through the text line collection
+        /// </summary>
+        private LineEnumerator GetEnumerator()
+        {
+            return new LineEnumerator(this);
+        }
+#if NEVER
+        /// <summary>
+        /// Returns an enumerator that can iterate through the text line collection
+        /// </summary>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+#endif
+
+        private void AdvanceLineOrigin(ref Point lineOrigin, TextLine currentLine)
+        {
+            var height = currentLine.Height;
+
+            // advance line origin according to the flow direction
+            switch (_defaultParaProps.FlowDirection)
+            {
+                case FlowDirection.LeftToRight:
+                case FlowDirection.RightToLeft:
+                    lineOrigin = lineOrigin.WithY(lineOrigin.Y + height);
+                    break;
+            }
+        }
+
+        private class CachedMetrics
+        {
+            // vertical
+            public double Height;
+            public double Baseline;
+
+            // horizontal
+            public double Width;
+            public double WidthIncludingTrailingWhitespace;
+
+            // vertical bounding box metrics
+            public double Extent;
+            public double OverhangAfter;
+
+            // horizontal bounding box metrics
+            public double OverhangLeading;
+            public double OverhangTrailing;
+        }
+
+        /// <summary>
+        /// Defines the flow direction
+        /// </summary>
+        public FlowDirection FlowDirection
+        {
+            set
+            {
+                ValidateFlowDirection(value, "value");
+                _defaultParaProps.SetFlowDirection(value);
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _defaultParaProps.FlowDirection;
+            }
+        }
+
+        /// <summary>
+        /// Defines the alignment of text within the column
+        /// </summary>
+        public TextAlignment TextAlignment
+        {
+            set
+            {
+                _defaultParaProps.SetTextAlignment(value);
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _defaultParaProps.TextAlignment;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of, or the spacing between, each line where
+        /// zero represents the default line height.
+        /// </summary>
+        public double LineHeight
+        {
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
+                }
+
+                _defaultParaProps.SetLineHeight(value);
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _defaultParaProps.LineHeight;
+            }
+        }
+
+        /// <summary>
+        /// The MaxTextWidth property defines the alignment edges for the FormattedText.
+        /// For example, left aligned text is wrapped such that the leftmost glyph alignment point
+        /// on each line falls exactly on the left edge of the rectangle.
+        /// Note that for many fonts, especially in italic style, some glyph strokes may extend beyond the edges of the alignment rectangle.
+        /// For this reason, it is recommended that clients draw text with at least 1/6 em (i.e of the font size) unused margin space either side.
+        /// Zero value of MaxTextWidth is equivalent to the maximum possible paragraph width.
+        /// </summary>
+        public double MaxTextWidth
+        {
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
+                }
+
+                _maxTextWidth = value;
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _maxTextWidth;
+            }
+        }
+
+        /// <summary>
+        /// Sets the array of lengths,
+        /// which will be applied to each line of text in turn.
+        /// If the text covers more lines than there are entries in the length array,
+        /// the last entry is reused as many times as required.
+        /// The maxTextWidths array overrides the MaxTextWidth property.
+        /// </summary>
+        /// <param name="maxTextWidths">The max text width array</param>
+        public void SetMaxTextWidths(double[] maxTextWidths)
+        {
+            if (maxTextWidths == null || maxTextWidths.Length <= 0)
+            {
+                throw new ArgumentNullException(nameof(maxTextWidths));
+            }
+
+            _maxTextWidths = maxTextWidths;
+
+            InvalidateMetrics();
+        }
+
+        /// <summary>
+        /// Obtains a copy of the array of lengths,
+        /// which will be applied to each line of text in turn.
+        /// If the text covers more lines than there are entries in the length array,
+        /// the last entry is reused as many times as required.
+        /// The maxTextWidths array overrides the MaxTextWidth property.
+        /// </summary>
+        /// <returns>The copy of max text width array</returns>
+        public double[] GetMaxTextWidths()
+        {
+            return _maxTextWidths != null ? (double[])_maxTextWidths.Clone() : Array.Empty<double>();
+        }
+
+        /// <summary>
+        /// Sets the maximum length of a column of text.
+        /// The last line of text displayed is the last whole line that will fit within this limit,
+        /// or the nth line as specified by MaxLineCount, whichever occurs first.
+        /// Use the Trimming property to control how the omission of text is indicated.
+        /// </summary>
+        public double MaxTextHeight
+        {
+            set
+            {
+                if (value <= 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value must be greater than zero.");
+                }
+
+                if (double.IsNaN(value))
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value cannot be NaN.");
+                }
+
+                _maxTextHeight = value;
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _maxTextHeight;
+            }
+        }
+
+        /// <summary>
+        /// Defines the maximum number of lines to display.
+        /// The last line of text displayed is the lineCount-1'th line,
+        /// or the last whole line that will fit within the count set by MaxTextHeight,
+        /// whichever occurs first.
+        /// Use the Trimming property to control how the omission of text is indicated
+        /// </summary>
+        public int MaxLineCount
+        {
+            set
+            {
+                if (value <= 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "The parameter value must be greater than zero.");
+                }
+
+                _maxLineCount = value;
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _maxLineCount;
+            }
+        }
+
+        /// <summary>
+        /// Defines how omission of text is indicated.
+        /// CharacterEllipsis trimming allows partial words to be displayed,
+        /// while WordEllipsis removes whole words to fit.
+        /// Both guarantee to include an ellipsis ('...') at the end of the lines
+        /// where text has been trimmed as a result of line and column limits.
+        /// </summary>
+        public TextTrimming Trimming
+        {
+            set
+            {
+                _trimming = value;
+
+                _defaultParaProps.SetTextWrapping(_trimming == TextTrimming.None ?
+                    TextWrapping.Wrap :
+                    TextWrapping.WrapWithOverflow);
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _trimming;
+            }
+        }
+
+        /// <summary>
+        /// Lazily initializes the cached metrics EXCEPT for black box metrics and
+        /// returns the CachedMetrics structure.
+        /// </summary>
+        private CachedMetrics Metrics
+        {
+            get
+            {
+                return _metrics ??= DrawAndCalculateMetrics(
+                    null, // drawing context
+                    new Point(), // drawing offset
+                    false);
+            }
+        }
+
+        /// <summary>
+        /// Lazily initializes the cached metrics INCLUDING black box metrics and
+        /// returns the CachedMetrics structure.
+        /// </summary>
+        private CachedMetrics BlackBoxMetrics
+        {
+            get
+            {
+                if (_metrics == null || double.IsNaN(_metrics.Extent))
+                {
+                    // We need to obtain the metrics, including black box metrics.
+
+                    _metrics = DrawAndCalculateMetrics(
+                        null,           // drawing context
+                        new Point(),    // drawing offset
+                        true);          // calculate black box metrics
+                }
+                return _metrics;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the top of the first line to the bottom of the last line.
+        /// </summary>
+        public double Height
+        {
+            get
+            {
+                return Metrics.Height;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the topmost black pixel of the first line
+        /// to the bottommost black pixel of the last line. 
+        /// </summary>
+        public double Extent
+        {
+            get
+            {
+                return BlackBoxMetrics.Extent;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the top of the first line to the baseline of the first line.
+        /// </summary>
+        public double Baseline
+        {
+            get
+            {
+                return Metrics.Baseline;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the bottom of the last line to the extent bottom.
+        /// </summary>
+        public double OverhangAfter
+        {
+            get
+            {
+                return BlackBoxMetrics.OverhangAfter;
+            }
+        }
+
+        /// <summary>
+        /// The maximum distance from the leading black pixel to the leading alignment point of a line.
+        /// </summary>
+        public double OverhangLeading
+        {
+            get
+            {
+                return BlackBoxMetrics.OverhangLeading;
+            }
+        }
+
+        /// <summary>
+        /// The maximum distance from the trailing black pixel to the trailing alignment point of a line.
+        /// </summary>
+        public double OverhangTrailing
+        {
+            get
+            {
+                return BlackBoxMetrics.OverhangTrailing;
+            }
+        }
+
+        /// <summary>
+        /// The maximum advance width between the leading and trailing alignment points of a line,
+        /// excluding the width of whitespace characters at the end of the line.
+        /// </summary>
+        public double Width
+        {
+            get
+            {
+                return Metrics.Width;
+            }
+        }
+
+        /// <summary>
+        /// The maximum advance width between the leading and trailing alignment points of a line,
+        /// including the width of whitespace characters at the end of the line.
+        /// </summary>
+        public double WidthIncludingTrailingWhitespace
+        {
+            get
+            {
+                return Metrics.WidthIncludingTrailingWhitespace;
+            }
+        }
+
+        /// <summary>
+        /// Obtains geometry for the text, including underlines and strikethroughs. 
+        /// </summary>
+        /// <param name="origin">The left top origin of the resulting geometry.</param>
+        /// <returns>The geometry returned contains the combined geometry
+        /// of all of the glyphs, underlines and strikeThroughs that represent the formatted text.
+        /// Overlapping contours are merged by performing a Boolean union operation.</returns>
+        public Geometry? BuildGeometry(Point origin)
+        {
+            GeometryGroup? accumulatedGeometry = null;
+            var lineOrigin = origin;
+
+            DrawingGroup drawing = new DrawingGroup();
+
+            using (var ctx = drawing.Open())
+            {
+                using (var enumerator = GetEnumerator())
+                {
+                    while (enumerator.MoveNext())
+                    {
+                        var currentLine = enumerator.Current;
+
+                        if (currentLine != null)
+                        {
+                            currentLine.Draw(ctx, lineOrigin);
+
+                            AdvanceLineOrigin(ref lineOrigin, currentLine);
+                        }
+                    }
+                }
+            }
+
+            Transform? transform = new TranslateTransform(origin.X, origin.Y);
+
+            //  recursively go down the DrawingGroup to build up the geometry
+            CombineGeometryRecursive(drawing, ref transform, ref accumulatedGeometry);
+
+            return accumulatedGeometry;
+        }
+
+        /// <summary>
+        /// Builds a highlight geometry object.
+        /// </summary>
+        /// <param name="origin">The origin of the highlight region</param>
+        /// <returns>Geometry that surrounds the text.</returns>
+        public Geometry? BuildHighlightGeometry(Point origin)
+        {
+            return BuildHighlightGeometry(origin, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Builds a highlight geometry object for a given character range.
+        /// </summary>
+        /// <param name="origin">The origin of the highlight region.</param>
+        /// <param name="startIndex">The start index of initial character the bounds should be obtained for.</param>
+        /// <param name="count">The number of characters the bounds should be obtained for.</param>
+        /// <returns>Geometry that surrounds the specified character range.</returns>
+        public Geometry? BuildHighlightGeometry(Point origin, int startIndex, int count)
+        {
+            ValidateRange(startIndex, count);
+
+            Geometry? accumulatedBounds = null;
+
+            using (var enumerator = GetEnumerator())
+            {
+                var lineOrigin = origin;
+
+                while (enumerator.MoveNext())
+                {
+                    var currentLine = enumerator.Current!;
+
+                    int x0 = Math.Max(enumerator.Position, startIndex);
+                    int x1 = Math.Min(enumerator.Position + enumerator.Length, startIndex + count);
+
+                    // check if this line is intersects with the specified character range
+                    if (x0 < x1)
+                    {
+                        var highlightBounds = currentLine.GetTextBounds(x0,x1 - x0);
+
+                        if (highlightBounds != null)
+                        {
+                            foreach (var bound in highlightBounds)
+                            {
+                                var rect = bound.Rectangle;
+
+                                if (FlowDirection == FlowDirection.RightToLeft)
+                                {
+                                    // Convert logical units (which extend leftward from the right edge
+                                    // of the paragraph) to physical units.
+                                    //
+                                    // Note that since rect is in logical units, rect.Right corresponds to 
+                                    // the visual *left* edge of the rectangle in the RTL case. Specifically,
+                                    // is the distance leftward from the right edge of the formatting rectangle
+                                    // whose width is the paragraph width passed to FormatLine.
+                                    //
+                                    rect = rect.WithX(enumerator.CurrentParagraphWidth - rect.Right);
+                                }
+
+                                rect = new Rect(new Point(rect.X + lineOrigin.X, rect.Y + lineOrigin.Y), rect.Size);
+
+                                RectangleGeometry rectangleGeometry = new RectangleGeometry(rect);
+
+                                if (accumulatedBounds == null)
+                                {
+                                    accumulatedBounds = rectangleGeometry;
+                                }
+                                else
+                                {
+                                    accumulatedBounds = Geometry.Combine(accumulatedBounds, rectangleGeometry, GeometryCombineMode.Union);
+                                }                                  
+                            }
+                        }
+                    }
+
+                    AdvanceLineOrigin(ref lineOrigin, currentLine);
+                }
+            }
+
+            if (accumulatedBounds?.PlatformImpl == null || accumulatedBounds.PlatformImpl.Bounds.IsEmpty)
+            {
+                return null;
+            }            
+
+            return accumulatedBounds;
+        }
+
+        /// <summary>
+        /// Draws the text object
+        /// </summary>
+        internal void Draw(DrawingContext drawingContext, Point origin)
+        {
+            var lineOrigin = origin;
+
+            if (_metrics != null && !double.IsNaN(_metrics.Extent))
+            {
+                // we can't use foreach because it requires GetEnumerator and associated classes to be public
+                // foreach (TextLine currentLine in this)
+                using (var enumerator = GetEnumerator())
+                {
+                    while (enumerator.MoveNext())
+                    {
+                        var currentLine = enumerator.Current!;
+
+                        currentLine.Draw(drawingContext, lineOrigin);
+
+                        AdvanceLineOrigin(ref lineOrigin, currentLine);
+                    }
+                }
+            }
+            else
+            {
+                // Calculate metrics as we draw to avoid formatting again if we need metrics later; we compute
+                // black box metrics too because these are already known as a side-effect of drawing
+
+                _metrics = DrawAndCalculateMetrics(drawingContext, origin, true);
+            }
+        }
+
+        private void CombineGeometryRecursive(Drawing drawing, ref Transform? transform, ref GeometryGroup? accumulatedGeometry)
+        {
+            if (drawing is DrawingGroup group)
+            {
+                transform = group.Transform;
+
+                if (group.Children is DrawingCollection children)
+                {
+                    // recursively go down for DrawingGroup
+                    foreach (var child in children)
+                    {
+                        CombineGeometryRecursive(child, ref transform, ref accumulatedGeometry);
+                    }
+                }
+            }
+            else
+            {
+                if (drawing is GlyphRunDrawing glyphRunDrawing)
+                {
+                    // process glyph run
+                    var glyphRun = glyphRunDrawing.GlyphRun;
+
+                    if (glyphRun != null)
+                    {
+                        var glyphRunGeometry = glyphRun.BuildGeometry();
+
+                        glyphRunGeometry.Transform = transform;
+
+                        if (accumulatedGeometry == null)
+                        {
+                            accumulatedGeometry = new GeometryGroup
+                            {
+                                FillRule = FillRule.NonZero
+                            };
+                        }
+
+                        accumulatedGeometry.Children.Add(glyphRunGeometry);
+                    }
+                }
+                else
+                {
+                    if (drawing is GeometryDrawing geometryDrawing)
+                    {
+                        // process geometry (i.e. TextDecoration on the line)
+                        var geometry = geometryDrawing.Geometry;
+
+                        if (geometry != null)
+                        {
+                            geometry.Transform = transform;
+
+                            if (geometry is LineGeometry lineGeometry)
+                            {
+                                // For TextDecoration drawn by DrawLine(), the geometry is a LineGeometry which has no 
+                                // bounding area. So this line won't show up. Work aroud it by increase the Bounding rect 
+                                // to be Pen's thickness                        
+
+                                var bounds = lineGeometry.Bounds;
+
+                                if (bounds.Height == 0)
+                                {
+                                    bounds = bounds.WithHeight(geometryDrawing.Pen?.Thickness ?? 0);
+                                }
+                                else if (bounds.Width == 0)
+                                {
+                                    bounds = bounds.WithWidth(geometryDrawing.Pen?.Thickness ?? 0);
+                                }
+
+                                // convert the line geometry into a rectangle geometry
+                                // we lost line cap info here
+                                geometry = new RectangleGeometry(bounds);
+                            }
+
+                            if (accumulatedGeometry == null)
+                            {
+                                accumulatedGeometry = new GeometryGroup
+                                {
+                                    FillRule = FillRule.NonZero
+                                };
+                            }
+
+                            accumulatedGeometry.Children.Add(geometry);
+                        }
+                    }
+                }
+            }
+        }
+
+        private CachedMetrics DrawAndCalculateMetrics(DrawingContext? drawingContext, Point drawingOffset, bool getBlackBoxMetrics)
+        {
+            var metrics = new CachedMetrics();
+
+            if (_text.Length == 0)
+            {
+                return metrics;
+            }
+
+            // we can't use foreach because it requires GetEnumerator and associated classes to be public
+            // foreach (TextLine currentLine in this)
+
+            using (var enumerator = GetEnumerator())
+            {
+                var first = true;
+
+                double accBlackBoxLeft, accBlackBoxTop, accBlackBoxRight, accBlackBoxBottom;
+                accBlackBoxLeft = accBlackBoxTop = double.MaxValue;
+                accBlackBoxRight = accBlackBoxBottom = double.MinValue;
+
+                var origin = new Point(0, 0);
+
+                // Holds the TextLine.Start of the longest line. Thus it will hold the minimum value 
+                // of TextLine.Start among all the lines that forms the text. The overhangs (leading and trailing) 
+                // are calculated with an offset as a result of the same issue with TextLine.Start. 
+                // So, we compute this offset and remove it later from the values of the overhangs.
+                var lineStartOfLongestLine = double.MaxValue;
+
+                while (enumerator.MoveNext())
+                {
+                    // enumerator will dispose the currentLine
+                    var currentLine = enumerator.Current!;
+
+                    // if we're drawing, do it first as this will compute black box metrics as a side-effect
+                    if (drawingContext != null)
+                    {
+                        currentLine.Draw(drawingContext,
+                            new Point(origin.X + drawingOffset.X, origin.Y + drawingOffset.Y));
+                    }
+
+                    if (getBlackBoxMetrics)
+                    {
+                        var blackBoxLeft = origin.X + currentLine.Start + currentLine.OverhangLeading;
+                        var blackBoxRight = origin.X + currentLine.Start + currentLine.Width - currentLine.OverhangTrailing;
+                        var blackBoxBottom = origin.Y + currentLine.Height + currentLine.OverhangAfter;
+                        var blackBoxTop = blackBoxBottom - currentLine.Extent;
+
+                        accBlackBoxLeft = Math.Min(accBlackBoxLeft, blackBoxLeft);
+                        accBlackBoxRight = Math.Max(accBlackBoxRight, blackBoxRight);
+                        accBlackBoxBottom = Math.Max(accBlackBoxBottom, blackBoxBottom);
+                        accBlackBoxTop = Math.Min(accBlackBoxTop, blackBoxTop);
+
+                        metrics.OverhangAfter = currentLine.OverhangAfter;
+                    }
+
+                    metrics.Height += currentLine.Height;
+                    metrics.Width = Math.Max(metrics.Width, currentLine.Width);
+                    metrics.WidthIncludingTrailingWhitespace = Math.Max(metrics.WidthIncludingTrailingWhitespace, currentLine.WidthIncludingTrailingWhitespace);
+                    lineStartOfLongestLine = Math.Min(lineStartOfLongestLine, currentLine.Start);
+
+                    if (first)
+                    {
+                        metrics.Baseline = currentLine.Baseline;
+                        first = false;
+                    }
+
+                    AdvanceLineOrigin(ref origin, currentLine);
+                }
+
+                if (getBlackBoxMetrics)
+                {
+                    metrics.Extent = accBlackBoxBottom - accBlackBoxTop;
+                    metrics.OverhangLeading = accBlackBoxLeft - lineStartOfLongestLine;
+                    metrics.OverhangTrailing = metrics.Width - (accBlackBoxRight - lineStartOfLongestLine);
+                }
+                else
+                {
+                    // indicate that black box metrics are not known
+                    metrics.Extent = double.NaN;
+                }
+            }
+
+            return metrics;
+        }
+
+        private class TextSourceImplementation : ITextSource
+        {
+            private readonly FormattedText _that;
+
+            public TextSourceImplementation(FormattedText text)
+            {
+                _that = text;
+            }
+
+            /// <inheritdoc/>
+            public TextRun? GetTextRun(int textSourceCharacterIndex)
+            {
+                if (textSourceCharacterIndex >= _that._text.Length)
+                {
+                    return null;
+                }
+
+                var thatFormatRider = new SpanRider(_that._formatRuns, _that._latestPosition, textSourceCharacterIndex);
+
+                TextRunProperties properties = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
+
+                var textCharacters = new TextCharacters(_that._text, textSourceCharacterIndex, thatFormatRider.Length,
+                    properties);
+
+                return textCharacters;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Geometry.cs b/src/Avalonia.Base/Media/Geometry.cs
new file mode 100644
index 0000000000..c31a6699c2
--- /dev/null
+++ b/src/Avalonia.Base/Media/Geometry.cs
@@ -0,0 +1,202 @@
+using System;
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines a geometric shape.
+    /// </summary>    
+    public abstract class Geometry : AvaloniaObject
+    {
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transform?> TransformProperty =
+            AvaloniaProperty.Register<Geometry, Transform?>(nameof(Transform));
+
+        private bool _isDirty = true;
+        private IGeometryImpl? _platformImpl;
+
+        static Geometry()
+        {
+            TransformProperty.Changed.AddClassHandler<Geometry>((x,e) => x.TransformChanged(e));
+        }
+
+        /// <summary>
+        /// Raised when the geometry changes.
+        /// </summary>
+        public event EventHandler? Changed;
+
+        /// <summary>
+        /// Gets the geometry's bounding rectangle.
+        /// </summary>
+        public Rect Bounds => PlatformImpl?.Bounds ?? Rect.Empty;
+
+        /// <summary>
+        /// Gets the platform-specific implementation of the geometry.
+        /// </summary>
+        public IGeometryImpl? PlatformImpl
+        {
+            get
+            {
+                if (_isDirty)
+                {
+                    var geometry = CreateDefiningGeometry();
+                    var transform = Transform;
+
+                    if (geometry != null && transform != null && transform.Value != Matrix.Identity)
+                    {
+                        geometry = geometry.WithTransform(transform.Value);
+                    }
+
+                    _platformImpl = geometry;
+                    _isDirty = false;
+                }
+
+                return _platformImpl;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a transform to apply to the geometry.
+        /// </summary>
+        public Transform? Transform
+        {
+            get { return GetValue(TransformProperty); }
+            set { SetValue(TransformProperty, value); }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Geometry"/> from a string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>A <see cref="StreamGeometry"/>.</returns>
+        public static Geometry Parse(string s) => StreamGeometry.Parse(s);
+
+        /// <summary>
+        /// Clones the geometry.
+        /// </summary>
+        /// <returns>A cloned geometry.</returns>
+        public abstract Geometry Clone();
+
+        /// <summary>
+        /// Gets the geometry's bounding rectangle with the specified pen.
+        /// </summary>
+        /// <param name="pen">The stroke thickness.</param>
+        /// <returns>The bounding rectangle.</returns>
+        public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
+
+        /// <summary>
+        /// Indicates whether the geometry's fill contains the specified point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        public bool FillContains(Point point)
+        {
+            return PlatformImpl?.FillContains(point) == true;
+        }
+
+        /// <summary>
+        /// Indicates whether the geometry's stroke contains the specified point.
+        /// </summary>
+        /// <param name="pen">The pen to use.</param>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        public bool StrokeContains(IPen pen, Point point)
+        {
+            return PlatformImpl?.StrokeContains(pen, point) == true;
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the geometry's <see cref="PlatformImpl"/>.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateGeometry"/> to be called on the element.
+        /// </remarks>
+        protected static void AffectsGeometry(params AvaloniaProperty[] properties)
+        {
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(AffectsGeometryInvalidate);
+            }
+        }
+
+        /// <summary>
+        /// Creates the platform implementation of the geometry, without the transform applied.
+        /// </summary>
+        /// <returns></returns>
+        protected abstract IGeometryImpl? CreateDefiningGeometry();
+
+        /// <summary>
+        /// Invalidates the platform implementation of the geometry.
+        /// </summary>
+        protected void InvalidateGeometry()
+        {
+            _isDirty = true;
+            _platformImpl = null;
+            Changed?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void TransformChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var oldValue = (Transform?)e.OldValue;
+            var newValue = (Transform?)e.NewValue;
+
+            if (oldValue != null)
+            {
+                oldValue.Changed -= TransformChanged;
+            }
+
+            if (newValue != null)
+            {
+                newValue.Changed += TransformChanged;
+            }
+
+            TransformChanged(newValue, EventArgs.Empty);
+        }
+
+        private void TransformChanged(object? sender, EventArgs e)
+        {
+            var transform = ((Transform?)sender)?.Value;
+
+            if (_platformImpl is ITransformedGeometryImpl t)
+            {
+                if (transform == null || transform == Matrix.Identity)
+                {
+                    _platformImpl = t.SourceGeometry;
+                }
+                else if (transform != t.Transform)
+                {
+                    _platformImpl = t.SourceGeometry.WithTransform(transform.Value);
+                }
+            }
+            else if (_platformImpl != null && transform != null && transform != Matrix.Identity)
+            {
+                _platformImpl = _platformImpl.WithTransform(transform.Value);
+            }
+
+            Changed?.Invoke(this, EventArgs.Empty);
+        }
+
+        private static void AffectsGeometryInvalidate(AvaloniaPropertyChangedEventArgs e)
+        {
+            var control = e.Sender as Geometry;
+            control?.InvalidateGeometry();
+        }
+
+        /// <summary>
+        /// Combines the two geometries using the specified <see cref="GeometryCombineMode"/> and applies the specified transform to the resulting geometry.
+        /// </summary>
+        /// <param name="geometry1">The first geometry to combine.</param>
+        /// <param name="geometry2">The second geometry to combine.</param>
+        /// <param name="combineMode">One of the enumeration values that specifies how the geometries are combined.</param>
+        /// <param name="transform">A transformation to apply to the combined geometry, or <c>null</c>.</param>
+        /// <returns></returns>
+        public static Geometry Combine(Geometry geometry1, RectangleGeometry geometry2, GeometryCombineMode combineMode, Transform? transform = null)
+        {
+            return new CombinedGeometry(combineMode, geometry1, geometry2, transform);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/GeometryCollection.cs b/src/Avalonia.Base/Media/GeometryCollection.cs
new file mode 100644
index 0000000000..2afa191dcf
--- /dev/null
+++ b/src/Avalonia.Base/Media/GeometryCollection.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+
+#nullable enable
+
+namespace Avalonia.Media
+{
+    public sealed class GeometryCollection : AvaloniaList<Geometry> 
+    {
+        public GeometryCollection()
+        {
+            ResetBehavior = ResetBehavior.Remove;
+
+            this.ForEachItem(
+               x =>
+               {
+                   Parent?.Invalidate();
+               },
+               x =>
+               {
+                   Parent?.Invalidate();
+               },
+               () => throw new NotSupportedException());
+        }
+
+        public GeometryCollection(IEnumerable<Geometry> items) : base(items)
+        {
+            ResetBehavior = ResetBehavior.Remove;
+
+            this.ForEachItem(
+               x =>
+               {
+                   Parent?.Invalidate();
+               },
+               x =>
+               {
+                   Parent?.Invalidate();
+               },
+               () => throw new NotSupportedException());
+        }
+
+        public GeometryGroup? Parent { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/GeometryDrawing.cs b/src/Avalonia.Base/Media/GeometryDrawing.cs
new file mode 100644
index 0000000000..7df7d25954
--- /dev/null
+++ b/src/Avalonia.Base/Media/GeometryDrawing.cs
@@ -0,0 +1,75 @@
+using Avalonia.Media.Immutable;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a drawing operation that combines 
+    /// a geometry with and brush and/or pen to produce rendered content.
+    /// </summary>
+    public class GeometryDrawing : Drawing
+    {
+        // Adding the Pen's stroke thickness here could yield wrong results due to transforms.
+        private static readonly IPen s_boundsPen = new ImmutablePen(Colors.Black.ToUint32(), 0);
+
+        /// <summary>
+        /// Defines the <see cref="Geometry"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Geometry> GeometryProperty =
+            AvaloniaProperty.Register<GeometryDrawing, Geometry>(nameof(Geometry));
+
+        /// <summary>
+        /// Defines the <see cref="Brush"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> BrushProperty =
+            AvaloniaProperty.Register<GeometryDrawing, IBrush?>(nameof(Brush), Brushes.Transparent);
+
+        /// <summary>
+        /// Defines the <see cref="Pen"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Pen?> PenProperty =
+            AvaloniaProperty.Register<GeometryDrawing, Pen?>(nameof(Pen));
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.Geometry"/> that describes the shape of this <see cref="GeometryDrawing"/>.
+        /// </summary>
+        [Content]
+        public Geometry Geometry
+        {
+            get => GetValue(GeometryProperty);
+            set => SetValue(GeometryProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.IBrush"/> used to fill the interior of the shape described by this <see cref="GeometryDrawing"/>.
+        /// </summary>
+        public IBrush? Brush
+        {
+            get => GetValue(BrushProperty);
+            set => SetValue(BrushProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.IPen"/> used to stroke this <see cref="GeometryDrawing"/>.
+        /// </summary>
+        public IPen? Pen
+        {
+            get => GetValue(PenProperty);
+            set => SetValue(PenProperty, value);
+        }
+
+        public override void Draw(DrawingContext context)
+        {
+            if (Geometry != null)
+            {
+                context.DrawGeometry(Brush, Pen, Geometry);
+            }
+        }
+
+        public override Rect GetBounds()
+        {
+            IPen pen = Pen ?? s_boundsPen;
+			return Geometry?.GetRenderBounds(pen) ?? Rect.Empty;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/GeometryGroup.cs b/src/Avalonia.Base/Media/GeometryGroup.cs
new file mode 100644
index 0000000000..0326e606f4
--- /dev/null
+++ b/src/Avalonia.Base/Media/GeometryGroup.cs
@@ -0,0 +1,105 @@
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+#nullable enable
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a composite geometry, composed of other <see cref="Geometry"/> objects.
+    /// </summary>
+    public class GeometryGroup : Geometry
+    {
+        public static readonly DirectProperty<GeometryGroup, GeometryCollection> ChildrenProperty =
+            AvaloniaProperty.RegisterDirect<GeometryGroup, GeometryCollection> (
+                nameof(Children),
+                o => o.Children,
+                (o, v)=> o.Children = v);
+
+        public static readonly StyledProperty<FillRule> FillRuleProperty =
+            AvaloniaProperty.Register<GeometryGroup, FillRule>(nameof(FillRule));
+
+        private GeometryCollection _children;
+
+        public GeometryGroup()
+        {
+            _children = new GeometryCollection
+            {
+                Parent = this
+            };
+        }
+
+        /// <summary>
+        /// Gets or sets the collection that contains the child geometries.
+        /// </summary>
+        [Content]
+        public GeometryCollection Children
+        {
+            get => _children;
+            set
+            {
+                OnChildrenChanged(_children, value);
+                SetAndRaise(ChildrenProperty, ref _children, value);             
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how the intersecting areas of the objects contained in this
+        /// <see cref="GeometryGroup"/> are combined. The default is <see cref="FillRule.EvenOdd"/>.
+        /// </summary>
+        public FillRule FillRule
+        {
+            get => GetValue(FillRuleProperty);
+            set => SetValue(FillRuleProperty, value);
+        }
+
+        public override Geometry Clone()
+        {
+            var result = new GeometryGroup { FillRule = FillRule, Transform = Transform };
+
+            if (_children.Count > 0)
+            {
+                result.Children = new GeometryCollection(_children);
+            }
+              
+            return result;
+        }
+
+        protected void OnChildrenChanged(GeometryCollection oldChildren, GeometryCollection newChildren)
+        {
+            oldChildren.Parent = null;
+
+            newChildren.Parent = this;
+        }
+
+        protected override IGeometryImpl? CreateDefiningGeometry()
+        {
+            if (_children.Count > 0)
+            {
+                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+
+                return factory.CreateGeometryGroup(FillRule, _children);
+            }
+
+            return null;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            switch (change.Property.Name)
+            {
+                case nameof(FillRule):                   
+                case nameof(Children):
+                    InvalidateGeometry();
+                    break;
+            }
+        }
+
+        internal void Invalidate()
+        {
+            InvalidateGeometry();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/GlyphMetrics.cs b/src/Avalonia.Base/Media/GlyphMetrics.cs
new file mode 100644
index 0000000000..2ee1f87d38
--- /dev/null
+++ b/src/Avalonia.Base/Media/GlyphMetrics.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Media;
+
+public readonly struct GlyphMetrics
+{
+    /// <summary>
+    /// Distance from the x-origin to the left extremum of the glyph.
+    /// </summary>
+    public int XBearing { get; init; }
+
+    /// <summary>
+    /// Distance from the top extremum of the glyph to the y-origin.
+    /// </summary>
+    public int YBearing{ get; init; }
+
+    /// <summary>
+    /// Distance from the left extremum of the glyph to the right extremum.
+    /// </summary>
+    public int Width{ get; init; }
+
+    /// <summary>
+    /// Distance from the top extremum of the glyph to the bottom extremum.
+    /// </summary>
+    public int Height{ get; init; }
+}
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
new file mode 100644
index 0000000000..d93a68e78b
--- /dev/null
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -0,0 +1,881 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    ///     Represents a sequence of glyphs from a single face of a single font at a single size, and with a single rendering style.
+    /// </summary>
+    public sealed class GlyphRun : IDisposable
+    {
+        private static readonly IComparer<int> s_ascendingComparer = Comparer<int>.Default;
+        private static readonly IComparer<int> s_descendingComparer = new ReverseComparer<int>();
+
+        private IGlyphRunImpl? _glyphRunImpl;
+        private IGlyphTypeface _glyphTypeface;
+        private double _fontRenderingEmSize;
+        private int _biDiLevel;
+        private Point? _baselineOrigin;
+        private GlyphRunMetrics? _glyphRunMetrics;
+
+        private ReadOnlySlice<char> _characters;
+
+        private IReadOnlyList<ushort> _glyphIndices;
+        private IReadOnlyList<double>? _glyphAdvances;
+        private IReadOnlyList<Vector>? _glyphOffsets;
+        private IReadOnlyList<int>? _glyphClusters;
+
+        private int _offsetToFirstCharacter;
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
+        /// </summary>
+        /// <param name="glyphTypeface">The glyph typeface.</param>
+        /// <param name="fontRenderingEmSize">The rendering em size.</param>
+        /// <param name="glyphIndices">The glyph indices.</param>
+        /// <param name="glyphAdvances">The glyph advances.</param>
+        /// <param name="glyphOffsets">The glyph offsets.</param>
+        /// <param name="characters">The characters.</param>
+        /// <param name="glyphClusters">The glyph clusters.</param>
+        /// <param name="biDiLevel">The bidi level.</param>
+        public GlyphRun(
+            IGlyphTypeface glyphTypeface,
+            double fontRenderingEmSize,
+            ReadOnlySlice<char> characters,
+            IReadOnlyList<ushort> glyphIndices,
+            IReadOnlyList<double>? glyphAdvances = null,
+            IReadOnlyList<Vector>? glyphOffsets = null,
+            IReadOnlyList<int>? glyphClusters = null,
+            int biDiLevel = 0)
+        {
+            _glyphTypeface = glyphTypeface;
+
+            FontRenderingEmSize = fontRenderingEmSize;
+
+            Characters = characters;
+
+            _glyphIndices = glyphIndices;
+
+            GlyphAdvances = glyphAdvances;
+
+            GlyphOffsets = glyphOffsets;
+
+            GlyphClusters = glyphClusters;
+
+            BiDiLevel = biDiLevel;
+        }
+
+        /// <summary>
+        ///     Gets the <see cref="IGlyphTypeface"/> for the <see cref="GlyphRun"/>.
+        /// </summary>
+        public IGlyphTypeface GlyphTypeface => _glyphTypeface;
+
+        /// <summary>
+        ///     Gets or sets the em size used for rendering the <see cref="GlyphRun"/>.
+        /// </summary>
+        public double FontRenderingEmSize
+        {
+            get => _fontRenderingEmSize;
+            set => Set(ref _fontRenderingEmSize, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the conservative bounding box of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public Size Size => new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public GlyphRunMetrics Metrics
+        {
+            get
+            {
+                _glyphRunMetrics ??= CreateGlyphRunMetrics();
+
+                return _glyphRunMetrics.Value;
+            }
+        }
+
+        /// <summary>
+        ///     Gets or sets the baseline origin of the<see cref="GlyphRun"/>.
+        /// </summary>
+        public Point BaselineOrigin
+        {
+            get
+            {
+                _baselineOrigin ??= CalculateBaselineOrigin();
+
+                return _baselineOrigin.Value;
+            }
+            set => Set(ref _baselineOrigin, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets an array of <see cref="ushort"/> values that represent the glyph indices in the rendering physical font.
+        /// </summary>
+        public IReadOnlyList<ushort> GlyphIndices
+        {
+            get => _glyphIndices;
+            set => Set(ref _glyphIndices, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets an array of <see cref="double"/> values that represent the advances corresponding to the glyph indices.
+        /// </summary>
+        public IReadOnlyList<double>? GlyphAdvances
+        {
+            get => _glyphAdvances;
+            set => Set(ref _glyphAdvances, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets an array of <see cref="Vector"/> values representing the offsets of the glyphs in the <see cref="GlyphRun"/>.
+        /// </summary>
+        public IReadOnlyList<Vector>? GlyphOffsets
+        {
+            get => _glyphOffsets;
+            set => Set(ref _glyphOffsets, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the list of UTF16 code points that represent the Unicode content of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public ReadOnlySlice<char> Characters
+        {
+            get => _characters;
+            set => Set(ref _characters, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets a list of <see cref="int"/> values representing a mapping from character index to glyph index.
+        /// </summary>
+        public IReadOnlyList<int>? GlyphClusters
+        {
+            get => _glyphClusters;
+            set => Set(ref _glyphClusters, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the bidirectional nesting level of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public int BiDiLevel
+        {
+            get => _biDiLevel;
+            set => Set(ref _biDiLevel, value);
+        }
+
+        /// <summary>
+        /// Gets the scale of the current <see cref="IGlyphTypeface"/>
+        /// </summary>
+        internal double Scale => FontRenderingEmSize / GlyphTypeface.Metrics.DesignEmHeight;
+
+        /// <summary>
+        /// Returns <c>true</c> if the text direction is left-to-right. Otherwise, returns <c>false</c>.
+        /// </summary>
+        public bool IsLeftToRight => ((BiDiLevel & 1) == 0);
+
+        /// <summary>
+        /// The platform implementation of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public IGlyphRunImpl GlyphRunImpl
+        {
+            get
+            {
+                if (_glyphRunImpl == null)
+                {
+                    Initialize();
+                }
+
+                return _glyphRunImpl!;
+            }
+        }
+
+        /// <summary>
+        /// Obtains geometry for the glyph run.
+        /// </summary>
+        /// <returns>The geometry returned contains the combined geometry of all glyphs in the glyph run.</returns>
+        public Geometry BuildGeometry()
+        {
+            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+
+            var geometryImpl = platformRenderInterface.BuildGlyphRunGeometry(this);
+
+            return new PlatformGeometry(geometryImpl);
+        }
+
+        /// <summary>
+        /// Retrieves the offset from the leading edge of the <see cref="GlyphRun"/>
+        /// to the leading or trailing edge of a caret stop containing the specified character hit.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the offset.</param>
+        /// <returns>
+        /// A <see cref="double"/> that represents the offset from the leading edge of the <see cref="GlyphRun"/>
+        /// to the leading or trailing edge of a caret stop containing the character hit.
+        /// </returns>
+        public double GetDistanceFromCharacterHit(CharacterHit characterHit)
+        {
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength - _offsetToFirstCharacter;
+
+            var distance = 0.0;
+
+            if (IsLeftToRight)
+            {
+                if (GlyphClusters != null)
+                {
+                    if (characterIndex < GlyphClusters[0])
+                    {
+                        return 0;
+                    }
+
+                    if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
+                    {
+                        return Metrics.WidthIncludingTrailingWhitespace;
+                    }
+                }
+
+                var glyphIndex = FindGlyphIndex(characterIndex);
+
+                if (GlyphClusters != null)
+                {
+                    var currentCluster = GlyphClusters[glyphIndex];
+
+                    //Move to the end of the glyph cluster
+                    if (characterHit.TrailingLength > 0)
+                    {
+                        while (glyphIndex + 1 < GlyphClusters.Count && GlyphClusters[glyphIndex + 1] == currentCluster)
+                        {
+                            glyphIndex++;
+                        }
+                    }
+                }
+
+                for (var i = 0; i < glyphIndex; i++)
+                {
+                    distance += GetGlyphAdvance(i, out _);
+                }
+
+                return distance;
+            }
+            else
+            {
+                //RightToLeft
+                var glyphIndex = FindGlyphIndex(characterIndex);
+
+                if (GlyphClusters != null && GlyphClusters.Count > 0)
+                {
+                    if (characterIndex > GlyphClusters[0])
+                    {
+                        return 0;
+                    }
+
+                    if (characterIndex <= GlyphClusters[GlyphClusters.Count - 1])
+                    {
+                        return Size.Width;
+                    }
+                }
+
+                for (var i = glyphIndex + 1; i < GlyphIndices.Count; i++)
+                {
+                    distance += GetGlyphAdvance(i, out _);
+                }
+
+                return Size.Width - distance;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the <see cref="CharacterHit"/> value that represents the character hit of the caret of the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <param name="distance">Offset to use for computing the caret character hit.</param>
+        /// <param name="isInside">Determines whether the character hit is inside the <see cref="GlyphRun"/>.</param>
+        /// <returns>
+        /// A <see cref="CharacterHit"/> value that represents the character hit that is closest to the distance value.
+        /// The out parameter <c>isInside</c> returns <c>true</c> if the character hit is inside the <see cref="GlyphRun"/>; otherwise, <c>false</c>.
+        /// </returns>
+        public CharacterHit GetCharacterHitFromDistance(double distance, out bool isInside)
+        {
+            var characterIndex = 0;
+
+            // Before
+            if (distance <= 0)
+            {
+                isInside = false;
+
+                if (GlyphClusters != null)
+                {
+                    characterIndex = GlyphClusters[characterIndex];
+                }
+
+                var firstCharacterHit = FindNearestCharacterHit(characterIndex, out _);
+
+                return IsLeftToRight ? new CharacterHit(firstCharacterHit.FirstCharacterIndex) : firstCharacterHit;
+            }
+
+            //After
+            if (distance >= Size.Width)
+            {
+                isInside = false;
+
+                characterIndex = GlyphIndices.Count - 1;
+
+                if (GlyphClusters != null)
+                {
+                    characterIndex = GlyphClusters[characterIndex];
+                }
+
+                var lastCharacterHit = FindNearestCharacterHit(characterIndex, out _);
+
+                return IsLeftToRight ? lastCharacterHit : new CharacterHit(lastCharacterHit.FirstCharacterIndex);
+            }
+
+            //Within
+            var currentX = 0d;
+
+            if (IsLeftToRight)
+            {
+                for (var index = 0; index < GlyphIndices.Count; index++)
+                {
+                    var advance = GetGlyphAdvance(index, out var cluster);
+
+                    characterIndex = cluster;
+
+                    if (distance > currentX && distance <= currentX + advance)
+                    {
+                        break;
+                    }
+
+                    currentX += advance;
+                }
+            }
+            else
+            {
+                currentX = Size.Width;
+
+                for (var index = GlyphIndices.Count - 1; index >= 0; index--)
+                {
+                    var advance = GetGlyphAdvance(index, out var cluster);
+
+                    characterIndex = cluster;
+
+                    var offsetX = currentX - advance;
+
+                    if (offsetX < distance)
+                    {
+                        break;
+                    }
+
+                    currentX -= advance;
+                }
+            }
+
+            isInside = true;
+
+            var characterHit = FindNearestCharacterHit(characterIndex, out var width);
+
+            var delta = width / 2;
+            
+            var offset = IsLeftToRight ? Math.Round(distance - currentX, 3) : Math.Round(currentX - distance, 3);
+
+            var isTrailing = offset > delta;
+
+            return isTrailing ? characterHit : new CharacterHit(characterHit.FirstCharacterIndex);
+        }
+
+        /// <summary>
+        /// Retrieves the next valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the next hit value.</param>
+        /// <returns>
+        /// A <see cref="CharacterHit"/> that represents the next valid caret character hit in the logical direction.
+        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
+        /// </returns>
+        public CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (characterHit.TrailingLength == 0)
+            {
+                characterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex, out _);
+
+                var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+                return textPosition > _characters.End ?
+                    characterHit :
+                    new CharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+            }
+
+            var nextCharacterHit =
+                FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
+
+            if (characterHit == nextCharacterHit)
+            {
+                return characterHit;
+            }
+
+            return characterHit.TrailingLength > 0 ?
+                nextCharacterHit :
+                new CharacterHit(nextCharacterHit.FirstCharacterIndex);
+        }
+
+        /// <summary>
+        /// Retrieves the previous valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the previous hit value.</param>
+        /// <returns>
+        /// A cref="CharacterHit"/> that represents the previous valid caret character hit in the logical direction.
+        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
+        /// </returns>
+        public CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (characterHit.TrailingLength != 0)
+            {
+                return new CharacterHit(characterHit.FirstCharacterIndex);
+            }
+
+            var previousCharacterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
+
+            return new CharacterHit(previousCharacterHit.FirstCharacterIndex);
+        }
+
+        /// <summary>
+        /// Finds a glyph index for given character index.
+        /// </summary>
+        /// <param name="characterIndex">The character index.</param>
+        /// <returns>
+        /// The glyph index.
+        /// </returns>
+        public int FindGlyphIndex(int characterIndex)
+        {
+            if (GlyphClusters == null || GlyphClusters.Count == 0)
+            {
+                return characterIndex;
+            }
+
+            if (IsLeftToRight)
+            {
+                if (characterIndex < GlyphClusters[0])
+                {
+                    return 0;
+                }
+
+                if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
+                {
+                    return GlyphClusters.Count - 1;
+                }
+            }
+            else
+            {
+                if (characterIndex < GlyphClusters[GlyphClusters.Count - 1])
+                {
+                    return GlyphClusters.Count - 1;
+                }
+
+                if (characterIndex > GlyphClusters[0])
+                {
+                    return 0;
+                }
+            }
+
+            var comparer = IsLeftToRight ? s_ascendingComparer : s_descendingComparer;
+
+            var clusters = GlyphClusters;
+
+            // Find the start of the cluster at the character index.
+            var start = clusters.BinarySearch(characterIndex, comparer);
+
+            // No cluster found.
+            if (start < 0)
+            {
+                while (characterIndex > 0 && start < 0)
+                {
+                    characterIndex--;
+
+                    start = clusters.BinarySearch(characterIndex, comparer);
+                }
+
+                if (start < 0)
+                {
+                    return -1;
+                }
+            }
+
+            if (IsLeftToRight)
+            {
+                while (start > 0 && clusters[start - 1] == clusters[start])
+                {
+                    start--;
+                }
+            }
+            else
+            {
+                while (start + 1 < clusters.Count && clusters[start + 1] == clusters[start])
+                {
+                    start++;
+                }
+            }
+
+            return start;
+        }
+
+        /// <summary>
+        /// Finds the nearest <see cref="CharacterHit"/> at given index.
+        /// </summary>
+        /// <param name="index">The index.</param>
+        /// <param name="width">The width of found cluster.</param>
+        /// <returns>
+        /// The nearest <see cref="CharacterHit"/>.
+        /// </returns>
+        public CharacterHit FindNearestCharacterHit(int index, out double width)
+        {
+            width = 0.0;
+
+            var start = FindGlyphIndex(index);
+
+            if (GlyphClusters == null)
+            {
+                width = GetGlyphAdvance(index, out _);
+
+                return new CharacterHit(start, 1);
+            }
+
+            var cluster = GlyphClusters[start];
+
+            var nextCluster = cluster;
+
+            var currentIndex = start;
+
+            while (nextCluster == cluster)
+            {
+                width += GetGlyphAdvance(currentIndex, out _);
+
+                if (IsLeftToRight)
+                {
+                    currentIndex++;
+
+                    if (currentIndex == GlyphClusters.Count)
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    currentIndex--;
+
+                    if (currentIndex < 0)
+                    {
+                        break;
+                    }
+                }
+
+                nextCluster = GlyphClusters[currentIndex];
+            }           
+
+            int trailingLength;
+
+            if (nextCluster == cluster)
+            {
+                trailingLength = Characters.Start + Characters.Length - _offsetToFirstCharacter - cluster;
+            }
+            else
+            {
+                trailingLength = nextCluster - cluster;
+            }
+
+            return new CharacterHit(_offsetToFirstCharacter + cluster, trailingLength);
+        }
+
+        /// <summary>
+        /// Gets a glyph's width.
+        /// </summary>
+        /// <param name="index">The glyph index.</param>
+        /// <param name="cluster">The current cluster.</param>
+        /// <returns>The glyph's width.</returns>
+        private double GetGlyphAdvance(int index, out int cluster)
+        {
+            cluster = GlyphClusters != null ? GlyphClusters[index] : index;
+
+            if (GlyphAdvances != null)
+            {
+                return GlyphAdvances[index];
+            }
+
+            var glyph = GlyphIndices[index];
+
+            return GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+        }
+
+        /// <summary>
+        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <returns>The baseline origin.</returns>
+        private Point CalculateBaselineOrigin()
+        {
+            return new Point(0, -GlyphTypeface.Metrics.Ascent * Scale);
+        }
+
+        private GlyphRunMetrics CreateGlyphRunMetrics()
+        {
+            var firstCluster = 0;
+            var lastCluster = Characters.Length - 1;
+
+            if (!IsLeftToRight)
+            {
+                var cluster = firstCluster;
+                firstCluster = lastCluster;
+                lastCluster = cluster;
+            }
+
+            if (GlyphClusters != null && GlyphClusters.Count > 0)
+            {
+                firstCluster = GlyphClusters[0];
+                lastCluster = GlyphClusters[GlyphClusters.Count - 1];
+
+                _offsetToFirstCharacter = Math.Max(0, Characters.Start - firstCluster);
+            }
+
+            var isReversed = firstCluster > lastCluster;
+            var height = GlyphTypeface.Metrics.LineSpacing * Scale;
+            var widthIncludingTrailingWhitespace = 0d;
+
+            var trailingWhitespaceLength = GetTrailingWhitespaceLength(isReversed, out var newLineLength, out var glyphCount);
+
+            for (var index = 0; index < GlyphIndices.Count; index++)
+            {
+                var advance = GetGlyphAdvance(index, out _);
+
+                widthIncludingTrailingWhitespace += advance;
+            }
+
+            var width = widthIncludingTrailingWhitespace;
+
+            if (isReversed)
+            {
+                for (var index = 0; index < glyphCount; index++)
+                {
+                    width -= GetGlyphAdvance(index, out _);
+                }
+            }
+            else
+            {
+                for (var index = GlyphIndices.Count - glyphCount; index < GlyphIndices.Count; index++)
+                {
+                    width -= GetGlyphAdvance(index, out _);
+                }
+            }
+
+            return new GlyphRunMetrics(width, widthIncludingTrailingWhitespace, trailingWhitespaceLength, newLineLength,
+                height);
+        }
+
+        private int GetTrailingWhitespaceLength(bool isReversed, out int newLineLength, out int glyphCount)
+        {          
+            if (isReversed)
+            {
+                return GetTralingWhitespaceLengthRightToLeft(out newLineLength, out glyphCount);
+            }
+
+            glyphCount = 0;
+            newLineLength = 0;
+            var trailingWhitespaceLength = 0;
+
+            if (GlyphClusters == null)
+            {
+                for (var i = _characters.Length - 1; i >= 0;)
+                {
+                    var codepoint = Codepoint.ReadAt(_characters, i, out var count);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength++;
+                    }
+
+                    trailingWhitespaceLength++;
+
+                    i -= count;
+                    glyphCount++;
+                }
+            }
+            else
+            {
+                for (var i = GlyphClusters.Count - 1; i >= 0; i--)
+                {
+                    var currentCluster = GlyphClusters[i];
+                    var characterIndex = Math.Max(0, currentCluster - _characters.BufferOffset);
+                    var codepoint = Codepoint.ReadAt(_characters, characterIndex, out _);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    var clusterLength = 1;
+
+                    while(i - 1 >= 0)
+                    {
+                        var nextCluster = GlyphClusters[i - 1];
+
+                        if(currentCluster == nextCluster)
+                        {
+                            clusterLength++;
+                            i--;
+
+                            continue;
+                        }
+
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength += clusterLength;
+                    }
+
+                    trailingWhitespaceLength += clusterLength;
+                   
+                    glyphCount++;                   
+                }
+            }
+
+            return trailingWhitespaceLength;
+        }
+
+        private int GetTralingWhitespaceLengthRightToLeft(out int newLineLength, out int glyphCount)
+        {
+            glyphCount = 0;
+            newLineLength = 0;
+            var trailingWhitespaceLength = 0;
+
+            if (GlyphClusters == null)
+            {
+                for (var i = 0; i < Characters.Length;)
+                {
+                    var codepoint = Codepoint.ReadAt(_characters, i, out var count);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength++;
+                    }
+
+                    trailingWhitespaceLength++;
+
+                    i += count;
+                    glyphCount++;
+                }
+            }
+            else
+            {
+                for (var i = 0; i < GlyphClusters.Count; i++)
+                {
+                    var currentCluster = GlyphClusters[i];
+                    var characterIndex = Math.Max(0, currentCluster - _characters.BufferOffset);
+                    var codepoint = Codepoint.ReadAt(_characters, characterIndex, out _);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    var clusterLength = 1;
+
+                    var j = i;
+
+                    while (j - 1 >= 0)
+                    {
+                        var nextCluster = GlyphClusters[--j];
+
+                        if (currentCluster == nextCluster)
+                        {
+                            clusterLength++;                        
+
+                            continue;
+                        }
+
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength += clusterLength;
+                    }
+
+                    trailingWhitespaceLength += clusterLength;
+
+                    glyphCount += clusterLength;
+                }
+            }
+
+            return trailingWhitespaceLength;
+        }
+
+        private void Set<T>(ref T field, T value)
+        {
+            _glyphRunImpl?.Dispose();
+
+            _glyphRunImpl = null;
+
+            _glyphRunMetrics = null;
+
+            _baselineOrigin = null;
+
+            field = value;
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="GlyphRun"/>.
+        /// </summary>
+        private void Initialize()
+        {
+            if (GlyphIndices == null)
+            {
+                throw new InvalidOperationException();
+            }
+
+            var glyphCount = GlyphIndices.Count;
+
+            if (GlyphAdvances != null && GlyphAdvances.Count > 0 && GlyphAdvances.Count != glyphCount)
+            {
+                throw new InvalidOperationException();
+            }
+
+            if (GlyphOffsets != null && GlyphOffsets.Count > 0 && GlyphOffsets.Count != glyphCount)
+            {
+                throw new InvalidOperationException();
+            }
+
+            _glyphRunImpl = CreateGlyphRunImpl();
+        }
+
+        private IGlyphRunImpl CreateGlyphRunImpl()
+        {
+            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+
+            return platformRenderInterface.CreateGlyphRun(GlyphTypeface, FontRenderingEmSize, GlyphIndices, GlyphAdvances, GlyphOffsets);
+        }
+
+        void IDisposable.Dispose()
+        {
+            _glyphRunImpl?.Dispose();
+        }
+
+        private class ReverseComparer<T> : IComparer<T>
+        {
+            public int Compare(T? x, T? y)
+            {
+                return Comparer<T>.Default.Compare(y, x);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/GlyphRunDrawing.cs b/src/Avalonia.Base/Media/GlyphRunDrawing.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GlyphRunDrawing.cs
rename to src/Avalonia.Base/Media/GlyphRunDrawing.cs
diff --git a/src/Avalonia.Visuals/Media/GlyphRunMetrics.cs b/src/Avalonia.Base/Media/GlyphRunMetrics.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GlyphRunMetrics.cs
rename to src/Avalonia.Base/Media/GlyphRunMetrics.cs
diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Base/Media/GradientBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GradientBrush.cs
rename to src/Avalonia.Base/Media/GradientBrush.cs
diff --git a/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs b/src/Avalonia.Base/Media/GradientSpreadMethod.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GradientSpreadMethod.cs
rename to src/Avalonia.Base/Media/GradientSpreadMethod.cs
diff --git a/src/Avalonia.Visuals/Media/GradientStop.cs b/src/Avalonia.Base/Media/GradientStop.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GradientStop.cs
rename to src/Avalonia.Base/Media/GradientStop.cs
diff --git a/src/Avalonia.Base/Media/GradientStops.cs b/src/Avalonia.Base/Media/GradientStops.cs
new file mode 100644
index 0000000000..c3d0bb5ceb
--- /dev/null
+++ b/src/Avalonia.Base/Media/GradientStops.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Collections;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A collection of <see cref="GradientStop"/>s.
+    /// </summary>
+    public class GradientStops : AvaloniaList<GradientStop>
+    {
+        public GradientStops()
+        {
+            ResetBehavior = ResetBehavior.Remove;
+        }
+
+        public IReadOnlyList<ImmutableGradientStop> ToImmutable()
+        {
+            return this.Select(x => new ImmutableGradientStop(x.Offset, x.Color)).ToArray();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/HslColor.cs b/src/Avalonia.Base/Media/HslColor.cs
new file mode 100644
index 0000000000..425a3138c3
--- /dev/null
+++ b/src/Avalonia.Base/Media/HslColor.cs
@@ -0,0 +1,513 @@
+// Color conversion portions of this source file are adapted from the Windows Community Toolkit project.
+// (https://github.com/CommunityToolkit/WindowsCommunityToolkit)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Globalization;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines a color using the hue/saturation/lightness (HSL) model.
+    /// This uses a cylindrical-coordinate representation of a color.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct HslColor : IEquatable<HslColor>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HslColor"/> struct.
+        /// </summary>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="lightness">The Lightness component in the range from 0..1.</param>
+        public HslColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double lightness)
+        {
+            A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+            H = MathUtilities.Clamp(hue,        0.0, 360.0);
+            S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+            L = MathUtilities.Clamp(lightness,  0.0, 1.0);
+
+            // The maximum value of Hue is technically 360 minus epsilon (just below 360).
+            // This is because, in a color circle, 360 degrees is equivalent to 0 degrees.
+            // However, that is too tricky to work with in code and isn't as intuitive.
+            // Therefore, since 360 == 0, just wrap 360 if needed back to 0.
+            H = (H == 360.0 ? 0 : H);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HslColor"/> struct.
+        /// </summary>
+        /// <remarks>
+        /// This constructor exists only for internal use where performance is critical.
+        /// Whether or not the component values are in the correct ranges must be known.
+        /// </remarks>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="lightness">The Lightness component in the range from 0..1.</param>
+        /// <param name="clampValues">Whether to clamp component values to their required ranges.</param>
+        internal HslColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double lightness,
+            bool clampValues)
+        {
+            if (clampValues)
+            {
+                A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+                H = MathUtilities.Clamp(hue,        0.0, 360.0);
+                S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+                L = MathUtilities.Clamp(lightness,  0.0, 1.0);
+
+                // See comments in constructor above
+                H = (H == 360.0 ? 0 : H);
+            }
+            else
+            {
+                A = alpha;
+                H = hue;
+                S = saturation;
+                L = lightness;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HslColor"/> struct.
+        /// </summary>
+        /// <param name="color">The RGB color to convert to HSL.</param>
+        public HslColor(Color color)
+        {
+            var hsl = Color.ToHsl(color);
+
+            A = hsl.A;
+            H = hsl.H;
+            S = hsl.S;
+            L = hsl.L;
+        }
+
+        /// <summary>
+        /// Gets the Alpha (transparency) component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully transparent.</item>
+        ///   <item>1 is fully opaque.</item>
+        /// </list>
+        /// </remarks>
+        public double A { get; }
+
+        /// <summary>
+        /// Gets the Hue component in the range from 0..360 (degrees).
+        /// This is the color's location, in degrees, on a color wheel/circle from 0 to 360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0/360 degrees is Red.</item>
+        ///   <item>60 degrees is Yellow.</item>
+        ///   <item>120 degrees is Green.</item>
+        ///   <item>180 degrees is Cyan.</item>
+        ///   <item>240 degrees is Blue.</item>
+        ///   <item>300 degrees is Magenta.</item>
+        /// </list>
+        /// </remarks>
+        public double H { get; }
+
+        /// <summary>
+        /// Gets the Saturation component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is a shade of gray (no color).</item>
+        ///   <item>1 is the full color.</item>
+        /// </list>
+        /// </remarks>
+        public double S { get; }
+
+        /// <summary>
+        /// Gets the Lightness component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully black.</item>
+        ///   <item>1 is fully white.</item>
+        /// </list>
+        /// </remarks>
+        public double L { get; }
+
+        /// <inheritdoc/>
+        public bool Equals(HslColor other)
+        {
+            return other.A == A &&
+                   other.H == H &&
+                   other.S == S &&
+                   other.L == L;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            if (obj is HslColor hslColor)
+            {
+                return Equals(hslColor);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a hashcode for this object.
+        /// Hashcode is not guaranteed to be unique.
+        /// </summary>
+        /// <returns>The hashcode for this object.</returns>
+        public override int GetHashCode()
+        {
+            // Same algorithm as Color
+            // This is used instead of HashCode.Combine() due to .NET Standard 2.0 requirements
+            unchecked
+            {
+                int hashCode = A.GetHashCode();
+                hashCode = (hashCode * 397) ^ H.GetHashCode();
+                hashCode = (hashCode * 397) ^ S.GetHashCode();
+                hashCode = (hashCode * 397) ^ L.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// Returns the RGB color model equivalent of this HSL color.
+        /// </summary>
+        /// <returns>The RGB equivalent color.</returns>
+        public Color ToRgb()
+        {
+            // Use the by-component conversion method directly for performance
+            return HslColor.ToRgb(H, S, L, A);
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            var sb = StringBuilderCache.Acquire();
+
+            // Use a format similar to CSS. However:
+            //   - To ensure precision is never lost, allow decimal places.
+            //     This is especially important for round-trip serialization.
+            //   - To maintain numerical consistency, do not use percent.
+            //
+            // Example:
+            //
+            // hsla(hue, saturation, lightness, alpha)
+            // hsla(230, 1.0, 0.5, 1.0)
+            //
+
+            sb.Append("hsva(");
+            sb.Append(H.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(S.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(L.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(A.ToString(CultureInfo.InvariantCulture));
+            sb.Append(')');
+
+            return StringBuilderCache.GetStringAndRelease(sb);
+        }
+
+        /// <summary>
+        /// Parses an HSL color string.
+        /// </summary>
+        /// <param name="s">The HSL color string to parse.</param>
+        /// <returns>The parsed <see cref="HslColor"/>.</returns>
+        public static HslColor Parse(string s)
+        {
+            if (s is null)
+            {
+                throw new ArgumentNullException(nameof(s));
+            }
+
+            if (TryParse(s, out HslColor hslColor))
+            {
+                return hslColor;
+            }
+
+            throw new FormatException($"Invalid HSL color string: '{s}'.");
+        }
+
+        /// <summary>
+        /// Parses an HSL color string.
+        /// </summary>
+        /// <param name="s">The HSL color string to parse.</param>
+        /// <param name="hslColor">The parsed <see cref="HslColor"/>.</param>
+        /// <returns>True if parsing was successful; otherwise, false.</returns>
+        public static bool TryParse(string s, out HslColor hslColor)
+        {
+            bool prefixMatched = false;
+
+            hslColor = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            string workingString = s.Trim();
+
+            if (workingString.Length == 0 ||
+                workingString.IndexOf(",", StringComparison.Ordinal) < 0)
+            {
+                return false;
+            }
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible format is "hsl(0,0,0)", Length = 10.
+
+            if (workingString.Length >= 11 &&
+                workingString.StartsWith("hsla(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(5, workingString.Length - 6);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false &&
+                workingString.Length >= 10 &&
+                workingString.StartsWith("hsl(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(4, workingString.Length - 5);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false)
+            {
+                return false;
+            }
+
+            string[] components = workingString.Split(',');
+
+            if (components.Length == 3) // HSL
+            {
+                if (components[0].AsSpan().TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1].AsSpan(), out double saturation) &&
+                    TryInternalParse(components[2].AsSpan(), out double lightness))
+                {
+                    hslColor = new HslColor(1.0, hue, saturation, lightness);
+                    return true;
+                }
+            }
+            else if (components.Length == 4) // HSLA
+            {
+                if (components[0].AsSpan().TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1].AsSpan(), out double saturation) &&
+                    TryInternalParse(components[2].AsSpan(), out double lightness) &&
+                    TryInternalParse(components[3].AsSpan(), out double alpha))
+                {
+                    hslColor = new HslColor(alpha, hue, saturation, lightness);
+                    return true;
+                }
+            }
+
+            // Local function to specially parse a double value with an optional percentage sign
+            bool TryInternalParse(ReadOnlySpan<char> inString, out double outDouble)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%".AsSpan(), StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = inString.Slice(0, percentIndex).TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                         out double percentage);
+
+                    outDouble = percentage / 100.0;
+                    return result;
+                }
+                else
+                {
+                    return inString.TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                        out outDouble);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HslColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="a">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="l">The Lightness component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HslColor"/> built from the individual color component values.</returns>
+        public static HslColor FromAhsl(double a, double h, double s, double l)
+        {
+            return new HslColor(a, h, s, l);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HslColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="l">The Lightness component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HslColor"/> built from the individual color component values.</returns>
+        public static HslColor FromHsl(double h, double s, double l)
+        {
+            return new HslColor(1.0, h, s, l);
+        }
+
+        /// <summary>
+        /// Converts the given HSL color to its RGB color equivalent.
+        /// </summary>
+        /// <param name="hslColor">The color in the HSL color model.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSLA values.</returns>
+        public static Color ToRgb(HslColor hslColor)
+        {
+            return HslColor.ToRgb(hslColor.H, hslColor.S, hslColor.L, hslColor.A);
+        }
+
+        /// <summary>
+        /// Converts the given HSLA color component values to their RGB color equivalent.
+        /// </summary>
+        /// <param name="hue">The Hue component in the HSL color model in the range from 0..360.</param>
+        /// <param name="saturation">The Saturation component in the HSL color model in the range from 0..1.</param>
+        /// <param name="lightness">The Lightness component in the HSL color model in the range from 0..1.</param>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSLA values.</returns>
+        public static Color ToRgb(
+            double hue,
+            double saturation,
+            double lightness,
+            double alpha = 1.0)
+        {
+            // Note: Conversion code is originally based on ColorHelper in the Windows Community Toolkit (licensed MIT)
+            // https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp/Helpers/ColorHelper.cs
+            // It has been modified to ensure input ranges and not throw exceptions.
+
+            // We want the hue to be between 0 and 359,
+            // so we first ensure that that's the case.
+            while (hue >= 360.0)
+            {
+                hue -= 360.0;
+            }
+
+            while (hue < 0.0)
+            {
+                hue += 360.0;
+            }
+
+            // We similarly clamp saturation, lightness and alpha between 0 and 1.
+            saturation = saturation < 0.0 ? 0.0 : saturation;
+            saturation = saturation > 1.0 ? 1.0 : saturation;
+
+            lightness = lightness < 0.0 ? 0.0 : lightness;
+            lightness = lightness > 1.0 ? 1.0 : lightness;
+
+            alpha = alpha < 0.0 ? 0.0 : alpha;
+            alpha = alpha > 1.0 ? 1.0 : alpha;
+
+            double chroma = (1 - Math.Abs((2 * lightness) - 1)) * saturation;
+            double h1 = hue / 60;
+            double x = chroma * (1 - Math.Abs((h1 % 2) - 1));
+            double m = lightness - (0.5 * chroma);
+            double r1, g1, b1;
+
+            if (h1 < 1)
+            {
+                r1 = chroma;
+                g1 = x;
+                b1 = 0;
+            }
+            else if (h1 < 2)
+            {
+                r1 = x;
+                g1 = chroma;
+                b1 = 0;
+            }
+            else if (h1 < 3)
+            {
+                r1 = 0;
+                g1 = chroma;
+                b1 = x;
+            }
+            else if (h1 < 4)
+            {
+                r1 = 0;
+                g1 = x;
+                b1 = chroma;
+            }
+            else if (h1 < 5)
+            {
+                r1 = x;
+                g1 = 0;
+                b1 = chroma;
+            }
+            else
+            {
+                r1 = chroma;
+                g1 = 0;
+                b1 = x;
+            }
+
+            return Color.FromArgb(
+                (byte)Math.Round(255 * alpha),
+                (byte)Math.Round(255 * (r1 + m)),
+                (byte)Math.Round(255 * (g1 + m)),
+                (byte)Math.Round(255 * (b1 + m)));
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HslColor"/> objects are equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are equal; otherwise, false.</returns>
+        public static bool operator ==(HslColor left, HslColor right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HslColor"/> objects are not equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are not equal; otherwise, false.</returns>
+        public static bool operator !=(HslColor left, HslColor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Explicit conversion from an <see cref="HslColor"/> to a <see cref="Color"/>.
+        /// </summary>
+        /// <param name="hslColor">The <see cref="HslColor"/> to convert.</param>
+        public static explicit operator Color(HslColor hslColor)
+        {
+            return hslColor.ToRgb();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/HsvColor.cs b/src/Avalonia.Base/Media/HsvColor.cs
new file mode 100644
index 0000000000..9f95b31518
--- /dev/null
+++ b/src/Avalonia.Base/Media/HsvColor.cs
@@ -0,0 +1,561 @@
+// Color conversion portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Globalization;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines a color using the hue/saturation/value (HSV) model.
+    /// This uses a cylindrical-coordinate representation of a color.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct HsvColor : IEquatable<HsvColor>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HsvColor"/> struct.
+        /// </summary>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="value">The Value component in the range from 0..1.</param>
+        public HsvColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double value)
+        {
+            A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+            H = MathUtilities.Clamp(hue,        0.0, 360.0);
+            S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+            V = MathUtilities.Clamp(value,      0.0, 1.0);
+
+            // The maximum value of Hue is technically 360 minus epsilon (just below 360).
+            // This is because, in a color circle, 360 degrees is equivalent to 0 degrees.
+            // However, that is too tricky to work with in code and isn't as intuitive.
+            // Therefore, since 360 == 0, just wrap 360 if needed back to 0.
+            H = (H == 360.0 ? 0 : H);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HsvColor"/> struct.
+        /// </summary>
+        /// <remarks>
+        /// This constructor exists only for internal use where performance is critical.
+        /// Whether or not the component values are in the correct ranges must be known.
+        /// </remarks>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="value">The Value component in the range from 0..1.</param>
+        /// <param name="clampValues">Whether to clamp component values to their required ranges.</param>
+        internal HsvColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double value,
+            bool clampValues)
+        {
+            if (clampValues)
+            {
+                A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+                H = MathUtilities.Clamp(hue,        0.0, 360.0);
+                S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+                V = MathUtilities.Clamp(value,      0.0, 1.0);
+
+                // See comments in constructor above
+                H = (H == 360.0 ? 0 : H);
+            }
+            else
+            {
+                A = alpha;
+                H = hue;
+                S = saturation;
+                V = value;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HsvColor"/> struct.
+        /// </summary>
+        /// <param name="color">The RGB color to convert to HSV.</param>
+        public HsvColor(Color color)
+        {
+            var hsv = Color.ToHsv(color);
+
+            A = hsv.A;
+            H = hsv.H;
+            S = hsv.S;
+            V = hsv.V;
+        }
+
+        /// <summary>
+        /// Gets the Alpha (transparency) component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully transparent.</item>
+        ///   <item>1 is fully opaque.</item>
+        /// </list>
+        /// </remarks>
+        public double A { get; }
+
+        /// <summary>
+        /// Gets the Hue component in the range from 0..360 (degrees).
+        /// This is the color's location, in degrees, on a color wheel/circle from 0 to 360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0/360 degrees is Red.</item>
+        ///   <item>60 degrees is Yellow.</item>
+        ///   <item>120 degrees is Green.</item>
+        ///   <item>180 degrees is Cyan.</item>
+        ///   <item>240 degrees is Blue.</item>
+        ///   <item>300 degrees is Magenta.</item>
+        /// </list>
+        /// </remarks>
+        public double H { get; }
+
+        /// <summary>
+        /// Gets the Saturation component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is a shade of gray (no color).</item>
+        ///   <item>1 is the full color.</item>
+        /// </list>
+        /// </remarks>
+        public double S { get; }
+
+        /// <summary>
+        /// Gets the Value (or Brightness/Intensity) component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully black and shows no color.</item>
+        ///   <item>1 is the brightest and shows full color.</item>
+        /// </list>
+        /// </remarks>
+        public double V { get; }
+
+        /// <inheritdoc/>
+        public bool Equals(HsvColor other)
+        {
+            return other.A == A &&
+                   other.H == H &&
+                   other.S == S &&
+                   other.V == V;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            if (obj is HsvColor hsvColor)
+            {
+                return Equals(hsvColor);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a hashcode for this object.
+        /// Hashcode is not guaranteed to be unique.
+        /// </summary>
+        /// <returns>The hashcode for this object.</returns>
+        public override int GetHashCode()
+        {
+            // Same algorithm as Color
+            // This is used instead of HashCode.Combine() due to .NET Standard 2.0 requirements
+            unchecked
+            {
+                int hashCode = A.GetHashCode();
+                hashCode = (hashCode * 397) ^ H.GetHashCode();
+                hashCode = (hashCode * 397) ^ S.GetHashCode();
+                hashCode = (hashCode * 397) ^ V.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// Returns the RGB color model equivalent of this HSV color.
+        /// </summary>
+        /// <returns>The RGB equivalent color.</returns>
+        public Color ToRgb()
+        {
+            // Use the by-component conversion method directly for performance
+            return HsvColor.ToRgb(H, S, V, A);
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            var sb = StringBuilderCache.Acquire();
+
+            // Use a format similar to CSS. However:
+            //   - To ensure precision is never lost, allow decimal places.
+            //     This is especially important for round-trip serialization.
+            //   - To maintain numerical consistency, do not use percent.
+            //
+            // Example:
+            //
+            // hsva(hue, saturation, value, alpha)
+            // hsva(230, 1.0, 0.5, 1.0)
+            //
+
+            sb.Append("hsva(");
+            sb.Append(H.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(S.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(V.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(A.ToString(CultureInfo.InvariantCulture));
+            sb.Append(')');
+
+            return StringBuilderCache.GetStringAndRelease(sb);
+        }
+
+        /// <summary>
+        /// Parses an HSV color string.
+        /// </summary>
+        /// <param name="s">The HSV color string to parse.</param>
+        /// <returns>The parsed <see cref="HsvColor"/>.</returns>
+        public static HsvColor Parse(string s)
+        {
+            if (s is null)
+            {
+                throw new ArgumentNullException(nameof(s));
+            }
+
+            if (TryParse(s, out HsvColor hsvColor))
+            {
+                return hsvColor;
+            }
+
+            throw new FormatException($"Invalid HSV color string: '{s}'.");
+        }
+
+        /// <summary>
+        /// Parses an HSV color string.
+        /// </summary>
+        /// <param name="s">The HSV color string to parse.</param>
+        /// <param name="hsvColor">The parsed <see cref="HsvColor"/>.</param>
+        /// <returns>True if parsing was successful; otherwise, false.</returns>
+        public static bool TryParse(string s, out HsvColor hsvColor)
+        {
+            bool prefixMatched = false;
+
+            hsvColor = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            string workingString = s.Trim();
+
+            if (workingString.Length == 0 ||
+                workingString.IndexOf(",", StringComparison.Ordinal) < 0)
+            {
+                return false;
+            }
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible format is "hsv(0,0,0)", Length = 10.
+
+            if (workingString.Length >= 11 &&
+                workingString.StartsWith("hsva(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(5, workingString.Length - 6);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false &&
+                workingString.Length >= 10 &&
+                workingString.StartsWith("hsv(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(4, workingString.Length - 5);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false)
+            {
+                return false;
+            }
+
+            string[] components = workingString.Split(',');
+
+            if (components.Length == 3) // HSV
+            {
+                if (components[0].AsSpan().TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1].AsSpan(), out double saturation) &&
+                    TryInternalParse(components[2].AsSpan(), out double value))
+                {
+                    hsvColor = new HsvColor(1.0, hue, saturation, value);
+                    return true;
+                }
+            }
+            else if (components.Length == 4) // HSVA
+            {
+                if (components[0].AsSpan().TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1].AsSpan(), out double saturation) &&
+                    TryInternalParse(components[2].AsSpan(), out double value) &&
+                    TryInternalParse(components[3].AsSpan(), out double alpha))
+                {
+                    hsvColor = new HsvColor(alpha, hue, saturation, value);
+                    return true;
+                }
+            }
+
+            // Local function to specially parse a double value with an optional percentage sign
+            bool TryInternalParse(ReadOnlySpan<char> inString, out double outDouble)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%".AsSpan(), StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = inString.Slice(0, percentIndex).TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                         out double percentage);
+
+                    outDouble = percentage / 100.0;
+                    return result;
+                }
+                else
+                {
+                    return inString.TryParseDouble(NumberStyles.Number, CultureInfo.InvariantCulture,
+                        out outDouble);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HsvColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="a">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="v">The Value component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> built from the individual color component values.</returns>
+        public static HsvColor FromAhsv(double a, double h, double s, double v)
+        {
+            return new HsvColor(a, h, s, v);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HsvColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="v">The Value component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> built from the individual color component values.</returns>
+        public static HsvColor FromHsv(double h, double s, double v)
+        {
+            return new HsvColor(1.0, h, s, v);
+        }
+
+        /// <summary>
+        /// Converts the given HSV color to its RGB color equivalent.
+        /// </summary>
+        /// <param name="hsvColor">The color in the HSV color model.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSVA values.</returns>
+        public static Color ToRgb(HsvColor hsvColor)
+        {
+            return HsvColor.ToRgb(hsvColor.H, hsvColor.S, hsvColor.V, hsvColor.A);
+        }
+
+        /// <summary>
+        /// Converts the given HSVA color component values to their RGB color equivalent.
+        /// </summary>
+        /// <param name="hue">The Hue component in the HSV color model in the range from 0..360.</param>
+        /// <param name="saturation">The Saturation component in the HSV color model in the range from 0..1.</param>
+        /// <param name="value">The Value component in the HSV color model in the range from 0..1.</param>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSVA values.</returns>
+        public static Color ToRgb(
+            double hue,
+            double saturation,
+            double value,
+            double alpha = 1.0)
+        {
+            // Note: Conversion code is originally based on the C++ in WinUI (licensed MIT)
+            // https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/Common/ColorConversion.cpp
+            // This was used because it is the best documented and likely most optimized for performance
+            // Alpha support was added
+
+            // We want the hue to be between 0 and 359,
+            // so we first ensure that that's the case.
+            while (hue >= 360.0)
+            {
+                hue -= 360.0;
+            }
+
+            while (hue < 0.0)
+            {
+                hue += 360.0;
+            }
+
+            // We similarly clamp saturation, value and alpha between 0 and 1.
+            saturation = saturation < 0.0 ? 0.0 : saturation;
+            saturation = saturation > 1.0 ? 1.0 : saturation;
+
+            value = value < 0.0 ? 0.0 : value;
+            value = value > 1.0 ? 1.0 : value;
+
+            alpha = alpha < 0.0 ? 0.0 : alpha;
+            alpha = alpha > 1.0 ? 1.0 : alpha;
+
+            // The first thing that we need to do is to determine the chroma (see above for its definition).
+            // Remember from above that:
+            //
+            // 1. The chroma is the difference between the maximum and the minimum of the RGB channels,
+            // 2. The value is the maximum of the RGB channels, and
+            // 3. The saturation comes from dividing the chroma by the maximum of the RGB channels (i.e., the value).
+            //
+            // From these facts, you can see that we can retrieve the chroma by simply multiplying the saturation and the value,
+            // and we can retrieve the minimum of the RGB channels by subtracting the chroma from the value.
+            var chroma = saturation * value;
+            var min = value - chroma;
+
+            // If the chroma is zero, then we have a greyscale color.  In that case, the maximum and the minimum RGB channels
+            // have the same value (and, indeed, all of the RGB channels are the same), so we can just immediately return
+            // the minimum value as the value of all the channels.
+            if (chroma == 0)
+            {
+                return Color.FromArgb(
+                    (byte)Math.Round(alpha * 255),
+                    (byte)Math.Round(min * 255),
+                    (byte)Math.Round(min * 255),
+                    (byte)Math.Round(min * 255));
+            }
+
+            // If the chroma is not zero, then we need to continue.  The first step is to figure out
+            // what section of the color wheel we're located in.  In order to do that, we'll divide the hue by 60.
+            // The resulting value means we're in one of the following locations:
+            //
+            // 0 - Between red and yellow.
+            // 1 - Between yellow and green.
+            // 2 - Between green and cyan.
+            // 3 - Between cyan and blue.
+            // 4 - Between blue and purple.
+            // 5 - Between purple and red.
+            //
+            // In each of these sextants, one of the RGB channels is completely present, one is partially present, and one is not present.
+            // For example, as we transition between red and yellow, red is completely present, green is becoming increasingly present, and blue is not present.
+            // Then, as we transition from yellow and green, green is now completely present, red is becoming decreasingly present, and blue is still not present.
+            // As we transition from green to cyan, green is still completely present, blue is becoming increasingly present, and red is no longer present.  And so on.
+            //
+            // To convert from hue to RGB value, we first need to figure out which of the three channels is in which configuration
+            // in the sextant that we're located in.  Next, we figure out what value the completely-present color should have.
+            // We know that chroma = (max - min), and we know that this color is the max color, so to find its value we simply add
+            // min to chroma to retrieve max.  Finally, we consider how far we've transitioned from the pure form of that color
+            // to the next color (e.g., how far we are from pure red towards yellow), and give a value to the partially present channel
+            // equal to the minimum plus the chroma (i.e., the max minus the min), multiplied by the percentage towards the new color.
+            // This gets us a value between the maximum and the minimum representing the partially present channel.
+            // Finally, the not-present color must be equal to the minimum value, since it is the one least participating in the overall color.
+            int sextant = (int)(hue / 60);
+            double intermediateColorPercentage = (hue / 60) - sextant;
+            double max = chroma + min;
+
+            double r = 0;
+            double g = 0;
+            double b = 0;
+
+            switch (sextant)
+            {
+                case 0:
+                    r = max;
+                    g = min + (chroma * intermediateColorPercentage);
+                    b = min;
+                    break;
+                case 1:
+                    r = min + (chroma * (1 - intermediateColorPercentage));
+                    g = max;
+                    b = min;
+                    break;
+                case 2:
+                    r = min;
+                    g = max;
+                    b = min + (chroma * intermediateColorPercentage);
+                    break;
+                case 3:
+                    r = min;
+                    g = min + (chroma * (1 - intermediateColorPercentage));
+                    b = max;
+                    break;
+                case 4:
+                    r = min + (chroma * intermediateColorPercentage);
+                    g = min;
+                    b = max;
+                    break;
+                case 5:
+                    r = max;
+                    g = min;
+                    b = min + (chroma * (1 - intermediateColorPercentage));
+                    break;
+            }
+
+            return Color.FromArgb(
+                (byte)Math.Round(alpha * 255),
+                (byte)Math.Round(r * 255),
+                (byte)Math.Round(g * 255),
+                (byte)Math.Round(b * 255));
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HsvColor"/> objects are equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are equal; otherwise, false.</returns>
+        public static bool operator ==(HsvColor left, HsvColor right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HsvColor"/> objects are not equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are not equal; otherwise, false.</returns>
+        public static bool operator !=(HsvColor left, HsvColor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Explicit conversion from an <see cref="HsvColor"/> to a <see cref="Color"/>.
+        /// </summary>
+        /// <param name="hsvColor">The <see cref="HsvColor"/> to convert.</param>
+        public static explicit operator Color(HsvColor hsvColor)
+        {
+            return hsvColor.ToRgb();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/IAffectsRender.cs b/src/Avalonia.Base/Media/IAffectsRender.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/IAffectsRender.cs
rename to src/Avalonia.Base/Media/IAffectsRender.cs
diff --git a/src/Avalonia.Base/Media/IBrush.cs b/src/Avalonia.Base/Media/IBrush.cs
new file mode 100644
index 0000000000..e32894f67c
--- /dev/null
+++ b/src/Avalonia.Base/Media/IBrush.cs
@@ -0,0 +1,28 @@
+using System.ComponentModel;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how an area is painted.
+    /// </summary>
+    [TypeConverter(typeof(BrushConverter))]
+    [NotClientImplementable]
+    public interface IBrush
+    {
+        /// <summary>
+        /// Gets the opacity of the brush.
+        /// </summary>
+        double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the origin of the brushes <see cref="Transform"/>
+        /// </summary>
+        RelativePoint TransformOrigin { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IConicGradientBrush.cs b/src/Avalonia.Base/Media/IConicGradientBrush.cs
new file mode 100644
index 0000000000..6a397b86d4
--- /dev/null
+++ b/src/Avalonia.Base/Media/IConicGradientBrush.cs
@@ -0,0 +1,22 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with a conic gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IConicGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Gets the center point for the gradient.
+        /// </summary>
+        RelativePoint Center { get; }
+
+        /// <summary>
+        /// Gets the starting angle for the gradient in degrees, measured from
+        /// the point above the center point.
+        /// </summary>
+        double Angle { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IDashStyle.cs b/src/Avalonia.Base/Media/IDashStyle.cs
new file mode 100644
index 0000000000..7208216603
--- /dev/null
+++ b/src/Avalonia.Base/Media/IDashStyle.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IDashStyle
+    {
+        /// <summary>
+        /// Gets or sets the length of alternating dashes and gaps.
+        /// </summary>
+        IReadOnlyList<double> Dashes { get; }
+
+        /// <summary>
+        /// Gets or sets how far in the dash sequence the stroke will start.
+        /// </summary>
+        double Offset { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/IExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..38048fb255
--- /dev/null
+++ b/src/Avalonia.Base/Media/IExperimentalAcrylicMaterial.cs
@@ -0,0 +1,36 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Experimental Interface for producing Acrylic-like materials.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IExperimentalAcrylicMaterial
+    {
+        /// <summary>
+        /// Gets the <see cref="AcrylicBackgroundSource"/> of the material.
+        /// </summary>
+        AcrylicBackgroundSource BackgroundSource { get; }
+
+        /// <summary>
+        /// Gets the TintColor of the material.
+        /// </summary>
+        Color TintColor { get; }
+
+        /// <summary>
+        /// Gets the TintOpacity of the material.
+        /// </summary>
+        double TintOpacity { get; }
+
+        /// <summary>
+        /// Gets the effective material color.
+        /// </summary>
+        Color MaterialColor { get; }        
+
+        /// <summary>
+        /// Gets the fallback color.
+        /// </summary>
+        Color FallbackColor { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IGlyphTypeface.cs b/src/Avalonia.Base/Media/IGlyphTypeface.cs
new file mode 100644
index 0000000000..9e1e52cb73
--- /dev/null
+++ b/src/Avalonia.Base/Media/IGlyphTypeface.cs
@@ -0,0 +1,94 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    [Unstable]
+    public interface IGlyphTypeface : IDisposable
+    {
+        /// <summary>
+        ///     Gets the number of glyphs held by this glyph typeface. 
+        /// </summary>
+        int GlyphCount { get; }
+
+        /// <summary>
+        ///     Gets the font metrics.
+        /// </summary>
+        /// <returns>
+        ///     The font metrics.
+        /// </returns>
+        FontMetrics Metrics { get; }
+
+        /// <summary>
+        ///     Gets the algorithmic style simulations applied to this glyph typeface.
+        /// </summary>
+        FontSimulations FontSimulations { get; }
+
+        /// <summary>
+        ///     Tries to get a glyph's metrics in em units.
+        /// </summary>
+        /// <param name="glyph">The glyph id.</param>
+        /// <param name="metrics">The glyph metrics.</param>
+        /// <returns>
+        ///   <c>true</c> if an glyph's metrics was found, <c>false</c> otherwise.
+        /// </returns>
+        bool TryGetGlyphMetrics(ushort glyph, out GlyphMetrics metrics);
+        
+        /// <summary>
+        ///     Returns an glyph index for the specified codepoint.
+        /// </summary>
+        /// <remarks>
+        ///     Returns <c>0</c> if a glyph isn't found.
+        /// </remarks>
+        /// <param name="codepoint">The codepoint.</param>
+        /// <returns>
+        ///     A glyph index.
+        /// </returns>
+        ushort GetGlyph(uint codepoint);
+
+        /// <summary>
+        ///     Tries to get an glyph index for specified codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint.</param>
+        /// <param name="glyph">A glyph index.</param>
+        /// <returns>
+        ///     <c>true</c> if an glyph index was found, <c>false</c> otherwise.
+        /// </returns>
+        bool TryGetGlyph(uint codepoint, out ushort glyph);
+
+        /// <summary>
+        ///     Returns an array of glyph indices. Codepoints that are not represented by the font are returned as <code>0</code>.
+        /// </summary>
+        /// <param name="codepoints">The codepoints to map.</param>
+        /// <returns>
+        ///     An array of glyph indices.
+        /// </returns>
+        ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints);
+
+        /// <summary>
+        ///     Returns the glyph advance for the specified glyph.
+        /// </summary>
+        /// <param name="glyph">The glyph.</param>
+        /// <returns>
+        ///     The advance.
+        /// </returns>
+        int GetGlyphAdvance(ushort glyph);
+
+        /// <summary>
+        ///     Returns an array of glyph advances in design em size.
+        /// </summary>
+        /// <param name="glyphs">The glyph indices.</param>
+        /// <returns>
+        ///     An array of glyph advances.
+        /// </returns>
+        int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs);
+
+        /// <summary>
+        ///     Returns the contents of the table data for the specified tag.
+        /// </summary>
+        /// <param name="tag">The table tag to get the data for.</param>
+        /// <param name="table">The contents of the table data for the specified tag.</param>
+        /// <returns>Returns <c>true</c> if the content exists, otherwise <c>false</c>.</returns>
+        bool TryGetTable(uint tag, out byte[] table);
+    }
+}
diff --git a/src/Avalonia.Base/Media/IGradientBrush.cs b/src/Avalonia.Base/Media/IGradientBrush.cs
new file mode 100644
index 0000000000..9b78a4af78
--- /dev/null
+++ b/src/Avalonia.Base/Media/IGradientBrush.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A brush that draws with a gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IGradientBrush : IBrush
+    {
+        /// <summary>
+        /// Gets the brush's gradient stops.
+        /// </summary>
+        IReadOnlyList<IGradientStop> GradientStops { get; }
+
+        /// <summary>
+        /// Gets the brush's spread method that defines how to draw a gradient that doesn't fill
+        /// the bounds of the destination control.
+        /// </summary>
+        GradientSpreadMethod SpreadMethod { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IGradientStop.cs b/src/Avalonia.Base/Media/IGradientStop.cs
new file mode 100644
index 0000000000..64b952f3bc
--- /dev/null
+++ b/src/Avalonia.Base/Media/IGradientStop.cs
@@ -0,0 +1,21 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes the location and color of a transition point in a gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IGradientStop
+    {
+        /// <summary>
+        /// Gets the gradient stop color.
+        /// </summary>
+        Color Color { get; }
+
+        /// <summary>
+        /// Gets the gradient stop offset.
+        /// </summary>
+        double Offset { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IImage.cs b/src/Avalonia.Base/Media/IImage.cs
new file mode 100644
index 0000000000..cbe25b7b58
--- /dev/null
+++ b/src/Avalonia.Base/Media/IImage.cs
@@ -0,0 +1,28 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a raster or vector image.
+    /// </summary>
+    public interface IImage
+    {
+        /// <summary>
+        /// Gets the size of the image, in device independent pixels.
+        /// </summary>
+        Size Size { get; }
+
+        /// <summary>
+        /// Draws the image to a <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        /// <param name="sourceRect">The rect in the image to draw.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        void Draw(
+            DrawingContext context,
+            Rect sourceRect,
+            Rect destRect,
+            BitmapInterpolationMode bitmapInterpolationMode);
+    }
+}
diff --git a/src/Avalonia.Base/Media/IImageBrush.cs b/src/Avalonia.Base/Media/IImageBrush.cs
new file mode 100644
index 0000000000..732f1957d0
--- /dev/null
+++ b/src/Avalonia.Base/Media/IImageBrush.cs
@@ -0,0 +1,17 @@
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IBitmap"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IImageBrush : ITileBrush
+    {
+        /// <summary>
+        /// Gets the image to draw.
+        /// </summary>
+        IBitmap Source { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/ILinearGradientBrush.cs b/src/Avalonia.Base/Media/ILinearGradientBrush.cs
new file mode 100644
index 0000000000..4f4a55db36
--- /dev/null
+++ b/src/Avalonia.Base/Media/ILinearGradientBrush.cs
@@ -0,0 +1,21 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A brush that draws with a linear gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILinearGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Gets or sets the start point for the gradient.
+        /// </summary>
+        RelativePoint StartPoint { get; }
+
+        /// <summary>
+        /// Gets or sets the end point for the gradient.
+        /// </summary>
+        RelativePoint EndPoint { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IMutableBrush.cs b/src/Avalonia.Base/Media/IMutableBrush.cs
new file mode 100644
index 0000000000..fef124ba36
--- /dev/null
+++ b/src/Avalonia.Base/Media/IMutableBrush.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a mutable brush which can return an immutable clone of itself.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMutableBrush : IBrush, IAffectsRender
+    {
+        /// <summary>
+        /// Creates an immutable clone of the brush.
+        /// </summary>
+        /// <returns>The immutable clone.</returns>
+        IBrush ToImmutable();
+    }
+}
diff --git a/src/Avalonia.Base/Media/IMutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/IMutableExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..f954a8c52a
--- /dev/null
+++ b/src/Avalonia.Base/Media/IMutableExperimentalAcrylicMaterial.cs
@@ -0,0 +1,17 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a mutable brush which can return an immutable clone of itself.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMutableExperimentalAcrylicMaterial : IExperimentalAcrylicMaterial, IAffectsRender
+    {
+        /// <summary>
+        /// Creates an immutable clone of the brush.
+        /// </summary>
+        /// <returns>The immutable clone.</returns>
+        IExperimentalAcrylicMaterial ToImmutable();
+    }
+}
diff --git a/src/Avalonia.Base/Media/IMutableTransform.cs b/src/Avalonia.Base/Media/IMutableTransform.cs
new file mode 100644
index 0000000000..22526eed17
--- /dev/null
+++ b/src/Avalonia.Base/Media/IMutableTransform.cs
@@ -0,0 +1,13 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    public interface IMutableTransform : ITransform
+    {
+        /// <summary>
+        /// Raised when the transform changes.
+        /// </summary>
+        event EventHandler Changed;
+    }
+}
diff --git a/src/Avalonia.Base/Media/IPen.cs b/src/Avalonia.Base/Media/IPen.cs
new file mode 100644
index 0000000000..eca1cb507a
--- /dev/null
+++ b/src/Avalonia.Base/Media/IPen.cs
@@ -0,0 +1,42 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how a stroke is drawn.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IPen
+    {
+        /// <summary>
+        /// Gets the brush used to draw the stroke.
+        /// </summary>
+        IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the style of dashed lines drawn with a <see cref="Pen"/> object.
+        /// </summary>
+        IDashStyle? DashStyle { get; }
+
+        /// <summary>
+        /// Gets the type of shape to use on both ends of a line.
+        /// </summary>
+        PenLineCap LineCap { get; }
+
+        /// <summary>
+        /// Gets a value describing how to join consecutive line or curve segments in a 
+        /// <see cref="PathFigure"/> contained in a <see cref="PathGeometry"/> object.
+        /// </summary>
+        PenLineJoin LineJoin { get; }
+
+        /// <summary>
+        /// Gets the limit of the thickness of the join on a mitered corner.
+        /// </summary>
+        double MiterLimit { get; }
+
+        /// <summary>
+        /// Gets the stroke thickness.
+        /// </summary>
+        double Thickness { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IRadialGradientBrush.cs b/src/Avalonia.Base/Media/IRadialGradientBrush.cs
new file mode 100644
index 0000000000..0f025e98bc
--- /dev/null
+++ b/src/Avalonia.Base/Media/IRadialGradientBrush.cs
@@ -0,0 +1,27 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with a radial gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IRadialGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Gets the start point for the gradient.
+        /// </summary>
+        RelativePoint Center { get; }
+
+        /// <summary>
+        /// Gets the location of the two-dimensional focal point that defines the beginning of the
+        /// gradient.
+        /// </summary>
+        RelativePoint GradientOrigin { get; }
+
+        /// <summary>
+        /// Gets the horizontal and vertical radius of the outermost circle of the radial gradient.
+        /// </summary>
+        double Radius { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/ISolidColorBrush.cs b/src/Avalonia.Base/Media/ISolidColorBrush.cs
new file mode 100644
index 0000000000..29e11210f1
--- /dev/null
+++ b/src/Avalonia.Base/Media/ISolidColorBrush.cs
@@ -0,0 +1,16 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Fills an area with a solid color.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ISolidColorBrush : IBrush
+    {
+        /// <summary>
+        /// Gets the color of the brush.
+        /// </summary>
+        Color Color { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/ITileBrush.cs b/src/Avalonia.Base/Media/ITileBrush.cs
new file mode 100644
index 0000000000..cb5a591003
--- /dev/null
+++ b/src/Avalonia.Base/Media/ITileBrush.cs
@@ -0,0 +1,51 @@
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A brush which displays a repeating image.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ITileBrush : IBrush
+    {
+        /// <summary>
+        /// Gets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        AlignmentX AlignmentX { get; }
+
+        /// <summary>
+        /// Gets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        AlignmentY AlignmentY { get; }
+
+        /// <summary>
+        /// Gets the rectangle on the destination in which to paint a tile.
+        /// </summary>
+        RelativeRect DestinationRect { get; }
+
+        /// <summary>
+        /// Gets the rectangle of the source image that will be displayed.
+        /// </summary>
+        RelativeRect SourceRect { get; }
+
+        /// <summary>
+        /// Gets a value indicating how the source rectangle will be stretched to fill the
+        /// destination rect.
+        /// </summary>
+        Stretch Stretch { get; }
+
+        /// <summary>
+        /// Gets the brush's tile mode.
+        /// </summary>
+        TileMode TileMode { get; }
+
+        /// <summary>
+        /// Gets the bitmap interpolation mode.
+        /// </summary>
+        /// <value>
+        /// The bitmap interpolation mode.
+        /// </value>
+        BitmapInterpolationMode BitmapInterpolationMode { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ITransform.cs b/src/Avalonia.Base/Media/ITransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ITransform.cs
rename to src/Avalonia.Base/Media/ITransform.cs
diff --git a/src/Avalonia.Base/Media/IVisualBrush.cs b/src/Avalonia.Base/Media/IVisualBrush.cs
new file mode 100644
index 0000000000..b8900bbd73
--- /dev/null
+++ b/src/Avalonia.Base/Media/IVisualBrush.cs
@@ -0,0 +1,17 @@
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IVisual"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IVisualBrush : ITileBrush
+    {
+        /// <summary>
+        /// Gets the visual to draw.
+        /// </summary>
+        IVisual Visual { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ImageBrush.cs b/src/Avalonia.Base/Media/ImageBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ImageBrush.cs
rename to src/Avalonia.Base/Media/ImageBrush.cs
diff --git a/src/Avalonia.Visuals/Media/ImageDrawing.cs b/src/Avalonia.Base/Media/ImageDrawing.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ImageDrawing.cs
rename to src/Avalonia.Base/Media/ImageDrawing.cs
diff --git a/src/Avalonia.Base/Media/Imaging/Bitmap.cs b/src/Avalonia.Base/Media/Imaging/Bitmap.cs
new file mode 100644
index 0000000000..ce38fc5abc
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/Bitmap.cs
@@ -0,0 +1,168 @@
+using System;
+using System.IO;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Holds a bitmap image.
+    /// </summary>
+    public class Bitmap : IBitmap
+    {
+        /// <summary>
+        /// Loads a Bitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
+        public static Bitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new Bitmap(GetFactory().LoadBitmapToWidth(stream, width, interpolationMode));
+        }
+
+        /// <summary>
+        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
+        public static Bitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new Bitmap(GetFactory().LoadBitmapToHeight(stream, height, interpolationMode));
+        }
+
+        /// <summary>
+        /// Creates a Bitmap scaled to a specified size from the current bitmap.
+        /// </summary>        
+        /// <param name="destinationSize">The destination size.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
+        public Bitmap CreateScaledBitmap(PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new Bitmap(GetFactory().ResizeBitmap(PlatformImpl.Item, destinationSize, interpolationMode));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="fileName">The filename of the bitmap.</param>
+        public Bitmap(string fileName)
+        {
+            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(fileName));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param>
+        public Bitmap(Stream stream)
+        {
+            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(stream));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="impl">A platform-specific bitmap implementation.</param>
+        public Bitmap(IRef<IBitmapImpl> impl)
+        {
+            PlatformImpl = impl.Clone();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="impl">A platform-specific bitmap implementation. Bitmap class takes the ownership.</param>
+        protected Bitmap(IBitmapImpl impl)
+        {
+            PlatformImpl = RefCountable.Create(impl);
+        }
+
+        /// <inheritdoc/>
+        public virtual void Dispose()
+        {
+            PlatformImpl.Dispose();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="format">The pixel format.</param>
+        /// <param name="alphaFormat">The alpha format.</param>
+        /// <param name="data">The pointer to the source bytes.</param>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="stride">The number of bytes per row.</param>
+        public Bitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(format, alphaFormat, data, size, dpi, stride));
+        }
+
+        /// <inheritdoc/>
+        public Vector Dpi => PlatformImpl.Item.Dpi;
+
+        /// <inheritdoc/>
+        public Size Size => PlatformImpl.Item.PixelSize.ToSizeWithDpi(Dpi);
+
+        /// <inheritdoc/>
+        public PixelSize PixelSize => PlatformImpl.Item.PixelSize;
+
+        /// <summary>
+        /// Gets the platform-specific bitmap implementation.
+        /// </summary>
+        public IRef<IBitmapImpl> PlatformImpl { get; }
+
+        /// <summary>
+        /// Saves the bitmap to a file.
+        /// </summary>
+        /// <param name="fileName">The filename.</param>
+        /// <param name="quality">
+        /// The optional quality for compression. 
+        /// The quality value is interpreted from 0 - 100. If quality is null the default quality 
+        /// setting is applied.
+        /// </param>
+        public void Save(string fileName, int? quality = null)
+        {
+            PlatformImpl.Item.Save(fileName, quality);
+        }
+
+        /// <summary>
+        /// Saves the bitmap to a stream.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="quality">
+        /// The optional quality for compression. 
+        /// The quality value is interpreted from 0 - 100. If quality is null the default quality 
+        /// setting is applied.
+        /// </param>
+        public void Save(Stream stream, int? quality = null)
+        {
+            PlatformImpl.Item.Save(stream, quality);
+        }
+
+        /// <inheritdoc/>
+        void IImage.Draw(
+            DrawingContext context,
+            Rect sourceRect,
+            Rect destRect,
+            BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            context.PlatformImpl.DrawBitmap(
+                PlatformImpl,
+                1,
+                sourceRect,
+                destRect,
+                bitmapInterpolationMode);
+        }
+
+        private static IPlatformRenderInterface GetFactory()
+        {
+            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/BitmapBlendingMode.cs b/src/Avalonia.Base/Media/Imaging/BitmapBlendingMode.cs
new file mode 100644
index 0000000000..eb39020939
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/BitmapBlendingMode.cs
@@ -0,0 +1,57 @@
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Controls the way the bitmaps are drawn together.
+    /// </summary>
+    public enum BitmapBlendingMode
+    {
+        /// <summary>
+        /// Source is placed over the destination.
+        /// </summary>
+        SourceOver,
+        /// <summary>
+        /// Only the source will be present.
+        /// </summary>
+        Source,
+        /// <summary>
+        /// Only the destination will be present.
+        /// </summary>
+        Destination,
+        /// <summary>
+        /// Destination is placed over the source.
+        /// </summary>
+        DestinationOver,
+        /// <summary>
+        /// The source that overlaps the destination, replaces the destination.
+        /// </summary>
+        SourceIn,
+        /// <summary>
+        /// Destination which overlaps the source, replaces the source.
+        /// </summary>
+        DestinationIn,
+        /// <summary>
+        /// Source is placed, where it falls outside of the destination.
+        /// </summary>
+        SourceOut,
+        /// <summary>
+        /// Destination is placed, where it falls outside of the source.
+        /// </summary>
+        DestinationOut,
+        /// <summary>
+        /// Source which overlaps the destination, replaces the destination.
+        /// </summary>
+        SourceAtop,
+        /// <summary>
+        /// Destination which overlaps the source replaces the source.
+        /// </summary>
+        DestinationAtop,
+        /// <summary>
+        /// The non-overlapping regions of source and destination are combined.
+        /// </summary>
+        Xor,
+        /// <summary>
+        /// Display the sum of the source image and destination image.
+        /// </summary>
+        Plus,
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/BitmapInterpolationMode.cs b/src/Avalonia.Base/Media/Imaging/BitmapInterpolationMode.cs
new file mode 100644
index 0000000000..7cdb5d8b9f
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/BitmapInterpolationMode.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Controls the performance and quality of bitmap scaling.
+    /// </summary>
+    public enum BitmapInterpolationMode
+    {
+        /// <summary>
+        /// Uses the default behavior of the underling render backend.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// The best performance but worst image quality.
+        /// </summary>
+        LowQuality,
+
+        /// <summary>
+        /// Good performance and decent image quality.
+        /// </summary>
+        MediumQuality,      
+
+        /// <summary>
+        /// Highest quality but worst performance.
+        /// </summary>
+        HighQuality
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
new file mode 100644
index 0000000000..70f9fbf567
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
@@ -0,0 +1,96 @@
+using System;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Crops a Bitmap.
+    /// </summary>
+    public class CroppedBitmap : AvaloniaObject, IImage, IAffectsRender, IDisposable
+    {
+        /// <summary>
+        /// Defines the <see cref="Source"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IImage?> SourceProperty =
+            AvaloniaProperty.Register<CroppedBitmap, IImage?>(nameof(Source));
+
+        /// <summary>
+        /// Defines the <see cref="SourceRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PixelRect> SourceRectProperty =
+            AvaloniaProperty.Register<CroppedBitmap, PixelRect>(nameof(SourceRect));
+
+        public event EventHandler? Invalidated;
+
+        static CroppedBitmap()
+        {
+            SourceRectProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceRectChanged(e));
+            SourceProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceChanged(e));
+        }
+
+        /// <summary>
+        /// Gets or sets the source for the bitmap.
+        /// </summary>
+        public IImage? Source
+        {
+            get => GetValue(SourceProperty);
+            set => SetValue(SourceProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangular area that the bitmap is cropped to.
+        /// </summary>
+        public PixelRect SourceRect
+        {
+            get => GetValue(SourceRectProperty);
+            set => SetValue(SourceRectProperty, value);
+        }
+
+        public CroppedBitmap()
+        {
+            Source = null;
+            SourceRect = default;
+        }
+
+        public CroppedBitmap(IImage source, PixelRect sourceRect)
+        {
+            Source = source;
+            SourceRect = sourceRect;
+        }
+
+        private void SourceChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.NewValue == null)
+                return;
+            if (!(e.NewValue is IBitmap))
+                throw new ArgumentException("Only IBitmap supported as source");
+            Invalidated?.Invoke(this, e);
+        }
+
+        private void SourceRectChanged(AvaloniaPropertyChangedEventArgs e) => Invalidated?.Invoke(this, e);
+
+        public virtual void Dispose()
+        {
+            (Source as IBitmap)?.Dispose();
+        }
+
+        public Size Size {
+            get
+            {
+                if (Source is not IBitmap bmp)
+                    return Size.Empty;
+                if (SourceRect.IsEmpty)
+                    return Source.Size;
+                return SourceRect.Size.ToSizeWithDpi(bmp.Dpi);
+            }
+        }
+
+        public void Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            if (Source is not IBitmap bmp)
+                return;
+            var topLeft = SourceRect.TopLeft.ToPointWithDpi(bmp.Dpi);
+            Source.Draw(context, sourceRect.Translate(new Vector(topLeft.X, topLeft.Y)), destRect, bitmapInterpolationMode);           
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/IBitmap.cs b/src/Avalonia.Base/Media/Imaging/IBitmap.cs
new file mode 100644
index 0000000000..e7d1862aa2
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/IBitmap.cs
@@ -0,0 +1,56 @@
+using System;
+using System.IO;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Represents a bitmap image.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IBitmap : IImage, IDisposable
+    {
+        /// <summary>
+        /// Gets the dots per inch (DPI) of the image.
+        /// </summary>
+        /// <remarks>
+        /// Note that Skia does not currently support reading the DPI of an image so this value
+        /// will always be 96dpi on Skia.
+        /// </remarks>
+        Vector Dpi { get; }
+
+        /// <summary>
+        /// Gets the size of the bitmap, in device pixels.
+        /// </summary>
+        PixelSize PixelSize { get; }
+
+        /// <summary>
+        /// Gets the platform-specific bitmap implementation.
+        /// </summary>
+        IRef<IBitmapImpl> PlatformImpl { get; }
+
+        /// <summary>
+        /// Saves the bitmap to a file.
+        /// </summary>
+        /// <param name="fileName">The filename.</param>
+        /// <param name="quality">
+        /// The optional quality for compression if supported by the specific backend. 
+        /// The quality value is interpreted from 0 - 100. If quality is null the default quality 
+        /// setting of the backend is applied.
+        /// </param>
+        void Save(string fileName, int? quality = null);
+
+        /// <summary>
+        /// Saves the bitmap to a stream in png format.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="quality">
+        /// The optional quality for compression if supported by the specific backend. 
+        /// The quality value is interpreted from 0 - 100. If quality is null the default quality 
+        /// setting of the backend is applied.
+        /// </param>
+        void Save(Stream stream, int? quality = null);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
rename to src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
diff --git a/src/Avalonia.Base/Media/Imaging/WriteableBitmap.cs b/src/Avalonia.Base/Media/Imaging/WriteableBitmap.cs
new file mode 100644
index 0000000000..1aac8efac7
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/WriteableBitmap.cs
@@ -0,0 +1,85 @@
+using System;
+using System.IO;
+using Avalonia.Platform;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Holds a writeable bitmap image.
+    /// </summary>
+    public class WriteableBitmap : Bitmap
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="format">The pixel format (optional).</param>
+        /// <param name="alphaFormat">The alpha format (optional).</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null, AlphaFormat? alphaFormat = null) 
+            : base(CreatePlatformImpl(size, dpi, format, alphaFormat))
+        {
+        }
+
+        private WriteableBitmap(IWriteableBitmapImpl impl) : base(impl)
+        {
+            
+        }
+
+        public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
+
+        public static WriteableBitmap Decode(Stream stream)
+        {
+            var ri = GetFactory();
+
+            return new WriteableBitmap(ri.LoadWriteableBitmap(stream));
+        }
+        
+        /// <summary>
+        /// Loads a WriteableBitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
+        public new static WriteableBitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            var ri = GetFactory();
+
+            return new WriteableBitmap(ri.LoadWriteableBitmapToWidth(stream, width, interpolationMode));
+        }
+
+        /// <summary>
+        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
+        public new static WriteableBitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            var ri = GetFactory();
+
+            return new WriteableBitmap(ri.LoadWriteableBitmapToHeight(stream, height, interpolationMode));
+        }
+
+        private static IBitmapImpl CreatePlatformImpl(PixelSize size, in Vector dpi, PixelFormat? format, AlphaFormat? alphaFormat)
+        {
+            var ri = GetFactory();
+
+            PixelFormat finalFormat = format ?? ri.DefaultPixelFormat;
+            AlphaFormat finalAlphaFormat = alphaFormat ?? ri.DefaultAlphaFormat;
+
+            return ri.CreateWriteableBitmap(size, dpi, finalFormat, finalAlphaFormat);
+        }
+
+        private static IPlatformRenderInterface GetFactory()
+        {
+            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableConicGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableConicGradientBrush.cs
new file mode 100644
index 0000000000..70232f0a63
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableConicGradientBrush.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a sweep gradient.
+    /// </summary>
+    public class ImmutableConicGradientBrush : ImmutableGradientBrush, IConicGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        /// <param name="center">The center point for the gradient.</param>
+        /// <param name="angle">The starting angle for the gradient.</param>
+        public ImmutableConicGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint? transformOrigin = null,
+            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
+            RelativePoint? center = null,
+            double angle = 0)
+            : base(gradientStops, opacity, transform, transformOrigin, spreadMethod)
+        {
+            Center = center ?? RelativePoint.Center;
+            Angle = angle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableConicGradientBrush(ConicGradientBrush source)
+            : base(source)
+        {
+            Center = source.Center;
+            Angle = source.Angle;
+        }
+
+        /// <inheritdoc/>
+        public RelativePoint Center { get; }
+
+        /// <inheritdoc/>
+        public double Angle { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs b/src/Avalonia.Base/Media/Immutable/ImmutableDashStyle.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutableDashStyle.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableGradientBrush.cs
new file mode 100644
index 0000000000..1e95acbf22
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableGradientBrush.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a gradient.
+    /// </summary>
+    public abstract class ImmutableGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        protected ImmutableGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity,
+            ImmutableTransform? transform,
+            RelativePoint? transformOrigin,
+            GradientSpreadMethod spreadMethod)
+        {
+            GradientStops = gradientStops;
+            Opacity = opacity;
+            Transform = transform;
+            TransformOrigin = transformOrigin.HasValue ? transformOrigin.Value : RelativePoint.TopLeft;
+            SpreadMethod = spreadMethod;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        protected ImmutableGradientBrush(GradientBrush source)
+            : this(source.GradientStops.ToImmutable(), source.Opacity, source.Transform?.ToImmutable(), 
+                  source.TransformOrigin, source.SpreadMethod)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public IReadOnlyList<IGradientStop> GradientStops { get; }
+
+        /// <inheritdoc/>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the transform origin of the brush
+        /// </summary>
+        public RelativePoint TransformOrigin { get; }
+
+        /// <inheritdoc/>
+        public GradientSpreadMethod SpreadMethod { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs b/src/Avalonia.Base/Media/Immutable/ImmutableGradientStop.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutableGradientStop.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableImageBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableImageBrush.cs
new file mode 100644
index 0000000000..f9892bf60c
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableImageBrush.cs
@@ -0,0 +1,66 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IBitmap"/>.
+    /// </summary>
+    internal class ImmutableImageBrush : ImmutableTileBrush, IImageBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
+        /// </summary>
+        /// <param name="source">The image to draw.</param>
+        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
+        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
+        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
+        /// <param name="stretch">
+        /// How the source rectangle will be stretched to fill the destination rect.
+        /// </param>
+        /// <param name="tileMode">The tile mode.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        public ImmutableImageBrush(
+            IBitmap source,
+            AlignmentX alignmentX = AlignmentX.Center,
+            AlignmentY alignmentY = AlignmentY.Center,
+            RelativeRect? destinationRect = null,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint transformOrigin = new RelativePoint(),
+            RelativeRect? sourceRect = null,
+            Stretch stretch = Stretch.Uniform,
+            TileMode tileMode = TileMode.None,
+            BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
+            : base(
+                  alignmentX,
+                  alignmentY,
+                  destinationRect ?? RelativeRect.Fill,
+                  opacity,
+                  transform,
+                  transformOrigin,
+                  sourceRect ?? RelativeRect.Fill,
+                  stretch,
+                  tileMode,
+                  bitmapInterpolationMode)
+        {
+            Source = source;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableImageBrush(IImageBrush source)
+            : base(source)
+        {
+            Source = source.Source;
+        }
+
+        /// <inheritdoc/>
+        public IBitmap Source { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableLinearGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableLinearGradientBrush.cs
new file mode 100644
index 0000000000..3c26b5c009
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableLinearGradientBrush.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a linear gradient.
+    /// </summary>
+    public class ImmutableLinearGradientBrush : ImmutableGradientBrush, ILinearGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        /// <param name="startPoint">The start point for the gradient.</param>
+        /// <param name="endPoint">The end point for the gradient.</param>
+        public ImmutableLinearGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint? transformOrigin = null,
+            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
+            RelativePoint? startPoint = null,
+            RelativePoint? endPoint = null)
+            : base(gradientStops, opacity, transform, transformOrigin, spreadMethod)
+        {
+            StartPoint = startPoint ?? RelativePoint.TopLeft;
+            EndPoint = endPoint ?? RelativePoint.BottomRight;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableLinearGradientBrush(LinearGradientBrush source)
+            : base(source)
+        {
+            StartPoint = source.StartPoint;
+            EndPoint = source.EndPoint;
+        }
+
+        /// <inheritdoc/>
+        public RelativePoint StartPoint { get; }
+
+        /// <inheritdoc/>
+        public RelativePoint EndPoint { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs b/src/Avalonia.Base/Media/Immutable/ImmutablePen.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutablePen.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableRadialGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableRadialGradientBrush.cs
new file mode 100644
index 0000000000..e08d2810f8
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableRadialGradientBrush.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a radial gradient.
+    /// </summary>
+    public class ImmutableRadialGradientBrush : ImmutableGradientBrush, IRadialGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        /// <param name="center">The start point for the gradient.</param>
+        /// <param name="gradientOrigin">
+        /// The location of the two-dimensional focal point that defines the beginning of the gradient.
+        /// </param>
+        /// <param name="radius">
+        /// The horizontal and vertical radius of the outermost circle of the radial gradient.
+        /// </param>
+        public ImmutableRadialGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint? transformOrigin = null,
+            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
+            RelativePoint? center = null,
+            RelativePoint? gradientOrigin = null,
+            double radius = 0.5)
+            : base(gradientStops, opacity, transform, transformOrigin, spreadMethod)
+        {
+            Center = center ?? RelativePoint.Center;
+            GradientOrigin = gradientOrigin ?? RelativePoint.Center;
+            Radius = radius;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableRadialGradientBrush(RadialGradientBrush source)
+            : base(source)
+        {
+            Center = source.Center;
+            GradientOrigin = source.GradientOrigin;
+            Radius = source.Radius;
+        }
+
+        /// <inheritdoc/>
+        public RelativePoint Center { get; }
+
+        /// <inheritdoc/>
+        public RelativePoint GradientOrigin { get; }
+
+        /// <inheritdoc/>
+        public double Radius { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableSolidColorBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableSolidColorBrush.cs
new file mode 100644
index 0000000000..6755dfd236
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableSolidColorBrush.cs
@@ -0,0 +1,100 @@
+using System;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Fills an area with a solid color.
+    /// </summary>
+    public class ImmutableSolidColorBrush : ISolidColorBrush, IEquatable<ImmutableSolidColorBrush>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
+        /// </summary>
+        /// <param name="color">The color to use.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        public ImmutableSolidColorBrush(Color color, double opacity = 1, ImmutableTransform? transform = null)
+        {
+            Color = color;
+            Opacity = opacity;
+            Transform = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
+        /// </summary>
+        /// <param name="color">The color to use.</param>
+        public ImmutableSolidColorBrush(uint color)
+            : this(Color.FromUInt32(color))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableSolidColorBrush(ISolidColorBrush source)
+            : this(source.Color, source.Opacity, source.Transform?.ToImmutable())
+        {
+        }
+
+        /// <summary>
+        /// Gets the color of the brush.
+        /// </summary>
+        public Color Color { get; }
+
+        /// <summary>
+        /// Gets the opacity of the brush.
+        /// </summary>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the transform origin of the brush
+        /// </summary>
+        public RelativePoint TransformOrigin { get; }
+
+        public bool Equals(ImmutableSolidColorBrush? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Color.Equals(other.Color) && Opacity.Equals(other.Opacity) && (Transform == null && other.Transform == null ? true : (Transform != null && Transform.Equals(other.Transform)));
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ImmutableSolidColorBrush other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Color.GetHashCode() * 397) ^ Opacity.GetHashCode() ^ (Transform is null ? 0 : Transform.GetHashCode());
+            }
+        }
+
+        public static bool operator ==(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
+        {
+            return !Equals(left, right);
+        }
+
+        /// <summary>
+        /// Returns a string representation of the brush.
+        /// </summary>
+        /// <returns>A string representation of the brush.</returns>
+        public override string ToString()
+        {
+            return Color.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTextDecoration.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutableTextDecoration.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
new file mode 100644
index 0000000000..6df27872fc
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
@@ -0,0 +1,102 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush which displays a repeating image.
+    /// </summary>
+    public abstract class ImmutableTileBrush : ITileBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
+        /// </summary>
+        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
+        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
+        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
+        /// <param name="stretch">
+        /// How the source rectangle will be stretched to fill the destination rect.
+        /// </param>
+        /// <param name="tileMode">The tile mode.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        protected ImmutableTileBrush(
+            AlignmentX alignmentX,
+            AlignmentY alignmentY,
+            RelativeRect destinationRect,
+            double opacity,
+            ImmutableTransform? transform,
+            RelativePoint transformOrigin,
+            RelativeRect sourceRect,
+            Stretch stretch,
+            TileMode tileMode,
+            BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            AlignmentX = alignmentX;
+            AlignmentY = alignmentY;
+            DestinationRect = destinationRect;
+            Opacity = opacity;
+            Transform = transform;
+            TransformOrigin = transformOrigin;
+            SourceRect = sourceRect;
+            Stretch = stretch;
+            TileMode = tileMode;
+            BitmapInterpolationMode = bitmapInterpolationMode;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        protected ImmutableTileBrush(ITileBrush source)
+            : this(
+                  source.AlignmentX,
+                  source.AlignmentY,
+                  source.DestinationRect,
+                  source.Opacity,
+                  source.Transform?.ToImmutable(),
+                  source.TransformOrigin,
+                  source.SourceRect,
+                  source.Stretch,
+                  source.TileMode,
+                  source.BitmapInterpolationMode)
+        {
+        }
+
+        /// <inheritdoc/>
+        public AlignmentX AlignmentX { get; }
+
+        /// <inheritdoc/>
+        public AlignmentY AlignmentY { get; }
+
+        /// <inheritdoc/>
+        public RelativeRect DestinationRect { get; }
+
+        /// <inheritdoc/>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the transform origin of the brush
+        /// </summary>
+        public RelativePoint TransformOrigin { get; }
+
+        /// <inheritdoc/>
+        public RelativeRect SourceRect { get; }
+
+        /// <inheritdoc/>
+        public Stretch Stretch { get; }
+
+        /// <inheritdoc/>
+        public TileMode TileMode { get; }
+
+        /// <inheritdoc/>
+        public BitmapInterpolationMode BitmapInterpolationMode { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
new file mode 100644
index 0000000000..d5ff2b8317
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
@@ -0,0 +1,21 @@
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Represents a transform on an <see cref="IVisual"/>.
+    /// </summary>
+    public class ImmutableTransform : ITransform
+    {
+        public Matrix Value { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableTransform"/> class.
+        /// </summary>
+        /// <param name="matrix">The transform matrix.</param>
+        public ImmutableTransform(Matrix matrix)
+        {
+            Value = matrix;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
new file mode 100644
index 0000000000..b436dcdb5e
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
@@ -0,0 +1,67 @@
+using Avalonia.Media.Imaging;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IVisual"/>.
+    /// </summary>
+    internal class ImmutableVisualBrush : ImmutableTileBrush, IVisualBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
+        /// </summary>
+        /// <param name="visual">The visual to draw.</param>
+        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
+        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
+        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
+        /// <param name="stretch">
+        /// How the source rectangle will be stretched to fill the destination rect.
+        /// </param>
+        /// <param name="tileMode">The tile mode.</param>
+        /// <param name="bitmapInterpolationMode">Controls the quality of interpolation.</param>
+        public ImmutableVisualBrush(
+            IVisual visual,
+            AlignmentX alignmentX = AlignmentX.Center,
+            AlignmentY alignmentY = AlignmentY.Center,
+            RelativeRect? destinationRect = null,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint transformOrigin = new RelativePoint(),
+            RelativeRect? sourceRect = null,
+            Stretch stretch = Stretch.Uniform,
+            TileMode tileMode = TileMode.None,
+            Imaging.BitmapInterpolationMode bitmapInterpolationMode = Imaging.BitmapInterpolationMode.Default)
+            : base(
+                  alignmentX,
+                  alignmentY,
+                  destinationRect ?? RelativeRect.Fill,
+                  opacity,
+                  transform,
+                  transformOrigin,
+                  sourceRect ?? RelativeRect.Fill,
+                  stretch,
+                  tileMode,
+                  bitmapInterpolationMode)
+        {
+            Visual = visual;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableVisualBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableVisualBrush(IVisualBrush source)
+            : base(source)
+        {
+            Visual = source.Visual;
+        }
+
+        /// <inheritdoc/>
+        public IVisual Visual { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/ImmutableExperimentalAcrylicMaterial.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs
rename to src/Avalonia.Base/Media/ImmutableExperimentalAcrylicMaterial.cs
diff --git a/src/Avalonia.Base/Media/KnownColors.cs b/src/Avalonia.Base/Media/KnownColors.cs
new file mode 100644
index 0000000000..ae2fca5a60
--- /dev/null
+++ b/src/Avalonia.Base/Media/KnownColors.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using Avalonia.SourceGenerator;
+
+namespace Avalonia.Media
+{
+    internal static partial class KnownColors
+    {
+        private static readonly IReadOnlyDictionary<string, KnownColor> _knownColorNames;
+        private static readonly IReadOnlyDictionary<uint, string> _knownColors;
+#if !BUILDTASK
+        private static readonly Dictionary<KnownColor, ISolidColorBrush> _knownBrushes;
+#endif
+
+        [GenerateEnumValueDictionary()]
+        private static partial Dictionary<string, KnownColor> GetKnownColors();
+
+        static KnownColors()
+        {
+            var knownColorNames = new Dictionary<string, KnownColor>(StringComparer.OrdinalIgnoreCase);
+            var knownColors = new Dictionary<uint, string>();
+
+            foreach (var field in GetKnownColors())
+            {
+                var knownColor = field.Value;
+                if (knownColor == KnownColor.None) continue;
+
+                knownColorNames.Add(field.Key, knownColor);
+
+                // some known colors have the same value, so use the first
+                if (!knownColors.ContainsKey((uint)knownColor))
+                {
+                    knownColors.Add((uint)knownColor, field.Key);
+                }
+            }
+
+            _knownColorNames = knownColorNames;
+            _knownColors = knownColors;
+            
+#if !BUILDTASK
+            _knownBrushes = new Dictionary<KnownColor, ISolidColorBrush>();
+#endif
+        }
+
+#if !BUILDTASK
+        public static ISolidColorBrush? GetKnownBrush(string s)
+        {
+            var color = GetKnownColor(s);
+            return color != KnownColor.None ? color.ToBrush() : null;
+        }
+#endif
+
+        public static KnownColor GetKnownColor(string s)
+        {
+            if (_knownColorNames.TryGetValue(s, out var color))
+            {
+                return color;
+            }
+
+            return KnownColor.None;
+        }
+
+        public static string? GetKnownColorName(uint rgb)
+        {
+            return _knownColors.TryGetValue(rgb, out var name) ? name : null;
+        }
+
+        public static Color ToColor(this KnownColor color)
+        {
+            return Color.FromUInt32((uint)color);
+        }
+
+#if !BUILDTASK
+        public static ISolidColorBrush ToBrush(this KnownColor color)
+        {
+            lock (_knownBrushes)
+            {
+                if (!_knownBrushes.TryGetValue(color, out var brush))
+                {
+                    brush = new Immutable.ImmutableSolidColorBrush(color.ToColor());
+                    _knownBrushes.Add(color, brush);
+                }
+
+                return brush;
+            }
+        }
+#endif
+    }
+
+    internal enum KnownColor : uint
+    {
+        None,
+        AliceBlue = 0xfff0f8ff,
+        AntiqueWhite = 0xfffaebd7,
+        Aqua = 0xff00ffff,
+        Aquamarine = 0xff7fffd4,
+        Azure = 0xfff0ffff,
+        Beige = 0xfff5f5dc,
+        Bisque = 0xffffe4c4,
+        Black = 0xff000000,
+        BlanchedAlmond = 0xffffebcd,
+        Blue = 0xff0000ff,
+        BlueViolet = 0xff8a2be2,
+        Brown = 0xffa52a2a,
+        BurlyWood = 0xffdeb887,
+        CadetBlue = 0xff5f9ea0,
+        Chartreuse = 0xff7fff00,
+        Chocolate = 0xffd2691e,
+        Coral = 0xffff7f50,
+        CornflowerBlue = 0xff6495ed,
+        Cornsilk = 0xfffff8dc,
+        Crimson = 0xffdc143c,
+        Cyan = 0xff00ffff,
+        DarkBlue = 0xff00008b,
+        DarkCyan = 0xff008b8b,
+        DarkGoldenrod = 0xffb8860b,
+        DarkGray = 0xffa9a9a9,
+        DarkGreen = 0xff006400,
+        DarkKhaki = 0xffbdb76b,
+        DarkMagenta = 0xff8b008b,
+        DarkOliveGreen = 0xff556b2f,
+        DarkOrange = 0xffff8c00,
+        DarkOrchid = 0xff9932cc,
+        DarkRed = 0xff8b0000,
+        DarkSalmon = 0xffe9967a,
+        DarkSeaGreen = 0xff8fbc8f,
+        DarkSlateBlue = 0xff483d8b,
+        DarkSlateGray = 0xff2f4f4f,
+        DarkTurquoise = 0xff00ced1,
+        DarkViolet = 0xff9400d3,
+        DeepPink = 0xffff1493,
+        DeepSkyBlue = 0xff00bfff,
+        DimGray = 0xff696969,
+        DodgerBlue = 0xff1e90ff,
+        Firebrick = 0xffb22222,
+        FloralWhite = 0xfffffaf0,
+        ForestGreen = 0xff228b22,
+        Fuchsia = 0xffff00ff,
+        Gainsboro = 0xffdcdcdc,
+        GhostWhite = 0xfff8f8ff,
+        Gold = 0xffffd700,
+        Goldenrod = 0xffdaa520,
+        Gray = 0xff808080,
+        Green = 0xff008000,
+        GreenYellow = 0xffadff2f,
+        Honeydew = 0xfff0fff0,
+        HotPink = 0xffff69b4,
+        IndianRed = 0xffcd5c5c,
+        Indigo = 0xff4b0082,
+        Ivory = 0xfffffff0,
+        Khaki = 0xfff0e68c,
+        Lavender = 0xffe6e6fa,
+        LavenderBlush = 0xfffff0f5,
+        LawnGreen = 0xff7cfc00,
+        LemonChiffon = 0xfffffacd,
+        LightBlue = 0xffadd8e6,
+        LightCoral = 0xfff08080,
+        LightCyan = 0xffe0ffff,
+        LightGoldenrodYellow = 0xfffafad2,
+        LightGreen = 0xff90ee90,
+        LightGray = 0xffd3d3d3,
+        LightPink = 0xffffb6c1,
+        LightSalmon = 0xffffa07a,
+        LightSeaGreen = 0xff20b2aa,
+        LightSkyBlue = 0xff87cefa,
+        LightSlateGray = 0xff778899,
+        LightSteelBlue = 0xffb0c4de,
+        LightYellow = 0xffffffe0,
+        Lime = 0xff00ff00,
+        LimeGreen = 0xff32cd32,
+        Linen = 0xfffaf0e6,
+        Magenta = 0xffff00ff,
+        Maroon = 0xff800000,
+        MediumAquamarine = 0xff66cdaa,
+        MediumBlue = 0xff0000cd,
+        MediumOrchid = 0xffba55d3,
+        MediumPurple = 0xff9370db,
+        MediumSeaGreen = 0xff3cb371,
+        MediumSlateBlue = 0xff7b68ee,
+        MediumSpringGreen = 0xff00fa9a,
+        MediumTurquoise = 0xff48d1cc,
+        MediumVioletRed = 0xffc71585,
+        MidnightBlue = 0xff191970,
+        MintCream = 0xfff5fffa,
+        MistyRose = 0xffffe4e1,
+        Moccasin = 0xffffe4b5,
+        NavajoWhite = 0xffffdead,
+        Navy = 0xff000080,
+        OldLace = 0xfffdf5e6,
+        Olive = 0xff808000,
+        OliveDrab = 0xff6b8e23,
+        Orange = 0xffffa500,
+        OrangeRed = 0xffff4500,
+        Orchid = 0xffda70d6,
+        PaleGoldenrod = 0xffeee8aa,
+        PaleGreen = 0xff98fb98,
+        PaleTurquoise = 0xffafeeee,
+        PaleVioletRed = 0xffdb7093,
+        PapayaWhip = 0xffffefd5,
+        PeachPuff = 0xffffdab9,
+        Peru = 0xffcd853f,
+        Pink = 0xffffc0cb,
+        Plum = 0xffdda0dd,
+        PowderBlue = 0xffb0e0e6,
+        Purple = 0xff800080,
+        Red = 0xffff0000,
+        RosyBrown = 0xffbc8f8f,
+        RoyalBlue = 0xff4169e1,
+        SaddleBrown = 0xff8b4513,
+        Salmon = 0xfffa8072,
+        SandyBrown = 0xfff4a460,
+        SeaGreen = 0xff2e8b57,
+        SeaShell = 0xfffff5ee,
+        Sienna = 0xffa0522d,
+        Silver = 0xffc0c0c0,
+        SkyBlue = 0xff87ceeb,
+        SlateBlue = 0xff6a5acd,
+        SlateGray = 0xff708090,
+        Snow = 0xfffffafa,
+        SpringGreen = 0xff00ff7f,
+        SteelBlue = 0xff4682b4,
+        Tan = 0xffd2b48c,
+        Teal = 0xff008080,
+        Thistle = 0xffd8bfd8,
+        Tomato = 0xffff6347,
+        Transparent = 0x00ffffff,
+        Turquoise = 0xff40e0d0,
+        Violet = 0xffee82ee,
+        Wheat = 0xfff5deb3,
+        White = 0xffffffff,
+        WhiteSmoke = 0xfff5f5f5,
+        Yellow = 0xffffff00,
+        YellowGreen = 0xff9acd32
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/LineGeometry.cs b/src/Avalonia.Base/Media/LineGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/LineGeometry.cs
rename to src/Avalonia.Base/Media/LineGeometry.cs
diff --git a/src/Avalonia.Visuals/Media/LineSegment.cs b/src/Avalonia.Base/Media/LineSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/LineSegment.cs
rename to src/Avalonia.Base/Media/LineSegment.cs
diff --git a/src/Avalonia.Visuals/Media/LinearGradientBrush.cs b/src/Avalonia.Base/Media/LinearGradientBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/LinearGradientBrush.cs
rename to src/Avalonia.Base/Media/LinearGradientBrush.cs
diff --git a/src/Avalonia.Visuals/Media/MaterialExtensions.cs b/src/Avalonia.Base/Media/MaterialExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/MaterialExtensions.cs
rename to src/Avalonia.Base/Media/MaterialExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/MatrixTransform.cs b/src/Avalonia.Base/Media/MatrixTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/MatrixTransform.cs
rename to src/Avalonia.Base/Media/MatrixTransform.cs
diff --git a/src/Avalonia.Visuals/Media/MediaExtensions.cs b/src/Avalonia.Base/Media/MediaExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/MediaExtensions.cs
rename to src/Avalonia.Base/Media/MediaExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/PathFigure.cs b/src/Avalonia.Base/Media/PathFigure.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathFigure.cs
rename to src/Avalonia.Base/Media/PathFigure.cs
diff --git a/src/Avalonia.Visuals/Media/PathGeometry.cs b/src/Avalonia.Base/Media/PathGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathGeometry.cs
rename to src/Avalonia.Base/Media/PathGeometry.cs
diff --git a/src/Avalonia.Visuals/Media/PathGeometryCollections.cs b/src/Avalonia.Base/Media/PathGeometryCollections.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathGeometryCollections.cs
rename to src/Avalonia.Base/Media/PathGeometryCollections.cs
diff --git a/src/Avalonia.Base/Media/PathMarkupParser.cs b/src/Avalonia.Base/Media/PathMarkupParser.cs
new file mode 100644
index 0000000000..5e808488fc
--- /dev/null
+++ b/src/Avalonia.Base/Media/PathMarkupParser.cs
@@ -0,0 +1,614 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Parses a path markup string.
+    /// </summary>
+    public class PathMarkupParser : IDisposable
+    {
+        private static readonly Dictionary<char, Command> s_commands =
+            new Dictionary<char, Command>
+                {
+                    { 'F', Command.FillRule },
+                    { 'M', Command.Move },
+                    { 'L', Command.Line },
+                    { 'H', Command.HorizontalLine },
+                    { 'V', Command.VerticalLine },
+                    { 'Q', Command.QuadraticBezierCurve },
+                    { 'T', Command.SmoothQuadraticBezierCurve },
+                    { 'C', Command.CubicBezierCurve },
+                    { 'S', Command.SmoothCubicBezierCurve },
+                    { 'A', Command.Arc },
+                    { 'Z', Command.Close },
+                };
+
+        private IGeometryContext? _geometryContext;
+        private Point _currentPoint;
+        private Point? _beginFigurePoint;
+        private Point? _previousControlPoint;
+        private bool _isOpen;
+        private bool _isDisposed;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PathMarkupParser"/> class.
+        /// </summary>
+        /// <param name="geometryContext">The geometry context.</param>
+        /// <exception cref="ArgumentNullException">geometryContext</exception>
+        public PathMarkupParser(IGeometryContext geometryContext)
+        {
+            if (geometryContext == null)
+            {
+                throw new ArgumentNullException(nameof(geometryContext));
+            }
+
+            _geometryContext = geometryContext;
+        }
+
+        private enum Command
+        {
+            None,
+            FillRule,
+            Move,
+            Line,
+            HorizontalLine,
+            VerticalLine,
+            CubicBezierCurve,
+            QuadraticBezierCurve,
+            SmoothCubicBezierCurve,
+            SmoothQuadraticBezierCurve,
+            Arc,
+            Close
+        }
+
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                _geometryContext = null;
+            }
+
+            _isDisposed = true;
+        }
+
+        private static Point MirrorControlPoint(Point controlPoint, Point center)
+        {
+            var dir = controlPoint - center;
+
+            return center + -dir;
+        }
+
+        /// <summary>
+        /// Parses the specified path data and writes the result to the geometryContext of this instance.
+        /// </summary>
+        /// <param name="pathData">The path data.</param>
+        public void Parse(string pathData)
+        {
+            ThrowIfDisposed();
+
+            var span = pathData.AsSpan();
+            _currentPoint = new Point();
+
+            while(!span.IsEmpty)
+            {
+                if(!ReadCommand(ref span, out var command, out var relative))
+                {
+                    break;
+                }
+
+                bool initialCommand = true;
+                
+                do
+                {
+                    if (!initialCommand)
+                    {
+                        span = ReadSeparator(span);
+                    }
+
+                    switch (command)
+                    {
+                        case Command.None:
+                            break;
+                        case Command.FillRule:
+                            SetFillRule(ref span);
+                            break;
+                        case Command.Move:
+                            AddMove(ref span, relative);
+                            break;
+                        case Command.Line:
+                            AddLine(ref span, relative);
+                            break;
+                        case Command.HorizontalLine:
+                            AddHorizontalLine(ref span, relative);
+                            break;
+                        case Command.VerticalLine:
+                            AddVerticalLine(ref span, relative);
+                            break;
+                        case Command.CubicBezierCurve:
+                            AddCubicBezierCurve(ref span, relative);
+                            break;
+                        case Command.QuadraticBezierCurve:
+                            AddQuadraticBezierCurve(ref span, relative);
+                            break;
+                        case Command.SmoothCubicBezierCurve:
+                            AddSmoothCubicBezierCurve(ref span, relative);
+                            break;
+                        case Command.SmoothQuadraticBezierCurve:
+                            AddSmoothQuadraticBezierCurve(ref span, relative);
+                            break;
+                        case Command.Arc:
+                            AddArc(ref span, relative);
+                            break;
+                        case Command.Close:
+                            CloseFigure();
+                            break;
+                        default:
+                            throw new NotSupportedException("Unsupported command");
+                    }
+
+                    initialCommand = false;
+                } while (PeekArgument(span));
+                
+            }
+
+            if (_isOpen)
+            {
+                _geometryContext.EndFigure(false);
+            }
+        }
+
+        private void CreateFigure()
+        {
+            ThrowIfDisposed();
+
+            if (_isOpen)
+            {
+                _geometryContext.EndFigure(false);
+            }
+
+            _geometryContext.BeginFigure(_currentPoint);
+
+            _beginFigurePoint = _currentPoint;
+
+            _isOpen = true;
+        }
+
+        private void SetFillRule(
+#if NET7SDK
+            scoped
+#endif
+            ref ReadOnlySpan<char> span)
+        {
+            ThrowIfDisposed();
+
+            if (!ReadArgument(ref span, out var fillRule) || fillRule.Length != 1)
+            {
+                throw new InvalidDataException("Invalid fill rule.");
+            }
+
+            FillRule rule;
+
+            switch (fillRule[0])
+            {
+                case '0':
+                    rule = FillRule.EvenOdd;
+                    break;
+                case '1':
+                    rule = FillRule.NonZero;
+                    break;
+                default:
+                    throw new InvalidDataException("Invalid fill rule");
+            }
+
+            _geometryContext.SetFillRule(rule);
+        }
+
+        private void CloseFigure()
+        {
+            ThrowIfDisposed();
+
+            if (_isOpen)
+            {
+                _geometryContext.EndFigure(true);
+
+                if (_beginFigurePoint != null)
+                {
+                    _currentPoint = _beginFigurePoint.Value;
+                    _beginFigurePoint = null;
+                }
+            }
+
+            _previousControlPoint = null;
+
+            _isOpen = false;
+        }
+
+        private void AddMove(ref ReadOnlySpan<char> span, bool relative)
+        {
+            var currentPoint = relative
+                                ? ReadRelativePoint(ref span, _currentPoint)
+                                : ReadPoint(ref span);
+
+            _currentPoint = currentPoint;
+
+            CreateFigure();
+
+            while (PeekArgument(span))
+            {
+                span = ReadSeparator(span);
+                AddLine(ref span, relative);
+            }
+        }
+
+        private void AddLine(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            _currentPoint = relative
+                                ? ReadRelativePoint(ref span, _currentPoint)
+                                : ReadPoint(ref span);
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.LineTo(_currentPoint);
+        }
+
+        private void AddHorizontalLine(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            _currentPoint = relative
+                                ? new Point(_currentPoint.X + ReadDouble(ref span), _currentPoint.Y)
+                                : _currentPoint.WithX(ReadDouble(ref span));
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.LineTo(_currentPoint);
+        }
+
+        private void AddVerticalLine(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            _currentPoint = relative
+                                ? new Point(_currentPoint.X, _currentPoint.Y + ReadDouble(ref span))
+                                : _currentPoint.WithY(ReadDouble(ref span));
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.LineTo(_currentPoint);
+        }
+
+        private void AddCubicBezierCurve(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            var point1 = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            span = ReadSeparator(span);
+
+            var point2 = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            _previousControlPoint = point2;
+
+            span = ReadSeparator(span);
+
+            var point3 = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.CubicBezierTo(point1, point2, point3);
+
+            _currentPoint = point3;
+        }
+
+        private void AddQuadraticBezierCurve(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            var start = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            _previousControlPoint = start;
+
+            span = ReadSeparator(span);
+
+            var end = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.QuadraticBezierTo(start, end);
+
+            _currentPoint = end;
+        }
+
+        private void AddSmoothCubicBezierCurve(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            var point2 = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            span = ReadSeparator(span);
+
+            var end = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            if (_previousControlPoint != null)
+            {
+                _previousControlPoint = MirrorControlPoint((Point)_previousControlPoint, _currentPoint);
+            }
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.CubicBezierTo(_previousControlPoint ?? _currentPoint, point2, end);
+
+            _previousControlPoint = point2;
+
+            _currentPoint = end;
+        }
+
+        private void AddSmoothQuadraticBezierCurve(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            var end = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            if (_previousControlPoint != null)
+            {
+                _previousControlPoint = MirrorControlPoint((Point)_previousControlPoint, _currentPoint);
+            }
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.QuadraticBezierTo(_previousControlPoint ?? _currentPoint, end);
+
+            _currentPoint = end;
+        }
+
+        private void AddArc(ref ReadOnlySpan<char> span, bool relative)
+        {
+            ThrowIfDisposed();
+
+            var size = ReadSize(ref span);
+
+            span = ReadSeparator(span);
+
+            var rotationAngle = ReadDouble(ref span);
+            span = ReadSeparator(span);
+            var isLargeArc = ReadBool(ref span);
+
+            span = ReadSeparator(span);
+
+            var sweepDirection = ReadBool(ref span) ? SweepDirection.Clockwise : SweepDirection.CounterClockwise;
+            
+            span = ReadSeparator(span);
+
+            var end = relative
+                    ? ReadRelativePoint(ref span, _currentPoint)
+                    : ReadPoint(ref span);
+
+            if (!_isOpen)
+            {
+                CreateFigure();
+            }
+
+            _geometryContext.ArcTo(end, size, rotationAngle, isLargeArc, sweepDirection);
+
+            _currentPoint = end;
+
+            _previousControlPoint = null;
+        }
+
+        private static bool PeekArgument(ReadOnlySpan<char> span)
+        {
+            span = SkipWhitespace(span);
+
+            return !span.IsEmpty && (span[0] == ',' || span[0] == '-' || span[0] == '.' || char.IsDigit(span[0]));
+        }
+
+        private static bool ReadArgument(
+#if NET7SDK
+            scoped
+#endif
+            ref ReadOnlySpan<char> remaining, out ReadOnlySpan<char> argument)
+        {
+            remaining = SkipWhitespace(remaining);
+            if (remaining.IsEmpty)
+            {
+                argument = ReadOnlySpan<char>.Empty;
+                return false;
+            }
+
+            var valid = false;
+            int i = 0;
+            if (remaining[i] == '-')
+            {
+                i++;
+            }
+            for (; i < remaining.Length && char.IsNumber(remaining[i]); i++) valid = true;
+
+            if (i < remaining.Length && remaining[i] == '.')
+            {
+                valid = false;
+                i++;
+            }
+            for (; i < remaining.Length && char.IsNumber(remaining[i]); i++) valid = true;
+
+            if (i < remaining.Length)
+            {
+                // scientific notation
+                if (remaining[i] == 'E' || remaining[i] == 'e')
+                {
+                    valid = false;
+                    i++;
+                    if (remaining[i] == '-' || remaining[i] == '+')
+                    {
+                        i++;
+                        for (; i < remaining.Length && char.IsNumber(remaining[i]); i++) valid = true;
+                    }                  
+                }               
+            }          
+
+            if (!valid)
+            {
+                argument = ReadOnlySpan<char>.Empty;
+                return false;
+            }
+            argument = remaining.Slice(0, i);
+            remaining = remaining.Slice(i);
+            return true;
+        }
+
+
+        private static ReadOnlySpan<char> ReadSeparator(ReadOnlySpan<char> span)
+        {
+            span = SkipWhitespace(span);
+            if (!span.IsEmpty && span[0] == ',')
+            {
+                span = span.Slice(1);
+            }
+            return span;
+        }
+
+        private static ReadOnlySpan<char> SkipWhitespace(ReadOnlySpan<char> span)
+        {
+            int i = 0;
+            for (; i < span.Length && char.IsWhiteSpace(span[i]); i++) ;
+            return span.Slice(i);
+        }
+
+        private bool ReadBool(ref ReadOnlySpan<char> span)
+        {
+            span = SkipWhitespace(span);
+            
+            if (span.IsEmpty)
+            {
+                throw new InvalidDataException("Invalid bool rule.");
+            }
+            
+            var c = span[0];
+            
+            span = span.Slice(1);
+            
+            switch (c)
+            {
+                case '0':
+                    return false;
+                case '1':
+                    return true;
+                default:
+                    throw new InvalidDataException("Invalid bool rule");
+            }
+        }
+
+        private double ReadDouble(ref ReadOnlySpan<char> span)
+        {
+            if (!ReadArgument(ref span, out var doubleValue))
+            {
+                throw new InvalidDataException("Invalid double value");
+            }
+
+            return double.Parse(doubleValue.ToString(), CultureInfo.InvariantCulture);
+        }
+
+        private Size ReadSize(ref ReadOnlySpan<char> span)
+        {
+            var width = ReadDouble(ref span);
+            span = ReadSeparator(span);
+            var height = ReadDouble(ref span);
+            return new Size(width, height);
+        }
+
+        private Point ReadPoint(ref ReadOnlySpan<char> span)
+        {
+            var x = ReadDouble(ref span);
+            span = ReadSeparator(span);
+            var y = ReadDouble(ref span);
+            return new Point(x, y);
+        }
+
+        private Point ReadRelativePoint(ref ReadOnlySpan<char> span, Point origin)
+        {
+            var x = ReadDouble(ref span);
+            span = ReadSeparator(span);
+            var y = ReadDouble(ref span);
+            return new Point(origin.X + x, origin.Y + y);
+        }
+
+        private bool ReadCommand(ref ReadOnlySpan<char> span, out Command command, out bool relative)
+        {
+            span = SkipWhitespace(span);
+            if (span.IsEmpty)
+            {
+                command = default;
+                relative = false;
+                return false;
+            }
+            var c = span[0];
+            if (!s_commands.TryGetValue(char.ToUpperInvariant(c), out command))
+            {
+                throw new InvalidDataException("Unexpected path command '" + c + "'.");
+            }
+            relative = char.IsLower(c);
+            span = span.Slice(1);
+            return true;
+        }
+
+        [MemberNotNull(nameof(_geometryContext))]
+        private void ThrowIfDisposed()
+        {
+            if (_isDisposed || _geometryContext is null)
+                throw new ObjectDisposedException(nameof(PathMarkupParser));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PathSegment.cs b/src/Avalonia.Base/Media/PathSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathSegment.cs
rename to src/Avalonia.Base/Media/PathSegment.cs
diff --git a/src/Avalonia.Base/Media/Pen.cs b/src/Avalonia.Base/Media/Pen.cs
new file mode 100644
index 0000000000..66632a973b
--- /dev/null
+++ b/src/Avalonia.Base/Media/Pen.cs
@@ -0,0 +1,239 @@
+using System;
+using Avalonia.Media.Immutable;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how a stroke is drawn.
+    /// </summary>
+    public sealed class Pen : AvaloniaObject, IPen
+    {
+        /// <summary>
+        /// Defines the <see cref="Brush"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> BrushProperty =
+            AvaloniaProperty.Register<Pen, IBrush?>(nameof(Brush));
+
+        /// <summary>
+        /// Defines the <see cref="Thickness"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> ThicknessProperty =
+            AvaloniaProperty.Register<Pen, double>(nameof(Thickness), 1.0);
+
+        /// <summary>
+        /// Defines the <see cref="DashStyle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDashStyle?> DashStyleProperty =
+            AvaloniaProperty.Register<Pen, IDashStyle?>(nameof(DashStyle));
+
+        /// <summary>
+        /// Defines the <see cref="LineCap"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PenLineCap> LineCapProperty =
+            AvaloniaProperty.Register<Pen, PenLineCap>(nameof(LineCap));
+
+        /// <summary>
+        /// Defines the <see cref="LineJoin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PenLineJoin> LineJoinProperty =
+            AvaloniaProperty.Register<Pen, PenLineJoin>(nameof(LineJoin));
+
+        /// <summary>
+        /// Defines the <see cref="MiterLimit"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MiterLimitProperty =
+            AvaloniaProperty.Register<Pen, double>(nameof(MiterLimit), 10.0);
+
+        private EventHandler? _invalidated;
+        private IAffectsRender? _subscribedToBrush;
+        private IAffectsRender? _subscribedToDashes;
+        private TargetWeakEventSubscriber<Pen, EventArgs>? _weakSubscriber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// </summary>
+        public Pen()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// </summary>
+        /// <param name="color">The stroke color.</param>
+        /// <param name="thickness">The stroke thickness.</param>
+        /// <param name="dashStyle">The dash style.</param>
+        /// <param name="lineCap">Specifies the type of graphic shape to use on both ends of a line.</param>
+        /// <param name="lineJoin">The line join.</param>
+        /// <param name="miterLimit">The miter limit.</param>
+        public Pen(
+            uint color,
+            double thickness = 1.0,
+            IDashStyle? dashStyle = null,
+            PenLineCap lineCap = PenLineCap.Flat,
+            PenLineJoin lineJoin = PenLineJoin.Miter,
+            double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// </summary>
+        /// <param name="brush">The brush used to draw.</param>
+        /// <param name="thickness">The stroke thickness.</param>
+        /// <param name="dashStyle">The dash style.</param>
+        /// <param name="lineCap">The line cap.</param>
+        /// <param name="lineJoin">The line join.</param>
+        /// <param name="miterLimit">The miter limit.</param>
+        public Pen(
+            IBrush? brush,
+            double thickness = 1.0,
+            IDashStyle? dashStyle = null,
+            PenLineCap lineCap = PenLineCap.Flat,
+            PenLineJoin lineJoin = PenLineJoin.Miter,
+            double miterLimit = 10.0)
+        {
+            Brush = brush;
+            Thickness = thickness;
+            LineCap = lineCap;
+            LineJoin = lineJoin;
+            MiterLimit = miterLimit;
+            DashStyle = dashStyle;
+        }
+
+        /// <summary>
+        /// Gets or sets the brush used to draw the stroke.
+        /// </summary>
+        public IBrush? Brush
+        {
+            get => GetValue(BrushProperty);
+            set => SetValue(BrushProperty, value);
+        }
+
+        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
+            WeakEvent.Register<IAffectsRender>(
+                (s, h) => s.Invalidated += h,
+                (s, h) => s.Invalidated -= h);
+
+        /// <summary>
+        /// Gets or sets the stroke thickness.
+        /// </summary>
+        public double Thickness
+        {
+            get => GetValue(ThicknessProperty);
+            set => SetValue(ThicknessProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the style of dashed lines drawn with a <see cref="Pen"/> object.
+        /// </summary>
+        public IDashStyle? DashStyle
+        {
+            get => GetValue(DashStyleProperty);
+            set => SetValue(DashStyleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the type of shape to use on both ends of a line.
+        /// </summary>
+        public PenLineCap LineCap
+        {
+            get => GetValue(LineCapProperty);
+            set => SetValue(LineCapProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the join style for the ends of two consecutive lines drawn with this
+        /// <see cref="Pen"/>.
+        /// </summary>
+        public PenLineJoin LineJoin
+        {
+            get => GetValue(LineJoinProperty);
+            set => SetValue(LineJoinProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the limit of the thickness of the join on a mitered corner.
+        /// </summary>
+        public double MiterLimit
+        {
+            get => GetValue(MiterLimitProperty);
+            set => SetValue(MiterLimitProperty, value);
+        }
+
+        /// <summary>
+        /// Raised when the pen changes.
+        /// </summary>
+        public event EventHandler? Invalidated
+        {
+            add
+            {
+                _invalidated += value;
+                UpdateSubscriptions();
+            }
+            remove
+            {
+                _invalidated -= value; 
+                UpdateSubscriptions();
+            }
+        }
+
+        /// <summary>
+        /// Creates an immutable clone of the brush.
+        /// </summary>
+        /// <returns>The immutable clone.</returns>
+        public ImmutablePen ToImmutable()
+        {
+            return new ImmutablePen(
+                Brush?.ToImmutable(),
+                Thickness,
+                DashStyle?.ToImmutable(),
+                LineCap,
+                LineJoin,
+                MiterLimit);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            _invalidated?.Invoke(this, EventArgs.Empty);
+            if(change.Property == BrushProperty)
+                UpdateSubscription(ref _subscribedToBrush, Brush);
+            if(change.Property == DashStyleProperty)
+                UpdateSubscription(ref _subscribedToDashes, DashStyle);
+            base.OnPropertyChanged(change);
+        }
+
+        
+        void UpdateSubscription(ref IAffectsRender? field, object? value)
+        {
+            if ((_invalidated == null || field != value) && field != null)
+            {
+                if (_weakSubscriber != null)
+                    InvalidatedWeakEvent.Unsubscribe(field, _weakSubscriber);
+                field = null;
+            }
+
+            if (_invalidated != null && field != value && value is IAffectsRender affectsRender)
+            {
+                if (_weakSubscriber == null)
+                {
+                    _weakSubscriber = new TargetWeakEventSubscriber<Pen, EventArgs>(
+                        this, static (target, _, ev, _) =>
+                        {
+                            if (ev == InvalidatedWeakEvent)
+                                target._invalidated?.Invoke(target, EventArgs.Empty);
+                        });
+                }
+
+                InvalidatedWeakEvent.Subscribe(affectsRender, _weakSubscriber);
+                field = affectsRender;
+            }
+        }
+
+        void UpdateSubscriptions()
+        {
+            UpdateSubscription(ref _subscribedToBrush, Brush);
+            UpdateSubscription(ref _subscribedToDashes, DashStyle);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PenLineCap.cs b/src/Avalonia.Base/Media/PenLineCap.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PenLineCap.cs
rename to src/Avalonia.Base/Media/PenLineCap.cs
diff --git a/src/Avalonia.Visuals/Media/PenLineJoin.cs b/src/Avalonia.Base/Media/PenLineJoin.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PenLineJoin.cs
rename to src/Avalonia.Base/Media/PenLineJoin.cs
diff --git a/src/Avalonia.Base/Media/PlatformGeometry.cs b/src/Avalonia.Base/Media/PlatformGeometry.cs
new file mode 100644
index 0000000000..f25a14540f
--- /dev/null
+++ b/src/Avalonia.Base/Media/PlatformGeometry.cs
@@ -0,0 +1,24 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    internal class PlatformGeometry : Geometry
+    {
+        private readonly IGeometryImpl _geometryImpl;
+
+        public PlatformGeometry(IGeometryImpl geometryImpl)
+        {
+            _geometryImpl = geometryImpl;
+        }
+
+        public override Geometry Clone()
+        {
+            return new PlatformGeometry(_geometryImpl);
+        }
+
+        protected override IGeometryImpl? CreateDefiningGeometry()
+        {
+           return _geometryImpl;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PolyLineSegment.cs b/src/Avalonia.Base/Media/PolyLineSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PolyLineSegment.cs
rename to src/Avalonia.Base/Media/PolyLineSegment.cs
diff --git a/src/Avalonia.Visuals/Media/PolylineGeometry.cs b/src/Avalonia.Base/Media/PolylineGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PolylineGeometry.cs
rename to src/Avalonia.Base/Media/PolylineGeometry.cs
diff --git a/src/Avalonia.Base/Media/PreciseEllipticArcHelper.cs b/src/Avalonia.Base/Media/PreciseEllipticArcHelper.cs
new file mode 100644
index 0000000000..49dfe3c7b3
--- /dev/null
+++ b/src/Avalonia.Base/Media/PreciseEllipticArcHelper.cs
@@ -0,0 +1,1165 @@
+// Copyright © 2003-2004, Luc Maisonobe
+// 2015 - Alexey Rozanov <thehdotx@gmail.com> - Adaptations for Avalonia and oval center computations
+// 2022 - Alexey Rozanov <thehdotx@gmail.com> - Fix for arcs sometimes drawn in inverted order.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with
+// or without modification, are permitted provided that
+// the following conditions are met:
+// 
+//    Redistributions of source code must retain the
+//    above copyright notice, this list of conditions and
+//    the following disclaimer. 
+//    Redistributions in binary form must reproduce the
+//    above copyright notice, this list of conditions and
+//    the following disclaimer in the documentation
+//    and/or other materials provided with the
+//    distribution. 
+//    Neither the names of spaceroots.org, spaceroots.com
+//    nor the names of their contributors may be used to
+//    endorse or promote products derived from this
+//    software without specific prior written permission. 
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+// C#/WPF/Avalonia adaptation by Alexey Rozanov <thehdotx@gmail.com>, 2015.
+// I do not mind if anyone would find this adaptation useful, but
+// please retain the above disclaimer made by the original class 
+// author Luc Maisonobe. He worked really hard on this subject, so
+// please respect him by at least keeping the above disclaimer intact
+// if you use his code.
+//
+// Commented out some unused values calculations.
+// These are not supposed to be removed from the source code,
+// as these may be helpful for debugging.
+//
+// Adapted from http://www.spaceroots.org/documents/ellipse/EllipticalArc.java
+
+using System;
+
+namespace Avalonia.Media
+{
+    static class PreciseEllipticArcHelper
+    {
+        /// <summary>
+        /// This class represents an elliptical arc on a 2D plane.
+        /// 
+        /// This class is adapted for use with WPF StreamGeometryContext, and needs to be created explicitly
+        /// for each particular arc.
+        /// 
+        /// Some helpers
+        /// 
+        /// It can handle ellipses which are not aligned with the x and y reference axes of the plane,
+        /// as well as their parts.
+        /// 
+        /// Another improvement is that this class can handle degenerated cases like for example very 
+        /// flat ellipses(semi-minor axis much smaller than semi-major axis) and drawing of very small 
+        /// parts of such ellipses at very high magnification scales.This imply monitoring the drawing 
+        /// approximation error for extremely small values.Such cases occur for example while drawing 
+        /// orbits of comets near the perihelion.
+        /// 
+        /// When the arc does not cover the complete ellipse, the lines joining the center of the 
+        /// ellipse to the endpoints can optionally be included or not in the outline, hence allowing 
+        /// to use it for pie-charts rendering. If these lines are not included, the curve is not 
+        /// naturally closed.
+        /// </summary>
+        public sealed class EllipticalArc
+        {
+
+            private const double TwoPi = 2 * Math.PI;
+
+            /// <summary>
+            /// Coefficients for error estimation while using quadratic Bezier curves for approximation,
+            /// 0 ≤ b/a ≤ 0.25
+            /// </summary>
+            private static readonly double[][][] Coeffs2Low = {
+            new[]
+            {
+                new[] {3.92478, -13.5822, -0.233377, 0.0128206},
+                new[] {-1.08814, 0.859987, 3.62265E-4, 2.29036E-4},
+                new[] {-0.942512, 0.390456, 0.0080909, 0.00723895},
+                new[] {-0.736228, 0.20998, 0.0129867, 0.0103456}
+            },
+            new[]
+            {
+                new[] {-0.395018, 6.82464, 0.0995293, 0.0122198},
+                new[] {-0.545608, 0.0774863, 0.0267327, 0.0132482},
+                new[] {0.0534754, -0.0884167, 0.012595, 0.0343396},
+                new[] {0.209052, -0.0599987, -0.00723897, 0.00789976}
+            }
+        };
+
+            /// <summary>
+            /// Coefficients for error estimation while using quadratic Bezier curves for approximation,
+            /// 0.25 ≤ b/a ≤ 1
+            /// </summary>
+            private static readonly double[][][] Coeffs2High = {
+            new[]
+            {
+                new[] {0.0863805, -11.5595, -2.68765, 0.181224},
+                new[] {0.242856, -1.81073, 1.56876, 1.68544},
+                new[] {0.233337, -0.455621, 0.222856, 0.403469},
+                new[] {0.0612978, -0.104879, 0.0446799, 0.00867312}
+            },
+            new[]
+            {
+                new[] {0.028973, 6.68407, 0.171472, 0.0211706},
+                new[] {0.0307674, -0.0517815, 0.0216803, -0.0749348},
+                new[] {-0.0471179, 0.1288, -0.0781702, 2.0},
+                new[] {-0.0309683, 0.0531557, -0.0227191, 0.0434511}
+            }
+        };
+
+            /// <summary>
+            /// Safety factor to convert the "best" error approximation into a "max bound" error
+            /// </summary>
+            private static readonly double[] Safety2 = { 0.02, 2.83, 0.125, 0.01 };
+
+            /// <summary>
+            /// Coefficients for error estimation while using cubic Bezier curves for approximation,
+            /// 0.25 ≤ b/a ≤ 1
+            /// </summary>
+            private static readonly double[][][] Coeffs3Low = {
+            new[]
+            {
+                new[] {3.85268, -21.229, -0.330434, 0.0127842},
+                new[] {-1.61486, 0.706564, 0.225945, 0.263682},
+                new[] {-0.910164, 0.388383, 0.00551445, 0.00671814},
+                new[] {-0.630184, 0.192402, 0.0098871, 0.0102527}
+            },
+            new[]
+            {
+                new[] {-0.162211, 9.94329, 0.13723, 0.0124084},
+                new[] {-0.253135, 0.00187735, 0.0230286, 0.01264},
+                new[] {-0.0695069, -0.0437594, 0.0120636, 0.0163087},
+                new[] {-0.0328856, -0.00926032, -0.00173573, 0.00527385}
+            }
+        };
+
+            /// <summary>
+            /// Coefficients for error estimation while using cubic Bezier curves for approximation,
+            /// 0.25 ≤ b/a ≤ 1
+            /// </summary>
+            private static readonly double[][][] Coeffs3High = {
+            new[]
+            {
+                new[] {0.0899116, -19.2349, -4.11711, 0.183362},
+                new[] {0.138148, -1.45804, 1.32044, 1.38474},
+                new[] {0.230903, -0.450262, 0.219963, 0.414038},
+                new[] {0.0590565, -0.101062, 0.0430592, 0.0204699}
+            },
+            new[]
+            {
+                new[] {0.0164649, 9.89394, 0.0919496, 0.00760802},
+                new[] {0.0191603, -0.0322058, 0.0134667, -0.0825018},
+                new[] {0.0156192, -0.017535, 0.00326508, -0.228157},
+                new[] {-0.0236752, 0.0405821, -0.0173086, 0.176187}
+            }
+        };
+            /// <summary>
+            /// Safety factor to convert the "best" error approximation into a "max bound" error
+            /// </summary>
+            private static readonly double[] Safety3 = { 0.0010, 4.98, 0.207, 0.0067 };
+
+            /// <summary>
+            /// Abscissa of the center of the ellipse
+            /// </summary>
+            internal double Cx;
+            /// <summary>
+            /// Ordinate of the center of the ellipse
+            /// </summary>
+            internal double Cy;
+            /// <summary>
+            /// Semi-major axis
+            /// </summary>
+            internal double A;
+            /// <summary>
+            /// Semi-minor axis
+            /// </summary>
+            internal double B;
+            /// <summary>
+            /// Orientation of the major axis with respect to the x axis
+            /// </summary>
+            internal double Theta;
+            /// <summary>
+            /// Pre-calculated cosine value for the major-axis-to-X orientation (Theta)
+            /// </summary>
+            private readonly double _cosTheta;
+            /// <summary>
+            /// Pre-calculated sine value for the major-axis-to-X orientation (Theta)
+            /// </summary>
+            private readonly double _sinTheta;
+            /// <summary>
+            /// Start angle of the arc
+            /// </summary>
+            internal double Eta1;
+            /// <summary>
+            /// End angle of the arc
+            /// </summary>
+            internal double Eta2;
+            /// <summary>
+            /// Abscissa of the start point
+            /// </summary>
+            internal double X1;
+            /// <summary>
+            /// Ordinate of the start point
+            /// </summary>
+            internal double Y1;
+            /// <summary>
+            /// Abscissa of the end point
+            /// </summary>
+            internal double X2;
+            /// <summary>
+            /// Ordinate of the end point
+            /// </summary>
+            internal double Y2;
+            /// <summary>
+            /// Abscissa of the first focus
+            /// </summary>
+            internal double FirstFocusX;
+            /// <summary>
+            /// Ordinate of the first focus
+            /// </summary>
+            internal double FirstFocusY;
+            /// <summary>
+            /// Abscissa of the second focus
+            /// </summary>
+            internal double SecondFocusX;
+            /// <summary>
+            /// Ordinate of the second focus
+            /// </summary>
+            internal double SecondFocusY;
+            /// <summary>
+            /// Abscissa of the leftmost point of the arc
+            /// </summary>
+            private double _xLeft;
+            /// <summary>
+            /// Ordinate of the highest point of the arc
+            /// </summary>
+            private double _yUp;
+            /// <summary>
+            /// Horizontal width of the arc
+            /// </summary>
+            private double _width;
+            /// <summary>
+            /// Vertical height of the arc
+            /// </summary>
+            private double _height;
+            /// <summary>
+            /// Indicator for center to endpoints line inclusion
+            /// </summary>
+            internal bool IsPieSlice;
+            /// <summary>
+            /// Maximal degree for Bezier curve approximation
+            /// </summary>
+            private int _maxDegree;
+            /// <summary>
+            /// Default flatness for Bezier curve approximation
+            /// </summary>
+            private double _defaultFlatness;
+
+            /// <summary>
+            /// Indicator for semi-major axis significance (compared to semi-minor one).
+            /// Computed by dividing the (A-B) difference by the value of A.
+            /// This indicator is used for an early escape in intersection test
+            /// </summary>
+            internal double F;
+            /// <summary>
+            /// Indicator used for an early escape in intersection test
+            /// </summary>
+            internal double E2;
+            /// <summary>
+            /// Indicator used for an early escape in intersection test
+            /// </summary>
+            internal double G;
+            /// <summary>
+            /// Indicator used for an early escape in intersection test
+            /// </summary>
+            internal double G2;
+
+            public bool DrawInOppositeDirection { get; set; }
+
+            /// <summary>
+            /// Builds an elliptical arc composed of the full unit circle around (0,0)
+            /// </summary>
+            public EllipticalArc()
+            {
+                Cx = 0;
+                Cy = 0;
+                A = 1;
+                B = 1;
+                Theta = 0;
+                Eta1 = 0;
+                Eta2 = TwoPi;
+                _cosTheta = 1;
+                _sinTheta = 0;
+                IsPieSlice = false;
+                _maxDegree = 3;
+                _defaultFlatness = 0.5;
+                ComputeFocii();
+                ComputeEndPoints();
+                ComputeBounds();
+                ComputeDerivedFlatnessParameters();
+            }
+
+            /// <summary>
+            /// Builds an elliptical arc from its canonical geometrical elements
+            /// </summary>
+            /// <param name="center">Center of the ellipse</param>
+            /// <param name="a">Semi-major axis</param>
+            /// <param name="b">Semi-minor axis</param>
+            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
+            /// <param name="lambda1">Start angle of the arc</param>
+            /// <param name="lambda2">End angle of the arc</param>
+            /// <param name="isPieSlice">If true, the lines between the center of the ellipse
+            ///  and the endpoints are part of the shape (it is pie slice like)</param>
+            public EllipticalArc(Point center, double a, double b, double theta, double lambda1, double lambda2,
+                bool isPieSlice) : this(center.X, center.Y, a, b, theta, lambda1,
+                    lambda2, isPieSlice)
+            {
+            }
+            /// <summary>
+            /// Builds an elliptical arc from its canonical geometrical elements
+            /// </summary>
+            /// <param name="cx">Abscissa of the center of the ellipse</param>
+            /// <param name="cy">Ordinate of the center of the ellipse</param>
+            /// <param name="a">Semi-major axis</param>
+            /// <param name="b">Semi-minor axis</param>
+            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
+            /// <param name="lambda1">Start angle of the arc</param>
+            /// <param name="lambda2">End angle of the arc</param>
+            /// <param name="isPieSlice">If true, the lines between the center of the ellipse
+            ///  and the endpoints are part of the shape (it is pie slice like)</param>
+            public EllipticalArc(double cx, double cy, double a, double b, double theta, double lambda1, double lambda2,
+                bool isPieSlice)
+            {
+                Cx = cx;
+                Cy = cy;
+                A = a;
+                B = b;
+                Theta = theta;
+                IsPieSlice = isPieSlice;
+                Eta1 = Math.Atan2(Math.Sin(lambda1) / b, Math.Cos(lambda1) / a);
+                Eta2 = Math.Atan2(Math.Sin(lambda2) / b, Math.Cos(lambda2) / a);
+                _cosTheta = Math.Cos(theta);
+                _sinTheta = Math.Sin(theta);
+                _maxDegree = 3;
+                _defaultFlatness = 0.5; // half a pixel
+                Eta2 -= TwoPi * Math.Floor((Eta2 - Eta1) / TwoPi); //make sure we have eta1 <= eta2 <= eta1 + 2 PI
+                                                                   // the preceding correction fails if we have exactly eta2-eta1 == 2*PI
+                                                                   // it reduces the interval to zero length
+                if (lambda2 - lambda1 > Math.PI && Eta2 - Eta1 < Math.PI)
+                {
+                    Eta2 += TwoPi;
+                }
+                ComputeFocii();
+                ComputeEndPoints();
+                ComputeBounds();
+                ComputeDerivedFlatnessParameters();
+            }
+            /// <summary>
+            /// Build a full ellipse from its canonical geometrical elements
+            /// </summary>
+            /// <param name="center">Center of the ellipse</param>
+            /// <param name="a">Semi-major axis</param>
+            /// <param name="b">Semi-minor axis</param>
+            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
+            public EllipticalArc(Point center, double a, double b, double theta) : this(center.X, center.Y, a, b, theta)
+            {
+            }
+
+            /// <summary>
+            /// Build a full ellipse from its canonical geometrical elements
+            /// </summary>
+            /// <param name="cx">Abscissa of the center of the ellipse</param>
+            /// <param name="cy">Ordinate of the center of the ellipse</param>
+            /// <param name="a">Semi-major axis</param>
+            /// <param name="b">Semi-minor axis</param>
+            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
+            public EllipticalArc(double cx, double cy, double a, double b, double theta)
+            {
+                Cx = cx;
+                Cy = cy;
+                A = a;
+                B = b;
+                Theta = theta;
+                IsPieSlice = false;
+                Eta1 = 0;
+                Eta2 = TwoPi;
+                _cosTheta = Math.Cos(theta);
+                _sinTheta = Math.Sin(theta);
+                _maxDegree = 3;
+                _defaultFlatness = 0.5; //half a pixel
+                ComputeFocii();
+                ComputeEndPoints();
+                ComputeBounds();
+                ComputeDerivedFlatnessParameters();
+            }
+
+            /// <summary>
+            /// Sets the maximal degree allowed for Bezier curve approximation.
+            /// </summary>
+            /// <param name="maxDegree">Maximal allowed degree (must be between 1 and 3)</param>
+            /// <exception cref="ArgumentException">Thrown if maxDegree is not between 1 and 3</exception>
+            public void SetMaxDegree(int maxDegree)
+            {
+                if (maxDegree < 1 || maxDegree > 3)
+                {
+                    throw new ArgumentException(@"maxDegree must be between 1 and 3", nameof(maxDegree));
+                }
+                _maxDegree = maxDegree;
+            }
+
+            /// <summary>
+            /// Sets the default flatness for Bezier curve approximation
+            /// </summary>
+            /// <param name="defaultFlatness">default flatness (must be greater than 1e-10)</param>
+            /// <exception cref="ArgumentException">Thrown if defaultFlatness is lower than 1e-10</exception>
+            public void SetDefaultFlatness(double defaultFlatness)
+            {
+                if (defaultFlatness < 1.0E-10)
+                {
+                    throw new ArgumentException(@"defaultFlatness must be greater than 1.0e-10", nameof(defaultFlatness));
+                }
+                _defaultFlatness = defaultFlatness;
+            }
+
+            /// <summary>
+            /// Computes the locations of the focii
+            /// </summary>
+            private void ComputeFocii()
+            {
+                double d = Math.Sqrt(A * A - B * B);
+                double dx = d * _cosTheta;
+                double dy = d * _sinTheta;
+                FirstFocusX = Cx - dx;
+                FirstFocusY = Cy - dy;
+                SecondFocusX = Cx + dx;
+                SecondFocusY = Cy + dy;
+            }
+
+            /// <summary>
+            /// Computes the locations of the endpoints
+            /// </summary>
+            private void ComputeEndPoints()
+            {
+                double aCosEta1 = A * Math.Cos(Eta1);
+                double bSinEta1 = B * Math.Sin(Eta1);
+                X1 = Cx + aCosEta1 * _cosTheta - bSinEta1 * _sinTheta;
+                Y1 = Cy + aCosEta1 * _sinTheta + bSinEta1 * _cosTheta;
+                double aCosEta2 = A * Math.Cos(Eta2);
+                double bSinEta2 = B * Math.Sin(Eta2);
+                X2 = Cx + aCosEta2 * _cosTheta - bSinEta2 * _sinTheta;
+                Y2 = Cy + aCosEta2 * _sinTheta + bSinEta2 * _cosTheta;
+            }
+
+            /// <summary>
+            /// Computes the bounding box
+            /// </summary>
+            private void ComputeBounds()
+            {
+                double bOnA = B / A;
+                double etaXMin;
+                double etaXMax;
+                double etaYMin;
+                double etaYMax;
+                if (Math.Abs(_sinTheta) < 0.1)
+                {
+                    double tanTheta = _sinTheta / _cosTheta;
+                    if (_cosTheta < 0)
+                    {
+                        etaXMin = -Math.Atan(tanTheta * bOnA);
+                        etaXMax = etaXMin + Math.PI;
+                        etaYMin = 0.5 * Math.PI - Math.Atan(tanTheta / bOnA);
+                        etaYMax = etaYMin + Math.PI;
+                    }
+                    else
+                    {
+                        etaXMax = -Math.Atan(tanTheta * bOnA);
+                        etaXMin = etaXMax - Math.PI;
+                        etaYMax = 0.5 * Math.PI - Math.Atan(tanTheta / bOnA);
+                        etaYMin = etaYMax - Math.PI;
+                    }
+                }
+                else
+                {
+                    double invTanTheta = _cosTheta / _sinTheta;
+                    if (_sinTheta < 0)
+                    {
+                        etaXMax = 0.5 * Math.PI + Math.Atan(invTanTheta / bOnA);
+                        etaXMin = etaXMax - Math.PI;
+                        etaYMin = Math.Atan(invTanTheta * bOnA);
+                        etaYMax = etaYMin + Math.PI;
+                    }
+                    else
+                    {
+                        etaXMin = 0.5 * Math.PI + Math.Atan(invTanTheta / bOnA);
+                        etaXMax = etaXMin + Math.PI;
+                        etaYMax = Math.Atan(invTanTheta * bOnA);
+                        etaYMin = etaYMax - Math.PI;
+                    }
+                }
+                etaXMin -= TwoPi * Math.Floor((etaXMin - Eta1) / TwoPi);
+                etaYMin -= TwoPi * Math.Floor((etaYMin - Eta1) / TwoPi);
+                etaXMax -= TwoPi * Math.Floor((etaXMax - Eta1) / TwoPi);
+                etaYMax -= TwoPi * Math.Floor((etaYMax - Eta1) / TwoPi);
+                _xLeft = etaXMin <= Eta2
+                    ? Cx + A * Math.Cos(etaXMin) * _cosTheta - B * Math.Sin(etaXMin) * _sinTheta
+                    : Math.Min(X1, X2);
+                _yUp = etaYMin <= Eta2 ? Cy + A * Math.Cos(etaYMin) * _sinTheta + B * Math.Sin(etaYMin) * _cosTheta : Math.Min(Y1, Y2);
+                _width = (etaXMax <= Eta2
+                    ? Cx + A * Math.Cos(etaXMax) * _cosTheta - B * Math.Sin(etaXMax) * _sinTheta
+                    : Math.Max(X1, X2)) - _xLeft;
+                _height = (etaYMax <= Eta2
+                    ? Cy + A * Math.Cos(etaYMax) * _sinTheta + B * Math.Sin(etaYMax) * _cosTheta
+                    : Math.Max(Y1, Y2)) - _yUp;
+            }
+
+            /// <summary>
+            /// Computes the flatness parameters used in intersection tests
+            /// </summary>
+            private void ComputeDerivedFlatnessParameters()
+            {
+                F = (A - B) / A;
+                E2 = F * (2.0 - F);
+                G = 1.0 - F;
+                G2 = G * G;
+            }
+
+            /// <summary>
+            /// Computes the value of a rational function.
+            /// This method handles rational functions where the numerator is quadratic
+            /// and the denominator is linear
+            /// </summary>
+            /// <param name="x">Abscissa for which the value should be computed</param>
+            /// <param name="c">Coefficients array of the rational function</param>
+            /// <returns></returns>
+            private static double RationalFunction(double x, double[] c)
+            {
+                return (x * (x * c[0] + c[1]) + c[2]) / (x + c[3]);
+            }
+
+            /// <summary>
+            /// Estimate the approximation error for a sub-arc of the instance
+            /// </summary>
+            /// <param name="degree">Degree of the Bezier curve to use (1, 2 or 3)</param>
+            /// <param name="etaA">Start angle of the sub-arc</param>
+            /// <param name="etaB">End angle of the sub-arc</param>
+            /// <returns>Upper bound of the approximation error between the Bezier curve and the real ellipse</returns>
+            public double EstimateError(int degree, double etaA, double etaB)
+            {
+                if (degree < 1 || degree > _maxDegree)
+                    throw new ArgumentException($"degree should be between {1} and {_maxDegree}", nameof(degree));
+                double eta = 0.5 * (etaA + etaB);
+                if (degree < 2)
+                {
+                    //start point
+                    double aCosEtaA = A * Math.Cos(etaA);
+                    double bSinEtaA = B * Math.Sin(etaA);
+                    double xA = Cx + aCosEtaA * _cosTheta - bSinEtaA * _sinTheta;
+                    double yA = Cy + aCosEtaA * _sinTheta + bSinEtaA * _cosTheta;
+
+                    //end point
+                    double aCosEtaB = A * Math.Cos(etaB);
+                    double bSinEtaB = B * Math.Sin(etaB);
+                    double xB = Cx + aCosEtaB * _cosTheta - bSinEtaB * _sinTheta;
+                    double yB = Cy + aCosEtaB * _sinTheta + bSinEtaB * _cosTheta;
+
+                    //maximal error point
+                    double aCosEta = A * Math.Cos(eta);
+                    double bSinEta = B * Math.Sin(eta);
+                    double x = Cx + aCosEta * _cosTheta - bSinEta * _sinTheta;
+                    double y = Cy + aCosEta * _sinTheta + bSinEta * _cosTheta;
+
+                    double dx = xB - xA;
+                    double dy = yB - yA;
+
+                    return Math.Abs(x * dy - y * dx + xB * yA - xA * yB) / Math.Sqrt(dx * dx + dy * dy);
+                }
+                else
+                {
+                    double x = B / A;
+                    double dEta = etaB - etaA;
+                    double cos2 = Math.Cos(2 * eta);
+                    double cos4 = Math.Cos(4 * eta);
+                    double cos6 = Math.Cos(6 * eta);
+
+                    // select the right coefficients set according to degree and b/a
+                    double[][][] coeffs;
+                    double[] safety;
+                    if (degree == 2)
+                    {
+                        coeffs = x < 0.25 ? Coeffs2Low : Coeffs2High;
+                        safety = Safety2;
+                    }
+                    else
+                    {
+                        coeffs = x < 0.25 ? Coeffs3Low : Coeffs3High;
+                        safety = Safety3;
+                    }
+                    double c0 = RationalFunction(x, coeffs[0][0]) + cos2 * RationalFunction(x, coeffs[0][1]) +
+                                cos4 * RationalFunction(x, coeffs[0][2]) + cos6 * RationalFunction(x,
+                                    coeffs[0][3]);
+                    double c1 = RationalFunction(x, coeffs[1][0]) + cos2 * RationalFunction(x, coeffs[1][1]) +
+                                cos4 * RationalFunction(x, coeffs[1][2]) + cos6 * RationalFunction(x,
+                                    coeffs[1][3]);
+                    return RationalFunction(x, safety) * A * Math.Exp(c0 + c1 * dEta);
+                }
+            }
+
+            /// <summary>
+            /// Get the elliptical arc point for a given angular parameter
+            /// </summary>
+            /// <param name="lambda">Angular parameter for which point is desired</param> 
+            /// <returns>The desired elliptical arc point location</returns>
+            public Point PointAt(double lambda)
+            {
+                double eta = Math.Atan2(Math.Sin(lambda) / B, Math.Cos(lambda) / A);
+                double aCosEta = A * Math.Cos(eta);
+                double bSinEta = B * Math.Sin(eta);
+                Point p = new Point(Cx + aCosEta * _cosTheta - bSinEta * _sinTheta, Cy + aCosEta * _sinTheta + bSinEta * _cosTheta);
+                return p;
+            }
+
+            /// <summary>
+            /// Tests if the specified coordinates are inside the closed shape formed by this arc.
+            /// If this is not a pie, then a shape derived by adding a closing chord is considered.
+            /// </summary>
+            /// <param name="x">Abscissa of the test point</param>
+            /// <param name="y">Ordinate of the test point</param>
+            /// <returns>True if the specified coordinates are inside the closed shape of this arc</returns>
+            public bool Contains(double x, double y)
+            {
+                // position relative to the focii
+                double dx1 = x - FirstFocusX;
+                double dy1 = y - FirstFocusY;
+                double dx2 = x - SecondFocusX;
+                double dy2 = y - SecondFocusY;
+                if (dx1 * dx1 + dy1 * dy1 + dx2 * dx2 + dy2 * dy2 > 4 * A * A)
+                {
+                    // the point is outside of the ellipse
+                    return false;
+                }
+                if (IsPieSlice)
+                {
+                    // check the location of the test point with respect to the
+                    // angular sector counted from the center of the ellipse
+                    double dxC = x - Cx;
+                    double dyC = y - Cy;
+                    double u = dxC * _cosTheta + dyC * _sinTheta;
+                    double v = dyC * _cosTheta - dxC * _sinTheta;
+                    double eta = Math.Atan2(v / B, u / A);
+                    eta -= TwoPi * Math.Floor((eta - Eta1) / TwoPi);
+                    return eta <= Eta2;
+                }
+                // check the location of the test point with respect to the
+                // chord joining the start and end points
+                double dx = X2 - X1;
+                double dy = Y2 - Y1;
+                return x * dy - y * dx + X2 * Y1 - X1 * Y2 >= 0;
+            }
+
+            /// <summary>
+            /// Tests if a line segment intersects the arc
+            /// </summary>
+            /// <param name="xA">abscissa of the first point of the line segment</param>
+            /// <param name="yA">ordinate of the first point of the line segment</param>
+            /// <param name="xB">abscissa of the second point of the line segment</param>
+            /// <param name="yB">ordinate of the second point of the line segment</param>
+            /// <returns>true if the two line segments intersect</returns>
+            private bool IntersectArc(double xA, double yA, double xB, double yB)
+            {
+                double dx = xA - xB;
+                double dy = yA - yB;
+                double l = Math.Sqrt(dx * dx + dy * dy);
+                if (l < 1.0E-10 * A)
+                {
+                    // too small line segment, we consider it doesn't intersect anything
+                    return false;
+                }
+                double cz = (dx * _cosTheta + dy * _sinTheta) / l;
+                double sz = (dy * _cosTheta - dx * _sinTheta) / l;
+
+                // express position of the first point in canonical frame
+                dx = xA - Cx;
+                dy = yA - Cy;
+                double u = dx * _cosTheta + dy * _sinTheta;
+                double v = dy * _cosTheta - dx * _sinTheta;
+                double u2 = u * u;
+                double v2 = v * v;
+                double g2U2Ma2 = G2 * (u2 - A * A);
+                //double g2U2Ma2Mv2 = g2U2Ma2 - v2;
+                double g2U2Ma2Pv2 = g2U2Ma2 + v2;
+
+                // compute intersections with the ellipse along the line
+                // as the roots of a 2nd degree polynom : c0 k^2 - 2 c1 k + c2 = 0
+                double c0 = 1.0 - E2 * cz * cz;
+                double c1 = G2 * u * cz + v * sz;
+                double c2 = g2U2Ma2Pv2;
+                double c12 = c1 * c1;
+                double c0C2 = c0 * c2;
+                if (c12 < c0C2)
+                {
+                    // the line does not intersect the ellipse at all
+                    return false;
+                }
+                double k = c1 >= 0 ? (c1 + Math.Sqrt(c12 - c0C2)) / c0 : c2 / (c1 - Math.Sqrt(c12 - c0C2));
+                if (k >= 0 && k <= l)
+                {
+                    double uIntersect = u - k * cz;
+                    double vIntersect = v - k * sz;
+                    double eta = Math.Atan2(vIntersect / B, uIntersect / A);
+                    eta -= TwoPi * Math.Floor((eta - Eta1) / TwoPi);
+                    if (eta <= Eta2)
+                    {
+                        return true;
+                    }
+                }
+                k = c2 / (k * c0);
+                if (k >= 0 && k <= l)
+                {
+                    double uIntersect = u - k * cz;
+                    double vIntersect = v - k * sz;
+                    double eta = Math.Atan2(vIntersect / B, uIntersect / A);
+                    eta -= TwoPi * Math.Floor((eta - Eta1) / TwoPi);
+                    if (eta <= Eta2)
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            /// <summary>
+            /// Tests if two line segments intersect
+            /// </summary>
+            /// <param name="x1">Abscissa of the first point of the first line segment</param>
+            /// <param name="y1">Ordinate of the first point of the first line segment</param>
+            /// <param name="x2">Abscissa of the second point of the first line segment</param>
+            /// <param name="y2">Ordinate of the second point of the first line segment</param>
+            /// <param name="xA">Abscissa of the first point of the second line segment</param>
+            /// <param name="yA">Ordinate of the first point of the second line segment</param>
+            /// <param name="xB">Abscissa of the second point of the second line segment</param>
+            /// <param name="yB">Ordinate of the second point of the second line segment</param>
+            /// <returns>true if the two line segments intersect</returns>
+            private static bool Intersect(double x1, double y1, double x2, double y2, double xA, double yA, double xB,
+                double yB)
+            {
+                // elements of the equation of the (1, 2) line segment
+                double dx12 = x2 - x1;
+                double dy12 = y2 - y1;
+                double k12 = x2 * y1 - x1 * y2;
+                // elements of the equation of the (A, B) line segment
+                double dxAb = xB - xA;
+                double dyAb = yB - yA;
+                double kAb = xB * yA - xA * yB;
+                // compute relative positions of endpoints versus line segments
+                double pAvs12 = xA * dy12 - yA * dx12 + k12;
+                double pBvs12 = xB * dy12 - yB * dx12 + k12;
+                double p1VsAb = x1 * dyAb - y1 * dxAb + kAb;
+                double p2VsAb = x2 * dyAb - y2 * dxAb + kAb;
+
+                return pAvs12 * pBvs12 <= 0 && p1VsAb * p2VsAb <= 0;
+            }
+
+            /// <summary>
+            /// Tests if a line segment intersects the outline
+            /// </summary>
+            /// <param name="xA">Abscissa of the first point of the line segment</param>
+            /// <param name="yA">Ordinate of the first point of the line segment</param>
+            /// <param name="xB">Abscissa of the second point of the line segment</param>
+            /// <param name="yB">Ordinate of the second point of the line segment</param>
+            /// <returns>true if the two line segments intersect</returns>
+            private bool IntersectOutline(double xA, double yA, double xB, double yB)
+            {
+                if (IntersectArc(xA, yA, xB, yB))
+                {
+                    return true;
+                }
+                if (IsPieSlice)
+                {
+                    return Intersect(Cx, Cy, X1, Y1, xA, yA, xB, yB) || Intersect(Cx, Cy, X2, Y2, xA, yA, xB, yB);
+                }
+                return Intersect(X1, Y1, X2, Y2, xA, yA, xB, yB);
+            }
+
+            /// <summary>
+            /// Tests if the interior of a closed path derived from this arc entirely contains the specified rectangular area.
+            /// The closed path is derived with respect to the IsPieSlice value.
+            /// </summary>
+            /// <param name="x">Abscissa of the upper-left corner of the test rectangle</param>
+            /// <param name="y">Ordinate of the upper-left corner of the test rectangle</param>
+            /// <param name="w">Width of the test rectangle</param>
+            /// <param name="h">Height of the test rectangle</param>
+            /// <returns>true if the interior of a closed path derived from this arc entirely contains the specified rectangular area; false otherwise</returns>
+            public bool Contains(double x, double y, double w, double h)
+            {
+                double xPlusW = x + w;
+                double yPlusH = y + h;
+                return Contains(x, y) && Contains(xPlusW, y) && Contains(x, yPlusH) && Contains(xPlusW, yPlusH) &&
+                       !IntersectOutline(x, y, xPlusW, y) && !IntersectOutline(xPlusW,
+                           y, xPlusW, yPlusH) && !IntersectOutline(xPlusW, yPlusH, x, yPlusH) &&
+                       !IntersectOutline(x, yPlusH, x, y);
+            }
+
+            /// <summary>
+            /// Tests if a specified Point2D is inside the boundary of a closed path derived from this arc.
+            /// The closed path is derived with respect to the IsPieSlice value.
+            /// </summary>
+            /// <param name="p">Test point</param>
+            /// <returns>true if the specified point is inside a closed path derived from this arc</returns>
+            public bool Contains(Point p)
+            {
+                return Contains(p.X, p.Y);
+            }
+
+            /// <summary>
+            /// Tests if the interior of a closed path derived from this arc entirely contains the specified Rectangle2D.
+            /// The closed path is derived with respect to the IsPieSlice value.
+            /// </summary>
+            /// <param name="r">Test rectangle</param>
+            /// <returns>True if the interior of a closed path derived from this arc entirely contains the specified Rectangle2D; false otherwise</returns>
+            public bool Contains(Rect r)
+            {
+                return Contains(r.X, r.Y, r.Width, r.Height);
+            }
+
+            /// <summary>
+            /// Returns an integer Rectangle that completely encloses the closed path derived from this arc.
+            /// The closed path is derived with respect to the IsPieSlice value.
+            /// </summary> 
+            public Rect GetBounds()
+            {
+                return new Rect(_xLeft, _yUp, _width, _height);
+            }
+
+            /// <summary>
+            /// Builds the arc outline using given StreamGeometryContext and default (max) Bezier curve degree and acceptable error of half a pixel (0.5)
+            /// </summary>
+            /// <param name="path">A StreamGeometryContext to output the path commands to</param>
+            public void BuildArc(StreamGeometryContext path)
+            {
+                BuildArc(path, _maxDegree, _defaultFlatness, true);
+            }
+
+            /// <summary>
+            /// Builds the arc outline using given StreamGeometryContext
+            /// </summary>
+            /// <param name="path">A StreamGeometryContext to output the path commands to</param>
+            /// <param name="degree">degree of the Bezier curve to use</param>
+            /// <param name="threshold">acceptable error</param>
+            /// <param name="openNewFigure">if true, a new figure will be started in the specified StreamGeometryContext</param>
+            public void BuildArc(StreamGeometryContext path, int degree, double threshold, bool openNewFigure)
+            {
+                if (degree < 1 || degree > _maxDegree)
+                    throw new ArgumentException($"degree should be between {1} and {_maxDegree}", nameof(degree));
+
+                // find the number of Bezier curves needed
+                bool found = false;
+                int n = 1;
+                double dEta;
+                double etaB;
+                while (!found && n < 1024)
+                {
+                    dEta = (Eta2 - Eta1) / n;
+                    if (dEta <= 0.5 * Math.PI)
+                    {
+                        etaB = Eta1;
+                        found = true;
+                        for (int i = 0; found && i < n; ++i)
+                        {
+                            double etaA = etaB;
+                            etaB += dEta;
+                            found = EstimateError(degree, etaA, etaB) <= threshold;
+                        }
+                    }
+                    n = n << 1;
+                }
+                if (!DrawInOppositeDirection)
+                {
+                    dEta = (Eta2 - Eta1) / n;
+                    etaB = Eta1;
+                }
+                else
+                {
+                    dEta = (Eta1 - Eta2) / n;
+                    etaB = Eta2;
+                }
+
+
+                double cosEtaB = Math.Cos(etaB);
+                double sinEtaB = Math.Sin(etaB);
+                double aCosEtaB = A * cosEtaB;
+                double bSinEtaB = B * sinEtaB;
+                double aSinEtaB = A * sinEtaB;
+                double bCosEtaB = B * cosEtaB;
+                double xB = Cx + aCosEtaB * _cosTheta - bSinEtaB * _sinTheta;
+                double yB = Cy + aCosEtaB * _sinTheta + bSinEtaB * _cosTheta;
+                double xBDot = -aSinEtaB * _cosTheta - bCosEtaB * _sinTheta;
+                double yBDot = -aSinEtaB * _sinTheta + bCosEtaB * _cosTheta;
+
+                /*
+                  This controls the drawing in case of pies
+                if (openNewFigure)
+                {
+                    if (IsPieSlice)
+                    {
+                        path.BeginFigure(new Point(Cx, Cy), false, false);
+                        path.LineTo(new Point(xB, yB), true, true);
+                    }
+                    else
+                    {
+                        path.BeginFigure(new Point(xB, yB), false, false);
+                    }
+                }
+                else
+                {
+                    //path.LineTo(new Point(xB, yB), true, true);
+                }
+                */
+
+                //otherwise we're supposed to be already at the (xB,yB)
+                 
+
+                double t = Math.Tan(0.5 * dEta);
+                double alpha = Math.Sin(dEta) * (Math.Sqrt(4 + 3 * t * t) - 1) / 3;
+                for (int i = 0; i < n; ++i)
+                {
+                    //double etaA = etaB;
+                    double xA = xB;
+                    double yA = yB;
+                    double xADot = xBDot;
+                    double yADot = yBDot;
+                    etaB += dEta;
+                    cosEtaB = Math.Cos(etaB);
+                    sinEtaB = Math.Sin(etaB);
+                    aCosEtaB = A * cosEtaB;
+                    bSinEtaB = B * sinEtaB;
+                    aSinEtaB = A * sinEtaB;
+                    bCosEtaB = B * cosEtaB;
+                    xB = Cx + aCosEtaB * _cosTheta - bSinEtaB * _sinTheta;
+                    yB = Cy + aCosEtaB * _sinTheta + bSinEtaB * _cosTheta;
+                    xBDot = -aSinEtaB * _cosTheta - bCosEtaB * _sinTheta;
+                    yBDot = -aSinEtaB * _sinTheta + bCosEtaB * _cosTheta;
+                    if (degree == 1)
+                    {
+                        path.LineTo(new Point(xB, yB));
+                    }
+                    else if (degree == 2)
+                    {
+                        double k = (yBDot * (xB - xA) - xBDot * (yB - yA)) / (xADot * yBDot - yADot * xBDot);
+                        path.QuadraticBezierTo(new Point(xA + k * xADot, yA + k * yADot), new Point(xB, yB));
+                    }
+                    else
+                    {
+                        path.CubicBezierTo(
+                            new Point(xA + alpha * xADot, yA + alpha * yADot),
+                            new Point(xB - alpha * xBDot, yB - alpha * yBDot),
+                            new Point(xB, yB)
+                            );
+                    }
+                }
+                if (IsPieSlice)
+                {
+                    path.LineTo(new Point(Cx, Cy));
+                }
+            }
+
+            /// <summary>
+            /// Calculates the angle between two vectors
+            /// </summary>
+            /// <param name="v1">Vector V1</param>
+            /// <param name="v2">Vector V2</param>
+            /// <returns>The signed angle between v2 and v1</returns>
+            static double GetAngle(Vector v1, Vector v2)
+            {
+                var scalar = v1 * v2;
+                return Math.Atan2(v1.X * v2.Y - v2.X * v1.Y, scalar);
+            }
+
+            /// <summary>
+            /// Simple matrix used for rotate transforms. 
+            /// At some point I did not trust the WPF Matrix struct, and wrote my own simple one -_-
+            /// This is supposed to be replaced with proper WPF Matrices everywhere
+            /// </summary>
+            private readonly struct SimpleMatrix
+            {
+                private readonly double _a, _b, _c, _d;
+
+                public SimpleMatrix(double a, double b, double c, double d)
+                {
+                    _a = a;
+                    _b = b;
+                    _c = c;
+                    _d = d;
+                }
+
+                public static Point operator *(SimpleMatrix m, Point p)
+                {
+                    return new Point(m._a * p.X + m._b * p.Y, m._c * p.X + m._d * p.Y);
+                }
+            }
+
+            /// <summary>
+            /// ArcTo Helper for StreamGeometryContext
+            /// </summary>
+            /// <param name="path">Target path</param>
+            /// <param name="p1">Start point</param>
+            /// <param name="p2">End point</param>
+            /// <param name="size">Ellipse radii</param>
+            /// <param name="theta">Ellipse theta (angle measured from the abscissa)</param>
+            /// <param name="isLargeArc">Large Arc Indicator</param>
+            /// <param name="clockwise">Clockwise direction flag</param>
+            public static void BuildArc(StreamGeometryContext path, Point p1, Point p2, Size size, double theta, bool isLargeArc, bool clockwise)
+            {
+
+                // var orthogonalizer = new RotateTransform(-theta);
+                var orth = new SimpleMatrix(Math.Cos(theta), Math.Sin(theta), -Math.Sin(theta), Math.Cos(theta));
+                var rest = new SimpleMatrix(Math.Cos(theta), -Math.Sin(theta), Math.Sin(theta), Math.Cos(theta));
+
+                // var restorer = orthogonalizer.Inverse;
+                // if(restorer == null) throw new InvalidOperationException("Can't get a restorer!");
+
+                Point p1S = orth * (new Point((p1.X - p2.X) / 2, (p1.Y - p2.Y) / 2));
+
+                double rx = size.Width;
+                double ry = size.Height;
+                double rx2 = rx * rx;
+                double ry2 = ry * ry;
+                double y1S2 = p1S.Y * p1S.Y;
+                double x1S2 = p1S.X * p1S.X;
+
+                double numerator = rx2*ry2 - rx2*y1S2 - ry2*x1S2;
+                double denominator = rx2*y1S2 + ry2*x1S2;
+
+                if (Math.Abs(denominator) < 1e-8)
+                {
+                    path.LineTo(p2);
+                    return;
+                }
+                if ((numerator / denominator) < 0)
+                {
+                    double lambda = x1S2/rx2 + y1S2/ry2;
+                    double lambdaSqrt = Math.Sqrt(lambda);
+                    if (lambda > 1)
+                    {
+                        rx *= lambdaSqrt;
+                        ry *= lambdaSqrt;
+                        rx2 = rx*rx;
+                        ry2 = ry*ry;
+                        numerator = rx2 * ry2 - rx2 * y1S2 - ry2 * x1S2;
+                        if (numerator < 0)
+                            numerator = 0;
+
+                        denominator = rx2 * y1S2 + ry2 * x1S2;
+                    }
+
+                }
+
+                double multiplier = Math.Sqrt(Math.Abs(numerator / denominator));
+                Point mulVec = new Point(rx * p1S.Y / ry, -ry * p1S.X / rx);
+
+                int sign = (clockwise != isLargeArc) ? 1 : -1;
+
+                Point cs = new Point(mulVec.X * multiplier * sign, mulVec.Y * multiplier * sign);
+
+                Vector translation = new Vector((p1.X + p2.X) / 2, (p1.Y + p2.Y) / 2);
+
+                Point c = rest * (cs) + translation;
+
+                // See "https://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter" to understand
+                // how the ellipse center is calculated 
+
+
+                // from here, W3C recommendations from the above link make less sense than Darth Vader pouring
+                // some sea water in a water filter while standing in the water confused 
+
+                // Therefore, we are on our own with our task of finding out lambda1 and lambda2
+                // matching our points p1 and p2.
+
+                // Fortunately it is not so difficult now, when we already know the ellipse centre.
+
+                // We eliminate the offset, making our ellipse zero-centered, then we eliminate the theta,
+                // making its Y and X axes the same as global axes. Then we can easily get our angles using
+                // good old school formula for angles between vectors.
+
+                // We should remember that this class expects true angles, and not the t-values for ellipse equation.
+                // To understand how t-values are obtained, one should see Etas calculation in the constructor code.
+
+                var p1NoOffset = orth * (p1-c);
+                var p2NoOffset = orth * (p2-c);
+
+                // if the arc is drawn clockwise, we swap start and end points
+                var revisedP1 = clockwise ? p1NoOffset : p2NoOffset;
+                var revisedP2 = clockwise ? p2NoOffset : p1NoOffset;
+
+
+                var thetaStart = GetAngle(new Vector(1, 0), revisedP1);
+                var thetaEnd = GetAngle(new Vector(1, 0), revisedP2);
+
+
+                // Uncomment this to draw a pie
+                // path.LineTo(c, true, true);
+                // path.LineTo(clockwise ? p1 : p2, true,true);
+
+                var arc = new EllipticalArc(c.X, c.Y, rx, ry, theta, thetaStart, thetaEnd, false);
+
+                double ManhattanDistance(Point p1, Point p2) => Math.Abs(p1.X - p2.X) + Math.Abs(p1.Y - p2.Y);
+                if (ManhattanDistance(p2, new Point(arc.X2, arc.Y2)) > ManhattanDistance(p2, new Point(arc.X1, arc.Y1)))
+                {
+                    arc.DrawInOppositeDirection = true;
+                }
+
+                arc.BuildArc(path, arc._maxDegree, arc._defaultFlatness, false);
+                //path.LineTo(p2);
+
+                //uncomment this to draw a pie
+                //path.LineTo(c, true, true);
+            }
+
+            /// <summary>
+            /// Tests if the interior of the closed path derived from this arc intersects the interior of a specified rectangular area.
+            /// The closed path is derived with respect to the IsPieSlice value.
+            /// </summary>
+            public bool Intersects(double x, double y, double w, double h)
+            {
+                double xPlusW = x + w;
+                double yPlusH = y + h;
+                return Contains(x, y) || Contains(xPlusW, y) || Contains(x, yPlusH) || Contains(xPlusW, yPlusH) ||
+                       IntersectOutline(x, y, xPlusW, y) || IntersectOutline(xPlusW,
+                           y, xPlusW, yPlusH) || IntersectOutline(xPlusW, yPlusH, x, yPlusH) ||
+                       IntersectOutline(x, yPlusH, x, y);
+            }
+
+            /// <summary>
+            /// Tests if the interior of the closed path derived from this arc intersects the interior of a specified rectangular area.
+            /// The closed path is derived with respect to the IsPieSlice value.
+            /// </summary>
+            public bool Intersects(Rect r)
+            {
+                return Intersects(r.X, r.Y, r.Width, r.Height);
+            }
+        }
+
+        public static void ArcTo(StreamGeometryContext streamGeometryContextImpl, Point currentPoint, Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+        {
+            EllipticalArc.BuildArc(streamGeometryContextImpl, currentPoint, point, size, rotationAngle*(Math.PI/180),
+                isLargeArc,
+                sweepDirection == SweepDirection.Clockwise);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs
rename to src/Avalonia.Base/Media/QuadraticBezierSegment .cs
diff --git a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs b/src/Avalonia.Base/Media/RadialGradientBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/RadialGradientBrush.cs
rename to src/Avalonia.Base/Media/RadialGradientBrush.cs
diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Base/Media/RectangleGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/RectangleGeometry.cs
rename to src/Avalonia.Base/Media/RectangleGeometry.cs
diff --git a/src/Avalonia.Base/Media/RenderOptions.cs b/src/Avalonia.Base/Media/RenderOptions.cs
new file mode 100644
index 0000000000..5863d0ac58
--- /dev/null
+++ b/src/Avalonia.Base/Media/RenderOptions.cs
@@ -0,0 +1,36 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{ 
+    public class RenderOptions
+    {
+        /// <summary>
+        /// Defines the <see cref="BitmapInterpolationMode"/> property.
+        /// </summary>
+        public static readonly StyledProperty<BitmapInterpolationMode> BitmapInterpolationModeProperty =
+            AvaloniaProperty.RegisterAttached<RenderOptions, AvaloniaObject, BitmapInterpolationMode>(
+                "BitmapInterpolationMode", 
+                BitmapInterpolationMode.MediumQuality,
+                inherits: true);
+
+        /// <summary>
+        /// Gets the value of the BitmapInterpolationMode attached property for a control.
+        /// </summary>
+        /// <param name="element">The control.</param>
+        /// <returns>The control's left coordinate.</returns>
+        public static BitmapInterpolationMode GetBitmapInterpolationMode(AvaloniaObject element)
+        {
+            return element.GetValue(BitmapInterpolationModeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the BitmapInterpolationMode attached property for a control.
+        /// </summary>
+        /// <param name="element">The control.</param>
+        /// <param name="value">The left value.</param>
+        public static void SetBitmapInterpolationMode(AvaloniaObject element, BitmapInterpolationMode value)
+        {
+            element.SetValue(BitmapInterpolationModeProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/RotateTransform.cs b/src/Avalonia.Base/Media/RotateTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/RotateTransform.cs
rename to src/Avalonia.Base/Media/RotateTransform.cs
diff --git a/src/Avalonia.Visuals/Media/ScaleTransform.cs b/src/Avalonia.Base/Media/ScaleTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ScaleTransform.cs
rename to src/Avalonia.Base/Media/ScaleTransform.cs
diff --git a/src/Avalonia.Visuals/Media/SkewTransform.cs b/src/Avalonia.Base/Media/SkewTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/SkewTransform.cs
rename to src/Avalonia.Base/Media/SkewTransform.cs
diff --git a/src/Avalonia.Visuals/Media/SolidColorBrush.cs b/src/Avalonia.Base/Media/SolidColorBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/SolidColorBrush.cs
rename to src/Avalonia.Base/Media/SolidColorBrush.cs
diff --git a/src/Avalonia.Visuals/Media/StreamGeometry.cs b/src/Avalonia.Base/Media/StreamGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/StreamGeometry.cs
rename to src/Avalonia.Base/Media/StreamGeometry.cs
diff --git a/src/Avalonia.Base/Media/StreamGeometryContext.cs b/src/Avalonia.Base/Media/StreamGeometryContext.cs
new file mode 100644
index 0000000000..ed6065eae4
--- /dev/null
+++ b/src/Avalonia.Base/Media/StreamGeometryContext.cs
@@ -0,0 +1,133 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes a geometry using drawing commands.
+    /// </summary>
+    /// <remarks>
+    /// This class is used to define the geometry of a <see cref="StreamGeometry"/>. An instance
+    /// of <see cref="StreamGeometryContext"/> is obtained by calling
+    /// <see cref="StreamGeometry.Open"/>.
+    /// </remarks>
+    /// TODO: This class is just a wrapper around IStreamGeometryContextImpl: is it needed?
+    public class StreamGeometryContext : IGeometryContext
+    {
+        private readonly IStreamGeometryContextImpl _impl;
+
+        private Point _currentPoint;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamGeometryContext"/> class.
+        /// </summary>
+        /// <param name="impl">The platform-specific implementation.</param>
+        public StreamGeometryContext(IStreamGeometryContextImpl impl)
+        {
+            _impl = impl;
+        }
+
+        /// <summary>
+        /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. If you wonder why, ask Direct2D guys about their design decisions.
+        /// </summary>
+        /// <param name="fillRule"></param>
+
+        public void SetFillRule(FillRule fillRule)
+        {
+            _impl.SetFillRule(fillRule);
+        }
+
+        /// <summary>
+        /// Draws an arc to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
+        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
+        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
+        /// <param name="sweepDirection">
+        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+        /// </param>
+        public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+        {
+            _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection);
+            _currentPoint = point;
+        }
+
+
+        /// <summary>
+        /// Draws an arc to the specified point using polylines, quadratic or cubic Bezier curves
+        /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios.        
+        /// </summary>         
+        /// <param name="point">The destination point.</param>
+        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
+        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
+        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
+        /// <param name="sweepDirection">
+        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+        /// </param>
+        public void PreciseArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+        {
+            PreciseEllipticArcHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection);
+        }
+
+        /// <summary>
+        /// Begins a new figure.
+        /// </summary>
+        /// <param name="startPoint">The starting point for the figure.</param>
+        /// <param name="isFilled">Whether the figure is filled.</param>
+        public void BeginFigure(Point startPoint, bool isFilled)
+        {
+            _impl.BeginFigure(startPoint, isFilled);
+            _currentPoint = startPoint;
+        }
+
+        /// <summary>
+        /// Draws a Bezier curve to the specified point.
+        /// </summary>
+        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
+        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
+        /// <param name="point3">The destination point for the end of the curve.</param>
+        public void CubicBezierTo(Point point1, Point point2, Point point3)
+        {
+            _impl.CubicBezierTo(point1, point2, point3);
+            _currentPoint = point3;
+        }
+
+        /// <summary>
+        /// Draws a quadratic Bezier curve to the specified point
+        /// </summary>
+        /// <param name="control">The control point used to specify the shape of the curve.</param>
+        /// <param name="endPoint">The destination point for the end of the curve.</param>
+        public void QuadraticBezierTo(Point control, Point endPoint)
+        {
+            _impl.QuadraticBezierTo(control, endPoint);
+            _currentPoint = endPoint;
+        }
+
+        /// <summary>
+        /// Draws a line to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        public void LineTo(Point point)
+        {
+            _impl.LineTo(point);
+            _currentPoint = point;
+        }
+
+        /// <summary>
+        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
+        /// </summary>
+        /// <param name="isClosed">Whether the figure is closed.</param>
+        public void EndFigure(bool isClosed)
+        {
+            _impl.EndFigure(isClosed);
+        }
+
+        /// <summary>
+        /// Finishes the drawing session.
+        /// </summary>
+        public void Dispose()
+        {
+            _impl.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Stretch.cs b/src/Avalonia.Base/Media/Stretch.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Stretch.cs
rename to src/Avalonia.Base/Media/Stretch.cs
diff --git a/src/Avalonia.Visuals/Media/StretchDirection.cs b/src/Avalonia.Base/Media/StretchDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/StretchDirection.cs
rename to src/Avalonia.Base/Media/StretchDirection.cs
diff --git a/src/Avalonia.Visuals/Media/SweepDirection.cs b/src/Avalonia.Base/Media/SweepDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/SweepDirection.cs
rename to src/Avalonia.Base/Media/SweepDirection.cs
diff --git a/src/Avalonia.Base/Media/TextAlignment.cs b/src/Avalonia.Base/Media/TextAlignment.cs
new file mode 100644
index 0000000000..94416ccde2
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextAlignment.cs
@@ -0,0 +1,46 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines how text is aligned.
+    /// </summary>
+    public enum TextAlignment
+    {
+        /// <summary>
+        /// The text is left-aligned.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// The text is centered.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// The text is right-aligned.
+        /// </summary>
+        Right,
+
+        /// <summary>
+        /// The beginning of the text is aligned to the edge of the available space.
+        /// </summary>
+        Start,
+
+        /// <summary>
+        /// The end of the text is aligned to the edge of the available space.
+        /// </summary>
+        End,
+
+        /// <summary>
+        /// Text alignment is inferred from the text content.
+        /// </summary>
+        /// <remarks>
+        /// When the TextAlignment property is set to DetectFromContent, alignment is inferred from the text content of the control. For example, English text is left aligned, and Arabic text is right aligned.
+        /// </remarks>
+        DetectFromContent,
+
+        /// <summary>
+        /// Text is justified within the available space.
+        /// </summary>
+        Justify
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextCollapsingCreateInfo.cs b/src/Avalonia.Base/Media/TextCollapsingCreateInfo.cs
new file mode 100644
index 0000000000..78f15b724a
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextCollapsingCreateInfo.cs
@@ -0,0 +1,16 @@
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    public readonly struct TextCollapsingCreateInfo
+    {
+        public readonly double Width;
+        public readonly TextRunProperties TextRunProperties;
+
+        public TextCollapsingCreateInfo(double width, TextRunProperties textRunProperties)
+        {
+            Width = width;
+            TextRunProperties = textRunProperties;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextDecoration.cs b/src/Avalonia.Base/Media/TextDecoration.cs
new file mode 100644
index 0000000000..0a7328125a
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextDecoration.cs
@@ -0,0 +1,215 @@
+using Avalonia.Collections;
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a text decoration, which is a visual ornamentation that is added to text (such as an underline).
+    /// </summary>
+    public class TextDecoration : AvaloniaObject
+    {
+        /// <summary>
+        /// Defines the <see cref="Location"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextDecorationLocation> LocationProperty =
+            AvaloniaProperty.Register<TextDecoration, TextDecorationLocation>(nameof(Location));
+
+        /// <summary>
+        /// Defines the <see cref="Stroke"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> StrokeProperty =
+            AvaloniaProperty.Register<TextDecoration, IBrush>(nameof(Stroke));
+
+        /// <summary>
+        /// Defines the <see cref="StrokeThicknessUnit"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextDecorationUnit> StrokeThicknessUnitProperty =
+            AvaloniaProperty.Register<TextDecoration, TextDecorationUnit>(nameof(StrokeThicknessUnit));
+
+        /// <summary>
+        /// Defines the <see cref="StrokeDashArray"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AvaloniaList<double>> StrokeDashArrayProperty =
+            AvaloniaProperty.Register<TextDecoration, AvaloniaList<double>>(nameof(StrokeDashArray));
+
+        /// <summary>
+        /// Defines the <see cref="StrokeDashOffset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> StrokeDashOffsetProperty =
+            AvaloniaProperty.Register<TextDecoration, double>(nameof(StrokeDashOffset));
+
+        /// <summary>
+        /// Defines the <see cref="StrokeThickness"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> StrokeThicknessProperty =
+            AvaloniaProperty.Register<TextDecoration, double>(nameof(StrokeThickness), 1);
+
+        /// <summary>
+        /// Defines the <see cref="StrokeLineCap"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PenLineCap> StrokeLineCapProperty =
+            AvaloniaProperty.Register<TextDecoration, PenLineCap>(nameof(StrokeLineCap));
+
+        /// <summary>
+        /// Defines the <see cref="StrokeOffset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> StrokeOffsetProperty =
+            AvaloniaProperty.Register<TextDecoration, double>(nameof(StrokeOffset));
+
+        /// <summary>
+        /// Defines the <see cref="StrokeOffsetUnit"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextDecorationUnit> StrokeOffsetUnitProperty =
+            AvaloniaProperty.Register<TextDecoration, TextDecorationUnit>(nameof(StrokeOffsetUnit));
+
+        /// <summary>
+        /// Gets or sets the location.
+        /// </summary>
+        /// <value>
+        /// The location.
+        /// </value>
+        public TextDecorationLocation Location
+        {
+            get => GetValue(LocationProperty);
+            set => SetValue(LocationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IBrush"/> that specifies how the <see cref="TextDecoration"/> is painted.
+        /// </summary>
+        public IBrush Stroke
+        {
+            get { return GetValue(StrokeProperty); }
+            set { SetValue(StrokeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the units in which the thickness of the <see cref="TextDecoration"/> is expressed.
+        /// </summary>
+        public TextDecorationUnit StrokeThicknessUnit
+        {
+            get => GetValue(StrokeThicknessUnitProperty);
+            set => SetValue(StrokeThicknessUnitProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a collection of <see cref="double"/> values that indicate the pattern of dashes and gaps
+        /// that is used to draw the <see cref="TextDecoration"/>.
+        /// </summary>
+        public AvaloniaList<double> StrokeDashArray
+        {
+            get { return GetValue(StrokeDashArrayProperty); }
+            set { SetValue(StrokeDashArrayProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that specifies the distance within the dash pattern where a dash begins.
+        /// </summary>
+        public double StrokeDashOffset
+        {
+            get { return GetValue(StrokeDashOffsetProperty); }
+            set { SetValue(StrokeDashOffsetProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the thickness of the <see cref="TextDecoration"/>.
+        /// </summary>
+        public double StrokeThickness
+        {
+            get { return GetValue(StrokeThicknessProperty); }
+            set { SetValue(StrokeThicknessProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a <see cref="PenLineCap"/> enumeration value that describes the shape at the ends of a line.
+        /// </summary>
+        public PenLineCap StrokeLineCap
+        {
+            get { return GetValue(StrokeLineCapProperty); }
+            set { SetValue(StrokeLineCapProperty, value); }
+        }
+
+        /// <summary>
+        /// The stroke's offset.
+        /// </summary>
+        /// <value>
+        /// The pen offset.
+        /// </value>
+        public double StrokeOffset
+        {
+            get => GetValue(StrokeOffsetProperty);
+            set => SetValue(StrokeOffsetProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the units in which the <see cref="StrokeOffset"/> value is expressed.
+        /// </summary>
+        public TextDecorationUnit StrokeOffsetUnit
+        {
+            get => GetValue(StrokeOffsetUnitProperty);
+            set => SetValue(StrokeOffsetUnitProperty, value);
+        }
+
+        /// <summary>
+        /// Draws the <see cref="TextDecoration"/> at given origin.
+        /// </summary>
+        /// <param name="drawingContext">The drawing context.</param>
+        /// <param name="glyphRun">The decorated run.</param>
+        /// <param name="textMetrics">The font metrics of the decorated run.</param>
+        /// <param name="defaultBrush">The default brush that is used to draw the decoration.</param>
+        internal void Draw(DrawingContext drawingContext, GlyphRun glyphRun, TextMetrics textMetrics, IBrush defaultBrush)
+        {
+            var baselineOrigin = glyphRun.BaselineOrigin;
+            var thickness = StrokeThickness;
+
+            switch (StrokeThicknessUnit)
+            {
+                case TextDecorationUnit.FontRecommended:
+                    switch (Location)
+                    {
+                        case TextDecorationLocation.Underline:
+                            thickness = textMetrics.UnderlineThickness;
+                            break;
+                        case TextDecorationLocation.Strikethrough:
+                            thickness = textMetrics.StrikethroughThickness;
+                            break;
+                    }
+
+                    break;
+                case TextDecorationUnit.FontRenderingEmSize:
+                    thickness = textMetrics.FontRenderingEmSize * thickness;
+                    break;
+            }
+
+            var origin = new Point();
+
+            switch (Location)
+            {
+                case TextDecorationLocation.Baseline:
+                    origin += glyphRun.BaselineOrigin;
+                    break;
+                case TextDecorationLocation.Strikethrough:
+                    origin += new Point(baselineOrigin.X, baselineOrigin.Y + textMetrics.StrikethroughPosition);
+                    break;
+                case TextDecorationLocation.Underline:
+                    origin += new Point(baselineOrigin.X, baselineOrigin.Y + textMetrics.UnderlinePosition);
+                    break;
+            }
+
+            switch (StrokeOffsetUnit)
+            {
+                case TextDecorationUnit.FontRenderingEmSize:
+                    origin += new Point(0, StrokeOffset * textMetrics.FontRenderingEmSize);
+                    break;
+                case TextDecorationUnit.Pixel:
+                    origin += new Point(0, StrokeOffset);
+                    break;
+            }
+
+            var pen = new Pen(Stroke ?? defaultBrush, thickness,
+                new DashStyle(StrokeDashArray, StrokeDashOffset), StrokeLineCap);
+
+            drawingContext.DrawLine(pen, origin, origin + new Point(glyphRun.Metrics.Width, 0));
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextDecorationCollection.cs b/src/Avalonia.Base/Media/TextDecorationCollection.cs
new file mode 100644
index 0000000000..2d7bd17b20
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextDecorationCollection.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A collection that holds <see cref="TextDecoration"/> objects.
+    /// </summary>
+    public class TextDecorationCollection : AvaloniaList<TextDecoration>
+    {
+        public TextDecorationCollection()
+        {
+            
+        }
+
+        public TextDecorationCollection(IEnumerable<TextDecoration> textDecorations) : base(textDecorations)
+        {
+            
+        }
+        
+        /// <summary>
+        /// Parses a <see cref="TextDecorationCollection"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="TextDecorationCollection"/>.</returns>
+        public static TextDecorationCollection Parse(string s)
+        {
+            var locations = new List<TextDecorationLocation>();
+
+            using (var tokenizer = new StringTokenizer(s, ',', "Invalid text decoration."))
+            {
+                while (tokenizer.TryReadString(out var name))
+                {
+                    var location = GetTextDecorationLocation(name);
+
+                    if (locations.Contains(location))
+                    {
+                        throw new ArgumentException("Text decoration already specified.", nameof(s));
+                    }
+
+                    locations.Add(location);
+                }
+            }
+
+            var textDecorations = new TextDecorationCollection();
+
+            foreach (var textDecorationLocation in locations)
+            {
+                textDecorations.Add(new TextDecoration { Location = textDecorationLocation });
+            }
+
+            return textDecorations;
+        }
+
+        /// <summary>
+        /// Parses a <see cref="TextDecorationLocation"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="TextDecorationLocation"/>.</returns>
+        private static TextDecorationLocation GetTextDecorationLocation(string s)
+        {
+            if (Enum.TryParse<TextDecorationLocation>(s,true, out var location))
+            {
+                return location;
+            }
+
+            throw new ArgumentException("Could not parse text decoration.", nameof(s));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextDecorationLocation.cs b/src/Avalonia.Base/Media/TextDecorationLocation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecorationLocation.cs
rename to src/Avalonia.Base/Media/TextDecorationLocation.cs
diff --git a/src/Avalonia.Visuals/Media/TextDecorationUnit.cs b/src/Avalonia.Base/Media/TextDecorationUnit.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecorationUnit.cs
rename to src/Avalonia.Base/Media/TextDecorationUnit.cs
diff --git a/src/Avalonia.Visuals/Media/TextDecorations.cs b/src/Avalonia.Base/Media/TextDecorations.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecorations.cs
rename to src/Avalonia.Base/Media/TextDecorations.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/DrawableTextRun.cs b/src/Avalonia.Base/Media/TextFormatting/DrawableTextRun.cs
new file mode 100644
index 0000000000..e63ed421ba
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/DrawableTextRun.cs
@@ -0,0 +1,25 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that supports drawing content.
+    /// </summary>
+    public abstract class DrawableTextRun : TextRun
+    {
+        /// <summary>
+        /// Gets the size.
+        /// </summary>
+        public abstract Size Size { get; }
+        
+        /// <summary>
+        /// Run baseline in ratio relative to run height
+        /// </summary>
+        public abstract double Baseline { get; }
+
+        /// <summary>
+        /// Draws the <see cref="DrawableTextRun"/> at the given origin.
+        /// </summary>
+        /// <param name="drawingContext">The drawing context.</param>
+        /// <param name="origin">The origin.</param>
+        public abstract void Draw(DrawingContext drawingContext, Point origin);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
new file mode 100644
index 0000000000..fb8e699d8e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal readonly struct FormattedTextSource : ITextSource
+    {
+        private readonly ReadOnlySlice<char> _text;
+        private readonly TextRunProperties _defaultProperties;
+        private readonly IReadOnlyList<ValueSpan<TextRunProperties>>? _textModifier;
+
+        public FormattedTextSource(ReadOnlySlice<char> text, TextRunProperties defaultProperties,
+            IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
+        {
+            _text = text;
+            _defaultProperties = defaultProperties;
+            _textModifier = textModifier;
+        }
+
+        public TextRun? GetTextRun(int textSourceIndex)
+        {
+            if (textSourceIndex > _text.Length)
+            {
+                return null;
+            }
+
+            var runText = _text.Skip(textSourceIndex);
+
+            if (runText.IsEmpty)
+            {
+                return null;
+            }
+
+            var textStyleRun = CreateTextStyleRun(runText, textSourceIndex, _defaultProperties, _textModifier);
+
+            return new TextCharacters(runText.Take(textStyleRun.Length), textStyleRun.Value);
+        }
+
+        /// <summary>
+        /// Creates a span of text run properties that has modifier applied.
+        /// </summary>
+        /// <param name="text">The text to create the properties for.</param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="defaultProperties">The default text properties.</param>
+        /// <param name="textModifier">The text properties modifier.</param>
+        /// <returns>
+        /// The created text style run.
+        /// </returns>
+        private static ValueSpan<TextRunProperties> CreateTextStyleRun(ReadOnlySlice<char> text, int firstTextSourceIndex,
+            TextRunProperties defaultProperties, IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
+        {
+            if (textModifier == null || textModifier.Count == 0)
+            {
+                return new ValueSpan<TextRunProperties>(firstTextSourceIndex, text.Length, defaultProperties);
+            }
+
+            var currentProperties = defaultProperties;
+
+            var hasOverride = false;
+
+            var i = 0;
+
+            var length = 0;
+
+            for (; i < textModifier.Count; i++)
+            {
+                var propertiesOverride = textModifier[i];
+
+                var textRange = new TextRange(propertiesOverride.Start, propertiesOverride.Length);
+
+                if (textRange.Start + textRange.Length <= firstTextSourceIndex)
+                {
+                    continue;
+                }
+
+                if (textRange.Start > firstTextSourceIndex + text.Length)
+                {
+                    length = text.Length;
+                    break;
+                }
+
+                if (textRange.Start > firstTextSourceIndex)
+                {
+                    if (propertiesOverride.Value != currentProperties)
+                    {
+                        length = Math.Min(Math.Abs(textRange.Start - firstTextSourceIndex), text.Length);
+
+                        break;
+                    }
+                }
+
+                length = Math.Max(0, textRange.Start + textRange.Length - firstTextSourceIndex);
+
+                if (hasOverride)
+                {
+                    continue;
+                }
+
+                hasOverride = true;
+
+                currentProperties = propertiesOverride.Value;
+            }
+
+            if (length < text.Length && i == textModifier.Count)
+            {
+                if (currentProperties == defaultProperties)
+                {
+                    length = text.Length;
+                }
+            }
+
+            if (length == 0 && currentProperties != defaultProperties)
+            {
+                currentProperties = defaultProperties;
+                length = text.Length;
+            }
+
+            length = CoerceLength(text, length);
+
+            return new ValueSpan<TextRunProperties>(firstTextSourceIndex, length, currentProperties);
+        }
+
+        private static int CoerceLength(ReadOnlySlice<char> text, int length)
+        {
+            var finalLength = 0;
+
+            var graphemeEnumerator = new GraphemeEnumerator(text);
+
+            while (graphemeEnumerator.MoveNext())
+            {
+                var grapheme = graphemeEnumerator.Current;
+
+                finalLength += grapheme.Text.Length;
+
+                if (finalLength >= length)
+                {
+                    return finalLength;
+                }
+            }
+
+            return Math.Min(length, text.Length);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/GenericTextParagraphProperties.cs b/src/Avalonia.Base/Media/TextFormatting/GenericTextParagraphProperties.cs
new file mode 100644
index 0000000000..b9ed31523e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/GenericTextParagraphProperties.cs
@@ -0,0 +1,179 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Generic implementation of TextParagraphProperties
+    /// </summary>
+    public sealed class GenericTextParagraphProperties : TextParagraphProperties
+    {
+        private FlowDirection _flowDirection;
+        private TextAlignment _textAlignment;
+        private TextWrapping _textWrap;
+        private double _lineHeight;
+
+        /// <summary>
+        /// Constructing TextParagraphProperties
+        /// </summary>
+        /// <param name="defaultTextRunProperties">default paragraph's default run properties</param>
+        /// <param name="textAlignment">logical horizontal alignment</param>
+        /// <param name="textWrap">text wrap option</param>
+        /// <param name="lineHeight">Paragraph line height</param>
+        /// <param name="letterSpacing">letter spacing</param>
+        public GenericTextParagraphProperties(TextRunProperties defaultTextRunProperties,
+            TextAlignment textAlignment = TextAlignment.Left,
+            TextWrapping textWrap = TextWrapping.NoWrap,
+            double lineHeight = 0,
+            double letterSpacing = 0)
+        {
+            DefaultTextRunProperties = defaultTextRunProperties;
+            _textAlignment = textAlignment;
+            _textWrap = textWrap;
+            _lineHeight = lineHeight;
+            LetterSpacing = letterSpacing;
+        }
+
+        /// <summary>
+        /// Constructing TextParagraphProperties
+        /// </summary>
+        /// <param name="flowDirection">text flow direction</param>
+        /// <param name="textAlignment">logical horizontal alignment</param>
+        /// <param name="firstLineInParagraph">true if the paragraph is the first line in the paragraph</param>
+        /// <param name="alwaysCollapsible">true if the line is always collapsible</param>
+        /// <param name="defaultTextRunProperties">default paragraph's default run properties</param>
+        /// <param name="textWrap">text wrap option</param>
+        /// <param name="lineHeight">Paragraph line height</param>
+        /// <param name="indent">line indentation</param>
+        /// <param name="letterSpacing">letter spacing</param>
+        public GenericTextParagraphProperties(
+            FlowDirection flowDirection,
+            TextAlignment textAlignment,
+            bool firstLineInParagraph,
+            bool alwaysCollapsible,
+            TextRunProperties defaultTextRunProperties,
+            TextWrapping textWrap,
+            double lineHeight,
+            double indent,
+            double letterSpacing)
+        {
+            _flowDirection = flowDirection;
+            _textAlignment = textAlignment;
+            FirstLineInParagraph = firstLineInParagraph;
+            AlwaysCollapsible = alwaysCollapsible;
+            DefaultTextRunProperties = defaultTextRunProperties;
+            _textWrap = textWrap;
+            _lineHeight = lineHeight;
+            LetterSpacing = letterSpacing;
+            Indent = indent;
+        }
+
+        /// <summary>
+        /// Constructing TextParagraphProperties from another one
+        /// </summary>
+        /// <param name="textParagraphProperties">source line props</param>
+        public GenericTextParagraphProperties(TextParagraphProperties textParagraphProperties)
+            : this(textParagraphProperties.FlowDirection, 
+                textParagraphProperties.TextAlignment,
+                textParagraphProperties.FirstLineInParagraph, 
+                textParagraphProperties.AlwaysCollapsible,
+                textParagraphProperties.DefaultTextRunProperties, 
+                textParagraphProperties.TextWrapping,
+                textParagraphProperties.LineHeight,
+                textParagraphProperties.Indent,
+                textParagraphProperties.LetterSpacing)
+        {
+        }
+
+        /// <summary>
+        /// This property specifies whether the primary text advance
+        /// direction shall be left-to-right, right-to-left, or top-to-bottom.
+        /// </summary>
+        public override FlowDirection FlowDirection
+        {
+            get { return _flowDirection; }
+        }
+
+        /// <summary>
+        /// This property describes how inline content of a block is aligned.
+        /// </summary>
+        public override TextAlignment TextAlignment
+        {
+            get { return _textAlignment; }
+        }
+
+        /// <summary>
+        /// Paragraph's line height
+        /// </summary>
+        public override double LineHeight
+        {
+            get { return _lineHeight; }
+        }
+
+        /// <summary>
+        /// Indicates the first line of the paragraph.
+        /// </summary>
+        public override bool FirstLineInParagraph { get; }
+
+        /// <summary>
+        /// If true, the formatted line may always be collapsed. If false (the default),
+        /// only lines that overflow the paragraph width are collapsed.
+        /// </summary>
+        public override bool AlwaysCollapsible { get; }
+
+        /// <summary>
+        /// Paragraph's default run properties
+        /// </summary>
+        public override TextRunProperties DefaultTextRunProperties { get; }
+
+        /// <summary>
+        /// This property controls whether or not text wraps when it reaches the flow edge
+        /// of its containing block box
+        /// </summary>
+        public override TextWrapping TextWrapping
+        {
+            get { return _textWrap; }
+        }
+
+        /// <summary>
+        /// Line indentation
+        /// </summary>
+        public override double Indent { get; }
+
+        /// <summary>
+        /// The letter spacing
+        /// </summary>
+        public override double LetterSpacing { get; }
+
+        /// <summary>
+        /// Set text flow direction
+        /// </summary>
+        internal void SetFlowDirection(FlowDirection flowDirection)
+        {
+            _flowDirection = flowDirection;
+        }
+
+
+        /// <summary>
+        /// Set text alignment
+        /// </summary>
+        internal void SetTextAlignment(TextAlignment textAlignment)
+        {
+            _textAlignment = textAlignment;
+        }
+
+
+        /// <summary>
+        /// Set line height
+        /// </summary>
+        internal void SetLineHeight(double lineHeight)
+        {
+            _lineHeight = lineHeight;
+        }
+
+        /// <summary>
+        /// Set text wrap
+        /// </summary>
+        internal void SetTextWrapping(TextWrapping textWrap)
+        {
+            _textWrap = textWrap;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs b/src/Avalonia.Base/Media/TextFormatting/GenericTextRunProperties.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs
rename to src/Avalonia.Base/Media/TextFormatting/GenericTextRunProperties.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/ITextSource.cs b/src/Avalonia.Base/Media/TextFormatting/ITextSource.cs
new file mode 100644
index 0000000000..26966b37bc
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/ITextSource.cs
@@ -0,0 +1,17 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Produces <see cref="TextRun"/> objects that are used by the <see cref="TextFormatter"/>.
+    /// </summary>
+    public interface ITextSource
+    {
+        /// <summary>
+        /// Gets a <see cref="TextRun"/> for specified text source index.
+        /// </summary>
+        /// <param name="textSourceIndex">The text source index.</param>
+        /// <returns>The text run.</returns>
+        TextRun? GetTextRun(int textSourceIndex);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs b/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
new file mode 100644
index 0000000000..a49e4ef13b
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal class InterWordJustification : JustificationProperties
+    {
+        public InterWordJustification(double width)
+        {
+            Width = width;
+        }
+
+        public override double Width { get; }
+
+        public override void Justify(TextLine textLine)
+        {
+            var lineImpl = textLine as TextLineImpl;
+
+            if(lineImpl is null)
+            {
+                return;
+            }
+
+            var paragraphWidth = Width;
+
+            if (double.IsInfinity(paragraphWidth))
+            {
+                return;
+            }
+
+            if (lineImpl.NewLineLength > 0)
+            {
+                return;
+            }
+
+            var textLineBreak = lineImpl.TextLineBreak;
+
+            if (textLineBreak is not null && textLineBreak.TextEndOfLine is not null)
+            {
+                if (textLineBreak.RemainingRuns is null || textLineBreak.RemainingRuns.Count == 0)
+                {
+                    return;
+                }
+            }
+
+            var breakOportunities = new Queue<int>();
+
+            foreach (var textRun in lineImpl.TextRuns)
+            {
+                var text = textRun.Text;
+
+                if (text.IsEmpty)
+                {
+                    continue;
+                }
+
+                var start = text.Start;
+
+                var lineBreakEnumerator = new LineBreakEnumerator(text);
+
+                while (lineBreakEnumerator.MoveNext())
+                {
+                    var currentBreak = lineBreakEnumerator.Current;
+
+                    if (!currentBreak.Required && currentBreak.PositionWrap != text.Length)
+                    {
+                        breakOportunities.Enqueue(start + currentBreak.PositionMeasure);
+                    }
+                }
+            }
+
+            if (breakOportunities.Count == 0)
+            {
+                return;
+            }
+
+            var remainingSpace = Math.Max(0, paragraphWidth - lineImpl.WidthIncludingTrailingWhitespace);
+            var spacing = remainingSpace / breakOportunities.Count;
+
+            foreach (var textRun in lineImpl.TextRuns)
+            {
+                var text = textRun.Text;
+
+                if (text.IsEmpty)
+                {
+                    continue;
+                }
+
+                if (textRun is ShapedTextCharacters shapedText)
+                {
+                    var glyphRun = shapedText.GlyphRun;
+                    var shapedBuffer = shapedText.ShapedBuffer;
+                    var currentPosition = text.Start;
+
+                    while (breakOportunities.Count > 0)
+                    {
+                        var characterIndex = breakOportunities.Dequeue();
+
+                        if (characterIndex < currentPosition)
+                        {
+                            continue;
+                        }
+
+                        var glyphIndex = glyphRun.FindGlyphIndex(characterIndex);
+                        var glyphInfo = shapedBuffer.GlyphInfos[glyphIndex];
+
+                        shapedBuffer.GlyphInfos[glyphIndex] = new GlyphInfo(glyphInfo.GlyphIndex, glyphInfo.GlyphCluster, glyphInfo.GlyphAdvance + spacing);
+                    }
+
+                    glyphRun.GlyphAdvances = shapedBuffer.GlyphAdvances;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/JustificationProperties.cs b/src/Avalonia.Base/Media/TextFormatting/JustificationProperties.cs
new file mode 100644
index 0000000000..620ad17189
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/JustificationProperties.cs
@@ -0,0 +1,16 @@
+namespace Avalonia.Media.TextFormatting
+{
+    public abstract class JustificationProperties
+    {
+        /// <summary>
+        /// Gets the width in which the range is justified.
+        /// </summary>
+        public abstract double Width { get; }
+
+        /// <summary>
+        /// Justifies given text line.
+        /// </summary>
+        /// <param name="textLine">Text line to collapse.</param>
+        public abstract void Justify(TextLine textLine);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/LogicalDirection.cs b/src/Avalonia.Base/Media/TextFormatting/LogicalDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/LogicalDirection.cs
rename to src/Avalonia.Base/Media/TextFormatting/LogicalDirection.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapeableTextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/ShapeableTextCharacters.cs
new file mode 100644
index 0000000000..b31a6f4d13
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapeableTextCharacters.cs
@@ -0,0 +1,62 @@
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A group of characters that can be shaped.
+    /// </summary>
+    public sealed class ShapeableTextCharacters : TextRun
+    {
+        public ShapeableTextCharacters(ReadOnlySlice<char> text, TextRunProperties properties, sbyte biDiLevel)
+        {
+            TextSourceLength = text.Length;
+            Text = text;
+            Properties = properties;
+            BidiLevel = biDiLevel;
+        }
+
+        public override int TextSourceLength { get; }
+
+        public override ReadOnlySlice<char> Text { get; }
+
+        public override TextRunProperties Properties { get; }
+        
+        public sbyte BidiLevel { get; }
+
+        public bool CanShapeTogether(ShapeableTextCharacters shapeableTextCharacters)
+        {
+            if (!Text.Buffer.Equals(shapeableTextCharacters.Text.Buffer))
+            {
+                return false;
+            }
+
+            if (Text.Start + Text.Length != shapeableTextCharacters.Text.Start)
+            {
+                return false;
+            }
+
+            if (BidiLevel != shapeableTextCharacters.BidiLevel)
+            {
+                return false;
+            }
+
+            if (!MathUtilities.AreClose(Properties.FontRenderingEmSize,
+                    shapeableTextCharacters.Properties.FontRenderingEmSize))
+            {
+                return false;
+            }
+
+            if (Properties.Typeface != shapeableTextCharacters.Properties.Typeface)
+            {
+                return false;
+            }
+
+            if (Properties.BaselineAlignment != shapeableTextCharacters.Properties.BaselineAlignment)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
new file mode 100644
index 0000000000..85924a3d32
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
@@ -0,0 +1,288 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    public sealed class ShapedBuffer : IList<GlyphInfo>
+    {
+        private static readonly IComparer<GlyphInfo> s_clusterComparer = new CompareClusters();
+
+        public ShapedBuffer(ReadOnlySlice<char> text, int length, IGlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel)
+            : this(text, new GlyphInfo[length], glyphTypeface, fontRenderingEmSize, bidiLevel)
+        {
+
+        }
+
+        internal ShapedBuffer(ReadOnlySlice<char> text, ArraySlice<GlyphInfo> glyphInfos, IGlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel)
+        {
+            Text = text;
+            GlyphInfos = glyphInfos;
+            GlyphTypeface = glyphTypeface;
+            FontRenderingEmSize = fontRenderingEmSize;
+            BidiLevel = bidiLevel;
+        }
+
+        internal ArraySlice<GlyphInfo> GlyphInfos { get; }
+
+        public ReadOnlySlice<char> Text { get; }
+
+        public int Length => GlyphInfos.Length;
+
+        public IGlyphTypeface GlyphTypeface { get; }
+
+        public double FontRenderingEmSize { get; }
+
+        public sbyte BidiLevel { get; }
+
+        public bool IsLeftToRight => (BidiLevel & 1) == 0;
+        
+        public IReadOnlyList<ushort> GlyphIndices => new GlyphIndexList(GlyphInfos);
+
+        public IReadOnlyList<int> GlyphClusters => new GlyphClusterList(GlyphInfos);
+
+        public IReadOnlyList<double> GlyphAdvances => new GlyphAdvanceList(GlyphInfos);
+
+        public IReadOnlyList<Vector> GlyphOffsets => new GlyphOffsetList(GlyphInfos);
+
+        /// <summary>
+        /// Finds a glyph index for given character index.
+        /// </summary>
+        /// <param name="characterIndex">The character index.</param>
+        /// <returns>
+        /// The glyph index.
+        /// </returns>
+        private int FindGlyphIndex(int characterIndex)
+        {
+            if (characterIndex < GlyphInfos[0].GlyphCluster)
+            {
+                return 0;
+            }
+
+            if (characterIndex > GlyphInfos[GlyphInfos.Length - 1].GlyphCluster)
+            {
+                return GlyphInfos.Length - 1;
+            }
+
+
+            var comparer = s_clusterComparer;
+
+            var clusters = GlyphInfos.Span;
+
+            var searchValue = new GlyphInfo(0, characterIndex);
+
+            var start = clusters.BinarySearch(searchValue, comparer);
+
+            if (start < 0)
+            {
+                while (characterIndex > 0 && start < 0)
+                {
+                    characterIndex--;
+
+                    searchValue = new GlyphInfo(0, characterIndex);
+
+                    start = clusters.BinarySearch(searchValue, comparer);
+                }
+
+                if (start < 0)
+                {
+                    return -1;
+                }
+            }
+
+            while (start > 0 && clusters[start - 1].GlyphCluster == clusters[start].GlyphCluster)
+            {
+                start--;
+            }
+
+            return start;
+        }
+
+        /// <summary>
+        /// Splits the <see cref="TextRun"/> at specified length.
+        /// </summary>
+        /// <param name="length">The length.</param>
+        /// <returns>The split result.</returns>
+        internal SplitResult<ShapedBuffer> Split(int length)
+        {
+            if (Text.Length == length)
+            {
+                return new SplitResult<ShapedBuffer>(this, null);
+            }
+
+            var glyphCount = FindGlyphIndex(Text.Start + length);
+
+            var first = new ShapedBuffer(Text.Take(length), GlyphInfos.Take(glyphCount), GlyphTypeface, FontRenderingEmSize, BidiLevel);
+
+            var second = new ShapedBuffer(Text.Skip(length), GlyphInfos.Skip(glyphCount), GlyphTypeface, FontRenderingEmSize, BidiLevel);
+
+            return new SplitResult<ShapedBuffer>(first, second);
+        }
+
+        int ICollection<GlyphInfo>.Count => throw new NotImplementedException();
+
+        bool ICollection<GlyphInfo>.IsReadOnly => true;
+
+        public GlyphInfo this[int index]
+        {
+            get => GlyphInfos[index];
+            set => GlyphInfos[index] = value;
+        }
+
+        int IList<GlyphInfo>.IndexOf(GlyphInfo item)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IList<GlyphInfo>.Insert(int index, GlyphInfo item)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IList<GlyphInfo>.RemoveAt(int index)
+        {
+            throw new NotImplementedException();
+        }
+
+        void ICollection<GlyphInfo>.Add(GlyphInfo item)
+        {
+            throw new NotImplementedException();
+        }
+
+        void ICollection<GlyphInfo>.Clear()
+        {
+            throw new NotImplementedException();
+        }
+
+        bool ICollection<GlyphInfo>.Contains(GlyphInfo item)
+        {
+            throw new NotImplementedException();
+        }
+
+        void ICollection<GlyphInfo>.CopyTo(GlyphInfo[] array, int arrayIndex)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool ICollection<GlyphInfo>.Remove(GlyphInfo item)
+        {
+            throw new NotImplementedException();
+        }
+        public IEnumerator<GlyphInfo> GetEnumerator() => GlyphInfos.GetEnumerator();
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
+
+        private class CompareClusters : IComparer<GlyphInfo>
+        {
+            private static readonly Comparer<int> s_intClusterComparer = Comparer<int>.Default;
+
+            public int Compare(GlyphInfo x, GlyphInfo y)
+            {
+                return s_intClusterComparer.Compare(x.GlyphCluster, y.GlyphCluster);
+            }
+        }
+
+        private readonly struct GlyphAdvanceList : IReadOnlyList<double>
+        {
+            private readonly ArraySlice<GlyphInfo> _glyphInfos;
+
+            public GlyphAdvanceList(ArraySlice<GlyphInfo> glyphInfos)
+            {
+                _glyphInfos = glyphInfos;
+            }
+
+            public double this[int index] => _glyphInfos[index].GlyphAdvance;
+
+            public int Count => _glyphInfos.Length;
+
+            public IEnumerator<double> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<double>(this);
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+
+        private readonly struct GlyphIndexList : IReadOnlyList<ushort>
+        {
+            private readonly ArraySlice<GlyphInfo> _glyphInfos;
+
+            public GlyphIndexList(ArraySlice<GlyphInfo> glyphInfos)
+            {
+                _glyphInfos = glyphInfos;
+            }
+
+            public ushort this[int index] => _glyphInfos[index].GlyphIndex;
+
+            public int Count => _glyphInfos.Length;
+
+            public IEnumerator<ushort> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<ushort>(this);
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+
+        private readonly struct GlyphClusterList : IReadOnlyList<int>
+        {
+            private readonly ArraySlice<GlyphInfo> _glyphInfos;
+
+            public GlyphClusterList(ArraySlice<GlyphInfo> glyphInfos)
+            {
+                _glyphInfos = glyphInfos;
+            }
+
+            public int this[int index] => _glyphInfos[index].GlyphCluster;
+
+            public int Count => _glyphInfos.Length;
+
+            public IEnumerator<int> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<int>(this);
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+
+        private readonly struct GlyphOffsetList : IReadOnlyList<Vector>
+        {
+            private readonly ArraySlice<GlyphInfo> _glyphInfos;
+
+            public GlyphOffsetList(ArraySlice<GlyphInfo> glyphInfos)
+            {
+                _glyphInfos = glyphInfos;
+            }
+
+            public Vector this[int index] => _glyphInfos[index].GlyphOffset;
+
+            public int Count => _glyphInfos.Length;
+
+            public IEnumerator<Vector> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<Vector>(this);
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+    }
+
+    public readonly struct GlyphInfo
+    {
+        public GlyphInfo(ushort glyphIndex, int glyphCluster, double glyphAdvance = 0, Vector glyphOffset = default)
+        {
+            GlyphIndex = glyphIndex;
+            GlyphAdvance = glyphAdvance;
+            GlyphCluster = glyphCluster;
+            GlyphOffset = glyphOffset;
+        }
+
+        /// <summary>
+        /// Get the glyph index.
+        /// </summary>
+        public ushort GlyphIndex { get; }
+
+        /// <summary>
+        /// Get the glyph cluster.
+        /// </summary>
+        public int GlyphCluster { get; }
+
+        /// <summary>
+        /// Get the glyph advance.
+        /// </summary>
+        public double GlyphAdvance { get; }
+
+        /// <summary>
+        /// Get the glyph offset.
+        /// </summary>
+        public Vector GlyphOffset { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedTextCharacters.cs
new file mode 100644
index 0000000000..21101f462c
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedTextCharacters.cs
@@ -0,0 +1,204 @@
+using System;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that holds shaped characters.
+    /// </summary>
+    public sealed class ShapedTextCharacters : DrawableTextRun
+    {
+        private GlyphRun? _glyphRun;
+
+        public ShapedTextCharacters(ShapedBuffer shapedBuffer, TextRunProperties properties)
+        {
+            ShapedBuffer = shapedBuffer;
+            Text = shapedBuffer.Text;
+            Properties = properties;
+            TextSourceLength = Text.Length;
+            TextMetrics = new TextMetrics(properties.Typeface, properties.FontRenderingEmSize);
+        }
+
+        public bool IsReversed { get; private set; }
+
+        public sbyte BidiLevel => ShapedBuffer.BidiLevel;
+
+        public ShapedBuffer ShapedBuffer { get; }
+
+        /// <inheritdoc/>
+        public override ReadOnlySlice<char> Text { get; }
+
+        /// <inheritdoc/>
+        public override TextRunProperties Properties { get; }
+
+        /// <inheritdoc/>
+        public override int TextSourceLength { get; }
+
+        public TextMetrics TextMetrics { get; }
+
+        public override double Baseline => -TextMetrics.Ascent;
+
+        public override Size Size => GlyphRun.Size;
+
+        public GlyphRun GlyphRun
+        {
+            get
+            {
+                if(_glyphRun is null)
+                {
+                    _glyphRun = CreateGlyphRun();
+                }
+
+                return _glyphRun;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void Draw(DrawingContext drawingContext, Point origin)
+        {
+            using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
+            {
+                if (GlyphRun.GlyphIndices.Count == 0)
+                {
+                    return;
+                }
+
+                if (Properties.Typeface == default)
+                {
+                    return;
+                }
+
+                if (Properties.ForegroundBrush == null)
+                {
+                    return;
+                }
+
+                if (Properties.BackgroundBrush != null)
+                {
+                    drawingContext.DrawRectangle(Properties.BackgroundBrush, null, new Rect(Size));
+                }
+
+                drawingContext.DrawGlyphRun(Properties.ForegroundBrush, GlyphRun);
+
+                if (Properties.TextDecorations == null)
+                {
+                    return;
+                }
+
+                foreach (var textDecoration in Properties.TextDecorations)
+                {
+                    textDecoration.Draw(drawingContext, GlyphRun, TextMetrics, Properties.ForegroundBrush);
+                }
+            }
+        }
+
+        internal void Reverse()
+        {
+            _glyphRun = null;
+
+            ShapedBuffer.GlyphInfos.Span.Reverse();
+
+            IsReversed = !IsReversed;
+        }
+
+        /// <summary>
+        /// Measures the number of characters that fit into available width.
+        /// </summary>
+        /// <param name="availableWidth">The available width.</param>
+        /// <param name="length">The count of fitting characters.</param>
+        /// <returns>
+        /// <c>true</c> if characters fit into the available width; otherwise, <c>false</c>.
+        /// </returns>
+        internal bool TryMeasureCharacters(double availableWidth, out int length)
+        {
+            length = 0;
+            var currentWidth = 0.0;
+
+            for (var i = 0; i < ShapedBuffer.Length; i++)
+            {
+                var advance = ShapedBuffer.GlyphAdvances[i];
+
+                if (currentWidth + advance > availableWidth)
+                {
+                    break;
+                }
+
+                Codepoint.ReadAt(GlyphRun.Characters, length, out var count);
+
+                length += count;
+                currentWidth += advance;
+            }
+
+            return length > 0;
+        }
+
+        internal bool TryMeasureCharactersBackwards(double availableWidth, out int length, out double width)
+        {
+            length = 0;
+            width = 0;
+
+            for (var i = ShapedBuffer.Length - 1; i >= 0; i--)
+            {
+                var advance = ShapedBuffer.GlyphAdvances[i];
+
+                if (width + advance > availableWidth)
+                {
+                    break;
+                }
+
+                Codepoint.ReadAt(GlyphRun.Characters, length, out var count);
+
+                length += count;
+                width += advance;
+            }
+
+            return length > 0;
+        }
+
+        internal SplitResult<ShapedTextCharacters> Split(int length)
+        {
+            if (IsReversed)
+            {
+                Reverse();
+            }
+
+#if DEBUG
+            if(length == 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length), "length must be greater than zero.");
+            }
+#endif
+            
+            var splitBuffer = ShapedBuffer.Split(length);
+
+            var first = new ShapedTextCharacters(splitBuffer.First, Properties);
+
+            #if DEBUG
+
+            if (first.Text.Length != length)
+            {
+                throw new InvalidOperationException("Split length mismatch.");
+            }
+            
+            #endif
+
+            var second = new ShapedTextCharacters(splitBuffer.Second!, Properties);
+
+            return new SplitResult<ShapedTextCharacters>(first, second);
+        }
+
+        internal GlyphRun CreateGlyphRun()
+        {
+            return new GlyphRun(
+                ShapedBuffer.GlyphTypeface,
+                ShapedBuffer.FontRenderingEmSize,
+                Text,
+                ShapedBuffer.GlyphIndices,
+                ShapedBuffer.GlyphAdvances,
+                ShapedBuffer.GlyphOffsets,
+                ShapedBuffer.GlyphClusters,
+                BidiLevel);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/SplitResult.cs b/src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/SplitResult.cs
rename to src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextBounds.cs b/src/Avalonia.Base/Media/TextFormatting/TextBounds.cs
new file mode 100644
index 0000000000..93edf68348
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextBounds.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// The bounding rectangle of a range of characters
+    /// </summary>
+    public sealed class TextBounds
+    {
+        /// <summary>
+        /// Constructing TextBounds object
+        /// </summary>
+        internal TextBounds(Rect bounds, FlowDirection flowDirection, IList<TextRunBounds> runBounds)
+        {
+            Rectangle = bounds;
+            FlowDirection = flowDirection;
+            TextRunBounds = runBounds;
+        }
+
+        /// <summary>
+        /// Bounds rectangle
+        /// </summary>
+        public Rect Rectangle { get; internal set; }
+
+        /// <summary>
+        /// Text flow direction inside the boundary rectangle
+        /// </summary>
+        public FlowDirection FlowDirection { get; }
+
+        /// <summary>
+        /// Get a list of run bounding rectangles
+        /// </summary>
+        /// <returns>Array of text run bounds</returns>
+        public IList<TextRunBounds> TextRunBounds { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
new file mode 100644
index 0000000000..bcfa35ae30
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that holds text characters.
+    /// </summary>
+    public class TextCharacters : TextRun
+    {
+        public TextCharacters(ReadOnlySlice<char> text, TextRunProperties properties)
+        {
+            TextSourceLength = text.Length;
+            Text = text;
+            Properties = properties;
+        }
+
+        public TextCharacters(ReadOnlySlice<char> text, int offsetToFirstCharacter, int length,
+            TextRunProperties properties)
+        {
+            Text = text.Skip(offsetToFirstCharacter).Take(length);
+            TextSourceLength = length;
+            Properties = properties;
+        }
+
+        /// <inheritdoc />
+        public override int TextSourceLength { get; }
+
+        /// <inheritdoc />
+        public override ReadOnlySlice<char> Text { get; }
+
+        /// <inheritdoc />
+        public override TextRunProperties Properties { get; }
+
+        /// <summary>
+        /// Gets a list of <see cref="ShapeableTextCharacters"/>.
+        /// </summary>
+        /// <returns>The shapeable text characters.</returns>
+        internal IReadOnlyList<ShapeableTextCharacters> GetShapeableCharacters(ReadOnlySlice<char> runText, sbyte biDiLevel,
+            ref TextRunProperties? previousProperties)
+        {
+            var shapeableCharacters = new List<ShapeableTextCharacters>(2);
+
+            while (!runText.IsEmpty)
+            {
+                var shapeableRun = CreateShapeableRun(runText, Properties, biDiLevel, ref previousProperties);
+
+                shapeableCharacters.Add(shapeableRun);
+
+                runText = runText.Skip(shapeableRun.Text.Length);
+
+                previousProperties = shapeableRun.Properties;
+            }
+
+            return shapeableCharacters;
+        }
+
+        /// <summary>
+        /// Creates a shapeable text run with unique properties.
+        /// </summary>
+        /// <param name="text">The text to create text runs from.</param>
+        /// <param name="defaultProperties">The default text run properties.</param>
+        /// <param name="biDiLevel">The bidi level of the run.</param>
+        /// <param name="previousProperties"></param>
+        /// <returns>A list of shapeable text runs.</returns>
+        private static ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text,
+            TextRunProperties defaultProperties, sbyte biDiLevel, ref TextRunProperties? previousProperties)
+        {
+            var defaultTypeface = defaultProperties.Typeface;
+            var currentTypeface = defaultTypeface;
+            var previousTypeface = previousProperties?.Typeface;
+
+            if (TryGetShapeableLength(text, currentTypeface, null, out var count, out var script))
+            {
+                if (script == Script.Common && previousTypeface is not null)
+                {
+                    if (TryGetShapeableLength(text, previousTypeface.Value, null, out var fallbackCount, out _))
+                    {
+                        return new ShapeableTextCharacters(text.Take(fallbackCount),
+                            defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
+                    }
+                }
+
+                return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
+                    biDiLevel);
+            }
+
+            if (previousTypeface is not null)
+            {
+                if (TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out count, out _))
+                {
+                    return new ShapeableTextCharacters(text.Take(count),
+                        defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
+                }
+            }
+
+            var codepoint = Codepoint.ReplacementCodepoint;
+
+            var codepointEnumerator = new CodepointEnumerator(text.Skip(count));
+
+            while (codepointEnumerator.MoveNext())
+            {
+                if (codepointEnumerator.Current.IsWhiteSpace)
+                {
+                    continue;
+                }
+
+                codepoint = codepointEnumerator.Current;
+
+                break;
+            }
+
+            //ToDo: Fix FontFamily fallback
+            var matchFound =
+                FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
+                    defaultTypeface.Stretch, defaultTypeface.FontFamily, defaultProperties.CultureInfo,
+                    out currentTypeface);
+
+            if (matchFound && TryGetShapeableLength(text, currentTypeface, defaultTypeface, out count, out _))
+            {
+                //Fallback found
+                return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
+                    biDiLevel);
+            }
+
+            // no fallback found
+            currentTypeface = defaultTypeface;
+
+            var glyphTypeface = currentTypeface.GlyphTypeface;
+
+            var enumerator = new GraphemeEnumerator(text);
+
+            while (enumerator.MoveNext())
+            {
+                var grapheme = enumerator.Current;
+
+                if (!grapheme.FirstCodepoint.IsWhiteSpace && glyphTypeface.TryGetGlyph(grapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+
+                count += grapheme.Text.Length;
+            }
+
+            return new ShapeableTextCharacters(text.Take(count), defaultProperties, biDiLevel);
+        }
+
+        /// <summary>
+        /// Tries to get a shapeable length that is supported by the specified typeface.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="typeface">The typeface that is used to find matching characters.</param>
+        /// <param name="defaultTypeface"></param>
+        /// <param name="length">The shapeable length.</param>
+        /// <param name="script"></param>
+        /// <returns></returns>
+        protected static bool TryGetShapeableLength(
+            ReadOnlySlice<char> text,
+            Typeface typeface,
+            Typeface? defaultTypeface,
+            out int length,
+            out Script script)
+        {
+            length = 0;
+            script = Script.Unknown;
+
+            if (text.Length == 0)
+            {
+                return false;
+            }
+
+            var font = typeface.GlyphTypeface;
+            var defaultFont = defaultTypeface?.GlyphTypeface;
+
+            var enumerator = new GraphemeEnumerator(text);
+
+            while (enumerator.MoveNext())
+            {
+                var currentGrapheme = enumerator.Current;
+
+                var currentScript = currentGrapheme.FirstCodepoint.Script;
+
+                if (!currentGrapheme.FirstCodepoint.IsWhiteSpace && defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+
+                //Stop at the first missing glyph
+                if (!currentGrapheme.FirstCodepoint.IsBreakChar && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+
+                if (currentScript != script)
+                {
+                    if (script is Script.Unknown || currentScript != Script.Common &&
+                        script is Script.Common or Script.Inherited)
+                    {
+                        script = currentScript;
+                    }
+                    else
+                    {
+                        if (currentScript != Script.Inherited && currentScript != Script.Common)
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                length += currentGrapheme.Text.Length;
+            }
+
+            return length > 0;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
new file mode 100644
index 0000000000..f677617b14
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Properties of text collapsing.
+    /// </summary>
+    public abstract class TextCollapsingProperties
+    {
+        /// <summary>
+        /// Gets the width in which the collapsible range is constrained to.
+        /// </summary>
+        public abstract double Width { get; }
+
+        /// <summary>
+        /// Gets the text run that is used as collapsing symbol.
+        /// </summary>
+        public abstract TextRun Symbol { get; }
+
+        /// <summary>
+        /// Collapses given text line.
+        /// </summary>
+        /// <param name="textLine">Text line to collapse.</param>
+        public abstract List<DrawableTextRun>? Collapse(TextLine textLine);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
new file mode 100644
index 0000000000..5a2169630b
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
@@ -0,0 +1,122 @@
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal static class TextEllipsisHelper
+    {
+        public static List<DrawableTextRun>? Collapse(TextLine textLine, TextCollapsingProperties properties, bool isWordEllipsis)
+        {
+            if (textLine.TextRuns is not List<DrawableTextRun> textRuns || textRuns.Count == 0)
+            {
+                return null;
+            }
+
+            var runIndex = 0;
+            var currentWidth = 0.0;
+            var collapsedLength = 0;
+            var shapedSymbol = TextFormatterImpl.CreateSymbol(properties.Symbol, FlowDirection.LeftToRight);
+
+            if (properties.Width < shapedSymbol.GlyphRun.Size.Width)
+            {
+                //Not enough space to fit in the symbol
+                return new List<DrawableTextRun>(0);
+            }
+
+            var availableWidth = properties.Width - shapedSymbol.Size.Width;
+
+            while (runIndex < textRuns.Count)
+            {
+                var currentRun = textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                    {
+                        currentWidth += shapedRun.Size.Width;
+
+                        if (currentWidth > availableWidth)
+                        {
+                            if (shapedRun.TryMeasureCharacters(availableWidth, out var measuredLength))
+                            {
+                                if (isWordEllipsis && measuredLength < textLine.Length)
+                                {
+                                    var currentBreakPosition = 0;
+
+                                    var lineBreaker = new LineBreakEnumerator(currentRun.Text);
+
+                                    while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
+                                    {
+                                        var nextBreakPosition = lineBreaker.Current.PositionMeasure;
+
+                                        if (nextBreakPosition == 0)
+                                        {
+                                            break;
+                                        }
+
+                                        if (nextBreakPosition >= measuredLength)
+                                        {
+                                            break;
+                                        }
+
+                                        currentBreakPosition = nextBreakPosition;
+                                    }
+
+                                    measuredLength = currentBreakPosition;
+                                }
+                            }
+
+                            collapsedLength += measuredLength;
+
+                            var collapsedRuns = new List<DrawableTextRun>(textRuns.Count);
+
+                            if (collapsedLength > 0)
+                            {
+                                var splitResult = TextFormatterImpl.SplitDrawableRuns(textRuns, collapsedLength);
+
+                                collapsedRuns.AddRange(splitResult.First);
+                            }
+
+                            collapsedRuns.Add(shapedSymbol);
+
+                            return collapsedRuns;
+                        }
+
+                        availableWidth -= currentRun.Size.Width;
+
+                        
+                        break;
+                    }
+
+                    case { } drawableRun:
+                    {
+                        //The whole run needs to fit into available space
+                        if (currentWidth + drawableRun.Size.Width > availableWidth)
+                        {
+                            var collapsedRuns = new List<DrawableTextRun>(textRuns.Count);
+
+                            if (collapsedLength > 0)
+                            {
+                                var splitResult = TextFormatterImpl.SplitDrawableRuns(textRuns, collapsedLength);
+
+                                collapsedRuns.AddRange(splitResult.First);
+                            }
+
+                            collapsedRuns.Add(shapedSymbol);
+
+                            return collapsedRuns;
+                        }
+                        
+                        break;
+                    }
+                }
+
+                collapsedLength += currentRun.TextSourceLength;
+
+                runIndex++;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfLine.cs b/src/Avalonia.Base/Media/TextFormatting/TextEndOfLine.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextEndOfLine.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextEndOfLine.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs b/src/Avalonia.Base/Media/TextFormatting/TextEndOfParagraph.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextEndOfParagraph.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
new file mode 100644
index 0000000000..0b5d7649d7
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
@@ -0,0 +1,44 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a base class for text formatting.
+    /// </summary>
+    public abstract class TextFormatter
+    {
+        /// <summary>
+        /// Gets the current <see cref="TextFormatter"/> that is used for non complex text formatting.
+        /// </summary>
+        public static TextFormatter Current
+        {
+            get
+            {
+                var current = AvaloniaLocator.Current.GetService<TextFormatter>();
+
+                if (current != null)
+                {
+                    return current;
+                }
+
+                current = new TextFormatterImpl();
+
+                AvaloniaLocator.CurrentMutable.Bind<TextFormatter>().ToConstant(current);
+
+                return current;
+            }
+        }
+
+        /// <summary>
+        /// Formats a text line.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="firstTextSourceIndex">The first character index to start the text line from.</param>
+        /// <param name="paragraphWidth">A <see cref="double"/> value that specifies the width of the paragraph that the line fills.</param>
+        /// <param name="paragraphProperties">A <see cref="TextParagraphProperties"/> value that represents paragraph properties,
+        /// such as TextWrapping, TextAlignment, or TextStyle.</param>
+        /// <param name="previousLineBreak">A <see cref="TextLineBreak"/> value that specifies the text formatter state,
+        /// in terms of where the previous line in the paragraph was broken by the text formatting process.</param>
+        /// <returns>The formatted line.</returns>
+        public abstract TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
new file mode 100644
index 0000000000..7bad95c4a2
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
@@ -0,0 +1,762 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal class TextFormatterImpl : TextFormatter
+    {
+        private static readonly char[] s_empty = { ' ' };
+
+        /// <inheritdoc cref="TextFormatter.FormatLine"/>
+        public override TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null)
+        {
+            var textWrapping = paragraphProperties.TextWrapping;
+            FlowDirection resolvedFlowDirection;
+            TextLineBreak? nextLineBreak = null;
+            List<DrawableTextRun> drawableTextRuns;
+
+            var textRuns = FetchTextRuns(textSource, firstTextSourceIndex,
+                out var textEndOfLine, out var textSourceLength);
+
+            if (previousLineBreak?.RemainingRuns != null)
+            {
+                resolvedFlowDirection = previousLineBreak.FlowDirection;
+                drawableTextRuns = previousLineBreak.RemainingRuns.ToList();
+                nextLineBreak = previousLineBreak;
+            }
+            else
+            {
+                drawableTextRuns = ShapeTextRuns(textRuns, paragraphProperties, out resolvedFlowDirection);
+
+                if (nextLineBreak == null && textEndOfLine != null)
+                {
+                    nextLineBreak = new TextLineBreak(textEndOfLine, resolvedFlowDirection);
+                }
+            }
+
+            TextLineImpl textLine;
+
+            switch (textWrapping)
+            {
+                case TextWrapping.NoWrap:
+                    {
+                        textLine = new TextLineImpl(drawableTextRuns, firstTextSourceIndex, textSourceLength,
+                            paragraphWidth, paragraphProperties, resolvedFlowDirection, nextLineBreak);
+
+                        textLine.FinalizeLine();
+
+                        break;
+                    }
+                case TextWrapping.WrapWithOverflow:
+                case TextWrapping.Wrap:
+                    {
+                        textLine = PerformTextWrapping(drawableTextRuns, firstTextSourceIndex, paragraphWidth, paragraphProperties,
+                            resolvedFlowDirection, nextLineBreak);
+                        break;
+                    }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(textWrapping));
+            }
+
+            return textLine;
+        }
+
+        /// <summary>
+        /// Split a sequence of runs into two segments at specified length.
+        /// </summary>
+        /// <param name="textRuns">The text run's.</param>
+        /// <param name="length">The length to split at.</param>
+        /// <returns>The split text runs.</returns>
+        internal static SplitResult<List<DrawableTextRun>> SplitDrawableRuns(List<DrawableTextRun> textRuns, int length)
+        {
+            var currentLength = 0;
+
+            for (var i = 0; i < textRuns.Count; i++)
+            {
+                var currentRun = textRuns[i];
+
+                if (currentLength + currentRun.TextSourceLength < length)
+                {
+                    currentLength += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                var firstCount = currentRun.TextSourceLength >= 1 ? i + 1 : i;
+
+                var first = new List<DrawableTextRun>(firstCount);
+
+                if (firstCount > 1)
+                {
+                    for (var j = 0; j < i; j++)
+                    {
+                        first.Add(textRuns[j]);
+                    }
+                }
+
+                var secondCount = textRuns.Count - firstCount;
+
+                if (currentLength + currentRun.TextSourceLength == length)
+                {
+                    var second = secondCount > 0 ? new List<DrawableTextRun>(secondCount) : null;
+
+                    if (second != null)
+                    {
+                        var offset = currentRun.TextSourceLength >= 1 ? 1 : 0;
+
+                        for (var j = 0; j < secondCount; j++)
+                        {
+                            second.Add(textRuns[i + j + offset]);
+                        }
+                    }
+
+                    first.Add(currentRun);
+
+                    return new SplitResult<List<DrawableTextRun>>(first, second);
+                }
+                else
+                {
+                    secondCount++;
+
+                    var second = new List<DrawableTextRun>(secondCount);
+
+                    if (currentRun is ShapedTextCharacters shapedTextCharacters)
+                    {
+                        var split = shapedTextCharacters.Split(length - currentLength);
+
+                        first.Add(split.First);
+
+                        second.Add(split.Second!);
+                    }                
+
+                    for (var j = 1; j < secondCount; j++)
+                    {
+                        second.Add(textRuns[i + j]);
+                    }
+
+                    return new SplitResult<List<DrawableTextRun>>(first, second);
+                }
+            }
+
+            return new SplitResult<List<DrawableTextRun>>(textRuns, null);
+        }
+
+        /// <summary>
+        /// Shape specified text runs with specified paragraph embedding.
+        /// </summary>
+        /// <param name="textRuns">The text runs to shape.</param>
+        /// <param name="paragraphProperties">The default paragraph properties.</param>
+        /// <param name="resolvedFlowDirection">The resolved flow direction.</param>
+        /// <returns>
+        /// A list of shaped text characters.
+        /// </returns>
+        private static List<DrawableTextRun> ShapeTextRuns(List<TextRun> textRuns, TextParagraphProperties paragraphProperties,
+            out FlowDirection resolvedFlowDirection)
+        {
+            var flowDirection = paragraphProperties.FlowDirection;
+            var drawableTextRuns = new List<DrawableTextRun>();
+            var biDiData = new BidiData((sbyte)flowDirection);
+
+            foreach (var textRun in textRuns)
+            {
+                if (textRun.Text.IsEmpty)
+                {
+                    var text = new char[textRun.TextSourceLength];
+
+                    biDiData.Append(text);
+                }
+                else
+                {
+                    biDiData.Append(textRun.Text);
+                }
+            }
+
+            var biDi = new BidiAlgorithm();
+
+            biDi.Process(biDiData);
+
+            var resolvedEmbeddingLevel = biDi.ResolveEmbeddingLevel(biDiData.Classes);
+
+            resolvedFlowDirection =
+                (resolvedEmbeddingLevel & 1) == 0 ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
+
+            var processedRuns = new List<TextRun>(textRuns.Count);
+
+            foreach (var coalescedRuns in CoalesceLevels(textRuns, biDi.ResolvedLevels))
+            {
+                processedRuns.AddRange(coalescedRuns);
+            }
+
+            for (var index = 0; index < processedRuns.Count; index++)
+            {
+                var currentRun = processedRuns[index];
+
+                switch (currentRun)
+                {
+                    case DrawableTextRun drawableRun:
+                        {
+                            drawableTextRuns.Add(drawableRun);
+
+                            break;
+                        }
+
+                    case ShapeableTextCharacters shapeableRun:
+                        {
+                            var groupedRuns = new List<ShapeableTextCharacters>(2) { shapeableRun };
+                            var text = currentRun.Text;
+                            var start = currentRun.Text.Start;
+                            var length = currentRun.Text.Length;
+                            var bufferOffset = currentRun.Text.BufferOffset;
+
+                            while (index + 1 < processedRuns.Count)
+                            {
+                                if (processedRuns[index + 1] is not ShapeableTextCharacters nextRun)
+                                {
+                                    break;
+                                }
+
+                                if (shapeableRun.CanShapeTogether(nextRun))
+                                {
+                                    groupedRuns.Add(nextRun);
+
+                                    length += nextRun.Text.Length;
+
+                                    if (start > nextRun.Text.Start)
+                                    {
+                                        start = nextRun.Text.Start;
+                                    }
+
+                                    if (bufferOffset > nextRun.Text.BufferOffset)
+                                    {
+                                        bufferOffset = nextRun.Text.BufferOffset;
+                                    }
+
+                                    text = new ReadOnlySlice<char>(text.Buffer, start, length, bufferOffset);
+
+                                    index++;
+
+                                    shapeableRun = nextRun;
+
+                                    continue;
+                                }
+
+                                break;
+                            }
+
+                            var shaperOptions = new TextShaperOptions(currentRun.Properties!.Typeface.GlyphTypeface,
+                                        currentRun.Properties.FontRenderingEmSize,
+                                         shapeableRun.BidiLevel, currentRun.Properties.CultureInfo, 
+                                         paragraphProperties.DefaultIncrementalTab, paragraphProperties.LetterSpacing);
+
+                            drawableTextRuns.AddRange(ShapeTogether(groupedRuns, text, shaperOptions));
+
+                            break;
+                        }
+                }
+            }
+
+            return drawableTextRuns;
+        }
+
+        private static IReadOnlyList<ShapedTextCharacters> ShapeTogether(
+            IReadOnlyList<ShapeableTextCharacters> textRuns, ReadOnlySlice<char> text, TextShaperOptions options)
+        {
+            var shapedRuns = new List<ShapedTextCharacters>(textRuns.Count);
+
+            var shapedBuffer = TextShaper.Current.ShapeText(text, options);
+
+            for (var i = 0; i < textRuns.Count; i++)
+            {
+                var currentRun = textRuns[i];
+
+                var splitResult = shapedBuffer.Split(currentRun.Text.Length);
+
+                shapedRuns.Add(new ShapedTextCharacters(splitResult.First, currentRun.Properties));
+
+                shapedBuffer = splitResult.Second!;
+            }
+
+            return shapedRuns;
+        }
+
+        /// <summary>
+        /// Coalesces ranges of the same bidi level to form <see cref="ShapeableTextCharacters"/>
+        /// </summary>
+        /// <param name="textCharacters">The text characters to form <see cref="ShapeableTextCharacters"/> from.</param>
+        /// <param name="levels">The bidi levels.</param>
+        /// <returns></returns>
+        private static IEnumerable<IReadOnlyList<TextRun>> CoalesceLevels(IReadOnlyList<TextRun> textCharacters, ArraySlice<sbyte> levels)
+        {
+            if (levels.Length == 0)
+            {
+                yield break;
+            }
+
+            var levelIndex = 0;
+            var runLevel = levels[0];
+
+            TextRunProperties? previousProperties = null;
+            TextCharacters? currentRun = null;
+            var runText = ReadOnlySlice<char>.Empty;
+
+            for (var i = 0; i < textCharacters.Count; i++)
+            {
+                var j = 0;
+                currentRun = textCharacters[i] as TextCharacters;
+
+                if (currentRun == null)
+                {
+                    var drawableRun = textCharacters[i];
+
+                    yield return new[] { drawableRun };
+
+                    levelIndex += drawableRun.TextSourceLength;
+
+                    continue;
+                }
+
+                runText = currentRun.Text;
+
+                for (; j < runText.Length;)
+                {
+                    Codepoint.ReadAt(runText, j, out var count);
+
+                    if (levelIndex + 1 == levels.Length)
+                    {
+                        break;
+                    }
+
+                    levelIndex++;
+                    j += count;
+
+                    if (j == runText.Length)
+                    {
+                        yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
+
+                        runLevel = levels[levelIndex];
+
+                        continue;
+                    }
+
+                    if (levels[levelIndex] == runLevel)
+                    {
+                        continue;
+                    }
+
+                    // End of this run
+                    yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
+
+                    runText = runText.Skip(j);
+
+                    j = 0;
+
+                    // Move to next run
+                    runLevel = levels[levelIndex];
+                }
+            }
+
+            if (currentRun is null || runText.IsEmpty)
+            {
+                yield break;
+            }
+
+            yield return currentRun.GetShapeableCharacters(runText, runLevel, ref previousProperties);
+        }
+
+        /// <summary>
+        /// Fetches text runs.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="endOfLine"></param>
+        /// <param name="textSourceLength"></param>
+        /// <returns>
+        /// The formatted text runs.
+        /// </returns>
+        private static List<TextRun> FetchTextRuns(ITextSource textSource, int firstTextSourceIndex,
+            out TextEndOfLine? endOfLine, out int textSourceLength)
+        {
+            textSourceLength = 0;
+
+            endOfLine = null;
+
+            var textRuns = new List<TextRun>();
+
+            var textRunEnumerator = new TextRunEnumerator(textSource, firstTextSourceIndex);
+
+            while (textRunEnumerator.MoveNext())
+            {
+                var textRun = textRunEnumerator.Current;
+
+                if (textRun == null)
+                {
+                    break;
+                }
+
+                if (textRun is TextEndOfLine textEndOfLine)
+                {
+                    endOfLine = textEndOfLine;
+
+                    textSourceLength += textEndOfLine.TextSourceLength;
+
+                    textRuns.Add(textRun);
+
+                    break;
+                }
+
+                switch (textRun)
+                {
+                    case TextCharacters textCharacters:
+                        {
+                            if (TryGetLineBreak(textCharacters, out var runLineBreak))
+                            {
+                                var splitResult = new TextCharacters(textCharacters.Text.Take(runLineBreak.PositionWrap),
+                                    textCharacters.Properties);
+
+                                textRuns.Add(splitResult);
+
+                                textSourceLength += runLineBreak.PositionWrap;
+
+                                return textRuns;
+                            }
+
+                            textRuns.Add(textCharacters);
+
+                            break;
+                        }
+                    default:
+                        {
+                            textRuns.Add(textRun);
+                            break;
+                        }
+                }
+
+                textSourceLength += textRun.TextSourceLength;
+            }
+
+            return textRuns;
+        }
+
+        private static bool TryGetLineBreak(TextRun textRun, out LineBreak lineBreak)
+        {
+            lineBreak = default;
+
+            if (textRun.Text.IsEmpty)
+            {
+                return false;
+            }
+
+            var lineBreakEnumerator = new LineBreakEnumerator(textRun.Text);
+
+            while (lineBreakEnumerator.MoveNext())
+            {
+                if (!lineBreakEnumerator.Current.Required)
+                {
+                    continue;
+                }
+
+                lineBreak = lineBreakEnumerator.Current;
+
+                return lineBreak.PositionWrap >= textRun.Text.Length || true;
+            }
+
+            return false;
+        }
+
+        private static bool TryMeasureLength(IReadOnlyList<DrawableTextRun> textRuns, double paragraphWidth, out int measuredLength)
+        {
+            measuredLength = 0;
+            var currentWidth = 0.0;
+
+            foreach (var currentRun in textRuns)
+            {
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedTextCharacters:
+                        {
+                            if(shapedTextCharacters.ShapedBuffer.Length > 0)
+                            {
+                                var firstCluster = shapedTextCharacters.ShapedBuffer.GlyphClusters[0];
+                                var lastCluster = firstCluster;
+
+                                for (var i = 0; i < shapedTextCharacters.ShapedBuffer.Length; i++)
+                                {
+                                    var glyphInfo = shapedTextCharacters.ShapedBuffer[i];
+
+                                    if (currentWidth + glyphInfo.GlyphAdvance > paragraphWidth)
+                                    {
+                                        measuredLength += Math.Max(0, lastCluster - firstCluster);
+
+                                        goto found;
+                                    }
+
+                                    lastCluster = glyphInfo.GlyphCluster;
+                                    currentWidth += glyphInfo.GlyphAdvance;
+                                }
+
+                                measuredLength += currentRun.TextSourceLength;
+                            }                         
+
+                            break;
+                        }
+
+                    case { } drawableTextRun:
+                        {
+                            if (currentWidth + drawableTextRun.Size.Width >= paragraphWidth)
+                            {
+                                goto found;
+                            }
+
+                            measuredLength += currentRun.TextSourceLength;
+                            currentWidth += currentRun.Size.Width;
+
+                            break;
+                        }
+                }
+            }
+
+            found:
+
+            return measuredLength != 0;
+        }
+
+        /// <summary>
+        /// Creates an empty text line.
+        /// </summary>
+        /// <returns>The empty text line.</returns>
+        public static TextLineImpl CreateEmptyTextLine(int firstTextSourceIndex, double paragraphWidth, TextParagraphProperties paragraphProperties)
+        {
+            var flowDirection = paragraphProperties.FlowDirection;
+            var properties = paragraphProperties.DefaultTextRunProperties;
+            var glyphTypeface = properties.Typeface.GlyphTypeface;
+            var text = new ReadOnlySlice<char>(s_empty, firstTextSourceIndex, 1);
+            var glyph = glyphTypeface.GetGlyph(s_empty[0]);
+            var glyphInfos = new[] { new GlyphInfo(glyph, firstTextSourceIndex) };
+
+            var shapedBuffer = new ShapedBuffer(text, glyphInfos, glyphTypeface, properties.FontRenderingEmSize,
+                (sbyte)flowDirection);
+
+            var textRuns = new List<DrawableTextRun> { new ShapedTextCharacters(shapedBuffer, properties) };
+
+            return new TextLineImpl(textRuns, firstTextSourceIndex, 0, paragraphWidth, paragraphProperties, flowDirection).FinalizeLine();
+        }
+
+        /// <summary>
+        /// Performs text wrapping returns a list of text lines.
+        /// </summary>
+        /// <param name="textRuns"></param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="paragraphWidth">The paragraph width.</param>
+        /// <param name="paragraphProperties">The text paragraph properties.</param>
+        /// <param name="resolvedFlowDirection"></param>
+        /// <param name="currentLineBreak">The current line break if the line was explicitly broken.</param>
+        /// <returns>The wrapped text line.</returns>
+        private static TextLineImpl PerformTextWrapping(List<DrawableTextRun> textRuns, int firstTextSourceIndex,
+            double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection resolvedFlowDirection,
+            TextLineBreak? currentLineBreak)
+        {
+            if(textRuns.Count == 0)
+            {
+                return CreateEmptyTextLine(firstTextSourceIndex,paragraphWidth, paragraphProperties);
+            }
+
+            if (!TryMeasureLength(textRuns, paragraphWidth, out var measuredLength))
+            {
+                measuredLength = 1;
+            }
+
+            var currentLength = 0;
+
+            var lastWrapPosition = 0;
+
+            var currentPosition = 0;
+
+            for (var index = 0; index < textRuns.Count; index++)
+            {
+                var currentRun = textRuns[index];
+
+                var lineBreaker = new LineBreakEnumerator(currentRun.Text);
+
+                var breakFound = false;
+
+                while (lineBreaker.MoveNext())
+                {
+                    if (lineBreaker.Current.Required &&
+                        currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
+                    {
+                        //Explicit break found
+                        breakFound = true;
+
+                        currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+
+                        break;
+                    }
+
+                    if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength)
+                    {
+                        if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
+                        {
+                            if (lastWrapPosition > 0)
+                            {
+                                currentPosition = lastWrapPosition;
+
+                                breakFound = true;
+
+                                break;
+                            }
+
+                            //Find next possible wrap position (overflow)
+                            if (index < textRuns.Count - 1)
+                            {
+                                if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
+                                {
+                                    //We already found the next possible wrap position.
+                                    breakFound = true;
+
+                                    currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+
+                                    break;
+                                }
+
+                                while (lineBreaker.MoveNext() && index < textRuns.Count)
+                                {
+                                    currentPosition += lineBreaker.Current.PositionWrap;
+
+                                    if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
+                                    {
+                                        break;
+                                    }
+
+                                    index++;
+
+                                    if (index >= textRuns.Count)
+                                    {
+                                        break;
+                                    }
+
+                                    currentRun = textRuns[index];
+
+                                    lineBreaker = new LineBreakEnumerator(currentRun.Text);
+                                }
+                            }
+                            else
+                            {
+                                currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+                            }
+
+                            breakFound = true;
+
+                            break;
+                        }
+
+                        //We overflowed so we use the last available wrap position.
+                        currentPosition = lastWrapPosition == 0 ? measuredLength : lastWrapPosition;
+
+                        breakFound = true;
+
+                        break;
+                    }
+
+                    if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
+                    {
+                        lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
+                    }
+                }
+
+                if (!breakFound)
+                {
+                    currentLength += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                measuredLength = currentPosition;
+
+                break;
+            }
+
+            var splitResult = SplitDrawableRuns(textRuns, measuredLength);
+
+            var remainingCharacters = splitResult.Second;
+
+            var lineBreak = remainingCharacters?.Count > 0 ?
+                new TextLineBreak(currentLineBreak?.TextEndOfLine, resolvedFlowDirection, remainingCharacters) :
+                null;
+
+            if (lineBreak is null && currentLineBreak?.TextEndOfLine != null)
+            {
+                lineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, resolvedFlowDirection);
+            }
+
+            var textLine = new TextLineImpl(splitResult.First, firstTextSourceIndex, measuredLength,
+                paragraphWidth, paragraphProperties, resolvedFlowDirection,
+                lineBreak);
+
+            return textLine.FinalizeLine();
+        }
+
+        private struct TextRunEnumerator
+        {
+            private readonly ITextSource _textSource;
+            private int _pos;
+
+            public TextRunEnumerator(ITextSource textSource, int firstTextSourceIndex)
+            {
+                _textSource = textSource;
+                _pos = firstTextSourceIndex;
+                Current = null;
+            }
+
+            // ReSharper disable once MemberHidesStaticFromOuterClass
+            public TextRun? Current { get; private set; }
+
+            public bool MoveNext()
+            {
+                Current = _textSource.GetTextRun(_pos);
+
+                if (Current is null)
+                {
+                    return false;
+                }
+
+                if (Current.TextSourceLength == 0)
+                {
+                    return false;
+                }
+
+                _pos += Current.TextSourceLength;
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Creates a shaped symbol.
+        /// </summary>
+        /// <param name="textRun">The symbol run to shape.</param>
+        /// <param name="flowDirection">The flow direction.</param>
+        /// <returns>
+        /// The shaped symbol.
+        /// </returns>
+        internal static ShapedTextCharacters CreateSymbol(TextRun textRun, FlowDirection flowDirection)
+        {
+            var textShaper = TextShaper.Current;
+
+            var glyphTypeface = textRun.Properties!.Typeface.GlyphTypeface;
+
+            var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
+
+            var cultureInfo = textRun.Properties.CultureInfo;
+
+            var shaperOptions = new TextShaperOptions(glyphTypeface, fontRenderingEmSize, (sbyte)flowDirection, cultureInfo);
+
+            var shapedBuffer = textShaper.ShapeText(textRun.Text, shaperOptions);
+
+            return new ShapedTextCharacters(shapedBuffer, textRun.Properties);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
new file mode 100644
index 0000000000..dc79e61333
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -0,0 +1,565 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a multi line text layout.
+    /// </summary>
+    public class TextLayout
+    {
+        private readonly ITextSource _textSource;
+        private readonly TextParagraphProperties _paragraphProperties;
+        private readonly TextTrimming _textTrimming;
+
+        private int _textSourceLength;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextLayout" /> class.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="typeface">The typeface.</param>
+        /// <param name="fontSize">Size of the font.</param>
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="textAlignment">The text alignment.</param>
+        /// <param name="textWrapping">The text wrapping.</param>
+        /// <param name="textTrimming">The text trimming.</param>
+        /// <param name="textDecorations">The text decorations.</param>
+        /// <param name="flowDirection">The text flow direction.</param>
+        /// <param name="maxWidth">The maximum width.</param>
+        /// <param name="maxHeight">The maximum height.</param>
+        /// <param name="lineHeight">The height of each line of text.</param>
+        /// <param name="letterSpacing">The letter spacing that is applied to rendered glyphs.</param>
+        /// <param name="maxLines">The maximum number of text lines.</param>
+        /// <param name="textStyleOverrides">The text style overrides.</param>
+        public TextLayout(
+            string? text,
+            Typeface typeface,
+            double fontSize,
+            IBrush? foreground,
+            TextAlignment textAlignment = TextAlignment.Left,
+            TextWrapping textWrapping = TextWrapping.NoWrap,
+            TextTrimming? textTrimming = null,
+            TextDecorationCollection? textDecorations = null,
+            FlowDirection flowDirection = FlowDirection.LeftToRight,
+            double maxWidth = double.PositiveInfinity,
+            double maxHeight = double.PositiveInfinity,
+            double lineHeight = double.NaN,
+            double letterSpacing = 0,
+            int maxLines = 0,
+            IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null)
+        {
+            _paragraphProperties =
+                CreateTextParagraphProperties(typeface, fontSize, foreground, textAlignment, textWrapping,
+                    textDecorations, flowDirection, lineHeight, letterSpacing);
+
+            _textSource = new FormattedTextSource(text.AsMemory(), _paragraphProperties.DefaultTextRunProperties, textStyleOverrides);
+
+            _textTrimming = textTrimming ?? TextTrimming.None;
+
+            LineHeight = lineHeight;
+
+            MaxWidth = maxWidth;
+
+            MaxHeight = maxHeight;
+
+            LetterSpacing = letterSpacing;
+
+            MaxLines = maxLines;
+
+            TextLines = CreateTextLines();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextLayout" /> class.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="paragraphProperties">The default text paragraph properties.</param>
+        /// <param name="textTrimming">The text trimming.</param>
+        /// <param name="maxWidth">The maximum width.</param>
+        /// <param name="maxHeight">The maximum height.</param>
+        /// <param name="lineHeight">The height of each line of text.</param>
+        /// <param name="letterSpacing">The letter spacing that is applied to rendered glyphs.</param>
+        /// <param name="maxLines">The maximum number of text lines.</param>
+        public TextLayout(
+            ITextSource textSource,
+            TextParagraphProperties paragraphProperties,
+            TextTrimming? textTrimming = null,
+            double maxWidth = double.PositiveInfinity,
+            double maxHeight = double.PositiveInfinity,
+            double lineHeight = double.NaN,
+            double letterSpacing = 0,
+            int maxLines = 0)
+        {
+            _textSource = textSource;
+
+            _paragraphProperties = paragraphProperties;
+
+            _textTrimming = textTrimming ?? TextTrimming.None;
+
+            LineHeight = lineHeight;
+
+            MaxWidth = maxWidth;
+
+            MaxHeight = maxHeight;
+
+            LetterSpacing = letterSpacing;
+
+            MaxLines = maxLines;
+
+            TextLines = CreateTextLines();
+        }
+
+        /// <summary>
+        /// Gets or sets the height of each line of text.
+        /// </summary>
+        /// <remarks>
+        /// A value of NaN (equivalent to an attribute value of "Auto") indicates that the line height
+        /// is determined automatically from the current font characteristics. The default is NaN.
+        /// </remarks>
+        public double LineHeight { get; }
+
+        /// <summary>
+        /// Gets the maximum width.
+        /// </summary>
+        public double MaxWidth { get; }
+
+        /// <summary>
+        /// Gets the maximum height.
+        /// </summary>
+        public double MaxHeight { get; }
+
+        /// <summary>
+        /// Gets the maximum number of text lines.
+        /// </summary>
+        public int MaxLines { get; }
+
+        /// <summary>
+        /// Gets the text spacing.
+        /// </summary>
+        public double LetterSpacing { get; }
+
+        /// <summary>
+        /// Gets the text lines.
+        /// </summary>
+        /// <value>
+        /// The text lines.
+        /// </value>
+        public IReadOnlyList<TextLine> TextLines { get; private set; }
+
+        /// <summary>
+        /// Gets the bounds of the layout.
+        /// </summary>
+        /// <value>
+        /// The bounds.
+        /// </value>
+        public Rect Bounds { get; private set; }
+
+        /// <summary>
+        /// Draws the text layout.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        /// <param name="origin">The origin.</param>
+        public void Draw(DrawingContext context, Point origin)
+        {
+            if (!TextLines.Any())
+            {
+                return;
+            }
+
+            var (currentX, currentY) = origin;
+
+            foreach (var textLine in TextLines)
+            {
+                textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
+
+                currentY += textLine.Height;
+            }
+        }
+
+        /// <summary>
+        /// Get the pixel location relative to the top-left of the layout box given the text position.
+        /// </summary>
+        /// <param name="textPosition">The text position.</param>
+        /// <returns></returns>
+        public Rect HitTestTextPosition(int textPosition)
+        {
+            if (TextLines.Count == 0)
+            {
+                return new Rect();
+            }
+
+            if (textPosition < 0)
+            {
+                textPosition = _textSourceLength;
+            }
+
+            var currentY = 0.0;
+
+            foreach (var textLine in TextLines)
+            {
+                var end = textLine.FirstTextSourceIndex + textLine.Length;
+
+                if (end <= textPosition && end < _textSourceLength)
+                {
+                    currentY += textLine.Height;
+
+                    continue;
+                }
+
+                var characterHit = new CharacterHit(textPosition);
+
+                var startX = textLine.GetDistanceFromCharacterHit(characterHit);
+
+                var nextCharacterHit = textLine.GetNextCaretCharacterHit(characterHit);
+
+                var endX = textLine.GetDistanceFromCharacterHit(nextCharacterHit);
+
+                return new Rect(startX, currentY, endX - startX, textLine.Height);
+            }
+
+            return new Rect();
+        }
+
+        public IEnumerable<Rect> HitTestTextRange(int start, int length)
+        {
+            if (start + length <= 0)
+            {
+                return Array.Empty<Rect>();
+            }
+
+            var result = new List<Rect>(TextLines.Count);
+
+            var currentY = 0d;
+
+            foreach (var textLine in TextLines)
+            {
+                //Current line isn't covered.
+                if (textLine.FirstTextSourceIndex + textLine.Length < start)
+                {
+                    currentY += textLine.Height;
+
+                    continue;
+                }
+
+                var textBounds = textLine.GetTextBounds(start, length);
+
+                if (textBounds.Count > 0)
+                {
+                    foreach (var bounds in textBounds)
+                    {
+                        Rect? last = result.Count > 0 ? result[result.Count - 1] : null;
+
+                        if (last.HasValue && MathUtilities.AreClose(last.Value.Right, bounds.Rectangle.Left) && MathUtilities.AreClose(last.Value.Top, currentY))
+                        {
+                            result[result.Count - 1] = last.Value.WithWidth(last.Value.Width + bounds.Rectangle.Width);
+                        }
+                        else
+                        {
+                            result.Add(bounds.Rectangle.WithY(currentY));
+                        }
+
+                        foreach (var runBounds in bounds.TextRunBounds)
+                        {
+                            start += runBounds.Length;
+                            length -= runBounds.Length;
+                        }
+                    }
+                }
+
+                if (textLine.FirstTextSourceIndex + textLine.Length >= start + length)
+                {
+                    break;
+                }
+
+                currentY += textLine.Height;
+            }
+
+            return result;
+        }
+
+        public TextHitTestResult HitTestPoint(in Point point)
+        {
+            var currentY = 0d;
+
+            var lineIndex = 0;
+            TextLine? currentLine = null;
+            CharacterHit characterHit;
+
+            for (; lineIndex < TextLines.Count; lineIndex++)
+            {
+                currentLine = TextLines[lineIndex];
+
+                if (currentY + currentLine.Height > point.Y)
+                {
+                    characterHit = currentLine.GetCharacterHitFromDistance(point.X);
+
+                    return GetHitTestResult(currentLine, characterHit, point);
+                }
+
+                currentY += currentLine.Height;
+            }
+
+            if (currentLine is null)
+            {
+                return new TextHitTestResult();
+            }
+
+            characterHit = currentLine.GetCharacterHitFromDistance(point.X);
+
+            return GetHitTestResult(currentLine, characterHit, point);
+        }
+
+
+        public int GetLineIndexFromCharacterIndex(int charIndex, bool trailingEdge)
+        {
+            if (charIndex < 0)
+            {
+                return 0;
+            }
+
+            if (charIndex > _textSourceLength)
+            {
+                return TextLines.Count - 1;
+            }
+
+            for (var index = 0; index < TextLines.Count; index++)
+            {
+                var textLine = TextLines[index];
+
+                if (textLine.FirstTextSourceIndex + textLine.Length < charIndex)
+                {
+                    continue;
+                }
+
+                if (charIndex >= textLine.FirstTextSourceIndex &&
+                    charIndex <= textLine.FirstTextSourceIndex + textLine.Length - (trailingEdge ? 0 : 1))
+                {
+                    return index;
+                }
+            }
+
+            return TextLines.Count - 1;
+        }
+
+        private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit characterHit, Point point)
+        {
+            var (x, y) = point;
+
+            var lastTrailingIndex = textLine.FirstTextSourceIndex + textLine.Length;
+
+            var isInside = x >= 0 && x <= textLine.Width && y >= 0 && y <= textLine.Height;
+
+            if (x >= textLine.Width && textLine.Length > 0 && textLine.NewLineLength > 0)
+            {
+                lastTrailingIndex -= textLine.NewLineLength;
+            }
+
+            var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+            var isTrailing = lastTrailingIndex == textPosition && characterHit.TrailingLength > 0 ||
+                             y > Bounds.Bottom;
+
+            if (textPosition == textLine.FirstTextSourceIndex + textLine.Length)
+            {
+                textPosition -= textLine.NewLineLength;
+            }
+
+            if (textLine.NewLineLength > 0 && textPosition + textLine.NewLineLength ==
+                characterHit.FirstCharacterIndex + characterHit.TrailingLength)
+            {
+                characterHit = new CharacterHit(characterHit.FirstCharacterIndex);
+            }
+
+            return new TextHitTestResult(characterHit, textPosition, isInside, isTrailing);
+        }
+
+        /// <summary>
+        /// Creates the default <see cref="TextParagraphProperties"/> that are used by the <see cref="TextFormatter"/>.
+        /// </summary>
+        /// <param name="typeface">The typeface.</param>
+        /// <param name="fontSize">The font size.</param>
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="textAlignment">The text alignment.</param>
+        /// <param name="textWrapping">The text wrapping.</param>
+        /// <param name="textDecorations">The text decorations.</param>
+        /// <param name="flowDirection">The text flow direction.</param>
+        /// <param name="lineHeight">The height of each line of text.</param>
+        /// <param name="letterSpacing">The letter spacing that is applied to rendered glyphs.</param>
+        /// <returns></returns>
+        private static TextParagraphProperties CreateTextParagraphProperties(Typeface typeface, double fontSize,
+            IBrush? foreground, TextAlignment textAlignment, TextWrapping textWrapping,
+            TextDecorationCollection? textDecorations, FlowDirection flowDirection, double lineHeight, 
+            double letterSpacing)
+        {
+            var textRunStyle = new GenericTextRunProperties(typeface, fontSize, textDecorations, foreground);
+
+            return new GenericTextParagraphProperties(flowDirection, textAlignment, true, false,
+                textRunStyle, textWrapping, lineHeight, 0, letterSpacing);
+        }
+
+        /// <summary>
+        /// Updates the current bounds.
+        /// </summary>
+        /// <param name="textLine">The text line.</param>
+        /// <param name="left">The current left.</param>
+        /// <param name="width">The current width.</param>
+        /// <param name="height">The current height.</param>
+        private static void UpdateBounds(TextLine textLine, ref double left, ref double width, ref double height)
+        {
+            var lineWidth = textLine.WidthIncludingTrailingWhitespace;
+
+            if (width < lineWidth)
+            {
+                width = lineWidth;
+            }
+
+            if (left > textLine.Start)
+            {
+                left = textLine.Start;
+            }
+
+            height += textLine.Height;
+        }
+
+        private IReadOnlyList<TextLine> CreateTextLines()
+        {
+            if (MathUtilities.IsZero(MaxWidth) || MathUtilities.IsZero(MaxHeight))
+            {
+                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, double.PositiveInfinity, _paragraphProperties);
+
+                Bounds = new Rect(0, 0, 0, textLine.Height);
+
+                return new List<TextLine> { textLine };
+            }
+
+            var textLines = new List<TextLine>();
+
+            double left = double.PositiveInfinity, width = 0.0, height = 0.0;
+
+            _textSourceLength = 0;
+
+            TextLine? previousLine = null;
+
+            while (true)
+            {
+                var textLine = TextFormatter.Current.FormatLine(_textSource, _textSourceLength, MaxWidth,
+                    _paragraphProperties, previousLine?.TextLineBreak);
+
+                if (textLine == null || textLine.Length == 0 || textLine.TextRuns.Count == 0 && textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
+                {
+                    if (previousLine != null && previousLine.NewLineLength > 0)
+                    {
+                        var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth, _paragraphProperties);
+
+                        textLines.Add(emptyTextLine);
+
+                        UpdateBounds(emptyTextLine, ref left, ref width, ref height);
+                    }
+
+                    break;
+                }
+
+                _textSourceLength += textLine.Length;
+
+                //Fulfill max height constraint
+                if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight) && height + textLine.Height > MaxHeight)
+                {
+                    if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+                    {
+                        var collapsedLine =
+                            previousLine.Collapse(GetCollapsingProperties(MaxWidth));
+
+                        textLines[textLines.Count - 1] = collapsedLine;
+                    }
+
+                    break;
+                }
+
+                var hasOverflowed = textLine.HasOverflowed;
+
+                if (hasOverflowed && _textTrimming != TextTrimming.None)
+                {
+                    textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
+                }
+
+                textLines.Add(textLine);
+
+                UpdateBounds(textLine, ref left, ref width, ref height);
+
+                previousLine = textLine;
+
+                //Fulfill max lines constraint
+                if (MaxLines > 0 && textLines.Count >= MaxLines)
+                {
+                    if(textLine.TextLineBreak is TextLineBreak lineBreak && lineBreak.RemainingRuns != null)
+                    {
+                        textLines[textLines.Count - 1] = textLine.Collapse(GetCollapsingProperties(width));
+                    }
+
+                    break;
+                }
+            }
+
+            //Make sure the TextLayout always contains at least on empty line
+            if (textLines.Count == 0)
+            {
+                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties);
+
+                textLines.Add(textLine);
+
+                UpdateBounds(textLine, ref left, ref width, ref height);
+            }
+
+            Bounds = new Rect(left, 0, width, height);
+
+            if (_paragraphProperties.TextAlignment == TextAlignment.Justify)
+            {
+                var whitespaceWidth = 0d;
+
+                foreach (var line in textLines)
+                {
+                    var lineWhitespaceWidth = line.Width - line.WidthIncludingTrailingWhitespace;
+
+                    if (lineWhitespaceWidth > whitespaceWidth)
+                    {
+                        whitespaceWidth = lineWhitespaceWidth;
+                    }
+                }
+
+                var justificationWidth = width - whitespaceWidth;
+
+                if (justificationWidth > 0)
+                {
+                    var justificationProperties = new InterWordJustification(justificationWidth);
+
+                    for (var i = 0; i < textLines.Count - 1; i++)
+                    {
+                        var line = textLines[i];
+
+                        line.Justify(justificationProperties);
+                    }
+                }
+            }
+
+            return textLines;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TextCollapsingProperties"/> for current text trimming mode.
+        /// </summary>
+        /// <param name="width">The collapsing width.</param>
+        /// <returns>The <see cref="TextCollapsingProperties"/>.</returns>
+        private TextCollapsingProperties? GetCollapsingProperties(double width)
+        {
+            if(_textTrimming == TextTrimming.None)
+            {
+                return null;
+            }
+
+            return _textTrimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(width, _paragraphProperties.DefaultTextRunProperties));
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
new file mode 100644
index 0000000000..5a14eda245
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Ellipsis based on a fixed length leading prefix and suffix growing from the end at character granularity.
+    /// </summary>
+    public sealed class TextLeadingPrefixCharacterEllipsis : TextCollapsingProperties
+    {
+        private readonly int _prefixLength;
+
+        /// <summary>
+        /// Construct a text trailing word ellipsis collapsing properties.
+        /// </summary>
+        /// <param name="ellipsis">Text used as collapsing symbol.</param>
+        /// <param name="prefixLength">Length of leading prefix.</param>
+        /// <param name="width">width in which collapsing is constrained to</param>
+        /// <param name="textRunProperties">text run properties of ellipsis symbol</param>
+        public TextLeadingPrefixCharacterEllipsis(
+            ReadOnlySlice<char> ellipsis,
+            int prefixLength,
+            double width,
+            TextRunProperties textRunProperties)
+        {
+            if (_prefixLength < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(prefixLength));
+            }
+
+            _prefixLength = prefixLength;
+            Width = width;
+            Symbol = new TextCharacters(ellipsis, textRunProperties);
+        }
+
+        /// <inheritdoc/>
+        public override double Width { get; }
+
+        /// <inheritdoc/>
+        public override TextRun Symbol { get; }
+
+        public override List<DrawableTextRun>? Collapse(TextLine textLine)
+        {
+            if (textLine.TextRuns is not List<DrawableTextRun> textRuns || textRuns.Count == 0)
+            {
+                return null;
+            }
+
+            var runIndex = 0;
+            var currentWidth = 0.0;
+            var shapedSymbol = TextFormatterImpl.CreateSymbol(Symbol, FlowDirection.LeftToRight);
+
+            if (Width < shapedSymbol.GlyphRun.Size.Width)
+            {
+                return new List<DrawableTextRun>(0);
+            }
+
+            // Overview of ellipsis structure
+            // Prefix length run | Ellipsis symbol | Post split run growing from the end |
+            var availableWidth = Width - shapedSymbol.Size.Width;
+
+            while (runIndex < textRuns.Count)
+            {
+                var currentRun = textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                    {
+                        currentWidth += currentRun.Size.Width;
+
+                        if (currentWidth > availableWidth)
+                        {
+                            shapedRun.TryMeasureCharacters(availableWidth, out var measuredLength);
+
+                            var collapsedRuns = new List<DrawableTextRun>(textRuns.Count);
+
+                            if (measuredLength > 0)
+                            {
+                                List<DrawableTextRun>? preSplitRuns = null;
+                                List<DrawableTextRun>? postSplitRuns;
+
+                                if (_prefixLength > 0)
+                                {
+                                    var splitResult = TextFormatterImpl.SplitDrawableRuns(textRuns,
+                                        Math.Min(_prefixLength, measuredLength));
+
+                                    collapsedRuns.AddRange(splitResult.First);
+
+                                    preSplitRuns = splitResult.First;
+                                    postSplitRuns = splitResult.Second;
+                                }
+                                else
+                                {
+                                    postSplitRuns = textRuns;
+                                }
+
+                                collapsedRuns.Add(shapedSymbol);
+
+                                if (measuredLength <= _prefixLength || postSplitRuns is null)
+                                {
+                                    return collapsedRuns;
+                                }
+
+                                var availableSuffixWidth = availableWidth;
+
+                                if (preSplitRuns is not null)
+                                {
+                                    foreach (var run in preSplitRuns)
+                                    {
+                                        availableSuffixWidth -= run.Size.Width;
+                                    }
+                                }
+
+                                for (var i = postSplitRuns.Count - 1; i >= 0; i--)
+                                {
+                                    var run = postSplitRuns[i];
+
+                                    switch (run)
+                                    {
+                                        case ShapedTextCharacters endShapedRun:
+                                        {
+                                            if (endShapedRun.TryMeasureCharactersBackwards(availableSuffixWidth,
+                                                    out var suffixCount, out var suffixWidth))
+                                            {
+                                                availableSuffixWidth -= suffixWidth;
+
+                                                if (suffixCount > 0)
+                                                {
+                                                    var splitSuffix =
+                                                        endShapedRun.Split(run.TextSourceLength - suffixCount);
+
+                                                    collapsedRuns.Add(splitSuffix.Second!);
+                                                }
+                                            }
+
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                collapsedRuns.Add(shapedSymbol);
+                            }
+
+                            return collapsedRuns;
+                        }
+
+                        break;
+                    }
+                }
+
+                availableWidth -= currentRun.Size.Width;
+
+                runIndex++;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLine.cs b/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
new file mode 100644
index 0000000000..61b24dc8c5
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
@@ -0,0 +1,211 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a line of text that is used for text rendering.
+    /// </summary>
+    public abstract class TextLine
+    {
+        /// <summary>
+        /// Gets the text runs that are contained within a line.
+        /// </summary>
+        /// <value>
+        /// The contained text runs.
+        /// </value>
+        public abstract IReadOnlyList<TextRun> TextRuns { get; }
+
+        /// <summary>
+        /// Gets the first TextSource position of the current line.
+        /// </summary>
+        public abstract int FirstTextSourceIndex { get; }
+
+        /// <summary>
+        /// Gets the total number of TextSource positions of the current line.
+        /// </summary>
+        public abstract int Length { get; }
+
+        /// <summary>
+        /// Gets the state of the line when broken by line breaking process.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="TextLineBreak"/> value that represents the line break.
+        /// </returns>
+        public abstract TextLineBreak? TextLineBreak { get; }
+
+        /// <summary>
+        /// Gets the distance from the top to the baseline of the current TextLine object.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="double"/> that represents the baseline distance.
+        /// </returns>
+        public abstract double Baseline { get; }
+
+        /// <summary>
+        /// Gets the distance from the top-most to bottom-most black pixel in a line.
+        /// </summary>
+        /// <returns>
+        /// A value that represents the extent distance.
+        /// </returns>
+        public abstract double Extent { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the line is collapsed.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c>, if the line is collapsed; otherwise, <c>false</c>.
+        /// </returns>
+        public abstract bool HasCollapsed { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether content of the line overflows the specified paragraph width.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c>, the line overflows the specified paragraph width; otherwise, <c>false</c>.
+        /// </returns>
+        public abstract bool HasOverflowed { get; }
+
+        /// <summary>
+        /// Gets the height of a line of text.
+        /// </summary>
+        /// <returns>
+        /// The text line height.
+        /// </returns>
+        public abstract double Height { get; }
+
+        /// <summary>
+        /// Gets the number of newline characters at the end of a line.
+        /// </summary>
+        /// <returns>
+        /// The number of newline characters.
+        /// </returns>
+        public abstract int NewLineLength { get; }
+
+        /// <summary>
+        /// Gets the distance that black pixels extend beyond the bottom alignment edge of a line.
+        /// </summary>
+        /// <returns>
+        /// The overhang after distance.
+        /// </returns>
+        public abstract double OverhangAfter { get; }
+
+        /// <summary>
+        /// Gets the distance that black pixels extend prior to the left leading alignment edge of the line.
+        /// </summary>
+        /// <returns>
+        /// The overhang leading distance.
+        /// </returns>
+        public abstract double OverhangLeading { get; }
+
+        /// <summary>
+        /// Gets the distance that black pixels extend following the right trailing alignment edge of the line.
+        /// </summary>
+        /// <returns>
+        /// The overhang trailing distance.
+        /// </returns>
+        public abstract double OverhangTrailing { get; }
+
+        /// <summary>
+        /// Gets the distance from the start of a paragraph to the starting point of a line.
+        /// </summary>
+        /// <returns>
+        /// The distance from the start of a paragraph to the starting point of a line.
+        /// </returns>
+        public abstract double Start { get; }
+
+        /// <summary>
+        /// Gets the number of whitespace code points beyond the last non-blank character in a line.
+        /// </summary>
+        /// <returns>
+        /// The number of whitespace code points beyond the last non-blank character in a line.
+        /// </returns>
+        public abstract int TrailingWhitespaceLength { get; }
+
+        /// <summary>
+        /// Gets the width of a line of text, excluding trailing whitespace characters.
+        /// </summary>
+        /// <returns>
+        /// The text line width, excluding trailing whitespace characters.
+        /// </returns>
+        public abstract double Width { get; }
+
+        /// <summary>
+        /// Gets the width of a line of text, including trailing whitespace characters.
+        /// </summary>
+        /// <returns>
+        /// The text line width, including trailing whitespace characters.
+        /// </returns>
+        public abstract double WidthIncludingTrailingWhitespace { get; }
+
+        /// <summary>
+        /// Draws the <see cref="TextLine"/> at the given origin.
+        /// </summary>
+        /// <param name="drawingContext">The drawing context.</param>
+        /// <param name="lineOrigin"></param>
+        public abstract void Draw(DrawingContext drawingContext, Point lineOrigin);
+
+        /// <summary>
+        /// Create a collapsed line based on collapsed text properties.
+        /// </summary>
+        /// <param name="collapsingPropertiesList">A list of <see cref="TextCollapsingProperties"/>
+        /// objects that represent the collapsed text properties.</param>
+        /// <returns>
+        /// A <see cref="TextLine"/> value that represents a collapsed line that can be displayed.
+        /// </returns>
+        public abstract TextLine Collapse(params TextCollapsingProperties?[] collapsingPropertiesList);
+
+        /// <summary>
+        /// Create a justified line based on justification text properties.
+        /// </summary>
+        /// <param name="justificationProperties">An object that represent the justification text properties.</param>
+        /// <returns>
+        /// A <see cref="TextLine"/> value that represents a justified line that can be displayed.
+        /// </returns>
+        public abstract void Justify(JustificationProperties justificationProperties);
+
+        /// <summary>
+        /// Gets the character hit corresponding to the specified distance from the beginning of the line.
+        /// </summary>
+        /// <param name="distance">A <see cref="double"/> value that represents the distance from the beginning of the line.</param>
+        /// <returns>The <see cref="CharacterHit"/> object at the specified distance from the beginning of the line.</returns>
+        public abstract CharacterHit GetCharacterHitFromDistance(double distance);
+
+        /// <summary>
+        /// Gets the distance from the beginning of the line to the specified character hit.
+        /// <see cref="CharacterHit"/>.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> object whose distance you want to query.</param>
+        /// <returns>A <see cref="double"/> that represents the distance from the beginning of the line.</returns>
+        public abstract double GetDistanceFromCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Gets the next character hit for caret navigation.
+        /// </summary>
+        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
+        /// <returns>The next <see cref="CharacterHit"/>.</returns>
+        public abstract CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Gets the previous character hit for caret navigation.
+        /// </summary>
+        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
+        /// <returns>The previous <see cref="CharacterHit"/>.</returns>
+        public abstract CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Gets the previous character hit after backspacing.
+        /// </summary>
+        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
+        /// <returns>The <see cref="CharacterHit"/> after backspacing.</returns>
+        public abstract CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Get an array of bounding rectangles of a range of characters within a text line.
+        /// </summary>
+        /// <param name="firstTextSourceCharacterIndex">index of first character of specified range</param>
+        /// <param name="textLength">number of characters of the specified range</param>
+        /// <returns>an array of bounding rectangles.</returns>
+        public abstract IReadOnlyList<TextBounds> GetTextBounds(int firstTextSourceCharacterIndex, int textLength);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineBreak.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineBreak.cs
new file mode 100644
index 0000000000..ce35e47fbd
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineBreak.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    public class TextLineBreak
+    {
+        public TextLineBreak(TextEndOfLine? textEndOfLine = null, FlowDirection flowDirection = FlowDirection.LeftToRight, 
+            IReadOnlyList<DrawableTextRun>? remainingRuns = null)
+        {
+            TextEndOfLine = textEndOfLine;
+            FlowDirection = flowDirection;
+            RemainingRuns = remainingRuns;
+        }
+
+        /// <summary>
+        /// Get the end of line run.
+        /// </summary>
+        public TextEndOfLine? TextEndOfLine { get; }
+
+        /// <summary>
+        /// Get the flow direction for remaining characters.
+        /// </summary>
+        public FlowDirection FlowDirection { get; }
+        
+        /// <summary>
+        /// Get the remaining runs that were split up by the <see cref="TextFormatter"/> during the formatting process.
+        /// </summary>
+        public IReadOnlyList<DrawableTextRun>? RemainingRuns { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
new file mode 100644
index 0000000000..96f88d1f44
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -0,0 +1,1617 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal class TextLineImpl : TextLine
+    {
+        private readonly List<DrawableTextRun> _textRuns;
+        private readonly double _paragraphWidth;
+        private readonly TextParagraphProperties _paragraphProperties;
+        private TextLineMetrics _textLineMetrics;
+        private readonly FlowDirection _resolvedFlowDirection;
+
+        public TextLineImpl(List<DrawableTextRun> textRuns, int firstTextSourceIndex, int length, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, FlowDirection resolvedFlowDirection = FlowDirection.LeftToRight,
+            TextLineBreak? lineBreak = null, bool hasCollapsed = false)
+        {
+            FirstTextSourceIndex = firstTextSourceIndex;
+            Length = length;
+            TextLineBreak = lineBreak;
+            HasCollapsed = hasCollapsed;
+
+            _textRuns = textRuns;
+            _paragraphWidth = paragraphWidth;
+            _paragraphProperties = paragraphProperties;
+
+            _resolvedFlowDirection = resolvedFlowDirection;
+        }
+
+        /// <inheritdoc/>
+        public override IReadOnlyList<TextRun> TextRuns => _textRuns;
+
+        /// <inheritdoc/>
+        public override int FirstTextSourceIndex { get; }
+
+        /// <inheritdoc/>
+        public override int Length { get; }
+
+        /// <inheritdoc/>
+        public override TextLineBreak? TextLineBreak { get; }
+
+        /// <inheritdoc/>
+        public override bool HasCollapsed { get; }
+
+        /// <inheritdoc/>
+        public override bool HasOverflowed => _textLineMetrics.HasOverflowed;
+
+        /// <inheritdoc/>
+        public override double Baseline => _textLineMetrics.TextBaseline;
+
+        /// <inheritdoc/>
+        public override double Extent => _textLineMetrics.Height;
+
+        /// <inheritdoc/>
+        public override double Height => _textLineMetrics.Height;
+
+        /// <inheritdoc/>
+        public override int NewLineLength => _textLineMetrics.NewLineLength;
+
+        /// <inheritdoc/>
+        public override double OverhangAfter => 0;
+
+        /// <inheritdoc/>
+        public override double OverhangLeading => 0;
+
+        /// <inheritdoc/>
+        public override double OverhangTrailing => 0;
+
+        /// <inheritdoc/>
+        public override int TrailingWhitespaceLength => _textLineMetrics.TrailingWhitespaceLength;
+
+        /// <inheritdoc/>
+        public override double Start => _textLineMetrics.Start;
+
+        /// <inheritdoc/>
+        public override double Width => _textLineMetrics.Width;
+
+        /// <inheritdoc/>
+        public override double WidthIncludingTrailingWhitespace => _textLineMetrics.WidthIncludingTrailingWhitespace;
+
+        /// <inheritdoc/>
+        public override void Draw(DrawingContext drawingContext, Point lineOrigin)
+        {
+            var (currentX, currentY) = lineOrigin;
+
+            foreach (var textRun in _textRuns)
+            {
+                var offsetY = GetBaselineOffset(this, textRun);
+
+                textRun.Draw(drawingContext, new Point(currentX, currentY + offsetY));
+
+                currentX += textRun.Size.Width;
+            }
+        }
+
+        private static double GetBaselineOffset(TextLine textLine, DrawableTextRun textRun)
+        {
+            var baseline = textRun.Baseline;
+            var baselineAlignment = textRun.Properties?.BaselineAlignment;
+
+            switch (baselineAlignment)
+            {
+                case BaselineAlignment.Top:
+                    return 0;
+                case BaselineAlignment.Center:
+                    return textLine.Height / 2 - textRun.Size.Height / 2;
+                case BaselineAlignment.Bottom:
+                    return textLine.Height - textRun.Size.Height;
+                case BaselineAlignment.Baseline:
+                case BaselineAlignment.TextTop:
+                case BaselineAlignment.TextBottom:
+                case BaselineAlignment.Subscript:
+                case BaselineAlignment.Superscript:
+                    return textLine.Baseline - baseline;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(baselineAlignment), baselineAlignment, null);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override TextLine Collapse(params TextCollapsingProperties?[] collapsingPropertiesList)
+        {
+            if (collapsingPropertiesList.Length == 0)
+            {
+                return this;
+            }
+
+            var collapsingProperties = collapsingPropertiesList[0];
+
+            if (collapsingProperties is null)
+            {
+                return this;
+            }
+
+            var collapsedRuns = collapsingProperties.Collapse(this);
+
+            if (collapsedRuns is null)
+            {
+                return this;
+            }
+
+            var collapsedLine = new TextLineImpl(collapsedRuns, FirstTextSourceIndex, Length, _paragraphWidth, _paragraphProperties,
+                _resolvedFlowDirection, TextLineBreak, true);
+
+            if (collapsedRuns.Count > 0)
+            {
+                collapsedLine.FinalizeLine();
+            }
+
+            return collapsedLine;
+        }
+
+        /// <inheritdoc/>
+        public override void Justify(JustificationProperties justificationProperties)
+        {
+            justificationProperties.Justify(this);
+
+            _textLineMetrics = CreateLineMetrics();
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetCharacterHitFromDistance(double distance)
+        {
+            if (_textRuns.Count == 0)
+            {
+                return new CharacterHit();
+            }
+
+            distance -= Start;
+
+            if (distance <= 0)
+            {
+                var firstRun = _textRuns[0];
+
+                return GetRunCharacterHit(firstRun, FirstTextSourceIndex, 0);
+            }
+
+            if (distance >= WidthIncludingTrailingWhitespace)
+            {
+                var lastRun = _textRuns[_textRuns.Count - 1];
+
+                return GetRunCharacterHit(lastRun, FirstTextSourceIndex + Length - lastRun.TextSourceLength, lastRun.Size.Width);
+            }
+
+            // process hit that happens within the line
+            var characterHit = new CharacterHit();
+            var currentPosition = FirstTextSourceIndex;
+            var currentDistance = 0.0;
+
+            for (var i = 0; i < _textRuns.Count; i++)
+            {
+                var currentRun = _textRuns[i];
+
+                if (currentRun is ShapedTextCharacters shapedRun && !shapedRun.ShapedBuffer.IsLeftToRight)
+                {
+                    var rightToLeftIndex = i;
+                    currentPosition += currentRun.TextSourceLength;
+
+                    while (rightToLeftIndex + 1 <= _textRuns.Count - 1)
+                    {
+                        var nextShaped = _textRuns[rightToLeftIndex + 1] as ShapedTextCharacters;
+
+                        if (nextShaped == null || nextShaped.ShapedBuffer.IsLeftToRight)
+                        {
+                            break;
+                        }
+
+                        currentPosition += nextShaped.TextSourceLength;
+
+                        rightToLeftIndex++;
+                    }
+
+                    for (var j = i; i <= rightToLeftIndex; j++)
+                    {
+                        if (j > _textRuns.Count - 1)
+                        {
+                            break;
+                        }
+
+                        currentRun = _textRuns[j];
+
+                        if (currentDistance + currentRun.Size.Width <= distance)
+                        {
+                            currentDistance += currentRun.Size.Width;
+                            currentPosition -= currentRun.TextSourceLength;
+
+                            continue;
+                        }
+
+                        characterHit = GetRunCharacterHit(currentRun, currentPosition, distance - currentDistance);
+
+                        break;
+                    }
+                }
+
+                if (currentDistance + currentRun.Size.Width < distance)
+                {
+                    currentDistance += currentRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                characterHit = GetRunCharacterHit(currentRun, currentPosition, distance - currentDistance);
+
+                break;
+            }
+
+            return characterHit;
+        }
+
+        private static CharacterHit GetRunCharacterHit(DrawableTextRun run, int currentPosition, double distance)
+        {
+            CharacterHit characterHit;
+
+            switch (run)
+            {
+                case ShapedTextCharacters shapedRun:
+                    {
+                        characterHit = shapedRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
+
+                        var offset = 0;
+
+                        if (shapedRun.GlyphRun.IsLeftToRight)
+                        {
+                            offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+                        }
+
+                        characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
+
+                        break;
+                    }
+                default:
+                    {
+                        if (distance < run.Size.Width / 2)
+                        {
+                            characterHit = new CharacterHit(currentPosition);
+                        }
+                        else
+                        {
+                            characterHit = new CharacterHit(currentPosition, run.TextSourceLength);
+                        }
+                        break;
+                    }
+            }
+
+            return characterHit;
+        }
+
+        /// <inheritdoc/>
+        public override double GetDistanceFromCharacterHit(CharacterHit characterHit)
+        {
+            var flowDirection = _paragraphProperties.FlowDirection;
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+            var currentPosition = FirstTextSourceIndex;
+            var remainingLength = characterIndex - FirstTextSourceIndex;
+
+            var currentDistance = Start;
+
+            if (flowDirection == FlowDirection.LeftToRight)
+            {
+                for (var index = 0; index < _textRuns.Count; index++)
+                {
+                    var currentRun = _textRuns[index];
+
+                    if (currentRun is ShapedTextCharacters shapedRun && !shapedRun.ShapedBuffer.IsLeftToRight)
+                    {
+                        var i = index;
+
+                        var rightToLeftWidth = currentRun.Size.Width;
+
+                        while (i + 1 <= _textRuns.Count - 1)
+                        {
+                            var nextRun = _textRuns[i + 1];
+
+                            if (nextRun is ShapedTextCharacters nextShapedRun && !nextShapedRun.ShapedBuffer.IsLeftToRight)
+                            {
+                                i++;
+
+                                rightToLeftWidth += nextRun.Size.Width;
+
+                                continue;
+                            }
+
+                            break;
+                        }
+
+                        if (i > index)
+                        {
+                            while (i >= index)
+                            {
+                                currentRun = _textRuns[i];
+
+                                rightToLeftWidth -= currentRun.Size.Width;
+
+                                if (currentPosition + currentRun.TextSourceLength >= characterIndex)
+                                {
+                                    break;
+                                }
+
+                                currentPosition += currentRun.TextSourceLength;
+
+                                remainingLength -= currentRun.TextSourceLength;
+
+                                i--;
+                            }
+
+                            currentDistance += rightToLeftWidth;
+                        }
+                    }
+
+                    if (currentPosition + currentRun.TextSourceLength >= characterIndex &&
+                        TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength, flowDirection, out var distance, out _))
+                    {
+                        return Math.Max(0, currentDistance + distance);
+                    }
+
+                    //No hit hit found so we add the full width
+                    currentDistance += currentRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
+                    remainingLength -= currentRun.TextSourceLength;
+                }
+            }
+            else
+            {
+                currentDistance += WidthIncludingTrailingWhitespace;
+
+                for (var index = _textRuns.Count - 1; index >= 0; index--)
+                {
+                    var currentRun = _textRuns[index];
+
+                    if (TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength,
+                        flowDirection, out var distance, out var currentGlyphRun))
+                    {
+                        if (currentGlyphRun != null)
+                        {
+                            distance = currentGlyphRun.Size.Width - distance;
+                        }
+
+                        return Math.Max(0, currentDistance - distance);
+                    }
+
+                    //No hit hit found so we add the full width
+                    currentDistance -= currentRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
+                    remainingLength -= currentRun.TextSourceLength;
+                }
+            }
+
+            return Math.Max(0, currentDistance);
+        }
+
+        private static bool TryGetDistanceFromCharacterHit(
+            DrawableTextRun currentRun,
+            CharacterHit characterHit,
+            int currentPosition,
+            int remainingLength,
+            FlowDirection flowDirection,
+            out double distance,
+            out GlyphRun? currentGlyphRun)
+        {
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+            var isTrailingHit = characterHit.TrailingLength > 0;
+
+            distance = 0;
+            currentGlyphRun = null;
+
+            switch (currentRun)
+            {
+                case ShapedTextCharacters shapedTextCharacters:
+                    {
+                        currentGlyphRun = shapedTextCharacters.GlyphRun;
+
+                        if (currentPosition + remainingLength <= currentPosition + currentRun.Text.Length)
+                        {
+                            characterHit = new CharacterHit(currentRun.Text.Start + remainingLength);
+
+                            distance = currentGlyphRun.GetDistanceFromCharacterHit(characterHit);
+
+                            return true;
+                        }
+
+                        if (currentPosition + remainingLength == currentPosition + currentRun.Text.Length && isTrailingHit)
+                        {
+                            if (currentGlyphRun.IsLeftToRight || flowDirection == FlowDirection.RightToLeft)
+                            {
+                                distance = currentGlyphRun.Size.Width;
+                            }
+
+                            return true;
+                        }
+
+                        break;
+                    }
+                default:
+                    {
+                        if (characterIndex == currentPosition)
+                        {
+                            return true;
+                        }
+
+                        if (characterIndex == currentPosition + currentRun.TextSourceLength)
+                        {
+                            distance = currentRun.Size.Width;
+
+                            return true;
+
+                        }
+
+                        break;
+                    }
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (_textRuns.Count == 0)
+            {
+                return new CharacterHit();
+            }
+
+            if (TryFindNextCharacterHit(characterHit, out var nextCharacterHit))
+            {
+                return nextCharacterHit;
+            }
+
+            var lastTextPosition = FirstTextSourceIndex + Length;
+
+            // Can't move, we're after the last character
+            var runIndex = GetRunIndexAtCharacterIndex(lastTextPosition, LogicalDirection.Forward, out var currentPosition);
+
+            var currentRun = _textRuns[runIndex];
+
+            switch (currentRun)
+            {
+                case ShapedTextCharacters shapedRun:
+                    {
+                        characterHit = shapedRun.GlyphRun.GetNextCaretCharacterHit(characterHit);
+                        break;
+                    }
+                default:
+                    {
+                        characterHit = new CharacterHit(currentPosition + currentRun.TextSourceLength);
+                        break;
+                    }
+            }
+
+            return characterHit;
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (TryFindPreviousCharacterHit(characterHit, out var previousCharacterHit))
+            {
+                return previousCharacterHit;
+            }
+
+            if (characterHit.FirstCharacterIndex <= FirstTextSourceIndex)
+            {
+                characterHit = new CharacterHit(FirstTextSourceIndex);
+            }
+
+            return characterHit; // Can't move, we're before the first character
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit)
+        {
+            // same operation as move-to-previous
+            return GetPreviousCaretCharacterHit(characterHit);
+        }
+
+        private IReadOnlyList<TextBounds> GetTextBoundsLeftToRight(int firstTextSourceIndex, int textLength)
+        {
+            var characterIndex = firstTextSourceIndex + textLength;
+
+            var result = new List<TextBounds>(TextRuns.Count);
+            var lastDirection = FlowDirection.LeftToRight;
+            var currentDirection = lastDirection;
+
+            var currentPosition = FirstTextSourceIndex;
+            var remainingLength = textLength;
+
+            var startX = Start;
+            double currentWidth = 0;
+            var currentRect = Rect.Empty;
+
+            TextRunBounds lastRunBounds = default;
+
+            for (var index = 0; index < TextRuns.Count; index++)
+            {
+                if (TextRuns[index] is not DrawableTextRun currentRun)
+                {
+                    continue;
+                }
+
+                var characterLength = 0;
+                var endX = startX;
+
+                var currentShapedRun = currentRun as ShapedTextCharacters;
+
+                TextRunBounds currentRunBounds;
+
+                double combinedWidth;
+
+                if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                {
+                    startX += currentRun.Size.Width;
+
+                    currentPosition += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                if (currentShapedRun != null && !currentShapedRun.ShapedBuffer.IsLeftToRight)
+                {
+                    var rightToLeftIndex = index;
+                    var rightToLeftWidth = currentShapedRun.Size.Width;
+
+                    while (rightToLeftIndex + 1 <= _textRuns.Count - 1 && _textRuns[rightToLeftIndex + 1] is ShapedTextCharacters nextShapedRun)
+                    {
+                        if (nextShapedRun == null || nextShapedRun.ShapedBuffer.IsLeftToRight)
+                        {
+                            break;
+                        }
+
+                        rightToLeftIndex++;
+
+                        rightToLeftWidth += nextShapedRun.Size.Width;
+
+                        if (currentPosition + nextShapedRun.TextSourceLength > firstTextSourceIndex + textLength)
+                        {
+                            break;
+                        }
+
+                        currentShapedRun = nextShapedRun;
+                    }
+
+                    startX = startX + rightToLeftWidth;
+
+                    currentRunBounds = GetRightToLeftTextRunBounds(currentShapedRun, startX, firstTextSourceIndex, characterIndex, currentPosition, remainingLength);
+
+                    remainingLength -= currentRunBounds.Length;
+                    currentPosition = currentRunBounds.TextSourceCharacterIndex + currentRunBounds.Length;
+                    endX = currentRunBounds.Rectangle.Right;
+                    startX = currentRunBounds.Rectangle.Left;
+
+                    var rightToLeftRunBounds = new List<TextRunBounds> { currentRunBounds };
+
+                    for (int i = rightToLeftIndex - 1; i >= index; i--)
+                    {
+                        currentShapedRun = TextRuns[i] as ShapedTextCharacters;
+
+                        if(currentShapedRun == null)
+                        {
+                            continue;
+                        }
+
+                        currentRunBounds = GetRightToLeftTextRunBounds(currentShapedRun, startX, firstTextSourceIndex, characterIndex, currentPosition, remainingLength);
+
+                        rightToLeftRunBounds.Insert(0, currentRunBounds);
+
+                        remainingLength -= currentRunBounds.Length;
+                        startX = currentRunBounds.Rectangle.Left;
+
+                        currentPosition += currentRunBounds.Length;
+                    }
+
+                    combinedWidth = endX - startX;
+
+                    currentRect = new Rect(startX, 0, combinedWidth, Height);
+
+                    currentDirection = FlowDirection.RightToLeft;
+
+                    if (!MathUtilities.IsZero(combinedWidth))
+                    {
+                        result.Add(new TextBounds(currentRect, currentDirection, rightToLeftRunBounds));
+                    }
+
+                    startX = endX;
+                }
+                else
+                {
+                    if (currentShapedRun != null)
+                    {
+                        var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+                        currentPosition += offset;
+
+                        var startIndex = currentRun.Text.Start + offset;
+
+                        double startOffset;
+                        double endOffset;
+
+                        if (currentShapedRun.ShapedBuffer.IsLeftToRight)
+                        {
+                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                        }
+                        else
+                        {
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                            if (currentPosition < startIndex)
+                            {
+                                startOffset = endOffset;
+                            }
+                            else
+                            {
+                                startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                            }
+                        }
+
+                        startX += startOffset;
+
+                        endX += endOffset;
+
+                        var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+                        var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+
+                        characterLength = Math.Abs(endHit.FirstCharacterIndex + endHit.TrailingLength - startHit.FirstCharacterIndex - startHit.TrailingLength);
+
+                        currentDirection = FlowDirection.LeftToRight;
+                    }
+                    else
+                    {
+                        if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                        {
+                            startX += currentRun.Size.Width;
+
+                            currentPosition += currentRun.TextSourceLength;
+
+                            continue;
+                        }
+
+                        if (currentPosition < firstTextSourceIndex)
+                        {
+                            startX += currentRun.Size.Width;
+                        }
+
+                        if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                        {
+                            endX += currentRun.Size.Width;
+
+                            characterLength = currentRun.TextSourceLength;
+                        }
+                    }
+
+                    if (endX < startX)
+                    {
+                        (endX, startX) = (startX, endX);
+                    }
+
+                    //Lines that only contain a linebreak need to be covered here
+                    if (characterLength == 0)
+                    {
+                        characterLength = NewLineLength;
+                    }
+
+                    combinedWidth = endX - startX;
+
+                    currentRunBounds = new TextRunBounds(new Rect(startX, 0, combinedWidth, Height), currentPosition, characterLength, currentRun);
+
+                    currentPosition += characterLength;
+
+                    remainingLength -= characterLength;
+
+                    startX = endX;
+
+                    if (currentRunBounds.TextRun != null && !MathUtilities.IsZero(combinedWidth) || NewLineLength > 0)
+                    {
+                        if (result.Count > 0 && lastDirection == currentDirection && MathUtilities.AreClose(currentRect.Left, lastRunBounds.Rectangle.Right))
+                        {
+                            currentRect = currentRect.WithWidth(currentWidth + combinedWidth);
+
+                            var textBounds = result[result.Count - 1];
+
+                            textBounds.Rectangle = currentRect;
+
+                            textBounds.TextRunBounds.Add(currentRunBounds);
+                        }
+                        else
+                        {
+                            currentRect = currentRunBounds.Rectangle;
+
+                            result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                        }
+                    }
+
+                    lastRunBounds = currentRunBounds;
+                }
+
+                currentWidth += combinedWidth;
+
+                if (remainingLength <= 0 || currentPosition >= characterIndex)
+                {
+                    break;
+                }
+
+                lastDirection = currentDirection;
+            }
+
+            return result;
+        }
+
+        private IReadOnlyList<TextBounds> GetTextBoundsRightToLeft(int firstTextSourceIndex, int textLength)
+        {
+            var characterIndex = firstTextSourceIndex + textLength;
+
+            var result = new List<TextBounds>(TextRuns.Count);
+            var lastDirection = FlowDirection.LeftToRight;
+            var currentDirection = lastDirection;
+
+            var currentPosition = FirstTextSourceIndex;
+            var remainingLength = textLength;
+
+            var startX = WidthIncludingTrailingWhitespace;
+            double currentWidth = 0;
+            var currentRect = Rect.Empty;
+
+            for (var index = TextRuns.Count - 1; index >= 0; index--)
+            {
+                if (TextRuns[index] is not DrawableTextRun currentRun)
+                {
+                    continue;
+                }
+
+                if (currentPosition + currentRun.TextSourceLength < firstTextSourceIndex)
+                {
+                    startX -= currentRun.Size.Width;
+
+                    currentPosition += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                var characterLength = 0;
+                var endX = startX;
+
+                if (currentRun is ShapedTextCharacters currentShapedRun)
+                {
+                    var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+                    currentPosition += offset;
+
+                    var startIndex = currentRun.Text.Start + offset;
+                    double startOffset;
+                    double endOffset;
+
+                    if (currentShapedRun.ShapedBuffer.IsLeftToRight)
+                    {
+                        if (currentPosition < startIndex)
+                        {
+                            startOffset = endOffset = 0;
+                        }
+                        else
+                        {
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+
+                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+                        }
+                    }
+                    else
+                    {
+                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                        startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                    }
+
+                    startX -= currentRun.Size.Width - startOffset;
+                    endX -= currentRun.Size.Width - endOffset;
+
+                    var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+                    var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+
+                    characterLength = Math.Abs(startHit.FirstCharacterIndex + startHit.TrailingLength - endHit.FirstCharacterIndex - endHit.TrailingLength);
+
+                    currentDirection = currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                        FlowDirection.LeftToRight :
+                        FlowDirection.RightToLeft;
+                }
+                else
+                {
+                    if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                    {
+                        endX -= currentRun.Size.Width;
+                    }
+
+                    if (currentPosition < firstTextSourceIndex)
+                    {
+                        startX -= currentRun.Size.Width;
+
+                        characterLength = currentRun.TextSourceLength;
+                    }
+                }
+
+                if (endX < startX)
+                {
+                    (endX, startX) = (startX, endX);
+                }
+
+                //Lines that only contain a linebreak need to be covered here
+                if (characterLength == 0)
+                {
+                    characterLength = NewLineLength;
+                }
+
+                var runWidth = endX - startX;
+
+                var currentRunBounds = new TextRunBounds(new Rect(Start + startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
+
+                if (!MathUtilities.IsZero(runWidth) || NewLineLength > 0)
+                {
+                    if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, Start + startX))
+                    {
+                        currentRect = currentRect.WithWidth(currentWidth + runWidth);
+
+                        var textBounds = result[result.Count - 1];
+
+                        textBounds.Rectangle = currentRect;
+
+                        textBounds.TextRunBounds.Add(currentRunBounds);
+                    }
+                    else
+                    {
+                        currentRect = currentRunBounds.Rectangle;
+
+                        result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                    }
+                }
+
+                currentWidth += runWidth;
+                currentPosition += characterLength;
+
+                if (currentPosition > characterIndex)
+                {
+                    break;
+                }
+
+                lastDirection = currentDirection;
+                remainingLength -= characterLength;
+
+                if (remainingLength <= 0)
+                {
+                    break;
+                }
+            }
+
+            result.Reverse();
+
+            return result;
+        }
+
+        private TextRunBounds GetRightToLeftTextRunBounds(ShapedTextCharacters currentRun, double endX, int firstTextSourceIndex, int characterIndex, int currentPosition, int remainingLength)
+        {
+            var startX = endX;
+
+            var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+            currentPosition += offset;
+
+            var startIndex = currentRun.Text.Start + offset;
+
+            double startOffset;
+            double endOffset;
+
+            endOffset = currentRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+            startOffset = currentRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+
+            startX -= currentRun.Size.Width - startOffset;
+            endX -= currentRun.Size.Width - endOffset;
+
+            var endHit = currentRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+            var startHit = currentRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+
+            var characterLength = Math.Abs(startHit.FirstCharacterIndex + startHit.TrailingLength - endHit.FirstCharacterIndex - endHit.TrailingLength);
+
+            if (endX < startX)
+            {
+                (endX, startX) = (startX, endX);
+            }
+
+            //Lines that only contain a linebreak need to be covered here
+            if (characterLength == 0)
+            {
+                characterLength = NewLineLength;
+            }
+
+            var runWidth = endX - startX;
+
+            return new TextRunBounds(new Rect(Start + startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
+        }
+
+        public override IReadOnlyList<TextBounds> GetTextBounds(int firstTextSourceIndex, int textLength)
+        {
+            if (_paragraphProperties.FlowDirection == FlowDirection.LeftToRight)
+            {
+                return GetTextBoundsLeftToRight(firstTextSourceIndex, textLength);
+            }
+
+            return GetTextBoundsRightToLeft(firstTextSourceIndex, textLength);
+        }
+
+        public TextLineImpl FinalizeLine()
+        {
+            _textLineMetrics = CreateLineMetrics();
+
+            BidiReorder();
+
+            return this;
+        }
+
+        private static sbyte GetRunBidiLevel(DrawableTextRun run, FlowDirection flowDirection)
+        {
+            if (run is ShapedTextCharacters shapedTextCharacters)
+            {
+                return shapedTextCharacters.BidiLevel;
+            }
+
+            var defaultLevel = flowDirection == FlowDirection.LeftToRight ? 0 : 1;
+
+            return (sbyte)defaultLevel;
+        }
+
+        private void BidiReorder()
+        {
+            if (_textRuns.Count == 0)
+            {
+                return;
+            }
+
+            // Build up the collection of ordered runs.
+            var run = _textRuns[0];
+
+            OrderedBidiRun orderedRun = new(run, GetRunBidiLevel(run, _resolvedFlowDirection));
+
+            var current = orderedRun;
+
+            for (var i = 1; i < _textRuns.Count; i++)
+            {
+                run = _textRuns[i];
+
+                current.Next = new OrderedBidiRun(run, GetRunBidiLevel(run, _resolvedFlowDirection));
+
+                current = current.Next;
+            }
+
+            // Reorder them into visual order.
+            orderedRun = LinearReOrder(orderedRun);
+
+            // Now perform a recursive reversal of each run.
+            // From the highest level found in the text to the lowest odd level on each line, including intermediate levels
+            // not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
+            // https://unicode.org/reports/tr9/#L2
+            sbyte max = 0;
+            var min = sbyte.MaxValue;
+
+            for (var i = 0; i < _textRuns.Count; i++)
+            {
+                var currentRun = _textRuns[i];
+
+                var level = GetRunBidiLevel(currentRun, _resolvedFlowDirection);
+
+                if (level > max)
+                {
+                    max = level;
+                }
+
+                if ((level & 1) != 0 && level < min)
+                {
+                    min = level;
+                }
+            }
+
+            if (min > max)
+            {
+                min = max;
+            }
+
+            if (max == 0 || (min == max && (max & 1) == 0))
+            {
+                // Nothing to reverse.
+                return;
+            }
+
+            // Now apply the reversal and replace the original contents.
+            var minLevelToReverse = max;
+
+            while (minLevelToReverse >= min)
+            {
+                current = orderedRun;
+
+                while (current != null)
+                {
+                    if (current.Level >= minLevelToReverse && current.Level % 2 != 0)
+                    {
+                        if (current.Run is ShapedTextCharacters { IsReversed: false } shapedTextCharacters)
+                        {
+                            shapedTextCharacters.Reverse();
+                        }
+                    }
+
+                    current = current.Next;
+                }
+
+                minLevelToReverse--;
+            }
+
+            _textRuns.Clear();
+
+            current = orderedRun;
+
+            while (current != null)
+            {
+                _textRuns.Add(current.Run);
+
+                current = current.Next;
+            }
+        }
+
+        /// <summary>
+        /// Reorders a series of runs from logical to visual order, returning the left most run.
+        /// <see href="https://github.com/fribidi/linear-reorder/blob/f2f872257d4d8b8e137fcf831f254d6d4db79d3c/linear-reorder.c"/>
+        /// </summary>
+        /// <param name="run">The ordered bidi run.</param>
+        /// <returns>The <see cref="OrderedBidiRun"/>.</returns>
+        private static OrderedBidiRun LinearReOrder(OrderedBidiRun? run)
+        {
+            BidiRange? range = null;
+
+            while (run != null)
+            {
+                var next = run.Next;
+
+                while (range != null && range.Level > run.Level
+                    && range.Previous != null && range.Previous.Level >= run.Level)
+                {
+                    range = BidiRange.MergeWithPrevious(range);
+                }
+
+                if (range != null && range.Level >= run.Level)
+                {
+                    // Attach run to the range.
+                    if ((run.Level & 1) != 0)
+                    {
+                        // Odd, range goes to the right of run.
+                        run.Next = range.Left;
+                        range.Left = run;
+                    }
+                    else
+                    {
+                        // Even, range goes to the left of run.
+                        range.Right!.Next = run;
+                        range.Right = run;
+                    }
+
+                    range.Level = run.Level;
+                }
+                else
+                {
+                    var r = new BidiRange();
+
+                    r.Left = r.Right = run;
+                    r.Level = run.Level;
+                    r.Previous = range;
+
+                    range = r;
+                }
+
+                run = next;
+            }
+
+            while (range?.Previous != null)
+            {
+                range = BidiRange.MergeWithPrevious(range);
+            }
+
+            // Terminate.
+            range!.Right!.Next = null;
+
+            return range.Left!;
+        }
+
+        /// <summary>
+        /// Tries to find the next character hit.
+        /// </summary>
+        /// <param name="characterHit">The current character hit.</param>
+        /// <param name="nextCharacterHit">The next character hit.</param>
+        /// <returns></returns>
+        private bool TryFindNextCharacterHit(CharacterHit characterHit, out CharacterHit nextCharacterHit)
+        {
+            nextCharacterHit = characterHit;
+
+            var codepointIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+            var lastCodepointIndex = FirstTextSourceIndex + Length;
+
+            if (codepointIndex >= lastCodepointIndex)
+            {
+                return false; // Cannot go forward anymore
+            }
+
+            if (codepointIndex < FirstTextSourceIndex)
+            {
+                codepointIndex = FirstTextSourceIndex;
+            }
+
+            var runIndex = GetRunIndexAtCharacterIndex(codepointIndex, LogicalDirection.Forward, out var currentPosition);
+
+            while (runIndex < _textRuns.Count)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            var foundCharacterHit = shapedRun.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
+
+                            var isAtEnd = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength == FirstTextSourceIndex + Length;
+
+                            if (isAtEnd && !shapedRun.GlyphRun.IsLeftToRight)
+                            {
+                                nextCharacterHit = foundCharacterHit;
+
+                                return true;
+                            }
+
+                            var characterIndex = codepointIndex - shapedRun.Text.Start;
+
+                            if (characterIndex < 0 && shapedRun.ShapedBuffer.IsLeftToRight)
+                            {
+                                foundCharacterHit = new CharacterHit(foundCharacterHit.FirstCharacterIndex);
+                            }
+
+                            nextCharacterHit = isAtEnd || characterHit.TrailingLength != 0 ?
+                                foundCharacterHit :
+                                new CharacterHit(foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength);
+
+                            if (isAtEnd || nextCharacterHit.FirstCharacterIndex > characterHit.FirstCharacterIndex)
+                            {
+                                return true;
+                            }
+
+                            break;
+                        }
+                    default:
+                        {
+                            var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+                            if (textPosition == currentPosition)
+                            {
+                                nextCharacterHit = new CharacterHit(currentPosition + currentRun.TextSourceLength);
+
+                                return true;
+                            }
+
+                            break;
+                        }
+                }
+
+                currentPosition += currentRun.TextSourceLength;
+                runIndex++;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Tries to find the previous character hit.
+        /// </summary>
+        /// <param name="characterHit">The current character hit.</param>
+        /// <param name="previousCharacterHit">The previous character hit.</param>
+        /// <returns></returns>
+        private bool TryFindPreviousCharacterHit(CharacterHit characterHit, out CharacterHit previousCharacterHit)
+        {
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+            if (characterIndex == FirstTextSourceIndex)
+            {
+                previousCharacterHit = new CharacterHit(FirstTextSourceIndex);
+
+                return true;
+            }
+
+            previousCharacterHit = characterHit;
+
+            if (characterIndex < FirstTextSourceIndex)
+            {
+                return false; // Cannot go backward anymore.
+            }
+
+            var runIndex = GetRunIndexAtCharacterIndex(characterIndex, LogicalDirection.Backward, out var currentPosition);
+
+            while (runIndex >= 0)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            var foundCharacterHit = shapedRun.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
+
+                            if (foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength < characterIndex)
+                            {
+                                previousCharacterHit = foundCharacterHit;
+
+                                return true;
+                            }
+
+                            var previousPosition = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength;
+
+                            if (foundCharacterHit.TrailingLength > 0 && previousPosition == characterIndex)
+                            {
+                                previousCharacterHit = new CharacterHit(foundCharacterHit.FirstCharacterIndex);
+                            }
+
+                            if (previousCharacterHit != characterHit)
+                            {
+                                return true;
+                            }
+
+                            break;
+                        }
+                    default:
+                        {
+                            if (characterIndex == currentPosition + currentRun.TextSourceLength)
+                            {
+                                previousCharacterHit = new CharacterHit(currentPosition);
+
+                                return true;
+                            }
+
+                            break;
+                        }
+                }
+
+                currentPosition -= currentRun.TextSourceLength;
+                runIndex--;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the run index of the specified codepoint index.
+        /// </summary>
+        /// <param name="codepointIndex">The codepoint index.</param>
+        /// <param name="direction">The logical direction.</param>
+        /// <param name="textPosition">The text position of the found run index.</param>
+        /// <returns>The text run index.</returns>
+        private int GetRunIndexAtCharacterIndex(int codepointIndex, LogicalDirection direction, out int textPosition)
+        {
+            var runIndex = 0;
+            textPosition = FirstTextSourceIndex;
+            DrawableTextRun? previousRun = null;
+
+            while (runIndex < _textRuns.Count)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            if (previousRun is ShapedTextCharacters previousShaped && !previousShaped.ShapedBuffer.IsLeftToRight)
+                            {
+                                if (shapedRun.ShapedBuffer.IsLeftToRight)
+                                {
+                                    if (currentRun.Text.Start >= codepointIndex)
+                                    {
+                                        return --runIndex;
+                                    }
+                                }
+                                else
+                                {
+                                    if (codepointIndex > currentRun.Text.Start + currentRun.Text.Length)
+                                    {
+                                        return --runIndex;
+                                    }
+                                }
+                            }
+
+                            if (direction == LogicalDirection.Forward)
+                            {
+                                if (codepointIndex >= currentRun.Text.Start && codepointIndex <= currentRun.Text.End)
+                                {
+                                    return runIndex;
+                                }
+                            }
+                            else
+                            {
+                                if (codepointIndex > currentRun.Text.Start &&
+                                    codepointIndex <= currentRun.Text.Start + currentRun.Text.Length)
+                                {
+                                    return runIndex;
+                                }
+                            }
+
+                            if (runIndex + 1 >= _textRuns.Count)
+                            {
+                                return runIndex;
+                            }
+
+                            break;
+                        }
+
+                    default:
+                        {
+                            if (codepointIndex == textPosition)
+                            {
+                                return runIndex;
+                            }
+
+                            if (runIndex + 1 >= _textRuns.Count)
+                            {
+                                return runIndex;
+                            }
+
+                            break;
+                        }
+                }
+
+                runIndex++;
+                previousRun = currentRun;
+                textPosition += currentRun.TextSourceLength;
+            }
+
+            return runIndex;
+        }
+
+        private TextLineMetrics CreateLineMetrics()
+        {
+            var fontMetrics = _paragraphProperties.DefaultTextRunProperties.Typeface.GlyphTypeface.Metrics;
+            var fontRenderingEmSize = _paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize;
+            var scale = fontRenderingEmSize / fontMetrics.DesignEmHeight;
+
+            var width = 0d;
+            var widthIncludingWhitespace = 0d;
+            var trailingWhitespaceLength = 0;
+            var newLineLength = 0;
+            var ascent = fontMetrics.Ascent * scale;
+            var descent = fontMetrics.Descent * scale;
+            var lineGap = fontMetrics.LineGap * scale;
+
+            var height = descent - ascent + lineGap;
+
+            var lineHeight = _paragraphProperties.LineHeight;
+
+            for (var index = 0; index < _textRuns.Count; index++)
+            {
+                switch (_textRuns[index])
+                {
+                    case ShapedTextCharacters textRun:
+                        {
+                            var textMetrics =
+                                new TextMetrics(textRun.Properties.Typeface, textRun.Properties.FontRenderingEmSize);
+
+                            if (fontRenderingEmSize < textRun.Properties.FontRenderingEmSize)
+                            {
+                                fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
+
+                                if (ascent > textMetrics.Ascent)
+                                {
+                                    ascent = textMetrics.Ascent;
+                                }
+
+                                if (descent < textMetrics.Descent)
+                                {
+                                    descent = textMetrics.Descent;
+                                }
+
+                                if (lineGap < textMetrics.LineGap)
+                                {
+                                    lineGap = textMetrics.LineGap;
+                                }
+
+                                if (descent - ascent + lineGap > height)
+                                {
+                                    height = descent - ascent + lineGap;
+                                }
+                            }
+
+                            if (index == _textRuns.Count - 1)
+                            {
+                                width = widthIncludingWhitespace + textRun.GlyphRun.Metrics.Width;
+                                trailingWhitespaceLength = textRun.GlyphRun.Metrics.TrailingWhitespaceLength;
+                                newLineLength = textRun.GlyphRun.Metrics.NewlineLength;
+                            }
+
+                            widthIncludingWhitespace += textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace;
+
+                            break;
+                        }
+
+                    case { } drawableTextRun:
+                        {
+                            widthIncludingWhitespace += drawableTextRun.Size.Width;
+
+                            switch (_paragraphProperties.FlowDirection)
+                            {
+                                case FlowDirection.LeftToRight:
+                                    {
+                                        if (index == _textRuns.Count - 1)
+                                        {
+                                            width = widthIncludingWhitespace;
+                                            trailingWhitespaceLength = 0;
+                                            newLineLength = 0;
+                                        }
+
+                                        break;
+                                    }
+
+                                case FlowDirection.RightToLeft:
+                                    {
+                                        if (index == _textRuns.Count - 1)
+                                        {
+                                            width = widthIncludingWhitespace;
+                                            trailingWhitespaceLength = 0;
+                                            newLineLength = 0;
+                                        }
+
+                                        break;
+                                    }
+                            }
+
+                            if (drawableTextRun.Size.Height > height)
+                            {
+                                height = drawableTextRun.Size.Height;
+                            }
+
+                            if (ascent > -drawableTextRun.Baseline)
+                            {
+                                ascent = -drawableTextRun.Baseline;
+                            }
+
+                            break;
+                        }
+                }
+            }
+
+            var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
+
+            if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
+            {
+                if (lineHeight > height)
+                {
+                    height = lineHeight;
+                }
+            }
+
+            return new TextLineMetrics(widthIncludingWhitespace > _paragraphWidth, height, newLineLength, start,
+                -ascent, trailingWhitespaceLength, width, widthIncludingWhitespace);
+        }
+
+        /// <summary>
+        /// Gets the text line offset x.
+        /// </summary>
+        /// <param name="width">The line width.</param>
+        /// <param name="widthIncludingTrailingWhitespace">The paragraph width including whitespace.</param>
+
+        /// <returns>The paragraph offset.</returns>
+        private double GetParagraphOffsetX(double width, double widthIncludingTrailingWhitespace)
+        {
+            if (double.IsPositiveInfinity(_paragraphWidth))
+            {
+                return 0;
+            }
+
+            var textAlignment = _paragraphProperties.TextAlignment;
+            var paragraphFlowDirection = _paragraphProperties.FlowDirection;
+
+            if (textAlignment == TextAlignment.Justify)
+            {
+                textAlignment = TextAlignment.Start;
+            }
+
+            switch (textAlignment)
+            {
+                case TextAlignment.Start:
+                    {
+                        textAlignment = paragraphFlowDirection == FlowDirection.LeftToRight ? TextAlignment.Left : TextAlignment.Right;
+                        break;
+                    }
+                case TextAlignment.End:
+                    {
+                        textAlignment = paragraphFlowDirection == FlowDirection.RightToLeft ? TextAlignment.Left : TextAlignment.Right;
+                        break;
+                    }
+                case TextAlignment.DetectFromContent:
+                    {
+                        textAlignment = _resolvedFlowDirection == FlowDirection.LeftToRight ? TextAlignment.Left : TextAlignment.Right;
+                        break;
+                    }
+            }
+
+            switch (textAlignment)
+            {
+                case TextAlignment.Center:
+                    var start = (_paragraphWidth - width) / 2;
+
+                    if (paragraphFlowDirection == FlowDirection.RightToLeft)
+                    {
+                        start -= (widthIncludingTrailingWhitespace - width);
+                    }
+
+                    return Math.Max(0, start);
+                case TextAlignment.Right:
+                    return Math.Max(0, _paragraphWidth - widthIncludingTrailingWhitespace);
+
+                default:
+                    return 0;
+            }
+        }
+
+        private sealed class OrderedBidiRun
+        {
+            public OrderedBidiRun(DrawableTextRun run, sbyte level)
+            {
+                Run = run;
+                Level = level;
+            }
+
+            public sbyte Level { get; }
+
+            public DrawableTextRun Run { get; }
+
+            public OrderedBidiRun? Next { get; set; }
+        }
+
+        private sealed class BidiRange
+        {
+            public int Level { get; set; }
+
+            public OrderedBidiRun? Left { get; set; }
+
+            public OrderedBidiRun? Right { get; set; }
+
+            public BidiRange? Previous { get; set; }
+
+            public static BidiRange MergeWithPrevious(BidiRange range)
+            {
+                var previous = range.Previous;
+
+                BidiRange left;
+                BidiRange right;
+
+                if ((previous!.Level & 1) != 0)
+                {
+                    // Odd, previous goes to the right of range.
+                    left = range;
+                    right = previous;
+                }
+                else
+                {
+                    // Even, previous goes to the left of range.
+                    left = previous;
+                    right = range;
+                }
+
+                // Stitch them
+                left.Right!.Next = right.Left;
+                previous.Left = left.Left;
+                previous.Right = right.Right;
+
+                return previous;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineMetrics.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextLineMetrics.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextMetrics.cs b/src/Avalonia.Base/Media/TextFormatting/TextMetrics.cs
new file mode 100644
index 0000000000..0382e66b5a
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextMetrics.cs
@@ -0,0 +1,78 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A metric that holds information about text specific measurements.
+    /// </summary>
+    public readonly struct TextMetrics
+    {
+        public TextMetrics(Typeface typeface, double fontRenderingEmSize)
+        {
+            var fontMetrics = typeface.GlyphTypeface.Metrics;
+
+            var scale = fontRenderingEmSize / fontMetrics.DesignEmHeight;
+
+            FontRenderingEmSize = fontRenderingEmSize;
+
+            Ascent = fontMetrics.Ascent * scale;
+
+            Descent = fontMetrics.Descent * scale;
+
+            LineGap = fontMetrics.LineGap * scale;
+
+            LineHeight = Descent - Ascent + LineGap;
+
+            UnderlineThickness = fontMetrics.UnderlineThickness * scale;
+
+            UnderlinePosition = fontMetrics.UnderlinePosition * scale;
+
+            StrikethroughThickness = fontMetrics.StrikethroughThickness * scale;
+
+            StrikethroughPosition = fontMetrics.StrikethroughPosition * scale;
+        }
+
+        /// <summary>
+        /// Em size of font used to format and display text
+        /// </summary>
+        public double FontRenderingEmSize { get; }
+
+        /// <summary>
+        /// Gets the recommended distance above the baseline.
+        /// </summary>
+        public double Ascent { get; }
+
+        /// <summary>
+        /// Gets the recommended distance under the baseline.
+        /// </summary>
+        public double Descent { get; }
+
+        /// <summary>
+        /// Gets the recommended additional space between two lines of text.
+        /// </summary>
+        public double LineGap { get; }
+
+        /// <summary>
+        /// Gets the estimated line height.
+        /// </summary>
+        public double LineHeight { get; }
+
+        /// <summary>
+        /// Gets a value that indicates the thickness of the underline.
+        /// </summary>
+        public double UnderlineThickness { get; }
+
+        /// <summary>
+        /// Gets a value that indicates the distance of the underline from the baseline.
+        /// </summary>
+        public double UnderlinePosition { get; }
+
+        /// <summary>
+        /// Gets a value that indicates the thickness of the underline.
+        /// </summary>
+        public double StrikethroughThickness { get; }
+
+        /// <summary>
+        /// Gets a value that indicates the distance of the strikethrough from the baseline.
+        /// </summary>
+        public double StrikethroughPosition { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextParagraphProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextParagraphProperties.cs
new file mode 100644
index 0000000000..5691dd8ad0
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextParagraphProperties.cs
@@ -0,0 +1,80 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Provides a set of properties that are used during the paragraph layout.
+    /// </summary>
+    public abstract class TextParagraphProperties
+    {
+        /// <summary>
+        /// This property specifies whether the primary text advance 
+        /// direction shall be left-to-right, right-to-left.
+        /// </summary>
+        public abstract FlowDirection FlowDirection { get; }
+
+        /// <summary>
+        /// Gets the text alignment.
+        /// </summary>
+        public abstract TextAlignment TextAlignment { get; }
+
+        /// <summary>
+        /// Paragraph's line height
+        /// </summary>
+        public abstract double LineHeight { get; }
+
+        /// <summary>
+        /// Indicates the first line of the paragraph.
+        /// </summary>
+        public abstract bool FirstLineInParagraph { get; }
+
+        /// <summary>
+        /// If true, the formatted line may always be collapsed. If false (the default),
+        /// only lines that overflow the paragraph width are collapsed.
+        /// </summary>
+        public virtual bool AlwaysCollapsible
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets the default text style.
+        /// </summary>
+        public abstract TextRunProperties DefaultTextRunProperties { get; }
+
+        /// <summary>
+        /// If not null, text decorations to apply to all runs in the line. This is in addition
+        /// to any text decorations specified by the TextRunProperties for individual text runs.
+        /// </summary>
+        public virtual TextDecorationCollection? TextDecorations => null;
+
+        /// <summary>
+        /// Gets the text wrapping.
+        /// </summary>
+        public abstract TextWrapping TextWrapping { get; }
+
+        /// <summary>
+        /// Line indentation
+        /// </summary>
+        public abstract double Indent { get; }
+
+        /// <summary>
+        /// Get the paragraph indentation.
+        /// </summary>
+        public virtual double ParagraphIndent
+        {
+            get { return 0; }
+        }
+        
+        /// <summary>
+        /// Gets the default incremental tab width.
+        /// </summary>
+        public virtual double DefaultIncrementalTab
+        {
+            get { return 4 * DefaultTextRunProperties.FontRenderingEmSize; }
+        }
+
+        /// <summary>
+        /// Gets the letter spacing.
+        /// </summary>
+        public virtual double LetterSpacing { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs b/src/Avalonia.Base/Media/TextFormatting/TextRange.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextRange.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs b/src/Avalonia.Base/Media/TextFormatting/TextRun.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextRun.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextRunBounds.cs b/src/Avalonia.Base/Media/TextFormatting/TextRunBounds.cs
new file mode 100644
index 0000000000..bdc7a1ca89
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextRunBounds.cs
@@ -0,0 +1,39 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// The bounding rectangle of text run
+    /// </summary>
+    public readonly struct TextRunBounds
+    {
+        /// <summary>
+        /// Constructing TextRunBounds
+        /// </summary>
+        internal TextRunBounds(Rect bounds, int firstCharacterIndex, int length, TextRun textRun)
+        {
+            Rectangle = bounds;
+            TextSourceCharacterIndex = firstCharacterIndex;
+            Length = length;
+            TextRun = textRun;
+        }
+
+        /// <summary>
+        /// First text source character index of text run
+        /// </summary>
+        public int TextSourceCharacterIndex { get; }
+
+        /// <summary>
+        /// character length of bounded text run
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Text run bounding rectangle
+        /// </summary>
+        public Rect Rectangle { get; }
+
+        /// <summary>
+        /// text run
+        /// </summary>
+        public TextRun TextRun { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
new file mode 100644
index 0000000000..86b701cb4b
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Globalization;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Provides a set of properties, such as typeface or foreground brush, that can be applied to a TextRun object. This is an abstract class.
+    /// </summary>
+    /// <remarks>
+    /// The text layout client provides a concrete implementation of this abstract class.
+    /// This enables the client to implement text run properties in a way that corresponds with the associated formatting store.
+    /// </remarks>
+    public abstract class TextRunProperties : IEquatable<TextRunProperties>
+    {
+        /// <summary>
+        /// Run typeface
+        /// </summary>
+        public abstract Typeface Typeface { get; }
+
+        /// <summary>
+        /// Em size of font used to format and display text
+        /// </summary>
+        public abstract double FontRenderingEmSize { get; }
+
+        ///<summary>
+        /// Run TextDecorations. 
+        ///</summary>
+        public abstract TextDecorationCollection? TextDecorations { get; }
+
+        /// <summary>
+        /// Brush used to fill text.
+        /// </summary>
+        public abstract IBrush? ForegroundBrush { get; }
+
+        /// <summary>
+        /// Brush used to paint background of run.
+        /// </summary>
+        public abstract IBrush? BackgroundBrush { get; }
+
+        /// <summary>
+        /// Run text culture.
+        /// </summary>
+        public abstract CultureInfo? CultureInfo { get; }
+
+        /// <summary>
+        /// Run vertical box alignment
+        /// </summary>
+        public virtual BaselineAlignment BaselineAlignment => BaselineAlignment.Baseline;
+
+        public bool Equals(TextRunProperties? other)
+        {
+            if (ReferenceEquals(null, other))
+                return false;
+            if (ReferenceEquals(this, other))
+                return true;
+
+            return Typeface.Equals(other.Typeface) &&
+                   FontRenderingEmSize.Equals(other.FontRenderingEmSize)
+                   && Equals(TextDecorations, other.TextDecorations) &&
+                   Equals(ForegroundBrush, other.ForegroundBrush) &&
+                   Equals(BackgroundBrush, other.BackgroundBrush) &&
+                   Equals(CultureInfo, other.CultureInfo);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return ReferenceEquals(this, obj) || obj is TextRunProperties other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Typeface.GetHashCode();
+                hashCode = (hashCode * 397) ^ FontRenderingEmSize.GetHashCode();
+                hashCode = (hashCode * 397) ^ (TextDecorations != null ? TextDecorations.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (ForegroundBrush != null ? ForegroundBrush.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (BackgroundBrush != null ? BackgroundBrush.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (CultureInfo != null ? CultureInfo.GetHashCode() : 0);
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(TextRunProperties left, TextRunProperties right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(TextRunProperties left, TextRunProperties right)
+        {
+            return !Equals(left, right);
+        }
+        
+        internal TextRunProperties WithTypeface(Typeface typeface)
+        {
+            return new GenericTextRunProperties(typeface, FontRenderingEmSize,
+                TextDecorations, ForegroundBrush, BackgroundBrush, BaselineAlignment);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextShaper.cs b/src/Avalonia.Base/Media/TextFormatting/TextShaper.cs
new file mode 100644
index 0000000000..615b1553b6
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextShaper.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Globalization;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A class that is responsible for text shaping.
+    /// </summary>
+    public class TextShaper
+    {
+        private readonly ITextShaperImpl _platformImpl;
+
+        public TextShaper(ITextShaperImpl platformImpl)
+        {
+            _platformImpl = platformImpl;
+        }
+
+        /// <summary>
+        /// Gets the current text shaper.
+        /// </summary>
+        public static TextShaper Current
+        {
+            get
+            {
+                var current = AvaloniaLocator.Current.GetService<TextShaper>();
+
+                if (current != null)
+                {
+                    return current;
+                }
+
+                var textShaperImpl = AvaloniaLocator.Current.GetService<ITextShaperImpl>();
+
+                if (textShaperImpl == null)
+                    throw new InvalidOperationException("No text shaper implementation was registered.");
+
+                current = new TextShaper(textShaperImpl);
+
+                AvaloniaLocator.CurrentMutable.Bind<TextShaper>().ToConstant(current);
+
+                return current;
+            }
+        }
+
+        /// <inheritdoc cref="ITextShaperImpl.ShapeText"/>
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
+        {
+            return _platformImpl.ShapeText(text, options);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextShaperOptions.cs b/src/Avalonia.Base/Media/TextFormatting/TextShaperOptions.cs
new file mode 100644
index 0000000000..80bbbcdbfe
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextShaperOptions.cs
@@ -0,0 +1,56 @@
+using System.Globalization;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Options to customize text shaping.
+    /// </summary>
+    public readonly struct TextShaperOptions
+    {
+        public TextShaperOptions(
+            IGlyphTypeface typeface, 
+            double fontRenderingEmSize = 12, 
+            sbyte bidiLevel = 0, 
+            CultureInfo? culture = null, 
+            double incrementalTabWidth = 0,
+            double letterSpacing = 0)
+        {
+            Typeface = typeface;
+            FontRenderingEmSize = fontRenderingEmSize;
+            BidiLevel = bidiLevel;
+            Culture = culture;
+            IncrementalTabWidth = incrementalTabWidth;
+            LetterSpacing = letterSpacing;
+        }
+
+        /// <summary>
+        /// Get the typeface.
+        /// </summary>
+        public IGlyphTypeface Typeface { get; }
+        /// <summary>
+        /// Get the font rendering em size.
+        /// </summary>
+        public double FontRenderingEmSize { get; }
+
+        /// <summary>
+        /// Get the bidi level of the text.
+        /// </summary>
+        public sbyte BidiLevel { get; }
+
+        /// <summary>
+        /// Get the culture.
+        /// </summary>
+        public CultureInfo? Culture { get; }
+
+        /// <summary>
+        /// Get the incremental tab width.
+        /// </summary>
+        public double IncrementalTabWidth { get; }
+
+        /// <summary>
+        /// Get the letter spacing.
+        /// </summary>
+        public double LetterSpacing { get; }
+
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
new file mode 100644
index 0000000000..670d94e928
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A collapsing properties to collapse whole line toward the end
+    /// at character granularity.
+    /// </summary>
+    public sealed class TextTrailingCharacterEllipsis : TextCollapsingProperties
+    {
+        /// <summary>
+        /// Construct a text trailing character ellipsis collapsing properties
+        /// </summary>
+        /// <param name="ellipsis">Text used as collapsing symbol.</param>
+        /// <param name="width">Width in which collapsing is constrained to.</param>
+        /// <param name="textRunProperties">Text run properties of ellipsis symbol.</param>
+        public TextTrailingCharacterEllipsis(ReadOnlySlice<char> ellipsis, double width, TextRunProperties textRunProperties)
+        {
+            Width = width;
+            Symbol = new TextCharacters(ellipsis, textRunProperties);
+        }
+
+        /// <inheritdoc/>
+        public override double Width { get; }
+
+        /// <inheritdoc/>
+        public override TextRun Symbol { get; }
+
+        public override List<DrawableTextRun>? Collapse(TextLine textLine)
+        {
+            return TextEllipsisHelper.Collapse(textLine, this, false);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
new file mode 100644
index 0000000000..dbffbdf060
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// a collapsing properties to collapse whole line toward the end
+    /// at word granularity.
+    /// </summary>
+    public sealed class TextTrailingWordEllipsis : TextCollapsingProperties
+    {
+        /// <summary>
+        /// Construct a text trailing word ellipsis collapsing properties.
+        /// </summary>
+        /// <param name="ellipsis">Text used as collapsing symbol.</param>
+        /// <param name="width">width in which collapsing is constrained to.</param>
+        /// <param name="textRunProperties">text run properties of ellipsis symbol.</param>
+        public TextTrailingWordEllipsis(
+            ReadOnlySlice<char> ellipsis,
+            double width,
+            TextRunProperties textRunProperties
+        )
+        {
+            Width = width;
+            Symbol = new TextCharacters(ellipsis, textRunProperties);
+        }
+
+        /// <inheritdoc/>
+        public override double Width { get; }
+
+        /// <inheritdoc/>
+        public override TextRun Symbol { get; }
+
+        public override List<DrawableTextRun>? Collapse(TextLine textLine)
+        {
+            return TextEllipsisHelper.Collapse(textLine, this, true);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDi.trie.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDi.trie.cs
new file mode 100644
index 0000000000..bb907b8ace
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDi.trie.cs
@@ -0,0 +1,519 @@
+using System;
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+   internal static class BidiTrie
+    {
+        public static ReadOnlySpan<byte> Data => new byte[]
+        {
+            0, 0, 16, 0, 0, 0, 0, 0, 192, 198, 0, 0, 127, 3, 0, 0, 135, 3, 0, 0, 143, 3, 0, 0, 151, 3, 0, 0, 175, 3, 0, 0, 183, 3, 0, 0, 191, 3, 0, 0, 199, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 205, 3, 0, 0, 213, 3, 0, 0,
+            221, 3, 0, 0, 229, 3, 0, 0, 237, 3, 0, 0, 245, 3, 0, 0, 241, 3, 0, 0, 249, 3, 0, 0, 1, 4, 0, 0, 9, 4, 0, 0, 4, 4, 0, 0, 12, 4, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 20, 4, 0, 0, 28, 4, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 159, 3, 0, 0, 167, 3, 0, 0, 34, 4, 0, 0, 42, 4, 0, 0, 50, 4, 0, 0,
+            58, 4, 0, 0, 66, 4, 0, 0, 74, 4, 0, 0, 80, 4, 0, 0, 88, 4, 0, 0, 93, 4, 0, 0, 101, 4, 0, 0, 104, 4, 0, 0, 112, 4, 0, 0, 119, 4, 0, 0, 127, 4, 0, 0, 133, 4, 0, 0, 141, 4, 0, 0, 140, 4, 0, 0, 148, 4, 0, 0, 156, 4, 0, 0, 164, 4, 0, 0, 54, 9, 0, 0, 61, 9, 0, 0, 69, 9, 0, 0, 17, 12, 0, 0, 142, 10, 0, 0, 73, 4, 0, 0, 228, 11, 0, 0, 150, 10, 0, 0,
+            172, 4, 0, 0, 174, 4, 0, 0, 182, 4, 0, 0, 190, 4, 0, 0, 198, 4, 0, 0, 199, 4, 0, 0, 207, 4, 0, 0, 215, 4, 0, 0, 223, 4, 0, 0, 199, 4, 0, 0, 231, 4, 0, 0, 236, 4, 0, 0, 223, 4, 0, 0, 199, 4, 0, 0, 244, 4, 0, 0, 252, 4, 0, 0, 198, 4, 0, 0, 4, 5, 0, 0, 12, 5, 0, 0, 190, 4, 0, 0, 20, 5, 0, 0, 159, 3, 0, 0, 28, 5, 0, 0, 32, 5, 0, 0, 40, 5, 0, 0,
+            42, 5, 0, 0, 50, 5, 0, 0, 58, 5, 0, 0, 198, 4, 0, 0, 199, 4, 0, 0, 66, 5, 0, 0, 190, 4, 0, 0, 22, 4, 0, 0, 70, 5, 0, 0, 207, 4, 0, 0, 190, 4, 0, 0, 198, 4, 0, 0, 159, 3, 0, 0, 78, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 84, 5, 0, 0, 92, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 96, 5, 0, 0, 104, 5, 0, 0, 159, 3, 0, 0, 108, 5, 0, 0, 115, 5, 0, 0,
+            159, 3, 0, 0, 123, 5, 0, 0, 131, 5, 0, 0, 138, 5, 0, 0, 19, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 146, 5, 0, 0, 154, 5, 0, 0, 162, 5, 0, 0, 170, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 178, 5, 0, 0, 159, 3, 0, 0, 186, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 194, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 202, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 210, 5, 0, 0, 211, 4, 0, 0, 211, 4, 0, 0, 211, 4, 0, 0, 159, 3, 0, 0, 216, 5, 0, 0, 224, 5, 0, 0, 186, 5, 0, 0, 232, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 239, 5, 0, 0,
+            196, 4, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 247, 5, 0, 0, 255, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 1, 6, 0, 0, 182, 10, 0, 0, 9, 6, 0, 0, 159, 3, 0, 0, 16, 6, 0, 0, 24, 6, 0, 0, 159, 3, 0, 0, 32, 6, 0, 0, 233, 11, 0, 0, 159, 3, 0, 0, 3, 5, 0, 0, 40, 6, 0, 0, 20, 5, 0, 0, 48, 6, 0, 0, 22, 4, 0, 0, 56, 6, 0, 0,
+            159, 3, 0, 0, 63, 6, 0, 0, 159, 3, 0, 0, 68, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 74, 6, 0, 0, 82, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 89, 6, 0, 0, 97, 6, 0, 0, 101, 6, 0, 0, 109, 6, 0, 0, 102, 10, 0, 0, 174, 10, 0, 0, 117, 6, 0, 0, 125, 6, 0, 0, 110, 10, 0, 0, 118, 10, 0, 0, 141, 5, 0, 0, 133, 6, 0, 0, 141, 6, 0, 0, 149, 6, 0, 0, 159, 3, 0, 0, 157, 6, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0,
+            86, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 188, 10, 0, 0, 163, 6, 0, 0, 159, 3, 0, 0, 169, 6, 0, 0, 176, 6, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 22, 7, 0, 0, 194, 10, 0, 0, 182, 10, 0, 0, 182, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 189, 6, 0, 0, 182, 10, 0, 0,
+            182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 194, 6, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 202, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 209, 10, 0, 0, 216, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 224, 10, 0, 0, 182, 10, 0, 0, 231, 10, 0, 0, 238, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0,
+            246, 10, 0, 0, 252, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 202, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 210, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 237, 3, 0, 0, 182, 10, 0, 0, 4, 11, 0, 0, 7, 11, 0, 0, 159, 3, 0, 0,
+            15, 11, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 22, 11, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 30, 11, 0, 0, 36, 11, 0, 0, 218, 6, 0, 0, 226, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 234, 6, 0, 0, 194, 5, 0, 0, 159, 3, 0, 0, 198, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 182, 10, 0, 0, 209, 6, 0, 0, 212, 3, 0, 0, 159, 3, 0, 0, 242, 6, 0, 0, 250, 6, 0, 0, 159, 3, 0, 0, 2, 7, 0, 0, 10, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 14, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 1, 6, 0, 0, 197, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            182, 10, 0, 0, 182, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 242, 6, 0, 0, 182, 10, 0, 0, 22, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 27, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 32, 7, 0, 0, 40, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 110, 5, 0, 0, 182, 10, 0, 0, 0, 6, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 48, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 56, 7, 0, 0, 63, 7, 0, 0, 159, 3, 0, 0,
+            70, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 68, 5, 0, 0, 78, 7, 0, 0, 159, 3, 0, 0, 86, 7, 0, 0, 93, 7, 0, 0, 159, 3, 0, 0, 172, 4, 0, 0, 98, 7, 0, 0, 159, 3, 0, 0, 197, 4, 0, 0, 159, 3, 0, 0, 106, 7, 0, 0, 114, 7, 0, 0, 199, 4, 0, 0, 159, 3, 0, 0, 118, 7, 0, 0, 198, 4, 0, 0, 126, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 6, 6, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 133, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 137, 7, 0, 0, 77, 9, 0, 0, 85, 9, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 25, 12, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0,
+            73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 44, 11, 0, 0, 52, 11, 0, 0, 73, 4, 0, 0, 30, 12, 0, 0, 73, 4, 0, 0, 58, 11, 0, 0, 62, 11, 0, 0, 70, 11, 0, 0, 122, 10, 0, 0, 126, 10, 0, 0, 94, 10, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 73, 4, 0, 0, 196, 11, 0, 0, 54, 10, 0, 0, 145, 7, 0, 0, 153, 7, 0, 0, 161, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            134, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 188, 14, 0, 0, 252, 14, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 52, 15, 0, 0, 116, 15, 0, 0, 180, 15, 0, 0, 196, 15, 0, 0, 4, 16, 0, 0, 16, 16, 0, 0, 124, 14, 0, 0,
+            124, 14, 0, 0, 80, 16, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 124, 14, 0, 0, 136, 16, 0, 0, 200, 16, 0, 0, 8, 17, 0, 0, 64, 17, 0, 0, 116, 17, 0, 0, 160, 17, 0, 0, 220, 17, 0, 0, 20, 18, 0, 0, 48, 18, 0, 0, 112, 18, 0, 0, 32, 10, 0, 0, 233, 12, 0, 0, 96, 10, 0, 0, 159, 10, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 223, 10, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 8, 11, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 72, 11, 0, 0, 160, 1, 0, 0, 110, 11, 0, 0, 169, 11, 0, 0, 233, 11, 0, 0, 41, 12, 0, 0, 41, 13, 0, 0, 105, 12, 0, 0, 105, 13, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 169, 13, 0, 0, 185, 13, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 169, 12, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 169, 7, 0, 0, 159, 3, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 177, 7, 0, 0, 194, 5, 0, 0, 159, 3, 0, 0, 191, 4, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 62, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 185, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 198, 4, 0, 0, 192, 7, 0, 0, 199, 7, 0, 0, 206, 7, 0, 0, 22, 4, 0, 0, 214, 7, 0, 0, 20, 5, 0, 0, 159, 3, 0, 0, 172, 4, 0, 0, 221, 7, 0, 0, 159, 3, 0, 0, 227, 7, 0, 0, 22, 4, 0, 0, 232, 7, 0, 0, 240, 7, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 245, 7, 0, 0, 198, 4, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 210, 6, 0, 0, 253, 7, 0, 0, 22, 4, 0, 0, 70, 5, 0, 0, 41, 5, 0, 0, 4, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 192, 7, 0, 0, 12, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 20, 8, 0, 0, 28, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 32, 8, 0, 0, 40, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 48, 8, 0, 0, 41, 5, 0, 0, 181, 7, 0, 0, 159, 3, 0, 0, 56, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 178, 5, 0, 0, 64, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 69, 8, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 76, 8, 0, 0, 84, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 87, 8, 0, 0, 41, 5, 0, 0, 95, 8, 0, 0, 99, 8, 0, 0, 107, 8, 0, 0, 159, 3, 0, 0, 114, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 121, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 129, 8, 0, 0, 135, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 141, 8, 0, 0, 149, 8, 0, 0, 159, 3, 0, 0, 153, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 72, 5, 0, 0, 22, 4, 0, 0, 185, 7, 0, 0, 161, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 164, 8, 0, 0, 172, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 180, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            186, 8, 0, 0, 159, 3, 0, 0, 192, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 228, 7, 0, 0, 159, 3, 0, 0, 198, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 206, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 224, 4, 0, 0, 204, 11, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 237, 3, 0, 0, 249, 11, 0, 0, 106, 5, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 213, 8, 0, 0,
+            221, 8, 0, 0, 227, 8, 0, 0, 159, 3, 0, 0, 233, 8, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 78, 11, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 191, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 198, 3, 0, 0, 159, 3, 0, 0, 164, 7, 0, 0, 159, 3, 0, 0, 193, 3, 0, 0, 159, 3, 0, 0, 167, 7, 0, 0, 159, 3, 0, 0,
+            241, 8, 0, 0, 70, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 237, 3, 0, 0, 249, 8, 0, 0, 237, 3, 0, 0, 0, 9, 0, 0, 7, 9, 0, 0, 1, 12, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 9, 12, 0, 0, 15, 9, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 228, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            192, 8, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 16, 8, 0, 0, 159, 3, 0, 0, 20, 9, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 28, 9, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 182, 10, 0, 0, 90, 11, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 22, 11, 0, 0, 95, 11, 0, 0, 99, 11, 0, 0, 30, 11, 0, 0, 36, 9, 0, 0, 193, 3, 0, 0, 159, 3, 0, 0, 42, 9, 0, 0, 159, 3, 0, 0, 166, 7, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 167, 6, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0,
+            182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 104, 11, 0, 0, 177, 7, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 111, 11, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 118, 11, 0, 0, 126, 11, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 46, 9, 0, 0, 93, 9, 0, 0, 96, 9, 0, 0, 104, 9, 0, 0, 156, 4, 0, 0, 110, 9, 0, 0, 118, 9, 0, 0, 159, 3, 0, 0, 126, 9, 0, 0, 133, 9, 0, 0, 141, 9, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 156, 4, 0, 0, 149, 9, 0, 0, 156, 9, 0, 0, 156, 4, 0, 0, 164, 9, 0, 0,
+            171, 9, 0, 0, 179, 9, 0, 0, 156, 4, 0, 0, 156, 4, 0, 0, 159, 3, 0, 0, 156, 4, 0, 0, 187, 9, 0, 0, 156, 4, 0, 0, 195, 9, 0, 0, 203, 9, 0, 0, 209, 9, 0, 0, 215, 9, 0, 0, 223, 9, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 156, 4, 0, 0, 156, 4, 0, 0, 231, 9, 0, 0, 159, 3, 0, 0, 156, 4, 0, 0, 239, 9, 0, 0, 156, 4, 0, 0, 247, 9, 0, 0, 73, 4, 0, 0, 158, 10, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 166, 10, 0, 0, 156, 4, 0, 0, 254, 9, 0, 0, 159, 3, 0, 0, 178, 5, 0, 0, 156, 4, 0, 0, 6, 10, 0, 0, 241, 11, 0, 0, 122, 9, 0, 0, 14, 10, 0, 0, 122, 9, 0, 0, 22, 10, 0, 0, 30, 10, 0, 0, 156, 4, 0, 0, 156, 4, 0, 0, 156, 4, 0, 0,
+            156, 4, 0, 0, 156, 4, 0, 0, 156, 4, 0, 0, 38, 10, 0, 0, 159, 3, 0, 0, 156, 4, 0, 0, 156, 4, 0, 0, 46, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 38, 12, 0, 0, 73, 4, 0, 0, 43, 12, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 136, 4, 0, 0, 51, 12, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 59, 12, 0, 0, 67, 12, 0, 0, 75, 12, 0, 0, 83, 12, 0, 0, 91, 12, 0, 0,
+            99, 12, 0, 0, 159, 3, 0, 0, 82, 11, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 90, 11, 0, 0, 182, 10, 0, 0, 134, 11, 0, 0, 182, 10, 0, 0, 142, 11, 0, 0, 147, 11, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0,
+            182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 22, 11, 0, 0, 155, 11, 0, 0, 160, 11, 0, 0, 164, 11, 0, 0, 172, 11, 0, 0, 180, 11, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 182, 10, 0, 0, 188, 11, 0, 0, 182, 10, 0, 0, 194, 10, 0, 0, 78, 10, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0,
+            159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 159, 3, 0, 0, 46, 9, 0, 0,
+            212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 237, 3, 0, 0, 220, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0,
+            212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0,
+            212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0,
+            212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 212, 11, 0, 0, 126, 3, 1, 0, 126, 3, 1, 0, 126, 3, 1, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 84, 0, 0, 0, 12, 0, 0, 0, 84, 0, 0, 0, 88, 0, 0, 0, 12, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 84, 0, 0, 0, 88, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 41, 0, 58, 0, 40, 0, 57, 0,
+            0, 0, 56, 0, 0, 0, 28, 0, 0, 0, 20, 0, 0, 0, 28, 0, 0, 0, 20, 0, 0, 0, 20, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 20, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 0, 58, 0,
+            0, 0, 56, 0, 91, 0, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 125, 0, 58, 0, 0, 0, 56, 0, 123, 0, 57, 0, 0, 0, 56, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 12, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 20, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 16, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 68, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 4, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 4, 0,
+            0, 0, 20, 0, 0, 0, 4, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 8, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 59, 15, 58, 0, 58, 15, 57, 0, 61, 15, 58, 0, 60, 15, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, 22, 58, 0, 155, 22, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 16, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 88, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 44, 0, 0, 0, 76, 0, 0, 0, 36, 0, 0, 0, 64, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, 56, 0, 126, 32, 58, 0, 125, 32, 57, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, 56, 0, 142, 32, 58, 0, 141, 32, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 42, 35, 58, 0, 41, 35, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 88, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 9, 48, 58, 0, 8, 48, 57, 0, 11, 48, 58, 0, 10, 48, 57, 0, 13, 48, 58, 0, 12, 48, 57, 0, 15, 48, 58, 0, 14, 48, 57, 0, 17, 48, 58, 0, 16, 48, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 21, 48, 58, 0, 20, 48, 57, 0, 23, 48, 58, 0, 22, 48, 57, 0, 25, 48, 58, 0, 24, 48, 57, 0, 27, 48, 58, 0, 26, 48, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 52, 0,
+            0, 0, 68, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 61, 255, 58, 0, 0, 0, 56, 0, 59, 255, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 255, 58, 0, 0, 0, 56, 0, 91, 255, 57, 0, 0, 0, 56, 0, 96, 255, 58, 0, 95, 255, 57, 0, 0, 0, 56, 0, 99, 255, 58, 0, 98, 255, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 28, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0,
+            0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0,
+            0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 9, 255, 58, 0, 8, 255, 57, 0, 0, 0, 56, 0, 0, 0, 28, 0, 0, 0, 20, 0, 0, 0, 28, 0, 0, 0, 20, 0, 0, 0, 20, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 20, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0,
+            0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 28, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 88, 0, 0, 0, 12, 0, 0, 0, 40, 0, 0, 0, 72, 0, 0, 0, 60, 0, 0, 0, 48, 0, 0, 0, 80, 0, 0, 0, 20, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0,
+            0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 20, 0, 0, 0, 56, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 20, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 90, 254, 58, 0, 89, 254, 57, 0, 92, 254, 58, 0,
+            91, 254, 57, 0, 94, 254, 58, 0, 93, 254, 57, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 8, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0,
+            0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0,
+            0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 20, 0, 70, 32, 58, 0, 69, 32, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 88, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 9, 35, 58, 0, 8, 35, 57, 0, 11, 35, 58, 0, 10, 35, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 105, 39, 58, 0, 104, 39, 57, 0, 107, 39, 58, 0, 106, 39, 57, 0, 109, 39, 58, 0, 108, 39, 57, 0, 111, 39, 58, 0, 110, 39, 57, 0, 113, 39, 58, 0, 112, 39, 57, 0, 115, 39, 58, 0, 114, 39, 57, 0, 117, 39, 58, 0, 116, 39, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 198, 39, 58, 0, 197, 39, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 231, 39, 58, 0, 230, 39, 57, 0, 233, 39, 58, 0, 232, 39, 57, 0, 235, 39, 58, 0, 234, 39, 57, 0, 237, 39, 58, 0, 236, 39, 57, 0, 239, 39, 58, 0, 238, 39, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 132, 41, 58, 0, 131, 41, 57, 0, 134, 41, 58, 0, 133, 41, 57, 0, 136, 41, 58, 0, 135, 41, 57, 0, 138, 41, 58, 0, 137, 41, 57, 0,
+            140, 41, 58, 0, 139, 41, 57, 0, 144, 41, 58, 0, 143, 41, 57, 0, 142, 41, 58, 0, 141, 41, 57, 0, 146, 41, 58, 0, 145, 41, 57, 0, 148, 41, 58, 0, 147, 41, 57, 0, 150, 41, 58, 0, 149, 41, 57, 0, 152, 41, 58, 0, 151, 41, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 217, 41, 58, 0, 216, 41, 57, 0, 219, 41, 58, 0, 218, 41, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 253, 41, 58, 0, 252, 41, 57, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 35, 46, 58, 0, 34, 46, 57, 0, 37, 46, 58, 0, 36, 46, 57, 0, 39, 46, 58, 0, 38, 46, 57, 0, 41, 46, 58, 0, 40, 46, 57, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 86, 46, 58, 0, 85, 46, 57, 0, 88, 46, 58, 0, 87, 46, 57, 0, 90, 46, 58, 0, 89, 46, 57, 0, 92, 46, 58, 0, 91, 46, 57, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0, 0, 0, 56, 0,
+            0, 0, 56, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0,
+            0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
+            0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+            0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0,
+            0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        };
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
new file mode 100644
index 0000000000..17ec9b1df2
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
@@ -0,0 +1,1718 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Implementation of Unicode bidirectional algorithm (UAX #9)
+    /// https://unicode.org/reports/tr9/
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The Bidi algorithm uses a number of memory arrays for resolved
+    /// types, level information, bracket types, x9 removal maps and
+    /// more...
+    /// </para>
+    /// <para>
+    /// This implementation of the BiDi algorithm has been designed
+    /// to reduce memory pressure on the GC by re-using the same
+    /// work buffers, so instances of this class should be re-used
+    /// as much as possible.
+    /// </para>
+    /// </remarks>
+    internal sealed class BidiAlgorithm
+    {
+        /// <summary>
+        /// The original BiDiClass classes as provided by the caller
+        /// </summary>
+        private ArraySlice<BidiClass> _originalClasses;
+
+        /// <summary>
+        /// Paired bracket types as provided by caller
+        /// </summary>
+        private ArraySlice<BidiPairedBracketType> _pairedBracketTypes;
+
+        /// <summary>
+        /// Paired bracket values as provided by caller
+        /// </summary>
+        private ArraySlice<int> _pairedBracketValues;
+
+        /// <summary>
+        /// Try if the incoming data is known to contain brackets
+        /// </summary>
+        private bool _hasBrackets;
+
+        /// <summary>
+        /// True if the incoming data is known to contain embedding runs
+        /// </summary>
+        private bool _hasEmbeddings;
+
+        /// <summary>
+        /// True if the incoming data is known to contain isolating runs
+        /// </summary>
+        private bool _hasIsolates;
+
+        /// <summary>
+        /// Two directional mapping of isolate start/end pairs
+        /// </summary>
+        /// <remarks>
+        /// The forward mapping maps the start index to the end index.
+        /// The reverse mapping maps the end index to the start index.
+        /// </remarks>
+        private readonly BidiDictionary<int, int> _isolatePairs = new BidiDictionary<int, int>();
+
+        /// <summary>
+        /// The working BiDi classes
+        /// </summary>
+        private ArraySlice<BidiClass> _workingClasses;
+
+        /// <summary>
+        /// The working classes buffer
+        /// </summary>
+        private ArrayBuilder<BidiClass> _workingClassesBuffer;
+
+        /// <summary>
+        /// A slice of the resolved levels
+        /// </summary>
+        private ArraySlice<sbyte> _resolvedLevels;
+
+        /// <summary>
+        /// The buffer underlying resolvedLevels
+        /// </summary>
+        private ArrayBuilder<sbyte> _resolvedLevelsBuffer;
+
+        /// <summary>
+        /// The resolve paragraph embedding level
+        /// </summary>
+        private sbyte _paragraphEmbeddingLevel;
+
+        /// <summary>
+        /// The status stack used during resolution of explicit
+        /// embedding and isolating runs
+        /// </summary>
+        private readonly Stack<Status> _statusStack = new Stack<Status>();
+
+        /// <summary>
+        /// Mapping used to virtually remove characters for rule X9
+        /// </summary>
+        private ArrayBuilder<int> _x9Map;
+
+        /// <summary>
+        /// Re-usable list of level runs
+        /// </summary>
+        private readonly List<LevelRun> _levelRuns = new List<LevelRun>();
+
+        /// <summary>
+        /// Mapping for the current isolating sequence, built
+        /// by joining level runs from the x9 map.
+        /// </summary>
+        private ArrayBuilder<int> _isolatedRunMapping;
+
+        /// <summary>
+        /// A stack of pending isolate openings used by FindIsolatePairs()
+        /// </summary>
+        private readonly Stack<int> _pendingIsolateOpenings = new Stack<int>();
+
+        /// <summary>
+        /// The level of the isolating run currently being processed
+        /// </summary>
+        private int _runLevel;
+
+        /// <summary>
+        /// The direction of the isolating run currently being processed
+        /// </summary>
+        private BidiClass _runDirection;
+
+        /// <summary>
+        /// The length of the isolating run currently being processed
+        /// </summary>
+        private int _runLength;
+
+        /// <summary>
+        /// A mapped slice of the resolved types for the isolating run currently
+        /// being processed
+        /// </summary>
+        private MappedArraySlice<BidiClass> _runResolvedClasses;
+
+        /// <summary>
+        /// A mapped slice of the original types for the isolating run currently
+        /// being processed
+        /// </summary>
+        private MappedArraySlice<BidiClass> _runOriginalClasses;
+
+        /// <summary>
+        /// A mapped slice of the run levels for the isolating run currently
+        /// being processed
+        /// </summary>
+        private MappedArraySlice<sbyte> _runLevels;
+
+        /// <summary>
+        /// A mapped slice of the paired bracket types of the isolating
+        /// run currently being processed
+        /// </summary>
+        private MappedArraySlice<BidiPairedBracketType> _runBiDiPairedBracketTypes;
+
+        /// <summary>
+        /// A mapped slice of the paired bracket values of the isolating
+        /// run currently being processed
+        /// </summary>
+        private MappedArraySlice<int> _runPairedBracketValues;
+
+        /// <summary>
+        /// Maximum pairing depth for paired brackets
+        /// </summary>
+        private const int MaxPairedBracketDepth = 63;
+
+        /// <summary>
+        /// Reusable list of pending opening brackets used by the
+        /// LocatePairedBrackets method
+        /// </summary>
+        private readonly List<int> _pendingOpeningBrackets = new List<int>();
+
+        /// <summary>
+        /// Resolved list of paired brackets
+        /// </summary>
+        private readonly List<BracketPair> _pairedBrackets = new List<BracketPair>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BidiAlgorithm"/> class.
+        /// </summary>
+        internal BidiAlgorithm()
+        {
+        }
+
+        /// <summary>
+        /// Gets the resolved levels.
+        /// </summary>
+        public ArraySlice<sbyte> ResolvedLevels => _resolvedLevels;
+
+        /// <summary>
+        /// Gets the resolved paragraph embedding level
+        /// </summary>
+        public int ResolvedParagraphEmbeddingLevel => _paragraphEmbeddingLevel;
+
+        /// <summary>
+        /// Process data from a BiDiData instance
+        /// </summary>
+        /// <param name="data">The BiDi Unicode data.</param>
+        public void Process(BidiData data)
+            => Process(
+                data.Classes,
+                data.PairedBracketTypes,
+                data.PairedBracketValues,
+                data.ParagraphEmbeddingLevel,
+                data.HasBrackets,
+                data.HasEmbeddings,
+                data.HasIsolates,
+                null);
+
+        /// <summary>
+        /// Processes Bidi Data
+        /// </summary>
+        public void Process(
+            ArraySlice<BidiClass> types,
+            ArraySlice<BidiPairedBracketType> pairedBracketTypes,
+            ArraySlice<int> pairedBracketValues,
+            sbyte paragraphEmbeddingLevel,
+            bool? hasBrackets,
+            bool? hasEmbeddings,
+            bool? hasIsolates,
+            ArraySlice<sbyte>? outLevels)
+        {
+            // Reset state
+            _isolatePairs.Clear();
+            _workingClassesBuffer.Clear();
+            _levelRuns.Clear();
+            _resolvedLevelsBuffer.Clear();
+
+            if (types.IsEmpty)
+            {
+                return;
+            }
+
+            // Setup original types and working types
+            _originalClasses = types;
+            _workingClasses = _workingClassesBuffer.Add(types);
+
+            // Capture paired bracket values and types
+            _pairedBracketTypes = pairedBracketTypes;
+            _pairedBracketValues = pairedBracketValues;
+
+            // Store things we know
+            _hasBrackets = hasBrackets ?? _pairedBracketTypes.Length == _originalClasses.Length;
+            _hasEmbeddings = hasEmbeddings ?? true;
+            _hasIsolates = hasIsolates ?? true;
+
+            // Find all isolate pairs
+            FindIsolatePairs();
+
+            // Resolve the paragraph embedding level
+            if (paragraphEmbeddingLevel == 2)
+            {
+                _paragraphEmbeddingLevel = ResolveEmbeddingLevel(_originalClasses);
+            }
+            else
+            {
+                _paragraphEmbeddingLevel = paragraphEmbeddingLevel;
+            }
+
+            // Create resolved levels buffer
+            if (outLevels.HasValue)
+            {
+                if (outLevels.Value.Length != _originalClasses.Length)
+                {
+                    throw new ArgumentException("Out levels must be the same length as the input data");
+                }
+
+                _resolvedLevels = outLevels.Value;
+            }
+            else
+            {
+                _resolvedLevels = _resolvedLevelsBuffer.Add(_originalClasses.Length);
+                _resolvedLevels.Fill(_paragraphEmbeddingLevel);
+            }
+
+            // Resolve explicit embedding levels (Rules X1-X8)
+            ResolveExplicitEmbeddingLevels();
+
+            // Build the rule X9 map
+            BuildX9RemovalMap();
+
+            // Process all isolated run sequences
+            ProcessIsolatedRunSequences();
+
+            // Reset whitespace levels
+            ResetWhitespaceLevels();
+
+            // Clean up
+            AssignLevelsToCodePointsRemovedByX9();
+        }
+
+        /// <summary>
+        /// Resolve the paragraph embedding level if not explicitly passed
+        /// by the caller. Also used by rule X5c for FSI isolating sequences.
+        /// </summary>
+        /// <param name="data">The data to be evaluated</param>
+        /// <returns>The resolved embedding level</returns>
+        public sbyte ResolveEmbeddingLevel(ArraySlice<BidiClass> data)
+        {
+            // P2
+            for (var i = 0; i < data.Length; ++i)
+            {
+                switch (data[i])
+                {
+                    case BidiClass.LeftToRight:
+                        // P3
+                        return 0;
+
+                    case BidiClass.ArabicLetter:
+                    case BidiClass.RightToLeft:
+                        // P3
+                        return 1;
+
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                        // Skip isolate pairs
+                        // (Because we're working with a slice, we need to adjust the indices
+                        //  we're using for the isolatePairs map)
+                        if (_isolatePairs.TryGetValue(data.Start + i, out i))
+                        {
+                            i -= data.Start;
+                        }
+                        else
+                        {
+                            i = data.Length;
+                        }
+
+                        break;
+                }
+            }
+
+            // P3
+            return 0;
+        }
+
+        /// <summary>
+        /// Build a list of matching isolates for a directionality slice
+        /// Implements BD9
+        /// </summary>
+        private void FindIsolatePairs()
+        {
+            // Redundant?
+            if (!_hasIsolates)
+            {
+                return;
+            }
+
+            // Lets double check this as we go and clear the flag
+            // if there actually aren't any isolate pairs as this might
+            // mean we can skip some later steps
+            _hasIsolates = false;
+
+            // BD9...
+            _pendingIsolateOpenings.Clear();
+            
+            for (var i = 0; i < _originalClasses.Length; i++)
+            {
+                var t = _originalClasses[i];
+
+                switch (t)
+                {
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    {
+                        _pendingIsolateOpenings.Push(i);
+                        _hasIsolates = true;
+                        break;
+                    }
+                    case BidiClass.PopDirectionalIsolate:
+                    {
+                        if (_pendingIsolateOpenings.Count > 0)
+                        {
+                            _isolatePairs.Add(_pendingIsolateOpenings.Pop(), i);
+                        }
+
+                        _hasIsolates = true;
+                        
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Resolve the explicit embedding levels from the original
+        /// data.  Implements rules X1 to X8.
+        /// </summary>
+        private void ResolveExplicitEmbeddingLevels()
+        {
+            // Redundant?
+            if (!_hasIsolates && !_hasEmbeddings)
+            {
+                return;
+            }
+
+            // Work variables
+            _statusStack.Clear();
+            var overflowIsolateCount = 0;
+            var overflowEmbeddingCount = 0;
+            var validIsolateCount = 0;
+
+            // Constants
+            const int maxStackDepth = 125;
+
+            // Rule X1 - setup initial state
+            _statusStack.Clear();
+
+            // Neutral
+            _statusStack.Push(new Status(_paragraphEmbeddingLevel, BidiClass.OtherNeutral, false));
+
+            // Process all characters
+            for (var i = 0; i < _originalClasses.Length; i++)
+            {
+                switch (_originalClasses[i])
+                {
+                    case BidiClass.RightToLeftEmbedding:
+                    {
+                        // Rule X2
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.LeftToRightEmbedding:
+                    {
+                        // Rule X3
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
+                        if (newLevel < maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.RightToLeftOverride:
+                    {
+                        // Rule X4
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.RightToLeft, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.LeftToRightOverride:
+                    {
+                        // Rule X5
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.LeftToRight, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    {
+                        // Rule X5a, X5b and X5c
+                        var resolvedIsolate = _originalClasses[i];
+
+                        if (resolvedIsolate == BidiClass.FirstStrongIsolate)
+                        {
+                            if (!_isolatePairs.TryGetValue(i, out var endOfIsolate))
+                            {
+                                endOfIsolate = _originalClasses.Length;
+                            }
+
+                            // Rule X5c
+                            if (ResolveEmbeddingLevel(_originalClasses.Slice(i + 1,endOfIsolate - (i + 1))) == 1)
+                            {
+                                resolvedIsolate = BidiClass.RightToLeftIsolate;
+                            }
+                            else
+                            {
+                                resolvedIsolate = BidiClass.LeftToRightIsolate;
+                            }
+                        }
+
+                        // Replace RLI's level with current embedding level
+                        var tos = _statusStack.Peek();
+                        _resolvedLevels[i] = tos.EmbeddingLevel;
+
+                        // Apply override
+                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
+                        {
+                            _workingClasses[i] = tos.OverrideStatus;
+                        }
+
+                        // Work out new level
+                        sbyte newLevel;
+                        if (resolvedIsolate == BidiClass.RightToLeftIsolate)
+                        {
+                            newLevel = (sbyte)((tos.EmbeddingLevel + 1) | 1);
+                        }
+                        else
+                        {
+                            newLevel = (sbyte)((tos.EmbeddingLevel + 2) & ~1);
+                        }
+
+                        // Valid?
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            validIsolateCount++;
+                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, true));
+                        }
+                        else
+                        {
+                            overflowIsolateCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.BoundaryNeutral:
+                    {
+                        // Mentioned in rule X6 - "for all types besides ..., BN, ..."
+                        // no-op
+                        break;
+                    }
+
+                    default:
+                    {
+                        // Rule X6
+                        var tos = _statusStack.Peek();
+                        _resolvedLevels[i] = tos.EmbeddingLevel;
+                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
+                        {
+                            _workingClasses[i] = tos.OverrideStatus;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.PopDirectionalIsolate:
+                    {
+                        // Rule X6a
+                        if (overflowIsolateCount > 0)
+                        {
+                            overflowIsolateCount--;
+                        }
+                        else if (validIsolateCount != 0)
+                        {
+                            overflowEmbeddingCount = 0;
+                            while (!_statusStack.Peek().IsolateStatus)
+                            {
+                                _statusStack.Pop();
+                            }
+
+                            _statusStack.Pop();
+                            validIsolateCount--;
+                        }
+
+                        var tos = _statusStack.Peek();
+                        _resolvedLevels[i] = tos.EmbeddingLevel;
+                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
+                        {
+                            _workingClasses[i] = tos.OverrideStatus;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.PopDirectionalFormat:
+                    {
+                        // Rule X7
+                        if (overflowIsolateCount == 0)
+                        {
+                            if (overflowEmbeddingCount > 0)
+                            {
+                                overflowEmbeddingCount--;
+                            }
+                            else if (!_statusStack.Peek().IsolateStatus && _statusStack.Count >= 2)
+                            {
+                                _statusStack.Pop();
+                            }
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.ParagraphSeparator:
+                    {
+                        // Rule X8
+                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Build a map to the original data positions that excludes all
+        /// the types defined by rule X9
+        /// </summary>
+        private void BuildX9RemovalMap()
+        {
+            // Reserve room for the x9 map
+            _x9Map.Length = _originalClasses.Length;
+
+            if (_hasEmbeddings || _hasIsolates)
+            {
+                // Build a map the removes all x9 characters
+                var j = 0;
+                for (var i = 0; i < _originalClasses.Length; i++)
+                {
+                    if (!IsRemovedByX9(_originalClasses[i]))
+                    {
+                        _x9Map[j++] = i;
+                    }
+                }
+
+                // Set the final length
+                _x9Map.Length = j;
+            }
+            else
+            {
+                for (int i = 0, count = _originalClasses.Length; i < count; i++)
+                {
+                    _x9Map[i] = i;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Find the original character index for an entry in the X9 map
+        /// </summary>
+        /// <param name="index">Index in the x9 removal map</param>
+        /// <returns>Index to the original data</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private int MapX9(int index) => _x9Map[index];
+
+        /// <summary>
+        /// Add a new level run
+        /// </summary>
+        /// <remarks>
+        /// This method resolves the sos and eos values for the run
+        /// and adds the run to the list
+        /// /// </remarks>
+        /// <param name="start">The index of the start of the run (in x9 removed units)</param>
+        /// <param name="length">The length of the run (in x9 removed units)</param>
+        /// <param name="level">The level of the run</param>
+        private void AddLevelRun(int start, int length, int level)
+        {
+            // Get original indices to first and last character in this run
+            var firstCharIndex = MapX9(start);
+            var lastCharIndex = MapX9(start + length - 1);
+
+            // Work out sos
+            var i = firstCharIndex - 1;
+            
+            while (i >= 0 && IsRemovedByX9(_originalClasses[i]))
+            {
+                i--;
+            }
+
+            var prevLevel = i < 0 ? _paragraphEmbeddingLevel : _resolvedLevels[i];
+            var sos = DirectionFromLevel(Math.Max(prevLevel, level));
+
+            // Work out eos
+            var lastType = _workingClasses[lastCharIndex];
+            int nextLevel;
+
+            switch (lastType)
+            {
+                case BidiClass.LeftToRightIsolate:
+                case BidiClass.RightToLeftIsolate:
+                case BidiClass.FirstStrongIsolate:
+                {
+                    nextLevel = _paragraphEmbeddingLevel;
+                    
+                    break;
+                }
+                default:
+                {
+                    i = lastCharIndex + 1;
+                    while (i < _originalClasses.Length && IsRemovedByX9(_originalClasses[i]))
+                    {
+                        i++;
+                    }
+
+                    nextLevel = i >= _originalClasses.Length ? _paragraphEmbeddingLevel : _resolvedLevels[i];
+                    
+                    break;
+                }
+            }
+
+            var eos = DirectionFromLevel(Math.Max(nextLevel, level));
+
+            // Add the run
+            _levelRuns.Add(new LevelRun(start, length, level, sos, eos));
+        }
+
+        /// <summary>
+        /// Find all runs of the same level, populating the _levelRuns
+        /// collection
+        /// </summary>
+        private void FindLevelRuns()
+        {
+            var currentLevel = -1;
+            var runStart = 0;
+            
+            for (var i = 0; i < _x9Map.Length; ++i)
+            {
+                int level = _resolvedLevels[MapX9(i)];
+
+                if (level == currentLevel)
+                {
+                    continue;
+                }
+
+                if (currentLevel != -1)
+                {
+                    AddLevelRun(runStart, i - runStart, currentLevel);
+                }
+
+                currentLevel = level;
+                runStart = i;
+            }
+
+            // Don't forget the final level run
+            if (currentLevel != -1)
+            {
+                AddLevelRun(runStart, _x9Map.Length - runStart, currentLevel);
+            }
+        }
+
+        /// <summary>
+        /// Given a character index, find the level run that starts at that position
+        /// </summary>
+        /// <param name="index">The index into the original (unmapped) data</param>
+        /// <returns>The index of the run that starts at that index</returns>
+        private int FindRunForIndex(int index)
+        {
+            for (var i = 0; i < _levelRuns.Count; i++)
+            {
+                // Passed index is for the original non-x9 filtered data, however
+                // the level run ranges are for the x9 filtered data.  Convert before
+                // comparing
+                if (MapX9(_levelRuns[i].Start) == index)
+                {
+                    return i;
+                }
+            }
+
+            throw new InvalidOperationException("Internal error");
+        }
+
+        /// <summary>
+        /// Determine and the process all isolated run sequences
+        /// </summary>
+        private void ProcessIsolatedRunSequences()
+        {
+            // Find all runs with the same level
+            FindLevelRuns();
+
+            // Process them one at a time by first building
+            // a mapping using slices from the x9 map for each
+            // run section that needs to be joined together to
+            // form an complete run.  That full run mapping
+            // will be placed in _isolatedRunMapping and then
+            // processed by ProcessIsolatedRunSequence().
+            while (_levelRuns.Count > 0)
+            {
+                // Clear the mapping
+                _isolatedRunMapping.Clear();
+
+                // Combine mappings from this run and all runs that continue on from it
+                var runIndex = 0;
+                BidiClass eos;
+                var sos = _levelRuns[0].Sos;
+                var level = _levelRuns[0].Level;
+                
+                while (true)
+                {
+                    // Get the run
+                    var r = _levelRuns[runIndex];
+
+                    // The eos of the isolating run is the eos of the
+                    // last level run that comprises it.
+                    eos = r.Eos;
+
+                    // Remove this run as we've now processed it
+                    _levelRuns.RemoveAt(runIndex);
+
+                    // Add the x9 map indices for the run range to the mapping
+                    // for this isolated run
+                    _isolatedRunMapping.Add(_x9Map.AsSlice(r.Start, r.Length));
+
+                    // Get the last character and see if it's an isolating run with a matching
+                    // PDI and concatenate that run to this one
+                    var lastCharacterIndex = _isolatedRunMapping[_isolatedRunMapping.Length - 1];
+                    var lastType = _originalClasses[lastCharacterIndex];
+                    if ((lastType == BidiClass.LeftToRightIsolate || lastType == BidiClass.RightToLeftIsolate || lastType == BidiClass.FirstStrongIsolate) &&
+                            _isolatePairs.TryGetValue(lastCharacterIndex, out var nextRunIndex))
+                    {
+                        // Find the continuing run index
+                        runIndex = FindRunForIndex(nextRunIndex);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                // Process this isolated run
+                ProcessIsolatedRunSequence(sos, eos, level);
+            }
+        }
+
+        /// <summary>
+        /// Process a single isolated run sequence, where the character sequence
+        /// mapping is currently held in _isolatedRunMapping.
+        /// </summary>
+        private void ProcessIsolatedRunSequence(BidiClass sos, BidiClass eos, int runLevel)
+        {
+            // Create mappings onto the underlying data
+            _runResolvedClasses = new MappedArraySlice<BidiClass>(_workingClasses, _isolatedRunMapping.AsSlice());
+            _runOriginalClasses = new MappedArraySlice<BidiClass>(_originalClasses, _isolatedRunMapping.AsSlice());
+            _runLevels = new MappedArraySlice<sbyte>(_resolvedLevels, _isolatedRunMapping.AsSlice());
+            if (_hasBrackets)
+            {
+                _runBiDiPairedBracketTypes = new MappedArraySlice<BidiPairedBracketType>(_pairedBracketTypes, _isolatedRunMapping.AsSlice());
+                _runPairedBracketValues = new MappedArraySlice<int>(_pairedBracketValues, _isolatedRunMapping.AsSlice());
+            }
+
+            _runLevel = runLevel;
+            _runDirection = DirectionFromLevel(runLevel);
+            _runLength = _runResolvedClasses.Length;
+
+            // By tracking the types of characters known to be in the current run, we can
+            // skip some of the rules that we know won't apply.  The flags will be
+            // initialized while we're processing rule W1 below.
+            var hasEN = false;
+            var hasAL = false;
+            var hasES = false;
+            var hasCS = false;
+            var hasAN = false;
+            var hasET = false;
+
+            // Rule W1
+            // Also, set hasXX flags
+            int i;
+            var previousClass = sos;
+            
+            for (i = 0; i < _runLength; i++)
+            {
+                var resolvedClass = _runResolvedClasses[i];
+                
+                switch (resolvedClass)
+                {
+                    case BidiClass.NonspacingMark:
+                        _runResolvedClasses[i] = previousClass;
+                        break;
+
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                        previousClass = BidiClass.OtherNeutral;
+                        break;
+
+                    case BidiClass.EuropeanNumber:
+                        hasEN = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.ArabicLetter:
+                        hasAL = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.EuropeanSeparator:
+                        hasES = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.CommonSeparator:
+                        hasCS = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.ArabicNumber:
+                        hasAN = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.EuropeanTerminator:
+                        hasET = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    default:
+                        previousClass = resolvedClass;
+                        break;
+                }
+            }
+
+            // Rule W2
+            if (hasEN)
+            {
+                for (i = 0; i < _runLength; i++)
+                {
+                    if (_runResolvedClasses[i] != BidiClass.EuropeanNumber)
+                    {
+                        continue;
+                    }
+
+                    for (var j = i - 1; j >= 0; j--)
+                    {
+                        var resolvedClass = _runResolvedClasses[j];
+
+                        switch (resolvedClass)
+                        {
+                            case BidiClass.LeftToRight:
+                            case BidiClass.RightToLeft:
+                            case BidiClass.ArabicLetter:
+                            {
+                                if (resolvedClass == BidiClass.ArabicLetter)
+                                {
+                                    _runResolvedClasses[i] = BidiClass.ArabicNumber;
+                                    hasAN = true;
+                                }
+
+                                j = -1;
+                                    
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Rule W3
+            if (hasAL)
+            {
+                for (i = 0; i < _runLength; i++)
+                {
+                    if (_runResolvedClasses[i] == BidiClass.ArabicLetter)
+                    {
+                        _runResolvedClasses[i] = BidiClass.RightToLeft;
+                    }
+                }
+            }
+
+            // Rule W4
+            if ((hasES || hasCS) && (hasEN || hasAN))
+            {
+                for (i = 1; i < _runLength - 1; ++i)
+                {
+                    ref var resolvedClass = ref _runResolvedClasses[i];
+                    
+                    if (resolvedClass == BidiClass.EuropeanSeparator)
+                    {
+                        var previousSeparatorClass = _runResolvedClasses[i - 1];
+                        var nextSeparatorClass = _runResolvedClasses[i + 1];
+
+                        if (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber)
+                        {
+                            // ES between EN and EN
+                            resolvedClass = BidiClass.EuropeanNumber;
+                        }
+                    }
+                    else if (resolvedClass == BidiClass.CommonSeparator)
+                    {
+                        var previousSeparatorClass = _runResolvedClasses[i - 1];
+                        var nextSeparatorClass = _runResolvedClasses[i + 1];
+
+                        if ((previousSeparatorClass == BidiClass.ArabicNumber && nextSeparatorClass == BidiClass.ArabicNumber) ||
+                             (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber))
+                        {
+                            // CS between (AN and AN) or (EN and EN)
+                            resolvedClass = previousSeparatorClass;
+                        }
+                    }
+                }
+            }
+
+            // Rule W5
+            if (hasET && hasEN)
+            {
+                for (i = 0; i < _runLength; ++i)
+                {
+                    if (_runResolvedClasses[i] != BidiClass.EuropeanTerminator)
+                    {
+                        continue;
+                    }
+                    
+                    // Locate end of sequence
+                    var sequenceStart = i;
+                    var sequenceEnd = i;
+                    
+                    while (sequenceEnd < _runLength && _runResolvedClasses[sequenceEnd] == BidiClass.EuropeanTerminator)
+                    {
+                        sequenceEnd++;
+                    }
+
+                    // Preceded by, or followed by EN?
+                    if ((sequenceStart == 0 ? sos : _runResolvedClasses[sequenceStart - 1]) == BidiClass.EuropeanNumber
+                        || (sequenceEnd == _runLength ? eos : _runResolvedClasses[sequenceEnd]) == BidiClass.EuropeanNumber)
+                    {
+                        // Change the entire range
+                        for (var j = sequenceStart; i < sequenceEnd; ++i)
+                        {
+                            _runResolvedClasses[i] = BidiClass.EuropeanNumber;
+                        }
+                    }
+
+                    // continue at end of sequence
+                    i = sequenceEnd;
+                }
+            }
+
+            // Rule W6
+            if (hasES || hasET || hasCS)
+            {
+                for (i = 0; i < _runLength; ++i)
+                {
+                    ref var resolvedClass = ref _runResolvedClasses[i];
+
+                    switch (resolvedClass)
+                    {
+                        case BidiClass.EuropeanSeparator:
+                        case BidiClass.EuropeanTerminator:
+                        case BidiClass.CommonSeparator:
+                        {
+                            resolvedClass = BidiClass.OtherNeutral;
+                            
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Rule W7.
+            if (hasEN)
+            {
+                var previousStrongClass = sos;
+                
+                for (i = 0; i < _runLength; ++i)
+                {
+                    ref var resolvedClass = ref _runResolvedClasses[i];
+
+                    switch (resolvedClass)
+                    {
+                        case BidiClass.EuropeanNumber:
+                        {
+                            // If prev strong type was an L change this to L too
+                            if (previousStrongClass == BidiClass.LeftToRight)
+                            {
+                                _runResolvedClasses[i] = BidiClass.LeftToRight;
+                            }
+                            
+                            break;
+                        }
+                       
+                        case BidiClass.LeftToRight:
+                        case BidiClass.RightToLeft:
+                        {
+                            // Remember previous strong type (NB: AL should already be changed to R)
+                            previousStrongClass = resolvedClass;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Rule N0 - process bracket pairs
+            if (_hasBrackets)
+            {
+                int count;
+                var pairedBrackets = LocatePairedBrackets();
+                
+                for (i = 0, count = pairedBrackets.Count; i < count; i++)
+                {
+                    var pairedBracket = pairedBrackets[i];
+                    
+                    var strongDirection = InspectPairedBracket(pairedBracket);
+
+                    // Case "d" - no strong types in the brackets, ignore
+                    if (strongDirection == BidiClass.OtherNeutral)
+                    {
+                        continue;
+                    }
+
+                    // Case "b" - strong type found that matches the embedding direction
+                    if ((strongDirection == BidiClass.LeftToRight || strongDirection == BidiClass.RightToLeft) && strongDirection == _runDirection)
+                    {
+                        SetPairedBracketDirection(pairedBracket, strongDirection);
+                        continue;
+                    }
+
+                    // Case "c" - found opposite strong type found, look before to establish context
+                    strongDirection = InspectBeforePairedBracket(pairedBracket, sos);
+                    
+                    if (strongDirection == _runDirection || strongDirection == BidiClass.OtherNeutral)
+                    {
+                        strongDirection = _runDirection;
+                    }
+
+                    SetPairedBracketDirection(pairedBracket, strongDirection);
+                }
+            }
+
+            // Rules N1 and N2 - resolve neutral types
+            for (i = 0; i < _runLength; ++i)
+            {
+                var resolvedClass = _runResolvedClasses[i];
+                
+                if (IsNeutralClass(resolvedClass))
+                {
+                    // Locate end of sequence
+                    var seqStart = i;
+                    var seqEnd = i;
+                    
+                    while (seqEnd < _runLength && IsNeutralClass(_runResolvedClasses[seqEnd]))
+                    {
+                        seqEnd++;
+                    }
+
+                    // Work out the preceding class
+                    BidiClass classBefore;
+                    
+                    if (seqStart == 0)
+                    {
+                        classBefore = sos;
+                    }
+                    else
+                    {
+                        classBefore = _runResolvedClasses[seqStart - 1];
+                        
+                        switch (classBefore)
+                        {
+                            case BidiClass.ArabicNumber:
+                            case BidiClass.EuropeanNumber:
+                            {
+                                classBefore = BidiClass.RightToLeft;
+                                
+                                break;
+                            }
+                        }
+                    }
+
+                    // Work out the following class
+                    BidiClass classAfter;
+                    
+                    if (seqEnd == _runLength)
+                    {
+                        classAfter = eos;
+                    }
+                    else
+                    {
+                        classAfter = _runResolvedClasses[seqEnd];
+
+                        switch (classAfter)
+                        {
+                            case BidiClass.ArabicNumber:
+                            case BidiClass.EuropeanNumber:
+                            {
+                                classAfter = BidiClass.RightToLeft;
+                                
+                                break;
+                            }
+                        }
+                    }
+
+                    // Work out the final resolved type
+                    BidiClass finalResolveClass;
+                    
+                    if (classBefore == classAfter)
+                    {
+                        // Rule N1
+                        finalResolveClass = classBefore;
+                    }
+                    else
+                    {
+                        // Rule N2
+                        finalResolveClass = _runDirection;
+                    }
+
+                    // Apply changes
+                    for (var j = seqStart; j < seqEnd; j++)
+                    {
+                        _runResolvedClasses[j] = finalResolveClass;
+                    }
+
+                    // continue after this run
+                    i = seqEnd;
+                }
+            }
+
+            // Rules I1 and I2 - resolve implicit types
+            if ((_runLevel & 0x01) == 0)
+            {
+                // Rule I1 - even
+                for (i = 0; i < _runLength; i++)
+                {
+                    var resolvedClass = _runResolvedClasses[i];
+                    ref var currentRunLevel = ref _runLevels[i];
+
+                    switch (resolvedClass)
+                    {
+                        case BidiClass.RightToLeft:
+                        {
+                            currentRunLevel++;
+                            break;
+                        }
+                        case BidiClass.ArabicNumber:
+                        case BidiClass.EuropeanNumber:
+                        {
+                            currentRunLevel += 2;
+                            
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Rule I2 - odd
+                for (i = 0; i < _runLength; i++)
+                {
+                    var resolvedClass = _runResolvedClasses[i];
+                    ref var currentRunLevel = ref _runLevels[i];
+                    
+                    if (resolvedClass != BidiClass.RightToLeft)
+                    {
+                        currentRunLevel++;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Locate all pair brackets in the current isolating run
+        /// </summary>
+        /// <returns>A sorted list of BracketPairs</returns>
+        private List<BracketPair> LocatePairedBrackets()
+        {
+            // Clear work collections
+            _pendingOpeningBrackets.Clear();
+            _pairedBrackets.Clear();
+
+            // Since List.Sort is expensive on memory if called often (it internally
+            // allocates an ArraySorted object) and since we will rarely have many
+            // items in this list (most paragraphs will only have a handful of bracket
+            // pairs - if that), we use a simple linear lookup and insert most of the
+            // time.  If there are more that `sortLimit` paired brackets we abort th
+            // linear searching/inserting and using List.Sort at the end.
+            const int sortLimit = 8;
+
+            // Process all characters in the run, looking for paired brackets
+            for (int i = 0, length = _runLength; i < length; i++)
+            {
+                // Ignore non-neutral characters
+                if (_runResolvedClasses[i] != BidiClass.OtherNeutral)
+                {
+                    continue;
+                }
+
+                switch (_runBiDiPairedBracketTypes[i])
+                {
+                    case BidiPairedBracketType.Open:
+                        if (_pendingOpeningBrackets.Count == MaxPairedBracketDepth)
+                        {
+                            goto exit;
+                        }
+
+                        _pendingOpeningBrackets.Insert(0, i);
+                        break;
+
+                    case BidiPairedBracketType.Close:
+                        // see if there is a match
+                        for (var j = 0; j < _pendingOpeningBrackets.Count; j++)
+                        {
+                            if (_runPairedBracketValues[i] != _runPairedBracketValues[_pendingOpeningBrackets[j]])
+                            {
+                                continue;
+                            }
+                            
+                            // Add this paired bracket set
+                            var opener = _pendingOpeningBrackets[j];
+                            
+                            if (_pairedBrackets.Count < sortLimit)
+                            {
+                                var ppi = 0;
+                                while (ppi < _pairedBrackets.Count && _pairedBrackets[ppi].OpeningIndex < opener)
+                                {
+                                    ppi++;
+                                }
+
+                                _pairedBrackets.Insert(ppi, new BracketPair(opener, i));
+                            }
+                            else
+                            {
+                                _pairedBrackets.Add(new BracketPair(opener, i));
+                            }
+
+                            // remove up to and including matched opener
+                            _pendingOpeningBrackets.RemoveRange(0, j + 1);
+                            break;
+                        }
+
+                        break;
+                }
+            }
+
+            exit:
+
+            // Is a sort pending?
+            if (_pairedBrackets.Count > sortLimit)
+            {
+                _pairedBrackets.Sort();
+            }
+
+            return _pairedBrackets;
+        }
+
+        /// <summary>
+        /// Inspect a paired bracket set and determine its strong direction
+        /// </summary>
+        /// <param name="bracketPair">The paired bracket to be inspected</param>
+        /// <returns>The direction of the bracket set content</returns>
+        private BidiClass InspectPairedBracket(in BracketPair bracketPair)
+        {
+            var directionFromLevel = DirectionFromLevel(_runLevel);
+            var directionOpposite = BidiClass.OtherNeutral;
+            
+            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
+            {
+                var dir = GetStrongClassN0(_runResolvedClasses[i]);
+                
+                if (dir == BidiClass.OtherNeutral)
+                {
+                    continue;
+                }
+
+                if (dir == directionFromLevel)
+                {
+                    return dir;
+                }
+
+                directionOpposite = dir;
+            }
+
+            return directionOpposite;
+        }
+
+        /// <summary>
+        /// Look for a strong type before a paired bracket
+        /// </summary>
+        /// <param name="bracketPair">The paired bracket set to be inspected</param>
+        /// <param name="sos">The sos in case nothing found before the bracket</param>
+        /// <returns>The strong direction before the brackets</returns>
+        private BidiClass InspectBeforePairedBracket(in BracketPair bracketPair, BidiClass sos)
+        {
+            for (var i = bracketPair.OpeningIndex - 1; i >= 0; --i)
+            {
+                var direction = GetStrongClassN0(_runResolvedClasses[i]);
+                
+                if (direction != BidiClass.OtherNeutral)
+                {
+                    return direction;
+                }
+            }
+
+            return sos;
+        }
+
+        /// <summary>
+        /// Sets the direction of a bracket pair, including setting the direction of
+        /// NSM's inside the brackets and following.
+        /// </summary>
+        /// <param name="pairedBracket">The paired brackets</param>
+        /// <param name="direction">The resolved direction for the bracket pair</param>
+        private void SetPairedBracketDirection(in BracketPair pairedBracket, BidiClass direction)
+        {
+            // Set the direction of the brackets
+            _runResolvedClasses[pairedBracket.OpeningIndex] = direction;
+            _runResolvedClasses[pairedBracket.ClosingIndex] = direction;
+
+            // Set the directionality of NSM's inside the brackets
+            // BN  characters (such as ZWJ or ZWSP) that appear between the base bracket character
+            // and the nonspacing mark should be ignored.
+            for (int i = pairedBracket.OpeningIndex + 1; i < pairedBracket.ClosingIndex; i++)
+            {
+                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
+                {
+                    _runOriginalClasses[i] = direction;
+                }
+                else if (_runOriginalClasses[i] != BidiClass.BoundaryNeutral)
+                {
+                    break;
+                }
+            }
+
+            // Set the directionality of NSM's following the brackets
+            for (int i = pairedBracket.ClosingIndex + 1; i < _runLength; i++)
+            {
+                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
+                {
+                    _runOriginalClasses[i] = direction;
+                }
+                else if (_runOriginalClasses[i] != BidiClass.BoundaryNeutral)
+                {
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Resets whitespace levels. Implements rule L1
+        /// </summary>
+        private void ResetWhitespaceLevels()
+        {
+            for (var i = 0; i < _resolvedLevels.Length; i++)
+            {
+                var originalClass = _originalClasses[i];
+
+                switch (originalClass)
+                {
+                    case BidiClass.ParagraphSeparator:
+                    case BidiClass.SegmentSeparator:
+                    {
+                        // Rule L1, clauses one and two.
+                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
+
+                        // Rule L1, clause three.
+                        for (var j = i - 1; j >= 0; --j)
+                        {
+                            if (IsWhitespace(_originalClasses[j]))
+                            {
+                                // including format codes
+                                _resolvedLevels[j] = _paragraphEmbeddingLevel;
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        
+                        break;
+                    }
+                }
+            }
+
+            // Rule L1, clause four.
+            for (var j = _resolvedLevels.Length - 1; j >= 0; j--)
+            {
+                if (IsWhitespace(_originalClasses[j]))
+                { // including format codes
+                    _resolvedLevels[j] = _paragraphEmbeddingLevel;
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Assign levels to any characters that would be have been
+        /// removed by rule X9.  The idea is to keep level runs together
+        /// that would otherwise be broken by an interfering isolate/embedding
+        /// control character.
+        /// </summary>
+        private void AssignLevelsToCodePointsRemovedByX9()
+        {
+            // Redundant?
+            if (!_hasIsolates && !_hasEmbeddings)
+            {
+                return;
+            }
+
+            // No-op?
+            if (_workingClasses.Length == 0)
+            {
+                return;
+            }
+
+            // Fix up first character
+            if (_resolvedLevels[0] < 0)
+            {
+                _resolvedLevels[0] = _paragraphEmbeddingLevel;
+            }
+
+            if (IsRemovedByX9(_originalClasses[0]))
+            {
+                _workingClasses[0] = _originalClasses[0];
+            }
+
+            for (int i = 1, length = _workingClasses.Length; i < length; i++)
+            {
+                var originalClass = _originalClasses[i];
+                
+                if (IsRemovedByX9(originalClass))
+                {
+                    _workingClasses[i] = originalClass;
+                    _resolvedLevels[i] = _resolvedLevels[i - 1];
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check if a directionality type represents whitespace
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsWhitespace(BidiClass biDiClass)
+        {
+            switch (biDiClass)
+            {
+                    case BidiClass.LeftToRightEmbedding:
+                    case BidiClass.RightToLeftEmbedding:
+                    case BidiClass.LeftToRightOverride:
+                    case BidiClass.RightToLeftOverride:
+                    case BidiClass.PopDirectionalFormat:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                    case BidiClass.BoundaryNeutral:
+                    case BidiClass.WhiteSpace:
+                        return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Convert a level to a direction where odd is RTL and
+        /// even is LTR
+        /// </summary>
+        /// <param name="level">The level to convert</param>
+        /// <returns>A directionality</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static BidiClass DirectionFromLevel(int level)
+            => ((level & 0x1) == 0) ? BidiClass.LeftToRight : BidiClass.RightToLeft;
+
+        /// <summary>
+        /// Helper to check if a directionality is removed by rule X9
+        /// </summary>
+        /// <param name="biDiClass">The bidi type to check</param>
+        /// <returns>True if rule X9 would remove this character; otherwise false</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsRemovedByX9(BidiClass biDiClass)
+        {
+            switch (biDiClass)
+            {
+                    case BidiClass.LeftToRightEmbedding:
+                    case  BidiClass.RightToLeftEmbedding:
+                    case  BidiClass.LeftToRightOverride:
+                    case  BidiClass.RightToLeftOverride:
+                    case  BidiClass.PopDirectionalFormat:
+                    case  BidiClass.BoundaryNeutral:
+                        return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Check if a a directionality is neutral for rules N1 and N2
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsNeutralClass(BidiClass direction)
+        {
+            switch (direction)
+            {
+                    case BidiClass.ParagraphSeparator:
+                    case BidiClass.SegmentSeparator:
+                    case BidiClass.WhiteSpace:
+                    case BidiClass.OtherNeutral:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                        return true;
+                        default:
+                            return false;
+            }
+        }
+
+        /// <summary>
+        /// Maps a direction to a strong class for rule N0
+        /// </summary>
+        /// <param name="direction">The direction to map</param>
+        /// <returns>A strong direction - R, L or ON</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static BidiClass GetStrongClassN0(BidiClass direction)
+        {
+            switch (direction)
+            {
+                    case BidiClass.EuropeanNumber:
+                    case BidiClass.ArabicNumber:
+                    case BidiClass.ArabicLetter:
+                    case BidiClass.RightToLeft:
+                        return BidiClass.RightToLeft;
+                    case BidiClass.LeftToRight:
+                        return BidiClass.LeftToRight;
+                    default:
+                        return BidiClass.OtherNeutral;
+            }
+        }
+
+        /// <summary>
+        /// Hold the start and end index of a pair of brackets
+        /// </summary>
+        private readonly struct BracketPair : IComparable<BracketPair>
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="BracketPair"/> struct.
+            /// </summary>
+            /// <param name="openingIndex">Index of the opening bracket</param>
+            /// <param name="closingIndex">Index of the closing bracket</param>
+            public BracketPair(int openingIndex, int closingIndex)
+            {
+                OpeningIndex = openingIndex;
+                ClosingIndex = closingIndex;
+            }
+
+            /// <summary>
+            /// Gets the index of the opening bracket
+            /// </summary>
+            public int OpeningIndex { get; }
+
+            /// <summary>
+            /// Gets the index of the closing bracket
+            /// </summary>
+            public int ClosingIndex { get; }
+
+            public int CompareTo(BracketPair other)
+                => OpeningIndex.CompareTo(other.OpeningIndex);
+        }
+
+        /// <summary>
+        /// Status stack entry used while resolving explicit
+        /// embedding levels
+        /// </summary>
+        private readonly struct Status
+        {
+            public Status(sbyte embeddingLevel, BidiClass overrideStatus, bool isolateStatus)
+            {
+                EmbeddingLevel = embeddingLevel;
+                OverrideStatus = overrideStatus;
+                IsolateStatus = isolateStatus;
+            }
+
+            public sbyte EmbeddingLevel { get; }
+
+            public BidiClass OverrideStatus { get; }
+
+            public bool IsolateStatus { get; }
+        }
+
+        /// <summary>
+        /// Provides information about a level run - a continuous
+        /// sequence of equal levels.
+        /// </summary>
+        private readonly struct LevelRun
+        {
+            public LevelRun(int start, int length, int level, BidiClass sos, BidiClass eos)
+            {
+                Start = start;
+                Length = length;
+                Level = level;
+                Sos = sos;
+                Eos = eos;
+            }
+
+            public int Start { get; }
+
+            public int Length { get; }
+
+            public int Level { get; }
+
+            public BidiClass Sos { get; }
+
+            public BidiClass Eos { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiClass.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiClass.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiClass.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiClass.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
new file mode 100644
index 0000000000..72df2815a9
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
@@ -0,0 +1,184 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/
+
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Represents a unicode string and all associated attributes
+    /// for each character required for the bidirectional Unicode algorithm
+    /// </summary>
+    internal class BidiData
+    {
+        private ArrayBuilder<BidiClass> _classes;
+        private ArrayBuilder<BidiPairedBracketType> _pairedBracketTypes;
+        private ArrayBuilder<int> _pairedBracketValues;
+        private ArrayBuilder<BidiClass> _savedClasses;
+        private ArrayBuilder<BidiPairedBracketType> _savedPairedBracketTypes;
+        private ArrayBuilder<sbyte> _tempLevelBuffer;
+
+        public BidiData(sbyte paragraphEmbeddingLevel)
+        {
+            ParagraphEmbeddingLevel = paragraphEmbeddingLevel;
+        }
+
+        public sbyte ParagraphEmbeddingLevel { get; private set; }
+
+        public bool HasBrackets { get; private set; }
+
+        public bool HasEmbeddings { get; private set; }
+
+        public bool HasIsolates { get; private set; }
+
+        /// <summary>
+        /// Gets the length of the data held by the BidiData
+        /// </summary>
+        public int Length{get; private set; }
+
+        /// <summary>
+        /// Gets the bidi character type of each code point
+        /// </summary>
+        public ArraySlice<BidiClass> Classes { get; private set; }
+
+        /// <summary>
+        /// Gets the paired bracket type for each code point
+        /// </summary>
+        public ArraySlice<BidiPairedBracketType> PairedBracketTypes { get; private set; }
+
+        /// <summary>
+        /// Gets the paired bracket value for code point
+        /// </summary>
+        /// <remarks>
+        /// The paired bracket values are the code points
+        /// of each character where the opening code point
+        /// is replaced with the closing code point for easier
+        /// matching.  Also, bracket code points are mapped
+        /// to their canonical equivalents
+        /// </remarks>
+        public ArraySlice<int> PairedBracketValues { get; private set; }
+
+        /// <summary>
+        /// Appends text to the bidi data.
+        /// </summary>
+        /// <param name="text">The text to process.</param>
+        public void Append(ReadOnlySlice<char> text)
+        {
+            _classes.Add(text.Length);
+            _pairedBracketTypes.Add(text.Length);
+            _pairedBracketValues.Add(text.Length);
+
+            // Resolve the BidiCharacterType, paired bracket type and paired
+            // bracket values for all code points
+
+            int i = Length;
+             
+            var codePointEnumerator = new CodepointEnumerator(text);
+            
+            while (codePointEnumerator.MoveNext())
+            {
+                var codepoint = codePointEnumerator.Current;
+
+                // Look up BiDiClass
+                var dir = codepoint.BiDiClass;
+                
+                _classes[i] = dir;
+
+                switch (dir)
+                {
+                    case BidiClass.LeftToRightEmbedding:
+                    case BidiClass.LeftToRightOverride:
+                    case BidiClass.RightToLeftEmbedding:
+                    case BidiClass.RightToLeftOverride:
+                    case BidiClass.PopDirectionalFormat:
+                    {
+                        HasEmbeddings = true;
+                        break;
+                    }
+
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                    {
+                        HasIsolates = true;
+                        break;
+                    }
+                }
+
+                // Lookup paired bracket types
+                var pbt = codepoint.PairedBracketType;
+                
+                _pairedBracketTypes[i] = pbt;
+
+                if (pbt == BidiPairedBracketType.Open)
+                {
+                    // Opening bracket types can never have a null pairing.
+                    codepoint.TryGetPairedBracket(out var paired);
+                    
+                    _pairedBracketValues[i] = (int)Codepoint.GetCanonicalType(paired).Value;
+
+                    HasBrackets = true;
+                }
+                else if (pbt == BidiPairedBracketType.Close)
+                {
+                    _pairedBracketValues[i] = (int)Codepoint.GetCanonicalType(codepoint).Value;
+                    
+                    HasBrackets = true;
+                }
+
+                i++;
+            }
+
+            Length = i;
+            
+            Classes = _classes.AsSlice(0, Length);
+            PairedBracketTypes = _pairedBracketTypes.AsSlice(0, Length);
+            PairedBracketValues = _pairedBracketValues.AsSlice(0, Length);
+        }
+
+        /// <summary>
+        /// Save the Types and PairedBracketTypes of this BiDiData
+        /// </summary>
+        /// <remarks>
+        /// This is used when processing embedded style runs with
+        /// BiDiClass overrides. Text layout process saves the data,
+        /// overrides the style runs to neutral, processes the bidi
+        /// data for the entire paragraph and then restores this data
+        /// before processing the embedded runs.
+        /// </remarks>
+        public void SaveTypes()
+        {
+            // Capture the types data
+            _savedClasses.Clear();
+            _savedClasses.Add(_classes.AsSlice());
+            _savedPairedBracketTypes.Clear();
+            _savedPairedBracketTypes.Add(_pairedBracketTypes.AsSlice());
+        }
+
+        /// <summary>
+        /// Restore the data saved by SaveTypes
+        /// </summary>
+        public void RestoreTypes()
+        {
+            _classes.Clear();
+            _classes.Add(_savedClasses.AsSlice());
+            _pairedBracketTypes.Clear();
+            _pairedBracketTypes.Add(_savedPairedBracketTypes.AsSlice());
+        }
+
+        /// <summary>
+        /// Gets a temporary level buffer. Used by the text layout process when
+        /// resolving style runs with different BiDiClass.
+        /// </summary>
+        /// <param name="length">Length of the required ExpandableBuffer</param>
+        /// <returns>An uninitialized level ExpandableBuffer</returns>
+        public ArraySlice<sbyte> GetTempLevelBuffer(int length)
+        {
+            _tempLevelBuffer.Clear();
+            
+            return _tempLevelBuffer.Add(length, false);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
new file mode 100644
index 0000000000..ccbceb6a7b
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
@@ -0,0 +1,72 @@
+// RichTextKit
+// Copyright © 2019 Topten Software. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may 
+// not use this product except in compliance with the License. You may obtain 
+// a copy of the License at
+// 
+// https://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+// License for the specific language governing permissions and limitations 
+// under the License.
+// Copied from: https://github.com/toptensoftware/RichTextKit
+
+using System;
+using System.IO;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal static class BinaryReaderExtensions
+    {
+        public static int ReadInt32BE(this BinaryReader reader)
+        {
+            var bytes = reader.ReadBytes(4);
+
+            if (BitConverter.IsLittleEndian)
+            {
+                Array.Reverse(bytes);
+            }
+
+            return BitConverter.ToInt32(bytes, 0);
+        }
+
+        public static uint ReadUInt32BE(this BinaryReader reader)
+        {
+            var bytes = reader.ReadBytes(4);
+
+            if (BitConverter.IsLittleEndian)
+            {
+                Array.Reverse(bytes);
+            }
+
+            return BitConverter.ToUInt32(bytes, 0);
+        }
+
+        public static void WriteBE(this BinaryWriter writer, int value)
+        {
+            var bytes = BitConverter.GetBytes(value);
+
+            if (BitConverter.IsLittleEndian)
+            {
+                Array.Reverse(bytes);
+            }
+
+            writer.Write(bytes);
+        }
+
+        public static void WriteBE(this BinaryWriter writer, uint value)
+        {
+            var bytes = BitConverter.GetBytes(value);
+
+            if (BitConverter.IsLittleEndian)
+            {
+                Array.Reverse(bytes);
+            }
+
+            writer.Write(bytes);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
new file mode 100644
index 0000000000..de40839853
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
@@ -0,0 +1,235 @@
+using System;
+using System.Runtime.CompilerServices;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public readonly struct Codepoint
+    {
+        private readonly uint _value;
+
+        /// <summary>
+        /// The replacement codepoint that is used for non supported values.
+        /// </summary>
+        public static readonly Codepoint ReplacementCodepoint = new Codepoint('\uFFFD');
+
+        public Codepoint(uint value)
+        {
+            _value = value;
+        }
+
+        /// <summary>
+        /// Get the codepoint's value.
+        /// </summary>
+        public uint Value => _value;
+
+        /// <summary>
+        /// Gets the <see cref="Unicode.GeneralCategory"/>.
+        /// </summary>
+        public GeneralCategory GeneralCategory => UnicodeData.GetGeneralCategory(_value);
+
+        /// <summary>
+        /// Gets the <see cref="Unicode.Script"/>.
+        /// </summary>
+        public Script Script => UnicodeData.GetScript(_value);
+
+        /// <summary>
+        /// Gets the <see cref="Unicode.BidiClass"/>.
+        /// </summary>
+        public BidiClass BiDiClass => UnicodeData.GetBiDiClass(_value);
+
+        /// <summary>
+        /// Gets the <see cref="Unicode.BidiPairedBracketType"/>.
+        /// </summary>
+        public BidiPairedBracketType PairedBracketType => UnicodeData.GetBiDiPairedBracketType(_value);
+        
+        /// <summary>
+        /// Gets the <see cref="Unicode.LineBreakClass"/>.
+        /// </summary>
+        public LineBreakClass LineBreakClass => UnicodeData.GetLineBreakClass(_value);
+
+        /// <summary>
+        /// Gets the <see cref="GraphemeBreakClass"/>.
+        /// </summary>
+        public GraphemeBreakClass GraphemeBreakClass => UnicodeData.GetGraphemeClusterBreak(_value);
+
+        /// <summary>
+        /// Determines whether this <see cref="Codepoint"/> is a break char.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if [is break character]; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsBreakChar
+        {
+            get
+            {
+                switch (_value)
+                {
+                    case '\u000A':
+                    case '\u000B':
+                    case '\u000C':
+                    case '\u000D':
+                    case '\u0085':
+                    case '\u2028':
+                    case '\u2029':
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether this <see cref="Codepoint"/> is white space.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if [is whitespace]; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsWhiteSpace
+        {
+            get
+            {
+                switch (GeneralCategory)
+                {
+                    case GeneralCategory.Control:
+                    case GeneralCategory.NonspacingMark:
+                    case GeneralCategory.Format:
+                    case GeneralCategory.SpaceSeparator:
+                    case GeneralCategory.SpacingMark:
+                        return true;
+                }
+
+                return false;
+            }
+        }
+        
+        /// <summary>
+        /// Gets the canonical representation of a given codepoint.
+        /// <see href="https://www.unicode.org/L2/L2013/13123-norm-and-bpa.pdf"/>
+        /// </summary>
+        /// <param name="codePoint">The code point to be mapped.</param>
+        /// <returns>The mapped canonical code point, or the passed <paramref name="codePoint"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static Codepoint GetCanonicalType(Codepoint codePoint)
+        {
+            if (codePoint._value == 0x3008)
+            {
+                return new Codepoint(0x2329);
+            }
+
+            if (codePoint._value == 0x3009)
+            {
+                return new Codepoint(0x232A);
+            }
+
+            return codePoint;
+        }
+        
+        /// <summary>
+        /// Gets the codepoint representing the bracket pairing for this instance.
+        /// </summary>
+        /// <param name="codepoint">
+        /// When this method returns, contains the codepoint representing the bracket pairing for this instance;
+        /// otherwise, the default value for the type of the <paramref name="codepoint"/> parameter.
+        /// This parameter is passed uninitialized.
+        /// .</param>
+        /// <returns><see langword="true"/> if this instance has a bracket pairing; otherwise, <see langword="false"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryGetPairedBracket(out Codepoint codepoint)
+        {
+            if (PairedBracketType == BidiPairedBracketType.None)
+            {
+                codepoint = default;
+                
+                return false;
+            }
+
+            codepoint = UnicodeData.GetBiDiPairedBracket(_value);
+
+            return true;
+        }
+
+        public static implicit operator int(Codepoint codepoint)
+        {
+            return (int)codepoint._value;
+        }
+
+        public static implicit operator uint(Codepoint codepoint)
+        {
+            return codepoint._value;
+        }
+
+        /// <summary>
+        /// Reads the <see cref="Codepoint"/> at specified position.
+        /// </summary>
+        /// <param name="text">The buffer to read from.</param>
+        /// <param name="index">The index to read at.</param>
+        /// <param name="count">The count of character that were read.</param>
+        /// <returns></returns>
+        public static Codepoint ReadAt(ReadOnlySpan<char> text, int index, out int count)
+        {
+            count = 1;
+
+            if (index >= text.Length)
+            {
+                return ReplacementCodepoint;
+            }
+
+            var code = text[index];
+
+            ushort hi, low;
+
+            //# High surrogate
+            if (0xD800 <= code && code <= 0xDBFF)
+            {
+                hi = code;
+
+                if (index + 1 == text.Length)
+                {
+                    return ReplacementCodepoint;
+                }
+
+                low = text[index + 1];
+
+                if (0xDC00 <= low && low <= 0xDFFF)
+                {
+                    count = 2;
+                    return new Codepoint((uint)((hi - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000));
+                }
+
+                return ReplacementCodepoint;
+            }
+
+            //# Low surrogate
+            if (0xDC00 <= code && code <= 0xDFFF)
+            {
+                if (index == 0)
+                {
+                    return ReplacementCodepoint;
+                }
+
+                hi = text[index - 1];
+
+                low = code;
+
+                if (0xD800 <= hi && hi <= 0xDBFF)
+                {
+                    count = 2;
+                    return new Codepoint((uint)((hi - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000));
+                }
+
+                return ReplacementCodepoint;
+            }
+
+            return new Codepoint(code);
+        }
+
+        /// <summary>
+        /// Returns <see langword="true"/> if <paramref name="cp"/> is between
+        /// <paramref name="lowerBound"/> and <paramref name="upperBound"/>, inclusive.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool IsInRangeInclusive(Codepoint cp, uint lowerBound, uint upperBound)
+            => (cp._value - lowerBound) <= (upperBound - lowerBound);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/CodepointEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/CodepointEnumerator.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GeneralCategory.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/GeneralCategory.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.cs
new file mode 100644
index 0000000000..d0ceba62f4
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal static class GraphemeBreak
+    {
+        public static byte[] Data => System.Array.Empty<byte>();
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.trie.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.trie.cs
new file mode 100644
index 0000000000..e193b0f56f
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.trie.cs
@@ -0,0 +1,414 @@
+using System;
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+   internal static class GraphemeBreakTrie
+    {
+        public static ReadOnlySpan<byte> Data => new byte[]
+        {
+            0, 16, 14, 0, 0, 0, 0, 0, 160, 157, 0, 0, 90, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 114, 3, 0, 0, 138, 3, 0, 0, 146, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0,
+            98, 3, 0, 0, 106, 3, 0, 0, 154, 3, 0, 0, 162, 3, 0, 0, 158, 3, 0, 0, 166, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 174, 3, 0, 0, 182, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 186, 3, 0, 0, 194, 3, 0, 0, 202, 3, 0, 0,
+            210, 3, 0, 0, 218, 3, 0, 0, 226, 3, 0, 0, 232, 3, 0, 0, 240, 3, 0, 0, 98, 3, 0, 0, 106, 3, 0, 0, 245, 3, 0, 0, 253, 3, 0, 0, 2, 4, 0, 0, 10, 4, 0, 0, 16, 4, 0, 0, 24, 4, 0, 0, 23, 4, 0, 0, 31, 4, 0, 0, 36, 4, 0, 0, 44, 4, 0, 0, 178, 4, 0, 0, 185, 4, 0, 0, 189, 4, 0, 0, 98, 3, 0, 0, 52, 4, 0, 0, 98, 3, 0, 0, 196, 4, 0, 0, 60, 4, 0, 0,
+            204, 4, 0, 0, 206, 4, 0, 0, 214, 4, 0, 0, 222, 4, 0, 0, 230, 4, 0, 0, 231, 4, 0, 0, 239, 4, 0, 0, 247, 4, 0, 0, 255, 4, 0, 0, 0, 5, 0, 0, 8, 5, 0, 0, 13, 5, 0, 0, 255, 4, 0, 0, 0, 5, 0, 0, 21, 5, 0, 0, 29, 5, 0, 0, 230, 4, 0, 0, 37, 5, 0, 0, 45, 5, 0, 0, 222, 4, 0, 0, 53, 5, 0, 0, 205, 4, 0, 0, 61, 5, 0, 0, 98, 3, 0, 0, 69, 5, 0, 0,
+            37, 5, 0, 0, 77, 5, 0, 0, 222, 4, 0, 0, 230, 4, 0, 0, 83, 5, 0, 0, 91, 5, 0, 0, 99, 5, 0, 0, 107, 5, 0, 0, 109, 5, 0, 0, 68, 4, 0, 0, 222, 4, 0, 0, 230, 4, 0, 0, 98, 3, 0, 0, 117, 5, 0, 0, 113, 8, 0, 0, 98, 3, 0, 0, 125, 5, 0, 0, 132, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 136, 5, 0, 0, 144, 5, 0, 0, 98, 3, 0, 0, 148, 5, 0, 0, 155, 5, 0, 0,
+            98, 3, 0, 0, 163, 5, 0, 0, 171, 5, 0, 0, 178, 5, 0, 0, 52, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 186, 5, 0, 0, 194, 5, 0, 0, 202, 5, 0, 0, 210, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 149, 8, 0, 0, 149, 8, 0, 0, 149, 8, 0, 0, 158, 8, 0, 0, 158, 8, 0, 0, 164, 8, 0, 0, 182, 8, 0, 0, 182, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 183, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 218, 5, 0, 0, 224, 5, 0, 0, 25, 5, 0, 0, 25, 5, 0, 0, 98, 3, 0, 0, 230, 5, 0, 0, 238, 5, 0, 0, 98, 3, 0, 0, 136, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 81, 5, 0, 0,
+            243, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 251, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 2, 6, 0, 0, 98, 3, 0, 0, 9, 6, 0, 0, 17, 6, 0, 0, 98, 3, 0, 0, 150, 3, 0, 0, 15, 4, 0, 0, 98, 3, 0, 0, 25, 6, 0, 0, 28, 6, 0, 0, 36, 6, 0, 0, 42, 6, 0, 0, 50, 6, 0, 0, 58, 6, 0, 0,
+            98, 3, 0, 0, 65, 6, 0, 0, 98, 3, 0, 0, 72, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 78, 6, 0, 0, 86, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 142, 4, 0, 0, 148, 4, 0, 0, 104, 6, 0, 0, 94, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 150, 3, 0, 0, 181, 5, 0, 0, 98, 3, 0, 0, 205, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 212, 8, 0, 0, 219, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 222, 8, 0, 0, 229, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 229, 8, 0, 0, 98, 3, 0, 0, 234, 8, 0, 0, 240, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 248, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 254, 8, 0, 0, 6, 9, 0, 0, 8, 9, 0, 0, 16, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 28, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 35, 9, 0, 0, 42, 9, 0, 0, 49, 9, 0, 0, 57, 9, 0, 0, 60, 9, 0, 0, 68, 9, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 76, 9, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 83, 9, 0, 0, 98, 3, 0, 0, 91, 9, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 93, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 227, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 154, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 99, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 107, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 97, 9, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 114, 6, 0, 0, 25, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 150, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 122, 6, 0, 0, 130, 6, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 13, 8, 0, 0, 118, 8, 0, 0, 138, 6, 0, 0, 146, 6, 0, 0, 98, 3, 0, 0, 154, 6, 0, 0, 161, 6, 0, 0, 150, 8, 0, 0, 204, 4, 0, 0, 166, 6, 0, 0, 126, 8, 0, 0, 174, 6, 0, 0, 98, 3, 0, 0, 180, 6, 0, 0, 188, 6, 0, 0, 192, 6, 0, 0, 98, 3, 0, 0, 200, 6, 0, 0, 6, 4, 0, 0, 208, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 216, 6, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0,
+            191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0,
+            195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0,
+            192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0,
+            196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0,
+            193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0,
+            197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0,
+            194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0,
+            191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0,
+            195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0,
+            192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0,
+            196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0,
+            193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0,
+            197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0, 194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 197, 8, 0, 0, 191, 8, 0, 0, 192, 8, 0, 0, 193, 8, 0, 0,
+            194, 8, 0, 0, 195, 8, 0, 0, 196, 8, 0, 0, 172, 8, 0, 0, 179, 8, 0, 0, 183, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 220, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 166, 3, 0, 0, 166, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 114, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 25, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            156, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 232, 13, 0, 0, 232, 13, 0, 0, 40, 14, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 104, 14, 0, 0, 120, 14, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0,
+            136, 13, 0, 0, 184, 14, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 136, 13, 0, 0, 232, 14, 0, 0, 40, 15, 0, 0, 104, 15, 0, 0, 160, 15, 0, 0, 136, 13, 0, 0, 212, 15, 0, 0, 8, 16, 0, 0, 64, 16, 0, 0, 92, 16, 0, 0, 144, 16, 0, 0, 68, 11, 0, 0, 116, 11, 0, 0, 226, 9, 0, 0, 33, 10, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 92, 10, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 177, 11, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 127, 10, 0, 0, 149, 1, 0, 0, 241, 11, 0, 0, 180, 10, 0, 0, 44, 12, 0, 0, 108, 12, 0, 0, 166, 12, 0, 0, 230, 12, 0, 0, 38, 13, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0,
+            149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 149, 1, 0, 0, 244, 10, 0, 0, 4, 11, 0, 0, 16, 7, 0, 0, 8, 4, 0, 0, 17, 4, 0, 0, 20, 7, 0, 0, 50, 6, 0, 0, 74, 4, 0, 0, 82, 4, 0, 0, 98, 3, 0, 0, 18, 4, 0, 0, 26, 7, 0, 0, 133, 8, 0, 0, 32, 7, 0, 0, 50, 6, 0, 0, 37, 7, 0, 0, 90, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            45, 7, 0, 0, 6, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 227, 3, 0, 0, 53, 7, 0, 0, 107, 5, 0, 0, 109, 5, 0, 0, 61, 7, 0, 0, 69, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 75, 7, 0, 0, 83, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 91, 7, 0, 0, 99, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 104, 7, 0, 0, 112, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 120, 7, 0, 0, 35, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 128, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 183, 3, 0, 0, 136, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 141, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 94, 4, 0, 0, 102, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 148, 7, 0, 0, 156, 7, 0, 0, 164, 7, 0, 0, 106, 4, 0, 0, 171, 7, 0, 0, 98, 3, 0, 0, 114, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 178, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 186, 7, 0, 0, 192, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 198, 7, 0, 0, 122, 4, 0, 0, 98, 3, 0, 0, 206, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 212, 7, 0, 0, 130, 4, 0, 0, 218, 7, 0, 0, 226, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 134, 3, 0, 0, 234, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 14, 8, 0, 0, 97, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 163, 4, 0, 0, 30, 8, 0, 0, 6, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 38, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 138, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 154, 3, 0, 0, 170, 4, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0,
+            138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0,
+            138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0,
+            138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 138, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 228, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 35, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 236, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 244, 6, 0, 0, 248, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 81, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 246, 6, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 0, 7, 0, 0, 98, 3, 0, 0, 183, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 31, 4, 0, 0, 98, 3, 0, 0, 8, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 240, 7, 0, 0, 98, 3, 0, 0, 246, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 252, 7, 0, 0, 141, 8, 0, 0, 2, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 9, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 154, 3, 0, 0, 22, 8, 0, 0, 17, 4, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 154, 3, 0, 0, 46, 8, 0, 0, 154, 3, 0, 0, 53, 8, 0, 0, 60, 8, 0, 0, 68, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 76, 8, 0, 0, 84, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 33, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 246, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 224, 6, 0, 0, 98, 3, 0, 0, 89, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 89, 8, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 246, 7, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 145, 5, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 104, 9, 0, 0, 234, 8, 0, 0, 98, 3, 0, 0, 109, 9, 0, 0, 117, 9, 0, 0, 124, 9, 0, 0, 21, 9, 0, 0, 105, 8, 0, 0, 132, 9, 0, 0, 139, 9, 0, 0, 147, 9, 0, 0, 21, 9, 0, 0,
+            21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 97, 8, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 22, 9, 0, 0, 155, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0,
+            21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 159, 9, 0, 0, 98, 3, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 163, 9, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 171, 9, 0, 0, 21, 9, 0, 0, 179, 9, 0, 0, 98, 3, 0, 0, 185, 9, 0, 0, 98, 3, 0, 0, 193, 9, 0, 0, 198, 9, 0, 0,
+            21, 9, 0, 0, 21, 9, 0, 0, 94, 8, 0, 0, 202, 9, 0, 0, 209, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0, 98, 3, 0, 0,
+            98, 3, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0,
+            21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 21, 9, 0, 0, 22, 9, 0, 0, 89, 3, 1, 0, 89, 3, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 9, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0,
+            1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
+            1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0,
+            12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 12, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 12, 0, 0, 0, 14, 0, 0, 0, 12, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 12, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 12, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 12, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 12, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 6, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+            1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
+            1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
+            1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            6, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
+            6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0,
+            13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0,
+            14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 14, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0,
+            8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0,
+            16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0,
+            15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0,
+            16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0,
+            15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0,
+            15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0,
+            11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 10, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0,
+            11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0,
+            18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        };
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreakClass.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
new file mode 100644
index 0000000000..fcd1a4f51a
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
@@ -0,0 +1,25 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public enum GraphemeBreakClass
+    {
+        Other, //XX
+        Control, //CN
+        CR, //CR
+        EBase, //EB
+        EBaseGAZ, //EBG
+        EModifier, //EM
+        Extend, //EX
+        GlueAfterZwj, //GAZ
+        L, //L
+        LF, //LF
+        LV, //LV
+        LVT, //LVT
+        Prepend, //PP
+        RegionalIndicator, //RI
+        SpacingMark, //SM
+        T, //T
+        V, //V
+        ZWJ, //ZWJ
+        ExtendedPictographic
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreak.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreak.cs
new file mode 100644
index 0000000000..59c4df0a2e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreak.cs
@@ -0,0 +1,63 @@
+// RichTextKit
+// Copyright © 2019 Topten Software. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may 
+// not use this product except in compliance with the License. You may obtain 
+// a copy of the License at
+// 
+// https://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+// License for the specific language governing permissions and limitations 
+// under the License.
+//
+// Ported from: https://github.com/foliojs/linebreak
+// Copied from: https://github.com/toptensoftware/RichTextKit
+
+using System.Diagnostics;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Information about a potential line break position
+    /// </summary>
+    [DebuggerDisplay("{PositionMeasure}/{PositionWrap} @ {Required}")]
+    public readonly struct LineBreak
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="positionMeasure">The code point index to measure to</param>
+        /// <param name="positionWrap">The code point index to actually break the line at</param>
+        /// <param name="required">True if this is a required line break; otherwise false</param>
+        public LineBreak(int positionMeasure, int positionWrap, bool required = false)
+        {
+            PositionMeasure = positionMeasure;
+            PositionWrap = positionWrap;
+            Required = required;
+        }
+
+        /// <summary>
+        /// The break position, before any trailing whitespace
+        /// </summary>
+        /// <remarks>
+        /// This doesn't include trailing whitespace
+        /// </remarks>
+        public int PositionMeasure { get; }
+
+        /// <summary>
+        /// The break position, after any trailing whitespace
+        /// </summary>
+        /// <remarks>
+        /// This includes trailing whitespace
+        /// </remarks>
+        public int PositionWrap { get; }
+
+        /// <summary>
+        /// True if there should be a forced line break here
+        /// </summary>
+        public bool Required { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakClass.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakClass.cs
new file mode 100644
index 0000000000..bd77c398bd
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakClass.cs
@@ -0,0 +1,49 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public enum LineBreakClass
+    {
+        OpenPunctuation, //OP
+        ClosePunctuation, //CL
+        CloseParenthesis, //CP
+        Quotation, //QU
+        Glue, //GL
+        Nonstarter, //NS
+        Exclamation, //EX
+        BreakSymbols, //SY
+        InfixNumeric, //IS
+        PrefixNumeric, //PR
+        PostfixNumeric, //PO
+        Numeric, //NU
+        Alphabetic, //AL
+        HebrewLetter, //HL
+        Ideographic, //ID
+        Inseparable, //IN
+        Hyphen, //HY
+        BreakAfter, //BA
+        BreakBefore, //BB
+        BreakBoth, //B2
+        ZWSpace, //ZW
+        CombiningMark, //CM
+        WordJoiner, //WJ
+        H2, //H2
+        H3, //H3
+        JL, //JL
+        JV, //JV
+        JT, //JT
+        RegionalIndicator, //RI
+        EBase, //EB
+        EModifier, //EM
+        ZWJ, //ZWJ
+        ContingentBreak, //CB
+        Unknown, //XX
+        Ambiguous, //AI
+        MandatoryBreak, //BK
+        ConditionalJapaneseStarter, //CJ
+        CarriageReturn, //CR
+        LineFeed, //LF
+        NextLine, //NL
+        ComplexContext, //SA
+        Surrogate, //SG
+        Space, //SP
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
new file mode 100644
index 0000000000..e12a7c06f1
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -0,0 +1,506 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/
+
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Implementation of the Unicode Line Break Algorithm. UAX:14
+    /// <see href="https://www.unicode.org/reports/tr14/tr14-37.html"/>
+    /// </summary>
+    public ref struct LineBreakEnumerator
+    {
+        private readonly ReadOnlySlice<char> _text;
+        private int _position;
+        private int _lastPosition;
+        private LineBreakClass _currentClass;
+        private LineBreakClass _nextClass;
+        private bool _first;
+        private int _alphaNumericCount;
+        private bool _lb8a;
+        private bool _lb21a;
+        private bool _lb22ex;
+        private bool _lb24ex;
+        private bool _lb25ex;
+        private bool _lb30;
+        private int _lb30a;
+        private bool _lb31;
+
+        public LineBreakEnumerator(ReadOnlySlice<char> text)
+            : this()
+        {
+            _text = text;
+            _position = 0;
+            _currentClass = LineBreakClass.Unknown;
+            _nextClass = LineBreakClass.Unknown;
+            _first = true;
+            _lb8a = false;
+            _lb21a = false;
+            _lb22ex = false;
+            _lb24ex = false;
+            _lb25ex = false;
+            _alphaNumericCount = 0;
+            _lb31 = false;
+            _lb30 = false;
+            _lb30a = 0;
+        }
+        
+        public LineBreak Current { get; private set; }
+        
+        public bool MoveNext()
+        {
+            // Get the first char if we're at the beginning of the string.
+            if (_first)
+            {
+                var firstClass = NextCharClass();
+                _first = false;
+                _currentClass = MapFirst(firstClass);
+                _nextClass = firstClass;
+                _lb8a = firstClass == LineBreakClass.ZWJ;
+                _lb30a = 0;
+            }
+
+            while (_position < _text.Length)
+            {
+                _lastPosition = _position;
+                var lastClass = _nextClass;
+                _nextClass = NextCharClass();
+
+                // Explicit newline
+                switch (_currentClass)
+                {
+                    case LineBreakClass.MandatoryBreak:
+                    case LineBreakClass.CarriageReturn when _nextClass != LineBreakClass.LineFeed:
+                    {
+                        _currentClass = MapFirst(_nextClass);
+                        Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, true);
+                        return true;
+                    }
+                }
+
+                var shouldBreak = GetSimpleBreak() ?? GetPairTableBreak(lastClass);
+
+                // Rule LB8a
+                _lb8a = _nextClass == LineBreakClass.ZWJ;
+
+                if (shouldBreak)
+                {
+                    Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
+                    return true;
+                }
+            }
+
+            if (_position >= _text.Length)
+            {
+                if (_lastPosition < _text.Length)
+                {
+                    _lastPosition = _text.Length;
+
+                    var required = false;
+
+                    switch (_currentClass)
+                    {
+                        case LineBreakClass.MandatoryBreak:
+                        case LineBreakClass.CarriageReturn when _nextClass != LineBreakClass.LineFeed:
+                            required = true;
+                            break;
+                    }
+
+                    Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, required);
+                    return true;
+                }
+            }
+
+            Current = default;
+            
+            return false;
+        }
+
+        private static LineBreakClass MapClass(Codepoint cp)
+        {
+            if (cp.Value == 327685)
+            {
+                return LineBreakClass.Alphabetic;
+            }
+            
+            // LB 1
+            // ==========================================
+            // Resolved Original    General_Category
+            // ==========================================
+            // AL       AI, SG, XX  Any
+            // CM       SA          Only Mn or Mc
+            // AL       SA          Any except Mn and Mc
+            // NS       CJ          Any
+            switch (cp.LineBreakClass)
+            {
+                case LineBreakClass.Ambiguous:
+                case LineBreakClass.Surrogate:
+                case LineBreakClass.Unknown:
+                    return LineBreakClass.Alphabetic;
+
+                case LineBreakClass.ComplexContext:
+                    return cp.GeneralCategory == GeneralCategory.NonspacingMark || cp.GeneralCategory == GeneralCategory.SpacingMark
+                        ? LineBreakClass.CombiningMark
+                        : LineBreakClass.Alphabetic;
+
+                case LineBreakClass.ConditionalJapaneseStarter:
+                    return LineBreakClass.Nonstarter;
+
+                default:
+                    return cp.LineBreakClass;
+            }
+        }
+
+        private static LineBreakClass MapFirst(LineBreakClass c)
+        {
+            switch (c)
+            {
+                case LineBreakClass.LineFeed:
+                case LineBreakClass.NextLine:
+                    return LineBreakClass.MandatoryBreak;
+
+                case LineBreakClass.Space:
+                    return LineBreakClass.WordJoiner;
+
+                default:
+                    return c;
+            }
+        }
+
+        private static bool IsAlphaNumeric(LineBreakClass cls)
+            => cls == LineBreakClass.Alphabetic
+            || cls == LineBreakClass.HebrewLetter
+            || cls == LineBreakClass.Numeric;
+
+        private LineBreakClass PeekNextCharClass()
+        {
+            var cp = Codepoint.ReadAt(_text, _position, out _);
+            
+            return MapClass(cp);
+        }
+
+        // Get the next character class
+        private LineBreakClass NextCharClass()
+        {
+            var cp = Codepoint.ReadAt(_text, _position, out var count);
+            var cls = MapClass(cp);
+            _position += count;
+
+            // Keep track of alphanumeric + any combining marks.
+            // This is used for LB22 and LB30.
+            if (IsAlphaNumeric(_currentClass) || _alphaNumericCount > 0 && cls == LineBreakClass.CombiningMark)
+            {
+                _alphaNumericCount++;
+            }
+
+            // Track combining mark exceptions. LB22
+            if (cls == LineBreakClass.CombiningMark)
+            {
+                switch (_currentClass)
+                {
+                    case LineBreakClass.MandatoryBreak:
+                    case LineBreakClass.ContingentBreak:
+                    case LineBreakClass.Exclamation:
+                    case LineBreakClass.LineFeed:
+                    case LineBreakClass.NextLine:
+                    case LineBreakClass.Space:
+                    case LineBreakClass.ZWSpace:
+                    case LineBreakClass.CarriageReturn:
+                        _lb22ex = true;
+                        break;
+                }
+            }
+
+            // Track combining mark exceptions. LB31
+            if (_first && cls == LineBreakClass.CombiningMark)
+            {
+                _lb31 = true;
+            }
+
+            if (cls == LineBreakClass.CombiningMark)
+            {
+                switch (_currentClass)
+                {
+                    case LineBreakClass.MandatoryBreak:
+                    case LineBreakClass.ContingentBreak:
+                    case LineBreakClass.Exclamation:
+                    case LineBreakClass.LineFeed:
+                    case LineBreakClass.NextLine:
+                    case LineBreakClass.Space:
+                    case LineBreakClass.ZWSpace:
+                    case LineBreakClass.CarriageReturn:
+                    case LineBreakClass.ZWJ:
+                        _lb31 = true;
+                        break;
+                }
+            }
+
+            if (_first
+                && (cls == LineBreakClass.PostfixNumeric || cls == LineBreakClass.PrefixNumeric || cls == LineBreakClass.Space))
+            {
+                _lb31 = true;
+            }
+
+            if (_currentClass == LineBreakClass.Alphabetic && 
+                (cls == LineBreakClass.PostfixNumeric || cls == LineBreakClass.PrefixNumeric || cls == LineBreakClass.Space))
+            {
+                _lb31 = true;
+            }
+
+            // Reset LB31 if next is U+0028 (Left Opening Parenthesis)
+            if (_lb31
+                && _currentClass != LineBreakClass.PostfixNumeric
+                && _currentClass != LineBreakClass.PrefixNumeric
+                && cls == LineBreakClass.OpenPunctuation && cp.Value == 0x0028)
+            {
+                _lb31 = false;
+            }
+
+            // Rule LB24
+            if (_first && (cls == LineBreakClass.ClosePunctuation || cls == LineBreakClass.CloseParenthesis))
+            {
+                _lb24ex = true;
+            }
+
+            // Rule LB25
+            if (_first
+                && (cls == LineBreakClass.ClosePunctuation || cls == LineBreakClass.InfixNumeric || cls == LineBreakClass.BreakSymbols))
+            {
+                _lb25ex = true;
+            }
+
+            if (cls == LineBreakClass.Space || cls == LineBreakClass.WordJoiner || cls == LineBreakClass.Alphabetic)
+            {
+                var next = PeekNextCharClass();
+                if (next == LineBreakClass.ClosePunctuation || next == LineBreakClass.InfixNumeric || next == LineBreakClass.BreakSymbols)
+                {
+                    _lb25ex = true;
+                }
+            }
+
+            // AlphaNumeric + and combining marks can break for OP except.
+            // - U+0028 (Left Opening Parenthesis)
+            // - U+005B (Opening Square Bracket)
+            // - U+007B (Left Curly Bracket)
+            // See custom columns|rules in the text pair table.
+            // https://www.unicode.org/Public/13.0.0/ucd/auxiliary/LineBreakTest.html
+            _lb30 = _alphaNumericCount > 0
+                && cls == LineBreakClass.OpenPunctuation
+                && cp.Value != 0x0028
+                && cp.Value != 0x005B
+                && cp.Value != 0x007B;
+
+            return cls;
+        }
+
+        private bool? GetSimpleBreak()
+        {
+            // handle classes not handled by the pair table
+            switch (_nextClass)
+            {
+                case LineBreakClass.Space:
+                    return false;
+
+                case LineBreakClass.MandatoryBreak:
+                case LineBreakClass.LineFeed:
+                case LineBreakClass.NextLine:
+                    _currentClass = LineBreakClass.MandatoryBreak;
+                    return false;
+
+                case LineBreakClass.CarriageReturn:
+                    _currentClass = LineBreakClass.CarriageReturn;
+                    return false;
+            }
+
+            return null;
+        }
+
+        private bool GetPairTableBreak(LineBreakClass lastClass)
+        {
+            // If not handled already, use the pair table
+            bool shouldBreak = false;
+            switch (LineBreakPairTable.Table[(int)_currentClass][(int)_nextClass])
+            {
+                case LineBreakPairTable.DIBRK: // Direct break
+                    shouldBreak = true;
+                    break;
+
+                // TODO: Rewrite this so that it defaults to true and rules are set as exceptions.
+                case LineBreakPairTable.INBRK: // Possible indirect break
+
+                    // LB31
+                    if (_lb31 && _nextClass == LineBreakClass.OpenPunctuation)
+                    {
+                        shouldBreak = true;
+                        _lb31 = false;
+                        break;
+                    }
+
+                    // LB30
+                    if (_lb30)
+                    {
+                        shouldBreak = true;
+                        _lb30 = false;
+                        _alphaNumericCount = 0;
+                        break;
+                    }
+
+                    // LB25
+                    if (_lb25ex && (_nextClass == LineBreakClass.PrefixNumeric || _nextClass == LineBreakClass.Numeric))
+                    {
+                        shouldBreak = true;
+                        _lb25ex = false;
+                        break;
+                    }
+
+                    // LB24
+                    if (_lb24ex && (_nextClass == LineBreakClass.PostfixNumeric || _nextClass == LineBreakClass.PrefixNumeric))
+                    {
+                        shouldBreak = true;
+                        _lb24ex = false;
+                        break;
+                    }
+
+                    // LB18
+                    shouldBreak = lastClass == LineBreakClass.Space;
+                    break;
+
+                case LineBreakPairTable.CIBRK:
+                    shouldBreak = lastClass == LineBreakClass.Space;
+                    if (!shouldBreak)
+                    {
+                        return false;
+                    }
+
+                    break;
+
+                case LineBreakPairTable.CPBRK: // prohibited for combining marks
+                    if (lastClass != LineBreakClass.Space)
+                    {
+                        return false;
+                    }
+
+                    break;
+
+                case LineBreakPairTable.PRBRK:
+                    break;
+            }
+
+            // Rule LB22
+            if (_nextClass == LineBreakClass.Inseparable)
+            {
+                switch (lastClass)
+                {
+                    case LineBreakClass.MandatoryBreak:
+                    case LineBreakClass.ContingentBreak:
+                    case LineBreakClass.Exclamation:
+                    case LineBreakClass.LineFeed:
+                    case LineBreakClass.NextLine:
+                    case LineBreakClass.Space:
+                    case LineBreakClass.ZWSpace:
+
+                        // Allow break
+                        break;
+                    case LineBreakClass.CombiningMark:
+                        if (_lb22ex)
+                        {
+                            // Allow break
+                            _lb22ex = false;
+                            break;
+                        }
+
+                        shouldBreak = false;
+                        break;
+                    default:
+                        shouldBreak = false;
+                        break;
+                }
+            }
+
+            if (_lb8a)
+            {
+                shouldBreak = false;
+            }
+
+            // Rule LB21a
+            if (_lb21a && (_currentClass == LineBreakClass.Hyphen || _currentClass == LineBreakClass.BreakAfter))
+            {
+                shouldBreak = false;
+                _lb21a = false;
+            }
+            else
+            {
+                _lb21a = _currentClass == LineBreakClass.HebrewLetter;
+            }
+
+            // Rule LB30a
+            if (_currentClass == LineBreakClass.RegionalIndicator)
+            {
+                _lb30a++;
+                if (_lb30a == 2 && _nextClass == LineBreakClass.RegionalIndicator)
+                {
+                    shouldBreak = true;
+                    _lb30a = 0;
+                }
+            }
+            else
+            {
+                _lb30a = 0;
+            }
+
+            // Rule LB30b
+            if (_nextClass == LineBreakClass.EModifier && _lastPosition > 0)
+            {
+                // Mahjong Tiles (Unicode block) are extended pictographics but have a class of ID
+                // Unassigned codepoints with Line_Break=ID in some blocks are also assigned the Extended_Pictographic property.
+                // Those blocks are intended for future allocation of emoji characters.
+                var cp = Codepoint.ReadAt(_text, _lastPosition - 1, out int _);
+
+                if (Codepoint.IsInRangeInclusive(cp, 0x1F000, 0x1F02F))
+                {
+                    shouldBreak = false;
+                }
+            }
+
+            _currentClass = _nextClass;
+
+            return shouldBreak;
+        }
+        
+        private int FindPriorNonWhitespace(int from)
+        {
+            if (from > 0)
+            {
+                var cp = Codepoint.ReadAt(_text, from - 1, out var count);
+
+                var cls = cp.LineBreakClass;
+
+                if (cls == LineBreakClass.MandatoryBreak || cls == LineBreakClass.LineFeed ||
+                    cls == LineBreakClass.CarriageReturn)
+                {
+                    from -= count;
+                }
+            }
+
+            while (from > 0)
+            {
+                var cp = Codepoint.ReadAt(_text, from - 1, out var count);
+
+                var cls = cp.LineBreakClass;
+
+                if (cls == LineBreakClass.Space)
+                {
+                    from -= count;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            return from;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakPairTable.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakPairTable.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakPairTable.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakPairTable.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
new file mode 100644
index 0000000000..69814287ea
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
@@ -0,0 +1,523 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal static class PropertyValueAliasHelper
+    {
+        private static readonly Dictionary<Script, string> s_scriptToTag = 
+            new Dictionary<Script, string>{
+                { Script.Unknown, "Zzzz"},
+                { Script.Common, "Zyyy"},
+                { Script.Inherited, "Zinh"},
+                { Script.Adlam, "Adlm"},
+                { Script.CaucasianAlbanian, "Aghb"},
+                { Script.Ahom, "Ahom"},
+                { Script.Arabic, "Arab"},
+                { Script.ImperialAramaic, "Armi"},
+                { Script.Armenian, "Armn"},
+                { Script.Avestan, "Avst"},
+                { Script.Balinese, "Bali"},
+                { Script.Bamum, "Bamu"},
+                { Script.BassaVah, "Bass"},
+                { Script.Batak, "Batk"},
+                { Script.Bengali, "Beng"},
+                { Script.Bhaiksuki, "Bhks"},
+                { Script.Bopomofo, "Bopo"},
+                { Script.Brahmi, "Brah"},
+                { Script.Braille, "Brai"},
+                { Script.Buginese, "Bugi"},
+                { Script.Buhid, "Buhd"},
+                { Script.Chakma, "Cakm"},
+                { Script.CanadianAboriginal, "Cans"},
+                { Script.Carian, "Cari"},
+                { Script.Cham, "Cham"},
+                { Script.Cherokee, "Cher"},
+                { Script.Chorasmian, "Chrs"},
+                { Script.Coptic, "Copt"},
+                { Script.CyproMinoan, "Cpmn"},
+                { Script.Cypriot, "Cprt"},
+                { Script.Cyrillic, "Cyrl"},
+                { Script.Devanagari, "Deva"},
+                { Script.DivesAkuru, "Diak"},
+                { Script.Dogra, "Dogr"},
+                { Script.Deseret, "Dsrt"},
+                { Script.Duployan, "Dupl"},
+                { Script.EgyptianHieroglyphs, "Egyp"},
+                { Script.Elbasan, "Elba"},
+                { Script.Elymaic, "Elym"},
+                { Script.Ethiopic, "Ethi"},
+                { Script.Georgian, "Geor"},
+                { Script.Glagolitic, "Glag"},
+                { Script.GunjalaGondi, "Gong"},
+                { Script.MasaramGondi, "Gonm"},
+                { Script.Gothic, "Goth"},
+                { Script.Grantha, "Gran"},
+                { Script.Greek, "Grek"},
+                { Script.Gujarati, "Gujr"},
+                { Script.Gurmukhi, "Guru"},
+                { Script.Hangul, "Hang"},
+                { Script.Han, "Hani"},
+                { Script.Hanunoo, "Hano"},
+                { Script.Hatran, "Hatr"},
+                { Script.Hebrew, "Hebr"},
+                { Script.Hiragana, "Hira"},
+                { Script.AnatolianHieroglyphs, "Hluw"},
+                { Script.PahawhHmong, "Hmng"},
+                { Script.NyiakengPuachueHmong, "Hmnp"},
+                { Script.KatakanaOrHiragana, "Hrkt"},
+                { Script.OldHungarian, "Hung"},
+                { Script.OldItalic, "Ital"},
+                { Script.Javanese, "Java"},
+                { Script.KayahLi, "Kali"},
+                { Script.Katakana, "Kana"},
+                { Script.Kawi, "Kawi"},
+                { Script.Kharoshthi, "Khar"},
+                { Script.Khmer, "Khmr"},
+                { Script.Khojki, "Khoj"},
+                { Script.KhitanSmallScript, "Kits"},
+                { Script.Kannada, "Knda"},
+                { Script.Kaithi, "Kthi"},
+                { Script.TaiTham, "Lana"},
+                { Script.Lao, "Laoo"},
+                { Script.Latin, "Latn"},
+                { Script.Lepcha, "Lepc"},
+                { Script.Limbu, "Limb"},
+                { Script.LinearA, "Lina"},
+                { Script.LinearB, "Linb"},
+                { Script.Lisu, "Lisu"},
+                { Script.Lycian, "Lyci"},
+                { Script.Lydian, "Lydi"},
+                { Script.Mahajani, "Mahj"},
+                { Script.Makasar, "Maka"},
+                { Script.Mandaic, "Mand"},
+                { Script.Manichaean, "Mani"},
+                { Script.Marchen, "Marc"},
+                { Script.Medefaidrin, "Medf"},
+                { Script.MendeKikakui, "Mend"},
+                { Script.MeroiticCursive, "Merc"},
+                { Script.MeroiticHieroglyphs, "Mero"},
+                { Script.Malayalam, "Mlym"},
+                { Script.Modi, "Modi"},
+                { Script.Mongolian, "Mong"},
+                { Script.Mro, "Mroo"},
+                { Script.MeeteiMayek, "Mtei"},
+                { Script.Multani, "Mult"},
+                { Script.Myanmar, "Mymr"},
+                { Script.NagMundari, "Nagm"},
+                { Script.Nandinagari, "Nand"},
+                { Script.OldNorthArabian, "Narb"},
+                { Script.Nabataean, "Nbat"},
+                { Script.Newa, "Newa"},
+                { Script.Nko, "Nkoo"},
+                { Script.Nushu, "Nshu"},
+                { Script.Ogham, "Ogam"},
+                { Script.OlChiki, "Olck"},
+                { Script.OldTurkic, "Orkh"},
+                { Script.Oriya, "Orya"},
+                { Script.Osage, "Osge"},
+                { Script.Osmanya, "Osma"},
+                { Script.OldUyghur, "Ougr"},
+                { Script.Palmyrene, "Palm"},
+                { Script.PauCinHau, "Pauc"},
+                { Script.OldPermic, "Perm"},
+                { Script.PhagsPa, "Phag"},
+                { Script.InscriptionalPahlavi, "Phli"},
+                { Script.PsalterPahlavi, "Phlp"},
+                { Script.Phoenician, "Phnx"},
+                { Script.Miao, "Plrd"},
+                { Script.InscriptionalParthian, "Prti"},
+                { Script.Rejang, "Rjng"},
+                { Script.HanifiRohingya, "Rohg"},
+                { Script.Runic, "Runr"},
+                { Script.Samaritan, "Samr"},
+                { Script.OldSouthArabian, "Sarb"},
+                { Script.Saurashtra, "Saur"},
+                { Script.SignWriting, "Sgnw"},
+                { Script.Shavian, "Shaw"},
+                { Script.Sharada, "Shrd"},
+                { Script.Siddham, "Sidd"},
+                { Script.Khudawadi, "Sind"},
+                { Script.Sinhala, "Sinh"},
+                { Script.Sogdian, "Sogd"},
+                { Script.OldSogdian, "Sogo"},
+                { Script.SoraSompeng, "Sora"},
+                { Script.Soyombo, "Soyo"},
+                { Script.Sundanese, "Sund"},
+                { Script.SylotiNagri, "Sylo"},
+                { Script.Syriac, "Syrc"},
+                { Script.Tagbanwa, "Tagb"},
+                { Script.Takri, "Takr"},
+                { Script.TaiLe, "Tale"},
+                { Script.NewTaiLue, "Talu"},
+                { Script.Tamil, "Taml"},
+                { Script.Tangut, "Tang"},
+                { Script.TaiViet, "Tavt"},
+                { Script.Telugu, "Telu"},
+                { Script.Tifinagh, "Tfng"},
+                { Script.Tagalog, "Tglg"},
+                { Script.Thaana, "Thaa"},
+                { Script.Thai, "Thai"},
+                { Script.Tibetan, "Tibt"},
+                { Script.Tirhuta, "Tirh"},
+                { Script.Tangsa, "Tnsa"},
+                { Script.Toto, "Toto"},
+                { Script.Ugaritic, "Ugar"},
+                { Script.Vai, "Vaii"},
+                { Script.Vithkuqi, "Vith"},
+                { Script.WarangCiti, "Wara"},
+                { Script.Wancho, "Wcho"},
+                { Script.OldPersian, "Xpeo"},
+                { Script.Cuneiform, "Xsux"},
+                { Script.Yezidi, "Yezi"},
+                { Script.Yi, "Yiii"},
+                { Script.ZanabazarSquare, "Zanb"},
+        };
+
+        public static string GetTag(Script script)
+        {
+            if(!s_scriptToTag.ContainsKey(script))
+            {
+                return "Zzzz";
+            }
+            return s_scriptToTag[script];
+        }
+
+        private static readonly Dictionary<string, Script> s_tagToScript = 
+            new Dictionary<string,Script>{
+                { "Zzzz", Script.Unknown},
+                { "Zyyy", Script.Common},
+                { "Zinh", Script.Inherited},
+                { "Adlm", Script.Adlam},
+                { "Aghb", Script.CaucasianAlbanian},
+                { "Ahom", Script.Ahom},
+                { "Arab", Script.Arabic},
+                { "Armi", Script.ImperialAramaic},
+                { "Armn", Script.Armenian},
+                { "Avst", Script.Avestan},
+                { "Bali", Script.Balinese},
+                { "Bamu", Script.Bamum},
+                { "Bass", Script.BassaVah},
+                { "Batk", Script.Batak},
+                { "Beng", Script.Bengali},
+                { "Bhks", Script.Bhaiksuki},
+                { "Bopo", Script.Bopomofo},
+                { "Brah", Script.Brahmi},
+                { "Brai", Script.Braille},
+                { "Bugi", Script.Buginese},
+                { "Buhd", Script.Buhid},
+                { "Cakm", Script.Chakma},
+                { "Cans", Script.CanadianAboriginal},
+                { "Cari", Script.Carian},
+                { "Cham", Script.Cham},
+                { "Cher", Script.Cherokee},
+                { "Chrs", Script.Chorasmian},
+                { "Copt", Script.Coptic},
+                { "Cpmn", Script.CyproMinoan},
+                { "Cprt", Script.Cypriot},
+                { "Cyrl", Script.Cyrillic},
+                { "Deva", Script.Devanagari},
+                { "Diak", Script.DivesAkuru},
+                { "Dogr", Script.Dogra},
+                { "Dsrt", Script.Deseret},
+                { "Dupl", Script.Duployan},
+                { "Egyp", Script.EgyptianHieroglyphs},
+                { "Elba", Script.Elbasan},
+                { "Elym", Script.Elymaic},
+                { "Ethi", Script.Ethiopic},
+                { "Geor", Script.Georgian},
+                { "Glag", Script.Glagolitic},
+                { "Gong", Script.GunjalaGondi},
+                { "Gonm", Script.MasaramGondi},
+                { "Goth", Script.Gothic},
+                { "Gran", Script.Grantha},
+                { "Grek", Script.Greek},
+                { "Gujr", Script.Gujarati},
+                { "Guru", Script.Gurmukhi},
+                { "Hang", Script.Hangul},
+                { "Hani", Script.Han},
+                { "Hano", Script.Hanunoo},
+                { "Hatr", Script.Hatran},
+                { "Hebr", Script.Hebrew},
+                { "Hira", Script.Hiragana},
+                { "Hluw", Script.AnatolianHieroglyphs},
+                { "Hmng", Script.PahawhHmong},
+                { "Hmnp", Script.NyiakengPuachueHmong},
+                { "Hrkt", Script.KatakanaOrHiragana},
+                { "Hung", Script.OldHungarian},
+                { "Ital", Script.OldItalic},
+                { "Java", Script.Javanese},
+                { "Kali", Script.KayahLi},
+                { "Kana", Script.Katakana},
+                { "Kawi", Script.Kawi},
+                { "Khar", Script.Kharoshthi},
+                { "Khmr", Script.Khmer},
+                { "Khoj", Script.Khojki},
+                { "Kits", Script.KhitanSmallScript},
+                { "Knda", Script.Kannada},
+                { "Kthi", Script.Kaithi},
+                { "Lana", Script.TaiTham},
+                { "Laoo", Script.Lao},
+                { "Latn", Script.Latin},
+                { "Lepc", Script.Lepcha},
+                { "Limb", Script.Limbu},
+                { "Lina", Script.LinearA},
+                { "Linb", Script.LinearB},
+                { "Lisu", Script.Lisu},
+                { "Lyci", Script.Lycian},
+                { "Lydi", Script.Lydian},
+                { "Mahj", Script.Mahajani},
+                { "Maka", Script.Makasar},
+                { "Mand", Script.Mandaic},
+                { "Mani", Script.Manichaean},
+                { "Marc", Script.Marchen},
+                { "Medf", Script.Medefaidrin},
+                { "Mend", Script.MendeKikakui},
+                { "Merc", Script.MeroiticCursive},
+                { "Mero", Script.MeroiticHieroglyphs},
+                { "Mlym", Script.Malayalam},
+                { "Modi", Script.Modi},
+                { "Mong", Script.Mongolian},
+                { "Mroo", Script.Mro},
+                { "Mtei", Script.MeeteiMayek},
+                { "Mult", Script.Multani},
+                { "Mymr", Script.Myanmar},
+                { "Nagm", Script.NagMundari},
+                { "Nand", Script.Nandinagari},
+                { "Narb", Script.OldNorthArabian},
+                { "Nbat", Script.Nabataean},
+                { "Newa", Script.Newa},
+                { "Nkoo", Script.Nko},
+                { "Nshu", Script.Nushu},
+                { "Ogam", Script.Ogham},
+                { "Olck", Script.OlChiki},
+                { "Orkh", Script.OldTurkic},
+                { "Orya", Script.Oriya},
+                { "Osge", Script.Osage},
+                { "Osma", Script.Osmanya},
+                { "Ougr", Script.OldUyghur},
+                { "Palm", Script.Palmyrene},
+                { "Pauc", Script.PauCinHau},
+                { "Perm", Script.OldPermic},
+                { "Phag", Script.PhagsPa},
+                { "Phli", Script.InscriptionalPahlavi},
+                { "Phlp", Script.PsalterPahlavi},
+                { "Phnx", Script.Phoenician},
+                { "Plrd", Script.Miao},
+                { "Prti", Script.InscriptionalParthian},
+                { "Rjng", Script.Rejang},
+                { "Rohg", Script.HanifiRohingya},
+                { "Runr", Script.Runic},
+                { "Samr", Script.Samaritan},
+                { "Sarb", Script.OldSouthArabian},
+                { "Saur", Script.Saurashtra},
+                { "Sgnw", Script.SignWriting},
+                { "Shaw", Script.Shavian},
+                { "Shrd", Script.Sharada},
+                { "Sidd", Script.Siddham},
+                { "Sind", Script.Khudawadi},
+                { "Sinh", Script.Sinhala},
+                { "Sogd", Script.Sogdian},
+                { "Sogo", Script.OldSogdian},
+                { "Sora", Script.SoraSompeng},
+                { "Soyo", Script.Soyombo},
+                { "Sund", Script.Sundanese},
+                { "Sylo", Script.SylotiNagri},
+                { "Syrc", Script.Syriac},
+                { "Tagb", Script.Tagbanwa},
+                { "Takr", Script.Takri},
+                { "Tale", Script.TaiLe},
+                { "Talu", Script.NewTaiLue},
+                { "Taml", Script.Tamil},
+                { "Tang", Script.Tangut},
+                { "Tavt", Script.TaiViet},
+                { "Telu", Script.Telugu},
+                { "Tfng", Script.Tifinagh},
+                { "Tglg", Script.Tagalog},
+                { "Thaa", Script.Thaana},
+                { "Thai", Script.Thai},
+                { "Tibt", Script.Tibetan},
+                { "Tirh", Script.Tirhuta},
+                { "Tnsa", Script.Tangsa},
+                { "Toto", Script.Toto},
+                { "Ugar", Script.Ugaritic},
+                { "Vaii", Script.Vai},
+                { "Vith", Script.Vithkuqi},
+                { "Wara", Script.WarangCiti},
+                { "Wcho", Script.Wancho},
+                { "Xpeo", Script.OldPersian},
+                { "Xsux", Script.Cuneiform},
+                { "Yezi", Script.Yezidi},
+                { "Yiii", Script.Yi},
+                { "Zanb", Script.ZanabazarSquare},
+        };
+
+        public static Script GetScript(string tag)
+        {
+            if(!s_tagToScript.ContainsKey(tag))
+            {
+                return Script.Unknown;
+            }
+            return s_tagToScript[tag];
+        }
+
+        private static readonly Dictionary<string, GeneralCategory> s_tagToGeneralCategory = 
+            new Dictionary<string,GeneralCategory>{
+                { "C", GeneralCategory.Other},
+                { "Cc", GeneralCategory.Control},
+                { "Cf", GeneralCategory.Format},
+                { "Cn", GeneralCategory.Unassigned},
+                { "Co", GeneralCategory.PrivateUse},
+                { "Cs", GeneralCategory.Surrogate},
+                { "L", GeneralCategory.Letter},
+                { "LC", GeneralCategory.CasedLetter},
+                { "Ll", GeneralCategory.LowercaseLetter},
+                { "Lm", GeneralCategory.ModifierLetter},
+                { "Lo", GeneralCategory.OtherLetter},
+                { "Lt", GeneralCategory.TitlecaseLetter},
+                { "Lu", GeneralCategory.UppercaseLetter},
+                { "M", GeneralCategory.Mark},
+                { "Mc", GeneralCategory.SpacingMark},
+                { "Me", GeneralCategory.EnclosingMark},
+                { "Mn", GeneralCategory.NonspacingMark},
+                { "N", GeneralCategory.Number},
+                { "Nd", GeneralCategory.DecimalNumber},
+                { "Nl", GeneralCategory.LetterNumber},
+                { "No", GeneralCategory.OtherNumber},
+                { "P", GeneralCategory.Punctuation},
+                { "Pc", GeneralCategory.ConnectorPunctuation},
+                { "Pd", GeneralCategory.DashPunctuation},
+                { "Pe", GeneralCategory.ClosePunctuation},
+                { "Pf", GeneralCategory.FinalPunctuation},
+                { "Pi", GeneralCategory.InitialPunctuation},
+                { "Po", GeneralCategory.OtherPunctuation},
+                { "Ps", GeneralCategory.OpenPunctuation},
+                { "S", GeneralCategory.Symbol},
+                { "Sc", GeneralCategory.CurrencySymbol},
+                { "Sk", GeneralCategory.ModifierSymbol},
+                { "Sm", GeneralCategory.MathSymbol},
+                { "So", GeneralCategory.OtherSymbol},
+                { "Z", GeneralCategory.Separator},
+                { "Zl", GeneralCategory.LineSeparator},
+                { "Zp", GeneralCategory.ParagraphSeparator},
+                { "Zs", GeneralCategory.SpaceSeparator},
+        };
+
+        public static GeneralCategory GetGeneralCategory(string tag)
+        {
+            if(!s_tagToGeneralCategory.ContainsKey(tag))
+            {
+                return GeneralCategory.Other;
+            }
+            return s_tagToGeneralCategory[tag];
+        }
+
+        private static readonly Dictionary<string, LineBreakClass> s_tagToLineBreakClass = 
+            new Dictionary<string,LineBreakClass>{
+                { "OP", LineBreakClass.OpenPunctuation},
+                { "CL", LineBreakClass.ClosePunctuation},
+                { "CP", LineBreakClass.CloseParenthesis},
+                { "QU", LineBreakClass.Quotation},
+                { "GL", LineBreakClass.Glue},
+                { "NS", LineBreakClass.Nonstarter},
+                { "EX", LineBreakClass.Exclamation},
+                { "SY", LineBreakClass.BreakSymbols},
+                { "IS", LineBreakClass.InfixNumeric},
+                { "PR", LineBreakClass.PrefixNumeric},
+                { "PO", LineBreakClass.PostfixNumeric},
+                { "NU", LineBreakClass.Numeric},
+                { "AL", LineBreakClass.Alphabetic},
+                { "HL", LineBreakClass.HebrewLetter},
+                { "ID", LineBreakClass.Ideographic},
+                { "IN", LineBreakClass.Inseparable},
+                { "HY", LineBreakClass.Hyphen},
+                { "BA", LineBreakClass.BreakAfter},
+                { "BB", LineBreakClass.BreakBefore},
+                { "B2", LineBreakClass.BreakBoth},
+                { "ZW", LineBreakClass.ZWSpace},
+                { "CM", LineBreakClass.CombiningMark},
+                { "WJ", LineBreakClass.WordJoiner},
+                { "H2", LineBreakClass.H2},
+                { "H3", LineBreakClass.H3},
+                { "JL", LineBreakClass.JL},
+                { "JV", LineBreakClass.JV},
+                { "JT", LineBreakClass.JT},
+                { "RI", LineBreakClass.RegionalIndicator},
+                { "EB", LineBreakClass.EBase},
+                { "EM", LineBreakClass.EModifier},
+                { "ZWJ", LineBreakClass.ZWJ},
+                { "CB", LineBreakClass.ContingentBreak},
+                { "XX", LineBreakClass.Unknown},
+                { "AI", LineBreakClass.Ambiguous},
+                { "BK", LineBreakClass.MandatoryBreak},
+                { "CJ", LineBreakClass.ConditionalJapaneseStarter},
+                { "CR", LineBreakClass.CarriageReturn},
+                { "LF", LineBreakClass.LineFeed},
+                { "NL", LineBreakClass.NextLine},
+                { "SA", LineBreakClass.ComplexContext},
+                { "SG", LineBreakClass.Surrogate},
+                { "SP", LineBreakClass.Space},
+        };
+
+        public static LineBreakClass GetLineBreakClass(string tag)
+        {
+            if(!s_tagToLineBreakClass.ContainsKey(tag))
+            {
+                return LineBreakClass.Unknown;
+            }
+            return s_tagToLineBreakClass[tag];
+        }
+
+        private static readonly Dictionary<string, BidiPairedBracketType> s_tagToBidiPairedBracketType = 
+            new Dictionary<string,BidiPairedBracketType>{
+                { "n", BidiPairedBracketType.None},
+                { "c", BidiPairedBracketType.Close},
+                { "o", BidiPairedBracketType.Open},
+        };
+
+        public static BidiPairedBracketType GetBidiPairedBracketType(string tag)
+        {
+            if(!s_tagToBidiPairedBracketType.ContainsKey(tag))
+            {
+                return BidiPairedBracketType.None;
+            }
+            return s_tagToBidiPairedBracketType[tag];
+        }
+
+        private static readonly Dictionary<string, BidiClass> s_tagToBidiClass = 
+            new Dictionary<string,BidiClass>{
+                { "L", BidiClass.LeftToRight},
+                { "AL", BidiClass.ArabicLetter},
+                { "AN", BidiClass.ArabicNumber},
+                { "B", BidiClass.ParagraphSeparator},
+                { "BN", BidiClass.BoundaryNeutral},
+                { "CS", BidiClass.CommonSeparator},
+                { "EN", BidiClass.EuropeanNumber},
+                { "ES", BidiClass.EuropeanSeparator},
+                { "ET", BidiClass.EuropeanTerminator},
+                { "FSI", BidiClass.FirstStrongIsolate},
+                { "LRE", BidiClass.LeftToRightEmbedding},
+                { "LRI", BidiClass.LeftToRightIsolate},
+                { "LRO", BidiClass.LeftToRightOverride},
+                { "NSM", BidiClass.NonspacingMark},
+                { "ON", BidiClass.OtherNeutral},
+                { "PDF", BidiClass.PopDirectionalFormat},
+                { "PDI", BidiClass.PopDirectionalIsolate},
+                { "R", BidiClass.RightToLeft},
+                { "RLE", BidiClass.RightToLeftEmbedding},
+                { "RLI", BidiClass.RightToLeftIsolate},
+                { "RLO", BidiClass.RightToLeftOverride},
+                { "S", BidiClass.SegmentSeparator},
+                { "WS", BidiClass.WhiteSpace},
+        };
+
+        public static BidiClass GetBidiClass(string tag)
+        {
+            if(!s_tagToBidiClass.ContainsKey(tag))
+            {
+                return BidiClass.LeftToRight;
+            }
+            return s_tagToBidiClass[tag];
+        }
+
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/Script.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Script.cs
new file mode 100644
index 0000000000..dbdc1c12df
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/Script.cs
@@ -0,0 +1,171 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public enum Script
+    {
+        Unknown, //Zzzz
+        Common, //Zyyy
+        Inherited, //Zinh
+        Adlam, //Adlm
+        CaucasianAlbanian, //Aghb
+        Ahom, //Ahom
+        Arabic, //Arab
+        ImperialAramaic, //Armi
+        Armenian, //Armn
+        Avestan, //Avst
+        Balinese, //Bali
+        Bamum, //Bamu
+        BassaVah, //Bass
+        Batak, //Batk
+        Bengali, //Beng
+        Bhaiksuki, //Bhks
+        Bopomofo, //Bopo
+        Brahmi, //Brah
+        Braille, //Brai
+        Buginese, //Bugi
+        Buhid, //Buhd
+        Chakma, //Cakm
+        CanadianAboriginal, //Cans
+        Carian, //Cari
+        Cham, //Cham
+        Cherokee, //Cher
+        Chorasmian, //Chrs
+        Coptic, //Copt
+        CyproMinoan, //Cpmn
+        Cypriot, //Cprt
+        Cyrillic, //Cyrl
+        Devanagari, //Deva
+        DivesAkuru, //Diak
+        Dogra, //Dogr
+        Deseret, //Dsrt
+        Duployan, //Dupl
+        EgyptianHieroglyphs, //Egyp
+        Elbasan, //Elba
+        Elymaic, //Elym
+        Ethiopic, //Ethi
+        Georgian, //Geor
+        Glagolitic, //Glag
+        GunjalaGondi, //Gong
+        MasaramGondi, //Gonm
+        Gothic, //Goth
+        Grantha, //Gran
+        Greek, //Grek
+        Gujarati, //Gujr
+        Gurmukhi, //Guru
+        Hangul, //Hang
+        Han, //Hani
+        Hanunoo, //Hano
+        Hatran, //Hatr
+        Hebrew, //Hebr
+        Hiragana, //Hira
+        AnatolianHieroglyphs, //Hluw
+        PahawhHmong, //Hmng
+        NyiakengPuachueHmong, //Hmnp
+        KatakanaOrHiragana, //Hrkt
+        OldHungarian, //Hung
+        OldItalic, //Ital
+        Javanese, //Java
+        KayahLi, //Kali
+        Katakana, //Kana
+        Kawi, //Kawi
+        Kharoshthi, //Khar
+        Khmer, //Khmr
+        Khojki, //Khoj
+        KhitanSmallScript, //Kits
+        Kannada, //Knda
+        Kaithi, //Kthi
+        TaiTham, //Lana
+        Lao, //Laoo
+        Latin, //Latn
+        Lepcha, //Lepc
+        Limbu, //Limb
+        LinearA, //Lina
+        LinearB, //Linb
+        Lisu, //Lisu
+        Lycian, //Lyci
+        Lydian, //Lydi
+        Mahajani, //Mahj
+        Makasar, //Maka
+        Mandaic, //Mand
+        Manichaean, //Mani
+        Marchen, //Marc
+        Medefaidrin, //Medf
+        MendeKikakui, //Mend
+        MeroiticCursive, //Merc
+        MeroiticHieroglyphs, //Mero
+        Malayalam, //Mlym
+        Modi, //Modi
+        Mongolian, //Mong
+        Mro, //Mroo
+        MeeteiMayek, //Mtei
+        Multani, //Mult
+        Myanmar, //Mymr
+        NagMundari, //Nagm
+        Nandinagari, //Nand
+        OldNorthArabian, //Narb
+        Nabataean, //Nbat
+        Newa, //Newa
+        Nko, //Nkoo
+        Nushu, //Nshu
+        Ogham, //Ogam
+        OlChiki, //Olck
+        OldTurkic, //Orkh
+        Oriya, //Orya
+        Osage, //Osge
+        Osmanya, //Osma
+        OldUyghur, //Ougr
+        Palmyrene, //Palm
+        PauCinHau, //Pauc
+        OldPermic, //Perm
+        PhagsPa, //Phag
+        InscriptionalPahlavi, //Phli
+        PsalterPahlavi, //Phlp
+        Phoenician, //Phnx
+        Miao, //Plrd
+        InscriptionalParthian, //Prti
+        Rejang, //Rjng
+        HanifiRohingya, //Rohg
+        Runic, //Runr
+        Samaritan, //Samr
+        OldSouthArabian, //Sarb
+        Saurashtra, //Saur
+        SignWriting, //Sgnw
+        Shavian, //Shaw
+        Sharada, //Shrd
+        Siddham, //Sidd
+        Khudawadi, //Sind
+        Sinhala, //Sinh
+        Sogdian, //Sogd
+        OldSogdian, //Sogo
+        SoraSompeng, //Sora
+        Soyombo, //Soyo
+        Sundanese, //Sund
+        SylotiNagri, //Sylo
+        Syriac, //Syrc
+        Tagbanwa, //Tagb
+        Takri, //Takr
+        TaiLe, //Tale
+        NewTaiLue, //Talu
+        Tamil, //Taml
+        Tangut, //Tang
+        TaiViet, //Tavt
+        Telugu, //Telu
+        Tifinagh, //Tfng
+        Tagalog, //Tglg
+        Thaana, //Thaa
+        Thai, //Thai
+        Tibetan, //Tibt
+        Tirhuta, //Tirh
+        Tangsa, //Tnsa
+        Toto, //Toto
+        Ugaritic, //Ugar
+        Vai, //Vaii
+        Vithkuqi, //Vith
+        WarangCiti, //Wara
+        Wancho, //Wcho
+        OldPersian, //Xpeo
+        Cuneiform, //Xsux
+        Yezidi, //Yezi
+        Yi, //Yiii
+        ZanabazarSquare, //Zanb
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.cs
new file mode 100644
index 0000000000..0142a20790
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.cs
@@ -0,0 +1,121 @@
+using System.IO;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    ///     Helper for looking up unicode character class information
+    /// </summary>
+    internal static class UnicodeData
+    {
+        internal const int CATEGORY_BITS = 6;
+        internal const int SCRIPT_BITS = 8;
+        internal const int LINEBREAK_BITS = 6;
+
+        internal const int BIDIPAIREDBRACKED_BITS = 16;
+        internal const int BIDIPAIREDBRACKEDTYPE_BITS = 2;
+        internal const int BIDICLASS_BITS = 5;
+
+        internal const int SCRIPT_SHIFT = CATEGORY_BITS;
+        internal const int LINEBREAK_SHIFT = CATEGORY_BITS + SCRIPT_BITS;
+
+        internal const int BIDIPAIREDBRACKEDTYPE_SHIFT = BIDIPAIREDBRACKED_BITS;
+        internal const int BIDICLASS_SHIFT = BIDIPAIREDBRACKED_BITS + BIDIPAIREDBRACKEDTYPE_BITS;
+
+        internal const int CATEGORY_MASK = (1 << CATEGORY_BITS) - 1;
+        internal const int SCRIPT_MASK = (1 << SCRIPT_BITS) - 1;
+        internal const int LINEBREAK_MASK = (1 << LINEBREAK_BITS) - 1;
+
+        internal const int BIDIPAIREDBRACKED_MASK = (1 << BIDIPAIREDBRACKED_BITS) - 1;
+        internal const int BIDIPAIREDBRACKEDTYPE_MASK = (1 << BIDIPAIREDBRACKEDTYPE_BITS) - 1;
+        internal const int BIDICLASS_MASK = (1 << BIDICLASS_BITS) - 1;
+
+        private static readonly UnicodeTrie s_unicodeDataTrie;
+        private static readonly UnicodeTrie s_graphemeBreakTrie;
+        private static readonly UnicodeTrie s_biDiTrie;
+
+        static UnicodeData()
+        {
+            s_unicodeDataTrie = new UnicodeTrie(UnicodeDataTrie.Data);
+            s_graphemeBreakTrie = new UnicodeTrie(GraphemeBreakTrie.Data);
+            s_biDiTrie = new UnicodeTrie(BidiTrie.Data);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="GeneralCategory"/> for a Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's general category.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static GeneralCategory GetGeneralCategory(uint codepoint)
+        {
+            return (GeneralCategory)(s_unicodeDataTrie.Get(codepoint) & CATEGORY_MASK);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Script"/> for a Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's script.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Script GetScript(uint codepoint)
+        {
+            return (Script)((s_unicodeDataTrie.Get(codepoint) >> SCRIPT_SHIFT) & SCRIPT_MASK);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="BidiClass"/> for a Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's biDi class.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static BidiClass GetBiDiClass(uint codepoint)
+        {
+            return (BidiClass)((s_biDiTrie.Get(codepoint) >> BIDICLASS_SHIFT) & BIDICLASS_MASK);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="BidiPairedBracketType"/> for a Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's paired bracket type.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static BidiPairedBracketType GetBiDiPairedBracketType(uint codepoint)
+        {
+            return (BidiPairedBracketType)((s_biDiTrie.Get(codepoint) >> BIDIPAIREDBRACKEDTYPE_SHIFT) & BIDIPAIREDBRACKEDTYPE_MASK);
+        }
+
+        /// <summary>
+        /// Gets the paired bracket for a Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's paired bracket.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Codepoint GetBiDiPairedBracket(uint codepoint)
+        {
+            return new Codepoint((s_biDiTrie.Get(codepoint) & BIDIPAIREDBRACKED_MASK));
+        }
+
+        /// <summary>
+        /// Gets the line break class for a Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's line break class.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static LineBreakClass GetLineBreakClass(uint codepoint)
+        {
+            return (LineBreakClass)((s_unicodeDataTrie.Get(codepoint) >> LINEBREAK_SHIFT) & LINEBREAK_MASK);
+        }
+
+        /// <summary>
+        /// Gets the grapheme break type for the Unicode codepoint.
+        /// </summary>
+        /// <param name="codepoint">The codepoint in question.</param>
+        /// <returns>The code point's grapheme break type.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static GraphemeBreakClass GetGraphemeClusterBreak(uint codepoint)
+        {
+            return (GraphemeBreakClass)s_graphemeBreakTrie.Get(codepoint);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.trie.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.trie.cs
new file mode 100644
index 0000000000..17201eab0e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.trie.cs
@@ -0,0 +1,1099 @@
+using System;
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+   internal static class UnicodeDataTrie
+    {
+        public static ReadOnlySpan<byte> Data => new byte[]
+        {
+            0, 0, 16, 0, 0, 0, 0, 0, 64, 169, 1, 0, 103, 4, 0, 0, 111, 4, 0, 0, 119, 4, 0, 0, 127, 4, 0, 0, 151, 4, 0, 0, 159, 4, 0, 0, 167, 4, 0, 0, 175, 4, 0, 0, 183, 4, 0, 0, 191, 4, 0, 0, 197, 4, 0, 0, 205, 4, 0, 0, 213, 4, 0, 0, 221, 4, 0, 0, 229, 4, 0, 0, 237, 4, 0, 0, 243, 4, 0, 0, 251, 4, 0, 0, 3, 5, 0, 0, 11, 5, 0, 0, 14, 5, 0, 0, 22, 5, 0, 0,
+            30, 5, 0, 0, 38, 5, 0, 0, 46, 5, 0, 0, 54, 5, 0, 0, 59, 5, 0, 0, 67, 5, 0, 0, 75, 5, 0, 0, 83, 5, 0, 0, 88, 5, 0, 0, 96, 5, 0, 0, 104, 5, 0, 0, 112, 5, 0, 0, 116, 5, 0, 0, 124, 5, 0, 0, 132, 5, 0, 0, 140, 5, 0, 0, 148, 5, 0, 0, 156, 5, 0, 0, 152, 5, 0, 0, 160, 5, 0, 0, 165, 5, 0, 0, 173, 5, 0, 0, 179, 5, 0, 0, 187, 5, 0, 0, 195, 5, 0, 0,
+            203, 5, 0, 0, 211, 5, 0, 0, 219, 5, 0, 0, 227, 5, 0, 0, 235, 5, 0, 0, 240, 5, 0, 0, 248, 5, 0, 0, 251, 5, 0, 0, 3, 6, 0, 0, 11, 6, 0, 0, 19, 6, 0, 0, 25, 6, 0, 0, 33, 6, 0, 0, 41, 6, 0, 0, 49, 6, 0, 0, 57, 6, 0, 0, 65, 6, 0, 0, 71, 19, 0, 0, 73, 6, 0, 0, 81, 6, 0, 0, 89, 6, 0, 0, 95, 6, 0, 0, 219, 5, 0, 0, 79, 19, 0, 0, 68, 23, 0, 0,
+            220, 19, 0, 0, 222, 19, 0, 0, 230, 19, 0, 0, 87, 19, 0, 0, 103, 6, 0, 0, 109, 6, 0, 0, 117, 6, 0, 0, 125, 6, 0, 0, 133, 6, 0, 0, 139, 6, 0, 0, 147, 6, 0, 0, 155, 6, 0, 0, 163, 6, 0, 0, 169, 6, 0, 0, 177, 6, 0, 0, 185, 6, 0, 0, 193, 6, 0, 0, 199, 6, 0, 0, 207, 6, 0, 0, 215, 6, 0, 0, 223, 6, 0, 0, 231, 6, 0, 0, 239, 6, 0, 0, 246, 6, 0, 0, 254, 6, 0, 0,
+            4, 7, 0, 0, 12, 7, 0, 0, 20, 7, 0, 0, 28, 7, 0, 0, 34, 7, 0, 0, 42, 7, 0, 0, 50, 7, 0, 0, 58, 7, 0, 0, 238, 19, 0, 0, 66, 7, 0, 0, 74, 7, 0, 0, 82, 7, 0, 0, 89, 7, 0, 0, 97, 7, 0, 0, 105, 7, 0, 0, 113, 7, 0, 0, 117, 7, 0, 0, 125, 7, 0, 0, 132, 7, 0, 0, 140, 7, 0, 0, 147, 7, 0, 0, 155, 7, 0, 0, 132, 7, 0, 0, 246, 19, 0, 0, 76, 23, 0, 0,
+            163, 7, 0, 0, 168, 7, 0, 0, 176, 7, 0, 0, 183, 7, 0, 0, 191, 7, 0, 0, 132, 7, 0, 0, 254, 19, 0, 0, 4, 20, 0, 0, 12, 20, 0, 0, 20, 20, 0, 0, 28, 20, 0, 0, 224, 17, 0, 0, 199, 7, 0, 0, 216, 18, 0, 0, 36, 20, 0, 0, 36, 20, 0, 0, 36, 20, 0, 0, 44, 20, 0, 0, 44, 20, 0, 0, 50, 20, 0, 0, 52, 20, 0, 0, 52, 20, 0, 0, 60, 20, 0, 0, 60, 20, 0, 0, 207, 7, 0, 0,
+            60, 20, 0, 0, 215, 7, 0, 0, 219, 7, 0, 0, 227, 7, 0, 0, 60, 20, 0, 0, 233, 7, 0, 0, 60, 20, 0, 0, 239, 7, 0, 0, 247, 7, 0, 0, 255, 7, 0, 0, 232, 17, 0, 0, 232, 17, 0, 0, 7, 8, 0, 0, 68, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0,
+            69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 69, 20, 0, 0, 74, 20, 0, 0, 15, 8, 0, 0, 82, 20, 0, 0, 82, 20, 0, 0, 23, 8, 0, 0, 31, 8, 0, 0, 39, 8, 0, 0, 47, 8, 0, 0, 55, 8, 0, 0, 90, 20, 0, 0, 93, 20, 0, 0, 63, 8, 0, 0, 71, 8, 0, 0, 79, 8, 0, 0, 101, 20, 0, 0, 95, 19, 0, 0, 87, 8, 0, 0, 108, 20, 0, 0,
+            95, 8, 0, 0, 69, 20, 0, 0, 99, 8, 0, 0, 107, 8, 0, 0, 115, 8, 0, 0, 123, 8, 0, 0, 128, 8, 0, 0, 116, 20, 0, 0, 136, 8, 0, 0, 142, 8, 0, 0, 54, 25, 0, 0, 150, 8, 0, 0, 124, 20, 0, 0, 158, 8, 0, 0, 166, 8, 0, 0, 174, 8, 0, 0, 182, 8, 0, 0, 190, 8, 0, 0, 132, 7, 0, 0, 132, 20, 0, 0, 135, 20, 0, 0, 198, 8, 0, 0, 206, 8, 0, 0, 143, 20, 0, 0, 151, 20, 0, 0,
+            159, 20, 0, 0, 214, 8, 0, 0, 167, 20, 0, 0, 222, 8, 0, 0, 230, 8, 0, 0, 103, 19, 0, 0, 238, 8, 0, 0, 242, 8, 0, 0, 250, 8, 0, 0, 2, 9, 0, 0, 7, 5, 0, 0, 224, 18, 0, 0, 111, 19, 0, 0, 232, 18, 0, 0, 239, 18, 0, 0, 119, 19, 0, 0, 84, 23, 0, 0, 88, 23, 0, 0, 183, 4, 0, 0, 183, 4, 0, 0, 183, 4, 0, 0, 183, 4, 0, 0, 240, 17, 0, 0, 183, 4, 0, 0, 183, 4, 0, 0,
+            183, 4, 0, 0, 10, 9, 0, 0, 248, 17, 0, 0, 14, 9, 0, 0, 22, 9, 0, 0, 247, 18, 0, 0, 30, 9, 0, 0, 38, 9, 0, 0, 46, 9, 0, 0, 23, 24, 0, 0, 31, 24, 0, 0, 39, 24, 0, 0, 54, 9, 0, 0, 62, 9, 0, 0, 38, 25, 0, 0, 70, 9, 0, 0, 78, 9, 0, 0, 0, 18, 0, 0, 8, 18, 0, 0, 16, 18, 0, 0, 168, 23, 0, 0, 86, 9, 0, 0, 132, 24, 0, 0, 137, 24, 0, 0, 143, 24, 0, 0,
+            151, 24, 0, 0, 159, 24, 0, 0, 167, 24, 0, 0, 175, 24, 0, 0, 183, 24, 0, 0, 190, 24, 0, 0, 198, 24, 0, 0, 203, 24, 0, 0, 79, 24, 0, 0, 87, 24, 0, 0, 62, 25, 0, 0, 211, 24, 0, 0, 219, 24, 0, 0, 226, 24, 0, 0, 231, 24, 0, 0, 239, 24, 0, 0, 62, 25, 0, 0, 93, 9, 0, 0, 101, 9, 0, 0, 195, 23, 0, 0, 196, 23, 0, 0, 70, 25, 0, 0, 70, 25, 0, 0, 203, 23, 0, 0, 70, 25, 0, 0,
+            70, 25, 0, 0, 75, 25, 0, 0, 79, 25, 0, 0, 87, 25, 0, 0, 247, 24, 0, 0, 255, 24, 0, 0, 7, 25, 0, 0, 95, 25, 0, 0, 103, 25, 0, 0, 111, 25, 0, 0, 15, 25, 0, 0, 112, 25, 0, 0, 120, 25, 0, 0, 128, 25, 0, 0, 136, 25, 0, 0, 144, 25, 0, 0, 62, 25, 0, 0, 148, 25, 0, 0, 211, 23, 0, 0, 217, 23, 0, 0, 62, 25, 0, 0, 95, 24, 0, 0, 102, 24, 0, 0, 156, 25, 0, 0, 156, 25, 0, 0,
+            156, 25, 0, 0, 156, 25, 0, 0, 156, 25, 0, 0, 156, 25, 0, 0, 156, 25, 0, 0, 156, 25, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 110, 24, 0, 0, 198, 24, 0, 0, 117, 24, 0, 0, 124, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 198, 24, 0, 0, 62, 25, 0, 0, 23, 25, 0, 0, 30, 25, 0, 0,
+            109, 9, 0, 0, 115, 9, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 24, 18, 0, 0, 28, 18, 0, 0, 255, 18, 0, 0, 36, 18, 0, 0, 44, 18, 0, 0, 44, 18, 0, 0, 44, 18, 0, 0, 123, 9, 0, 0, 7, 19, 0, 0, 131, 9, 0, 0, 175, 20, 0, 0, 137, 9, 0, 0, 145, 9, 0, 0, 153, 9, 0, 0, 153, 9, 0, 0, 96, 23, 0, 0, 71, 24, 0, 0, 127, 19, 0, 0, 161, 9, 0, 0, 132, 7, 0, 0,
+            169, 9, 0, 0, 164, 25, 0, 0, 164, 25, 0, 0, 176, 9, 0, 0, 164, 25, 0, 0, 164, 25, 0, 0, 164, 25, 0, 0, 164, 25, 0, 0, 164, 25, 0, 0, 164, 25, 0, 0, 184, 9, 0, 0, 190, 9, 0, 0, 135, 19, 0, 0, 143, 19, 0, 0, 198, 9, 0, 0, 183, 20, 0, 0, 206, 9, 0, 0, 191, 20, 0, 0, 199, 20, 0, 0, 151, 19, 0, 0, 214, 9, 0, 0, 218, 9, 0, 0, 207, 20, 0, 0, 207, 20, 0, 0, 223, 9, 0, 0,
+            215, 20, 0, 0, 172, 25, 0, 0, 230, 9, 0, 0, 238, 9, 0, 0, 225, 23, 0, 0, 231, 23, 0, 0, 180, 25, 0, 0, 225, 23, 0, 0, 239, 23, 0, 0, 188, 25, 0, 0, 192, 25, 0, 0, 200, 25, 0, 0, 200, 25, 0, 0, 202, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            62, 25, 0, 0, 62, 25, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 159, 19, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0,
+            231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 231, 20, 0, 0, 246, 9, 0, 0, 210, 25, 0, 0, 253, 9, 0, 0, 167, 19, 0, 0, 239, 20, 0, 0, 239, 20, 0, 0,
+            239, 20, 0, 0, 239, 20, 0, 0, 239, 20, 0, 0, 239, 20, 0, 0, 239, 20, 0, 0, 239, 20, 0, 0, 175, 19, 0, 0, 5, 10, 0, 0, 124, 5, 0, 0, 52, 18, 0, 0, 60, 18, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 13, 10, 0, 0, 183, 19, 0, 0, 68, 18, 0, 0, 183, 4, 0, 0, 73, 18, 0, 0, 81, 18, 0, 0, 87, 18, 0, 0, 21, 10, 0, 0, 28, 10, 0, 0, 255, 20, 0, 0, 36, 10, 0, 0, 7, 21, 0, 0,
+            44, 10, 0, 0, 15, 21, 0, 0, 18, 21, 0, 0, 52, 10, 0, 0, 26, 21, 0, 0, 34, 21, 0, 0, 41, 21, 0, 0, 60, 10, 0, 0, 68, 10, 0, 0, 49, 21, 0, 0, 53, 21, 0, 0, 76, 10, 0, 0, 84, 10, 0, 0, 61, 21, 0, 0, 92, 10, 0, 0, 100, 10, 0, 0, 191, 19, 0, 0, 69, 21, 0, 0, 73, 21, 0, 0, 108, 10, 0, 0, 116, 10, 0, 0, 124, 10, 0, 0, 132, 10, 0, 0, 15, 19, 0, 0, 139, 10, 0, 0,
+            23, 19, 0, 0, 23, 19, 0, 0, 81, 21, 0, 0, 147, 10, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0,
+            89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0,
+            93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0,
+            90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0,
+            94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0,
+            91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0,
+            95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0,
+            92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0,
+            89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0,
+            93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0,
+            90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0,
+            94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0,
+            91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0,
+            95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0, 92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 95, 21, 0, 0, 89, 21, 0, 0, 90, 21, 0, 0, 91, 21, 0, 0,
+            92, 21, 0, 0, 93, 21, 0, 0, 94, 21, 0, 0, 155, 10, 0, 0, 162, 10, 0, 0, 165, 10, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0,
+            135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0,
+            63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 173, 10, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 177, 10, 0, 0, 132, 7, 0, 0, 185, 10, 0, 0, 193, 10, 0, 0, 201, 10, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 103, 21, 0, 0, 209, 10, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0,
+            219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 111, 21, 0, 0, 119, 21, 0, 0, 219, 5, 0, 0, 214, 10, 0, 0, 219, 5, 0, 0, 220, 10, 0, 0, 224, 10, 0, 0, 232, 10, 0, 0, 104, 23, 0, 0, 240, 10, 0, 0, 248, 10, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 219, 5, 0, 0, 254, 10, 0, 0, 6, 11, 0, 0, 95, 18, 0, 0, 31, 19, 0, 0, 199, 19, 0, 0, 204, 19, 0, 0, 14, 11, 0, 0, 22, 11, 0, 0,
+            30, 11, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0,
+            63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 63, 24, 0, 0, 28, 18, 0, 0, 28, 18, 0, 0, 92, 18, 0, 0, 156, 18, 0, 0, 220, 18, 0, 0, 20, 19, 0, 0, 84, 19, 0, 0, 148, 19, 0, 0, 204, 19, 0, 0, 12, 20, 0, 0, 56, 20, 0, 0, 120, 20, 0, 0, 184, 20, 0, 0, 236, 20, 0, 0, 44, 21, 0, 0, 96, 21, 0, 0, 160, 21, 0, 0,
+            208, 21, 0, 0, 16, 22, 0, 0, 80, 22, 0, 0, 96, 22, 0, 0, 148, 22, 0, 0, 204, 22, 0, 0, 12, 23, 0, 0, 76, 23, 0, 0, 140, 23, 0, 0, 192, 23, 0, 0, 236, 23, 0, 0, 44, 24, 0, 0, 100, 24, 0, 0, 164, 24, 0, 0, 228, 24, 0, 0, 96, 10, 0, 0, 160, 10, 0, 0, 224, 10, 0, 0, 32, 11, 0, 0, 96, 11, 0, 0, 139, 11, 0, 0, 203, 11, 0, 0, 238, 11, 0, 0, 14, 12, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 78, 12, 0, 0, 89, 17, 0, 0, 89, 17, 0, 0, 142, 12, 0, 0, 206, 12, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 247, 12, 0, 0, 55, 13, 0, 0, 87, 13, 0, 0, 238, 11, 0, 0, 125, 13, 0, 0, 189, 13, 0, 0, 253, 13, 0, 0, 61, 14, 0, 0, 125, 14, 0, 0, 189, 14, 0, 0, 253, 14, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 61, 15, 0, 0, 160, 1, 0, 0, 117, 15, 0, 0, 181, 15, 0, 0, 160, 1, 0, 0, 192, 15, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0,
+            160, 1, 0, 0, 246, 15, 0, 0, 238, 11, 0, 0, 54, 16, 0, 0, 160, 1, 0, 0, 160, 1, 0, 0, 118, 16, 0, 0, 160, 1, 0, 0, 153, 16, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 217, 16, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0,
+            238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 238, 11, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0,
+            0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 0, 25, 17, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0,
+            135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0,
+            135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0,
+            135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 135, 4, 0, 0, 38, 11, 0, 0, 45, 11, 0, 0, 53, 11, 0, 0, 132, 7, 0, 0, 127, 21, 0, 0, 127, 21, 0, 0, 127, 21, 0, 0, 61, 11, 0, 0, 69, 11, 0, 0, 72, 11, 0, 0, 176, 23, 0, 0, 179, 23, 0, 0, 80, 11, 0, 0, 88, 11, 0, 0, 105, 9, 0, 0, 96, 11, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 104, 11, 0, 0, 135, 21, 0, 0, 112, 11, 0, 0, 120, 11, 0, 0, 143, 21, 0, 0, 128, 11, 0, 0, 136, 11, 0, 0, 140, 11, 0, 0, 148, 11, 0, 0, 151, 21, 0, 0, 156, 11, 0, 0, 132, 7, 0, 0, 103, 18, 0, 0, 109, 18, 0, 0, 39, 19, 0, 0, 159, 21, 0, 0, 164, 11, 0, 0, 172, 11, 0, 0, 176, 11, 0, 0, 182, 11, 0, 0, 167, 21, 0, 0,
+            190, 11, 0, 0, 175, 21, 0, 0, 197, 11, 0, 0, 201, 11, 0, 0, 209, 11, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 183, 21, 0, 0, 217, 11, 0, 0, 225, 11, 0, 0, 233, 11, 0, 0, 241, 11, 0, 0, 245, 11, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 253, 11, 0, 0, 0, 12, 0, 0,
+            8, 12, 0, 0, 191, 21, 0, 0, 16, 12, 0, 0, 24, 12, 0, 0, 132, 7, 0, 0, 32, 12, 0, 0, 40, 12, 0, 0, 48, 12, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 199, 21, 0, 0, 56, 12, 0, 0, 64, 12, 0, 0, 247, 23, 0, 0, 72, 12, 0, 0, 79, 12, 0, 0, 87, 12, 0, 0, 207, 21, 0, 0, 215, 21, 0, 0, 132, 7, 0, 0, 223, 21, 0, 0, 95, 12, 0, 0, 231, 21, 0, 0, 103, 12, 0, 0, 111, 12, 0, 0,
+            119, 12, 0, 0, 127, 12, 0, 0, 135, 12, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 239, 21, 0, 0, 239, 21, 0, 0, 143, 12, 0, 0, 132, 7, 0, 0, 117, 18, 0, 0, 151, 12, 0, 0, 47, 19, 0, 0, 159, 12, 0, 0, 247, 21, 0, 0, 167, 12, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 175, 12, 0, 0,
+            255, 21, 0, 0, 183, 12, 0, 0, 132, 7, 0, 0, 188, 12, 0, 0, 7, 22, 0, 0, 196, 12, 0, 0, 203, 12, 0, 0, 210, 12, 0, 0, 218, 12, 0, 0, 222, 12, 0, 0, 229, 12, 0, 0, 237, 12, 0, 0, 15, 22, 0, 0, 17, 22, 0, 0, 245, 12, 0, 0, 252, 12, 0, 0, 25, 22, 0, 0, 29, 22, 0, 0, 4, 13, 0, 0, 10, 13, 0, 0, 37, 22, 0, 0, 18, 13, 0, 0, 26, 13, 0, 0, 30, 13, 0, 0, 45, 22, 0, 0,
+            49, 22, 0, 0, 57, 22, 0, 0, 38, 13, 0, 0, 46, 13, 0, 0, 65, 22, 0, 0, 54, 13, 0, 0, 132, 7, 0, 0, 62, 13, 0, 0, 70, 13, 0, 0, 73, 22, 0, 0, 78, 13, 0, 0, 86, 13, 0, 0, 92, 13, 0, 0, 100, 13, 0, 0, 108, 13, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 81, 22, 0, 0, 84, 22, 0, 0, 116, 13, 0, 0, 124, 13, 0, 0, 92, 22, 0, 0, 96, 22, 0, 0,
+            132, 13, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 104, 22, 0, 0, 140, 13, 0, 0, 148, 13, 0, 0, 132, 7, 0, 0, 112, 22, 0, 0, 116, 22, 0, 0, 156, 13, 0, 0, 164, 13, 0, 0, 124, 22, 0, 0, 172, 13, 0, 0, 180, 13, 0, 0, 132, 7, 0, 0, 188, 13, 0, 0, 196, 13, 0, 0, 204, 13, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 22, 0, 0, 212, 13, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 125, 18, 0, 0, 55, 19, 0, 0, 220, 13, 0, 0, 228, 13, 0, 0, 234, 13, 0, 0, 242, 13, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 250, 13, 0, 0, 254, 13, 0, 0, 6, 14, 0, 0, 140, 22, 0, 0, 144, 22, 0, 0, 14, 14, 0, 0, 152, 22, 0, 0, 158, 22, 0, 0, 22, 14, 0, 0, 166, 22, 0, 0, 30, 14, 0, 0,
+            38, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 46, 14, 0, 0, 51, 14, 0, 0, 59, 14, 0, 0, 66, 14, 0, 0, 71, 14, 0, 0, 77, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 85, 14, 0, 0, 89, 14, 0, 0, 97, 14, 0, 0, 105, 14, 0, 0, 111, 14, 0, 0, 119, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 127, 14, 0, 0, 135, 14, 0, 0, 140, 14, 0, 0, 148, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 155, 14, 0, 0, 255, 23, 0, 0, 163, 14, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0,
+            174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 171, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 187, 23, 0, 0, 187, 23, 0, 0, 187, 23, 0, 0,
+            179, 14, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 174, 22, 0, 0, 187, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 191, 14, 0, 0, 182, 22, 0, 0, 182, 22, 0, 0, 195, 14, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0,
+            190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 192, 22, 0, 0, 190, 22, 0, 0, 200, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 203, 22, 0, 0,
+            190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 190, 22, 0, 0, 210, 22, 0, 0, 203, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0,
+            218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 223, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 218, 22, 0, 0, 211, 14, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 247, 20, 0, 0, 219, 14, 0, 0, 227, 14, 0, 0, 235, 14, 0, 0, 231, 22, 0, 0, 239, 14, 0, 0,
+            247, 14, 0, 0, 252, 14, 0, 0, 239, 22, 0, 0, 243, 22, 0, 0, 4, 15, 0, 0, 12, 15, 0, 0, 20, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 133, 18, 0, 0, 63, 19, 0, 0, 28, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 251, 22, 0, 0, 251, 22, 0, 0, 36, 15, 0, 0, 152, 23, 0, 0, 42, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 50, 15, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 58, 15, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 11, 23, 0, 0, 66, 15, 0, 0, 132, 7, 0, 0, 74, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 78, 15, 0, 0, 19, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 20, 23, 0, 0, 86, 15, 0, 0, 91, 15, 0, 0, 98, 15, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0,
+            28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 28, 23, 0, 0, 102, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            36, 23, 0, 0, 36, 23, 0, 0, 36, 23, 0, 0, 110, 15, 0, 0, 115, 15, 0, 0, 123, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 46, 5, 0, 0, 131, 15, 0, 0, 138, 15, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 145, 15, 0, 0, 132, 7, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0,
+            62, 25, 0, 0, 62, 25, 0, 0, 153, 15, 0, 0, 62, 25, 0, 0, 161, 15, 0, 0, 62, 25, 0, 0, 112, 23, 0, 0, 120, 23, 0, 0, 126, 23, 0, 0, 62, 25, 0, 0, 101, 9, 0, 0, 218, 25, 0, 0, 218, 25, 0, 0, 169, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 177, 15, 0, 0, 177, 15, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 185, 15, 0, 0, 193, 15, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 141, 18, 0, 0, 148, 18, 0, 0, 201, 15, 0, 0, 151, 18, 0, 0, 209, 15, 0, 0, 217, 15, 0, 0, 225, 15, 0, 0, 145, 18, 0, 0, 233, 15, 0, 0, 241, 15, 0, 0, 249, 15, 0, 0, 150, 18, 0, 0, 158, 18, 0, 0, 141, 18, 0, 0, 148, 18, 0, 0, 144, 18, 0, 0, 151, 18, 0, 0, 159, 18, 0, 0, 142, 18, 0, 0, 149, 18, 0, 0, 145, 18, 0, 0, 0, 16, 0, 0, 167, 18, 0, 0,
+            175, 18, 0, 0, 182, 18, 0, 0, 189, 18, 0, 0, 170, 18, 0, 0, 178, 18, 0, 0, 185, 18, 0, 0, 192, 18, 0, 0, 8, 16, 0, 0, 160, 23, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0, 226, 25, 0, 0,
+            134, 23, 0, 0, 137, 23, 0, 0, 134, 23, 0, 0, 144, 23, 0, 0, 16, 16, 0, 0, 24, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 32, 16, 0, 0, 40, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 48, 16, 0, 0, 56, 16, 0, 0,
+            212, 19, 0, 0, 61, 16, 0, 0, 66, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 44, 23, 0, 0, 74, 16, 0, 0, 82, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 86, 16, 0, 0, 91, 16, 0, 0, 52, 23, 0, 0, 99, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 107, 16, 0, 0, 113, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 121, 16, 0, 0, 60, 23, 0, 0, 60, 23, 0, 0, 60, 23, 0, 0, 60, 23, 0, 0, 60, 23, 0, 0, 60, 23, 0, 0, 129, 16, 0, 0, 132, 7, 0, 0, 200, 18, 0, 0, 208, 18, 0, 0, 137, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 145, 16, 0, 0, 7, 24, 0, 0, 150, 16, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 158, 16, 0, 0, 163, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 171, 16, 0, 0, 179, 16, 0, 0, 187, 16, 0, 0, 195, 16, 0, 0, 203, 16, 0, 0, 211, 16, 0, 0, 132, 7, 0, 0, 218, 16, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 172, 25, 0, 0, 226, 16, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 230, 16, 0, 0, 238, 16, 0, 0, 242, 16, 0, 0, 247, 16, 0, 0, 15, 24, 0, 0, 234, 25, 0, 0, 70, 25, 0, 0, 240, 25, 0, 0, 70, 25, 0, 0, 255, 16, 0, 0, 132, 7, 0, 0, 6, 17, 0, 0, 14, 17, 0, 0, 18, 17, 0, 0, 26, 17, 0, 0, 34, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            172, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 248, 25, 0, 0, 0, 26, 0, 0, 8, 26, 0, 0, 46, 25, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 16, 26, 0, 0, 23, 26, 0, 0, 31, 26, 0, 0, 39, 26, 0, 0, 172, 25, 0, 0, 172, 25, 0, 0, 47, 26, 0, 0, 54, 26, 0, 0, 60, 26, 0, 0, 63, 26, 0, 0, 70, 26, 0, 0, 172, 25, 0, 0, 76, 26, 0, 0, 83, 26, 0, 0, 172, 25, 0, 0,
+            172, 25, 0, 0, 90, 26, 0, 0, 94, 26, 0, 0, 172, 25, 0, 0, 102, 26, 0, 0, 42, 17, 0, 0, 49, 17, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 57, 17, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 65, 17, 0, 0, 73, 17, 0, 0, 81, 17, 0, 0, 62, 25, 0, 0, 87, 17, 0, 0, 62, 25, 0, 0, 95, 17, 0, 0, 100, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 110, 26, 0, 0, 118, 26, 0, 0,
+            172, 25, 0, 0, 126, 26, 0, 0, 172, 25, 0, 0, 132, 26, 0, 0, 139, 26, 0, 0, 172, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 108, 17, 0, 0, 116, 17, 0, 0, 121, 17, 0, 0, 125, 17, 0, 0, 133, 17, 0, 0, 141, 17, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 62, 25, 0, 0, 149, 17, 0, 0, 62, 25, 0, 0, 101, 9, 0, 0, 157, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 132, 7, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 177, 10, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 165, 17, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 172, 17, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 180, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 165, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 188, 17, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0,
+            223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 223, 20, 0, 0, 192, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 200, 17, 0, 0, 47, 24, 0, 0, 47, 24, 0, 0, 47, 24, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 46, 5, 0, 0,
+            46, 5, 0, 0, 46, 5, 0, 0, 46, 5, 0, 0, 46, 5, 0, 0, 46, 5, 0, 0, 46, 5, 0, 0, 208, 17, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0,
+            132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 132, 7, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0,
+            55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 55, 24, 0, 0, 216, 17, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0,
+            3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 3, 23, 0, 0, 102, 4, 1, 0, 102, 4, 1, 0, 102, 4, 1, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 4, 0, 65, 128, 9, 0, 65, 192, 8, 0, 65, 192, 8, 0, 65, 64, 9, 0,
+            65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 101, 128, 10, 0, 91, 128, 1, 0, 91, 192, 0, 0, 91, 0, 3, 0, 94, 64, 2, 0, 91, 128, 2, 0, 91, 0, 3, 0,
+            91, 192, 0, 0, 92, 0, 0, 0, 88, 128, 0, 0, 91, 0, 3, 0, 96, 64, 2, 0, 91, 0, 2, 0, 87, 0, 4, 0, 91, 0, 2, 0, 91, 192, 1, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 91, 0, 2, 0, 91, 0, 2, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 91, 128, 1, 0,
+            91, 0, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0,
+            76, 18, 3, 0, 76, 18, 3, 0, 92, 0, 0, 0, 91, 64, 2, 0, 88, 128, 0, 0, 95, 0, 3, 0, 86, 0, 3, 0, 95, 0, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 92, 0, 0, 0, 96, 64, 4, 0, 88, 64, 0, 0, 96, 0, 3, 0, 65, 64, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 192, 9, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0,
+            65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 65, 64, 5, 0, 101, 0, 1, 0, 91, 0, 0, 0, 94, 128, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 97, 0, 3, 0, 91, 128, 8, 0, 95, 128, 8, 0, 97, 0, 3, 0, 74, 146, 8, 0, 90, 192, 0, 0, 96, 0, 3, 0, 66, 64, 4, 0, 97, 0, 3, 0,
+            95, 0, 3, 0, 97, 128, 2, 0, 96, 64, 2, 0, 84, 128, 8, 0, 84, 128, 8, 0, 95, 128, 4, 0, 72, 0, 3, 0, 91, 128, 8, 0, 91, 128, 8, 0, 95, 128, 8, 0, 84, 128, 8, 0, 74, 146, 8, 0, 89, 192, 0, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 91, 0, 0, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0,
+            76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 96, 128, 8, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 96, 128, 8, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 74, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 76, 18, 3, 0, 75, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 75, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 75, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 75, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 74, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 73, 0, 3, 0,
+            73, 128, 8, 0, 73, 128, 4, 0, 73, 128, 8, 0, 73, 128, 8, 0, 73, 128, 8, 0, 73, 128, 4, 0, 73, 128, 8, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 128, 8, 0, 73, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 128, 8, 0, 95, 128, 8, 0, 95, 128, 8, 0, 95, 128, 8, 0, 95, 0, 3, 0, 95, 128, 8, 0, 95, 0, 3, 0, 95, 128, 4, 0,
+            73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 31, 4, 3, 0, 31, 4, 3, 0, 73, 0, 3, 0, 95, 0, 3, 0, 73, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0,
+            95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 0, 1, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 0, 1, 0, 144, 0, 1, 0, 144, 0, 1, 0, 144, 0, 1, 0, 144, 0, 1, 0, 144, 0, 1, 0, 144, 0, 1, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 140, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 73, 0, 3, 0, 159, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 137, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 91, 0, 2, 0, 140, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 159, 11, 3, 0, 95, 0, 3, 0, 140, 11, 3, 0, 91, 0, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 3, 0, 0, 0, 140, 11, 3, 0, 3, 0, 0, 0, 140, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0,
+            140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 3, 0, 0, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0,
+            136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 160, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0,
+            140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0,
+            140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0,
+            136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0,
+            140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0,
+            136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 161, 7, 3, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 71, 5, 0, 143, 71, 5, 0, 143, 71, 5, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0,
+            140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0,
+            136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0,
+            136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0,
+            136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0,
+            140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 3, 0, 0, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0,
+            12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 12, 2, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 9, 2, 3, 0, 27, 2, 3, 0, 27, 2, 3, 0, 27, 2, 3, 0, 27, 2, 3, 0, 27, 2, 3, 0, 27, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0,
+            8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 27, 2, 2, 0, 23, 66, 4, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 33, 2, 3, 0, 33, 2, 3, 0, 30, 66, 2, 0, 3, 0, 0, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0,
+            80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0, 80, 77, 5, 0,
+            80, 77, 5, 0, 87, 77, 4, 0, 80, 77, 5, 0, 91, 13, 3, 0, 80, 77, 5, 0, 80, 77, 5, 0, 91, 13, 3, 0, 80, 77, 5, 0, 80, 77, 5, 0, 91, 141, 1, 0, 80, 77, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0,
+            74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 91, 13, 3, 0, 91, 13, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 130, 1, 3, 0, 130, 1, 3, 0, 130, 1, 3, 0, 130, 1, 3, 0, 130, 1, 3, 0, 66, 0, 3, 0, 160, 1, 3, 0, 160, 1, 3, 0,
+            160, 1, 3, 0, 155, 129, 2, 0, 155, 129, 2, 0, 158, 129, 2, 0, 91, 0, 2, 0, 155, 1, 2, 0, 161, 1, 3, 0, 161, 1, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 91, 128, 1, 0, 130, 65, 5, 0, 155, 129, 1, 0, 155, 129, 1, 0, 91, 128, 1, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 73, 0, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 155, 129, 2, 0, 155, 193, 2, 0,
+            155, 193, 2, 0, 155, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 144, 64, 5, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 155, 129, 1, 0, 138, 1, 3, 0, 144, 65, 5, 0,
+            144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 66, 0, 3, 0, 161, 1, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 137, 1, 3, 0, 137, 1, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 161, 1, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 146, 193, 2, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 138, 1, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0,
+            155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 155, 34, 3, 0, 3, 0, 0, 0, 130, 34, 3, 0, 138, 34, 3, 0, 144, 98, 5, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0,
+            138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0,
+            144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 144, 98, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0,
+            74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 74, 37, 3, 0, 80, 101, 5, 0,
+            80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 80, 101, 5, 0, 74, 37, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 146, 217, 2, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0,
+            138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 138, 25, 3, 0, 144, 89, 5, 0, 144, 89, 5, 0, 144, 89, 5, 0, 144, 89, 5, 0, 144, 89, 5, 0, 144, 89, 5, 0, 144, 89, 5, 0,
+            144, 89, 5, 0, 144, 89, 5, 0, 137, 25, 3, 0, 137, 25, 3, 0, 161, 25, 3, 0, 155, 25, 3, 0, 155, 25, 2, 0, 155, 153, 1, 0, 137, 25, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 89, 5, 0, 158, 89, 2, 0, 158, 89, 2, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 201, 30, 3, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 201, 30, 3, 0, 208, 94, 5, 0, 208, 94, 5, 0,
+            208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 219, 30, 3, 0, 3, 0, 0, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0,
+            202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 202, 20, 3, 0, 208, 84, 5, 0, 208, 84, 5, 0, 208, 84, 5, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 219, 20, 3, 0, 3, 0, 0, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 138, 34, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 159, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 130, 1, 3, 0, 130, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 138, 3, 3, 0, 144, 67, 5, 0, 142, 67, 5, 0, 142, 67, 5, 0, 3, 0, 0, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 3, 3, 0,
+            138, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 3, 0, 0, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0,
+            3, 0, 0, 0, 138, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 67, 5, 0, 138, 3, 3, 0, 142, 67, 5, 0, 142, 67, 5, 0, 142, 67, 5, 0, 144, 67, 5, 0, 144, 67, 5, 0, 144, 67, 5, 0, 144, 67, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 142, 67, 5, 0, 142, 67, 5, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 142, 67, 5, 0, 142, 67, 5, 0, 144, 67, 5, 0, 138, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 142, 67, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 3, 3, 0, 138, 3, 3, 0, 3, 0, 0, 0, 138, 3, 3, 0, 138, 3, 3, 0, 138, 3, 3, 0, 144, 67, 5, 0,
+            144, 67, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 146, 195, 2, 0, 138, 3, 3, 0, 138, 3, 3, 0, 158, 131, 2, 0, 158, 131, 2, 0, 148, 3, 3, 0, 148, 3, 3, 0, 148, 3, 3, 0, 148, 3, 3, 0, 148, 3, 3, 0, 148, 131, 2, 0, 161, 3, 3, 0, 158, 67, 2, 0,
+            138, 3, 3, 0, 155, 3, 3, 0, 144, 67, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 76, 5, 0, 16, 76, 5, 0, 14, 76, 5, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0,
+            10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 10, 12, 3, 0,
+            10, 12, 3, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 76, 5, 0, 3, 0, 0, 0, 14, 76, 5, 0, 14, 76, 5, 0, 14, 76, 5, 0, 16, 76, 5, 0, 16, 76, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 76, 5, 0, 16, 76, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 76, 5, 0, 16, 76, 5, 0, 16, 76, 5, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 16, 76, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 3, 0, 0, 0, 10, 12, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 18, 204, 2, 0, 18, 204, 2, 0,
+            18, 204, 2, 0, 18, 204, 2, 0, 18, 204, 2, 0, 18, 204, 2, 0, 18, 204, 2, 0, 18, 204, 2, 0, 18, 204, 2, 0, 18, 204, 2, 0, 16, 76, 5, 0, 16, 76, 5, 0, 10, 12, 3, 0, 10, 12, 3, 0, 10, 12, 3, 0, 16, 76, 5, 0, 27, 12, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            208, 75, 5, 0, 208, 75, 5, 0, 206, 75, 5, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0,
+            202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 202, 11, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 208, 75, 5, 0, 202, 11, 3, 0, 206, 75, 5, 0, 206, 75, 5, 0, 206, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 3, 0, 0, 0, 208, 75, 5, 0, 208, 75, 5, 0, 206, 75, 5, 0, 3, 0, 0, 0, 206, 75, 5, 0, 206, 75, 5, 0, 208, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 11, 3, 0, 202, 11, 3, 0, 208, 75, 5, 0, 208, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 203, 2, 0, 210, 203, 2, 0, 210, 203, 2, 0, 210, 203, 2, 0, 210, 203, 2, 0, 210, 203, 2, 0, 210, 203, 2, 0,
+            210, 203, 2, 0, 210, 203, 2, 0, 210, 203, 2, 0, 219, 11, 3, 0, 222, 75, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 11, 3, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 208, 75, 5, 0, 3, 0, 0, 0, 208, 90, 5, 0, 206, 90, 5, 0, 206, 90, 5, 0, 3, 0, 0, 0, 202, 26, 3, 0,
+            202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0,
+            202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 90, 5, 0, 202, 26, 3, 0, 206, 90, 5, 0, 208, 90, 5, 0,
+            206, 90, 5, 0, 208, 90, 5, 0, 208, 90, 5, 0, 208, 90, 5, 0, 208, 90, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 206, 90, 5, 0, 206, 90, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 206, 90, 5, 0, 206, 90, 5, 0, 208, 90, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 90, 5, 0, 208, 90, 5, 0, 206, 90, 5, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 3, 0, 0, 0, 202, 26, 3, 0, 202, 26, 3, 0, 202, 26, 3, 0, 208, 90, 5, 0, 208, 90, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 210, 218, 2, 0, 225, 26, 3, 0, 202, 26, 3, 0,
+            212, 26, 3, 0, 212, 26, 3, 0, 212, 26, 3, 0, 212, 26, 3, 0, 212, 26, 3, 0, 212, 26, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 99, 5, 0, 202, 35, 3, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 3, 0, 0, 0, 202, 35, 3, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 35, 3, 0,
+            202, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 202, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 206, 99, 5, 0, 206, 99, 5, 0, 208, 99, 5, 0, 206, 99, 5, 0, 206, 99, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 206, 99, 5, 0, 206, 99, 5, 0, 206, 99, 5, 0, 3, 0, 0, 0, 206, 99, 5, 0, 206, 99, 5, 0, 206, 99, 5, 0, 208, 99, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 206, 99, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 210, 227, 2, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0,
+            225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 222, 99, 2, 0, 225, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 100, 5, 0, 142, 100, 5, 0, 142, 100, 5, 0, 142, 100, 5, 0, 144, 100, 5, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0,
+            138, 36, 3, 0, 3, 0, 0, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 3, 0, 0, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 3, 0, 0, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0,
+            138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 100, 5, 0, 138, 36, 3, 0, 144, 100, 5, 0, 144, 100, 5, 0, 144, 100, 5, 0, 142, 100, 5, 0, 142, 100, 5, 0, 142, 100, 5, 0, 142, 100, 5, 0, 3, 0, 0, 0,
+            144, 100, 5, 0, 144, 100, 5, 0, 144, 100, 5, 0, 3, 0, 0, 0, 144, 100, 5, 0, 144, 100, 5, 0, 144, 100, 5, 0, 144, 100, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 100, 5, 0, 144, 100, 5, 0, 3, 0, 0, 0, 138, 36, 3, 0, 138, 36, 3, 0, 138, 36, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 36, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 138, 36, 3, 0, 138, 36, 3, 0, 144, 100, 5, 0, 144, 100, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 146, 228, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 155, 164, 4, 0,
+            148, 36, 3, 0, 148, 36, 3, 0, 148, 36, 3, 0, 148, 36, 3, 0, 148, 36, 3, 0, 148, 36, 3, 0, 148, 36, 3, 0, 161, 36, 3, 0, 74, 17, 3, 0, 80, 81, 5, 0, 78, 81, 5, 0, 78, 81, 5, 0, 91, 145, 4, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0,
+            3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0,
+            74, 17, 3, 0, 74, 17, 3, 0, 3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 74, 17, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 81, 5, 0, 74, 17, 3, 0, 78, 81, 5, 0, 80, 81, 5, 0, 78, 81, 5, 0, 78, 81, 5, 0, 78, 81, 5, 0, 78, 81, 5, 0, 78, 81, 5, 0, 3, 0, 0, 0, 80, 81, 5, 0, 78, 81, 5, 0, 78, 81, 5, 0, 3, 0, 0, 0, 78, 81, 5, 0,
+            78, 81, 5, 0, 80, 81, 5, 0, 80, 81, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 78, 81, 5, 0, 78, 81, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 80, 81, 5, 0, 80, 81, 5, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 82, 209, 2, 0, 3, 0, 0, 0, 74, 17, 3, 0, 74, 17, 3, 0, 78, 81, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 86, 5, 0, 144, 86, 5, 0, 142, 86, 5, 0, 142, 86, 5, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 3, 0, 0, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 3, 0, 0, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0,
+            138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 142, 86, 5, 0, 144, 86, 5, 0, 144, 86, 5, 0, 144, 86, 5, 0, 144, 86, 5, 0, 3, 0, 0, 0, 142, 86, 5, 0, 142, 86, 5, 0, 142, 86, 5, 0, 3, 0, 0, 0, 142, 86, 5, 0, 142, 86, 5, 0, 142, 86, 5, 0, 144, 86, 5, 0, 138, 22, 3, 0,
+            161, 22, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 142, 86, 5, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 144, 86, 5, 0, 144, 86, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 214, 2, 0, 146, 214, 2, 0,
+            146, 214, 2, 0, 146, 214, 2, 0, 146, 214, 2, 0, 146, 214, 2, 0, 146, 214, 2, 0, 146, 214, 2, 0, 146, 214, 2, 0, 146, 214, 2, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 148, 22, 3, 0, 161, 150, 2, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 3, 0, 0, 0,
+            208, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 3, 0, 0, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 3, 0, 0, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0,
+            202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 3, 0, 0, 0, 202, 32, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 202, 32, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 96, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 206, 96, 5, 0,
+            206, 96, 5, 0, 206, 96, 5, 0, 208, 96, 5, 0, 208, 96, 5, 0, 208, 96, 5, 0, 3, 0, 0, 0, 208, 96, 5, 0, 3, 0, 0, 0, 206, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 206, 96, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 224, 2, 0, 210, 224, 2, 0, 210, 224, 2, 0,
+            210, 224, 2, 0, 210, 224, 2, 0, 210, 224, 2, 0, 210, 224, 2, 0, 210, 224, 2, 0, 210, 224, 2, 0, 210, 224, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 206, 96, 5, 0, 206, 96, 5, 0, 219, 32, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 37, 10, 0,
+            138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0,
+            138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 144, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 94, 64, 2, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0, 138, 37, 10, 0,
+            138, 37, 10, 0, 138, 37, 10, 0, 137, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 144, 37, 10, 0, 155, 37, 3, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 146, 229, 2, 0, 155, 101, 4, 0, 155, 101, 4, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 18, 10, 0, 10, 18, 10, 0, 3, 0, 0, 0, 10, 18, 10, 0, 3, 0, 0, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 3, 0, 0, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0,
+            10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 3, 0, 0, 0, 10, 18, 10, 0, 3, 0, 0, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0,
+            10, 18, 10, 0, 16, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 10, 18, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 3, 0, 0, 0, 9, 18, 10, 0, 3, 0, 0, 0, 16, 18, 10, 0,
+            16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 16, 18, 10, 0, 3, 0, 0, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 18, 210, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 10, 18, 10, 0, 202, 37, 3, 0, 202, 37, 3, 0,
+            202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 3, 0, 0, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0,
+            202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 206, 101, 4, 0,
+            208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 219, 101, 4, 0, 208, 101, 5, 0, 208, 101, 5, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 202, 37, 3, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 3, 0, 0, 0,
+            208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0,
+            208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 208, 101, 5, 0, 3, 0, 0, 0, 225, 101, 4, 0, 225, 101, 4, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 208, 101, 5, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 3, 0, 0, 0, 225, 37, 3, 0,
+            225, 37, 3, 0, 219, 165, 4, 0, 219, 165, 4, 0, 219, 101, 4, 0, 219, 165, 4, 0, 219, 37, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 219, 37, 1, 0, 219, 37, 1, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 3, 0, 0, 0, 12, 10, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 12, 10, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 3, 0, 0, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 73, 5, 0, 208, 73, 5, 0, 208, 73, 5, 0, 219, 9, 3, 0, 219, 73, 4, 0, 219, 9, 3, 0, 219, 9, 3, 0, 219, 9, 3, 0, 219, 9, 3, 0, 219, 9, 3, 0, 219, 9, 3, 0, 219, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0,
+            212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 212, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 225, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 6, 3, 0, 76, 6, 3, 0,
+            76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0,
+            72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 37, 90, 4, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0,
+            10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 10, 26, 3, 0, 28, 26, 0, 0, 24, 90, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 91, 64, 4, 0, 91, 64, 4, 0,
+            91, 64, 4, 0, 147, 30, 3, 0, 147, 30, 3, 0, 147, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0,
+            10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 10, 37, 3, 0, 16, 101, 5, 0, 16, 101, 5, 0, 16, 101, 5, 0, 14, 101, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            10, 37, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 202, 12, 3, 0, 208, 76, 5, 0, 208, 76, 5, 0, 206, 76, 5, 0, 91, 64, 4, 0, 91, 64, 4, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0, 10, 5, 3, 0,
+            10, 5, 3, 0, 16, 69, 5, 0, 16, 69, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0,
+            202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 3, 0, 0, 0, 202, 34, 3, 0, 202, 34, 3, 0, 202, 34, 3, 0, 3, 0, 0, 0, 208, 98, 5, 0, 208, 98, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 142, 16, 10, 0, 142, 16, 10, 0, 142, 16, 10, 0,
+            142, 16, 10, 0, 142, 16, 10, 0, 142, 16, 10, 0, 144, 16, 10, 0, 142, 16, 10, 0, 142, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 155, 80, 4, 0, 155, 80, 4, 0, 155, 80, 1, 0, 137, 16, 10, 0, 155, 80, 4, 0, 155, 16, 3, 0, 155, 80, 4, 0, 158, 80, 2, 0,
+            138, 16, 10, 0, 144, 16, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 146, 208, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 148, 16, 3, 0, 148, 16, 3, 0, 148, 16, 3, 0, 148, 16, 3, 0, 148, 16, 3, 0,
+            148, 16, 3, 0, 148, 16, 3, 0, 148, 16, 3, 0, 148, 16, 3, 0, 148, 16, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 23, 3, 0, 27, 23, 3, 0, 91, 128, 1, 0, 91, 128, 1, 0, 27, 87, 4, 0, 91, 64, 4, 0, 23, 151, 4, 0, 27, 23, 3, 0, 27, 151, 1, 0, 27, 151, 1, 0, 27, 23, 3, 0, 16, 87, 5, 0, 16, 87, 5, 0, 16, 87, 5, 0,
+            2, 23, 1, 0, 16, 87, 5, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 18, 215, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0,
+            10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 16, 87, 5, 0, 10, 23, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0,
+            138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 18, 3, 0, 202, 18, 3, 0,
+            202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0,
+            202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 202, 18, 3, 0, 3, 0, 0, 0, 208, 82, 5, 0, 208, 82, 5, 0, 208, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 208, 82, 5, 0, 208, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 206, 82, 5, 0, 206, 82, 5, 0, 208, 82, 5, 0, 206, 82, 5, 0,
+            206, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 206, 82, 5, 0, 208, 82, 5, 0, 208, 82, 5, 0, 208, 82, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 225, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 146, 1, 0, 219, 146, 1, 0, 210, 210, 2, 0, 210, 210, 2, 0, 210, 210, 2, 0, 210, 210, 2, 0, 210, 210, 2, 0, 210, 210, 2, 0, 210, 210, 2, 0,
+            210, 210, 2, 0, 210, 210, 2, 0, 210, 210, 2, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 35, 10, 0, 74, 35, 10, 0,
+            74, 35, 10, 0, 74, 35, 10, 0, 74, 35, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0,
+            138, 35, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 146, 227, 2, 0, 148, 35, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 161, 35, 10, 0, 161, 35, 10, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0,
+            202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 202, 4, 3, 0, 208, 68, 5, 0, 208, 68, 5, 0, 206, 68, 5, 0, 206, 68, 5, 0, 208, 68, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            219, 4, 3, 0, 219, 4, 3, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 206, 17, 10, 0, 208, 17, 10, 0,
+            206, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 3, 0, 0, 0, 208, 17, 10, 0, 206, 17, 10, 0, 208, 17, 10, 0, 206, 17, 10, 0, 206, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 206, 17, 10, 0, 206, 17, 10, 0, 206, 17, 10, 0,
+            206, 17, 10, 0, 206, 17, 10, 0, 206, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 208, 17, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 81, 5, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0,
+            210, 209, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 210, 209, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 17, 10, 0, 219, 17, 10, 0,
+            219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 201, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 219, 17, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 143, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 142, 66, 5, 0, 142, 66, 5, 0, 144, 66, 5, 0, 142, 66, 5, 0, 142, 66, 5, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 146, 194, 2, 0, 155, 66, 4, 0, 155, 66, 4, 0, 155, 2, 3, 0, 155, 66, 4, 0, 155, 66, 4, 0, 155, 66, 4, 0, 155, 66, 4, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0,
+            161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 161, 2, 3, 0, 155, 66, 4, 0, 155, 66, 4, 0,
+            3, 0, 0, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 80, 67, 5, 0, 78, 67, 5, 0, 80, 67, 5, 0, 80, 67, 5, 0, 78, 67, 5, 0, 78, 67, 5, 0, 78, 67, 5, 0, 80, 67, 5, 0, 78, 67, 5, 0, 80, 67, 5, 0, 80, 67, 5, 0, 80, 67, 5, 0, 78, 67, 5, 0, 78, 67, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 3, 3, 0, 91, 3, 3, 0, 91, 3, 3, 0, 91, 3, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 142, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 144, 82, 5, 0, 144, 82, 5, 0, 144, 82, 5, 0, 144, 82, 5, 0, 144, 82, 5, 0,
+            144, 82, 5, 0, 144, 82, 5, 0, 144, 82, 5, 0, 142, 82, 5, 0, 142, 82, 5, 0, 144, 82, 5, 0, 144, 82, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 155, 82, 4, 0, 155, 82, 4, 0, 155, 82, 4, 0, 155, 82, 4, 0, 155, 82, 4, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0, 146, 210, 2, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 82, 218, 2, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0,
+            136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 136, 7, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0,
+            12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 27, 34, 3, 0, 27, 34, 3, 0, 27, 34, 3, 0, 27, 34, 3, 0, 27, 34, 3, 0,
+            27, 34, 3, 0, 27, 34, 3, 0, 27, 34, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 91, 0, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 78, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 144, 64, 5, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 144, 64, 5, 0, 74, 0, 3, 0, 74, 0, 3, 0,
+            78, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 74, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0,
+            140, 11, 3, 0, 3, 0, 0, 0, 140, 11, 3, 0, 3, 0, 0, 0, 140, 11, 3, 0, 3, 0, 0, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0,
+            139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 139, 11, 3, 0, 159, 11, 3, 0, 136, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0,
+            136, 11, 3, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 139, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 3, 0, 0, 0,
+            159, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 159, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 3, 0, 0, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 139, 11, 3, 0, 159, 139, 4, 0, 159, 11, 3, 0, 3, 0, 0, 0, 66, 128, 5, 0, 66, 0, 3, 0, 66, 0, 3, 0, 66, 0, 3, 0, 66, 0, 3, 0, 3, 0, 0, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0,
+            66, 64, 5, 0, 84, 0, 3, 0, 73, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 128, 8, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 73, 146, 8, 0, 84, 0, 3, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 3, 0, 0, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 94, 128, 2, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 143, 64, 5, 0, 143, 64, 5, 0, 143, 64, 5, 0, 143, 64, 5, 0, 144, 64, 5, 0, 143, 64, 5, 0, 143, 64, 5, 0, 143, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 84, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 200, 6, 3, 0, 225, 6, 3, 0, 225, 6, 3, 0, 225, 6, 3, 0, 225, 6, 3, 0, 225, 6, 3, 0, 225, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0,
+            200, 6, 3, 0, 208, 70, 5, 0, 208, 70, 5, 0, 208, 70, 5, 0, 204, 6, 3, 0, 200, 6, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 134, 1, 0, 219, 70, 4, 0, 219, 70, 4, 0, 219, 70, 4, 0, 212, 6, 3, 0, 219, 134, 1, 0, 219, 70, 4, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 3, 0, 0, 0,
+            8, 10, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 8, 10, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 201, 36, 3, 0, 219, 100, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 100, 5, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 87, 64, 4, 0, 91, 64, 4, 0, 92, 0, 0, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 0, 3, 0,
+            91, 64, 4, 0, 91, 0, 3, 0, 91, 64, 4, 0, 91, 64, 4, 0, 97, 0, 3, 0, 97, 0, 3, 0, 91, 0, 3, 0, 91, 128, 1, 0, 91, 128, 1, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 87, 64, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0,
+            161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 3, 0, 0, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0,
+            161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0,
+            161, 140, 3, 0, 161, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0,
+            138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0,
+            138, 13, 9, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 13, 9, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 95, 64, 1, 0, 95, 64, 1, 0, 137, 77, 1, 0, 137, 77, 1, 0, 138, 141, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0,
+            10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 3, 0, 0, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0,
+            74, 140, 3, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0,
+            97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0,
+            97, 140, 3, 0, 97, 140, 3, 0, 3, 0, 0, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0,
+            225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0,
+            138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 18, 231, 2, 0, 10, 39, 3, 0, 10, 39, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0,
+            202, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 211, 2, 3, 0, 208, 66, 5, 0, 208, 66, 5, 0, 219, 2, 3, 0, 219, 66, 4, 0, 219, 66, 4, 0, 219, 66, 4, 0, 219, 66, 4, 0, 219, 66, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 18, 3, 0, 72, 18, 3, 0, 3, 0, 0, 0, 72, 18, 3, 0, 3, 0, 0, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 73, 18, 3, 0, 73, 18, 3, 0,
+            73, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 74, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 72, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 74, 18, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 78, 98, 5, 0, 78, 98, 5, 0, 80, 98, 5, 0, 80, 98, 5, 0, 78, 98, 5, 0, 97, 34, 3, 0, 97, 34, 3, 0, 97, 34, 3, 0, 97, 34, 3, 0, 80, 98, 5, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 94, 128, 2, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0,
+            138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 155, 156, 4, 0, 155, 156, 4, 0, 155, 156, 1, 0, 155, 156, 1, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 80, 95, 5, 0, 80, 95, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 95, 4, 0, 91, 95, 4, 0, 82, 223, 2, 0, 82, 223, 2, 0, 82, 223, 2, 0, 82, 223, 2, 0, 82, 223, 2, 0, 82, 223, 2, 0, 82, 223, 2, 0, 82, 223, 2, 0,
+            82, 223, 2, 0, 82, 223, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0, 16, 94, 5, 0,
+            16, 94, 5, 0, 14, 94, 5, 0, 14, 94, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 30, 3, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0,
+            74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 78, 79, 5, 0, 91, 15, 3, 0, 91, 15, 3, 0,
+            91, 15, 3, 0, 91, 15, 3, 0, 91, 15, 3, 0, 91, 15, 3, 0, 91, 79, 4, 0, 91, 79, 4, 0, 91, 79, 4, 0, 91, 15, 3, 0, 91, 15, 3, 0, 91, 15, 3, 0, 91, 15, 3, 0, 3, 0, 0, 0, 73, 0, 3, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 82, 207, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 91, 15, 3, 0, 91, 15, 3, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 16, 24, 10, 0, 9, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0,
+            18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 3, 0, 0, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 16, 70, 5, 0, 16, 70, 5, 0, 16, 70, 5, 0, 16, 70, 5, 0, 16, 70, 5, 0,
+            16, 70, 5, 0, 14, 70, 5, 0, 14, 70, 5, 0, 16, 70, 5, 0, 16, 70, 5, 0, 14, 70, 5, 0, 14, 70, 5, 0, 16, 70, 5, 0, 16, 70, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 16, 70, 5, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0,
+            10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 16, 70, 5, 0, 14, 70, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 18, 198, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 6, 3, 0, 27, 70, 4, 0, 27, 70, 4, 0, 27, 70, 4, 0,
+            74, 36, 10, 0, 80, 36, 10, 0, 74, 36, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 74, 36, 10, 0, 74, 36, 10, 0, 73, 36, 10, 0, 91, 36, 10, 0, 91, 36, 10, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 142, 87, 5, 0, 144, 87, 5, 0, 144, 87, 5, 0, 142, 87, 5, 0, 142, 87, 5, 0, 155, 87, 4, 0, 155, 87, 4, 0,
+            138, 23, 3, 0, 137, 23, 3, 0, 137, 23, 3, 0, 142, 87, 5, 0, 144, 87, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 136, 11, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 73, 18, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0,
+            72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 142, 87, 5, 0, 142, 87, 5, 0, 144, 87, 5, 0, 142, 87, 5, 0, 142, 87, 5, 0, 144, 87, 5, 0, 142, 87, 5, 0, 142, 87, 5, 0, 155, 87, 4, 0, 142, 87, 5, 0, 144, 87, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 215, 2, 0, 146, 215, 2, 0, 146, 215, 2, 0,
+            146, 215, 2, 0, 146, 215, 2, 0, 146, 215, 2, 0, 146, 215, 2, 0, 146, 215, 2, 0, 146, 215, 2, 0, 146, 215, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0,
+            74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0,
+            138, 140, 3, 0, 138, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 8, 2, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 77, 3, 0, 80, 77, 5, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 96, 13, 3, 0,
+            74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 3, 0, 0, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 3, 0, 0, 0, 74, 77, 3, 0, 3, 0, 0, 0, 74, 77, 3, 0, 74, 77, 3, 0, 3, 0, 0, 0,
+            74, 77, 3, 0, 74, 77, 3, 0, 3, 0, 0, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 74, 77, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 161, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 158, 129, 2, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 91, 0, 2, 0, 91, 64, 0, 0, 91, 64, 0, 0, 91, 0, 2, 0, 91, 0, 2, 0, 91, 128, 1, 0, 91, 128, 1, 0, 92, 0, 0, 0, 88, 64, 0, 0, 91, 192, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 91, 128, 3, 0, 91, 128, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 91, 128, 3, 0, 91, 128, 3, 0, 91, 128, 3, 0, 91, 128, 3, 0, 86, 128, 3, 0, 86, 128, 3, 0, 86, 128, 3, 0, 91, 64, 0, 0, 91, 128, 3, 0, 91, 64, 0, 0, 3, 0, 0, 0, 91, 64, 1, 0, 91, 64, 1, 0,
+            91, 128, 1, 0, 91, 128, 1, 0, 87, 128, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 91, 128, 3, 0, 91, 128, 3, 0, 91, 128, 3, 0, 96, 128, 3, 0, 87, 128, 3, 0, 96, 128, 3, 0, 96, 128, 3, 0, 96, 128, 3, 0, 3, 0, 0, 0, 91, 128, 3, 0, 94, 64, 2, 0, 91, 128, 2, 0, 91, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 66, 128, 5, 0, 3, 0, 0, 0, 91, 128, 1, 0, 91, 128, 3, 0, 91, 128, 3, 0, 94, 64, 2, 0, 91, 128, 2, 0, 91, 128, 3, 0, 91, 128, 3, 0, 92, 0, 0, 0,
+            88, 64, 0, 0, 91, 128, 3, 0, 96, 128, 3, 0, 91, 64, 0, 0, 87, 128, 3, 0, 91, 64, 0, 0, 91, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 82, 128, 3, 0, 91, 64, 1, 0, 91, 64, 1, 0, 96, 128, 3, 0, 96, 128, 3, 0, 96, 128, 3, 0, 91, 128, 1, 0, 74, 140, 3, 0, 74, 140, 3, 0,
+            74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0,
+            74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 140, 3, 0, 74, 140, 3, 0,
+            74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 94, 128, 2, 0, 94, 64, 2, 0, 96, 128, 3, 0, 95, 128, 3, 0, 97, 128, 3, 0, 94, 64, 2, 0, 94, 64, 2, 0, 3, 0, 0, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 97, 0, 8, 0, 97, 128, 8, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0,
+            74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0,
+            74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0,
+            74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0,
+            74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0,
+            74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 148, 11, 3, 0, 148, 11, 3, 0, 161, 11, 3, 0,
+            161, 11, 3, 0, 161, 11, 3, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 161, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 144, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0,
+            202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 202, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0,
+            202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 15, 3, 0, 20, 15, 3, 0, 20, 15, 3, 0, 20, 15, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0,
+            10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 19, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 10, 11, 3, 0, 19, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 74, 28, 3, 0, 80, 92, 5, 0,
+            80, 92, 5, 0, 80, 92, 5, 0, 80, 92, 5, 0, 80, 92, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0,
+            202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 202, 38, 3, 0, 3, 0, 0, 0, 219, 102, 4, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 40, 3, 0,
+            10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 27, 104, 4, 0, 19, 40, 3, 0, 19, 40, 3, 0, 19, 40, 3, 0, 19, 40, 3, 0, 19, 40, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 27, 3, 0, 74, 27, 3, 0,
+            74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0,
+            74, 27, 3, 0, 74, 27, 3, 0, 74, 27, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 82, 219, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0,
+            12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 12, 27, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0,
+            8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 8, 27, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0,
+            10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 1, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0,
+            76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 3, 0, 0, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 76, 39, 3, 0, 3, 0, 0, 0, 76, 39, 3, 0, 76, 39, 3, 0, 3, 0, 0, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0,
+            72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 3, 0, 0, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 3, 0, 0, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0,
+            72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 72, 39, 3, 0, 3, 0, 0, 0, 72, 39, 3, 0, 72, 39, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0,
+            10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0,
+            10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 19, 3, 0,
+            10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 3, 0, 0, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0,
+            73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 3, 0, 0, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 7, 3, 0, 3, 0, 0, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0,
+            74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 74, 7, 3, 0, 3, 0, 0, 0, 74, 7, 3, 0, 74, 7, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 7, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 7, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0,
+            202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 202, 1, 3, 0, 3, 0, 0, 0, 219, 65, 4, 0, 212, 1, 3, 0, 212, 1, 3, 0, 212, 1, 3, 0,
+            212, 1, 3, 0, 212, 1, 3, 0, 212, 1, 3, 0, 212, 1, 3, 0, 212, 1, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0,
+            10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 10, 25, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 25, 3, 0, 20, 25, 3, 0, 20, 25, 3, 0, 20, 25, 3, 0, 20, 25, 3, 0, 20, 25, 3, 0,
+            20, 25, 3, 0, 20, 25, 3, 0, 20, 25, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0,
+            10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 10, 13, 3, 0, 3, 0, 0, 0, 10, 13, 3, 0, 10, 13, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 13, 3, 0, 20, 13, 3, 0, 20, 13, 3, 0, 20, 13, 3, 0,
+            20, 13, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 74, 29, 3, 0, 84, 29, 3, 0, 84, 29, 3, 0,
+            84, 29, 3, 0, 84, 29, 3, 0, 84, 29, 3, 0, 84, 29, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 93, 4, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0,
+            10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 10, 20, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 20, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0,
+            10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 22, 3, 0, 20, 22, 3, 0, 10, 22, 3, 0, 10, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0,
+            20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0,
+            20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 74, 16, 3, 0, 80, 80, 5, 0, 80, 80, 5, 0, 80, 80, 5, 0, 3, 0, 0, 0, 80, 80, 5, 0, 80, 80, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 80, 5, 0, 80, 80, 5, 0, 80, 80, 5, 0, 80, 80, 5, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 3, 0, 0, 0,
+            74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 3, 0, 0, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0,
+            74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 74, 16, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 80, 5, 0, 80, 80, 5, 0, 80, 80, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 80, 5, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 84, 16, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 80, 4, 0, 91, 16, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0,
+            10, 21, 3, 0, 16, 85, 5, 0, 16, 85, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 21, 3, 0, 20, 21, 3, 0, 20, 21, 3, 0, 20, 21, 3, 0, 20, 21, 3, 0, 27, 85, 4, 0, 27, 85, 4, 0, 27, 85, 4, 0, 27, 85, 4, 0, 27, 85, 4, 0, 27, 85, 4, 0, 27, 213, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 66, 4, 0, 91, 66, 4, 0, 91, 66, 4, 0, 91, 66, 4, 0, 91, 66, 4, 0, 91, 66, 4, 0, 91, 66, 4, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0,
+            202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 202, 29, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 212, 29, 3, 0, 212, 29, 3, 0, 212, 29, 3, 0, 212, 29, 3, 0, 212, 29, 3, 0, 212, 29, 3, 0, 212, 29, 3, 0, 212, 29, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0,
+            202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 202, 28, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 212, 28, 3, 0, 212, 28, 3, 0, 212, 28, 3, 0, 212, 28, 3, 0, 212, 28, 3, 0, 212, 28, 3, 0, 212, 28, 3, 0, 212, 28, 3, 0, 10, 29, 3, 0,
+            10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 10, 29, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 29, 3, 0,
+            27, 29, 3, 0, 27, 29, 3, 0, 27, 29, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 20, 29, 3, 0, 20, 29, 3, 0, 20, 29, 3, 0, 20, 29, 3, 0, 20, 29, 3, 0, 20, 29, 3, 0, 20, 29, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0,
+            204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 212, 14, 3, 0, 212, 14, 3, 0, 212, 14, 3, 0, 212, 14, 3, 0, 212, 14, 3, 0, 212, 14, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 80, 94, 5, 0, 80, 94, 5, 0, 80, 94, 5, 0, 80, 94, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 82, 222, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0,
+            148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 148, 1, 3, 0, 3, 0, 0, 0, 138, 40, 3, 0, 138, 40, 3, 0,
+            138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 3, 0, 0, 0, 144, 104, 5, 0, 144, 104, 5, 0, 151, 104, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 40, 3, 0, 138, 40, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0,
+            84, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 74, 33, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0,
+            10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 10, 33, 3, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 16, 97, 5, 0, 20, 33, 3, 0, 20, 33, 3, 0, 20, 33, 3, 0, 20, 33, 3, 0, 27, 33, 3, 0,
+            27, 33, 3, 0, 27, 33, 3, 0, 27, 33, 3, 0, 27, 33, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0,
+            138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 138, 27, 3, 0, 144, 91, 5, 0, 144, 91, 5, 0, 144, 91, 5, 0, 144, 91, 5, 0, 155, 27, 3, 0, 155, 27, 3, 0, 155, 27, 3, 0, 155, 27, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0,
+            138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 138, 6, 3, 0, 148, 6, 3, 0, 148, 6, 3, 0, 148, 6, 3, 0, 148, 6, 3, 0, 148, 6, 3, 0, 148, 6, 3, 0, 148, 6, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0,
+            138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 138, 9, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0,
+            80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0, 91, 68, 4, 0, 91, 68, 4, 0, 91, 4, 3, 0, 91, 4, 3, 0, 91, 4, 3, 0, 91, 4, 3, 0, 91, 4, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0,
+            84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 84, 4, 3, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 82, 196, 2, 0, 80, 68, 5, 0, 74, 4, 3, 0, 74, 4, 3, 0, 80, 68, 5, 0, 80, 68, 5, 0, 74, 4, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 68, 5, 0, 155, 81, 4, 0, 155, 81, 4, 0, 144, 81, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 130, 17, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0,
+            138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 138, 33, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 225, 2, 0, 146, 225, 2, 0, 146, 225, 2, 0, 146, 225, 2, 0,
+            146, 225, 2, 0, 146, 225, 2, 0, 146, 225, 2, 0, 146, 225, 2, 0, 146, 225, 2, 0, 146, 225, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 78, 69, 5, 0,
+            80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 3, 0, 0, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 82, 197, 2, 0, 91, 69, 4, 0, 91, 69, 4, 0, 91, 69, 4, 0, 91, 69, 4, 0, 74, 5, 3, 0, 78, 69, 5, 0,
+            78, 69, 5, 0, 74, 5, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0,
+            74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 74, 20, 3, 0, 80, 84, 5, 0, 91, 20, 3, 0, 91, 148, 4, 0, 74, 20, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0,
+            212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 212, 32, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 16, 3, 0,
+            202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 3, 0, 0, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0,
+            202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 208, 80, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 3, 0, 0, 0, 202, 23, 3, 0, 3, 0, 0, 0, 202, 23, 3, 0, 202, 23, 3, 0,
+            202, 23, 3, 0, 202, 23, 3, 0, 3, 0, 0, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 3, 0, 0, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0,
+            202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 202, 23, 3, 0, 219, 87, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0,
+            138, 32, 3, 0, 138, 32, 3, 0, 142, 96, 5, 0, 142, 96, 5, 0, 142, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 144, 96, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 224, 2, 0, 146, 224, 2, 0, 146, 224, 2, 0, 146, 224, 2, 0, 146, 224, 2, 0, 146, 224, 2, 0, 146, 224, 2, 0,
+            146, 224, 2, 0, 146, 224, 2, 0, 146, 224, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 75, 5, 0, 80, 75, 5, 0, 78, 75, 5, 0, 78, 75, 5, 0, 3, 0, 0, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 11, 3, 0,
+            74, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 3, 0, 0, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0,
+            3, 0, 0, 0, 74, 11, 3, 0, 74, 11, 3, 0, 3, 0, 0, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 3, 0, 0, 0, 144, 64, 5, 0, 80, 75, 5, 0, 74, 11, 3, 0, 78, 75, 5, 0, 78, 75, 5, 0, 80, 75, 5, 0, 78, 75, 5, 0, 78, 75, 5, 0, 78, 75, 5, 0, 78, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 78, 75, 5, 0, 78, 75, 5, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 78, 75, 5, 0, 78, 75, 5, 0, 78, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 78, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 74, 11, 3, 0, 78, 75, 5, 0,
+            78, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 80, 75, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 78, 89, 5, 0, 78, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 78, 89, 5, 0, 80, 89, 5, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 91, 89, 4, 0, 91, 89, 4, 0, 91, 89, 4, 0, 91, 89, 4, 0, 91, 25, 3, 0, 82, 217, 2, 0, 82, 217, 2, 0, 82, 217, 2, 0, 82, 217, 2, 0, 82, 217, 2, 0,
+            82, 217, 2, 0, 82, 217, 2, 0, 82, 217, 2, 0, 82, 217, 2, 0, 82, 217, 2, 0, 91, 89, 4, 0, 91, 89, 4, 0, 3, 0, 0, 0, 91, 25, 3, 0, 80, 89, 5, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 102, 5, 0, 14, 102, 5, 0, 16, 102, 5, 0, 16, 102, 5, 0, 10, 38, 3, 0, 10, 38, 3, 0, 27, 38, 3, 0,
+            10, 38, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 18, 230, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 78, 96, 5, 0, 78, 96, 5, 0, 78, 96, 5, 0, 80, 96, 5, 0, 80, 96, 5, 0, 80, 96, 5, 0, 80, 96, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 78, 96, 5, 0,
+            78, 96, 5, 0, 78, 96, 5, 0, 78, 96, 5, 0, 80, 96, 5, 0, 80, 96, 5, 0, 78, 96, 5, 0, 80, 96, 5, 0, 80, 96, 5, 0, 91, 160, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 160, 1, 0, 91, 160, 1, 0, 91, 32, 3, 0, 91, 32, 3, 0, 91, 32, 3, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0,
+            91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 91, 96, 4, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 80, 96, 5, 0, 80, 96, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 86, 5, 0, 219, 86, 4, 0, 219, 86, 4, 0, 219, 22, 3, 0, 202, 22, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 210, 214, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0,
+            27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 27, 151, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 16, 99, 5, 0, 14, 99, 5, 0, 16, 99, 5, 0, 14, 99, 5, 0, 14, 99, 5, 0, 16, 99, 5, 0, 16, 99, 5, 0, 16, 99, 5, 0, 16, 99, 5, 0, 16, 99, 5, 0, 16, 99, 5, 0,
+            14, 99, 5, 0, 16, 99, 5, 0, 10, 35, 3, 0, 27, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 18, 227, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0,
+            74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 78, 1, 10, 0,
+            78, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 78, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 80, 1, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0, 82, 193, 2, 0,
+            84, 1, 10, 0, 84, 1, 10, 0, 91, 65, 4, 0, 91, 65, 4, 0, 91, 65, 4, 0, 97, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 74, 1, 10, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0,
+            78, 72, 5, 0, 78, 72, 5, 0, 78, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 78, 72, 5, 0, 80, 72, 5, 0, 80, 72, 5, 0, 91, 8, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 231, 2, 0, 146, 231, 2, 0, 146, 231, 2, 0, 146, 231, 2, 0, 146, 231, 2, 0,
+            146, 231, 2, 0, 146, 231, 2, 0, 146, 231, 2, 0, 146, 231, 2, 0, 146, 231, 2, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 148, 39, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 138, 39, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 8, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 3, 0, 0, 0, 10, 8, 3, 0, 10, 8, 3, 0,
+            3, 0, 0, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 10, 8, 3, 0, 14, 72, 5, 0, 14, 72, 5, 0, 14, 72, 5, 0, 14, 72, 5, 0, 14, 72, 5, 0, 14, 72, 5, 0, 3, 0, 0, 0, 14, 72, 5, 0,
+            14, 72, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 72, 5, 0, 16, 72, 5, 0, 14, 72, 5, 0, 16, 72, 5, 0, 10, 8, 3, 0, 14, 72, 5, 0, 10, 8, 3, 0, 14, 72, 5, 0, 16, 72, 5, 0, 27, 72, 4, 0, 27, 72, 4, 0, 27, 72, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 18, 200, 2, 0,
+            18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 18, 200, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 138, 24, 3, 0, 142, 88, 5, 0, 142, 88, 5, 0,
+            142, 88, 5, 0, 144, 88, 5, 0, 144, 88, 5, 0, 144, 88, 5, 0, 144, 88, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 88, 5, 0, 144, 88, 5, 0, 142, 88, 5, 0, 142, 88, 5, 0, 142, 88, 5, 0, 142, 88, 5, 0, 144, 88, 5, 0, 138, 24, 3, 0, 155, 152, 4, 0, 138, 24, 3, 0, 142, 88, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 27, 41, 3, 0, 27, 105, 4, 0, 27, 105, 4, 0, 27, 105, 4, 0, 27, 105, 4, 0,
+            27, 169, 4, 0, 27, 41, 3, 0, 16, 105, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 33, 3, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 206, 97, 5, 0, 206, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 202, 33, 3, 0, 202, 33, 3, 0,
+            202, 33, 3, 0, 202, 33, 3, 0, 219, 161, 4, 0, 219, 97, 4, 0, 219, 97, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0,
+            138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0,
+            10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0, 219, 135, 4, 0,
+            219, 135, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 3, 3, 0, 202, 3, 3, 0,
+            202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 3, 0, 0, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0,
+            202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 202, 3, 3, 0, 206, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 3, 0, 0, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 208, 67, 5, 0, 206, 67, 5, 0, 208, 67, 5, 0,
+            202, 3, 3, 0, 219, 67, 4, 0, 219, 67, 4, 0, 219, 67, 4, 0, 219, 67, 4, 0, 219, 67, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0, 210, 195, 2, 0,
+            210, 195, 2, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 212, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 149, 4, 0, 91, 149, 1, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0,
+            74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 74, 21, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0,
+            80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 3, 0, 0, 0, 78, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 78, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 78, 85, 5, 0, 80, 85, 5, 0, 80, 85, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 3, 0, 0, 0, 202, 10, 3, 0, 202, 10, 3, 0, 3, 0, 0, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0,
+            202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 202, 10, 3, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 208, 74, 5, 0, 3, 0, 0, 0, 208, 74, 5, 0, 208, 74, 5, 0,
+            3, 0, 0, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 208, 74, 5, 0, 202, 10, 3, 0, 208, 74, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 210, 202, 2, 0, 210, 202, 2, 0, 210, 202, 2, 0, 210, 202, 2, 0, 210, 202, 2, 0, 210, 202, 2, 0, 210, 202, 2, 0,
+            210, 202, 2, 0, 210, 202, 2, 0, 210, 202, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 3, 0, 0, 0, 138, 10, 3, 0, 138, 10, 3, 0, 3, 0, 0, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0,
+            138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 138, 10, 3, 0, 142, 74, 5, 0, 142, 74, 5, 0, 142, 74, 5, 0, 142, 74, 5, 0, 142, 74, 5, 0, 3, 0, 0, 0, 144, 74, 5, 0,
+            144, 74, 5, 0, 3, 0, 0, 0, 142, 74, 5, 0, 142, 74, 5, 0, 144, 74, 5, 0, 142, 74, 5, 0, 144, 74, 5, 0, 138, 10, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0, 146, 202, 2, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0,
+            138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 138, 20, 3, 0, 144, 84, 5, 0, 144, 84, 5, 0, 142, 84, 5, 0, 142, 84, 5, 0, 155, 20, 3, 0, 155, 20, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 80, 5, 0, 16, 80, 5, 0, 10, 16, 3, 0, 14, 80, 5, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 3, 0, 0, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0,
+            10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 10, 16, 3, 0, 14, 80, 5, 0, 14, 80, 5, 0, 16, 80, 5, 0, 16, 80, 5, 0, 16, 80, 5, 0, 16, 80, 5, 0,
+            16, 80, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 14, 80, 5, 0, 14, 80, 5, 0, 16, 80, 5, 0, 14, 80, 5, 0, 16, 80, 5, 0, 27, 80, 4, 0, 27, 80, 4, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 27, 144, 3, 0, 18, 208, 2, 0, 18, 208, 2, 0, 18, 208, 2, 0,
+            18, 208, 2, 0, 18, 208, 2, 0, 18, 208, 2, 0, 18, 208, 2, 0, 18, 208, 2, 0, 18, 208, 2, 0, 18, 208, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            138, 19, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 222, 163, 2, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0,
+            225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 99, 4, 0, 74, 40, 3, 0, 74, 40, 3, 0,
+            74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 3, 0, 0, 0, 91, 104, 4, 0, 91, 104, 4, 0, 91, 104, 4, 0, 91, 104, 4, 0,
+            91, 104, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0,
+            10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 27, 7, 3, 0, 27, 7, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 16, 73, 5, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 16, 73, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0,
+            202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0,
+            74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0,
+            74, 23, 3, 0, 74, 23, 3, 0, 74, 23, 3, 0, 3, 0, 0, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 82, 215, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 91, 87, 4, 0, 91, 87, 4, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0,
+            74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0,
+            74, 38, 3, 0, 3, 0, 0, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 82, 230, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0,
+            10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 10, 3, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 16, 67, 5, 0, 16, 67, 5, 0, 16, 67, 5, 0, 16, 67, 5, 0, 16, 67, 5, 0, 27, 67, 4, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 9, 14, 3, 0, 9, 14, 3, 0, 9, 14, 3, 0, 9, 14, 3, 0, 27, 78, 4, 0, 33, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 18, 206, 2, 0, 18, 206, 2, 0, 18, 206, 2, 0, 18, 206, 2, 0, 18, 206, 2, 0,
+            18, 206, 2, 0, 18, 206, 2, 0, 18, 206, 2, 0, 18, 206, 2, 0, 18, 206, 2, 0, 3, 0, 0, 0, 20, 14, 3, 0, 20, 14, 3, 0, 20, 14, 3, 0, 20, 14, 3, 0, 20, 14, 3, 0, 20, 14, 3, 0, 20, 14, 3, 0, 3, 0, 0, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0,
+            10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0,
+            10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 148, 21, 3, 0, 155, 85, 4, 0, 155, 85, 4, 0,
+            155, 21, 3, 0, 155, 21, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 93, 5, 0, 138, 29, 3, 0, 142, 93, 5, 0,
+            142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 93, 5, 0, 144, 93, 5, 0, 144, 93, 5, 0, 144, 93, 5, 0,
+            137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 137, 29, 3, 0, 9, 100, 1, 0, 201, 89, 1, 0, 155, 76, 1, 0, 137, 76, 1, 0, 16, 17, 1, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 142, 76, 5, 0, 142, 76, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0,
+            10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 201, 15, 3, 0, 201, 15, 3, 0, 201, 15, 3, 0, 201, 15, 3, 0, 3, 0, 0, 0, 201, 15, 3, 0, 201, 15, 3, 0, 201, 15, 3, 0, 201, 15, 3, 0,
+            201, 15, 3, 0, 201, 15, 3, 0, 201, 15, 3, 0, 3, 0, 0, 0, 201, 15, 3, 0, 201, 15, 3, 0, 3, 0, 0, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            138, 13, 9, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 13, 9, 0, 138, 13, 9, 0, 138, 13, 9, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 15, 9, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0,
+            202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0,
+            202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 225, 8, 3, 0, 208, 72, 5, 0, 208, 72, 5, 0, 219, 72, 4, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 144, 75, 5, 0, 144, 75, 5, 0, 144, 75, 5, 0, 161, 11, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 3, 0, 0, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 3, 0, 0, 0, 72, 0, 3, 0, 3, 0, 0, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 3, 0, 0, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 3, 0, 0, 0, 76, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 3, 0, 0, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 96, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0,
+            82, 192, 2, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 144, 95, 5, 0, 161, 31, 3, 0, 161, 31, 3, 0, 155, 95, 4, 0, 155, 95, 4, 0, 155, 95, 4, 0, 155, 95, 4, 0, 155, 31, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 3, 0, 0, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            74, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 3, 0, 0, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0,
+            80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 3, 0, 0, 0, 80, 74, 5, 0, 80, 74, 5, 0, 3, 0, 0, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 80, 74, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 71, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 80, 78, 5, 0,
+            80, 78, 5, 0, 80, 78, 5, 0, 80, 78, 5, 0, 80, 78, 5, 0, 80, 78, 5, 0, 80, 78, 5, 0, 73, 14, 3, 0, 73, 14, 3, 0, 73, 14, 3, 0, 73, 14, 3, 0, 73, 14, 3, 0, 73, 14, 3, 0, 73, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0, 82, 206, 2, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 14, 3, 0, 97, 14, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0,
+            138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 138, 38, 3, 0, 144, 102, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 208, 103, 5, 0, 208, 103, 5, 0, 208, 103, 5, 0, 208, 103, 5, 0, 210, 231, 2, 0,
+            210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 210, 231, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 222, 103, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0, 74, 24, 3, 0,
+            73, 24, 3, 0, 80, 88, 5, 0, 80, 88, 5, 0, 80, 88, 5, 0, 80, 88, 5, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 82, 216, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 3, 0, 0, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 212, 21, 3, 0, 208, 85, 5, 0, 208, 85, 5, 0, 208, 85, 5, 0, 208, 85, 5, 0, 208, 85, 5, 0, 208, 85, 5, 0,
+            208, 85, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 208, 64, 5, 0, 208, 64, 5, 0, 208, 64, 5, 0, 208, 64, 5, 0, 208, 64, 5, 0, 208, 64, 5, 0, 208, 64, 5, 0, 201, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 210, 192, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 219, 0, 0, 0, 219, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 97, 128, 2, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 94, 128, 2, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 97, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            160, 1, 3, 0, 160, 1, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0,
+            97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 97, 0, 7, 0, 161, 141, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 3, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0,
+            138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0,
+            138, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0,
+            138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 66, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0,
+            4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0,
+            4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 3, 0, 0, 0, 3, 0, 0, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0,
+            12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 12, 10, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0,
+            76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 6, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 140, 11, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 76, 0, 3, 0, 97, 128, 2, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 76, 0, 3, 0, 97, 0, 3, 0, 97, 128, 2, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 128, 8, 0, 97, 0, 3, 0, 76, 0, 3, 0, 97, 64, 2, 0, 97, 0, 3, 0, 96, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 76, 0, 3, 0, 97, 0, 3, 0, 140, 11, 3, 0, 97, 0, 3, 0,
+            76, 0, 3, 0, 97, 0, 3, 0, 76, 18, 3, 0, 76, 146, 8, 0, 76, 0, 3, 0, 76, 0, 3, 0, 97, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 18, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 74, 0, 3, 0, 72, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 72, 18, 3, 0, 97, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 128, 8, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 128, 8, 0, 84, 0, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0,
+            76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 76, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0,
+            72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0,
+            204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 204, 6, 3, 0, 200, 6, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0,
+            136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 138, 7, 3, 0, 144, 71, 5, 0, 143, 71, 5, 0, 143, 71, 5, 0, 143, 71, 5, 0, 155, 7, 3, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 155, 7, 3, 0, 137, 7, 3, 0,
+            140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 140, 7, 3, 0,
+            136, 7, 3, 0, 140, 7, 3, 0, 136, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 144, 71, 5, 0, 144, 71, 5, 0, 95, 0, 3, 0, 95, 0, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 73, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 73, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 74, 18, 3, 0,
+            76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0,
+            76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 76, 18, 3, 0, 72, 18, 3, 0, 91, 128, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0,
+            76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 76, 146, 3, 0, 92, 0, 0, 0, 91, 128, 3, 0, 88, 64, 0, 0, 95, 128, 3, 0, 86, 128, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0,
+            140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0,
+            140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 140, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0,
+            136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0,
+            204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 204, 14, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0,
+            140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 39, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0,
+            140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 140, 21, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 96, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 96, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 96, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 96, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0,
+            76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 76, 0, 3, 0, 96, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0,
+            72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 72, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0,
+            204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 204, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0,
+            200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 200, 0, 3, 0, 8, 10, 3, 0,
+            8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0,
+            8, 10, 3, 0, 91, 0, 3, 0, 9, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 7, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0,
+            73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 137, 7, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0,
+            136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 136, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0,
+            139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 139, 11, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0,
+            72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 72, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0,
+            8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 8, 10, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0,
+            72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 72, 18, 3, 0, 95, 0, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0,
+            73, 18, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0,
+            72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 72, 6, 3, 0, 95, 128, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0,
+            72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 72, 146, 3, 0, 92, 0, 0, 0, 96, 128, 3, 0, 88, 64, 0, 0, 96, 128, 3, 0, 92, 0, 0, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0,
+            136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 136, 8, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0,
+            200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0,
+            200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 200, 14, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0,
+            136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 39, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0,
+            136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 136, 21, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0,
+            202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 202, 30, 3, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 201, 30, 3, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0, 208, 94, 5, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 137, 1, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0,
+            144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 202, 7, 3, 0, 202, 7, 3, 0, 208, 71, 5, 0, 208, 71, 5, 0, 91, 64, 4, 0, 91, 64, 4, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 210, 199, 2, 0, 219, 7, 3, 0, 201, 7, 3, 0,
+            202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 9, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0,
+            10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0,
+            74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 74, 26, 3, 0, 73, 26, 3, 0, 73, 26, 3, 0, 73, 26, 3, 0, 73, 26, 3, 0, 73, 26, 3, 0,
+            73, 26, 3, 0, 91, 90, 4, 0, 91, 90, 4, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0,
+            73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 137, 11, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0,
+            73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 73, 18, 3, 0, 137, 11, 3, 0, 90, 192, 0, 0, 89, 192, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0,
+            92, 0, 0, 0, 88, 64, 0, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 128, 1, 0, 73, 0, 3, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 0, 3, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 87, 192, 4, 0, 87, 192, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 0, 3, 0, 101, 64, 4, 0,
+            91, 64, 0, 0, 91, 64, 0, 0, 91, 128, 3, 0, 97, 128, 3, 0, 137, 76, 1, 0, 74, 128, 3, 0, 147, 140, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 97, 128, 3, 0, 97, 128, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0,
+            92, 0, 0, 0, 88, 64, 0, 0, 87, 64, 1, 0, 92, 0, 0, 0, 88, 64, 0, 0, 88, 64, 0, 0, 97, 128, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 78, 76, 5, 0, 78, 76, 5, 0, 87, 128, 3, 0, 73, 128, 3, 0, 73, 128, 3, 0,
+            73, 128, 3, 0, 73, 128, 3, 0, 73, 64, 5, 0, 97, 128, 3, 0, 97, 128, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 147, 140, 3, 0, 137, 76, 1, 0, 74, 64, 1, 0, 91, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0,
+            202, 143, 3, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 91, 64, 1, 0, 73, 0, 9, 0, 201, 79, 1, 0, 201, 79, 1, 0, 202, 143, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0,
+            202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 201, 104, 1, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0,
+            202, 168, 3, 0, 202, 168, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0, 138, 19, 3, 0,
+            138, 19, 3, 0, 137, 19, 3, 0, 137, 19, 3, 0, 137, 19, 3, 0, 137, 19, 3, 0, 137, 19, 3, 0, 137, 19, 3, 0, 155, 83, 4, 0, 155, 83, 4, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 9, 39, 3, 0, 27, 103, 4, 0, 27, 167, 1, 0, 27, 103, 4, 0,
+            10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0,
+            95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 95, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 73, 0, 3, 0, 10, 24, 10, 0, 10, 24, 10, 0,
+            10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 9, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 33, 24, 10, 0, 33, 24, 10, 0, 33, 24, 10, 0, 10, 24, 10, 0,
+            14, 24, 10, 0, 16, 24, 10, 0, 14, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 88, 64, 0, 0, 91, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 91, 64, 0, 0, 91, 64, 1, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 202, 15, 9, 0, 73, 0, 9, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0,
+            202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0,
+            202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 73, 64, 1, 0, 73, 64, 1, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0,
+            137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 137, 7, 3, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 206, 71, 5, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0,
+            202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 208, 71, 5, 0, 206, 71, 5, 0,
+            208, 71, 5, 0, 202, 7, 3, 0, 206, 71, 5, 0, 206, 71, 5, 0, 206, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 206, 71, 5, 0, 206, 71, 5, 0, 206, 71, 5, 0, 206, 71, 5, 0, 208, 71, 5, 0, 206, 71, 5, 0, 206, 71, 5, 0, 202, 7, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0,
+            138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 138, 22, 3, 0, 144, 86, 5, 0, 144, 86, 5, 0, 138, 22, 3, 0, 142, 86, 5, 0, 142, 86, 5, 0, 202, 37, 3, 0, 225, 165, 4, 0, 225, 165, 4, 0, 225, 165, 4, 0, 219, 165, 4, 0, 219, 37, 3, 0, 219, 165, 4, 0,
+            219, 165, 4, 0, 219, 37, 1, 0, 219, 165, 4, 0, 219, 165, 4, 0, 219, 101, 4, 0, 219, 37, 1, 0, 219, 165, 1, 0, 219, 165, 1, 0, 219, 165, 1, 0, 219, 165, 1, 0, 219, 165, 1, 0, 219, 37, 1, 0, 225, 37, 3, 0, 219, 165, 1, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 208, 101, 5, 0, 208, 101, 5, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0, 225, 37, 3, 0,
+            10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0,
+            10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0,
+            16, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 10, 24, 10, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 27, 88, 4, 0, 27, 88, 4, 0, 27, 24, 3, 0, 27, 24, 3, 0, 27, 24, 3, 0, 27, 24, 3, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0,
+            10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 10, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0,
+            14, 24, 10, 0, 14, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 16, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 10, 24, 10, 0, 16, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0,
+            16, 24, 10, 0, 16, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0, 10, 24, 10, 0, 14, 24, 10, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 18, 216, 2, 0, 14, 24, 10, 0, 14, 24, 10, 0, 14, 24, 10, 0, 16, 24, 10, 0,
+            33, 24, 10, 0, 33, 24, 10, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0,
+            74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 76, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0,
+            74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 140, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0,
+            74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 74, 204, 6, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0,
+            202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 202, 9, 3, 0, 151, 69, 4, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0,
+            138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 161, 5, 3, 0, 155, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0,
+            138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 5, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0,
+            138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 30, 3, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0,
+            138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0, 138, 16, 10, 0,
+            144, 16, 10, 0, 144, 16, 10, 0, 142, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 144, 16, 10, 0, 142, 16, 10, 0, 142, 16, 10, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0,
+            10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 16, 87, 5, 0, 16, 87, 5, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0,
+            10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 10, 23, 3, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0,
+            138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0,
+            138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 138, 35, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0,
+            202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 202, 17, 10, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 142, 66, 5, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0,
+            138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 138, 2, 3, 0, 144, 66, 5, 0, 142, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0, 144, 66, 5, 0,
+            142, 66, 5, 0, 144, 66, 5, 0, 142, 66, 5, 0, 142, 66, 5, 0, 142, 66, 5, 0, 16, 98, 5, 0, 16, 98, 5, 0, 14, 98, 5, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0,
+            10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 14, 98, 5, 0, 16, 98, 5, 0, 16, 98, 5, 0, 16, 98, 5, 0, 16, 98, 5, 0, 14, 98, 5, 0, 14, 98, 5, 0, 16, 98, 5, 0, 16, 98, 5, 0, 14, 98, 5, 0, 16, 98, 5, 0, 16, 98, 5, 0,
+            16, 98, 5, 0, 10, 34, 3, 0, 10, 34, 3, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 18, 226, 2, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 10, 34, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0,
+            74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0, 74, 3, 3, 0,
+            74, 3, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0,
+            138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 138, 18, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0,
+            202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 202, 36, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 13, 9, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0,
+            138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 87, 64, 1, 0, 202, 15, 9, 0, 202, 143, 3, 0,
+            202, 15, 9, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0,
+            202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 15, 9, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0,
+            202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 202, 143, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0,
+            74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 74, 140, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0,
+            10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0, 10, 132, 3, 0,
+            138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0,
+            138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 138, 140, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0,
+            202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 202, 168, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0,
+            10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 10, 39, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0,
+            202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0,
+            202, 2, 3, 0, 202, 2, 3, 0, 202, 2, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 80, 98, 5, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 80, 98, 5, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 80, 98, 5, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0,
+            74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 74, 34, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0,
+            138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 138, 28, 3, 0, 78, 95, 5, 0, 78, 95, 5, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0,
+            74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 74, 31, 3, 0, 78, 95, 5, 0,
+            78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 78, 95, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0,
+            208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 208, 71, 5, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 202, 7, 3, 0, 219, 7, 3, 0, 219, 7, 3, 0, 219, 7, 3, 0, 202, 7, 3, 0, 219, 135, 4, 0, 202, 7, 3, 0, 202, 7, 3, 0, 208, 71, 5, 0, 146, 207, 2, 0, 146, 207, 2, 0, 146, 207, 2, 0, 146, 207, 2, 0, 146, 207, 2, 0, 146, 207, 2, 0, 146, 207, 2, 0,
+            146, 207, 2, 0, 146, 207, 2, 0, 146, 207, 2, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0, 138, 15, 3, 0,
+            138, 15, 3, 0, 138, 15, 3, 0, 144, 79, 5, 0, 144, 79, 5, 0, 144, 79, 5, 0, 144, 79, 5, 0, 144, 79, 5, 0, 144, 79, 5, 0, 144, 79, 5, 0, 144, 79, 5, 0, 91, 64, 4, 0, 155, 79, 4, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0,
+            10, 30, 3, 0, 10, 30, 3, 0, 10, 30, 3, 0, 80, 79, 5, 0, 80, 79, 5, 0, 80, 79, 5, 0, 78, 79, 5, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0,
+            74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 74, 15, 3, 0, 80, 79, 5, 0, 78, 79, 5, 0, 78, 79, 5, 0, 80, 79, 5, 0, 80, 79, 5, 0, 80, 79, 5, 0, 80, 79, 5, 0, 78, 79, 5, 0, 78, 79, 5, 0, 80, 79, 5, 0, 80, 79, 5, 0, 78, 79, 5, 0,
+            78, 79, 5, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0,
+            10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 10, 6, 3, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0,
+            74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 80, 36, 10, 0, 74, 36, 10, 0, 80, 36, 10, 0, 80, 36, 10, 0, 80, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 80, 36, 10, 0, 80, 36, 10, 0, 74, 36, 10, 0,
+            74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 74, 36, 10, 0, 80, 36, 10, 0, 80, 36, 10, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0,
+            138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 138, 23, 3, 0, 74, 204, 5, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0,
+            74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 204, 5, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0,
+            74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 74, 12, 6, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0, 159, 1, 3, 0,
+            159, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 88, 64, 0, 0, 92, 0, 0, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 161, 1, 3, 0, 138, 1, 3, 0,
+            138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 138, 1, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0,
+            74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 74, 19, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0,
+            202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0,
+            202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 202, 5, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0,
+            10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 15, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0,
+            10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 10, 40, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0,
+            202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0, 202, 31, 3, 0,
+            74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0,
+            74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 74, 9, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0,
+            10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 1, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0,
+            10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 10, 19, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0,
+            202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 202, 27, 3, 0, 225, 27, 3, 0, 225, 27, 3, 0, 212, 27, 3, 0, 212, 27, 3, 0, 212, 27, 3, 0, 212, 27, 3, 0,
+            212, 27, 3, 0, 212, 27, 3, 0, 212, 27, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0,
+            74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 74, 22, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0,
+            10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 10, 31, 3, 0, 20, 31, 3, 0, 20, 31, 3, 0, 27, 31, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0,
+            202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 202, 24, 3, 0, 212, 24, 3, 0, 212, 24, 3, 0, 212, 24, 3, 0, 10, 21, 3, 0,
+            10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 33, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0,
+            10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 10, 21, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0,
+            74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 74, 2, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0,
+            138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 138, 26, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0,
+            74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0, 74, 30, 3, 0,
+            74, 30, 3, 0, 74, 30, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0,
+            138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 138, 40, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0,
+            74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 74, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 84, 33, 3, 0, 78, 68, 5, 0, 80, 68, 5, 0, 78, 68, 5, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0,
+            74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 74, 4, 3, 0, 80, 68, 5, 0, 80, 68, 5, 0,
+            80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0, 80, 68, 5, 0, 144, 81, 5, 0, 144, 81, 5, 0, 142, 81, 5, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0,
+            138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 138, 17, 3, 0, 142, 81, 5, 0, 142, 81, 5, 0, 142, 81, 5, 0, 144, 81, 5, 0, 144, 81, 5, 0, 144, 81, 5, 0, 144, 81, 5, 0, 142, 81, 5, 0, 142, 81, 5, 0, 144, 81, 5, 0, 144, 81, 5, 0, 155, 17, 3, 0,
+            155, 17, 3, 0, 130, 17, 3, 0, 155, 81, 4, 0, 155, 81, 4, 0, 80, 69, 5, 0, 80, 69, 5, 0, 80, 69, 5, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0,
+            74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 74, 5, 3, 0, 16, 96, 5, 0, 16, 96, 5, 0, 14, 96, 5, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0,
+            10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 14, 96, 5, 0, 14, 96, 5, 0, 14, 96, 5, 0, 16, 96, 5, 0,
+            16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 14, 96, 5, 0, 14, 96, 5, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 10, 32, 3, 0, 27, 96, 4, 0, 27, 96, 4, 0, 27, 32, 3, 0, 27, 96, 4, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 16, 96, 5, 0, 27, 32, 3, 0, 14, 96, 5, 0, 16, 96, 5, 0,
+            18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 18, 224, 2, 0, 10, 32, 3, 0, 27, 160, 4, 0, 10, 32, 3, 0, 27, 96, 4, 0, 27, 96, 4, 0, 27, 96, 4, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0,
+            202, 16, 3, 0, 202, 16, 3, 0, 202, 16, 3, 0, 206, 80, 5, 0, 206, 80, 5, 0, 206, 80, 5, 0, 208, 80, 5, 0, 208, 80, 5, 0, 208, 80, 5, 0, 206, 80, 5, 0, 206, 80, 5, 0, 208, 80, 5, 0, 206, 80, 5, 0, 208, 80, 5, 0, 208, 80, 5, 0, 219, 80, 4, 0, 219, 80, 4, 0, 219, 16, 3, 0, 219, 80, 4, 0, 219, 80, 4, 0, 219, 16, 3, 0, 208, 80, 5, 0, 202, 16, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0,
+            138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0,
+            138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 138, 32, 3, 0, 144, 96, 5, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0,
+            74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 74, 25, 3, 0, 78, 89, 5, 0, 78, 89, 5, 0, 78, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 80, 89, 5, 0, 10, 38, 3, 0,
+            10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0,
+            10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 10, 38, 3, 0, 14, 102, 5, 0, 14, 102, 5, 0, 14, 102, 5, 0, 16, 102, 5, 0, 16, 102, 5, 0, 16, 102, 5, 0, 16, 102, 5, 0, 16, 102, 5, 0, 16, 102, 5, 0, 14, 102, 5, 0, 16, 102, 5, 0, 14, 102, 5, 0, 14, 102, 5, 0, 14, 102, 5, 0, 14, 102, 5, 0, 16, 102, 5, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0,
+            74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0,
+            74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 74, 32, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0,
+            202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 202, 22, 3, 0, 206, 86, 5, 0, 206, 86, 5, 0, 206, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 208, 86, 5, 0, 206, 86, 5, 0, 206, 86, 5, 0, 208, 86, 5, 0,
+            206, 86, 5, 0, 208, 86, 5, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0,
+            10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 10, 35, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0,
+            74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 74, 8, 3, 0, 10, 41, 3, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0,
+            16, 105, 5, 0, 16, 105, 5, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0, 10, 41, 3, 0,
+            10, 41, 3, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 14, 105, 5, 0, 10, 41, 3, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 16, 105, 5, 0, 27, 169, 4, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0,
+            202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 202, 33, 3, 0, 208, 97, 5, 0, 208, 97, 5, 0,
+            208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 206, 97, 5, 0, 208, 97, 5, 0, 208, 97, 5, 0, 219, 97, 4, 0, 219, 97, 4, 0, 219, 97, 4, 0, 202, 33, 3, 0, 219, 161, 4, 0, 219, 161, 4, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0,
+            10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0, 10, 28, 3, 0,
+            10, 28, 3, 0, 10, 28, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0,
+            74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 74, 40, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0,
+            10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 7, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0,
+            10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 0, 0, 10, 9, 0, 0,
+            10, 9, 0, 0, 10, 73, 0, 0, 10, 73, 0, 0, 10, 73, 0, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 73, 0, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 0, 0, 10, 73, 0, 0, 10, 9, 0, 0, 10, 73, 0, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0,
+            10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 0, 0, 10, 73, 0, 0, 10, 73, 0, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0,
+            10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 10, 9, 3, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 0, 0, 2, 73, 0, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 1, 0, 2, 9, 0, 0,
+            2, 73, 0, 0, 2, 9, 0, 0, 2, 73, 0, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0,
+            202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 0, 0, 202, 77, 0, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0,
+            202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 202, 13, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0,
+            74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 74, 38, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0,
+            10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 10, 14, 3, 0, 16, 78, 5, 0, 16, 78, 5, 0, 16, 78, 5, 0, 16, 78, 5, 0, 16, 78, 5, 0, 16, 78, 5, 0,
+            16, 78, 5, 0, 27, 78, 4, 0, 27, 78, 4, 0, 27, 78, 4, 0, 27, 14, 3, 0, 27, 14, 3, 0, 33, 14, 3, 0, 33, 14, 3, 0, 33, 14, 3, 0, 33, 14, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0,
+            138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 138, 29, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0,
+            10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 164, 3, 0, 10, 17, 3, 0,
+            10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0,
+            10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 10, 17, 3, 0, 202, 143, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0,
+            138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 138, 141, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0,
+            202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 153, 3, 0, 202, 8, 3, 0,
+            202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0,
+            202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 202, 8, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0,
+            74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 74, 14, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0,
+            202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 39, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0,
+            202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0, 202, 21, 3, 0,
+            202, 21, 3, 0, 202, 21, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 66, 0, 3, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0,
+            144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 144, 65, 5, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 210, 229, 2, 0, 212, 37, 3, 0, 212, 37, 3, 0, 212, 37, 3, 0, 212, 37, 3, 0, 212, 37, 3, 0, 212, 37, 3, 0,
+            212, 37, 3, 0, 212, 37, 3, 0, 212, 37, 3, 0, 212, 37, 3, 0, 225, 101, 4, 0, 208, 101, 5, 0, 225, 37, 3, 0, 208, 101, 5, 0, 225, 37, 3, 0, 208, 101, 5, 0, 220, 37, 0, 0, 216, 101, 0, 0, 220, 37, 0, 0, 216, 101, 0, 0, 206, 101, 5, 0, 206, 101, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 0, 1, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 0, 1, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0,
+            144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0,
+            144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 71, 5, 0, 144, 71, 5, 0, 91, 128, 3, 0, 87, 128, 3, 0, 87, 128, 3, 0, 86, 128, 3, 0, 86, 128, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0,
+            92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 78, 64, 5, 0, 78, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 78, 64, 5, 0, 78, 64, 5, 0, 78, 64, 5, 0, 78, 64, 5, 0, 78, 64, 5, 0, 78, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0,
+            66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 97, 0, 3, 0, 97, 0, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 144, 64, 5, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0,
+            144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0,
+            144, 95, 5, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 144, 95, 5, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0,
+            161, 31, 3, 0, 161, 31, 3, 0, 144, 95, 5, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0,
+            142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 142, 93, 5, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0,
+            82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0, 82, 192, 2, 0,
+            82, 192, 2, 0, 82, 192, 2, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0,
+            83, 146, 8, 0, 83, 146, 8, 0, 83, 146, 8, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 83, 18, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0,
+            147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 147, 11, 3, 0, 148, 11, 3, 0, 148, 11, 3, 0, 148, 11, 3, 0, 148, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0,
+            161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0,
+            83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 83, 40, 3, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0,
+            84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 0, 3, 0, 97, 192, 0, 0,
+            97, 0, 3, 0, 97, 128, 1, 0, 97, 128, 1, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0,
+            84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 97, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0,
+            84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 84, 128, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0,
+            20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0, 20, 22, 3, 0,
+            212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 212, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0,
+            225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 225, 35, 3, 0, 222, 163, 2, 0, 222, 163, 2, 0, 222, 163, 2, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0,
+            84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 0, 3, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0, 84, 128, 8, 0,
+            84, 128, 8, 0, 84, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 101, 64, 4, 0, 101, 64, 4, 0, 101, 64, 4, 0, 101, 64, 4, 0,
+            101, 64, 4, 0, 101, 64, 4, 0, 101, 64, 4, 0, 101, 0, 1, 0, 101, 64, 4, 0, 101, 64, 4, 0, 101, 64, 4, 0, 66, 0, 5, 0, 130, 64, 5, 0, 130, 192, 7, 0, 66, 64, 5, 0, 66, 64, 5, 0, 87, 64, 4, 0, 87, 0, 1, 0, 87, 64, 4, 0, 87, 64, 4, 0, 87, 192, 4, 0, 87, 128, 8, 0, 91, 128, 8, 0, 91, 0, 3, 0, 90, 192, 0, 0, 89, 192, 0, 0, 92, 0, 0, 0, 90, 192, 0, 0, 90, 192, 0, 0,
+            89, 192, 0, 0, 92, 0, 0, 0, 90, 192, 0, 0, 91, 128, 8, 0, 91, 128, 8, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 192, 3, 0, 91, 192, 3, 0, 91, 192, 3, 0, 91, 64, 4, 0, 99, 192, 8, 0, 100, 192, 8, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 101, 0, 1, 0, 91, 128, 2, 0, 91, 128, 2, 0, 91, 128, 2, 0, 91, 128, 2, 0, 91, 128, 2, 0, 91, 128, 2, 0,
+            91, 128, 2, 0, 91, 128, 2, 0, 91, 0, 3, 0, 90, 192, 0, 0, 89, 192, 0, 0, 91, 128, 8, 0, 91, 64, 1, 0, 91, 64, 1, 0, 91, 0, 3, 0, 86, 0, 3, 0, 86, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 96, 0, 2, 0, 92, 0, 0, 0, 88, 64, 0, 0, 91, 64, 1, 0, 91, 64, 1, 0, 91, 64, 1, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0,
+            91, 0, 3, 0, 91, 0, 3, 0, 91, 0, 3, 0, 96, 0, 3, 0, 91, 0, 3, 0, 86, 0, 3, 0, 91, 0, 3, 0, 91, 64, 4, 0, 91, 128, 2, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 0, 3, 0, 91, 64, 4, 0, 91, 64, 4, 0, 101, 64, 4, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0,
+            66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 66, 64, 5, 0, 4, 64, 8, 0,
+            4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0,
+            4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 4, 64, 8, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0,
+            5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 5, 64, 10, 0, 91, 192, 0, 0, 91, 192, 0, 0, 90, 192, 0, 0, 89, 192, 0, 0, 90, 192, 0, 0, 89, 192, 0, 0, 91, 192, 0, 0, 91, 192, 0, 0, 91, 192, 0, 0, 90, 192, 0, 0, 89, 192, 0, 0, 91, 192, 0, 0,
+            90, 192, 0, 0, 89, 192, 0, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 64, 4, 0, 91, 0, 3, 0, 87, 64, 4, 0, 91, 0, 0, 0, 91, 64, 4, 0, 87, 0, 3, 0, 91, 0, 3, 0, 90, 192, 0, 0, 89, 192, 0, 0, 91, 0, 3, 0, 91, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0,
+            88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0,
+            88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 92, 0, 0, 0, 88, 64, 0, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 92, 0, 0, 0, 88, 64, 0, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 128, 8, 0, 97, 0, 3, 0, 96, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0,
+            96, 128, 8, 0, 96, 64, 2, 0, 96, 64, 2, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0,
+            96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 128, 8, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 192, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 96, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0,
+            96, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 96, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0,
+            96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 96, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 128, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0,
+            94, 64, 2, 0, 94, 64, 2, 0, 94, 128, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 128, 2, 0, 94, 64, 2, 0, 94, 64, 2, 0, 94, 128, 2, 0, 94, 64, 2, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 95, 128, 7, 0, 95, 128, 7, 0, 95, 128, 7, 0, 95, 128, 7, 0, 95, 128, 7, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0,
+            161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0, 161, 16, 3, 0,
+            161, 16, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 128, 8, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0,
+            97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 192, 0, 0, 97, 192, 0, 0, 97, 192, 0, 0,
+            97, 192, 0, 0, 97, 192, 0, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0,
+            161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 4, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0,
+            161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 161, 140, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0,
+            97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0,
+            97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 140, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0,
+            225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0,
+            225, 143, 3, 0, 225, 143, 3, 0, 97, 128, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0,
+            225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 225, 143, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0,
+            225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0, 225, 168, 3, 0,
+            161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0,
+            161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 11, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0,
+            161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 161, 31, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0,
+            97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 8, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0,
+            97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0,
+            97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0,
+            97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 192, 0, 0, 97, 192, 0, 0, 97, 192, 0, 0, 97, 64, 1, 0, 97, 64, 1, 0, 97, 64, 1, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0,
+            97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 0, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0,
+            97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 128, 3, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0,
+            97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 64, 7, 0, 97, 128, 3, 0, 97, 128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        };
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrie.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrie.cs
new file mode 100644
index 0000000000..079f830ddc
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrie.cs
@@ -0,0 +1,192 @@
+// RichTextKit
+// Copyright © 2019 Topten Software. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may 
+// not use this product except in compliance with the License. You may obtain 
+// a copy of the License at
+// 
+// https://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+// License for the specific language governing permissions and limitations 
+// under the License.
+// Ported from: https://github.com/foliojs/unicode-trie
+// Copied from: https://github.com/toptensoftware/RichTextKit
+
+using System;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal class UnicodeTrie
+    {
+        private readonly uint[] _data;
+        private readonly int _highStart;
+        private readonly uint _errorValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnicodeTrie"/> class.
+        /// </summary>
+        /// <param name="rawData">The uncompressed trie data.</param>
+        public UnicodeTrie(ReadOnlySpan<byte> rawData)
+        {
+            var header = UnicodeTrieHeader.Parse(rawData);
+            int length = header.DataLength;
+            uint[] data = new uint[length / sizeof(uint)];
+
+            MemoryMarshal.Cast<byte, uint>(rawData.Slice(rawData.Length - length))
+                .CopyTo(data);
+
+            _highStart = header.HighStart;
+           _errorValue = header.ErrorValue;
+            _data = data;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnicodeTrie"/> class.
+        /// </summary>
+        /// <param name="stream">The stream containing the data.</param>
+        public UnicodeTrie(Stream stream)
+        {
+            // Read the header info
+            using (var br = new BinaryReader(stream, Encoding.UTF8, true))
+            {
+                _highStart = br.ReadInt32();
+                _errorValue = br.ReadUInt32();
+                _data = new uint[br.ReadInt32() / sizeof(uint)];
+            }
+
+            // Read the data in compressed format.
+            using (var br = new BinaryReader(stream, Encoding.UTF8, true))
+            {
+                for (int i = 0; i < _data.Length; i++)
+                {
+                    _data[i] = br.ReadUInt32();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnicodeTrie"/> class.
+        /// </summary>
+        /// <param name="data">The uncompressed trie data.</param>
+        /// <param name="highStart">The start of the last range which ends at U+10ffff.</param>
+        /// <param name="errorValue">The value for out-of-range code points and illegal UTF-8.</param>
+        public UnicodeTrie(uint[] data, int highStart, uint errorValue)
+        {
+            _data = data;
+            _highStart = highStart;
+            _errorValue = errorValue;
+        }
+
+        /// <summary>
+        /// Saves the <see cref="UnicodeTrie"/> to the stream in a compressed format.
+        /// </summary>
+        /// <param name="stream">The output stream.</param>
+        internal void Save(Stream stream)
+        {
+            // Write the header info
+            using (var bw = new BinaryWriter(stream, Encoding.UTF8, true))
+            {
+                bw.Write(_highStart);
+                bw.Write(_errorValue);
+                bw.Write(_data.Length * sizeof(uint));
+            }
+
+            // Write the data.
+            using (var bw = new BinaryWriter(stream, Encoding.UTF8, true))
+            {
+                for (int i = 0; i < _data.Length; i++)
+                {
+                    bw.Write(_data[i]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the value for a code point as stored in the trie.
+        /// </summary>
+        /// <param name="codePoint">The code point.</param>
+        /// <returns>The <see cref="uint"/> value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public uint Get(uint codePoint)
+        {
+            uint index;
+            ref uint dataBase = ref MemoryMarshal.GetReference(_data.AsSpan());
+
+            if (codePoint is < 0x0d800 or (> 0x0dbff and <= 0x0ffff))
+            {
+                // Ordinary BMP code point, excluding leading surrogates.
+                // BMP uses a single level lookup.  BMP index starts at offset 0 in the Trie2 index.
+                // 16 bit data is stored in the index array itself.
+                index = _data[codePoint >> UnicodeTrieBuilder.SHIFT_2];
+                index = (index << UnicodeTrieBuilder.INDEX_SHIFT) + (codePoint & UnicodeTrieBuilder.DATA_MASK);
+                return Unsafe.Add(ref dataBase, (nint)index);
+            }
+
+            if (codePoint <= 0xffff)
+            {
+                // Lead Surrogate Code Point.  A Separate index section is stored for
+                // lead surrogate code units and code points.
+                //   The main index has the code unit data.
+                //   For this function, we need the code point data.
+                // Note: this expression could be refactored for slightly improved efficiency, but
+                //       surrogate code points will be so rare in practice that it's not worth it.
+                index = _data[UnicodeTrieBuilder.LSCP_INDEX_2_OFFSET + ((codePoint - 0xd800) >> UnicodeTrieBuilder.SHIFT_2)];
+                index = (index << UnicodeTrieBuilder.INDEX_SHIFT) + (codePoint & UnicodeTrieBuilder.DATA_MASK);
+                return Unsafe.Add(ref dataBase, (nint)index);
+            }
+
+            if (codePoint < _highStart)
+            {
+                // Supplemental code point, use two-level lookup.
+                index = UnicodeTrieBuilder.INDEX_1_OFFSET - UnicodeTrieBuilder.OMITTED_BMP_INDEX_1_LENGTH + (codePoint >> UnicodeTrieBuilder.SHIFT_1);
+                index = _data[index];
+                index += (codePoint >> UnicodeTrieBuilder.SHIFT_2) & UnicodeTrieBuilder.INDEX_2_MASK;
+                index = _data[index];
+                index = (index << UnicodeTrieBuilder.INDEX_SHIFT) + (codePoint & UnicodeTrieBuilder.DATA_MASK);
+                return Unsafe.Add(ref dataBase, (nint)index);
+            }
+
+            if (codePoint <= 0x10ffff)
+            {
+                return Unsafe.Add(ref dataBase, (nint)(_data.Length - UnicodeTrieBuilder.DATA_GRANULARITY));
+            }
+
+            // Fall through.  The code point is outside of the legal range of 0..0x10ffff.
+            return _errorValue;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        private struct UnicodeTrieHeader
+        {
+            public int HighStart
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get;
+            }
+
+            public uint ErrorValue
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get;
+            }
+
+            public int DataLength
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public static UnicodeTrieHeader Parse(ReadOnlySpan<byte> data)
+                => MemoryMarshal.Cast<byte, UnicodeTrieHeader>(data)[0];
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
new file mode 100644
index 0000000000..de0304f4c9
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
@@ -0,0 +1,159 @@
+// RichTextKit
+// Copyright © 2019 Topten Software. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may 
+// not use this product except in compliance with the License. You may obtain 
+// a copy of the License at
+// 
+// https://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+// License for the specific language governing permissions and limitations 
+// under the License.
+// Ported from: https://github.com/foliojs/unicode-trie
+// Copied from: https://github.com/toptensoftware/RichTextKit
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal partial class UnicodeTrieBuilder
+    {
+        // Shift size for getting the index-1 table offset.
+        internal const int SHIFT_1 = 6 + 5;
+
+        // Shift size for getting the index-2 table offset.
+        internal const int SHIFT_2 = 5;
+
+        // Difference between the two shift sizes,
+        // for getting an index-1 offset from an index-2 offset. 6=11-5
+        const int SHIFT_1_2 = SHIFT_1 - SHIFT_2;
+
+        // Number of index-1 entries for the BMP. 32=0x20
+        // This part of the index-1 table is omitted from the serialized form.
+        internal const int OMITTED_BMP_INDEX_1_LENGTH = 0x10000 >> SHIFT_1;
+
+        // Number of code points per index-1 table entry. 2048=0x800
+        const int CP_PER_INDEX_1_ENTRY = 1 << SHIFT_1;
+
+        // Number of entries in an index-2 block. 64=0x40
+        const int INDEX_2_BLOCK_LENGTH = 1 << SHIFT_1_2;
+
+        // Mask for getting the lower bits for the in-index-2-block offset. */
+        internal const int INDEX_2_MASK = INDEX_2_BLOCK_LENGTH - 1;
+
+        // Number of entries in a data block. 32=0x20
+        const int DATA_BLOCK_LENGTH = 1 << SHIFT_2;
+
+        // Mask for getting the lower bits for the in-data-block offset.
+        internal const int DATA_MASK = DATA_BLOCK_LENGTH - 1;
+
+        // Shift size for shifting left the index array values.
+        // Increases possible data size with 16-bit index values at the cost
+        // of compactability.
+        // This requires data blocks to be aligned by DATA_GRANULARITY.
+        internal const int INDEX_SHIFT = 2;
+
+        // The alignment size of a data block. Also the granularity for compaction.
+        internal const int DATA_GRANULARITY = 1 << INDEX_SHIFT;
+
+        // The BMP part of the index-2 table is fixed and linear and starts at offset 0.
+        // Length=2048=0x800=0x10000>>SHIFT_2.
+        const int INDEX_2_OFFSET = 0;
+
+        // The part of the index-2 table for U+D800..U+DBFF stores values for
+        // lead surrogate code _units_ not code _points_.
+        // Values for lead surrogate code _points_ are indexed with this portion of the table.
+        // Length=32=0x20=0x400>>SHIFT_2. (There are 1024=0x400 lead surrogates.)
+        internal const int LSCP_INDEX_2_OFFSET = 0x10000 >> SHIFT_2;
+        const int LSCP_INDEX_2_LENGTH = 0x400 >> SHIFT_2;
+
+        // Count the lengths of both BMP pieces. 2080=0x820
+        const int INDEX_2_BMP_LENGTH = LSCP_INDEX_2_OFFSET + LSCP_INDEX_2_LENGTH;
+
+        // The 2-byte UTF-8 version of the index-2 table follows at offset 2080=0x820.
+        // Length 32=0x20 for lead bytes C0..DF, regardless of SHIFT_2.
+        const int UTF8_2B_INDEX_2_OFFSET = INDEX_2_BMP_LENGTH;
+        const int UTF8_2B_INDEX_2_LENGTH = 0x800 >> 6;  // U+0800 is the first code point after 2-byte UTF-8
+
+        // The index-1 table, only used for supplementary code points, at offset 2112=0x840.
+        // Variable length, for code points up to highStart, where the last single-value range starts.
+        // Maximum length 512=0x200=0x100000>>SHIFT_1.
+        // (For 0x100000 supplementary code points U+10000..U+10ffff.)
+        //
+        // The part of the index-2 table for supplementary code points starts
+        // after this index-1 table.
+        //
+        // Both the index-1 table and the following part of the index-2 table
+        // are omitted completely if there is only BMP data.
+        internal const int INDEX_1_OFFSET = UTF8_2B_INDEX_2_OFFSET + UTF8_2B_INDEX_2_LENGTH;
+        const int MAX_INDEX_1_LENGTH = 0x100000 >> SHIFT_1;
+
+        // The illegal-UTF-8 data block follows the ASCII block, at offset 128=0x80.
+        // Used with linear access for single bytes 0..0xbf for simple error handling.
+        // Length 64=0x40, not DATA_BLOCK_LENGTH.
+        const int BAD_UTF8_DATA_OFFSET = 0x80;
+
+        // The start of non-linear-ASCII data blocks, at offset 192=0xc0.
+        // !!!!
+        const int DATA_START_OFFSET = 0xc0;
+
+        // The null data block.
+        // Length 64=0x40 even if DATA_BLOCK_LENGTH is smaller,
+        // to work with 6-bit trail bytes from 2-byte UTF-8.
+        const int DATA_NULL_OFFSET = DATA_START_OFFSET;
+
+        // The start of allocated data blocks.
+        const int NEW_DATA_START_OFFSET = DATA_NULL_OFFSET + 0x40;
+
+        // The start of data blocks for U+0800 and above.
+        // Below, compaction uses a block length of 64 for 2-byte UTF-8.
+        // From here on, compaction uses DATA_BLOCK_LENGTH.
+        // Data values for 0x780 code points beyond ASCII.
+        const int DATA_0800_OFFSET = NEW_DATA_START_OFFSET + 0x780;
+
+        // Start with allocation of 16k data entries. */
+        const int INITIAL_DATA_LENGTH = 1 << 14;
+
+        // Grow about 8x each time.
+        const int MEDIUM_DATA_LENGTH = 1 << 17;
+
+        // Maximum length of the runtime data array.
+        // Limited by 16-bit index values that are left-shifted by INDEX_SHIFT,
+        // and by uint16_t UTrie2Header.shiftedDataLength.
+        const int MAX_DATA_LENGTH_RUNTIME = 0xffff << INDEX_SHIFT;
+
+        const int INDEX_1_LENGTH = 0x110000 >> SHIFT_1;
+
+        // Maximum length of the build-time data array.
+        // One entry per 0x110000 code points, plus the illegal-UTF-8 block and the null block,
+        // plus values for the 0x400 surrogate code units.
+        const int MAX_DATA_LENGTH_BUILDTIME = 0x110000 + 0x40 + 0x40 + 0x400;
+
+        // At build time, leave a gap in the index-2 table,
+        // at least as long as the maximum lengths of the 2-byte UTF-8 index-2 table
+        // and the supplementary index-1 table.
+        // Round up to INDEX_2_BLOCK_LENGTH for proper compacting.
+        const int INDEX_GAP_OFFSET = INDEX_2_BMP_LENGTH;
+        const int INDEX_GAP_LENGTH = ((UTF8_2B_INDEX_2_LENGTH + MAX_INDEX_1_LENGTH) + INDEX_2_MASK) & ~INDEX_2_MASK;
+
+        // Maximum length of the build-time index-2 array.
+        // Maximum number of Unicode code points (0x110000) shifted right by SHIFT_2,
+        // plus the part of the index-2 table for lead surrogate code points,
+        // plus the build-time index gap,
+        // plus the null index-2 block.)
+        const int MAX_INDEX_2_LENGTH = (0x110000 >> SHIFT_2) + LSCP_INDEX_2_LENGTH + INDEX_GAP_LENGTH + INDEX_2_BLOCK_LENGTH;
+
+        // The null index-2 block, following the gap in the index-2 table.
+        const int INDEX_2_NULL_OFFSET = INDEX_GAP_OFFSET + INDEX_GAP_LENGTH;
+
+        // The start of allocated index-2 blocks.
+        const int INDEX_2_START_OFFSET = INDEX_2_NULL_OFFSET + INDEX_2_BLOCK_LENGTH;
+
+        // Maximum length of the runtime index array.
+        // Limited by its own 16-bit index values, and by uint16_t UTrie2Header.indexLength.
+        // (The actual maximum length is lower,
+        // (0x110000>>SHIFT_2)+UTF8_2B_INDEX_2_LENGTH+MAX_INDEX_1_LENGTH.)
+        const int MAX_INDEX_LENGTH = 0xffff;
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
new file mode 100644
index 0000000000..755d603539
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
@@ -0,0 +1,984 @@
+// RichTextKit
+// Copyright © 2019 Topten Software. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may 
+// not use this product except in compliance with the License. You may obtain 
+// a copy of the License at
+// 
+// https://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+// License for the specific language governing permissions and limitations 
+// under the License.
+// Ported from: https://github.com/foliojs/unicode-trie
+// Copied from: https://github.com/toptensoftware/RichTextKit
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal partial class UnicodeTrieBuilder
+    {
+        private readonly uint _initialValue;
+        private readonly uint _errorValue;
+        private readonly int[] _index1;
+        private readonly int[] _index2;
+        private int _highStart;
+        private uint[] _data;
+        private int _dataCapacity;
+        private int _firstFreeBlock;
+        private bool _isCompacted;
+        private readonly int[] _map;
+        private int _dataNullOffset;
+        private int _dataLength;
+        private int _index2NullOffset;
+        private int _index2Length;
+
+        public UnicodeTrieBuilder(uint initialValue = 0, uint errorValue = 0)
+        {
+            _initialValue = initialValue;
+            _errorValue = errorValue;
+            _index1 = new int[INDEX_1_LENGTH];
+            _index2 = new int[MAX_INDEX_2_LENGTH];
+            _highStart = 0x110000;
+
+            _data = new uint[INITIAL_DATA_LENGTH];
+            _dataCapacity = INITIAL_DATA_LENGTH;
+
+            _firstFreeBlock = 0;
+            _isCompacted = false;
+
+            // Multi-purpose per-data-block table.
+            //
+            // Before compacting:
+            //
+            // Per-data-block reference counters/free-block list.
+            //  0: unused
+            // >0: reference counter (number of index-2 entries pointing here)
+            // <0: next free data block in free-block list
+            //
+            // While compacting:
+            //
+            // Map of adjusted indexes, used in compactData() and compactIndex2().
+            // Maps from original indexes to new ones.
+            _map = new int[MAX_DATA_LENGTH_BUILDTIME >> SHIFT_2];
+
+            int i;
+            for (i = 0; i < 0x80; i++)
+            {
+                _data[i] = _initialValue;
+            }
+
+            for (; i < 0xc0; i++)
+            {
+                _data[i] = _errorValue;
+            }
+
+            for (i = DATA_NULL_OFFSET; i < NEW_DATA_START_OFFSET; i++)
+            {
+                _data[i] = _initialValue;
+            }
+
+            _dataNullOffset = DATA_NULL_OFFSET;
+            _dataLength = NEW_DATA_START_OFFSET;
+
+            // set the index-2 indexes for the 2=0x80>>SHIFT_2 ASCII data blocks
+            int j;
+            i = 0;
+            for (j = 0; j < 0x80; j += DATA_BLOCK_LENGTH) {
+                _index2[i] = j;
+                _map[i++] = 1;
+            }
+
+            // reference counts for the bad-UTF-8-data block
+            for (; j < 0xc0; j += DATA_BLOCK_LENGTH) {
+                _map[i++] = 0;
+            }
+
+            // Reference counts for the null data block: all blocks except for the ASCII blocks.
+            // Plus 1 so that we don't drop this block during compaction.
+            // Plus as many as needed for lead surrogate code points.
+            // i==newTrie->dataNullOffset
+            _map[i++] = ((0x110000 >> SHIFT_2) - (0x80 >> SHIFT_2)) + 1 + LSCP_INDEX_2_LENGTH;
+            j += DATA_BLOCK_LENGTH;
+            for (; j < NEW_DATA_START_OFFSET; j += DATA_BLOCK_LENGTH) {
+                _map[i++] = 0;
+            }
+
+            // set the remaining indexes in the BMP index-2 block
+            // to the null data block
+            for (i = 0x80 >> SHIFT_2; i < INDEX_2_BMP_LENGTH; i++) {
+                _index2[i] = DATA_NULL_OFFSET;
+            }
+
+            // Fill the index gap with impossible values so that compaction
+            // does not overlap other index-2 blocks with the gap.
+            for (i = 0; i < INDEX_GAP_LENGTH; i++) {
+                _index2[INDEX_GAP_OFFSET + i] = -1;
+            }
+
+            // set the indexes in the null index-2 block
+            for (i = 0; i < INDEX_2_BLOCK_LENGTH; i++) {
+                _index2[INDEX_2_NULL_OFFSET + i] = DATA_NULL_OFFSET;
+            }
+
+            _index2NullOffset = INDEX_2_NULL_OFFSET;
+            _index2Length = INDEX_2_START_OFFSET;
+
+            // set the index-1 indexes for the linear index-2 block
+            j = 0;
+            for (i = 0; i < OMITTED_BMP_INDEX_1_LENGTH; i++) {
+                _index1[i] = j;
+                j += INDEX_2_BLOCK_LENGTH;
+            }
+
+            // set the remaining index-1 indexes to the null index-2 block
+            for (; i < INDEX_1_LENGTH; i++) {
+                _index1[i] = INDEX_2_NULL_OFFSET;
+            }
+
+            // Preallocate and reset data for U+0080..U+07ff,
+            // for 2-byte UTF-8 which will be compacted in 64-blocks
+            // even if DATA_BLOCK_LENGTH is smaller.
+            for (i = 0x80; i < 0x800; i += DATA_BLOCK_LENGTH) {
+                Set(i, _initialValue);
+            }
+
+        }
+
+        public UnicodeTrieBuilder Set(int codePoint, uint value)
+        {
+            if ((codePoint < 0) || (codePoint > 0x10ffff))
+            {
+                throw new InvalidOperationException("Invalid code point");
+            }
+
+            if (_isCompacted)
+            {
+                throw new InvalidOperationException("Already compacted");
+            }
+
+            var block = GetDataBlock(codePoint, true);
+            _data[block + (codePoint & DATA_MASK)] = value;
+            return this;
+        }
+
+        public UnicodeTrieBuilder SetRange(int start, int end, uint value, bool overwrite = true)
+        {
+
+            if ((start > 0x10ffff) || (end > 0x10ffff) || (start > end))
+            {
+                throw new InvalidOperationException("Invalid code point");
+            }
+
+            if (_isCompacted)
+            {
+                throw new InvalidOperationException("Already compacted");
+            }
+
+            if (!overwrite && (value == _initialValue))
+            {
+                return this; // nothing to do
+            }
+
+            var limit = end + 1;
+            if ((start & DATA_MASK) != 0)
+            {
+                // set partial block at [start..following block boundary
+                var block = GetDataBlock(start, true);
+
+                var nextStart = (start + DATA_BLOCK_LENGTH) & ~DATA_MASK;
+                if (nextStart <= limit)
+                {
+                    FillBlock(block, start & DATA_MASK, DATA_BLOCK_LENGTH, value, _initialValue, overwrite);
+                    start = nextStart;
+                }
+                else
+                {
+                    FillBlock(block, start & DATA_MASK, limit & DATA_MASK, value, _initialValue, overwrite);
+                    return this;
+                }
+            }
+
+            // number of positions in the last, partial block
+            var rest = limit & DATA_MASK;
+
+            // round down limit to a block boundary
+            limit &= ~DATA_MASK;
+
+            // iterate over all-value blocks
+            int repeatBlock;
+            if (value == _initialValue)
+            {
+                repeatBlock = _dataNullOffset;
+            }
+            else
+            {
+                repeatBlock = -1;
+            }
+
+            while (start < limit)
+            {
+                var setRepeatBlock = false;
+
+                if ((value == _initialValue) && IsInNullBlock(start, true))
+                {
+                    start += DATA_BLOCK_LENGTH; // nothing to do
+                    continue;
+                }
+
+                // get index value
+                var i2 = GetIndex2Block(start, true);
+                i2 += (start >> SHIFT_2) & INDEX_2_MASK;
+
+                var block = _index2[i2];
+                if (IsWritableBlock(block))
+                {
+                    // already allocated
+                    if (overwrite && (block >= DATA_0800_OFFSET))
+                    {
+                        // We overwrite all values, and it's not a
+                        // protected (ASCII-linear or 2-byte UTF-8) block:
+                        // replace with the repeatBlock.
+                        setRepeatBlock = true;
+                    }
+                    else
+                    {
+                        // protected block: just write the values into this block
+                        FillBlock(block, 0, DATA_BLOCK_LENGTH, value, _initialValue, overwrite);
+                    }
+
+                }
+                else if ((_data[block] != value) && (overwrite || (block == _dataNullOffset)))
+                {
+                    // Set the repeatBlock instead of the null block or previous repeat block:
+                    //
+                    // If !isWritableBlock() then all entries in the block have the same value
+                    // because it's the null block or a range block (the repeatBlock from a previous
+                    // call to utrie2_setRange32()).
+                    // No other blocks are used multiple times before compacting.
+                    //
+                    // The null block is the only non-writable block with the initialValue because
+                    // of the repeatBlock initialization above. (If value==initialValue, then
+                    // the repeatBlock will be the null data block.)
+                    //
+                    // We set our repeatBlock if the desired value differs from the block's value,
+                    // and if we overwrite any data or if the data is all initial values
+                    // (which is the same as the block being the null block, see above).
+                    setRepeatBlock = true;
+                }
+
+                if (setRepeatBlock)
+                {
+                    if (repeatBlock >= 0)
+                    {
+                        SetIndex2Entry(i2, repeatBlock);
+                    }
+                    else
+                    {
+                        // create and set and fill the repeatBlock
+                        repeatBlock = GetDataBlock(start, true);
+                        WriteBlock(repeatBlock, value);
+                    }
+                }
+
+                start += DATA_BLOCK_LENGTH;
+            }
+
+            if (rest > 0)
+            {
+                // set partial block at [last block boundary..limit
+                var block = GetDataBlock(start, true);
+                FillBlock(block, 0, rest, value, _initialValue, overwrite);
+            }
+
+            return this;
+        }
+
+        public uint Get(int c, bool fromLSCP = true)
+        {
+            if ((c < 0) || (c > 0x10ffff))
+            {
+                return _errorValue;
+            }
+
+            if ((c >= _highStart) && (!((c >= 0xd800) && (c < 0xdc00)) || fromLSCP))
+            {
+                return _data[_dataLength - DATA_GRANULARITY];
+            }
+
+            int i2;
+            if (((c >= 0xd800) && (c < 0xdc00)) && fromLSCP)
+            {
+                i2 = (LSCP_INDEX_2_OFFSET - (0xd800 >> SHIFT_2)) + (c >> SHIFT_2);
+            }
+            else
+            {
+                i2 = _index1[c >> SHIFT_1] + ((c >> SHIFT_2) & INDEX_2_MASK);
+            }
+
+            var block = _index2[i2];
+            return _data[block + (c & DATA_MASK)];
+        }
+
+        public byte[] ToBuffer()
+        {
+            var mem = new MemoryStream();
+            Save(mem);
+            return mem.GetBuffer();
+        }
+
+        public void Save(Stream stream)
+        {
+            var trie = this.Freeze();
+            trie.Save(stream);
+        }
+
+        public UnicodeTrie Freeze()
+        {
+            int allIndexesLength, i;
+            if (!_isCompacted)
+            {
+                Compact();
+            }
+
+            if (_highStart <= 0x10000)
+            {
+                allIndexesLength = INDEX_1_OFFSET;
+            }
+            else
+            {
+                allIndexesLength = _index2Length;
+            }
+
+            var dataMove = allIndexesLength;
+
+            // are indexLength and dataLength within limits?
+            if ((allIndexesLength > MAX_INDEX_LENGTH) || // for unshifted indexLength
+              ((dataMove + _dataNullOffset) > 0xffff) || // for unshifted dataNullOffset
+              ((dataMove + DATA_0800_OFFSET) > 0xffff) || // for unshifted 2-byte UTF-8 index-2 values
+              ((dataMove + _dataLength) > MAX_DATA_LENGTH_RUNTIME))
+            { // for shiftedDataLength
+                throw new InvalidOperationException("Trie data is too large.");
+            }
+
+            // calculate the sizes of, and allocate, the index and data arrays
+            var indexLength = allIndexesLength + _dataLength;
+            var data = new uint[indexLength];
+
+            // write the index-2 array values shifted right by INDEX_SHIFT, after adding dataMove
+            var destIdx = 0;
+            for (i = 0; i < INDEX_2_BMP_LENGTH; i++)
+            {
+                data[destIdx++] = (uint)((_index2[i] + dataMove) >> INDEX_SHIFT);
+            }
+
+            // write UTF-8 2-byte index-2 values, not right-shifted
+            for (i = 0; i < 0xc2 - 0xc0; i++)
+            { // C0..C1
+                data[destIdx++] = (uint)(dataMove + BAD_UTF8_DATA_OFFSET);
+            }
+
+            for (; i < 0xe0 - 0xc0; i++)
+            { // C2..DF
+                data[destIdx++] = (uint)(dataMove + _index2[i << (6 - SHIFT_2)]);
+            }
+
+            if (_highStart > 0x10000)
+            {
+                var index1Length = (_highStart - 0x10000) >> SHIFT_1;
+                var index2Offset = INDEX_2_BMP_LENGTH + UTF8_2B_INDEX_2_LENGTH + index1Length;
+
+                // write 16-bit index-1 values for supplementary code points
+                for (i = 0; i < index1Length; i++)
+                {
+                    data[destIdx++] = (uint)(INDEX_2_OFFSET + _index1[i + OMITTED_BMP_INDEX_1_LENGTH]);
+                }
+
+                // write the index-2 array values for supplementary code points,
+                // shifted right by INDEX_SHIFT, after adding dataMove
+                for (i = 0; i < _index2Length - index2Offset; i++)
+                {
+                    data[destIdx++] = (uint)((dataMove + _index2[index2Offset + i]) >> INDEX_SHIFT);
+                }
+            }
+
+            // write 16-bit data values
+            for (i = 0; i < _dataLength; i++)
+            {
+                data[destIdx++] = _data[i];
+            }
+
+            return new UnicodeTrie(data, _highStart, _errorValue);
+        }
+
+        private bool IsInNullBlock(int c, bool forLSCP)
+        {
+            int i2;
+            if (((c & 0xfffffc00) == 0xd800) && forLSCP)
+            {
+                i2 = (LSCP_INDEX_2_OFFSET - (0xd800 >> SHIFT_2)) + (c >> SHIFT_2);
+            }
+            else
+            {
+                i2 = _index1[c >> SHIFT_1] + ((c >> SHIFT_2) & INDEX_2_MASK);
+            }
+
+            var block = _index2[i2];
+            return block == _dataNullOffset;
+        }
+
+        private int AllocIndex2Block()
+        {
+            var newBlock = _index2Length;
+            var newTop = newBlock + INDEX_2_BLOCK_LENGTH;
+            if (newTop > _index2.Length)
+            {
+                // Should never occur.
+                // Either MAX_BUILD_TIME_INDEX_LENGTH is incorrect,
+                // or the code writes more values than should be possible.
+                throw new InvalidOperationException("Internal error in Trie2 creation.");
+            }
+
+            _index2Length = newTop;
+            Array.Copy(_index2, _index2NullOffset, _index2, newBlock, INDEX_2_BLOCK_LENGTH);
+
+            return newBlock;
+        }
+
+        private int GetIndex2Block(int c, bool forLSCP)
+        {
+            if ((c >= 0xd800) && (c < 0xdc00) && forLSCP)
+            {
+                return LSCP_INDEX_2_OFFSET;
+            }
+
+            var i1 = c >> SHIFT_1;
+            var i2 = _index1[i1];
+            if (i2 == _index2NullOffset)
+            {
+                i2 = AllocIndex2Block();
+                _index1[i1] = i2;
+            }
+
+            return i2;
+        }
+
+        private bool IsWritableBlock(int block)
+        {
+            return (block != _dataNullOffset) && (_map[block >> SHIFT_2] == 1);
+        }
+
+        private int AllocDataBlock(int copyBlock)
+        {
+            int newBlock;
+            if (_firstFreeBlock != 0)
+            {
+                // get the first free block
+                newBlock = _firstFreeBlock;
+                _firstFreeBlock = -_map[newBlock >> SHIFT_2];
+            }
+            else
+            {
+                // get a new block from the high end
+                newBlock = _dataLength;
+                var newTop = newBlock + DATA_BLOCK_LENGTH;
+                if (newTop > _dataCapacity)
+                {
+                    // out of memory in the data array
+                    int capacity;
+                    if (_dataCapacity < MEDIUM_DATA_LENGTH)
+                    {
+                        capacity = MEDIUM_DATA_LENGTH;
+                    }
+                    else if (_dataCapacity < MAX_DATA_LENGTH_BUILDTIME)
+                    {
+                        capacity = MAX_DATA_LENGTH_BUILDTIME;
+                    }
+                    else
+                    {
+                        // Should never occur.
+                        // Either MAX_DATA_LENGTH_BUILDTIME is incorrect,
+                        // or the code writes more values than should be possible.
+                        throw new InvalidOperationException("Internal error in Trie2 creation.");
+                    }
+
+                    var newData = new UInt32[capacity];
+                    Array.Copy(_data, newData, _dataLength);
+                    _data = newData;
+                    _dataCapacity = capacity;
+                }
+
+                _dataLength = newTop;
+            }
+
+            Array.Copy(_data, copyBlock, _data, newBlock, DATA_BLOCK_LENGTH);
+            //_data.set(_data.subarray(copyBlock, copyBlock + DATA_BLOCK_LENGTH), newBlock);
+            _map[newBlock >> SHIFT_2] = 0;
+            return newBlock;
+        }
+
+        private void ReleaseDataBlock(int block)
+        {
+            // put this block at the front of the free-block chain
+            _map[block >> SHIFT_2] = -_firstFreeBlock;
+            _firstFreeBlock = block;
+        }
+
+        private void SetIndex2Entry(int i2, int block)
+        {
+            ++_map[block >> SHIFT_2];  // increment first, in case block == oldBlock!
+            var oldBlock = _index2[i2];
+            if (--_map[oldBlock >> SHIFT_2] == 0)
+            {
+                ReleaseDataBlock(oldBlock);
+            }
+
+            _index2[i2] = block;
+        }
+
+        private int GetDataBlock(int c, bool forLSCP)
+        {
+            var i2 = GetIndex2Block(c, forLSCP);
+            i2 += (c >> SHIFT_2) & INDEX_2_MASK;
+
+            var oldBlock = _index2[i2];
+            if (IsWritableBlock(oldBlock))
+            {
+                return oldBlock;
+            }
+
+            // allocate a new data block
+            var newBlock = AllocDataBlock(oldBlock);
+            SetIndex2Entry(i2, newBlock);
+            return newBlock;
+        }
+
+        private void FillBlock(int block, int start, int limit, uint value, uint initialValue, bool overwrite)
+        {
+            int i;
+            if (overwrite)
+            {
+                for (i = block + start; i < block + limit; i++)
+                {
+                    _data[i] = value;
+                }
+            }
+            else
+            {
+                for (i = block + start; i < block + limit; i++)
+                {
+                    if (_data[i] == initialValue)
+                    {
+                        _data[i] = value;
+                    }
+                }
+            }
+        }
+
+        private void WriteBlock(int block, uint value)
+        {
+            var limit = block + DATA_BLOCK_LENGTH;
+            while (block < limit)
+            {
+                _data[block++] = value;
+            }
+        }
+
+        private int FindHighStart(uint highValue)
+        {
+            int prevBlock, prevI2Block;
+            
+            // set variables for previous range
+            if (highValue == _initialValue)
+            {
+                prevI2Block = _index2NullOffset;
+                prevBlock = _dataNullOffset;
+            }
+            else
+            {
+                prevI2Block = -1;
+                prevBlock = -1;
+            }
+
+            int prev = 0x110000;
+
+            // enumerate index-2 blocks
+            var i1 = INDEX_1_LENGTH;
+            var c = prev;
+            while (c > 0)
+            {
+                var i2Block = _index1[--i1];
+                if (i2Block == prevI2Block)
+                {
+                    // the index-2 block is the same as the previous one, and filled with highValue
+                    c -= CP_PER_INDEX_1_ENTRY;
+                    continue;
+                }
+
+                prevI2Block = i2Block;
+                if (i2Block == _index2NullOffset)
+                {
+                    // this is the null index-2 block
+                    if (highValue != _initialValue)
+                    {
+                        return c;
+                    }
+                    c -= CP_PER_INDEX_1_ENTRY;
+                }
+                else
+                {
+                    // enumerate data blocks for one index-2 block
+                    var i2 = INDEX_2_BLOCK_LENGTH;
+                    while (i2 > 0)
+                    {
+                        var block = _index2[i2Block + --i2];
+                        if (block == prevBlock)
+                        {
+                            // the block is the same as the previous one, and filled with highValue
+                            c -= DATA_BLOCK_LENGTH;
+                            continue;
+                        }
+
+                        prevBlock = block;
+                        if (block == _dataNullOffset)
+                        {
+                            // this is the null data block
+                            if (highValue != _initialValue)
+                            {
+                                return c;
+                            }
+                            c -= DATA_BLOCK_LENGTH;
+                        }
+                        else
+                        {
+                            var j = DATA_BLOCK_LENGTH;
+                            while (j > 0)
+                            {
+                                var value = _data[block + --j];
+                                if (value != highValue)
+                                {
+                                    return c;
+                                }
+                                --c;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // deliver last range
+            return 0;
+        }
+
+        private int FindSameDataBlock(int dataLength, int otherBlock, int blockLength)
+        {
+            // ensure that we do not even partially get past dataLength
+            dataLength -= blockLength;
+            var block = 0;
+            while (block <= dataLength)
+            {
+                if (EqualSequence(_data, block, otherBlock, blockLength))
+                {
+                    return block;
+                }
+                block += DATA_GRANULARITY;
+            }
+
+            return -1;
+        }
+
+        private int FindSameIndex2Block(int index2Length, int otherBlock) {
+            // ensure that we do not even partially get past index2Length
+            index2Length -= INDEX_2_BLOCK_LENGTH;
+            for (var block = 0; block <= index2Length; block++)
+            {
+                if (EqualSequence(_index2, block, otherBlock, INDEX_2_BLOCK_LENGTH))
+                {
+                    return block;
+                }
+            }
+
+            return -1;
+        }
+
+        private void CompactData()
+        {
+            // do not compact linear-ASCII data
+            var newStart = DATA_START_OFFSET;
+            var start = 0;
+            var i = 0;
+
+            while (start < newStart)
+            {
+                _map[i++] = start;
+                start += DATA_BLOCK_LENGTH;
+            }
+
+            // Start with a block length of 64 for 2-byte UTF-8,
+            // then switch to DATA_BLOCK_LENGTH.
+            var blockLength = 64;
+            var blockCount = blockLength >> SHIFT_2;
+            start = newStart;
+            while (start < _dataLength)
+            {
+                // start: index of first entry of current block
+                // newStart: index where the current block is to be moved
+                //           (right after current end of already-compacted data)
+                int mapIndex, movedStart;
+                if (start == DATA_0800_OFFSET)
+                {
+                    blockLength = DATA_BLOCK_LENGTH;
+                    blockCount = 1;
+                }
+
+                // skip blocks that are not used
+                if (_map[start >> SHIFT_2] <= 0)
+                {
+                    // advance start to the next block
+                    start += blockLength;
+
+                    // leave newStart with the previous block!
+                    continue;
+                }
+
+                // search for an identical block
+                if ((movedStart = FindSameDataBlock(newStart, start, blockLength)) >= 0)
+                {
+                    // found an identical block, set the other block's index value for the current block
+                    mapIndex = start >> SHIFT_2;
+                    for (i = blockCount; i > 0; i--)
+                    {
+                        _map[mapIndex++] = movedStart;
+                        movedStart += DATA_BLOCK_LENGTH;
+                    }
+
+                    // advance start to the next block
+                    start += blockLength;
+
+                    // leave newStart with the previous block!
+                    continue;
+                }
+
+                // see if the beginning of this block can be overlapped with the end of the previous block
+                // look for maximum overlap (modulo granularity) with the previous, adjacent block
+                var overlap = blockLength - DATA_GRANULARITY;
+                while ((overlap > 0) && !EqualSequence(_data, (newStart - overlap), start, overlap))
+                {
+                    overlap -= DATA_GRANULARITY;
+                }
+
+                if ((overlap > 0) || (newStart < start))
+                {
+                    // some overlap, or just move the whole block
+                    movedStart = newStart - overlap;
+                    mapIndex = start >> SHIFT_2;
+
+                    for (i = blockCount; i > 0; i--)
+                    {
+                        _map[mapIndex++] = movedStart;
+                        movedStart += DATA_BLOCK_LENGTH;
+                    }
+
+                    // move the non-overlapping indexes to their new positions
+                    start += overlap;
+                    for (i = blockLength - overlap; i > 0; i--)
+                    {
+                        _data[newStart++] = _data[start++];
+                    }
+
+                }
+                else
+                { // no overlap && newStart==start
+                    mapIndex = start >> SHIFT_2;
+                    for (i = blockCount; i > 0; i--)
+                    {
+                        _map[mapIndex++] = start;
+                        start += DATA_BLOCK_LENGTH;
+                    }
+
+                    newStart = start;
+                }
+            }
+
+            // now adjust the index-2 table
+            i = 0;
+            while (i < _index2Length)
+            {
+                // Gap indexes are invalid (-1). Skip over the gap.
+                if (i == INDEX_GAP_OFFSET)
+                {
+                    i += INDEX_GAP_LENGTH;
+                }
+                _index2[i] = _map[_index2[i] >> SHIFT_2];
+                ++i;
+            }
+
+            _dataNullOffset = _map[_dataNullOffset >> SHIFT_2];
+
+            // ensure dataLength alignment
+            while ((newStart & (DATA_GRANULARITY - 1)) != 0)
+            {
+                _data[newStart++] = _initialValue;
+            }
+            _dataLength = newStart;
+        }
+
+        private void CompactIndex2()
+        {
+            // do not compact linear-BMP index-2 blocks
+            var newStart = INDEX_2_BMP_LENGTH;
+            var start = 0;
+            var i = 0;
+
+            while (start < newStart)
+            {
+                _map[i++] = start;
+                start += INDEX_2_BLOCK_LENGTH;
+            }
+
+            // Reduce the index table gap to what will be needed at runtime.
+            newStart += UTF8_2B_INDEX_2_LENGTH + ((_highStart - 0x10000) >> SHIFT_1);
+            start = INDEX_2_NULL_OFFSET;
+            while (start < _index2Length)
+            {
+                // start: index of first entry of current block
+                // newStart: index where the current block is to be moved
+                //           (right after current end of already-compacted data)
+
+                // search for an identical block
+                int movedStart;
+                if ((movedStart = FindSameIndex2Block(newStart, start)) >= 0)
+                {
+                    // found an identical block, set the other block's index value for the current block
+                    _map[start >> SHIFT_1_2] = movedStart;
+
+                    // advance start to the next block
+                    start += INDEX_2_BLOCK_LENGTH;
+
+                    // leave newStart with the previous block!
+                    continue;
+                }
+
+                // see if the beginning of this block can be overlapped with the end of the previous block
+                // look for maximum overlap with the previous, adjacent block
+                var overlap = INDEX_2_BLOCK_LENGTH - 1;
+                while ((overlap > 0) && !EqualSequence(_index2, (newStart - overlap), start, overlap))
+                {
+                    --overlap;
+                }
+
+                if ((overlap > 0) || (newStart < start))
+                {
+                    // some overlap, or just move the whole block
+                    _map[start >> SHIFT_1_2] = newStart - overlap;
+
+                    // move the non-overlapping indexes to their new positions
+                    start += overlap;
+                    for (i = INDEX_2_BLOCK_LENGTH - overlap; i > 0; i--)
+                    {
+                        _index2[newStart++] = _index2[start++];
+                    }
+
+                }
+                else
+                { // no overlap && newStart==start
+                    _map[start >> SHIFT_1_2] = start;
+                    start += INDEX_2_BLOCK_LENGTH;
+                    newStart = start;
+                }
+            }
+
+            // now adjust the index-1 table
+            for (i = 0; i < INDEX_1_LENGTH; i++)
+            {
+                _index1[i] = _map[_index1[i] >> SHIFT_1_2];
+            }
+
+            _index2NullOffset = _map[_index2NullOffset >> SHIFT_1_2];
+
+            // Ensure data table alignment:
+            // Needs to be granularity-aligned for 16-bit trie
+            // (so that dataMove will be down-shiftable),
+            // and 2-aligned for uint32_t data.
+
+            // Arbitrary value: 0x3fffc not possible for real data.
+            while ((newStart & ((DATA_GRANULARITY - 1) | 1)) != 0)
+            {
+                _index2[newStart++] = 0x0000ffff << INDEX_SHIFT;
+            }
+
+            _index2Length = newStart;
+        }
+
+        private void Compact()
+        {
+            // find highStart and round it up
+            var highValue = Get(0x10ffff);
+            var highStart = FindHighStart(highValue);
+            highStart = (highStart + (CP_PER_INDEX_1_ENTRY - 1)) & ~(CP_PER_INDEX_1_ENTRY - 1);
+            if (highStart == 0x110000)
+            {
+                highValue = _errorValue;
+            }
+
+            // Set trie->highStart only after utrie2_get32(trie, highStart).
+            // Otherwise utrie2_get32(trie, highStart) would try to read the highValue.
+            _highStart = highStart;
+            if (_highStart < 0x110000)
+            {
+                // Blank out [highStart..10ffff] to release associated data blocks.
+                var suppHighStart = _highStart <= 0x10000 ? 0x10000 : _highStart;
+                SetRange(suppHighStart, 0x10ffff, _initialValue);
+            }
+
+            CompactData();
+
+            if (_highStart > 0x10000)
+            {
+                CompactIndex2();
+            }
+
+            // Store the highValue in the data array and round up the dataLength.
+            // Must be done after compactData() because that assumes that dataLength
+            // is a multiple of DATA_BLOCK_LENGTH.
+            _data[_dataLength++] = highValue;
+            while ((_dataLength & (DATA_GRANULARITY - 1)) != 0)
+            {
+                _data[_dataLength++] = _initialValue;
+            }
+
+            _isCompacted = true;
+        }
+
+        private static bool EqualSequence(IReadOnlyList<uint> a, int s, int t, int length)
+        {
+            for (var i = 0; i < length; i++)
+            {
+                if (a[s + i] != a[t + i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool EqualSequence(IReadOnlyList<int> a, int s, int t, int length)
+        {
+            for (var i = 0; i < length; i++)
+            {
+                if (a[s + i] != a[t + i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextHitTestResult.cs b/src/Avalonia.Base/Media/TextHitTestResult.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextHitTestResult.cs
rename to src/Avalonia.Base/Media/TextHitTestResult.cs
diff --git a/src/Avalonia.Base/Media/TextLeadingPrefixTrimming.cs b/src/Avalonia.Base/Media/TextLeadingPrefixTrimming.cs
new file mode 100644
index 0000000000..19ca1a0198
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextLeadingPrefixTrimming.cs
@@ -0,0 +1,31 @@
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public sealed class TextLeadingPrefixTrimming : TextTrimming
+    {
+        private readonly ReadOnlySlice<char> _ellipsis;
+        private readonly int _prefixLength;
+
+        public TextLeadingPrefixTrimming(char ellipsis, int prefixLength) : this(new[] { ellipsis }, prefixLength)
+        {
+        }
+
+        public TextLeadingPrefixTrimming(char[] ellipsis, int prefixLength)
+        {
+            _prefixLength = prefixLength;
+            _ellipsis = new ReadOnlySlice<char>(ellipsis);
+        }
+
+        public override TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo)
+        {
+            return new TextLeadingPrefixCharacterEllipsis(_ellipsis, _prefixLength, createInfo.Width, createInfo.TextRunProperties);
+        }
+
+        public override string ToString()
+        {
+            return nameof(PrefixCharacterEllipsis);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextNoneTrimming.cs b/src/Avalonia.Base/Media/TextNoneTrimming.cs
new file mode 100644
index 0000000000..ec238cf17e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextNoneTrimming.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    internal sealed class TextNoneTrimming : TextTrimming
+    {
+        public override TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override string ToString()
+        {
+            return nameof(None);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextTrailingTrimming.cs b/src/Avalonia.Base/Media/TextTrailingTrimming.cs
new file mode 100644
index 0000000000..5bb35f0ba7
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextTrailingTrimming.cs
@@ -0,0 +1,36 @@
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public sealed class TextTrailingTrimming : TextTrimming
+    {
+        private readonly ReadOnlySlice<char> _ellipsis;
+        private readonly bool _isWordBased;
+
+        public TextTrailingTrimming(char ellipsis, bool isWordBased) : this(new[] {ellipsis}, isWordBased)
+        {
+        }
+        
+        public TextTrailingTrimming(char[] ellipsis, bool isWordBased)
+        {
+            _isWordBased = isWordBased;
+            _ellipsis = new ReadOnlySlice<char>(ellipsis);
+        }
+
+        public override TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo)
+        {
+            if (_isWordBased)
+            {
+                return new TextTrailingWordEllipsis(_ellipsis, createInfo.Width, createInfo.TextRunProperties);
+            }
+
+            return new TextTrailingCharacterEllipsis(_ellipsis, createInfo.Width, createInfo.TextRunProperties);
+        }
+
+        public override string ToString()
+        {
+            return _isWordBased ? nameof(WordEllipsis) : nameof(CharacterEllipsis);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextTrimming.cs b/src/Avalonia.Base/Media/TextTrimming.cs
new file mode 100644
index 0000000000..e2737210be
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextTrimming.cs
@@ -0,0 +1,76 @@
+using System;
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how text is trimmed when it overflows.
+    /// </summary>
+    public abstract class TextTrimming
+    {
+        internal const char DefaultEllipsisChar = '\u2026';
+
+        /// <summary>
+        /// Text is not trimmed.
+        /// </summary>
+        public static TextTrimming None { get; } = new TextNoneTrimming();
+
+        /// <summary>
+        /// Text is trimmed at a character boundary. An ellipsis (...) is drawn in place of remaining text.
+        /// </summary>
+        public static TextTrimming CharacterEllipsis { get; } = new TextTrailingTrimming(DefaultEllipsisChar, false);
+
+        /// <summary>
+        /// Text is trimmed at a word boundary. An ellipsis (...) is drawn in place of remaining text.
+        /// </summary>
+        public static TextTrimming WordEllipsis { get; } = new TextTrailingTrimming(DefaultEllipsisChar, true);
+
+        /// <summary>
+        /// Text is trimmed after a given prefix length. An ellipsis (...) is drawn in between prefix and suffix and represents remaining text.
+        /// </summary>
+        public static TextTrimming PrefixCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(DefaultEllipsisChar, 8);
+
+        /// <summary>
+        /// Text is trimmed at a character boundary starting from the beginning. An ellipsis (...) is drawn in place of remaining text.
+        /// </summary>
+        public static TextTrimming LeadingCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(DefaultEllipsisChar, 0);
+
+        /// <summary>
+        /// Creates properties that will be used for collapsing lines of text.
+        /// </summary>
+        /// <param name="createInfo">Contextual info about text that will be collapsed.</param>
+        public abstract TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo);
+
+        /// <summary>
+        /// Parses a text trimming string. Names must match static properties defined in this class.
+        /// </summary>
+        /// <param name="s">The text trimming string.</param>
+        /// <returns>The <see cref="TextTrimming"/>.</returns>
+        public static TextTrimming Parse(string s)
+        {
+            bool Matches(string name)
+            {
+                return name.Equals(s, StringComparison.OrdinalIgnoreCase);
+            }
+
+            if (Matches(nameof(None)))
+            {
+                return None;
+            }
+            if (Matches(nameof(CharacterEllipsis)))
+            {
+                return CharacterEllipsis;
+            }
+            else if (Matches(nameof(WordEllipsis)))
+            {
+                return WordEllipsis;
+            }
+            else if (Matches(nameof(PrefixCharacterEllipsis)))
+            {
+                return PrefixCharacterEllipsis;
+            }
+
+            throw new FormatException($"Invalid text trimming string: '{s}'.");
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextWrapping.cs b/src/Avalonia.Base/Media/TextWrapping.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextWrapping.cs
rename to src/Avalonia.Base/Media/TextWrapping.cs
diff --git a/src/Avalonia.Base/Media/TileBrush.cs b/src/Avalonia.Base/Media/TileBrush.cs
new file mode 100644
index 0000000000..ab1ee2d604
--- /dev/null
+++ b/src/Avalonia.Base/Media/TileBrush.cs
@@ -0,0 +1,156 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how a <see cref="TileBrush"/> is tiled.
+    /// </summary>
+    public enum TileMode
+    {
+        /// <summary>
+        /// A single repeat of the content will be displayed.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The content will be repeated horizontally, with alternate tiles mirrored.
+        /// </summary>
+        FlipX,
+
+        /// <summary>
+        /// The content will be repeated vertically, with alternate tiles mirrored.
+        /// </summary>
+        FlipY,
+
+        /// <summary>
+        /// The content will be repeated horizontally and vertically, with alternate tiles mirrored.
+        /// </summary>
+        FlipXY,
+
+        /// <summary>
+        /// The content will be repeated.
+        /// </summary>
+        Tile
+    }
+
+    /// <summary>
+    /// Base class for brushes which display repeating images.
+    /// </summary>
+    public abstract class TileBrush : Brush, ITileBrush
+    {
+        /// <summary>
+        /// Defines the <see cref="AlignmentX"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AlignmentX> AlignmentXProperty =
+            AvaloniaProperty.Register<TileBrush, AlignmentX>(nameof(AlignmentX), AlignmentX.Center);
+
+        /// <summary>
+        /// Defines the <see cref="AlignmentY"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AlignmentY> AlignmentYProperty =
+            AvaloniaProperty.Register<TileBrush, AlignmentY>(nameof(AlignmentY), AlignmentY.Center);
+
+        /// <summary>
+        /// Defines the <see cref="DestinationRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativeRect> DestinationRectProperty =
+            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(DestinationRect), RelativeRect.Fill);
+
+        /// <summary>
+        /// Defines the <see cref="SourceRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativeRect> SourceRectProperty =
+            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(SourceRect), RelativeRect.Fill);
+
+        /// <summary>
+        /// Defines the <see cref="Stretch"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Stretch> StretchProperty =
+            AvaloniaProperty.Register<TileBrush, Stretch>(nameof(Stretch), Stretch.Uniform);
+
+        /// <summary>
+        /// Defines the <see cref="TileMode"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TileMode> TileModeProperty =
+            AvaloniaProperty.Register<TileBrush, TileMode>(nameof(TileMode));
+
+        static TileBrush()
+        {
+            AffectsRender<TileBrush>(
+                AlignmentXProperty,
+                AlignmentYProperty,
+                DestinationRectProperty,
+                SourceRectProperty,
+                StretchProperty,
+                TileModeProperty);
+            RenderOptions.BitmapInterpolationModeProperty.OverrideDefaultValue<TileBrush>(BitmapInterpolationMode.Default);
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        public AlignmentX AlignmentX
+        {
+            get { return GetValue(AlignmentXProperty); }
+            set { SetValue(AlignmentXProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        public AlignmentY AlignmentY
+        {
+            get { return GetValue(AlignmentYProperty); }
+            set { SetValue(AlignmentYProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangle on the destination in which to paint a tile.
+        /// </summary>
+        public RelativeRect DestinationRect
+        {
+            get { return GetValue(DestinationRectProperty); }
+            set { SetValue(DestinationRectProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangle of the source image that will be displayed.
+        /// </summary>
+        public RelativeRect SourceRect
+        {
+            get { return GetValue(SourceRectProperty); }
+            set { SetValue(SourceRectProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value controlling how the source rectangle will be stretched to fill
+        /// the destination rect.
+        /// </summary>
+        public Stretch Stretch
+        {
+            get { return (Stretch)GetValue(StretchProperty); }
+            set { SetValue(StretchProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush's tile mode.
+        /// </summary>
+        public TileMode TileMode
+        {
+            get { return (TileMode)GetValue(TileModeProperty); }
+            set { SetValue(TileModeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the bitmap interpolation mode.
+        /// </summary>
+        /// <value>
+        /// The bitmap interpolation mode.
+        /// </value>
+        public BitmapInterpolationMode BitmapInterpolationMode
+        {
+            get { return RenderOptions.GetBitmapInterpolationMode(this); }
+            set { RenderOptions.SetBitmapInterpolationMode(this, value); }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Transform.cs b/src/Avalonia.Base/Media/Transform.cs
new file mode 100644
index 0000000000..023a8b9cdd
--- /dev/null
+++ b/src/Avalonia.Base/Media/Transform.cs
@@ -0,0 +1,66 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Animators;
+using Avalonia.Media.Immutable;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a transform on an <see cref="IVisual"/>.
+    /// </summary>
+    public abstract class Transform : Animatable, IMutableTransform
+    {
+        static Transform()
+        {
+            Animation.Animation.RegisterAnimator<TransformAnimator>(prop =>
+                typeof(ITransform).IsAssignableFrom(prop.OwnerType));
+        }
+
+        /// <summary>
+        /// Raised when the transform changes.
+        /// </summary>
+        public event EventHandler? Changed;
+
+        /// <summary>
+        /// Gets the transform's <see cref="Matrix"/>.
+        /// </summary>
+        public abstract Matrix Value { get; }
+
+        /// <summary>
+        /// Parses a <see cref="Transform"/> string.
+        /// </summary>
+        /// <param name="s">Six comma-delimited double values that describe the new <see cref="Transform"/>. For details check <see cref="Matrix.Parse(string)"/> </param>
+        /// <returns>The <see cref="Transform"/>.</returns>
+        public static Transform Parse(string s)
+        {
+            return new MatrixTransform(Matrix.Parse(s));
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Changed"/> event.
+        /// </summary>
+        protected void RaiseChanged()
+        {
+            Changed?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Converts a transform to an immutable transform.
+        /// </summary>
+        /// <returns>The immutable transform</returns>
+        public ImmutableTransform ToImmutable()
+        {
+            return new ImmutableTransform(this.Value);
+        }
+
+        /// <summary>
+        /// Returns a String representing this transform matrix instance.
+        /// </summary>
+        /// <returns>The string representation.</returns>
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TransformConverter.cs b/src/Avalonia.Base/Media/TransformConverter.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TransformConverter.cs
rename to src/Avalonia.Base/Media/TransformConverter.cs
diff --git a/src/Avalonia.Base/Media/TransformExtensions.cs b/src/Avalonia.Base/Media/TransformExtensions.cs
new file mode 100644
index 0000000000..ccf2231ce2
--- /dev/null
+++ b/src/Avalonia.Base/Media/TransformExtensions.cs
@@ -0,0 +1,26 @@
+using System;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Extension methods for transform classes.
+    /// </summary>
+    public static class TransformExtensions
+    {
+        /// <summary>
+        /// Converts a transform to an immutable transform.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <returns>
+        /// The result of calling <see cref="Transform.ToImmutable"/> if the transform is mutable,
+        /// otherwise <paramref name="transform"/>.
+        /// </returns>
+        public static ImmutableTransform ToImmutable(this ITransform transform)
+        {
+            _ = transform ?? throw new ArgumentNullException(nameof(transform));
+
+            return (transform as Transform)?.ToImmutable() ?? new ImmutableTransform(transform.Value);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TransformGroup.cs b/src/Avalonia.Base/Media/TransformGroup.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TransformGroup.cs
rename to src/Avalonia.Base/Media/TransformGroup.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs b/src/Avalonia.Base/Media/Transformation/InterpolationUtilities.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
rename to src/Avalonia.Base/Media/Transformation/InterpolationUtilities.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs b/src/Avalonia.Base/Media/Transformation/TransformOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs
rename to src/Avalonia.Base/Media/Transformation/TransformOperation.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs b/src/Avalonia.Base/Media/Transformation/TransformOperations.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs
rename to src/Avalonia.Base/Media/Transformation/TransformOperations.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformParser.cs b/src/Avalonia.Base/Media/Transformation/TransformParser.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/TransformParser.cs
rename to src/Avalonia.Base/Media/Transformation/TransformParser.cs
diff --git a/src/Avalonia.Visuals/Media/TranslateTransform.cs b/src/Avalonia.Base/Media/TranslateTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TranslateTransform.cs
rename to src/Avalonia.Base/Media/TranslateTransform.cs
diff --git a/src/Avalonia.Base/Media/Typeface.cs b/src/Avalonia.Base/Media/Typeface.cs
new file mode 100644
index 0000000000..e6047bf96c
--- /dev/null
+++ b/src/Avalonia.Base/Media/Typeface.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Diagnostics;
+using JetBrains.Annotations;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a typeface.
+    /// </summary>
+    [DebuggerDisplay("Name = {FontFamily.Name}, Weight = {Weight}, Style = {Style}")]
+    public readonly struct Typeface : IEquatable<Typeface>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Typeface"/> class.
+        /// </summary>
+        /// <param name="fontFamily">The font family.</param>
+        /// <param name="style">The font style.</param>
+        /// <param name="weight">The font weight.</param>
+        /// <param name="stretch">The font stretch.</param>
+        public Typeface([NotNull] FontFamily fontFamily,
+            FontStyle style = FontStyle.Normal,
+            FontWeight weight = FontWeight.Normal,
+            FontStretch stretch = FontStretch.Normal)
+        {
+            if (weight <= 0)
+            {
+                throw new ArgumentException("Font weight must be > 0.");
+            }
+            
+            if ((int)stretch < 1)
+            {
+                throw new ArgumentException("Font stretch must be > 1.");
+            }
+
+            FontFamily = fontFamily;
+            Style = style;
+            Weight = weight;
+            Stretch = stretch;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Typeface"/> class.
+        /// </summary>
+        /// <param name="fontFamilyName">The name of the font family.</param>
+        /// <param name="style">The font style.</param>
+        /// <param name="weight">The font weight.</param>
+        /// <param name="stretch">The font stretch.</param>
+        public Typeface(string fontFamilyName,
+            FontStyle style = FontStyle.Normal,
+            FontWeight weight = FontWeight.Normal,
+            FontStretch stretch = FontStretch.Normal)
+            : this(new FontFamily(fontFamilyName), style, weight, stretch)
+        {
+        }
+
+        public static Typeface Default { get; } = new Typeface(FontFamily.Default);
+
+        /// <summary>
+        /// Gets the font family.
+        /// </summary>
+        public FontFamily FontFamily { get; }
+
+        /// <summary>
+        /// Gets the font style.
+        /// </summary>
+        public FontStyle Style { get; }
+
+        /// <summary>
+        /// Gets the font weight.
+        /// </summary>
+        public FontWeight Weight { get; }
+        
+        /// <summary>
+        /// Gets the font stretch.
+        /// </summary>
+        public FontStretch Stretch { get; }
+
+        /// <summary>
+        /// Gets the glyph typeface.
+        /// </summary>
+        /// <value>
+        /// The glyph typeface.
+        /// </value>
+        public IGlyphTypeface GlyphTypeface => FontManager.Current.GetOrAddGlyphTypeface(this);
+
+        public static bool operator !=(Typeface a, Typeface b)
+        {
+            return !(a == b);
+        }
+
+        public static bool operator ==(Typeface a, Typeface b)
+        {
+            return  a.Equals(b);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is Typeface typeface && Equals(typeface);
+        }
+
+        public bool Equals(Typeface other)
+        {
+            return FontFamily == other.FontFamily && Style == other.Style && 
+                   Weight == other.Weight && Stretch == other.Stretch;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = (FontFamily != null ? FontFamily.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (int)Style;
+                hashCode = (hashCode * 397) ^ (int)Weight;
+                hashCode = (hashCode * 397) ^ (int)Stretch;
+                return hashCode;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/UnicodeRange.cs b/src/Avalonia.Base/Media/UnicodeRange.cs
new file mode 100644
index 0000000000..344b85bae9
--- /dev/null
+++ b/src/Avalonia.Base/Media/UnicodeRange.cs
@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// The <see cref="UnicodeRange"/> descripes a set of Unicode characters.
+    /// </summary>
+    public readonly struct UnicodeRange
+    {
+        public readonly static UnicodeRange Default = Parse("0-10FFFD");
+
+        private readonly UnicodeRangeSegment _single;
+        private readonly IReadOnlyList<UnicodeRangeSegment>? _segments = null;
+
+        public UnicodeRange(int start, int end)
+        {
+            _single = new UnicodeRangeSegment(start, end);
+        }
+
+        public UnicodeRange(UnicodeRangeSegment single)
+        {
+            _single = single;
+        }
+
+        public UnicodeRange(IReadOnlyList<UnicodeRangeSegment> segments)
+        {
+            if(segments is null || segments.Count == 0)
+            {
+                throw new ArgumentException(nameof(segments));
+            }
+
+            _single = segments[0];
+            _segments = segments;
+        }
+
+        internal UnicodeRangeSegment Single => _single;
+
+        internal IReadOnlyList<UnicodeRangeSegment>? Segments => _segments;
+
+        /// <summary>
+        /// Determines if given value is inside the range.
+        /// </summary>
+        /// <param name="value">The value to verify.</param>
+        /// <returns>
+        /// <c>true</c> If given value is inside the range, <c>false</c> otherwise.
+        /// </returns>
+        public bool IsInRange(int value)
+        {
+            if(_segments is null)
+            {
+                return _single.IsInRange(value);
+            }
+
+            foreach(var segment in _segments)
+            {
+                if (segment.IsInRange(value))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Parses a <see cref="UnicodeRange"/>.
+        /// </summary>
+        /// <param name="s">The string to parse.</param>
+        /// <returns>The parsed <see cref="UnicodeRange"/>.</returns>
+        /// <exception cref="FormatException"></exception>
+        public static UnicodeRange Parse(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                throw new FormatException("Could not parse specified Unicode range.");
+            }
+
+            var parts = s.Split(',');
+
+            var length = parts.Length;
+
+            if(length == 0)
+            {
+                throw new FormatException("Could not parse specified Unicode range.");
+            }
+
+            if(length == 1)
+            {
+                return new UnicodeRange(UnicodeRangeSegment.Parse(parts[0]));
+            }
+
+            var segments = new UnicodeRangeSegment[length];
+
+            for (int i = 0; i < length; i++)
+            {
+                segments[i] = UnicodeRangeSegment.Parse(parts[i].Trim());
+            }
+
+            return new UnicodeRange(segments);
+        }
+    }
+
+    public readonly struct UnicodeRangeSegment
+    {
+        private static Regex s_regex = new Regex(@"^(?:[uU]\+)?(?:([0-9a-fA-F](?:[0-9a-fA-F?]{1,5})?))$");
+
+        public UnicodeRangeSegment(int start, int end)
+        {
+            Start = start;
+            End = end;
+        }
+
+        /// <summary>
+        /// Get the start of the segment.
+        /// </summary>
+        public int Start { get; }
+
+        /// <summary>
+        /// Get the end of the segment.
+        /// </summary>
+        public int End { get; }
+
+        /// <summary>
+        /// Determines if given value is inside the range segment.
+        /// </summary>
+        /// <param name="value">The value to verify.</param>
+        /// <returns>
+        /// <c>true</c> If given value is inside the range segment, <c>false</c> otherwise.
+        /// </returns>
+        public bool IsInRange(int value)
+        {
+            return value - Start <= End - Start;
+        }
+
+        /// <summary>
+        /// Parses a <see cref="UnicodeRangeSegment"/>.
+        /// </summary>
+        /// <param name="s">The string to parse.</param>
+        /// <returns>The parsed <see cref="UnicodeRangeSegment"/>.</returns>
+        /// <exception cref="FormatException"></exception>
+        public static UnicodeRangeSegment Parse(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                throw new FormatException("Could not parse specified Unicode range segment.");
+            }
+
+            var parts = s.Split('-');
+
+            int start, end;
+
+            switch (parts.Length)
+            {
+                case 1:
+                    {
+                        //e.g. U+20, U+3F U+30??
+                        var single = s_regex.Match(parts[0]);
+
+                        if (!single.Success)
+                        {
+                            throw new FormatException("Could not parse specified Unicode range segment.");
+                        }
+
+                        if (!single.Value.Contains('?'))
+                        {
+                            start = int.Parse(single.Groups[1].Value, System.Globalization.NumberStyles.HexNumber);
+                            end = start;
+                        }
+                        else
+                        {
+                            start = int.Parse(single.Groups[1].Value.Replace('?', '0'), System.Globalization.NumberStyles.HexNumber);
+                            end = int.Parse(single.Groups[1].Value.Replace('?', 'F'), System.Globalization.NumberStyles.HexNumber);
+                        }
+                        break;
+                    }
+                case 2:
+                    {
+                        var first = s_regex.Match(parts[0]);
+                        var second = s_regex.Match(parts[1]);
+
+                        if (!first.Success || !second.Success)
+                        {
+                            throw new FormatException("Could not parse specified Unicode range segment.");
+                        }
+
+                        start = int.Parse(first.Groups[1].Value, System.Globalization.NumberStyles.HexNumber);
+                        end = int.Parse(second.Groups[1].Value, System.Globalization.NumberStyles.HexNumber);
+                        break;
+                    }
+                default:
+                    throw new FormatException("Could not parse specified Unicode range segment.");
+            }
+
+            return new UnicodeRangeSegment(start, end);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/VisualBrush.cs b/src/Avalonia.Base/Media/VisualBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/VisualBrush.cs
rename to src/Avalonia.Base/Media/VisualBrush.cs
diff --git a/src/Avalonia.Base/Metadata/DataTypeAttribute.cs b/src/Avalonia.Base/Metadata/DataTypeAttribute.cs
new file mode 100644
index 0000000000..ac46a0d30a
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/DataTypeAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Avalonia.Metadata;
+
+/// <summary>
+/// Defines the property that contains type that should be used as a type information for compiled bindings.
+/// </summary>
+/// <remarks>
+/// Used on DataTemplate.DataType property so it can be inherited in compiled bindings inside of the template.
+/// </remarks>
+[AttributeUsage(AttributeTargets.Property)]
+public class DataTypeAttribute : Attribute
+{
+    
+}
diff --git a/src/Avalonia.Base/Metadata/IAddChild.cs b/src/Avalonia.Base/Metadata/IAddChild.cs
new file mode 100644
index 0000000000..8ef02912a6
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/IAddChild.cs
@@ -0,0 +1,12 @@
+namespace Avalonia.Metadata
+{
+    public interface IAddChild
+    {
+        void AddChild(object child);
+    }
+
+    public interface IAddChild<T>
+    {
+        void AddChild(T child);
+    }
+}
diff --git a/src/Avalonia.Base/Metadata/MarkupExtensionOption.cs b/src/Avalonia.Base/Metadata/MarkupExtensionOption.cs
new file mode 100644
index 0000000000..4009720bcb
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/MarkupExtensionOption.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace Avalonia.Metadata;
+
+[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+public sealed class MarkupExtensionOptionAttribute : Attribute
+{
+    public MarkupExtensionOptionAttribute(object value)
+    {
+        Value = value;
+    }
+
+    public object Value { get; }
+
+    public int Priority { get; set; } = 0;
+}
+
+[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+public sealed class MarkupExtensionDefaultOptionAttribute : Attribute
+{
+
+}
diff --git a/src/Avalonia.Base/Metadata/NotClientImplementableAttribute.cs b/src/Avalonia.Base/Metadata/NotClientImplementableAttribute.cs
new file mode 100644
index 0000000000..348c983c03
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/NotClientImplementableAttribute.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// This interface is not intended to be implemented outside of the core Avalonia framework as
+    /// its API may change without warning.
+    /// </summary>
+    /// <remarks>
+    /// This interface is stable for consumption by a client, but should not be implemented as members
+    /// may be added to its API.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Interface)]
+    public class NotClientImplementableAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Metadata/TrimSurroundingWhitespaceAttribute.cs b/src/Avalonia.Base/Metadata/TrimSurroundingWhitespaceAttribute.cs
new file mode 100644
index 0000000000..c46891b3ad
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/TrimSurroundingWhitespaceAttribute.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class TrimSurroundingWhitespaceAttribute : Attribute
+    {
+
+    }
+}
diff --git a/src/Avalonia.Base/Metadata/UnstableAttribute.cs b/src/Avalonia.Base/Metadata/UnstableAttribute.cs
new file mode 100644
index 0000000000..3b6fa5168a
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/UnstableAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// This API is unstable and is not covered by API compatibility guarantees between minor and
+    /// patch releases.
+    /// </summary>
+    public class UnstableAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Metadata/WhitespaceSignificantCollectionAttribute.cs b/src/Avalonia.Base/Metadata/WhitespaceSignificantCollectionAttribute.cs
new file mode 100644
index 0000000000..aeaa38dad9
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/WhitespaceSignificantCollectionAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// Indicates that a collection type should be processed as being whitespace significant by a XAML processor.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class WhitespaceSignificantCollectionAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PixelPoint.cs b/src/Avalonia.Base/PixelPoint.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PixelPoint.cs
rename to src/Avalonia.Base/PixelPoint.cs
diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs
new file mode 100644
index 0000000000..855ba104ad
--- /dev/null
+++ b/src/Avalonia.Base/PixelRect.cs
@@ -0,0 +1,464 @@
+using System;
+using System.Globalization;
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Represents a rectangle in device pixels.
+    /// </summary>
+    public readonly struct PixelRect : IEquatable<PixelRect>
+    {
+        /// <summary>
+        /// An empty rectangle.
+        /// </summary>
+        public static readonly PixelRect Empty = default;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="x">The X position.</param>
+        /// <param name="y">The Y position.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public PixelRect(int x, int y, int width, int height)
+        {
+            X = x;
+            Y = y;
+            Width = width;
+            Height = height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="size">The size of the rectangle.</param>
+        public PixelRect(PixelSize size)
+        {
+            X = 0;
+            Y = 0;
+            Width = size.Width;
+            Height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="position">The position of the rectangle.</param>
+        /// <param name="size">The size of the rectangle.</param>
+        public PixelRect(PixelPoint position, PixelSize size)
+        {
+            X = position.X;
+            Y = position.Y;
+            Width = size.Width;
+            Height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="topLeft">The top left position of the rectangle.</param>
+        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
+        public PixelRect(PixelPoint topLeft, PixelPoint bottomRight)
+        {
+            X = topLeft.X;
+            Y = topLeft.Y;
+            Width = bottomRight.X - topLeft.X;
+            Height = bottomRight.Y - topLeft.Y;
+        }
+
+        /// <summary>
+        /// Gets the X position.
+        /// </summary>
+        public int X { get; }
+
+        /// <summary>
+        /// Gets the Y position.
+        /// </summary>
+        public int Y { get; }
+
+        /// <summary>
+        /// Gets the width.
+        /// </summary>
+        public int Width { get; }
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public int Height { get; }
+
+        /// <summary>
+        /// Gets the position of the rectangle.
+        /// </summary>
+        public PixelPoint Position => new PixelPoint(X, Y);
+
+        /// <summary>
+        /// Gets the size of the rectangle.
+        /// </summary>
+        public PixelSize Size => new PixelSize(Width, Height);
+
+        /// <summary>
+        /// Gets the right position of the rectangle.
+        /// </summary>
+        public int Right => X + Width;
+
+        /// <summary>
+        /// Gets the bottom position of the rectangle.
+        /// </summary>
+        public int Bottom => Y + Height;
+
+        /// <summary>
+        /// Gets the top left point of the rectangle.
+        /// </summary>
+        public PixelPoint TopLeft => new PixelPoint(X, Y);
+
+        /// <summary>
+        /// Gets the top right point of the rectangle.
+        /// </summary>
+        public PixelPoint TopRight => new PixelPoint(Right, Y);
+
+        /// <summary>
+        /// Gets the bottom left point of the rectangle.
+        /// </summary>
+        public PixelPoint BottomLeft => new PixelPoint(X, Bottom);
+
+        /// <summary>
+        /// Gets the bottom right point of the rectangle.
+        /// </summary>
+        public PixelPoint BottomRight => new PixelPoint(Right, Bottom);
+
+        /// <summary>
+        /// Gets the center point of the rectangle.
+        /// </summary>
+        public PixelPoint Center => new PixelPoint(X + (Width / 2), Y + (Height / 2));
+
+        /// <summary>
+        /// Gets a value that indicates whether the rectangle is empty.
+        /// </summary>
+        public bool IsEmpty => Width == 0 && Height == 0;
+
+        /// <summary>
+        /// Checks for equality between two <see cref="PixelRect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are equal; otherwise false.</returns>
+        public static bool operator ==(PixelRect left, PixelRect right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="PixelRect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are unequal; otherwise false.</returns>
+        public static bool operator !=(PixelRect left, PixelRect right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Determines whether a point in in the bounds of the rectangle.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
+        public bool Contains(PixelPoint p)
+        {
+            return p.X >= X && p.X <= Right && p.Y >= Y && p.Y <= Bottom;
+        }
+        
+        /// <summary>
+        /// Determines whether a point is in the bounds of the rectangle, exclusive of the
+        /// rectangle's bottom/right edge.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>    
+        public bool ContainsExclusive(PixelPoint p)
+        {
+            return p.X >= X && p.X < X + Width &&
+                   p.Y >= Y && p.Y < Y + Height;
+        }
+
+        /// <summary>
+        /// Determines whether the rectangle fully contains another rectangle.
+        /// </summary>
+        /// <param name="r">The rectangle.</param>
+        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
+        public bool Contains(PixelRect r)
+        {
+            return Contains(r.TopLeft) && Contains(r.BottomRight);
+        }
+
+        /// <summary>
+        /// Centers another rectangle in this rectangle.
+        /// </summary>
+        /// <param name="rect">The rectangle to center.</param>
+        /// <returns>The centered rectangle.</returns>
+        public PixelRect CenterRect(PixelRect rect)
+        {
+            return new PixelRect(
+                X + ((Width - rect.Width) / 2),
+                Y + ((Height - rect.Height) / 2),
+                rect.Width,
+                rect.Height);
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the rect is equal to the other given rect.
+        /// </summary>
+        /// <param name="other">The other rect to test equality against.</param>
+        /// <returns>True if this rect is equal to other; False otherwise.</returns>
+        public bool Equals(PixelRect other)
+        {
+            return Position == other.Position && Size == other.Size;
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given object is equal to this rectangle.
+        /// </summary>
+        /// <param name="obj">The object to compare against.</param>
+        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
+        public override bool Equals(object? obj) => obj is PixelRect other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this instance.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + X.GetHashCode();
+                hash = (hash * 23) + Y.GetHashCode();
+                hash = (hash * 23) + Width.GetHashCode();
+                hash = (hash * 23) + Height.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Gets the intersection of two rectangles.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>The intersection.</returns>
+        public PixelRect Intersect(PixelRect rect)
+        {
+            var newLeft = (rect.X > X) ? rect.X : X;
+            var newTop = (rect.Y > Y) ? rect.Y : Y;
+            var newRight = (rect.Right < Right) ? rect.Right : Right;
+            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
+
+            if ((newRight > newLeft) && (newBottom > newTop))
+            {
+                return new PixelRect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
+            }
+            else
+            {
+                return Empty;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a rectangle intersects with this rectangle.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>
+        /// True if the specified rectangle intersects with this one; otherwise false.
+        /// </returns>
+        public bool Intersects(PixelRect rect)
+        {
+            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
+        }
+        
+        /// <summary>
+        /// Translates the rectangle by an offset.
+        /// </summary>
+        /// <param name="offset">The offset.</param>
+        /// <returns>The translated rectangle.</returns>
+        public PixelRect Translate(PixelVector offset)
+        {
+            return new PixelRect(Position + offset, Size);
+        }
+
+        /// <summary>
+        /// Gets the union of two rectangles.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>The union.</returns>
+        public PixelRect Union(PixelRect rect)
+        {
+            if (IsEmpty)
+            {
+                return rect;
+            }
+            else if (rect.IsEmpty)
+            {
+                return this;
+            }
+            else
+            {
+                var x1 = Math.Min(X, rect.X);
+                var x2 = Math.Max(Right, rect.Right);
+                var y1 = Math.Min(Y, rect.Y);
+                var y2 = Math.Max(Bottom, rect.Bottom);
+
+                return new PixelRect(new PixelPoint(x1, y1), new PixelPoint(x2, y2));
+            }
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified X position.
+        /// </summary>
+        /// <param name="x">The x position.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithX(int x)
+        {
+            return new PixelRect(x, Y, Width, Height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified Y position.
+        /// </summary>
+        /// <param name="y">The y position.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithY(int y)
+        {
+            return new PixelRect(X, y, Width, Height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified width.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithWidth(int width)
+        {
+            return new PixelRect(X, Y, width, Height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified height.
+        /// </summary>
+        /// <param name="height">The height.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithHeight(int height)
+        {
+            return new PixelRect(X, Y, Width, Height);
+        }
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified scaling factor.
+        /// </summary>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRect(double scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified scaling factor.
+        /// </summary>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRect(Vector scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRectWithDpi(double dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRectWithDpi(Vector dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent rect.</returns>
+        public static PixelRect FromRect(Rect rect, double scale) => new PixelRect(
+            PixelPoint.FromPoint(rect.Position, scale),
+            FromPointCeiling(rect.BottomRight, new Vector(scale, scale)));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent point.</returns>
+        public static PixelRect FromRect(Rect rect, Vector scale) => new PixelRect(
+            PixelPoint.FromPoint(rect.Position, scale),
+            FromPointCeiling(rect.BottomRight, scale));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent point.</returns>
+        public static PixelRect FromRectWithDpi(Rect rect, double dpi) => new PixelRect(
+            PixelPoint.FromPointWithDpi(rect.Position, dpi),
+            FromPointCeiling(rect.BottomRight, new Vector(dpi / 96, dpi / 96)));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent point.</returns>
+        public static PixelRect FromRectWithDpi(Rect rect, Vector dpi) => new PixelRect(
+            PixelPoint.FromPointWithDpi(rect.Position, dpi),
+            FromPointCeiling(rect.BottomRight, dpi / 96));
+
+        /// <summary>
+        /// Returns the string representation of the rectangle.
+        /// </summary>
+        /// <returns>The string representation of the rectangle.</returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}, {1}, {2}, {3}",
+                X,
+                Y,
+                Width,
+                Height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="PixelRect"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The parsed <see cref="PixelRect"/>.</returns>
+        public static PixelRect Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid PixelRect."))
+            {
+                return new PixelRect(
+                    tokenizer.ReadInt32(),
+                    tokenizer.ReadInt32(),
+                    tokenizer.ReadInt32(),
+                    tokenizer.ReadInt32()
+                );
+            }
+        }
+
+        private static PixelPoint FromPointCeiling(Point point, Vector scale)
+        {
+            return new PixelPoint(
+                (int)Math.Ceiling(point.X * scale.X),
+                (int)Math.Ceiling(point.Y * scale.Y));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PixelSize.cs b/src/Avalonia.Base/PixelSize.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PixelSize.cs
rename to src/Avalonia.Base/PixelSize.cs
diff --git a/src/Avalonia.Visuals/Media/PixelVector.cs b/src/Avalonia.Base/PixelVector.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PixelVector.cs
rename to src/Avalonia.Base/PixelVector.cs
diff --git a/src/Avalonia.Visuals/Platform/AlphaFormat.cs b/src/Avalonia.Base/Platform/AlphaFormat.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/AlphaFormat.cs
rename to src/Avalonia.Base/Platform/AlphaFormat.cs
diff --git a/src/Avalonia.Base/Platform/AssetLoader.cs b/src/Avalonia.Base/Platform/AssetLoader.cs
new file mode 100644
index 0000000000..a74da2a178
--- /dev/null
+++ b/src/Avalonia.Base/Platform/AssetLoader.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Platform.Internal;
+using Avalonia.Utilities;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Loads assets compiled into the application binary.
+    /// </summary>
+    public class AssetLoader : IAssetLoader
+    {
+        private static IAssemblyDescriptorResolver s_assemblyDescriptorResolver = new AssemblyDescriptorResolver();
+
+        private AssemblyDescriptor? _defaultResmAssembly;
+
+        /// <remarks>
+        /// Introduced for tests.
+        /// </remarks>
+        internal static void SetAssemblyDescriptorResolver(IAssemblyDescriptorResolver resolver) =>
+            s_assemblyDescriptorResolver = resolver;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssetLoader"/> class.
+        /// </summary>
+        /// <param name="assembly">
+        /// The default assembly from which to load resm: assets for which no assembly is specified.
+        /// </param>
+        public AssetLoader(Assembly? assembly = null)
+        {
+            if (assembly == null)
+                assembly = Assembly.GetEntryAssembly();
+            if (assembly != null)
+                _defaultResmAssembly = new AssemblyDescriptor(assembly);
+        }
+
+        /// <summary>
+        /// Sets the default assembly from which to load assets for which no assembly is specified.
+        /// </summary>
+        /// <param name="assembly">The default assembly.</param>
+        public void SetDefaultAssembly(Assembly assembly)
+        {
+            _defaultResmAssembly = new AssemblyDescriptor(assembly);
+        }
+
+        /// <summary>
+        /// Checks if an asset with the specified URI exists.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">
+        /// A base URI to use if <paramref name="uri"/> is relative.
+        /// </param>
+        /// <returns>True if the asset could be found; otherwise false.</returns>
+        public bool Exists(Uri uri, Uri? baseUri = null)
+        {
+            return GetAsset(uri, baseUri) != null;
+        }
+
+        /// <summary>
+        /// Opens the asset with the requested URI.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">
+        /// A base URI to use if <paramref name="uri"/> is relative.
+        /// </param>
+        /// <returns>A stream containing the asset contents.</returns>
+        /// <exception cref="FileNotFoundException">
+        /// The asset could not be found.
+        /// </exception>
+        public Stream Open(Uri uri, Uri? baseUri = null) => OpenAndGetAssembly(uri, baseUri).Item1;
+
+        /// <summary>
+        /// Opens the asset with the requested URI and returns the asset stream and the
+        /// assembly containing the asset.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">
+        /// A base URI to use if <paramref name="uri"/> is relative.
+        /// </param>
+        /// <returns>
+        /// The stream containing the resource contents together with the assembly.
+        /// </returns>
+        /// <exception cref="FileNotFoundException">
+        /// The asset could not be found.
+        /// </exception>
+        public (Stream stream, Assembly assembly) OpenAndGetAssembly(Uri uri, Uri? baseUri = null)
+        {
+            var asset = GetAsset(uri, baseUri);
+
+            if (asset == null)
+            {
+                throw new FileNotFoundException($"The resource {uri} could not be found.");
+            }
+
+            return (asset.GetStream(), asset.Assembly);
+        }
+
+        public Assembly? GetAssembly(Uri uri, Uri? baseUri)
+        {
+            if (!uri.IsAbsoluteUri && baseUri != null)
+                uri = new Uri(baseUri, uri);
+            return GetAssembly(uri)?.Assembly;
+        }
+
+        /// <summary>
+        /// Gets all assets of a folder and subfolders that match specified uri.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">Base URI that is used if <paramref name="uri"/> is relative.</param>
+        /// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
+        public IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri)
+        {
+            if (uri.IsAbsoluteResm())
+            {
+                var assembly = GetAssembly(uri);
+
+                return assembly?.Resources?
+                           .Where(x => x.Key.IndexOf(uri.GetUnescapeAbsolutePath(), StringComparison.Ordinal) >= 0)
+                           .Select(x =>new Uri($"resm:{x.Key}?assembly={assembly.Name}")) ??
+                       Enumerable.Empty<Uri>();
+            }
+
+            uri = uri.EnsureAbsolute(baseUri);
+            if (uri.IsAvares())
+            {
+                var (asm, path) = GetResAsmAndPath(uri);
+                if (asm == null)
+                {
+                    throw new ArgumentException(
+                        "No default assembly, entry assembly or explicit assembly specified; " +
+                        "don't know where to look up for the resource, try specifying assembly explicitly.");
+                }
+
+                if (asm.AvaloniaResources == null)
+                    return Enumerable.Empty<Uri>();
+
+                if (path[path.Length - 1] != '/')
+                    path += '/';
+
+                return asm.AvaloniaResources
+                    .Where(r => r.Key.StartsWith(path, StringComparison.Ordinal))
+                    .Select(x => new Uri($"avares://{asm.Name}{x.Key}"));
+            }
+
+            return Enumerable.Empty<Uri>();
+        }
+        
+        private IAssetDescriptor? GetAsset(Uri uri, Uri? baseUri)
+        {           
+            if (uri.IsAbsoluteResm())
+            {
+                var asm = GetAssembly(uri) ?? GetAssembly(baseUri) ?? _defaultResmAssembly;
+
+                if (asm == null)
+                {
+                    throw new ArgumentException(
+                        "No default assembly, entry assembly or explicit assembly specified; " +
+                        "don't know where to look up for the resource, try specifying assembly explicitly.");
+                }
+
+                var resourceKey = uri.AbsolutePath;
+                IAssetDescriptor? rv = null;
+                asm.Resources?.TryGetValue(resourceKey, out rv);
+                return rv;
+            }
+
+            uri = uri.EnsureAbsolute(baseUri);
+
+            if (uri.IsAvares())
+            {
+                var (asm, path) = GetResAsmAndPath(uri);
+                if (asm.AvaloniaResources == null)
+                    return null;
+                asm.AvaloniaResources.TryGetValue(path, out var desc);
+                return desc;
+            }
+
+            throw new ArgumentException($"Unsupported url type: " + uri.Scheme, nameof(uri));
+        }
+
+        private (IAssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
+        {
+            var asm = s_assemblyDescriptorResolver.GetAssembly(uri.Authority);
+            return (asm, uri.GetUnescapeAbsolutePath());
+        }
+        
+        private IAssemblyDescriptor? GetAssembly(Uri? uri)
+        {
+            if (uri != null)
+            {
+                if (!uri.IsAbsoluteUri)
+                    return null;
+                if (uri.IsAvares())
+                    return GetResAsmAndPath(uri).asm;
+
+                if (uri.IsResm())
+                {
+                    var assemblyName = uri.GetAssemblyNameFromQuery();
+                    if (assemblyName.Length > 0)
+                        return s_assemblyDescriptorResolver.GetAssembly(assemblyName);
+                }
+            }
+
+            return null;
+        }
+
+        public static void RegisterResUriParsers()
+        {
+            if (!UriParser.IsKnownScheme("avares"))
+                UriParser.Register(new GenericUriParser(
+                    GenericUriParserOptions.GenericAuthority |
+                    GenericUriParserOptions.NoUserInfo |
+                    GenericUriParserOptions.NoPort |
+                    GenericUriParserOptions.NoQuery |
+                    GenericUriParserOptions.NoFragment), "avares", -1);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
new file mode 100644
index 0000000000..dd3e1a4cb1
--- /dev/null
+++ b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
@@ -0,0 +1,30 @@
+using System;
+using Avalonia.Input;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// A default implementation of <see cref="IPlatformSettings"/> for platforms which don't have
+    /// an OS-specific implementation.
+    /// </summary>
+    public class DefaultPlatformSettings : IPlatformSettings
+    {
+        public Size GetTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(10, 10),
+                _ => new(4, 4),
+            };
+        }
+        public Size GetDoubleTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(16, 16),
+                _ => new(4, 4),
+            };
+        }
+        public TimeSpan GetDoubleTapTime(PointerType type) => TimeSpan.FromMilliseconds(500);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IAssetLoader.cs b/src/Avalonia.Base/Platform/IAssetLoader.cs
index e3899784ad..b65d61803f 100644
--- a/src/Avalonia.Base/Platform/IAssetLoader.cs
+++ b/src/Avalonia.Base/Platform/IAssetLoader.cs
@@ -2,12 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
     /// <summary>
     /// Loads assets compiled into the application binary.
     /// </summary>
+    [Unstable]
     public interface IAssetLoader
     {
         /// <summary>
diff --git a/src/Avalonia.Base/Platform/IBitmapImpl.cs b/src/Avalonia.Base/Platform/IBitmapImpl.cs
new file mode 100644
index 0000000000..299a758961
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IBitmapImpl.cs
@@ -0,0 +1,50 @@
+using System;
+using System.IO;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
+    /// </summary>
+    [Unstable]
+    public interface IBitmapImpl : IDisposable
+    {
+        /// <summary>
+        /// Gets the dots per inch (DPI) of the image.
+        /// </summary>
+        Vector Dpi { get; }
+
+        /// <summary>
+        /// Gets the size of the bitmap, in device pixels.
+        /// </summary>
+        PixelSize PixelSize { get; }
+        
+        /// <summary>
+        /// Version of the pixel data
+        /// </summary>
+        int Version { get; }
+
+        /// <summary>
+        /// Saves the bitmap to a file.
+        /// </summary>
+        /// <param name="fileName">The filename.</param>
+        /// <param name="quality">
+        /// The optional quality for compression if supported by the specific backend. 
+        /// The quality value is interpreted from 0 - 100. If quality is null the default quality 
+        /// setting of the backend is applied.
+        /// </param>
+        void Save(string fileName, int? quality = null);
+
+        /// <summary>
+        /// Saves the bitmap to a stream in png format.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="quality">
+        /// The optional quality for compression if supported by the specific backend. 
+        /// The quality value is interpreted from 0 - 100. If quality is null the default quality 
+        /// setting of the backend is applied.
+        /// </param>
+        void Save(Stream stream, int? quality = null);
+    }
+}
diff --git a/src/Avalonia.Input/Platform/ICursorFactory.cs b/src/Avalonia.Base/Platform/ICursorFactory.cs
similarity index 100%
rename from src/Avalonia.Input/Platform/ICursorFactory.cs
rename to src/Avalonia.Base/Platform/ICursorFactory.cs
diff --git a/src/Avalonia.Base/Platform/ICursorImpl.cs b/src/Avalonia.Base/Platform/ICursorImpl.cs
new file mode 100644
index 0000000000..74e0ba2e5c
--- /dev/null
+++ b/src/Avalonia.Base/Platform/ICursorImpl.cs
@@ -0,0 +1,16 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Represents a platform implementation of a <see cref="Cursor"/>.
+    /// </summary>
+    [Unstable]
+    public interface ICursorImpl : IDisposable
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
new file mode 100644
index 0000000000..6aa5eeea3d
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
@@ -0,0 +1,204 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the interface through which drawing occurs.
+    /// </summary>
+    [Unstable]
+    public interface IDrawingContextImpl : IDisposable
+    {
+        /// <summary>
+        /// Gets or sets the current transform of the drawing context.
+        /// </summary>
+        Matrix Transform { get; set; }
+
+        /// <summary>
+        /// Clears the render target to the specified color.
+        /// </summary>
+        /// <param name="color">The color.</param>
+        void Clear(Color color);
+
+        /// <summary>
+        /// Draws a bitmap image.
+        /// </summary>
+        /// <param name="source">The bitmap image.</param>
+        /// <param name="opacity">The opacity to draw with.</param>
+        /// <param name="sourceRect">The rect in the image to draw.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default);
+
+        /// <summary>
+        /// Draws a bitmap image.
+        /// </summary>
+        /// <param name="source">The bitmap image.</param>
+        /// <param name="opacityMask">The opacity mask to draw with.</param>
+        /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
+
+        /// <summary>
+        /// Draws a line.
+        /// </summary>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="p1">The first point of the line.</param>
+        /// <param name="p2">The second point of the line.</param>
+        void DrawLine(IPen pen, Point p1, Point p2);
+
+        /// <summary>
+        /// Draws a geometry.
+        /// </summary>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry);
+
+        /// <summary>
+        /// Draws a rectangle with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="boxShadows">Box shadow effect parameters</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
+            BoxShadows boxShadows = default);
+
+        /// <summary>
+        /// Draws an ellipse with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
+        /// <param name="rect">The ellipse bounds.</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        void DrawEllipse(IBrush? brush, IPen? pen, Rect rect);
+
+
+        /// <summary>
+        /// Draws a glyph run.
+        /// </summary>
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="glyphRun">The glyph run.</param>
+        void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun);
+
+        /// <summary>
+        /// Creates a new <see cref="IRenderTargetBitmapImpl"/> that can be used as a render layer
+        /// for the current render target.
+        /// </summary>
+        /// <param name="size">The size of the layer in DIPs.</param>
+        /// <returns>An <see cref="IRenderTargetBitmapImpl"/></returns>
+        /// <remarks>
+        /// Depending on the rendering backend used, a layer created via this method may be more
+        /// performant than a standard render target bitmap. In particular the Direct2D backend
+        /// has to do a format conversion each time a standard render target bitmap is rendered,
+        /// but a layer created via this method has no such overhead.
+        /// </remarks>
+        IDrawingContextLayerImpl CreateLayer(Size size);
+
+        /// <summary>
+        /// Pushes a clip rectangle.
+        /// </summary>
+        /// <param name="clip">The clip rectangle.</param>
+        void PushClip(Rect clip);
+
+        /// <summary>
+        /// Pushes a clip rounded rectangle.
+        /// </summary>
+        /// <param name="clip">The clip rounded rectangle</param>
+        void PushClip(RoundedRect clip);
+
+        /// <summary>
+        /// Pops the latest pushed clip rectangle.
+        /// </summary>
+        void PopClip();
+
+        /// <summary>
+        /// Pushes an opacity value.
+        /// </summary>
+        /// <param name="opacity">The opacity.</param>
+        void PushOpacity(double opacity);
+
+        /// <summary>
+        /// Pops the latest pushed opacity value.
+        /// </summary>
+        void PopOpacity();
+
+        /// <summary>
+        /// Pushes an opacity mask
+        /// </summary>
+        void PushOpacityMask(IBrush mask, Rect bounds);
+
+        /// <summary>
+        /// Pops the latest pushed opacity mask.
+        /// </summary>
+        void PopOpacityMask();
+
+        /// <summary>
+        /// Pushes a clip geometry.
+        /// </summary>
+        /// <param name="clip">The clip geometry.</param>
+        void PushGeometryClip(IGeometryImpl clip);
+
+        /// <summary>
+        /// Pops the latest pushed geometry clip.
+        /// </summary>
+        void PopGeometryClip();
+        
+        /// <summary>
+        /// Pushes a bitmap blending value.
+        /// </summary>
+        /// <param name="blendingMode">The bitmap blending mode.</param>
+        void PushBitmapBlendMode(BitmapBlendingMode blendingMode);
+
+        /// <summary>
+        /// Pops the latest pushed bitmap blending value.
+        /// </summary>
+        void PopBitmapBlendMode();
+
+        /// <summary>
+        /// Adds a custom draw operation
+        /// </summary>
+        /// <param name="custom">Custom draw operation</param>
+        void Custom(ICustomDrawOperation custom);
+
+        /// <summary>
+        /// Attempts to get an optional feature from the drawing context implementation
+        /// </summary>
+        object? GetFeature(Type t);
+    }
+
+    public static class DrawingContextImplExtensions
+    {
+        /// <summary>
+        /// Attempts to get an optional feature from the drawing context implementation
+        /// </summary>
+        public static T? GetFeature<T>(this IDrawingContextImpl context) where T : class =>
+            (T?)context.GetFeature(typeof(T));
+    }
+
+    public interface IDrawingContextLayerImpl : IRenderTargetBitmapImpl
+    {
+        /// <summary>
+        /// Does optimized blit with Src blend mode
+        /// </summary>
+        /// <param name="context"></param>
+        void Blit(IDrawingContextImpl context);
+        
+        /// <summary>
+        /// Returns true if layer supports optimized blit
+        /// </summary>
+        bool CanBlit { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextWithAcrylicLikeSupport.cs b/src/Avalonia.Base/Platform/IDrawingContextWithAcrylicLikeSupport.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/IDrawingContextWithAcrylicLikeSupport.cs
rename to src/Avalonia.Base/Platform/IDrawingContextWithAcrylicLikeSupport.cs
diff --git a/src/Avalonia.Base/Platform/IFontManagerImpl.cs b/src/Avalonia.Base/Platform/IFontManagerImpl.cs
new file mode 100644
index 0000000000..cd6e64abaf
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IFontManagerImpl.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IFontManagerImpl
+    {
+        /// <summary>
+        ///     Gets the system's default font family's name.
+        /// </summary>
+        string GetDefaultFontFamilyName();
+
+        /// <summary>
+        ///     Get all installed fonts in the system.
+        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
+        /// </summary>
+        IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false);
+
+        /// <summary>
+        ///     Tries to match a specified character to a typeface that supports specified font properties.
+        /// </summary>
+        /// <param name="codepoint">The codepoint to match against.</param>
+        /// <param name="fontStyle">The font style.</param>
+        /// <param name="fontWeight">The font weight.</param>
+        /// <param name="fontStretch">The font stretch.</param>
+        /// <param name="fontFamily">The font family. This is optional and used for fallback lookup.</param>
+        /// <param name="culture">The culture.</param>
+        /// <param name="typeface">The matching typeface.</param>
+        /// <returns>
+        ///     <c>True</c>, if the <see cref="IFontManagerImpl"/> could match the character to specified parameters, <c>False</c> otherwise.
+        /// </returns>
+        bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
+            FontWeight fontWeight, FontStretch fontStretch,
+            FontFamily? fontFamily, CultureInfo? culture, out Typeface typeface);
+
+        /// <summary>
+        ///     Creates a glyph typeface.
+        /// </summary>
+        /// <param name="typeface">The typeface.</param>
+        /// <returns>0
+        ///     The created glyph typeface. Can be <c>Null</c> if it was not possible to create a glyph typeface.
+        /// </returns>
+        IGlyphTypeface CreateGlyphTypeface(Typeface typeface);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGeometryContext.cs b/src/Avalonia.Base/Platform/IGeometryContext.cs
new file mode 100644
index 0000000000..87db9f1dd4
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGeometryContext.cs
@@ -0,0 +1,63 @@
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Describes a geometry using drawing commands.
+    /// </summary>
+    public interface IGeometryContext : IDisposable
+    {
+        /// <summary>
+        /// Draws an arc to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
+        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
+        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
+        /// <param name="sweepDirection">
+        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+        /// </param>
+        void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection);
+
+        /// <summary>
+        /// Begins a new figure.
+        /// </summary>
+        /// <param name="startPoint">The starting point for the figure.</param>
+        /// <param name="isFilled">Whether the figure is filled.</param>
+        void BeginFigure(Point startPoint, bool isFilled = true);
+
+        /// <summary>
+        /// Draws a Bezier curve to the specified point.
+        /// </summary>
+        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
+        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
+        /// <param name="point3">The destination point for the end of the curve.</param>
+        void CubicBezierTo(Point point1, Point point2, Point point3);
+
+        /// <summary>
+        /// Draws a quadratic Bezier curve to the specified point
+        /// </summary>
+        /// <param name="control">Control point</param>
+        /// <param name="endPoint">DestinationPoint</param>
+        void QuadraticBezierTo(Point control, Point endPoint);
+
+        /// <summary>
+        /// Draws a line to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        void LineTo(Point point);
+
+        /// <summary>
+        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
+        /// </summary>
+        /// <param name="isClosed">Whether the figure is closed.</param>
+        void EndFigure(bool isClosed);
+
+        /// <summary>
+        /// Sets the fill rule.
+        /// </summary>
+        /// <param name="fillRule">The fill rule.</param>
+        void SetFillRule(FillRule fillRule);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGeometryImpl.cs b/src/Avalonia.Base/Platform/IGeometryImpl.cs
new file mode 100644
index 0000000000..5826cfb2ff
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGeometryImpl.cs
@@ -0,0 +1,92 @@
+using Avalonia.Media;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Geometry"/>.
+    /// </summary>
+    [Unstable]
+    public interface IGeometryImpl
+    {
+        /// <summary>
+        /// Gets the geometry's bounding rectangle.
+        /// </summary>
+        Rect Bounds { get; }
+        
+        /// <summary>
+        /// Gets the geometry's total length as if all its contours are placed
+        /// in a straight line.
+        /// </summary>
+        double ContourLength { get; }
+
+        /// <summary>
+        /// Gets the geometry's bounding rectangle with the specified pen.
+        /// </summary>
+        /// <param name="pen">The pen to use. May be null.</param>
+        /// <returns>The bounding rectangle.</returns>
+        Rect GetRenderBounds(IPen? pen);
+
+        /// <summary>
+        /// Indicates whether the geometry's fill contains the specified point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        bool FillContains(Point point);
+
+        /// <summary>
+        /// Intersects the geometry with another geometry.
+        /// </summary>
+        /// <param name="geometry">The other geometry.</param>
+        /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection or <c>null</c> when the operation failed.</returns>
+        IGeometryImpl? Intersect(IGeometryImpl geometry);
+
+        /// <summary>
+        /// Indicates whether the geometry's stroke contains the specified point.
+        /// </summary>
+        /// <param name="pen">The stroke to use.</param>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        bool StrokeContains(IPen pen, Point point);
+
+        /// <summary>
+        /// Makes a clone of the geometry with the specified transform.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <returns>The cloned geometry.</returns>
+        ITransformedGeometryImpl WithTransform(Matrix transform);
+
+        /// <summary>
+        /// Attempts to get the corresponding point at the
+        /// specified distance
+        /// </summary>
+        /// <param name="distance">The contour distance to get from.</param>
+        /// <param name="point">The point in the specified distance.</param>
+        /// <returns>If there's valid point at the specified distance.</returns>
+        bool TryGetPointAtDistance(double distance, out Point point);
+
+        /// <summary>
+        /// Attempts to get the corresponding point and
+        /// tangent from the specified distance along the
+        /// contour of the geometry.
+        /// </summary>
+        /// <param name="distance">The contour distance to get from.</param>
+        /// <param name="point">The point in the specified distance.</param>
+        /// <param name="tangent">The tangent in the specified distance.</param>
+        /// <returns>If there's valid point and tangent at the specified distance.</returns>
+        bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent);
+        
+        /// <summary>
+        /// Attempts to get the corresponding path segment
+        /// given by the two distances specified.
+        /// Imagine it like snipping a part of the current
+        /// geometry.
+        /// </summary>
+        /// <param name="startDistance">The contour distance to start snipping from.</param>
+        /// <param name="stopDistance">The contour distance to stop snipping to.</param>
+        /// <param name="startOnBeginFigure">If ture, the resulting snipped path will start with a BeginFigure call.</param>
+        /// <param name="segmentGeometry">The resulting snipped path.</param>
+        /// <returns>If the snipping operation is successful.</returns>
+        bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGlyphRunBuffer.cs b/src/Avalonia.Base/Platform/IGlyphRunBuffer.cs
new file mode 100644
index 0000000000..c1fc7a5967
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGlyphRunBuffer.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Drawing;
+
+namespace Avalonia.Platform
+{
+    public interface IGlyphRunBuffer
+    {
+        Span<ushort> GlyphIndices { get; }
+
+        IGlyphRunImpl Build();
+    }
+
+    public interface IHorizontalGlyphRunBuffer : IGlyphRunBuffer
+    {
+        Span<float> GlyphPositions { get; }
+    }
+
+    public interface IPositionedGlyphRunBuffer : IGlyphRunBuffer
+    {
+        Span<PointF> GlyphPositions { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGlyphRunImpl.cs b/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
new file mode 100644
index 0000000000..7801bdd50f
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
@@ -0,0 +1,11 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    ///     Actual implementation of a glyph run that stores platform dependent resources.
+    /// </summary>
+    [Unstable]
+    public interface IGlyphRunImpl : IDisposable { }
+}
diff --git a/src/Avalonia.Visuals/Platform/ILockedFramebuffer.cs b/src/Avalonia.Base/Platform/ILockedFramebuffer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/ILockedFramebuffer.cs
rename to src/Avalonia.Base/Platform/ILockedFramebuffer.cs
diff --git a/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs b/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
index e399976bbe..b087724079 100644
--- a/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
+++ b/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IMacOSTopLevelPlatformHandle
     {
         IntPtr NSView { get; }
diff --git a/src/Avalonia.Visuals/Platform/IModuleEnvironmentChecker.cs b/src/Avalonia.Base/Platform/IModuleEnvironmentChecker.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/IModuleEnvironmentChecker.cs
rename to src/Avalonia.Base/Platform/IModuleEnvironmentChecker.cs
diff --git a/src/Avalonia.Base/Platform/IPlatformGpu.cs b/src/Avalonia.Base/Platform/IPlatformGpu.cs
new file mode 100644
index 0000000000..0507dea1d7
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IPlatformGpu.cs
@@ -0,0 +1,16 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform;
+
+[Unstable]
+public interface IPlatformGpu
+{
+    IPlatformGpuContext PrimaryContext { get; }
+}
+
+[Unstable]
+public interface IPlatformGpuContext : IDisposable
+{
+    IDisposable EnsureCurrent();
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
new file mode 100644
index 0000000000..518c5f37b8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the main platform-specific interface for the rendering subsystem.
+    /// </summary>
+    [Unstable]
+    public interface IPlatformRenderInterface
+    {
+        /// <summary>
+        /// Creates an ellipse geometry implementation.
+        /// </summary>
+        /// <param name="rect">The bounds of the ellipse.</param>
+        /// <returns>An ellipse geometry..</returns>
+        IGeometryImpl CreateEllipseGeometry(Rect rect);
+
+        /// <summary>
+        /// Creates a line geometry implementation.
+        /// </summary>
+        /// <param name="p1">The start of the line.</param>
+        /// <param name="p2">The end of the line.</param>
+        /// <returns>A line geometry.</returns>
+        IGeometryImpl CreateLineGeometry(Point p1, Point p2);
+
+        /// <summary>
+        /// Creates a rectangle geometry implementation.
+        /// </summary>
+        /// <param name="rect">The bounds of the rectangle.</param>
+        /// <returns>A rectangle.</returns>
+        IGeometryImpl CreateRectangleGeometry(Rect rect);
+
+        /// <summary>
+        /// Creates a stream geometry implementation.
+        /// </summary>
+        /// <returns>An <see cref="IStreamGeometryImpl"/>.</returns>
+        IStreamGeometryImpl CreateStreamGeometry();
+
+        /// <summary>
+        /// Creates a geometry group implementation.
+        /// </summary>
+        /// <param name="fillRule">The fill rule.</param>
+        /// <param name="children">The geometries to group.</param>
+        /// <returns>A combined geometry.</returns>
+        IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children);
+
+        /// <summary>
+        /// Creates a geometry group implementation.
+        /// </summary>
+        /// <param name="combineMode">The combine mode</param>
+        /// <param name="g1">The first geometry.</param>
+        /// <param name="g2">The second geometry.</param>
+        /// <returns>A combined geometry.</returns>
+        IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2);
+
+        /// <summary>
+        /// Created a geometry implementation for the glyph run.
+        /// </summary>
+        /// <param name="glyphRun">The glyph run to build a geometry from.</param>
+        /// <returns>The geometry returned contains the combined geometry of all glyphs in the glyph run.</returns>
+        IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun);
+
+        /// <summary>
+        /// Creates a renderer.
+        /// </summary>
+        /// <param name="surfaces">
+        /// The list of native platform surfaces that can be used for output.
+        /// </param>
+        /// <returns>An <see cref="IRenderTarget"/>.</returns>
+        IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces);
+
+        /// <summary>
+        /// Creates a render target bitmap implementation.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <returns>An <see cref="IRenderTargetBitmapImpl"/>.</returns>
+        IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi);
+
+        /// <summary>
+        /// Creates a writeable bitmap implementation.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="format">Pixel format.</param>
+        /// <param name="alphaFormat">Alpha format .</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a file..
+        /// </summary>
+        /// <param name="fileName">The filename of the bitmap.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmap(string fileName);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a file..
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmap(Stream stream);
+
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a stream to a specified width maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a stream to a specified height maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+        
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a file.
+        /// </summary>
+        /// <param name="fileName">The filename of the bitmap.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmap(string fileName);
+
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a file.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmap(Stream stream);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a stream to a specified width maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a stream to a specified height maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a pixels in memory.
+        /// </summary>
+        /// <param name="format">The pixel format.</param>
+        /// <param name="alphaFormat">The alpha format.</param>
+        /// <param name="data">The pointer to source bytes.</param>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="stride">The number of bytes per row.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride);
+
+        /// <summary>
+        /// Creates a platform implementation of a glyph run.
+        /// </summary>
+        /// <param name="glyphTypeface">The glyph typeface.</param>
+        /// <param name="fontRenderingEmSize">The font rendering em size.</param>
+        /// <param name="glyphIndices">The glyph indices.</param>
+        /// <param name="glyphAdvances">The glyph advances.</param>
+        /// <param name="glyphOffsets">The glyph offsets.</param>
+        /// <returns></returns>
+        IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double>? glyphAdvances, IReadOnlyList<Vector>? glyphOffsets);
+
+        /// <summary>
+        /// Gets a value indicating whether the platform directly supports rectangles with rounded corners.
+        /// </summary>
+        /// <remarks>
+        /// Some platform renderers can't directly handle rounded corners on rectangles.
+        /// In this case, code that requires rounded corners must generate and retain a geometry instead.
+        /// </remarks>
+        bool SupportsIndividualRoundRects { get; }
+
+        /// <summary>
+        /// Default <see cref="AlphaFormat"/> used on this platform.
+        /// </summary>
+        public AlphaFormat DefaultAlphaFormat { get; }
+
+        /// <summary>
+        /// Default <see cref="PixelFormat"/> used on this platform.
+        /// </summary>
+        public PixelFormat DefaultPixelFormat { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformSettings.cs b/src/Avalonia.Base/Platform/IPlatformSettings.cs
new file mode 100644
index 0000000000..e7921883fd
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IPlatformSettings.cs
@@ -0,0 +1,31 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IPlatformSettings
+    {
+        /// <summary>
+        /// The size of the rectangle around the location of a pointer down that a pointer up
+        /// must occur within in order to register a tap gesture, in device-independent pixels.
+        /// </summary>
+        /// <param name="type">The pointer type.</param>
+        Size GetTapSize(PointerType type);
+
+        /// <summary>
+        /// The size of the rectangle around the location of a pointer down that a pointer up
+        /// must occur within in order to register a double-tap gesture, in device-independent
+        /// pixels.
+        /// </summary>
+        /// <param name="type">The pointer type.</param>
+        Size GetDoubleTapSize(PointerType type);
+
+        /// <summary>
+        /// Gets the maximum time that may occur between the first and second click of a double-
+        /// tap gesture.
+        /// </summary>
+        TimeSpan GetDoubleTapTime(PointerType type);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
index 2137f965cc..bf18a7da5b 100644
--- a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using Avalonia.Metadata;
 using Avalonia.Threading;
 
 namespace Avalonia.Platform
@@ -7,6 +8,7 @@ namespace Avalonia.Platform
     /// <summary>
     /// Provides platform-specific services relating to threading.
     /// </summary>
+    [Unstable]
     public interface IPlatformThreadingInterface
     {
         void RunLoop(CancellationToken cancellationToken);
diff --git a/src/Avalonia.Visuals/Platform/IRenderTarget.cs b/src/Avalonia.Base/Platform/IRenderTarget.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/IRenderTarget.cs
rename to src/Avalonia.Base/Platform/IRenderTarget.cs
diff --git a/src/Avalonia.Base/Platform/IRenderTargetBitmapImpl.cs b/src/Avalonia.Base/Platform/IRenderTargetBitmapImpl.cs
new file mode 100644
index 0000000000..d33c503650
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IRenderTargetBitmapImpl.cs
@@ -0,0 +1,13 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a
+    /// <see cref="Avalonia.Media.Imaging.RenderTargetBitmap"/>.
+    /// </summary>
+    [Unstable]
+    public interface IRenderTargetBitmapImpl : IBitmapImpl, IRenderTarget
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IRuntimePlatform.cs b/src/Avalonia.Base/Platform/IRuntimePlatform.cs
index 850757a1ee..3f8983479f 100644
--- a/src/Avalonia.Base/Platform/IRuntimePlatform.cs
+++ b/src/Avalonia.Base/Platform/IRuntimePlatform.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IRuntimePlatform
     {
         IDisposable StartSystemTimer(TimeSpan interval, Action tick);
@@ -9,17 +11,22 @@ namespace Avalonia.Platform
         IUnmanagedBlob AllocBlob(int size);
     }
 
+    [Unstable]
     public interface IUnmanagedBlob : IDisposable
     {
         IntPtr Address { get; }
         int Size { get; }
         bool IsDisposed { get; }
-        
+
     }
 
+    [Unstable]
     public struct RuntimePlatformInfo
     {
         public OperatingSystemType OperatingSystem { get; set; }
+
+        public FormFactorType FormFactor => IsDesktop ? FormFactorType.Desktop :
+            IsMobile ? FormFactorType.Mobile : FormFactorType.Unknown;
         public bool IsDesktop { get; set; }
         public bool IsMobile { get; set; }
         public bool IsBrowser { get; set; }
@@ -29,6 +36,7 @@ namespace Avalonia.Platform
         public bool IsUnix { get; set; }
     }
 
+    [Unstable]
     public enum OperatingSystemType
     {
         Unknown,
@@ -39,4 +47,12 @@ namespace Avalonia.Platform
         iOS,
         Browser
     }
+
+    [Unstable]
+    public enum FormFactorType
+    {
+        Unknown,
+        Desktop,
+        Mobile
+    }
 }
diff --git a/src/Avalonia.Base/Platform/IStreamGeometryContextImpl.cs b/src/Avalonia.Base/Platform/IStreamGeometryContextImpl.cs
new file mode 100644
index 0000000000..3d5ee36608
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IStreamGeometryContextImpl.cs
@@ -0,0 +1,12 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Describes a geometry using drawing commands.
+    /// </summary>
+    [Unstable]
+    public interface IStreamGeometryContextImpl : IGeometryContext
+    {      
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IStreamGeometryImpl.cs b/src/Avalonia.Base/Platform/IStreamGeometryImpl.cs
new file mode 100644
index 0000000000..bd4411f3a4
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IStreamGeometryImpl.cs
@@ -0,0 +1,25 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.StreamGeometry"/>.
+    /// </summary>
+    [Unstable]
+    public interface IStreamGeometryImpl : IGeometryImpl
+    {
+        /// <summary>
+        /// Clones the geometry.
+        /// </summary>
+        /// <returns>A cloned geometry.</returns>
+        IStreamGeometryImpl Clone();
+
+        /// <summary>
+        /// Opens the geometry to start defining it.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="IStreamGeometryContextImpl"/> which can be used to define the geometry.
+        /// </returns>
+        IStreamGeometryContextImpl Open();
+    }
+}
diff --git a/src/Avalonia.Base/Platform/ITextShaperImpl.cs b/src/Avalonia.Base/Platform/ITextShaperImpl.cs
new file mode 100644
index 0000000000..10e58b7d0b
--- /dev/null
+++ b/src/Avalonia.Base/Platform/ITextShaperImpl.cs
@@ -0,0 +1,21 @@
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+using Avalonia.Utilities;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// An abstraction that is used produce shaped text.
+    /// </summary>
+    [Unstable]
+    public interface ITextShaperImpl
+    {
+        /// <summary>
+        /// Shapes the specified region within the text and returns a shaped buffer.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="options">Text shaper options to customize the shaping process.</param>
+        /// <returns>A shaped glyph run.</returns>
+        ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options);
+    }   
+}
diff --git a/src/Avalonia.Base/Platform/ITransformedGeometryImpl.cs b/src/Avalonia.Base/Platform/ITransformedGeometryImpl.cs
new file mode 100644
index 0000000000..2754414cd1
--- /dev/null
+++ b/src/Avalonia.Base/Platform/ITransformedGeometryImpl.cs
@@ -0,0 +1,25 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Represents a geometry with a transform applied.
+    /// </summary>
+    /// <remarks>
+    /// An <see cref="ITransformedGeometryImpl"/> transforms a geometry without transforming its
+    /// stroke thickness.
+    /// </remarks>
+    [Unstable]
+    public interface ITransformedGeometryImpl : IGeometryImpl
+    {
+        /// <summary>
+        /// Gets the source geometry that the <see cref="Transform"/> is applied to.
+        /// </summary>
+        IGeometryImpl SourceGeometry { get; }
+
+        /// <summary>
+        /// Gets the applied transform.
+        /// </summary>
+        Matrix Transform { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IWriteableBitmapImpl.cs b/src/Avalonia.Base/Platform/IWriteableBitmapImpl.cs
new file mode 100644
index 0000000000..fa1e1862b7
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IWriteableBitmapImpl.cs
@@ -0,0 +1,13 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.WriteableBitmap"/>.
+    /// </summary>
+    [Unstable]
+    public interface IWriteableBitmapImpl : IBitmapImpl
+    {
+        ILockedFramebuffer Lock();
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs
new file mode 100644
index 0000000000..df2a26ddd3
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Utilities;
+
+namespace Avalonia.Platform.Internal;
+
+internal interface IAssemblyDescriptor
+{
+    Assembly Assembly { get; }
+    Dictionary<string, IAssetDescriptor>? Resources { get; }
+    Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
+    string? Name { get; }
+}
+
+internal class AssemblyDescriptor : IAssemblyDescriptor
+{
+    public AssemblyDescriptor(Assembly assembly)
+    {
+        Assembly = assembly;
+
+        if (assembly != null)
+        {
+            Resources = assembly.GetManifestResourceNames()
+                .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
+            Name = assembly.GetName().Name;
+            using (var resources = assembly.GetManifestResourceStream(Constants.AvaloniaResourceName))
+            {
+                if (resources != null)
+                {
+                    Resources.Remove(Constants.AvaloniaResourceName);
+
+                    var indexLength = new BinaryReader(resources).ReadInt32();
+                    var index = AvaloniaResourcesIndexReaderWriter.Read(new SlicedStream(resources, 4, indexLength));
+                    var baseOffset = indexLength + 4;
+                    AvaloniaResources = index.ToDictionary(r => GetPathRooted(r), r => (IAssetDescriptor)
+                        new AvaloniaResourceDescriptor(assembly, baseOffset + r.Offset, r.Size));
+                }
+            }
+        }
+    }
+
+    public Assembly Assembly { get; }
+    public Dictionary<string, IAssetDescriptor>? Resources { get; }
+    public Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
+    public string? Name { get; }
+    private static string GetPathRooted(AvaloniaResourcesIndexEntry r) =>
+        r.Path![0] == '/' ? r.Path : '/' + r.Path;
+}
diff --git a/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
new file mode 100644
index 0000000000..b12130b1f7
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Platform.Internal;
+
+internal interface IAssemblyDescriptorResolver
+{
+    IAssemblyDescriptor GetAssembly(string name);
+}
+
+internal class AssemblyDescriptorResolver: IAssemblyDescriptorResolver
+{
+    private readonly Dictionary<string, IAssemblyDescriptor> _assemblyNameCache = new();
+
+    public IAssemblyDescriptor GetAssembly(string name)
+    {
+        if (name == null)
+            throw new ArgumentNullException(nameof(name));
+
+        if (!_assemblyNameCache.TryGetValue(name, out var rv))
+        {
+            var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
+            if (match != null)
+            {
+                _assemblyNameCache[name] = rv = new AssemblyDescriptor(match);
+            }
+            else
+            {
+#if NET6_0_OR_GREATER
+                if (!RuntimeFeature.IsDynamicCodeSupported)
+                {
+                    throw new InvalidOperationException(
+                        $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
+                }
+#endif
+                name = Uri.UnescapeDataString(name);
+                _assemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
+            }
+        }
+
+        return rv;
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs b/src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs
new file mode 100644
index 0000000000..52f8f5e68d
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs
@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Avalonia.Platform.Internal;
+
+internal interface IAssetDescriptor
+{
+    Stream GetStream();
+    Assembly Assembly { get; }
+}
+
+internal class AssemblyResourceDescriptor : IAssetDescriptor
+{
+    private readonly Assembly _asm;
+    private readonly string _name;
+
+    public AssemblyResourceDescriptor(Assembly asm, string name)
+    {
+        _asm = asm;
+        _name = name;
+    }
+
+    public Stream GetStream()
+    {
+        var s = _asm.GetManifestResourceStream(_name);
+        return s ?? throw new InvalidOperationException($"Could not find manifest resource stream '{_name}',");
+    }
+
+    public Assembly Assembly => _asm;
+}
+        
+internal class AvaloniaResourceDescriptor : IAssetDescriptor
+{
+    private readonly int _offset;
+    private readonly int _length;
+    public Assembly Assembly { get; }
+
+    public AvaloniaResourceDescriptor(Assembly asm, int offset, int length)
+    {
+        _offset = offset;
+        _length = length;
+        Assembly = asm;
+    }
+
+    public Stream GetStream()
+    {
+        var s = Assembly.GetManifestResourceStream(Constants.AvaloniaResourceName) ??
+                throw new InvalidOperationException($"Could not find manifest resource stream '{Constants.AvaloniaResourceName}',");
+        return new SlicedStream(s, _offset, _length);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/Constants.cs b/src/Avalonia.Base/Platform/Internal/Constants.cs
new file mode 100644
index 0000000000..cad864e7e3
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/Constants.cs
@@ -0,0 +1,6 @@
+namespace Avalonia.Platform.Internal;
+
+internal static class Constants
+{
+    public static string AvaloniaResourceName => "!AvaloniaResources";
+}
diff --git a/src/Avalonia.Base/Platform/Internal/DynLoader.cs b/src/Avalonia.Base/Platform/Internal/DynLoader.cs
new file mode 100644
index 0000000000..07903669b1
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/DynLoader.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Platform.Interop;
+
+// ReSharper disable InconsistentNaming
+namespace Avalonia.Platform.Internal
+{
+    class UnixLoader : IDynamicLibraryLoader
+    {
+        static class LinuxImports
+        {
+            [DllImport("libdl.so.2")]
+            private static extern IntPtr dlopen(string path, int flags);
+
+            [DllImport("libdl.so.2")]
+            private static extern IntPtr dlsym(IntPtr handle, string symbol);
+
+            [DllImport("libdl.so.2")]
+            private static extern IntPtr dlerror();
+
+            public static void Init()
+            {
+                DlOpen = dlopen;
+                DlSym = dlsym;
+                DlError = dlerror;
+            }
+        }
+
+        static class OsXImports
+        {
+            [DllImport("/usr/lib/libSystem.dylib")]
+            private static extern IntPtr dlopen(string path, int flags);
+
+            [DllImport("/usr/lib/libSystem.dylib")]
+            private static extern IntPtr dlsym(IntPtr handle, string symbol);
+
+            [DllImport("/usr/lib/libSystem.dylib")]
+            private static extern IntPtr dlerror();
+
+            public static void Init()
+            {
+                DlOpen = dlopen;
+                DlSym = dlsym;
+                DlError = dlerror;
+            }
+            
+        }
+        
+
+        [DllImport("libc")]
+        static extern int uname(IntPtr buf);
+
+        static UnixLoader()
+        {
+            var buffer = Marshal.AllocHGlobal(0x1000);
+            uname(buffer);
+            var unixName = Marshal.PtrToStringAnsi(buffer);
+            Marshal.FreeHGlobal(buffer);
+            if (unixName == "Darwin")
+                OsXImports.Init();
+            else
+                LinuxImports.Init();
+        }
+
+        private static Func<string, int, IntPtr>? DlOpen;
+        private static Func<IntPtr, string, IntPtr>? DlSym;
+        private static Func<IntPtr>? DlError;
+        // ReSharper restore InconsistentNaming
+
+        static string? DlErrorString() => Marshal.PtrToStringAnsi(DlError!.Invoke());
+
+        public IntPtr LoadLibrary(string dll)
+        {
+            var handle = DlOpen!.Invoke(dll, 1);
+            if (handle == IntPtr.Zero)
+                throw new DynamicLibraryLoaderException(DlErrorString()!);
+            return handle;
+        }
+
+        public IntPtr GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            var ptr = DlSym!.Invoke(dll, proc);
+            if (ptr == IntPtr.Zero && !optional)
+                throw new DynamicLibraryLoaderException(DlErrorString()!);
+            return ptr;
+        }
+    }
+
+    internal class Win32Loader : IDynamicLibraryLoader
+    {
+        [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
+        private static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
+
+        [DllImport("kernel32", EntryPoint = "LoadLibraryW", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern IntPtr LoadLibrary(string lpszLib);
+
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
+        {
+            var handle = LoadLibrary(dll);
+            if (handle != IntPtr.Zero)
+                return handle;
+            var err = Marshal.GetLastWin32Error();
+
+            throw new DynamicLibraryLoaderException("Error loading " + dll + " error " + err);
+        }
+
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            var ptr = GetProcAddress(dll, proc);
+            if (ptr == IntPtr.Zero && !optional)
+                throw new DynamicLibraryLoaderException("Error " + Marshal.GetLastWin32Error());
+            return ptr;
+        }
+    }
+
+#if NET6_0_OR_GREATER
+    internal class Net6Loader : IDynamicLibraryLoader
+    {
+        public IntPtr LoadLibrary(string dll)
+        {
+            try
+            {
+                return NativeLibrary.Load(dll);
+            }
+            catch (Exception ex)
+            {
+                throw new DynamicLibraryLoaderException("Error loading " + dll, ex);
+            }
+        }
+
+        public IntPtr GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            try
+            {
+                if (optional)
+                {
+                    return NativeLibrary.TryGetExport(dll, proc, out var address) ? address : default;
+                }
+                return NativeLibrary.GetExport(dll, proc);
+            }
+            catch (Exception ex)
+            {
+                throw new DynamicLibraryLoaderException("Error " + dll, ex);
+            }
+        }
+    }
+#endif
+    
+    internal class NotSupportedLoader : IDynamicLibraryLoader
+    {
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
+        {
+            throw new PlatformNotSupportedException();
+        }
+
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            throw new PlatformNotSupportedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/SlicedStream.cs b/src/Avalonia.Base/Platform/Internal/SlicedStream.cs
new file mode 100644
index 0000000000..124c248aa8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/SlicedStream.cs
@@ -0,0 +1,59 @@
+using System;
+using System.IO;
+
+namespace Avalonia.Platform.Internal;
+
+internal class SlicedStream : Stream
+{
+    private readonly Stream _baseStream;
+    private readonly int _from;
+
+    public SlicedStream(Stream baseStream, int from, int length)
+    {
+        Length = length;
+        _baseStream = baseStream;
+        _from = from;
+        _baseStream.Position = from;
+    }
+    public override void Flush()
+    {
+    }
+
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        return _baseStream.Read(buffer, offset, (int)Math.Min(count, Length - Position));
+    }
+
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        if (origin == SeekOrigin.Begin)
+            Position = offset;
+        if (origin == SeekOrigin.End)
+            Position = _from + Length + offset;
+        if (origin == SeekOrigin.Current)
+            Position = Position + offset;
+        return Position;
+    }
+
+    public override void SetLength(long value) => throw new NotSupportedException();
+
+    public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
+
+    public override bool CanRead => true;
+    public override bool CanSeek => _baseStream.CanRead;
+    public override bool CanWrite => false;
+    public override long Length { get; }
+    public override long Position
+    {
+        get => _baseStream.Position - _from;
+        set => _baseStream.Position = value + _from;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+            _baseStream.Dispose();
+    }
+
+    public override void Close() => _baseStream.Close();
+}
diff --git a/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs b/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs
new file mode 100644
index 0000000000..a56d9ffd1c
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace Avalonia.Platform.Internal;
+
+internal class UnmanagedBlob : IUnmanagedBlob
+{
+    private IntPtr _address;
+    private readonly object _lock = new object();
+#if DEBUG
+    private static readonly List<string> Backtraces = new List<string>();
+    private static Thread? GCThread;
+    private readonly string _backtrace;
+    private static readonly object _btlock = new object();
+
+    class GCThreadDetector
+    {
+        ~GCThreadDetector()
+        {
+            GCThread = Thread.CurrentThread;
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static void Spawn() => new GCThreadDetector();
+
+    static UnmanagedBlob()
+    {
+        Spawn();
+        GC.WaitForPendingFinalizers();
+    }
+#endif
+
+    public UnmanagedBlob(int size)
+    {
+        try
+        {
+            if (size <= 0)
+                throw new ArgumentException("Positive number required", nameof(size));
+            _address = Alloc(size);
+            GC.AddMemoryPressure(size);
+            Size = size;
+        }
+        catch
+        {
+            GC.SuppressFinalize(this);
+            throw;
+        }
+#if DEBUG
+        _backtrace = Environment.StackTrace;
+        lock (_btlock)
+            Backtraces.Add(_backtrace);
+#endif
+    }
+
+    void DoDispose()
+    {
+        lock (_lock)
+        {
+            if (!IsDisposed)
+            {
+#if DEBUG
+                lock (_btlock)
+                    Backtraces.Remove(_backtrace);
+#endif
+                Free(_address, Size);
+                GC.RemoveMemoryPressure(Size);
+                IsDisposed = true;
+                _address = IntPtr.Zero;
+                Size = 0;
+            }
+        }
+    }
+
+    public void Dispose()
+    {
+#if DEBUG
+        if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
+        {
+            lock (_lock)
+            {
+                if (!IsDisposed)
+                {
+                    Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
+                                         + Environment.StackTrace
+                                         + "\n\nBlob created by " + _backtrace);
+                }
+            }
+        }
+#endif
+        DoDispose();
+        GC.SuppressFinalize(this);
+    }
+
+    ~UnmanagedBlob()
+    {
+#if DEBUG
+        Console.Error.WriteLine("Undisposed native blob created by " + _backtrace);
+#endif
+        DoDispose();
+    }
+
+    public IntPtr Address => IsDisposed ? throw new ObjectDisposedException("UnmanagedBlob") : _address;
+    public int Size { get; private set; }
+    public bool IsDisposed { get; private set; }
+
+    [DllImport("libc", SetLastError = true)]
+    private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);
+    [DllImport("libc", SetLastError = true)]
+    private static extern int munmap(IntPtr addr, IntPtr length);
+    [DllImport("libc", SetLastError = true)]
+    private static extern long sysconf(int name);
+
+    private bool? _useMmap;
+    private bool UseMmap
+        => _useMmap ?? ((_useMmap = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)).Value);
+
+    // Could be replaced with https://github.com/dotnet/runtime/issues/40892 when it will be available.
+    private IntPtr Alloc(int size)
+    {
+        if (!UseMmap)
+        {
+            return Marshal.AllocHGlobal(size);
+        }
+        else
+        {
+            var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);
+            if (rv.ToInt64() == -1 || (ulong)rv.ToInt64() == 0xffffffff)
+            {
+                var errno = Marshal.GetLastWin32Error();
+                throw new Exception("Unable to allocate memory: " + errno);
+            }
+            return rv;
+        }
+    }
+
+    private void Free(IntPtr ptr, int len)
+    {
+        if (!UseMmap)
+        {
+            Marshal.FreeHGlobal(ptr);
+        }
+        else
+        {
+            if (munmap(ptr, new IntPtr(len)) == -1)
+            {
+                var errno = Marshal.GetLastWin32Error();
+                throw new Exception("Unable to free memory: " + errno);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs b/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
index 8124ce6bc4..d9db4b71d5 100644
--- a/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
+++ b/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform.Interop
 {
+    [Unstable]
     public interface IDynamicLibraryLoader
     {
         IntPtr LoadLibrary(string dll);
@@ -14,5 +16,10 @@ namespace Avalonia.Platform.Interop
         {
             
         }
+        
+        public DynamicLibraryLoaderException(string message, Exception innerException) : base(message, innerException)
+        {
+            
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/LockedFramebuffer.cs b/src/Avalonia.Base/Platform/LockedFramebuffer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/LockedFramebuffer.cs
rename to src/Avalonia.Base/Platform/LockedFramebuffer.cs
diff --git a/src/Avalonia.Visuals/Platform/PathGeometryContext.cs b/src/Avalonia.Base/Platform/PathGeometryContext.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/PathGeometryContext.cs
rename to src/Avalonia.Base/Platform/PathGeometryContext.cs
diff --git a/src/Avalonia.Visuals/Platform/PixelFormat.cs b/src/Avalonia.Base/Platform/PixelFormat.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/PixelFormat.cs
rename to src/Avalonia.Base/Platform/PixelFormat.cs
diff --git a/src/Avalonia.Base/Platform/StandardRuntimePlatform.cs b/src/Avalonia.Base/Platform/StandardRuntimePlatform.cs
new file mode 100644
index 0000000000..4df9e8e917
--- /dev/null
+++ b/src/Avalonia.Base/Platform/StandardRuntimePlatform.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia.Platform.Internal;
+
+namespace Avalonia.Platform
+{
+    public class StandardRuntimePlatform : IRuntimePlatform
+    {
+        public IDisposable StartSystemTimer(TimeSpan interval, Action tick)
+        {
+            return new Timer(_ => tick(), null, interval, interval);
+        }
+
+        public IUnmanagedBlob AllocBlob(int size) => new UnmanagedBlob(size);
+        
+        private static readonly Lazy<RuntimePlatformInfo> Info = new(() =>
+        {
+            OperatingSystemType os;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                os = OperatingSystemType.OSX;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                os = OperatingSystemType.Linux;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                os = OperatingSystemType.WinNT;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("Android")))
+                os = OperatingSystemType.Android;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("iOS")))
+                os = OperatingSystemType.iOS;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("Browser")))
+                os = OperatingSystemType.Browser;
+            else
+                throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription);
+
+            // Source: https://github.com/dotnet/runtime/blob/main/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
+            var isCoreClr = Environment.Version.Major >= 5 || RuntimeInformation.FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase);
+            var isMonoRuntime = Type.GetType("Mono.Runtime") != null;
+            var isFramework = !isCoreClr && RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
+            
+            return new RuntimePlatformInfo
+            {
+                IsCoreClr = isCoreClr,
+                IsDotNetFramework = isFramework,
+                IsMono = isMonoRuntime,
+                
+                IsDesktop = os is OperatingSystemType.Linux or OperatingSystemType.OSX or OperatingSystemType.WinNT,
+                IsMobile = os is OperatingSystemType.Android or OperatingSystemType.iOS,
+                IsUnix = os is OperatingSystemType.Linux or OperatingSystemType.OSX or OperatingSystemType.Android,
+                IsBrowser = os == OperatingSystemType.Browser,
+                OperatingSystem = os,
+            };
+        });
+
+
+        public virtual RuntimePlatformInfo GetRuntimeInfo() => Info.Value;
+    }
+}
diff --git a/src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs b/src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs
new file mode 100644
index 0000000000..65d6733399
--- /dev/null
+++ b/src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using Avalonia.Platform.Internal;
+using Avalonia.Platform.Interop;
+
+namespace Avalonia.Platform
+{
+    public static class StandardRuntimePlatformServices
+    {
+        public static void Register(Assembly? assembly = null)
+        {
+            var standardPlatform = new StandardRuntimePlatform();
+
+            AssetLoader.RegisterResUriParsers();
+            AvaloniaLocator.CurrentMutable
+                .Bind<IRuntimePlatform>().ToConstant(standardPlatform)
+                .Bind<IAssetLoader>().ToConstant(new AssetLoader(assembly))
+                .Bind<IDynamicLibraryLoader>().ToConstant(
+#if NET6_0_OR_GREATER
+                    new Net6Loader()
+#else
+                    standardPlatform.GetRuntimeInfo().OperatingSystem switch
+                    {
+                        OperatingSystemType.WinNT => (IDynamicLibraryLoader)new Win32Loader(),
+                        OperatingSystemType.OSX => new UnixLoader(),
+                        OperatingSystemType.Linux => new UnixLoader(),
+                        OperatingSystemType.Android => new UnixLoader(),
+                        // iOS, WASM, ...
+                        _ => new NotSupportedLoader()
+                    }
+#endif
+                );
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
new file mode 100644
index 0000000000..cec20678cf
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Security;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+[Unstable]
+public class BclStorageFile : IStorageBookmarkFile
+{
+    private readonly FileInfo _fileInfo;
+
+    public BclStorageFile(string fileName)
+    {
+        _fileInfo = new FileInfo(fileName);
+    }
+
+    public BclStorageFile(FileInfo fileInfo)
+    {
+        _fileInfo = fileInfo ?? throw new ArgumentNullException(nameof(fileInfo));
+    }
+
+    public bool CanOpenRead => true;
+
+    public bool CanOpenWrite => true;
+
+    public string Name => _fileInfo.Name;
+
+    public virtual bool CanBookmark => true;
+
+    public Task<StorageItemProperties> GetBasicPropertiesAsync()
+    {
+        if (_fileInfo.Exists)
+        {
+            return Task.FromResult(new StorageItemProperties(
+                (ulong)_fileInfo.Length,
+                _fileInfo.CreationTimeUtc,
+                _fileInfo.LastAccessTimeUtc));
+        }
+        return Task.FromResult(new StorageItemProperties());
+    }
+
+    public Task<IStorageFolder?> GetParentAsync()
+    {
+        if (_fileInfo.Directory is { } directory)
+        {
+            return Task.FromResult<IStorageFolder?>(new BclStorageFolder(directory));
+        }
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public Task<Stream> OpenReadAsync()
+    {
+        return Task.FromResult<Stream>(_fileInfo.OpenRead());
+    }
+
+    public Task<Stream> OpenWriteAsync()
+    {
+        return Task.FromResult<Stream>(_fileInfo.OpenWrite());
+    }
+
+    public virtual Task<string?> SaveBookmarkAsync()
+    {
+        return Task.FromResult<string?>(_fileInfo.FullName);
+    }
+
+    public Task ReleaseBookmarkAsync()
+    {
+        // No-op
+        return Task.CompletedTask;
+    }
+
+    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
+    {
+        try
+        {
+            if (_fileInfo.Directory is not null)
+            {
+                uri = Path.IsPathRooted(_fileInfo.FullName) ?
+                    new Uri(new Uri("file://"), _fileInfo.FullName) :
+                    new Uri(_fileInfo.FullName, UriKind.Relative);
+                return true;
+            }
+
+            uri = null;
+            return false;
+        }
+        catch (SecurityException)
+        {
+            uri = null;
+            return false;
+        }
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+    }
+
+    ~BclStorageFile()
+    {
+        Dispose(disposing: false);
+    }
+
+    public void Dispose()
+    {
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
new file mode 100644
index 0000000000..b91e910777
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Security;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+[Unstable]
+public class BclStorageFolder : IStorageBookmarkFolder
+{
+    private readonly DirectoryInfo _directoryInfo;
+
+    public BclStorageFolder(string path)
+    {
+        _directoryInfo = new DirectoryInfo(path);
+        if (!_directoryInfo.Exists)
+        {
+            throw new ArgumentException("Directory must exist");
+        }
+    }
+
+    public BclStorageFolder(DirectoryInfo directoryInfo)
+    {
+        _directoryInfo = directoryInfo ?? throw new ArgumentNullException(nameof(directoryInfo));
+        if (!_directoryInfo.Exists)
+        {
+            throw new ArgumentException("Directory must exist", nameof(directoryInfo));
+        }
+    }
+
+    public string Name => _directoryInfo.Name;
+
+    public bool CanBookmark => true;
+
+    public Task<StorageItemProperties> GetBasicPropertiesAsync()
+    {
+        var props = new StorageItemProperties(
+            null,
+            _directoryInfo.CreationTimeUtc,
+            _directoryInfo.LastAccessTimeUtc);
+        return Task.FromResult(props);
+    }
+
+    public Task<IStorageFolder?> GetParentAsync()
+    {
+        if (_directoryInfo.Parent is { } directory)
+        {
+            return Task.FromResult<IStorageFolder?>(new BclStorageFolder(directory));
+        }
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+         var items = _directoryInfo.GetDirectories()
+            .Select(d => (IStorageItem)new BclStorageFolder(d))
+            .Concat(_directoryInfo.GetFiles().Select(f => new BclStorageFile(f)))
+            .ToArray();
+
+         return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
+    }
+
+    public virtual Task<string?> SaveBookmarkAsync()
+    {
+        return Task.FromResult<string?>(_directoryInfo.FullName);
+    }
+    
+    public Task ReleaseBookmarkAsync()
+    {
+        // No-op
+        return Task.CompletedTask;
+    }
+
+    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
+    {
+        try
+        {
+            uri = Path.IsPathRooted(_directoryInfo.FullName) ?
+                new Uri(new Uri("file://"), _directoryInfo.FullName) :
+                new Uri(_directoryInfo.FullName, UriKind.Relative);
+
+            return true;
+        }
+        catch (SecurityException)
+        {
+            uri = null;
+            return false;
+        }
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+    }
+
+    ~BclStorageFolder()
+    {
+        Dispose(disposing: false);
+    }
+
+    public void Dispose()
+    {
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
new file mode 100644
index 0000000000..469388021e
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+[Unstable]
+public abstract class BclStorageProvider : IStorageProvider
+{
+    public abstract bool CanOpen { get; }
+    public abstract Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options);
+
+    public abstract bool CanSave { get; }
+    public abstract Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options);
+
+    public abstract bool CanPickFolder { get; }
+    public abstract Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options);
+
+    public virtual Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark)
+    {
+        var file = new FileInfo(bookmark);
+        return file.Exists
+            ? Task.FromResult<IStorageBookmarkFile?>(new BclStorageFile(file))
+            : Task.FromResult<IStorageBookmarkFile?>(null);
+    }
+
+    public virtual Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark)
+    {
+        var folder = new DirectoryInfo(bookmark);
+        return folder.Exists
+            ? Task.FromResult<IStorageBookmarkFolder?>(new BclStorageFolder(folder))
+            : Task.FromResult<IStorageBookmarkFolder?>(null);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
new file mode 100644
index 0000000000..f90d0a5a2f
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
@@ -0,0 +1,40 @@
+using System;
+using System.IO;
+using System.Linq;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+[Unstable]
+public static class StorageProviderHelpers
+{
+    public static string NameWithExtension(string path, string? defaultExtension, FilePickerFileType? filter)
+    {
+        var name = Path.GetFileName(path);
+        if (name != null && !Path.HasExtension(name))
+        {
+            if (filter?.Patterns?.Count > 0)
+            {
+                if (defaultExtension != null
+                    && filter.Patterns.Contains(defaultExtension))
+                {
+                    return Path.ChangeExtension(path, defaultExtension.TrimStart('.'));
+                }
+
+                var ext = filter.Patterns.FirstOrDefault(x => x != "*.*");
+                ext = ext?.Split(new[] { "*." }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+                if (ext != null)
+                {
+                    return Path.ChangeExtension(path, ext);
+                }
+            }
+
+            if (defaultExtension != null)
+            {
+                return Path.ChangeExtension(path, defaultExtension);
+            }
+        }
+
+        return path;
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FilePickerFileType.cs b/src/Avalonia.Base/Platform/Storage/FilePickerFileType.cs
new file mode 100644
index 0000000000..75076e2bb8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FilePickerFileType.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Represents a name mapped to the associated file types (extensions).
+/// </summary>
+public sealed class FilePickerFileType
+{
+    public FilePickerFileType(string name)
+    {
+        Name = name;
+    }
+
+    /// <summary>
+    /// File type name.
+    /// </summary>
+    public string Name { get; }
+
+    /// <summary>
+    /// List of extensions in GLOB format. I.e. "*.png" or "*.*".
+    /// </summary>
+    /// <remarks>
+    /// Used on Windows and Linux systems.
+    /// </remarks>
+    public IReadOnlyList<string>? Patterns { get; set; }
+
+    /// <summary>
+    /// List of extensions in MIME format.
+    /// </summary>
+    /// <remarks>
+    /// Used on Android, Browser and Linux systems.
+    /// </remarks>
+    public IReadOnlyList<string>? MimeTypes { get; set; }
+
+    /// <summary>
+    /// List of extensions in Apple uniform format.
+    /// </summary>
+    /// <remarks>
+    /// Used only on Apple devices.
+    /// See https://developer.apple.com/documentation/uniformtypeidentifiers/system_declared_uniform_type_identifiers.
+    /// </remarks>
+    public IReadOnlyList<string>? AppleUniformTypeIdentifiers { get; set; }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FilePickerFileTypes.cs b/src/Avalonia.Base/Platform/Storage/FilePickerFileTypes.cs
new file mode 100644
index 0000000000..5da037999a
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FilePickerFileTypes.cs
@@ -0,0 +1,48 @@
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Dictionary of well known file types.
+/// </summary>
+public static class FilePickerFileTypes
+{
+    public static FilePickerFileType All { get; } = new("All")
+    {
+        Patterns = new[] { "*.*" },
+        MimeTypes = new[] { "*/*" }
+    };
+
+    public static FilePickerFileType TextPlain { get; } = new("Plain Text")
+    {
+        Patterns = new[] { "*.txt" },
+        AppleUniformTypeIdentifiers = new[] { "public.plain-text" },
+        MimeTypes = new[] { "text/plain" }
+    };
+
+    public static FilePickerFileType ImageAll { get; } = new("All Images")
+    {
+        Patterns = new[] { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp" },
+        AppleUniformTypeIdentifiers = new[] { "public.image" },
+        MimeTypes = new[] { "image/*" }
+    };
+
+    public static FilePickerFileType ImageJpg { get; } = new("JPEG image")
+    {
+        Patterns = new[] { "*.jpg", "*.jpeg" },
+        AppleUniformTypeIdentifiers = new[] { "public.jpeg" },
+        MimeTypes = new[] { "image/jpeg" }
+    };
+
+    public static FilePickerFileType ImagePng { get; } = new("PNG image")
+    {
+        Patterns = new[] { "*.png" },
+        AppleUniformTypeIdentifiers = new[] { "public.png" },
+        MimeTypes = new[] { "image/png" }
+    };
+
+    public static FilePickerFileType Pdf { get; } = new("PDF document")
+    {
+        Patterns = new[] { "*.pdf" },
+        AppleUniformTypeIdentifiers = new[] { "com.adobe.pdf" },
+        MimeTypes = new[] { "application/pdf" }
+    };
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FilePickerOpenOptions.cs b/src/Avalonia.Base/Platform/Storage/FilePickerOpenOptions.cs
new file mode 100644
index 0000000000..1674ec11c8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FilePickerOpenOptions.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Options class for <see cref="IStorageProvider.OpenFilePickerAsync"/> method.
+/// </summary>
+public class FilePickerOpenOptions : PickerOptions
+{
+    /// <summary>
+    /// Gets or sets an option indicating whether open picker allows users to select multiple files.
+    /// </summary>
+    public bool AllowMultiple { get; set; }
+
+    /// <summary>
+    /// Gets or sets the collection of file types that the file open picker displays.
+    /// </summary>
+    public IReadOnlyList<FilePickerFileType>? FileTypeFilter { get; set; }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FilePickerSaveOptions.cs b/src/Avalonia.Base/Platform/Storage/FilePickerSaveOptions.cs
new file mode 100644
index 0000000000..fa4fccd47a
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FilePickerSaveOptions.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Options class for <see cref="IStorageProvider.SaveFilePickerAsync"/> method.
+/// </summary>
+public class FilePickerSaveOptions : PickerOptions
+{
+    /// <summary>
+    /// Gets or sets the file name that the file save picker suggests to the user.
+    /// </summary>
+    public string? SuggestedFileName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default extension to be used to save the file.
+    /// </summary>
+    public string? DefaultExtension { get; set; }
+
+    /// <summary>
+    /// Gets or sets the collection of valid file types that the user can choose to assign to a file.
+    /// </summary>
+    public IReadOnlyList<FilePickerFileType>? FileTypeChoices { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether file open picker displays a warning if the user specifies the name of a file that already exists.
+    /// </summary>
+    public bool? ShowOverwritePrompt { get; set; }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FolderPickerOpenOptions.cs b/src/Avalonia.Base/Platform/Storage/FolderPickerOpenOptions.cs
new file mode 100644
index 0000000000..df9fa8fd35
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FolderPickerOpenOptions.cs
@@ -0,0 +1,12 @@
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Options class for <see cref="IStorageProvider.OpenFolderPickerAsync"/> method.
+/// </summary>
+public class FolderPickerOpenOptions : PickerOptions
+{
+    /// <summary>
+    /// Gets or sets an option indicating whether open picker allows users to select multiple folders.
+    /// </summary>
+    public bool AllowMultiple { get; set; }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
new file mode 100644
index 0000000000..40f2720ee8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage;
+
+[NotClientImplementable]
+public interface IStorageBookmarkItem : IStorageItem
+{
+    Task ReleaseBookmarkAsync();
+}
+
+[NotClientImplementable]
+public interface IStorageBookmarkFile : IStorageFile, IStorageBookmarkItem
+{
+}
+
+[NotClientImplementable]
+public interface IStorageBookmarkFolder : IStorageFolder, IStorageBookmarkItem
+{
+}
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageFile.cs b/src/Avalonia.Base/Platform/Storage/IStorageFile.cs
new file mode 100644
index 0000000000..4aa84e3ec4
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/IStorageFile.cs
@@ -0,0 +1,34 @@
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Represents a file. Provides information about the file and its contents, and ways to manipulate them.
+/// </summary>
+[NotClientImplementable]
+public interface IStorageFile : IStorageItem
+{
+    /// <summary>
+    /// Returns true, if file is readable.
+    /// </summary>
+    bool CanOpenRead { get; }
+
+    /// <summary>
+    /// Opens a stream for read access.
+    /// </summary>
+    /// <exception cref="System.UnauthorizedAccessException" />
+    Task<Stream> OpenReadAsync();
+
+    /// <summary>
+    /// Returns true, if file is writeable. 
+    /// </summary>
+    bool CanOpenWrite { get; }
+
+    /// <summary>
+    /// Opens stream for writing to the file.
+    /// </summary>
+    /// <exception cref="System.UnauthorizedAccessException" />
+    Task<Stream> OpenWriteAsync();
+}
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs
new file mode 100644
index 0000000000..0ffb9f41c6
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Manipulates folders and their contents, and provides information about them.
+/// </summary>
+[NotClientImplementable]
+public interface IStorageFolder : IStorageItem
+{
+    /// <summary>
+    /// Gets the files and subfolders in the current folder.
+    /// </summary>
+    /// <returns>
+    /// When this method completes successfully, it returns a list of the files and folders in the current folder. Each item in the list is represented by an <see cref="IStorageItem"/> implementation object.
+    /// </returns>
+    Task<IReadOnlyList<IStorageItem>> GetItemsAsync();
+}
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
new file mode 100644
index 0000000000..f5469d31c9
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Manipulates storage items (files and folders) and their contents, and provides information about them
+/// </summary>
+/// <remarks>
+/// This interface inherits <see cref="IDisposable"/> . It's recommended to dispose <see cref="IStorageItem"/> when it's not used anymore.
+/// </remarks>
+[NotClientImplementable]
+public interface IStorageItem : IDisposable
+{
+    /// <summary>
+    /// Gets the name of the item including the file name extension if there is one.
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// Gets the full file-system path of the item, if the item has a path.
+    /// </summary>
+    /// <remarks>
+    /// Android backend might return file path with "content:" scheme.
+    /// Browser and iOS backends might return relative uris.
+    /// </remarks>
+    bool TryGetUri([NotNullWhen(true)] out Uri? uri);
+
+    /// <summary>
+    /// Gets the basic properties of the current item.
+    /// </summary>
+    Task<StorageItemProperties> GetBasicPropertiesAsync();
+
+    /// <summary>
+    /// Returns true is item can be bookmarked and reused later.
+    /// </summary>
+    bool CanBookmark { get; }
+
+    /// <summary>
+    /// Saves items to a bookmark.
+    /// </summary>
+    /// <returns>
+    /// Returns identifier of a bookmark. Can be null if OS denied request.
+    /// </returns>
+    Task<string?> SaveBookmarkAsync();
+
+    /// <summary>
+    /// Gets the parent folder of the current storage item.
+    /// </summary>
+    Task<IStorageFolder?> GetParentAsync();
+}
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
new file mode 100644
index 0000000000..0f5cf931d9
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform.Storage;
+
+[NotClientImplementable]
+public interface IStorageProvider
+{
+    /// <summary>
+    /// Returns true if it's possible to open file picker on the current platform. 
+    /// </summary>
+    bool CanOpen { get; }
+
+    /// <summary>
+    /// Opens file picker dialog.
+    /// </summary>
+    /// <returns>Array of selected <see cref="IStorageFile"/> or empty collection if user canceled the dialog.</returns>
+    Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options);
+
+    /// <summary>
+    /// Returns true if it's possible to open save file picker on the current platform. 
+    /// </summary>
+    bool CanSave { get; }
+
+    /// <summary>
+    /// Opens save file picker dialog.
+    /// </summary>
+    /// <returns>Saved <see cref="IStorageFile"/> or null if user canceled the dialog.</returns>
+    Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options);
+
+    /// <summary>
+    /// Returns true if it's possible to open folder picker on the current platform. 
+    /// </summary>
+    bool CanPickFolder { get; }
+
+    /// <summary>
+    /// Opens folder picker dialog.
+    /// </summary>
+    /// <returns>Array of selected <see cref="IStorageFolder"/> or empty collection if user canceled the dialog.</returns>
+    Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options);
+
+    /// <summary>
+    /// Open <see cref="IStorageBookmarkFile"/> from the bookmark ID.
+    /// </summary>
+    /// <param name="bookmark">Bookmark ID.</param>
+    /// <returns>Bookmarked file or null if OS denied request.</returns>
+    Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark);
+
+    /// <summary>
+    /// Open <see cref="IStorageBookmarkFolder"/> from the bookmark ID.
+    /// </summary>
+    /// <param name="bookmark">Bookmark ID.</param>
+    /// <returns>Bookmarked folder or null if OS denied request.</returns>
+    Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark);
+}
diff --git a/src/Avalonia.Base/Platform/Storage/PickerOptions.cs b/src/Avalonia.Base/Platform/Storage/PickerOptions.cs
new file mode 100644
index 0000000000..6f97916a26
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/PickerOptions.cs
@@ -0,0 +1,17 @@
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Common options for <see cref="IStorageProvider.OpenFolderPickerAsync"/>, <see cref="IStorageProvider.OpenFilePickerAsync"/> and <see cref="IStorageProvider.SaveFilePickerAsync"/> methods. 
+/// </summary>
+public class PickerOptions
+{
+    /// <summary>
+    /// Gets or sets the text that appears in the title bar of a folder dialog.
+    /// </summary>
+    public string? Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the initial location where the file open picker looks for files to present to the user.
+    /// </summary>
+    public IStorageFolder? SuggestedStartLocation { get; set; }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/StorageItemProperties.cs b/src/Avalonia.Base/Platform/Storage/StorageItemProperties.cs
new file mode 100644
index 0000000000..a63973ccf8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/StorageItemProperties.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Provides access to the content-related properties of an item (like a file or folder).
+/// </summary>
+public class StorageItemProperties
+{
+    public StorageItemProperties(
+        ulong? size = null,
+        DateTimeOffset? dateCreated = null,
+        DateTimeOffset? dateModified = null)
+    {
+        Size = size;
+        DateCreated = dateCreated;
+        DateModified = dateModified;
+    }
+
+    /// <summary>
+    /// Gets the size of the file in bytes.
+    /// </summary>
+    /// <remarks>
+    /// Can be null if property is not available.
+    /// </remarks>
+    public ulong? Size { get; }
+
+    /// <summary>
+    /// Gets the date and time that the current folder was created.
+    /// </summary>
+    /// <remarks>
+    /// Can be null if property is not available.
+    /// </remarks>
+    public DateTimeOffset? DateCreated { get; }
+
+    /// <summary>
+    /// Gets the date and time of the last time the file was modified.
+    /// </summary>
+    /// <remarks>
+    /// Can be null if property is not available.
+    /// </remarks>
+    public DateTimeOffset? DateModified { get; }
+}
diff --git a/src/Avalonia.Base/Point.cs b/src/Avalonia.Base/Point.cs
new file mode 100644
index 0000000000..0c789ff20f
--- /dev/null
+++ b/src/Avalonia.Base/Point.cs
@@ -0,0 +1,294 @@
+using System;
+using System.Globalization;
+using System.Numerics;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+#endif
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines a point.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Point : IEquatable<Point>
+    {
+        static Point()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<PointAnimator>(prop => typeof(Point).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// The X position.
+        /// </summary>
+        private readonly double _x;
+
+        /// <summary>
+        /// The Y position.
+        /// </summary>
+        private readonly double _y;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Point"/> structure.
+        /// </summary>
+        /// <param name="x">The X position.</param>
+        /// <param name="y">The Y position.</param>
+        public Point(double x, double y)
+        {
+            _x = x;
+            _y = y;
+        }
+
+        /// <summary>
+        /// Gets the X position.
+        /// </summary>
+        public double X => _x;
+
+        /// <summary>
+        /// Gets the Y position.
+        /// </summary>
+        public double Y => _y;
+
+        /// <summary>
+        /// Converts the <see cref="Point"/> to a <see cref="Vector"/>.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        public static implicit operator Vector(Point p)
+        {
+            return new Vector(p._x, p._y);
+        }
+
+        /// <summary>
+        /// Negates a point.
+        /// </summary>
+        /// <param name="a">The point.</param>
+        /// <returns>The negated point.</returns>
+        public static Point operator -(Point a)
+        {
+            return new Point(-a._x, -a._y);
+        }
+
+        /// <summary>
+        /// Checks for equality between two <see cref="Point"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are equal; otherwise false.</returns>
+        public static bool operator ==(Point left, Point right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="Point"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are unequal; otherwise false.</returns>
+        public static bool operator !=(Point left, Point right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Adds two points.
+        /// </summary>
+        /// <param name="a">The first point.</param>
+        /// <param name="b">The second point.</param>
+        /// <returns>A point that is the result of the addition.</returns>
+        public static Point operator +(Point a, Point b)
+        {
+            return new Point(a._x + b._x, a._y + b._y);
+        }
+
+        /// <summary>
+        /// Adds a vector to a point.
+        /// </summary>
+        /// <param name="a">The point.</param>
+        /// <param name="b">The vector.</param>
+        /// <returns>A point that is the result of the addition.</returns>
+        public static Point operator +(Point a, Vector b)
+        {
+            return new Point(a._x + b.X, a._y + b.Y);
+        }
+
+        /// <summary>
+        /// Subtracts two points.
+        /// </summary>
+        /// <param name="a">The first point.</param>
+        /// <param name="b">The second point.</param>
+        /// <returns>A point that is the result of the subtraction.</returns>
+        public static Point operator -(Point a, Point b)
+        {
+            return new Point(a._x - b._x, a._y - b._y);
+        }
+
+        /// <summary>
+        /// Subtracts a vector from a point.
+        /// </summary>
+        /// <param name="a">The point.</param>
+        /// <param name="b">The vector.</param>
+        /// <returns>A point that is the result of the subtraction.</returns>
+        public static Point operator -(Point a, Vector b)
+        {
+            return new Point(a._x - b.X, a._y - b.Y);
+        }
+
+        /// <summary>
+        /// Multiplies a point by a factor coordinate-wise
+        /// </summary>
+        /// <param name="p">Point to multiply</param>
+        /// <param name="k">Factor</param>
+        /// <returns>Points having its coordinates multiplied</returns>
+        public static Point operator *(Point p, double k) => new Point(p.X * k, p.Y * k);
+
+        /// <summary>
+        /// Multiplies a point by a factor coordinate-wise
+        /// </summary>
+        /// <param name="p">Point to multiply</param>
+        /// <param name="k">Factor</param>
+        /// <returns>Points having its coordinates multiplied</returns>
+        public static Point operator *(double k, Point p) => new Point(p.X * k, p.Y * k);
+
+        /// <summary>
+        /// Divides a point by a factor coordinate-wise
+        /// </summary>
+        /// <param name="p">Point to divide by</param>
+        /// <param name="k">Factor</param>
+        /// <returns>Points having its coordinates divided</returns>
+        public static Point operator /(Point p, double k) => new Point(p.X / k, p.Y / k);
+
+        /// <summary>
+        /// Applies a matrix to a point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="matrix">The matrix.</param>
+        /// <returns>The resulting point.</returns>
+        public static Point operator *(Point point, Matrix matrix) => matrix.Transform(point);
+
+        /// <summary>
+        /// Parses a <see cref="Point"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="Point"/>.</returns>
+        public static Point Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point."))
+            {
+                return new Point(
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble()
+                );
+            }
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the point is equal to the other given point (bitwise).
+        /// </summary>
+        /// <param name="other">The other point to test equality against.</param>
+        /// <returns>True if this point is equal to other; False otherwise.</returns>
+        public bool Equals(Point other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _x == other._x &&
+                   _y == other._y;
+            // ReSharper enable CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the point is equal to the other given point
+        /// (numerically).
+        /// </summary>
+        /// <param name="other">The other point to test equality against.</param>
+        /// <returns>True if this point is equal to other; False otherwise.</returns>
+        public bool NearlyEquals(Point other)
+        {
+            return MathUtilities.AreClose(_x, other._x) &&
+                   MathUtilities.AreClose(_y, other._y);
+        }
+
+        /// <summary>
+        /// Checks for equality between a point and an object.
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        /// <returns>
+        /// True if <paramref name="obj"/> is a point that equals the current point.
+        /// </returns>
+        public override bool Equals(object? obj) => obj is Point other && Equals(other);
+
+        /// <summary>
+        /// Returns a hash code for a <see cref="Point"/>.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + _x.GetHashCode();
+                hash = (hash * 23) + _y.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Returns the string representation of the point.
+        /// </summary>
+        /// <returns>The string representation of the point.</returns>
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _x, _y);
+        }
+
+        /// <summary>
+        /// Transforms the point by a matrix.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <returns>The transformed point.</returns>
+        public Point Transform(Matrix transform) => transform.Transform(this);
+
+        /// <summary>
+        /// Returns a new point with the specified X coordinate.
+        /// </summary>
+        /// <param name="x">The X coordinate.</param>
+        /// <returns>The new point.</returns>
+        public Point WithX(double x)
+        {
+            return new Point(x, _y);
+        }
+
+        /// <summary>
+        /// Returns a new point with the specified Y coordinate.
+        /// </summary>
+        /// <param name="y">The Y coordinate.</param>
+        /// <returns>The new point.</returns>
+        public Point WithY(double y)
+        {
+            return new Point(_x, y);
+        }
+
+        /// <summary>
+        /// Deconstructs the point into its X and Y coordinates.
+        /// </summary>
+        /// <param name="x">The X coordinate.</param>
+        /// <param name="y">The Y coordinate.</param>
+        public void Deconstruct(out double x, out double y)
+        {
+            x = this._x;
+            y = this._y;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the X and Y coordinates are zero.
+        /// </summary>
+        public bool IsDefault
+        {
+            get { return (_x == 0) && (_y == 0); }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Points.cs b/src/Avalonia.Base/Points.cs
similarity index 100%
rename from src/Avalonia.Visuals/Points.cs
rename to src/Avalonia.Base/Points.cs
diff --git a/src/Avalonia.Base/Properties/AssemblyInfo.cs b/src/Avalonia.Base/Properties/AssemblyInfo.cs
index 053c7a7547..d5e01087ef 100644
--- a/src/Avalonia.Base/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Base/Properties/AssemblyInfo.cs
@@ -1,14 +1,34 @@
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data.Converters")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.GestureRecognizers")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.TextInput")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.LogicalTree")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Imaging")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Transformation")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Styling")]
+
 [assembly: InternalsVisibleTo("Avalonia.Base.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] 
+[assembly: InternalsVisibleTo("Avalonia.Controls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.ColorPicker, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Visuals, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Web.Blazor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Avalonia.Base/PropertyStore/BindingEntry.cs b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
index cffbaed6b0..9a25e98a23 100644
--- a/src/Avalonia.Base/PropertyStore/BindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
@@ -18,19 +18,19 @@ namespace Avalonia.PropertyStore
     /// <typeparam name="T">The property type.</typeparam>
     internal class BindingEntry<T> : IBindingEntry, IPriorityValueEntry<T>, IObserver<BindingValue<T>>
     {
-        private readonly IAvaloniaObject _owner;
-        private IValueSink _sink;
+        private readonly AvaloniaObject _owner;
+        private ValueOwner<T> _sink;
         private IDisposable? _subscription;
         private bool _isSubscribed;
         private bool _batchUpdate;
         private Optional<T> _value;
 
         public BindingEntry(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
             IObservable<BindingValue<T>> source,
             BindingPriority priority,
-            IValueSink sink)
+            ValueOwner<T> sink)
         {
             _owner = owner;
             Property = property;
@@ -50,7 +50,7 @@ namespace Avalonia.PropertyStore
         {
             _batchUpdate = false;
 
-            if (_sink is ValueStore)
+            if (_sink.IsValueStore)
                 Start();
         }
 
@@ -113,16 +113,15 @@ namespace Avalonia.PropertyStore
             }
         }
 
-        public void Reparent(IValueSink sink) => _sink = sink;
+        public void Reparent(PriorityValue<T> parent) => _sink = new(parent);
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
diff --git a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
index c7fbf56abc..4116f4abd9 100644
--- a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
@@ -18,14 +18,14 @@ namespace Avalonia.PropertyStore
     /// <typeparam name="T">The property type.</typeparam>
     internal class ConstantValueEntry<T> : IPriorityValueEntry<T>, IConstantValueEntry
     {
-        private IValueSink _sink;
+        private ValueOwner<T> _sink;
         private Optional<T> _value;
 
         public ConstantValueEntry(
             StyledPropertyBase<T> property,
             T value,
             BindingPriority priority,
-            IValueSink sink)
+            ValueOwner<T> sink)
         {
             Property = property;
             _value = value;
@@ -37,7 +37,7 @@ namespace Avalonia.PropertyStore
             StyledPropertyBase<T> property,
             Optional<T> value,
             BindingPriority priority,
-            IValueSink sink)
+            ValueOwner<T> sink)
         {
             Property = property;
             _value = value;
@@ -62,17 +62,16 @@ namespace Avalonia.PropertyStore
             _sink.Completed(Property, this, oldValue);
         }
 
-        public void Reparent(IValueSink sink) => _sink = sink;
+        public void Reparent(PriorityValue<T> sink) => _sink = new(sink);
         public void Start() { }
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
diff --git a/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs b/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
index 26665ab683..45bbd0cda5 100644
--- a/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
@@ -5,7 +5,6 @@
     /// </summary>
     internal interface IPriorityValueEntry : IValue
     {
-        void Reparent(IValueSink sink);
     }
 
     /// <summary>
@@ -14,5 +13,6 @@
     /// <typeparam name="T">The property type.</typeparam>
     internal interface IPriorityValueEntry<T> : IPriorityValueEntry, IValue<T>
     {
+        void Reparent(PriorityValue<T> parent);
     }
 }
diff --git a/src/Avalonia.Base/PropertyStore/IValue.cs b/src/Avalonia.Base/PropertyStore/IValue.cs
index a4ec06e64e..b493df92e6 100644
--- a/src/Avalonia.Base/PropertyStore/IValue.cs
+++ b/src/Avalonia.Base/PropertyStore/IValue.cs
@@ -11,8 +11,7 @@ namespace Avalonia.PropertyStore
         Optional<object?> GetValue();
         void Start();
         void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue);
diff --git a/src/Avalonia.Base/PropertyStore/IValueSink.cs b/src/Avalonia.Base/PropertyStore/IValueSink.cs
deleted file mode 100644
index 738fdef267..0000000000
--- a/src/Avalonia.Base/PropertyStore/IValueSink.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Data;
-
-namespace Avalonia.PropertyStore
-{
-    /// <summary>
-    /// Represents an entity that can receive change notifications in a <see cref="ValueStore"/>.
-    /// </summary>
-    internal interface IValueSink
-    {
-        void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change);
-
-        void Completed<T>(
-            StyledPropertyBase<T> property,
-            IPriorityValueEntry entry,
-            Optional<T> oldValue);
-    }
-}
diff --git a/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs b/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
index cb5f3556d1..13ca69681f 100644
--- a/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
@@ -25,13 +25,12 @@ namespace Avalonia.PropertyStore
         public void Start() { }
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
diff --git a/src/Avalonia.Base/PropertyStore/PriorityValue.cs b/src/Avalonia.Base/PropertyStore/PriorityValue.cs
index f670160e75..182b2638c4 100644
--- a/src/Avalonia.Base/PropertyStore/PriorityValue.cs
+++ b/src/Avalonia.Base/PropertyStore/PriorityValue.cs
@@ -1,10 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Avalonia.Data;
 
 namespace Avalonia.PropertyStore
 {
+    /// <summary>
+    /// Represents an untyped interface to <see cref="PriorityValue{T}"/>.
+    /// </summary>
+    interface IPriorityValue : IValue
+    {
+        void UpdateEffectiveValue();
+    }
+
     /// <summary>
     /// Stores a set of prioritized values and bindings in a <see cref="ValueStore"/>.
     /// </summary>
@@ -16,10 +23,10 @@ namespace Avalonia.PropertyStore
     /// <see cref="IPriorityValueEntry{T}"/> entries (sorted first by priority and then in the order
     /// they were added) plus a local value.
     /// </remarks>
-    internal class PriorityValue<T> : IValue<T>, IValueSink, IBatchUpdate
+    internal class PriorityValue<T> : IPriorityValue, IValue<T>, IBatchUpdate
     {
-        private readonly IAvaloniaObject _owner;
-        private readonly IValueSink _sink;
+        private readonly AvaloniaObject _owner;
+        private readonly ValueStore _store;
         private readonly List<IPriorityValueEntry<T>> _entries = new List<IPriorityValueEntry<T>>();
         private readonly Func<IAvaloniaObject, T, T>? _coerceValue;
         private Optional<T> _localValue;
@@ -28,13 +35,13 @@ namespace Avalonia.PropertyStore
         private bool _batchUpdate;
 
         public PriorityValue(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
-            IValueSink sink)
+            ValueStore store)
         {
             _owner = owner;
             Property = property;
-            _sink = sink;
+            _store = store;
 
             if (property.HasCoercion)
             {
@@ -44,11 +51,11 @@ namespace Avalonia.PropertyStore
         }
 
         public PriorityValue(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
-            IValueSink sink,
+            ValueStore store,
             IPriorityValueEntry<T> existing)
-            : this(owner, property, sink)
+            : this(owner, property, store)
         {
             existing.Reparent(this);
             _entries.Add(existing);
@@ -75,9 +82,9 @@ namespace Avalonia.PropertyStore
         }
 
         public PriorityValue(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
-            IValueSink sink,
+            ValueStore sink,
             LocalValueEntry<T> existing)
             : this(owner, property, sink)
         {
@@ -114,6 +121,7 @@ namespace Avalonia.PropertyStore
 
         public void ClearLocalValue()
         {
+            _localValue = default;
             UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
                 _owner,
                 Property,
@@ -148,7 +156,7 @@ namespace Avalonia.PropertyStore
             else
             {
                 var insert = FindInsertPoint(priority);
-                var entry = new ConstantValueEntry<T>(Property, value, priority, this);
+                var entry = new ConstantValueEntry<T>(Property, value, priority, new ValueOwner<T>(this));
                 _entries.Insert(insert, entry);
                 result = entry;
             }
@@ -165,7 +173,7 @@ namespace Avalonia.PropertyStore
 
         public BindingEntry<T> AddBinding(IObservable<BindingValue<T>> source, BindingPriority priority)
         {
-            var binding = new BindingEntry<T>(_owner, Property, source, priority, this);
+            var binding = new BindingEntry<T>(_owner, Property, source, priority, new(this));
             var insert = FindInsertPoint(binding.Priority);
             _entries.Insert(insert, binding);
 
@@ -186,13 +194,12 @@ namespace Avalonia.PropertyStore
         public void Start() => UpdateEffectiveValue(null);
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
@@ -200,7 +207,7 @@ namespace Avalonia.PropertyStore
                 Priority));
         }
 
-        void IValueSink.ValueChanged<TValue>(AvaloniaPropertyChangedEventArgs<TValue> change)
+        public void ValueChanged<TValue>(AvaloniaPropertyChangedEventArgs<TValue> change)
         {
             if (change.Priority == BindingPriority.LocalValue)
             {
@@ -213,22 +220,15 @@ namespace Avalonia.PropertyStore
             }
         }
 
-        void IValueSink.Completed<TValue>(
-            StyledPropertyBase<TValue> property,
-            IPriorityValueEntry entry,
-            Optional<TValue> oldValue)
+        public void Completed(IPriorityValueEntry entry, Optional<T> oldValue)
         {
             _entries.Remove((IPriorityValueEntry<T>)entry);
-
-            if (oldValue is Optional<T> o)
-            {
-                UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
-                    _owner,
-                    Property,
-                    o,
-                    default,
-                    entry.Priority));
-            }
+            UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
+                _owner,
+                Property,
+                oldValue,
+                default,
+                entry.Priority));
         }
 
         private int FindInsertPoint(BindingPriority priority)
@@ -308,7 +308,7 @@ namespace Avalonia.PropertyStore
                 var old = _value;
                 _value = value;
 
-                _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                _store.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                     _owner,
                     Property,
                     old,
@@ -319,7 +319,7 @@ namespace Avalonia.PropertyStore
             {
                 change.MarkNonEffectiveValue();
                 change.SetOldValue(default);
-                _sink.ValueChanged(change);
+                _store.ValueChanged(change);
             }
         }
     }
diff --git a/src/Avalonia.Base/PropertyStore/ValueOwner.cs b/src/Avalonia.Base/PropertyStore/ValueOwner.cs
new file mode 100644
index 0000000000..c68435f7a5
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/ValueOwner.cs
@@ -0,0 +1,45 @@
+using Avalonia.Data;
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Represents a union type of <see cref="ValueStore"/> and <see cref="PriorityValue{T}"/>,
+    /// which are the valid owners of a value store <see cref="IValue"/>.
+    /// </summary>
+    /// <typeparam name="T">The value type.</typeparam>
+    internal readonly struct ValueOwner<T>
+    {
+        private readonly ValueStore? _store;
+        private readonly PriorityValue<T>? _priorityValue;
+
+        public ValueOwner(ValueStore o)
+        {
+            _store = o;
+            _priorityValue = null;
+        }
+
+        public ValueOwner(PriorityValue<T> v)
+        {
+            _store = null;
+            _priorityValue = v;
+        }
+
+        public bool IsValueStore => _store is not null;
+
+        public void Completed(StyledPropertyBase<T> property, IPriorityValueEntry entry, Optional<T> oldValue)
+        {
+            if (_store is not null)
+                _store?.Completed(property, entry, oldValue);
+            else
+                _priorityValue!.Completed(entry, oldValue);
+        }
+
+        public void ValueChanged(AvaloniaPropertyChangedEventArgs<T> e)
+        {
+            if (_store is not null)
+                _store?.ValueChanged(e);
+            else
+                _priorityValue!.ValueChanged(e);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
index 238bb16e3e..9f038214c4 100644
--- a/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
+++ b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Reactive
             {
                 if (e is AvaloniaPropertyChangedEventArgs<T> typedArgs)
                 {
-                    var newValue = e.Sender.GetValue(typedArgs.Property);
+                    var newValue = e.Sender.GetValue<T>(typedArgs.Property);
 
                     if (!_value.HasValue || !EqualityComparer<T>.Default.Equals(newValue, _value.Value))
                     {
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
index fbc126bb05..cafce58c9c 100644
--- a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
+++ b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
@@ -49,23 +49,31 @@ namespace Avalonia.Reactive
         {
             if (e.Property == _property)
             {
-                T newValue;
-
-                if (e is AvaloniaPropertyChangedEventArgs<T> typed)
+                if (e.Sender is AvaloniaObject ao)
                 {
-                    newValue = typed.Sender.GetValue(typed.Property);
+                    T newValue;
+
+                    if (e is AvaloniaPropertyChangedEventArgs<T> typed)
+                    {
+                        newValue = AvaloniaObjectExtensions.GetValue(ao, typed.Property);
+                    }
+                    else
+                    {
+                        newValue = (T)e.Sender.GetValue(e.Property)!;
+                    }
+
+                    if (!_value.HasValue ||
+                        !EqualityComparer<T>.Default.Equals(newValue, _value.Value))
+                    {
+                        _value = newValue;
+                        PublishNext(_value.Value!);
+                    }
                 }
                 else
                 {
-                    newValue = (T)e.Sender.GetValue(e.Property)!;
+                    throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
                 }
 
-                if (!_value.HasValue ||
-                    !EqualityComparer<T>.Default.Equals(newValue, _value.Value))
-                {
-                    _value = newValue;
-                    PublishNext(_value.Value!);
-                }
             }
         }
     }
diff --git a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
index f60ef247d5..f75917a00e 100644
--- a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
+++ b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
@@ -30,13 +30,15 @@ namespace Avalonia.Reactive
             }
             catch (InvalidCastException e)
             {
+                var unwrappedValue = value.HasValue ? value.Value : null;
+                
                 Logger.TryGet(LogEventLevel.Error, LogArea.Binding)?.Log(
                     _target,
                     "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
                     _property.Name,
                     _property.PropertyType,
-                    value.Value,
-                    value.Value?.GetType());
+                    unwrappedValue,
+                    unwrappedValue?.GetType());
                 PublishNext(BindingValue<T>.BindingError(e));
             }
         }
diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs
new file mode 100644
index 0000000000..7930228d99
--- /dev/null
+++ b/src/Avalonia.Base/Rect.cs
@@ -0,0 +1,588 @@
+using System;
+using System.Globalization;
+using Avalonia.Animation.Animators;
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines a rectangle.
+    /// </summary>
+    public readonly struct Rect : IEquatable<Rect>
+    {
+        static Rect()
+        {
+            Animation.Animation.RegisterAnimator<RectAnimator>(prop => typeof(Rect).IsAssignableFrom(prop.PropertyType));
+        }
+
+        /// <summary>
+        /// An empty rectangle.
+        /// </summary>
+        public static readonly Rect Empty = default(Rect);
+
+        /// <summary>
+        /// The X position.
+        /// </summary>
+        private readonly double _x;
+
+        /// <summary>
+        /// The Y position.
+        /// </summary>
+        private readonly double _y;
+
+        /// <summary>
+        /// The width.
+        /// </summary>
+        private readonly double _width;
+
+        /// <summary>
+        /// The height.
+        /// </summary>
+        private readonly double _height;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="x">The X position.</param>
+        /// <param name="y">The Y position.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public Rect(double x, double y, double width, double height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="size">The size of the rectangle.</param>
+        public Rect(Size size)
+        {
+            _x = 0;
+            _y = 0;
+            _width = size.Width;
+            _height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="position">The position of the rectangle.</param>
+        /// <param name="size">The size of the rectangle.</param>
+        public Rect(Point position, Size size)
+        {
+            _x = position.X;
+            _y = position.Y;
+            _width = size.Width;
+            _height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="topLeft">The top left position of the rectangle.</param>
+        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
+        public Rect(Point topLeft, Point bottomRight)
+        {
+            _x = topLeft.X;
+            _y = topLeft.Y;
+            _width = bottomRight.X - topLeft.X;
+            _height = bottomRight.Y - topLeft.Y;
+        }
+
+        /// <summary>
+        /// Gets the X position.
+        /// </summary>
+        public double X => _x;
+
+        /// <summary>
+        /// Gets the Y position.
+        /// </summary>
+        public double Y => _y;
+
+        /// <summary>
+        /// Gets the width.
+        /// </summary>
+        public double Width => _width;
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public double Height => _height;
+
+        /// <summary>
+        /// Gets the position of the rectangle.
+        /// </summary>
+        public Point Position => new Point(_x, _y);
+
+        /// <summary>
+        /// Gets the size of the rectangle.
+        /// </summary>
+        public Size Size => new Size(_width, _height);
+
+        /// <summary>
+        /// Gets the right position of the rectangle.
+        /// </summary>
+        public double Right => _x + _width;
+
+        /// <summary>
+        /// Gets the bottom position of the rectangle.
+        /// </summary>
+        public double Bottom => _y + _height;
+        
+        /// <summary>
+        /// Gets the left position.
+        /// </summary>
+        public double Left => _x;
+
+        /// <summary>
+        /// Gets the top position.
+        /// </summary>
+        public double Top => _y;
+
+        /// <summary>
+        /// Gets the top left point of the rectangle.
+        /// </summary>
+        public Point TopLeft => new Point(_x, _y);
+
+        /// <summary>
+        /// Gets the top right point of the rectangle.
+        /// </summary>
+        public Point TopRight => new Point(Right, _y);
+
+        /// <summary>
+        /// Gets the bottom left point of the rectangle.
+        /// </summary>
+        public Point BottomLeft => new Point(_x, Bottom);
+
+        /// <summary>
+        /// Gets the bottom right point of the rectangle.
+        /// </summary>
+        public Point BottomRight => new Point(Right, Bottom);
+
+        /// <summary>
+        /// Gets the center point of the rectangle.
+        /// </summary>
+        public Point Center => new Point(_x + (_width / 2), _y + (_height / 2));
+
+        /// <summary>
+        /// Gets a value that indicates whether the rectangle is empty.
+        /// </summary>
+        // ReSharper disable CompareOfFloatsByEqualityOperator
+        public bool IsEmpty => _width == 0 && _height == 0;
+        // ReSharper restore CompareOfFloatsByEqualityOperator
+
+        /// <summary>
+        /// Checks for equality between two <see cref="Rect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are equal; otherwise false.</returns>
+        public static bool operator ==(Rect left, Rect right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="Rect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are unequal; otherwise false.</returns>
+        public static bool operator !=(Rect left, Rect right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Multiplies a rectangle by a scaling vector.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        /// <param name="scale">The vector scale.</param>
+        /// <returns>The scaled rectangle.</returns>
+        public static Rect operator *(Rect rect, Vector scale)
+        {
+            return new Rect(
+                rect.X * scale.X,
+                rect.Y * scale.Y,
+                rect.Width * scale.X,
+                rect.Height * scale.Y);
+        }
+        
+        /// <summary>
+        /// Multiplies a rectangle by a scale.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        /// <param name="scale">The scale.</param>
+        /// <returns>The scaled rectangle.</returns>
+        public static Rect operator *(Rect rect, double scale)
+        {
+            return new Rect(
+                rect.X * scale,
+                rect.Y * scale,
+                rect.Width * scale,
+                rect.Height * scale);
+        }
+
+        /// <summary>
+        /// Divides a rectangle by a vector.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        /// <param name="scale">The vector scale.</param>
+        /// <returns>The scaled rectangle.</returns>
+        public static Rect operator /(Rect rect, Vector scale)
+        {
+            return new Rect(
+                rect.X / scale.X, 
+                rect.Y / scale.Y, 
+                rect.Width / scale.X, 
+                rect.Height / scale.Y);
+        }
+
+        /// <summary>
+        /// Determines whether a point in in the bounds of the rectangle.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
+        public bool Contains(Point p)
+        {
+            return p.X >= _x && p.X <= _x + _width &&
+                   p.Y >= _y && p.Y <= _y + _height;
+        }
+        
+        /// <summary>
+        /// Determines whether a point is in the bounds of the rectangle, exclusive of the
+        /// rectangle's bottom/right edge.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>    
+        public bool ContainsExclusive(Point p)
+        {
+            return p.X >= _x && p.X < _x + _width &&
+                   p.Y >= _y && p.Y < _y + _height;
+        }
+
+        /// <summary>
+        /// Determines whether the rectangle fully contains another rectangle.
+        /// </summary>
+        /// <param name="r">The rectangle.</param>
+        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
+        public bool Contains(Rect r)
+        {
+            return Contains(r.TopLeft) && Contains(r.BottomRight);
+        }
+
+        /// <summary>
+        /// Centers another rectangle in this rectangle.
+        /// </summary>
+        /// <param name="rect">The rectangle to center.</param>
+        /// <returns>The centered rectangle.</returns>
+        public Rect CenterRect(Rect rect)
+        {
+            return new Rect(
+                _x + ((_width - rect._width) / 2),
+                _y + ((_height - rect._height) / 2),
+                rect._width,
+                rect._height);
+        }
+
+        /// <summary>
+        /// Inflates the rectangle.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The inflated rectangle.</returns>
+        public Rect Inflate(double thickness)
+        {
+            return Inflate(new Thickness(thickness));
+        }
+
+        /// <summary>
+        /// Inflates the rectangle.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The inflated rectangle.</returns>
+        public Rect Inflate(Thickness thickness)
+        {
+            return new Rect(
+                new Point(_x - thickness.Left, _y - thickness.Top),
+                Size.Inflate(thickness));
+        }
+
+        /// <summary>
+        /// Deflates the rectangle.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The deflated rectangle.</returns>
+        public Rect Deflate(double thickness)
+        {
+            return Deflate(new Thickness(thickness));
+        }
+
+        /// <summary>
+        /// Deflates the rectangle by a <see cref="Thickness"/>.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The deflated rectangle.</returns>
+        public Rect Deflate(Thickness thickness)
+        {
+            return new Rect(
+                new Point(_x + thickness.Left, _y + thickness.Top),
+                Size.Deflate(thickness));
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the rect is equal to the other given rect.
+        /// </summary>
+        /// <param name="other">The other rect to test equality against.</param>
+        /// <returns>True if this rect is equal to other; False otherwise.</returns>
+        public bool Equals(Rect other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _x == other._x &&
+                   _y == other._y &&
+                   _width == other._width &&
+                   _height == other._height;
+            // ReSharper enable CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given object is equal to this rectangle.
+        /// </summary>
+        /// <param name="obj">The object to compare against.</param>
+        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
+        public override bool Equals(object? obj) => obj is Rect other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this instance.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + X.GetHashCode();
+                hash = (hash * 23) + Y.GetHashCode();
+                hash = (hash * 23) + Width.GetHashCode();
+                hash = (hash * 23) + Height.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Gets the intersection of two rectangles.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>The intersection.</returns>
+        public Rect Intersect(Rect rect)
+        {
+            var newLeft = (rect.X > X) ? rect.X : X;
+            var newTop = (rect.Y > Y) ? rect.Y : Y;
+            var newRight = (rect.Right < Right) ? rect.Right : Right;
+            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
+
+            if ((newRight > newLeft) && (newBottom > newTop))
+            {
+                return new Rect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
+            }
+            else
+            {
+                return Empty;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a rectangle intersects with this rectangle.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>
+        /// True if the specified rectangle intersects with this one; otherwise false.
+        /// </returns>
+        public bool Intersects(Rect rect)
+        {
+            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
+        }
+
+        /// <summary>
+        /// Returns the axis-aligned bounding box of a transformed rectangle.
+        /// </summary>
+        /// <param name="matrix">The transform.</param>
+        /// <returns>The bounding box</returns>
+        public Rect TransformToAABB(Matrix matrix)
+        {
+            ReadOnlySpan<Point> points = stackalloc Point[4]
+            {
+                TopLeft.Transform(matrix),
+                TopRight.Transform(matrix),
+                BottomRight.Transform(matrix),
+                BottomLeft.Transform(matrix)
+            };
+
+            var left = double.MaxValue;
+            var right = double.MinValue;
+            var top = double.MaxValue;
+            var bottom = double.MinValue;
+
+            foreach (var p in points)
+            {
+                if (p.X < left) left = p.X;
+                if (p.X > right) right = p.X;
+                if (p.Y < top) top = p.Y;
+                if (p.Y > bottom) bottom = p.Y;
+            }
+
+            return new Rect(new Point(left, top), new Point(right, bottom));
+        }
+
+        /// <summary>
+        /// Translates the rectangle by an offset.
+        /// </summary>
+        /// <param name="offset">The offset.</param>
+        /// <returns>The translated rectangle.</returns>
+        public Rect Translate(Vector offset)
+        {
+            return new Rect(Position + offset, Size);
+        }
+
+        /// <summary>
+		/// Normalizes the rectangle so both the <see cref="Width"/> and <see 
+        /// cref="Height"/> are positive, without changing the location of the rectangle
+		/// </summary>
+        /// <returns>Normalized Rect</returns>
+		/// <remarks>
+		/// Empty rect will be return when Rect contains invalid values. Like NaN.
+		/// </remarks>
+		public Rect Normalize()
+        {
+            Rect rect = this;            
+
+            if(double.IsNaN(rect.Right) || double.IsNaN(rect.Bottom) || 
+                double.IsNaN(rect.X) || double.IsNaN(rect.Y) || 
+                double.IsNaN(Height) || double.IsNaN(Width))
+            {
+                return Rect.Empty;
+            }
+
+            if (rect.Width < 0)
+            {
+                var x = X + Width;
+                var width = X - x;
+
+                rect = rect.WithX(x).WithWidth(width);
+            }
+
+            if (rect.Height < 0)
+            {
+                var y = Y + Height;
+                var height = Y - y;
+
+                rect = rect.WithY(y).WithHeight(height);
+            }
+
+            return rect;
+        }
+
+
+            /// <summary>
+            /// Gets the union of two rectangles.
+            /// </summary>
+            /// <param name="rect">The other rectangle.</param>
+            /// <returns>The union.</returns>
+            public Rect Union(Rect rect)
+        {
+            if (IsEmpty)
+            {
+                return rect;
+            }
+            else if (rect.IsEmpty)
+            {
+                return this;
+            }
+            else
+            {
+                var x1 = Math.Min(X, rect.X);
+                var x2 = Math.Max(Right, rect.Right);
+                var y1 = Math.Min(Y, rect.Y);
+                var y2 = Math.Max(Bottom, rect.Bottom);
+
+                return new Rect(new Point(x1, y1), new Point(x2, y2));
+            }
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified X position.
+        /// </summary>
+        /// <param name="x">The x position.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithX(double x)
+        {
+            return new Rect(x, _y, _width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified Y position.
+        /// </summary>
+        /// <param name="y">The y position.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithY(double y)
+        {
+            return new Rect(_x, y, _width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified width.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithWidth(double width)
+        {
+            return new Rect(_x, _y, width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified height.
+        /// </summary>
+        /// <param name="height">The height.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithHeight(double height)
+        {
+            return new Rect(_x, _y, _width, height);
+        }
+
+        /// <summary>
+        /// Returns the string representation of the rectangle.
+        /// </summary>
+        /// <returns>The string representation of the rectangle.</returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}, {1}, {2}, {3}",
+                _x,
+                _y,
+                _width,
+                _height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="Rect"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The parsed <see cref="Rect"/>.</returns>
+        public static Rect Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect."))
+            {
+                return new Rect(
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble()
+                );
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/RelativePoint.cs b/src/Avalonia.Base/RelativePoint.cs
new file mode 100644
index 0000000000..e1fd0093b6
--- /dev/null
+++ b/src/Avalonia.Base/RelativePoint.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Globalization;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+#endif
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines the reference point units of an <see cref="RelativePoint"/> or 
+    /// <see cref="RelativeRect"/>.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    enum RelativeUnit
+    {
+        /// <summary>
+        /// The point is expressed as a fraction of the containing element's size.
+        /// </summary>
+        Relative,
+
+        /// <summary>
+        /// The point is absolute (i.e. in pixels).
+        /// </summary>
+        Absolute,
+    }
+
+    /// <summary>
+    /// Defines a point that may be defined relative to a containing element.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct RelativePoint : IEquatable<RelativePoint>
+    {
+        /// <summary>
+        /// A point at the top left of the containing element.
+        /// </summary>
+        public static readonly RelativePoint TopLeft = new RelativePoint(0, 0, RelativeUnit.Relative);
+
+        /// <summary>
+        /// A point at the center of the containing element.
+        /// </summary>
+        public static readonly RelativePoint Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+
+        /// <summary>
+        /// A point at the bottom right of the containing element.
+        /// </summary>
+        public static readonly RelativePoint BottomRight = new RelativePoint(1, 1, RelativeUnit.Relative);
+
+        private readonly Point _point;
+
+        private readonly RelativeUnit _unit;
+
+        static RelativePoint()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<RelativePointAnimator>(prop => typeof(RelativePoint).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
+        /// </summary>
+        /// <param name="x">The X point.</param>
+        /// <param name="y">The Y point</param>
+        /// <param name="unit">The unit.</param>
+        public RelativePoint(double x, double y, RelativeUnit unit)
+            : this(new Point(x, y), unit)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="unit">The unit.</param>
+        public RelativePoint(Point point, RelativeUnit unit)
+        {
+            _point = point;
+            _unit = unit;
+        }
+
+        /// <summary>
+        /// Gets the point.
+        /// </summary>
+        public Point Point => _point;
+
+        /// <summary>
+        /// Gets the unit.
+        /// </summary>
+        public RelativeUnit Unit => _unit;
+
+        /// <summary>
+        /// Checks for equality between two <see cref="RelativePoint"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are equal; otherwise false.</returns>
+        public static bool operator ==(RelativePoint left, RelativePoint right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="RelativePoint"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are unequal; otherwise false.</returns>
+        public static bool operator !=(RelativePoint left, RelativePoint right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks if the <see cref="RelativePoint"/> equals another object.
+        /// </summary>
+        /// <param name="obj">The other object.</param>
+        /// <returns>True if the objects are equal, otherwise false.</returns>
+        public override bool Equals(object? obj) => obj is RelativePoint other && Equals(other);
+
+        /// <summary>
+        /// Checks if the <see cref="RelativePoint"/> equals another point.
+        /// </summary>
+        /// <param name="p">The other point.</param>
+        /// <returns>True if the objects are equal, otherwise false.</returns>
+        public bool Equals(RelativePoint p)
+        {
+            return Unit == p.Unit && Point == p.Point;
+        }
+
+        /// <summary>
+        /// Gets a hashcode for a <see cref="RelativePoint"/>.
+        /// </summary>
+        /// <returns>A hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (_point.GetHashCode() * 397) ^ (int)_unit;
+            }
+        }
+
+        /// <summary>
+        /// Converts a <see cref="RelativePoint"/> into pixels.
+        /// </summary>
+        /// <param name="size">The size of the visual.</param>
+        /// <returns>The origin point in pixels.</returns>
+        public Point ToPixels(Size size)
+        {
+            return _unit == RelativeUnit.Absolute ?
+                _point :
+                new Point(_point.X * size.Width, _point.Y * size.Height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="RelativePoint"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The parsed <see cref="RelativePoint"/>.</returns>
+        public static RelativePoint Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid RelativePoint."))
+            {
+                var x = tokenizer.ReadString();
+                var y = tokenizer.ReadString();
+
+                var unit = RelativeUnit.Absolute;
+                var scale = 1.0;
+
+                if (x.EndsWith("%"))
+                {
+                    if (!y.EndsWith("%"))
+                    {
+                        throw new FormatException("If one coordinate is relative, both must be.");
+                    }
+
+                    x = x.TrimEnd('%');
+                    y = y.TrimEnd('%');
+                    unit = RelativeUnit.Relative;
+                    scale = 0.01;
+                }
+
+                return new RelativePoint(
+                    double.Parse(x, CultureInfo.InvariantCulture) * scale,
+                    double.Parse(y, CultureInfo.InvariantCulture) * scale,
+                    unit);
+            }
+        }
+
+        /// <summary>
+        /// Returns a String representing this RelativePoint instance.
+        /// </summary>
+        /// <returns>The string representation.</returns>
+        public override string ToString()
+        {
+            return _unit == RelativeUnit.Absolute ?
+                _point.ToString() :
+                 string.Format(CultureInfo.InvariantCulture, "{0}%, {1}%", _point.X * 100, _point.Y * 100);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/RelativeRect.cs b/src/Avalonia.Base/RelativeRect.cs
similarity index 100%
rename from src/Avalonia.Visuals/RelativeRect.cs
rename to src/Avalonia.Base/RelativeRect.cs
diff --git a/src/Avalonia.Visuals/RenderTargetCorruptedException.cs b/src/Avalonia.Base/RenderTargetCorruptedException.cs
similarity index 100%
rename from src/Avalonia.Visuals/RenderTargetCorruptedException.cs
rename to src/Avalonia.Base/RenderTargetCorruptedException.cs
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
new file mode 100644
index 0000000000..889c1d34c8
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations;
+
+/// <summary>
+/// The base class for both key-frame and expression animation instances
+/// Is responsible for activation tracking and for subscribing to properties used in dependencies
+/// </summary>
+internal abstract class AnimationInstanceBase : IAnimationInstance
+{
+    private List<(ServerObject obj, CompositionProperty member)>? _trackedObjects;
+    protected PropertySetSnapshot Parameters { get; }
+    public ServerObject TargetObject { get; }
+    protected CompositionProperty Property { get; private set; } = null!;
+    private bool _invalidated;
+
+    public AnimationInstanceBase(ServerObject target, PropertySetSnapshot parameters)
+    {
+        Parameters = parameters;
+        TargetObject = target;
+    }
+
+    protected void Initialize(CompositionProperty property, HashSet<(string name, string member)> trackedObjects)
+    {
+        if (trackedObjects.Count > 0)
+        {
+            _trackedObjects = new ();
+            foreach (var t in trackedObjects)
+            {
+                var obj = Parameters.GetObjectParameter(t.name);
+                if (obj is ServerObject tracked)
+                {
+                    var off = tracked.GetCompositionProperty(t.member);
+                    if (off == null)
+#if DEBUG
+                        throw new InvalidCastException("Attempting to subscribe to unknown field");
+#else
+                        continue;
+#endif
+                    _trackedObjects.Add((tracked, off));
+                }
+            }
+        }
+
+        Property = property;
+    }
+
+    public abstract void Initialize(TimeSpan startedAt, ExpressionVariant startingValue, CompositionProperty property);
+    protected abstract ExpressionVariant EvaluateCore(TimeSpan now, ExpressionVariant currentValue);
+
+    public ExpressionVariant Evaluate(TimeSpan now, ExpressionVariant currentValue)
+    {
+        _invalidated = false;
+        return EvaluateCore(now, currentValue);
+    }
+
+    public virtual void Activate()
+    {
+        if (_trackedObjects != null)
+            foreach (var tracked in _trackedObjects)
+                tracked.obj.SubscribeToInvalidation(tracked.member, this);
+    }
+
+    public virtual void Deactivate()
+    {
+        if (_trackedObjects != null)
+            foreach (var tracked in _trackedObjects)
+                tracked.obj.UnsubscribeFromInvalidation(tracked.member, this);
+    }
+
+    public void Invalidate()
+    {
+        if (_invalidated)
+            return;
+        _invalidated = true;
+        TargetObject.NotifyAnimatedValueChanged(Property);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
new file mode 100644
index 0000000000..a6db4330a3
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
@@ -0,0 +1,74 @@
+// ReSharper disable InconsistentNaming
+// ReSharper disable CheckNamespace
+
+using System.Numerics;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    /// This is the base class for ExpressionAnimation and KeyFrameAnimation.
+    /// </summary>
+    /// <remarks>
+    /// Use the <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> method to start the animation.
+    /// Value parameters (as opposed to reference parameters which are set using <see cref="SetReferenceParameter"/>)
+    /// are copied and "embedded" into an expression at the time CompositionObject.StartAnimation is called.
+    /// Changing the value of the variable after <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> is called will not affect
+    /// the value of the ExpressionAnimation.
+    /// See the remarks section of ExpressionAnimation for additional information.
+    /// </remarks>
+    public abstract class CompositionAnimation : CompositionObject,  ICompositionAnimationBase
+    {
+        private readonly CompositionPropertySet _propertySet;
+        internal CompositionAnimation(Compositor compositor) : base(compositor, null!)
+        {
+            _propertySet = new CompositionPropertySet(compositor);
+        }
+        
+        /// <summary>
+        /// Clears all of the parameters of the animation.
+        /// </summary>
+        public void ClearAllParameters() => _propertySet.ClearAll();
+
+        /// <summary>
+        /// Clears a parameter from the animation.
+        /// </summary>
+        public void ClearParameter(string key) => _propertySet.Clear(key);
+        
+        void SetVariant(string key, ExpressionVariant value) => _propertySet.Set(key, value);
+        
+        public void SetColorParameter(string key, Media.Color value) => SetVariant(key, value);
+
+        public void SetMatrix3x2Parameter(string key, Matrix3x2 value) => SetVariant(key, value);
+
+        public void SetMatrix4x4Parameter(string key, Matrix4x4 value) => SetVariant(key, value);
+
+        public void SetQuaternionParameter(string key, Quaternion value) => SetVariant(key, value);
+
+        public void SetReferenceParameter(string key, CompositionObject compositionObject) =>
+            _propertySet.Set(key, compositionObject);
+
+        public void SetScalarParameter(string key, float value) => SetVariant(key, value);
+
+        public void SetVector2Parameter(string key, Vector2 value) => SetVariant(key, value);
+
+        public void SetVector3Parameter(string key, Vector3 value) => SetVariant(key, value);
+
+        public void SetVector4Parameter(string key, Vector4 value) => SetVariant(key, value);
+
+        public string? Target { get; set; }
+
+        internal abstract IAnimationInstance CreateInstance(ServerObject targetObject,
+            ExpressionVariant? finalValue);
+
+        internal PropertySetSnapshot CreateSnapshot() => _propertySet.Snapshot();
+
+        void ICompositionAnimationBase.InternalOnly()
+        {
+            
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
new file mode 100644
index 0000000000..bad3991f43
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Transport;
+
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    public class CompositionAnimationGroup : CompositionObject, ICompositionAnimationBase
+    {
+        internal List<CompositionAnimation> Animations { get; } = new List<CompositionAnimation>();
+        void ICompositionAnimationBase.InternalOnly()
+        {
+            
+        }
+
+        public void Add(CompositionAnimation value) => Animations.Add(value);
+        public void Remove(CompositionAnimation value) => Animations.Remove(value);
+        public void RemoveAll() => Animations.Clear();
+
+        public CompositionAnimationGroup(Compositor compositor) : base(compositor, null!)
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
new file mode 100644
index 0000000000..ec2972044e
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
@@ -0,0 +1,55 @@
+// ReSharper disable CheckNamespace
+using System;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    /// A Composition Animation that uses a mathematical equation to calculate the value for an animating property every frame.
+    /// </summary>
+    /// <remarks>
+    /// The core of ExpressionAnimations allows a developer to define a mathematical equation that can be used to calculate the value
+    /// of a targeted animating property each frame.
+    /// This contrasts <see cref="KeyFrameAnimation"/>s, which use an interpolator to define how the animating
+    /// property changes over time. The mathematical equation can be defined using references to properties
+    /// of Composition objects, mathematical functions and operators and Input.
+    /// Use the <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> method to start the animation.
+    /// </remarks>
+    public class ExpressionAnimation : CompositionAnimation
+    {
+        private string? _expression;
+        private Expression? _parsedExpression;
+        
+        internal ExpressionAnimation(Compositor compositor) : base(compositor)
+        {
+        }
+
+        /// <summary>
+        /// The mathematical equation specifying how the animated value is calculated each frame.
+        /// The Expression is the core of an <see cref="ExpressionAnimation"/> and represents the equation
+        /// the system will use to calculate the value of the animation property each frame.
+        /// The equation is set on this property in the form of a string.
+        /// Although expressions can be defined by simple mathematical equations such as "2+2",
+        /// the real power lies in creating mathematical relationships where the input values can change frame over frame.
+        /// </summary>
+        public string? Expression
+        {
+            get => _expression;
+            set
+            {
+                _expression = value;
+                _parsedExpression = null;
+            }
+        }
+
+        private Expression ParsedExpression => _parsedExpression ??= ExpressionParser.Parse(_expression.AsSpan());
+
+        internal override IAnimationInstance CreateInstance(
+            ServerObject targetObject, ExpressionVariant? finalValue)
+            => new ExpressionAnimationInstance(ParsedExpression,
+                targetObject, finalValue, CreateSnapshot());
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
new file mode 100644
index 0000000000..6c7c556456
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    
+    /// <summary>
+    /// Server-side counterpart of <see cref="ExpressionAnimation"/> with values baked-in.
+    /// </summary>
+    internal class ExpressionAnimationInstance : AnimationInstanceBase, IAnimationInstance
+    {
+        private readonly Expression _expression;
+        private ExpressionVariant _startingValue;
+        private readonly ExpressionVariant? _finalValue;
+
+        protected override ExpressionVariant EvaluateCore(TimeSpan now, ExpressionVariant currentValue)
+        {
+            var ctx = new ExpressionEvaluationContext
+            {
+                Parameters = Parameters,
+                Target = TargetObject,
+                ForeignFunctionInterface = BuiltInExpressionFfi.Instance,
+                StartingValue = _startingValue,
+                FinalValue = _finalValue ?? _startingValue,
+                CurrentValue = currentValue
+            };
+            return _expression.Evaluate(ref ctx);
+        }
+
+        public override void Initialize(TimeSpan startedAt, ExpressionVariant startingValue, CompositionProperty property)
+        {
+            _startingValue = startingValue;
+            var hs = new HashSet<(string, string)>();
+            _expression.CollectReferences(hs);
+            base.Initialize(property, hs);
+        }
+        
+        public ExpressionAnimationInstance(Expression expression,
+            ServerObject target,
+            ExpressionVariant? finalValue,
+            PropertySetSnapshot parameters) : base(target, parameters)
+        {
+            _expression = expression;
+            _finalValue = finalValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
new file mode 100644
index 0000000000..8ec4ec19bc
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    internal interface IAnimationInstance
+    {
+        ServerObject TargetObject { get; }
+        ExpressionVariant Evaluate(TimeSpan now, ExpressionVariant currentValue);
+        void Initialize(TimeSpan startedAt, ExpressionVariant startingValue, CompositionProperty property);
+        void Activate();
+        void Deactivate();
+        void Invalidate();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
new file mode 100644
index 0000000000..91b37a81af
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
@@ -0,0 +1,17 @@
+// ReSharper disable CheckNamespace
+
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    /// Base class for composition animations.
+    /// </summary>
+    public interface ICompositionAnimationBase
+    {
+        internal void InternalOnly();
+    }
+
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
new file mode 100644
index 0000000000..72be4edd07
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Rendering.Composition.Transport;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    /// A collection of animations triggered when a condition is met.
+    /// </summary>
+    /// <remarks>
+    /// Implicit animations let you drive animations by specifying trigger conditions rather than requiring the manual definition of animation behavior.
+    /// They help decouple animation start logic from core app logic. You define animations and the events that should trigger these animations.
+    /// Currently the only available trigger is animated property change.
+    ///
+    /// When expression is used in ImplicitAnimationCollection a special keyword `this.FinalValue` will represent
+    /// the final value of the animated property that was changed 
+    /// </remarks>
+    public class ImplicitAnimationCollection : CompositionObject, IDictionary<string, ICompositionAnimationBase>
+    {
+        private Dictionary<string, ICompositionAnimationBase> _inner = new Dictionary<string, ICompositionAnimationBase>();
+        private IDictionary<string, ICompositionAnimationBase> _innerface;
+        internal ImplicitAnimationCollection(Compositor compositor) : base(compositor, null!)
+        {
+            _innerface = _inner;
+        }
+
+        public IEnumerator<KeyValuePair<string, ICompositionAnimationBase>> GetEnumerator() => _inner.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable) _inner).GetEnumerator();
+
+        void ICollection<KeyValuePair<string, ICompositionAnimationBase>>.Add(KeyValuePair<string, ICompositionAnimationBase> item) => _innerface.Add(item);
+
+        public void Clear() => _inner.Clear();
+
+        bool ICollection<KeyValuePair<string, ICompositionAnimationBase>>.Contains(KeyValuePair<string, ICompositionAnimationBase> item) => _innerface.Contains(item);
+
+        void ICollection<KeyValuePair<string, ICompositionAnimationBase>>.CopyTo(KeyValuePair<string, ICompositionAnimationBase>[] array, int arrayIndex) => _innerface.CopyTo(array, arrayIndex);
+
+        bool ICollection<KeyValuePair<string, ICompositionAnimationBase>>.Remove(KeyValuePair<string, ICompositionAnimationBase> item) => _innerface.Remove(item);
+
+        public int Count => _inner.Count;
+
+        bool ICollection<KeyValuePair<string, ICompositionAnimationBase>>.IsReadOnly => _innerface.IsReadOnly;
+
+        public void Add(string key, ICompositionAnimationBase value) => _inner.Add(key, value);
+
+        public bool ContainsKey(string key) => _inner.ContainsKey(key);
+
+        public bool Remove(string key) => _inner.Remove(key);
+
+        public bool TryGetValue(string key, [MaybeNullWhen(false)] out ICompositionAnimationBase value) =>
+            _inner.TryGetValue(key, out value);
+
+        public ICompositionAnimationBase this[string key]
+        {
+            get => _inner[key];
+            set => _inner[key] = value;
+        }
+
+        ICollection<string> IDictionary<string, ICompositionAnimationBase>.Keys => _innerface.Keys;
+
+        ICollection<ICompositionAnimationBase> IDictionary<string, ICompositionAnimationBase>.Values =>
+            _innerface.Values;
+        
+        // UWP compat
+        public uint Size => (uint) Count;
+
+        public IReadOnlyDictionary<string, ICompositionAnimationBase> GetView() =>
+            new Dictionary<string, ICompositionAnimationBase>(this);
+
+        public bool HasKey(string key) => ContainsKey(key);
+        public void Insert(string key, ICompositionAnimationBase animation) => Add(key, animation);
+
+        public ICompositionAnimationBase? Lookup(string key)
+        {
+            _inner.TryGetValue(key, out var rv);
+            return rv;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs b/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
new file mode 100644
index 0000000000..e19c0ff098
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Numerics;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    ///  An interface to define interpolation logic for a particular type
+    /// </summary>
+    internal interface IInterpolator<T>
+    {
+        T Interpolate(T from, T to, float progress);
+    }
+
+    class ScalarInterpolator : IInterpolator<float>
+    {
+        public float Interpolate(float @from, float to, float progress) => @from + (to - @from) * progress;
+        
+        public static ScalarInterpolator Instance { get; } = new ScalarInterpolator();
+    }
+
+    class Vector2Interpolator : IInterpolator<Vector2>
+    {
+        public Vector2 Interpolate(Vector2 @from, Vector2 to, float progress) 
+            => Vector2.Lerp(@from, to, progress);
+        
+        public static Vector2Interpolator Instance { get; } = new Vector2Interpolator();
+    }
+    
+    class Vector3Interpolator : IInterpolator<Vector3>
+    {
+        public Vector3 Interpolate(Vector3 @from, Vector3 to, float progress) 
+            => Vector3.Lerp(@from, to, progress);
+        
+        public static Vector3Interpolator Instance { get; } = new Vector3Interpolator();
+    }
+    
+    class Vector4Interpolator : IInterpolator<Vector4>
+    {
+        public Vector4 Interpolate(Vector4 @from, Vector4 to, float progress) 
+            => Vector4.Lerp(@from, to, progress);
+        
+        public static Vector4Interpolator Instance { get; } = new Vector4Interpolator();
+    }
+    
+    class QuaternionInterpolator : IInterpolator<Quaternion>
+    {
+        public Quaternion Interpolate(Quaternion @from, Quaternion to, float progress) 
+            => Quaternion.Lerp(@from, to, progress);
+
+        public static QuaternionInterpolator Instance { get; } = new QuaternionInterpolator();
+    }
+    
+    class ColorInterpolator : IInterpolator<Avalonia.Media.Color>
+    {
+        static byte Lerp(float a, float b, float p) => (byte) Math.Max(0, Math.Min(255, (p * (b - a) + a)));
+
+        public static Avalonia.Media.Color
+            LerpRGB(Avalonia.Media.Color to, Avalonia.Media.Color from, float progress) =>
+            new Avalonia.Media.Color(Lerp(to.A, @from.A, progress),
+                Lerp(to.R, @from.R, progress),
+                Lerp(to.G, @from.G, progress),
+                Lerp(to.B, @from.B, progress));
+
+        public Avalonia.Media.Color Interpolate(Avalonia.Media.Color @from, Avalonia.Media.Color to, float progress)
+            => LerpRGB(@from, to, progress);
+        
+        public static ColorInterpolator Instance { get; } = new ColorInterpolator();
+    }
+
+    class BooleanInterpolator : IInterpolator<bool>
+    {
+        public bool Interpolate(bool @from, bool to, float progress) => progress >= 1 ? to : @from;
+        
+        public static BooleanInterpolator Instance { get; } = new BooleanInterpolator();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
new file mode 100644
index 0000000000..d21a4d06e3
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
@@ -0,0 +1,136 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    
+    /// <summary>
+    /// A time-based animation with one or more key frames.
+    /// These frames are markers, allowing developers to specify values at specific times for the animating property.
+    /// KeyFrame animations can be further customized by specifying how the animation interpolates between keyframes.
+    /// </summary>
+    public abstract class KeyFrameAnimation : CompositionAnimation
+    {
+        private TimeSpan _duration = TimeSpan.FromMilliseconds(1);
+
+        internal KeyFrameAnimation(Compositor compositor) : base(compositor)
+        {
+        }
+        
+        /// <summary>
+        /// The delay behavior of the key frame animation.
+        /// </summary>
+        public AnimationDelayBehavior DelayBehavior { get; set; }
+
+        /// <summary>
+        /// Delay before the animation starts after <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> is called.
+        /// </summary>
+        public System.TimeSpan DelayTime { get; set; }
+        
+        /// <summary>
+        /// The direction the animation is playing.
+        /// The Direction property allows you to drive your animation from start to end or end to start or alternate
+        /// between start and end or end to start if animation has an <see cref="IterationCount"/> greater than one.
+        /// This gives an easy way for customizing animation definitions.
+        /// </summary>
+        public PlaybackDirection Direction { get; set; }
+
+        /// <summary>
+        /// The duration of the animation.
+        /// Minimum allowed value is 1ms and maximum allowed value is 24 days.
+        /// </summary>
+        public TimeSpan Duration
+        {
+            get => _duration;
+            set
+            {
+                if (_duration < TimeSpan.FromMilliseconds(1) || _duration > TimeSpan.FromDays(1))
+                    throw new ArgumentException("Minimum allowed value is 1ms and maximum allowed value is 24 days.");
+                _duration = value;
+            }
+        }
+        
+        /// <summary>
+        /// The iteration behavior for the key frame animation.
+        /// </summary>
+        public AnimationIterationBehavior IterationBehavior { get; set; }
+        
+        /// <summary>
+        /// The number of times to repeat the key frame animation.
+        /// </summary>
+        public int IterationCount { get; set; } = 1;
+        
+        /// <summary>
+        /// Specifies how to set the property value when animation is stopped
+        /// </summary>
+        public AnimationStopBehavior StopBehavior { get; set; }
+        
+        private protected abstract IKeyFrames KeyFrames { get; }
+        
+        /// <summary>
+        /// Inserts an expression keyframe.
+        /// </summary>
+        /// <param name="normalizedProgressKey">
+        /// The time the key frame should occur at, expressed as a percentage of the animation Duration. Allowed value is from 0.0 to 1.0.
+        /// </param>
+        /// <param name="value">The expression used to calculate the value of the key frame.</param>
+        /// <param name="easingFunction">The easing function to use when interpolating between frames.</param>
+        public void InsertExpressionKeyFrame(float normalizedProgressKey, string value,
+            Easing? easingFunction = null) =>
+            KeyFrames.InsertExpressionKeyFrame(normalizedProgressKey, value, easingFunction ?? Compositor.DefaultEasing);
+    }
+
+    /// <summary>
+    /// Specifies the animation delay behavior.
+    /// </summary>
+    public enum AnimationDelayBehavior
+    {
+        /// <summary>
+        /// If a DelayTime is specified, it delays starting the animation according to delay time and after delay
+        /// has expired it applies animation to the object property.
+        /// </summary>
+        SetInitialValueAfterDelay,
+        /// <summary>
+        /// Applies the initial value of the animation (i.e. the value at Keyframe 0) to the object before the delay time
+        /// is elapsed (when there is a DelayTime specified), it then delays starting the animation according to the DelayTime.
+        /// </summary>
+        SetInitialValueBeforeDelay
+    }
+
+    /// <summary>
+    /// Specifies if the animation should loop.
+    /// </summary>
+    public enum AnimationIterationBehavior
+    {
+        /// <summary>
+        /// The animation should loop the specified number of times.
+        /// </summary>
+        Count,
+        /// <summary>
+        /// The animation should loop forever.
+        /// </summary>
+        Forever
+    }
+
+    /// <summary>
+    /// Specifies the behavior of an animation when it stops.
+    /// </summary>
+    public enum AnimationStopBehavior
+    {
+        /// <summary>
+        /// Leave the animation at its current value.
+        /// </summary>
+        LeaveCurrentValue,
+        /// <summary>
+        /// Reset the animation to its initial value.
+        /// </summary>
+        SetToInitialValue,
+        /// <summary>
+        /// Set the animation to its final value.
+        /// </summary>
+        SetToFinalValue
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
new file mode 100644
index 0000000000..e20a4a9ad8
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Animation;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    /// Server-side counterpart of KeyFrameAnimation with values baked-in
+    /// </summary>
+    class KeyFrameAnimationInstance<T> : AnimationInstanceBase, IAnimationInstance where T : struct
+    {
+        private readonly IInterpolator<T> _interpolator;
+        private readonly ServerKeyFrame<T>[] _keyFrames;
+        private readonly ExpressionVariant? _finalValue;
+        private readonly AnimationDelayBehavior _delayBehavior;
+        private readonly TimeSpan _delayTime;
+        private readonly PlaybackDirection _direction;
+        private readonly TimeSpan _duration;
+        private readonly AnimationIterationBehavior _iterationBehavior;
+        private readonly int _iterationCount;
+        private readonly AnimationStopBehavior _stopBehavior;
+        private TimeSpan _startedAt;
+        private T _startingValue;
+        private readonly TimeSpan _totalDuration;
+        private bool _finished;
+
+        public KeyFrameAnimationInstance(
+            IInterpolator<T> interpolator, ServerKeyFrame<T>[] keyFrames,
+            PropertySetSnapshot snapshot, ExpressionVariant? finalValue,
+            ServerObject target,
+            AnimationDelayBehavior delayBehavior, TimeSpan delayTime,
+            PlaybackDirection direction, TimeSpan duration,
+            AnimationIterationBehavior iterationBehavior,
+            int iterationCount, AnimationStopBehavior stopBehavior) : base(target, snapshot)
+        {
+            _interpolator = interpolator;
+            _keyFrames = keyFrames;
+            _finalValue = finalValue;
+            _delayBehavior = delayBehavior;
+            _delayTime = delayTime;
+            _direction = direction;
+            _duration = duration;
+            _iterationBehavior = iterationBehavior;
+            _iterationCount = iterationCount;
+            _stopBehavior = stopBehavior;
+            if (_iterationBehavior == AnimationIterationBehavior.Count)
+                _totalDuration = delayTime.Add(TimeSpan.FromTicks(iterationCount * _duration.Ticks));
+            if (_keyFrames.Length == 0)
+                throw new InvalidOperationException("Animation has no key frames");
+            if(_duration.Ticks <= 0)
+                throw new InvalidOperationException("Invalid animation duration");
+        }
+
+
+        protected override ExpressionVariant EvaluateCore(TimeSpan now, ExpressionVariant currentValue)
+        {
+            var starting = ExpressionVariant.Create(_startingValue);
+            var ctx = new ExpressionEvaluationContext
+            {
+                Parameters = Parameters,
+                Target = TargetObject,
+                CurrentValue = currentValue,
+                FinalValue = _finalValue ??  starting,
+                StartingValue = starting,
+                ForeignFunctionInterface = BuiltInExpressionFfi.Instance
+            };
+            var elapsed = now - _startedAt;
+            var res = EvaluateImpl(elapsed, currentValue, ref ctx);
+            
+            if (_iterationBehavior == AnimationIterationBehavior.Count
+                && !_finished
+                && elapsed > _totalDuration)
+            {
+                // Active check?
+                TargetObject.Compositor.RemoveFromClock(this);
+                _finished = true;
+            }
+            return res;
+        }
+        
+        private ExpressionVariant EvaluateImpl(TimeSpan elapsed, ExpressionVariant currentValue, ref ExpressionEvaluationContext ctx)
+        {
+            if (elapsed < _delayTime)
+            {
+                if (_delayBehavior == AnimationDelayBehavior.SetInitialValueBeforeDelay)
+                    return ExpressionVariant.Create(GetKeyFrame(ref ctx, _keyFrames[0]));
+                return currentValue;
+            }
+
+            elapsed -= _delayTime;
+            var iterationNumber = elapsed.Ticks / _duration.Ticks;
+            if (_iterationBehavior == AnimationIterationBehavior.Count
+                && iterationNumber >= _iterationCount)
+                return ExpressionVariant.Create(GetKeyFrame(ref ctx, _keyFrames[_keyFrames.Length - 1]));
+            
+            
+            var evenIterationNumber = iterationNumber % 2 == 0;
+            elapsed = TimeSpan.FromTicks(elapsed.Ticks % _duration.Ticks);
+
+            var reverse =
+                _direction == PlaybackDirection.Alternate
+                    ? !evenIterationNumber
+                    : _direction == PlaybackDirection.AlternateReverse
+                        ? evenIterationNumber
+                        : _direction == PlaybackDirection.Reverse;
+
+            var iterationProgress = elapsed.TotalSeconds / _duration.TotalSeconds;
+            if (reverse)
+                iterationProgress = 1 - iterationProgress;
+
+            var left = new ServerKeyFrame<T>
+            {
+                Value = _startingValue
+            };
+            var right = _keyFrames[_keyFrames.Length - 1];
+            for (var c = 0; c < _keyFrames.Length; c++)
+            {
+                var kf = _keyFrames[c];
+                if (kf.Key < iterationProgress)
+                {
+                    // this is the last frame
+                    if (c == _keyFrames.Length - 1)
+                        return ExpressionVariant.Create(GetKeyFrame(ref ctx, kf));
+
+                    left = kf;
+                    right = _keyFrames[c + 1];
+                    break;
+                }
+            }
+
+            var keyProgress = Math.Max(0, Math.Min(1, (iterationProgress - left.Key) / (right.Key - left.Key)));
+
+            var easedKeyProgress = (float)right.EasingFunction.Ease(keyProgress);
+            if (float.IsNaN(easedKeyProgress) || float.IsInfinity(easedKeyProgress))
+                return currentValue;
+            
+            return ExpressionVariant.Create(_interpolator.Interpolate(
+                GetKeyFrame(ref ctx, left),
+                GetKeyFrame(ref ctx, right),
+                easedKeyProgress
+            ));
+        }
+
+        T GetKeyFrame(ref ExpressionEvaluationContext ctx, ServerKeyFrame<T> f)
+        {
+            if (f.Expression != null)
+                return f.Expression.Evaluate(ref ctx).CastOrDefault<T>();
+            else
+                return f.Value;
+        }
+
+        public override void Initialize(TimeSpan startedAt, ExpressionVariant startingValue, CompositionProperty property)
+        {
+            _startedAt = startedAt;
+            _startingValue = startingValue.CastOrDefault<T>();
+            var hs = new HashSet<(string, string)>();
+            
+            // TODO: Update subscriptions based on the current keyframe rather than keeping subscriptions to all of them
+            foreach (var frame in _keyFrames)
+                frame.Expression?.CollectReferences(hs);
+            Initialize(property, hs);
+        }
+
+        public override void Activate()
+        {
+            TargetObject.Compositor.AddToClock(this);
+            base.Activate();
+        }
+
+        public override void Deactivate()
+        {
+            TargetObject.Compositor.RemoveFromClock(this);
+            base.Deactivate();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
new file mode 100644
index 0000000000..79045ccff8
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Animation.Easings;
+using Avalonia.Rendering.Composition.Expressions;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    
+    /// <summary>
+    /// Collection of composition animation key frames
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    class KeyFrames<T> : List<KeyFrame<T>>, IKeyFrames
+    {
+        void Validate(float key)
+        {
+            if (key < 0 || key > 1)
+                throw new ArgumentException("Key frame key");
+            if (Count > 0 && this[Count - 1].NormalizedProgressKey > key)
+                throw new ArgumentException("Key frame key " + key + " is less than the previous one");
+        }
+        
+        public void InsertExpressionKeyFrame(float normalizedProgressKey, string value, IEasing easingFunction)
+        {
+            Validate(normalizedProgressKey);
+            Add(new KeyFrame<T>
+            {
+                NormalizedProgressKey = normalizedProgressKey,
+                Expression = Expression.Parse(value),
+                EasingFunction = easingFunction
+            });
+        }
+
+        public void Insert(float normalizedProgressKey, T value, IEasing easingFunction)
+        {
+            Validate(normalizedProgressKey);
+            Add(new KeyFrame<T>
+            {
+                NormalizedProgressKey = normalizedProgressKey,
+                Value = value,
+                EasingFunction = easingFunction
+            });
+        }
+
+        public ServerKeyFrame<T>[] Snapshot()
+        {
+            var frames = new ServerKeyFrame<T>[Count];
+            for (var c = 0; c < Count; c++)
+            {
+                var f = this[c];
+                frames[c] = new ServerKeyFrame<T>
+                {
+                    Expression = f.Expression,
+                    Value = f.Value,
+                    EasingFunction = f.EasingFunction,
+                    Key = f.NormalizedProgressKey
+                };
+            }
+            return frames;
+        }
+    }
+
+    /// <summary>
+    /// Composition animation key frame
+    /// </summary>
+    struct KeyFrame<T>
+    {
+        public float NormalizedProgressKey;
+        public T Value;
+        public Expression Expression;
+        public IEasing EasingFunction;
+    }
+    
+    /// <summary>
+    /// Server-side composition animation key frame
+    /// </summary>
+    struct ServerKeyFrame<T>
+    {
+        public T Value;
+        public Expression? Expression;
+        public IEasing EasingFunction;
+        public float Key;
+    }
+    
+    interface IKeyFrames
+    {
+        public void InsertExpressionKeyFrame(float normalizedProgressKey, string value, IEasing easingFunction);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs b/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
new file mode 100644
index 0000000000..af3c344999
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Expressions;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Animations
+{
+    /// <summary>
+    /// A snapshot of properties used by an animation
+    /// </summary>
+    internal class PropertySetSnapshot : IExpressionParameterCollection, IExpressionObject
+    {
+        private readonly Dictionary<string, Value> _dic;
+
+        public struct Value
+        {
+            public ExpressionVariant Variant;
+            public IExpressionObject Object;
+
+            public Value(IExpressionObject o)
+            {
+                Object = o;
+                Variant = default;
+            }
+
+            public static implicit operator Value(ExpressionVariant v) => new Value
+            {
+                Variant = v
+            };
+        }
+
+        public PropertySetSnapshot(Dictionary<string, Value> dic)
+        {
+            _dic = dic;
+        }
+
+        public ExpressionVariant GetParameter(string name)
+        {
+            _dic.TryGetValue(name, out var v);
+            return v.Variant;
+        }
+
+        public IExpressionObject GetObjectParameter(string name)
+        {
+            _dic.TryGetValue(name, out var v);
+            return v.Object;
+        }
+
+        public ExpressionVariant GetProperty(string name) => GetParameter(name);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
new file mode 100644
index 0000000000..98a6a3600e
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
@@ -0,0 +1,304 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia.Collections;
+using Avalonia.Collections.Pooled;
+using Avalonia.Media;
+using Avalonia.Rendering.Composition.Drawing;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition;
+
+/// <summary>
+/// A renderer that utilizes <see cref="Avalonia.Rendering.Composition.Compositor"/> to render the visual tree 
+/// </summary>
+public class CompositingRenderer : IRendererWithCompositor
+{
+    private readonly IRenderRoot _root;
+    private readonly Compositor _compositor;
+    CompositionDrawingContext _recorder = new();
+    DrawingContext _recordingContext;
+    private HashSet<Visual> _dirty = new();
+    private HashSet<Visual> _recalculateChildren = new();
+    private bool _queuedUpdate;
+    private Action<Task> _update;
+    private bool _updating;
+
+    internal CompositionTarget CompositionTarget;
+    
+    /// <summary>
+    /// Asks the renderer to only draw frames on the render thread. Makes Paint to wait until frame is rendered.
+    /// </summary>
+    public bool RenderOnlyOnRenderThread { get; set; } = true;
+
+    public CompositingRenderer(IRenderRoot root,
+        Compositor compositor)
+    {
+        _root = root;
+        _compositor = compositor;
+        _recordingContext = new DrawingContext(_recorder);
+        CompositionTarget = compositor.CreateCompositionTarget(root.CreateRenderTarget);
+        CompositionTarget.Root = ((Visual)root!.VisualRoot!).AttachToCompositor(compositor);
+        _update = Update;
+    }
+
+    /// <inheritdoc/>
+    public bool DrawFps
+    {
+        get => CompositionTarget.DrawFps;
+        set => CompositionTarget.DrawFps = value;
+    }
+    
+    /// <inheritdoc/>
+    public bool DrawDirtyRects
+    {
+        get => CompositionTarget.DrawDirtyRects;
+        set => CompositionTarget.DrawDirtyRects = value;
+    }
+
+    /// <inheritdoc/>
+    public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
+
+    void QueueUpdate()
+    {
+        if(_queuedUpdate)
+            return;
+        _queuedUpdate = true;
+        _compositor.InvokeBeforeNextCommit(_update);
+    }
+    
+    /// <inheritdoc/>
+    public void AddDirty(IVisual visual)
+    {
+        if (_updating)
+            throw new InvalidOperationException("Visual was invalidated during the render pass");
+        _dirty.Add((Visual)visual);
+        QueueUpdate();
+    }
+
+    /// <inheritdoc/>
+    public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool>? filter)
+    {
+        Func<CompositionVisual, bool>? f = null;
+        if (filter != null)
+            f = v =>
+            {
+                if (v is CompositionDrawListVisual dlv)
+                    return filter(dlv.Visual);
+                return true;
+            };
+        
+        var res = CompositionTarget.TryHitTest(p, f);
+        if(res == null)
+            yield break;
+        foreach(var v in res)
+        {
+            if (v is CompositionDrawListVisual dv)
+            {
+                if (filter == null || filter(dv.Visual))
+                    yield return dv.Visual;
+            }
+        }
+    }
+
+    /// <inheritdoc/>
+    public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool>? filter)
+    {
+        // TODO: Optimize
+        return HitTest(p, root, filter).FirstOrDefault();
+    }
+
+    /// <inheritdoc/>
+    public void RecalculateChildren(IVisual visual)
+    {
+        if (_updating)
+            throw new InvalidOperationException("Visual was invalidated during the render pass");
+        _recalculateChildren.Add((Visual)visual);
+        QueueUpdate();
+    }
+
+    private void SyncChildren(Visual v)
+    {
+        //TODO: Optimize by moving that logic to Visual itself
+        if(v.CompositionVisual == null)
+            return;
+        var compositionChildren = v.CompositionVisual.Children;
+        var visualChildren = (AvaloniaList<IVisual>)v.GetVisualChildren();
+        
+        PooledList<(IVisual visual, int index)>? sortedChildren = null;
+        if (v.HasNonUniformZIndexChildren && visualChildren.Count > 1)
+        {
+            sortedChildren = new (visualChildren.Count);
+            for (var c = 0; c < visualChildren.Count; c++) 
+                sortedChildren.Add((visualChildren[c], c));
+            
+            // Regular Array.Sort is unstable, we need to provide indices as well to avoid reshuffling elements.
+            sortedChildren.Sort(static (lhs, rhs) =>
+            {
+                var result = lhs.visual.ZIndex.CompareTo(rhs.visual.ZIndex);
+                return result == 0 ? lhs.index.CompareTo(rhs.index) : result;
+            });
+        }
+
+        if (compositionChildren.Count == visualChildren.Count)
+        {
+            bool mismatch = false;
+            if (sortedChildren != null)
+                for (var c = 0; c < visualChildren.Count; c++)
+                {
+                    if (!ReferenceEquals(compositionChildren[c], ((Visual)sortedChildren[c].visual).CompositionVisual))
+                    {
+                        mismatch = true;
+                        break;
+                    }
+                }
+            else
+                for (var c = 0; c < visualChildren.Count; c++)
+                    if (!ReferenceEquals(compositionChildren[c], ((Visual)visualChildren[c]).CompositionVisual))
+                    {
+                        mismatch = true;
+                        break;
+                    }
+
+
+            if (!mismatch)
+            {
+                sortedChildren?.Dispose();
+                return;
+            }
+        }
+        
+        compositionChildren.Clear();
+        if (sortedChildren != null)
+        {
+            foreach (var ch in sortedChildren)
+            {
+                var compositionChild = ((Visual)ch.visual).CompositionVisual;
+                if (compositionChild != null)
+                    compositionChildren.Add(compositionChild);
+            }
+            sortedChildren.Dispose();
+        }
+        else
+            foreach (var ch in v.GetVisualChildren())
+            {
+                var compositionChild = ((Visual)ch).CompositionVisual;
+                if (compositionChild != null)
+                    compositionChildren.Add(compositionChild);
+            }
+    }
+
+    private void UpdateCore()
+    {
+        _queuedUpdate = false;
+        foreach (var visual in _dirty)
+        {
+            var comp = visual.CompositionVisual;
+            if(comp == null)
+                continue;
+            
+            // TODO: Optimize all of that by moving to the Visual itself, so we won't have to recalculate every time
+            comp.Offset = new Vector3((float)visual.Bounds.Left, (float)visual.Bounds.Top, 0);
+            comp.Size = new Vector2((float)visual.Bounds.Width, (float)visual.Bounds.Height);
+            comp.Visible = visual.IsVisible;
+            comp.Opacity = (float)visual.Opacity;
+            comp.ClipToBounds = visual.ClipToBounds;
+            comp.Clip = visual.Clip?.PlatformImpl;
+            comp.OpacityMask = visual.OpacityMask;
+            
+            var renderTransform = Matrix.Identity;
+
+            if (visual.HasMirrorTransform) 
+                renderTransform = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0);
+
+            if (visual.RenderTransform != null)
+            {
+                var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                var offset = Matrix.CreateTranslation(origin);
+                renderTransform *= (-offset) * visual.RenderTransform.Value * (offset);
+            }
+
+
+
+            comp.TransformMatrix = MatrixUtils.ToMatrix4x4(renderTransform);
+
+            _recorder.BeginUpdate(comp.DrawList);
+            visual.Render(_recordingContext);
+            comp.DrawList = _recorder.EndUpdate();
+
+            SyncChildren(visual);
+        }
+        foreach(var v in _recalculateChildren)
+            if (!_dirty.Contains(v))
+                SyncChildren(v);
+        _dirty.Clear();
+        _recalculateChildren.Clear();
+        CompositionTarget.Size = _root.ClientSize;
+        CompositionTarget.Scaling = _root.RenderScaling;
+    }
+
+    private async void TriggerSceneInvalidatedOnBatchCompletion(Task batchCompletion)
+    {
+        await batchCompletion;
+        SceneInvalidated?.Invoke(this, new SceneInvalidatedEventArgs(_root, new Rect(_root.ClientSize)));
+    }
+    
+    private void Update(Task batchCompletion)
+    {
+        if(_updating)
+            return;
+        _updating = true;
+        try
+        {
+            UpdateCore();
+        }
+        finally
+        {
+            _updating = false;
+        }
+    }
+    
+    public void Resized(Size size)
+    {
+    }
+
+    public void Paint(Rect rect)
+    {
+        QueueUpdate();
+        CompositionTarget.RequestRedraw();
+        if(RenderOnlyOnRenderThread && Compositor.Loop.RunsInBackground)
+            Compositor.Commit().Wait();
+        else
+            CompositionTarget.ImmediateUIThreadRender();
+    }
+
+    public void Start() => CompositionTarget.IsEnabled = true;
+
+    public void Stop()
+    {
+        CompositionTarget.IsEnabled = false;
+    }
+    
+    public void Dispose()
+    {
+        Stop();
+        CompositionTarget.Dispose();
+        
+        // Wait for the composition batch to be applied and rendered to guarantee that
+        // render target is not used anymore and can be safely disposed
+        if (Compositor.Loop.RunsInBackground)
+            _compositor.Commit().Wait();
+    }
+
+    /// <summary>
+    /// The associated <see cref="Avalonia.Rendering.Composition.Compositor"/> object
+    /// </summary>
+    public Compositor Compositor => _compositor;
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
new file mode 100644
index 0000000000..b019d1792b
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Numerics;
+using Avalonia.Rendering.Composition.Drawing;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.VisualTree;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition;
+
+
+/// <summary>
+/// A composition visual that holds a list of drawing commands issued by <see cref="Avalonia.Visual"/>
+/// </summary>
+internal class CompositionDrawListVisual : CompositionContainerVisual
+{
+    /// <summary>
+    /// The associated <see cref="Avalonia.Visual"/>
+    /// </summary>
+    public Visual Visual { get; }
+
+    private bool _drawListChanged;
+    private CompositionDrawList? _drawList;
+    
+    /// <summary>
+    /// The list of drawing commands
+    /// </summary>
+    public CompositionDrawList? DrawList
+    {
+        get => _drawList;
+        set
+        {
+            _drawList?.Dispose();
+            _drawList = value;
+            _drawListChanged = true;
+            RegisterForSerialization();
+        }
+    }
+
+    private protected override void SerializeChangesCore(BatchStreamWriter writer)
+    {
+        writer.Write((byte)(_drawListChanged ? 1 : 0));
+        if (_drawListChanged)
+        {
+            writer.WriteObject(DrawList?.Clone());
+            _drawListChanged = false;
+        }
+        base.SerializeChangesCore(writer);
+    }
+
+    internal CompositionDrawListVisual(Compositor compositor, ServerCompositionDrawListVisual server, Visual visual) : base(compositor, server)
+    {
+        Visual = visual;
+    }
+
+    internal override bool HitTest(Point pt)
+    {
+        var custom = Visual as ICustomHitTest;
+        if (DrawList == null && custom == null)
+            return false;
+        if (custom != null)
+        {
+            // Simulate the old behavior
+            // TODO: Change behavior once legacy renderers are removed
+            pt += new Point(Offset.X, Offset.Y);
+            return custom.HitTest(pt);
+        }
+
+        foreach (var op in DrawList!)
+            if (op.Item.HitTest(pt))
+                return true;
+        return false;
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs b/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
new file mode 100644
index 0000000000..50332926ad
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
@@ -0,0 +1,143 @@
+using System;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// Base class of the composition API representing a node in the visual tree structure.
+    /// Composition objects are the visual tree structure on which all other features of the composition API use and build on.
+    /// The API allows developers to define and create one or many <see cref="CompositionVisual" /> objects each representing a single node in a Visual tree.
+    /// </summary>
+    public abstract class CompositionObject : IDisposable
+    {
+        /// <summary>
+        /// The collection of implicit animations attached to this object.
+        /// </summary>
+        public ImplicitAnimationCollection? ImplicitAnimations { get; set; }
+
+        private protected InlineDictionary<CompositionProperty, IAnimationInstance> PendingAnimations;
+        internal CompositionObject(Compositor compositor, ServerObject server)
+        {
+            Compositor = compositor;
+            Server = server;
+        }
+        
+        /// <summary>
+        /// The associated Compositor
+        /// </summary>
+        public Compositor Compositor { get; }
+        internal ServerObject Server { get; }
+        public bool IsDisposed { get; private set; }
+        private bool _registeredForSerialization;
+
+        private static void ThrowInvalidOperation() =>
+            throw new InvalidOperationException("There is no server-side counterpart for this object");
+
+        public void Dispose()
+        {
+            RegisterForSerialization();
+            IsDisposed = true;
+        }
+
+        /// <summary>
+        /// Connects an animation with the specified property of the object and starts the animation.
+        /// </summary>
+        public void StartAnimation(string propertyName, CompositionAnimation animation)
+            => StartAnimation(propertyName, animation, null);
+        
+        internal virtual void StartAnimation(string propertyName, CompositionAnimation animation, ExpressionVariant? finalValue)
+        {
+            throw new ArgumentException("Unknown property " + propertyName);
+        }
+
+        /// <summary>
+        /// Starts an animation group.
+        /// The StartAnimationGroup method on CompositionObject lets you start CompositionAnimationGroup.
+        /// All the animations in the group will be started at the same time on the object.
+        /// </summary>
+        public void StartAnimationGroup(ICompositionAnimationBase grp)
+        {
+            if (grp is CompositionAnimation animation)
+            {
+                if(animation.Target == null)
+                    throw new ArgumentException("Animation Target can't be null");
+                StartAnimation(animation.Target, animation);
+            }
+            else if (grp is CompositionAnimationGroup group)
+            {
+                foreach (var a in group.Animations)
+                {
+                    if (a.Target == null)
+                        throw new ArgumentException("Animation Target can't be null");
+                    StartAnimation(a.Target, a);
+                }
+            }
+        }
+
+        bool StartAnimationGroupPart(CompositionAnimation animation, string target, ExpressionVariant finalValue)
+        {
+            if(animation.Target == null)
+                throw new ArgumentException("Animation Target can't be null");
+            if (animation.Target == target)
+            {
+                StartAnimation(animation.Target, animation, finalValue);
+                return true;
+            }
+            else
+            {
+                StartAnimation(animation.Target, animation);
+                return false;
+            }
+        }
+        
+        internal bool StartAnimationGroup(ICompositionAnimationBase grp, string target, ExpressionVariant finalValue)
+        {
+            if (grp is CompositionAnimation animation)
+                return StartAnimationGroupPart(animation, target, finalValue);
+            if (grp is CompositionAnimationGroup group)
+            {
+                var matched = false;
+                foreach (var a in group.Animations)
+                {
+                    if (a.Target == null)
+                        throw new ArgumentException("Animation Target can't be null");
+                    if (StartAnimationGroupPart(a, target, finalValue))
+                        matched = true;
+                }
+
+                return matched;
+            }
+
+            throw new ArgumentException();
+        }
+
+        protected void RegisterForSerialization()
+        {
+            if (Server == null)
+                throw new InvalidOperationException("The object doesn't have an associated server counterpart");
+            
+            if(_registeredForSerialization)
+                return;
+            _registeredForSerialization = true;
+            Compositor.RegisterForSerialization(this);
+        }
+
+        internal void SerializeChanges(BatchStreamWriter writer)
+        {
+            _registeredForSerialization = false;
+            SerializeChangesCore(writer);
+        }
+
+        private protected virtual void SerializeChangesCore(BatchStreamWriter writer)
+        {
+            if (Server is IDisposable)
+                writer.Write((byte)(IsDisposed ? 1 : 0));
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs b/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
new file mode 100644
index 0000000000..7d794af9a2
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Transport;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// <see cref="CompositionPropertySet"/>s are <see cref="CompositionObject"/>s that allow storage of key values pairs
+    /// that can be shared across the application and are not tied to the lifetime of another composition object.
+    /// <see cref="CompositionPropertySet"/>s are most commonly used with animations, where they maintain key-value pairs
+    /// that are referenced to drive portions of composition animations. <see cref="CompositionPropertySet"/>s
+    /// provide the ability to insert key-value pairs or retrieve a value for a given key.
+    /// <see cref="CompositionPropertySet"/> does not support a delete function – ensure you use <see cref="CompositionPropertySet"/>
+    /// to store values that will be shared across the application.
+    /// </summary>
+    public class CompositionPropertySet : CompositionObject
+    {
+        private readonly Dictionary<string, ExpressionVariant> _variants = new Dictionary<string, ExpressionVariant>();
+        private readonly Dictionary<string, CompositionObject> _objects = new Dictionary<string, CompositionObject>();
+        
+        internal CompositionPropertySet(Compositor compositor) : base(compositor, null!)
+        {
+        }
+
+        internal void Set(string key, ExpressionVariant value)
+        {
+            _objects.Remove(key);
+            _variants[key] = value;
+        }
+
+        /*
+         For INTERNAL USE by CompositionAnimation ONLY, we DON'T support expression
+         paths like SomeParam.SomePropertyObject.SomeValue
+        */
+        internal void Set(string key, CompositionObject obj)
+        {
+            _objects[key] = obj ?? throw new ArgumentNullException(nameof(obj));
+            _variants.Remove(key);
+        }
+        
+        public void InsertColor(string propertyName, Avalonia.Media.Color value) => Set(propertyName, value);
+
+        public void InsertMatrix3x2(string propertyName, Matrix3x2 value) => Set(propertyName, value);
+
+        public void InsertMatrix4x4(string propertyName, Matrix4x4 value) => Set(propertyName, value);
+
+        public void InsertQuaternion(string propertyName, Quaternion value) => Set(propertyName, value);
+
+        public void InsertScalar(string propertyName, float value) => Set(propertyName, value);
+        public void InsertVector2(string propertyName, Vector2 value) => Set(propertyName, value);
+
+        public void InsertVector3(string propertyName, Vector3 value) => Set(propertyName, value);
+
+        public void InsertVector4(string propertyName, Vector4 value) => Set(propertyName, value);
+
+
+        CompositionGetValueStatus TryGetVariant<T>(string key, out T value) where T : struct
+        {
+            value = default;
+            if (!_variants.TryGetValue(key, out var v))
+                return _objects.ContainsKey(key)
+                    ? CompositionGetValueStatus.TypeMismatch
+                    : CompositionGetValueStatus.NotFound;
+
+            return v.TryCast(out value) ? CompositionGetValueStatus.Succeeded : CompositionGetValueStatus.TypeMismatch;
+        }
+
+        public CompositionGetValueStatus TryGetColor(string propertyName, out Avalonia.Media.Color value) 
+            => TryGetVariant(propertyName, out value);
+
+        public CompositionGetValueStatus TryGetMatrix3x2(string propertyName, out Matrix3x2 value)
+            => TryGetVariant(propertyName, out value);
+
+        public CompositionGetValueStatus TryGetMatrix4x4(string propertyName, out Matrix4x4 value)
+            => TryGetVariant(propertyName, out value);
+
+        public CompositionGetValueStatus TryGetQuaternion(string propertyName, out Quaternion value)
+            => TryGetVariant(propertyName, out value);
+
+        
+        public CompositionGetValueStatus TryGetScalar(string propertyName, out float value)
+            => TryGetVariant(propertyName, out value);
+
+        public CompositionGetValueStatus TryGetVector2(string propertyName, out Vector2 value)
+            => TryGetVariant(propertyName, out value);
+
+        public CompositionGetValueStatus TryGetVector3(string propertyName, out Vector3 value)
+            => TryGetVariant(propertyName, out value);
+
+        public CompositionGetValueStatus TryGetVector4(string propertyName, out Vector4 value)
+            => TryGetVariant(propertyName, out value);
+
+
+        public void InsertBoolean(string propertyName, bool value) => Set(propertyName, value);
+
+        public CompositionGetValueStatus TryGetBoolean(string propertyName, out bool value)
+            => TryGetVariant(propertyName, out value);
+
+        internal void ClearAll()
+        {
+            _objects.Clear();
+            _variants.Clear();
+        }
+
+        internal void Clear(string key)
+        {
+            _objects.Remove(key);
+            _variants.Remove(key);
+        }
+
+        internal PropertySetSnapshot Snapshot() =>
+            SnapshotCore(1);
+        
+        private PropertySetSnapshot SnapshotCore(int allowedNestingLevel)
+        {
+            var dic = new Dictionary<string, PropertySetSnapshot.Value>(_objects.Count + _variants.Count);
+            foreach (var o in _objects)
+            {
+                if (o.Value is CompositionPropertySet ps)
+                {
+                    if (allowedNestingLevel <= 0)
+                        throw new InvalidOperationException("PropertySet depth limit reached");
+                    dic[o.Key] = new PropertySetSnapshot.Value(ps.SnapshotCore(allowedNestingLevel - 1));
+                }
+                else if (o.Value.Server == null)
+                    throw new InvalidOperationException($"Object of type {o.Value.GetType()} is not allowed");
+                else
+                    dic[o.Key] = new PropertySetSnapshot.Value(o.Value.Server);
+            }
+
+            foreach (var v in _variants)
+                dic[v.Key] = v.Value;
+            
+            return new PropertySetSnapshot(dic);
+        }
+    }
+
+    public enum CompositionGetValueStatus
+    {
+        Succeeded,
+        TypeMismatch,
+        NotFound
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
new file mode 100644
index 0000000000..d8a608651b
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Avalonia.Collections.Pooled;
+using Avalonia.VisualTree;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// Represents the composition output (e. g. a window, embedded control, entire screen)
+    /// </summary>
+    public partial class CompositionTarget
+    {
+        partial void OnRootChanged()
+        {
+            if (Root != null)
+                Root.Root = this;
+        }
+
+        partial void OnRootChanging()
+        {
+            if (Root != null)
+                Root.Root = null;
+        }
+        
+        /// <summary>
+        /// Attempts to perform a hit-tst
+        /// </summary>
+        /// <param name="point"></param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public PooledList<CompositionVisual>? TryHitTest(Point point, Func<CompositionVisual, bool>? filter)
+        {
+            Server.Readback.NextRead();
+            if (Root == null)
+                return null;
+            var res = new PooledList<CompositionVisual>();
+            HitTestCore(Root, point, res, filter);
+            return res;
+        }
+
+        /// <summary>
+        /// Attempts to transform a point to a particular CompositionVisual coordinate space
+        /// </summary>
+        /// <returns></returns>
+        public Point? TryTransformToVisual(CompositionVisual visual, Point point)
+        {
+            if (visual.Root != this)
+                return null;
+            var v = visual;
+            var m = Matrix.Identity;
+            while (v != null)
+            {
+                if (!TryGetInvertedTransform(v, out var cm))
+                    return null;
+                m = m * cm;
+                v = v.Parent;
+            }
+
+            return point * m;
+        }
+
+        bool TryGetInvertedTransform(CompositionVisual visual, out Matrix matrix)
+        {
+            var m = visual.TryGetServerGlobalTransform();
+            if (m == null)
+            {
+                matrix = default;
+                return false;
+            }
+
+            var m33 = MatrixUtils.ToMatrix(m.Value);
+            return m33.TryInvert(out matrix);
+        }
+
+        bool TryTransformTo(CompositionVisual visual, Point globalPoint, out Point v)
+        {
+            v = default;
+            if (TryGetInvertedTransform(visual, out var m))
+            {
+                v = globalPoint * m;
+                return true;
+            }
+
+            return false;
+        }
+        
+        void HitTestCore(CompositionVisual visual, Point globalPoint, PooledList<CompositionVisual> result,
+            Func<CompositionVisual, bool>? filter)
+        {
+            if (visual.Visible == false)
+                return;
+            
+            if (filter != null && !filter(visual))
+                return;
+            
+            if (!TryTransformTo(visual, globalPoint, out var point))
+                return;
+
+            if (visual.ClipToBounds
+                && (point.X < 0 || point.Y < 0 || point.X > visual.Size.X || point.Y > visual.Size.Y))
+                return;
+
+            if (visual.Clip?.FillContains(point) == false)
+                return;
+            
+            // Inspect children
+            if (visual is CompositionContainerVisual cv)
+                for (var c = cv.Children.Count - 1; c >= 0; c--)
+                {
+                    var ch = cv.Children[c];
+                    HitTestCore(ch, globalPoint, result, filter);
+                }
+            
+            // Hit-test the current node
+            if (visual.HitTest(point)) 
+                result.Add(visual);
+        }
+
+        /// <summary>
+        /// Registers the composition target for explicit redraw
+        /// </summary>
+        public void RequestRedraw() => RegisterForSerialization();
+
+        /// <summary>
+        /// Performs composition directly on the UI thread 
+        /// </summary>
+        internal void ImmediateUIThreadRender()
+        {
+            Compositor.Commit();
+            Compositor.Server.Render();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs
new file mode 100644
index 0000000000..1a13d23acd
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Server;
+
+namespace Avalonia.Rendering.Composition;
+
+public partial class Compositor
+{
+    /// <summary>
+    /// Creates a new CompositionTarget
+    /// </summary>
+    /// <param name="renderTargetFactory">A factory method to create IRenderTarget to be called from the render thread</param>
+    /// <returns></returns>
+    public CompositionTarget CreateCompositionTarget(Func<IRenderTarget> renderTargetFactory)
+    {
+        return new CompositionTarget(this, new ServerCompositionTarget(_server, renderTargetFactory));
+    }
+    
+    public CompositionContainerVisual CreateContainerVisual() => new(this, new ServerCompositionContainerVisual(_server));
+        
+    public ExpressionAnimation CreateExpressionAnimation() => new ExpressionAnimation(this);
+
+    public ExpressionAnimation CreateExpressionAnimation(string expression) => new ExpressionAnimation(this)
+    {
+        Expression = expression
+    };
+
+    public ImplicitAnimationCollection CreateImplicitAnimationCollection() => new ImplicitAnimationCollection(this);
+
+    public CompositionAnimationGroup CreateAnimationGroup() => new CompositionAnimationGroup(this);
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
new file mode 100644
index 0000000000..e6b9600e45
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Numerics;
+using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// The Compositor class manages communication between UI-thread and render-thread parts of the composition engine.
+    /// It also serves as a factory to create UI-thread parts of various composition objects 
+    /// </summary>
+    public partial class Compositor
+    {
+        internal IRenderLoop Loop { get; }
+        private ServerCompositor _server;
+        private TaskCompletionSource<int>? _nextCommit;
+        private Action _commit;
+        private BatchStreamObjectPool<object?> _batchObjectPool = new();
+        private BatchStreamMemoryPool _batchMemoryPool = new();
+        private List<CompositionObject> _objectsForSerialization = new();
+        private Queue<Action<Task>> _invokeBeforeCommit = new();
+        internal ServerCompositor Server => _server;
+        private Task? _pendingBatch;
+        private readonly object _pendingBatchLock = new();
+
+        internal IEasing DefaultEasing { get; }
+        
+
+        /// <summary>
+        /// Creates a new compositor on a specified render loop that would use a particular GPU
+        /// </summary>
+        /// <param name="loop"></param>
+        /// <param name="gpu"></param>
+        public Compositor(IRenderLoop loop, IPlatformGpu? gpu)
+        {
+            Loop = loop;
+            _server = new ServerCompositor(loop, gpu, _batchObjectPool, _batchMemoryPool);
+            _commit = () => Commit();
+
+            DefaultEasing = new CubicBezierEasing(new Point(0.25f, 0.1f), new Point(0.25f, 1f));
+        }
+
+        /// <summary>
+        /// Requests pending changes in the composition objects to be serialized and sent to the render thread
+        /// </summary>
+        /// <returns>A task that completes when sent changes are applied and rendered on the render thread</returns>
+        public Task RequestCommitAsync()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            if (_nextCommit == null)
+            {
+                _nextCommit = new TaskCompletionSource<int>();
+                var pending = _pendingBatch;
+                if (pending != null)
+                {
+                    pending.ContinueWith(_ =>
+                    {
+                        Dispatcher.UIThread.Post(_commit, DispatcherPriority.Composition);
+                    });
+                }
+                else
+                    Dispatcher.UIThread.Post(_commit, DispatcherPriority.Composition);
+            }
+
+            return _nextCommit.Task;
+        }
+        
+        internal Task Commit()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            using var noPump = NonPumpingLockHelper.Use();
+            
+            _nextCommit ??= new TaskCompletionSource<int>();
+
+            while (_invokeBeforeCommit.Count > 0)
+                _invokeBeforeCommit.Dequeue()(_nextCommit.Task);
+            
+            var batch = new Batch(_nextCommit);
+            
+            using (var writer = new BatchStreamWriter(batch.Changes, _batchMemoryPool, _batchObjectPool))
+            {
+                foreach (var obj in _objectsForSerialization)
+                {
+                    writer.WriteObject(obj.Server);
+                    obj.SerializeChanges(writer);
+#if DEBUG_COMPOSITOR_SERIALIZATION
+                    writer.Write(BatchStreamDebugMarkers.ObjectEndMagic);
+                    writer.WriteObject(BatchStreamDebugMarkers.ObjectEndMarker);
+#endif
+                }
+                _objectsForSerialization.Clear();
+            }
+            
+            batch.CommitedAt = Server.Clock.Elapsed;
+            _server.EnqueueBatch(batch);
+            
+            lock (_pendingBatchLock)
+            {
+                _pendingBatch = _nextCommit.Task;
+                _pendingBatch.ContinueWith(t =>
+                {
+                    lock (_pendingBatchLock)
+                    {
+                        if (_pendingBatch == t)
+                            _pendingBatch = null;
+                    }
+                }, TaskContinuationOptions.ExecuteSynchronously);
+                _nextCommit = null;
+                
+                return _pendingBatch;
+            }
+        }
+
+        internal void RegisterForSerialization(CompositionObject compositionObject)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            _objectsForSerialization.Add(compositionObject);
+            RequestCommitAsync();
+        }
+
+        internal void InvokeBeforeNextCommit(Action<Task> action)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            _invokeBeforeCommit.Enqueue(action);
+            RequestCommitAsync();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
new file mode 100644
index 0000000000..9b9c44b95f
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
@@ -0,0 +1,26 @@
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// A node in the visual tree that can have children.
+    /// </summary>
+    public partial class CompositionContainerVisual : CompositionVisual
+    {
+        public CompositionVisualCollection Children { get; private set; } = null!;
+
+        partial void InitializeDefaultsExtra()
+        {
+            Children = new CompositionVisualCollection(this, Server.Children);
+        }
+
+        private protected override void OnRootChangedCore()
+        {
+            foreach (var ch in Children)
+                ch.Root = Root;
+            base.OnRootChangedCore();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
new file mode 100644
index 0000000000..10a7c3e360
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
@@ -0,0 +1,104 @@
+using System;
+using Avalonia.Collections.Pooled;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Drawing;
+
+/// <summary>
+/// A list of serialized drawing commands
+/// </summary>
+internal class CompositionDrawList : PooledList<IRef<IDrawOperation>>
+{
+    public Size? Size { get; set; }
+    
+    public CompositionDrawList()
+    {
+        
+    }
+
+    public CompositionDrawList(int capacity) : base(capacity)
+    {
+        
+    }
+    
+    public override void Dispose()
+    {
+        foreach(var item in this)
+            item.Dispose();
+        base.Dispose();
+    }
+
+    public CompositionDrawList Clone()
+    {
+        var clone = new CompositionDrawList(Count) { Size = Size };
+        foreach (var r in this)
+            clone.Add(r.Clone());
+        return clone;
+    }
+
+    public void Render(CompositorDrawingContextProxy canvas)
+    {
+        foreach (var cmd in this)
+        {
+            canvas.VisualBrushDrawList = (cmd.Item as BrushDrawOperation)?.Aux as CompositionDrawList;
+            cmd.Item.Render(canvas);
+        }
+
+        canvas.VisualBrushDrawList = null;
+    }
+}
+
+/// <summary>
+/// An helper class for building <see cref="CompositionDrawList"/>
+/// </summary>
+internal class CompositionDrawListBuilder
+{
+    private CompositionDrawList? _operations;
+    private bool _owns;
+
+    public void Reset(CompositionDrawList? previousOperations)
+    {
+        _operations = previousOperations;
+        _owns = false;
+    }
+
+    public int Count => _operations?.Count ?? 0;
+    public CompositionDrawList? DrawOperations => _operations;
+
+    void MakeWritable(int atIndex)
+    {
+        if(_owns)
+            return;
+        _owns = true;
+        var newOps = new CompositionDrawList(_operations?.Count ?? Math.Max(1, atIndex));
+        if (_operations != null)
+        {
+            for (var c = 0; c < atIndex; c++)
+                newOps.Add(_operations[c].Clone());
+        }
+
+        _operations = newOps;
+    }
+
+    public void ReplaceDrawOperation(int index, IDrawOperation node)
+    {
+        MakeWritable(index);
+        DrawOperations!.Add(RefCountable.Create(node));
+    }
+
+    public void AddDrawOperation(IDrawOperation node)
+    {
+        MakeWritable(Count);
+        DrawOperations!.Add(RefCountable.Create(node));
+    }
+
+    public void TrimTo(int count)
+    {
+        if (count < Count)
+            _operations!.RemoveRange(count, _operations.Count - count);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
new file mode 100644
index 0000000000..30b57883fc
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
@@ -0,0 +1,396 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Drawing;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition;
+
+/// <summary>
+/// An IDrawingContextImpl implementation that builds <see cref="CompositionDrawList"/>
+/// </summary>
+internal class CompositionDrawingContext : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
+{
+    private CompositionDrawListBuilder _builder = new();
+    private int _drawOperationIndex;
+
+    /// <inheritdoc/>
+    public Matrix Transform { get; set; } = Matrix.Identity;
+
+    /// <inheritdoc/>
+    public void Clear(Color color)
+    {
+        // Cannot clear a deferred scene.
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        // Nothing to do here since we allocate no unmanaged resources.
+    }
+
+    public void BeginUpdate(CompositionDrawList? list)
+    {
+        _builder.Reset(list);
+        _drawOperationIndex = 0;
+    }
+
+    public CompositionDrawList EndUpdate()
+    {
+        _builder.TrimTo(_drawOperationIndex);
+        return _builder.DrawOperations!;
+    }
+
+    /// <inheritdoc/>
+    public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+    {
+        var next = NextDrawAs<GeometryNode>();
+
+        if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
+        {
+            Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect,
+        BitmapInterpolationMode bitmapInterpolationMode)
+    {
+        var next = NextDrawAs<ImageNode>();
+
+        if (next == null ||
+            !next.Item.Equals(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode))
+        {
+            Add(new ImageNode(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
+    {
+        // This method is currently only used to composite layers so shouldn't be called here.
+        throw new NotSupportedException();
+    }
+
+    /// <inheritdoc/>
+    public void DrawLine(IPen pen, Point p1, Point p2)
+    {
+        var next = NextDrawAs<LineNode>();
+
+        if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
+        {
+            Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
+        BoxShadows boxShadows = default)
+    {
+        var next = NextDrawAs<RectangleNode>();
+
+        if (next == null || !next.Item.Equals(Transform, brush, pen, rect, boxShadows))
+        {
+            Add(new RectangleNode(Transform, brush, pen, rect, boxShadows, CreateChildScene(brush)));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
+    {
+        var next = NextDrawAs<ExperimentalAcrylicNode>();
+
+        if (next == null || !next.Item.Equals(Transform, material, rect))
+        {
+            Add(new ExperimentalAcrylicNode(Transform, material, rect));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
+    {
+        var next = NextDrawAs<EllipseNode>();
+
+        if (next == null || !next.Item.Equals(Transform, brush, pen, rect))
+        {
+            Add(new EllipseNode(Transform, brush, pen, rect, CreateChildScene(brush)));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    public void Custom(ICustomDrawOperation custom)
+    {
+        var next = NextDrawAs<CustomDrawOperation>();
+        if (next == null || !next.Item.Equals(Transform, custom))
+            Add(new CustomDrawOperation(custom, Transform));
+        else
+            ++_drawOperationIndex;
+    }
+
+    public object? GetFeature(Type t) => null;
+
+    /// <inheritdoc/>
+    public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+    {
+        var next = NextDrawAs<GlyphRunNode>();
+
+        if (next == null || !next.Item.Equals(Transform, foreground, glyphRun))
+        {
+            Add(new GlyphRunNode(Transform, foreground, glyphRun, CreateChildScene(foreground)));
+        }
+
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    public IDrawingContextLayerImpl CreateLayer(Size size)
+    {
+        throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
+    }
+
+    /// <inheritdoc/>
+    public void PopClip()
+    {
+        var next = NextDrawAs<ClipNode>();
+
+        if (next == null || !next.Item.Equals(null))
+        {
+            Add(new ClipNode());
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PopGeometryClip()
+    {
+        var next = NextDrawAs<GeometryClipNode>();
+
+        if (next == null || !next.Item.Equals(null))
+        {
+            Add(new GeometryClipNode());
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PopBitmapBlendMode()
+    {
+        var next = NextDrawAs<BitmapBlendModeNode>();
+
+        if (next == null || !next.Item.Equals(null))
+        {
+            Add(new BitmapBlendModeNode());
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PopOpacity()
+    {
+        var next = NextDrawAs<OpacityNode>();
+
+        if (next == null || !next.Item.Equals(null))
+        {
+            Add(new OpacityNode());
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PopOpacityMask()
+    {
+        var next = NextDrawAs<OpacityMaskNode>();
+
+        if (next == null || !next.Item.Equals(null, null))
+        {
+            Add(new OpacityMaskNode());
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PushClip(Rect clip)
+    {
+        var next = NextDrawAs<ClipNode>();
+
+        if (next == null || !next.Item.Equals(Transform, clip))
+        {
+            Add(new ClipNode(Transform, clip));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc />
+    public void PushClip(RoundedRect clip)
+    {
+        var next = NextDrawAs<ClipNode>();
+
+        if (next == null || !next.Item.Equals(Transform, clip))
+        {
+            Add(new ClipNode(Transform, clip));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PushGeometryClip(IGeometryImpl? clip)
+    {
+        if (clip is null)
+            return;
+
+        var next = NextDrawAs<GeometryClipNode>();
+
+        if (next == null || !next.Item.Equals(Transform, clip))
+        {
+            Add(new GeometryClipNode(Transform, clip));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PushOpacity(double opacity)
+    {
+        var next = NextDrawAs<OpacityNode>();
+
+        if (next == null || !next.Item.Equals(opacity))
+        {
+            Add(new OpacityNode(opacity));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PushOpacityMask(IBrush mask, Rect bounds)
+    {
+        var next = NextDrawAs<OpacityMaskNode>();
+
+        if (next == null || !next.Item.Equals(mask, bounds))
+        {
+            Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
+    {
+        var next = NextDrawAs<BitmapBlendModeNode>();
+
+        if (next == null || !next.Item.Equals(blendingMode))
+        {
+            Add(new BitmapBlendModeNode(blendingMode));
+        }
+        else
+        {
+            ++_drawOperationIndex;
+        }
+    }
+
+    private void Add<T>(T node) where T : class, IDrawOperation
+    {
+        if (_drawOperationIndex < _builder.Count)
+        {
+            _builder.ReplaceDrawOperation(_drawOperationIndex, node);
+        }
+        else
+        {
+            _builder.AddDrawOperation(node);
+        }
+
+        ++_drawOperationIndex;
+    }
+
+    private IRef<T>? NextDrawAs<T>() where T : class, IDrawOperation
+    {
+        return _drawOperationIndex < _builder.Count
+            ? _builder.DrawOperations![_drawOperationIndex] as IRef<T>
+            : null;
+    }
+    
+    private IDisposable? CreateChildScene(IBrush? brush)
+    {
+        if (brush is VisualBrush visualBrush)
+        {
+            var visual = visualBrush.Visual;
+
+            if (visual != null)
+            {
+                // TODO: This is a temporary solution to make visual brush to work like it does with DeferredRenderer
+                // We should directly reference the corresponding CompositionVisual (which should
+                // be attached to the same composition target) like UWP does.
+                // Render-able visuals shouldn't be dangling unattached
+                (visual as IVisualBrushInitialize)?.EnsureInitialized();
+                
+                var recorder = new CompositionDrawingContext();
+                recorder.BeginUpdate(null);
+                ImmediateRenderer.Render(visual, new DrawingContext(recorder));
+                var drawList = recorder.EndUpdate();
+                drawList.Size = visual.Bounds.Size;
+
+                return drawList;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs b/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
new file mode 100644
index 0000000000..5bd8e4a4d3
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
@@ -0,0 +1,16 @@
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition;
+
+/// <summary>
+/// Enables access to composition visual objects that back XAML elements in the XAML composition tree.
+/// </summary>
+public static class ElementComposition
+{
+    /// <summary>
+    /// Gets CompositionVisual that backs a Visual
+    /// </summary>
+    /// <param name="visual"></param>
+    /// <returns></returns>
+    public static CompositionVisual? GetElementVisual(Visual visual) => visual.CompositionVisual;
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Enums.cs b/src/Avalonia.Base/Rendering/Composition/Enums.cs
new file mode 100644
index 0000000000..cc37b25701
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Enums.cs
@@ -0,0 +1,122 @@
+using System;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    public enum CompositionBlendMode
+    {
+        /// <summary>No regions are enabled. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_clr.svg)</summary>
+        Clear,
+
+        /// <summary>Only the source will be present. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_src.svg)</summary>
+        Src,
+
+        /// <summary>Only the destination will be present. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_dst.svg)</summary>
+        Dst,
+
+        /// <summary>Source is placed over the destination. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_src-over.svg)</summary>
+        SrcOver,
+
+        /// <summary>Destination is placed over the source. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_dst-over.svg)</summary>
+        DstOver,
+
+        /// <summary>The source that overlaps the destination, replaces the destination. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_src-in.svg)</summary>
+        SrcIn,
+
+        /// <summary>Destination which overlaps the source, replaces the source. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_dst-in.svg)</summary>
+        DstIn,
+
+        /// <summary>Source is placed, where it falls outside of the destination. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_src-out.svg)</summary>
+        SrcOut,
+
+        /// <summary>Destination is placed, where it falls outside of the source. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_dst-out.svg)</summary>
+        DstOut,
+
+        /// <summary>Source which overlaps the destination, replaces the destination. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_src-atop.svg)</summary>
+        SrcATop,
+
+        /// <summary>Destination which overlaps the source replaces the source. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_dst-atop.svg)</summary>
+        DstATop,
+
+        /// <summary>The non-overlapping regions of source and destination are combined. [Porter Duff Compositing Operators] (https://drafts.fxtf.org/compositing-1/examples/PD_xor.svg)</summary>
+        Xor,
+
+        /// <summary>Display the sum of the source image and destination image. [Porter Duff Compositing Operators]</summary>
+        Plus,
+
+        /// <summary>Multiplies all components (= alpha and color). [Separable Blend Modes]</summary>
+        Modulate,
+
+        /// <summary>Multiplies the complements of the backdrop and source CompositionColorvalues, then complements the result. [Separable Blend Modes]</summary>
+        Screen,
+
+        /// <summary>Multiplies or screens the colors, depending on the backdrop CompositionColorvalue. [Separable Blend Modes]</summary>
+        Overlay,
+
+        /// <summary>Selects the darker of the backdrop and source colors. [Separable Blend Modes]</summary>
+        Darken,
+
+        /// <summary>Selects the lighter of the backdrop and source colors. [Separable Blend Modes]</summary>
+        Lighten,
+
+        /// <summary>Brightens the backdrop CompositionColorto reflect the source color. [Separable Blend Modes]</summary>
+        ColorDodge,
+
+        /// <summary>Darkens the backdrop CompositionColorto reflect the source color. [Separable Blend Modes]</summary>
+        ColorBurn,
+
+        /// <summary>Multiplies or screens the colors, depending on the source CompositionColorvalue. [Separable Blend Modes]</summary>
+        HardLight,
+
+        /// <summary>Darkens or lightens the colors, depending on the source CompositionColorvalue. [Separable Blend Modes]</summary>
+        SoftLight,
+
+        /// <summary>Subtracts the darker of the two constituent colors from the lighter color. [Separable Blend Modes]</summary>
+        Difference,
+
+        /// <summary>Produces an effect similar to that of the Difference mode but lower in contrast. [Separable Blend Modes]</summary>
+        Exclusion,
+
+        /// <summary>The source CompositionColoris multiplied by the destination CompositionColorand replaces the destination [Separable Blend Modes]</summary>
+        Multiply,
+
+        /// <summary>Creates a CompositionColorwith the hue of the source CompositionColorand the saturation and luminosity of the backdrop color. [Non-Separable Blend Modes]</summary>
+        Hue,
+
+        /// <summary>Creates a CompositionColorwith the saturation of the source CompositionColorand the hue and luminosity of the backdrop color. [Non-Separable Blend Modes]</summary>
+        Saturation,
+
+        /// <summary>Creates a CompositionColorwith the hue and saturation of the source CompositionColorand the luminosity of the backdrop color. [Non-Separable Blend Modes]</summary>
+        Color,
+
+        /// <summary>Creates a CompositionColorwith the luminosity of the source CompositionColorand the hue and saturation of the backdrop color. [Non-Separable Blend Modes]</summary>
+        Luminosity,
+    }
+
+    public enum CompositionGradientExtendMode
+    {
+        Clamp,
+        Wrap,
+        Mirror
+    }
+    
+    [Flags]
+    public enum CompositionTileMode
+    {
+        None = 0,
+        TileX = 1,
+        TileY = 2,
+        FlipX = 4,
+        FlipY = 8,
+        Tile = TileX | TileY,
+        Flip = FlipX | FlipY
+    }
+
+    public enum CompositionStretch
+    {
+        None = 0,
+        Fill = 1,
+        //TODO: Uniform, UniformToFill
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
new file mode 100644
index 0000000000..896ae4fc3a
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
@@ -0,0 +1,239 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    /// <summary>
+    /// Built-in functions for Foreign Function Interface available from composition animation expressions
+    /// </summary>
+    internal class BuiltInExpressionFfi : IExpressionForeignFunctionInterface
+    {
+        private readonly DelegateExpressionFfi _registry;
+
+        static float Lerp(float a, float b, float p) => p * (b - a) + a;
+
+        static Matrix3x2 Inverse(Matrix3x2 m)
+        {
+            Matrix3x2.Invert(m, out var r);
+            return r;
+        }
+
+        static Matrix4x4 Inverse(Matrix4x4 m)
+        {
+            Matrix4x4.Invert(m, out var r);
+            return r;
+        }
+
+        static float SmoothStep(float edge0, float edge1, float x)
+        {
+            var t = MathUtilities.Clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
+            return t * t * (3.0f - 2.0f * t);
+        }
+
+        static Vector2 SmoothStep(Vector2 edge0, Vector2 edge1, Vector2 x)
+        {
+            return new Vector2(
+                SmoothStep(edge0.X, edge1.X, x.X),
+                SmoothStep(edge0.Y, edge1.Y, x.Y)
+                
+                );
+        }
+        static Vector3 SmoothStep(Vector3 edge0, Vector3 edge1, Vector3 x)
+        {
+            return new Vector3(
+                SmoothStep(edge0.X, edge1.X, x.X),
+                SmoothStep(edge0.Y, edge1.Y, x.Y),
+                SmoothStep(edge0.Z, edge1.Z, x.Z)
+                
+                );
+        }
+
+        static Vector4 SmoothStep(Vector4 edge0, Vector4 edge1, Vector4 x)
+        {
+            return new Vector4(
+                SmoothStep(edge0.X, edge1.X, x.X),
+                SmoothStep(edge0.Y, edge1.Y, x.Y),
+                SmoothStep(edge0.Z, edge1.Z, x.Z),
+                SmoothStep(edge0.W, edge1.W, x.W)
+            );
+        }
+
+        private BuiltInExpressionFfi()
+        {
+            _registry = new DelegateExpressionFfi
+            {
+                {"Abs", (float f) => Math.Abs(f)},
+                {"Abs", (Vector2 v) => Vector2.Abs(v)},
+                {"Abs", (Vector3 v) => Vector3.Abs(v)},
+                {"Abs", (Vector4 v) => Vector4.Abs(v)},
+
+                {"ACos", (float f) => (float) Math.Acos(f)},
+                {"ASin", (float f) => (float) Math.Asin(f)},
+                {"ATan", (float f) => (float) Math.Atan(f)},
+                {"Ceil", (float f) => (float) Math.Ceiling(f)},
+
+                {"Clamp", (float a1, float a2, float a3) => MathUtilities.Clamp(a1, a2, a3)},
+                {"Clamp", (Vector2 a1, Vector2 a2, Vector2 a3) => Vector2.Clamp(a1, a2, a3)},
+                {"Clamp", (Vector3 a1, Vector3 a2, Vector3 a3) => Vector3.Clamp(a1, a2, a3)},
+                {"Clamp", (Vector4 a1, Vector4 a2, Vector4 a3) => Vector4.Clamp(a1, a2, a3)},
+
+                {"Concatenate", (Quaternion a1, Quaternion a2) => Quaternion.Concatenate(a1, a2)},
+                {"Cos", (float a) => (float) Math.Cos(a)},
+
+                /*
+                TODO:
+                    ColorHsl(Float h, Float s, Float l)
+                    ColorLerpHSL(Color colorTo, CompositionColorcolorFrom, Float progress)
+                */
+
+                {
+                    "ColorLerp", (Avalonia.Media.Color to, Avalonia.Media.Color from, float progress) =>
+                        ColorInterpolator.LerpRGB(to, from, progress)
+                },
+                {
+                    "ColorLerpRGB", (Avalonia.Media.Color to, Avalonia.Media.Color from, float progress) =>
+                        ColorInterpolator.LerpRGB(to, from, progress)
+                },
+                {
+                    "ColorRGB", (float a, float r, float g, float b) => Avalonia.Media.Color.FromArgb(
+                        (byte) MathUtilities.Clamp(a, 0, 255),
+                        (byte) MathUtilities.Clamp(r, 0, 255),
+                        (byte) MathUtilities.Clamp(g, 0, 255),
+                        (byte) MathUtilities.Clamp(b, 0, 255)
+                    )
+                },
+
+                {"Distance", (Vector2 a1, Vector2 a2) => Vector2.Distance(a1, a2)},
+                {"Distance", (Vector3 a1, Vector3 a2) => Vector3.Distance(a1, a2)},
+                {"Distance", (Vector4 a1, Vector4 a2) => Vector4.Distance(a1, a2)},
+
+                {"DistanceSquared", (Vector2 a1, Vector2 a2) => Vector2.DistanceSquared(a1, a2)},
+                {"DistanceSquared", (Vector3 a1, Vector3 a2) => Vector3.DistanceSquared(a1, a2)},
+                {"DistanceSquared", (Vector4 a1, Vector4 a2) => Vector4.DistanceSquared(a1, a2)},
+
+                {"Floor", (float v) => (float) Math.Floor(v)},
+
+                {"Inverse", (Matrix3x2 v) => Inverse(v)},
+                {"Inverse", (Matrix4x4 v) => Inverse(v)},
+
+
+                {"Length", (Vector2 a1) => a1.Length()},
+                {"Length", (Vector3 a1) => a1.Length()},
+                {"Length", (Vector4 a1) => a1.Length()},
+                {"Length", (Quaternion a1) => a1.Length()},
+
+                {"LengthSquared", (Vector2 a1) => a1.LengthSquared()},
+                {"LengthSquared", (Vector3 a1) => a1.LengthSquared()},
+                {"LengthSquared", (Vector4 a1) => a1.LengthSquared()},
+                {"LengthSquared", (Quaternion a1) => a1.LengthSquared()},
+
+                {"Lerp", (float a1, float a2, float a3) => Lerp(a1, a2, a3)},
+                {"Lerp", (Vector2 a1, Vector2 a2, float a3) => Vector2.Lerp(a1, a2, a3)},
+                {"Lerp", (Vector3 a1, Vector3 a2, float a3) => Vector3.Lerp(a1, a2, a3)},
+                {"Lerp", (Vector4 a1, Vector4 a2, float a3) => Vector4.Lerp(a1, a2, a3)},
+
+
+                {"Ln", (float f) => (float) Math.Log(f)},
+                {"Log10", (float f) => (float) Math.Log10(f)},
+
+                {"Matrix3x2.CreateFromScale", (Vector2 v) => Matrix3x2.CreateScale(v)},
+                {"Matrix3x2.CreateFromTranslation", (Vector2 v) => Matrix3x2.CreateTranslation(v)},
+                {"Matrix3x2.CreateRotation", (float v) => Matrix3x2.CreateRotation(v)},
+                {"Matrix3x2.CreateScale", (Vector2 v) => Matrix3x2.CreateScale(v)},
+                {"Matrix3x2.CreateSkew", (float a1, float a2, Vector2 a3) => Matrix3x2.CreateSkew(a1, a2, a3)},
+                {"Matrix3x2.CreateTranslation", (Vector2 v) => Matrix3x2.CreateScale(v)},
+                {
+                    "Matrix3x2", (float m11, float m12, float m21, float m22, float m31, float m32) =>
+                        new Matrix3x2(m11, m12, m21, m22, m31, m32)
+                },
+                {"Matrix4x4.CreateFromAxisAngle", (Vector3 v, float angle) => Matrix4x4.CreateFromAxisAngle(v, angle)},
+                {"Matrix4x4.CreateFromScale", (Vector3 v) => Matrix4x4.CreateScale(v)},
+                {"Matrix4x4.CreateFromTranslation", (Vector3 v) => Matrix4x4.CreateTranslation(v)},
+                {"Matrix4x4.CreateScale", (Vector3 v) => Matrix4x4.CreateScale(v)},
+                {"Matrix4x4.CreateTranslation", (Vector3 v) => Matrix4x4.CreateScale(v)},
+                {"Matrix4x4", (Matrix3x2 m) => new Matrix4x4(m)},
+                {
+                    "Matrix4x4",
+                    (float m11, float m12, float m13, float m14,
+                            float m21, float m22, float m23, float m24,
+                            float m31, float m32, float m33, float m34,
+                            float m41, float m42, float m43, float m44) =>
+                        new Matrix4x4(
+                            m11, m12, m13, m14,
+                            m21, m22, m23, m24,
+                            m31, m32, m33, m34,
+                            m41, m42, m43, m44)
+                },
+
+
+                {"Max", (float a1, float a2) => Math.Max(a1, a2)},
+                {"Max", (Vector2 a1, Vector2 a2) => Vector2.Max(a1, a2)},
+                {"Max", (Vector3 a1, Vector3 a2) => Vector3.Max(a1, a2)},
+                {"Max", (Vector4 a1, Vector4 a2) => Vector4.Max(a1, a2)},
+
+
+                {"Min", (float a1, float a2) => Math.Min(a1, a2)},
+                {"Min", (Vector2 a1, Vector2 a2) => Vector2.Min(a1, a2)},
+                {"Min", (Vector3 a1, Vector3 a2) => Vector3.Min(a1, a2)},
+                {"Min", (Vector4 a1, Vector4 a2) => Vector4.Min(a1, a2)},
+
+                {"Mod", (float a, float b) => a % b},
+
+                {"Normalize", (Quaternion a) => Quaternion.Normalize(a)},
+                {"Normalize", (Vector2 a) => Vector2.Normalize(a)},
+                {"Normalize", (Vector3 a) => Vector3.Normalize(a)},
+                {"Normalize", (Vector4 a) => Vector4.Normalize(a)},
+
+                {"Pow", (float a, float b) => (float) Math.Pow(a, b)},
+                {"Quaternion.CreateFromAxisAngle", (Vector3 a, float b) => Quaternion.CreateFromAxisAngle(a, b)},
+                {"Quaternion", (float a, float b, float c, float d) => new Quaternion(a, b, c, d)},
+
+                {"Round", (float a) => (float) Math.Round(a)},
+
+                {"Scale", (Matrix3x2 a, float b) => a * b},
+                {"Scale", (Matrix4x4 a, float b) => a * b},
+                {"Scale", (Vector2 a, float b) => a * b},
+                {"Scale", (Vector3 a, float b) => a * b},
+                {"Scale", (Vector4 a, float b) => a * b},
+
+                {"Sin", (float a) => (float) Math.Sin(a)},
+
+                {"SmoothStep", (float a1, float a2, float a3) => SmoothStep(a1, a2, a3)},
+                {"SmoothStep", (Vector2 a1, Vector2 a2, Vector2 a3) => SmoothStep(a1, a2, a3)},
+                {"SmoothStep", (Vector3 a1, Vector3 a2, Vector3 a3) => SmoothStep(a1, a2, a3)},
+                {"SmoothStep", (Vector4 a1, Vector4 a2, Vector4 a3) => SmoothStep(a1, a2, a3)},
+
+                // I have no idea how to do a spherical interpolation for a scalar value, so we are doing a linear one
+                {"Slerp", (float a1, float a2, float a3) => Lerp(a1, a2, a3)},
+                {"Slerp", (Quaternion a1, Quaternion a2, float a3) => Quaternion.Slerp(a1, a2, a3)},
+
+                {"Sqrt", (float a) => (float) Math.Sqrt(a)},
+                {"Square", (float a) => a * a},
+                {"Tan", (float a) => (float) Math.Tan(a)},
+
+                {"ToRadians", (float a) => (float) (a * Math.PI / 180)},
+                {"ToDegrees", (float a) => (float) (a * 180d / Math.PI)},
+
+                {"Transform", (Vector2 a, Matrix3x2 b) => Vector2.Transform(a, b)},
+                {"Transform", (Vector3 a, Matrix4x4 b) => Vector3.Transform(a, b)},
+
+                {"Vector2", (float a, float b) => new Vector2(a, b)},
+                {"Vector3", (float a, float b, float c) => new Vector3(a, b, c)},
+                {"Vector3", (Vector2 v2, float z) => new Vector3(v2, z)},
+                {"Vector4", (float a, float b, float c, float d) => new Vector4(a, b, c, d)},
+                {"Vector4", (Vector2 v2, float z, float w) => new Vector4(v2, z, w)},
+                {"Vector4", (Vector3 v3, float w) => new Vector4(v3, w)},
+            };
+        }
+
+        public bool Call(string name, IReadOnlyList<ExpressionVariant> arguments, out ExpressionVariant result) =>
+            _registry.Call(name, arguments, out result);
+
+        public static BuiltInExpressionFfi Instance { get; } = new BuiltInExpressionFfi();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
new file mode 100644
index 0000000000..c15487065c
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using Avalonia.Media;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    /// <summary>
+    /// Foreign function interface for composition animations based on calling delegates
+    /// </summary>
+    internal class DelegateExpressionFfi : IExpressionForeignFunctionInterface, IEnumerable
+    {
+        struct FfiRecord
+        {
+            public VariantType[] Types;
+            public Func<IReadOnlyList<ExpressionVariant>, ExpressionVariant> Delegate;
+        }
+
+        private readonly Dictionary<string, Dictionary<int, List<FfiRecord>>>
+            _registry = new Dictionary<string, Dictionary<int, List<FfiRecord>>>();
+
+        public bool Call(string name, IReadOnlyList<ExpressionVariant> arguments, out ExpressionVariant result)
+        {
+            result = default;
+            if (!_registry.TryGetValue(name, out var nameGroup))
+                return false;
+            if (!nameGroup.TryGetValue(arguments.Count, out var countGroup))
+                return false;
+            foreach (var record in countGroup)
+            {
+                var match = true;
+                for (var c = 0; c < arguments.Count; c++)
+                {
+                    if (record.Types[c] != arguments[c].Type)
+                    {
+                        match = false;
+                        break;
+                    }
+                }
+
+                if (match)
+                {
+                    result = record.Delegate(arguments);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        // Stub for collection initializer 
+        IEnumerator IEnumerable.GetEnumerator() => Array.Empty<object>().GetEnumerator();
+
+        void Add(string name, Func<IReadOnlyList<ExpressionVariant>, ExpressionVariant> cb,
+            params Type[] types)
+        {
+            if (!_registry.TryGetValue(name, out var nameGroup))
+                _registry[name] = nameGroup =
+                    new Dictionary<int, List<FfiRecord>>();
+            if (!nameGroup.TryGetValue(types.Length, out var countGroup))
+                nameGroup[types.Length] = countGroup = new List<FfiRecord>();
+
+            countGroup.Add(new FfiRecord
+            {
+                Types = types.Select(t => TypeMap[t]).ToArray(),
+                Delegate = cb
+            });
+        }
+
+        static readonly Dictionary<Type, VariantType> TypeMap = new Dictionary<Type, VariantType>
+        {
+            [typeof(bool)] = VariantType.Boolean,
+            [typeof(float)] = VariantType.Scalar,
+            [typeof(Vector2)] = VariantType.Vector2,
+            [typeof(Vector3)] = VariantType.Vector3,
+            [typeof(Vector4)] = VariantType.Vector4,
+            [typeof(Matrix3x2)] = VariantType.Matrix3x2,
+            [typeof(Matrix4x4)] = VariantType.Matrix4x4,
+            [typeof(Quaternion)] = VariantType.Quaternion,
+            [typeof(Color)] = VariantType.Color
+        };
+
+        public void Add<T1>(string name, Func<T1, ExpressionVariant> cb) where T1 : struct
+        {
+            Add(name, args => cb(args[0].CastOrDefault<T1>()), typeof(T1));
+        }
+
+        public void Add<T1, T2>(string name, Func<T1, T2, ExpressionVariant> cb) where T1 : struct where T2 : struct
+        {
+            Add(name, args => cb(args[0].CastOrDefault<T1>(), args[1].CastOrDefault<T2>()), typeof(T1), typeof(T2));
+        }
+
+
+        public void Add<T1, T2, T3>(string name, Func<T1, T2, T3, ExpressionVariant> cb)
+            where T1 : struct where T2 : struct where T3 : struct
+        {
+            Add(name, args => cb(args[0].CastOrDefault<T1>(), args[1].CastOrDefault<T2>(), args[2].CastOrDefault<T3>()), typeof(T1), typeof(T2),
+                typeof(T3));
+        }
+        
+        public void Add<T1, T2, T3, T4>(string name, Func<T1, T2, T3, T4, ExpressionVariant> cb)
+            where T1 : struct where T2 : struct where T3 : struct where T4 : struct
+        {
+            Add(name, args => cb(
+                    args[0].CastOrDefault<T1>(),
+                    args[1].CastOrDefault<T2>(), 
+                    args[2].CastOrDefault<T3>(),
+                    args[3].CastOrDefault<T4>()),
+                typeof(T1), typeof(T2), typeof(T3), typeof(T4));
+        }
+        
+        public void Add<T1, T2, T3, T4, T5>(string name, Func<T1, T2, T3, T4, T5, ExpressionVariant> cb)
+            where T1 : struct where T2 : struct where T3 : struct where T4 : struct where T5 : struct
+        {
+            Add(name, args => cb(
+                    args[0].CastOrDefault<T1>(),
+                    args[1].CastOrDefault<T2>(), 
+                    args[2].CastOrDefault<T3>(),
+                    args[3].CastOrDefault<T4>(),
+                    args[4].CastOrDefault<T5>()),
+                typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5));
+        }
+        
+        public void Add<T1, T2, T3, T4, T5, T6>(string name, Func<T1, T2, T3, T4, T5, T6, ExpressionVariant> cb)
+            where T1 : struct where T2 : struct where T3 : struct where T4 : struct where T5 : struct where T6 : struct
+        {
+            Add(name, args => cb(
+                    args[0].CastOrDefault<T1>(),
+                    args[1].CastOrDefault<T2>(), 
+                    args[2].CastOrDefault<T3>(),
+                    args[3].CastOrDefault<T4>(),
+                    args[4].CastOrDefault<T5>(),
+                    args[4].CastOrDefault<T6>()),
+                typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6));
+        }
+
+
+        public void Add<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(string name,
+            Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, ExpressionVariant> cb)
+            where T1 : struct
+            where T2 : struct
+            where T3 : struct
+            where T4 : struct
+            where T5 : struct
+            where T6 : struct
+            where T7 : struct
+            where T8 : struct
+            where T9 : struct
+            where T10 : struct
+            where T11 : struct
+            where T12 : struct
+            where T13 : struct
+            where T14 : struct
+            where T15 : struct
+            where T16 : struct
+        {
+            Add(name, args => cb(
+                    args[0].CastOrDefault<T1>(),
+                    args[1].CastOrDefault<T2>(),
+                    args[2].CastOrDefault<T3>(),
+                    args[3].CastOrDefault<T4>(),
+                    args[4].CastOrDefault<T5>(),
+                    args[4].CastOrDefault<T6>(),
+                    args[4].CastOrDefault<T7>(),
+                    args[4].CastOrDefault<T8>(),
+                    args[4].CastOrDefault<T9>(),
+                    args[4].CastOrDefault<T10>(),
+                    args[4].CastOrDefault<T11>(),
+                    args[4].CastOrDefault<T12>(),
+                    args[4].CastOrDefault<T13>(),
+                    args[4].CastOrDefault<T14>(),
+                    args[4].CastOrDefault<T15>(),
+                    args[4].CastOrDefault<T16>()
+                ),
+                typeof(T1), typeof(T2), typeof(T3), typeof(T4),
+                typeof(T5), typeof(T6), typeof(T7), typeof(T8),
+                typeof(T9), typeof(T10), typeof(T11), typeof(T12),
+                typeof(T13), typeof(T14), typeof(T15), typeof(T16)
+            );
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
new file mode 100644
index 0000000000..ff2069e71e
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
@@ -0,0 +1,379 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    /// <summary>
+    /// A parsed composition expression
+    /// </summary>
+    internal abstract class Expression
+    {
+        public abstract ExpressionType Type { get; }
+        public static Expression Parse(string expression)
+        {
+            return ExpressionParser.Parse(expression.AsSpan());
+        }
+
+        public abstract ExpressionVariant Evaluate(ref ExpressionEvaluationContext context);
+
+        public virtual void CollectReferences(HashSet<(string parameter, string property)> references)
+        {
+            
+        }
+
+        protected abstract string Print();
+        public override string ToString() => Print();
+
+        internal static string OperatorName(ExpressionType t)
+        {
+            var attr = typeof(ExpressionType).GetMember(t.ToString())[0]
+                .GetCustomAttribute<PrettyPrintStringAttribute>();
+            if (attr != null)
+                return attr.Name;
+            return t.ToString();
+        }
+    }
+
+    internal class PrettyPrintStringAttribute : Attribute
+    {
+        public string Name { get; }
+
+        public PrettyPrintStringAttribute(string name)
+        {
+            Name = name;
+        }
+    }
+    
+    internal enum ExpressionType
+    {
+        // Binary operators
+        [PrettyPrintString("+")]
+        Add,
+        [PrettyPrintString("-")]
+        Subtract,
+        [PrettyPrintString("/")]
+        Divide,
+        [PrettyPrintString("*")]
+        Multiply,
+        [PrettyPrintString(">")]
+        MoreThan,
+        [PrettyPrintString("<")]
+        LessThan,
+        [PrettyPrintString(">=")]
+        MoreThanOrEqual,
+        [PrettyPrintString("<=")]
+        LessThanOrEqual,
+        [PrettyPrintString("&&")]
+        LogicalAnd,
+        [PrettyPrintString("||")]
+        LogicalOr,
+        [PrettyPrintString("%")]
+        Remainder,
+        [PrettyPrintString("==")]
+        Equals,
+        [PrettyPrintString("!=")]
+        NotEquals,
+        // Unary operators
+        [PrettyPrintString("!")]
+        Not,
+        [PrettyPrintString("-")]
+        UnaryMinus,
+        // The rest
+        MemberAccess,
+        Parameter,
+        FunctionCall,
+        Keyword,
+        Constant,
+        ConditionalExpression
+    }
+
+    internal enum ExpressionKeyword
+    {
+        StartingValue,
+        CurrentValue,
+        FinalValue,
+        Target,
+        Pi,
+        True,
+        False
+    }
+
+    internal class ConditionalExpression : Expression
+    {
+        public Expression Condition { get; }
+        public Expression TruePart { get; }
+        public Expression FalsePart { get; }
+        public override ExpressionType Type => ExpressionType.ConditionalExpression;
+
+        public ConditionalExpression(Expression condition, Expression truePart, Expression falsePart)
+        {
+            Condition = condition;
+            TruePart = truePart;
+            FalsePart = falsePart;
+        }
+        
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            var cond = Condition.Evaluate(ref context);
+            if (cond.Type == VariantType.Boolean && cond.Boolean)
+                return TruePart.Evaluate(ref context);
+            return FalsePart.Evaluate(ref context);
+        }
+
+        public override void CollectReferences(HashSet<(string parameter, string property)> references)
+        {
+            Condition.CollectReferences(references);
+            TruePart.CollectReferences(references);
+            FalsePart.CollectReferences(references);
+        }
+
+        protected override string Print() => $"({Condition}) ? ({TruePart}) : ({FalsePart})";
+    }
+    
+    internal class ConstantExpression : Expression
+    {
+        public float Constant { get; }
+        public override ExpressionType Type => ExpressionType.Constant;
+
+        public ConstantExpression(float constant)
+        {
+            Constant = constant;
+        }
+
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context) => Constant;
+
+        protected override string Print() => Constant.ToString(CultureInfo.InvariantCulture);
+    }
+
+    internal class FunctionCallExpression : Expression
+    {
+        public string Name { get; }
+        public List<Expression> Parameters { get; }
+        public override ExpressionType Type => ExpressionType.FunctionCall;
+
+        public FunctionCallExpression(string name, List<Expression> parameters)
+        {
+            Name = name;
+            Parameters = parameters;
+        }
+        
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            if (context.ForeignFunctionInterface == null)
+                return default;
+            var args = new List<ExpressionVariant>();
+            foreach (var expr in Parameters)
+                args.Add(expr.Evaluate(ref context));
+            if (!context.ForeignFunctionInterface.Call(Name, args, out var res))
+                return default;
+            return res;
+        }
+
+        public override void CollectReferences(HashSet<(string parameter, string property)> references)
+        {
+            foreach(var arg in Parameters)
+                arg.CollectReferences(references);
+        }
+
+        protected override string Print()
+        {
+            return Name + "( (" + string.Join("), (", Parameters) + ") )";
+        }
+    }
+    
+    internal class MemberAccessExpression : Expression
+    {
+        public override ExpressionType Type => ExpressionType.MemberAccess;
+        public Expression Target { get; }
+        public string Member { get; }
+
+        public MemberAccessExpression(Expression target, string member)
+        {
+            Target = target;
+            Member = string.Intern(member);
+        }
+
+        public override void CollectReferences(HashSet<(string parameter, string property)> references)
+        {
+            Target.CollectReferences(references);
+            if (Target is ParameterExpression pe)
+                references.Add((pe.Name, Member));
+        }
+
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            if (Target is KeywordExpression ke
+                && ke.Keyword == ExpressionKeyword.Target)
+            {
+                return context.Target.GetProperty(Member);
+            }
+
+            if (Target is ParameterExpression pe)
+            {
+                var obj = context.Parameters?.GetObjectParameter(pe.Name);
+                if (obj != null)
+                {
+                    return obj.GetProperty(Member);
+                }
+            }
+            // Those are considered immutable
+            return Target.Evaluate(ref context).GetProperty(Member);
+        }
+
+        protected override string Print()
+        {
+            return "(" + Target.ToString() + ")." + Member;
+        }
+    }
+
+    internal class ParameterExpression : Expression
+    {
+        public string Name { get; }
+        public override ExpressionType Type => ExpressionType.Parameter;
+
+        public ParameterExpression(string name)
+        {
+            Name = name;
+        }
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            return context.Parameters?.GetParameter(Name) ?? default;
+        }
+
+        protected override string Print()
+        {
+            return "{" + Name + "}";
+        }
+    }
+
+    internal class KeywordExpression : Expression
+    {
+        public override ExpressionType Type => ExpressionType.Keyword;
+        public ExpressionKeyword Keyword { get; }
+
+        public KeywordExpression(ExpressionKeyword keyword)
+        {
+            Keyword = keyword;
+        }
+
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            if (Keyword == ExpressionKeyword.StartingValue)
+                return context.StartingValue;
+            if (Keyword == ExpressionKeyword.CurrentValue)
+                return context.CurrentValue;
+            if (Keyword == ExpressionKeyword.FinalValue)
+                return context.FinalValue;
+            if (Keyword == ExpressionKeyword.Target)
+                // should be handled by MemberAccess
+                return default;
+            if (Keyword == ExpressionKeyword.True)
+                return true;
+            if (Keyword == ExpressionKeyword.False)
+                return false;
+            if (Keyword == ExpressionKeyword.Pi)
+                return (float) Math.PI;
+            return default;
+        }
+
+        protected override string Print()
+        {
+            return "[" + Keyword + "]";
+        }
+    }
+
+    internal class UnaryExpression : Expression
+    {
+        public Expression Parameter { get; }
+        public override ExpressionType Type { get; }
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            if (Type == ExpressionType.Not)
+                return !Parameter.Evaluate(ref context);
+            if (Type == ExpressionType.UnaryMinus)
+                return -Parameter.Evaluate(ref context);
+            return default;
+        }
+
+        public override void CollectReferences(HashSet<(string parameter, string property)> references)
+        {
+            Parameter.CollectReferences(references);
+        }
+
+        protected override string Print()
+        {
+            return OperatorName(Type) + Parameter;
+        }
+
+        public UnaryExpression(Expression parameter, ExpressionType type)
+        {
+            Parameter = parameter;
+            Type = type;
+        }
+    }
+    
+    internal class BinaryExpression : Expression
+    {
+        public Expression Left { get; }
+        public Expression Right { get; }
+        public override ExpressionType Type { get; }
+        public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
+        {
+            var left = Left.Evaluate(ref context);
+            var right = Right.Evaluate(ref context);
+            if (Type == ExpressionType.Add)
+                return left + right;
+            if (Type == ExpressionType.Subtract)
+                return left - right;
+            if (Type == ExpressionType.Multiply)
+                return left * right;
+            if (Type == ExpressionType.Divide)
+                return left / right;
+            if (Type == ExpressionType.Remainder)
+                return left % right;
+            if (Type == ExpressionType.MoreThan)
+                return left > right;
+            if (Type == ExpressionType.LessThan)
+                return left < right;
+            if (Type == ExpressionType.MoreThanOrEqual)
+                return left > right;
+            if (Type == ExpressionType.LessThanOrEqual)
+                return left < right;
+            if (Type == ExpressionType.LogicalAnd)
+                return left.And(right);
+            if (Type == ExpressionType.LogicalOr)
+                return left.Or(right);
+            if (Type == ExpressionType.Equals)
+                return left.EqualsTo(right);
+            if (Type == ExpressionType.NotEquals)
+                return left.NotEqualsTo(right);
+            return default;
+        }
+
+        public override void CollectReferences(HashSet<(string parameter, string property)> references)
+        {
+            Left.CollectReferences(references);
+            Right.CollectReferences(references);
+        }
+
+        protected override string Print()
+        {
+            return "(" + Left + OperatorName(Type) + Right + ")";
+        }
+
+        public BinaryExpression(Expression left, Expression right, ExpressionType type)
+        {
+            Left = left;
+            Right = right;
+            Type = type;
+        }
+    }
+
+
+
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
new file mode 100644
index 0000000000..9086c59aad
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    internal struct ExpressionEvaluationContext
+    {
+        public ExpressionVariant StartingValue { get; set; }
+        public ExpressionVariant CurrentValue { get; set; }
+        public ExpressionVariant FinalValue { get; set; }
+        public IExpressionObject Target { get; set; }
+        public IExpressionParameterCollection Parameters { get; set; }
+        public IExpressionForeignFunctionInterface ForeignFunctionInterface { get; set; }
+    }
+
+    internal interface IExpressionObject
+    {
+        ExpressionVariant GetProperty(string name);
+    }
+
+    internal interface IExpressionParameterCollection
+    {
+        public ExpressionVariant GetParameter(string name);
+
+        public IExpressionObject GetObjectParameter(string name);
+    }
+
+    internal interface IExpressionForeignFunctionInterface
+    {
+        bool Call(string name, IReadOnlyList<ExpressionVariant> arguments, out ExpressionVariant result);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
new file mode 100644
index 0000000000..c32a7832a6
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
@@ -0,0 +1,16 @@
+using System;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    internal class ExpressionParseException : Exception
+    {
+        public int Position { get; }
+
+        public ExpressionParseException(string message, int position) : base(message)
+        {
+            Position = position;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
new file mode 100644
index 0000000000..3937d48187
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
@@ -0,0 +1,300 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+// ReSharper disable StringLiteralTypo
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    internal class ExpressionParser
+    {
+        public static Expression Parse(ReadOnlySpan<char> s)
+        {
+            var p = new TokenParser(s);
+            var parsed = ParseTillTerminator(ref p, "", false, false, out _);
+            p.SkipWhitespace();
+            if (p.Length != 0)
+                throw new ExpressionParseException("Unexpected data ", p.Position);
+            return parsed;
+        }
+
+        private static ReadOnlySpan<char> Dot => ".".AsSpan();
+        static bool TryParseAtomic(ref TokenParser parser, 
+            [MaybeNullWhen(returnValue: false)] out Expression expr)
+        {
+            // We can parse keywords, parameter names and constants
+            expr = null;
+            if (parser.TryParseKeywordLowerCase("this.startingvalue"))
+                expr = new KeywordExpression(ExpressionKeyword.StartingValue);
+            else if(parser.TryParseKeywordLowerCase("this.currentvalue"))
+                expr = new KeywordExpression(ExpressionKeyword.CurrentValue);
+            else if(parser.TryParseKeywordLowerCase("this.finalvalue"))
+                expr = new KeywordExpression(ExpressionKeyword.FinalValue);
+            else if(parser.TryParseKeywordLowerCase("pi"))
+                expr = new KeywordExpression(ExpressionKeyword.Pi);
+            else if(parser.TryParseKeywordLowerCase("true"))
+                expr = new KeywordExpression(ExpressionKeyword.True);
+            else if(parser.TryParseKeywordLowerCase("false"))
+                expr = new KeywordExpression(ExpressionKeyword.False);
+            else if (parser.TryParseKeywordLowerCase("this.target"))
+                expr = new KeywordExpression(ExpressionKeyword.Target);
+
+            if (expr != null)
+                return true;
+
+            if (parser.TryParseIdentifier(out var identifier))
+            {
+                expr = new ParameterExpression(identifier.ToString());
+                return true;
+            }
+
+            if(parser.TryParseFloat(out var scalar))
+            {
+                expr = new ConstantExpression(scalar);
+                return true;
+            }
+
+            return false;
+
+        }
+
+        static bool TryParseOperator(ref TokenParser parser, out ExpressionType op)
+        {
+            op = (ExpressionType) (-1);
+            if (parser.TryConsume("||"))
+                op = ExpressionType.LogicalOr;
+            else if (parser.TryConsume("&&"))
+                op = ExpressionType.LogicalAnd;
+            else if (parser.TryConsume(">="))
+                op = ExpressionType.MoreThanOrEqual;
+            else if (parser.TryConsume("<="))
+                op = ExpressionType.LessThanOrEqual;
+            else if (parser.TryConsume("=="))
+                op = ExpressionType.Equals;
+            else if (parser.TryConsume("!="))
+                op = ExpressionType.NotEquals;
+            else if (parser.TryConsumeAny("+-/*><%".AsSpan(), out var sop))
+            {
+#pragma warning disable CS8509
+                op = sop switch
+#pragma warning restore CS8509
+                {
+                    '+' => ExpressionType.Add,
+                    '-' => ExpressionType.Subtract,
+                    '/' => ExpressionType.Divide,
+                    '*' => ExpressionType.Multiply,
+                    '<' => ExpressionType.LessThan,
+                    '>' => ExpressionType.MoreThan,
+                    '%' => ExpressionType.Remainder
+                };
+            }
+            else
+                return false;
+
+            return true;
+        }
+
+
+        struct ExpressionOperatorGroup
+        {
+            private List<Expression> _expressions;
+            private List<ExpressionType> _operators;
+            private Expression? _first;
+
+            public bool NotEmpty => !Empty;
+            public bool Empty => _expressions == null && _first == null;
+
+            public void AppendFirst(Expression expr)
+            {
+                if (NotEmpty)
+                    throw new InvalidOperationException();
+                _first = expr;
+            }
+
+            public void AppendWithOperator(Expression expr, ExpressionType op)
+            {
+                if (_expressions == null)
+                {
+                    if (_first == null)
+                        throw new InvalidOperationException();
+                    _expressions = new List<Expression>();
+                    _expressions.Add(_first);
+                    _first = null;
+                    _operators = new List<ExpressionType>();
+                }
+                _expressions.Add(expr);
+                _operators.Add(op);
+            }
+
+            // https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/
+            private static readonly ExpressionType[][] OperatorPrecedenceGroups = new[]
+            {
+                // multiplicative
+                new[] {ExpressionType.Multiply, ExpressionType.Divide, ExpressionType.Remainder},
+                // additive
+                new[] {ExpressionType.Add, ExpressionType.Subtract},
+                // relational
+                new[] {ExpressionType.MoreThan, ExpressionType.MoreThanOrEqual, ExpressionType.LessThan, ExpressionType.LessThanOrEqual},
+                // equality
+                new[] {ExpressionType.Equals, ExpressionType.NotEquals},
+                // conditional AND
+                new[] {ExpressionType.LogicalAnd},
+                // conditional OR
+                new[]{ ExpressionType.LogicalOr},
+            };
+
+            private static readonly ExpressionType[][] OperatorPrecedenceGroupsReversed =
+                OperatorPrecedenceGroups.Reverse().ToArray();
+
+            // a*b+c [a,b,c] [*,+], call with (0, 2)
+            // ToExpression(a*b) + ToExpression(c)
+            // a+b*c -> ToExpression(a) + ToExpression(b*c)
+            Expression ToExpression(int from, int to)
+            {
+                if (to - from == 0)
+                    return _expressions[from];
+                
+                if (to - from == 1)
+                    return new BinaryExpression(_expressions[from], _expressions[to], _operators[from]);
+                
+                foreach (var grp in OperatorPrecedenceGroupsReversed)
+                {
+                    for (var c = from; c < to; c++)
+                    {
+                        var currentOperator = _operators[c];
+                        foreach(var operatorFromGroup in grp)
+                            if (currentOperator == operatorFromGroup)
+                            {
+                                // We are dividing the expression right here
+                                var left = ToExpression(from, c);
+                                var right = ToExpression(c + 1, to);
+                                return new BinaryExpression(left, right, currentOperator);
+                            }
+                    }
+                }
+
+                // We shouldn't ever get here, if we are, there is something wrong in the code
+                throw new ExpressionParseException("Expression parsing algorithm bug in ToExpression", 0);
+            }
+
+            public Expression ToExpression()
+            {
+                if (_expressions == null)
+                    return _first ?? throw new InvalidOperationException();
+                return ToExpression(0, _expressions.Count - 1);
+            }
+        }
+
+        static Expression ParseTillTerminator(ref TokenParser parser, string terminatorChars, 
+            bool throwOnTerminator,
+            bool throwOnEnd,
+            out char? token)
+        {
+            ExpressionOperatorGroup left = default;
+            token = null;
+            while (true)
+            {
+                if (parser.TryConsumeAny(terminatorChars.AsSpan(), out var consumedToken))
+                {
+                    if (throwOnTerminator || left.Empty)
+                        throw new ExpressionParseException($"Unexpected '{token}'", parser.Position - 1);
+                    token = consumedToken;
+                    return left.ToExpression();
+                }
+                parser.SkipWhitespace();
+                if (parser.Length == 0)
+                {
+                    if (throwOnEnd || left.Empty)
+                        throw new ExpressionParseException("Unexpected end of  expression", parser.Position);
+                    return left.ToExpression();
+                }
+                
+                ExpressionType? op = null;
+                if (left.NotEmpty)
+                {
+                    if (parser.TryConsume('?'))
+                    {
+                        var truePart = ParseTillTerminator(ref parser, ":",
+                            false, true, out _);
+                        // pass through the current parsing rules to consume the rest
+                        var falsePart = ParseTillTerminator(ref parser, terminatorChars, throwOnTerminator, throwOnEnd,
+                            out token);
+                        
+                        return new ConditionalExpression(left.ToExpression(), truePart, falsePart);
+                    }
+                    
+                    // We expect a binary operator here
+                    if (!TryParseOperator(ref parser, out var sop))
+                        throw new ExpressionParseException("Unexpected token", parser.Position);
+                    op = sop;
+                }
+                
+                // We expect an expression to be parsed (either due to expecting a binary operator or parsing the first part
+                var applyNegation = false;
+                while (parser.TryConsume('!')) 
+                    applyNegation = !applyNegation;
+
+                var applyUnaryMinus = false;
+                while (parser.TryConsume('-')) 
+                    applyUnaryMinus = !applyUnaryMinus;
+
+                Expression? parsed;
+                
+                if (parser.TryConsume('(')) 
+                    parsed = ParseTillTerminator(ref parser, ")", false, true, out _);
+                else if (parser.TryParseCall(out var functionName))
+                {
+                    var parameterList = new List<Expression>();
+                    while (true)
+                    {
+                        parameterList.Add(ParseTillTerminator(ref parser, ",)", false, true, out var closingToken));
+                        if (closingToken == ')')
+                            break;
+                        if (closingToken != ',')
+                            throw new ExpressionParseException("Unexpected end of the expression", parser.Position);
+                    }
+
+                    parsed = new FunctionCallExpression(functionName.ToString(), parameterList);
+                }
+                else if (TryParseAtomic(ref parser, out parsed))
+                {
+                    // do nothing
+                }
+                else
+                    throw new ExpressionParseException("Unexpected token", parser.Position);
+
+                
+                // Parse any following member accesses
+                while (parser.TryConsume('.'))
+                {
+                    if(!parser.TryParseIdentifier(out var memberName))
+                        throw new ExpressionParseException("Unexpected token", parser.Position);
+
+                    parsed = new MemberAccessExpression(parsed, memberName.ToString());
+                }
+
+                // Apply ! operator
+                if (applyNegation)
+                    parsed = new UnaryExpression(parsed, ExpressionType.Not);
+
+                if (applyUnaryMinus)
+                {
+                    if(parsed is ConstantExpression constexpr)
+                        parsed = new ConstantExpression(-constexpr.Constant);
+                    else parsed = new UnaryExpression(parsed, ExpressionType.UnaryMinus);
+                }
+
+                if (left.Empty)
+                    left.AppendFirst(parsed);
+                else
+                    left.AppendWithOperator(parsed, op!.Value);
+            }
+            
+            
+            
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
new file mode 100644
index 0000000000..e386e058df
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
@@ -0,0 +1,59 @@
+using System.Collections;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions;
+
+internal class ExpressionTrackedObjects : IEnumerable<IExpressionObject>
+{
+    private List<IExpressionObject> _list = new();
+    private HashSet<IExpressionObject> _hashSet = new();
+    
+    public void Add(IExpressionObject obj, string member)
+    {
+        if (_hashSet.Add(obj))
+            _list.Add(obj);
+    }
+
+    public void Clear()
+    {
+        _list.Clear();
+        _hashSet.Clear();
+    }
+
+    IEnumerator<IExpressionObject> IEnumerable<IExpressionObject>.GetEnumerator()
+    {
+        return _list.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return ((IEnumerable)_list).GetEnumerator();
+    }
+
+    public List<IExpressionObject>.Enumerator GetEnumerator() => _list.GetEnumerator();
+    
+    public struct Pool
+    {
+        private Stack<ExpressionTrackedObjects> _stack = new();
+
+        public Pool()
+        {
+        }
+
+        public ExpressionTrackedObjects Get()
+        {
+            if (_stack.Count > 0)
+                return _stack.Pop();
+            return new ExpressionTrackedObjects();
+        }
+
+        public void Return(ExpressionTrackedObjects obj)
+        {
+            _stack.Clear();
+            _stack.Push(obj);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
new file mode 100644
index 0000000000..6e53a138cd
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
@@ -0,0 +1,732 @@
+using System;
+using System.Globalization;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Avalonia.Media;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    internal enum VariantType
+    {
+        Invalid,
+        Boolean,
+        Scalar,
+        Double,
+        Vector2,
+        Vector3,
+        Vector4,
+        AvaloniaMatrix,
+        Matrix3x2,
+        Matrix4x4,
+        Quaternion,
+        Color
+    }
+
+    /// <summary>
+    /// A VARIANT type used in expression animations. Can represent multiple value types
+    /// </summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct ExpressionVariant
+    {
+        [FieldOffset(0)] public VariantType Type;
+
+        [FieldOffset(4)] public bool Boolean;
+        [FieldOffset(4)] public float Scalar;
+        [FieldOffset(4)] public double Double;
+        [FieldOffset(4)] public Vector2 Vector2;
+        [FieldOffset(4)] public Vector3 Vector3;
+        [FieldOffset(4)] public Vector4 Vector4;
+        [FieldOffset(4)] public Matrix AvaloniaMatrix;
+        [FieldOffset(4)] public Matrix3x2 Matrix3x2;
+        [FieldOffset(4)] public Matrix4x4 Matrix4x4;
+        [FieldOffset(4)] public Quaternion Quaternion;
+        [FieldOffset(4)] public Color Color;
+        
+
+        public ExpressionVariant GetProperty(string property)
+        {
+            if (Type == VariantType.Vector2)
+            {
+                if (ReferenceEquals(property, "X"))
+                    return Vector2.X;
+                if (ReferenceEquals(property, "Y"))
+                    return Vector2.Y;
+                return default;
+            }
+
+            if (Type == VariantType.Vector3)
+            {
+                if (ReferenceEquals(property, "X"))
+                    return Vector3.X;
+                if (ReferenceEquals(property, "Y"))
+                    return Vector3.Y;
+                if (ReferenceEquals(property, "Z"))
+                    return Vector3.Z;
+                if(ReferenceEquals(property, "XY"))
+                    return new Vector2(Vector3.X, Vector3.Y);
+                if(ReferenceEquals(property, "YX"))
+                    return new Vector2(Vector3.Y, Vector3.X);
+                if(ReferenceEquals(property, "XZ"))
+                    return new Vector2(Vector3.X, Vector3.Z);
+                if(ReferenceEquals(property, "ZX"))
+                    return new Vector2(Vector3.Z, Vector3.X);
+                if(ReferenceEquals(property, "YZ"))
+                    return new Vector2(Vector3.Y, Vector3.Z);
+                if(ReferenceEquals(property, "ZY"))
+                    return new Vector2(Vector3.Z, Vector3.Y);
+                return default;
+            }
+
+            if (Type == VariantType.Vector4)
+            {
+                if (ReferenceEquals(property, "X"))
+                    return Vector4.X;
+                if (ReferenceEquals(property, "Y"))
+                    return Vector4.Y;
+                if (ReferenceEquals(property, "Z"))
+                    return Vector4.Z;
+                if (ReferenceEquals(property, "W"))
+                    return Vector4.W;
+                return default;
+            }
+
+            if (Type == VariantType.Matrix3x2)
+            {
+                if (ReferenceEquals(property, "M11"))
+                    return Matrix3x2.M11;
+                if (ReferenceEquals(property, "M12"))
+                    return Matrix3x2.M12;
+                if (ReferenceEquals(property, "M21"))
+                    return Matrix3x2.M21;
+                if (ReferenceEquals(property, "M22"))
+                    return Matrix3x2.M22;
+                if (ReferenceEquals(property, "M31"))
+                    return Matrix3x2.M31;
+                if (ReferenceEquals(property, "M32"))
+                    return Matrix3x2.M32;
+                return default;
+            }
+            
+            if (Type == VariantType.AvaloniaMatrix)
+            {
+                if (ReferenceEquals(property, "M11"))
+                    return AvaloniaMatrix.M11;
+                if (ReferenceEquals(property, "M12"))
+                    return AvaloniaMatrix.M12;
+                if (ReferenceEquals(property, "M21"))
+                    return AvaloniaMatrix.M21;
+                if (ReferenceEquals(property, "M22"))
+                    return AvaloniaMatrix.M22;
+                if (ReferenceEquals(property, "M31"))
+                    return AvaloniaMatrix.M31;
+                if (ReferenceEquals(property, "M32"))
+                    return AvaloniaMatrix.M32;
+                return default;
+            }
+
+            if (Type == VariantType.Matrix4x4)
+            {
+                if (ReferenceEquals(property, "M11"))
+                    return Matrix4x4.M11;
+                if (ReferenceEquals(property, "M12"))
+                    return Matrix4x4.M12;
+                if (ReferenceEquals(property, "M13"))
+                    return Matrix4x4.M13;
+                if (ReferenceEquals(property, "M14"))
+                    return Matrix4x4.M14;
+                if (ReferenceEquals(property, "M21"))
+                    return Matrix4x4.M21;
+                if (ReferenceEquals(property, "M22"))
+                    return Matrix4x4.M22;
+                if (ReferenceEquals(property, "M23"))
+                    return Matrix4x4.M23;
+                if (ReferenceEquals(property, "M24"))
+                    return Matrix4x4.M24;
+                if (ReferenceEquals(property, "M31"))
+                    return Matrix4x4.M31;
+                if (ReferenceEquals(property, "M32"))
+                    return Matrix4x4.M32;
+                if (ReferenceEquals(property, "M33"))
+                    return Matrix4x4.M33;
+                if (ReferenceEquals(property, "M34"))
+                    return Matrix4x4.M34;
+                if (ReferenceEquals(property, "M41"))
+                    return Matrix4x4.M41;
+                if (ReferenceEquals(property, "M42"))
+                    return Matrix4x4.M42;
+                if (ReferenceEquals(property, "M43"))
+                    return Matrix4x4.M43;
+                if (ReferenceEquals(property, "M44"))
+                    return Matrix4x4.M44;
+                return default;
+            }
+
+            if (Type == VariantType.Quaternion)
+            {
+                if (ReferenceEquals(property, "X"))
+                    return Quaternion.X;
+                if (ReferenceEquals(property, "Y"))
+                    return Quaternion.Y;
+                if (ReferenceEquals(property, "Z"))
+                    return Quaternion.Z;
+                if (ReferenceEquals(property, "W"))
+                    return Quaternion.W;
+                return default;
+            }
+            
+            if (Type == VariantType.Color)
+            {
+                if (ReferenceEquals(property, "A"))
+                    return Color.A;
+                if (ReferenceEquals(property, "R"))
+                    return Color.R;
+                if (ReferenceEquals(property, "G"))
+                    return Color.G;
+                if (ReferenceEquals(property, "B"))
+                    return Color.B;
+                return default;
+            }
+
+            return default;
+        }
+
+        public static implicit operator ExpressionVariant(bool value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Boolean,
+                Boolean = value
+            };
+
+        public static implicit operator ExpressionVariant(float scalar) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Scalar,
+                Scalar = scalar
+            };
+        
+        public static implicit operator ExpressionVariant(double d) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Double,
+                Double = d
+            };
+
+
+        public static implicit operator ExpressionVariant(Vector2 value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Vector2,
+                Vector2 = value
+            };
+
+
+        public static implicit operator ExpressionVariant(Vector3 value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Vector3,
+                Vector3 = value
+            };
+
+
+        public static implicit operator ExpressionVariant(Vector4 value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Vector4,
+                Vector4 = value
+            };
+
+        public static implicit operator ExpressionVariant(Matrix3x2 value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Matrix3x2,
+                Matrix3x2 = value
+            };
+        
+        public static implicit operator ExpressionVariant(Matrix value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Matrix3x2,
+                AvaloniaMatrix = value
+            };
+
+        public static implicit operator ExpressionVariant(Matrix4x4 value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Matrix4x4,
+                Matrix4x4 = value
+            };
+
+        public static implicit operator ExpressionVariant(Quaternion value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Quaternion,
+                Quaternion = value
+            };
+        
+        public static implicit operator ExpressionVariant(Avalonia.Media.Color value) =>
+            new ExpressionVariant
+            {
+                Type = VariantType.Color,
+                Color = value
+            };
+
+        public static ExpressionVariant operator +(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type != right.Type || left.Type == VariantType.Invalid)
+                return default;
+
+            if (left.Type == VariantType.Scalar)
+                return left.Scalar + right.Scalar;
+            
+            if (left.Type == VariantType.Double)
+                return left.Double + right.Double;
+
+            if (left.Type == VariantType.Vector2)
+                return left.Vector2 + right.Vector2;
+
+            if (left.Type == VariantType.Vector3)
+                return left.Vector3 + right.Vector3;
+
+            if (left.Type == VariantType.Vector4)
+                return left.Vector4 + right.Vector4;
+            
+            if (left.Type == VariantType.Matrix3x2)
+                return left.Matrix3x2 + right.Matrix3x2;
+            
+            if (left.Type == VariantType.Matrix4x4)
+                return left.Matrix4x4 + right.Matrix4x4;
+            
+            if (left.Type == VariantType.Quaternion)
+                return left.Quaternion + right.Quaternion;
+            
+            return default;
+        }
+
+        public static ExpressionVariant operator -(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type != right.Type || left.Type == VariantType.Invalid)
+                return default;
+
+            if (left.Type == VariantType.Scalar)
+                return left.Scalar - right.Scalar;
+            
+            if (left.Type == VariantType.Double)
+                return left.Double - right.Double;
+
+            if (left.Type == VariantType.Vector2)
+                return left.Vector2 - right.Vector2;
+
+            if (left.Type == VariantType.Vector3)
+                return left.Vector3 - right.Vector3;
+
+            if (left.Type == VariantType.Vector4)
+                return left.Vector4 - right.Vector4;
+            
+            if (left.Type == VariantType.Matrix3x2)
+                return left.Matrix3x2 - right.Matrix3x2;
+            
+            if (left.Type == VariantType.Matrix4x4)
+                return left.Matrix4x4 - right.Matrix4x4;
+            
+            if (left.Type == VariantType.Quaternion)
+                return left.Quaternion - right.Quaternion;
+
+            return default;
+        }
+
+        public static ExpressionVariant operator -(ExpressionVariant left)
+        {
+
+            if (left.Type == VariantType.Scalar)
+                return -left.Scalar;
+            
+            if (left.Type == VariantType.Double)
+                return -left.Double;
+
+            if (left.Type == VariantType.Vector2)
+                return -left.Vector2;
+
+            if (left.Type == VariantType.Vector3)
+                return -left.Vector3;
+
+            if (left.Type == VariantType.Vector4)
+                return -left.Vector4;
+            
+            if (left.Type == VariantType.Matrix3x2)
+                return -left.Matrix3x2;
+            
+            if (left.Type == VariantType.AvaloniaMatrix)
+                return -left.AvaloniaMatrix;
+            
+            if (left.Type == VariantType.Matrix4x4)
+                return -left.Matrix4x4;
+
+            if (left.Type == VariantType.Quaternion)
+                return -left.Quaternion;
+
+            return default;
+        }
+
+        public static ExpressionVariant operator *(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type == VariantType.Invalid || right.Type == VariantType.Invalid)
+                return default;
+
+            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
+                return left.Scalar * right.Scalar;
+            
+            if (left.Type == VariantType.Double && right.Type == VariantType.Double)
+                return left.Double * right.Double;
+
+            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Vector2)
+                return left.Vector2 * right.Vector2;
+
+            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Scalar)
+                return left.Vector2 * right.Scalar;
+
+            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Vector3)
+                return left.Vector3 * right.Vector3;
+
+            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Scalar)
+                return left.Vector3 * right.Scalar;
+
+            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Vector4)
+                return left.Vector4 * right.Vector4;
+
+            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Scalar)
+                return left.Vector4 * right.Scalar;
+            
+            if (left.Type == VariantType.Matrix3x2 && right.Type == VariantType.Matrix3x2)
+                return left.Matrix3x2 * right.Matrix3x2;
+
+            if (left.Type == VariantType.Matrix3x2 && right.Type == VariantType.Scalar)
+                return left.Matrix3x2 * right.Scalar;
+            
+            if (left.Type == VariantType.AvaloniaMatrix && right.Type == VariantType.AvaloniaMatrix)
+                return left.AvaloniaMatrix * right.AvaloniaMatrix;
+            
+            if (left.Type == VariantType.Matrix4x4 && right.Type == VariantType.Matrix4x4)
+                return left.Matrix4x4 * right.Matrix4x4;
+
+            if (left.Type == VariantType.Matrix4x4 && right.Type == VariantType.Scalar)
+                return left.Matrix4x4 * right.Scalar;
+            
+            if (left.Type == VariantType.Quaternion && right.Type == VariantType.Quaternion)
+                return left.Quaternion * right.Quaternion;
+
+            if (left.Type == VariantType.Quaternion && right.Type == VariantType.Scalar)
+                return left.Quaternion * right.Scalar;
+
+            return default;
+        }
+
+        public static ExpressionVariant operator /(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type == VariantType.Invalid || right.Type == VariantType.Invalid)
+                return default;
+
+            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
+                return left.Scalar / right.Scalar;
+            
+            if (left.Type == VariantType.Double && right.Type == VariantType.Double)
+                return left.Double / right.Double;
+
+            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Vector2)
+                return left.Vector2 / right.Vector2;
+
+            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Scalar)
+                return left.Vector2 / right.Scalar;
+
+            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Vector3)
+                return left.Vector3 / right.Vector3;
+
+            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Scalar)
+                return left.Vector3 / right.Scalar;
+
+            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Vector4)
+                return left.Vector4 / right.Vector4;
+
+            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Scalar)
+                return left.Vector4 / right.Scalar;
+            
+            if (left.Type == VariantType.Quaternion && right.Type == VariantType.Quaternion)
+                return left.Quaternion / right.Quaternion;
+
+            return default;
+        }
+
+        public ExpressionVariant EqualsTo(ExpressionVariant right)
+        {
+            if (Type != right.Type || Type == VariantType.Invalid)
+                return default;
+
+            if (Type == VariantType.Scalar)
+                return Scalar == right.Scalar;
+            
+            
+            if (Type == VariantType.Double)
+                return Double == right.Double;
+
+            if (Type == VariantType.Vector2)
+                return Vector2 == right.Vector2;
+
+            if (Type == VariantType.Vector3)
+                return Vector3 == right.Vector3;
+
+            if (Type == VariantType.Vector4)
+                return Vector4 == right.Vector4;
+
+            if (Type == VariantType.Boolean)
+                return Boolean == right.Boolean;
+
+            if (Type == VariantType.Matrix3x2)
+                return Matrix3x2 == right.Matrix3x2;
+            
+            if (Type == VariantType.AvaloniaMatrix)
+                return AvaloniaMatrix == right.AvaloniaMatrix;
+
+            if (Type == VariantType.Matrix4x4)
+                return Matrix4x4 == right.Matrix4x4;
+
+            if (Type == VariantType.Quaternion)
+                return Quaternion == right.Quaternion;
+            
+            return default;
+        }
+
+        public ExpressionVariant NotEqualsTo(ExpressionVariant right)
+        {
+            var r = EqualsTo(right);
+            if (r.Type == VariantType.Boolean)
+                return !r.Boolean;
+            return default;
+        }
+
+        public static ExpressionVariant operator !(ExpressionVariant v)
+        {
+            if (v.Type == VariantType.Boolean)
+                return !v.Boolean;
+            return default;
+        }
+
+        public static ExpressionVariant operator %(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
+                return left.Scalar % right.Scalar;
+            if (left.Type == VariantType.Double && right.Type == VariantType.Double)
+                return left.Double % right.Double;
+            return default;
+        }
+
+        public static ExpressionVariant operator <(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
+                return left.Scalar < right.Scalar;
+            if (left.Type == VariantType.Double && right.Type == VariantType.Double)
+                return left.Double < right.Double;
+            return default;
+        }
+
+        public static ExpressionVariant operator >(ExpressionVariant left, ExpressionVariant right)
+        {
+            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
+                return left.Scalar > right.Scalar;
+            
+            if (left.Type == VariantType.Double && right.Type == VariantType.Double)
+                return left.Double > right.Double;
+            return default;
+        }
+
+        public ExpressionVariant And(ExpressionVariant right)
+        {
+            if (Type == VariantType.Boolean && right.Type == VariantType.Boolean)
+                return Boolean && right.Boolean;
+            return default;
+        }
+
+        public ExpressionVariant Or(ExpressionVariant right)
+        {
+            if (Type == VariantType.Boolean && right.Type == VariantType.Boolean)
+                return Boolean && right.Boolean;
+            return default;
+        }
+
+        public bool TryCast<T>(out T res) where T : struct
+        {
+            if (typeof(T) == typeof(bool))
+            {
+                if (Type == VariantType.Boolean)
+                {
+                    res = (T) (object) Boolean;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(float))
+            {
+                if (Type == VariantType.Scalar)
+                {
+                    res = (T) (object) Scalar;
+                    return true;
+                }
+            }
+            
+            if (typeof(T) == typeof(double))
+            {
+                if (Type == VariantType.Double)
+                {
+                    res = (T) (object) Double;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(Vector2))
+            {
+                if (Type == VariantType.Vector2)
+                {
+                    res = (T) (object) Vector2;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(Vector3))
+            {
+                if (Type == VariantType.Vector3)
+                {
+                    res = (T) (object) Vector3;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(Vector4))
+            {
+                if (Type == VariantType.Vector4)
+                {
+                    res = (T) (object) Vector4;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(Matrix3x2))
+            {
+                if (Type == VariantType.Matrix3x2)
+                {
+                    res = (T) (object) Matrix3x2;
+                    return true;
+                }
+            }
+            
+            if (typeof(T) == typeof(Matrix))
+            {
+                if (Type == VariantType.AvaloniaMatrix)
+                {
+                    res = (T) (object) Matrix3x2;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(Matrix4x4))
+            {
+                if (Type == VariantType.Matrix4x4)
+                {
+                    res = (T) (object) Matrix4x4;
+                    return true;
+                }
+            }
+
+            if (typeof(T) == typeof(Quaternion))
+            {
+                if (Type == VariantType.Quaternion)
+                {
+                    res = (T) (object) Quaternion;
+                    return true;
+                }
+            }
+            
+            if (typeof(T) == typeof(Avalonia.Media.Color))
+            {
+                if (Type == VariantType.Color)
+                {
+                    res = (T) (object) Color;
+                    return true;
+                }
+            }
+
+            res = default(T);
+            return false;
+        }
+
+        public static ExpressionVariant Create<T>(T v) where T : struct
+        {
+            if (typeof(T) == typeof(bool))
+                return (bool) (object) v;
+
+            if (typeof(T) == typeof(float))
+                return (float) (object) v;
+
+            if (typeof(T) == typeof(Vector2))
+                return (Vector2) (object) v;
+
+            if (typeof(T) == typeof(Vector3))
+                return (Vector3) (object) v;
+
+            if (typeof(T) == typeof(Vector4))
+                return (Vector4) (object) v;
+
+            if (typeof(T) == typeof(Matrix3x2))
+                return (Matrix3x2) (object) v;
+            
+            if (typeof(T) == typeof(Matrix))
+                return (Matrix) (object) v;
+
+            if (typeof(T) == typeof(Matrix4x4))
+                return (Matrix4x4) (object) v;
+
+            if (typeof(T) == typeof(Quaternion))
+                return (Quaternion) (object) v;
+            
+            if (typeof(T) == typeof(Avalonia.Media.Color))
+                return (Avalonia.Media.Color) (object) v;
+
+            throw new ArgumentException("Invalid variant type: " + typeof(T));
+        }
+
+        public T CastOrDefault<T>() where T : struct
+        {
+            TryCast<T>(out var r);
+            return r;
+        }
+
+        public override string ToString()
+        {
+            if (Type == VariantType.Boolean)
+                return Boolean.ToString();
+            if (Type == VariantType.Scalar)
+                return Scalar.ToString(CultureInfo.InvariantCulture);
+            if (Type == VariantType.Double)
+                return Double.ToString(CultureInfo.InvariantCulture);
+            if (Type == VariantType.Vector2)
+                return Vector2.ToString();
+            if (Type == VariantType.Vector3)
+                return Vector3.ToString();
+            if (Type == VariantType.Vector4)
+                return Vector4.ToString();
+            if (Type == VariantType.Quaternion)
+                return Quaternion.ToString();
+            if (Type == VariantType.Matrix3x2)
+                return Matrix3x2.ToString();
+            if (Type == VariantType.AvaloniaMatrix)
+                return AvaloniaMatrix.ToString();
+            if (Type == VariantType.Matrix4x4)
+                return Matrix4x4.ToString();
+            if (Type == VariantType.Color)
+                return Color.ToString();
+            if (Type == VariantType.Invalid)
+                return "Invalid";
+            return "Unknown";
+        }
+    }
+
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
new file mode 100644
index 0000000000..bb7372c375
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
@@ -0,0 +1,261 @@
+using System;
+using System.Globalization;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Expressions
+{
+    /// <summary>
+    /// Helper class for composition expression parser
+    /// </summary>
+    internal ref struct TokenParser
+    {
+        private ReadOnlySpan<char> _s;
+        public int Position { get; private set; }
+        public TokenParser(ReadOnlySpan<char> s)
+        {
+            _s = s;
+            Position = 0;
+        }
+
+        public void SkipWhitespace()
+        {
+            while (true)
+            {
+                if (_s.Length > 0 && char.IsWhiteSpace(_s[0]))
+                    Advance(1);
+                else
+                    return;
+            }
+        }
+
+        static bool IsAlphaNumeric(char ch) => (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') ||
+                                               (ch >= 'A' && ch <= 'Z');
+
+        public bool TryConsume(char c)
+        {
+            SkipWhitespace();
+            if (_s.Length == 0 || _s[0] != c)
+                return false;
+
+            Advance(1);
+            return true;
+        }
+        public bool TryConsume(string s)
+        {
+            SkipWhitespace();
+            if (_s.Length < s.Length)
+                return false;
+            for (var c = 0; c < s.Length; c++)
+            {
+                if (_s[c] != s[c])
+                    return false;
+            }
+
+            Advance(s.Length);
+            return true;
+        }
+        
+        public bool TryConsumeAny(ReadOnlySpan<char> chars, out char token)
+        {
+            SkipWhitespace();
+            token = default;
+            if (_s.Length == 0)
+                return false;
+
+            foreach (var c in chars)
+            {
+                if (c == _s[0])
+                {
+                    token = c;
+                    Advance(1);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        
+        public bool TryParseKeyword(string keyword)
+        {
+            SkipWhitespace();
+            if (keyword.Length > _s.Length)
+                return false;
+            for(var c=0; c<keyword.Length;c++)
+                if (keyword[c] != _s[c])
+                    return false;
+
+            if (_s.Length > keyword.Length && IsAlphaNumeric(_s[keyword.Length]))
+                return false;
+
+            Advance(keyword.Length);
+            return true;
+        }
+        
+        public bool TryParseKeywordLowerCase(string keywordInLowerCase)
+        {
+            SkipWhitespace();
+            if (keywordInLowerCase.Length > _s.Length)
+                return false;
+            for(var c=0; c<keywordInLowerCase.Length;c++)
+                if (keywordInLowerCase[c] != char.ToLowerInvariant(_s[c]))
+                    return false;
+            
+            if (_s.Length > keywordInLowerCase.Length && IsAlphaNumeric(_s[keywordInLowerCase.Length]))
+                return false;
+            
+            Advance(keywordInLowerCase.Length);
+            return true;
+        }
+
+        public void Advance(int c)
+        {
+            _s = _s.Slice(c);
+            Position += c;
+        }
+
+        public int Length => _s.Length;
+
+        public bool TryParseIdentifier(ReadOnlySpan<char> extraValidChars, out ReadOnlySpan<char> res)
+        {
+            res = ReadOnlySpan<char>.Empty;
+            SkipWhitespace();
+            if (_s.Length == 0)
+                return false;
+            var first = _s[0];
+            if (!((first >= 'a' && first <= 'z') || (first >= 'A' && first <= 'Z')))
+                return false;
+            int len = 1;
+            for (var c = 1; c < _s.Length; c++)
+            {
+                var ch = _s[c];
+                if (IsAlphaNumeric(ch))
+                    len++;
+                else
+                {
+                    var found = false;
+                    foreach(var vc in extraValidChars)
+                        if (vc == ch)
+                        {
+                            found = true;
+                            break;
+                        }
+
+                    if (found)
+                        len++;
+                    else
+                        break;
+                }
+            }
+
+            res = _s.Slice(0, len);
+            Advance(len);
+            return true;
+        }
+        
+        public bool TryParseIdentifier(out ReadOnlySpan<char> res)
+        {
+            res = ReadOnlySpan<char>.Empty;
+            SkipWhitespace();
+            if (_s.Length == 0)
+                return false;
+            var first = _s[0];
+            if (!((first >= 'a' && first <= 'z') || (first >= 'A' && first <= 'Z')))
+                return false;
+            int len = 1;
+            for (var c = 1; c < _s.Length; c++)
+            {
+                var ch = _s[c];
+                if (IsAlphaNumeric(ch))
+                    len++;
+                else
+                    break;
+            }
+
+            res = _s.Slice(0, len);
+            Advance(len);
+            return true;
+        }
+        
+        public bool TryParseCall(out ReadOnlySpan<char> res)
+        {
+            res = ReadOnlySpan<char>.Empty;
+            SkipWhitespace();
+            if (_s.Length == 0)
+                return false;
+            var first = _s[0];
+            if (!((first >= 'a' && first <= 'z') || (first >= 'A' && first <= 'Z')))
+                return false;
+            int len = 1;
+            for (var c = 1; c < _s.Length; c++)
+            {
+                var ch = _s[c];
+                if ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch<= 'Z') || ch == '.')
+                    len++;
+                else
+                    break;
+            }
+            
+            res = _s.Slice(0, len);
+
+            // Find '('
+            for (var c = len; c < _s.Length; c++)
+            {
+                if(char.IsWhiteSpace(_s[c]))
+                    continue;
+                if(_s[c]=='(')
+                {
+                    Advance(c + 1);
+                    return true;
+                }
+
+                return false;
+
+            }
+
+            return false;
+
+        }
+        
+        
+        public bool TryParseFloat(out float res)
+        {
+            res = 0;
+            SkipWhitespace();
+            if (_s.Length == 0)
+                return false;
+            
+            var len = 0;
+            var dotCount = 0;
+            for (var c = 0; c < _s.Length; c++)
+            {
+                var ch = _s[c];
+                if (ch >= '0' && ch <= '9')
+                    len = c + 1;
+                else if (ch == '.' && dotCount == 0)
+                {
+                    len = c + 1;
+                    dotCount++;
+                }
+                else
+                    break;
+            }
+
+            var span = _s.Slice(0, len);
+
+#if NETSTANDARD2_0
+            if (!float.TryParse(span.ToString(), NumberStyles.Number, CultureInfo.InvariantCulture, out res))
+                return false;
+#else
+            if (!float.TryParse(span, NumberStyles.Number, CultureInfo.InvariantCulture, out res))
+                return false;
+#endif
+            Advance(len);
+            return true;
+        }
+
+        public override string ToString() => _s.ToString();
+
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
new file mode 100644
index 0000000000..131a51b5e6
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
@@ -0,0 +1,8 @@
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition;
+
+internal interface ICompositionTargetDebugEvents
+{
+    void RectInvalidated(Rect rc);
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/License.md b/src/Avalonia.Base/Rendering/Composition/License.md
new file mode 100644
index 0000000000..d1b709859e
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/License.md
@@ -0,0 +1,7 @@
+Please note: Any code in this directory is excluded from the normal MIT license.
+
+This code is owned and copyright to Avalonia OU.
+
+This code may be used free of charge by any application that consumes Avalonia binary packages as a direct or indirect dependency.
+
+Explicit permission is required for any other use outside of Avalonia applications.
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs b/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
new file mode 100644
index 0000000000..3d8d5bae78
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
@@ -0,0 +1,68 @@
+using System.Numerics;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    static class MatrixUtils
+    {
+        public static Matrix4x4 ComputeTransform(Vector2 size, Vector2 anchorPoint, Vector3 centerPoint,
+            Matrix4x4 transformMatrix, Vector3 scale, float rotationAngle, Quaternion orientation, Vector3 offset)
+        {
+            // The math here follows the *observed* UWP behavior since there are no docs on how it's supposed to work
+            
+            var anchor = size * anchorPoint;
+            var  mat = Matrix4x4.CreateTranslation(-anchor.X, -anchor.Y, 0);
+
+            var center = new Vector3(centerPoint.X, centerPoint.Y, centerPoint.Z);
+
+            if (!transformMatrix.IsIdentity)
+                mat = transformMatrix * mat;
+
+
+            if (scale != new Vector3(1, 1, 1))
+                mat *= Matrix4x4.CreateScale(scale, center);
+
+            //TODO: RotationAxis support
+            if (rotationAngle != 0)
+                mat *= Matrix4x4.CreateRotationZ(rotationAngle, center);
+
+            if (orientation != Quaternion.Identity)
+            {
+                if (centerPoint != default)
+                {
+                    mat *= Matrix4x4.CreateTranslation(-center)
+                           * Matrix4x4.CreateFromQuaternion(orientation)
+                           * Matrix4x4.CreateTranslation(center);
+                }
+                else
+                    mat *= Matrix4x4.CreateFromQuaternion(orientation);
+            }
+
+            if (offset != default)
+                mat *= Matrix4x4.CreateTranslation(offset);
+
+            return mat;
+        }
+
+        public static Matrix4x4 ToMatrix4x4(Matrix matrix) =>
+            new Matrix4x4(
+                (float)matrix.M11, (float)matrix.M12, 0, (float)matrix.M13,
+                (float)matrix.M21, (float)matrix.M22, 0, (float)matrix.M23,
+                0, 0, 1, 0,
+                (float)matrix.M31, (float)matrix.M32, 0, (float)matrix.M33
+            );
+        
+        public static Matrix ToMatrix(Matrix4x4 matrix44) =>
+            new Matrix(
+                matrix44.M11,
+                matrix44.M12,
+                matrix44.M14,
+                matrix44.M21,
+                matrix44.M22,
+                matrix44.M24,
+                matrix44.M41,
+                matrix44.M42,
+                matrix44.M44);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
new file mode 100644
index 0000000000..5d63c8a4b3
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Threading;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server;
+
+internal class CompositionProperty
+{
+    private static volatile int s_NextId = 1;
+    public int Id { get; private set; }
+
+    public static CompositionProperty Register() => new()
+    {
+        Id = Interlocked.Increment(ref s_NextId)
+    };
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
new file mode 100644
index 0000000000..03859d241f
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Numerics;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Drawing;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server;
+
+/// <summary>
+/// A bunch of hacks to make the existing rendering operations and IDrawingContext
+/// to work with composition rendering infrastructure.
+/// 1) Keeps and applies the transform of the current visual since drawing operations think that
+/// they have information about the full render transform (they are not)
+/// 2) Keeps the draw list for the VisualBrush contents of the current drawing operation.
+/// </summary>
+internal class CompositorDrawingContextProxy : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
+{
+    private IDrawingContextImpl _impl;
+    private readonly VisualBrushRenderer _visualBrushRenderer;
+
+    public CompositorDrawingContextProxy(IDrawingContextImpl impl, VisualBrushRenderer visualBrushRenderer)
+    {
+        _impl = impl;
+        _visualBrushRenderer = visualBrushRenderer;
+    }
+
+    // This is a hack to make it work with the current way of handling visual brushes
+    public CompositionDrawList? VisualBrushDrawList
+    {
+        get => _visualBrushRenderer.VisualBrushDrawList;
+        set => _visualBrushRenderer.VisualBrushDrawList = value;
+    }
+    
+    public Matrix PostTransform { get; set; } = Matrix.Identity;
+    
+    public void Dispose()
+    {
+        _impl.Dispose();
+    }
+
+    Matrix _transform;    
+    public Matrix Transform
+    {
+        get => _transform;
+        set => _impl.Transform = (_transform = value) * PostTransform;
+    }
+
+    public void Clear(Color color)
+    {
+        _impl.Clear(color);
+    }
+
+    public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect,
+        BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
+    {
+        _impl.DrawBitmap(source, opacity, sourceRect, destRect, bitmapInterpolationMode);
+    }
+
+    public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+    {
+        _impl.DrawBitmap(source, opacityMask, opacityMaskRect, destRect);
+    }
+
+    public void DrawLine(IPen pen, Point p1, Point p2)
+    {
+        _impl.DrawLine(pen, p1, p2);
+    }
+
+    public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+    {
+        _impl.DrawGeometry(brush, pen, geometry);
+    }
+
+    public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect, BoxShadows boxShadows = default)
+    {
+        _impl.DrawRectangle(brush, pen, rect, boxShadows);
+    }
+
+    public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
+    {
+        _impl.DrawEllipse(brush, pen, rect);
+    }
+
+    public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+    {
+        _impl.DrawGlyphRun(foreground, glyphRun);
+    }
+
+    public IDrawingContextLayerImpl CreateLayer(Size size)
+    {
+        return _impl.CreateLayer(size);
+    }
+
+    public void PushClip(Rect clip)
+    {
+        _impl.PushClip(clip);
+    }
+
+    public void PushClip(RoundedRect clip)
+    {
+        _impl.PushClip(clip);
+    }
+
+    public void PopClip()
+    {
+        _impl.PopClip();
+    }
+
+    public void PushOpacity(double opacity)
+    {
+        _impl.PushOpacity(opacity);
+    }
+
+    public void PopOpacity()
+    {
+        _impl.PopOpacity();
+    }
+
+    public void PushOpacityMask(IBrush mask, Rect bounds)
+    {
+        _impl.PushOpacityMask(mask, bounds);
+    }
+
+    public void PopOpacityMask()
+    {
+        _impl.PopOpacityMask();
+    }
+
+    public void PushGeometryClip(IGeometryImpl clip)
+    {
+        _impl.PushGeometryClip(clip);
+    }
+
+    public void PopGeometryClip()
+    {
+        _impl.PopGeometryClip();
+    }
+
+    public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
+    {
+        _impl.PushBitmapBlendMode(blendingMode);
+    }
+
+    public void PopBitmapBlendMode()
+    {
+        _impl.PopBitmapBlendMode();
+    }
+
+    public void Custom(ICustomDrawOperation custom)
+    {
+        _impl.Custom(custom);
+    }
+
+    public object? GetFeature(Type t) => _impl.GetFeature(t);
+
+    public class VisualBrushRenderer : IVisualBrushRenderer
+    {
+        public CompositionDrawList? VisualBrushDrawList { get; set; }
+        public Size GetRenderTargetSize(IVisualBrush brush)
+        {
+            return VisualBrushDrawList?.Size ?? Size.Empty;
+        }
+
+        public void RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
+        {
+            if (VisualBrushDrawList != null)
+            {
+                foreach (var cmd in VisualBrushDrawList)
+                    cmd.Item.Render(context);
+            }
+        }
+    }
+
+    public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
+    {
+        if (_impl is IDrawingContextWithAcrylicLikeSupport acrylic) 
+            acrylic.DrawRectangle(material, rect);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
new file mode 100644
index 0000000000..06fb526736
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server;
+
+/// <summary>
+/// An FPS counter helper that can draw itself on the render thread
+/// </summary>
+internal class FpsCounter
+{
+    private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+    private int _framesThisSecond;
+    private int _totalFrames;
+    private int _fps;
+    private TimeSpan _lastFpsUpdate;
+    const int FirstChar = 32;
+    const int LastChar = 126;
+    // ASCII chars
+    private GlyphRun[] _runs = new GlyphRun[LastChar - FirstChar + 1];
+    
+    public FpsCounter(IGlyphTypeface typeface)
+    {
+        for (var c = FirstChar; c <= LastChar; c++)
+        {
+            var s = new string((char)c, 1);
+            var glyph = typeface.GetGlyph((uint)(s[0]));
+            _runs[c - FirstChar] = new GlyphRun(typeface, 18, new ReadOnlySlice<char>(s.AsMemory()), new ushort[] { glyph });
+        }
+    }
+
+    public void FpsTick() => _framesThisSecond++;
+
+    public void RenderFps(IDrawingContextImpl context, string aux)
+    {
+        var now = _stopwatch.Elapsed;
+        var elapsed = now - _lastFpsUpdate;
+
+        ++_framesThisSecond;
+        ++_totalFrames;
+
+        if (elapsed.TotalSeconds > 1)
+        {
+            _fps = (int)(_framesThisSecond / elapsed.TotalSeconds);
+            _framesThisSecond = 0;
+            _lastFpsUpdate = now;
+        }
+
+        var fpsLine = $"Frame #{_totalFrames:00000000} FPS: {_fps:000} " + aux;
+        double width = 0;
+        double height = 0;
+        foreach (var ch in fpsLine)
+        {
+            var run = _runs[ch - FirstChar];
+            width +=  run.Size.Width;
+            height = Math.Max(height, run.Size.Height);
+        }
+
+        var rect = new Rect(0, 0, width + 3, height + 3);
+
+        context.DrawRectangle(Brushes.Black, null, rect);
+
+        double offset = 0;
+        foreach (var ch in fpsLine)
+        {
+            var run = _runs[ch - FirstChar];
+            context.Transform = Matrix.CreateTranslation(offset, 0);
+            context.DrawGlyphRun(Brushes.White, run);
+            offset += run.Size.Width;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs b/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
new file mode 100644
index 0000000000..d9df176e66
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
@@ -0,0 +1,48 @@
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// A helper class used to manage the current slots for writing data from the render thread
+    /// and reading it from the UI thread.
+    /// Used mostly by hit-testing which needs to know the last transform of the visual
+    /// </summary>
+    internal class ReadbackIndices
+    {
+        private readonly object _lock = new object();
+        public int ReadIndex { get; private set; } = 0;
+        public int WriteIndex { get; private set; } = 1;
+        public int WrittenIndex { get; private set; } = 0;
+        public ulong ReadRevision { get; private set; }
+        public ulong LastWrittenRevision { get; private set; }
+        
+        public void NextRead()
+        {
+            lock (_lock)
+            {
+                if (ReadRevision < LastWrittenRevision)
+                {
+                    ReadIndex = WrittenIndex;
+                    ReadRevision = LastWrittenRevision;
+                }
+            }
+        }
+
+        public void CompleteWrite(ulong writtenRevision)
+        {
+            lock (_lock)
+            {
+                for (var c = 0; c < 3; c++)
+                {
+                    if (c != WriteIndex && c != ReadIndex)
+                    {
+                        WrittenIndex = WriteIndex;
+                        LastWrittenRevision = writtenRevision;
+                        WriteIndex = c;
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
new file mode 100644
index 0000000000..19349a5196
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
@@ -0,0 +1,46 @@
+using System.Numerics;
+using Avalonia.Platform;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// Server-side counterpart of <see cref="CompositionContainerVisual"/>.
+    /// Mostly propagates update and render calls, but is also responsible
+    /// for updating adorners in deferred manner
+    /// </summary>
+    internal partial class ServerCompositionContainerVisual : ServerCompositionVisual
+    {
+        public ServerCompositionVisualCollection Children { get; private set; } = null!;
+        
+        protected override void RenderCore(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)
+        {
+            base.RenderCore(canvas, currentTransformedClip);
+
+            foreach (var ch in Children)
+            {
+                ch.Render(canvas, currentTransformedClip);
+            }
+        }
+
+        public override void Update(ServerCompositionTarget root)
+        {
+            base.Update(root);
+            foreach (var child in Children)
+            {
+                if (child.AdornedVisual != null)
+                    root.EnqueueAdornerUpdate(child);
+                else
+                    child.Update(root);
+            }
+
+            IsDirtyComposition = false;
+        }
+
+        partial void Initialize()
+        {
+            Children = new ServerCompositionVisualCollection(Compositor);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
new file mode 100644
index 0000000000..6cbd2797f9
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Numerics;
+using Avalonia.Collections.Pooled;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Drawing;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server;
+
+/// <summary>
+/// Server-side counterpart of <see cref="CompositionDrawListVisual"/>
+/// </summary>
+internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisual
+{
+#if DEBUG
+    // This is needed for debugging purposes so we could see inspect the associated visual from debugger
+    public readonly Visual UiVisual;
+#endif
+    private CompositionDrawList? _renderCommands;
+    
+    public ServerCompositionDrawListVisual(ServerCompositor compositor, Visual v) : base(compositor)
+    {
+#if DEBUG
+        UiVisual = v;
+#endif
+    }
+
+    Rect? _contentBounds;
+
+    public override Rect OwnContentBounds
+    {
+        get
+        {
+            if (_contentBounds == null)
+            {
+                var rect = Rect.Empty;
+                if(_renderCommands!=null)
+                    foreach (var cmd in _renderCommands)
+                        rect = rect.Union(cmd.Item.Bounds);
+                _contentBounds = rect;
+            }
+
+            return _contentBounds.Value;
+        }
+    }
+
+    protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+    {
+        if (reader.Read<byte>() == 1)
+        {
+            _renderCommands?.Dispose();
+            _renderCommands = reader.ReadObject<CompositionDrawList?>();
+            _contentBounds = null;
+        }
+        base.DeserializeChangesCore(reader, commitedAt);
+    }
+
+    protected override void RenderCore(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)
+    {
+        if (_renderCommands != null)
+        {
+            _renderCommands.Render(canvas);
+        }
+        base.RenderCore(canvas, currentTransformedClip);
+    }
+    
+#if DEBUG
+    public override string ToString()
+    {
+        return UiVisual.GetType().ToString();
+    }
+#endif
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
new file mode 100644
index 0000000000..32a99fa187
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
@@ -0,0 +1,11 @@
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    internal abstract class ServerCompositionSurface : ServerObject
+    {
+        protected ServerCompositionSurface(ServerCompositor compositor) : base(compositor)
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
new file mode 100644
index 0000000000..5c1ac0312c
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -0,0 +1,230 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Threading;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// Server-side counterpart of the <see cref="CompositionTarget"/>
+    /// That's the place where we update visual transforms, track dirty rects and actually do rendering
+    /// </summary>
+    internal partial class ServerCompositionTarget : IDisposable
+    {
+        private readonly ServerCompositor _compositor;
+        private readonly Func<IRenderTarget> _renderTargetFactory;
+        private static long s_nextId = 1;
+        public long Id { get; }
+        public ulong Revision { get; private set; }
+        private IRenderTarget? _renderTarget;
+        private FpsCounter _fpsCounter = new FpsCounter(Typeface.Default.GlyphTypeface);
+        private Rect _dirtyRect;
+        private Random _random = new();
+        private Size _layerSize;
+        private IDrawingContextLayerImpl? _layer;
+        private bool _redrawRequested;
+        private bool _disposed;
+        private HashSet<ServerCompositionVisual> _attachedVisuals = new();
+        private Queue<ServerCompositionVisual> _adornerUpdateQueue = new();
+
+        public ICompositionTargetDebugEvents? DebugEvents { get; set; }
+        public ReadbackIndices Readback { get; } = new();
+        public int RenderedVisuals { get; set; }
+
+        public ServerCompositionTarget(ServerCompositor compositor, Func<IRenderTarget> renderTargetFactory) :
+            base(compositor)
+        {
+            _compositor = compositor;
+            _renderTargetFactory = renderTargetFactory;
+            Id = Interlocked.Increment(ref s_nextId);
+        }
+
+        partial void OnIsEnabledChanged()
+        {
+            if (IsEnabled)
+            {
+                _compositor.AddCompositionTarget(this);
+                foreach (var v in _attachedVisuals)
+                    v.Activate();
+            }
+            else
+            {
+                _compositor.RemoveCompositionTarget(this);
+                foreach (var v in _attachedVisuals)
+                    v.Deactivate();
+            }
+        }
+        
+        partial void DeserializeChangesExtra(BatchStreamReader c)
+        {
+            _redrawRequested = true;
+        }
+
+        public void Render()
+        {
+            if (_disposed)
+            {
+                Compositor.RemoveCompositionTarget(this);
+                return;
+            }
+
+            if (Root == null) 
+                return;
+
+            if ((_renderTarget as IRenderTargetWithCorruptionInfo)?.IsCorrupted == true)
+            {
+                _renderTarget!.Dispose();
+                _renderTarget = null;
+            }
+
+            _renderTarget ??= _renderTargetFactory();
+
+            Compositor.UpdateServerTime();
+            
+            if(_dirtyRect.IsEmpty && !_redrawRequested)
+                return;
+
+            Revision++;
+            
+            // Update happens in a separate phase to extend dirty rect if needed
+            Root.Update(this);
+
+            while (_adornerUpdateQueue.Count > 0)
+            {
+                var adorner = _adornerUpdateQueue.Dequeue();
+                adorner.Update(this);
+            }
+            
+            Readback.CompleteWrite(Revision);
+
+            _redrawRequested = false;
+            using (var targetContext = _renderTarget.CreateDrawingContext(null))
+            {
+                var layerSize = Size * Scaling;
+                if (layerSize != _layerSize || _layer == null)
+                {
+                    _layer?.Dispose();
+                    _layer = null;
+                    _layer = targetContext.CreateLayer(Size);
+                    _layerSize = layerSize;
+                }
+
+                if (!_dirtyRect.IsEmpty)
+                {
+                    var visualBrushHelper = new CompositorDrawingContextProxy.VisualBrushRenderer();
+                    using (var context = _layer.CreateDrawingContext(visualBrushHelper))
+                    {
+                        context.PushClip(_dirtyRect);
+                        context.Clear(Colors.Transparent);
+                        Root.Render(new CompositorDrawingContextProxy(context, visualBrushHelper), _dirtyRect);
+                        context.PopClip();
+                    }
+                }
+
+                targetContext.Clear(Colors.Transparent);
+                targetContext.Transform = Matrix.Identity;
+                if (_layer.CanBlit)
+                    _layer.Blit(targetContext);
+                else
+                    targetContext.DrawBitmap(RefCountable.CreateUnownedNotClonable(_layer), 1,
+                        new Rect(_layerSize),
+                        new Rect(Size), BitmapInterpolationMode.LowQuality);
+                
+                
+                if (DrawDirtyRects)
+                {
+                    targetContext.DrawRectangle(new ImmutableSolidColorBrush(
+                            new Color(30, (byte)_random.Next(255), (byte)_random.Next(255),
+                                (byte)_random.Next(255)))
+                        , null, _dirtyRect);
+                }
+
+                if (DrawFps)
+                {
+                    var nativeMem = ByteSizeHelper.ToString((ulong)(
+                        (Compositor.BatchMemoryPool.CurrentUsage + Compositor.BatchMemoryPool.CurrentPool)  *
+                                                    Compositor.BatchMemoryPool.BufferSize), false);
+                    var managedMem = ByteSizeHelper.ToString((ulong)(
+                        (Compositor.BatchObjectPool.CurrentUsage + Compositor.BatchObjectPool.CurrentPool) *
+                                                                     Compositor.BatchObjectPool.ArraySize *
+                                                                     IntPtr.Size), false);
+                    _fpsCounter.RenderFps(targetContext, $"M:{managedMem} / N:{nativeMem} R:{RenderedVisuals:0000}");
+                }
+                RenderedVisuals = 0;
+
+                _dirtyRect = Rect.Empty;
+            }
+        }
+
+        public Rect SnapToDevicePixels(Rect rect) => SnapToDevicePixels(rect, Scaling);
+        
+        private static Rect SnapToDevicePixels(Rect rect, double scale)
+        {
+            return new Rect(
+                new Point(
+                    Math.Floor(rect.X * scale) / scale,
+                    Math.Floor(rect.Y * scale) / scale),
+                new Point(
+                    Math.Ceiling(rect.Right * scale) / scale,
+                    Math.Ceiling(rect.Bottom * scale) / scale));
+        }
+        
+        public void AddDirtyRect(Rect rect)
+        {
+            if(rect.IsEmpty)
+                return;
+            var snapped = SnapToDevicePixels(rect, Scaling);
+            DebugEvents?.RectInvalidated(rect);
+            _dirtyRect = _dirtyRect.Union(snapped);
+            _redrawRequested = true;
+        }
+
+        public void Invalidate()
+        {
+            _redrawRequested = true;
+        }
+
+        public void Dispose()
+        {
+            if(_disposed)
+                return;
+            _disposed = true;
+            using (_compositor.GpuContext?.EnsureCurrent())
+            {
+                if (_layer != null)
+                {
+                    _layer.Dispose();
+                    _layer = null;
+                }
+
+                _renderTarget?.Dispose();
+                _renderTarget = null;
+            }
+            _compositor.RemoveCompositionTarget(this);
+        }
+
+        public void AddVisual(ServerCompositionVisual visual)
+        {
+            if (_attachedVisuals.Add(visual) && IsEnabled)
+                visual.Activate();
+        }
+
+        public void RemoveVisual(ServerCompositionVisual visual)
+        {
+            if (_attachedVisuals.Remove(visual) && IsEnabled)
+                visual.Deactivate();
+            if(visual.IsVisibleInFrame)
+                AddDirtyRect(visual.TransformedOwnContentBounds);
+        }
+
+        public void EnqueueAdornerUpdate(ServerCompositionVisual visual) => _adornerUpdateQueue.Enqueue(visual);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
new file mode 100644
index 0000000000..405c7879b7
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
@@ -0,0 +1,78 @@
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server;
+
+partial class ServerCompositionVisual
+{
+    protected bool IsDirtyComposition;
+    private bool _combinedTransformDirty;
+    private bool _clipSizeDirty;
+    
+    private const CompositionVisualChangedFields CompositionFieldsMask
+        = CompositionVisualChangedFields.Opacity
+          | CompositionVisualChangedFields.OpacityAnimated
+          | CompositionVisualChangedFields.OpacityMaskBrush
+          | CompositionVisualChangedFields.Clip
+          | CompositionVisualChangedFields.ClipToBounds
+          | CompositionVisualChangedFields.ClipToBoundsAnimated
+          | CompositionVisualChangedFields.Size
+          | CompositionVisualChangedFields.SizeAnimated;
+
+    private const CompositionVisualChangedFields CombinedTransformFieldsMask =
+        CompositionVisualChangedFields.Size
+        | CompositionVisualChangedFields.SizeAnimated
+        | CompositionVisualChangedFields.AnchorPoint
+        | CompositionVisualChangedFields.AnchorPointAnimated
+        | CompositionVisualChangedFields.CenterPoint
+        | CompositionVisualChangedFields.CenterPointAnimated
+        | CompositionVisualChangedFields.AdornedVisual
+        | CompositionVisualChangedFields.TransformMatrix
+        | CompositionVisualChangedFields.Scale
+        | CompositionVisualChangedFields.ScaleAnimated
+        | CompositionVisualChangedFields.RotationAngle
+        | CompositionVisualChangedFields.RotationAngleAnimated
+        | CompositionVisualChangedFields.Orientation
+        | CompositionVisualChangedFields.OrientationAnimated
+        | CompositionVisualChangedFields.Offset
+        | CompositionVisualChangedFields.OffsetAnimated;
+
+    private const CompositionVisualChangedFields ClipSizeDirtyMask =
+        CompositionVisualChangedFields.Size
+        | CompositionVisualChangedFields.SizeAnimated
+        | CompositionVisualChangedFields.ClipToBounds
+        | CompositionVisualChangedFields.ClipToBoundsAnimated;
+        
+    partial void OnFieldsDeserialized(CompositionVisualChangedFields changed)
+    {
+        if ((changed & CompositionFieldsMask) != 0)
+            IsDirtyComposition = true;
+        if ((changed & CombinedTransformFieldsMask) != 0)
+            _combinedTransformDirty = true;
+        if ((changed & ClipSizeDirtyMask) != 0)
+            _clipSizeDirty = true;
+    }
+
+    public override void NotifyAnimatedValueChanged(CompositionProperty offset)
+    {
+        base.NotifyAnimatedValueChanged(offset);
+        if (offset == s_IdOfClipToBoundsProperty
+            || offset == s_IdOfOpacityProperty
+            || offset == s_IdOfSizeProperty)
+            IsDirtyComposition = true;
+
+        if (offset == s_IdOfSizeProperty
+            || offset == s_IdOfAnchorPointProperty
+            || offset == s_IdOfCenterPointProperty
+            || offset == s_IdOfAdornedVisualProperty
+            || offset == s_IdOfTransformMatrixProperty
+            || offset == s_IdOfScaleProperty
+            || offset == s_IdOfRotationAngleProperty
+            || offset == s_IdOfOrientationProperty
+            || offset == s_IdOfOffsetProperty)
+            _combinedTransformDirty = true;
+        
+        if (offset == s_IdOfClipToBoundsProperty
+            || offset == s_IdOfSizeProperty)
+            _clipSizeDirty = true;
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
new file mode 100644
index 0000000000..b742f1d44a
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -0,0 +1,239 @@
+using System;
+using System.Numerics;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// Server-side <see cref="CompositionVisual"/> counterpart.
+    /// Is responsible for computing the transformation matrix, for applying various visual
+    /// properties before calling visual-specific drawing code and for notifying the
+    /// <see cref="ServerCompositionTarget"/> for new dirty rects
+    /// </summary>
+    partial class ServerCompositionVisual : ServerObject
+    {
+        private bool _isDirtyForUpdate;
+        private Rect _oldOwnContentBounds;
+        private bool _isBackface;
+        private Rect? _transformedClipBounds;
+        private Rect _combinedTransformedClipBounds;
+        
+        protected virtual void RenderCore(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)
+        {
+            
+        }
+
+        public void Render(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)
+        {
+            if(Visible == false || IsVisibleInFrame == false)
+                return;
+            if(Opacity == 0)
+                return;
+
+            currentTransformedClip = currentTransformedClip.Intersect(_combinedTransformedClipBounds);
+            if(currentTransformedClip.IsEmpty)
+                return;
+
+            Root!.RenderedVisuals++;
+            
+            var transform = GlobalTransformMatrix;
+            canvas.PostTransform = MatrixUtils.ToMatrix(transform);
+            canvas.Transform = Matrix.Identity;
+            if (Opacity != 1)
+                canvas.PushOpacity(Opacity);
+            var boundsRect = new Rect(new Size(Size.X, Size.Y));
+            if(ClipToBounds)
+                canvas.PushClip(Root!.SnapToDevicePixels(boundsRect));
+            if (Clip != null) 
+                canvas.PushGeometryClip(Clip);
+            if(OpacityMaskBrush != null)
+                canvas.PushOpacityMask(OpacityMaskBrush, boundsRect);
+            
+            RenderCore(canvas, currentTransformedClip);
+            
+            // Hack to force invalidation of SKMatrix
+            canvas.PostTransform = MatrixUtils.ToMatrix(transform);
+            canvas.Transform = Matrix.Identity;
+
+            if (OpacityMaskBrush != null)
+                canvas.PopOpacityMask();
+            if (Clip != null)
+                canvas.PopGeometryClip();
+            if (ClipToBounds)
+                canvas.PopClip();
+            if(Opacity != 1)
+                canvas.PopOpacity();
+        }
+        
+        private ReadbackData _readback0, _readback1, _readback2;
+
+        /// <summary>
+        /// Obtains "readback" data - the data that is sent from the render thread to the UI thread
+        /// in non-blocking manner. Used mostly by hit-testing
+        /// </summary>
+        public ref ReadbackData GetReadback(int idx)
+        {
+            if (idx == 0)
+                return ref _readback0;
+            if (idx == 1)
+                return ref _readback1;
+            return ref _readback2;
+        }
+        
+        public Matrix4x4 CombinedTransformMatrix { get; private set; } = Matrix4x4.Identity;
+        public Matrix4x4 GlobalTransformMatrix { get; private set; }
+
+        public virtual void Update(ServerCompositionTarget root)
+        {
+            if(Parent == null && Root == null)
+                return;
+            
+            var wasVisible = IsVisibleInFrame;
+            
+            // Calculate new parent-relative transform
+            if (_combinedTransformDirty)
+            {
+                CombinedTransformMatrix = MatrixUtils.ComputeTransform(Size, AnchorPoint, CenterPoint,
+                    // HACK: Ignore RenderTransform set by the adorner layer
+                    AdornedVisual != null ? Matrix4x4.Identity : TransformMatrix,
+                    Scale, RotationAngle, Orientation, Offset);
+                _combinedTransformDirty = false;
+            }
+
+            var parentTransform = (AdornedVisual ?? Parent)?.GlobalTransformMatrix ?? Matrix4x4.Identity;
+
+            var newTransform = CombinedTransformMatrix * parentTransform;
+            
+            // Check if visual was moved and recalculate face orientation
+            var positionChanged = false;
+            if (GlobalTransformMatrix != newTransform)
+            {
+                _isBackface = Vector3.Transform(
+                    new Vector3(0, 0, float.PositiveInfinity), GlobalTransformMatrix).Z <= 0;
+                positionChanged = true;
+            }
+
+            var oldTransformedContentBounds = TransformedOwnContentBounds;
+            var oldCombinedTransformedClipBounds = _combinedTransformedClipBounds;
+            
+            if (_parent?.IsDirtyComposition == true)
+            {
+                IsDirtyComposition = true;
+                _isDirtyForUpdate = true;
+            }
+            
+            var invalidateOldBounds = _isDirtyForUpdate;
+            var invalidateNewBounds = _isDirtyForUpdate;
+
+            GlobalTransformMatrix = newTransform;
+            
+            var ownBounds = OwnContentBounds;
+            if (ownBounds != _oldOwnContentBounds || positionChanged)
+            {
+                _oldOwnContentBounds = ownBounds;
+                if (ownBounds.IsEmpty)
+                    TransformedOwnContentBounds = default;
+                else
+                    TransformedOwnContentBounds =
+                        ownBounds.TransformToAABB(MatrixUtils.ToMatrix(GlobalTransformMatrix));
+            }
+
+            if (_clipSizeDirty || positionChanged)
+            {
+                _transformedClipBounds = ClipToBounds
+                    ? new Rect(new Size(Size.X, Size.Y))
+                        .TransformToAABB(MatrixUtils.ToMatrix(GlobalTransformMatrix))
+                    : null;
+                
+                _clipSizeDirty = false;
+            }
+            
+            _combinedTransformedClipBounds = Parent?._combinedTransformedClipBounds ?? new Rect(Root!.Size);
+            if (_transformedClipBounds != null)
+                _combinedTransformedClipBounds = _combinedTransformedClipBounds.Intersect(_transformedClipBounds.Value);
+            
+            EffectiveOpacity = Opacity * (Parent?.EffectiveOpacity ?? 1);
+
+            IsVisibleInFrame = _parent?.IsVisibleInFrame != false && Visible && EffectiveOpacity > 0.04 && !_isBackface &&
+                               !_combinedTransformedClipBounds.IsEmpty;
+
+            if (wasVisible != IsVisibleInFrame || positionChanged)
+            {
+                invalidateOldBounds |= wasVisible;
+                invalidateNewBounds |= IsVisibleInFrame;
+            }
+
+            // Invalidate new bounds
+            if (invalidateNewBounds)
+                AddDirtyRect(TransformedOwnContentBounds.Intersect(_combinedTransformedClipBounds));
+
+            if (invalidateOldBounds)
+                AddDirtyRect(oldTransformedContentBounds.Intersect(oldCombinedTransformedClipBounds));
+
+
+            _isDirtyForUpdate = false;
+            
+            // Update readback indices
+            var i = Root!.Readback;
+            ref var readback = ref GetReadback(i.WriteIndex);
+            readback.Revision = root.Revision;
+            readback.Matrix = GlobalTransformMatrix;
+            readback.TargetId = Root.Id;
+            readback.Visible = IsVisibleInFrame;
+        }
+
+        void AddDirtyRect(Rect rc)
+        {
+            if(rc == Rect.Empty)
+                return;
+            Root?.AddDirtyRect(rc);
+        }
+        
+        /// <summary>
+        /// Data that can be read from the UI thread
+        /// </summary>
+        public struct ReadbackData
+        {
+            public Matrix4x4 Matrix;
+            public ulong Revision;
+            public long TargetId;
+            public bool Visible;
+        }
+        
+        partial void DeserializeChangesExtra(BatchStreamReader c)
+        {
+            ValuesInvalidated();
+        }
+
+        partial void OnRootChanging()
+        {
+            if (Root != null)
+                Root.RemoveVisual(this);
+        }
+        
+        partial void OnRootChanged()
+        {
+            if (Root != null)
+                Root.AddVisual(this);
+        }
+        
+        protected override void ValuesInvalidated()
+        {
+            _isDirtyForUpdate = true;
+            Root?.Invalidate();
+        }
+
+        public bool IsVisibleInFrame { get; set; }
+        public double EffectiveOpacity { get; set; }
+        public Rect TransformedOwnContentBounds { get; set; }
+        public virtual Rect OwnContentBounds => new Rect(0, 0, Size.X, Size.Y);
+    }
+
+
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
new file mode 100644
index 0000000000..bfc2b2d626
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Transport;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// Server-side counterpart of the <see cref="Compositor"/>.
+    /// 1) manages deserialization of changes received from the UI thread
+    /// 2) triggers animation ticks
+    /// 3) asks composition targets to render themselves
+    /// </summary>
+    internal class ServerCompositor : IRenderLoopTask
+    {
+        private readonly IRenderLoop _renderLoop;
+        private readonly Queue<Batch> _batches = new Queue<Batch>(); 
+        public long LastBatchId { get; private set; }
+        public Stopwatch Clock { get; } = Stopwatch.StartNew();
+        public TimeSpan ServerNow { get; private set; }
+        private List<ServerCompositionTarget> _activeTargets = new();
+        private HashSet<IAnimationInstance> _activeAnimations = new();
+        private List<IAnimationInstance> _animationsToUpdate = new();
+        internal BatchStreamObjectPool<object?> BatchObjectPool;
+        internal BatchStreamMemoryPool BatchMemoryPool;
+        private object _lock = new object();
+        public IPlatformGpuContext? GpuContext { get; }
+
+        public ServerCompositor(IRenderLoop renderLoop, IPlatformGpu? platformGpu,
+            BatchStreamObjectPool<object?> batchObjectPool, BatchStreamMemoryPool batchMemoryPool)
+        {
+            GpuContext = platformGpu?.PrimaryContext;
+            _renderLoop = renderLoop;
+            BatchObjectPool = batchObjectPool;
+            BatchMemoryPool = batchMemoryPool;
+            _renderLoop.Add(this);
+        }
+
+        public void EnqueueBatch(Batch batch)
+        {
+            lock (_batches) 
+                _batches.Enqueue(batch);
+        }
+
+        internal void UpdateServerTime() => ServerNow = Clock.Elapsed;
+
+        List<Batch> _reusableToCompleteList = new();
+        void ApplyPendingBatches()
+        {
+            while (true)
+            {
+                Batch batch;
+                lock (_batches)
+                {
+                    if(_batches.Count == 0)
+                        break;
+                    batch = _batches.Dequeue();
+                }
+
+                using (var stream = new BatchStreamReader(batch.Changes, BatchMemoryPool, BatchObjectPool))
+                {
+                    while (!stream.IsObjectEof)
+                    {
+                        var target = (ServerObject)stream.ReadObject()!;
+                        target.DeserializeChanges(stream, batch);
+#if DEBUG_COMPOSITOR_SERIALIZATION
+                        if (stream.ReadObject() != BatchStreamDebugMarkers.ObjectEndMarker)
+                            throw new InvalidOperationException(
+                                $"Object {target.GetType()} failed to deserialize properly on object stream");
+                        if(stream.Read<Guid>() != BatchStreamDebugMarkers.ObjectEndMagic)
+                            throw new InvalidOperationException(
+                                $"Object {target.GetType()} failed to deserialize properly on data stream");
+#endif
+                    }
+                }
+
+                _reusableToCompleteList.Add(batch);
+                LastBatchId = batch.SequenceId;
+            }
+        }
+
+        void CompletePendingBatches()
+        {
+            foreach(var batch in _reusableToCompleteList)
+                batch.Complete();
+            _reusableToCompleteList.Clear();
+        }
+
+        bool IRenderLoopTask.NeedsUpdate => false;
+
+        void IRenderLoopTask.Update(TimeSpan time)
+        {
+        }
+
+        public void Render()
+        {
+            lock (_lock)
+            {
+                RenderCore();
+            }
+        }
+        
+        private void RenderCore()
+        {
+            ApplyPendingBatches();
+            CompletePendingBatches();
+            
+            foreach(var animation in _activeAnimations)
+                _animationsToUpdate.Add(animation);
+            
+            foreach(var animation in _animationsToUpdate)
+                animation.Invalidate();
+            
+            _animationsToUpdate.Clear();
+            
+            foreach (var t in _activeTargets)
+                t.Render();
+        }
+
+        public void AddCompositionTarget(ServerCompositionTarget target)
+        {
+            _activeTargets.Add(target);
+        }
+
+        public void RemoveCompositionTarget(ServerCompositionTarget target)
+        {
+            _activeTargets.Remove(target);
+        }
+        
+        public void AddToClock(IAnimationInstance animationInstance) =>
+            _activeAnimations.Add(animationInstance);
+
+        public void RemoveFromClock(IAnimationInstance animationInstance) =>
+            _activeAnimations.Remove(animationInstance);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
new file mode 100644
index 0000000000..08a3fdce22
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Transport;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// A server-side list container capable of receiving changes from the UI thread
+    /// Right now it's quite dumb since it always receives the full list
+    /// </summary>
+    class ServerList<T> : ServerObject where T : ServerObject
+    {
+        public List<T> List { get; } = new List<T>();
+
+        protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        {
+            if (reader.Read<byte>() == 1)
+            {
+                List.Clear();
+                var count = reader.Read<int>();
+                for (var c = 0; c < count; c++) 
+                    List.Add(reader.ReadObject<T>());
+            }
+            base.DeserializeChangesCore(reader, commitedAt);
+        }
+
+        public override long LastChangedBy
+        {
+            get
+            {
+                var seq = base.LastChangedBy;
+                foreach (var i in List)
+                    seq = Math.Max(i.LastChangedBy, seq);
+                return seq;
+            }
+        }
+
+        public List<T>.Enumerator GetEnumerator() => List.GetEnumerator();
+
+        public ServerList(ServerCompositor compositor) : base(compositor)
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
new file mode 100644
index 0000000000..257d3b29a2
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Transport;
+using Avalonia.Utilities;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Server
+{
+    /// <summary>
+    /// Server-side <see cref="CompositionObject" /> counterpart.
+    /// Is responsible for animation activation and invalidation
+    /// </summary>
+    internal abstract class ServerObject : IExpressionObject
+    {
+        public ServerCompositor Compositor { get; }
+
+        public virtual long LastChangedBy => ItselfLastChangedBy;
+        public long ItselfLastChangedBy { get; private set; }
+        private uint _activationCount;
+        public bool IsActive => _activationCount != 0;
+        private InlineDictionary<CompositionProperty, ServerObjectSubscriptionStore> _subscriptions;
+        private InlineDictionary<CompositionProperty, IAnimationInstance> _animations;
+        
+        private class ServerObjectSubscriptionStore
+        {
+            public bool IsValid;
+            public RefTrackingDictionary<IAnimationInstance>? Subscribers;
+
+            public void Invalidate()
+            {
+                if (IsValid)
+                    return;
+                IsValid = false;
+                if (Subscribers != null)
+                    foreach (var sub in Subscribers)
+                        sub.Key.Invalidate();
+            }
+        }
+            
+        public ServerObject(ServerCompositor compositor)
+        {
+            Compositor = compositor;
+        }
+
+        public virtual ExpressionVariant GetPropertyForAnimation(string name)
+        {
+            return default;
+        }
+
+        ExpressionVariant IExpressionObject.GetProperty(string name) => GetPropertyForAnimation(name);
+
+        public void Activate()
+        {
+            _activationCount++;
+            if (_activationCount == 1)
+                Activated();
+        }
+
+        public void Deactivate()
+        {
+#if DEBUG
+            if (_activationCount == 0)
+                throw new InvalidOperationException();
+#endif
+            _activationCount--;
+            if (_activationCount == 0)
+                Deactivated();
+        }
+
+        protected void Activated()
+        {
+            foreach(var kp in _animations)
+                kp.Value.Activate();
+        }
+
+        protected void Deactivated()
+        {
+            foreach(var kp in _animations)
+                kp.Value.Deactivate();
+        }
+
+        void InvalidateSubscriptions(CompositionProperty property)
+        {
+            if(_subscriptions.TryGetValue(property, out var subs))
+                subs.Invalidate();
+        }
+
+        protected void SetValue<T>(CompositionProperty prop, out T field, T value)
+        {
+            field = value;
+            InvalidateSubscriptions(prop);
+        }
+
+        protected T GetValue<T>(CompositionProperty prop, ref T field)
+        {
+            if (_subscriptions.TryGetValue(prop, out var subs))
+                subs.IsValid = true;
+            return field;
+        }
+
+        protected void SetAnimatedValue<T>(CompositionProperty prop, ref T field,
+            TimeSpan commitedAt, IAnimationInstance animation) where T : struct
+        {
+            if (IsActive && _animations.TryGetValue(prop, out var oldAnimation))
+                oldAnimation.Deactivate();
+            _animations[prop] = animation;
+            
+            animation.Initialize(commitedAt, ExpressionVariant.Create(field), prop);
+            if(IsActive)
+                animation.Activate();
+            
+            InvalidateSubscriptions(prop);
+        }
+
+        protected void SetAnimatedValue<T>(CompositionProperty property, out T field, T value)
+        {
+            if (_animations.TryGetAndRemoveValue(property, out var animation) && IsActive) 
+                animation.Deactivate();
+            field = value;
+            InvalidateSubscriptions(property);
+        }
+        
+        protected T GetAnimatedValue<T>(CompositionProperty property, ref T field) where T : struct
+        {
+            if (_subscriptions.TryGetValue(property, out var subscriptions))
+                subscriptions.IsValid = true;
+
+            if (_animations.TryGetValue(property, out var animation))
+                field = animation.Evaluate(Compositor.ServerNow, ExpressionVariant.Create(field))
+                .CastOrDefault<T>();
+
+            return field;
+        }
+        
+        public virtual void NotifyAnimatedValueChanged(CompositionProperty prop)
+        {
+            InvalidateSubscriptions(prop);
+            ValuesInvalidated();
+        }
+
+        protected virtual void ValuesInvalidated()
+        {
+            
+        }
+
+        public void SubscribeToInvalidation(CompositionProperty member, IAnimationInstance animation)
+        {
+            if (!_subscriptions.TryGetValue(member, out var store))
+                _subscriptions[member] = store = new ServerObjectSubscriptionStore();
+            if (store.Subscribers == null)
+                store.Subscribers = new();
+            store.Subscribers.AddRef(animation);
+        }
+
+        public void UnsubscribeFromInvalidation(CompositionProperty member, IAnimationInstance animation)
+        {
+            if(_subscriptions.TryGetValue(member, out var store))
+                store.Subscribers?.ReleaseRef(animation);
+        }
+
+        public virtual CompositionProperty? GetCompositionProperty(string fieldName) => null;
+
+        protected virtual void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt)
+        {
+            if (this is IDisposable disp
+                && reader.Read<byte>() == 1)
+                disp.Dispose();
+        }
+        
+        public void DeserializeChanges(BatchStreamReader reader, Batch batch)
+        {
+            DeserializeChangesCore(reader, batch.CommitedAt);
+            ValuesInvalidated();
+            ItselfLastChangedBy = batch.SequenceId;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
new file mode 100644
index 0000000000..d3e3664f84
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Transport
+{
+    /// <summary>
+    /// Represents a group of serialized changes from the UI thread to be atomically applied at the render thread
+    /// </summary>
+    internal class Batch
+    {
+        private static long _nextSequenceId = 1;
+        private static ConcurrentBag<BatchStreamData> _pool = new();
+        private readonly TaskCompletionSource<int>? _tcs;
+        public long SequenceId { get; }
+        
+        public Batch(TaskCompletionSource<int>? tcs)
+        {
+            _tcs = tcs;
+            SequenceId = Interlocked.Increment(ref _nextSequenceId);
+            if (!_pool.TryTake(out var lst))
+                lst = new BatchStreamData();
+            Changes = lst;
+        }
+
+        
+        public BatchStreamData Changes { get; private set; }
+        public TimeSpan CommitedAt { get; set; }
+        
+        public void Complete()
+        {
+            _pool.Add(Changes);
+            Changes = null!;
+
+            _tcs?.TrySetResult(0);
+        }
+
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
new file mode 100644
index 0000000000..8b68900994
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Transport;
+
+/// <summary>
+/// The batch data is separated into 2 "streams":
+/// - objects: CLR reference types that are references to either server-side or common objects
+/// - structs: blittable types like int, Matrix, Color
+/// Each "stream" consists of memory segments that are pooled 
+/// </summary>
+internal class BatchStreamData
+{
+    public Queue<BatchStreamSegment<object?[]>> Objects { get; } = new();
+    public Queue<BatchStreamSegment<IntPtr>> Structs { get; } = new();
+}
+
+public struct BatchStreamSegment<TData>
+{
+    public TData Data { get; set; }
+    public int ElementCount { get; set; }
+}
+
+internal class BatchStreamWriter : IDisposable
+{
+    private readonly BatchStreamData _output;
+    private readonly BatchStreamMemoryPool _memoryPool;
+    private readonly BatchStreamObjectPool<object?> _objectPool;
+
+    private BatchStreamSegment<object?[]?> _currentObjectSegment;
+    private BatchStreamSegment<IntPtr> _currentDataSegment;
+    
+    public BatchStreamWriter(BatchStreamData output, BatchStreamMemoryPool memoryPool, BatchStreamObjectPool<object?> objectPool)
+    {
+        _output = output;
+        _memoryPool = memoryPool;
+        _objectPool = objectPool;
+    }
+
+    void CommitDataSegment()
+    {
+        if (_currentDataSegment.Data != IntPtr.Zero)
+            _output.Structs.Enqueue(_currentDataSegment);
+        _currentDataSegment = new ();
+    }
+    
+    void NextDataSegment()
+    {
+        CommitDataSegment();
+        _currentDataSegment.Data = _memoryPool.Get();
+    }
+
+    void CommitObjectSegment()
+    {
+        if (_currentObjectSegment.Data != null)
+            _output.Objects.Enqueue(_currentObjectSegment!);
+        _currentObjectSegment = new();
+    }
+    
+    void NextObjectSegment()
+    {
+        CommitObjectSegment();
+        _currentObjectSegment.Data = _objectPool.Get();
+    }
+
+    public unsafe void Write<T>(T item) where T : unmanaged
+    {
+        var size = Unsafe.SizeOf<T>();
+        if (_currentDataSegment.Data == IntPtr.Zero || _currentDataSegment.ElementCount + size > _memoryPool.BufferSize)
+            NextDataSegment();
+        Unsafe.WriteUnaligned<T>((byte*)_currentDataSegment.Data + _currentDataSegment.ElementCount, item);
+        _currentDataSegment.ElementCount += size;
+    }
+
+    public void WriteObject(object? item)
+    {
+        if (_currentObjectSegment.Data == null ||
+            _currentObjectSegment.ElementCount >= _currentObjectSegment.Data.Length)
+            NextObjectSegment();
+        _currentObjectSegment.Data![_currentObjectSegment.ElementCount] = item;
+        _currentObjectSegment.ElementCount++;
+    }
+
+    public void Dispose()
+    {
+        CommitDataSegment();
+        CommitObjectSegment();
+    }
+}
+
+internal class BatchStreamReader : IDisposable
+{
+    private readonly BatchStreamData _input;
+    private readonly BatchStreamMemoryPool _memoryPool;
+    private readonly BatchStreamObjectPool<object?> _objectPool;
+
+    private BatchStreamSegment<object?[]?> _currentObjectSegment;
+    private BatchStreamSegment<IntPtr> _currentDataSegment;
+    private int _memoryOffset, _objectOffset;
+    
+    public BatchStreamReader(BatchStreamData input, BatchStreamMemoryPool memoryPool, BatchStreamObjectPool<object?> objectPool)
+    {
+        _input = input;
+        _memoryPool = memoryPool;
+        _objectPool = objectPool;
+    }
+
+    public unsafe T Read<T>() where T : unmanaged
+    {
+        var size = Unsafe.SizeOf<T>();
+        if (_currentDataSegment.Data == IntPtr.Zero)
+        {
+            if (_input.Structs.Count == 0)
+                throw new EndOfStreamException();
+            _currentDataSegment = _input.Structs.Dequeue();
+            _memoryOffset = 0;
+        }
+
+        if (_memoryOffset + size > _currentDataSegment.ElementCount)
+            throw new InvalidOperationException("Attempted to read more memory then left in the current segment");
+
+        var rv = Unsafe.ReadUnaligned<T>((byte*)_currentDataSegment.Data + _memoryOffset);
+        _memoryOffset += size;
+        if (_memoryOffset == _currentDataSegment.ElementCount)
+        {
+            _memoryPool.Return(_currentDataSegment.Data);
+            _currentDataSegment = new();
+        }
+
+        return rv;
+    }
+
+    public T ReadObject<T>() where T : class? => (T)ReadObject()!;
+    
+    public object? ReadObject()
+    {
+        if (_currentObjectSegment.Data == null)
+        {
+            if (_input.Objects.Count == 0)
+                throw new EndOfStreamException();
+            _currentObjectSegment = _input.Objects.Dequeue()!;
+            _objectOffset = 0;
+        }
+
+        var rv = _currentObjectSegment.Data![_objectOffset];
+        _objectOffset++;
+        if (_objectOffset == _currentObjectSegment.ElementCount)
+        {
+            _objectPool.Return(_currentObjectSegment.Data);
+            _currentObjectSegment = new();
+        }
+
+        return rv;
+    }
+
+    public bool IsObjectEof => _currentObjectSegment.Data == null && _input.Objects.Count == 0;
+    
+    public bool IsStructEof => _currentDataSegment.Data == IntPtr.Zero && _input.Structs.Count == 0;
+    
+    public void Dispose()
+    {
+        if (_currentDataSegment.Data != IntPtr.Zero)
+        {
+            _memoryPool.Return(_currentDataSegment.Data);
+            _currentDataSegment = new();
+        }
+
+        while (_input.Structs.Count > 0)
+            _memoryPool.Return(_input.Structs.Dequeue().Data);
+
+        if (_currentObjectSegment.Data != null)
+        {
+            _objectPool.Return(_currentObjectSegment.Data);
+            _currentObjectSegment = new();
+        }
+
+        while (_input.Objects.Count > 0)
+            _objectPool.Return(_input.Objects.Dequeue().Data);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
new file mode 100644
index 0000000000..f24f449551
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Transport;
+
+/// <summary>
+/// A pool that keeps a number of elements that was used in the last 10 seconds 
+/// </summary>
+internal abstract class BatchStreamPoolBase<T> : IDisposable
+{
+    readonly Stack<T> _pool = new();
+    bool _disposed;
+    int _usage;
+    readonly int[] _usageStatistics = new int[10];
+    int _usageStatisticsSlot;
+    bool _reclaimImmediately;
+
+    public int CurrentUsage => _usage;
+    public int CurrentPool => _pool.Count;
+
+    public BatchStreamPoolBase(bool needsFinalize, Action<Func<bool>>? startTimer = null)
+    {
+        if(!needsFinalize)
+            GC.SuppressFinalize(needsFinalize);
+
+        var updateRef = new WeakReference<BatchStreamPoolBase<T>>(this);
+        if (AvaloniaLocator.Current.GetService<IPlatformThreadingInterface>() == null)
+            _reclaimImmediately = true;
+        else
+            StartUpdateTimer(startTimer, updateRef);
+    }
+
+    static void StartUpdateTimer(Action<Func<bool>>? startTimer, WeakReference<BatchStreamPoolBase<T>> updateRef)
+    {
+        Func<bool> timerProc = () =>
+        {
+            if (updateRef.TryGetTarget(out var target))
+            {
+                target.UpdateStatistics();
+                return true;
+            }
+
+            return false;
+        };
+        if (startTimer != null)
+            startTimer(timerProc);
+        else
+            DispatcherTimer.Run(timerProc, TimeSpan.FromSeconds(1));
+    }
+
+    private void UpdateStatistics()
+    {
+        lock (_pool)
+        {
+            var maximumUsage = _usageStatistics.Max();
+            var recentlyUsedPooledSlots = maximumUsage - _usage;
+            var keepSlots = Math.Max(recentlyUsedPooledSlots, 10);
+            while (keepSlots < _pool.Count) 
+                DestroyItem(_pool.Pop());
+
+            _usageStatisticsSlot = (_usageStatisticsSlot + 1) % _usageStatistics.Length;
+            _usageStatistics[_usageStatisticsSlot] = 0;
+        }
+    }
+
+    protected abstract T CreateItem();
+
+    protected virtual void DestroyItem(T item)
+    {
+        
+    }
+
+    public T Get()
+    {
+        lock (_pool)
+        {
+            _usage++;
+            if (_usageStatistics[_usageStatisticsSlot] < _usage)
+                _usageStatistics[_usageStatisticsSlot] = _usage;
+            
+            if (_pool.Count != 0)
+                return _pool.Pop();
+        }
+
+        return CreateItem();
+    }
+
+    public void Return(T item)
+    {
+        lock (_pool)
+        {
+            _usage--;
+            if (!_disposed && !_reclaimImmediately)
+            {
+                _pool.Push(item);
+                return;
+            }
+        }
+        
+        DestroyItem(item);
+    }
+
+    public void Dispose()
+    {
+        lock (_pool)
+        {
+            _disposed = true;
+            foreach (var item in _pool)
+                DestroyItem(item);
+            _pool.Clear();
+        }
+    }
+
+    ~BatchStreamPoolBase()
+    {
+        Dispose();
+    }
+}
+
+internal sealed class BatchStreamObjectPool<T> : BatchStreamPoolBase<T[]> where T : class?
+{
+    public int ArraySize { get; }
+
+    public BatchStreamObjectPool(int arraySize = 128, Action<Func<bool>>? startTimer = null) : base(false, startTimer)
+    {
+        ArraySize = arraySize;
+    }
+    
+    protected override T[] CreateItem()
+    {
+        return new T[ArraySize];
+    }
+
+    protected override void DestroyItem(T[] item)
+    {
+        Array.Clear(item, 0, item.Length);
+    }
+}
+
+internal sealed class BatchStreamMemoryPool : BatchStreamPoolBase<IntPtr>
+{
+    public int BufferSize { get; }
+
+    public BatchStreamMemoryPool(int bufferSize = 1024, Action<Func<bool>>? startTimer = null) : base(true, startTimer)
+    {
+        BufferSize = bufferSize;
+    }
+    
+    protected override IntPtr CreateItem() => Marshal.AllocHGlobal(BufferSize);
+
+    protected override void DestroyItem(IntPtr item) => Marshal.FreeHGlobal(item);
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
new file mode 100644
index 0000000000..fed0f4d4aa
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
@@ -0,0 +1,11 @@
+using System;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Transport;
+
+internal class BatchStreamDebugMarkers
+{
+    public static object ObjectEndMarker = new object();
+    public static Guid ObjectEndMagic = Guid.NewGuid();
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs b/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
new file mode 100644
index 0000000000..603c7582a1
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
@@ -0,0 +1,100 @@
+using System.Collections;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition.Transport
+{
+    /// <summary>
+    /// A helper class used from generated UI-thread-side collections of composition objects.
+    /// </summary>
+    // NOTE: This should probably be a base class since TServer isn't used anymore and it was the reason why 
+    // it couldn't be exposed as a base class
+    class ServerListProxyHelper<TClient, TServer> : IList<TClient>
+        where TServer : ServerObject
+        where TClient : CompositionObject
+    {
+        private readonly IRegisterForSerialization _parent;
+        private bool _changed;
+
+        public interface IRegisterForSerialization
+        {
+            void RegisterForSerialization();
+        }
+
+        public ServerListProxyHelper(IRegisterForSerialization parent)
+        {
+            _parent = parent;
+        }
+        
+        private readonly List<TClient> _list = new List<TClient>();
+        
+        IEnumerator<TClient> IEnumerable<TClient>.GetEnumerator() => GetEnumerator();
+        public List<TClient>.Enumerator GetEnumerator() => _list.GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public void Add(TClient item) => Insert(_list.Count, item);
+
+        public void Clear()
+        {
+            _list.Clear();
+            _changed = true;
+            _parent.RegisterForSerialization();
+        }
+
+        public bool Contains(TClient item) => _list.Contains(item);
+
+        public void CopyTo(TClient[] array, int arrayIndex) => _list.CopyTo(array, arrayIndex);
+
+        public bool Remove(TClient item)
+        {
+            var idx = _list.IndexOf(item);
+            if (idx == -1)
+                return false;
+            RemoveAt(idx);
+            return true;
+        }
+
+        public int Count => _list.Count;
+        public bool IsReadOnly => false;
+        public int IndexOf(TClient item) => _list.IndexOf(item);
+
+        public void Insert(int index, TClient item)
+        {
+            _list.Insert(index, item);
+            _changed = true;
+            _parent.RegisterForSerialization();
+        }
+
+        public void RemoveAt(int index)
+        {
+            _list.RemoveAt(index);
+            _changed = true;
+            _parent.RegisterForSerialization();
+        }
+
+        public TClient this[int index]
+        {
+            get => _list[index];
+            set
+            {
+                _list[index] = value;
+                _changed = true;
+                _parent.RegisterForSerialization();
+            }
+        }
+
+        public void Serialize(BatchStreamWriter writer)
+        {
+            writer.Write((byte)(_changed ? 1 : 0));
+            if (_changed)
+            {
+                writer.Write(_list.Count);
+                foreach (var el in _list)
+                    writer.WriteObject(el.Server);
+            }
+            _changed = false;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Visual.cs b/src/Avalonia.Base/Rendering/Composition/Visual.cs
new file mode 100644
index 0000000000..6d6818256a
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Visual.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Numerics;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// The base visual object in the composition visual hierarchy.
+    /// </summary>
+    public abstract partial class CompositionVisual
+    {
+        private IBrush? _opacityMask;
+
+        private protected virtual void OnRootChangedCore()
+        {
+        }
+
+        partial void OnRootChanged() => OnRootChangedCore();
+
+        partial void OnParentChanged() => Root = Parent?.Root;
+
+        public IBrush? OpacityMask
+        {
+            get => _opacityMask;
+            set
+            {
+                if (_opacityMask == value)
+                    return;
+                OpacityMaskBrush = (_opacityMask = value)?.ToImmutable();
+            }
+        }
+
+        internal Matrix4x4? TryGetServerGlobalTransform()
+        {
+            if (Root == null)
+                return null;
+            var i = Root.Server.Readback;
+            ref var readback = ref Server.GetReadback(i.ReadIndex);
+            
+            // CompositionVisual wasn't visible or wasn't even attached to the composition target during the lat frame
+            if (!readback.Visible || readback.Revision < i.ReadRevision)
+                return null;
+            
+            // CompositionVisual was reparented (potential race here)
+            if (readback.TargetId != Root.Server.Id)
+                return null;
+            
+            return readback.Matrix;
+        }
+        
+        internal object? Tag { get; set; }
+
+        internal virtual bool HitTest(Point point) => true;
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs b/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
new file mode 100644
index 0000000000..6981dc39e3
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
@@ -0,0 +1,75 @@
+using System;
+using Avalonia.Rendering.Composition.Server;
+
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{
+    /// <summary>
+    /// A collection of CompositionVisual objects
+    /// </summary>
+    public partial class CompositionVisualCollection : CompositionObject
+    {
+        private CompositionVisual _owner;
+        internal CompositionVisualCollection(CompositionVisual parent, ServerCompositionVisualCollection server) : base(parent.Compositor, server)
+        {
+            _owner = parent;
+            InitializeDefaults();
+        }
+        
+        public void InsertAbove(CompositionVisual newChild, CompositionVisual sibling)
+        {
+            var idx = _list.IndexOf(sibling);
+            if (idx == -1)
+                throw new InvalidOperationException();
+            
+            Insert(idx + 1, newChild);
+        }
+        
+        public void InsertBelow(CompositionVisual newChild, CompositionVisual sibling)
+        {
+            var idx = _list.IndexOf(sibling);
+            if (idx == -1)
+                throw new InvalidOperationException();
+            Insert(idx, newChild);
+        }
+
+        public void InsertAtTop(CompositionVisual newChild) => Insert(_list.Count, newChild);
+
+        public void InsertAtBottom(CompositionVisual newChild) => Insert(0, newChild);
+
+        public void RemoveAll() => Clear();
+
+        partial void OnAdded(CompositionVisual item) => item.Parent = _owner;
+
+        partial void OnBeforeReplace(CompositionVisual oldItem, CompositionVisual newItem)
+        {
+            if (oldItem != newItem)
+                OnBeforeAdded(newItem);
+        }
+
+        partial void OnReplace(CompositionVisual oldItem, CompositionVisual newItem)
+        {
+            if (oldItem != newItem)
+            {
+                OnRemoved(oldItem);
+                OnAdded(newItem);
+            }
+        }
+
+        partial void OnRemoved(CompositionVisual item) => item.Parent = null;
+
+        partial void OnBeforeClear()
+        {
+            foreach (var i in this)
+                i.Parent = null;
+        }
+
+        partial void OnBeforeAdded(CompositionVisual item)
+        {
+            if (item.Parent != null)
+                throw new InvalidOperationException("Visual already has a parent");
+            item.Parent = item;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/readme.md b/src/Avalonia.Base/Rendering/Composition/readme.md
new file mode 100644
index 0000000000..6c238db191
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/readme.md
@@ -0,0 +1,3 @@
+Please note the composition renderer is not subject to the usual MIT license.
+
+Please contact us for more details and see [License.md](https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md)
diff --git a/src/Avalonia.Base/Rendering/DefaultRenderTimer.cs b/src/Avalonia.Base/Rendering/DefaultRenderTimer.cs
new file mode 100644
index 0000000000..d0d3dd9715
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/DefaultRenderTimer.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines a default render timer that uses a standard timer.
+    /// </summary>
+    /// <remarks>
+    /// This class may be overridden by platform implementations to use a specialized timer
+    /// implementation.
+    /// </remarks>
+    public class DefaultRenderTimer : IRenderTimer
+    {
+        private IRuntimePlatform? _runtime;
+        private int _subscriberCount;
+        private Action<TimeSpan>? _tick;
+        private IDisposable? _subscription;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultRenderTimer"/> class.
+        /// </summary>
+        /// <param name="framesPerSecond">
+        /// The number of frames per second at which the loop should run.
+        /// </param>
+        public DefaultRenderTimer(int framesPerSecond)
+        {
+            FramesPerSecond = framesPerSecond;
+        }
+
+        /// <summary>
+        /// Gets the number of frames per second at which the loop runs.
+        /// </summary>
+        public int FramesPerSecond { get; }
+
+        /// <inheritdoc/>
+        public event Action<TimeSpan> Tick
+        {
+            add
+            {
+                _tick += value;
+
+                if (_subscriberCount++ == 0)
+                {
+                    Start();
+                }
+            }
+
+            remove
+            {
+                if (--_subscriberCount == 0)
+                {
+                    Stop();
+                }
+
+                _tick -= value;
+            }
+        }
+
+        public bool RunsInBackground => true;
+
+        /// <summary>
+        /// Starts the timer.
+        /// </summary>
+        protected void Start()
+        {
+            _subscription = StartCore(InternalTick);
+        }
+
+        /// <summary>
+        /// Provides the implementation of starting the timer.
+        /// </summary>
+        /// <param name="tick">The method to call on each tick.</param>
+        /// <remarks>
+        /// This can be overridden by platform implementations to use a specialized timer
+        /// implementation.
+        /// </remarks>
+        protected virtual IDisposable StartCore(Action<TimeSpan> tick)
+        {
+            _runtime ??= AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
+
+            return _runtime.StartSystemTimer(
+                TimeSpan.FromSeconds(1.0 / FramesPerSecond),
+                () => tick(TimeSpan.FromMilliseconds(Environment.TickCount)));
+        }
+
+        /// <summary>
+        /// Stops the timer.
+        /// </summary>
+        protected void Stop()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+        }
+
+        private void InternalTick(TimeSpan tickCount)
+        {
+            _tick?.Invoke(tickCount);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/DeferredRenderer.cs b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
new file mode 100644
index 0000000000..4236763e3b
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
@@ -0,0 +1,733 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// A renderer which renders the state of the visual tree to an intermediate scene graph
+    /// representation which is then rendered on a rendering thread.
+    /// </summary>
+    public class DeferredRenderer : RendererBase, IRenderer, IRenderLoopTask, IVisualBrushRenderer
+    {
+        private readonly IDispatcher? _dispatcher;
+        private readonly IRenderLoop? _renderLoop;
+        private readonly IVisual _root;
+        private readonly ISceneBuilder _sceneBuilder;
+
+        private bool _running;
+        private bool _disposed;
+        private volatile IRef<Scene>? _scene;
+        private DirtyVisuals? _dirty;
+        private HashSet<IVisual>? _recalculateChildren;
+        private IRef<IRenderTargetBitmapImpl>? _overlay;
+        private int _lastSceneId = -1;
+        private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
+        private IRef<IDrawOperation>? _currentDraw;
+        private readonly IDeferredRendererLock _lock;
+        private readonly object _sceneLock = new object();
+        private readonly object _startStopLock = new object();
+        private readonly object _renderLoopIsRenderingLock = new object();
+        private readonly Action _updateSceneIfNeededDelegate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
+        /// </summary>
+        /// <param name="root">The control to render.</param>
+        /// <param name="renderLoop">The render loop.</param>
+        /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
+        /// <param name="dispatcher">The dispatcher to use. Optional.</param>
+        /// <param name="rendererLock">Lock object used before trying to access render target</param>
+        public DeferredRenderer(
+            IRenderRoot root,
+            IRenderLoop renderLoop,
+            ISceneBuilder? sceneBuilder = null,
+            IDispatcher? dispatcher = null,
+            IDeferredRendererLock? rendererLock = null) : base(true)
+        {
+            _dispatcher = dispatcher ?? Dispatcher.UIThread;
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            _sceneBuilder = sceneBuilder ?? new SceneBuilder();
+            Layers = new RenderLayers();
+            _renderLoop = renderLoop;
+            _lock = rendererLock ?? new ManagedDeferredRendererLock();
+            _updateSceneIfNeededDelegate = UpdateSceneIfNeeded;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
+        /// </summary>
+        /// <param name="root">The control to render.</param>
+        /// <param name="renderTarget">The render target.</param>
+        /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
+        /// <remarks>
+        /// This constructor is intended to be used for unit testing.
+        /// </remarks>
+        public DeferredRenderer(
+            IVisual root,
+            IRenderTarget renderTarget,
+            ISceneBuilder? sceneBuilder = null) : base(true)
+        {
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            RenderTarget = renderTarget ?? throw new ArgumentNullException(nameof(renderTarget));
+            _sceneBuilder = sceneBuilder ?? new SceneBuilder();
+            Layers = new RenderLayers();
+            _lock = new ManagedDeferredRendererLock();
+            _updateSceneIfNeededDelegate = UpdateSceneIfNeeded;
+        }
+
+        /// <inheritdoc/>
+        public bool DrawFps { get; set; }
+
+        /// <inheritdoc/>
+        public bool DrawDirtyRects { get; set; }
+
+        /// <summary>
+        /// Gets or sets a path to which rendered frame should be rendered for debugging.
+        /// </summary>
+        public string? DebugFramesPath { get; set; }
+
+        /// <summary>
+        /// Forces the renderer to only draw frames on the render thread. Makes Paint to wait until frame is rendered
+        /// </summary>
+        public bool RenderOnlyOnRenderThread { get; set; }
+
+        /// <inheritdoc/>
+        public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
+
+        /// <summary>
+        /// Gets the render layers.
+        /// </summary>
+        internal RenderLayers Layers { get; }
+
+        /// <summary>
+        /// Gets the current render target.
+        /// </summary>
+        internal IRenderTarget? RenderTarget { get; private set; }
+
+        /// <inheritdoc/>
+        public void AddDirty(IVisual visual)
+        {
+            _dirty?.Add(visual);
+        }
+
+        /// <summary>
+        /// Disposes of the renderer and detaches from the render loop.
+        /// </summary>
+        public void Dispose()
+        {
+            lock (_sceneLock)
+            {
+                if (_disposed)
+                    return;
+                _disposed = true;
+                var scene = _scene;
+                _scene = null;
+                scene?.Dispose();
+            }
+
+            Stop();
+            // Wait for any in-progress rendering to complete
+            lock(_renderLoopIsRenderingLock){}
+            DisposeRenderTarget();
+        }
+
+        public void RecalculateChildren(IVisual visual) => _recalculateChildren?.Add(visual);
+
+        void DisposeRenderTarget()
+        {
+            using (var l = _lock.TryLock())
+            {
+                if(l == null)
+                {
+                    // We are still trying to render on the render thread, try again a bit later
+                    DispatcherTimer.RunOnce(DisposeRenderTarget, TimeSpan.FromMilliseconds(50),
+                        DispatcherPriority.Background);
+                    return;
+                }
+
+                Layers.Clear();
+                RenderTarget?.Dispose();
+                RenderTarget = null;
+            }
+        }
+
+        /// <inheritdoc/>
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool>? filter)
+        {
+            EnsureCanHitTest();
+
+            //It's safe to access _scene here without a lock since
+            //it's only changed from UI thread which we are currently on
+            return _scene?.Item.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
+        }
+
+        /// <inheritdoc/>
+        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool>? filter)
+        {
+            EnsureCanHitTest();
+
+            //It's safe to access _scene here without a lock since
+            //it's only changed from UI thread which we are currently on
+            return _scene?.Item.HitTestFirst(p, root, filter);
+        }
+
+        /// <inheritdoc/>
+        public void Paint(Rect rect)
+        {
+            if (RenderOnlyOnRenderThread)
+            {
+                // Renderer is stopped and doesn't tick on the render thread
+                // This indicates a bug somewhere in our code
+                // (currently happens when a window gets minimized with Show desktop on Windows 10)
+                if(!_running)
+                    return;
+                
+                while (true)
+                {
+                    Scene? scene;
+                    bool? updated;
+                    lock (_sceneLock)
+                    {
+                        updated = UpdateScene();
+                        scene = _scene?.Item;
+                    }
+                    
+                    // Renderer is in invalid state, skip drawing
+                    if(updated == null)
+                        return;
+
+                    // Wait for the scene to be rendered or disposed
+                    scene?.Rendered.Wait();
+                    
+                    // That was an up-to-date scene, we can return immediately
+                    if (updated == true)
+                        return;
+                }
+            }
+            else
+            {
+                var t = (IRenderLoopTask)this;
+                if (t.NeedsUpdate)
+                    UpdateScene();
+                if (_scene?.Item != null)
+                    Render(true);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Resized(Size size)
+        {
+        }
+
+        /// <inheritdoc/>
+        public void Start()
+        {
+            lock (_startStopLock)
+            {
+                if (!_running && _renderLoop != null)
+                {
+                    _renderLoop.Add(this);
+                    _running = true;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Stop()
+        {
+            lock (_startStopLock)
+            {
+                if (_running && _renderLoop != null)
+                {
+                    _renderLoop.Remove(this);
+                    _running = false;
+                }
+            }
+        }
+
+        bool NeedsUpdate => _dirty == null || _dirty.Count > 0;
+        bool IRenderLoopTask.NeedsUpdate => NeedsUpdate;
+
+        void IRenderLoopTask.Update(TimeSpan time) => UpdateScene();
+
+        void IRenderLoopTask.Render()
+        {
+            lock (_renderLoopIsRenderingLock)
+            {
+                lock(_startStopLock)
+                    if(!_running)
+                        return;
+                Render(false);
+            }
+        }
+
+        Scene? TryGetChildScene(IRef<IDrawOperation>? op) => (op?.Item as BrushDrawOperation)?.Aux as Scene;
+        
+        /// <inheritdoc/>
+        Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
+        {
+            return TryGetChildScene(_currentDraw)?.Size ?? Size.Empty;
+        }
+
+        /// <inheritdoc/>
+        void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
+        {
+            var childScene = TryGetChildScene(_currentDraw);
+
+            if (childScene != null)
+            {
+                Render(context, (VisualNode)childScene.Root, null, new Rect(childScene.Size));
+            }
+        }
+
+        internal void UnitTestUpdateScene() => UpdateScene();
+
+        internal void UnitTestRender() => Render(false);
+
+        internal Scene? UnitTestScene() => _scene?.Item;
+
+        private void EnsureCanHitTest()
+        {
+            if (_renderLoop == null && (_dirty == null || _dirty.Count > 0))
+            {
+                // When unit testing the renderLoop may be null, so update the scene manually.
+                UpdateScene();
+            }
+        }
+
+        internal void Render(bool forceComposite)
+        {
+            using (var l = _lock.TryLock())
+            {
+                if (l == null)
+                    return;
+
+                IDrawingContextImpl? context = null;
+                try
+                {
+                    try
+                    {
+                        var (scene, updated) = UpdateRenderLayersAndConsumeSceneIfNeeded(ref context);
+                        if (updated)
+                            FpsTick();
+                        using (scene)
+                        {
+                            if (scene?.Item != null)
+                            {
+                                try
+                                {
+                                    var overlay = DrawDirtyRects || DrawFps;
+                                    if (DrawDirtyRects)
+                                        _dirtyRectsDisplay.Tick();
+                                    if (overlay)
+                                        RenderOverlay(scene.Item, ref context);
+                                    if (updated || forceComposite || overlay)
+                                        RenderComposite(scene.Item, ref context);
+                                }
+                                finally
+                                {
+                                    scene.Item.MarkAsRendered();
+                                }
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        context?.Dispose();
+                    }
+                }
+                catch (RenderTargetCorruptedException ex)
+                {
+                    Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
+                    RenderTarget?.Dispose();
+                    RenderTarget = null;
+                }
+            }
+        }
+
+        private (IRef<Scene>? scene, bool updated) UpdateRenderLayersAndConsumeSceneIfNeeded(ref IDrawingContextImpl? context,
+            bool recursiveCall = false)
+        {
+            IRef<Scene>? sceneRef;
+            lock (_sceneLock)
+                sceneRef = _scene?.Clone();
+            if (sceneRef == null)
+                return (null, false);
+            using (sceneRef)
+            {
+                var scene = sceneRef.Item;
+                if (scene.Generation != _lastSceneId)
+                {
+                    EnsureDrawingContext(ref context);
+
+                    Layers.Update(scene, context);
+
+                    RenderToLayers(scene);
+
+                    if (DebugFramesPath != null)
+                    {
+                        SaveDebugFrames(scene.Generation);
+                    }
+
+                    lock (_sceneLock)
+                        _lastSceneId = scene.Generation;
+
+
+                    var isUiThread = Dispatcher.UIThread.CheckAccess();
+                    // We have consumed the previously available scene, but there might be some dirty 
+                    // rects since the last update. *If* we are on UI thread, we can force immediate scene
+                    // rebuild before rendering anything on-screen
+                    // We are calling the same method recursively here 
+                    if (!recursiveCall && isUiThread && NeedsUpdate)
+                    {
+                        UpdateScene();
+                        var (rs, _) = UpdateRenderLayersAndConsumeSceneIfNeeded(ref context, true);
+                        return (rs, true);
+                    }
+
+                    // We are rendering a new scene version, so it's highly likely
+                    // that there is already a pending update for animations
+                    // So we are scheduling an update call so UI thread could prepare a scene before
+                    // the next render timer tick
+                    if (!recursiveCall && !isUiThread)
+                        Dispatcher.UIThread.Post(_updateSceneIfNeededDelegate, DispatcherPriority.Render);
+
+                    // Indicate that we have updated the layers
+                    return (sceneRef.Clone(), true);
+                }
+
+                // Just return scene, layers weren't updated
+                return (sceneRef.Clone(), false);
+            }
+
+        }
+
+
+        private void Render(IDrawingContextImpl context, VisualNode node, IVisual? layer, Rect clipBounds)
+        {
+            if (layer == null || node.LayerRoot == layer)
+            {
+                clipBounds = node.ClipBounds.Intersect(clipBounds);
+
+                if (!clipBounds.IsEmpty && node.Opacity > 0)
+                {
+                    var isLayerRoot = node.Visual == layer;
+
+                    node.BeginRender(context, isLayerRoot);
+
+                    var drawOperations = node.DrawOperations;
+                    var drawOperationsCount = drawOperations.Count;
+                    for (int i = 0; i < drawOperationsCount; i++)
+                    {
+                        var operation = drawOperations[i];
+                        _currentDraw = operation;
+                        operation.Item.Render(context);
+                        _currentDraw = null;
+                    }
+
+                    var children = node.Children;
+                    var childrenCount = children.Count;
+                    for (int i = 0; i < childrenCount; i++)
+                    {
+                        var child = children[i];
+                        Render(context, (VisualNode)child, layer, clipBounds);
+                    }
+
+                    node.EndRender(context, isLayerRoot);
+                }
+            }
+        }
+
+        private void RenderToLayers(Scene scene)
+        {
+            foreach (var layer in scene.Layers)
+            {
+                var renderLayer = Layers[layer.LayerRoot];
+                if (layer.Dirty.IsEmpty && !renderLayer.IsEmpty)
+                    continue;
+                var renderTarget = renderLayer.Bitmap;
+                var node = (VisualNode?)scene.FindNode(layer.LayerRoot);
+
+                if (node != null)
+                {
+                    using (var context = renderTarget.Item.CreateDrawingContext(this))
+                    {
+                        if (renderLayer.IsEmpty)
+                        {
+                            // Render entire layer root node
+                            context.Clear(Colors.Transparent);
+                            context.Transform = Matrix.Identity;
+                            context.PushClip(node.ClipBounds);
+                            Render(context, node, layer.LayerRoot, node.ClipBounds);
+                            context.PopClip();
+                            if (DrawDirtyRects)
+                            {
+                                _dirtyRectsDisplay.Add(node.ClipBounds);
+                            }
+
+                            renderLayer.IsEmpty = false;
+                        }
+                        else
+                        {
+                            var scale = scene.Scaling;
+
+                            foreach (var rect in layer.Dirty)
+                            {
+                                var snappedRect = SnapToDevicePixels(rect, scale);
+                                context.Transform = Matrix.Identity;
+                                context.PushClip(snappedRect);
+                                context.Clear(Colors.Transparent);
+                                Render(context, node, layer.LayerRoot, snappedRect);
+                                context.PopClip();
+
+                                if (DrawDirtyRects)
+                                {
+                                    _dirtyRectsDisplay.Add(snappedRect);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private static Rect SnapToDevicePixels(Rect rect, double scale)
+        {
+            return new Rect(
+                new Point(
+                    Math.Floor(rect.X * scale) / scale,
+                    Math.Floor(rect.Y * scale) / scale),
+                new Point(
+                    Math.Ceiling(rect.Right * scale) / scale,
+                    Math.Ceiling(rect.Bottom * scale) / scale));
+        }
+
+        private void RenderOverlay(Scene scene, ref IDrawingContextImpl? parentContent)
+        {
+            EnsureDrawingContext(ref parentContent);
+
+            if (DrawDirtyRects)
+            {
+                var overlay = GetOverlay(parentContent, scene.Size, scene.Scaling);
+
+                using (var context = overlay.Item.CreateDrawingContext(this))
+                {
+                    context.Clear(Colors.Transparent);
+                    RenderDirtyRects(context);
+                }
+            }
+            else
+            {
+                _overlay?.Dispose();
+                _overlay = null;
+            }
+        }
+
+        private void RenderDirtyRects(IDrawingContextImpl context)
+        {
+            foreach (var r in _dirtyRectsDisplay)
+            {
+                var brush = new ImmutableSolidColorBrush(Colors.Magenta, r.Opacity);
+                context.DrawRectangle(brush,null, r.Rect);
+            }
+        }
+
+        private void RenderComposite(Scene scene, ref IDrawingContextImpl? context)
+        {
+            EnsureDrawingContext(ref context);
+
+            context.Clear(Colors.Transparent);
+
+            var clientRect = new Rect(scene.Size);
+
+            var firstLayer = true;
+            foreach (var layer in scene.Layers)
+            {
+                var bitmap = Layers[layer.LayerRoot].Bitmap;
+                var sourceRect = new Rect(0, 0, bitmap.Item.PixelSize.Width, bitmap.Item.PixelSize.Height);
+
+                if (layer.GeometryClip != null)
+                {
+                    context.PushGeometryClip(layer.GeometryClip);
+                }
+
+                if (layer.OpacityMask == null)
+                {
+                    if (firstLayer && bitmap.Item.CanBlit)
+                        bitmap.Item.Blit(context);
+                    else
+                        context.DrawBitmap(bitmap, layer.Opacity, sourceRect, clientRect);
+                }
+                else
+                {
+                    context.DrawBitmap(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect);
+                }
+
+                if (layer.GeometryClip != null)
+                {
+                    context.PopGeometryClip();
+                }
+
+                firstLayer = false;
+            }
+
+            if (_overlay != null)
+            {
+                var sourceRect = new Rect(0, 0, _overlay.Item.PixelSize.Width, _overlay.Item.PixelSize.Height);
+                context.DrawBitmap(_overlay, 0.5, sourceRect, clientRect);
+            }
+
+            if (DrawFps)
+            {
+                using (var c = new DrawingContext(context, false))
+                {
+                    RenderFps(c, clientRect, scene.Layers.Count);
+                }
+            }
+        }
+
+        private void EnsureDrawingContext([NotNull] ref IDrawingContextImpl? context)
+        {
+            if (context != null)
+            {
+                return;
+            }
+
+            if ((RenderTarget as IRenderTargetWithCorruptionInfo)?.IsCorrupted == true)
+            {
+                RenderTarget!.Dispose();
+                RenderTarget = null;
+            }
+
+            if (RenderTarget == null)
+            {
+                RenderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+            }
+
+            context = RenderTarget.CreateDrawingContext(this);
+        }
+
+        private void UpdateSceneIfNeeded()
+        {
+            if(NeedsUpdate)
+                UpdateScene();
+        }
+        
+        private bool? UpdateScene()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            using var noPump = NonPumpingLockHelper.Use();
+            lock (_sceneLock)
+            {
+                if (_disposed)
+                    return null;
+                if (_scene?.Item.Generation > _lastSceneId)
+                    return false;
+            }
+            if (_root.IsVisible)
+            {
+                var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
+                var scene = sceneRef.Item;
+
+                if (_dirty == null)
+                {
+                    _dirty = new DirtyVisuals();
+                    _recalculateChildren = new HashSet<IVisual>();
+                    _sceneBuilder.UpdateAll(scene);
+                }
+                else
+                {
+                    foreach (var visual in _recalculateChildren!)
+                    {
+                        var node = scene.FindNode(visual);
+                        ((VisualNode?)node)?.SortChildren(scene);
+                    }
+
+                    _recalculateChildren.Clear();
+
+                    foreach (var visual in _dirty)
+                    {
+                        _sceneBuilder.Update(scene, visual);
+                    }
+                }
+
+                lock (_sceneLock)
+                {
+                    var oldScene = _scene;
+                    _scene = sceneRef;
+                    oldScene?.Dispose();
+                }
+
+                _dirty.Clear();
+
+                if (SceneInvalidated != null)
+                {
+                    var rect = new Rect();
+
+                    foreach (var layer in scene.Layers)
+                    {
+                        foreach (var dirty in layer.Dirty)
+                        {
+                            rect = rect.Union(dirty);
+                        }
+                    }
+
+                    SceneInvalidated(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
+                }
+
+                return true;
+            }
+            else
+            {
+                lock (_sceneLock)
+                {
+                    var oldScene = _scene;
+                    _scene = null;
+                    oldScene?.Dispose();
+                }
+
+                return null;
+            }
+        }
+
+        private IRef<IRenderTargetBitmapImpl> GetOverlay(
+            IDrawingContextImpl parentContext,
+            Size size,
+            double scaling)
+        {
+            var pixelSize = size * scaling;
+
+            if (_overlay == null ||
+                _overlay.Item.PixelSize.Width != pixelSize.Width ||
+                _overlay.Item.PixelSize.Height != pixelSize.Height)
+            {
+                _overlay?.Dispose();
+                _overlay = RefCountable.Create(parentContext.CreateLayer(size));
+            }
+
+            return _overlay;
+        }
+
+        private void SaveDebugFrames(int id)
+        {
+            var index = 0;
+
+            foreach (var layer in Layers)
+            {
+                var fileName = Path.Combine(DebugFramesPath ?? string.Empty, $"frame-{id}-layer-{index++}.png");
+                layer.Bitmap.Item.Save(fileName);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/DirtyRects.cs b/src/Avalonia.Base/Rendering/DirtyRects.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DirtyRects.cs
rename to src/Avalonia.Base/Rendering/DirtyRects.cs
diff --git a/src/Avalonia.Base/Rendering/DirtyVisuals.cs b/src/Avalonia.Base/Rendering/DirtyVisuals.cs
new file mode 100644
index 0000000000..999b12e810
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/DirtyVisuals.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Stores a list of dirty visuals for an <see cref="IRenderer"/>.
+    /// </summary>
+    /// <remarks>
+    /// This class stores the dirty visuals for a scene, ordered by their distance to the root
+    /// visual. TODO: We probably want to put an upper limit on the number of visuals that can be
+    /// stored and if we reach that limit, assume all visuals are dirty.
+    /// </remarks>
+    internal class DirtyVisuals : IEnumerable<IVisual>
+    {
+        private SortedDictionary<int, List<IVisual>> _inner = new SortedDictionary<int, List<IVisual>>();
+        private Dictionary<IVisual, int> _index = new Dictionary<IVisual, int>();
+        private int _enumerating;
+
+        /// <summary>
+        /// Gets the number of dirty visuals.
+        /// </summary>
+        public int Count => _index.Count;
+
+        /// <summary>
+        /// Adds a visual to the dirty list.
+        /// </summary>
+        /// <param name="visual">The dirty visual.</param>
+        public void Add(IVisual visual)
+        {
+            if (_enumerating > 0)
+            {
+                throw new InvalidOperationException("Visual was invalidated during a render pass");
+            }
+
+            var distance = visual.CalculateDistanceFromAncestor(visual.VisualRoot);
+
+            if (_index.TryGetValue(visual, out var existingDistance))
+            {
+                if (distance == existingDistance)
+                {
+                    return;
+                }
+
+                _inner[existingDistance].Remove(visual);
+                _index.Remove(visual);
+            }
+
+            if (!_inner.TryGetValue(distance, out var list))
+            {
+                list = new List<IVisual>();
+                _inner.Add(distance, list);
+            }
+
+            list.Add(visual);
+            _index.Add(visual, distance);
+        }
+
+        /// <summary>
+        /// Clears the list.
+        /// </summary>
+        public void Clear()
+        {
+            if (_enumerating > 0)
+            {
+                throw new InvalidOperationException("Cannot clear while enumerating");
+            }
+
+            _inner.Clear();
+            _index.Clear();
+        }
+
+        /// <summary>
+        /// Gets the dirty visuals, in ascending order of distance to their root.
+        /// </summary>
+        /// <returns>A collection of visuals.</returns>
+        public IEnumerator<IVisual> GetEnumerator()
+        {
+            _enumerating++;
+            try
+            {
+                foreach (var i in _inner)
+                {
+                    foreach (var j in i.Value)
+                    {
+                        yield return j;
+                    }
+                }
+            }
+            finally
+            {
+                _enumerating--;
+            }
+        }
+        
+        /// <summary>
+        /// Gets the dirty visuals, in ascending order of distance to their root.
+        /// </summary>
+        /// <returns>A collection of visuals.</returns>
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/DisplayDirtyRect.cs b/src/Avalonia.Base/Rendering/DisplayDirtyRect.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DisplayDirtyRect.cs
rename to src/Avalonia.Base/Rendering/DisplayDirtyRect.cs
diff --git a/src/Avalonia.Visuals/Rendering/DisplayDirtyRects.cs b/src/Avalonia.Base/Rendering/DisplayDirtyRects.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DisplayDirtyRects.cs
rename to src/Avalonia.Base/Rendering/DisplayDirtyRects.cs
diff --git a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs b/src/Avalonia.Base/Rendering/ICustomSimpleHitTest.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
rename to src/Avalonia.Base/Rendering/ICustomSimpleHitTest.cs
diff --git a/src/Avalonia.Base/Rendering/IDeferredRendererLock.cs b/src/Avalonia.Base/Rendering/IDeferredRendererLock.cs
new file mode 100644
index 0000000000..1c6bd69158
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IDeferredRendererLock.cs
@@ -0,0 +1,11 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    [Unstable]
+    public interface IDeferredRendererLock
+    {
+        IDisposable? TryLock();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IRenderLoop.cs b/src/Avalonia.Base/Rendering/IRenderLoop.cs
new file mode 100644
index 0000000000..e500ecdf8b
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderLoop.cs
@@ -0,0 +1,33 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// The application render loop.
+    /// </summary>
+    /// <remarks>
+    /// The render loop is responsible for advancing the animation timer and updating the scene
+    /// graph for visible windows.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IRenderLoop
+    {
+        /// <summary>
+        /// Adds an update task.
+        /// </summary>
+        /// <param name="i">The update task.</param>
+        /// <remarks>
+        /// Registered update tasks will be polled on each tick of the render loop after the
+        /// animation timer has been pulsed.
+        /// </remarks>
+        void Add(IRenderLoopTask i);
+
+        /// <summary>
+        /// Removes an update task.
+        /// </summary>
+        /// <param name="i">The update task.</param>
+        void Remove(IRenderLoopTask i);
+        
+        bool RunsInBackground { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs b/src/Avalonia.Base/Rendering/IRenderLoopTask.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs
rename to src/Avalonia.Base/Rendering/IRenderLoopTask.cs
diff --git a/src/Avalonia.Base/Rendering/IRenderRoot.cs b/src/Avalonia.Base/Rendering/IRenderRoot.cs
new file mode 100644
index 0000000000..1aa44158b2
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderRoot.cs
@@ -0,0 +1,54 @@
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Represents the root of a renderable tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IRenderRoot : IVisual
+    {
+        /// <summary>
+        /// Gets the client size of the window.
+        /// </summary>
+        Size ClientSize { get; }
+
+        /// <summary>
+        /// Gets the renderer for the window.
+        /// </summary>
+        IRenderer Renderer { get; }
+
+        /// <summary>
+        /// The scaling factor to use in rendering.
+        /// </summary>
+        double RenderScaling { get; }
+
+        /// <summary>
+        /// Creates a render target for the window.
+        /// </summary>
+        /// <returns>An <see cref="IRenderTarget"/>.</returns>
+        IRenderTarget CreateRenderTarget();
+
+        /// <summary>
+        /// Adds a rectangle to the window's dirty region.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        void Invalidate(Rect rect);
+
+        /// <summary>
+        /// Converts a point from screen to client coordinates.
+        /// </summary>
+        /// <param name="point">The point in screen device coordinates.</param>
+        /// <returns>The point in client coordinates.</returns>
+        Point PointToClient(PixelPoint point);
+
+        /// <summary>
+        /// Converts a point from client to screen coordinates.
+        /// </summary>
+        /// <param name="point">The point in client coordinates.</param>
+        /// <returns>The point in screen device coordinates.</returns>
+        PixelPoint PointToScreen(Point point);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IRenderTimer.cs b/src/Avalonia.Base/Rendering/IRenderTimer.cs
new file mode 100644
index 0000000000..07af7eeec8
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderTimer.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines the interface implemented by an application render timer.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IRenderTimer
+    {
+        /// <summary>
+        /// Raised when the render timer ticks to signal a new frame should be drawn.
+        /// </summary>
+        /// <remarks>
+        /// This event can be raised on any thread; it is the responsibility of the subscriber to
+        /// switch execution to the right thread.
+        /// </remarks>
+        event Action<TimeSpan> Tick;
+
+        /// <summary>
+        /// Indicates if the timer ticks on a non-UI thread
+        /// </summary>
+        bool RunsInBackground { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IRenderer.cs b/src/Avalonia.Base/Rendering/IRenderer.cs
new file mode 100644
index 0000000000..8d6aabf440
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderer.cs
@@ -0,0 +1,96 @@
+using System;
+using Avalonia.VisualTree;
+using System.Collections.Generic;
+using Avalonia.Rendering.Composition;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines the interface for a renderer.
+    /// </summary>
+    public interface IRenderer : IDisposable
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the renderer should draw an FPS counter.
+        /// </summary>
+        bool DrawFps { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the renderer should draw a visual representation
+        /// of its dirty rectangles.
+        /// </summary>
+        bool DrawDirtyRects { get; set; }
+
+        /// <summary>
+        /// Raised when a portion of the scene has been invalidated.
+        /// </summary>
+        /// <remarks>
+        /// Indicates that the underlying low-level scene information has been updated. Used to
+        /// signal that an update to the current pointer-over state may be required.
+        /// </remarks>
+        event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
+
+        /// <summary>
+        /// Mark a visual as dirty and needing re-rendering.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        void AddDirty(IVisual visual);
+
+        /// <summary>
+        /// Hit tests a location to find the visuals at the specified point.
+        /// </summary>
+        /// <param name="p">The point, in client coordinates.</param>
+        /// <param name="root">The root of the subtree to search.</param>
+        /// <param name="filter">
+        /// A filter predicate. If the predicate returns false then the visual and all its
+        /// children will be excluded from the results.
+        /// </param>
+        /// <returns>The visuals at the specified point, topmost first.</returns>
+        IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter);
+
+        /// <summary>
+        /// Hit tests a location to find first visual at the specified point.
+        /// </summary>
+        /// <param name="p">The point, in client coordinates.</param>
+        /// <param name="root">The root of the subtree to search.</param>
+        /// <param name="filter">
+        /// A filter predicate. If the predicate returns false then the visual and all its
+        /// children will be excluded from the results.
+        /// </param>
+        /// <returns>The visual at the specified point, topmost first.</returns>
+        IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter);
+
+        /// <summary>
+        /// Informs the renderer that the z-ordering of a visual's children has changed.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        void RecalculateChildren(IVisual visual);
+
+        /// <summary>
+        /// Called when a resize notification is received by the control being rendered.
+        /// </summary>
+        /// <param name="size">The new size of the window.</param>
+        void Resized(Size size);
+
+        /// <summary>
+        /// Called when a paint notification is received by the control being rendered.
+        /// </summary>
+        /// <param name="rect">The dirty rectangle.</param>
+        void Paint(Rect rect);
+
+        /// <summary>
+        /// Starts the renderer.
+        /// </summary>
+        void Start();
+
+        /// <summary>
+        /// Stops the renderer.
+        /// </summary>
+        void Stop();
+    }
+    
+    public interface IRendererWithCompositor : IRenderer
+    {
+        Compositor Compositor { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRendererFactory.cs b/src/Avalonia.Base/Rendering/IRendererFactory.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/IRendererFactory.cs
rename to src/Avalonia.Base/Rendering/IRendererFactory.cs
diff --git a/src/Avalonia.Base/Rendering/IVisualBrushInitialize.cs b/src/Avalonia.Base/Rendering/IVisualBrushInitialize.cs
new file mode 100644
index 0000000000..b5ab8ed0bd
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IVisualBrushInitialize.cs
@@ -0,0 +1,18 @@
+using Avalonia.Media;
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Internal interface for initializing controls that are to be used as the visual in a
+    /// <see cref="VisualBrush"/>.
+    /// </summary>
+    [Unstable]
+    public interface IVisualBrushInitialize
+    {
+        /// <summary>
+        /// Ensures that the control is ready to use as the visual in a visual brush.
+        /// </summary>
+        void EnsureInitialized();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IVisualBrushRenderer.cs b/src/Avalonia.Base/Rendering/IVisualBrushRenderer.cs
new file mode 100644
index 0000000000..f5312ad39b
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IVisualBrushRenderer.cs
@@ -0,0 +1,29 @@
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines a renderer used to render a visual brush to a bitmap.
+    /// </summary>
+    [Unstable]
+    public interface IVisualBrushRenderer
+    {
+        /// <summary>
+        /// Gets the size of the intermediate render target to which the visual brush should be
+        /// drawn.
+        /// </summary>
+        /// <param name="brush">The visual brush.</param>
+        /// <returns>The size of the intermediate render target to create.</returns>
+        Size GetRenderTargetSize(IVisualBrush brush);
+
+        /// <summary>
+        /// Renders a visual brush to a bitmap.
+        /// </summary>
+        /// <param name="context">The drawing context to render to.</param>
+        /// <param name="brush">The visual brush.</param>
+        /// <returns>A bitmap containing the rendered brush.</returns>
+        void RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
new file mode 100644
index 0000000000..79ef52586d
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
@@ -0,0 +1,363 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// A renderer which renders the state of the visual tree without an intermediate scene graph
+    /// representation.
+    /// </summary>
+    /// <remarks>
+    /// The immediate renderer supports only clip-bound-based hit testing; a control's geometry is
+    /// not taken into account.
+    /// </remarks>
+    public class ImmediateRenderer : RendererBase, IRenderer, IVisualBrushRenderer
+    {
+        private readonly IVisual _root;
+        private readonly IRenderRoot? _renderRoot;
+        private bool _updateTransformedBounds = true;
+        private IRenderTarget? _renderTarget;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmediateRenderer"/> class.
+        /// </summary>
+        /// <param name="root">The control to render.</param>
+        public ImmediateRenderer(IVisual root)
+        {
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            _renderRoot = root as IRenderRoot;
+        }
+
+        private ImmediateRenderer(IVisual root, bool updateTransformedBounds)
+        {
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            _renderRoot = root as IRenderRoot;
+            _updateTransformedBounds = updateTransformedBounds;
+        }
+
+        /// <inheritdoc/>
+        public bool DrawFps { get; set; }
+
+        /// <inheritdoc/>
+        public bool DrawDirtyRects { get; set; }
+
+        /// <inheritdoc/>
+        public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
+
+        /// <inheritdoc/>
+        public void Paint(Rect rect)
+        {
+            if (_renderTarget == null)
+            {
+                _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+            }
+
+            try
+            {
+                using (var context = new DrawingContext(_renderTarget.CreateDrawingContext(this)))
+                {
+                    context.PlatformImpl.Clear(Colors.Transparent);
+
+                    using (context.PushTransformContainer())
+                    {
+                        Render(context, _root, _root.Bounds);
+                    }
+
+                    if (DrawDirtyRects)
+                    {
+                        var color = (uint)new Random().Next(0xffffff) | 0x44000000;
+                        context.FillRectangle(
+                            new SolidColorBrush(color),
+                            rect);
+                    }
+
+                    if (DrawFps)
+                    {
+                        RenderFps(context, _root.Bounds, null);
+                    }
+                }
+            }
+            catch (RenderTargetCorruptedException ex)
+            {
+                Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
+                _renderTarget.Dispose();
+                _renderTarget = null;
+            }
+
+            SceneInvalidated?.Invoke(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
+        }
+
+        /// <inheritdoc/>
+        public void Resized(Size size)
+        {
+        }
+
+        /// <summary>
+        /// Renders a visual to a render target.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="target">The render target.</param>
+        public static void Render(IVisual visual, IRenderTarget target)
+        {
+            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
+            using (var context = new DrawingContext(target.CreateDrawingContext(renderer)))
+            {
+                renderer.Render(context, visual, visual.Bounds);
+            }
+        }
+
+        /// <summary>
+        /// Renders a visual to a drawing context.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="context">The drawing context.</param>
+        public static void Render(IVisual visual, DrawingContext context)
+        {
+            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
+            {
+                renderer.Render(context, visual, visual.Bounds);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void AddDirty(IVisual visual)
+        {
+            if (visual.Bounds != Rect.Empty)
+            {
+                var m = visual.TransformToVisual(_root);
+
+                if (m.HasValue)
+                {
+                    var bounds = new Rect(visual.Bounds.Size).TransformToAABB(m.Value);
+
+                    //use transformedbounds as previous render state of the visual bounds
+                    //so we can invalidate old and new bounds of a control in case it moved/shrinked
+                    if (visual.TransformedBounds.HasValue)
+                    {
+                        var trb = visual.TransformedBounds.Value;
+                        var trBounds = trb.Bounds.TransformToAABB(trb.Transform);
+
+                        if (trBounds != bounds)
+                        {
+                            _renderRoot?.Invalidate(trBounds);
+                        }
+                    }
+
+                    _renderRoot?.Invalidate(bounds);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Ends the operation of the renderer.
+        /// </summary>
+        public void Dispose()
+        {
+            _renderTarget?.Dispose();
+        }
+
+        /// <inheritdoc/>
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
+        {
+            return HitTest(root, p, filter);
+        }
+
+        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter)
+        {
+            return HitTest(root, p, filter).FirstOrDefault();
+        }
+
+        /// <inheritdoc/>
+        public void RecalculateChildren(IVisual visual) => AddDirty(visual);
+
+        /// <inheritdoc/>
+        public void Start()
+        {
+        }
+
+        /// <inheritdoc/>
+        public void Stop()
+        {
+        }
+
+        /// <inheritdoc/>
+        Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
+        {
+            (brush.Visual as IVisualBrushInitialize)?.EnsureInitialized();
+            return brush.Visual?.Bounds.Size ?? Size.Empty;
+        }
+
+        /// <inheritdoc/>
+        void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
+        {
+            var visual = brush.Visual;
+            Render(new DrawingContext(context), visual, visual.Bounds);
+        }
+
+        internal static void Render(IVisual visual, DrawingContext context, bool updateTransformedBounds)
+        {
+            using var renderer = new ImmediateRenderer(visual, updateTransformedBounds);
+            renderer.Render(context, visual, visual.Bounds);
+        }
+
+        private static void ClearTransformedBounds(IVisual visual)
+        {
+            foreach (var e in visual.GetSelfAndVisualDescendants())
+            {
+                visual.TransformedBounds = null;
+            }
+        }
+
+        private static Rect GetTransformedBounds(IVisual visual)
+        {
+            if (visual.RenderTransform == null)
+            {
+                return visual.Bounds;
+            }
+            else
+            {
+                var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                var offset = Matrix.CreateTranslation(visual.Bounds.Position + origin);
+                var m = (-offset) * visual.RenderTransform.Value * (offset);
+                return visual.Bounds.TransformToAABB(m);
+            }
+        }
+
+        private static IEnumerable<IVisual> HitTest(
+           IVisual visual,
+           Point p,
+           Func<IVisual, bool>? filter)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            if (filter?.Invoke(visual) != false)
+            {
+                bool containsPoint;
+
+                if (visual is ICustomSimpleHitTest custom)
+                {
+                    containsPoint = custom.HitTest(p);
+                }
+                else
+                {
+                    containsPoint = visual.TransformedBounds?.Contains(p) == true;
+                }
+
+                if ((containsPoint || !visual.ClipToBounds) && visual.VisualChildren.Count > 0)
+                {
+                    foreach (var child in visual.VisualChildren.SortByZIndex())
+                    {
+                        foreach (var result in HitTest(child, p, filter))
+                        {
+                            yield return result;
+                        }
+                    }
+                }
+
+                if (containsPoint)
+                {
+                    yield return visual;
+                }
+            }
+        }
+
+        private void Render(DrawingContext context, IVisual visual, Rect clipRect)
+        {
+            var opacity = visual.Opacity;
+            var clipToBounds = visual.ClipToBounds;
+            var bounds = new Rect(visual.Bounds.Size);
+
+            if (visual.IsVisible && opacity > 0)
+            {
+                var m = Matrix.CreateTranslation(visual.Bounds.Position);
+
+                var renderTransform = Matrix.Identity;
+                
+                // this should be calculated BEFORE renderTransform
+                if (visual.HasMirrorTransform)
+                {
+                    var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0);
+                    renderTransform *= mirrorMatrix;
+                }
+
+                if (visual.RenderTransform != null)
+                {
+                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                    var offset = Matrix.CreateTranslation(origin);
+                    var finalTransform = (-offset) * visual.RenderTransform.Value * (offset);
+                    renderTransform *= finalTransform;
+                }
+
+                m = renderTransform * m;
+
+                if (clipToBounds)
+                {
+                    if (visual.RenderTransform != null)
+                    {
+                        clipRect = new Rect(visual.Bounds.Size);
+                    }
+                    else
+                    {
+                        clipRect = clipRect.Intersect(new Rect(visual.Bounds.Size));
+                    }
+                }
+
+                using (context.PushPostTransform(m))
+                using (context.PushOpacity(opacity))
+                using (clipToBounds
+#pragma warning disable CS0618 // Type or member is obsolete
+                    ? visual is IVisualWithRoundRectClip roundClipVisual
+                        ? context.PushClip(new RoundedRect(bounds, roundClipVisual.ClipToBoundsRadius))
+                        : context.PushClip(bounds) 
+                    : default(DrawingContext.PushedState))
+#pragma warning restore CS0618 // Type or member is obsolete
+
+                using (visual.Clip != null ? context.PushGeometryClip(visual.Clip) : default(DrawingContext.PushedState))
+                using (visual.OpacityMask != null ? context.PushOpacityMask(visual.OpacityMask, bounds) : default(DrawingContext.PushedState))
+                using (context.PushTransformContainer())
+                {
+                    visual.Render(context);
+
+#pragma warning disable 0618
+                    var transformed =
+                        new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
+#pragma warning restore 0618
+
+                    if (_updateTransformedBounds)
+                        visual.TransformedBounds = transformed;
+
+                    var childrenEnumerable = visual.HasNonUniformZIndexChildren
+                        ? visual.VisualChildren.OrderBy(x => x, ZIndexComparer.Instance)
+                        : (IEnumerable<IVisual>)visual.VisualChildren;
+                    
+                    foreach (var child in childrenEnumerable)
+                    {
+                        var childBounds = GetTransformedBounds(child);
+
+                        if (!child.ClipToBounds || clipRect.Intersects(childBounds))
+                        {
+                            var childClipRect = child.RenderTransform == null
+                                ? clipRect.Translate(-childBounds.Position)
+                                : clipRect;
+                            Render(context, child, childClipRect);
+                        }
+                        else if (_updateTransformedBounds)
+                        {
+                            ClearTransformedBounds(child);
+                        }
+                    }
+                }
+            }
+
+            if (!visual.IsVisible && _updateTransformedBounds)
+            {
+                ClearTransformedBounds(visual);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs b/src/Avalonia.Base/Rendering/ManagedDeferredRendererLock.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs
rename to src/Avalonia.Base/Rendering/ManagedDeferredRendererLock.cs
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayer.cs b/src/Avalonia.Base/Rendering/RenderLayer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RenderLayer.cs
rename to src/Avalonia.Base/Rendering/RenderLayer.cs
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayers.cs b/src/Avalonia.Base/Rendering/RenderLayers.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RenderLayers.cs
rename to src/Avalonia.Base/Rendering/RenderLayers.cs
diff --git a/src/Avalonia.Base/Rendering/RenderLoop.cs b/src/Avalonia.Base/Rendering/RenderLoop.cs
new file mode 100644
index 0000000000..c66fec92aa
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/RenderLoop.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Avalonia.Logging;
+using Avalonia.Threading;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// The application render loop.
+    /// </summary>
+    /// <remarks>
+    /// The render loop is responsible for advancing the animation timer and updating the scene
+    /// graph for visible windows.
+    /// </remarks>
+    public class RenderLoop : IRenderLoop
+    {
+        private readonly IDispatcher _dispatcher;
+        private List<IRenderLoopTask> _items = new List<IRenderLoopTask>();
+        private List<IRenderLoopTask> _itemsCopy = new List<IRenderLoopTask>();
+        private IRenderTimer? _timer;
+        private int _inTick;
+        private int _inUpdate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RenderLoop"/> class.
+        /// </summary>
+        public RenderLoop()
+        {
+            _dispatcher = Dispatcher.UIThread;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RenderLoop"/> class.
+        /// </summary>
+        /// <param name="timer">The render timer.</param>
+        /// <param name="dispatcher">The UI thread dispatcher.</param>
+        public RenderLoop(IRenderTimer timer, IDispatcher dispatcher)
+        {
+            _timer = timer;
+            _dispatcher = dispatcher;
+        }
+
+        /// <summary>
+        /// Gets the render timer.
+        /// </summary>
+        protected IRenderTimer Timer
+        {
+            get
+            {
+                return _timer ??= AvaloniaLocator.Current.GetService<IRenderTimer>() ??
+                    throw new InvalidOperationException("Cannot locate IRenderTimer.");
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Add(IRenderLoopTask i)
+        {
+            _ = i ?? throw new ArgumentNullException(nameof(i));
+            Dispatcher.UIThread.VerifyAccess();
+
+            lock (_items)
+            {
+                _items.Add(i);
+
+                if (_items.Count == 1)
+                {
+                    Timer.Tick += TimerTick;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Remove(IRenderLoopTask i)
+        {
+            _ = i ?? throw new ArgumentNullException(nameof(i));
+            Dispatcher.UIThread.VerifyAccess();
+            lock (_items)
+            {
+                _items.Remove(i);
+
+                if (_items.Count == 0)
+                {
+                    Timer.Tick -= TimerTick;
+                }
+            }
+        }
+
+        public bool RunsInBackground => Timer.RunsInBackground;
+
+        private void TimerTick(TimeSpan time)
+        {
+            if (Interlocked.CompareExchange(ref _inTick, 1, 0) == 0)
+            {
+                try
+                {
+                    bool needsUpdate = false;
+
+                    foreach (IRenderLoopTask item in _items)
+                    {
+                        if (item.NeedsUpdate)
+                        {
+                            needsUpdate = true;
+
+                            break;
+                        }
+                    }
+
+                    if (needsUpdate &&
+                        Interlocked.CompareExchange(ref _inUpdate, 1, 0) == 0)
+                    {
+                        _dispatcher.Post(() =>
+                        {
+                            for (var i = 0; i < _items.Count; ++i)
+                            {
+                                var item = _items[i];
+
+                                if (item.NeedsUpdate)
+                                {
+                                    try
+                                    {
+                                        item.Update(time);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception in render update: {Error}", ex);
+                                    }
+                                }
+                            }
+
+                            Interlocked.Exchange(ref _inUpdate, 0);
+                        }, DispatcherPriority.Render);
+                    }
+
+                    lock (_items)
+                    {
+                        _itemsCopy.Clear();
+                        foreach (var i in _items)
+                            _itemsCopy.Add(i);
+                    }
+
+                    for (int i = 0; i < _itemsCopy.Count; i++)
+                    {
+                        _itemsCopy[i].Render();
+                    }
+                    
+                    _itemsCopy.Clear();
+
+                }
+                catch (Exception ex)
+                {
+                    Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception in render loop: {Error}", ex);
+                }
+                finally
+                {
+                    Interlocked.Exchange(ref _inTick, 0);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/RendererBase.cs b/src/Avalonia.Base/Rendering/RendererBase.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RendererBase.cs
rename to src/Avalonia.Base/Rendering/RendererBase.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
new file mode 100644
index 0000000000..98e89f6549
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
@@ -0,0 +1,68 @@
+using Avalonia.Platform;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an bitmap blending mode push or pop.
+    /// </summary>
+    internal class BitmapBlendModeNode : IDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
+        /// <see cref="BitmapBlendingMode"/> push.
+        /// </summary>
+        /// <param name="bitmapBlend">The <see cref="BitmapBlendingMode"/> to push.</param>
+        public BitmapBlendModeNode(BitmapBlendingMode bitmapBlend)
+        {
+            BlendingMode = bitmapBlend;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
+        /// <see cref="BitmapBlendingMode"/> pop.
+        /// </summary>
+        public BitmapBlendModeNode()
+        {
+        }
+
+        /// <inheritdoc/>
+        public Rect Bounds => Rect.Empty;
+
+        /// <summary>
+        /// Gets the BitmapBlend to be pushed or null if the operation represents a pop.
+        /// </summary>
+        public BitmapBlendingMode? BlendingMode { get; }
+
+        /// <inheritdoc/>
+        public bool HitTest(Point p) => false;
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="blendingMode">the <see cref="BitmapBlendModeNode"/> how to compare</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(BitmapBlendingMode? blendingMode) => BlendingMode == blendingMode;
+
+        /// <inheritdoc/>
+        public void Render(IDrawingContextImpl context)
+        {
+            if (BlendingMode.HasValue)
+            {
+                context.PushBitmapBlendMode(BlendingMode.Value);
+            }
+            else
+            {
+                context.PopBitmapBlendMode();
+            }
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/BrushDrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/BrushDrawOperation.cs
new file mode 100644
index 0000000000..e81966ce81
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/BrushDrawOperation.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// Base class for draw operations that can use a brush.
+    /// </summary>
+    internal abstract class BrushDrawOperation : DrawOperation
+    {
+        public BrushDrawOperation(Rect bounds, Matrix transform, IDisposable? aux)
+            : base(bounds, transform)
+        {
+            Aux = aux;
+        }
+
+        /// <summary>
+        /// Auxiliary data required to draw the brush
+        /// </summary>
+        public IDisposable? Aux { get; }
+
+        public override void Dispose()
+        {
+            Aux?.Dispose();
+            base.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/CustomDrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/CustomDrawOperation.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
new file mode 100644
index 0000000000..d6766fa9b8
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -0,0 +1,482 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A drawing context which builds a scene graph.
+    /// </summary>
+    internal class DeferredDrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
+    {
+        private readonly ISceneBuilder _sceneBuilder;
+        private VisualNode? _node;
+        private int _childIndex;
+        private int _drawOperationindex;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeferredDrawingContextImpl"/> class.
+        /// </summary>
+        /// <param name="sceneBuilder">
+        /// A scene builder used for constructing child scenes for visual brushes.
+        /// </param>
+        /// <param name="layers">The scene layers.</param>
+        public DeferredDrawingContextImpl(ISceneBuilder sceneBuilder, SceneLayers layers)
+        {
+            _sceneBuilder = sceneBuilder;
+            Layers = layers;
+        }
+
+        /// <inheritdoc/>
+        public Matrix Transform { get; set; } = Matrix.Identity;
+
+        /// <summary>
+        /// Gets the layers in the scene being built.
+        /// </summary>
+        public SceneLayers Layers { get; }
+
+        /// <summary>
+        /// Informs the drawing context of the visual node that is about to be rendered.
+        /// </summary>
+        /// <param name="node">The visual node.</param>
+        /// <returns>
+        /// An object which when disposed will commit the changes to visual node.
+        /// </returns>
+        public UpdateState BeginUpdate(VisualNode node)
+        {
+            _ = node ?? throw new ArgumentNullException(nameof(node));
+
+            if (_node != null)
+            {
+                if (_childIndex < _node.Children.Count)
+                {
+                    _node.ReplaceChild(_childIndex, node);
+                }
+                else
+                {
+                    _node.AddChild(node);
+                }
+
+                ++_childIndex;
+            }
+
+            var state = new UpdateState(this, _node, _childIndex, _drawOperationindex);
+            _node = node;
+            _childIndex = _drawOperationindex = 0;
+            return state;
+        }
+
+        /// <inheritdoc/>
+        public void Clear(Color color)
+        {
+            // Cannot clear a deferred scene.
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            // Nothing to do here since we allocate no unmanaged resources.
+        }
+
+        /// <summary>
+        /// Removes any remaining drawing operations from the visual node.
+        /// </summary>
+        /// <remarks>
+        /// Drawing operations are updated in place, overwriting existing drawing operations if
+        /// they are different. Once drawing has completed for the current visual node, it is
+        /// possible that there are stale drawing operations at the end of the list. This method
+        /// trims these stale drawing operations.
+        /// </remarks>
+        public void TrimChildren()
+        {
+            _node!.TrimChildren(_childIndex);
+        }
+
+        /// <inheritdoc/>
+        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+        {
+            var next = NextDrawAs<GeometryNode>();
+
+            if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
+            {
+                Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            var next = NextDrawAs<ImageNode>();
+
+            if (next == null || !next.Item.Equals(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode))
+            {
+                Add(new ImageNode(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
+        {
+            // This method is currently only used to composite layers so shouldn't be called here.
+            throw new NotSupportedException();
+        }
+
+        /// <inheritdoc/>
+        public void DrawLine(IPen pen, Point p1, Point p2)
+        {
+            var next = NextDrawAs<LineNode>();
+
+            if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
+            {
+                Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
+            BoxShadows boxShadows = default)
+        {
+            var next = NextDrawAs<RectangleNode>();
+
+            if (next == null || !next.Item.Equals(Transform, brush, pen, rect, boxShadows))
+            {
+                Add(new RectangleNode(Transform, brush, pen, rect, boxShadows, CreateChildScene(brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
+        {
+            var next = NextDrawAs<ExperimentalAcrylicNode>();
+
+            if (next == null || !next.Item.Equals(Transform, material, rect))
+            {
+                Add(new ExperimentalAcrylicNode(Transform, material, rect));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
+        {
+            var next = NextDrawAs<EllipseNode>();
+
+            if (next == null || !next.Item.Equals(Transform, brush, pen, rect))
+            {
+                Add(new EllipseNode(Transform, brush, pen, rect, CreateChildScene(brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        public void Custom(ICustomDrawOperation custom)
+        {
+            var next = NextDrawAs<CustomDrawOperation>();
+            if (next == null || !next.Item.Equals(Transform, custom))
+                Add(new CustomDrawOperation(custom, Transform));
+            else
+                ++_drawOperationindex;
+        }
+
+        public object? GetFeature(Type t) => null;
+
+        /// <inheritdoc/>
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        {
+            var next = NextDrawAs<GlyphRunNode>();
+
+            if (next == null || !next.Item.Equals(Transform, foreground, glyphRun))
+            {
+                Add(new GlyphRunNode(Transform, foreground, glyphRun, CreateChildScene(foreground)));
+            }
+
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+        public IDrawingContextLayerImpl CreateLayer(Size size)
+        {
+            throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
+        }
+
+        /// <inheritdoc/>
+        public void PopClip()
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new ClipNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PopGeometryClip()
+        {
+            var next = NextDrawAs<GeometryClipNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new GeometryClipNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PopBitmapBlendMode()
+        {
+            var next = NextDrawAs<BitmapBlendModeNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new BitmapBlendModeNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+        
+        /// <inheritdoc/>
+        public void PopOpacity()
+        {
+            var next = NextDrawAs<OpacityNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new OpacityNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PopOpacityMask()
+        {
+            var next = NextDrawAs<OpacityMaskNode>();
+
+            if (next == null || !next.Item.Equals(null, null))
+            {
+                Add(new OpacityMaskNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushClip(Rect clip)
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(Transform, clip))
+            {
+                Add(new ClipNode(Transform, clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc />
+        public void PushClip(RoundedRect clip)
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(Transform, clip))
+            {
+                Add(new ClipNode(Transform, clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushGeometryClip(IGeometryImpl? clip)
+        {
+            if (clip is null)
+                return;
+
+            var next = NextDrawAs<GeometryClipNode>();
+
+            if (next == null || !next.Item.Equals(Transform, clip))
+            {
+                Add(new GeometryClipNode(Transform, clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushOpacity(double opacity)
+        {
+            var next = NextDrawAs<OpacityNode>();
+
+            if (next == null || !next.Item.Equals(opacity))
+            {
+                Add(new OpacityNode(opacity));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            var next = NextDrawAs<OpacityMaskNode>();
+
+            if (next == null || !next.Item.Equals(mask, bounds))
+            {
+                Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
+        {
+            var next = NextDrawAs<BitmapBlendModeNode>();
+
+            if (next == null || !next.Item.Equals(blendingMode))
+            {
+                Add(new BitmapBlendModeNode(blendingMode));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+        
+        public readonly struct UpdateState : IDisposable
+        {
+            public UpdateState(
+                DeferredDrawingContextImpl owner,
+                VisualNode? node,
+                int childIndex,
+                int drawOperationIndex)
+            {
+                Owner = owner;
+                Node = node;
+                ChildIndex = childIndex;
+                DrawOperationIndex = drawOperationIndex;
+            }
+
+            public void Dispose()
+            {
+                Owner._node!.TrimDrawOperations(Owner._drawOperationindex);
+
+                var dirty = Owner.Layers.GetOrAdd(Owner._node.LayerRoot!).Dirty;
+
+                var drawOperations = Owner._node.DrawOperations;
+                var drawOperationsCount = drawOperations.Count;
+
+                for (var i = 0; i < drawOperationsCount; i++)
+                {
+                    dirty.Add(drawOperations[i].Item.Bounds);
+                }
+
+                Owner._node = Node;
+                Owner._childIndex = ChildIndex;
+                Owner._drawOperationindex = DrawOperationIndex;
+            }
+
+            public DeferredDrawingContextImpl Owner { get; }
+            public VisualNode? Node { get; }
+            public int ChildIndex { get; }
+            public int DrawOperationIndex { get; }
+        }
+
+        private void Add<T>(T node) where T : class, IDrawOperation
+        {
+            using (var refCounted = RefCountable.Create(node))
+            {
+                Add(refCounted);
+            }
+        }
+
+        private void Add(IRef<IDrawOperation> node)
+        {
+            if (_drawOperationindex < _node!.DrawOperations.Count)
+            {
+                _node.ReplaceDrawOperation(_drawOperationindex, node);
+            }
+            else
+            {
+                _node.AddDrawOperation(node);
+            }
+
+            ++_drawOperationindex;
+        }
+
+        private IRef<T>? NextDrawAs<T>() where T : class, IDrawOperation
+        {
+            return _drawOperationindex < _node!.DrawOperations.Count ? _node.DrawOperations[_drawOperationindex] as IRef<T> : null;
+        }
+
+        private IDisposable? CreateChildScene(IBrush? brush)
+        {
+            var visualBrush = brush as VisualBrush;
+
+            if (visualBrush != null)
+            {
+                var visual = visualBrush.Visual;
+
+                if (visual != null)
+                {
+                    (visual as IVisualBrushInitialize)?.EnsureInitialized();
+                    var scene = new Scene(visual);
+                    _sceneBuilder.UpdateAll(scene);
+                    return scene;
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/DrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/DrawOperation.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs
new file mode 100644
index 0000000000..4600653b9d
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an ellipse draw.
+    /// </summary>
+    internal class EllipseNode : BrushDrawOperation
+    {
+        public EllipseNode(
+            Matrix transform, 
+            IBrush? brush, 
+            IPen? pen, 
+            Rect rect, 
+            IDisposable? aux = null) 
+            : base(rect.Inflate(pen?.Thickness ?? 0), transform, aux)
+        {
+            Transform = transform;
+            Brush = brush?.ToImmutable();
+            Pen = pen?.ToImmutable();
+            Rect = rect;
+        }
+
+        /// <summary>
+        /// Gets the fill brush.
+        /// </summary>
+        public IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the stroke pen.
+        /// </summary>
+        public ImmutablePen? Pen { get; }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the rect of the ellipse to draw.
+        /// </summary>
+        public Rect Rect { get; }
+
+        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, Rect rect)
+        {
+            return transform == Transform &&
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   rect.Equals(Rect);
+        }
+
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawEllipse(Brush, Pen, Rect);
+        }
+
+        public override bool HitTest(Point p)
+        {
+            if (!Transform.TryInvert(out Matrix inverted))
+            {
+                return false;
+            }
+
+            p *= inverted;
+
+            var center = Rect.Center;
+
+            var strokeThickness = Pen?.Thickness ?? 0;
+
+            var rx = Rect.Width / 2 + strokeThickness / 2;
+            var ry = Rect.Height / 2 + strokeThickness / 2;
+
+            var dx = p.X - center.X;
+            var dy = p.Y - center.Y;
+
+            if (Math.Abs(dx) > rx || Math.Abs(dy) > ry)
+            {
+                return false;
+            }
+
+            if (Brush != null)
+            {
+                return Contains(rx, ry);
+            }
+            else if (strokeThickness > 0)
+            {
+                bool inStroke = Contains(rx, ry);
+
+                rx = Rect.Width / 2 - strokeThickness / 2;
+                ry = Rect.Height / 2 - strokeThickness / 2;
+
+                bool inInner = Contains(rx, ry);
+
+                return inStroke && !inInner;
+            }
+
+            bool Contains(double radiusX, double radiusY)
+            {
+                var rx2 = radiusX * radiusX;
+                var ry2 = radiusY * radiusY;
+
+                var distance = ry2 * dx * dx + rx2 * dy * dy;
+
+                return distance <= rx2 * ry2;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
new file mode 100644
index 0000000000..12b67105e9
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
@@ -0,0 +1,93 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents a rectangle draw.
+    /// </summary>
+    internal class ExperimentalAcrylicNode : DrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RectangleNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="material"></param>        
+        /// <param name="rect">The rectangle to draw.</param>
+        public ExperimentalAcrylicNode(
+            Matrix transform,
+            IExperimentalAcrylicMaterial material,
+            RoundedRect rect)
+            : base(rect.Rect, transform)
+        {
+            Transform = transform;
+            Material = material.ToImmutable();
+            Rect = rect;
+        }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        public IExperimentalAcrylicMaterial Material { get; }        
+
+        /// <summary>
+        /// Gets the rectangle to draw.
+        /// </summary>
+        public RoundedRect Rect { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="material">The fill of the other draw operation.</param>
+        /// <param name="rect">The rectangle of the other draw operation.</param>        
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IExperimentalAcrylicMaterial material, RoundedRect rect)
+        {
+            return transform == Transform &&
+                   Equals(material, Material) &&
+                   rect.Equals(Rect);
+        }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+
+            if(context is IDrawingContextWithAcrylicLikeSupport idc)
+            {
+                idc.DrawRectangle(Material, Rect);
+            }
+            else
+            {
+                context.DrawRectangle(new ImmutableSolidColorBrush(Material.FallbackColor), null, Rect);
+            }            
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p)
+        {
+            // TODO: This doesn't respect CornerRadius yet.
+            if (Transform.HasInverse)
+            {
+                p *= Transform.Invert();
+
+                if (Material != null)
+                {
+                    var rect = Rect.Rect;
+                    return rect.ContainsExclusive(p);
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
new file mode 100644
index 0000000000..b1129e81c4
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
@@ -0,0 +1,31 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Rendering.SceneGraph;
+
+internal static class GeometryBoundsHelper
+{
+    /// <summary>
+    /// Calculates the bounds of a given geometry with respect to the pens <see cref="IPen.LineCap"/>
+    /// </summary>
+    /// <param name="originalBounds">The calculated bounds without <see cref="IPen.LineCap"/>s</param>
+    /// <param name="pen">The pen with information about the <see cref="IPen.LineCap"/>s</param>
+    /// <returns></returns>
+    public static Rect CalculateBoundsWithLineCaps(this Rect originalBounds, IPen? pen)
+    {
+        if (pen is null || MathUtilities.IsZero(pen.Thickness)) return originalBounds;
+
+        switch (pen.LineCap)
+        {
+            case PenLineCap.Flat:
+                return originalBounds;
+            case PenLineCap.Round:
+                return originalBounds.Inflate(pen.Thickness / 2);
+            case PenLineCap.Square:
+                return originalBounds.Inflate(pen.Thickness);
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
new file mode 100644
index 0000000000..cf53b86fa7
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
@@ -0,0 +1,94 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents a geometry draw.
+    /// </summary>
+    internal class GeometryNode : BrushDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GeometryNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
+        public GeometryNode(Matrix transform,
+            IBrush? brush,
+            IPen? pen,
+            IGeometryImpl geometry,
+            IDisposable? aux)
+            : base(geometry.GetRenderBounds(pen).CalculateBoundsWithLineCaps(pen), transform, aux)
+        {
+            Transform = transform;
+            Brush = brush?.ToImmutable();
+            Pen = pen?.ToImmutable();
+            Geometry = geometry;
+        }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the fill brush.
+        /// </summary>
+        public IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the stroke pen.
+        /// </summary>
+        public ImmutablePen? Pen { get; }
+
+        /// <summary>
+        /// Gets the geometry to draw.
+        /// </summary>
+        public IGeometryImpl Geometry { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="brush">The fill of the other draw operation.</param>
+        /// <param name="pen">The stroke of the other draw operation.</param>
+        /// <param name="geometry">The geometry of the other draw operation.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, IGeometryImpl geometry)
+        {
+            return transform == Transform &&
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   Equals(geometry, Geometry);
+        }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawGeometry(Brush, Pen, Geometry);
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p)
+        {
+            if (Transform.HasInverse)
+            {
+                p *= Transform.Invert();
+                return (Brush != null && Geometry.FillContains(p)) ||
+                    (Pen != null && Geometry.StrokeContains(Pen, p));
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
new file mode 100644
index 0000000000..1d85e95835
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
@@ -0,0 +1,74 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents a glyph run draw.
+    /// </summary>
+    internal class GlyphRunNode : BrushDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GlyphRunNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="foreground">The foreground brush.</param>
+        /// <param name="glyphRun">The glyph run to draw.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
+        public GlyphRunNode(
+            Matrix transform,
+            IBrush foreground,
+            GlyphRun glyphRun,
+            IDisposable? aux = null)
+            : base(new Rect(glyphRun.Size), transform, aux)
+        {
+            Transform = transform;
+            Foreground = foreground.ToImmutable();
+            GlyphRun = glyphRun;
+        }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the foreground brush.
+        /// </summary>
+        public IBrush Foreground { get; }
+
+        /// <summary>
+        /// Gets the glyph run to draw.
+        /// </summary>
+        public GlyphRun GlyphRun { get; }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawGlyphRun(Foreground, GlyphRun);
+        }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="foreground">The foreground of the other draw operation.</param>
+        /// <param name="glyphRun">The glyph run of the other draw operation.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        internal bool Equals(Matrix transform, IBrush foreground, GlyphRun glyphRun)
+        {
+            return transform == Transform &&
+                   Equals(foreground, Foreground) &&
+                   Equals(glyphRun, GlyphRun);
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p) => Bounds.ContainsExclusive(p);
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/IDrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/IDrawOperation.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ISceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/ISceneBuilder.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/ISceneBuilder.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/ISceneBuilder.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/IVisualNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/IVisualNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
new file mode 100644
index 0000000000..339881e675
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
@@ -0,0 +1,119 @@
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an image draw.
+    /// </summary>
+    internal class ImageNode : DrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="source">The image to draw.</param>
+        /// <param name="opacity">The draw opacity.</param>
+        /// <param name="sourceRect">The source rect.</param>
+        /// <param name="destRect">The destination rect.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        public ImageNode(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+            : base(destRect, transform)
+        {
+            Transform = transform;
+            Source = source.Clone();
+            Opacity = opacity;
+            SourceRect = sourceRect;
+            DestRect = destRect;
+            BitmapInterpolationMode = bitmapInterpolationMode;
+            SourceVersion = Source.Item.Version;
+        }        
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the image to draw.
+        /// </summary>
+        public IRef<IBitmapImpl> Source { get; }
+
+        /// <summary>
+        /// Source bitmap Version
+        /// </summary>
+        public int SourceVersion { get; }
+
+        /// <summary>
+        /// Gets the draw opacity.
+        /// </summary>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the source rect.
+        /// </summary>
+        public Rect SourceRect { get; }
+
+        /// <summary>
+        /// Gets the destination rect.
+        /// </summary>
+        public Rect DestRect { get; }
+
+        /// <summary>
+        /// Gets the bitmap interpolation mode.
+        /// </summary>
+        /// <value>
+        /// The scaling mode.
+        /// </value>
+        public BitmapInterpolationMode BitmapInterpolationMode { get; }
+        
+        /// <summary>
+        /// The bitmap blending mode.
+        /// </summary>
+        /// <value>
+        /// The blending mode.
+        /// </value>
+        public BitmapBlendingMode BitmapBlendingMode { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="source">The image of the other draw operation.</param>
+        /// <param name="opacity">The opacity of the other draw operation.</param>
+        /// <param name="sourceRect">The source rect of the other draw operation.</param>
+        /// <param name="destRect">The dest rect of the other draw operation.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            return transform == Transform &&
+                   Equals(source.Item, Source.Item) &&
+                   source.Item.Version == SourceVersion &&
+                   opacity == Opacity &&
+                   sourceRect == SourceRect &&
+                   destRect == DestRect &&
+                   bitmapInterpolationMode == BitmapInterpolationMode;
+        }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawBitmap(Source, Opacity, SourceRect, DestRect, BitmapInterpolationMode);
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p) => Bounds.ContainsExclusive(p);
+
+        public override void Dispose()
+        {
+            Source?.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs b/src/Avalonia.Base/Rendering/SceneGraph/LineBoundsHelper.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/LineBoundsHelper.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
new file mode 100644
index 0000000000..0af8ba2752
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
@@ -0,0 +1,122 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents a line draw.
+    /// </summary>
+    internal class LineNode : BrushDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GeometryNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="p1">The start point of the line.</param>
+        /// <param name="p2">The end point of the line.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
+        public LineNode(
+            Matrix transform,
+            IPen pen,
+            Point p1,
+            Point p2,
+            IDisposable? aux = null)
+            : base(LineBoundsHelper.CalculateBounds(p1, p2, pen), transform, aux)
+        {
+            Transform = transform;
+            Pen = pen.ToImmutable();
+            P1 = p1;
+            P2 = p2;
+        }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the stroke pen.
+        /// </summary>
+        public ImmutablePen Pen { get; }
+
+        /// <summary>
+        /// Gets the start point of the line.
+        /// </summary>
+        public Point P1 { get; }
+
+        /// <summary>
+        /// Gets the end point of the line.
+        /// </summary>
+        public Point P2 { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="pen">The stroke of the other draw operation.</param>
+        /// <param name="p1">The start point of the other draw operation.</param>
+        /// <param name="p2">The end point of the other draw operation.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IPen pen, Point p1, Point p2)
+        {
+            return transform == Transform && Equals(Pen, pen) && p1 == P1 && p2 == P2;
+        }
+
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawLine(Pen, P1, P2);
+        }
+
+        public override bool HitTest(Point p)
+        {
+            if (!Transform.HasInverse)
+                return false;
+
+            p *= Transform.Invert();
+
+            var halfThickness = Pen.Thickness / 2;
+            var minX = Math.Min(P1.X, P2.X) - halfThickness;
+            var maxX = Math.Max(P1.X, P2.X) + halfThickness;
+            var minY = Math.Min(P1.Y, P2.Y) - halfThickness;
+            var maxY = Math.Max(P1.Y, P2.Y) + halfThickness;
+
+            if (p.X < minX || p.X > maxX || p.Y < minY || p.Y > maxY)
+                return false;
+
+            var a = P1;
+            var b = P2;
+
+            //If dot1 or dot2 is negative, then the angle between the perpendicular and the segment is obtuse.
+            //The distance from a point to a straight line is defined as the
+            //length of the vector formed by the point and the closest point of the segment
+
+            Vector ap = p - a;
+            var dot1 = Vector.Dot(b - a, ap);
+
+            if (dot1 < 0)
+                return ap.Length <= Pen.Thickness / 2;
+
+            Vector bp = p - b;
+            var dot2 = Vector.Dot(a - b, bp);
+
+            if (dot2 < 0)
+                return bp.Length <= halfThickness;
+
+            var bXaX = b.X - a.X;
+            var bYaY = b.Y - a.Y;
+
+            var distance = (bXaX * (p.Y - a.Y) - bYaY * (p.X - a.X)) /
+                           (Math.Sqrt(bXaX * bXaX + bYaY * bYaY));
+
+            return Math.Abs(distance) <= halfThickness;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
new file mode 100644
index 0000000000..5fd200ddff
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an opacity mask push or pop.
+    /// </summary>
+    internal class OpacityMaskNode : BrushDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpacityMaskNode"/> class that represents an
+        /// opacity mask push.
+        /// </summary>
+        /// <param name="mask">The opacity mask to push.</param>
+        /// <param name="bounds">The bounds of the mask.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
+        public OpacityMaskNode(IBrush mask, Rect bounds, IDisposable? aux = null)
+            : base(Rect.Empty, Matrix.Identity, aux)
+        {
+            Mask = mask.ToImmutable();
+            MaskBounds = bounds;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpacityMaskNode"/> class that represents an
+        /// opacity mask pop.
+        /// </summary>
+        public OpacityMaskNode()
+            : base(Rect.Empty, Matrix.Identity, null)
+        {
+        }
+
+        /// <summary>
+        /// Gets the mask to be pushed or null if the operation represents a pop.
+        /// </summary>
+        public IBrush? Mask { get; }
+
+        /// <summary>
+        /// Gets the bounds of the opacity mask or null if the operation represents a pop.
+        /// </summary>
+        public Rect? MaskBounds { get; }
+
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p) => false;
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="mask">The opacity mask of the other draw operation.</param>
+        /// <param name="bounds">The opacity mask bounds of the other draw operation.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(IBrush? mask, Rect? bounds) => Mask == mask && MaskBounds == bounds;
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            if (Mask != null)
+            {
+                context.PushOpacityMask(Mask, MaskBounds!.Value);
+            }
+            else
+            {
+                context.PopOpacityMask();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
new file mode 100644
index 0000000000..f2ffd7411c
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents a rectangle draw.
+    /// </summary>
+    internal class RectangleNode : BrushDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RectangleNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="rect">The rectangle to draw.</param>
+        /// <param name="boxShadows">The box shadow parameters</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
+        public RectangleNode(
+            Matrix transform,
+            IBrush? brush,
+            IPen? pen,
+            RoundedRect rect,
+            BoxShadows boxShadows,
+            IDisposable? aux = null)
+            : base(boxShadows.TransformBounds(rect.Rect).Inflate((pen?.Thickness ?? 0) / 2), transform, aux)
+        {
+            Transform = transform;
+            Brush = brush?.ToImmutable();
+            Pen = pen?.ToImmutable();
+            Rect = rect;
+            BoxShadows = boxShadows;
+        }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the fill brush.
+        /// </summary>
+        public IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the stroke pen.
+        /// </summary>
+        public ImmutablePen? Pen { get; }
+
+        /// <summary>
+        /// Gets the rectangle to draw.
+        /// </summary>
+        public RoundedRect Rect { get; }
+        
+        /// <summary>
+        /// The parameters for the box-shadow effect
+        /// </summary>
+        public BoxShadows BoxShadows { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="brush">The fill of the other draw operation.</param>
+        /// <param name="pen">The stroke of the other draw operation.</param>
+        /// <param name="rect">The rectangle of the other draw operation.</param>
+        /// <param name="boxShadows">The box shadow parameters of the other draw operation</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, RoundedRect rect, BoxShadows boxShadows)
+        {
+            return transform == Transform &&
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   BoxShadows.Equals(boxShadows) &&
+                   rect.Equals(Rect);
+        }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+
+            context.DrawRectangle(Brush, Pen, Rect, BoxShadows);
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p)
+        {
+            // TODO: This doesn't respect CornerRadius yet.
+            if (Transform.HasInverse)
+            {
+                p *= Transform.Invert();
+
+                if (Brush != null)
+                {
+                    var rect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
+                    return rect.ContainsExclusive(p);
+                }
+                else
+                {
+                    var borderRect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
+                    var emptyRect = Rect.Rect.Deflate((Pen?.Thickness / 2) ?? 0);
+                    return borderRect.ContainsExclusive(p) && !emptyRect.ContainsExclusive(p);
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
new file mode 100644
index 0000000000..c436299018
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
@@ -0,0 +1,350 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Collections.Pooled;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// Represents a scene graph used by the <see cref="DeferredRenderer"/>.
+    /// </summary>
+    public class Scene : IDisposable
+    {
+        private readonly Dictionary<IVisual, IVisualNode> _index;
+        private readonly TaskCompletionSource<bool> _rendered = new TaskCompletionSource<bool>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scene"/> class.
+        /// </summary>
+        /// <param name="rootVisual">The root visual to draw.</param>
+        public Scene(IVisual rootVisual)
+            : this(
+                new VisualNode(rootVisual, null),
+                new Dictionary<IVisual, IVisualNode>(),
+                new SceneLayers(rootVisual),
+                0)
+        {
+            _index.Add(rootVisual, Root);
+        }
+
+        private Scene(VisualNode root, Dictionary<IVisual, IVisualNode> index, SceneLayers layers, int generation)
+        {
+            _ = root ?? throw new ArgumentNullException(nameof(root));
+
+            var renderRoot = root.Visual as IRenderRoot;
+
+            _index = index;
+            Root = root;
+            Layers = layers;
+            Generation = generation;
+            root.LayerRoot = root.Visual;
+        }
+
+        public Task Rendered => _rendered.Task;
+
+        /// <summary>
+        /// Gets a value identifying the scene's generation. This is incremented each time the scene is cloned.
+        /// </summary>
+        public int Generation { get; }
+
+        /// <summary>
+        /// Gets the layers for the scene.
+        /// </summary>
+        public SceneLayers Layers { get; }
+
+        /// <summary>
+        /// Gets the root node of the scene graph.
+        /// </summary>
+        public IVisualNode Root { get; }
+
+        /// <summary>
+        /// Gets or sets the size of the scene in device independent pixels.
+        /// </summary>
+        public Size Size { get; set; }
+
+        /// <summary>
+        /// Gets or sets the scene scaling.
+        /// </summary>
+        public double Scaling { get; set; } = 1;
+
+        /// <summary>
+        /// Adds a node to the scene index.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public void Add(IVisualNode node)
+        {
+            _ = node ?? throw new ArgumentNullException(nameof(node));
+
+            _index.Add(node.Visual, node);
+        }
+
+        /// <summary>
+        /// Clones the scene.
+        /// </summary>
+        /// <returns>The cloned scene.</returns>
+        public Scene CloneScene()
+        {
+            var index = new Dictionary<IVisual, IVisualNode>(_index.Count);
+            var root = Clone((VisualNode)Root, null, index);
+
+            var result = new Scene(root, index, Layers.Clone(), Generation + 1)
+            {
+                Size = Size,
+                Scaling = Scaling,
+            };
+
+            return result;
+        }
+
+        public void Dispose()
+        {
+            _rendered.TrySetResult(false);
+            foreach (var node in _index.Values)
+            {
+                node.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Tries to find a node in the scene graph representing the specified visual.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>
+        /// The node representing the visual or null if it could not be found.
+        /// </returns>
+        public IVisualNode? FindNode(IVisual visual)
+        {
+            _index.TryGetValue(visual, out var node);
+            return node;
+        }
+
+        /// <summary>
+        /// Gets the visuals at a point in the scene.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <param name="root">The root of the subtree to search.</param>
+        /// <param name="filter">A filter. May be null.</param>
+        /// <returns>The visuals at the specified point.</returns>
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool>? filter)
+        {
+            var node = FindNode(root);
+            return (node != null) ? new HitTestEnumerable(node, filter, p, Root) : Enumerable.Empty<IVisual>();
+        }
+
+        /// <summary>
+        /// Gets the visual at a point in the scene.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <param name="root">The root of the subtree to search.</param>
+        /// <param name="filter">A filter. May be null.</param>
+        /// <returns>The visual at the specified point.</returns>
+        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool>? filter)
+        {
+            var node = FindNode(root);
+            return (node != null) ? HitTestFirst(node, p, filter) : null;
+        }
+
+        /// <summary>
+        /// Removes a node from the scene index.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public void Remove(IVisualNode node)
+        {
+            _ = node ?? throw new ArgumentNullException(nameof(node));
+
+            _index.Remove(node.Visual);
+
+            node.Dispose();
+        }
+
+        private VisualNode Clone(VisualNode source, IVisualNode? parent, Dictionary<IVisual, IVisualNode> index)
+        {
+            var result = source.Clone(parent);
+
+            index.Add(result.Visual, result);
+
+            var children = source.Children;
+            var childrenCount = children.Count;
+
+            if (childrenCount > 0)
+            {
+                result.TryPreallocateChildren(childrenCount);
+
+                for (var i = 0; i < childrenCount; i++)
+                {
+                    var child = children[i];
+
+                    result.AddChild(Clone((VisualNode)child, result, index));
+                }
+            }
+
+            return result;
+        }
+
+        private IVisual HitTestFirst(IVisualNode root, Point p, Func<IVisual, bool>? filter)
+        {
+            using var enumerator = new HitTestEnumerator(root, filter, p, Root);
+
+            enumerator.MoveNext();
+
+            return enumerator.Current;
+        }
+
+        private class HitTestEnumerable : IEnumerable<IVisual>
+        {
+            private readonly IVisualNode _root;
+            private readonly Func<IVisual, bool>? _filter;
+            private readonly IVisualNode _sceneRoot;
+            private readonly Point _point;
+            
+            public HitTestEnumerable(IVisualNode root, Func<IVisual, bool>? filter, Point point, IVisualNode sceneRoot)
+            {
+                _root = root;
+                _filter = filter;
+                _point = point;
+                _sceneRoot = sceneRoot;
+            }
+
+            public IEnumerator<IVisual> GetEnumerator()
+            {
+                return new HitTestEnumerator(_root, _filter, _point, _sceneRoot);
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+
+        private struct HitTestEnumerator : IEnumerator<IVisual>
+        {
+            private readonly PooledStack<Entry> _nodeStack;
+            private readonly Func<IVisual, bool>? _filter;
+            private readonly IVisualNode _sceneRoot;
+            private IVisual? _current;
+            private readonly Point _point;
+
+            public HitTestEnumerator(IVisualNode root, Func<IVisual, bool>? filter, Point point, IVisualNode sceneRoot)
+            {
+                _nodeStack = new PooledStack<Entry>();
+                _nodeStack.Push(new Entry(root, false, null, true));
+
+                _filter = filter;
+                _point = point;
+                _sceneRoot = sceneRoot;
+
+                _current = null;
+            }
+
+            public bool MoveNext()
+            {
+                while (_nodeStack.Count > 0)
+                {
+                    (var wasVisited, var isRoot, IVisualNode node, Rect? clip) = _nodeStack.Pop();
+
+                    if (wasVisited && isRoot)
+                    {
+                        break;
+                    }
+
+                    var children = node.Children;
+                    int childCount = children.Count;
+
+                    if (childCount == 0 || wasVisited)
+                    {
+                        if ((wasVisited || FilterAndClip(node, ref clip)) &&
+                            (node.Visual is ICustomHitTest custom ? custom.HitTest(_point) : node.HitTest(_point)))
+                        {
+                            _current = node.Visual;
+
+                            return true;
+                        }
+                    }
+                    else if (FilterAndClip(node, ref clip))
+                    {
+                        _nodeStack.Push(new Entry(node, true, null));
+
+                        for (var i = 0; i < childCount; i++)
+                        {
+                            _nodeStack.Push(new Entry(children[i], false, clip));
+                        }
+                    }
+                }
+
+                return false;
+            }
+
+            public void Reset()
+            {
+                throw new NotSupportedException();
+            }
+
+            public IVisual Current => _current!;
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
+                _nodeStack.Dispose();
+            }
+
+            private bool FilterAndClip(IVisualNode node, ref Rect? clip)
+            {
+                if (_filter?.Invoke(node.Visual) != false && node.Visual.IsAttachedToVisualTree)
+                {
+                    var clipped = false;
+
+                    if (node.ClipToBounds)
+                    {
+                        clip = clip == null ? node.ClipBounds : clip.Value.Intersect(node.ClipBounds);
+                        clipped = !clip.Value.ContainsExclusive(_point);
+                    }
+
+                    if (node.GeometryClip != null)
+                    {
+                        var controlPoint = _sceneRoot.Visual.TranslatePoint(_point, node.Visual);
+                        clipped = !node.GeometryClip.FillContains(controlPoint!.Value);
+                    }
+
+                    if (!clipped && node.Visual is ICustomHitTest custom)
+                    {
+                        clipped = !custom.HitTest(_point);
+                    }
+
+                    return !clipped;
+                }
+
+                return false;
+            }
+
+            private readonly struct Entry
+            {
+                public readonly bool WasVisited;
+                public readonly bool IsRoot;
+                public readonly IVisualNode Node;
+                public readonly Rect? Clip;
+
+                public Entry(IVisualNode node, bool wasVisited, Rect? clip, bool isRoot = false)
+                {
+                    Node = node;
+                    WasVisited = wasVisited;
+                    IsRoot = isRoot;
+                    Clip = clip;
+                }
+
+                public void Deconstruct(out bool wasVisited, out bool isRoot, out IVisualNode node, out Rect? clip)
+                {
+                    wasVisited = WasVisited;
+                    isRoot = IsRoot;
+                    node = Node;
+                    clip = Clip;
+                }
+            }
+        }
+
+        public void MarkAsRendered() => _rendered.TrySetResult(true);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
new file mode 100644
index 0000000000..0ceb44ed75
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
@@ -0,0 +1,485 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// Builds a scene graph from a visual tree.
+    /// </summary>
+    public class SceneBuilder : ISceneBuilder
+    {
+        /// <inheritdoc/>
+        public void UpdateAll(Scene scene)
+        {
+            _ = scene ?? throw new ArgumentNullException(nameof(scene));
+            Dispatcher.UIThread.VerifyAccess();
+
+            UpdateSize(scene);
+            scene.Layers.GetOrAdd(scene.Root.Visual);
+
+            using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
+            using (var context = new DrawingContext(impl))
+            {
+                var clip = new Rect(scene.Root.Visual.Bounds.Size);
+                Update(context, scene, (VisualNode)scene.Root, clip, true);
+            }
+        }
+
+        /// <inheritdoc/>
+        public bool Update(Scene scene, IVisual visual)
+        {
+            _ = scene ?? throw new ArgumentNullException(nameof(scene));
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (!scene.Root.Visual.IsVisible)
+            {
+                throw new AvaloniaInternalException("Cannot update the scene for an invisible root visual.");
+            }
+
+            var node = (VisualNode?)scene.FindNode(visual);
+
+            if (visual == scene.Root.Visual)
+            {
+                UpdateSize(scene);
+            }
+
+            if (visual.VisualRoot == scene.Root.Visual)
+            {
+                if (node?.Parent != null &&
+                    visual.VisualParent != null &&
+                    node.Parent.Visual != visual.VisualParent)
+                {
+                    // The control has changed parents. Remove the node and recurse into the new parent node.
+                    ((VisualNode)node.Parent).RemoveChild(node);
+                    Deindex(scene, node);
+                    node = (VisualNode?)scene.FindNode(visual.VisualParent);
+                }
+
+                if (visual.IsVisible)
+                {
+                    // If the node isn't yet part of the scene, find the nearest ancestor that is.
+                    node = node ?? FindExistingAncestor(scene, visual);
+
+                    // We don't need to do anything if this part of the tree has already been fully
+                    // updated.
+                    if (node != null && !node.SubTreeUpdated)
+                    {
+                        // If the control we've been asked to update isn't part of the scene then
+                        // we're carrying out an add operation, so recurse and add all the
+                        // descendents too.
+                        var recurse = node.Visual != visual;
+
+                        using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
+                        using (var context = new DrawingContext(impl))
+                        {
+                            var clip = new Rect(scene.Root.Visual.Bounds.Size);
+
+                            if (node.Parent != null)
+                            {
+                                context.PushPostTransform(node.Parent.Transform);
+                                clip = node.Parent.ClipBounds;
+                            }
+
+                            using (context.PushTransformContainer())
+                            {
+                                Update(context, scene, node, clip, recurse);
+                            }
+                        }
+
+                        return true;
+                    }
+                }
+                else
+                {
+                    if (node != null)
+                    {
+                        // The control has been hidden so remove it from its parent and deindex the
+                        // node and its descendents.
+                        ((VisualNode?)node.Parent)?.RemoveChild(node);
+                        Deindex(scene, node);
+                        return true;
+                    }
+                }
+            }
+            else if (node != null)
+            {
+                // The control has been removed so remove it from its parent and deindex the
+                // node and its descendents.
+                var trim = FindFirstDeadAncestor(scene, node);
+                ((VisualNode)trim.Parent!).RemoveChild(trim);
+                Deindex(scene, trim);
+                return true;
+            }
+
+            return false;
+        }
+
+        private static VisualNode? FindExistingAncestor(Scene scene, IVisual visual)
+        {
+            var node = scene.FindNode(visual);
+
+            while (node == null && visual.IsVisible)
+            {
+                var parent = visual.VisualParent;
+
+                if (parent is null)
+                    return null;
+
+                visual = parent;
+                node = scene.FindNode(visual);
+            }
+
+            return visual.IsVisible ? (VisualNode?)node : null;
+        }
+
+        private static VisualNode FindFirstDeadAncestor(Scene scene, IVisualNode node)
+        {
+            var parent = node.Parent;
+
+            while (parent!.Visual.VisualRoot == null)
+            {
+                node = parent;
+                parent = node.Parent;
+            }
+
+            return (VisualNode)node;
+        }
+
+        private static object GetOrCreateChildNode(Scene scene, IVisual child, VisualNode parent)
+        {
+            var result = (VisualNode?)scene.FindNode(child);
+
+            if (result != null && result.Parent != parent)
+            {
+                Deindex(scene, result);
+                ((VisualNode?)result.Parent)?.RemoveChild(result);
+                result = null;
+            }
+
+            return result ?? CreateNode(scene, child, parent);
+        }
+
+        private static void Update(DrawingContext context, Scene scene, VisualNode node, Rect clip, bool forceRecurse)
+        {
+            var visual = node.Visual;
+            var opacity = visual.Opacity;
+            var clipToBounds = visual.ClipToBounds;
+#pragma warning disable CS0618 // Type or member is obsolete
+            var clipToBoundsRadius = visual is IVisualWithRoundRectClip roundRectClip ?
+                roundRectClip.ClipToBoundsRadius :
+                default;
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            var bounds = new Rect(visual.Bounds.Size);
+            var contextImpl = (DeferredDrawingContextImpl)context.PlatformImpl;
+
+            contextImpl.Layers.Find(node.LayerRoot!)?.Dirty.Add(node.Bounds);
+
+            if (visual.IsVisible)
+            {
+                var m = node != scene.Root ? 
+                    Matrix.CreateTranslation(visual.Bounds.Position) :
+                    Matrix.Identity;
+
+                var renderTransform = Matrix.Identity;
+
+                // this should be calculated BEFORE renderTransform
+                if (visual.HasMirrorTransform)
+                {
+                    var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0);
+                    renderTransform *= mirrorMatrix;
+                }
+
+                if (visual.RenderTransform != null)
+                {
+                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                    var offset = Matrix.CreateTranslation(origin);
+                    var finalTransform = (-offset) * visual.RenderTransform.Value * (offset);
+                    renderTransform *= finalTransform;
+                }
+
+                m = renderTransform * m;
+
+                using (contextImpl.BeginUpdate(node))
+                using (context.PushPostTransform(m))
+                using (context.PushTransformContainer())
+                {
+                    var globalBounds = bounds.TransformToAABB(contextImpl.Transform);
+                    var clipBounds = clipToBounds ?
+                        globalBounds.Intersect(clip) :
+                        clip;
+
+                    forceRecurse = forceRecurse ||
+                        node.ClipBounds != clipBounds ||
+                        node.Opacity != opacity ||
+                        node.Transform != contextImpl.Transform;
+
+                    node.Transform = contextImpl.Transform;
+                    node.ClipBounds = clipBounds;
+                    node.ClipToBounds = clipToBounds;
+                    node.LayoutBounds = globalBounds;
+                    node.ClipToBoundsRadius = clipToBoundsRadius;
+                    node.GeometryClip = visual.Clip?.PlatformImpl;
+                    node.Opacity = opacity;
+
+                    // TODO: Check equality between node.OpacityMask and visual.OpacityMask before assigning.
+                    node.OpacityMask = visual.OpacityMask?.ToImmutable();
+
+                    if (ShouldStartLayer(visual))
+                    {
+                        if (node.LayerRoot != visual)
+                        {
+                            MakeLayer(scene, node);
+                        }
+                        else
+                        {
+                            UpdateLayer(node, scene.Layers[node.LayerRoot]);
+                        }
+                    }
+                    else if (node.LayerRoot == node.Visual && node.Parent != null)
+                    {
+                        ClearLayer(scene, node);
+                    }
+
+                    if (node.ClipToBounds)
+                    {
+                        clip = clip.Intersect(node.ClipBounds);
+                    }
+
+                    try
+                    {
+                        visual.Render(context);
+                    }
+                    catch { }
+
+                    var transformed = new TransformedBounds(new Rect(visual.Bounds.Size), clip, node.Transform);
+                    visual.TransformedBounds = transformed;
+
+                    if (forceRecurse)
+                    {
+                        var visualChildren = (IList<IVisual>) visual.VisualChildren;
+
+                        node.TryPreallocateChildren(visualChildren.Count);
+
+                        if (visualChildren.Count == 1)
+                        {
+                            var childNode = GetOrCreateChildNode(scene, visualChildren[0], node);
+                            Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
+                        }
+                        else if (visualChildren.Count > 1)
+                        {
+                            var count = visualChildren.Count;
+
+                            if (visual.HasNonUniformZIndexChildren)
+                            {
+                                var sortedChildren = new (IVisual visual, int index)[count];
+
+                                for (var i = 0; i < count; i++)
+                                {
+                                    sortedChildren[i] = (visualChildren[i], i);
+                                }
+
+                                // Regular Array.Sort is unstable, we need to provide indices as well to avoid reshuffling elements.
+                                Array.Sort(sortedChildren, (lhs, rhs) =>
+                                {
+                                    var result = ZIndexComparer.Instance.Compare(lhs.visual, rhs.visual);
+
+                                    return result == 0 ? lhs.index.CompareTo(rhs.index) : result;
+                                });
+
+                                foreach (var child in sortedChildren)
+                                {
+                                    var childNode = GetOrCreateChildNode(scene, child.Item1, node);
+                                    Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
+                                }
+                            }
+                            else
+                                foreach (var child in visualChildren)
+                                {
+                                    var childNode = GetOrCreateChildNode(scene, child, node);
+                                    Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
+                                }
+                        }
+
+                        node.SubTreeUpdated = true;
+                        contextImpl.TrimChildren();
+                    }
+                }
+            }
+            else
+            {
+                contextImpl.BeginUpdate(node).Dispose();
+            }
+        }
+
+        private void UpdateSize(Scene scene)
+        {
+            var renderRoot = scene.Root.Visual as IRenderRoot;
+            var newSize = renderRoot?.ClientSize ?? scene.Root.Visual.Bounds.Size;
+
+            scene.Scaling = renderRoot?.RenderScaling ?? 1;
+
+            if (scene.Size != newSize)
+            {
+                var oldSize = scene.Size;
+
+                scene.Size = newSize;
+
+                Rect horizontalDirtyRect = Rect.Empty;
+                Rect verticalDirtyRect = Rect.Empty;
+
+                if (newSize.Width > oldSize.Width)
+                {
+                    horizontalDirtyRect = new Rect(oldSize.Width, 0, newSize.Width - oldSize.Width, oldSize.Height);
+                }
+
+                if (newSize.Height > oldSize.Height)
+                {
+                    verticalDirtyRect = new Rect(0, oldSize.Height, newSize.Width, newSize.Height - oldSize.Height);
+                }
+
+                foreach (var layer in scene.Layers)
+                {
+                    layer.Dirty.Add(horizontalDirtyRect);
+                    layer.Dirty.Add(verticalDirtyRect);
+                }
+            }
+        }
+
+        private static VisualNode CreateNode(Scene scene, IVisual visual, VisualNode parent)
+        {
+            var node = new VisualNode(visual, parent);
+            node.LayerRoot = parent.LayerRoot;
+            scene.Add(node);
+            return node;
+        }
+
+        private static void Deindex(Scene scene, VisualNode node)
+        {
+            var nodeChildren = node.Children;
+            var nodeChildrenCount = nodeChildren.Count;
+
+            for (var i = 0; i < nodeChildrenCount; i++)
+            {
+                if (nodeChildren[i] is VisualNode visual)
+                {
+                    Deindex(scene, visual);
+                }
+            }
+
+            scene.Remove(node);
+
+            node.SubTreeUpdated = true;
+
+            scene.Layers[node.LayerRoot!].Dirty.Add(node.Bounds);
+
+            node.Visual.TransformedBounds = null;
+
+            if (node.LayerRoot == node.Visual && node.Visual != scene.Root.Visual)
+            {
+                scene.Layers.Remove(node.LayerRoot);
+            }
+        }
+
+        private static void ClearLayer(Scene scene, VisualNode node)
+        {
+            var parent = (VisualNode)node.Parent!;
+            var oldLayerRoot = node.LayerRoot;
+            var newLayerRoot = parent.LayerRoot!;
+            var existingDirtyRects = scene.Layers[node.LayerRoot!].Dirty;
+            var newDirtyRects = scene.Layers[newLayerRoot].Dirty;
+
+            existingDirtyRects.Coalesce();
+
+            foreach (var r in existingDirtyRects)
+            {
+                newDirtyRects.Add(r);
+            }
+
+            var oldLayer = scene.Layers[oldLayerRoot!];
+            PropagateLayer(node, scene.Layers[newLayerRoot], oldLayer);
+            scene.Layers.Remove(oldLayer);
+        }
+
+        private static void MakeLayer(Scene scene, VisualNode node)
+        {
+            var oldLayerRoot = node.LayerRoot!;
+            var layer = scene.Layers.Add(node.Visual);
+            var oldLayer = scene.Layers[oldLayerRoot!];
+
+            UpdateLayer(node, layer);
+            PropagateLayer(node, layer, scene.Layers[oldLayerRoot]);
+        }
+
+        private static void UpdateLayer(VisualNode node, SceneLayer layer)
+        {
+            layer.Opacity = node.Visual.Opacity;
+
+            if (node.Visual.OpacityMask != null)
+            {
+                layer.OpacityMask = node.Visual.OpacityMask?.ToImmutable();
+                layer.OpacityMaskRect = node.ClipBounds;
+            }
+            else
+            {
+                layer.OpacityMask = null;
+                layer.OpacityMaskRect = Rect.Empty;
+            }
+
+            layer.GeometryClip = node.HasAncestorGeometryClip ?
+                CreateLayerGeometryClip(node) :
+                null;
+        }
+
+        private static void PropagateLayer(VisualNode node, SceneLayer layer, SceneLayer oldLayer)
+        {
+            node.LayerRoot = layer.LayerRoot;
+
+            layer.Dirty.Add(node.Bounds);
+            oldLayer.Dirty.Add(node.Bounds);
+
+            foreach (VisualNode child in node.Children)
+            {
+                // If the child is not the start of a new layer, recurse.
+                if (child.LayerRoot != child.Visual)
+                {
+                    PropagateLayer(child, layer, oldLayer);
+                }
+            }
+        }
+
+        // HACK: Disabled layers because they're broken in current renderer. See #2244.
+        private static bool ShouldStartLayer(IVisual visual) => false;
+
+        private static IGeometryImpl? CreateLayerGeometryClip(VisualNode node)
+        {
+            IGeometryImpl? result = null;
+            VisualNode? n = node;
+
+            for (;;)
+            {
+                n = (VisualNode?)n!.Parent;
+
+                if (n == null || (n.GeometryClip == null && !n.HasAncestorGeometryClip))
+                {
+                    break;
+                }
+
+                if (n?.GeometryClip != null)
+                {
+                    var transformed = n.GeometryClip.WithTransform(n.Transform);
+
+                    result = result == null ? transformed : result.Intersect(transformed);
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayer.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneLayer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayer.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/SceneLayer.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneLayers.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/SceneLayers.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs b/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
new file mode 100644
index 0000000000..73840376fe
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
@@ -0,0 +1,33 @@
+using System;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Provides data for the <see cref="IRenderer.SceneInvalidated"/> event.
+    /// </summary>
+    public class SceneInvalidatedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SceneInvalidatedEventArgs"/> class.
+        /// </summary>
+        /// <param name="root">The render root that has been updated.</param>
+        /// <param name="dirtyRect">The updated area.</param>
+        internal SceneInvalidatedEventArgs(
+            IRenderRoot root,
+            Rect dirtyRect)
+        {
+            RenderRoot = root;
+            DirtyRect = dirtyRect;
+        }
+
+        /// <summary>
+        /// Gets the invalidated area.
+        /// </summary>
+        public Rect DirtyRect { get; }
+
+        /// <summary>
+        /// Gets the render root that has been invalidated.
+        /// </summary>
+        public IRenderRoot RenderRoot { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/SleepLoopRenderTimer.cs b/src/Avalonia.Base/Rendering/SleepLoopRenderTimer.cs
new file mode 100644
index 0000000000..cd43a3ef20
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SleepLoopRenderTimer.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+namespace Avalonia.Rendering
+{
+    public class SleepLoopRenderTimer : IRenderTimer
+    {
+        private Action<TimeSpan>? _tick;
+        private int _count;
+        private readonly object _lock = new object();
+        private bool _running;
+        private readonly Stopwatch _st = Stopwatch.StartNew();
+        private readonly TimeSpan _timeBetweenTicks;
+
+        public SleepLoopRenderTimer(int fps)
+        {
+            _timeBetweenTicks = TimeSpan.FromSeconds(1d / fps);
+        }
+        
+        public event Action<TimeSpan> Tick
+        {
+            add
+            {
+                lock (_lock)
+                {
+                    _tick += value;
+                    _count++;
+                    if (_running)
+                        return;
+                    _running = true;
+                    new Thread(LoopProc) { IsBackground = true }.Start();
+                }
+
+            }
+            remove
+            {
+                lock (_lock)
+                {
+                    _tick -= value;
+                    _count--;
+                }
+            }
+        }
+
+        public bool RunsInBackground => true;
+
+        void LoopProc()
+        {
+            var lastTick = _st.Elapsed;
+            while (true)
+            {
+                var now = _st.Elapsed;
+                var timeTillNextTick = lastTick + _timeBetweenTicks - now;
+                if (timeTillNextTick.TotalMilliseconds > 1) Thread.Sleep(timeTillNextTick);
+                lastTick = now = _st.Elapsed;
+                lock (_lock)
+                {
+                    if (_count == 0)
+                    {
+                        _running = false;
+                        return;
+                    }
+                }
+
+                _tick?.Invoke(now);
+                
+            }
+        }
+
+
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/UiThreadRenderTimer.cs b/src/Avalonia.Base/Rendering/UiThreadRenderTimer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/UiThreadRenderTimer.cs
rename to src/Avalonia.Base/Rendering/UiThreadRenderTimer.cs
diff --git a/src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs b/src/Avalonia.Base/Rendering/Utilities/TileBrushCalculator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs
rename to src/Avalonia.Base/Rendering/Utilities/TileBrushCalculator.cs
diff --git a/src/Avalonia.Visuals/Rendering/ZIndexComparer.cs b/src/Avalonia.Base/Rendering/ZIndexComparer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/ZIndexComparer.cs
rename to src/Avalonia.Base/Rendering/ZIndexComparer.cs
diff --git a/src/Avalonia.Base/Rotate3DTransform.cs b/src/Avalonia.Base/Rotate3DTransform.cs
new file mode 100644
index 0000000000..2de33889c8
--- /dev/null
+++ b/src/Avalonia.Base/Rotate3DTransform.cs
@@ -0,0 +1,211 @@
+using System;
+using System.Numerics;
+using Avalonia.Animation.Animators;
+
+namespace Avalonia.Media;
+
+/// <summary>
+///  Non-Affine 3D transformation for rotating a visual around a definable axis
+/// </summary>
+public class Rotate3DTransform : Transform
+{
+    private readonly bool _isInitializing;
+    
+    /// <summary>
+    /// Defines the <see cref="AngleX"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> AngleXProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleX));
+
+    /// <summary>
+    /// Defines the <see cref="AngleY"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> AngleYProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleY));
+
+    /// <summary>
+    /// Defines the <see cref="AngleZ"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> AngleZProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleZ));
+
+
+    /// <summary>
+    /// Defines the <see cref="CenterX"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> CenterXProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterX));
+
+
+    /// <summary>
+    /// Defines the <see cref="CenterY"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> CenterYProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterY));
+
+
+    /// <summary>
+    /// Defines the <see cref="CenterZ"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> CenterZProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterZ));
+
+    /// <summary>
+    /// Defines the <see cref="Depth"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> DepthProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(Depth));
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Rotate3DTransform"/> class.
+    /// </summary>
+    public Rotate3DTransform() { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Rotate3DTransform"/> class.
+    /// </summary>
+    /// <param name="angleX">The rotation around the X-Axis</param>
+    /// <param name="angleY">The rotation around the Y-Axis</param>
+    /// <param name="angleZ">The rotation around the Z-Axis</param>
+    /// <param name="centerX">The origin of the X-Axis</param>
+    /// <param name="centerY">The origin of the Y-Axis</param>
+    /// <param name="centerZ">The origin of the Z-Axis</param>
+    /// <param name="depth">The depth of the 3D effect</param>
+    public Rotate3DTransform(
+        double angleX,
+        double angleY,
+        double angleZ,
+        double centerX,
+        double centerY,
+        double centerZ,
+        double depth) : this()
+    {
+        _isInitializing = true;
+        AngleX = angleX;
+        AngleY = angleY;
+        AngleZ = angleZ;
+        CenterX = centerX;
+        CenterY = centerY;
+        CenterZ = centerZ;
+        Depth = depth;
+        _isInitializing = false;
+    }
+
+    /// <summary>
+    /// Sets the rotation around the X-Axis
+    /// </summary>
+    public double AngleX
+    {
+        get => GetValue(AngleXProperty);
+        set => SetValue(AngleXProperty, value);
+    }
+
+    /// <summary>
+    /// Sets the rotation around the Y-Axis
+    /// </summary>
+    public double AngleY
+    {
+        get => GetValue(AngleYProperty);
+        set => SetValue(AngleYProperty, value);
+    }
+
+    /// <summary>
+    ///  Sets the rotation around the Z-Axis
+    /// </summary>
+    public double AngleZ
+    {
+        get => GetValue(AngleZProperty);
+        set => SetValue(AngleZProperty, value);
+    }
+
+    /// <summary>
+    ///  Moves the origin the X-Axis rotates around
+    /// </summary>
+    public double CenterX
+    {
+        get => GetValue(CenterXProperty);
+        set => SetValue(CenterXProperty, value);
+    }
+
+    /// <summary>
+    ///  Moves the origin the Y-Axis rotates around
+    /// </summary>
+    public double CenterY
+    {
+        get => GetValue(CenterYProperty);
+        set => SetValue(CenterYProperty, value);
+    }
+
+    /// <summary>
+    ///  Moves the origin the Z-Axis rotates around
+    /// </summary>
+    public double CenterZ
+    {
+        get => GetValue(CenterZProperty);
+        set => SetValue(CenterZProperty, value);
+    }
+
+    /// <summary>
+    ///  Affects the depth of the rotation effect
+    /// </summary>
+    public double Depth
+    {
+        get => GetValue(DepthProperty);
+        set => SetValue(DepthProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the transform's <see cref="Matrix"/>. 
+    /// </summary>
+    public override Matrix Value
+    {
+        get
+        {
+            var matrix44 = Matrix4x4.Identity;
+            //Copy values first, because it's not guaranteed, that values will not change during calculation
+            var (copyCenterX, 
+                 copyCenterY, 
+                 copyCenterZ, 
+                 copyAngleX, 
+                 copyAngleY, 
+                 copyAngleZ, 
+                 copyDepth) = (CenterX, CenterY, CenterZ, AngleX, AngleY, AngleZ, Depth);
+            
+            var centerSum = copyCenterX + copyCenterY + copyCenterZ;
+            
+            if (Math.Abs(centerSum) > double.Epsilon) matrix44 *= Matrix4x4.CreateTranslation(-(float)copyCenterX, -(float)copyCenterY, -(float)copyCenterZ);
+
+            if (copyAngleX != 0) matrix44 *= Matrix4x4.CreateRotationX((float)Matrix.ToRadians(copyAngleX));
+            if (copyAngleY != 0) matrix44 *= Matrix4x4.CreateRotationY((float)Matrix.ToRadians(copyAngleY));
+            if (copyAngleZ != 0) matrix44 *= Matrix4x4.CreateRotationZ((float)Matrix.ToRadians(copyAngleZ));
+
+            if (Math.Abs(centerSum) > double.Epsilon) matrix44 *= Matrix4x4.CreateTranslation((float)copyCenterX, (float)copyCenterY, (float)copyCenterZ);
+
+            if (copyDepth != 0)
+            {
+                var perspectiveMatrix = Matrix4x4.Identity;
+                perspectiveMatrix.M34 = -1 / (float)copyDepth;
+                matrix44 *= perspectiveMatrix;
+            }
+
+            var matrix = new Matrix(
+                matrix44.M11,
+                matrix44.M12,
+                matrix44.M14,
+                matrix44.M21,
+                matrix44.M22,
+                matrix44.M24,
+                matrix44.M41,
+                matrix44.M42,
+                matrix44.M44);
+
+            return matrix;
+        }
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (!_isInitializing) RaiseChanged();
+    } 
+}
diff --git a/src/Avalonia.Visuals/RoundedRect.cs b/src/Avalonia.Base/RoundedRect.cs
similarity index 100%
rename from src/Avalonia.Visuals/RoundedRect.cs
rename to src/Avalonia.Base/RoundedRect.cs
diff --git a/src/Avalonia.Base/Settings.StyleCop b/src/Avalonia.Base/Settings.StyleCop
deleted file mode 100644
index bb05f99bc1..0000000000
--- a/src/Avalonia.Base/Settings.StyleCop
+++ /dev/null
@@ -1 +0,0 @@
-<StyleCopSettings Version="105" />
\ No newline at end of file
diff --git a/src/Avalonia.Base/Size.cs b/src/Avalonia.Base/Size.cs
new file mode 100644
index 0000000000..5f20206200
--- /dev/null
+++ b/src/Avalonia.Base/Size.cs
@@ -0,0 +1,317 @@
+using System;
+using System.Globalization;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+#endif
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines a size.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Size : IEquatable<Size>
+    {
+        static Size()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<SizeAnimator>(prop => typeof(Size).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// A size representing infinity.
+        /// </summary>
+        public static readonly Size Infinity = new Size(double.PositiveInfinity, double.PositiveInfinity);
+
+        /// <summary>
+        /// A size representing zero
+        /// </summary>
+        public static readonly Size Empty = new Size(0, 0);
+
+        /// <summary>
+        /// The width.
+        /// </summary>
+        private readonly double _width;
+
+        /// <summary>
+        /// The height.
+        /// </summary>
+        private readonly double _height;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Size"/> structure.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public Size(double width, double height)
+        {
+            _width = width;
+            _height = height;
+        }
+        
+#if !BUILDTASK
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Size"/> structure.
+        /// </summary>
+        /// <param name="vector2">The vector to take values from.</param>
+        public Size(System.Numerics.Vector2 vector2) : this(vector2.X, vector2.Y)
+        {
+            
+        }
+#endif
+
+        /// <summary>
+        /// Gets the aspect ratio of the size.
+        /// </summary>
+        public double AspectRatio => _width / _height;
+
+        /// <summary>
+        /// Gets the width.
+        /// </summary>
+        public double Width => _width;
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public double Height => _height;
+
+        /// <summary>
+        /// Checks for equality between two <see cref="Size"/>s.
+        /// </summary>
+        /// <param name="left">The first size.</param>
+        /// <param name="right">The second size.</param>
+        /// <returns>True if the sizes are equal; otherwise false.</returns>
+        public static bool operator ==(Size left, Size right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="Size"/>s.
+        /// </summary>
+        /// <param name="left">The first size.</param>
+        /// <param name="right">The second size.</param>
+        /// <returns>True if the sizes are unequal; otherwise false.</returns>
+        public static bool operator !=(Size left, Size right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Scales a size.
+        /// </summary>
+        /// <param name="size">The size</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The scaled size.</returns>
+        public static Size operator *(Size size, Vector scale)
+        {
+            return new Size(size._width * scale.X, size._height * scale.Y);
+        }
+
+        /// <summary>
+        /// Scales a size.
+        /// </summary>
+        /// <param name="size">The size</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The scaled size.</returns>
+        public static Size operator /(Size size, Vector scale)
+        {
+            return new Size(size._width / scale.X, size._height / scale.Y);
+        }
+
+        /// <summary>
+        /// Divides a size by another size to produce a scaling factor.
+        /// </summary>
+        /// <param name="left">The first size</param>
+        /// <param name="right">The second size.</param>
+        /// <returns>The scaled size.</returns>
+        public static Vector operator /(Size left, Size right)
+        {
+            return new Vector(left._width / right._width, left._height / right._height);
+        }
+
+        /// <summary>
+        /// Scales a size.
+        /// </summary>
+        /// <param name="size">The size</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The scaled size.</returns>
+        public static Size operator *(Size size, double scale)
+        {
+            return new Size(size._width * scale, size._height * scale);
+        }
+
+        /// <summary>
+        /// Scales a size.
+        /// </summary>
+        /// <param name="size">The size</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The scaled size.</returns>
+        public static Size operator /(Size size, double scale)
+        {
+            return new Size(size._width / scale, size._height / scale);
+        }
+
+        public static Size operator +(Size size, Size toAdd)
+        {
+            return new Size(size._width + toAdd._width, size._height + toAdd._height);
+        }
+
+        public static Size operator -(Size size, Size toSubtract)
+        {
+            return new Size(size._width - toSubtract._width, size._height - toSubtract._height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="Size"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="Size"/>.</returns>
+        public static Size Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Size."))
+            {
+                return new Size(
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble());
+            }
+        }
+
+        /// <summary>
+        /// Constrains the size.
+        /// </summary>
+        /// <param name="constraint">The size to constrain to.</param>
+        /// <returns>The constrained size.</returns>
+        public Size Constrain(Size constraint)
+        {
+            return new Size(
+                Math.Min(_width, constraint._width),
+                Math.Min(_height, constraint._height));
+        }
+
+        /// <summary>
+        /// Deflates the size by a <see cref="Thickness"/>.
+        /// </summary>
+        /// <param name="thickness">The thickness.</param>
+        /// <returns>The deflated size.</returns>
+        /// <remarks>The deflated size cannot be less than 0.</remarks>
+        public Size Deflate(Thickness thickness)
+        {
+            return new Size(
+                Math.Max(0, _width - thickness.Left - thickness.Right),
+                Math.Max(0, _height - thickness.Top - thickness.Bottom));
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the size is equal to the other given size (bitwise).
+        /// </summary>
+        /// <param name="other">The other size to test equality against.</param>
+        /// <returns>True if this size is equal to other; False otherwise.</returns>
+        public bool Equals(Size other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _width == other._width &&
+                   _height == other._height;
+            // ReSharper enable CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the size is equal to the other given size (numerically).
+        /// </summary>
+        /// <param name="other">The other size to test equality against.</param>
+        /// <returns>True if this size is equal to other; False otherwise.</returns>
+        public bool NearlyEquals(Size other)
+        {
+            return MathUtilities.AreClose(_width, other._width) && 
+                   MathUtilities.AreClose(_height, other._height);
+        }
+
+        /// <summary>
+        /// Checks for equality between a size and an object.
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        /// <returns>
+        /// True if <paramref name="obj"/> is a size that equals the current size.
+        /// </returns>
+        public override bool Equals(object? obj) => obj is Size other && Equals(other);
+
+        /// <summary>
+        /// Returns a hash code for a <see cref="Size"/>.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + Width.GetHashCode();
+                hash = (hash * 23) + Height.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Inflates the size by a <see cref="Thickness"/>.
+        /// </summary>
+        /// <param name="thickness">The thickness.</param>
+        /// <returns>The inflated size.</returns>
+        public Size Inflate(Thickness thickness)
+        {
+            return new Size(
+                _width + thickness.Left + thickness.Right,
+                _height + thickness.Top + thickness.Bottom);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Size"/> with the same height and the specified width.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <returns>The new <see cref="Size"/>.</returns>
+        public Size WithWidth(double width)
+        {
+            return new Size(width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Size"/> with the same width and the specified height.
+        /// </summary>
+        /// <param name="height">The height.</param>
+        /// <returns>The new <see cref="Size"/>.</returns>
+        public Size WithHeight(double height)
+        {
+            return new Size(_width, height);
+        }
+
+        /// <summary>
+        /// Returns the string representation of the size.
+        /// </summary>
+        /// <returns>The string representation of the size.</returns>
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _width, _height);
+        }
+
+        /// <summary>
+        /// Deconstructs the size into its Width and Height values.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public void Deconstruct(out double width, out double height)
+        {
+            width = this._width;
+            height = this._height;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the Width and Height values are zero.
+        /// </summary>
+        public bool IsDefault
+        {
+            get { return (_width == 0) && (_height == 0); }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
new file mode 100644
index 0000000000..3a42e9bdfe
--- /dev/null
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -0,0 +1,968 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Avalonia.Animation;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Diagnostics;
+using Avalonia.Logging;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extends an <see cref="Animatable"/> with the following features:
+    /// 
+    /// - An inherited <see cref="DataContext"/>.
+    /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
+    /// - Implements <see cref="ILogical"/> to form part of a logical tree.
+    /// - A collection of class strings for custom styling.
+    /// </summary>
+    public class StyledElement : Animatable, IDataContextProvider, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    {
+        /// <summary>
+        /// Defines the <see cref="DataContext"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object?> DataContextProperty =
+            AvaloniaProperty.Register<StyledElement, object?>(
+                nameof(DataContext),
+                inherits: true,
+                notifying: DataContextNotifying);
+
+        /// <summary>
+        /// Defines the <see cref="Name"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, string?> NameProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, string?>(nameof(Name), o => o.Name, (o, v) => o.Name = v);
+        
+        /// <summary>
+        /// Defines the <see cref="Parent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, IStyledElement?> ParentProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, IStyledElement?>(nameof(Parent), o => o.Parent);
+
+        /// <summary>
+        /// Defines the <see cref="TemplatedParent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, ITemplatedControl?> TemplatedParentProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, ITemplatedControl?>(
+                nameof(TemplatedParent),
+                o => o.TemplatedParent,
+                (o ,v) => o.TemplatedParent = v);
+        
+        /// <summary>
+        /// Defines the <see cref="Theme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ThemeProperty =
+            AvaloniaProperty.Register<StyledElement, ControlTheme?>(nameof(Theme));
+
+        private static readonly ControlTheme s_invalidTheme = new ControlTheme();
+        private int _initCount;
+        private string? _name;
+        private readonly Classes _classes = new Classes();
+        private ILogicalRoot? _logicalRoot;
+        private IAvaloniaList<ILogical>? _logicalChildren;
+        private IResourceDictionary? _resources;
+        private Styles? _styles;
+        private bool _styled;
+        private List<IStyleInstance>? _appliedStyles;
+        private ITemplatedControl? _templatedParent;
+        private bool _dataContextUpdating;
+        private bool _hasPromotedTheme;
+        private ControlTheme? _implicitTheme;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="StyledElement"/> class.
+        /// </summary>
+        static StyledElement()
+        {
+            DataContextProperty.Changed.AddClassHandler<StyledElement>((x,e) => x.OnDataContextChangedCore(e));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StyledElement"/> class.
+        /// </summary>
+        public StyledElement()
+        {
+            _logicalRoot = this as ILogicalRoot;
+        }
+
+        /// <summary>
+        /// Raised when the styled element is attached to a rooted logical tree.
+        /// </summary>
+        public event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
+
+        /// <summary>
+        /// Raised when the styled element is detached from a rooted logical tree.
+        /// </summary>
+        public event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
+
+        /// <summary>
+        /// Occurs when the <see cref="DataContext"/> property changes.
+        /// </summary>
+        /// <remarks>
+        /// This event will be raised when the <see cref="DataContext"/> property has changed and
+        /// all subscribers to that change have been notified.
+        /// </remarks>
+        public event EventHandler? DataContextChanged;
+
+        /// <summary>
+        /// Occurs when the styled element has finished initialization.
+        /// </summary>
+        /// <remarks>
+        /// The Initialized event indicates that all property values on the styled element have been set.
+        /// When loading the styled element from markup, it occurs when 
+        /// <see cref="ISupportInitialize.EndInit"/> is called *and* the styled element
+        /// is attached to a rooted logical tree. When the styled element is created by code and
+        /// <see cref="ISupportInitialize"/> is not used, it is called when the styled element is attached
+        /// to the visual tree.
+        /// </remarks>
+        public event EventHandler? Initialized;
+
+        /// <summary>
+        /// Occurs when a resource in this styled element or a parent styled element has changed.
+        /// </summary>
+        public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
+
+        /// <summary>
+        /// Gets or sets the name of the styled element.
+        /// </summary>
+        /// <remarks>
+        /// An element's name is used to uniquely identify an element within the element's name
+        /// scope. Once the element is added to a logical tree, its name cannot be changed.
+        /// </remarks>
+        public string? Name
+        {
+            get => _name;
+
+            set
+            {
+                if (_styled)
+                {
+                    throw new InvalidOperationException("Cannot set Name : styled element already styled.");
+                }
+
+                _name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the styled element's classes.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Classes can be used to apply user-defined styling to styled elements, or to allow styled elements
+        /// that share a common purpose to be easily selected.
+        /// </para>
+        /// <para>
+        /// Even though this property can be set, the setter is only intended for use in object
+        /// initializers. Assigning to this property does not change the underlying collection,
+        /// it simply clears the existing collection and adds the contents of the assigned
+        /// collection.
+        /// </para>
+        /// </remarks>
+        public Classes Classes
+        {
+            get
+            {
+                return _classes;
+            }
+
+            set
+            {
+                if (_classes != value)
+                {
+                    _classes.Replace(value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the control's data context.
+        /// </summary>
+        /// <remarks>
+        /// The data context is an inherited property that specifies the default object that will
+        /// be used for data binding.
+        /// </remarks>
+        public object? DataContext
+        {
+            get { return GetValue(DataContextProperty); }
+            set { SetValue(DataContextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the element has finished initialization.
+        /// </summary>
+        /// <remarks>
+        /// For more information about when IsInitialized is set, see the <see cref="Initialized"/>
+        /// event.
+        /// </remarks>
+        public bool IsInitialized { get; private set; }
+
+        /// <summary>
+        /// Gets the styles for the styled element.
+        /// </summary>
+        /// <remarks>
+        /// Styles for the entire application are added to the Application.Styles collection, but
+        /// each styled element may in addition define its own styles which are applied to the styled element
+        /// itself and its children.
+        /// </remarks>
+        public Styles Styles => _styles ??= new Styles(this);
+
+        /// <summary>
+        /// Gets or sets the styled element's resource dictionary.
+        /// </summary>
+        public IResourceDictionary Resources
+        {
+            get => _resources ??= new ResourceDictionary(this);
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(value));
+                _resources?.RemoveOwner(this);
+                _resources = value;
+                _resources.AddOwner(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the styled element whose lookless template this styled element is part of.
+        /// </summary>
+        public ITemplatedControl? TemplatedParent
+        {
+            get => _templatedParent;
+            internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the theme to be applied to the element.
+        /// </summary>
+        public ControlTheme? Theme
+        {
+            get => GetValue(ThemeProperty);
+            set => SetValue(ThemeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the styled element's logical children.
+        /// </summary>
+        protected IAvaloniaList<ILogical> LogicalChildren
+        {
+            get
+            {
+                if (_logicalChildren == null)
+                {
+                    var list = new AvaloniaList<ILogical>
+                    {
+                        ResetBehavior = ResetBehavior.Remove,
+                        Validate = logical => ValidateLogicalChild(logical)
+                    };
+                    list.CollectionChanged += LogicalChildrenCollectionChanged;
+                    _logicalChildren = list;
+                }
+
+                return _logicalChildren;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Classes"/> collection in a form that allows adding and removing
+        /// pseudoclasses.
+        /// </summary>
+        protected IPseudoClasses PseudoClasses => Classes;
+
+        /// <summary>
+        /// Gets a value indicating whether the element is attached to a rooted logical tree.
+        /// </summary>
+        bool ILogical.IsAttachedToLogicalTree => _logicalRoot != null;
+
+        /// <summary>
+        /// Gets the styled element's logical parent.
+        /// </summary>
+        public IStyledElement? Parent { get; private set; }
+
+        /// <summary>
+        /// Gets the styled element's logical parent.
+        /// </summary>
+        ILogical? ILogical.LogicalParent => Parent;
+
+        /// <summary>
+        /// Gets the styled element's logical children.
+        /// </summary>
+        IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
+
+        /// <inheritdoc/>
+        bool IResourceNode.HasResources => (_resources?.HasResources ?? false) ||
+            (((IResourceNode?)_styles)?.HasResources ?? false);
+
+        /// <inheritdoc/>
+        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
+
+        /// <summary>
+        /// Gets the type by which the styled element is styled.
+        /// </summary>
+        /// <remarks>
+        /// Usually controls are styled by their own type, but there are instances where you want
+        /// a styled element to be styled by its base type, e.g. creating SpecialButton that
+        /// derives from Button and adds extra functionality but is still styled as a regular
+        /// Button.
+        /// </remarks>
+        Type IStyleable.StyleKey => GetType();
+
+        /// <inheritdoc/>
+        bool IStyleHost.IsStylesInitialized => _styles != null;
+
+        /// <inheritdoc/>
+        IStyleHost? IStyleHost.StylingParent => (IStyleHost?)InheritanceParent;
+
+
+        /// <inheritdoc/>
+        public virtual void BeginInit()
+        {
+            ++_initCount;
+        }
+
+        /// <inheritdoc/>
+        public virtual void EndInit()
+        {
+            if (_initCount == 0)
+            {
+                throw new InvalidOperationException("BeginInit was not called.");
+            }
+
+            if (--_initCount == 0 && _logicalRoot != null)
+            {
+                ApplyStyling();
+                InitializeIfNeeded();
+            }
+        }
+
+        /// <summary>
+        /// Applies styling to the control if the control is initialized and styling is not
+        /// already applied.
+        /// </summary>
+        /// <returns>
+        /// A value indicating whether styling is now applied to the control.
+        /// </returns>
+        protected bool ApplyStyling()
+        {
+            if (_initCount == 0 && !_styled)
+            {
+                try
+                {
+                    BeginBatchUpdate();
+                    AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
+                }
+                finally
+                {
+                    _styled = true;
+                    EndBatchUpdate();
+                }
+
+                if (_hasPromotedTheme)
+                {
+                    _hasPromotedTheme = false;
+                    ClearValue(ThemeProperty);
+                }
+            }
+
+            return _styled;
+        }
+
+        /// <summary>
+        /// Detaches all styles from the element and queues a restyle.
+        /// </summary>
+        protected virtual void InvalidateStyles() => DetachStyles();
+
+        protected void InitializeIfNeeded()
+        {
+            if (_initCount == 0 && !IsInitialized)
+            {
+                IsInitialized = true;
+                OnInitialized();
+                Initialized?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        internal StyleDiagnostics GetStyleDiagnosticsInternal()
+        {
+            IReadOnlyList<IStyleInstance>? appliedStyles = _appliedStyles;
+
+            if (appliedStyles is null)
+            {
+                appliedStyles = Array.Empty<IStyleInstance>();
+            }
+
+            return new StyleDiagnostics(appliedStyles);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            OnAttachedToLogicalTreeCore(e);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            OnDetachedFromLogicalTreeCore(e);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
+
+        /// <inheritdoc/>
+        void IResourceHost.NotifyHostedResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
+
+        /// <inheritdoc/>
+        bool IResourceNode.TryGetResource(object key, out object? value)
+        {
+            value = null;
+            return (_resources?.TryGetResource(key, out value) ?? false) ||
+                   (_styles?.TryGetResource(key, out value) ?? false);
+        }
+
+        /// <summary>
+        /// Sets the styled element's logical parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void ISetLogicalParent.SetParent(ILogical? parent)
+        {
+            var old = Parent;
+
+            if (parent != old)
+            {
+                if (old != null && parent != null)
+                {
+                    throw new InvalidOperationException("The Control already has a parent.");
+                }
+
+                if (InheritanceParent == null || parent == null)
+                {
+                    InheritanceParent = parent as AvaloniaObject;
+                }
+
+                Parent = (IStyledElement?)parent;
+
+                if (_logicalRoot != null)
+                {
+                    var e = new LogicalTreeAttachmentEventArgs(_logicalRoot, this, old!);
+                    OnDetachedFromLogicalTreeCore(e);
+                }
+
+                var newRoot = FindLogicalRoot(this);
+
+                if (newRoot is object)
+                {
+                    var e = new LogicalTreeAttachmentEventArgs(newRoot, this, parent!);
+                    OnAttachedToLogicalTreeCore(e);
+                }
+                else if (parent is null)
+                {
+                    // If we were attached to the logical tree, we piggyback on the tree traversal
+                    // there to raise resources changed notifications. If we're being removed from
+                    // the logical tree, then traverse the tree raising notifications now.
+                    //
+                    // We don't raise resources changed notifications if we're being attached to a 
+                    // non-rooted control beacuse it's unlikely that dynamic resources need to be 
+                    // correct until the control is added to the tree, and it causes a *lot* of
+                    // notifications.
+                    NotifyResourcesChanged();
+                }
+
+#nullable disable
+                RaisePropertyChanged(
+                    ParentProperty,
+                    new Optional<IStyledElement>(old),
+                    new BindingValue<IStyledElement>(Parent),
+                    BindingPriority.LocalValue);
+#nullable enable
+            }
+        }
+
+        /// <summary>
+        /// Sets the styled element's inheritance parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void ISetInheritanceParent.SetParent(IAvaloniaObject? parent)
+        {
+            InheritanceParent = parent switch
+            {
+                AvaloniaObject ao => ao,
+                null => null,
+                _ => throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.")
+            };
+        }
+
+        ControlTheme? IStyleable.GetEffectiveTheme()
+        {
+            var theme = Theme;
+
+            // Explitly set Theme property takes precedence.
+            if (theme is not null)
+                return theme;
+
+            // If the Theme property is not set, try to find a ControlTheme resource with our StyleKey.
+            if (_implicitTheme is null)
+            {
+                var key = ((IStyleable)this).StyleKey;
+
+                if (this.TryFindResource(key, out var value) && value is ControlTheme t)
+                    _implicitTheme = t;
+                else
+                    _implicitTheme = s_invalidTheme;
+            }
+
+            if (_implicitTheme != s_invalidTheme)
+                return _implicitTheme;
+
+            return null;
+        }
+
+        void IStyleable.StyleApplied(IStyleInstance instance)
+        {
+            instance = instance ?? throw new ArgumentNullException(nameof(instance));
+
+            _appliedStyles ??= new List<IStyleInstance>();
+            _appliedStyles.Add(instance);
+        }
+
+        void IStyleable.DetachStyles() => DetachStyles();
+
+        void IStyleable.DetachStyles(IReadOnlyList<IStyle> styles) => DetachStyles(styles);
+
+        void IStyleable.InvalidateStyles() => InvalidateStyles();
+
+        void IStyleHost.StylesAdded(IReadOnlyList<IStyle> styles)
+        {
+            InvalidateStylesOnThisAndDescendents();
+        }
+
+        void IStyleHost.StylesRemoved(IReadOnlyList<IStyle> styles)
+        {
+            var allStyles = RecurseStyles(styles);
+            DetachStylesFromThisAndDescendents(allStyles);
+        }
+
+        protected virtual void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    SetLogicalParent(e.NewItems!);
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    ClearLogicalParent(e.OldItems!);
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    ClearLogicalParent(e.OldItems!);
+                    SetLogicalParent(e.NewItems!);
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    throw new NotSupportedException("Reset should not be signaled on LogicalChildren collection");
+            }
+        }
+
+        /// <summary>
+        /// Notifies child controls that a change has been made to resources that apply to them.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void NotifyChildResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            if (_logicalChildren is object)
+            {
+                var count = _logicalChildren.Count;
+
+                if (count > 0)
+                {
+                    e ??= ResourcesChangedEventArgs.Empty;
+
+                    for (var i = 0; i < count; ++i)
+                    {
+                        _logicalChildren[i].NotifyResourcesChanged(e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the styled element is added to a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the styled element is removed from a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> property changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDataContextChanged(EventArgs e)
+        {
+            DataContextChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> begins updating.
+        /// </summary>
+        protected virtual void OnDataContextBeginUpdate()
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> finishes updating.
+        /// </summary>
+        protected virtual void OnDataContextEndUpdate()
+        {
+        }
+
+        /// <summary>
+        /// Called when the control finishes initialization.
+        /// </summary>
+        protected virtual void OnInitialized()
+        {
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ThemeProperty)
+            {
+                // Changing the theme detaches all styles, meaning that if the theme property was
+                // set via a style, it will get cleared! To work around this, if the value was
+                // applied at less than local value priority then promote the value to local value
+                // priority until styling is re-applied.
+                if (change.Priority > BindingPriority.LocalValue)
+                {
+                    Theme = change.GetNewValue<ControlTheme?>();
+                    _hasPromotedTheme = true;
+                }
+                else if (_hasPromotedTheme && change.Priority == BindingPriority.LocalValue)
+                {
+                    _hasPromotedTheme = false;
+                }
+
+                InvalidateStyles();
+            }
+        }
+
+        private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
+        {
+            if (o is StyledElement element)
+            {
+                DataContextNotifying(element, updateStarted);
+            }
+        }
+
+        private static void DataContextNotifying(StyledElement element, bool updateStarted)
+        {
+            if (updateStarted)
+            {
+                if (!element._dataContextUpdating)
+                {
+                    element._dataContextUpdating = true;
+                    element.OnDataContextBeginUpdate();
+
+                    var logicalChildren = element.LogicalChildren;
+                    var logicalChildrenCount = logicalChildren.Count;
+
+                    for (var i = 0; i < logicalChildrenCount; i++)
+                    {
+                        if (element.LogicalChildren[i] is StyledElement s &&
+                            s.InheritanceParent == element &&
+                            !s.IsSet(DataContextProperty))
+                        {
+                            DataContextNotifying(s, updateStarted);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (element._dataContextUpdating)
+                {
+                    element.OnDataContextEndUpdate();
+                    element._dataContextUpdating = false;
+                }
+            }
+        }
+
+        private static ILogicalRoot? FindLogicalRoot(IStyleHost? e)
+        {
+            while (e != null)
+            {
+                if (e is ILogicalRoot root)
+                {
+                    return root;
+                }
+
+                e = e.StylingParent;
+            }
+
+            return null;
+        }
+
+        private static void ValidateLogicalChild(ILogical c)
+        {
+            if (c == null)
+            {
+                throw new ArgumentException("Cannot add null to LogicalChildren.");
+            }
+        }
+
+        private void OnAttachedToLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
+        {
+            if (this.GetLogicalParent() == null && !(this is ILogicalRoot))
+            {
+                throw new InvalidOperationException(
+                    $"AttachedToLogicalTreeCore called for '{GetType().Name}' but control has no logical parent.");
+            }
+
+            // This method can be called when a control is already attached to the logical tree
+            // in the following scenario:
+            // - ListBox gets assigned Items containing ListBoxItem
+            // - ListBox makes ListBoxItem a logical child
+            // - ListBox template gets applied; making its Panel get attached to logical tree
+            // - That AttachedToLogicalTree signal travels down to the ListBoxItem
+            if (_logicalRoot == null)
+            {
+                _logicalRoot = e.Root;
+
+                ApplyStyling();
+                NotifyResourcesChanged(propagate: false);
+
+                OnAttachedToLogicalTree(e);
+                AttachedToLogicalTree?.Invoke(this, e);
+            }
+
+            var logicalChildren = LogicalChildren;
+            var logicalChildrenCount = logicalChildren.Count;
+
+            for (var i = 0; i < logicalChildrenCount; i++)
+            {
+                if (logicalChildren[i] is StyledElement child)
+                {
+                    child.OnAttachedToLogicalTreeCore(e);
+                }
+            }
+        }
+
+        private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
+        {
+            if (_logicalRoot != null)
+            {
+                _logicalRoot = null;
+                _implicitTheme = null;
+                DetachStyles();
+                OnDetachedFromLogicalTree(e);
+                DetachedFromLogicalTree?.Invoke(this, e);
+
+                var logicalChildren = LogicalChildren;
+                var logicalChildrenCount = logicalChildren.Count;
+
+                for (var i = 0; i < logicalChildrenCount; i++)
+                {
+                    if (logicalChildren[i] is StyledElement child)
+                    {
+                        child.OnDetachedFromLogicalTreeCore(e);
+                    }
+                }
+
+#if DEBUG
+                if (((INotifyCollectionChangedDebug)Classes).GetCollectionChangedSubscribers()?.Length > 0)
+                {
+                    Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
+                        this,
+                        "{Type} detached from logical tree but still has class listeners",
+                        GetType());
+                }
+#endif
+            }
+        }
+
+        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnDataContextChanged(EventArgs.Empty);
+        }
+
+        private void SetLogicalParent(IList children)
+        {
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
+            {
+                var logical = (ILogical) children[i]!;
+                
+                if (logical.LogicalParent is null)
+                {
+                    ((ISetLogicalParent)logical).SetParent(this);
+                }
+            }
+        }
+
+        private void ClearLogicalParent(IList children)
+        {
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
+            {
+                var logical = (ILogical) children[i]!;
+                
+                if (logical.LogicalParent == this)
+                {
+                    ((ISetLogicalParent)logical).SetParent(null);
+                }
+            }
+        }
+
+        private void DetachStyles()
+        {
+            if (_appliedStyles?.Count > 0)
+            {
+                BeginBatchUpdate();
+
+                try
+                {
+                    foreach (var i in _appliedStyles)
+                    {
+                        i.Dispose();
+                    }
+
+                    _appliedStyles.Clear();
+                }
+                finally
+                {
+                    EndBatchUpdate();
+                }
+            }
+
+            _styled = false;
+        }
+
+        private void DetachStyles(IReadOnlyList<IStyle> styles)
+        {
+            styles = styles ?? throw new ArgumentNullException(nameof(styles));
+
+            if (_appliedStyles is null)
+            {
+                return;
+            }
+
+            var count = styles.Count;
+
+            for (var i = 0; i < count; ++i)
+            {
+                for (var j = _appliedStyles.Count - 1; j >= 0; --j)
+                {
+                    var applied = _appliedStyles[j];
+
+                    if (applied.Source == styles[i])
+                    {
+                        _appliedStyles.RemoveAt(j);
+                        applied.Dispose();
+                    }
+
+                    if (j > _appliedStyles.Count)
+                        j = _appliedStyles.Count;
+                }
+            }
+        }
+
+        private void InvalidateStylesOnThisAndDescendents()
+        {
+            InvalidateStyles();
+
+            if (_logicalChildren is object)
+            {
+                var childCount = _logicalChildren.Count;
+
+                for (var i = 0; i < childCount; ++i)
+                {
+                    (_logicalChildren[i] as StyledElement)?.InvalidateStylesOnThisAndDescendents();
+                }
+            }
+        }
+
+        private void DetachStylesFromThisAndDescendents(IReadOnlyList<IStyle> styles)
+        {
+            DetachStyles(styles);
+
+            if (_logicalChildren is object)
+            {
+                var childCount = _logicalChildren.Count;
+
+                for (var i = 0; i < childCount; ++i)
+                {
+                    (_logicalChildren[i] as StyledElement)?.DetachStylesFromThisAndDescendents(styles);
+                }
+            }
+        }
+
+        private void NotifyResourcesChanged(
+            ResourcesChangedEventArgs? e = null,
+            bool propagate = true)
+        {
+            if (ResourcesChanged is object)
+            {
+                e ??= ResourcesChangedEventArgs.Empty;
+                ResourcesChanged(this, e);
+            }
+
+            if (propagate)
+            {
+                e ??= ResourcesChangedEventArgs.Empty;
+                NotifyChildResourcesChanged(e);
+            }
+        }
+
+        private static IReadOnlyList<IStyle> RecurseStyles(IReadOnlyList<IStyle> styles)
+        {
+            var count = styles.Count;
+            List<IStyle>? result = null;
+
+            for (var i = 0; i < count; ++i)
+            {
+                var style = styles[i];
+
+                if (style.Children.Count > 0)
+                {
+                    if (result is null)
+                    {
+                        result = new List<IStyle>(styles);
+                    }
+
+                    RecurseStyles(style.Children, result);
+                }
+            }
+
+            return result ?? styles;
+        }
+
+        private static void RecurseStyles(IReadOnlyList<IStyle> styles, List<IStyle> result)
+        {
+            var count = styles.Count;
+
+            for (var i = 0; i < count; ++i)
+            {
+                var style = styles[i];
+                result.Add(style);
+                RecurseStyles(style.Children, result);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/StyledElementExtensions.cs b/src/Avalonia.Base/StyledElementExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/StyledElementExtensions.cs
rename to src/Avalonia.Base/StyledElementExtensions.cs
diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
index 16ba571a5a..da607720ff 100644
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/src/Avalonia.Base/StyledPropertyBase.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Diagnostics;
 using Avalonia.Data;
 using Avalonia.Reactive;
-using Avalonia.Utilities;
+using Avalonia.Styling;
 
 namespace Avalonia
 {
@@ -11,7 +10,7 @@ namespace Avalonia
     /// </summary>
     public abstract class StyledPropertyBase<TValue> : AvaloniaProperty<TValue>, IStyledPropertyAccessor
     {
-        private bool _inherits;
+        private readonly bool _inherits;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StyledPropertyBase{T}"/> class.
@@ -158,12 +157,6 @@ namespace Avalonia
             base.OverrideMetadata(type, metadata);
         }
 
-        /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
-        {
-            vistor.Visit(this, ref data);
-        }
-
         /// <summary>
         /// Gets the string representation of the property.
         /// </summary>
@@ -177,19 +170,19 @@ namespace Avalonia
         object? IStyledPropertyAccessor.GetDefaultValue(Type type) => GetDefaultBoxedValue(type);
 
         /// <inheritdoc/>
-        internal override void RouteClearValue(IAvaloniaObject o)
+        internal override void RouteClearValue(AvaloniaObject o)
         {
             o.ClearValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        internal override object? RouteGetValue(IAvaloniaObject o)
+        internal override object? RouteGetValue(AvaloniaObject o)
         {
             return o.GetValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        internal override object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+        internal override object? RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority)
         {
             var value = o.GetBaseValue<TValue>(this, maxPriority);
             return value.HasValue ? value.Value : AvaloniaProperty.UnsetValue;
@@ -197,7 +190,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         internal override IDisposable? RouteSetValue(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             object? value,
             BindingPriority priority)
         {
@@ -221,7 +214,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         internal override IDisposable RouteBind(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             IObservable<BindingValue<object?>> source,
             BindingPriority priority)
         {
@@ -232,21 +225,40 @@ namespace Avalonia
         /// <inheritdoc/>
         internal override void RouteInheritanceParentChanged(
             AvaloniaObject o,
-            IAvaloniaObject? oldParent)
+            AvaloniaObject? oldParent)
         {
             o.InheritanceParentChanged(this, oldParent);
         }
 
-        private object? GetDefaultBoxedValue(Type type)
+        internal override ISetterInstance CreateSetterInstance(IStyleable target, object? value)
         {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-            return GetMetadata(type).DefaultValue;
+            if (value is IBinding binding)
+            {
+                return new PropertySetterBindingInstance<TValue>(
+                    target,
+                    this,
+                    binding);
+            }
+            else if (value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(PropertyType))
+            {
+                return new PropertySetterTemplateInstance<TValue>(
+                    target,
+                    this,
+                    template);
+            }
+            else
+            {
+                return new PropertySetterInstance<TValue>(
+                    target,
+                    this,
+                    (TValue)value!);
+            }
         }
 
-        [DebuggerHidden]
-        private Func<IAvaloniaObject, TValue, TValue> Cast<THost>(Func<THost, TValue, TValue> validate)
+        private object? GetDefaultBoxedValue(Type type)
         {
-            return (o, v) => validate((THost)o, v);
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+            return GetMetadata(type).DefaultValue;
         }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Activators/AndActivator.cs b/src/Avalonia.Base/Styling/Activators/AndActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/AndActivator.cs
rename to src/Avalonia.Base/Styling/Activators/AndActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs b/src/Avalonia.Base/Styling/Activators/AndActivatorBuilder.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs
rename to src/Avalonia.Base/Styling/Activators/AndActivatorBuilder.cs
diff --git a/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
new file mode 100644
index 0000000000..ac7b8b3ef1
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
@@ -0,0 +1,33 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Defines a style activator.
+    /// </summary>
+    /// <remarks>
+    /// A style activator is very similar to an `IObservable{bool}` but is optimized for the
+    /// particular use-case of activating a style according to a selector. It differs from
+    /// an observable in two major ways:
+    /// 
+    /// - Can only have a single subscription
+    /// - The subscription can have a tag associated with it, allowing a subscriber to index
+    ///   into a list of subscriptions without having to allocate additional objects.
+    /// </remarks>
+    [Unstable]
+    public interface IStyleActivator : IDisposable
+    {
+        /// <summary>
+        /// Subscribes to the activator.
+        /// </summary>
+        /// <param name="sink">The listener.</param>
+        /// <param name="tag">An optional tag.</param>
+        void Subscribe(IStyleActivatorSink sink, int tag = 0);
+
+        /// <summary>
+        /// Unsubscribes from the activator.
+        /// </summary>
+        void Unsubscribe(IStyleActivatorSink sink);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Activators/IStyleActivatorSink.cs b/src/Avalonia.Base/Styling/Activators/IStyleActivatorSink.cs
new file mode 100644
index 0000000000..fbb18dc304
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Activators/IStyleActivatorSink.cs
@@ -0,0 +1,18 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Receives notifications from an <see cref="IStyleActivator"/>.
+    /// </summary>
+    [Unstable]
+    public interface IStyleActivatorSink
+    {
+        /// <summary>
+        /// Called when the subscribed activator value changes.
+        /// </summary>
+        /// <param name="value">The new value.</param>
+        /// <param name="tag">The subscription tag.</param>
+        void OnNext(bool value, int tag);
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/NotActivator.cs b/src/Avalonia.Base/Styling/Activators/NotActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/NotActivator.cs
rename to src/Avalonia.Base/Styling/Activators/NotActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/NthChildActivator.cs b/src/Avalonia.Base/Styling/Activators/NthChildActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/NthChildActivator.cs
rename to src/Avalonia.Base/Styling/Activators/NthChildActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/OrActivator.cs b/src/Avalonia.Base/Styling/Activators/OrActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/OrActivator.cs
rename to src/Avalonia.Base/Styling/Activators/OrActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs b/src/Avalonia.Base/Styling/Activators/OrActivatorBuilder.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs
rename to src/Avalonia.Base/Styling/Activators/OrActivatorBuilder.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs b/src/Avalonia.Base/Styling/Activators/PropertyEqualsActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs
rename to src/Avalonia.Base/Styling/Activators/PropertyEqualsActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs b/src/Avalonia.Base/Styling/Activators/StyleActivatorBase.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs
rename to src/Avalonia.Base/Styling/Activators/StyleActivatorBase.cs
diff --git a/src/Avalonia.Base/Styling/Activators/StyleClassActivator.cs b/src/Avalonia.Base/Styling/Activators/StyleClassActivator.cs
new file mode 100644
index 0000000000..3f70ff50b3
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Activators/StyleClassActivator.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls;
+
+#nullable enable
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// An <see cref="IStyleActivator"/> which is active when a set of classes match those on a
+    /// control.
+    /// </summary>
+    internal sealed class StyleClassActivator : StyleActivatorBase, IClassesChangedListener
+    {
+        private readonly IList<string> _match;
+        private readonly Classes _classes;
+
+        public StyleClassActivator(Classes classes, IList<string> match)
+        {
+            _classes = classes;
+            _match = match;
+        }
+
+        public static bool AreClassesMatching(IReadOnlyList<string> classes, IList<string> toMatch)
+        {
+            int remainingMatches = toMatch.Count;
+            int classesCount = classes.Count;
+
+            // Early bail out - we can't match if control does not have enough classes.
+            if (classesCount < remainingMatches)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < classesCount; i++)
+            {
+                var c = classes[i];
+
+                if (toMatch.Contains(c))
+                {
+                    --remainingMatches;
+
+                    // Already matched so we can skip checking other classes.
+                    if (remainingMatches == 0)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return remainingMatches == 0;
+        }
+
+        void IClassesChangedListener.Changed()
+        {
+            PublishNext(IsMatching());
+        }
+
+        protected override void Initialize()
+        {
+            PublishNext(IsMatching());
+            _classes.AddListener(this);
+        }
+
+        protected override void Deinitialize()
+        {
+            _classes.RemoveListener(this);
+        }
+
+        private bool IsMatching() => AreClassesMatching(_classes, _match);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
new file mode 100644
index 0000000000..9512dc34df
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -0,0 +1,70 @@
+using System;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Styling
+{
+    internal class ChildSelector : Selector
+    {
+        private readonly Selector _parent;
+        private string? _selectorString;
+
+        public ChildSelector(Selector parent)
+        {
+            if (parent == null)
+            {
+                throw new InvalidOperationException("Child selector must be preceeded by a selector.");
+            }
+
+            _parent = parent;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _parent.InTemplate;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => true;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => null;
+
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = _parent.ToString() + " > ";
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var controlParent = ((ILogical)control).LogicalParent;
+
+            if (controlParent != null)
+            {
+                var parentMatch = _parent.Match((IStyleable)controlParent, parent, subscribe);
+
+                if (parentMatch.Result == SelectorMatchResult.Sometimes)
+                {
+                    return parentMatch;
+                }
+                else if (parentMatch.IsMatch)
+                {
+                    return SelectorMatch.AlwaysThisInstance;
+                }
+                else
+                {
+                    return SelectorMatch.NeverThisInstance;
+                }
+            }
+            else
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+        }
+
+        protected override Selector? MovePrevious() => null;
+        protected override Selector? MovePreviousOrParent() => _parent;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
new file mode 100644
index 0000000000..644e8b32d4
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -0,0 +1,67 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines a switchable theme for a control.
+    /// </summary>
+    public class ControlTheme : StyleBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControlTheme"/> class.
+        /// </summary>
+        public ControlTheme() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControlTheme"/> class.
+        /// </summary>
+        /// <param name="targetType">The value for <see cref="TargetType"/>.</param>
+        public ControlTheme(Type targetType) => TargetType = targetType;
+
+        /// <summary>
+        /// Gets or sets the type for which this control theme is intended.
+        /// </summary>
+        public Type? TargetType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a control theme that is the basis of the current theme.
+        /// </summary>
+        public ControlTheme? BasedOn { get; set; }
+
+        public override SelectorMatchResult TryAttach(IStyleable target, object? host)
+        {
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
+            if (TargetType is null)
+                throw new InvalidOperationException("ControlTheme has no TargetType.");
+
+            var result = BasedOn?.TryAttach(target, host) ?? SelectorMatchResult.NeverThisType;
+
+            if (HasSettersOrAnimations && TargetType.IsAssignableFrom(target.StyleKey))
+            {
+                Attach(target, null);
+                result = SelectorMatchResult.AlwaysThisType;
+            }
+
+            var childResult = TryAttachChildren(target, host);
+
+            if (childResult > result)
+                result = childResult;
+
+            return result;
+        }
+
+        public override string ToString()
+        {
+            if (TargetType is not null)
+                return "ControlTheme: " + TargetType.Name;
+            else
+                return "ControlTheme";
+        }
+
+        internal override void SetParent(StyleBase? parent)
+        {
+            throw new InvalidOperationException("ControlThemes cannot be added as a nested style.");
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
new file mode 100644
index 0000000000..677a924189
--- /dev/null
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -0,0 +1,75 @@
+using System;
+using Avalonia.LogicalTree;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    internal class DescendantSelector : Selector
+    {
+        private readonly Selector _parent;
+        private string? _selectorString;
+
+        public DescendantSelector(Selector? parent)
+        {
+            _parent = parent ?? throw new InvalidOperationException("Descendant selector must be preceeded by a selector.");
+        }
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => true;
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _parent.InTemplate;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => null;
+
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = _parent.ToString() + ' ';
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var c = (ILogical)control;
+            var descendantMatches = new OrActivatorBuilder();
+
+            while (c != null)
+            {
+                c = c.LogicalParent;
+
+                if (c is IStyleable)
+                {
+                    var match = _parent.Match((IStyleable)c, parent, subscribe);
+
+                    if (match.Result == SelectorMatchResult.Sometimes)
+                    {
+                        descendantMatches.Add(match.Activator);
+                    }
+                    else if (match.IsMatch)
+                    {
+                        return SelectorMatch.AlwaysThisInstance;
+                    }
+                }
+            }
+
+            if (descendantMatches.Count > 0)
+            {
+                return new SelectorMatch(descendantMatches.Get());
+            }
+            else
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+        }
+
+        protected override Selector? MovePrevious() => null;
+        protected override Selector? MovePreviousOrParent() => _parent;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IGlobalStyles.cs b/src/Avalonia.Base/Styling/IGlobalStyles.cs
new file mode 100644
index 0000000000..f9667a8895
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IGlobalStyles.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines the style host that provides styles global to the application.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IGlobalStyles : IStyleHost
+    {
+        /// <summary>
+        /// Raised when styles are added to <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        public event Action<IReadOnlyList<IStyle>>? GlobalStylesAdded;
+
+        /// <summary>
+        /// Raised when styles are removed from <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        public event Action<IReadOnlyList<IStyle>>? GlobalStylesRemoved;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/ISetter.cs b/src/Avalonia.Base/Styling/ISetter.cs
new file mode 100644
index 0000000000..71ae5d84c0
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ISetter.cs
@@ -0,0 +1,24 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a setter for a <see cref="Style"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ISetter
+    {
+        /// <summary>
+        /// Instances a setter on a control.
+        /// </summary>
+        /// <param name="target">The control.</param>
+        /// <returns>An <see cref="ISetterInstance"/>.</returns>
+        /// <remarks>
+        /// This method should return an <see cref="ISetterInstance"/> which can be used to apply
+        /// the setter to the specified control. Note that it should not apply the setter value 
+        /// until <see cref="ISetterInstance.Start(bool)"/> is called.
+        /// </remarks>
+        ISetterInstance Instance(IStyleable target);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/ISetterInstance.cs b/src/Avalonia.Base/Styling/ISetterInstance.cs
new file mode 100644
index 0000000000..e0d3137619
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ISetterInstance.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a setter that has been instanced on a control.
+    /// </summary>
+    [Unstable]
+    public interface ISetterInstance : IDisposable
+    {
+        /// <summary>
+        /// Starts the setter instance.
+        /// </summary>
+        /// <param name="hasActivator">Whether the parent style has an activator.</param>
+        /// <remarks>
+        /// If <paramref name="hasActivator"/> is false then the setter should be immediately
+        /// applied and <see cref="Activate"/> and <see cref="Deactivate"/> should not be called.
+        /// If true, then bindings etc should be initiated but not produce a value until
+        /// <see cref="Activate"/> called.
+        /// </remarks>
+        public void Start(bool hasActivator);
+
+        /// <summary>
+        /// Activates the setter.
+        /// </summary>
+        /// <remarks>
+        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
+        /// </remarks>
+        public void Activate();
+
+        /// <summary>
+        /// Deactivates the setter.
+        /// </summary>
+        /// <remarks>
+        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
+        /// </remarks>
+        public void Deactivate();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/ISetterValue.cs b/src/Avalonia.Base/Styling/ISetterValue.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/ISetterValue.cs
rename to src/Avalonia.Base/Styling/ISetterValue.cs
diff --git a/src/Avalonia.Base/Styling/IStyle.cs b/src/Avalonia.Base/Styling/IStyle.cs
new file mode 100644
index 0000000000..417739fb28
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyle.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines the interface for styles.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IStyle : IResourceNode
+    {
+        /// <summary>
+        /// Gets a collection of child styles.
+        /// </summary>
+        IReadOnlyList<IStyle> Children { get; }
+
+        /// <summary>
+        /// Attaches the style and any child styles to a control if the style's selector matches.
+        /// </summary>
+        /// <param name="target">The control to attach to.</param>
+        /// <param name="host">The element that hosts the style.</param>
+        /// <returns>
+        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
+        /// </returns>
+        SelectorMatchResult TryAttach(IStyleable target, object? host);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyleHost.cs b/src/Avalonia.Base/Styling/IStyleHost.cs
new file mode 100644
index 0000000000..2ae488825c
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyleHost.cs
@@ -0,0 +1,46 @@
+
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines an element that has a <see cref="Styles"/> collection.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IStyleHost
+    {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Styles"/> is initialized.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Styles"/> property may be lazily initialized, if so this property
+        /// indicates whether it has been initialized.
+        /// </remarks>
+        bool IsStylesInitialized { get; }
+
+        /// <summary>
+        /// Gets the styles for the element.
+        /// </summary>
+        Styles Styles { get; }
+
+        /// <summary>
+        /// Gets the parent style host element.
+        /// </summary>
+        IStyleHost? StylingParent { get; }
+
+        /// <summary>
+        /// Called when styles are added to <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        /// <param name="styles">The added styles.</param>
+        void StylesAdded(IReadOnlyList<IStyle> styles);
+
+        /// <summary>
+        /// Called when styles are removed from <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        /// <param name="styles">The removed styles.</param>
+        void StylesRemoved(IReadOnlyList<IStyle> styles);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyleInstance.cs b/src/Avalonia.Base/Styling/IStyleInstance.cs
new file mode 100644
index 0000000000..262f336e05
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyleInstance.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a style that has been instanced on a control.
+    /// </summary>
+    [Unstable]
+    public interface IStyleInstance : IDisposable
+    {
+        /// <summary>
+        /// Gets the source style.
+        /// </summary>
+        IStyle Source { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this style has an activator.
+        /// </summary>
+        bool HasActivator { get; }
+        
+        /// <summary>
+        /// Gets a value indicating whether this style is active.
+        /// </summary>
+        bool IsActive { get; }
+
+        /// <summary>
+        /// Instructs the style to start acting upon the control.
+        /// </summary>
+        void Start();
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyleable.cs b/src/Avalonia.Base/Styling/IStyleable.cs
new file mode 100644
index 0000000000..254da4d85c
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyleable.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Interface for styleable elements.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IStyleable : IAvaloniaObject, INamed
+    {
+        /// <summary>
+        /// Gets the list of classes for the control.
+        /// </summary>
+        IAvaloniaReadOnlyList<string> Classes { get; }
+
+        /// <summary>
+        /// Gets the type by which the control is styled.
+        /// </summary>
+        Type StyleKey { get; }
+
+        /// <summary>
+        /// Gets the template parent of this element if the control comes from a template.
+        /// </summary>
+        ITemplatedControl? TemplatedParent { get; }
+
+        /// <summary>
+        /// Gets the effective theme for the control as used by the syling system.
+        /// </summary>
+        ControlTheme? GetEffectiveTheme();
+
+        /// <summary>
+        /// Notifies the element that a style has been applied.
+        /// </summary>
+        /// <param name="instance">The style instance.</param>
+        void StyleApplied(IStyleInstance instance);
+
+        /// <summary>
+        /// Detaches all styles applied to the element.
+        /// </summary>
+        void DetachStyles();
+
+        /// <summary>
+        /// Detaches a collection of styles, if applied to the element.
+        /// </summary>
+        void DetachStyles(IReadOnlyList<IStyle> styles);
+
+        /// <summary>
+        /// Detaches all styles from the element and queues a restyle.
+        /// </summary>
+        void InvalidateStyles();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/IStyler.cs b/src/Avalonia.Base/Styling/IStyler.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/IStyler.cs
rename to src/Avalonia.Base/Styling/IStyler.cs
diff --git a/src/Avalonia.Styling/Styling/ITemplate.cs b/src/Avalonia.Base/Styling/ITemplate.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/ITemplate.cs
rename to src/Avalonia.Base/Styling/ITemplate.cs
diff --git a/src/Avalonia.Base/Styling/ITemplatedControl.cs b/src/Avalonia.Base/Styling/ITemplatedControl.cs
new file mode 100644
index 0000000000..68989c8a5e
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ITemplatedControl.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    [NotClientImplementable]
+    public interface ITemplatedControl : IAvaloniaObject
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
new file mode 100644
index 0000000000..77c5b719c6
--- /dev/null
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The `^` nesting style selector.
+    /// </summary>
+    internal class NestingSelector : Selector
+    {
+        public override bool InTemplate => false;
+        public override bool IsCombinator => false;
+        public override Type? TargetType => null;
+
+        public override string ToString() => "^";
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (parent is Style s && s.Selector is not null)
+            {
+                return s.Selector.Match(control, s.Parent, subscribe);
+            }
+            else if (parent is ControlTheme theme)
+            {
+                if (theme.TargetType is null)
+                    throw new InvalidOperationException("ControlTheme has no TargetType.");
+                return theme.TargetType.IsAssignableFrom(control.StyleKey) ?
+                    SelectorMatch.AlwaysThisType :
+                    SelectorMatch.NeverThisType;
+            }
+
+            throw new InvalidOperationException(
+                "Nesting selector was specified but cannot determine parent selector.");
+        }
+
+        protected override Selector? MovePrevious() => null;
+        protected override Selector? MovePreviousOrParent() => null;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
new file mode 100644
index 0000000000..c7727bb6b8
--- /dev/null
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -0,0 +1,72 @@
+using System;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The `:not()` style selector.
+    /// </summary>
+    internal class NotSelector : Selector
+    {
+        private readonly Selector? _previous;
+        private readonly Selector _argument;
+        private string? _selectorString;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NotSelector"/> class.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="argument">The selector to be not-ed.</param>
+        public NotSelector(Selector? previous, Selector argument)
+        {
+            _previous = previous;
+            _argument = argument ?? throw new InvalidOperationException("Not selector must have a selector argument.");
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _argument.InTemplate;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => _previous?.TargetType;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = $"{_previous?.ToString()}:not({_argument})";
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var innerResult = _argument.Match(control, parent, subscribe);
+
+            switch (innerResult.Result)
+            {
+                case SelectorMatchResult.AlwaysThisInstance:
+                    return SelectorMatch.NeverThisInstance;
+                case SelectorMatchResult.AlwaysThisType:
+                    return SelectorMatch.NeverThisType;
+                case SelectorMatchResult.NeverThisInstance:
+                    return SelectorMatch.AlwaysThisInstance;
+                case SelectorMatchResult.NeverThisType:
+                    return SelectorMatch.AlwaysThisType;
+                case SelectorMatchResult.Sometimes:
+                    return new SelectorMatch(new NotActivator(innerResult.Activator!));
+                default:
+                    throw new InvalidOperationException("Invalid SelectorMatchResult.");
+            }
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
new file mode 100644
index 0000000000..c872a40ad4
--- /dev/null
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -0,0 +1,147 @@
+#nullable enable
+using System;
+using Avalonia.LogicalTree;
+using Avalonia.Styling.Activators;
+using Avalonia.Utilities;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The :nth-child() pseudo-class matches elements based on their position in a group of siblings.
+    /// </summary>
+    /// <remarks>
+    /// Element indices are 1-based.
+    /// </remarks>
+    public class NthChildSelector : Selector
+    {
+        private const string NthChildSelectorName = "nth-child";
+        private const string NthLastChildSelectorName = "nth-last-child";
+        private readonly Selector? _previous;
+        private readonly bool _reversed;
+
+        internal protected NthChildSelector(Selector? previous, int step, int offset, bool reversed)
+        {
+            _previous = previous;
+            Step = step;
+            Offset = offset;
+            _reversed = reversed;
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="NthChildSelector"/>
+        /// </summary>
+        /// <param name="previous">Previous selector.</param>
+        /// <param name="step">Position step.</param>
+        /// <param name="offset">Initial index offset.</param>
+        public NthChildSelector(Selector? previous, int step, int offset)
+            : this(previous, step, offset, false)
+        {
+
+        }
+
+        public override bool InTemplate => _previous?.InTemplate ?? false;
+
+        public override bool IsCombinator => false;
+
+        public override Type? TargetType => _previous?.TargetType;
+
+        public int Step { get; }
+        public int Offset { get; }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (!(control is ILogical logical))
+            {
+                return SelectorMatch.NeverThisType;
+            }
+
+            var controlParent = logical.LogicalParent;
+
+            if (controlParent is IChildIndexProvider childIndexProvider)
+            {
+                return subscribe
+                    ? new SelectorMatch(new NthChildActivator(logical, childIndexProvider, Step, Offset, _reversed))
+                    : Evaluate(logical, childIndexProvider, Step, Offset, _reversed);
+            }
+            else
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+        }
+
+        internal static SelectorMatch Evaluate(
+            ILogical logical, IChildIndexProvider childIndexProvider,
+            int step, int offset, bool reversed)
+        {
+            var index = childIndexProvider.GetChildIndex(logical);
+            if (index < 0)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+
+            if (reversed)
+            {
+                if (childIndexProvider.TryGetTotalCount(out var totalCountValue))
+                {
+                    index = totalCountValue - index;
+                }
+                else
+                {
+                    return SelectorMatch.NeverThisInstance;
+                }
+            }
+            else
+            {
+                // nth child index is 1-based
+                index += 1;
+            }
+
+            var n = Math.Sign(step);
+
+            var diff = index - offset;
+            var match = diff == 0 || (Math.Sign(diff) == n && diff % step == 0);
+
+            return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
+
+        public override string ToString()
+        {
+            var expectedCapacity = NthLastChildSelectorName.Length + 8;
+            var stringBuilder =  StringBuilderCache.Acquire(expectedCapacity);
+            stringBuilder.Append(_previous?.ToString());
+            
+            stringBuilder.Append(':');
+            stringBuilder.Append(_reversed ? NthLastChildSelectorName : NthChildSelectorName);
+            stringBuilder.Append('(');
+
+            var hasStep = false;
+            if (Step != 0)
+            {
+                hasStep = true;
+                stringBuilder.Append(Step);
+                stringBuilder.Append('n');
+            }
+
+            if (Offset > 0)
+            {
+                if (hasStep)
+                {
+                    stringBuilder.Append('+');
+                }
+                stringBuilder.Append(Offset);
+            }
+            else if (Offset < 0)
+            {
+                stringBuilder.Append('-');
+                stringBuilder.Append(-Offset);
+            }
+
+            stringBuilder.Append(')');
+
+            return StringBuilderCache.GetStringAndRelease(stringBuilder);
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/NthLastChildSelector.cs b/src/Avalonia.Base/Styling/NthLastChildSelector.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/NthLastChildSelector.cs
rename to src/Avalonia.Base/Styling/NthLastChildSelector.cs
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
new file mode 100644
index 0000000000..af9249864f
--- /dev/null
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The OR style selector.
+    /// </summary>
+    internal class OrSelector : Selector
+    {
+        private readonly IReadOnlyList<Selector> _selectors;
+        private string? _selectorString;
+        private Type? _targetType;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrSelector"/> class.
+        /// </summary>
+        /// <param name="selectors">The selectors to OR.</param>
+        public OrSelector(IReadOnlyList<Selector> selectors)
+        {
+            if (selectors is null)
+            {
+                throw new ArgumentNullException(nameof(selectors));
+            }
+
+            if (selectors.Count <= 1)
+            {
+                throw new ArgumentException("Need more than one selector to OR.");
+            }
+
+            _selectors = selectors;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => false;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <inheritdoc/>
+        public override Type? TargetType
+        {
+            get
+            {
+                if (_targetType == null)
+                {
+                    _targetType = EvaluateTargetType();
+                }
+
+                return _targetType;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = string.Join(", ", _selectors);
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var activators = new OrActivatorBuilder();
+            var neverThisInstance = false;
+
+            foreach (var selector in _selectors)
+            {
+                var match = selector.Match(control, parent, subscribe);
+
+                switch (match.Result)
+                {
+                    case SelectorMatchResult.AlwaysThisType:
+                    case SelectorMatchResult.AlwaysThisInstance:
+                        return match;
+                    case SelectorMatchResult.NeverThisInstance:
+                        neverThisInstance = true;
+                        break;
+                    case SelectorMatchResult.Sometimes:
+                        activators.Add(match.Activator!);
+                        break;
+                }
+            }
+
+            if (activators.Count > 0)
+            {
+                return new SelectorMatch(activators.Get());
+            }
+            else if (neverThisInstance)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+            else
+            {
+                return SelectorMatch.NeverThisType;
+            }
+        }
+
+        protected override Selector? MovePrevious() => null;
+        protected override Selector? MovePreviousOrParent() => null;
+
+        internal override void ValidateNestingSelector(bool inControlTheme)
+        {
+            foreach (var selector in _selectors)
+                selector.ValidateNestingSelector(inControlTheme);
+        }
+
+        private Type? EvaluateTargetType()
+        {
+            Type? result = null;
+
+            foreach (var selector in _selectors)
+            {
+                if (selector.TargetType == null)
+                {
+                    return null;
+                }
+                else if (result == null)
+                {
+                    result = selector.TargetType;
+                }
+                else
+                {
+                    while (result is not null && !result.IsAssignableFrom(selector.TargetType))
+                    {
+                        result = result.BaseType;
+                    }
+                }
+            }
+
+            return result;
+        }
+    }
+}
+
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
new file mode 100644
index 0000000000..e98ff3f9c9
--- /dev/null
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -0,0 +1,119 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Avalonia.Styling.Activators;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A selector that matches the common case of a type and/or name followed by a collection of
+    /// style classes and pseudoclasses.
+    /// </summary>
+    internal class PropertyEqualsSelector : Selector
+    {
+        private readonly Selector? _previous;
+        private readonly AvaloniaProperty _property;
+        private readonly object? _value;
+        private string? _selectorString;
+
+        public PropertyEqualsSelector(Selector? previous, AvaloniaProperty property, object? value)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            _previous = previous;
+            _property = property;
+            _value = value;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _previous?.InTemplate ?? false;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => _previous?.TargetType;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                var builder = StringBuilderCache.Acquire();
+
+                if (_previous != null)
+                {
+                    builder.Append(_previous.ToString());
+                }
+
+                builder.Append('[');
+
+                if (_property.IsAttached)
+                {
+                    builder.Append('(');
+                    builder.Append(_property.OwnerType.Name);
+                    builder.Append('.');
+                }
+
+                builder.Append(_property.Name);
+                if (_property.IsAttached)
+                {
+                    builder.Append(')');
+                }
+                builder.Append('=');
+                builder.Append(_value ?? string.Empty);
+                builder.Append(']');
+
+                _selectorString = StringBuilderCache.GetStringAndRelease(builder);
+            }
+
+            return _selectorString;
+        }
+
+        /// <inheritdoc/>
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (subscribe)
+            {
+                return new SelectorMatch(new PropertyEqualsActivator(control, _property, _value));
+            }
+            else
+            {
+                return Compare(_property.PropertyType, control.GetValue(_property), _value)
+                    ? SelectorMatch.AlwaysThisInstance
+                    : SelectorMatch.NeverThisInstance;
+            }
+            
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
+
+        internal static bool Compare(Type propertyType, object? propertyValue, object? value)
+        {
+            if (propertyType == typeof(object) &&
+                propertyValue?.GetType() is Type inferredType)
+            {
+                propertyType = inferredType;
+            }
+
+            var valueType = value?.GetType();
+
+            if (valueType is null || propertyType.IsAssignableFrom(valueType))
+            {
+                return Equals(propertyValue, value);
+            }
+
+            var converter = TypeDescriptor.GetConverter(propertyType);
+            if (converter?.CanConvertFrom(valueType) == true)
+            {
+                return Equals(propertyValue, converter.ConvertFrom(null, CultureInfo.InvariantCulture, value!));
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs b/src/Avalonia.Base/Styling/PropertySetterBindingInstance.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs
rename to src/Avalonia.Base/Styling/PropertySetterBindingInstance.cs
diff --git a/src/Avalonia.Base/Styling/PropertySetterInstance.cs b/src/Avalonia.Base/Styling/PropertySetterInstance.cs
new file mode 100644
index 0000000000..9028224cc1
--- /dev/null
+++ b/src/Avalonia.Base/Styling/PropertySetterInstance.cs
@@ -0,0 +1,133 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Setter"/> which has been instanced on a control.
+    /// </summary>
+    /// <typeparam name="T">The target property type.</typeparam>
+    internal class PropertySetterInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        ISetterInstance
+    {
+        private readonly IStyleable _target;
+        private readonly StyledPropertyBase<T>? _styledProperty;
+        private readonly DirectPropertyBase<T>? _directProperty;
+        private readonly T _value;
+        private IDisposable? _subscription;
+        private State _state;
+
+        public PropertySetterInstance(
+            IStyleable target,
+            StyledPropertyBase<T> property,
+            T value)
+        {
+            _target = target;
+            _styledProperty = property;
+            _value = value;
+        }
+
+        public PropertySetterInstance(
+            IStyleable target,
+            DirectPropertyBase<T> property,
+            T value)
+        {
+            _target = target;
+            _directProperty = property;
+            _value = value;
+        }
+
+        private bool IsActive => _state == State.Active;
+
+        public void Start(bool hasActivator)
+        {
+            if (hasActivator)
+            {
+                if (_styledProperty is not null)
+                {
+                    _subscription = _target.Bind(_styledProperty, this, BindingPriority.StyleTrigger);
+                }
+                else
+                {
+                    _subscription = _target.Bind(_directProperty!, this);
+                }
+            }
+            else
+            {
+                var target = (AvaloniaObject) _target;
+                
+                if (_styledProperty is not null)
+                {
+                    _subscription = target.SetValue(_styledProperty!, _value, BindingPriority.Style);
+                }
+                else
+                {
+                    target.SetValue(_directProperty!, _value);
+                }
+            }
+        }
+
+        public void Activate()
+        {
+            if (!IsActive)
+            {
+                _state = State.Active;
+                PublishNext();
+            }
+        }
+
+        public void Deactivate()
+        {
+            if (IsActive)
+            {
+                _state = State.Inactive;
+                PublishNext();
+            }
+        }
+
+        public override void Dispose()
+        {
+            if (_state == State.Disposed)
+                return;
+            _state = State.Disposed;
+
+            if (_subscription is object)
+            {
+                var sub = _subscription;
+                _subscription = null;
+                sub.Dispose();
+            }
+            else if (IsActive)
+            {
+                if (_styledProperty is object)
+                {
+                    _target.ClearValue(_styledProperty);
+                }
+                else
+                {
+                    _target.ClearValue(_directProperty!);
+                }
+            }
+
+            base.Dispose();
+        }
+
+        protected override void Subscribed() => PublishNext();
+        protected override void Unsubscribed() { }
+
+        private void PublishNext()
+        {
+            PublishNext(IsActive ? new BindingValue<T>(_value) : default);
+        }
+
+        private enum State
+        {
+            Inactive,
+            Active,
+            Disposed,
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/PropertySetterTemplateInstance.cs b/src/Avalonia.Base/Styling/PropertySetterTemplateInstance.cs
new file mode 100644
index 0000000000..0f6efef1be
--- /dev/null
+++ b/src/Avalonia.Base/Styling/PropertySetterTemplateInstance.cs
@@ -0,0 +1,127 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Setter"/> which has been instanced on a control and whose value is lazily
+    /// evaluated.
+    /// </summary>
+    /// <typeparam name="T">The target property type.</typeparam>
+    internal class PropertySetterTemplateInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        ISetterInstance
+    {
+        private readonly IStyleable _target;
+        private readonly StyledPropertyBase<T>? _styledProperty;
+        private readonly DirectPropertyBase<T>? _directProperty;
+        private readonly ITemplate _template;
+        private BindingValue<T> _value;
+        private IDisposable? _subscription;
+        private bool _isActive;
+
+        public PropertySetterTemplateInstance(
+            IStyleable target,
+            StyledPropertyBase<T> property,
+            ITemplate template)
+        {
+            _target = target;
+            _styledProperty = property;
+            _template = template;
+        }
+
+        public PropertySetterTemplateInstance(
+            IStyleable target,
+            DirectPropertyBase<T> property,
+            ITemplate template)
+        {
+            _target = target;
+            _directProperty = property;
+            _template = template;
+        }
+
+        public void Start(bool hasActivator)
+        {
+            _isActive = !hasActivator;
+
+            if (_styledProperty is not null)
+            {
+                var priority = hasActivator ? BindingPriority.StyleTrigger : BindingPriority.Style;
+                _subscription = _target.Bind(_styledProperty, this, priority);
+            }
+            else
+            {
+                _subscription = _target.Bind(_directProperty!, this);
+            }
+        }
+
+        public void Activate()
+        {
+            if (!_isActive)
+            {
+                _isActive = true;
+                PublishNext();
+            }
+        }
+
+        public void Deactivate()
+        {
+            if (_isActive)
+            {
+                _isActive = false;
+                PublishNext();
+            }
+        }
+
+        public override void Dispose()
+        {
+            if (_subscription is not null)
+            {
+                var sub = _subscription;
+                _subscription = null;
+                sub.Dispose();
+            }
+            else if (_isActive)
+            {
+                if (_styledProperty is not null)
+                {
+                    _target.ClearValue(_styledProperty);
+                }
+                else
+                {
+                    _target.ClearValue(_directProperty!);
+                }
+            }
+
+            base.Dispose();
+        }
+
+        protected override void Subscribed() => PublishNext();
+        protected override void Unsubscribed() { }
+
+        private void EnsureTemplate()
+        {
+            if (_value.HasValue)
+            {
+                return;
+            }
+
+            _value = (T) _template.Build();
+        }
+
+        private void PublishNext()
+        {
+            if (_isActive)
+            {
+                EnsureTemplate();
+                PublishNext(_value);
+            }
+            else
+            {
+                PublishNext(default);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
new file mode 100644
index 0000000000..7ce17518dd
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -0,0 +1,181 @@
+using System;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A selector in a <see cref="Style"/>.
+    /// </summary>
+    public abstract class Selector
+    {
+        /// <summary>
+        /// Gets a value indicating whether either this selector or a previous selector has moved
+        /// into a template.
+        /// </summary>
+        public abstract bool InTemplate { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this selector is a combinator.
+        /// </summary>
+        /// <remarks>
+        /// A combinator is a selector such as Child or Descendent which links simple selectors.
+        /// </remarks>
+        public abstract bool IsCombinator { get; }
+
+        /// <summary>
+        /// Gets the target type of the selector, if available.
+        /// </summary>
+        public abstract Type? TargetType { get; }
+
+        /// <summary>
+        /// Tries to match the selector with a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="parent">
+        /// The parent style, if the style containing the selector is a nested style.
+        /// </param>
+        /// <param name="subscribe">
+        /// Whether the match should subscribe to changes in order to track the match over time,
+        /// or simply return an immediate result.
+        /// </param>
+        /// <returns>A <see cref="SelectorMatch"/>.</returns>
+        public SelectorMatch Match(IStyleable control, IStyle? parent = null, bool subscribe = true)
+        {
+            // First match the selector until a combinator is found. Selectors are stored from 
+            // right-to-left, so MatchUntilCombinator reverses this order because the type selector
+            // will be on the left.
+            var match = MatchUntilCombinator(control, this, parent, subscribe, out var combinator);
+            
+            // If the pre-combinator selector matches, we can now match the combinator, if any.
+            if (match.IsMatch && combinator is object)
+            {
+                match = match.And(combinator.Match(control, parent, subscribe));
+
+                // If we have a combinator then we can never say that we always match a control of
+                // this type, because by definition the combinator matches on things outside of the
+                // control.
+                match = match.Result switch
+                {
+                    SelectorMatchResult.AlwaysThisType => SelectorMatch.AlwaysThisInstance,
+                    SelectorMatchResult.NeverThisType => SelectorMatch.NeverThisInstance,
+                    _ => match
+                };
+            }
+
+            return match;
+        }
+
+        /// <summary>
+        /// Evaluates the selector for a match.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="parent">
+        /// The parent style, if the style containing the selector is a nested style.
+        /// </param>
+        /// <param name="subscribe">
+        /// Whether the match should subscribe to changes in order to track the match over time,
+        /// or simply return an immediate result.
+        /// </param>
+        /// <returns>A <see cref="SelectorMatch"/>.</returns>
+        protected abstract SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe);
+
+        /// <summary>
+        /// Moves to the previous selector.
+        /// </summary>
+        protected abstract Selector? MovePrevious();
+
+        /// <summary>
+        /// Moves to the previous selector or the parent selector.
+        /// </summary>
+        protected abstract Selector? MovePreviousOrParent();
+
+        internal virtual void ValidateNestingSelector(bool inControlTheme)
+        {
+            var s = this;
+            var templateCount = 0;
+
+            do
+            {
+                if (inControlTheme)
+                {
+                    if (!s.InTemplate && s.IsCombinator)
+                        throw new InvalidOperationException(
+                            "ControlTheme style may not directly contain a child or descendent selector.");
+                    if (s is TemplateSelector && templateCount++ > 0)
+                        throw new InvalidOperationException(
+                            "ControlTemplate styles cannot contain multiple template selectors.");
+                }
+
+                var previous = s.MovePreviousOrParent();
+
+                if (previous is null && s is not NestingSelector)
+                    throw new InvalidOperationException("Child styles must have a nesting selector.");
+
+                s = previous;
+            } while (s is not null);
+        }
+
+        private static SelectorMatch MatchUntilCombinator(
+            IStyleable control,
+            Selector start,
+            IStyle? parent,
+            bool subscribe,
+            out Selector? combinator)
+        {
+            combinator = null;
+
+            var activators = new AndActivatorBuilder();
+            var result = Match(control, start, parent, subscribe, ref activators, ref combinator);
+
+            return result == SelectorMatchResult.Sometimes ?
+                new SelectorMatch(activators.Get()) :
+                new SelectorMatch(result);
+        }
+
+        private static SelectorMatchResult Match(
+            IStyleable control,
+            Selector selector,
+            IStyle? parent,
+            bool subscribe,
+            ref AndActivatorBuilder activators,
+            ref Selector? combinator)
+        {
+            var previous = selector.MovePrevious();
+
+            // Selectors are stored from right-to-left, so we recurse into the selector in order to
+            // reverse this order, because the type selector will be on the left and is our best
+            // opportunity to exit early.
+            if (previous != null && !previous.IsCombinator)
+            {
+                var previousMatch = Match(control, previous, parent, subscribe, ref activators, ref combinator);
+
+                if (previousMatch < SelectorMatchResult.Sometimes)
+                {
+                    return previousMatch;
+                }
+            }
+
+            // Match this selector.
+            var match = selector.Evaluate(control, parent, subscribe);
+
+            if (!match.IsMatch)
+            {
+                combinator = null;
+                return match.Result;
+            }
+            else if (match.Activator is object)
+            {
+                activators.Add(match.Activator!);
+            }
+
+            if (previous?.IsCombinator == true)
+            {
+                combinator = previous;
+            }
+
+            return match.Result;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/SelectorMatch.cs b/src/Avalonia.Base/Styling/SelectorMatch.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/SelectorMatch.cs
rename to src/Avalonia.Base/Styling/SelectorMatch.cs
diff --git a/src/Avalonia.Base/Styling/Selectors.cs b/src/Avalonia.Base/Styling/Selectors.cs
new file mode 100644
index 0000000000..476d86cd11
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Selectors.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Extension methods for <see cref="Selector"/>.
+    /// </summary>
+    public static class Selectors
+    {
+        /// <summary>
+        /// Returns a selector which matches a previous selector's child.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Child(this Selector previous)
+        {
+            return new ChildSelector(previous);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control's style class.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="name">The name of the style class.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Class(this Selector? previous, string name)
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                throw new ArgumentException("Name may not be empty", nameof(name));
+            }
+
+            var tac = previous as TypeNameAndClassSelector;
+
+            if (tac != null)
+            {
+                tac.Classes.Add(name);
+                return tac;
+            }
+            else
+            {
+                return TypeNameAndClassSelector.ForClass(previous, name);
+            }
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a descendant of a previous selector.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Descendant(this Selector? previous)
+        {
+            return new DescendantSelector(previous);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type or a derived type.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="type">The type.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Is(this Selector? previous, Type type)
+        {
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+
+            return TypeNameAndClassSelector.Is(previous, type);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type or a derived type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Is<T>(this Selector? previous) where T : IStyleable
+        {
+            return previous.Is(typeof(T));
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control's Name.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="name">The name.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Name(this Selector? previous, string name)
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                throw new ArgumentException("Name may not be empty", nameof(name));
+            }
+
+            var tac = previous as TypeNameAndClassSelector;
+
+            if (tac != null)
+            {
+                tac.Name = name;
+                return tac;
+            }
+            else
+            {
+                return TypeNameAndClassSelector.ForName(previous, name);
+            }
+        }
+
+        public static Selector Nesting(this Selector? previous)
+        {
+            return new NestingSelector();
+        }
+
+        /// <summary>
+        /// Returns a selector which inverts the results of selector argument.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="argument">The selector to be not-ed.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Not(this Selector? previous, Func<Selector?, Selector> argument)
+        {
+            return new NotSelector(previous, argument(null));
+        }
+        
+        /// <summary>
+        /// Returns a selector which inverts the results of selector argument.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="argument">The selector to be not-ed.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Not(this Selector? previous, Selector argument)
+        {
+            return new NotSelector(previous, argument);
+        }
+
+        /// <inheritdoc cref="NthChildSelector"/>
+        /// <inheritdoc cref="NthChildSelector(Selector?, int, int)"/>
+        /// <returns>The selector.</returns>
+        public static Selector NthChild(this Selector? previous, int step, int offset)
+        {
+            return new NthChildSelector(previous, step, offset);
+        }
+
+        /// <inheritdoc cref="NthLastChildSelector"/>
+        /// <inheritdoc cref="NthLastChildSelector(Selector?, int, int)"/>
+        /// <returns>The selector.</returns>
+        public static Selector NthLastChild(this Selector? previous, int step, int offset)
+        {
+            return new NthLastChildSelector(previous, step, offset);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="type">The type.</param>
+        /// <returns>The selector.</returns>
+        public static Selector OfType(this Selector? previous, Type type)
+        {
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+
+            return TypeNameAndClassSelector.OfType(previous, type);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector OfType<T>(this Selector? previous) where T : IStyleable
+        {
+            return previous.OfType(typeof(T));
+        }
+
+        /// <summary>
+        /// Returns a selector which ORs selectors.
+        /// </summary>
+        /// <param name="selectors">The selectors to be OR'd.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Or(params Selector[] selectors)
+        {
+            return new OrSelector(selectors);
+        }
+
+        /// <summary>
+        /// Returns a selector which ORs selectors.
+        /// </summary>
+        /// <param name="selectors">The selectors to be OR'd.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Or(IReadOnlyList<Selector> selectors)
+        {
+            return new OrSelector(selectors);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control with the specified property value.
+        /// </summary>
+        /// <typeparam name="T">The property type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns>The selector.</returns>
+        public static Selector PropertyEquals<T>(this Selector? previous, AvaloniaProperty<T> property, object? value)
+        {
+            _ = property ?? throw new ArgumentNullException(nameof(property));
+
+            return new PropertyEqualsSelector(previous, property, value);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control with the specified property value.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns>The selector.</returns>
+        public static Selector PropertyEquals(this Selector? previous, AvaloniaProperty property, object? value)
+        {
+            _ = property ?? throw new ArgumentNullException(nameof(property));
+
+            return new PropertyEqualsSelector(previous, property, value);
+        }
+
+        /// <summary>
+        /// Returns a selector which enters a lookless control's template.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Template(this Selector previous)
+        {
+            return new TemplateSelector(previous);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Setter.cs b/src/Avalonia.Base/Styling/Setter.cs
new file mode 100644
index 0000000000..d989bb0706
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Setter.cs
@@ -0,0 +1,72 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Data;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A setter for a <see cref="Style"/>.
+    /// </summary>
+    /// <remarks>
+    /// A <see cref="Setter"/> is used to set a <see cref="AvaloniaProperty"/> value on a
+    /// <see cref="AvaloniaObject"/> depending on a condition.
+    /// </remarks>
+    public class Setter : ISetter, IAnimationSetter
+    {
+        private object? _value;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Setter"/> class.
+        /// </summary>
+        public Setter()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Setter"/> class.
+        /// </summary>
+        /// <param name="property">The property to set.</param>
+        /// <param name="value">The property value.</param>
+        public Setter(AvaloniaProperty property, object value)
+        {
+            Property = property;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the property to set.
+        /// </summary>
+        public AvaloniaProperty? Property { get; set; }
+
+        /// <summary>
+        /// Gets or sets the property value.
+        /// </summary>
+        [Content]
+        [AssignBinding]
+        [DependsOn(nameof(Property))]
+        public object? Value
+        {
+            get => _value;
+            set
+            {
+                (value as ISetterValue)?.Initialize(this);
+                _value = value;
+            }
+        }
+
+        public ISetterInstance Instance(IStyleable target)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Setter.Property must be set.");
+            }
+
+            return Property.CreateSetterInstance(target, Value);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
new file mode 100644
index 0000000000..c61b08b2a1
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -0,0 +1,106 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines a style.
+    /// </summary>
+    public class Style : StyleBase
+    {
+        private Selector? _selector;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Style"/> class.
+        /// </summary>
+        public Style()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Style"/> class.
+        /// </summary>
+        /// <param name="selector">The style selector.</param>
+        public Style(Func<Selector?, Selector> selector)
+        {
+            Selector = selector(null);
+        }
+
+        /// <summary>
+        /// Gets or sets the style's selector.
+        /// </summary>
+        public Selector? Selector 
+        {
+            get => _selector;
+            set => _selector = ValidateSelector(value);
+        }
+
+        public override SelectorMatchResult TryAttach(IStyleable target, object? host)
+        {
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
+            var result = SelectorMatchResult.NeverThisType;
+
+            if (HasSettersOrAnimations)
+            {
+                var match = Selector?.Match(target, Parent, true) ??
+                    (target == host ?
+                        SelectorMatch.AlwaysThisInstance :
+                        SelectorMatch.NeverThisInstance);
+
+                if (match.IsMatch)
+                    Attach(target, match.Activator);
+
+                result = match.Result;
+            }
+
+            var childResult = TryAttachChildren(target, host);
+
+            if (childResult > result)
+                result = childResult;
+
+            return result;
+        }
+
+        /// <summary>
+        /// Returns a string representation of the style.
+        /// </summary>
+        /// <returns>A string representation of the style.</returns>
+        public override string ToString()
+        {
+            if (Selector != null)
+            {
+                return "Style: " + Selector.ToString();
+            }
+            else
+            {
+                return "Style";
+            }
+        }
+
+        internal override void SetParent(StyleBase? parent)
+        {
+            if (parent is Style parentStyle && parentStyle.Selector is not null)
+            {
+                if (Selector is null)
+                    throw new InvalidOperationException("Child styles must have a selector.");
+                Selector.ValidateNestingSelector(false);
+            }
+            else if (parent is ControlTheme)
+            {
+                if (Selector is null)
+                    throw new InvalidOperationException("Child styles must have a selector.");
+                Selector.ValidateNestingSelector(true);
+            }
+
+            base.SetParent(parent);
+        }
+
+        private static Selector? ValidateSelector(Selector? selector)
+        {
+            if (selector is TemplateSelector)
+                throw new InvalidOperationException(
+                    "Invalid selector: Template selector must be followed by control selector.");
+            return selector;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleBase.cs b/src/Avalonia.Base/Styling/StyleBase.cs
new file mode 100644
index 0000000000..306a4cf010
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleBase.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+using Avalonia.Styling.Activators;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Base class for <see cref="Style"/> and <see cref="ControlTheme"/>.
+    /// </summary>
+    public abstract class StyleBase : AvaloniaObject, IStyle, IResourceProvider
+    {
+        private IResourceHost? _owner;
+        private StyleChildren? _children;
+        private IResourceDictionary? _resources;
+        private List<ISetter>? _setters;
+        private List<IAnimation>? _animations;
+        private StyleCache? _childCache;
+
+        public IList<IStyle> Children => _children ??= new(this);
+
+        public IResourceHost? Owner
+        {
+            get => _owner;
+            private set
+            {
+                if (_owner != value)
+                {
+                    _owner = value;
+                    OwnerChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        public IStyle? Parent { get; private set; }
+
+        public IResourceDictionary Resources
+        {
+            get => _resources ?? (Resources = new ResourceDictionary());
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(value));
+
+                var hadResources = _resources?.HasResources ?? false;
+
+                _resources = value;
+
+                if (Owner is object)
+                {
+                    _resources.AddOwner(Owner);
+
+                    if (hadResources || _resources.HasResources)
+                    {
+                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                    }
+                }
+            }
+        }
+
+        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
+        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
+
+        bool IResourceNode.HasResources => _resources?.Count > 0;
+        IReadOnlyList<IStyle> IStyle.Children => (IReadOnlyList<IStyle>?)_children ?? Array.Empty<IStyle>();
+
+        internal bool HasSettersOrAnimations => _setters?.Count > 0 || _animations?.Count > 0;
+
+        public void Add(ISetter setter) => Setters.Add(setter);
+        public void Add(IStyle style) => Children.Add(style);
+
+        public event EventHandler? OwnerChanged;
+
+        public abstract SelectorMatchResult TryAttach(IStyleable target, object? host);
+
+        public bool TryGetResource(object key, out object? result)
+        {
+            result = null;
+            return _resources?.TryGetResource(key, out result) ?? false;
+        }
+
+        internal void Attach(IStyleable target, IStyleActivator? activator)
+        {
+            var instance = new StyleInstance(this, target, _setters, _animations, activator);
+            target.StyleApplied(instance);
+            instance.Start();
+        }
+
+        internal SelectorMatchResult TryAttachChildren(IStyleable target, object? host)
+        {
+            if (_children is null || _children.Count == 0)
+                return SelectorMatchResult.NeverThisType;
+            _childCache ??= new StyleCache();
+            return _childCache.TryAttach(_children, target, host);
+        }
+
+        internal virtual void SetParent(StyleBase? parent) => Parent = parent;
+
+        void IResourceProvider.AddOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner != null)
+            {
+                throw new InvalidOperationException("The Style already has a parent.");
+            }
+
+            Owner = owner;
+            _resources?.AddOwner(owner);
+        }
+
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner == owner)
+            {
+                Owner = null;
+                _resources?.RemoveOwner(owner);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleCache.cs b/src/Avalonia.Base/Styling/StyleCache.cs
new file mode 100644
index 0000000000..81196f6a27
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleCache.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Simple cache for improving performance of applying styles.
+    /// </summary>
+    /// <remarks>
+    /// Maps <see cref="IStyleable.StyleKey"/> to a list of styles that are known be be possible
+    /// matches.
+    /// </remarks>
+    internal class StyleCache : Dictionary<Type, List<IStyle>?>
+    {
+        public SelectorMatchResult TryAttach(IList<IStyle> styles, IStyleable target, object? host)
+        {
+            if (TryGetValue(target.StyleKey, out var cached))
+            {
+                if (cached is object)
+                {
+                    var result = SelectorMatchResult.NeverThisType;
+
+                    foreach (var style in cached)
+                    {
+                        var childResult = style.TryAttach(target, host);
+                        if (childResult > result)
+                            result = childResult;
+                    }
+
+                    return result;
+                }
+                else
+                {
+                    return SelectorMatchResult.NeverThisType;
+                }
+            }
+            else
+            {
+                List<IStyle>? matches = null;
+
+                foreach (var child in styles)
+                {
+                    if (child.TryAttach(target, host) != SelectorMatchResult.NeverThisType)
+                    {
+                        matches ??= new List<IStyle>();
+                        matches.Add(child);
+                    }
+                }
+
+                Add(target.StyleKey, matches);
+
+                return matches is null ?
+                    SelectorMatchResult.NeverThisType :
+                    SelectorMatchResult.AlwaysThisType;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleChildren.cs b/src/Avalonia.Base/Styling/StyleChildren.cs
new file mode 100644
index 0000000000..42b0a331ee
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleChildren.cs
@@ -0,0 +1,35 @@
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+
+namespace Avalonia.Styling
+{
+    internal class StyleChildren : Collection<IStyle>
+    {
+        private readonly StyleBase _owner;
+
+        public StyleChildren(StyleBase owner) => _owner = owner;
+
+        protected override void InsertItem(int index, IStyle item)
+        {
+            (item as StyleBase)?.SetParent(_owner);
+            base.InsertItem(index, item);
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            var item = Items[index];
+            (item as StyleBase)?.SetParent(null);
+            if (_owner.Owner is IResourceHost host)
+                (item as IResourceProvider)?.RemoveOwner(host);
+            base.RemoveItem(index);
+        }
+
+        protected override void SetItem(int index, IStyle item)
+        {
+            (item as StyleBase)?.SetParent(_owner);
+            base.SetItem(index, item);
+            if (_owner.Owner is IResourceHost host)
+                (item as IResourceProvider)?.AddOwner(host);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleInstance.cs b/src/Avalonia.Base/Styling/StyleInstance.cs
new file mode 100644
index 0000000000..db96da6821
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleInstance.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Subjects;
+using Avalonia.Animation;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Style"/> which has been instanced on a control.
+    /// </summary>
+    internal sealed class StyleInstance : IStyleInstance, IStyleActivatorSink
+    {
+        private readonly ISetterInstance[]? _setters;
+        private readonly IDisposable[]? _animations;
+        private readonly IStyleActivator? _activator;
+        private readonly Subject<bool>? _animationTrigger;
+
+        public StyleInstance(
+            IStyle source,
+            IStyleable target,
+            IReadOnlyList<ISetter>? setters,
+            IReadOnlyList<IAnimation>? animations,
+            IStyleActivator? activator = null)
+        {
+            Source = source ?? throw new ArgumentNullException(nameof(source));
+            Target = target ?? throw new ArgumentNullException(nameof(target));
+            _activator = activator;
+            IsActive = _activator is null;
+
+            if (setters is not null)
+            {
+                var setterCount = setters.Count;
+
+                _setters = new ISetterInstance[setterCount];
+
+                for (var i = 0; i < setterCount; ++i)
+                {
+                    _setters[i] = setters[i].Instance(Target);
+                }
+            }
+
+            if (animations is not null && target is Animatable animatable)
+            {
+                var animationsCount = animations.Count;
+
+                _animations = new IDisposable[animationsCount];
+                _animationTrigger = new Subject<bool>();
+
+                for (var i = 0; i < animationsCount; ++i)
+                {
+                    _animations[i] = animations[i].Apply(animatable, null, _animationTrigger);
+                }
+            }
+        }
+
+        public bool HasActivator => _activator is not null;
+        public bool IsActive { get; private set; }
+        public IStyle Source { get; }
+        public IStyleable Target { get; }
+
+        public void Start()
+        {
+            var hasActivator = HasActivator;
+
+            if (_setters is not null)
+            {
+                foreach (var setter in _setters)
+                {
+                    setter.Start(hasActivator);
+                }
+            }
+
+            if (hasActivator)
+            {
+                _activator!.Subscribe(this, 0);
+            }
+            else if (_animationTrigger is not null)
+            {
+                _animationTrigger.OnNext(true);
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_setters is not null)
+            {
+                foreach (var setter in _setters)
+                {
+                    setter.Dispose();
+                }
+            }
+
+            if (_animations is not null)
+            {
+                foreach (var subscription in _animations)
+                {
+                    subscription.Dispose();
+                }
+            }
+
+            _activator?.Dispose();
+        }
+
+        private void ActivatorChanged(bool value)
+        {
+            if (IsActive != value)
+            {
+                IsActive = value;
+
+                _animationTrigger?.OnNext(value);
+
+                if (_setters is not null)
+                {
+                    if (IsActive)
+                    {
+                        foreach (var setter in _setters)
+                        {
+                            setter.Activate();
+                        }
+                    }
+                    else
+                    {
+                        foreach (var setter in _setters)
+                        {
+                            setter.Deactivate();
+                        }
+                    }
+                }
+            }
+        }
+
+        void IStyleActivatorSink.OnNext(bool value, int tag) => ActivatorChanged(value);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Styler.cs b/src/Avalonia.Base/Styling/Styler.cs
new file mode 100644
index 0000000000..ad5c1cd102
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Styler.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    public class Styler : IStyler
+    {
+        public void ApplyStyles(IStyleable target)
+        {
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
+            // Apply the control theme.
+            target.GetEffectiveTheme()?.TryAttach(target, target);
+
+            // If the control has a themed templated parent then apply the styles from the
+            // templated parent theme.
+            if (target.TemplatedParent is IStyleable styleableParent)
+                styleableParent.GetEffectiveTheme()?.TryAttach(target, styleableParent);
+
+            // Apply styles from the rest of the tree.
+            if (target is IStyleHost styleHost)
+                ApplyStyles(target, styleHost);
+        }
+
+        private void ApplyStyles(IStyleable target, IStyleHost host)
+        {
+            var parent = host.StylingParent;
+
+            if (parent != null)
+                ApplyStyles(target, parent);
+
+            if (host.IsStylesInitialized)
+                host.Styles.TryAttach(target, host);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Styles.cs b/src/Avalonia.Base/Styling/Styles.cs
new file mode 100644
index 0000000000..c213475bb7
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Styles.cs
@@ -0,0 +1,317 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A style that consists of a number of child styles.
+    /// </summary>
+    public class Styles : AvaloniaObject,
+        IAvaloniaList<IStyle>,
+        IStyle,
+        IResourceProvider
+    {
+        private readonly AvaloniaList<IStyle> _styles = new();
+        private IResourceHost? _owner;
+        private IResourceDictionary? _resources;
+        private StyleCache? _cache;
+
+        public Styles()
+        {
+            _styles.ResetBehavior = ResetBehavior.Remove;
+            _styles.CollectionChanged += OnCollectionChanged;
+            _styles.Validate = i =>
+            {
+                if (i is ControlTheme)
+                    throw new InvalidOperationException("ControlThemes cannot be added to a Styles collection.");
+            };
+        }
+
+        public Styles(IResourceHost owner)
+            : this()
+        {
+            Owner = owner;
+        }
+
+        public event NotifyCollectionChangedEventHandler? CollectionChanged;
+        public event EventHandler? OwnerChanged;
+
+        public int Count => _styles.Count;
+
+        public IResourceHost? Owner
+        {
+            get => _owner;
+            private set
+            {
+                if (_owner != value)
+                {
+                    _owner = value;
+                    OwnerChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a dictionary of style resources.
+        /// </summary>
+        public IResourceDictionary Resources
+        {
+            get => _resources ?? (Resources = new ResourceDictionary());
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(Resources));
+
+                var currentOwner = Owner;
+
+                if (currentOwner is not null)
+                {
+                    _resources?.RemoveOwner(currentOwner);
+                }
+
+                _resources = value;
+
+                if (currentOwner is not null)
+                {
+                    _resources.AddOwner(currentOwner);
+                }
+            }
+        }
+
+        bool ICollection<IStyle>.IsReadOnly => false;
+
+        bool IResourceNode.HasResources
+        {
+            get
+            {
+                if (_resources?.Count > 0)
+                {
+                    return true;
+                }
+
+                foreach (var i in this)
+                {
+                    if (i is IResourceProvider { HasResources: true })
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        IStyle IReadOnlyList<IStyle>.this[int index] => _styles[index];
+
+        IReadOnlyList<IStyle> IStyle.Children => this;
+
+        public IStyle this[int index]
+        {
+            get => _styles[index];
+            set => _styles[index] = value;
+        }
+
+        public SelectorMatchResult TryAttach(IStyleable target, object? host)
+        {
+            _cache ??= new StyleCache();
+            return _cache.TryAttach(this, target, host);
+        }
+
+        /// <inheritdoc/>
+        public bool TryGetResource(object key, out object? value)
+        {
+            if (_resources != null && _resources.TryGetResource(key, out value))
+            {
+                return true;
+            }
+
+            for (var i = Count - 1; i >= 0; --i)
+            {
+                if (this[i].TryGetResource(key, out value))
+                {
+                    return true;
+                }
+            }
+
+            value = null;
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public void AddRange(IEnumerable<IStyle> items) => _styles.AddRange(items);
+
+        /// <inheritdoc/>
+        public void InsertRange(int index, IEnumerable<IStyle> items) => _styles.InsertRange(index, items);
+
+        /// <inheritdoc/>
+        public void Move(int oldIndex, int newIndex) => _styles.Move(oldIndex, newIndex);
+
+        /// <inheritdoc/>
+        public void MoveRange(int oldIndex, int count, int newIndex) => _styles.MoveRange(oldIndex, count, newIndex);
+
+        /// <inheritdoc/>
+        public void RemoveAll(IEnumerable<IStyle> items) => _styles.RemoveAll(items);
+
+        /// <inheritdoc/>
+        public void RemoveRange(int index, int count) => _styles.RemoveRange(index, count);
+
+        /// <inheritdoc/>
+        public int IndexOf(IStyle item) => _styles.IndexOf(item);
+
+        /// <inheritdoc/>
+        public void Insert(int index, IStyle item) => _styles.Insert(index, item);
+
+        /// <inheritdoc/>
+        public void RemoveAt(int index) => _styles.RemoveAt(index);
+
+        /// <inheritdoc/>
+        public void Add(IStyle item) => _styles.Add(item);
+
+        /// <inheritdoc/>
+        public void Clear() => _styles.Clear();
+
+        /// <inheritdoc/>
+        public bool Contains(IStyle item) => _styles.Contains(item);
+
+        /// <inheritdoc/>
+        public void CopyTo(IStyle[] array, int arrayIndex) => _styles.CopyTo(array, arrayIndex);
+
+        /// <inheritdoc/>
+        public bool Remove(IStyle item) => _styles.Remove(item);
+
+        public AvaloniaList<IStyle>.Enumerator GetEnumerator() => _styles.GetEnumerator();
+
+        /// <inheritdoc/>
+        IEnumerator<IStyle> IEnumerable<IStyle>.GetEnumerator() => _styles.GetEnumerator();
+
+        /// <inheritdoc/>
+        IEnumerator IEnumerable.GetEnumerator() => _styles.GetEnumerator();
+
+        /// <inheritdoc/>
+        void IResourceProvider.AddOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner is not null)
+            {
+                throw new InvalidOperationException("The Styles already has a owner.");
+            }
+
+            Owner = owner;
+            _resources?.AddOwner(owner);
+
+            foreach (var child in this)
+            {
+                if (child is IResourceProvider r)
+                {
+                    r.AddOwner(owner);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner == owner)
+            {
+                Owner = null;
+                _resources?.RemoveOwner(owner);
+
+                foreach (var child in this)
+                {
+                    if (child is IResourceProvider r)
+                    {
+                        r.RemoveOwner(owner);
+                    }
+                }
+            }
+        }
+
+        private static IReadOnlyList<T> ToReadOnlyList<T>(ICollection list)
+        {
+            if (list is IReadOnlyList<T> readOnlyList)
+            {
+                return readOnlyList;
+            }
+
+            var result = new T[list.Count];
+            list.CopyTo(result, 0);
+            return result;
+        }
+
+        private static void InternalAdd(IList items, IResourceHost? owner, ref StyleCache? cache)
+        {
+            if (owner is not null)
+            {
+                for (var i = 0; i < items.Count; ++i)
+                {
+                    if (items[i] is IResourceProvider provider)
+                    {
+                        provider.AddOwner(owner);
+                    }
+                }
+
+                (owner as IStyleHost)?.StylesAdded(ToReadOnlyList<IStyle>(items));
+            }
+
+            if (items.Count > 0)
+            {
+                cache = null;
+            }
+        }
+
+        private static void InternalRemove(IList items, IResourceHost? owner, ref StyleCache? cache)
+        {
+            if (owner is not null)
+            {
+                for (var i = 0; i < items.Count; ++i)
+                {
+                    if (items[i] is IResourceProvider provider)
+                    {
+                        provider.RemoveOwner(owner);
+                    }
+                }
+
+                (owner as IStyleHost)?.StylesRemoved(ToReadOnlyList<IStyle>(items));
+            }
+
+            if (items.Count > 0)
+            {
+                cache = null;
+            }
+        }
+
+        private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                throw new InvalidOperationException("Reset should not be called on Styles.");
+            }
+
+            var currentOwner = Owner;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    InternalAdd(e.NewItems!, currentOwner, ref _cache);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    InternalRemove(e.OldItems!, currentOwner, ref _cache);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    InternalRemove(e.OldItems!, currentOwner, ref _cache);
+                    InternalAdd(e.NewItems!, currentOwner, ref _cache);
+                    break;
+            }
+
+            CollectionChanged?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
new file mode 100644
index 0000000000..278e24a203
--- /dev/null
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    internal class TemplateSelector : Selector
+    {
+        private readonly Selector _parent;
+        private string? _selectorString;
+
+        public TemplateSelector(Selector parent)
+        {
+            if (parent == null)
+            {
+                throw new InvalidOperationException("Template selector must be preceeded by a selector.");
+            }
+
+            _parent = parent;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => true;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => true;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => null;
+
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = _parent.ToString() + " /template/ ";
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var templatedParent = control.TemplatedParent as IStyleable;
+
+            if (templatedParent == null)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+
+            return _parent.Match(templatedParent, parent, subscribe);
+        }
+
+        protected override Selector? MovePrevious() => null;
+        protected override Selector? MovePreviousOrParent() => _parent;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
new file mode 100644
index 0000000000..1833f0d133
--- /dev/null
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Styling.Activators;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A selector that matches the common case of a type and/or name followed by a collection of
+    /// style classes and pseudoclasses.
+    /// </summary>
+    internal class TypeNameAndClassSelector : Selector
+    {
+        private readonly Selector? _previous;
+        private readonly Lazy<List<string>> _classes = new Lazy<List<string>>(() => new List<string>());
+        private Type? _targetType;
+        private string? _selectorString;
+
+        public static TypeNameAndClassSelector OfType(Selector? previous, Type targetType)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result._targetType = targetType;
+            result.IsConcreteType = true;
+
+            return result;
+        }
+
+        public static TypeNameAndClassSelector Is(Selector? previous, Type targetType)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result._targetType = targetType;
+            result.IsConcreteType = false;
+
+            return result;
+        }
+
+        public static TypeNameAndClassSelector ForName(Selector? previous, string name)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result.Name = name;
+
+            return result;
+        }
+
+        public static TypeNameAndClassSelector ForClass(Selector? previous, string className)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result.Classes.Add(className);
+
+            return result;
+        }
+
+        protected TypeNameAndClassSelector(Selector? previous)
+        {
+            _previous = previous;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _previous?.InTemplate ?? false;
+
+        /// <summary>
+        /// Gets the name of the control to match.
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <inheritdoc/>
+        public override Type? TargetType => _targetType ?? _previous?.TargetType;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <summary>
+        /// Whether the selector matches the concrete <see cref="TargetType"/> or any object which
+        /// implements <see cref="TargetType"/>.
+        /// </summary>
+        public bool IsConcreteType { get; private set; }
+
+        /// <summary>
+        /// The style classes which the selector matches.
+        /// </summary>
+        public IList<string> Classes => _classes.Value;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = BuildSelectorString();
+            }
+
+            return _selectorString;
+        }
+
+        /// <inheritdoc/>
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (TargetType != null)
+            {
+                var controlType = control.StyleKey ?? control.GetType();
+
+                if (IsConcreteType)
+                {
+                    if (controlType != TargetType)
+                    {
+                        return SelectorMatch.NeverThisType;
+                    }
+                }
+                else
+                {
+                    if (!TargetType.IsAssignableFrom(controlType))
+                    {
+                        return SelectorMatch.NeverThisType;
+                    }
+                }
+            }
+
+            if (Name != null && control.Name != Name)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+
+            if (_classes.IsValueCreated && _classes.Value.Count > 0)
+            {
+                if (subscribe)
+                {
+                    var observable = new StyleClassActivator((Classes)control.Classes, _classes.Value);
+
+                    return new SelectorMatch(observable);
+                }
+
+                if (!StyleClassActivator.AreClassesMatching(control.Classes, Classes))
+                {
+                    return SelectorMatch.NeverThisInstance;
+                }
+            }
+
+            return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
+
+        private string BuildSelectorString()
+        {
+            var builder = StringBuilderCache.Acquire();
+
+            if (_previous != null)
+            {
+                builder.Append(_previous.ToString());
+            }
+
+            if (TargetType != null)
+            {
+                if (IsConcreteType)
+                {
+                    builder.Append(TargetType.Name);
+                }
+                else
+                {
+                    builder.Append(":is(");
+                    builder.Append(TargetType.Name);
+                    builder.Append(")");
+                }
+            }
+
+            if (Name != null)
+            {
+                builder.Append('#');
+                builder.Append(Name);
+            }
+
+            if (_classes.IsValueCreated && _classes.Value.Count > 0)
+            {
+                foreach (var c in Classes)
+                {
+                    if (!c.StartsWith(":"))
+                    {
+                        builder.Append('.');
+                    }
+
+                    builder.Append(c);
+                }
+            }
+
+            return StringBuilderCache.GetStringAndRelease(builder);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Thickness.cs b/src/Avalonia.Base/Thickness.cs
similarity index 100%
rename from src/Avalonia.Visuals/Thickness.cs
rename to src/Avalonia.Base/Thickness.cs
diff --git a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
index 397826df53..6423d86e7c 100644
--- a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Threading
                     {
                         composite.Add(action(this, state));
                     }
-                }, DispatcherPriority.DataBind);
+                }, DispatcherPriority.Background);
 
                 composite.Add(cancellation);
 
diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
index 21649306cb..2cade55f32 100644
--- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Threading
         /// <inheritdoc/>
         public override void Post(SendOrPostCallback d, object? state)
         {
-           Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Background);
+           Dispatcher.UIThread.Post(d, state, DispatcherPriority.Background);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index 49cee441d0..571f782813 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -83,42 +83,42 @@ namespace Avalonia.Threading
             _jobRunner.HasJobsWithPriority(minimumPriority);
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Action action, DispatcherPriority priority = default)
         {
             _ = action ?? throw new ArgumentNullException(nameof(action));
             return _jobRunner.InvokeAsync(action, priority);
         }
 
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = default)
         {
             _ = function ?? throw new ArgumentNullException(nameof(function));
             return _jobRunner.InvokeAsync(function, priority);
         }
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority = default)
         {
             _ = function ?? throw new ArgumentNullException(nameof(function));
             return _jobRunner.InvokeAsync(function, priority).Unwrap();
         }
 
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = default)
         {
             _ = function ?? throw new ArgumentNullException(nameof(function));
             return _jobRunner.InvokeAsync(function, priority).Unwrap();
         }
 
         /// <inheritdoc/>
-        public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(Action action, DispatcherPriority priority = default)
         {
             _ = action ?? throw new ArgumentNullException(nameof(action));
             _jobRunner.Post(action, priority);
         }
 
         /// <inheritdoc/>
-        public void Post<T>(Action<T> action, T arg, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(SendOrPostCallback action, object? arg, DispatcherPriority priority = default)
         {
             _ = action ?? throw new ArgumentNullException(nameof(action));
             _jobRunner.Post(action, arg, priority);
diff --git a/src/Avalonia.Base/Threading/DispatcherPriority.cs b/src/Avalonia.Base/Threading/DispatcherPriority.cs
index a2b4b86bac..f041590fc0 100644
--- a/src/Avalonia.Base/Threading/DispatcherPriority.cs
+++ b/src/Avalonia.Base/Threading/DispatcherPriority.cs
@@ -1,74 +1,126 @@
+using System;
+
 namespace Avalonia.Threading
 {
     /// <summary>
     /// Defines the priorities with which jobs can be invoked on a <see cref="Dispatcher"/>.
     /// </summary>
-    // TODO: These are copied from WPF - many won't apply to Avalonia.
-    public enum DispatcherPriority
+    public readonly struct DispatcherPriority : IEquatable<DispatcherPriority>, IComparable<DispatcherPriority>
     {
+        /// <summary>
+        /// The integer value of the priority
+        /// </summary>
+        public int Value { get; }
+
+        private DispatcherPriority(int value)
+        {
+            Value = value;
+        }
+
         /// <summary>
         /// Minimum possible priority
         /// </summary>
-        MinValue = 1,
-        
+        public static readonly DispatcherPriority MinValue = new(0);
+
         /// <summary>
         /// The job will be processed when the system is idle.
         /// </summary>
-        SystemIdle = 1,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority SystemIdle = MinValue;
 
         /// <summary>
         /// The job will be processed when the application is idle.
         /// </summary>
-        ApplicationIdle = 2,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority ApplicationIdle = MinValue;
 
         /// <summary>
         /// The job will be processed after background operations have completed.
         /// </summary>
-        ContextIdle = 3,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority ContextIdle = MinValue;
+
+        /// <summary>
+        /// The job will be processed with normal priority.
+        /// </summary>
+        public static readonly DispatcherPriority Normal = MinValue;
 
         /// <summary>
         /// The job will be processed after other non-idle operations have completed.
         /// </summary>
-        Background = 4,
+        public static readonly DispatcherPriority Background = new(1);
 
         /// <summary>
         /// The job will be processed with the same priority as input.
         /// </summary>
-        Input = 5,
+        public static readonly DispatcherPriority Input = new(2);
 
         /// <summary>
         /// The job will be processed after layout and render but before input.
         /// </summary>
-        Loaded = 6,
-
+        public static readonly DispatcherPriority Loaded = new(3);
+        
         /// <summary>
         /// The job will be processed with the same priority as render.
         /// </summary>
-        Render = 7,
+        public static readonly DispatcherPriority Render = new(5);
         
         /// <summary>
-        /// The job will be processed with the same priority as render.
+        /// The job will be processed with the same priority as composition updates.
         /// </summary>
-        Layout = 8,
+        public static readonly DispatcherPriority Composition = new(6);
         
         /// <summary>
-        /// The job will be processed with the same priority as data binding.
+        /// The job will be processed with the same priority as render.
         /// </summary>
-        DataBind = 9,
+        public static readonly DispatcherPriority Layout = new(7);
 
         /// <summary>
-        /// The job will be processed with normal priority.
+        /// The job will be processed with the same priority as data binding.
         /// </summary>
-        Normal = 10,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority DataBind = MinValue;
 
         /// <summary>
         /// The job will be processed before other asynchronous operations.
         /// </summary>
-        Send = 11,
-        
+        public static readonly DispatcherPriority Send = new(8);
+
         /// <summary>
         /// Maximum possible priority
         /// </summary>
-        MaxValue = 11
+        public static readonly DispatcherPriority MaxValue = Send;
+
+        // Note: unlike ctor this one is validating
+        public static DispatcherPriority FromValue(int value)
+        {
+            if (value < MinValue.Value || value > MaxValue.Value)
+                throw new ArgumentOutOfRangeException(nameof(value));
+            return new DispatcherPriority(value);
+        }
+
+        public static implicit operator int(DispatcherPriority priority) => priority.Value;
+
+        public static implicit operator DispatcherPriority(int value) => FromValue(value);
+
+        /// <inheritdoc />
+        public bool Equals(DispatcherPriority other) => Value == other.Value;
+
+        /// <inheritdoc />
+        public override bool Equals(object? obj) => obj is DispatcherPriority other && Equals(other);
+
+        /// <inheritdoc />
+        public override int GetHashCode() => Value.GetHashCode();
+
+        public static bool operator ==(DispatcherPriority left, DispatcherPriority right) => left.Value == right.Value;
+
+        public static bool operator !=(DispatcherPriority left, DispatcherPriority right) => left.Value != right.Value;
+
+        public static bool operator <(DispatcherPriority left, DispatcherPriority right) => left.Value < right.Value;
+
+        public static bool operator >(DispatcherPriority left, DispatcherPriority right) => left.Value > right.Value;
+
+        public static bool operator <=(DispatcherPriority left, DispatcherPriority right) => left.Value <= right.Value;
+
+        public static bool operator >=(DispatcherPriority left, DispatcherPriority right) => left.Value >= right.Value;
+
+        /// <inheritdoc />
+        public int CompareTo(DispatcherPriority other) => Value.CompareTo(other.Value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Threading/DispatcherTimer.cs b/src/Avalonia.Base/Threading/DispatcherTimer.cs
index 93023b90a5..0c25d89722 100644
--- a/src/Avalonia.Base/Threading/DispatcherTimer.cs
+++ b/src/Avalonia.Base/Threading/DispatcherTimer.cs
@@ -123,7 +123,7 @@ namespace Avalonia.Threading
         /// <param name="interval">The interval at which to tick.</param>
         /// <param name="priority">The priority to use.</param>
         /// <returns>An <see cref="IDisposable"/> used to cancel the timer.</returns>
-        public static IDisposable Run(Func<bool> action, TimeSpan interval, DispatcherPriority priority = DispatcherPriority.Normal)
+        public static IDisposable Run(Func<bool> action, TimeSpan interval, DispatcherPriority priority = default)
         {
             var timer = new DispatcherTimer(priority) { Interval = interval };
 
@@ -152,7 +152,7 @@ namespace Avalonia.Threading
         public static IDisposable RunOnce(
             Action action,
             TimeSpan interval,
-            DispatcherPriority priority = DispatcherPriority.Normal)
+            DispatcherPriority priority = default)
         {
             interval = (interval != TimeSpan.Zero) ? interval : TimeSpan.FromTicks(1);
             
diff --git a/src/Avalonia.Base/Threading/IDispatcher.cs b/src/Avalonia.Base/Threading/IDispatcher.cs
index cd5add70d4..1c700132b7 100644
--- a/src/Avalonia.Base/Threading/IDispatcher.cs
+++ b/src/Avalonia.Base/Threading/IDispatcher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Avalonia.Threading
@@ -24,16 +25,15 @@ namespace Avalonia.Threading
         /// </summary>
         /// <param name="action">The method.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
-        void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
+        void Post(Action action, DispatcherPriority priority = default);
 
         /// <summary>
         /// Posts an action that will be invoked on the dispatcher thread.
         /// </summary>
-        /// <typeparam name="T">type of argument</typeparam>
-        /// <param name="action">The method to call.</param>
+        /// <param name="action">The method.</param>
         /// <param name="arg">The argument of method to call.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
-        void Post<T>(Action<T> action, T arg, DispatcherPriority priority = DispatcherPriority.Normal);
+        void Post(SendOrPostCallback action, object? arg, DispatcherPriority priority = default);
 
         /// <summary>
         /// Invokes a action on the dispatcher thread.
@@ -41,24 +41,7 @@ namespace Avalonia.Threading
         /// <param name="action">The method.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
         /// <returns>A task that can be used to track the method's execution.</returns>
-        Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
-
-        /// <summary>
-        /// Invokes a method on the dispatcher thread.
-        /// </summary>
-        /// <param name="function">The method.</param>
-        /// <param name="priority">The priority with which to invoke the method.</param>
-        /// <returns>A task that can be used to track the method's execution.</returns>
-        Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = DispatcherPriority.Normal);
-
-        /// <summary>
-        /// Queues the specified work to run on the dispatcher thread and returns a proxy for the
-        /// task returned by <paramref name="function"/>.
-        /// </summary>
-        /// <param name="function">The work to execute asynchronously.</param>
-        /// <param name="priority">The priority with which to invoke the method.</param>
-        /// <returns>A task that represents a proxy for the task returned by <paramref name="function"/>.</returns>
-        Task InvokeAsync(Func<Task> function, DispatcherPriority priority = DispatcherPriority.Normal);
+        Task InvokeAsync(Action action, DispatcherPriority priority = default);
 
         /// <summary>
         /// Queues the specified work to run on the dispatcher thread and returns a proxy for the
@@ -67,6 +50,6 @@ namespace Avalonia.Threading
         /// <param name="function">The work to execute asynchronously.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
         /// <returns>A task that represents a proxy for the task returned by <paramref name="function"/>.</returns>
-        Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = DispatcherPriority.Normal);
+        Task InvokeAsync(Func<Task> function, DispatcherPriority priority = default);
     }
 }
diff --git a/src/Avalonia.Base/Threading/JobRunner.cs b/src/Avalonia.Base/Threading/JobRunner.cs
index 4b304d44f6..ced3423c27 100644
--- a/src/Avalonia.Base/Threading/JobRunner.cs
+++ b/src/Avalonia.Base/Threading/JobRunner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Platform;
 
@@ -81,9 +82,9 @@ namespace Avalonia.Threading
         /// <param name="action">The method to call.</param>
         /// <param name="parameter">The parameter of method to call.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
-        internal void Post<T>(Action<T> action, T parameter, DispatcherPriority priority)
+        internal void Post(SendOrPostCallback action, object? parameter, DispatcherPriority priority)
         {
-            AddJob(new Job<T>(action, parameter, priority, true));
+            AddJob(new JobWithArg(action, parameter, priority, true));
         }
 
         /// <summary>
@@ -207,11 +208,10 @@ namespace Avalonia.Threading
         /// <summary>
         /// A typed job to run.
         /// </summary>
-        /// <typeparam name="T">Type of job parameter</typeparam>
-        private sealed class Job<T> : IJob
+        private sealed class JobWithArg : IJob
         {
-            private readonly Action<T> _action;
-            private readonly T _parameter;
+            private readonly SendOrPostCallback _action;
+            private readonly object? _parameter;
             private readonly TaskCompletionSource<bool>? _taskCompletionSource;
 
             /// <summary>
@@ -222,7 +222,7 @@ namespace Avalonia.Threading
             /// <param name="priority">The job priority.</param>
             /// <param name="throwOnUiThread">Do not wrap exception in TaskCompletionSource</param>
 
-            public Job(Action<T> action, T parameter, DispatcherPriority priority, bool throwOnUiThread)
+            public JobWithArg(SendOrPostCallback action, object? parameter, DispatcherPriority priority, bool throwOnUiThread)
             {
                 _action = action;
                 _parameter = parameter;
diff --git a/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs b/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs
index c6845485dc..827a02334a 100644
--- a/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs
+++ b/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs
@@ -5,12 +5,11 @@ namespace Avalonia.Threading
     public class ThreadSafeObjectPool<T> where T : class, new()
     {
         private Stack<T> _stack = new Stack<T>();
-        private object _lock = new object();
         public static ThreadSafeObjectPool<T> Default { get; } = new ThreadSafeObjectPool<T>();
 
         public T Get()
         {
-            lock (_lock)
+            lock (_stack)
             {
                 if(_stack.Count == 0)
                     return new T();
diff --git a/src/Avalonia.Base/Utilities/ArrayBuilder.cs b/src/Avalonia.Base/Utilities/ArrayBuilder.cs
new file mode 100644
index 0000000000..60bf2c7586
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/ArrayBuilder.cs
@@ -0,0 +1,184 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// A helper type for avoiding allocations while building arrays.
+    /// </summary>
+    /// <typeparam name="T">The type of item contained in the array.</typeparam>
+    internal struct ArrayBuilder<T>
+        where T : struct
+    {
+        private const int DefaultCapacity = 4;
+        private const int MaxCoreClrArrayLength = 0x7FeFFFFF;
+
+        // Starts out null, initialized on first Add.
+        private T[] _data;
+        private int _size;
+
+        /// <summary>
+        /// Gets or sets the number of items in the array.
+        /// </summary>
+        public int Length
+        {
+            get => _size;
+
+            set
+            {
+                if (value == _size)
+                {
+                    return;
+                }
+
+                if (value > 0)
+                {
+                    EnsureCapacity(value);
+
+                    _size = value;
+                }
+                else
+                {
+                    _size = 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a reference to specified element of the array.
+        /// </summary>
+        /// <param name="index">The index of the element to return.</param>
+        /// <returns>The <typeparamref name="T"/>.</returns>
+        /// <exception cref="IndexOutOfRangeException">
+        /// Thrown when index less than 0 or index greater than or equal to <see cref="Length"/>.
+        /// </exception>
+        public ref T this[int index]
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+#if DEBUG
+                if (index.CompareTo(0) < 0 || index.CompareTo(_size) > 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                }
+#endif
+
+                return ref _data![index];
+            }
+        }
+
+        /// <summary>
+        /// Appends a given number of empty items to the array returning
+        /// the items as a slice.
+        /// </summary>
+        /// <param name="length">The number of items in the slice.</param>
+        /// <param name="clear">Whether to clear the new slice, Defaults to <see langword="true"/>.</param>
+        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
+        public ArraySlice<T> Add(int length, bool clear = true)
+        {
+            var position = _size;
+
+            // Expand the array.
+            Length += length;
+
+            var slice = AsSlice(position, Length - position);
+
+            if (clear)
+            {
+                slice.Span.Clear();
+            }
+
+            return slice;
+        }
+
+        /// <summary>
+        /// Appends the slice to the array copying the data across.
+        /// </summary>
+        /// <param name="value">The array slice.</param>
+        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
+        public ArraySlice<T> Add(in ArraySlice<T> value)
+        {
+            var position = _size;
+
+            // Expand the array.
+            Length += value.Length;
+
+            var slice = AsSlice(position, Length - position);
+
+            value.Span.CopyTo(slice.Span);
+
+            return slice;
+        }
+
+        /// <summary>
+        /// Clears the array.
+        /// Allocated memory is left intact for future usage.
+        /// </summary>
+        public void Clear()
+        {
+            // No need to actually clear since we're not allowing reference types.
+            _size = 0;
+        }
+
+        private void EnsureCapacity(int min)
+        {
+            var length = _data?.Length ?? 0;
+
+            if (length >= min)
+            {
+                return;
+            }
+
+            // Same expansion algorithm as List<T>.
+            var newCapacity = length == 0 ? DefaultCapacity : (uint)length * 2u;
+
+            if (newCapacity > MaxCoreClrArrayLength)
+            {
+                newCapacity = MaxCoreClrArrayLength;
+            }
+
+            if (newCapacity < min)
+            {
+                newCapacity = (uint)min;
+            }
+
+            var array = new T[newCapacity];
+
+            if (_size > 0)
+            {
+                Array.Copy(_data!, array, _size);
+            }
+
+            _data = array;
+        }
+
+        /// <summary>
+        /// Returns the current state of the array as a slice.
+        /// </summary>
+        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public ArraySlice<T> AsSlice() => AsSlice(Length);
+
+        /// <summary>
+        /// Returns the current state of the array as a slice.
+        /// </summary>
+        /// <param name="length">The number of items in the slice.</param>
+        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public ArraySlice<T> AsSlice(int length) => new ArraySlice<T>(_data!, 0, length);
+
+        /// <summary>
+        /// Returns the current state of the array as a slice.
+        /// </summary>
+        /// <param name="start">The index at which to begin the slice.</param>
+        /// <param name="length">The number of items in the slice.</param>
+        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public ArraySlice<T> AsSlice(int start, int length) => new ArraySlice<T>(_data!, start, length);
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/ArraySlice.cs b/src/Avalonia.Base/Utilities/ArraySlice.cs
new file mode 100644
index 0000000000..482f807fe0
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/ArraySlice.cs
@@ -0,0 +1,197 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// ArraySlice represents a contiguous region of arbitrary memory similar
+    /// to <see cref="Memory{T}"/> and <see cref="Span{T}"/> though constrained
+    /// to arrays.
+    /// Unlike <see cref="Span{T}"/>, it is not a byref-like type.
+    /// </summary>
+    /// <typeparam name="T">The type of item contained in the slice.</typeparam>
+    internal readonly struct ArraySlice<T> : IReadOnlyList<T>
+        where T : struct
+    {
+        /// <summary>
+        /// Gets an empty <see cref="ArraySlice{T}"/>
+        /// </summary>
+        public static ArraySlice<T> Empty => new ArraySlice<T>(Array.Empty<T>());
+
+        private readonly T[] _data;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArraySlice{T}"/> struct.
+        /// </summary>
+        /// <param name="data">The underlying data buffer.</param>
+        public ArraySlice(T[] data)
+            : this(data, 0, data.Length)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArraySlice{T}"/> struct.
+        /// </summary>
+        /// <param name="data">The underlying data buffer.</param>
+        /// <param name="start">The offset position in the underlying buffer this slice was created from.</param>
+        /// <param name="length">The number of items in the slice.</param>
+        public ArraySlice(T[] data, int start, int length)
+        {
+#if DEBUG
+            if (start.CompareTo(0) < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start));
+            }
+
+            if (length.CompareTo(data.Length) > 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            if ((start + length).CompareTo(data.Length) > 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(data));
+            }
+#endif
+
+            _data = data;
+            Start = start;
+            Length = length;
+        }
+
+
+        /// <summary>
+        ///     Gets a value that indicates whether this instance of <see cref="ArraySlice{T}"/> is Empty.
+        /// </summary>
+        public bool IsEmpty => Length == 0;
+
+        /// <summary>
+        /// Gets the offset position in the underlying buffer this slice was created from.
+        /// </summary>
+        public int Start { get; }
+
+        /// <summary>
+        /// Gets the number of items in the slice.
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Gets a <see cref="Span{T}"/> representing this slice.
+        /// </summary>
+        public Span<T> Span => new Span<T>(_data, Start, Length);
+
+        /// <summary>
+        /// Returns a reference to specified element of the slice.
+        /// </summary>
+        /// <param name="index">The index of the element to return.</param>
+        /// <returns>The <typeparamref name="T"/>.</returns>
+        /// <exception cref="IndexOutOfRangeException">
+        /// Thrown when index less than 0 or index greater than or equal to <see cref="Length"/>.
+        /// </exception>
+        public ref T this[int index]
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+#if DEBUG
+                if (index.CompareTo(0) < 0 || index.CompareTo(Length) > 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                }
+#endif
+                var i = index + Start;
+
+                return ref _data[i];
+            }
+        }
+
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="ArraySlice{T}"/> to a <see cref="ReadOnlySlice{T}"/>
+        /// </summary>
+        public static implicit operator ReadOnlySlice<T>(ArraySlice<T> slice)
+        {
+            return new ReadOnlySlice<T>(slice._data, 0, slice.Length, slice.Start);
+        }
+
+        /// <summary>
+        /// Defines an implicit conversion of an array to a <see cref="ArraySlice{T}"/>
+        /// </summary>
+        public static implicit operator ArraySlice<T>(T[] array) => new ArraySlice<T>(array, 0, array.Length);
+
+        /// <summary>
+        /// Fills the contents of this slice with the given value.
+        /// </summary>
+        public void Fill(T value) => Span.Fill(value);
+
+        /// <summary>
+        /// Forms a slice out of the given slice, beginning at 'start', of given length
+        /// </summary>
+        /// <param name="start">The index at which to begin this slice.</param>
+        /// <param name="length">The desired length for the slice (exclusive).</param>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// Thrown when the specified <paramref name="start"/> or end index is not in range (&lt;0 or &gt;Length).
+        /// </exception>
+        public ArraySlice<T> Slice(int start, int length) => new ArraySlice<T>(_data, start, length);
+
+        /// <summary>
+        ///     Returns a specified number of contiguous elements from the start of the slice.
+        /// </summary>
+        /// <param name="length">The number of elements to return.</param>
+        /// <returns>A <see cref="ArraySlice{T}"/> that contains the specified number of elements from the start of this slice.</returns>
+        public ArraySlice<T> Take(int length)
+        {
+            if (IsEmpty)
+            {
+                return this;
+            }
+
+            if (length > Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new ArraySlice<T>(_data, Start, length);
+        }
+
+        /// <summary>
+        ///     Bypasses a specified number of elements in the slice and then returns the remaining elements.
+        /// </summary>
+        /// <param name="length">The number of elements to skip before returning the remaining elements.</param>
+        /// <returns>A <see cref="ArraySlice{T}"/> that contains the elements that occur after the specified index in this slice.</returns>
+        public ArraySlice<T> Skip(int length)
+        {
+            if (IsEmpty)
+            {
+                return this;
+            }
+
+            if (length > Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new ArraySlice<T>(_data, Start + length, Length - length);
+        }
+
+        public ImmutableReadOnlyListStructEnumerator<T> GetEnumerator() =>
+            new ImmutableReadOnlyListStructEnumerator<T>(this);
+
+        /// <inheritdoc/>
+        IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
+
+        /// <inheritdoc/>
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        /// <inheritdoc/>
+        T IReadOnlyList<T>.this[int index] => this[index];
+
+        /// <inheritdoc/>
+        int IReadOnlyCollection<T>.Count => Length;
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs b/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
index 09e408cb42..b8692bb771 100644
--- a/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
+++ b/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
-using System.Runtime.Serialization.Json;
 using System.Xml.Linq;
 using System.Linq;
 
@@ -23,7 +21,7 @@ namespace Avalonia.Utilities
 
             var assetDoc = XDocument.Load(stream);
             XNamespace assetNs = assetDoc.Root!.Attribute("xmlns")!.Value;
-            List<AvaloniaResourcesIndexEntry> entries=         
+            List<AvaloniaResourcesIndexEntry> entries =         
                 (from entry in assetDoc.Root.Element(assetNs + "Entries")!.Elements(assetNs + "AvaloniaResourcesIndexEntry")
                     select new AvaloniaResourcesIndexEntry
                     {
diff --git a/src/Avalonia.Base/Utilities/BidiDictionary.cs b/src/Avalonia.Base/Utilities/BidiDictionary.cs
new file mode 100644
index 0000000000..654fbc9807
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/BidiDictionary.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// A simple bi-directional dictionary.
+    /// </summary>
+    /// <typeparam name="T1">Key type</typeparam>
+    /// <typeparam name="T2">Value type</typeparam>
+    internal sealed class BidiDictionary<T1, T2> where T1 : notnull where T2 : notnull
+    {
+        public Dictionary<T1, T2> Forward { get; } = new Dictionary<T1, T2>();
+
+        public Dictionary<T2, T1> Reverse { get; } = new Dictionary<T2, T1>();
+
+        public void Clear()
+        {
+            Forward.Clear();
+            Reverse.Clear();
+        }
+
+        public void Add(T1 key, T2 value)
+        {
+            Forward.Add(key, value);
+            Reverse.Add(value, key);
+        }
+
+#pragma warning disable CS8601
+        public bool TryGetValue(T1 key, out T2 value) => Forward.TryGetValue(key, out value);
+#pragma warning restore CS8601
+
+#pragma warning disable CS8601
+        public bool TryGetKey(T2 value, out T1 key) => Reverse.TryGetValue(value, out key);
+#pragma warning restore CS8601
+
+        public bool ContainsKey(T1 key) => Forward.ContainsKey(key);
+
+        public bool ContainsValue(T2 value) => Reverse.ContainsKey(value);
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/BinarySearchExtension.cs b/src/Avalonia.Base/Utilities/BinarySearchExtension.cs
new file mode 100644
index 0000000000..b7060d2e21
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/BinarySearchExtension.cs
@@ -0,0 +1,80 @@
+// RichTextKit
+// Copyright © 2019-2020 Topten Software. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may 
+// not use this product except in compliance with the License. You may obtain 
+// a copy of the License at
+// 
+// https://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+// License for the specific language governing permissions and limitations 
+// under the License.
+// Copied from: https://github.com/toptensoftware/RichTextKit
+
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// Extension methods for binary searching an IReadOnlyList collection
+    /// </summary>
+    internal static class BinarySearchExtension
+    {
+        private static int GetMedian(int low, int hi)
+        {
+            System.Diagnostics.Debug.Assert(low <= hi);
+            System.Diagnostics.Debug.Assert(hi - low >= 0, "Length overflow!");
+            return low + (hi - low >> 1);
+        }
+
+        /// <summary>
+        /// Performs a binary search on the entire contents of an IReadOnlyList
+        /// </summary>
+        /// <typeparam name="T">The list element type</typeparam>
+        /// <param name="list">The list to be searched</param>
+        /// <param name="value">The value to search for</param>
+        /// <param name="comparer">The comparer</param>
+        /// <returns>The index of the found item; otherwise the bitwise complement of the index of the next larger item</returns>
+        public static int BinarySearch<T>(this IReadOnlyList<T> list, T value, IComparer<T> comparer) where T : IComparable
+        {
+            return list.BinarySearch(0, list.Count, value, comparer);
+        }
+
+        /// <summary>
+        /// Performs a binary search on a a subset of an IReadOnlyList
+        /// </summary>
+        /// <typeparam name="T">The list element type</typeparam>
+        /// <param name="list">The list to be searched</param>
+        /// <param name="index">The start of the range to be searched</param>
+        /// <param name="length">The length of the range to be searched</param>
+        /// <param name="value">The value to search for</param>
+        /// <param name="comparer">A comparer</param>
+        /// <returns>The index of the found item; otherwise the bitwise complement of the index of the next larger item</returns>
+        public static int BinarySearch<T>(this IReadOnlyList<T> list, int index, int length, T value, IComparer<T> comparer)
+        {
+            // Based on this: https://referencesource.microsoft.com/#mscorlib/system/array.cs,957
+            var lo = index;
+            var hi = index + length - 1;
+            while (lo <= hi)
+            {
+                var i = GetMedian(lo, hi);
+                var c = comparer.Compare(list[i], value);
+                if (c == 0)
+                    return i;
+                if (c < 0)
+                {
+                    lo = i + 1;
+                }
+                else
+                {
+                    hi = i - 1;
+                }
+            }
+            return ~lo;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/ByteSizeHelper.cs b/src/Avalonia.Base/Utilities/ByteSizeHelper.cs
new file mode 100644
index 0000000000..edaf94231b
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/ByteSizeHelper.cs
@@ -0,0 +1,41 @@
+using System;
+
+namespace Avalonia.Utilities
+{
+    internal static class ByteSizeHelper
+    {
+        private const string formatTemplateSeparated = "{0}{1:0.#} {2}";
+        private const string formatTemplate = "{0}{1:0.#}{2}";
+
+        private static readonly string[] Prefixes =
+        {
+            "B",
+            "KB",
+            "MB",
+            "GB",
+            "TB",
+            "PB",
+            "EB",
+            "ZB",
+            "YB" 
+        };
+
+        public static string ToString(ulong bytes, bool separate)
+        {
+            if (bytes == 0)
+            {
+                return string.Format(separate ? formatTemplateSeparated : formatTemplate, null, 0, Prefixes[0]);
+            }
+
+            var absSize = Math.Abs((double)bytes);
+            var fpPower = Math.Log(absSize, 1000);
+            var intPower = (int)fpPower;
+            var iUnit = intPower >= Prefixes.Length
+                ? Prefixes.Length - 1
+                : intPower;
+            var normSize = absSize / Math.Pow(1000, iUnit);
+
+            return string.Format(formatTemplate,bytes < 0 ? "-" : null, normSize, Prefixes[iUnit]);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/EnumHelper.cs b/src/Avalonia.Base/Utilities/EnumHelper.cs
new file mode 100644
index 0000000000..c857033ef1
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/EnumHelper.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Avalonia.Utilities
+{
+    internal class EnumHelper
+    {
+#if NET6_0_OR_GREATER
+        public static T Parse<T>(ReadOnlySpan<char> key, bool ignoreCase) where T : struct
+        {
+            return Enum.Parse<T>(key, ignoreCase);
+        }
+#else
+        public static T Parse<T>(string key, bool ignoreCase) where T : struct
+        {
+            return (T)Enum.Parse(typeof(T), key, ignoreCase);
+        }
+#endif
+    }
+}
diff --git a/src/Avalonia.Visuals/Utilities/FrugalList.cs b/src/Avalonia.Base/Utilities/FrugalList.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/FrugalList.cs
rename to src/Avalonia.Base/Utilities/FrugalList.cs
diff --git a/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs b/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs
deleted file mode 100644
index 6a8df91b81..0000000000
--- a/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// A visitor to resolve an untyped <see cref="AvaloniaProperty"/> to a typed property.
-    /// </summary>
-    /// <typeparam name="TData">The type of user data passed.</typeparam>
-    /// <remarks>
-    /// Pass an instance that implements this interface to
-    /// <see cref="AvaloniaProperty.Accept{TData}(IAvaloniaPropertyVisitor{TData}, ref TData)"/>
-    /// in order to resolve un untyped <see cref="AvaloniaProperty"/> to a typed
-    /// <see cref="StyledPropertyBase{TValue}"/> or <see cref="DirectPropertyBase{TValue}"/>.
-    /// </remarks>
-    public interface IAvaloniaPropertyVisitor<TData>
-        where TData : struct
-    {
-        /// <summary>
-        /// Called when the property is a styled property.
-        /// </summary>
-        /// <typeparam name="T">The property value type.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="data">The user data.</param>
-        void Visit<T>(StyledPropertyBase<T> property, ref TData data);
-
-        /// <summary>
-        /// Called when the property is a direct property.
-        /// </summary>
-        /// <typeparam name="T">The property value type.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="data">The user data.</param>
-        void Visit<T>(DirectPropertyBase<T> property, ref TData data);
-    }
-}
diff --git a/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
index e48c0cb111..6cf8c605a7 100644
--- a/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
+++ b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
@@ -9,4 +9,31 @@ namespace Avalonia.Utilities;
 public interface IWeakEventSubscriber<in TEventArgs> where TEventArgs : EventArgs
 {
     void OnEvent(object? sender, WeakEvent ev, TEventArgs e);
-}
\ No newline at end of file
+}
+
+public sealed class WeakEventSubscriber<TEventArgs> : IWeakEventSubscriber<TEventArgs> where TEventArgs : EventArgs 
+{
+    public event Action<object?, WeakEvent, TEventArgs>? Event;
+
+    void IWeakEventSubscriber<TEventArgs>.OnEvent(object? sender, WeakEvent ev, TEventArgs e)
+    {
+        Event?.Invoke(sender, ev, e);
+    }
+}
+
+public sealed class TargetWeakEventSubscriber<TTarget, TEventArgs> : IWeakEventSubscriber<TEventArgs> where TEventArgs : EventArgs
+{
+    private readonly TTarget _target;
+    private readonly Action<TTarget, object?, WeakEvent, TEventArgs> _dispatchFunc;
+
+    public TargetWeakEventSubscriber(TTarget target, Action<TTarget, object?, WeakEvent, TEventArgs> dispatchFunc)
+    {
+        _target = target;
+        _dispatchFunc = dispatchFunc;
+    }
+
+    void IWeakEventSubscriber<TEventArgs>.OnEvent(object? sender, WeakEvent ev, TEventArgs e)
+    {
+        _dispatchFunc(_target, sender, ev, e);
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/IWeakSubscriber.cs b/src/Avalonia.Base/Utilities/IWeakSubscriber.cs
index 613c931165..2a5b8d39c5 100644
--- a/src/Avalonia.Base/Utilities/IWeakSubscriber.cs
+++ b/src/Avalonia.Base/Utilities/IWeakSubscriber.cs
@@ -3,7 +3,7 @@ using System;
 namespace Avalonia.Utilities
 {
     /// <summary>
-    /// Defines a listener to a event subscribed vis the <see cref="WeakSubscriptionManager"/>.
+    /// Defines a listener to a event subscribed vis the <see cref="WeakObservable"/>.
     /// </summary>
     /// <typeparam name="T">The type of the event arguments.</typeparam>
     public interface IWeakSubscriber<T> where T : EventArgs
diff --git a/src/Avalonia.Base/Utilities/IdentifierParser.cs b/src/Avalonia.Base/Utilities/IdentifierParser.cs
index b105d0746b..76e6459e2e 100644
--- a/src/Avalonia.Base/Utilities/IdentifierParser.cs
+++ b/src/Avalonia.Base/Utilities/IdentifierParser.cs
@@ -8,7 +8,11 @@ namespace Avalonia.Utilities
 #endif
     static class IdentifierParser
     {
-        public static ReadOnlySpan<char> ParseIdentifier(this ref CharacterReader r)
+        public static ReadOnlySpan<char> ParseIdentifier(this
+#if NET7SDK
+            scoped
+#endif
+            ref CharacterReader r)
         {
             if (IsValidIdentifierStart(r.Peek))
             {
diff --git a/src/Avalonia.Visuals/Utilities/MappedArraySlice.cs b/src/Avalonia.Base/Utilities/MappedArraySlice.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/MappedArraySlice.cs
rename to src/Avalonia.Base/Utilities/MappedArraySlice.cs
diff --git a/src/Avalonia.Base/Utilities/MathUtilities.cs b/src/Avalonia.Base/Utilities/MathUtilities.cs
index 596cbf1d7e..feb1097b5f 100644
--- a/src/Avalonia.Base/Utilities/MathUtilities.cs
+++ b/src/Avalonia.Base/Utilities/MathUtilities.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Utilities
     static class MathUtilities
     {
         // smallest such that 1.0+DoubleEpsilon != 1.0
-        internal static readonly double DoubleEpsilon = 2.2204460492503131e-016;
+        internal const double DoubleEpsilon = 2.2204460492503131e-016;
 
         private const float FloatEpsilon = 1.192092896e-07F;
 
@@ -251,6 +251,20 @@ namespace Avalonia.Utilities
                 return val;
             }
         }
+        
+        /// <summary>
+        /// Clamps a value between a minimum and maximum value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>The clamped value.</returns>
+        public static float Clamp(float value, float min, float max)
+        {
+            var amax = Math.Max(min, max);
+            var amin = Math.Min(min, max);
+            return Math.Min(Math.Max(value, amin), amax);
+        }
 
         /// <summary>
         /// Clamps a value between a minimum and maximum value.
@@ -310,6 +324,41 @@ namespace Avalonia.Utilities
             return angle * 2 * Math.PI;
         }
 
+        /// <summary>
+        /// Calculates the point of an angle on an ellipse.
+        /// </summary>
+        /// <param name="centre">The centre point of the ellipse.</param>
+        /// <param name="radiusX">The x radius of the ellipse.</param>
+        /// <param name="radiusY">The y radius of the ellipse.</param>
+        /// <param name="angle">The angle in radians.</param>
+        /// <returns>A point on the ellipse.</returns>
+        public static Point GetEllipsePoint(Point centre, double radiusX, double radiusY, double angle)
+        {
+            return new Point(radiusX * Math.Cos(angle) + centre.X, radiusY * Math.Sin(angle) + centre.Y);
+        }
+
+        /// <summary>
+        /// Gets the minimum and maximum from the specified numbers.
+        /// </summary>
+        /// <param name="a">The first number.</param>
+        /// <param name="b">The second number.</param>
+        /// <returns>A tuple containing the minimum and maximum of the two specified numbers.</returns>
+        public static (double min, double max) GetMinMax(double a, double b)
+        {
+            return a < b ? (a, b) : (b, a);
+        }
+
+        /// <summary>
+        /// Gets the minimum and maximum from the specified number and the difference with that number.
+        /// </summary>
+        /// <param name="initialValue">The initial value to use.</param>
+        /// <param name="delta">The difference for <paramref name="initialValue"/>.</param>
+        /// <returns>A tuple containing the minimum and maximum of the specified number and the difference with that number.</returns>
+        public static (double min, double max) GetMinMaxFromDelta(double initialValue, double delta)
+        {
+            return GetMinMax(initialValue, initialValue + delta);
+        }
+
         private static void ThrowCannotBeGreaterThanException<T>(T min, T max)
         {
             throw new ArgumentException($"{min} cannot be greater than {max}.");
diff --git a/src/Avalonia.Base/Utilities/ReadOnlySlice.cs b/src/Avalonia.Base/Utilities/ReadOnlySlice.cs
new file mode 100644
index 0000000000..583a3139b9
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/ReadOnlySlice.cs
@@ -0,0 +1,239 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    ///     ReadOnlySlice enables the ability to work with a sequence within a region of memory and retains the position in within that region.
+    /// </summary>
+    /// <typeparam name="T">The type of elements in the slice.</typeparam>
+    [DebuggerTypeProxy(typeof(ReadOnlySlice<>.ReadOnlySliceDebugView))]
+    public readonly struct ReadOnlySlice<T> : IReadOnlyList<T> where T : struct
+    {
+        private readonly int _bufferOffset;
+        
+        /// <summary>
+        /// Gets an empty <see cref="ReadOnlySlice{T}"/>
+        /// </summary>
+        public static ReadOnlySlice<T> Empty => new ReadOnlySlice<T>(Array.Empty<T>());
+        
+        private readonly ReadOnlyMemory<T> _buffer;
+
+        public ReadOnlySlice(ReadOnlyMemory<T> buffer) : this(buffer, 0, buffer.Length) { }
+
+        public ReadOnlySlice(ReadOnlyMemory<T> buffer, int start, int length, int bufferOffset = 0)
+        {
+#if DEBUG
+            if (start.CompareTo(0) < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof (start));
+            }
+
+            if (length.CompareTo(buffer.Length) > 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof (length));
+            }
+#endif
+            
+            _buffer = buffer;
+            Start = start;
+            Length = length;
+            _bufferOffset = bufferOffset;
+        }
+
+        /// <summary>
+        ///     Gets the start.
+        /// </summary>
+        /// <value>
+        ///     The start.
+        /// </value>
+        public int Start { get; }
+
+        /// <summary>
+        ///     Gets the end.
+        /// </summary>
+        /// <value>
+        ///     The end.
+        /// </value>
+        public int End => Start + Length - 1;
+
+        /// <summary>
+        ///     Gets the length.
+        /// </summary>
+        /// <value>
+        ///     The length.
+        /// </value>
+        public int Length { get; }
+
+        /// <summary>
+        ///     Gets a value that indicates whether this instance of <see cref="ReadOnlySlice{T}"/> is Empty.
+        /// </summary>
+        public bool IsEmpty => Length == 0;
+
+        /// <summary>
+        ///     Get the underlying span.
+        /// </summary>
+        public ReadOnlySpan<T> Span => _buffer.Span.Slice(_bufferOffset, Length);
+
+        /// <summary>
+        ///     Get the buffer offset.
+        /// </summary>
+        public int BufferOffset => _bufferOffset;
+        
+        /// <summary>
+        ///     Get the underlying buffer.
+        /// </summary>
+        public ReadOnlyMemory<T> Buffer => _buffer;
+
+        /// <summary>
+        /// Returns a value to specified element of the slice.
+        /// </summary>
+        /// <param name="index">The index of the element to return.</param>
+        /// <returns>The <typeparamref name="T"/>.</returns>
+        /// <exception cref="IndexOutOfRangeException">
+        /// Thrown when index less than 0 or index greater than or equal to <see cref="Length"/>.
+        /// </exception>
+        public T this[int index]
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+#if DEBUG
+                if (index.CompareTo(0) < 0 || index.CompareTo(Length) > 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof (index));
+                }
+#endif
+                return Span[index];
+            }
+        }
+        
+        /// <summary>
+        ///     Returns a sub slice of elements that start at the specified index and has the specified number of elements.
+        /// </summary>
+        /// <param name="start">The start of the sub slice.</param>
+        /// <param name="length">The length of the sub slice.</param>
+        /// <returns>A <see cref="ReadOnlySlice{T}"/> that contains the specified number of elements from the specified start.</returns>
+        public ReadOnlySlice<T> AsSlice(int start, int length)
+        {
+            if (IsEmpty)
+            {
+                return this;
+            }
+
+            if (length == 0)
+            {
+                return Empty;
+            }
+
+            if (start < 0 || _bufferOffset + start > _buffer.Length - 1)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start));
+            }
+
+            if (_bufferOffset + start + length > _buffer.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new ReadOnlySlice<T>(_buffer, start, length, _bufferOffset);
+        }
+
+        /// <summary>
+        ///     Returns a specified number of contiguous elements from the start of the slice.
+        /// </summary>
+        /// <param name="length">The number of elements to return.</param>
+        /// <returns>A <see cref="ReadOnlySlice{T}"/> that contains the specified number of elements from the start of this slice.</returns>
+        public ReadOnlySlice<T> Take(int length)
+        {
+            if (IsEmpty)
+            {
+                return this;
+            }
+
+            if (length > Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new ReadOnlySlice<T>(_buffer, Start, length, _bufferOffset);
+        }
+
+        /// <summary>
+        ///     Bypasses a specified number of elements in the slice and then returns the remaining elements.
+        /// </summary>
+        /// <param name="length">The number of elements to skip before returning the remaining elements.</param>
+        /// <returns>A <see cref="ReadOnlySlice{T}"/> that contains the elements that occur after the specified index in this slice.</returns>
+        public ReadOnlySlice<T> Skip(int length)
+        {
+            if (IsEmpty)
+            {
+                return this;
+            }
+
+            if (length > Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new ReadOnlySlice<T>(_buffer, Start + length, Length - length, _bufferOffset + length);
+        }
+
+        /// <summary>
+        /// Returns an enumerator for the slice.
+        /// </summary>
+        public ImmutableReadOnlyListStructEnumerator<T> GetEnumerator()
+        {
+            return new ImmutableReadOnlyListStructEnumerator<T>(this);
+        }
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        int IReadOnlyCollection<T>.Count => Length;
+
+        T IReadOnlyList<T>.this[int index] => this[index];
+
+        public static implicit operator ReadOnlySlice<T>(T[] array)
+        {
+            return new ReadOnlySlice<T>(array);
+        }
+
+        public static implicit operator ReadOnlySlice<T>(ReadOnlyMemory<T> memory)
+        {
+            return new ReadOnlySlice<T>(memory);
+        }
+
+        public static implicit operator ReadOnlySpan<T>(ReadOnlySlice<T> slice) => slice.Span;
+
+        internal class ReadOnlySliceDebugView
+        {
+            private readonly ReadOnlySlice<T> _readOnlySlice;
+
+            public ReadOnlySliceDebugView(ReadOnlySlice<T> readOnlySlice)
+            {
+                _readOnlySlice = readOnlySlice;
+            }
+
+            public int Start => _readOnlySlice.Start;
+
+            public int End => _readOnlySlice.End;
+
+            public int Length => _readOnlySlice.Length;
+
+            public bool IsEmpty => _readOnlySlice.IsEmpty;
+
+            public ReadOnlySpan<T> Items => _readOnlySlice.Span;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
index 7209f02720..95a1c23883 100644
--- a/src/Avalonia.Base/Utilities/Ref.cs
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -159,7 +159,7 @@ namespace Avalonia.Utilities
 
             ~Ref()
             {
-                _counter?.Release();
+                Dispose();
             }
 
             public T Item
diff --git a/src/Avalonia.Base/Utilities/RefTrackingDictionary.cs b/src/Avalonia.Base/Utilities/RefTrackingDictionary.cs
new file mode 100644
index 0000000000..9400e37f21
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/RefTrackingDictionary.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Utilities;
+
+/// <summary>
+/// Maintains a set of objects with reference counts
+/// </summary>
+internal class RefTrackingDictionary<TKey> : Dictionary<TKey, int> where TKey : class
+{
+    /// <summary>
+    /// Increase reference count for a key by 1.
+    /// </summary>
+    /// <returns>true if key was added to the dictionary, false otherwise</returns>
+    public bool AddRef(TKey key)
+    {
+#if NET5_0_OR_GREATER
+        ref var count = ref CollectionsMarshal.GetValueRefOrAddDefault(this, key, out var _);
+        count++;
+#else
+        TryGetValue(key, out var count);
+        count++;
+        this[key] = count;
+#endif
+        return count == 1;
+    }
+
+    /// <summary>
+    /// Decrease reference count for a key by 1.
+    /// </summary>
+    /// <returns>true if key was removed to the dictionary, false otherwise</returns>
+    public bool ReleaseRef(TKey key)
+    {
+#if NET5_0_OR_GREATER
+        ref var count = ref CollectionsMarshal.GetValueRefOrNullRef(this, key);
+        if (Unsafe.IsNullRef(ref count))
+#if DEBUG
+            throw new InvalidOperationException("Attempting to release a non-referenced object");
+#else
+            return false;
+#endif // DEBUG
+        count--;
+        if (count == 0)
+        {
+            Remove(key);
+            return true;
+        }
+
+        return false;
+#else
+        if (!TryGetValue(key, out var count))
+#if DEBUG
+            throw new InvalidOperationException("Attempting to release a non-referenced object");
+#else
+            return false;
+#endif // DEBUG
+        count--;
+        if (count == 0)
+        {
+            Remove(key);
+            return true;
+        }
+
+        this[key] = count;
+        return false;
+#endif
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/SafeEnumerableList.cs b/src/Avalonia.Base/Utilities/SafeEnumerableList.cs
new file mode 100644
index 0000000000..dd437d27be
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/SafeEnumerableList.cs
@@ -0,0 +1,89 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// Implements a simple list which is safe to modify during enumeration.
+    /// </summary>
+    /// <typeparam name="T">The item type.</typeparam>
+    /// <remarks>
+    /// Implements a list which, when written to while enumerating, performs a copy of the list
+    /// items. Note this this class doesn't actually implement <see cref="IList{T}"/> as it's not
+    /// currently needed - feel free to add missing methods etc.
+    /// </remarks>
+    internal class SafeEnumerableList<T> : IEnumerable<T>
+    {
+        private List<T> _list = new();
+        private int _generation;
+        private int _enumCount = 0;
+
+        public int Count => _list.Count;
+        internal List<T> Inner => _list;
+
+        public void Add(T item) => GetList().Add(item);
+        public bool Remove(T item) => GetList().Remove(item);
+
+        public Enumerator GetEnumerator() => new(this, _list);
+        IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        
+        private List<T> GetList()
+        {
+            if (_enumCount > 0)
+            {
+                _list = new(_list);
+                ++_generation;
+                _enumCount = 0;
+            }
+
+            return _list;
+        }
+
+        public struct Enumerator : IEnumerator<T>, IEnumerator
+        {
+            private readonly SafeEnumerableList<T> _owner;
+            private readonly List<T> _list;
+            private readonly int _generation;
+            private int _index;
+            private T? _current;
+
+            internal Enumerator(SafeEnumerableList<T> owner, List<T> list)
+            {
+                _owner = owner;
+                _list = list;
+                _generation = owner._generation;
+                _index = 0;
+                _current = default;
+                ++_owner._enumCount;
+            }
+
+            public void Dispose()
+            {
+                if (_owner._generation == _generation)
+                    --_owner._enumCount;
+            }
+
+            public bool MoveNext()
+            {
+                if (_index < _list.Count)
+                {
+                    _current = _list[_index++];
+                    return true;
+                }
+
+                _current = default;
+                return false;
+            }
+
+            public T Current => _current!;
+            object? IEnumerator.Current => _current;
+
+            void IEnumerator.Reset()
+            {
+                _index = 0;
+                _current = default;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/SmallDictionary.cs b/src/Avalonia.Base/Utilities/SmallDictionary.cs
new file mode 100644
index 0000000000..7d6a21c136
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/SmallDictionary.cs
@@ -0,0 +1,278 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Avalonia.Utilities;
+
+public struct InlineDictionary<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>> where TKey : class where TValue : class
+{
+    object? _data;
+    TValue? _value;
+
+    void SetCore(TKey key, TValue value, bool overwrite)
+    {
+        if (key == null)
+            throw new ArgumentNullException();
+        if (_data == null)
+        {
+            _data = key;
+            _value = value;
+        } 
+        else if (_data is KeyValuePair<TKey?, TValue?>[] arr)
+        {
+            var free = -1;
+            for (var c = 0; c < arr.Length; c++)
+            {
+                if (arr[c].Key == key)
+                {
+                    if (overwrite)
+                    {
+                        arr[c] = new(key, value);
+                        return;
+                    }
+                    else
+                        throw new ArgumentException("Key already exists in dictionary");
+                }
+
+                if (arr[c].Key == null)
+                    free = c;
+            }
+
+            if (free != -1)
+            {
+                arr[free] = new KeyValuePair<TKey?, TValue?>(key, value);
+                return;
+            }
+
+            // Upgrade to dictionary
+            var newDic = new Dictionary<TKey, TValue?>();
+            foreach (var kvp in arr)
+                newDic.Add(kvp.Key!, kvp.Value!);
+            newDic.Add(key, value);
+            _data = newDic;
+        }
+        else if (_data is Dictionary<TKey, TValue?> dic)
+        {
+            if (overwrite)
+                dic[key] = value;
+            else
+                dic.Add(key, value);
+        }
+        else
+        {
+            // We have a single element, upgrade to array
+            arr = new KeyValuePair<TKey?, TValue?>[6];
+            arr[0] = new KeyValuePair<TKey?, TValue?>((TKey)_data, _value);
+            arr[1] = new KeyValuePair<TKey?, TValue?>(key, value);
+            _data = arr;
+            _value = null;
+        }
+    }
+    
+    public void Add(TKey key, TValue value) => SetCore(key, value, false);
+    public void Set(TKey key, TValue value) => SetCore(key, value, true);
+
+    public TValue this[TKey key]
+    {
+        get
+        {
+            if (TryGetValue(key, out var rv))
+                return rv;
+            throw new KeyNotFoundException();
+        }
+        set => Set(key, value);
+    }
+
+    public bool Remove(TKey key)
+    {
+        if (_data == key)
+        {
+            _data = null;
+            _value = null;
+            return true;
+        } 
+        else if (_data is KeyValuePair<TKey?, TValue?>[] arr)
+        {
+            for (var c = 0; c < arr.Length; c++)
+            {
+                if (arr[c].Key == key)
+                {
+                    arr[c] = default;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        else if (_data is Dictionary<TKey, TValue?> dic)
+            return dic.Remove(key);
+
+        return false;
+    }
+
+    public bool TryGetValue(TKey key, [MaybeNullWhen(false)]out TValue value)
+    {
+        if (_data == key)
+        {
+            value = _value!;
+            return true;
+        } 
+        else if (_data is KeyValuePair<TKey?, TValue?>[] arr)
+        {
+            for (var c = 0; c < arr.Length; c++)
+            {
+                if (arr[c].Key == key)
+                {
+                    value = arr[c].Value!;
+                    return true;
+                }
+            }
+
+            value = null;
+            return false;
+        }
+        else if (_data is Dictionary<TKey, TValue?> dic)
+            return dic.TryGetValue(key, out value);
+
+        value = null;
+        return false;
+    }
+    
+    
+    public bool TryGetAndRemoveValue(TKey key, [MaybeNullWhen(false)]out TValue value)
+    {
+        if (_data == key)
+        {
+            value = _value!;
+            _value = null;
+            _data = null;
+            return true;
+        } 
+        else if (_data is KeyValuePair<TKey?, TValue?>[] arr)
+        {
+            for (var c = 0; c < arr.Length; c++)
+            {
+                if (arr[c].Key == key)
+                {
+                    value = arr[c].Value!;
+                    arr[c] = default;
+                    return true;
+                }
+            }
+
+            value = null;
+            return false;
+        }
+        else if (_data is Dictionary<TKey, TValue?> dic)
+        {
+            if (!dic.TryGetValue(key, out value))
+                return false;
+            dic.Remove(key);
+        }
+
+        value = null;
+        return false;
+    }
+
+    public TValue GetAndRemove(TKey key)
+    {
+        if (TryGetAndRemoveValue(key, out var v))
+            return v;
+        throw new KeyNotFoundException();
+    }
+
+    public struct Enumerator : IEnumerator<KeyValuePair<TKey, TValue>>
+    {
+        private Dictionary<TKey, TValue>.Enumerator _inner;
+        private readonly KeyValuePair<TKey?, TValue?>[]? _arr;
+        private KeyValuePair<TKey, TValue> _first;
+        private int _index;
+        private Type _type;
+        enum Type
+        {
+            Empty, Single, Array, Dictionary
+        }
+
+        public Enumerator(InlineDictionary<TKey, TValue> parent)
+        {
+            _arr = null;
+            _first = default;
+            _index = -1;
+            _inner = default;
+            if (parent._data is Dictionary<TKey, TValue> inner)
+            {
+                _inner = inner.GetEnumerator();
+                _type = Type.Dictionary;
+            }
+            else if (parent._data is KeyValuePair<TKey?, TValue?>[] arr)
+            {
+                _type = Type.Array;
+                _arr = arr;
+            }
+            else if (parent._data != null)
+            {
+                _type = Type.Single;
+                _first = new((TKey)parent._data!, parent._value!);
+            }
+            else
+                _type = Type.Empty;
+
+        }
+
+        public bool MoveNext()
+        {
+            if (_type == Type.Single)
+            {
+                if (_index != -1)
+                    return false;
+                _index = 0;
+            }
+            else if (_type == Type.Array)
+            {
+                var next = _index + 1;
+                if (_arr!.Length - 1 < next || _arr[next].Key == null)
+                    return false;
+                _index = next;
+                return true;
+            }
+            else if (_type == Type.Dictionary)
+                return _inner.MoveNext();
+
+            return false;
+        }
+
+        public void Reset()
+        {
+            _index = -1;
+            if(_type == Type.Dictionary)
+                ((IEnumerator)_inner).Reset();
+        }
+
+        public KeyValuePair<TKey, TValue> Current
+        {
+            get
+            {
+                if (_type == Type.Single)
+                    return _first!;
+                if (_type == Type.Array)
+                    return _arr![_index]!;
+                if (_type == Type.Dictionary)
+                    return _inner.Current;
+                throw new InvalidOperationException();
+            }
+        }
+
+        object IEnumerator.Current => Current;
+
+        public void Dispose()
+        {
+        }
+    }
+
+    public Enumerator GetEnumerator() => new Enumerator(this);
+
+    IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() => GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+}
diff --git a/src/Avalonia.Visuals/Utilities/Span.cs b/src/Avalonia.Base/Utilities/Span.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/Span.cs
rename to src/Avalonia.Base/Utilities/Span.cs
diff --git a/src/Avalonia.Base/Utilities/SpanHelpers.cs b/src/Avalonia.Base/Utilities/SpanHelpers.cs
new file mode 100644
index 0000000000..9a5dce9798
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/SpanHelpers.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Utilities
+{
+    public static class SpanHelpers
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool TryParseUInt(this ReadOnlySpan<char> span, NumberStyles style, IFormatProvider provider, out uint value)
+        {
+#if NETSTANDARD2_0
+            return uint.TryParse(span.ToString(), style, provider, out value);
+#else
+            return uint.TryParse(span, style, provider, out value);
+#endif
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool TryParseInt(this ReadOnlySpan<char> span, out int value)
+        {
+#if NETSTANDARD2_0
+            return int.TryParse(span.ToString(), out value);
+#else
+            return int.TryParse(span, out value);
+#endif
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool TryParseDouble(this ReadOnlySpan<char> span, NumberStyles style, IFormatProvider provider, out double value)
+        {
+#if NETSTANDARD2_0
+            return double.TryParse(span.ToString(), style, provider, out value);
+#else
+            return double.TryParse(span, style, provider, out value);
+#endif
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool TryParseByte(this ReadOnlySpan<char> span, NumberStyles style, IFormatProvider provider, out byte value)
+        {
+#if NETSTANDARD2_0
+            return byte.TryParse(span.ToString(), style, provider, out value);
+#else
+            return byte.TryParse(span, style, provider, out value);
+#endif
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/SpringSolver.cs b/src/Avalonia.Base/Utilities/SpringSolver.cs
new file mode 100644
index 0000000000..ead73e9b1b
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/SpringSolver.cs
@@ -0,0 +1,121 @@
+// Ported from:
+// https://svn.webkit.org/repository/webkit/trunk/Source/WebCore/platform/graphics/SpringSolver.h
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+
+namespace Avalonia.Utilities;
+
+internal struct SpringSolver 
+{
+    private double m_w0;
+    private double m_zeta;
+    private double m_wd;
+    private double m_A;
+    private double m_B;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="period">The time period.</param>
+    /// <param name="zeta">The damping ratio.</param>
+    /// <param name="initialVelocity"></param>
+    public SpringSolver(TimeSpan period, double zeta, double initialVelocity) 
+        : this(
+            2 * Math.PI / period.TotalSeconds, 
+            zeta, 
+            initialVelocity)
+    {
+        // T is time period [s]
+        // T = (2*PI / sqrt(k)) * sqrt(m)
+
+        // ωn is natural frequency of the system [Hz] [1/s]
+        // ωn = 2*PI / T
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="m">The mass of the oscillating body.</param>
+    /// <param name="k">The stiffness of the oscillated body (spring constant).</param>
+    /// <param name="c">The actual damping.</param>
+    /// <param name="initialVelocity">The initial velocity.</param>
+    public SpringSolver(double m, double k, double c, double initialVelocity)
+        : this(
+            Math.Sqrt(k / m), // ωn
+            c / (2 * Math.Sqrt(k * m)), // c / Cc
+            initialVelocity)
+    {
+        // ωn is natural frequency of the system [Hz] [1/s]
+        // ωn = sqrt(k / m)
+
+        // Cc is critical damping coefficient
+        // Cc = 2 * Sqrt(k * m)
+        // Cc = 2 * m * wn
+        // Cc = 2 * m * Sqrt(k / m)
+
+        // ζ is damping ratio (Greek letter zeta)
+        // ζ = m_zeta = c / Cc
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="ωn">The the natural frequency of the system [rad/s].</param>
+    /// <param name="zeta">The damping ratio.</param>
+    /// <param name="initialVelocity"></param>
+    public SpringSolver(double ωn, double zeta, double initialVelocity)
+    {
+        m_w0 = ωn;
+        m_zeta = zeta;
+
+        if (m_zeta < 1) {
+            // Under-damped.
+            m_wd = m_w0 * Math.Sqrt(1 - m_zeta * m_zeta);
+            m_A = 1;
+            m_B = (m_zeta * m_w0 + -initialVelocity) / m_wd;
+        } else {
+            // Critically damped (ignoring over-damped case for now).
+            m_A = 1;
+            m_B = -initialVelocity + m_w0;
+            m_wd = 0;
+        }
+    }
+
+    public readonly double Solve(double t)
+    {
+        if (m_zeta < 1) {
+            // Under-damped
+            t = Math.Exp(-t * m_zeta * m_w0) * (m_A * Math.Cos(m_wd * t) + m_B * Math.Sin(m_wd * t));
+        } else {
+            // Critically damped (ignoring over-damped case for now).
+            t = (m_A + m_B * t) * Math.Exp(-t * m_w0);
+        }
+
+        // Map range from [1..0] to [0..1].
+        return 1 - t;
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/StringBuilderCache.cs b/src/Avalonia.Base/Utilities/StringBuilderCache.cs
new file mode 100644
index 0000000000..be8b24c848
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/StringBuilderCache.cs
@@ -0,0 +1,68 @@
+// This file is imported from dotnet/runtime
+// Source Link: https://github.com/dotnet/runtime/blob/e63d21947e734db2da5093510a6636b5b7fb45b5/src/libraries/Common/src/System/Text/StringBuilderCache.cs
+// Commit: a9c5ead on Feb 10, 2021, https://github.com/dotnet/runtime/commit/a9c5eadd951dcba73167f72cc624eb790573663a
+// 
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Text;
+
+namespace Avalonia.Utilities;
+
+// <summary>Provide a cached reusable instance of stringbuilder per thread.</summary>
+internal static class StringBuilderCache
+{
+    // The value 360 was chosen in discussion with performance experts as a compromise between using
+    // as little memory per thread as possible and still covering a large part of short-lived
+    // StringBuilder creations on the startup path of VS designers.
+    internal const int MaxBuilderSize = 360;
+    private const int DefaultCapacity = 16; // == StringBuilder.DefaultCapacity
+
+    // WARNING: We allow diagnostic tools to directly inspect this member (t_cachedInstance).
+    // See https://github.com/dotnet/corert/blob/master/Documentation/design-docs/diagnostics/diagnostics-tools-contract.md for more details.
+    // Please do not change the type, the name, or the semantic usage of this member without understanding the implication for tools.
+    // Get in touch with the diagnostics team if you have questions.
+    [ThreadStatic]
+    private static StringBuilder? t_cachedInstance;
+
+    /// <summary>Get a StringBuilder for the specified capacity.</summary>
+    /// <remarks>If a StringBuilder of an appropriate size is cached, it will be returned and the cache emptied.</remarks>
+    public static StringBuilder Acquire(int capacity = DefaultCapacity)
+    {
+        if (capacity <= MaxBuilderSize)
+        {
+            StringBuilder? sb = t_cachedInstance;
+            if (sb != null)
+            {
+                // Avoid stringbuilder block fragmentation by getting a new StringBuilder
+                // when the requested size is larger than the current capacity
+                if (capacity <= sb.Capacity)
+                {
+                    t_cachedInstance = null;
+                    sb.Clear();
+                    return sb;
+                }
+            }
+        }
+
+        return new StringBuilder(capacity);
+    }
+
+    /// <summary>Place the specified builder in the cache if it is not too big.</summary>
+    public static void Release(StringBuilder sb)
+    {
+        if (sb.Capacity <= MaxBuilderSize)
+        {
+            t_cachedInstance = sb;
+        }
+    }
+
+    /// <summary>ToString() the stringbuilder, Release it to the cache, and return the resulting string.</summary>
+    public static string GetStringAndRelease(StringBuilder sb)
+    {
+        string result = sb.ToString();
+        Release(sb);
+        return result;
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/UriExtensions.cs b/src/Avalonia.Base/Utilities/UriExtensions.cs
new file mode 100644
index 0000000000..c706f72a63
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/UriExtensions.cs
@@ -0,0 +1,70 @@
+using System;
+
+namespace Avalonia.Utilities;
+
+internal static class UriExtensions
+{
+    public static bool IsAbsoluteResm(this Uri uri) =>
+        uri.IsAbsoluteUri && uri.IsResm();
+
+    public static bool IsResm(this Uri uri) => uri.Scheme == "resm";
+    
+    public static bool IsAvares(this Uri uri) => uri.Scheme == "avares";
+    
+    public static Uri EnsureAbsolute(this Uri uri, Uri? baseUri)
+    {
+        if (uri.IsAbsoluteUri)
+            return uri;
+        if(baseUri == null)
+            throw new ArgumentException($"Relative uri {uri} without base url");
+        if (!baseUri.IsAbsoluteUri)
+            throw new ArgumentException($"Base uri {baseUri} is relative");
+        if (baseUri.IsResm())
+            throw new ArgumentException(
+                $"Relative uris for 'resm' scheme aren't supported; {baseUri} uses resm");
+        return new Uri(baseUri, uri);
+    }
+
+    public static string GetUnescapeAbsolutePath(this Uri uri) =>
+        Uri.UnescapeDataString(uri.AbsolutePath);
+
+    public static string GetUnescapeAbsoluteUri(this Uri uri) =>
+        Uri.UnescapeDataString(uri.AbsoluteUri);
+    
+    public static string GetAssemblyNameFromQuery(this Uri uri)
+    {
+        const string assembly = "assembly";
+
+        var query = Uri.UnescapeDataString(uri.Query);
+        
+        // Skip the '?'
+        var currentIndex = 1;
+        while (currentIndex < query.Length)
+        {
+            var isFind = false;
+            for (var i = 0; i < assembly.Length; ++currentIndex, ++i)
+                if (query[currentIndex] == assembly[i])
+                {
+                    isFind = i == assembly.Length - 1;
+                }
+                else
+                {
+                    break;
+                }
+
+            // Skip the '='
+            ++currentIndex;
+
+            var beginIndex = currentIndex;
+            while (currentIndex < query.Length && query[currentIndex] != '&')
+                ++currentIndex;
+
+            if (isFind)
+                return query.Substring(beginIndex, currentIndex - beginIndex);
+
+            ++currentIndex;
+        }
+
+        return "";
+    }
+}
diff --git a/src/Avalonia.Visuals/Utilities/ValueSpan.cs b/src/Avalonia.Base/Utilities/ValueSpan.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/ValueSpan.cs
rename to src/Avalonia.Base/Utilities/ValueSpan.cs
diff --git a/src/Avalonia.Base/Utilities/WeakEvent.cs b/src/Avalonia.Base/Utilities/WeakEvent.cs
index 0b32015a8a..e72606bf70 100644
--- a/src/Avalonia.Base/Utilities/WeakEvent.cs
+++ b/src/Avalonia.Base/Utilities/WeakEvent.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -36,7 +37,7 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
     {
         if (!_subscriptions.TryGetValue(target, out var subscription))
             _subscriptions.Add(target, subscription = new Subscription(this, target));
-        subscription.Add(new WeakReference<IWeakEventSubscriber<TEventArgs>>(subscriber));
+        subscription.Add(subscriber);
     }
 
     public void Unsubscribe(TSender target, IWeakEventSubscriber<TEventArgs> subscriber)
@@ -51,11 +52,59 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
         private readonly TSender _target;
         private readonly Action _compact;
 
-        private WeakReference<IWeakEventSubscriber<TEventArgs>>?[] _data =
-            new WeakReference<IWeakEventSubscriber<TEventArgs>>[16];
-        private int _count;
+        struct Entry
+        {
+            WeakReference<IWeakEventSubscriber<TEventArgs>>? _reference;
+            int _hashCode;
+
+            public Entry(IWeakEventSubscriber<TEventArgs> r)
+            {
+                if (r == null)
+                {
+                    _reference = null;
+                    _hashCode = 0;
+                    return;
+                }
+
+                _hashCode = r.GetHashCode();
+                _reference = new WeakReference<IWeakEventSubscriber<TEventArgs>>(r);
+            }
+
+            public bool IsEmpty
+            {
+                get
+                {
+                    if (_reference == null)
+                        return true;
+                    if (_reference.TryGetTarget(out _))
+                        return false;
+                    _reference = null;
+                    return true;
+                }
+            }
+
+            public bool TryGetTarget([MaybeNullWhen(false)]out IWeakEventSubscriber<TEventArgs> target)
+            {
+                if (_reference == null)
+                {
+                    target = null!;
+                    return false;
+                }
+                return _reference.TryGetTarget(out target);
+            }
+
+            public bool Equals(IWeakEventSubscriber<TEventArgs> r)
+            {
+                if (_reference == null || r.GetHashCode() != _hashCode)
+                    return false;
+                return _reference.TryGetTarget(out var target) && target == r;
+            }
+        }
+
         private readonly Action _unsubscribe;
+        private readonly WeakHashList<IWeakEventSubscriber<TEventArgs>> _list = new();
         private bool _compactScheduled;
+        private bool _destroyed;
 
         public Subscription(WeakEvent<TSender, TEventArgs> ev, TSender target)
         {
@@ -67,48 +116,27 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
 
         void Destroy()
         {
+            if(_destroyed)
+                return;
+            _destroyed = true;
             _unsubscribe();
             _ev._subscriptions.Remove(_target);
         }
 
-        public void Add(WeakReference<IWeakEventSubscriber<TEventArgs>> s)
-        {
-            if (_count == _data.Length)
-            {
-                //Extend capacity
-                var extendedData = new WeakReference<IWeakEventSubscriber<TEventArgs>>?[_data.Length * 2];
-                Array.Copy(_data, extendedData, _data.Length);
-                _data = extendedData;
-            }
-
-            _data[_count] = s;
-            _count++;
-        }
+        public void Add(IWeakEventSubscriber<TEventArgs> s) => _list.Add(s);
 
         public void Remove(IWeakEventSubscriber<TEventArgs> s)
         {
-            var removed = false;
-
-            for (int c = 0; c < _count; ++c)
-            {
-                var reference = _data[c];
-
-                if (reference != null && reference.TryGetTarget(out var instance) && instance == s)
-                {
-                    _data[c] = null;
-                    removed = true;
-                }
-            }
-
-            if (removed)
-            {
+            _list.Remove(s);
+            if(_list.IsEmpty)
+                Destroy();
+            else if(_list.NeedCompact && _compactScheduled)
                 ScheduleCompact();
-            }
         }
 
         void ScheduleCompact()
         {
-            if(_compactScheduled)
+            if(_compactScheduled || _destroyed)
                 return;
             _compactScheduled = true;
             Dispatcher.UIThread.Post(_compact, DispatcherPriority.Background);
@@ -116,43 +144,27 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
         
         void Compact()
         {
+            if(!_compactScheduled)
+                return;
             _compactScheduled = false;
-            int empty = -1;
-            for (var c = 0; c < _count; c++)
-            {
-                var r = _data[c];
-                //Mark current index as first empty
-                if (r == null && empty == -1)
-                    empty = c;
-                //If current element isn't null and we have an empty one
-                if (r != null && empty != -1)
-                {
-                    _data[c] = null;
-                    _data[empty] = r;
-                    empty++;
-                }
-            }
-
-            if (empty != -1)
-                _count = empty;
-            if (_count == 0)
+            _list.Compact();
+            if (_list.IsEmpty)
                 Destroy();
         }
 
         void OnEvent(object? sender, TEventArgs eventArgs)
         {
-            var needCompact = false;
-            for (var c = 0; c < _count; c++)
+            var alive = _list.GetAlive();
+            if(alive == null)
+                Destroy();
+            else
             {
-                var r = _data[c];
-                if (r?.TryGetTarget(out var sub) == true)
-                    sub!.OnEvent(_target, _ev, eventArgs);
-                else
-                    needCompact = true;
+                foreach(var item in alive.Span)
+                    item.OnEvent(_target, _ev, eventArgs);
+                WeakHashList<IWeakEventSubscriber<TEventArgs>>.ReturnToSharedPool(alive);
+                if(_list.NeedCompact && !_compactScheduled)
+                    ScheduleCompact();
             }
-
-            if (needCompact)
-                ScheduleCompact();
         }
     }
 
diff --git a/src/Avalonia.Base/Utilities/WeakEvents.cs b/src/Avalonia.Base/Utilities/WeakEvents.cs
index d1b5e7f12d..6da899bab2 100644
--- a/src/Avalonia.Base/Utilities/WeakEvents.cs
+++ b/src/Avalonia.Base/Utilities/WeakEvents.cs
@@ -31,10 +31,23 @@ public class WeakEvents
                 return () => s.PropertyChanged -= handler;
             });
 
+
+    /// <summary>
+    /// Represents PropertyChanged event from <see cref="AvaloniaObject"/>
+    /// </summary>
+    public static readonly WeakEvent<AvaloniaObject, AvaloniaPropertyChangedEventArgs>
+        AvaloniaPropertyChanged = WeakEvent.Register<AvaloniaObject, AvaloniaPropertyChangedEventArgs>(
+            (s, h) =>
+            {
+                EventHandler<AvaloniaPropertyChangedEventArgs> handler = (_, e) => h(s, e);
+                s.PropertyChanged += handler;
+                return () => s.PropertyChanged -= handler;
+            });
+
     /// <summary>
     /// Represents CanExecuteChanged event from <see cref="ICommand"/>
     /// </summary>
     public static readonly WeakEvent<ICommand, EventArgs> CommandCanExecuteChanged =
         WeakEvent.Register<ICommand>((s, h) => s.CanExecuteChanged += h,
             (s, h) => s.CanExecuteChanged -= h);
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Utilities/WeakHashList.cs b/src/Avalonia.Base/Utilities/WeakHashList.cs
new file mode 100644
index 0000000000..fe582e8a78
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/WeakHashList.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections.Pooled;
+
+namespace Avalonia.Utilities;
+
+internal class WeakHashList<T> where T : class
+{
+    public const int DefaultArraySize = 8;
+    
+    private struct Key
+    {
+        public WeakReference<T>? Weak;
+        public T? Strong;
+        public int HashCode;
+
+        public static Key MakeStrong(T r) => new()
+        {
+            HashCode = r.GetHashCode(),
+            Strong = r
+        };
+
+        public static Key MakeWeak(T r) => new()
+        {
+            HashCode = r.GetHashCode(),
+            Weak = new WeakReference<T>(r)
+        };
+
+        public override int GetHashCode() => HashCode;
+    }
+
+    class KeyComparer : IEqualityComparer<Key>
+    {
+        public bool Equals(Key x, Key y)
+        {
+            if (x.HashCode != y.HashCode)
+                return false;
+            if (x.Strong != null)
+            {
+                if (y.Strong != null)
+                    return x.Strong == y.Strong;
+                if (y.Weak == null)
+                    return false;
+                return y.Weak.TryGetTarget(out var weakTarget) && weakTarget == x.Strong;
+            }
+            else if (y.Strong != null)
+            {
+                if (x.Weak == null)
+                    return false;
+                return x.Weak.TryGetTarget(out var weakTarget) && weakTarget == y.Strong;
+            }
+            else
+            {
+                if (x.Weak == null || x.Weak.TryGetTarget(out var xTarget) == false)
+                    return y.Weak?.TryGetTarget(out _) != true;
+                return y.Weak?.TryGetTarget(out var yTarget) == true && xTarget == yTarget;
+            }
+        }
+
+        public int GetHashCode(Key obj) => obj.HashCode;
+        public static KeyComparer Instance = new();
+    }
+
+    Dictionary<Key, int>? _dic;
+    WeakReference<T>?[]? _arr;
+    int _arrCount;
+    
+    public bool IsEmpty => _dic is not null ? _dic.Count == 0 : _arrCount == 0;
+
+    public bool NeedCompact { get; private set; }
+    
+    public void Add(T item)
+    {
+        if (_dic != null)
+        {
+            var strongKey = Key.MakeStrong(item);
+            if (_dic.TryGetValue(strongKey, out var cnt))
+                _dic[strongKey] = cnt + 1;
+            else
+                _dic[Key.MakeWeak(item)] = 1;
+            return;
+        }
+
+        if (_arr == null)
+            _arr = new WeakReference<T>[DefaultArraySize];
+
+        if (_arrCount < _arr.Length)
+        {
+            _arr[_arrCount] = new WeakReference<T>(item);
+            _arrCount++;
+            return;
+        }
+
+        // Check if something is dead
+        for (var c = 0; c < _arrCount; c++)
+        {
+            if (_arr[c]!.TryGetTarget(out _) == false)
+            {
+                _arr[c] = new WeakReference<T>(item);
+                return;
+            }
+        }
+
+        _dic = new Dictionary<Key, int>(KeyComparer.Instance);
+        foreach (var existing in _arr)
+        {
+            if (existing!.TryGetTarget(out var target))
+                Add(target);
+        }
+        
+        Add(item);
+
+        _arr = null;
+        _arrCount = 0;
+    }
+
+    public void Remove(T item)
+    {
+        if (_arr != null)
+        {
+            for (var c = 0; c < _arrCount; c++)
+            {
+                if (_arr[c]?.TryGetTarget(out var target) == true && target == item)
+                {
+                    _arr[c] = null;
+                    ArrCompact();
+                    return;
+                }
+            }
+        }
+        else if (_dic != null)
+        {
+            var strongKey = Key.MakeStrong(item);
+            
+            if (_dic.TryGetValue(strongKey, out var cnt))
+            {
+                if (cnt > 1)
+                {
+                    _dic[strongKey] = cnt - 1;
+                    return;
+                }
+            }
+
+            _dic.Remove(strongKey);
+        }
+    }
+
+    private void ArrCompact()
+    {
+        if (_arr != null)
+        {
+            int empty = -1;
+            for (var c = 0; c < _arrCount; c++)
+            {
+                var r = _arr[c];
+                //Mark current index as first empty
+                if (r == null && empty == -1)
+                    empty = c;
+                //If current element isn't null and we have an empty one
+                if (r != null && empty != -1)
+                {
+                    _arr[c] = null;
+                    _arr[empty] = r;
+                    empty++;
+                }
+            }
+
+            if (empty != -1)
+                _arrCount = empty;
+        }
+    }
+    
+    public void Compact()
+    {
+        if (_dic != null)
+        {
+            PooledList<Key>? toRemove = null;
+            foreach (var kvp in _dic)
+            {
+                if (kvp.Key.Weak?.TryGetTarget(out _) != true)
+                    (toRemove ??= new PooledList<Key>()).Add(kvp.Key);
+            }
+
+            if (toRemove != null)
+            {
+                foreach (var k in toRemove)
+                    _dic.Remove(k);
+                toRemove.Dispose();
+            }
+        }
+    }
+
+    private static readonly Stack<PooledList<T>> s_listPool = new();
+
+    public static void ReturnToSharedPool(PooledList<T> list)
+    {
+        list.Clear();
+        s_listPool.Push(list);
+    }
+    
+    public PooledList<T>? GetAlive(Func<PooledList<T>>? factory = null)
+    {
+        PooledList<T>? pooled = null;
+        if (_arr != null)
+        {
+            bool needCompact = false;
+            for (var c = 0; c < _arrCount; c++)
+            {
+                if (_arr[c]?.TryGetTarget(out var target) == true)
+                    (pooled ??= factory?.Invoke()
+                                ?? (s_listPool.Count > 0
+                                    ? s_listPool.Pop()
+                                    : new PooledList<T>())).Add(target!);
+                else
+                {
+                    _arr[c] = null;
+                    needCompact = true;
+                }
+            }
+            if(needCompact)
+                ArrCompact();
+            return pooled;
+        }
+        if (_dic != null)
+        {
+            foreach (var kvp in _dic)
+            {
+                if (kvp.Key.Weak?.TryGetTarget(out var target) == true)
+                    (pooled ??= factory?.Invoke()
+                                ?? (s_listPool.Count > 0
+                                    ? s_listPool.Pop()
+                                    : new PooledList<T>()))
+                        .Add(target!);
+                else
+                    NeedCompact = true;
+            }
+        }
+
+        return pooled;
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/WeakObservable.cs b/src/Avalonia.Base/Utilities/WeakObservable.cs
index 6bf1d4082f..e1c350d539 100644
--- a/src/Avalonia.Base/Utilities/WeakObservable.cs
+++ b/src/Avalonia.Base/Utilities/WeakObservable.cs
@@ -9,31 +9,6 @@ namespace Avalonia.Utilities
     /// </summary>
     public static class WeakObservable
     {
-        /// <summary>
-        /// Converts a .NET event conforming to the standard .NET event pattern into an observable
-        /// sequence, subscribing weakly.
-        /// </summary>
-        /// <typeparam name="TTarget">The type of target.</typeparam>
-        /// <typeparam name="TEventArgs">The type of the event args.</typeparam>
-        /// <param name="target">Object instance that exposes the event to convert.</param>
-        /// <param name="eventName">Name of the event to convert.</param>
-        /// <returns></returns>
-        [Obsolete("Use WeakEvent-based overload")]
-        public static IObservable<EventPattern<object, TEventArgs>> FromEventPattern<TTarget, TEventArgs>(
-            TTarget target, 
-            string eventName)
-            where TEventArgs : EventArgs
-        {
-            _ = target ?? throw new ArgumentNullException(nameof(target));
-            _ = eventName ?? throw new ArgumentNullException(nameof(eventName));
-
-            return Observable.Create<EventPattern<object, TEventArgs>>(observer =>
-            {
-                var handler = new Handler<TEventArgs>(observer);
-                WeakSubscriptionManager.Subscribe(target, eventName, handler);
-                return () => WeakSubscriptionManager.Unsubscribe(target, eventName, handler);
-            }).Publish().RefCount();
-        }
 
         private class Handler<TEventArgs> 
             : IWeakSubscriber<TEventArgs>,
diff --git a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
deleted file mode 100644
index dc9e86cc32..0000000000
--- a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// Manages subscriptions to events using weak listeners.
-    /// </summary>
-    public static class WeakSubscriptionManager
-    {
-        /// <summary>
-        /// Subscribes to an event on an object using a weak subscription.
-        /// </summary>
-        /// <typeparam name="TTarget">The type of the target.</typeparam>
-        /// <typeparam name="TEventArgs">The type of the event arguments.</typeparam>
-        /// <param name="target">The event source.</param>
-        /// <param name="eventName">The name of the event.</param>
-        /// <param name="subscriber">The subscriber.</param>
-        [Obsolete("Use WeakEvent")]
-        public static void Subscribe<TTarget, TEventArgs>(TTarget target, string eventName, IWeakSubscriber<TEventArgs> subscriber)
-            where TEventArgs : EventArgs
-        {
-            _ = target ?? throw new ArgumentNullException(nameof(target));
-
-            var dic = SubscriptionTypeStorage<TEventArgs>.Subscribers.GetOrCreateValue(target);
-
-            if (!dic.TryGetValue(eventName, out var sub))
-            {
-                dic[eventName] = sub = new Subscription<TEventArgs>(dic, typeof(TTarget), target, eventName);
-            }
-
-            sub.Add(new WeakReference<IWeakSubscriber<TEventArgs>>(subscriber));
-        }
-
-        /// <summary>
-        /// Unsubscribes from an event.
-        /// </summary>
-        /// <typeparam name="T">The type of the event arguments.</typeparam>
-        /// <param name="target">The event source.</param>
-        /// <param name="eventName">The name of the event.</param>
-        /// <param name="subscriber">The subscriber.</param>
-        public static void Unsubscribe<T>(object target, string eventName, IWeakSubscriber<T> subscriber)
-            where T : EventArgs
-        {
-            if (SubscriptionTypeStorage<T>.Subscribers.TryGetValue(target, out var dic))
-            {
-                if (dic.TryGetValue(eventName, out var sub))
-                {
-                    sub.Remove(subscriber);
-                }
-            }
-        }
-
-        private static class SubscriptionTypeStorage<T>
-            where T : EventArgs
-        {
-            public static readonly ConditionalWeakTable<object, SubscriptionDic<T>> Subscribers
-                = new ConditionalWeakTable<object, SubscriptionDic<T>>();
-        }
-
-        private class SubscriptionDic<T> : Dictionary<string, Subscription<T>>
-            where T : EventArgs
-        {
-        }
-
-        private static readonly Dictionary<Type, Dictionary<string, EventInfo>> Accessors
-            = new Dictionary<Type, Dictionary<string, EventInfo>>();
-
-        private class Subscription<T> where T : EventArgs
-        {
-            private readonly EventInfo _info;
-            private readonly SubscriptionDic<T> _sdic;
-            private readonly object _target;
-            private readonly string _eventName;
-            private readonly Delegate _delegate;
-
-            private WeakReference<IWeakSubscriber<T>>?[] _data = new WeakReference<IWeakSubscriber<T>>?[16];
-            private int _count = 0;
-
-            public Subscription(SubscriptionDic<T> sdic, Type targetType, object target, string eventName)
-            {
-                _sdic = sdic;
-                _target = target;
-                _eventName = eventName;
-                if (!Accessors.TryGetValue(targetType, out var evDic))
-                    Accessors[targetType] = evDic = new Dictionary<string, EventInfo>();
-
-                if (evDic.TryGetValue(eventName, out var info))
-                {
-                    _info = info;
-                }
-                else
-                {
-                    var ev = targetType.GetRuntimeEvents().FirstOrDefault(x => x.Name == eventName);
-
-                    if (ev == null)
-                    {
-                        throw new ArgumentException(
-                            $"The event {eventName} was not found on {target.GetType()}.");
-                    }
-
-                    evDic[eventName] = _info = ev;
-                }
-
-                var del = new Action<object, T>(OnEvent);
-                _delegate = del.GetMethodInfo().CreateDelegate(_info.EventHandlerType!, del.Target);
-                _info.AddMethod!.Invoke(target, new[] { _delegate });
-            }
-
-            void Destroy()
-            {
-                _info.RemoveMethod!.Invoke(_target, new[] { _delegate });
-                _sdic.Remove(_eventName);
-            }
-
-            public void Add(WeakReference<IWeakSubscriber<T>> s)
-            {
-                if (_count == _data.Length)
-                {
-                    //Extend capacity
-                    var ndata = new WeakReference<IWeakSubscriber<T>>?[_data.Length*2];
-                    Array.Copy(_data, ndata, _data.Length);
-                    _data = ndata;
-                }
-                _data[_count] = s!;
-                _count++;
-            }
-
-            public void Remove(IWeakSubscriber<T> s)
-            {
-                var removed = false;
-
-                for (int c = 0; c < _count; ++c)
-                {
-                    var reference = _data[c];
-                    IWeakSubscriber<T>? instance;
-
-                    if (reference != null && reference.TryGetTarget(out instance) && instance == s)
-                    {
-                        _data[c] = null;
-                        removed = true;
-                    }
-                }
-
-                if (removed)
-                {
-                    Compact();
-                }
-            }
-
-            void Compact()
-            {
-                int empty = -1;
-                for (int c = 0; c < _count; c++)
-                {
-                    var r = _data[c];
-                    //Mark current index as first empty
-                    if (r == null && empty == -1)
-                        empty = c;
-                    //If current element isn't null and we have an empty one
-                    if (r != null && empty != -1)
-                    {
-                        _data[c] = null;
-                        _data[empty] = r;
-                        empty++;
-                    }
-                }
-                if (empty != -1)
-                    _count = empty;
-                if (_count == 0)
-                    Destroy();
-            }
-
-            void OnEvent(object sender, T eventArgs)
-            {
-                var needCompact = false;
-                for(var c=0; c<_count; c++)
-                {
-                    var r = _data[c];
-                    if (r?.TryGetTarget(out var sub) == true)
-                        sub!.OnEvent(sender, eventArgs);
-                    else
-                        needCompact = true;
-                }
-                if (needCompact)
-                    Compact();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Base/ValueStore.cs b/src/Avalonia.Base/ValueStore.cs
index 6b7b598086..bf29e0b0ac 100644
--- a/src/Avalonia.Base/ValueStore.cs
+++ b/src/Avalonia.Base/ValueStore.cs
@@ -21,16 +21,15 @@ namespace Avalonia
     /// - For a single binding it will be an instance of <see cref="BindingEntry{T}"/>
     /// - For all other cases it will be an instance of <see cref="PriorityValue{T}"/>
     /// </remarks>
-    internal class ValueStore : IValueSink
+    internal class ValueStore
     {
         private readonly AvaloniaObject _owner;
-        private readonly IValueSink _sink;
         private readonly AvaloniaPropertyValueStore<IValue> _values;
         private BatchUpdate? _batchUpdate;
 
         public ValueStore(AvaloniaObject owner)
         {
-            _sink = _owner = owner;
+            _owner = owner;
             _values = new AvaloniaPropertyValueStore<IValue>();
         }
 
@@ -122,7 +121,7 @@ namespace Avalonia
                 }
                 else
                 {
-                    var entry = new ConstantValueEntry<T>(property, value, priority, this);
+                    var entry = new ConstantValueEntry<T>(property, value, priority, new(this));
                     AddValue(property, entry);
                     NotifyValueChanged<T>(property, default, value, priority);
                     result = entry;
@@ -151,7 +150,7 @@ namespace Avalonia
             }
             else
             {
-                var entry = new BindingEntry<T>(_owner, property, source, priority, this);
+                var entry = new BindingEntry<T>(_owner, property, source, priority, new(this));
                 AddValue(property, entry);
                 return entry;
             }
@@ -187,7 +186,7 @@ namespace Avalonia
                         // so there's no way to mark them for removal at the end of a batch update. Instead convert
                         // them to a constant value entry with Unset priority in the event of a local value being
                         // cleared during a batch update.
-                        var sentinel = new ConstantValueEntry<T>(property, Optional<T>.Empty, BindingPriority.Unset, _sink);
+                        var sentinel = new ConstantValueEntry<T>(property, Optional<T>.Empty, BindingPriority.Unset, new(this));
                         _values.SetValue(property, sentinel);
                     }
 
@@ -196,11 +195,11 @@ namespace Avalonia
             }
         }
 
-        public void CoerceValue<T>(StyledPropertyBase<T> property)
+        public void CoerceValue(AvaloniaProperty property)
         {
             if (TryGetValue(property, out var slot))
             {
-                if (slot is PriorityValue<T> p)
+                if (slot is IPriorityValue p)
                 {
                     p.UpdateEffectiveValue();
                 }
@@ -222,7 +221,7 @@ namespace Avalonia
             return null;
         }
 
-        void IValueSink.ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        public void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             if (_batchUpdate is object)
             {
@@ -233,11 +232,11 @@ namespace Avalonia
             }
             else
             {
-                _sink.ValueChanged(change);
+                _owner.ValueChanged(change);
             }
         }
 
-        void IValueSink.Completed<T>(
+        public void Completed<T>(
             StyledPropertyBase<T> property,
             IPriorityValueEntry entry,
             Optional<T> oldValue)
@@ -248,7 +247,7 @@ namespace Avalonia
                 if (_batchUpdate is null)
                 {
                     _values.Remove(property);
-                    _sink.Completed(property, entry, oldValue);
+                    _owner.Completed(property, entry, oldValue);
                 }
                 else
                 {
@@ -352,7 +351,7 @@ namespace Avalonia
         {
             if (_batchUpdate is null)
             {
-                _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                _owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                     _owner,
                     property,
                     oldValue,
@@ -451,7 +450,7 @@ namespace Avalonia
                             };
 
                             // Call _sink.ValueChanged with an appropriately typed AvaloniaPropertyChangedEventArgs<T>.
-                            slot.RaiseValueChanged(_owner._sink, _owner._owner, entry.property, oldValue, newValue);
+                            slot.RaiseValueChanged(_owner._owner, entry.property, oldValue, newValue);
 
                             // During batch update values can't be removed immediately because they're needed to raise
                             // the _sink.ValueChanged notification. They instead mark themselves for removal by setting
@@ -463,10 +462,6 @@ namespace Avalonia
                                 values.Remove(entry.property);
                             }
                         }
-                        else
-                        {
-                            throw new AvaloniaInternalException("Value could not be found at the end of batch update.");
-                        }
 
                         // If a new batch update was started while ending this one, abort.
                         if (_batchUpdateCount > 0)
diff --git a/src/Avalonia.Visuals/Vector.cs b/src/Avalonia.Base/Vector.cs
similarity index 100%
rename from src/Avalonia.Visuals/Vector.cs
rename to src/Avalonia.Base/Vector.cs
diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs
new file mode 100644
index 0000000000..69389def56
--- /dev/null
+++ b/src/Avalonia.Base/Visual.cs
@@ -0,0 +1,699 @@
+
+
+#nullable enable
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Data;
+using Avalonia.Logging;
+using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+namespace Avalonia
+{
+    /// <summary>
+    /// Base class for controls that provides rendering and related visual properties.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="Visual"/> class represents elements that have a visual on-screen
+    /// representation and stores all the information needed for an 
+    /// <see cref="IRenderer"/> to render the control. To traverse the visual tree, use the
+    /// extension methods defined in <see cref="VisualExtensions"/>.
+    /// </remarks>
+    [UsableDuringInitialization]
+    public class Visual : StyledElement, IVisual
+    {
+        /// <summary>
+        /// Defines the <see cref="Bounds"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Visual, Rect> BoundsProperty =
+            AvaloniaProperty.RegisterDirect<Visual, Rect>(nameof(Bounds), o => o.Bounds);
+
+        public static readonly DirectProperty<Visual, TransformedBounds?> TransformedBoundsProperty =
+            AvaloniaProperty.RegisterDirect<Visual, TransformedBounds?>(
+                nameof(TransformedBounds),
+                o => o.TransformedBounds);
+
+        /// <summary>
+        /// Defines the <see cref="ClipToBounds"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ClipToBoundsProperty =
+            AvaloniaProperty.Register<Visual, bool>(nameof(ClipToBounds));
+
+        /// <summary>
+        /// Defines the <see cref="Clip"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Geometry?> ClipProperty =
+            AvaloniaProperty.Register<Visual, Geometry?>(nameof(Clip));
+
+        /// <summary>
+        /// Defines the <see cref="IsVisibleProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsVisibleProperty =
+            AvaloniaProperty.Register<Visual, bool>(nameof(IsVisible), true);
+
+        /// <summary>
+        /// Defines the <see cref="Opacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> OpacityProperty =
+            AvaloniaProperty.Register<Visual, double>(nameof(Opacity), 1);
+
+        /// <summary>
+        /// Defines the <see cref="OpacityMask"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> OpacityMaskProperty =
+            AvaloniaProperty.Register<Visual, IBrush?>(nameof(OpacityMask));
+
+        /// <summary>
+        /// Defines the <see cref="HasMirrorTransform"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Visual, bool> HasMirrorTransformProperty =
+            AvaloniaProperty.RegisterDirect<Visual, bool>(nameof(HasMirrorTransform), o => o.HasMirrorTransform);
+
+        /// <summary>
+        /// Defines the <see cref="RenderTransform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITransform?> RenderTransformProperty =
+            AvaloniaProperty.Register<Visual, ITransform?>(nameof(RenderTransform));
+
+        /// <summary>
+        /// Defines the <see cref="RenderTransformOrigin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativePoint> RenderTransformOriginProperty =
+            AvaloniaProperty.Register<Visual, RelativePoint>(nameof(RenderTransformOrigin), defaultValue: RelativePoint.Center);
+
+        /// <summary>
+        /// Defines the <see cref="IVisual.VisualParent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Visual, IVisual?> VisualParentProperty =
+            AvaloniaProperty.RegisterDirect<Visual, IVisual?>(nameof(IVisual.VisualParent), o => o._visualParent);
+
+        /// <summary>
+        /// Defines the <see cref="ZIndex"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> ZIndexProperty =
+            AvaloniaProperty.Register<Visual, int>(nameof(ZIndex));
+        
+        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
+            WeakEvent.Register<IAffectsRender>(
+                (s, h) => s.Invalidated += h,
+                (s, h) => s.Invalidated -= h);
+
+        private Rect _bounds;
+        private TransformedBounds? _transformedBounds;
+        private IRenderRoot? _visualRoot;
+        private IVisual? _visualParent;
+        private bool _hasMirrorTransform;
+        private TargetWeakEventSubscriber<Visual, EventArgs>? _affectsRenderWeakSubscriber;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="Visual"/> class.
+        /// </summary>
+        static Visual()
+        {
+            AffectsRender<Visual>(
+                BoundsProperty,
+                ClipProperty,
+                ClipToBoundsProperty,
+                IsVisibleProperty,
+                OpacityProperty,
+                HasMirrorTransformProperty);
+            RenderTransformProperty.Changed.Subscribe(RenderTransformChanged);
+            ZIndexProperty.Changed.Subscribe(ZIndexChanged);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Visual"/> class.
+        /// </summary>
+        public Visual()
+        {
+            // Disable transitions until we're added to the visual tree.
+            DisableTransitions();
+
+            var visualChildren = new AvaloniaList<IVisual>();
+            visualChildren.ResetBehavior = ResetBehavior.Remove;
+            visualChildren.Validate = visual => ValidateVisualChild(visual);
+            visualChildren.CollectionChanged += VisualChildrenChanged;
+            VisualChildren = visualChildren;
+        }
+
+        /// <summary>
+        /// Raised when the control is attached to a rooted visual tree.
+        /// </summary>
+        public event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
+
+        /// <summary>
+        /// Raised when the control is detached from a rooted visual tree.
+        /// </summary>
+        public event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
+
+        /// <summary>
+        /// Gets the bounds of the control relative to its parent.
+        /// </summary>
+        public Rect Bounds
+        {
+            get { return _bounds; }
+            protected set { SetAndRaise(BoundsProperty, ref _bounds, value); }
+        }
+
+        /// <summary>
+        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
+        /// </summary>
+        public TransformedBounds? TransformedBounds => _transformedBounds;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control should be clipped to its bounds.
+        /// </summary>
+        public bool ClipToBounds
+        {
+            get { return GetValue(ClipToBoundsProperty); }
+            set { SetValue(ClipToBoundsProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the geometry clip for this visual.
+        /// </summary>
+        public Geometry? Clip
+        {
+            get { return GetValue(ClipProperty); }
+            set { SetValue(ClipProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are visible.
+        /// </summary>
+        public bool IsEffectivelyVisible
+        {
+            get
+            {
+                IVisual? node = this;
+
+                while (node != null)
+                {
+                    if (!node.IsVisible)
+                    {
+                        return false;
+                    }
+
+                    node = node.VisualParent;
+                }
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this control is visible.
+        /// </summary>
+        public bool IsVisible
+        {
+            get { return GetValue(IsVisibleProperty); }
+            set { SetValue(IsVisibleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity of the control.
+        /// </summary>
+        public double Opacity
+        {
+            get { return GetValue(OpacityProperty); }
+            set { SetValue(OpacityProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity mask of the control.
+        /// </summary>
+        public IBrush? OpacityMask
+        {
+            get { return GetValue(OpacityMaskProperty); }
+            set { SetValue(OpacityMaskProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to apply mirror transform on this control.
+        /// </summary>
+        public bool HasMirrorTransform 
+        { 
+            get { return _hasMirrorTransform; }
+            protected set { SetAndRaise(HasMirrorTransformProperty, ref _hasMirrorTransform, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the render transform of the control.
+        /// </summary>
+        public ITransform? RenderTransform
+        {
+            get { return GetValue(RenderTransformProperty); }
+            set { SetValue(RenderTransformProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the transform origin of the control.
+        /// </summary>
+        public RelativePoint RenderTransformOrigin
+        {
+            get { return GetValue(RenderTransformOriginProperty); }
+            set { SetValue(RenderTransformOriginProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z index of the control.
+        /// </summary>
+        /// <remarks>
+        /// Controls with a higher <see cref="ZIndex"/> will appear in front of controls with
+        /// a lower ZIndex. If two controls have the same ZIndex then the control that appears
+        /// later in the containing element's children collection will appear on top.
+        /// </remarks>
+        public int ZIndex
+        {
+            get { return GetValue(ZIndexProperty); }
+            set { SetValue(ZIndexProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the control's child visuals.
+        /// </summary>
+        protected IAvaloniaList<IVisual> VisualChildren
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        protected IRenderRoot? VisualRoot => _visualRoot ?? (this as IRenderRoot);
+
+        internal CompositionDrawListVisual? CompositionVisual { get; private set; }
+        
+        public bool HasNonUniformZIndexChildren { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control is attached to a visual root.
+        /// </summary>
+        bool IVisual.IsAttachedToVisualTree => VisualRoot != null;
+
+        /// <summary>
+        /// Gets the control's child controls.
+        /// </summary>
+        IAvaloniaReadOnlyList<IVisual> IVisual.VisualChildren => VisualChildren;
+
+        /// <summary>
+        /// Gets the control's parent visual.
+        /// </summary>
+        IVisual? IVisual.VisualParent => _visualParent;
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        IRenderRoot? IVisual.VisualRoot => VisualRoot;
+        
+        TransformedBounds? IVisual.TransformedBounds
+        {
+            get { return _transformedBounds; }
+            set { SetAndRaise(TransformedBoundsProperty, ref _transformedBounds, value); }
+        }
+
+        /// <summary>
+        /// Invalidates the visual and queues a repaint.
+        /// </summary>
+        public void InvalidateVisual()
+        {
+            VisualRoot?.Renderer?.AddDirty(this);
+        }
+
+        /// <summary>
+        /// Renders the visual to a <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        public virtual void Render(DrawingContext context)
+        {
+            Contract.Requires<ArgumentNullException>(context != null);
+        }
+
+        /// <summary>
+        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
+        /// called.
+        /// </summary>
+        /// <typeparam name="T">The control which the property affects.</typeparam>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// This method should be called in a control's static constructor with each property
+        /// on the control which when changed should cause a redraw. This is similar to WPF's
+        /// FrameworkPropertyMetadata.AffectsRender flag.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : Visual
+        {
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Sender is T sender)
+                {
+                    sender.InvalidateVisual();
+                }
+            }
+
+            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Sender is T sender)
+                {
+                    if (e.OldValue is IAffectsRender oldValue)
+                    {
+                        if (sender._affectsRenderWeakSubscriber != null)
+                        {
+                            InvalidatedWeakEvent.Unsubscribe(oldValue, sender._affectsRenderWeakSubscriber);
+                        }
+                    }
+
+                    if (e.NewValue is IAffectsRender newValue)
+                    {
+                        if (sender._affectsRenderWeakSubscriber == null)
+                        {
+                            sender._affectsRenderWeakSubscriber = new TargetWeakEventSubscriber<Visual, EventArgs>(
+                                sender, static (target, _, _, _) =>
+                                {
+                                    target.InvalidateVisual();
+                                });
+                        }
+                        InvalidatedWeakEvent.Subscribe(newValue, sender._affectsRenderWeakSubscriber);
+                    }
+
+                    sender.InvalidateVisual();
+                }
+            }
+
+            foreach (var property in properties)
+            {
+                if (property.CanValueAffectRender())
+                {
+                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
+                }
+                else
+                {
+                    property.Changed.Subscribe(e => Invalidate(e));
+                }
+            }
+        }
+
+        protected override void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            base.LogicalChildrenCollectionChanged(sender, e);
+            VisualRoot?.Renderer?.RecalculateChildren(this);
+        }
+
+        /// <summary>
+        /// Calls the <see cref="OnAttachedToVisualTree(VisualTreeAttachmentEventArgs)"/> method 
+        /// for this control and all of its visual descendants.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Attached to visual tree");
+
+            _visualRoot = e.Root;
+
+            if (RenderTransform is IMutableTransform mutableTransform)
+            {
+                mutableTransform.Changed += RenderTransformChanged;
+            }
+
+            EnableTransitions();
+            if (_visualRoot.Renderer is IRendererWithCompositor compositingRenderer)
+            {
+                AttachToCompositor(compositingRenderer.Compositor);
+            }
+            OnAttachedToVisualTree(e);
+            AttachedToVisualTree?.Invoke(this, e);
+            InvalidateVisual();
+
+            if (ZIndex != 0 && this.GetVisualParent() is Visual parent)
+                parent.HasNonUniformZIndexChildren = true;
+
+            var visualChildren = VisualChildren;
+
+            if (visualChildren != null)
+            {
+                var visualChildrenCount = visualChildren.Count;
+
+                for (var i = 0; i < visualChildrenCount; i++)
+                {
+                    if (visualChildren[i] is Visual child)
+                    {
+                        child.OnAttachedToVisualTreeCore(e);
+                    }
+                }
+            }
+        }
+
+        internal CompositionVisual AttachToCompositor(Compositor compositor)
+        {
+            if (CompositionVisual == null || CompositionVisual.Compositor != compositor)
+            {
+                CompositionVisual = new CompositionDrawListVisual(compositor,
+                    new ServerCompositionDrawListVisual(compositor.Server, this), this);
+            }
+
+            return CompositionVisual;
+        }
+
+        /// <summary>
+        /// Calls the <see cref="OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs)"/> method 
+        /// for this control and all of its visual descendants.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Detached from visual tree");
+
+            _visualRoot = null;
+
+            if (RenderTransform is IMutableTransform mutableTransform)
+            {
+                mutableTransform.Changed -= RenderTransformChanged;
+            }
+
+            DisableTransitions();
+            OnDetachedFromVisualTree(e);
+            if (CompositionVisual != null)
+            {
+                CompositionVisual.DrawList = null;
+                CompositionVisual = null;
+            }
+
+            DetachedFromVisualTree?.Invoke(this, e);
+            e.Root?.Renderer?.AddDirty(this);
+
+            var visualChildren = VisualChildren;
+
+            if (visualChildren != null)
+            {
+                var visualChildrenCount = visualChildren.Count;
+
+                for (var i = 0; i < visualChildrenCount; i++)
+                {
+                    if (visualChildren[i] is Visual child)
+                    {
+                        child.OnDetachedFromVisualTreeCore(e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the control is added to a rooted visual tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the control is removed from a rooted visual tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the control's visual parent changes.
+        /// </summary>
+        /// <param name="oldParent">The old visual parent.</param>
+        /// <param name="newParent">The new visual parent.</param>
+        protected virtual void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
+        {
+            RaisePropertyChanged(
+                VisualParentProperty,
+                new Optional<IVisual?>(oldParent),
+                new BindingValue<IVisual?>(newParent),
+                BindingPriority.LocalValue);
+        }
+
+        protected internal sealed override void LogBindingError(AvaloniaProperty property, Exception e)
+        {
+            // Don't log a binding error unless the control is attached to a logical tree.
+            if (((ILogical)this).IsAttachedToLogicalTree)
+            {
+                if (e is BindingChainException b &&
+                    string.IsNullOrEmpty(b.ExpressionErrorPoint) &&
+                    DataContext == null)
+                {
+                    // The error occurred at the root of the binding chain and DataContext is null;
+                    // don't log this - the DataContext probably hasn't been set up yet.
+                    return;
+                }
+
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Binding)?.Log(
+                    this,
+                    "Error in binding to {Target}.{Property}: {Message}",
+                    this,
+                    property,
+                    e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Called when a visual's <see cref="RenderTransform"/> changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void RenderTransformChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var sender = e.Sender as Visual;
+
+            if (sender?.VisualRoot != null)
+            {
+                var oldValue = e.OldValue as Transform;
+                var newValue = e.NewValue as Transform;
+
+                if (oldValue != null)
+                {
+                    oldValue.Changed -= sender.RenderTransformChanged;
+                }
+
+                if (newValue != null)
+                {
+                    newValue.Changed += sender.RenderTransformChanged;
+                }
+                
+                sender.InvalidateVisual();
+            }
+        }
+
+        /// <summary>
+        /// Ensures a visual child is not null and not already parented.
+        /// </summary>
+        /// <param name="c">The visual child.</param>
+        private static void ValidateVisualChild(IVisual c)
+        {
+            if (c == null)
+            {
+                throw new ArgumentNullException(nameof(c), "Cannot add null to VisualChildren.");
+            }
+
+            if (c.VisualParent != null)
+            {
+                throw new InvalidOperationException("The control already has a visual parent.");
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="ZIndex"/> property changes on any control.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void ZIndexChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var sender = e.Sender as IVisual;
+            var parent = sender?.VisualParent;
+            if (sender?.ZIndex != 0 && parent is Visual parentVisual)
+                parentVisual.HasNonUniformZIndexChildren = true;
+            
+            sender?.InvalidateVisual();
+            parent?.VisualRoot?.Renderer?.RecalculateChildren(parent);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="RenderTransform"/>'s <see cref="Transform.Changed"/> event
+        /// is fired.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void RenderTransformChanged(object? sender, EventArgs e)
+        {
+            InvalidateVisual();
+        }
+
+        /// <summary>
+        /// Sets the visual parent of the Visual.
+        /// </summary>
+        /// <param name="value">The visual parent.</param>
+        private void SetVisualParent(Visual? value)
+        {
+            if (_visualParent == value)
+            {
+                return;
+            }
+
+            var old = _visualParent;
+            _visualParent = value;
+
+            if (_visualRoot != null)
+            {
+                var e = new VisualTreeAttachmentEventArgs(old!, _visualRoot);
+                OnDetachedFromVisualTreeCore(e);
+            }
+
+            if (_visualParent is IRenderRoot || _visualParent?.IsAttachedToVisualTree == true)
+            {
+                var root = this.FindAncestorOfType<IRenderRoot>() ??
+                    throw new AvaloniaInternalException("Visual is atached to visual tree but root could not be found.");
+                var e = new VisualTreeAttachmentEventArgs(_visualParent, root);
+                OnAttachedToVisualTreeCore(e);
+            }
+
+            OnVisualParentChanged(old, value);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="VisualChildren"/> collection changes.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void VisualChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    SetVisualParent(e.NewItems!, this);
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    SetVisualParent(e.OldItems!, null);
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    SetVisualParent(e.OldItems!, null);
+                    SetVisualParent(e.NewItems!, this);
+                    break;
+            }
+        }
+        
+        private static void SetVisualParent(IList children, Visual? parent)
+        {
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
+            {
+                var visual = (Visual) children[i]!;
+                
+                visual.SetVisualParent(parent);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/VisualExtensions.cs b/src/Avalonia.Base/VisualExtensions.cs
new file mode 100644
index 0000000000..7a5bbb105c
--- /dev/null
+++ b/src/Avalonia.Base/VisualExtensions.cs
@@ -0,0 +1,138 @@
+using System;
+using Avalonia.VisualTree;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extension methods for <see cref="IVisual"/>.
+    /// </summary>
+    public static class VisualExtensions
+    {
+        /// <summary>
+        /// Converts a point from screen to client coordinates.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="point">The point in screen coordinates.</param>
+        /// <returns>The point in client coordinates.</returns>
+        public static Point PointToClient(this IVisual visual, PixelPoint point)
+        {
+            var root = visual.VisualRoot ??
+                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
+            var rootPoint = root.PointToClient(point);
+            return root.TranslatePoint(rootPoint, visual)!.Value;
+        }
+
+        /// <summary>
+        /// Converts a point from client to screen coordinates.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="point">The point in client coordinates.</param>
+        /// <returns>The point in screen coordinates.</returns>
+        public static PixelPoint PointToScreen(this IVisual visual, Point point)
+        {
+            var root = visual.VisualRoot ??
+                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
+            var p = visual.TranslatePoint(point, root);
+            return visual.VisualRoot.PointToScreen(p!.Value);
+        }
+
+        /// <summary>
+        /// Returns a transform that transforms the visual's coordinates into the coordinates
+        /// of the specified <paramref name="to"/>.
+        /// </summary>
+        /// <param name="from">The visual whose coordinates are to be transformed.</param>
+        /// <param name="to">The visual to translate the coordinates to.</param>
+        /// <returns>
+        /// A <see cref="Matrix"/> containing the transform or null if the visuals don't share a
+        /// common ancestor.
+        /// </returns>
+        public static Matrix? TransformToVisual(this IVisual from, IVisual to)
+        {
+            var common = from.FindCommonVisualAncestor(to);
+
+            if (common != null)
+            {
+                var thisOffset = GetOffsetFrom(common, from);
+                var thatOffset = GetOffsetFrom(common, to);
+
+                if (!thatOffset.TryInvert(out var thatOffsetInverted))
+                {
+                    return null;
+                }
+
+                return thatOffsetInverted * thisOffset;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Translates a point relative to this visual to coordinates that are relative to the specified visual.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="point">The point value, as relative to this visual.</param>
+        /// <param name="relativeTo">The visual to translate the given point into.</param>
+        /// <returns>
+        /// A point value, now relative to the target visual rather than this source element, or null if the
+        /// two elements have no common ancestor.
+        /// </returns>
+        public static Point? TranslatePoint(this IVisual visual, Point point, IVisual relativeTo)
+        {
+            var transform = visual.TransformToVisual(relativeTo);
+
+            if (transform.HasValue)
+            {
+                return point.Transform(transform.Value);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a transform from an ancestor to a descendent.
+        /// </summary>
+        /// <param name="ancestor">The ancestor visual.</param>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The transform.</returns>
+        private static Matrix GetOffsetFrom(IVisual ancestor, IVisual visual)
+        {
+            var result = Matrix.Identity;
+            IVisual? v = visual;
+
+            while (v != ancestor)
+            {
+                // this should be calculated BEFORE renderTransform
+                if (v.HasMirrorTransform)
+                {
+                    var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, v.Bounds.Width, 0);
+                    result *= mirrorMatrix;
+                }
+
+                if (v.RenderTransform?.Value != null)
+                {
+                    var origin = v.RenderTransformOrigin.ToPixels(v.Bounds.Size);
+                    var offset = Matrix.CreateTranslation(origin);
+                    var renderTransform = (-offset) * v.RenderTransform.Value * (offset);
+
+                    result *= renderTransform;
+                }
+
+                var topLeft = v.Bounds.TopLeft;
+
+                if (topLeft != default)
+                {
+                    result *= Matrix.CreateTranslation(topLeft);
+                }
+
+                v = v.VisualParent;
+
+                if (v == null)
+                {
+                    throw new ArgumentException("'visual' is not a descendant of 'ancestor'.");
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs b/src/Avalonia.Base/VisualTree/IHostedVisualTreeRoot.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs
rename to src/Avalonia.Base/VisualTree/IHostedVisualTreeRoot.cs
diff --git a/src/Avalonia.Base/VisualTree/IVisual.cs b/src/Avalonia.Base/VisualTree/IVisual.cs
new file mode 100644
index 0000000000..fdd2d187b8
--- /dev/null
+++ b/src/Avalonia.Base/VisualTree/IVisual.cs
@@ -0,0 +1,129 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Rendering;
+
+namespace Avalonia.VisualTree
+{
+    /// <summary>
+    /// Represents control that has a visual on-screen representation.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="IVisual"/> interface defines the interface required for a renderer to
+    /// render a control. You should not usually need to reference this interface unless
+    /// you are writing a renderer; instead use the extension methods defined in
+    /// <see cref="VisualExtensions"/> to traverse the visual tree. This interface is
+    /// implemented by <see cref="Visual"/>. It should not be necessary to implement it
+    /// anywhere else.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IVisual
+    {
+        /// <summary>
+        /// Raised when the control is attached to a rooted visual tree.
+        /// </summary>
+        event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
+
+        /// <summary>
+        /// Raised when the control is detached from a rooted visual tree.
+        /// </summary>
+        event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
+
+        /// <summary>
+        /// Gets the bounds of the control relative to its parent.
+        /// </summary>
+        Rect Bounds { get; }
+
+        /// <summary>
+        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
+        /// </summary>
+        TransformedBounds? TransformedBounds { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control should be clipped to its bounds.
+        /// </summary>
+        bool ClipToBounds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the geometry clip for this visual.
+        /// </summary>
+        Geometry? Clip { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control is attached to a visual root.
+        /// </summary>
+        bool IsAttachedToVisualTree { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are visible.
+        /// </summary>
+        bool IsEffectivelyVisible { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this control is visible.
+        /// </summary>
+        bool IsVisible { get; set; }
+
+        /// <summary>
+        /// Gets or sets the opacity of the control.
+        /// </summary>
+        double Opacity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the opacity mask for the control.
+        /// </summary>
+        IBrush? OpacityMask { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether to apply mirror transform on this control.
+        /// </summary>
+        bool HasMirrorTransform { get; }
+        
+        /// <summary>
+        /// Gets a value indicating whether to sort children when rendering this control
+        /// </summary>
+        bool HasNonUniformZIndexChildren { get; }
+
+        /// <summary>
+        /// Gets or sets the render transform of the control.
+        /// </summary>
+        ITransform? RenderTransform { get; set; }
+
+        /// <summary>
+        /// Gets or sets the render transform origin of the control.
+        /// </summary>
+        RelativePoint RenderTransformOrigin { get; set; }
+
+        /// <summary>
+        /// Gets the control's child visuals.
+        /// </summary>
+        IAvaloniaReadOnlyList<IVisual> VisualChildren { get; }
+
+        /// <summary>
+        /// Gets the control's parent visual.
+        /// </summary>
+        IVisual? VisualParent { get; }
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        IRenderRoot? VisualRoot { get; }
+
+        /// <summary>
+        /// Gets or sets the Z index of the node.
+        /// </summary>
+        int ZIndex { get; set; }
+
+        /// <summary>
+        /// Invalidates the visual and queues a repaint.
+        /// </summary>
+        void InvalidateVisual();
+
+        /// <summary>
+        /// Renders the control to a <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        void Render(DrawingContext context);
+    }
+}
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs b/src/Avalonia.Base/VisualTree/IVisualWithRoundRectClip.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs
rename to src/Avalonia.Base/VisualTree/IVisualWithRoundRectClip.cs
diff --git a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs b/src/Avalonia.Base/VisualTree/TransformedBounds.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
rename to src/Avalonia.Base/VisualTree/TransformedBounds.cs
diff --git a/src/Avalonia.Base/VisualTree/VisualExtensions.cs b/src/Avalonia.Base/VisualTree/VisualExtensions.cs
new file mode 100644
index 0000000000..a1b8894604
--- /dev/null
+++ b/src/Avalonia.Base/VisualTree/VisualExtensions.cs
@@ -0,0 +1,482 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Rendering;
+
+namespace Avalonia.VisualTree
+{
+    /// <summary>
+    /// Provides extension methods for working with the visual tree.
+    /// </summary>
+    public static class VisualExtensions
+    {
+        /// <summary>
+        /// Calculates the distance from a visual's ancestor.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="ancestor">The ancestor visual.</param>
+        /// <returns>
+        /// The number of steps from the visual to the ancestor or -1 if
+        /// <paramref name="visual"/> is not a descendent of <paramref name="ancestor"/>.
+        /// </returns>
+        public static int CalculateDistanceFromAncestor(this IVisual visual, IVisual? ancestor)
+        {
+            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
+            var result = 0;
+
+            while (v != null && v != ancestor)
+            {
+                v = v.VisualParent;
+
+                result++;
+            }
+
+            return v != null ? result : -1;
+        }
+
+        /// <summary>
+        /// Calculates the distance from a visual's root.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>
+        /// The number of steps from the visual to the root.
+        /// </returns>
+        public static int CalculateDistanceFromRoot(IVisual visual)
+        {
+            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
+            var result = 0;
+
+            v = v?.VisualParent;
+
+            while (v != null)
+            {
+                v = v.VisualParent;
+
+                result++;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Tries to get the first common ancestor of two visuals.
+        /// </summary>
+        /// <param name="visual">The first visual.</param>
+        /// <param name="target">The second visual.</param>
+        /// <returns>The common ancestor, or null if not found.</returns>
+        public static IVisual? FindCommonVisualAncestor(this IVisual visual, IVisual target)
+        {
+            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            if (target is null)
+            {
+                return null;
+            }
+
+            IVisual? t = target;
+
+            void GoUpwards(ref IVisual? node, int count)
+            {
+                for (int i = 0; i < count; ++i)
+                {
+                    node = node?.VisualParent;
+                }
+            }
+
+            // We want to find lowest node first, then make sure that both nodes are at the same height.
+            // By doing that we can sometimes find out that other node is our lowest common ancestor.
+            var firstHeight = CalculateDistanceFromRoot(v);
+            var secondHeight = CalculateDistanceFromRoot(t);
+
+            if (firstHeight > secondHeight)
+            {
+                GoUpwards(ref v, firstHeight - secondHeight);
+            }
+            else
+            {
+                GoUpwards(ref t, secondHeight - firstHeight);
+            }
+
+            if (v == t)
+            {
+                return v;
+            }
+
+            while (v != null && t != null)
+            {
+                IVisual? firstParent = v.VisualParent;
+                IVisual? secondParent = t.VisualParent;
+
+                if (firstParent == secondParent)
+                {
+                    return firstParent;
+                }
+
+                v = v.VisualParent;
+                t = t.VisualParent;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Enumerates the ancestors of an <see cref="IVisual"/> in the visual tree.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The visual's ancestors.</returns>
+        public static IEnumerable<IVisual> GetVisualAncestors(this IVisual visual)
+        {
+            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            v = v.VisualParent;
+
+            while (v != null)
+            {
+                yield return v;
+                v = v.VisualParent;
+            }
+        }
+
+        /// <summary>
+        /// Finds first ancestor of given type.
+        /// </summary>
+        /// <typeparam name="T">Ancestor type.</typeparam>
+        /// <param name="visual">The visual.</param>
+        /// <param name="includeSelf">If given visual should be included in search.</param>
+        /// <returns>First ancestor of given type.</returns>
+        public static T? FindAncestorOfType<T>(this IVisual visual, bool includeSelf = false) where T : class
+        {
+            if (visual is null)
+            {
+                return null;
+            }
+
+            IVisual? parent = includeSelf ? visual : visual.VisualParent;
+
+            while (parent != null)
+            {
+                if (parent is T result)
+                {
+                    return result;
+                }
+
+                parent = parent.VisualParent;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Finds first descendant of given type.
+        /// </summary>
+        /// <typeparam name="T">Descendant type.</typeparam>
+        /// <param name="visual">The visual.</param>
+        /// <param name="includeSelf">If given visual should be included in search.</param>
+        /// <returns>First descendant of given type.</returns>
+        public static T? FindDescendantOfType<T>(this IVisual visual, bool includeSelf = false) where T : class
+        {
+            if (visual is null)
+            {
+                return null;
+            }
+
+            if (includeSelf && visual is T result)
+            {
+                return result;
+            }
+
+            return FindDescendantOfTypeCore<T>(visual);
+        }
+
+        /// <summary>
+        /// Enumerates an <see cref="IVisual"/> and its ancestors in the visual tree.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The visual and its ancestors.</returns>
+        public static IEnumerable<IVisual> GetSelfAndVisualAncestors(this IVisual visual)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            yield return visual;
+
+            foreach (var ancestor in visual.GetVisualAncestors())
+            {
+                yield return ancestor;
+            }
+        }
+
+        /// <summary>
+        /// Gets the first visual in the visual tree whose bounds contain a point.
+        /// </summary>
+        /// <param name="visual">The root visual to test.</param>
+        /// <param name="p">The point.</param>
+        /// <returns>The visual at the requested point.</returns>
+        public static IVisual? GetVisualAt(this IVisual visual, Point p)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            return visual.GetVisualAt(p, x => x.IsVisible);
+        }
+
+        /// <summary>
+        /// Gets the first visual in the visual tree whose bounds contain a point.
+        /// </summary>
+        /// <param name="visual">The root visual to test.</param>
+        /// <param name="p">The point.</param>
+        /// <param name="filter">
+        /// A filter predicate. If the predicate returns false then the visual and all its
+        /// children will be excluded from the results.
+        /// </param>
+        /// <returns>The visual at the requested point.</returns>
+        public static IVisual? GetVisualAt(this IVisual visual, Point p, Func<IVisual, bool> filter)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            var root = visual.GetVisualRoot();
+
+            if (root is null)
+            {
+                return null;
+            }
+
+            var rootPoint = visual.TranslatePoint(p, root);
+
+            if (rootPoint.HasValue)
+            {
+                return root.Renderer.HitTestFirst(rootPoint.Value, visual, filter);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Enumerates the visible visuals in the visual tree whose bounds contain a point.
+        /// </summary>
+        /// <param name="visual">The root visual to test.</param>
+        /// <param name="p">The point.</param>
+        /// <returns>The visuals at the requested point.</returns>
+        public static IEnumerable<IVisual> GetVisualsAt(
+            this IVisual visual,
+            Point p)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            return visual.GetVisualsAt(p, x => x.IsVisible);
+        }
+
+        /// <summary>
+        /// Enumerates the visuals in the visual tree whose bounds contain a point.
+        /// </summary>
+        /// <param name="visual">The root visual to test.</param>
+        /// <param name="p">The point.</param>
+        /// <param name="filter">
+        /// A filter predicate. If the predicate returns false then the visual and all its
+        /// children will be excluded from the results.
+        /// </param>
+        /// <returns>The visuals at the requested point.</returns>
+        public static IEnumerable<IVisual> GetVisualsAt(
+            this IVisual visual,
+            Point p,
+            Func<IVisual, bool> filter)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            var root = visual.GetVisualRoot();
+
+            if (root is null)
+            {
+                return Array.Empty<IVisual>();
+            }
+
+            var rootPoint = visual.TranslatePoint(p, root);
+
+            if (rootPoint.HasValue)
+            {
+                return root.Renderer.HitTest(rootPoint.Value, visual, filter);
+            }
+
+            return Enumerable.Empty<IVisual>();
+        }
+
+        /// <summary>
+        /// Enumerates the children of an <see cref="IVisual"/> in the visual tree.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The visual children.</returns>
+        public static IEnumerable<IVisual> GetVisualChildren(this IVisual visual)
+        {
+            return visual.VisualChildren;
+        }
+
+        /// <summary>
+        /// Enumerates the descendants of an <see cref="IVisual"/> in the visual tree.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The visual's ancestors.</returns>
+        public static IEnumerable<IVisual> GetVisualDescendants(this IVisual visual)
+        {
+            foreach (IVisual child in visual.VisualChildren)
+            {
+                yield return child;
+
+                foreach (IVisual descendant in child.GetVisualDescendants())
+                {
+                    yield return descendant;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Enumerates an <see cref="IVisual"/> and its descendants in the visual tree.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The visual and its ancestors.</returns>
+        public static IEnumerable<IVisual> GetSelfAndVisualDescendants(this IVisual visual)
+        {
+            yield return visual;
+
+            foreach (var ancestor in visual.GetVisualDescendants())
+            {
+                yield return ancestor;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visual parent of an <see cref="IVisual"/>.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The parent, or null if the visual is unparented.</returns>
+        public static IVisual? GetVisualParent(this IVisual visual)
+        {
+            return visual.VisualParent;
+        }
+
+        /// <summary>
+        /// Gets the visual parent of an <see cref="IVisual"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the visual parent.</typeparam>
+        /// <param name="visual">The visual.</param>
+        /// <returns>
+        /// The parent, or null if the visual is unparented or its parent is not of type <typeparamref name="T"/>.
+        /// </returns>
+        public static T? GetVisualParent<T>(this IVisual visual) where T : class
+        {
+            return visual.VisualParent as T;
+        }
+
+        /// <summary>
+        /// Gets the root visual for an <see cref="IVisual"/>.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>
+        /// The root visual or null if the visual is not rooted.
+        /// </returns>
+        public static IRenderRoot? GetVisualRoot(this IVisual visual)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            return visual as IRenderRoot ?? visual.VisualRoot;
+        }
+
+        /// <summary>
+        /// Tests whether an <see cref="IVisual"/> is an ancestor of another visual.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="target">The potential descendant.</param>
+        /// <returns>
+        /// True if <paramref name="visual"/> is an ancestor of <paramref name="target"/>;
+        /// otherwise false.
+        /// </returns>
+        public static bool IsVisualAncestorOf(this IVisual visual, IVisual target)
+        {
+            IVisual? current = target?.VisualParent;
+
+            while (current != null)
+            {
+                if (current == visual)
+                {
+                    return true;
+                }
+
+                current = current.VisualParent;
+            }
+
+            return false;
+        }
+
+        public static IEnumerable<IVisual> SortByZIndex(this IEnumerable<IVisual> elements)
+        {
+            return elements
+                .Select((element, index) => new ZOrderElement
+                {
+                    Element = element,
+                    Index = index,
+                    ZIndex = element.ZIndex,
+                })
+                .OrderBy(x => x, ZOrderElement.Comparer)
+                .Select(x => x.Element!);
+        }
+
+        private static T? FindDescendantOfTypeCore<T>(IVisual visual) where T : class
+        {
+            var visualChildren = visual.VisualChildren;
+            var visualChildrenCount = visualChildren.Count;
+
+            for (var i = 0; i < visualChildrenCount; i++)
+            {
+                IVisual child = visualChildren[i];
+
+                if (child is T result)
+                {
+                    return result;
+                }
+
+                var childResult = FindDescendantOfTypeCore<T>(child);
+
+                if (!(childResult is null))
+                {
+                    return childResult;
+                }
+            }
+
+            return null;
+        }
+
+        private class ZOrderElement : IComparable<ZOrderElement>
+        {
+            public IVisual? Element { get; set; }
+            public int Index { get; set; }
+            public int ZIndex { get; set; }
+
+            class ZOrderComparer : IComparer<ZOrderElement>
+            {
+                public int Compare(ZOrderElement? x, ZOrderElement? y)
+                {
+                    if (ReferenceEquals(x, y)) return 0;
+                    if (ReferenceEquals(null, y)) return 1;
+                    if (ReferenceEquals(null, x)) return -1;
+                    return x.CompareTo(y);
+                }
+            }
+
+            public static IComparer<ZOrderElement> Comparer { get; } = new ZOrderComparer();
+            
+            public int CompareTo(ZOrderElement? other)
+            {
+                if (other is null)
+                    return 1;
+
+                var z = other.ZIndex - ZIndex;
+
+                if (z != 0)
+                {
+                    return z;
+                }
+                else
+                {
+                    return other.Index - Index;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/VisualTree/VisualLocator.cs b/src/Avalonia.Base/VisualTree/VisualLocator.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/VisualLocator.cs
rename to src/Avalonia.Base/VisualTree/VisualLocator.cs
diff --git a/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs b/src/Avalonia.Base/VisualTreeAttachmentEventArgs.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs
rename to src/Avalonia.Base/VisualTreeAttachmentEventArgs.cs
diff --git a/src/Avalonia.Base/composition-schema.xml b/src/Avalonia.Base/composition-schema.xml
new file mode 100644
index 0000000000..e0e177da44
--- /dev/null
+++ b/src/Avalonia.Base/composition-schema.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<NComposition>
+    <Using>System.Numerics</Using>
+    <Using>Avalonia.Rendering.Composition.Server</Using>
+    <Using>Avalonia.Rendering.Composition.Transport</Using>
+    <Using>Avalonia.Rendering.Composition.Animations</Using>
+    
+    <Manual Name="Avalonia.Platform.IGeometryImpl" Passthrough="true"/>
+    <Manual Name="Avalonia.Media.IBrush" Passthrough="true"/>
+    <Object Name="CompositionVisual" Abstract="true">
+        <Property Name="Root" Type="CompositionTarget?" InternalSet="true" />
+        <Property Name="Parent" Type="CompositionVisual?" InternalSet="true"  />
+        <Property Name="Visible" Type="bool" Animated="true" DefaultValue="true"/>
+        <Property Name="Opacity" Type="float" Animated="true" DefaultValue="1"/>
+        
+        <Property Name="Clip" Type="Avalonia.Platform.IGeometryImpl?" Internal="true" />
+        <Property Name="ClipToBounds" Type="bool" Animated="true" DefaultValue="true"/>
+        <Property Name="Offset" Type="Vector3" Animated="true"/>
+        <Property Name="Size" Type="Vector2" Animated="true"/>
+        <Property Name="AnchorPoint" Type="Vector2" Animated="true"/>
+        <Property Name="CenterPoint" Type="Vector3" Animated="true"/>
+        <Property Name="RotationAngle" Type="float" Animated="true"/>
+        <Property Name="Orientation" Type="Quaternion" DefaultValue="Quaternion.Identity" Animated="true"/>
+        <Property Name="Scale" Type="Vector3" DefaultValue="new Vector3(1, 1, 1)" Animated="true"/>
+        <Property Name="TransformMatrix" Type="Matrix4x4" DefaultValue="Matrix4x4.Identity" Animated="true"/>
+        <Property Name="AdornedVisual" Type="CompositionVisual?" Internal="true" />
+        <Property Name="OpacityMaskBrush" Type="Avalonia.Media.IBrush?" Internal="true" />
+    </Object>
+    <Object Name="CompositionContainerVisual" Inherits="CompositionVisual"/>
+    <List Name="CompositionVisualCollection" ItemType="CompositionVisual" CustomCtor="true"/>
+    <Object Name="CompositionTarget" CustomServerCtor="true">
+        <Property Name="Root" Type="CompositionVisual?"/>
+        <Property Name="IsEnabled" Type="bool"/>
+        <Property Name="DrawDirtyRects" Type="bool"/>
+        <Property Name="DrawFps" Type="bool"/>
+        <Property Name="Scaling" Type="double"/>
+        <Property Name="Size" Type="Size" />
+    </Object>
+    <KeyFrameAnimation Name="Scalar" Type="float"/>
+    <KeyFrameAnimation Name="Boolean" Type="bool"/>
+    <KeyFrameAnimation Name="Color" Type="Avalonia.Media.Color"/>
+    <KeyFrameAnimation Type="Vector2"/>
+    <KeyFrameAnimation Type="Vector3"/>
+    <KeyFrameAnimation Type="Vector4"/>
+    <KeyFrameAnimation Type="Quaternion"/>
+</NComposition>
\ No newline at end of file
diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
index e864ea2007..74debed828 100644
--- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -9,6 +9,11 @@
         <NoWarn>NU1605;CS8632</NoWarn>
     </PropertyGroup>
 
+    <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
+    <PropertyGroup>
+      <EnableNETAnalyzers>false</EnableNETAnalyzers>
+    </PropertyGroup>
+
     <ItemGroup>
       <Compile Include="../Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs">
         <Link>Shared/AvaloniaResourcesIndex.cs</Link>
@@ -50,6 +55,7 @@
       <Compile Include="../Avalonia.Base/Utilities/MathUtilities.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
+      <Compile Include="..\Avalonia.Base\Utilities\StringBuilderCache.cs" Link="Utilities\StringBuilderCache.cs" />
       <Compile Include="..\Markup\Avalonia.Markup\Markup\Parsers\ArgumentListParser.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
@@ -62,37 +68,51 @@
       <Compile Include="../Avalonia.Base/Utilities/StyleClassParser.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Thickness.cs">
+      <Compile Include="../Avalonia.Base/Thickness.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Size.cs">
+      <Compile Include="../Avalonia.Base/Size.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Vector.cs">
+      <Compile Include="../Avalonia.Base/Vector.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Point.cs">
+      <Compile Include="../Avalonia.Base/Point.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Matrix.cs">
+      <Compile Include="../Avalonia.Base/Matrix.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/CornerRadius.cs">
+      <Compile Include="../Avalonia.Base/CornerRadius.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Media/Color.cs">
+      <Compile Include="../Avalonia.Base/Media/Color.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Media/KnownColors.cs">
+      <Compile Include="../Avalonia.Base/Media/HslColor.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Media/HsvColor.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Media/KnownColors.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
       <Compile Include="../Avalonia.Controls/GridLength.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
+      <Compile Include="../Avalonia.Base/Data/BindingPriority.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/RelativePoint.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
       <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\**\obj\**\*.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX\IL\SreTypeSystem.cs" />
-      <PackageReference Include="Mono.Cecil" Version="0.11.2" />
+      <PackageReference Include="Mono.Cecil" Version="0.11.4" />
       <PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
+      <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     </ItemGroup>
+  <Import Project="..\..\build\SourceGenerators.props" />
 </Project>
diff --git a/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs b/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
index 66417e7dbb..e501fc650d 100644
--- a/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
+++ b/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
@@ -37,8 +37,7 @@ namespace Avalonia.Build.Tasks
             var res = XamlCompilerTaskExecutor.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
                 ProjectDirectory, OutputPath, VerifyIl, DefaultCompileBindings, outputImportance,
-                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null,
-                EnableComInteropPatching, SkipXamlCompilation, DebuggerLaunch);
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null, SkipXamlCompilation, DebuggerLaunch);
             if (!res.Success)
                 return false;
             if (!res.WrittenFile)
@@ -75,7 +74,6 @@ namespace Avalonia.Build.Tasks
 
         public bool DefaultCompileBindings { get; set; }
         
-        public bool EnableComInteropPatching { get; set; }
         public bool SkipXamlCompilation { get; set; }
         
         public string AssemblyOriginatorKeyFile { get; set; }
diff --git a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
index ae2bf99d1e..38450ea2a2 100644
--- a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
+++ b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Runtime.Serialization.Json;
 using System.Text;
 using Avalonia.Markup.Xaml.PortableXaml;
 using Avalonia.Utilities;
@@ -19,8 +18,6 @@ namespace Avalonia.Build.Tasks
         public string Root { get; set; }
         [Required]
         public string Output { get; set; }
-        [Required]
-        public ITaskItem[] EmbeddedResources { get; set; }
 
         public string ReportImportance { get; set; }
 
@@ -105,7 +102,7 @@ namespace Avalonia.Build.Tasks
         {
             var typeToXamlIndex = new Dictionary<string, string>(); 
             
-            foreach (var s in sources.ToList())
+            foreach (var s in sources.ToArray())
             {
                 if (s.Path.ToLowerInvariant().EndsWith(".xaml") || s.Path.ToLowerInvariant().EndsWith(".paml") || s.Path.ToLowerInvariant().EndsWith(".axaml"))
                 {
@@ -149,10 +146,6 @@ namespace Avalonia.Build.Tasks
             Enum.TryParse<MessageImportance>(ReportImportance, out _reportImportance);
 
             BuildEngine.LogMessage($"GenerateAvaloniaResourcesTask -> Root: {Root}, {Resources?.Count()} resources, Output:{Output}", _reportImportance < MessageImportance.Low ? MessageImportance.High : _reportImportance);
-
-            foreach (var r in EmbeddedResources.Where(r => r.ItemSpec.EndsWith(".xaml") || r.ItemSpec.EndsWith(".paml") || r.ItemSpec.EndsWith(".axaml")))
-                BuildEngine.LogWarning(BuildEngineErrorCode.LegacyResmScheme, r.ItemSpec,
-                    "XAML file is packed using legacy EmbeddedResource/resm scheme, relative URIs won't work");
             var resources = BuildResourceSources();
 
             if (!PreProcessXamlFiles(resources))
diff --git a/src/Avalonia.Build.Tasks/Program.cs b/src/Avalonia.Build.Tasks/Program.cs
index e3f00968fd..f42fab5964 100644
--- a/src/Avalonia.Build.Tasks/Program.cs
+++ b/src/Avalonia.Build.Tasks/Program.cs
@@ -44,8 +44,7 @@ namespace Avalonia.Build.Tasks
                 OutputPath = args[2],
                 BuildEngine = new ConsoleBuildEngine(),
                 ProjectDirectory = Directory.GetCurrentDirectory(),
-                VerifyIl = true,
-                EnableComInteropPatching = true
+                VerifyIl = true
             }.Execute() ?
                 0 :
                 2;
diff --git a/src/Avalonia.Build.Tasks/Properties/launchSettings.json b/src/Avalonia.Build.Tasks/Properties/launchSettings.json
new file mode 100644
index 0000000000..e9f5af46d6
--- /dev/null
+++ b/src/Avalonia.Build.Tasks/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Compile Sandbox": {
+      "commandName": "Project",
+      "executablePath": "$(SolutionDir)\\src\\Avalonia.Build.Tasks\\bin\\Debug\\net6.0\\Avalonia.Build.Tasks.exe",
+      "commandLineArgs": "$(SolutionDir)\\samples\\Sandbox\\obj\\Debug\\net6.0\\Avalonia\\original.dll $(SolutionDir)\\samples\\Sandbox\\bin\\Debug\\net6.0\\Sandbox.dll.refs $(SolutionDir)\\out.dll"
+    }
+  }
+}
diff --git a/src/Avalonia.Build.Tasks/SpanCompat.cs b/src/Avalonia.Build.Tasks/SpanCompat.cs
index 25f8d0175a..be59ff8b6c 100644
--- a/src/Avalonia.Build.Tasks/SpanCompat.cs
+++ b/src/Avalonia.Build.Tasks/SpanCompat.cs
@@ -1,4 +1,7 @@
 #if !NETCOREAPP3_1_OR_GREATER
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
 namespace System
 {
     // This is a hack to enable our span code to work inside MSBuild task without referencing System.Memory
@@ -9,6 +12,8 @@ namespace System
         private int _length;
         public int Length => _length;
 
+        public static implicit operator ReadOnlySpan<T>(string s) => new ReadOnlySpan<T>(s);
+
         public ReadOnlySpan(string s) : this(s, 0, s.Length)
         {
             
@@ -63,8 +68,75 @@ namespace System
             return Slice(start);
         }
 
+        public ReadOnlySpan<char> TrimEnd()
+        {
+            int end = Length - 1;
+            for (; end >= 0; end--)
+            {
+                if (!char.IsWhiteSpace(this[end]))
+                {
+                    break;
+                }
+            }
+            return Slice(0, end + 1);
+        }
+
+        public ReadOnlySpan<char> Trim()
+        {
+            return TrimStart().TrimEnd();
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryParseUInt(NumberStyles style, IFormatProvider provider, out uint value)
+        {
+            return uint.TryParse(ToString(), style, provider, out value);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryParseInt(out int value)
+        {
+            return int.TryParse(ToString(), out value);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryParseDouble(NumberStyles style, IFormatProvider provider, out double value)
+        {
+            return double.TryParse(ToString(), style, provider, out value);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryParseByte(NumberStyles style, IFormatProvider provider, out byte value)
+        {
+            return byte.TryParse(ToString(), style, provider, out value);
+        }
+
         public override string ToString() => _length == 0 ? string.Empty : _s.Substring(_start, _length);
 
+        internal int IndexOf(ReadOnlySpan<char> v, StringComparison ordinal, int start = 0)
+        {
+            if(Length == 0 || v.IsEmpty)
+            {
+                return -1;
+            }
+
+            for (var c = start; c < _length; c++)
+            {
+                if (this[c] == v[0])
+                {
+                    for(var i = 0; i < v.Length; i++)
+                    {
+                        if (this[c + i] != v[i])
+                        {
+                            break;
+                        }
+                    } 
+                    return c;
+                }
+            }
+
+            return -1;
+        }
+
         public static implicit operator ReadOnlySpan<T>(char[] arr) => new ReadOnlySpan<T>(new string(arr));
     }
 
diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
index 5a2c74e16f..f83e07bd74 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
@@ -24,38 +24,6 @@ namespace Avalonia.Build.Tasks
             string Name { get; }
             IEnumerable<IResource> Resources { get; }
         }
-        
-        class EmbeddedResources : IResourceGroup
-        {
-            private readonly AssemblyDefinition _asm;
-            public string Name => "EmbeddedResource";
-
-            public IEnumerable<IResource> Resources => _asm.MainModule.Resources.OfType<EmbeddedResource>()
-                .Select(r => new WrappedResource(_asm, r)).ToList();
-
-            public EmbeddedResources(AssemblyDefinition asm)
-            {
-                _asm = asm;
-            }
-            class WrappedResource : IResource
-            {
-                private readonly AssemblyDefinition _asm;
-                private readonly EmbeddedResource _res;
-
-                public WrappedResource(AssemblyDefinition asm, EmbeddedResource res)
-                {
-                    _asm = asm;
-                    _res = res;
-                }
-
-                public string Uri => $"resm:{Name}?assembly={_asm.Name.Name}";
-                public string Name => _res.Name;
-                public string FilePath => Name;
-                public byte[] FileContents => _res.GetResourceData();
-
-                public void Remove() => _asm.MainModule.Resources.Remove(_res);
-            }
-        }
 
         class AvaloniaResources : IResourceGroup
         {
diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index 52b58c2318..e81ce63b95 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -39,34 +39,31 @@ namespace Avalonia.Build.Tasks
 
         public static CompileResult Compile(IBuildEngine engine, string input, string[] references,
             string projectDirectory,
-            string output, bool verifyIl, bool defaultCompileBindings, MessageImportance logImportance, string strongNameKey, bool patchCom,
+            string output, bool verifyIl, bool defaultCompileBindings, MessageImportance logImportance, string strongNameKey,
             bool skipXamlCompilation)
         {
-            return Compile(engine, input, references, projectDirectory, output, verifyIl, defaultCompileBindings, logImportance, strongNameKey, patchCom, skipXamlCompilation, debuggerLaunch:false);
+            return Compile(engine, input, references, projectDirectory, output, verifyIl, logImportance, strongNameKey, skipXamlCompilation, debuggerLaunch:false);
         }
 
         internal static CompileResult Compile(IBuildEngine engine, string input, string[] references,
             string projectDirectory,
-            string output, bool verifyIl, bool defaultCompileBindings, MessageImportance logImportance, string strongNameKey, bool patchCom, bool skipXamlCompilation, bool debuggerLaunch)
+            string output, bool verifyIl, bool defaultCompileBindings, MessageImportance logImportance, string strongNameKey, bool skipXamlCompilation, bool debuggerLaunch)
         {
-            var typeSystem = new CecilTypeSystem(references
-                .Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll"))
-                .Concat(new[] { input }), input);
+            var typeSystem = new CecilTypeSystem(
+                references.Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll")),
+                input);
 
             var asm = typeSystem.TargetAssemblyDefinition;
 
             if (!skipXamlCompilation)
             {
                 var compileRes = CompileCore(engine, typeSystem, projectDirectory, verifyIl, defaultCompileBindings, logImportance, debuggerLaunch);
-                if (compileRes == null && !patchCom)
+                if (compileRes == null)
                     return new CompileResult(true);
                 if (compileRes == false)
                     return new CompileResult(false);
             }
 
-            if (patchCom)
-                ComInteropHelper.PatchAssembly(asm, typeSystem);
-
             var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
             if (!string.IsNullOrWhiteSpace(strongNameKey))
                 writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
@@ -113,9 +110,8 @@ namespace Avalonia.Build.Tasks
                 }
             }
             var asm = typeSystem.TargetAssemblyDefinition;
-            var emres = new EmbeddedResources(asm);
             var avares = new AvaloniaResources(asm, projectDirectory);
-            if (avares.Resources.Count(CheckXamlName) == 0 && emres.Resources.Count(CheckXamlName) == 0)
+            if (avares.Resources.Count(CheckXamlName) == 0)
                 // Nothing to do
                 return null;
 
@@ -125,6 +121,9 @@ namespace Avalonia.Build.Tasks
             var indexerAccessorClosure = new TypeDefinition("CompiledAvaloniaXaml", "!IndexerAccessorFactoryClosure",
                 TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
             asm.MainModule.Types.Add(indexerAccessorClosure);
+            var trampolineBuilder = new TypeDefinition("CompiledAvaloniaXaml", "XamlIlTrampolines",
+                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
+            asm.MainModule.Types.Add(trampolineBuilder);
 
             var (xamlLanguage , emitConfig) = AvaloniaXamlIlLanguage.Configure(typeSystem);
             var compilerConfig = new AvaloniaXamlIlCompilerConfiguration(typeSystem,
@@ -134,6 +133,7 @@ namespace Avalonia.Build.Tasks
                 AvaloniaXamlIlLanguage.CustomValueConverter,
                 new XamlIlClrPropertyInfoEmitter(typeSystem.CreateTypeBuilder(clrPropertiesDef)),
                 new XamlIlPropertyInfoAccessorFactoryEmitter(typeSystem.CreateTypeBuilder(indexerAccessorClosure)),
+                new XamlIlTrampolineBuilder(typeSystem.CreateTypeBuilder(trampolineBuilder)),
                 new DeterministicIdGenerator());
 
 
@@ -179,10 +179,11 @@ namespace Avalonia.Build.Tasks
 
             var stringEquals = asm.MainModule.ImportReference(asm.MainModule.TypeSystem.String.Resolve().Methods.First(
                 m =>
-                    m.IsStatic && m.Name == "Equals" && m.Parameters.Count == 2 &&
+                    m.IsStatic && m.Name == "Equals" && m.Parameters.Count == 3 &&
                     m.ReturnType.FullName == "System.Boolean"
                     && m.Parameters[0].ParameterType.FullName == "System.String"
-                    && m.Parameters[1].ParameterType.FullName == "System.String"));
+                    && m.Parameters[1].ParameterType.FullName == "System.String"
+                    && m.Parameters[2].ParameterType.FullName == "System.StringComparison"));
             
             bool CompileGroup(IResourceGroup group)
             {
@@ -248,7 +249,8 @@ namespace Avalonia.Build.Tasks
                         var populateBuilder = classTypeDefinition == null ?
                             builder :
                             typeSystem.CreateTypeBuilder(classTypeDefinition);
-                        compiler.Compile(parsed, contextClass,
+                        compiler.Compile(parsed, 
+                            contextClass,
                             compiler.DefinePopulateMethod(populateBuilder, parsed, populateName,
                                 classTypeDefinition == null),
                             buildName == null ? null : compiler.DefineBuildMethod(builder, parsed, buildName, true),
@@ -256,6 +258,8 @@ namespace Avalonia.Build.Tasks
                                 true),
                             (closureName, closureBaseType) =>
                                 populateBuilder.DefineSubType(closureBaseType, closureName, false),
+                            (closureName, returnType, parameterTypes) =>
+                                populateBuilder.DefineDelegateSubType(closureName, false, returnType, parameterTypes),
                             res.Uri, res
                         );
                         
@@ -320,8 +324,8 @@ namespace Avalonia.Build.Tasks
                                         var op = i[c].Operand as MethodReference;
                                         
                                         // TODO: Throw an error
-                                        // This usually happens when same XAML resource was added twice for some weird reason
-                                        // We currently support it for dual-named default theme resource
+                                        // This usually happens when the same XAML resource was added twice for some weird reason
+                                        // We currently support it for dual-named default theme resources
                                         if (op != null
                                             && op.Name == TrampolineName)
                                         {
@@ -382,6 +386,7 @@ namespace Avalonia.Build.Tasks
                                 var nop = Instruction.Create(OpCodes.Nop);
                                 i.Add(Instruction.Create(OpCodes.Ldarg_0));
                                 i.Add(Instruction.Create(OpCodes.Ldstr, res.Uri));
+                                i.Add(Instruction.Create(OpCodes.Ldc_I4, (int)StringComparison.OrdinalIgnoreCase));
                                 i.Add(Instruction.Create(OpCodes.Call, stringEquals));
                                 i.Add(Instruction.Create(OpCodes.Brfalse, nop));
                                 if (parameterlessConstructor != null)
@@ -430,9 +435,6 @@ namespace Avalonia.Build.Tasks
                 return true;
             }
             
-            if (emres.Resources.Count(CheckXamlName) != 0)
-                if (!CompileGroup(emres))
-                    return false;
             if (avares.Resources.Count(CheckXamlName) != 0)
             {
                 if (!CompileGroup(avares))
diff --git a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
new file mode 100644
index 0000000000..e0790795c5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <PackageId>Avalonia.Controls.ColorPicker</PackageId>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />    
+    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <!-- Compatibility with old apps -->
+    <EmbeddedResource Include="Themes\**\*.xaml" />
+  </ItemGroup>
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\EmbedXaml.props" />
+  <Import Project="..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
+  <!--<Import Project="..\..\build\ApiDiff.props" />-->
+  <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs b/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
new file mode 100644
index 0000000000..b1d15d6b17
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
@@ -0,0 +1,41 @@
+// Portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Holds the details of a ColorChanged event.
+    /// </summary>
+    /// <remarks>
+    /// HSV color information is intentionally not provided.
+    /// Use <see cref="Color.ToHsv()"/> to obtain it.
+    /// </remarks>
+    public class ColorChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorChangedEventArgs"/> class.
+        /// </summary>
+        /// <param name="oldColor">The old/original color from before the change event.</param>
+        /// <param name="newColor">The new/updated color that triggered the change event.</param>
+        public ColorChangedEventArgs(Color oldColor, Color newColor)
+        {
+            OldColor = oldColor;
+            NewColor = newColor;
+        }
+
+        /// <summary>
+        /// Gets the old/original color from before the change event.
+        /// </summary>
+        public Color OldColor { get; private set; }
+
+        /// <summary>
+        /// Gets the new/updated color that triggered the change event.
+        /// </summary>
+        public Color NewColor { get; private set; }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorComponent.cs b/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
new file mode 100644
index 0000000000..71725056cf
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component within a color model.
+    /// </summary>
+    public enum ColorComponent
+    {
+        /// <summary>
+        /// Represents the alpha component.
+        /// </summary>
+        Alpha = 0,
+
+        /// <summary>
+        /// Represents the first color component which is Red when RGB or Hue when HSV.
+        /// </summary>
+        Component1 = 1,
+
+        /// <summary>
+        /// Represents the second color component which is Green when RGB or Saturation when HSV.
+        /// </summary>
+        Component2 = 2,
+
+        /// <summary>
+        /// Represents the third color component which is Blue when RGB or Value when HSV.
+        /// </summary>
+        Component3 = 3
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorModel.cs b/src/Avalonia.Controls.ColorPicker/ColorModel.cs
new file mode 100644
index 0000000000..f11b514706
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorModel.cs
@@ -0,0 +1,18 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the model used to represent colors.
+    /// </summary>
+    public enum ColorModel
+    {
+        /// <summary>
+        /// Color is represented by hue, saturation, value and alpha components.
+        /// </summary>
+        Hsva,
+
+        /// <summary>
+        /// Color is represented by red, green, blue and alpha components.
+        /// </summary>
+        Rgba
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatColorPalette.cs
new file mode 100644
index 0000000000..2cc5b99b2e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatColorPalette.cs
@@ -0,0 +1,619 @@
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements a reduced flat design or flat UI color palette.
+    /// </summary>
+    /// <remarks>
+    /// See:
+    ///  - https://htmlcolorcodes.com/color-chart/
+    ///  - https://htmlcolorcodes.com/color-chart/flat-design-color-chart/
+    ///  - http://designmodo.github.io/Flat-UI/
+    ///
+    /// The GitHub project is licensed as MIT: https://github.com/designmodo/Flat-UI.
+    ///
+    /// </remarks>
+    public class FlatColorPalette : IColorPalette
+    {
+        /// <summary>
+        /// Defines all colors in the <see cref="FlatColorPalette"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is done in an enum to ensure it is compiled into the assembly improving
+        /// startup performance.
+        /// </remarks>
+        public enum FlatColor : uint
+        {
+            // Pomegranate
+            Pomegranate1  = 0xFFF9EBEA,
+            Pomegranate2  = 0xFFF2D7D5,
+            Pomegranate3  = 0xFFE6B0AA,
+            Pomegranate4  = 0xFFD98880,
+            Pomegranate5  = 0xFFCD6155,
+            Pomegranate6  = 0xFFC0392B,
+            Pomegranate7  = 0xFFA93226,
+            Pomegranate8  = 0xFF922B21,
+            Pomegranate9  = 0xFF7B241C,
+            Pomegranate10 = 0xFF641E16,
+
+            // Alizarin
+            Alizarin1  = 0xFFFDEDEC,
+            Alizarin2  = 0xFFFADBD8,
+            Alizarin3  = 0xFFF5B7B1,
+            Alizarin4  = 0xFFF1948A,
+            Alizarin5  = 0xFFEC7063,
+            Alizarin6  = 0xFFE74C3C,
+            Alizarin7  = 0xFFCB4335,
+            Alizarin8  = 0xFFB03A2E,
+            Alizarin9  = 0xFF943126,
+            Alizarin10 = 0xFF78281F,
+
+            // Amethyst
+            Amethyst1  = 0xFFF5EEF8,
+            Amethyst2  = 0xFFEBDEF0,
+            Amethyst3  = 0xFFD7BDE2,
+            Amethyst4  = 0xFFC39BD3,
+            Amethyst5  = 0xFFAF7AC5,
+            Amethyst6  = 0xFF9B59B6,
+            Amethyst7  = 0xFF884EA0,
+            Amethyst8  = 0xFF76448A,
+            Amethyst9  = 0xFF633974,
+            Amethyst10 = 0xFF512E5F,
+
+            // Wisteria
+            Wisteria1  = 0xFFF4ECF7,
+            Wisteria2  = 0xFFE8DAEF,
+            Wisteria3  = 0xFFD2B4DE,
+            Wisteria4  = 0xFFBB8FCE,
+            Wisteria5  = 0xFFA569BD,
+            Wisteria6  = 0xFF8E44AD,
+            Wisteria7  = 0xFF7D3C98,
+            Wisteria8  = 0xFF6C3483,
+            Wisteria9  = 0xFF5B2C6F,
+            Wisteria10 = 0xFF4A235A,
+
+            // Belize Hole
+            BelizeHole1  = 0xFFEAF2F8,
+            BelizeHole2  = 0xFFD4E6F1,
+            BelizeHole3  = 0xFFA9CCE3,
+            BelizeHole4  = 0xFF7FB3D5,
+            BelizeHole5  = 0xFF5499C7,
+            BelizeHole6  = 0xFF2980B9,
+            BelizeHole7  = 0xFF2471A3,
+            BelizeHole8  = 0xFF1F618D,
+            BelizeHole9  = 0xFF1A5276,
+            BelizeHole10 = 0xFF154360,
+
+            // Peter River
+            PeterRiver1  = 0xFFEBF5FB,
+            PeterRiver2  = 0xFFD6EAF8,
+            PeterRiver3  = 0xFFAED6F1,
+            PeterRiver4  = 0xFF85C1E9,
+            PeterRiver5  = 0xFF5DADE2,
+            PeterRiver6  = 0xFF3498DB,
+            PeterRiver7  = 0xFF2E86C1,
+            PeterRiver8  = 0xFF2874A6,
+            PeterRiver9  = 0xFF21618C,
+            PeterRiver10 = 0xFF1B4F72,
+
+            // Turquoise
+            Turquoise1  = 0xFFE8F8F5,
+            Turquoise2  = 0xFFD1F2EB,
+            Turquoise3  = 0xFFA3E4D7,
+            Turquoise4  = 0xFF76D7C4,
+            Turquoise5  = 0xFF48C9B0,
+            Turquoise6  = 0xFF1ABC9C,
+            Turquoise7  = 0xFF17A589,
+            Turquoise8  = 0xFF148F77,
+            Turquoise9  = 0xFF117864,
+            Turquoise10 = 0xFF0E6251,
+
+            // Green Sea
+            GreenSea1  = 0xFFE8F6F3,
+            GreenSea2  = 0xFFD0ECE7,
+            GreenSea3  = 0xFFA2D9CE,
+            GreenSea4  = 0xFF73C6B6,
+            GreenSea5  = 0xFF45B39D,
+            GreenSea6  = 0xFF16A085,
+            GreenSea7  = 0xFF138D75,
+            GreenSea8  = 0xFF117A65,
+            GreenSea9  = 0xFF0E6655,
+            GreenSea10 = 0xFF0B5345,
+
+            // Nephritis
+            Nephritis1  = 0xFFE9F7EF,
+            Nephritis2  = 0xFFD4EFDF,
+            Nephritis3  = 0xFFA9DFBF,
+            Nephritis4  = 0xFF7DCEA0,
+            Nephritis5  = 0xFF52BE80,
+            Nephritis6  = 0xFF27AE60,
+            Nephritis7  = 0xFF229954,
+            Nephritis8  = 0xFF1E8449,
+            Nephritis9  = 0xFF196F3D,
+            Nephritis10 = 0xFF145A32,
+
+            // Emerald
+            Emerald1  = 0xFFEAFAF1,
+            Emerald2  = 0xFFD5F5E3,
+            Emerald3  = 0xFFABEBC6,
+            Emerald4  = 0xFF82E0AA,
+            Emerald5  = 0xFF58D68D,
+            Emerald6  = 0xFF2ECC71,
+            Emerald7  = 0xFF28B463,
+            Emerald8  = 0xFF239B56,
+            Emerald9  = 0xFF1D8348,
+            Emerald10 = 0xFF186A3B,
+
+            // Sunflower
+            Sunflower1  = 0xFFFEF9E7,
+            Sunflower2  = 0xFFFCF3CF,
+            Sunflower3  = 0xFFF9E79F,
+            Sunflower4  = 0xFFF7DC6F,
+            Sunflower5  = 0xFFF4D03F,
+            Sunflower6  = 0xFFF1C40F,
+            Sunflower7  = 0xFFD4AC0D,
+            Sunflower8  = 0xFFB7950B,
+            Sunflower9  = 0xFF9A7D0A,
+            Sunflower10 = 0xFF7D6608,
+
+            // Orange
+            Orange1  = 0xFFFEF5E7,
+            Orange2  = 0xFFFDEBD0,
+            Orange3  = 0xFFFAD7A0,
+            Orange4  = 0xFFF8C471,
+            Orange5  = 0xFFF5B041,
+            Orange6  = 0xFFF39C12,
+            Orange7  = 0xFFD68910,
+            Orange8  = 0xFFB9770E,
+            Orange9  = 0xFF9C640C,
+            Orange10 = 0xFF7E5109,
+
+            // Carrot
+            Carrot1  = 0xFFFDF2E9,
+            Carrot2  = 0xFFFAE5D3,
+            Carrot3  = 0xFFF5CBA7,
+            Carrot4  = 0xFFF0B27A,
+            Carrot5  = 0xFFEB984E,
+            Carrot6  = 0xFFE67E22,
+            Carrot7  = 0xFFCA6F1E,
+            Carrot8  = 0xFFAF601A,
+            Carrot9  = 0xFF935116,
+            Carrot10 = 0xFF784212,
+
+            // Pumpkin
+            Pumpkin1  = 0xFFFBEEE6,
+            Pumpkin2  = 0xFFF6DDCC,
+            Pumpkin3  = 0xFFEDBB99,
+            Pumpkin4  = 0xFFE59866,
+            Pumpkin5  = 0xFFDC7633,
+            Pumpkin6  = 0xFFD35400,
+            Pumpkin7  = 0xFFBA4A00,
+            Pumpkin8  = 0xFFA04000,
+            Pumpkin9  = 0xFF873600,
+            Pumpkin10 = 0xFF6E2C00,
+
+            // Clouds
+            Clouds1  = 0xFFFDFEFE,
+            Clouds2  = 0xFFFBFCFC,
+            Clouds3  = 0xFFF7F9F9,
+            Clouds4  = 0xFFF4F6F7,
+            Clouds5  = 0xFFF0F3F4,
+            Clouds6  = 0xFFECF0F1,
+            Clouds7  = 0xFFD0D3D4,
+            Clouds8  = 0xFFB3B6B7,
+            Clouds9  = 0xFF979A9A,
+            Clouds10 = 0xFF7B7D7D,
+
+            // Silver
+            Silver1  = 0xFFF8F9F9,
+            Silver2  = 0xFFF2F3F4,
+            Silver3  = 0xFFE5E7E9,
+            Silver4  = 0xFFD7DBDD,
+            Silver5  = 0xFFCACFD2,
+            Silver6  = 0xFFBDC3C7,
+            Silver7  = 0xFFA6ACAF,
+            Silver8  = 0xFF909497,
+            Silver9  = 0xFF797D7F,
+            Silver10 = 0xFF626567,
+
+            // Concrete
+            Concrete1  = 0xFFF4F6F6,
+            Concrete2  = 0xFFEAEDED,
+            Concrete3  = 0xFFD5DBDB,
+            Concrete4  = 0xFFBFC9CA,
+            Concrete5  = 0xFFAAB7B8,
+            Concrete6  = 0xFF95A5A6,
+            Concrete7  = 0xFF839192,
+            Concrete8  = 0xFF717D7E,
+            Concrete9  = 0xFF5F6A6A,
+            Concrete10 = 0xFF4D5656,
+
+            // Asbestos
+            Asbestos1  = 0xFFF2F4F4,
+            Asbestos2  = 0xFFE5E8E8,
+            Asbestos3  = 0xFFCCD1D1,
+            Asbestos4  = 0xFFB2BABB,
+            Asbestos5  = 0xFF99A3A4,
+            Asbestos6  = 0xFF7F8C8D,
+            Asbestos7  = 0xFF707B7C,
+            Asbestos8  = 0xFF616A6B,
+            Asbestos9  = 0xFF515A5A,
+            Asbestos10 = 0xFF424949,
+
+            // Wet Asphalt
+            WetAsphalt1  = 0xFFEBEDEF,
+            WetAsphalt2  = 0xFFD6DBDF,
+            WetAsphalt3  = 0xFFAEB6BF,
+            WetAsphalt4  = 0xFF85929E,
+            WetAsphalt5  = 0xFF5D6D7E,
+            WetAsphalt6  = 0xFF34495E,
+            WetAsphalt7  = 0xFF2E4053,
+            WetAsphalt8  = 0xFF283747,
+            WetAsphalt9  = 0xFF212F3C,
+            WetAsphalt10 = 0xFF1B2631,
+
+            // Midnight Blue
+            MidnightBlue1  = 0xFFEAECEE,
+            MidnightBlue2  = 0xFFD5D8DC,
+            MidnightBlue3  = 0xFFABB2B9,
+            MidnightBlue4  = 0xFF808B96,
+            MidnightBlue5  = 0xFF566573,
+            MidnightBlue6  = 0xFF2C3E50,
+            MidnightBlue7  = 0xFF273746,
+            MidnightBlue8  = 0xFF212F3D,
+            MidnightBlue9  = 0xFF1C2833,
+            MidnightBlue10 = 0xFF17202A,
+
+            Pomegranate  = Pomegranate3,
+            Alizarin     = Alizarin3,
+            Amethyst     = Amethyst3,
+            Wisteria     = Wisteria3,
+            BelizeHole   = BelizeHole3,
+            PeterRiver   = PeterRiver3,
+            Turquoise    = Turquoise3,
+            GreenSea     = GreenSea3,
+            Nephritis    = Nephritis3,
+            Emerald      = Emerald3,
+            Sunflower    = Sunflower3,
+            Orange       = Orange3,
+            Carrot       = Carrot3,
+            Pumpkin      = Pumpkin3,
+            Clouds       = Clouds3,
+            Silver       = Silver3,
+            Concrete     = Concrete3,
+            Asbestos     = Asbestos3,
+            WetAsphalt   = WetAsphalt3,
+            MidnightBlue = MidnightBlue3,
+        };
+
+        // See: https://htmlcolorcodes.com/assets/downloads/flat-design-colors/flat-design-color-chart.png
+        protected static Color[,]? _colorChart = null;
+        protected static object _colorChartMutex = new object();
+
+        /// <summary>
+        /// Initializes all color chart colors.
+        /// </summary>
+        protected void InitColorChart()
+        {
+            lock (_colorChartMutex)
+            {
+                if (_colorChart != null)
+                {
+                    return;
+                }
+
+                _colorChart = new Color[,]
+                {
+                    // Pomegranate
+                    {
+                        Color.FromUInt32((uint)FlatColor.Pomegranate1),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate2),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate3),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate4),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate5),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate6),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate7),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate8),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate9),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate10),
+                    },
+
+                    // Alizarin
+                    {
+                        Color.FromUInt32((uint)FlatColor.Alizarin1),
+                        Color.FromUInt32((uint)FlatColor.Alizarin2),
+                        Color.FromUInt32((uint)FlatColor.Alizarin3),
+                        Color.FromUInt32((uint)FlatColor.Alizarin4),
+                        Color.FromUInt32((uint)FlatColor.Alizarin5),
+                        Color.FromUInt32((uint)FlatColor.Alizarin6),
+                        Color.FromUInt32((uint)FlatColor.Alizarin7),
+                        Color.FromUInt32((uint)FlatColor.Alizarin8),
+                        Color.FromUInt32((uint)FlatColor.Alizarin9),
+                        Color.FromUInt32((uint)FlatColor.Alizarin10),
+                    },
+
+                    // Amethyst
+                    {
+                        Color.FromUInt32((uint)FlatColor.Amethyst1),
+                        Color.FromUInt32((uint)FlatColor.Amethyst2),
+                        Color.FromUInt32((uint)FlatColor.Amethyst3),
+                        Color.FromUInt32((uint)FlatColor.Amethyst4),
+                        Color.FromUInt32((uint)FlatColor.Amethyst5),
+                        Color.FromUInt32((uint)FlatColor.Amethyst6),
+                        Color.FromUInt32((uint)FlatColor.Amethyst7),
+                        Color.FromUInt32((uint)FlatColor.Amethyst8),
+                        Color.FromUInt32((uint)FlatColor.Amethyst9),
+                        Color.FromUInt32((uint)FlatColor.Amethyst10),
+                    },
+
+                    // Wisteria
+                    {
+                        Color.FromUInt32((uint)FlatColor.Wisteria1),
+                        Color.FromUInt32((uint)FlatColor.Wisteria2),
+                        Color.FromUInt32((uint)FlatColor.Wisteria3),
+                        Color.FromUInt32((uint)FlatColor.Wisteria4),
+                        Color.FromUInt32((uint)FlatColor.Wisteria5),
+                        Color.FromUInt32((uint)FlatColor.Wisteria6),
+                        Color.FromUInt32((uint)FlatColor.Wisteria7),
+                        Color.FromUInt32((uint)FlatColor.Wisteria8),
+                        Color.FromUInt32((uint)FlatColor.Wisteria9),
+                        Color.FromUInt32((uint)FlatColor.Wisteria10),
+                    },
+
+                    // Belize Hole
+                    {
+                        Color.FromUInt32((uint)FlatColor.BelizeHole1),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole2),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole3),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole4),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole5),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole6),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole7),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole8),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole9),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole10),
+                    },
+
+                    // Peter River
+                    {
+                        Color.FromUInt32((uint)FlatColor.PeterRiver1),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver2),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver3),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver4),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver5),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver6),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver7),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver8),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver9),
+                        Color.FromUInt32((uint)FlatColor.PeterRiver10),
+                    },
+
+                    // Turquoise
+                    {
+                        Color.FromUInt32((uint)FlatColor.Turquoise1),
+                        Color.FromUInt32((uint)FlatColor.Turquoise2),
+                        Color.FromUInt32((uint)FlatColor.Turquoise3),
+                        Color.FromUInt32((uint)FlatColor.Turquoise4),
+                        Color.FromUInt32((uint)FlatColor.Turquoise5),
+                        Color.FromUInt32((uint)FlatColor.Turquoise6),
+                        Color.FromUInt32((uint)FlatColor.Turquoise7),
+                        Color.FromUInt32((uint)FlatColor.Turquoise8),
+                        Color.FromUInt32((uint)FlatColor.Turquoise9),
+                        Color.FromUInt32((uint)FlatColor.Turquoise10),
+                    },
+
+                    // Green Sea
+                    {
+                        Color.FromUInt32((uint)FlatColor.GreenSea1),
+                        Color.FromUInt32((uint)FlatColor.GreenSea2),
+                        Color.FromUInt32((uint)FlatColor.GreenSea3),
+                        Color.FromUInt32((uint)FlatColor.GreenSea4),
+                        Color.FromUInt32((uint)FlatColor.GreenSea5),
+                        Color.FromUInt32((uint)FlatColor.GreenSea6),
+                        Color.FromUInt32((uint)FlatColor.GreenSea7),
+                        Color.FromUInt32((uint)FlatColor.GreenSea8),
+                        Color.FromUInt32((uint)FlatColor.GreenSea9),
+                        Color.FromUInt32((uint)FlatColor.GreenSea10),
+                    },
+
+                    // Nephritis
+                    {
+                        Color.FromUInt32((uint)FlatColor.Nephritis1),
+                        Color.FromUInt32((uint)FlatColor.Nephritis2),
+                        Color.FromUInt32((uint)FlatColor.Nephritis3),
+                        Color.FromUInt32((uint)FlatColor.Nephritis4),
+                        Color.FromUInt32((uint)FlatColor.Nephritis5),
+                        Color.FromUInt32((uint)FlatColor.Nephritis6),
+                        Color.FromUInt32((uint)FlatColor.Nephritis7),
+                        Color.FromUInt32((uint)FlatColor.Nephritis8),
+                        Color.FromUInt32((uint)FlatColor.Nephritis9),
+                        Color.FromUInt32((uint)FlatColor.Nephritis10),
+                    },
+
+                    // Emerald
+                    {
+                        Color.FromUInt32((uint)FlatColor.Emerald1),
+                        Color.FromUInt32((uint)FlatColor.Emerald2),
+                        Color.FromUInt32((uint)FlatColor.Emerald3),
+                        Color.FromUInt32((uint)FlatColor.Emerald4),
+                        Color.FromUInt32((uint)FlatColor.Emerald5),
+                        Color.FromUInt32((uint)FlatColor.Emerald6),
+                        Color.FromUInt32((uint)FlatColor.Emerald7),
+                        Color.FromUInt32((uint)FlatColor.Emerald8),
+                        Color.FromUInt32((uint)FlatColor.Emerald9),
+                        Color.FromUInt32((uint)FlatColor.Emerald10),
+                    },
+
+                    // Sunflower
+                    {
+                        Color.FromUInt32((uint)FlatColor.Sunflower1),
+                        Color.FromUInt32((uint)FlatColor.Sunflower2),
+                        Color.FromUInt32((uint)FlatColor.Sunflower3),
+                        Color.FromUInt32((uint)FlatColor.Sunflower4),
+                        Color.FromUInt32((uint)FlatColor.Sunflower5),
+                        Color.FromUInt32((uint)FlatColor.Sunflower6),
+                        Color.FromUInt32((uint)FlatColor.Sunflower7),
+                        Color.FromUInt32((uint)FlatColor.Sunflower8),
+                        Color.FromUInt32((uint)FlatColor.Sunflower9),
+                        Color.FromUInt32((uint)FlatColor.Sunflower10),
+                    },
+
+                    // Orange
+                    {
+                        Color.FromUInt32((uint)FlatColor.Orange1),
+                        Color.FromUInt32((uint)FlatColor.Orange2),
+                        Color.FromUInt32((uint)FlatColor.Orange3),
+                        Color.FromUInt32((uint)FlatColor.Orange4),
+                        Color.FromUInt32((uint)FlatColor.Orange5),
+                        Color.FromUInt32((uint)FlatColor.Orange6),
+                        Color.FromUInt32((uint)FlatColor.Orange7),
+                        Color.FromUInt32((uint)FlatColor.Orange8),
+                        Color.FromUInt32((uint)FlatColor.Orange9),
+                        Color.FromUInt32((uint)FlatColor.Orange10),
+                    },
+
+                    // Carrot
+                    {
+                        Color.FromUInt32((uint)FlatColor.Carrot1),
+                        Color.FromUInt32((uint)FlatColor.Carrot2),
+                        Color.FromUInt32((uint)FlatColor.Carrot3),
+                        Color.FromUInt32((uint)FlatColor.Carrot4),
+                        Color.FromUInt32((uint)FlatColor.Carrot5),
+                        Color.FromUInt32((uint)FlatColor.Carrot6),
+                        Color.FromUInt32((uint)FlatColor.Carrot7),
+                        Color.FromUInt32((uint)FlatColor.Carrot8),
+                        Color.FromUInt32((uint)FlatColor.Carrot9),
+                        Color.FromUInt32((uint)FlatColor.Carrot10),
+                    },
+
+                    // Pumpkin
+                    {
+                        Color.FromUInt32((uint)FlatColor.Pumpkin1),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin2),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin3),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin4),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin5),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin6),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin7),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin8),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin9),
+                        Color.FromUInt32((uint)FlatColor.Pumpkin10),
+                    },
+
+                    // Clouds
+                    {
+                        Color.FromUInt32((uint)FlatColor.Clouds1),
+                        Color.FromUInt32((uint)FlatColor.Clouds2),
+                        Color.FromUInt32((uint)FlatColor.Clouds3),
+                        Color.FromUInt32((uint)FlatColor.Clouds4),
+                        Color.FromUInt32((uint)FlatColor.Clouds5),
+                        Color.FromUInt32((uint)FlatColor.Clouds6),
+                        Color.FromUInt32((uint)FlatColor.Clouds7),
+                        Color.FromUInt32((uint)FlatColor.Clouds8),
+                        Color.FromUInt32((uint)FlatColor.Clouds9),
+                        Color.FromUInt32((uint)FlatColor.Clouds10),
+                    },
+
+                    // Silver
+                    {
+                        Color.FromUInt32((uint)FlatColor.Silver1),
+                        Color.FromUInt32((uint)FlatColor.Silver2),
+                        Color.FromUInt32((uint)FlatColor.Silver3),
+                        Color.FromUInt32((uint)FlatColor.Silver4),
+                        Color.FromUInt32((uint)FlatColor.Silver5),
+                        Color.FromUInt32((uint)FlatColor.Silver6),
+                        Color.FromUInt32((uint)FlatColor.Silver7),
+                        Color.FromUInt32((uint)FlatColor.Silver8),
+                        Color.FromUInt32((uint)FlatColor.Silver9),
+                        Color.FromUInt32((uint)FlatColor.Silver10),
+                    },
+
+                    // Concrete
+                    {
+                        Color.FromUInt32((uint)FlatColor.Concrete1),
+                        Color.FromUInt32((uint)FlatColor.Concrete2),
+                        Color.FromUInt32((uint)FlatColor.Concrete3),
+                        Color.FromUInt32((uint)FlatColor.Concrete4),
+                        Color.FromUInt32((uint)FlatColor.Concrete5),
+                        Color.FromUInt32((uint)FlatColor.Concrete6),
+                        Color.FromUInt32((uint)FlatColor.Concrete7),
+                        Color.FromUInt32((uint)FlatColor.Concrete8),
+                        Color.FromUInt32((uint)FlatColor.Concrete9),
+                        Color.FromUInt32((uint)FlatColor.Concrete10),
+                    },
+
+                    // Asbestos
+                    {
+                        Color.FromUInt32((uint)FlatColor.Asbestos1),
+                        Color.FromUInt32((uint)FlatColor.Asbestos2),
+                        Color.FromUInt32((uint)FlatColor.Asbestos3),
+                        Color.FromUInt32((uint)FlatColor.Asbestos4),
+                        Color.FromUInt32((uint)FlatColor.Asbestos5),
+                        Color.FromUInt32((uint)FlatColor.Asbestos6),
+                        Color.FromUInt32((uint)FlatColor.Asbestos7),
+                        Color.FromUInt32((uint)FlatColor.Asbestos8),
+                        Color.FromUInt32((uint)FlatColor.Asbestos9),
+                        Color.FromUInt32((uint)FlatColor.Asbestos10),
+                    },
+
+                    // Wet Asphalt
+                    {
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt1),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt2),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt3),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt4),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt5),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt6),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt7),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt8),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt9),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt10),
+                    },
+
+                    // Midnight Blue
+                    {
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue1),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue2),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue3),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue4),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue5),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue6),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue7),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue8),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue9),
+                        Color.FromUInt32((uint)FlatColor.MidnightBlue10),
+                    },
+                };
+            }
+
+            return;
+        }
+
+        /// <inheritdoc/>
+        public int ColorCount
+        {
+            get => 20;
+        }
+
+        /// <inheritdoc/>
+        public int ShadeCount
+        {
+            get => 10;
+        }
+
+        /// <inheritdoc/>
+        public Color GetColor(int colorIndex, int shadeIndex)
+        {
+            if (_colorChart == null)
+            {
+                InitColorChart();
+            }
+
+            return _colorChart![
+                MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+                MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)];
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatHalfColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatHalfColorPalette.cs
new file mode 100644
index 0000000000..2758124fae
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatHalfColorPalette.cs
@@ -0,0 +1,150 @@
+using Avalonia.Media;
+using Avalonia.Utilities;
+using FlatColor = Avalonia.Controls.FlatColorPalette.FlatColor;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements half of the <see cref="FlatColorPalette"/> for improved usability.
+    /// </summary>
+    /// <inheritdoc cref="FlatColorPalette"/>
+    public class FlatHalfColorPalette : IColorPalette
+    {
+        protected static Color[,]? _colorChart = null;
+        protected static object _colorChartMutex = new object();
+
+        /// <summary>
+        /// Initializes all color chart colors.
+        /// </summary>
+        protected void InitColorChart()
+        {
+            lock (_colorChartMutex)
+            {
+                if (_colorChart != null)
+                {
+                    return;
+                }
+
+                _colorChart = new Color[,]
+                {
+                    // Pomegranate
+                    {
+                        Color.FromUInt32((uint)FlatColor.Pomegranate1),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate3),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate5),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate7),
+                        Color.FromUInt32((uint)FlatColor.Pomegranate9),
+                    },
+
+                    // Amethyst
+                    {
+                        Color.FromUInt32((uint)FlatColor.Amethyst1),
+                        Color.FromUInt32((uint)FlatColor.Amethyst3),
+                        Color.FromUInt32((uint)FlatColor.Amethyst5),
+                        Color.FromUInt32((uint)FlatColor.Amethyst7),
+                        Color.FromUInt32((uint)FlatColor.Amethyst9),
+                    },
+
+                    // Belize Hole
+                    {
+                        Color.FromUInt32((uint)FlatColor.BelizeHole1),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole3),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole5),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole7),
+                        Color.FromUInt32((uint)FlatColor.BelizeHole9),
+                    },
+
+                    // Turquoise
+                    {
+                        Color.FromUInt32((uint)FlatColor.Turquoise1),
+                        Color.FromUInt32((uint)FlatColor.Turquoise3),
+                        Color.FromUInt32((uint)FlatColor.Turquoise5),
+                        Color.FromUInt32((uint)FlatColor.Turquoise7),
+                        Color.FromUInt32((uint)FlatColor.Turquoise9),
+                    },
+
+                    // Nephritis
+                    {
+                        Color.FromUInt32((uint)FlatColor.Nephritis1),
+                        Color.FromUInt32((uint)FlatColor.Nephritis3),
+                        Color.FromUInt32((uint)FlatColor.Nephritis5),
+                        Color.FromUInt32((uint)FlatColor.Nephritis7),
+                        Color.FromUInt32((uint)FlatColor.Nephritis9),
+                    },
+
+                    // Sunflower
+                    {
+                        Color.FromUInt32((uint)FlatColor.Sunflower1),
+                        Color.FromUInt32((uint)FlatColor.Sunflower3),
+                        Color.FromUInt32((uint)FlatColor.Sunflower5),
+                        Color.FromUInt32((uint)FlatColor.Sunflower7),
+                        Color.FromUInt32((uint)FlatColor.Sunflower9),
+                    },
+
+                    // Carrot
+                    {
+                        Color.FromUInt32((uint)FlatColor.Carrot1),
+                        Color.FromUInt32((uint)FlatColor.Carrot3),
+                        Color.FromUInt32((uint)FlatColor.Carrot5),
+                        Color.FromUInt32((uint)FlatColor.Carrot7),
+                        Color.FromUInt32((uint)FlatColor.Carrot9),
+                    },
+
+                    // Clouds
+                    {
+                        Color.FromUInt32((uint)FlatColor.Clouds1),
+                        Color.FromUInt32((uint)FlatColor.Clouds3),
+                        Color.FromUInt32((uint)FlatColor.Clouds5),
+                        Color.FromUInt32((uint)FlatColor.Clouds7),
+                        Color.FromUInt32((uint)FlatColor.Clouds9),
+                    },
+
+                    // Concrete
+                    {
+                        Color.FromUInt32((uint)FlatColor.Concrete1),
+                        Color.FromUInt32((uint)FlatColor.Concrete3),
+                        Color.FromUInt32((uint)FlatColor.Concrete5),
+                        Color.FromUInt32((uint)FlatColor.Concrete7),
+                        Color.FromUInt32((uint)FlatColor.Concrete9),
+                    },
+
+                    // Wet Asphalt
+                    {
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt1),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt3),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt5),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt7),
+                        Color.FromUInt32((uint)FlatColor.WetAsphalt9),
+                    },
+                };
+            }
+
+            return;
+        }
+
+        /// <inheritdoc/>
+        public int ColorCount
+        {
+            get => 10;
+        }
+
+        /// <inheritdoc/>
+        public int ShadeCount
+        {
+            get => 5;
+        }
+
+        /// <inheritdoc/>
+        public Color GetColor(int colorIndex, int shadeIndex)
+        {
+            if (_colorChart == null)
+            {
+                InitColorChart();
+            }
+
+            return _colorChart![
+                MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+                MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)];
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/FluentColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FluentColorPalette.cs
new file mode 100644
index 0000000000..013e69ce20
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/FluentColorPalette.cs
@@ -0,0 +1,136 @@
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements the standard Windows 10 color palette.
+    /// </summary>
+    public class FluentColorPalette : IColorPalette
+    {
+        // Values were taken from the Settings App, Personalization > Colors which match with
+        // https://docs.microsoft.com/en-us/windows/uwp/whats-new/windows-docs-december-2017
+        //
+        // The default ordering and grouping of colors was undesirable so was modified.
+        // Colors were transposed: the colors in rows within the Settings app became columns here.
+        // This is because columns in an IColorPalette generally should contain different shades of
+        // the same color. In the settings app this concept is somewhat loosely reversed.
+        // The first 'column' ordering, after being transposed, was then reversed so 'red' colors
+        // were near to each other.
+        //
+        // This new ordering most closely follows the Windows standard while:
+        //
+        //  1. Keeping colors in a 'spectrum' order
+        //  2. Keeping like colors next to each both in rows and columns
+        //     (which is unique for the windows palette).
+        //     For example, similar red colors are next to each other in both
+        //     rows within the same column and rows within the column next to it.
+        //     This follows a 'snake-like' pattern as illustrated below.
+        //  3. A downside of this ordering is colors don't follow strict 'shades'
+        //     as in other palettes.
+        //
+        // The colors will be displayed in the below pattern.
+        // This pattern follows a spectrum while keeping like-colors near to one
+        // another across both rows and columns.
+        //
+        //      ┌Red───┐      ┌Blue──┐      ┌Gray──┐
+        //      │      │      │      │      │      |
+        //      │      │      │      │      │      |
+        // Yellow      └Violet┘      └Green─┘      Brown
+
+        private static Color[,] colorChart = new Color[,]
+        {
+            {
+                // Ordering reversed for this section only
+                Color.FromArgb(255, 255,  67,  67), /* #FF4343 */
+                Color.FromArgb(255, 209,  52,  56), /* #D13438 */
+                Color.FromArgb(255, 239, 105,  80), /* #EF6950 */
+                Color.FromArgb(255, 218,  59,   1), /* #DA3B01 */
+                Color.FromArgb(255, 202,  80,  16), /* #CA5010 */
+                Color.FromArgb(255, 247,  99,  12), /* #F7630C */
+                Color.FromArgb(255, 255, 140,   0), /* #FF8C00 */
+                Color.FromArgb(255, 255, 185,   0), /* #FFB900 */
+            },
+            {
+                Color.FromArgb(255, 231,  72,  86), /* #E74856 */
+                Color.FromArgb(255, 232,  17,  35), /* #E81123 */
+                Color.FromArgb(255, 234,   0,  94), /* #EA005E */
+                Color.FromArgb(255, 195,   0,  82), /* #C30052 */
+                Color.FromArgb(255, 227,   0, 140), /* #E3008C */
+                Color.FromArgb(255, 191,   0, 119), /* #BF0077 */
+                Color.FromArgb(255, 194,  57, 179), /* #C239B3 */
+                Color.FromArgb(255, 154,   0, 137), /* #9A0089 */
+            },
+            {
+                Color.FromArgb(255,   0, 120, 215), /* #0078D7 */
+                Color.FromArgb(255,   0,  99, 177), /* #0063B1 */
+                Color.FromArgb(255, 142, 140, 216), /* #8E8CD8 */
+                Color.FromArgb(255, 107, 105, 214), /* #6B69D6 */
+                Color.FromArgb(255, 135, 100, 184), /* #8764B8 */
+                Color.FromArgb(255, 116,  77, 169), /* #744DA9 */
+                Color.FromArgb(255, 177,  70, 194), /* #B146C2 */
+                Color.FromArgb(255, 136,  23, 152), /* #881798 */
+            },
+            {
+                Color.FromArgb(255,   0, 153, 188), /* #0099BC */
+                Color.FromArgb(255,  45, 125, 154), /* #2D7D9A */
+                Color.FromArgb(255,   0, 183, 195), /* #00B7C3 */
+                Color.FromArgb(255,   3, 131, 135), /* #038387 */
+                Color.FromArgb(255,   0, 178, 148), /* #00B294 */
+                Color.FromArgb(255,   1, 133, 116), /* #018574 */
+                Color.FromArgb(255,   0, 204, 106), /* #00CC6A */
+                Color.FromArgb(255,  16, 137,  62), /* #10893E */
+            },
+            {
+                Color.FromArgb(255, 122, 117, 116), /* #7A7574 */
+                Color.FromArgb(255,  93,  90,  80), /* #5D5A58 */
+                Color.FromArgb(255, 104, 118, 138), /* #68768A */
+                Color.FromArgb(255,  81,  92, 107), /* #515C6B */
+                Color.FromArgb(255,  86, 124, 115), /* #567C73 */
+                Color.FromArgb(255,  72, 104,  96), /* #486860 */
+                Color.FromArgb(255,  73, 130,   5), /* #498205 */
+                Color.FromArgb(255,  16, 124,  16), /* #107C10 */
+            },
+            {
+                Color.FromArgb(255, 118, 118, 118), /* #767676 */
+                Color.FromArgb(255,  76,  74,  72), /* #4C4A48 */
+                Color.FromArgb(255, 105, 121, 126), /* #69797E */
+                Color.FromArgb(255,  74,  84,  89), /* #4A5459 */
+                Color.FromArgb(255, 100, 124, 100), /* #647C64 */
+                Color.FromArgb(255,  82,  94,  84), /* #525E54 */
+                Color.FromArgb(255, 132, 117,  69), /* #847545 */
+                Color.FromArgb(255, 126, 115,  95), /* #7E735F */
+            }
+        };
+
+        /// <summary>
+        /// Gets the total number of colors in this palette.
+        /// A color is not necessarily a single value and may be composed of several shades.
+        /// This has little meaning in this palette as colors are not strictly separated.
+        /// </summary>
+        /// <inheritdoc path="/remarks"/>
+        public int ColorCount
+        {
+            get => colorChart.GetLength(0);
+        }
+
+        /// <summary>
+        /// Gets the total number of shades for each color in this palette.
+        /// Shades are usually a variation of the color lightening or darkening it.
+        /// This has little meaning in this palette as colors are not strictly separated by shade.
+        /// </summary>
+        /// <inheritdoc path="/remarks"/>
+        public int ShadeCount
+        {
+            get => colorChart.GetLength(1);
+        }
+
+        /// <inheritdoc/>
+        public Color GetColor(int colorIndex, int shadeIndex)
+        {
+            return colorChart[
+                MathUtilities.Clamp(colorIndex, 0, colorChart.GetLength(0) - 1),
+                MathUtilities.Clamp(shadeIndex, 0, colorChart.GetLength(1) - 1)];
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/IColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/IColorPalette.cs
new file mode 100644
index 0000000000..7c6ebc3f6a
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/IColorPalette.cs
@@ -0,0 +1,38 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Interface to define a color palette.
+    /// </summary>
+    public interface IColorPalette
+    {
+        /// <summary>
+        /// Gets the total number of colors in this palette.
+        /// A color is not necessarily a single value and may be composed of several shades.
+        /// </summary>
+        /// <remarks>
+        /// Represents total columns in a table.
+        /// </remarks>
+        int ColorCount { get; }
+
+        /// <summary>
+        /// Gets the total number of shades for each color in this palette.
+        /// Shades are usually a variation of the color lightening or darkening it.
+        /// </summary>
+        /// <remarks>
+        /// Represents total rows in a table.
+        /// </remarks>
+        int ShadeCount { get; }
+
+        /// <summary>
+        /// Gets a color in the palette by index.
+        /// </summary>
+        /// <param name="colorIndex">The index of the color in the palette.
+        /// The index must be between zero and <see cref="ColorCount"/>.</param>
+        /// <param name="shadeIndex">The index of the color shade in the palette.
+        /// The index must be between zero and <see cref="ShadeCount"/>.</param>
+        /// <returns>The color at the specified index or an exception.</returns>
+        Color GetColor(int colorIndex, int shadeIndex);
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialColorPalette.cs
new file mode 100644
index 0000000000..d009926bc5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialColorPalette.cs
@@ -0,0 +1,660 @@
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements a reduced version of the 2014 Material Design color palette.
+    /// </summary>
+    /// <remarks>
+    /// This palette is based on the one outlined here:
+    ///
+    ///   https://material.io/design/color/the-color-system.html#tools-for-picking-colors
+    ///
+    /// In order to make the palette uniform and rectangular the following
+    /// alterations were made:
+    ///
+    ///  1. The A100-A700 shades of each color are excluded.
+    ///     These shades do not exist for all colors (brown/gray).
+    ///  2. Black/White are stand-alone and are also excluded.
+    ///
+    /// </remarks>
+    public class MaterialColorPalette : IColorPalette
+    {
+        /// <summary>
+        /// Defines all colors in the <see cref="MaterialColorPalette"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is done in an enum to ensure it is compiled into the assembly improving
+        /// startup performance.
+        /// </remarks>
+        public enum MaterialColor : uint
+        {
+            // Red
+            Red50  = 0xFFFFEBEE,
+            Red100 = 0xFFFFCDD2,
+            Red200 = 0xFFEF9A9A,
+            Red300 = 0xFFE57373,
+            Red400 = 0xFFEF5350,
+            Red500 = 0xFFF44336,
+            Red600 = 0xFFE53935,
+            Red700 = 0xFFD32F2F,
+            Red800 = 0xFFC62828,
+            Red900 = 0xFFB71C1C,
+
+            RedA100 = 0xFFFF8A80,
+            RedA200 = 0xFFFF5252,
+            RedA400 = 0xFFFF1744,
+            RedA700 = 0xFFD50000,
+
+            // Pink
+            Pink50  = 0xFFFCE4EC,
+            Pink100 = 0xFFF8BBD0,
+            Pink200 = 0xFFF48FB1,
+            Pink300 = 0xFFF06292,
+            Pink400 = 0xFFEC407A,
+            Pink500 = 0xFFE91E63,
+            Pink600 = 0xFFD81B60,
+            Pink700 = 0xFFC2185B,
+            Pink800 = 0xFFAD1457,
+            Pink900 = 0xFF880E4F,
+
+            PinkA100 = 0xFFFF80AB,
+            PinkA200 = 0xFFFF4081,
+            PinkA400 = 0xFFF50057,
+            PinkA700 = 0xFFC51162,
+
+            // Purple
+            Purple50  = 0xFFF3E5F5,
+            Purple100 = 0xFFE1BEE7,
+            Purple200 = 0xFFCE93D8,
+            Purple300 = 0xFFBA68C8,
+            Purple400 = 0xFFAB47BC,
+            Purple500 = 0xFF9C27B0,
+            Purple600 = 0xFF8E24AA,
+            Purple700 = 0xFF7B1FA2,
+            Purple800 = 0xFF6A1B9A,
+            Purple900 = 0xFF4A148C,
+
+            PurpleA100 = 0xFFEA80FC,
+            PurpleA200 = 0xFFE040FB,
+            PurpleA400 = 0xFFD500F9,
+            PurpleA700 = 0xFFAA00FF,
+
+            // Deep Purple
+            DeepPurple50  = 0xFFEDE7F6,
+            DeepPurple100 = 0xFFD1C4E9,
+            DeepPurple200 = 0xFFB39DDB,
+            DeepPurple300 = 0xFF9575CD,
+            DeepPurple400 = 0xFF7E57C2,
+            DeepPurple500 = 0xFF673AB7,
+            DeepPurple600 = 0xFF5E35B1,
+            DeepPurple700 = 0xFF512DA8,
+            DeepPurple800 = 0xFF4527A0,
+            DeepPurple900 = 0xFF311B92,
+
+            DeepPurpleA100 = 0xFFB388FF,
+            DeepPurpleA200 = 0xFF7C4DFF,
+            DeepPurpleA400 = 0xFF651FFF,
+            DeepPurpleA700 = 0xFF6200EA,
+
+            // Indigo
+            Indigo50  = 0xFFE8EAF6,
+            Indigo100 = 0xFFC5CAE9,
+            Indigo200 = 0xFF9FA8DA,
+            Indigo300 = 0xFF7986CB,
+            Indigo400 = 0xFF5C6BC0,
+            Indigo500 = 0xFF3F51B5,
+            Indigo600 = 0xFF3949AB,
+            Indigo700 = 0xFF303F9F,
+            Indigo800 = 0xFF283593,
+            Indigo900 = 0xFF1A237E,
+
+            IndigoA100 = 0xFF8C9EFF,
+            IndigoA200 = 0xFF536DFE,
+            IndigoA400 = 0xFF3D5AFE,
+            IndigoA700 = 0xFF304FFE,
+
+            // Blue
+            Blue50  = 0xFFE3F2FD,
+            Blue100 = 0xFFBBDEFB,
+            Blue200 = 0xFF90CAF9,
+            Blue300 = 0xFF64B5F6,
+            Blue400 = 0xFF42A5F5,
+            Blue500 = 0xFF2196F3,
+            Blue600 = 0xFF1E88E5,
+            Blue700 = 0xFF1976D2,
+            Blue800 = 0xFF1565C0,
+            Blue900 = 0xFF0D47A1,
+
+            BlueA100 = 0xFF82B1FF,
+            BlueA200 = 0xFF448AFF,
+            BlueA400 = 0xFF2979FF,
+            BlueA700 = 0xFF2962FF,
+
+            // Light Blue
+            LightBlue50  = 0xFFE1F5FE,
+            LightBlue100 = 0xFFB3E5FC,
+            LightBlue200 = 0xFF81D4FA,
+            LightBlue300 = 0xFF4FC3F7,
+            LightBlue400 = 0xFF29B6F6,
+            LightBlue500 = 0xFF03A9F4,
+            LightBlue600 = 0xFF039BE5,
+            LightBlue700 = 0xFF0288D1,
+            LightBlue800 = 0xFF0277BD,
+            LightBlue900 = 0xFF01579B,
+
+            LightBlueA100 = 0xFF80D8FF,
+            LightBlueA200 = 0xFF40C4FF,
+            LightBlueA400 = 0xFF00B0FF,
+            LightBlueA700 = 0xFF0091EA,
+
+            // Cyan
+            Cyan50  = 0xFFE0F7FA,
+            Cyan100 = 0xFFB2EBF2,
+            Cyan200 = 0xFF80DEEA,
+            Cyan300 = 0xFF4DD0E1,
+            Cyan400 = 0xFF26C6DA,
+            Cyan500 = 0xFF00BCD4,
+            Cyan600 = 0xFF00ACC1,
+            Cyan700 = 0xFF0097A7,
+            Cyan800 = 0xFF00838F,
+            Cyan900 = 0xFF006064,
+
+            CyanA100 = 0xFF84FFFF,
+            CyanA200 = 0xFF18FFFF,
+            CyanA400 = 0xFF00E5FF,
+            CyanA700 = 0xFF00B8D4,
+
+            // Teal
+            Teal50  = 0xFFE0F2F1,
+            Teal100 = 0xFFB2DFDB,
+            Teal200 = 0xFF80CBC4,
+            Teal300 = 0xFF4DB6AC,
+            Teal400 = 0xFF26A69A,
+            Teal500 = 0xFF009688,
+            Teal600 = 0xFF00897B,
+            Teal700 = 0xFF00796B,
+            Teal800 = 0xFF00695C,
+            Teal900 = 0xFF004D40,
+
+            TealA100 = 0xFFA7FFEB,
+            TealA200 = 0xFF64FFDA,
+            TealA400 = 0xFF1DE9B6,
+            TealA700 = 0xFF00BFA5,
+
+            // Green
+            Green50  = 0xFFE8F5E9,
+            Green100 = 0xFFC8E6C9,
+            Green200 = 0xFFA5D6A7,
+            Green300 = 0xFF81C784,
+            Green400 = 0xFF66BB6A,
+            Green500 = 0xFF4CAF50,
+            Green600 = 0xFF43A047,
+            Green700 = 0xFF388E3C,
+            Green800 = 0xFF2E7D32,
+            Green900 = 0xFF1B5E20,
+
+            GreenA100 = 0xFFB9F6CA,
+            GreenA200 = 0xFF69F0AE,
+            GreenA400 = 0xFF00E676,
+            GreenA700 = 0xFF00C853,
+
+            // Light Green
+            LightGreen50  = 0xFFF1F8E9,
+            LightGreen100 = 0xFFDCEDC8,
+            LightGreen200 = 0xFFC5E1A5,
+            LightGreen300 = 0xFFAED581,
+            LightGreen400 = 0xFF9CCC65,
+            LightGreen500 = 0xFF8BC34A,
+            LightGreen600 = 0xFF7CB342,
+            LightGreen700 = 0xFF689F38,
+            LightGreen800 = 0xFF558B2F,
+            LightGreen900 = 0xFF33691E,
+
+            LightGreenA100 = 0xFFCCFF90,
+            LightGreenA200 = 0xFFB2FF59,
+            LightGreenA400 = 0xFF76FF03,
+            LightGreenA700 = 0xFF64DD17,
+
+            // Lime
+            Lime50  = 0xFFF9FBE7,
+            Lime100 = 0xFFF0F4C3,
+            Lime200 = 0xFFE6EE9C,
+            Lime300 = 0xFFDCE775,
+            Lime400 = 0xFFD4E157,
+            Lime500 = 0xFFCDDC39,
+            Lime600 = 0xFFC0CA33,
+            Lime700 = 0xFFAFB42B,
+            Lime800 = 0xFF9E9D24,
+            Lime900 = 0xFF827717,
+
+            LimeA100 = 0xFFF4FF81,
+            LimeA200 = 0xFFEEFF41,
+            LimeA400 = 0xFFC6FF00,
+            LimeA700 = 0xFFAEEA00,
+
+            // Yellow
+            Yellow50  = 0xFFFFFDE7,
+            Yellow100 = 0xFFFFF9C4,
+            Yellow200 = 0xFFFFF59D,
+            Yellow300 = 0xFFFFF176,
+            Yellow400 = 0xFFFFEE58,
+            Yellow500 = 0xFFFFEB3B,
+            Yellow600 = 0xFFFDD835,
+            Yellow700 = 0xFFFBC02D,
+            Yellow800 = 0xFFF9A825,
+            Yellow900 = 0xFFF57F17,
+
+            YellowA100 = 0xFFFFFF8D,
+            YellowA200 = 0xFFFFFF00,
+            YellowA400 = 0xFFFFEA00,
+            YellowA700 = 0xFFFFD600,
+
+            // Amber
+            Amber50  = 0xFFFFF8E1,
+            Amber100 = 0xFFFFECB3,
+            Amber200 = 0xFFFFE082,
+            Amber300 = 0xFFFFD54F,
+            Amber400 = 0xFFFFCA28,
+            Amber500 = 0xFFFFC107,
+            Amber600 = 0xFFFFB300,
+            Amber700 = 0xFFFFA000,
+            Amber800 = 0xFFFF8F00,
+            Amber900 = 0xFFFF6F00,
+
+            AmberA100 = 0xFFFFE57F,
+            AmberA200 = 0xFFFFD740,
+            AmberA400 = 0xFFFFC400,
+            AmberA700 = 0xFFFFAB00,
+
+            // Orange
+            Orange50  = 0xFFFFF3E0,
+            Orange100 = 0xFFFFE0B2,
+            Orange200 = 0xFFFFCC80,
+            Orange300 = 0xFFFFB74D,
+            Orange400 = 0xFFFFA726,
+            Orange500 = 0xFFFF9800,
+            Orange600 = 0xFFFB8C00,
+            Orange700 = 0xFFF57C00,
+            Orange800 = 0xFFEF6C00,
+            Orange900 = 0xFFE65100,
+
+            OrangeA100 = 0xFFFFD180,
+            OrangeA200 = 0xFFFFAB40,
+            OrangeA400 = 0xFFFF9100,
+            OrangeA700 = 0xFFFF6D00,
+
+            // Deep Orange
+            DeepOrange50  = 0xFFFBE9E7,
+            DeepOrange100 = 0xFFFFCCBC,
+            DeepOrange200 = 0xFFFFAB91,
+            DeepOrange300 = 0xFFFF8A65,
+            DeepOrange400 = 0xFFFF7043,
+            DeepOrange500 = 0xFFFF5722,
+            DeepOrange600 = 0xFFF4511E,
+            DeepOrange700 = 0xFFE64A19,
+            DeepOrange800 = 0xFFD84315,
+            DeepOrange900 = 0xFFBF360C,
+
+            DeepOrangeA100 = 0xFFFF9E80,
+            DeepOrangeA200 = 0xFFFF6E40,
+            DeepOrangeA400 = 0xFFFF3D00,
+            DeepOrangeA700 = 0xFFDD2C00,
+
+            // Brown
+            Brown50  = 0xFFEFEBE9,
+            Brown100 = 0xFFD7CCC8,
+            Brown200 = 0xFFBCAAA4,
+            Brown300 = 0xFFA1887F,
+            Brown400 = 0xFF8D6E63,
+            Brown500 = 0xFF795548,
+            Brown600 = 0xFF6D4C41,
+            Brown700 = 0xFF5D4037,
+            Brown800 = 0xFF4E342E,
+            Brown900 = 0xFF3E2723,
+
+            // Gray
+            Gray50  = 0xFFFAFAFA,
+            Gray100 = 0xFFF5F5F5,
+            Gray200 = 0xFFEEEEEE,
+            Gray300 = 0xFFE0E0E0,
+            Gray400 = 0xFFBDBDBD,
+            Gray500 = 0xFF9E9E9E,
+            Gray600 = 0xFF757575,
+            Gray700 = 0xFF616161,
+            Gray800 = 0xFF424242,
+            Gray900 = 0xFF212121,
+
+            // Blue Gray
+            BlueGray50  = 0xFFECEFF1,
+            BlueGray100 = 0xFFCFD8DC,
+            BlueGray200 = 0xFFB0BEC5,
+            BlueGray300 = 0xFF90A4AE,
+            BlueGray400 = 0xFF78909C,
+            BlueGray500 = 0xFF607D8B,
+            BlueGray600 = 0xFF546E7A,
+            BlueGray700 = 0xFF455A64,
+            BlueGray800 = 0xFF37474F,
+            BlueGray900 = 0xFF263238,
+
+            Black = 0xFF000000,
+            White = 0xFFFFFFFF,
+        }
+
+        // See: https://material.io/design/color/the-color-system.html#tools-for-picking-colors
+        // This is a reduced palette for uniformity
+        protected static Color[,]? _colorChart = null;
+        protected static object _colorChartMutex = new object();
+
+        /// <summary>
+        /// Initializes all color chart colors.
+        /// </summary>
+        protected void InitColorChart()
+        {
+            lock (_colorChartMutex)
+            {
+                if (_colorChart != null)
+                {
+                    return;
+                }
+
+                _colorChart = new Color[,]
+                {
+                    // Red
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Red50),
+                        Color.FromUInt32((uint)MaterialColor.Red100),
+                        Color.FromUInt32((uint)MaterialColor.Red200),
+                        Color.FromUInt32((uint)MaterialColor.Red300),
+                        Color.FromUInt32((uint)MaterialColor.Red400),
+                        Color.FromUInt32((uint)MaterialColor.Red500),
+                        Color.FromUInt32((uint)MaterialColor.Red600),
+                        Color.FromUInt32((uint)MaterialColor.Red700),
+                        Color.FromUInt32((uint)MaterialColor.Red800),
+                        Color.FromUInt32((uint)MaterialColor.Red900),
+                    },
+
+                    // Pink
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Pink50),
+                        Color.FromUInt32((uint)MaterialColor.Pink100),
+                        Color.FromUInt32((uint)MaterialColor.Pink200),
+                        Color.FromUInt32((uint)MaterialColor.Pink300),
+                        Color.FromUInt32((uint)MaterialColor.Pink400),
+                        Color.FromUInt32((uint)MaterialColor.Pink500),
+                        Color.FromUInt32((uint)MaterialColor.Pink600),
+                        Color.FromUInt32((uint)MaterialColor.Pink700),
+                        Color.FromUInt32((uint)MaterialColor.Pink800),
+                        Color.FromUInt32((uint)MaterialColor.Pink900),
+                    },
+
+                    // Purple
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Purple50),
+                        Color.FromUInt32((uint)MaterialColor.Purple100),
+                        Color.FromUInt32((uint)MaterialColor.Purple200),
+                        Color.FromUInt32((uint)MaterialColor.Purple300),
+                        Color.FromUInt32((uint)MaterialColor.Purple400),
+                        Color.FromUInt32((uint)MaterialColor.Purple500),
+                        Color.FromUInt32((uint)MaterialColor.Purple600),
+                        Color.FromUInt32((uint)MaterialColor.Purple700),
+                        Color.FromUInt32((uint)MaterialColor.Purple800),
+                        Color.FromUInt32((uint)MaterialColor.Purple900),
+                    },
+
+                    // Deep Purple
+                    {
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple50),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple100),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple200),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple300),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple400),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple500),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple600),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple700),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple800),
+                        Color.FromUInt32((uint)MaterialColor.DeepPurple900),
+                    },
+
+                    // Indigo
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Indigo50),
+                        Color.FromUInt32((uint)MaterialColor.Indigo100),
+                        Color.FromUInt32((uint)MaterialColor.Indigo200),
+                        Color.FromUInt32((uint)MaterialColor.Indigo300),
+                        Color.FromUInt32((uint)MaterialColor.Indigo400),
+                        Color.FromUInt32((uint)MaterialColor.Indigo500),
+                        Color.FromUInt32((uint)MaterialColor.Indigo600),
+                        Color.FromUInt32((uint)MaterialColor.Indigo700),
+                        Color.FromUInt32((uint)MaterialColor.Indigo800),
+                        Color.FromUInt32((uint)MaterialColor.Indigo900),
+                    },
+
+                    // Blue
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Blue50),
+                        Color.FromUInt32((uint)MaterialColor.Blue100),
+                        Color.FromUInt32((uint)MaterialColor.Blue200),
+                        Color.FromUInt32((uint)MaterialColor.Blue300),
+                        Color.FromUInt32((uint)MaterialColor.Blue400),
+                        Color.FromUInt32((uint)MaterialColor.Blue500),
+                        Color.FromUInt32((uint)MaterialColor.Blue600),
+                        Color.FromUInt32((uint)MaterialColor.Blue700),
+                        Color.FromUInt32((uint)MaterialColor.Blue800),
+                        Color.FromUInt32((uint)MaterialColor.Blue900),
+                    },
+
+                    // Light Blue
+                    {
+                        Color.FromUInt32((uint)MaterialColor.LightBlue50),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue100),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue200),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue300),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue400),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue500),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue600),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue700),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue800),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue900),
+                    },
+
+                    // Cyan
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Cyan50),
+                        Color.FromUInt32((uint)MaterialColor.Cyan100),
+                        Color.FromUInt32((uint)MaterialColor.Cyan200),
+                        Color.FromUInt32((uint)MaterialColor.Cyan300),
+                        Color.FromUInt32((uint)MaterialColor.Cyan400),
+                        Color.FromUInt32((uint)MaterialColor.Cyan500),
+                        Color.FromUInt32((uint)MaterialColor.Cyan600),
+                        Color.FromUInt32((uint)MaterialColor.Cyan700),
+                        Color.FromUInt32((uint)MaterialColor.Cyan800),
+                        Color.FromUInt32((uint)MaterialColor.Cyan900),
+                    },
+
+                    // Teal
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Teal50),
+                        Color.FromUInt32((uint)MaterialColor.Teal100),
+                        Color.FromUInt32((uint)MaterialColor.Teal200),
+                        Color.FromUInt32((uint)MaterialColor.Teal300),
+                        Color.FromUInt32((uint)MaterialColor.Teal400),
+                        Color.FromUInt32((uint)MaterialColor.Teal500),
+                        Color.FromUInt32((uint)MaterialColor.Teal600),
+                        Color.FromUInt32((uint)MaterialColor.Teal700),
+                        Color.FromUInt32((uint)MaterialColor.Teal800),
+                        Color.FromUInt32((uint)MaterialColor.Teal900),
+                    },
+
+                    // Green
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Green50),
+                        Color.FromUInt32((uint)MaterialColor.Green100),
+                        Color.FromUInt32((uint)MaterialColor.Green200),
+                        Color.FromUInt32((uint)MaterialColor.Green300),
+                        Color.FromUInt32((uint)MaterialColor.Green400),
+                        Color.FromUInt32((uint)MaterialColor.Green500),
+                        Color.FromUInt32((uint)MaterialColor.Green600),
+                        Color.FromUInt32((uint)MaterialColor.Green700),
+                        Color.FromUInt32((uint)MaterialColor.Green800),
+                        Color.FromUInt32((uint)MaterialColor.Green900),
+                    },
+
+                    // Light Green
+                    {
+                        Color.FromUInt32((uint)MaterialColor.LightGreen50),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen100),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen200),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen300),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen400),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen500),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen600),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen700),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen800),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen900),
+                    },
+
+                    // Lime
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Lime50),
+                        Color.FromUInt32((uint)MaterialColor.Lime100),
+                        Color.FromUInt32((uint)MaterialColor.Lime200),
+                        Color.FromUInt32((uint)MaterialColor.Lime300),
+                        Color.FromUInt32((uint)MaterialColor.Lime400),
+                        Color.FromUInt32((uint)MaterialColor.Lime500),
+                        Color.FromUInt32((uint)MaterialColor.Lime600),
+                        Color.FromUInt32((uint)MaterialColor.Lime700),
+                        Color.FromUInt32((uint)MaterialColor.Lime800),
+                        Color.FromUInt32((uint)MaterialColor.Lime900),
+                    },
+
+                    // Yellow
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Yellow50),
+                        Color.FromUInt32((uint)MaterialColor.Yellow100),
+                        Color.FromUInt32((uint)MaterialColor.Yellow200),
+                        Color.FromUInt32((uint)MaterialColor.Yellow300),
+                        Color.FromUInt32((uint)MaterialColor.Yellow400),
+                        Color.FromUInt32((uint)MaterialColor.Yellow500),
+                        Color.FromUInt32((uint)MaterialColor.Yellow600),
+                        Color.FromUInt32((uint)MaterialColor.Yellow700),
+                        Color.FromUInt32((uint)MaterialColor.Yellow800),
+                        Color.FromUInt32((uint)MaterialColor.Yellow900),
+                    },
+
+                    // Amber
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Amber50),
+                        Color.FromUInt32((uint)MaterialColor.Amber100),
+                        Color.FromUInt32((uint)MaterialColor.Amber200),
+                        Color.FromUInt32((uint)MaterialColor.Amber300),
+                        Color.FromUInt32((uint)MaterialColor.Amber400),
+                        Color.FromUInt32((uint)MaterialColor.Amber500),
+                        Color.FromUInt32((uint)MaterialColor.Amber600),
+                        Color.FromUInt32((uint)MaterialColor.Amber700),
+                        Color.FromUInt32((uint)MaterialColor.Amber800),
+                        Color.FromUInt32((uint)MaterialColor.Amber900),
+                    },
+
+                    // Orange
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Orange50),
+                        Color.FromUInt32((uint)MaterialColor.Orange100),
+                        Color.FromUInt32((uint)MaterialColor.Orange200),
+                        Color.FromUInt32((uint)MaterialColor.Orange300),
+                        Color.FromUInt32((uint)MaterialColor.Orange400),
+                        Color.FromUInt32((uint)MaterialColor.Orange500),
+                        Color.FromUInt32((uint)MaterialColor.Orange600),
+                        Color.FromUInt32((uint)MaterialColor.Orange700),
+                        Color.FromUInt32((uint)MaterialColor.Orange800),
+                        Color.FromUInt32((uint)MaterialColor.Orange900),
+                    },
+
+                    // Deep Orange
+                    {
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange50),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange100),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange200),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange300),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange400),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange500),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange600),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange700),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange800),
+                        Color.FromUInt32((uint)MaterialColor.DeepOrange900),
+                    },
+
+                    // Brown
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Brown50),
+                        Color.FromUInt32((uint)MaterialColor.Brown100),
+                        Color.FromUInt32((uint)MaterialColor.Brown200),
+                        Color.FromUInt32((uint)MaterialColor.Brown300),
+                        Color.FromUInt32((uint)MaterialColor.Brown400),
+                        Color.FromUInt32((uint)MaterialColor.Brown500),
+                        Color.FromUInt32((uint)MaterialColor.Brown600),
+                        Color.FromUInt32((uint)MaterialColor.Brown700),
+                        Color.FromUInt32((uint)MaterialColor.Brown800),
+                        Color.FromUInt32((uint)MaterialColor.Brown900),
+                    },
+
+                    // Gray
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Gray50),
+                        Color.FromUInt32((uint)MaterialColor.Gray100),
+                        Color.FromUInt32((uint)MaterialColor.Gray200),
+                        Color.FromUInt32((uint)MaterialColor.Gray300),
+                        Color.FromUInt32((uint)MaterialColor.Gray400),
+                        Color.FromUInt32((uint)MaterialColor.Gray500),
+                        Color.FromUInt32((uint)MaterialColor.Gray600),
+                        Color.FromUInt32((uint)MaterialColor.Gray700),
+                        Color.FromUInt32((uint)MaterialColor.Gray800),
+                        Color.FromUInt32((uint)MaterialColor.Gray900),
+                    },
+
+                    // Blue Gray
+                    {
+                        Color.FromUInt32((uint)MaterialColor.BlueGray50),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray100),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray200),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray300),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray400),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray500),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray600),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray700),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray800),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray900),
+                    },
+                };
+            }
+
+            return;
+        }
+
+        /// <inheritdoc/>
+        public int ColorCount
+        {
+            get => 19;
+        }
+
+        /// <inheritdoc/>
+        public int ShadeCount
+        {
+            get => 10;
+        }
+
+        /// <inheritdoc/>
+        public Color GetColor(int colorIndex, int shadeIndex)
+        {
+            if (_colorChart == null)
+            {
+                InitColorChart();
+            }
+
+            return _colorChart![
+                MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+                MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)];
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialHalfColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialHalfColorPalette.cs
new file mode 100644
index 0000000000..01d44aa65d
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/MaterialHalfColorPalette.cs
@@ -0,0 +1,150 @@
+using Avalonia.Media;
+using Avalonia.Utilities;
+using MaterialColor = Avalonia.Controls.MaterialColorPalette.MaterialColor;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements half of the <see cref="MaterialColorPalette"/> for improved usability.
+    /// </summary>
+    /// <inheritdoc cref="MaterialColorPalette"/>
+    public class MaterialHalfColorPalette : IColorPalette
+    {
+        protected static Color[,]? _colorChart = null;
+        protected static object _colorChartMutex = new object();
+
+        /// <summary>
+        /// Initializes all color chart colors.
+        /// </summary>
+        protected void InitColorChart()
+        {
+            lock (_colorChartMutex)
+            {
+                if (_colorChart != null)
+                {
+                    return;
+                }
+
+                _colorChart = new Color[,]
+                {
+                    // Red
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Red50),
+                        Color.FromUInt32((uint)MaterialColor.Red200),
+                        Color.FromUInt32((uint)MaterialColor.Red400),
+                        Color.FromUInt32((uint)MaterialColor.Red600),
+                        Color.FromUInt32((uint)MaterialColor.Red800),
+                    },
+
+                    // Purple
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Purple50),
+                        Color.FromUInt32((uint)MaterialColor.Purple200),
+                        Color.FromUInt32((uint)MaterialColor.Purple400),
+                        Color.FromUInt32((uint)MaterialColor.Purple600),
+                        Color.FromUInt32((uint)MaterialColor.Purple800),
+                    },
+
+                    // Indigo
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Indigo50),
+                        Color.FromUInt32((uint)MaterialColor.Indigo200),
+                        Color.FromUInt32((uint)MaterialColor.Indigo400),
+                        Color.FromUInt32((uint)MaterialColor.Indigo600),
+                        Color.FromUInt32((uint)MaterialColor.Indigo800),
+                    },
+
+                    // Light Blue
+                    {
+                        Color.FromUInt32((uint)MaterialColor.LightBlue50),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue200),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue400),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue600),
+                        Color.FromUInt32((uint)MaterialColor.LightBlue800),
+                    },
+
+                    // Teal
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Teal50),
+                        Color.FromUInt32((uint)MaterialColor.Teal200),
+                        Color.FromUInt32((uint)MaterialColor.Teal400),
+                        Color.FromUInt32((uint)MaterialColor.Teal600),
+                        Color.FromUInt32((uint)MaterialColor.Teal800),
+                    },
+
+                    // Light Green
+                    {
+                        Color.FromUInt32((uint)MaterialColor.LightGreen50),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen200),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen400),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen600),
+                        Color.FromUInt32((uint)MaterialColor.LightGreen800),
+                    },
+
+                    // Yellow
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Yellow50),
+                        Color.FromUInt32((uint)MaterialColor.Yellow200),
+                        Color.FromUInt32((uint)MaterialColor.Yellow400),
+                        Color.FromUInt32((uint)MaterialColor.Yellow600),
+                        Color.FromUInt32((uint)MaterialColor.Yellow800),
+                    },
+
+                    // Orange
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Orange50),
+                        Color.FromUInt32((uint)MaterialColor.Orange200),
+                        Color.FromUInt32((uint)MaterialColor.Orange400),
+                        Color.FromUInt32((uint)MaterialColor.Orange600),
+                        Color.FromUInt32((uint)MaterialColor.Orange800),
+                    },
+
+                    // Brown
+                    {
+                        Color.FromUInt32((uint)MaterialColor.Brown50),
+                        Color.FromUInt32((uint)MaterialColor.Brown200),
+                        Color.FromUInt32((uint)MaterialColor.Brown400),
+                        Color.FromUInt32((uint)MaterialColor.Brown600),
+                        Color.FromUInt32((uint)MaterialColor.Brown800),
+                    },
+
+                    // Blue Gray
+                    {
+                        Color.FromUInt32((uint)MaterialColor.BlueGray50),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray200),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray400),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray600),
+                        Color.FromUInt32((uint)MaterialColor.BlueGray800),
+                    },
+                };
+            }
+
+            return;
+        }
+
+        /// <inheritdoc/>
+        public int ColorCount
+        {
+            get => 10;
+        }
+
+        /// <inheritdoc/>
+        public int ShadeCount
+        {
+            get => 5;
+        }
+
+        /// <inheritdoc/>
+        public Color GetColor(int colorIndex, int shadeIndex)
+        {
+            if (_colorChart == null)
+            {
+                InitColorChart();
+            }
+
+            return _colorChart![
+                MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+                MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)];
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPalettes/SixteenColorPalette.cs b/src/Avalonia.Controls.ColorPicker/ColorPalettes/SixteenColorPalette.cs
new file mode 100644
index 0000000000..e8e82eac91
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPalettes/SixteenColorPalette.cs
@@ -0,0 +1,73 @@
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements the standard sixteen color palette from the HTML 4.01 specification.
+    /// </summary>
+    /// <remarks>
+    /// See https://en.wikipedia.org/wiki/Web_colors#HTML_color_names.
+    /// </remarks>
+    public class SixteenColorPalette : IColorPalette
+    {
+        // The 16 standard colors from HTML and early Windows computers
+        // https://en.wikipedia.org/wiki/List_of_software_palettes
+        // https://en.wikipedia.org/wiki/Web_colors#HTML_color_names
+        private static Color[,] colorChart = new Color[,]
+        {
+            {
+                Colors.White,
+                Colors.Silver
+            },
+            {
+                Colors.Gray,
+                Colors.Black
+            },
+            {
+                Colors.Red,
+                Colors.Maroon
+            },
+            {
+                Colors.Yellow,
+                Colors.Olive
+            },
+            {
+                Colors.Lime,
+                Colors.Green
+            },
+            {
+                Colors.Aqua,
+                Colors.Teal
+            },
+            {
+                Colors.Blue,
+                Colors.Navy
+            },
+            {
+                Colors.Fuchsia,
+                Colors.Purple
+            }
+        };
+
+        /// <inheritdoc/>
+        public int ColorCount
+        {
+            get => colorChart.GetLength(0);
+        }
+
+        /// <inheritdoc/>
+        public int ShadeCount
+        {
+            get => colorChart.GetLength(1);
+        }
+
+        /// <inheritdoc/>
+        public Color GetColor(int colorIndex, int shadeIndex)
+        {
+            return colorChart[
+                MathUtilities.Clamp(colorIndex, 0, colorChart.GetLength(0) - 1),
+                MathUtilities.Clamp(shadeIndex, 0, colorChart.GetLength(1) - 1)];
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs b/src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs
new file mode 100644
index 0000000000..01cb745ba7
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Presents a color for user editing using a spectrum, palette and component sliders within a drop down.
+    /// Editing is available when the drop down flyout is opened; otherwise, only the preview color is shown.
+    /// </summary>
+    public class ColorPicker : ColorView
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorPicker"/> class.
+        /// </summary>
+        public ColorPicker() : base()
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.Properties.cs
new file mode 100644
index 0000000000..e1ffbb7eae
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.Properties.cs
@@ -0,0 +1,50 @@
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <inheritdoc/>
+    public partial class ColorPreviewer
+    {
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorPreviewer, HsvColor>(
+                nameof(HsvColor),
+                Colors.Transparent.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="IsAccentColorsVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAccentColorsVisibleProperty =
+            AvaloniaProperty.Register<ColorPreviewer, bool>(
+                nameof(IsAccentColorsVisible),
+                true);
+
+        /// <summary>
+        /// Gets or sets the currently previewed color in the HSV color model.
+        /// </summary>
+        /// <remarks>
+        /// Only an HSV color is supported in this control to ensure there is never any
+        /// loss of precision or color information. Accent colors, like the color spectrum,
+        /// only operate with the HSV color model.
+        /// </remarks>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether accent colors are visible along
+        /// with the preview color.
+        /// </summary>
+        public bool IsAccentColorsVisible
+        {
+            get => GetValue(IsAccentColorsVisibleProperty);
+            set => SetValue(IsAccentColorsVisibleProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.cs b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.cs
new file mode 100644
index 0000000000..6f49430505
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives.Converters;
+using Avalonia.Input;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Presents a preview color with optional accent colors.
+    /// </summary>
+    [TemplatePart("PART_AccentDecrement1Border", typeof(Border))]
+    [TemplatePart("PART_AccentDecrement2Border", typeof(Border))]
+    [TemplatePart("PART_AccentIncrement1Border", typeof(Border))]
+    [TemplatePart("PART_AccentIncrement2Border", typeof(Border))]
+    public partial class ColorPreviewer : TemplatedControl
+    {
+        /// <summary>
+        /// Event for when the selected color changes within the previewer.
+        /// This occurs when an accent color is pressed.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        private bool eventsConnected = false;
+
+        // XAML template parts
+        private Border? _accentDecrement1Border;
+        private Border? _accentDecrement2Border;
+        private Border? _accentIncrement1Border;
+        private Border? _accentIncrement2Border;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorPreviewer"/> class.
+        /// </summary>
+        public ColorPreviewer() : base()
+        {
+        }
+
+        /// <summary>
+        /// Connects or disconnects all control event handlers.
+        /// </summary>
+        /// <param name="connected">True to connect event handlers, otherwise false.</param>
+        private void ConnectEvents(bool connected)
+        {
+            if (connected == true && eventsConnected == false)
+            {
+                // Add all events
+                if (_accentDecrement1Border != null) { _accentDecrement1Border.PointerPressed += AccentBorder_PointerPressed; }
+                if (_accentDecrement2Border != null) { _accentDecrement2Border.PointerPressed += AccentBorder_PointerPressed; }
+                if (_accentIncrement1Border != null) { _accentIncrement1Border.PointerPressed += AccentBorder_PointerPressed; }
+                if (_accentIncrement2Border != null) { _accentIncrement2Border.PointerPressed += AccentBorder_PointerPressed; }
+
+                eventsConnected = true;
+            }
+            else if (connected == false && eventsConnected == true)
+            {
+                // Remove all events
+                if (_accentDecrement1Border != null) { _accentDecrement1Border.PointerPressed -= AccentBorder_PointerPressed; }
+                if (_accentDecrement2Border != null) { _accentDecrement2Border.PointerPressed -= AccentBorder_PointerPressed; }
+                if (_accentIncrement1Border != null) { _accentIncrement1Border.PointerPressed -= AccentBorder_PointerPressed; }
+                if (_accentIncrement2Border != null) { _accentIncrement2Border.PointerPressed -= AccentBorder_PointerPressed; }
+
+                eventsConnected = false;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            // Remove any existing events present if the control was previously loaded then unloaded
+            ConnectEvents(false);
+
+            _accentDecrement1Border = e.NameScope.Find<Border>("PART_AccentDecrement1Border");
+            _accentDecrement2Border = e.NameScope.Find<Border>("PART_AccentDecrement2Border");
+            _accentIncrement1Border = e.NameScope.Find<Border>("PART_AccentIncrement1Border");
+            _accentIncrement2Border = e.NameScope.Find<Border>("PART_AccentIncrement2Border");
+
+            // Must connect after controls are found
+            ConnectEvents(true);
+
+            base.OnApplyTemplate(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == HsvColorProperty)
+            {
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<HsvColor>().ToRgb(),
+                    change.GetNewValue<HsvColor>().ToRgb()));
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="ColorChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The <see cref="ColorChangedEventArgs"/> defining old/new colors.</param>
+        protected virtual void OnColorChanged(ColorChangedEventArgs e)
+        {
+            ColorChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Event handler for when an accent color border is pressed.
+        /// This will update the color to the background of the pressed panel.
+        /// </summary>
+        private void AccentBorder_PointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            Border? border = sender as Border;
+            int accentStep = 0;
+            HsvColor hsvColor = HsvColor;
+
+            // Get the value component delta
+            try
+            {
+                accentStep = int.Parse(border?.Tag?.ToString() ?? "0", CultureInfo.InvariantCulture);
+            }
+            catch { }
+
+            if (accentStep != 0)
+            {
+                // ColorChanged will be invoked in OnPropertyChanged if the value is different
+                HsvColor = AccentColorConverter.GetAccent(hsvColor, accentStep);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.Properties.cs
new file mode 100644
index 0000000000..e2a34a7f90
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.Properties.cs
@@ -0,0 +1,146 @@
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <inheritdoc/>
+    public partial class ColorSlider
+    {
+        /// <summary>
+        /// Defines the <see cref="Color"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> ColorProperty =
+            AvaloniaProperty.Register<ColorSlider, Color>(
+                nameof(Color),
+                Colors.White,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="ColorComponent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorComponent> ColorComponentProperty =
+            AvaloniaProperty.Register<ColorSlider, ColorComponent>(
+                nameof(ColorComponent),
+                ColorComponent.Component1);
+
+        /// <summary>
+        /// Defines the <see cref="ColorModel"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorModel> ColorModelProperty =
+            AvaloniaProperty.Register<ColorSlider, ColorModel>(
+                nameof(ColorModel),
+                ColorModel.Rgba);
+
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorSlider, HsvColor>(
+                nameof(HsvColor),
+                Colors.White.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="IsAlphaMaxForced"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAlphaMaxForcedProperty =
+            AvaloniaProperty.Register<ColorSlider, bool>(
+                nameof(IsAlphaMaxForced),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsRoundingEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsRoundingEnabledProperty =
+            AvaloniaProperty.Register<ColorSlider, bool>(
+                nameof(IsRoundingEnabled),
+                false);
+
+        /// <summary>
+        /// Defines the <see cref="IsSaturationValueMaxForced"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsSaturationValueMaxForcedProperty =
+            AvaloniaProperty.Register<ColorSlider, bool>(
+                nameof(IsSaturationValueMaxForced),
+                true);
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the RGB color model.
+        /// </summary>
+        /// <remarks>
+        /// Use this property instead of <see cref="HsvColor"/> when in <see cref="ColorModel.Rgba"/>
+        /// to avoid loss of precision and color drifting.
+        /// </remarks>
+        public Color Color
+        {
+            get => GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the color component represented by the slider.
+        /// </summary>
+        public ColorComponent ColorComponent
+        {
+            get => GetValue(ColorComponentProperty);
+            set => SetValue(ColorComponentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the active color model used by the slider.
+        /// </summary>
+        public ColorModel ColorModel
+        {
+            get => GetValue(ColorModelProperty);
+            set => SetValue(ColorModelProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the HSV color model.
+        /// </summary>
+        /// <remarks>
+        /// Use this property instead of <see cref="Color"/> when in <see cref="ColorModel.Hsva"/>
+        /// to avoid loss of precision and color drifting.
+        /// </remarks>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the alpha component is always forced to maximum for components
+        /// other than <see cref="ColorComponent"/>.
+        /// This ensures that the background is always visible and never transparent regardless of the actual color.
+        /// </summary>
+        public bool IsAlphaMaxForced
+        {
+            get => GetValue(IsAlphaMaxForcedProperty);
+            set => SetValue(IsAlphaMaxForcedProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether rounding of color component values is enabled.
+        /// </summary>
+        /// <remarks>
+        /// This is applicable for the HSV color model only. The <see cref="Media.HsvColor"/> struct uses double
+        /// values while the <see cref="Media.Color"/> struct uses byte. Only double types need rounding.
+        /// </remarks>
+        public bool IsRoundingEnabled
+        {
+            get => GetValue(IsRoundingEnabledProperty);
+            set => SetValue(IsRoundingEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the saturation and value components are always forced to maximum values
+        /// when using the HSVA color model. Only component values other than <see cref="ColorComponent"/> will be changed.
+        /// This ensures, for example, that the Hue background is always visible and never washed out regardless of the actual color.
+        /// </summary>
+        public bool IsSaturationValueMaxForced
+        {
+            get => GetValue(IsSaturationValueMaxForcedProperty);
+            set => SetValue(IsSaturationValueMaxForcedProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
new file mode 100644
index 0000000000..ec08e96d87
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
@@ -0,0 +1,485 @@
+using System;
+using Avalonia.Controls.Metadata;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// A slider with a background that represents a single color component.
+    /// </summary>
+    [PseudoClasses(pcDarkSelector, pcLightSelector)]
+    public partial class ColorSlider : Slider
+    {
+        protected const string pcDarkSelector = ":dark-selector";
+        protected const string pcLightSelector = ":light-selector";
+
+        /// <summary>
+        /// Event for when the selected color changes within the slider.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        /// <summary>
+        /// Defines the maximum hue component value
+        /// (other components are always 0..100 or 0.255).
+        /// </summary>
+        /// <remarks>
+        /// This should match the default <see cref="ColorSpectrum.MaxHue"/> property.
+        /// </remarks>
+        private const double MaxHue = 359;
+
+        protected bool ignorePropertyChanged = false;
+
+        private WriteableBitmap? _backgroundBitmap;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorSlider"/> class.
+        /// </summary>
+        public ColorSlider() : base()
+        {
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+        }
+
+        /// <summary>
+        /// Updates the visual state of the control by applying latest PseudoClasses.
+        /// </summary>
+        private void UpdatePseudoClasses()
+        {
+            // The slider itself can be transparent for certain color values.
+            // This causes an issue where a white selector thumb over a light window background or
+            // a black selector thumb over a dark window background is not visible.
+            // This means under a certain alpha threshold, neither a white or black selector thumb
+            // should be shown and instead the default slider thumb color should be used instead.
+            if (Color.A < 128 &&
+                (IsAlphaMaxForced == false ||
+                 ColorComponent == ColorComponent.Alpha))
+            {
+                PseudoClasses.Set(pcDarkSelector, false);
+                PseudoClasses.Set(pcLightSelector, false);
+            }
+            else
+            {
+                Color perceivedColor;
+
+                if (ColorModel == ColorModel.Hsva)
+                {
+                    perceivedColor = GetEquivalentBackgroundColor(HsvColor).ToRgb();
+                }
+                else
+                {
+                    perceivedColor = GetEquivalentBackgroundColor(Color);
+                }
+
+                if (ColorHelper.GetRelativeLuminance(perceivedColor) <= 0.5)
+                {
+                    PseudoClasses.Set(pcDarkSelector, false);
+                    PseudoClasses.Set(pcLightSelector, true);
+                }
+                else
+                {
+                    PseudoClasses.Set(pcDarkSelector, true);
+                    PseudoClasses.Set(pcLightSelector, false);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Generates a new background image for the color slider and applies it.
+        /// </summary>
+        private async void UpdateBackground()
+        {
+            // In Avalonia, Bounds returns the actual device-independent pixel size of a control.
+            // However, this is not necessarily the size of the control rendered on a display.
+            // A desktop or application scaling factor may be applied which must be accounted for here.
+            // Remember bitmaps in Avalonia are rendered mapping to actual device pixels, not the device-
+            // independent pixels of controls.
+
+            var scale = LayoutHelper.GetLayoutScale(this);
+            var pixelWidth = Convert.ToInt32(Bounds.Width * scale);
+            var pixelHeight = Convert.ToInt32(Bounds.Height * scale);
+
+            if (pixelWidth != 0 && pixelHeight != 0)
+            {
+                ArrayList<byte> bgraPixelData = await ColorPickerHelpers.CreateComponentBitmapAsync(
+                    pixelWidth,
+                    pixelHeight,
+                    Orientation,
+                    ColorModel,
+                    ColorComponent,
+                    HsvColor,
+                    IsAlphaMaxForced,
+                    IsSaturationValueMaxForced);
+
+                if (bgraPixelData != null)
+                {
+                    if (_backgroundBitmap != null)
+                    {
+                        // TODO: CURRENTLY DISABLED DUE TO INTERMITTENT CRASHES IN SKIA/RENDERER
+                        //
+                        // Re-use the existing WriteableBitmap
+                        // This assumes the height, width and byte counts are the same and must be set to null
+                        // elsewhere if that assumption is ever not true.
+                        // ColorPickerHelpers.UpdateBitmapFromPixelData(_backgroundBitmap, bgraPixelData);
+
+                        // TODO: ALSO DISABLED DISPOSE DUE TO INTERMITTENT CRASHES
+                        //_backgroundBitmap?.Dispose();
+                        _backgroundBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraPixelData, pixelWidth, pixelHeight);
+                    }
+                    else
+                    {
+                        _backgroundBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraPixelData, pixelWidth, pixelHeight);
+                    }
+
+                    Background = new ImageBrush(_backgroundBitmap);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Rounds the component values of the given <see cref="HsvColor"/>.
+        /// This is useful for user-display and to ensure a color matches user selection exactly.
+        /// </summary>
+        /// <param name="hsvColor">The <see cref="HsvColor"/> to round component values for.</param>
+        /// <returns>A new <see cref="HsvColor"/> with rounded component values.</returns>
+        private HsvColor RoundComponentValues(HsvColor hsvColor)
+        {
+            return new HsvColor(
+                Math.Round(hsvColor.A, 2, MidpointRounding.AwayFromZero),
+                Math.Round(hsvColor.H, 0, MidpointRounding.AwayFromZero),
+                Math.Round(hsvColor.S, 2, MidpointRounding.AwayFromZero),
+                Math.Round(hsvColor.V, 2, MidpointRounding.AwayFromZero));
+        }
+
+        /// <summary>
+        /// Updates the slider property values by applying the current color.
+        /// </summary>
+        /// <remarks>
+        /// Warning: This will trigger property changed updates.
+        /// Consider using <see cref="ignorePropertyChanged"/> externally.
+        /// </remarks>
+        private void SetColorToSliderValues()
+        {
+            var component = ColorComponent;
+
+            if (ColorModel == ColorModel.Hsva)
+            {
+                var hsvColor = HsvColor;
+
+                if (IsRoundingEnabled)
+                {
+                    hsvColor = RoundComponentValues(hsvColor);
+                }
+
+                // Note: Components converted into a usable range for the user
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                        Minimum = 0;
+                        Maximum = 100;
+                        Value   = hsvColor.A * 100;
+                        break;
+                    case ColorComponent.Component1: // Hue
+                        Minimum = 0;
+                        Maximum = MaxHue;
+                        Value   = hsvColor.H;
+                        break;
+                    case ColorComponent.Component2: // Saturation
+                        Minimum = 0;
+                        Maximum = 100;
+                        Value   = hsvColor.S * 100;
+                        break;
+                    case ColorComponent.Component3: // Value
+                        Minimum = 0;
+                        Maximum = 100;
+                        Value   = hsvColor.V * 100;
+                        break;
+                }
+            }
+            else
+            {
+                var rgbColor = Color;
+
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.A);
+                        break;
+                    case ColorComponent.Component1: // Red
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.R);
+                        break;
+                    case ColorComponent.Component2: // Green
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.G);
+                        break;
+                    case ColorComponent.Component3: // Blue
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.B);
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the current color determined by the slider values.
+        /// </summary>
+        private (Color, HsvColor) GetColorFromSliderValues()
+        {
+            HsvColor hsvColor = new HsvColor();
+            Color rgbColor = new Color();
+            double sliderPercent = Value / (Maximum - Minimum);
+            var component = ColorComponent;
+
+            if (ColorModel == ColorModel.Hsva)
+            {
+                var baseHsvColor = HsvColor;
+
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                    {
+                        hsvColor = new HsvColor(sliderPercent, baseHsvColor.H, baseHsvColor.S, baseHsvColor.V);
+                        break;
+                    }
+                    case ColorComponent.Component1:
+                    {
+                        hsvColor = new HsvColor(baseHsvColor.A, sliderPercent * MaxHue, baseHsvColor.S, baseHsvColor.V);
+                        break;
+                    }
+                    case ColorComponent.Component2:
+                    {
+                        hsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, sliderPercent, baseHsvColor.V);
+                        break;
+                    }
+                    case ColorComponent.Component3:
+                    {
+                        hsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, baseHsvColor.S, sliderPercent);
+                        break;
+                    }
+                }
+
+                rgbColor = hsvColor.ToRgb();
+            }
+            else
+            {
+                var baseRgbColor = Color;
+
+                byte componentValue = Convert.ToByte(MathUtilities.Clamp(sliderPercent * 255, 0, 255));
+
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                        rgbColor = new Color(componentValue, baseRgbColor.R, baseRgbColor.G, baseRgbColor.B);
+                        break;
+                    case ColorComponent.Component1:
+                        rgbColor = new Color(baseRgbColor.A, componentValue, baseRgbColor.G, baseRgbColor.B);
+                        break;
+                    case ColorComponent.Component2:
+                        rgbColor = new Color(baseRgbColor.A, baseRgbColor.R, componentValue, baseRgbColor.B);
+                        break;
+                    case ColorComponent.Component3:
+                        rgbColor = new Color(baseRgbColor.A, baseRgbColor.R, baseRgbColor.G, componentValue);
+                        break;
+                }
+
+                hsvColor = rgbColor.ToHsv();
+            }
+
+            if (IsRoundingEnabled)
+            {
+                hsvColor = RoundComponentValues(hsvColor);
+            }
+
+            return (rgbColor, hsvColor);
+        }
+
+        /// <summary>
+        /// Gets the actual background color displayed for the given HSV color.
+        /// This can differ due to the effects of certain properties intended to improve perception.
+        /// </summary>
+        /// <param name="hsvColor">The actual color to get the equivalent background color for.</param>
+        /// <returns>The equivalent, perceived background color.</returns>
+        private HsvColor GetEquivalentBackgroundColor(HsvColor hsvColor)
+        {
+            var component = ColorComponent;
+            var isAlphaMaxForced = IsAlphaMaxForced;
+            var isSaturationValueMaxForced = IsSaturationValueMaxForced;
+
+            if (isAlphaMaxForced &&
+                component != ColorComponent.Alpha)
+            {
+                hsvColor = new HsvColor(1.0, hsvColor.H, hsvColor.S, hsvColor.V);
+            }
+
+            switch (component)
+            {
+                case ColorComponent.Component1:
+                    return new HsvColor(
+                        hsvColor.A,
+                        hsvColor.H,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.S,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.V);
+                case ColorComponent.Component2:
+                    return new HsvColor(
+                        hsvColor.A,
+                        hsvColor.H,
+                        hsvColor.S,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.V);
+                case ColorComponent.Component3:
+                    return new HsvColor(
+                        hsvColor.A,
+                        hsvColor.H,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.S,
+                        hsvColor.V);
+                default:
+                    return hsvColor;
+            }
+        }
+
+        /// <summary>
+        /// Gets the actual background color displayed for the given RGB color.
+        /// This can differ due to the effects of certain properties intended to improve perception.
+        /// </summary>
+        /// <param name="rgbColor">The actual color to get the equivalent background color for.</param>
+        /// <returns>The equivalent, perceived background color.</returns>
+        private Color GetEquivalentBackgroundColor(Color rgbColor)
+        {
+            var component = ColorComponent;
+            var isAlphaMaxForced = IsAlphaMaxForced;
+
+            if (isAlphaMaxForced &&
+                component != ColorComponent.Alpha)
+            {
+                rgbColor = new Color(255, rgbColor.R, rgbColor.G, rgbColor.B);
+            }
+
+            return rgbColor;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (ignorePropertyChanged)
+            {
+                base.OnPropertyChanged(change);
+                return;
+            }
+
+            if (change.Property == ColorProperty)
+            {
+                ignorePropertyChanged = true;
+
+                // Always keep the two color properties in sync
+                HsvColor = Color.ToHsv();
+
+                SetColorToSliderValues();
+                UpdateBackground();
+                UpdatePseudoClasses();
+
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<Color>(),
+                    change.GetNewValue<Color>()));
+
+                ignorePropertyChanged = false;
+            }
+            else if (change.Property == ColorComponentProperty ||
+                     change.Property == ColorModelProperty ||
+                     change.Property == IsAlphaMaxForcedProperty ||
+                     change.Property == IsSaturationValueMaxForcedProperty)
+            {
+                ignorePropertyChanged = true;
+
+                SetColorToSliderValues();
+                UpdateBackground();
+                UpdatePseudoClasses();
+
+                ignorePropertyChanged = false;
+            }
+            else if (change.Property == HsvColorProperty)
+            {
+                ignorePropertyChanged = true;
+
+                // Always keep the two color properties in sync
+                Color = HsvColor.ToRgb();
+
+                SetColorToSliderValues();
+                UpdateBackground();
+                UpdatePseudoClasses();
+
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<HsvColor>().ToRgb(),
+                    change.GetNewValue<HsvColor>().ToRgb()));
+
+                ignorePropertyChanged = false;
+            }
+            else if (change.Property == IsRoundingEnabledProperty)
+            {
+                SetColorToSliderValues();
+            }
+            else if (change.Property == BoundsProperty)
+            {
+                // If the control's overall dimensions have changed the background bitmap size also needs to change.
+                // This means the existing bitmap must be released to be recreated correctly in UpdateBackground().
+                _backgroundBitmap?.Dispose();
+                _backgroundBitmap = null;
+
+                UpdateBackground();
+                UpdatePseudoClasses();
+            }
+            else if (change.Property == ValueProperty ||
+                     change.Property == MinimumProperty ||
+                     change.Property == MaximumProperty)
+            {
+                ignorePropertyChanged = true;
+
+                Color oldColor = Color;
+                (var color, var hsvColor) = GetColorFromSliderValues();
+
+                if (ColorModel == ColorModel.Hsva)
+                {
+                    HsvColor = hsvColor;
+                    Color = hsvColor.ToRgb();
+                }
+                else
+                {
+                    Color = color;
+                    HsvColor = color.ToHsv();
+                }
+
+                UpdatePseudoClasses();
+                OnColorChanged(new ColorChangedEventArgs(oldColor, Color));
+
+                ignorePropertyChanged = false;
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="ColorChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The <see cref="ColorChangedEventArgs"/> defining old/new colors.</param>
+        protected virtual void OnColorChanged(ColorChangedEventArgs e)
+        {
+            ColorChanged?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
new file mode 100644
index 0000000000..5c7de2459b
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
@@ -0,0 +1,246 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <inheritdoc/>
+    public partial class ColorSpectrum
+    {
+        /// <summary>
+        /// Defines the <see cref="Color"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> ColorProperty =
+            AvaloniaProperty.Register<ColorSpectrum, Color>(
+                nameof(Color),
+                Colors.White,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="Components"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorSpectrumComponents> ComponentsProperty =
+            AvaloniaProperty.Register<ColorSpectrum, ColorSpectrumComponents>(
+                nameof(Components),
+                ColorSpectrumComponents.HueSaturation);
+
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorSpectrum, HsvColor>(
+                nameof(HsvColor),
+                Colors.White.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="MaxHue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxHueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MaxHue),
+                359);
+
+        /// <summary>
+        /// Defines the <see cref="MaxSaturation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxSaturationProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MaxSaturation),
+                100);
+
+        /// <summary>
+        /// Defines the <see cref="MaxValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxValueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MaxValue),
+                100);
+
+        /// <summary>
+        /// Defines the <see cref="MinHue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinHueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MinHue),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="MinSaturation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinSaturationProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MinSaturation),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="MinValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinValueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MinValue),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="Shape"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorSpectrumShape> ShapeProperty =
+            AvaloniaProperty.Register<ColorSpectrum, ColorSpectrumShape>(
+                nameof(Shape),
+                ColorSpectrumShape.Box);
+
+        /// <summary>
+        /// Defines the <see cref="ThirdComponent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorComponent> ThirdComponentProperty =
+            AvaloniaProperty.Register<ColorSpectrum, ColorComponent>(
+                nameof(ThirdComponent),
+                ColorComponent.Component3); // Value
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the RGB color model.
+        /// </summary>
+        /// <remarks>
+        /// For control authors, use <see cref="HsvColor"/> instead to avoid loss
+        /// of precision and color drifting.
+        /// </remarks>
+        public Color Color
+        {
+            get => GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the two HSV color components displayed by the spectrum.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public ColorSpectrumComponents Components
+        {
+            get => GetValue(ComponentsProperty);
+            set => SetValue(ComponentsProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the HSV color model.
+        /// </summary>
+        /// <remarks>
+        /// This should be used in all cases instead of the <see cref="Color"/> property.
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model and using
+        /// this property will avoid loss of precision and color drifting.
+        /// </remarks>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the Hue component in the range from 0..359.
+        /// This property must be greater than <see cref="MinHue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MaxHue
+        {
+            get => GetValue(MaxHueProperty);
+            set => SetValue(MaxHueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the Saturation component in the range from 0..100.
+        /// This property must be greater than <see cref="MinSaturation"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MaxSaturation
+        {
+            get => GetValue(MaxSaturationProperty);
+            set => SetValue(MaxSaturationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the Value component in the range from 0..100.
+        /// This property must be greater than <see cref="MinValue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MaxValue
+        {
+            get => GetValue(MaxValueProperty);
+            set => SetValue(MaxValueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the Hue component in the range from 0..359.
+        /// This property must be less than <see cref="MaxHue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MinHue
+        {
+            get => GetValue(MinHueProperty);
+            set => SetValue(MinHueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the Saturation component in the range from 0..100.
+        /// This property must be less than <see cref="MaxSaturation"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MinSaturation
+        {
+            get => GetValue(MinSaturationProperty);
+            set => SetValue(MinSaturationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the Value component in the range from 0..100.
+        /// This property must be less than <see cref="MaxValue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MinValue
+        {
+            get => GetValue(MinValueProperty);
+            set => SetValue(MinValueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the displayed shape of the spectrum.
+        /// </summary>
+        public ColorSpectrumShape Shape
+        {
+            get => GetValue(ShapeProperty);
+            set => SetValue(ShapeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the third HSV color component that is NOT displayed by the spectrum.
+        /// This is automatically calculated from the <see cref="Components"/> property.
+        /// </summary>
+        /// <remarks>
+        /// This property should be used for any external color slider that represents the
+        /// third component of the color. Note that this property uses the generic
+        /// <see cref="ColorComponent"/> type instead of the more accurate <see cref="HsvComponent"/>
+        /// to allow direct usage by the generalized color sliders.
+        /// </remarks>
+        public ColorComponent ThirdComponent
+        {
+            get => GetValue(ThirdComponentProperty);
+            protected set => SetValue(ThirdComponentProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
new file mode 100644
index 0000000000..f0ed89fb3a
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -0,0 +1,1650 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// A two dimensional spectrum for color selection.
+    /// </summary>
+    [TemplatePart("PART_InputTarget",              typeof(Canvas))]
+    [TemplatePart("PART_LayoutRoot",               typeof(Panel))]
+    [TemplatePart("PART_SelectionEllipsePanel",    typeof(Panel))]
+    [TemplatePart("PART_SizingPanel",              typeof(Panel))]
+    [TemplatePart("PART_SpectrumEllipse",          typeof(Ellipse))]
+    [TemplatePart("PART_SpectrumRectangle",        typeof(Rectangle))]
+    [TemplatePart("PART_SpectrumOverlayEllipse",   typeof(Ellipse))]
+    [TemplatePart("PART_SpectrumOverlayRectangle", typeof(Rectangle))]
+    [PseudoClasses(pcPressed, pcLargeSelector, pcDarkSelector, pcLightSelector)]
+    public partial class ColorSpectrum : TemplatedControl
+    {
+        protected const string pcPressed       = ":pressed";
+        protected const string pcDarkSelector  = ":dark-selector";
+        protected const string pcLargeSelector = ":large-selector";
+        protected const string pcLightSelector = ":light-selector";
+
+        /// <summary>
+        /// Event for when the selected color changes within the spectrum.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        private bool _updatingColor = false;
+        private bool _updatingHsvColor = false;
+        private bool _isPointerPressed = false;
+        private bool _shouldShowLargeSelection = false;
+        private List<Hsv> _hsvValues = new List<Hsv>();
+
+        private IDisposable? _layoutRootDisposable;
+        private IDisposable? _selectionEllipsePanelDisposable;
+
+        // XAML template parts
+        private Panel? _layoutRoot;
+        private Panel? _sizingPanel;
+        private Rectangle? _spectrumRectangle;
+        private Ellipse? _spectrumEllipse;
+        private Rectangle? _spectrumOverlayRectangle;
+        private Ellipse? _spectrumOverlayEllipse;
+        private Canvas? _inputTarget;
+        private Panel? _selectionEllipsePanel;
+
+        // Put the spectrum images in a bitmap, which is then given to an ImageBrush.
+        private WriteableBitmap? _hueRedBitmap;
+        private WriteableBitmap? _hueYellowBitmap;
+        private WriteableBitmap? _hueGreenBitmap;
+        private WriteableBitmap? _hueCyanBitmap;
+        private WriteableBitmap? _hueBlueBitmap;
+        private WriteableBitmap? _huePurpleBitmap;
+
+        private WriteableBitmap? _saturationMinimumBitmap;
+        private WriteableBitmap? _saturationMaximumBitmap;
+
+        private WriteableBitmap? _valueBitmap;
+        private WriteableBitmap? _minBitmap;
+        private WriteableBitmap? _maxBitmap;
+
+        // Fields used by UpdateEllipse() to ensure that it's using the data
+        // associated with the last call to CreateBitmapsAndColorMap(),
+        // in order to function properly while the asynchronous bitmap creation
+        // is in progress.
+        private ColorSpectrumShape _shapeFromLastBitmapCreation = ColorSpectrumShape.Box;
+        private ColorSpectrumComponents _componentsFromLastBitmapCreation = ColorSpectrumComponents.HueSaturation;
+        private double _imageWidthFromLastBitmapCreation = 0.0;
+        private double _imageHeightFromLastBitmapCreation = 0.0;
+        private int _minHueFromLastBitmapCreation = 0;
+        private int _maxHueFromLastBitmapCreation = 0;
+        private int _minSaturationFromLastBitmapCreation = 0;
+        private int _maxSaturationFromLastBitmapCreation = 0;
+        private int _minValueFromLastBitmapCreation = 0;
+        private int _maxValueFromLastBitmapCreation = 0;
+
+        private Color _oldColor = Color.FromArgb(255, 255, 255, 255);
+        private HsvColor _oldHsvColor = HsvColor.FromAhsv(0.0f, 0.0f, 1.0f, 1.0f);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorSpectrum"/> class.
+        /// </summary>
+        public ColorSpectrum() : base()
+        {
+            _shapeFromLastBitmapCreation = Shape;
+            _componentsFromLastBitmapCreation = Components;
+            _imageWidthFromLastBitmapCreation = 0;
+            _imageHeightFromLastBitmapCreation = 0;
+            _minHueFromLastBitmapCreation = MinHue;
+            _maxHueFromLastBitmapCreation = MaxHue;
+            _minSaturationFromLastBitmapCreation = MinSaturation;
+            _maxSaturationFromLastBitmapCreation = MaxSaturation;
+            _minValueFromLastBitmapCreation = MinValue;
+            _maxValueFromLastBitmapCreation = MaxValue;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            UnregisterEvents(); // Failsafe
+
+            _inputTarget = e.NameScope.Find<Canvas>("PART_InputTarget");
+            _layoutRoot = e.NameScope.Find<Panel>("PART_LayoutRoot");
+            _selectionEllipsePanel = e.NameScope.Find<Panel>("PART_SelectionEllipsePanel");
+            _sizingPanel = e.NameScope.Find<Panel>("PART_SizingPanel");
+            _spectrumEllipse = e.NameScope.Find<Ellipse>("PART_SpectrumEllipse");
+            _spectrumRectangle = e.NameScope.Find<Rectangle>("PART_SpectrumRectangle");
+            _spectrumOverlayEllipse = e.NameScope.Find<Ellipse>("PART_SpectrumOverlayEllipse");
+            _spectrumOverlayRectangle = e.NameScope.Find<Rectangle>("PART_SpectrumOverlayRectangle");
+
+            if (_inputTarget != null)
+            {
+                _inputTarget.PointerEntered += InputTarget_PointerEntered;
+                _inputTarget.PointerExited += InputTarget_PointerExited;
+                _inputTarget.PointerPressed += InputTarget_PointerPressed;
+                _inputTarget.PointerMoved += InputTarget_PointerMoved;
+                _inputTarget.PointerReleased += InputTarget_PointerReleased;
+            }
+
+            if (_layoutRoot != null)
+            {
+                _layoutRootDisposable = _layoutRoot.GetObservable(BoundsProperty).Subscribe(_ => 
+                {
+                    CreateBitmapsAndColorMap();
+                });
+            }
+
+            if (_selectionEllipsePanel != null)
+            {
+                _selectionEllipsePanelDisposable = _selectionEllipsePanel.GetObservable(FlowDirectionProperty).Subscribe(_ => 
+                {
+                    UpdateEllipse();
+                });
+            }
+
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetTip(_selectionEllipsePanel, ColorHelper.ToDisplayName(Color));
+            }
+
+            // If we haven't yet created our bitmaps, do so now.
+            if (_hsvValues.Count == 0)
+            {
+                CreateBitmapsAndColorMap();
+            }
+
+            UpdateEllipse();
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            // If the color was updated while this ColorSpectrum was not part of the visual tree,
+            // the selection ellipse may be in an incorrect position. This is because the spectrum
+            // renders based on layout scaling to avoid color banding; however, layout scale is only
+            // available when the control is attached to the visual tree. The ColorSpectrum's color
+            // may be updated from code-behind or from binding with another control when it's not
+            // part of the visual tree.
+            //
+            //  See discussion: https://github.com/AvaloniaUI/Avalonia/discussions/9077
+            //
+            // To work-around this issue the selection ellipse is refreshed here.
+            UpdateEllipse();
+
+            // OnAttachedToVisualTree is called after OnApplyTemplate so events cannot be connected here
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+        }
+
+        /// <summary>
+        /// Explicitly unregisters all events connected in OnApplyTemplate().
+        /// </summary>
+        private void UnregisterEvents()
+        {
+            _layoutRootDisposable?.Dispose();
+            _layoutRootDisposable = null;
+
+            _selectionEllipsePanelDisposable?.Dispose();
+            _selectionEllipsePanelDisposable = null;
+
+            if (_inputTarget != null)
+            {
+                _inputTarget.PointerEntered -= InputTarget_PointerEntered;
+                _inputTarget.PointerExited -= InputTarget_PointerExited;
+                _inputTarget.PointerPressed -= InputTarget_PointerPressed;
+                _inputTarget.PointerMoved -= InputTarget_PointerMoved;
+                _inputTarget.PointerReleased -= InputTarget_PointerReleased;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            var key = e.Key;
+
+            if (key != Key.Left &&
+                key != Key.Right &&
+                key != Key.Up &&
+                key != Key.Down)
+            {
+                base.OnKeyDown(e);
+                return;
+            }
+
+            bool isControlDown = e.KeyModifiers.HasFlag(KeyModifiers.Control);
+
+            HsvComponent incrementComponent = HsvComponent.Hue;
+
+            bool isSaturationValue = false;
+
+            if (key == Key.Left ||
+                key == Key.Right)
+            {
+                switch (Components)
+                {
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.HueValue:
+                        incrementComponent = HsvComponent.Hue;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        isSaturationValue = true;
+                        goto case ColorSpectrumComponents.SaturationHue;
+                    case ColorSpectrumComponents.SaturationHue:
+                        incrementComponent = HsvComponent.Saturation;
+                        break;
+
+                    case ColorSpectrumComponents.ValueHue:
+                    case ColorSpectrumComponents.ValueSaturation:
+                        incrementComponent = HsvComponent.Value;
+                        break;
+                }
+            }
+            else if (key == Key.Up ||
+                     key == Key.Down)
+            {
+                switch (Components)
+                {
+                    case ColorSpectrumComponents.SaturationHue:
+                    case ColorSpectrumComponents.ValueHue:
+                        incrementComponent = HsvComponent.Hue;
+                        break;
+
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.ValueSaturation:
+                        incrementComponent = HsvComponent.Saturation;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        isSaturationValue = true;
+                        goto case ColorSpectrumComponents.HueValue;
+                    case ColorSpectrumComponents.HueValue:
+                        incrementComponent = HsvComponent.Value;
+                        break;
+                }
+            }
+
+            double minBound = 0.0;
+            double maxBound = 0.0;
+
+            switch (incrementComponent)
+            {
+                case HsvComponent.Hue:
+                    minBound = MinHue;
+                    maxBound = MaxHue;
+                    break;
+
+                case HsvComponent.Saturation:
+                    minBound = MinSaturation;
+                    maxBound = MaxSaturation;
+                    break;
+
+                case HsvComponent.Value:
+                    minBound = MinValue;
+                    maxBound = MaxValue;
+                    break;
+            }
+
+            // The order of saturation and value in the spectrum is reversed - the max value is at the bottom while the min value is at the top -
+            // so we want left and up to be lower for hue, but higher for saturation and value.
+            // This will ensure that the icon always moves in the direction of the key press.
+            IncrementDirection direction =
+                (incrementComponent == HsvComponent.Hue && (key == Key.Left || key == Key.Up)) ||
+                (incrementComponent != HsvComponent.Hue && (key == Key.Right || key == Key.Down)) ?
+                IncrementDirection.Lower :
+                IncrementDirection.Higher;
+
+            // Image is flipped in RightToLeft, so we need to invert direction in that case.
+            // The combination saturation and value is also flipped, so we need to invert in that case too.
+            // If both are false, we don't need to invert.
+            // If both are true, we would invert twice, so not invert at all.
+            if ((FlowDirection == FlowDirection.RightToLeft) != isSaturationValue &&
+                (key == Key.Left || key == Key.Right))
+            {
+                if (direction == IncrementDirection.Higher)
+                {
+                    direction = IncrementDirection.Lower;
+                }
+                else
+                {
+                    direction = IncrementDirection.Higher;
+                }
+            }
+
+            IncrementAmount amount = isControlDown ? IncrementAmount.Large : IncrementAmount.Small;
+
+            HsvColor hsvColor = HsvColor;
+            UpdateColor(ColorPickerHelpers.IncrementColorComponent(
+                new Hsv(hsvColor),
+                incrementComponent,
+                direction,
+                amount,
+                shouldWrap: true,
+                minBound,
+                maxBound));
+
+            e.Handled = true;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, true);
+            }
+
+            UpdatePseudoClasses();
+
+            base.OnGotFocus(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, false);
+            }
+
+            UpdatePseudoClasses();
+
+            base.OnLostFocus(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerExited(PointerEventArgs e)
+        {
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, false);
+            }
+
+            UpdatePseudoClasses();
+
+            base.OnPointerExited(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == ColorProperty)
+            {
+                // If we're in the process of internally updating the color,
+                // then we don't want to respond to the Color property changing.
+                if (!_updatingColor)
+                {
+                    Color color = Color;
+
+                    _updatingHsvColor = true;
+                    Hsv newHsv = (new Rgb(color)).ToHsv();
+                    HsvColor = newHsv.ToHsvColor(color.A / 255.0);
+                    _updatingHsvColor = false;
+
+                    UpdateEllipse();
+                    UpdateBitmapSources();
+                }
+
+                _oldColor = change.GetOldValue<Color>();
+            }
+            else if (change.Property == HsvColorProperty)
+            {
+                // If we're in the process of internally updating the HSV color,
+                // then we don't want to respond to the HsvColor property changing.
+                if (!_updatingHsvColor)
+                {
+                    SetColor();
+                }
+
+                _oldHsvColor = change.GetOldValue<HsvColor>();
+            }
+            else if (change.Property == MinHueProperty ||
+                     change.Property == MaxHueProperty)
+            {
+                int minHue = MinHue;
+                int maxHue = MaxHue;
+
+                if (minHue < 0 || minHue > 359)
+                {
+                    throw new ArgumentException("MinHue must be between 0 and 359.");
+                }
+                else if (maxHue < 0 || maxHue > 359)
+                {
+                    throw new ArgumentException("MaxHue must be between 0 and 359.");
+                }
+
+                ColorSpectrumComponents components = Components;
+
+                // If hue is one of the axes in the spectrum bitmap, then we'll need to regenerate it
+                // if the maximum or minimum value has changed.
+                if (components != ColorSpectrumComponents.SaturationValue &&
+                    components != ColorSpectrumComponents.ValueSaturation)
+                {
+                    CreateBitmapsAndColorMap();
+                }
+            }
+            else if (change.Property == MinSaturationProperty ||
+                     change.Property == MaxSaturationProperty)
+            {
+                int minSaturation = MinSaturation;
+                int maxSaturation = MaxSaturation;
+
+                if (minSaturation < 0 || minSaturation > 100)
+                {
+                    throw new ArgumentException("MinSaturation must be between 0 and 100.");
+                }
+                else if (maxSaturation < 0 || maxSaturation > 100)
+                {
+                    throw new ArgumentException("MaxSaturation must be between 0 and 100.");
+                }
+
+                ColorSpectrumComponents components = Components;
+
+                // If value is one of the axes in the spectrum bitmap, then we'll need to regenerate it
+                // if the maximum or minimum value has changed.
+                if (components != ColorSpectrumComponents.HueValue &&
+                    components != ColorSpectrumComponents.ValueHue)
+                {
+                    CreateBitmapsAndColorMap();
+                }
+            }
+            else if (change.Property == MinValueProperty ||
+                     change.Property == MaxValueProperty)
+            {
+                int minValue = MinValue;
+                int maxValue = MaxValue;
+
+                if (minValue < 0 || minValue > 100)
+                {
+                    throw new ArgumentException("MinValue must be between 0 and 100.");
+                }
+                else if (maxValue < 0 || maxValue > 100)
+                {
+                    throw new ArgumentException("MaxValue must be between 0 and 100.");
+                }
+
+                ColorSpectrumComponents components = Components;
+
+                // If value is one of the axes in the spectrum bitmap, then we'll need to regenerate it
+                // if the maximum or minimum value has changed.
+                if (components != ColorSpectrumComponents.HueSaturation &&
+                    components != ColorSpectrumComponents.SaturationHue)
+                {
+                    CreateBitmapsAndColorMap();
+                }
+            }
+            else if (change.Property == ShapeProperty)
+            {
+                CreateBitmapsAndColorMap();
+            }
+            else if (change.Property == ComponentsProperty)
+            {
+                // Calculate and update the ThirdComponent value
+                switch (Components)
+                {
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.SaturationHue:
+                        ThirdComponent = (ColorComponent)HsvComponent.Value;
+                        break;
+                    case ColorSpectrumComponents.HueValue:
+                    case ColorSpectrumComponents.ValueHue:
+                        ThirdComponent = (ColorComponent)HsvComponent.Saturation;
+                        break;
+                    case ColorSpectrumComponents.SaturationValue:
+                    case ColorSpectrumComponents.ValueSaturation:
+                        ThirdComponent = (ColorComponent)HsvComponent.Hue;
+                        break;
+                }
+
+                CreateBitmapsAndColorMap();
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        private void SetColor()
+        {
+            HsvColor hsvColor = HsvColor;
+
+            _updatingColor = true;
+            Rgb newRgb = (new Hsv(hsvColor)).ToRgb();
+
+            Color = newRgb.ToColor(hsvColor.A);
+
+            _updatingColor = false;
+
+            UpdateEllipse();
+            UpdateBitmapSources();
+            RaiseColorChanged();
+        }
+
+        public void RaiseColorChanged()
+        {
+            Color newColor = Color;
+
+            bool colorChanged =
+                _oldColor.A != newColor.A ||
+                _oldColor.R != newColor.R ||
+                _oldColor.G != newColor.G ||
+                _oldColor.B != newColor.B;
+
+            bool areBothColorsBlack =
+                (_oldColor.R == newColor.R && newColor.R == 0) ||
+                (_oldColor.G == newColor.G && newColor.G == 0) ||
+                (_oldColor.B == newColor.B && newColor.B == 0);
+
+            if (colorChanged || areBothColorsBlack)
+            {
+                var colorChangedEventArgs = new ColorChangedEventArgs(_oldColor, newColor);
+                ColorChanged?.Invoke(this, colorChangedEventArgs);
+
+                if (_selectionEllipsePanel != null &&
+                    ColorHelper.ToDisplayNameExists)
+                {
+                    ToolTip.SetTip(_selectionEllipsePanel, ColorHelper.ToDisplayName(Color));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the visual state of the control by applying latest PseudoClasses.
+        /// </summary>
+        private void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(pcPressed, _isPointerPressed);
+            // Note: The ":pointerover" pseudo class is set in the base Control
+
+            if (_isPointerPressed)
+            {
+                PseudoClasses.Set(pcLargeSelector, _shouldShowLargeSelection);
+            }
+            else
+            {
+                PseudoClasses.Set(pcLargeSelector, false);
+            }
+
+            if (SelectionEllipseShouldBeLight())
+            {
+                PseudoClasses.Set(pcDarkSelector, false);
+                PseudoClasses.Set(pcLightSelector, true);
+            }
+            else
+            {
+                PseudoClasses.Set(pcDarkSelector, true);
+                PseudoClasses.Set(pcLightSelector, false);
+            }
+        }
+
+        private void UpdateColor(Hsv newHsv)
+        {
+            _updatingColor = true;
+            _updatingHsvColor = true;
+
+            Rgb newRgb = newHsv.ToRgb();
+            double alpha = HsvColor.A;
+
+            Color = newRgb.ToColor(alpha);
+            HsvColor = newHsv.ToHsvColor(alpha);
+
+            UpdateEllipse();
+            UpdatePseudoClasses();
+
+            _updatingHsvColor = false;
+            _updatingColor = false;
+
+            RaiseColorChanged();
+        }
+
+        /// <summary>
+        /// Updates the selected <see cref="HsvColor"/> and <see cref="Color"/> based on a point within the color spectrum.
+        /// </summary>
+        /// <param name="point">The point on the spectrum representing the color.</param>
+        private void UpdateColorFromPoint(PointerPoint point)
+        {
+            // If we haven't initialized our HSV value array yet, then we should just ignore any user input -
+            // we don't yet know what to do with it.
+            if (_hsvValues.Count == 0)
+            {
+                return;
+            }
+
+            // Remember the bitmap size follows physical device pixels
+            var scale = LayoutHelper.GetLayoutScale(this);
+            double xPosition = point.Position.X * scale;
+            double yPosition = point.Position.Y * scale;
+            double radius = Math.Min(_imageWidthFromLastBitmapCreation, _imageHeightFromLastBitmapCreation) / 2;
+            double distanceFromRadius = Math.Sqrt(Math.Pow(xPosition - radius, 2) + Math.Pow(yPosition - radius, 2));
+
+            var shape = Shape;
+
+            // If the point is outside the circle, we should bring it back into the circle.
+            if (distanceFromRadius > radius && shape == ColorSpectrumShape.Ring)
+            {
+                xPosition = (radius / distanceFromRadius) * (xPosition - radius) + radius;
+                yPosition = (radius / distanceFromRadius) * (yPosition - radius) + radius;
+            }
+
+            // Now we need to find the index into the array of HSL values at each point in the spectrum m_image.
+            int x = (int)Math.Round(xPosition);
+            int y = (int)Math.Round(yPosition);
+            int width = (int)Math.Round(_imageWidthFromLastBitmapCreation);
+
+            if (x < 0)
+            {
+                x = 0;
+            }
+            else if (x >= _imageWidthFromLastBitmapCreation)
+            {
+                x = (int)Math.Round(_imageWidthFromLastBitmapCreation) - 1;
+            }
+
+            if (y < 0)
+            {
+                y = 0;
+            }
+            else if (y >= _imageHeightFromLastBitmapCreation)
+            {
+                y = (int)Math.Round(_imageHeightFromLastBitmapCreation) - 1;
+            }
+
+            // The gradient image contains two dimensions of HSL information, but not the third.
+            // We should keep the third where it already was.
+            // Note: This can sometimes cause a crash -- possibly due to differences in c# rounding. Therefore, index is now clamped.
+            Hsv hsvAtPoint = _hsvValues[MathUtilities.Clamp((y * width + x), 0, _hsvValues.Count - 1)];
+
+            var hsvColor = HsvColor;
+
+            switch (Components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                case ColorSpectrumComponents.ValueHue:
+                    hsvAtPoint.S = hsvColor.S;
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                case ColorSpectrumComponents.SaturationHue:
+                    hsvAtPoint.V = hsvColor.V;
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                case ColorSpectrumComponents.SaturationValue:
+                    hsvAtPoint.H = hsvColor.H;
+                    break;
+            }
+
+            UpdateColor(hsvAtPoint);
+        }
+
+        /// <summary>
+        /// Updates the position of the selection ellipse on the spectrum which indicates the selected color.
+        /// </summary>
+        private void UpdateEllipse()
+        {
+            if (_selectionEllipsePanel == null)
+            {
+                return;
+            }
+
+            // If we don't have an image size yet, we shouldn't be showing the ellipse.
+            if (_imageWidthFromLastBitmapCreation == 0 ||
+                _imageHeightFromLastBitmapCreation == 0)
+            {
+                _selectionEllipsePanel.IsVisible = false;
+                return;
+            }
+            else
+            {
+                _selectionEllipsePanel.IsVisible = true;
+            }
+
+            double xPosition;
+            double yPosition;
+
+            Hsv hsvColor = new Hsv(HsvColor);
+
+            hsvColor.H = MathUtilities.Clamp(hsvColor.H, (double)_minHueFromLastBitmapCreation, (double)_maxHueFromLastBitmapCreation);
+            hsvColor.S = MathUtilities.Clamp(hsvColor.S, _minSaturationFromLastBitmapCreation / 100.0, _maxSaturationFromLastBitmapCreation / 100.0);
+            hsvColor.V = MathUtilities.Clamp(hsvColor.V, _minValueFromLastBitmapCreation / 100.0, _maxValueFromLastBitmapCreation / 100.0);
+
+            if (_shapeFromLastBitmapCreation == ColorSpectrumShape.Box)
+            {
+                double xPercent = 0;
+                double yPercent = 0;
+
+                double hPercent = (hsvColor.H - _minHueFromLastBitmapCreation) / (_maxHueFromLastBitmapCreation - _minHueFromLastBitmapCreation);
+                double sPercent = (hsvColor.S * 100.0 - _minSaturationFromLastBitmapCreation) / (_maxSaturationFromLastBitmapCreation - _minSaturationFromLastBitmapCreation);
+                double vPercent = (hsvColor.V * 100.0 - _minValueFromLastBitmapCreation) / (_maxValueFromLastBitmapCreation - _minValueFromLastBitmapCreation);
+
+                // In the case where saturation was an axis in the spectrum with hue, or value is an axis, full stop,
+                // we inverted the direction of that axis in order to put more hue on the outside of the ring,
+                // so we need to do similarly here when positioning the ellipse.
+                if (_componentsFromLastBitmapCreation == ColorSpectrumComponents.HueSaturation ||
+                    _componentsFromLastBitmapCreation == ColorSpectrumComponents.SaturationHue)
+                {
+                    sPercent = 1 - sPercent;
+                }
+                else
+                {
+                    vPercent = 1 - vPercent;
+                }
+
+                switch (_componentsFromLastBitmapCreation)
+                {
+                    case ColorSpectrumComponents.HueValue:
+                        xPercent = hPercent;
+                        yPercent = vPercent;
+                        break;
+
+                    case ColorSpectrumComponents.HueSaturation:
+                        xPercent = hPercent;
+                        yPercent = sPercent;
+                        break;
+
+                    case ColorSpectrumComponents.ValueHue:
+                        xPercent = vPercent;
+                        yPercent = hPercent;
+                        break;
+
+                    case ColorSpectrumComponents.ValueSaturation:
+                        xPercent = vPercent;
+                        yPercent = sPercent;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationHue:
+                        xPercent = sPercent;
+                        yPercent = hPercent;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        xPercent = sPercent;
+                        yPercent = vPercent;
+                        break;
+                }
+
+                xPosition = _imageWidthFromLastBitmapCreation * xPercent;
+                yPosition = _imageHeightFromLastBitmapCreation * yPercent;
+            }
+            else
+            {
+                double thetaValue = 0;
+                double rValue = 0;
+
+                double hThetaValue =
+                    _maxHueFromLastBitmapCreation != _minHueFromLastBitmapCreation ?
+                    360 * (hsvColor.H - _minHueFromLastBitmapCreation) / (_maxHueFromLastBitmapCreation - _minHueFromLastBitmapCreation) :
+                    0;
+                double sThetaValue =
+                    _maxSaturationFromLastBitmapCreation != _minSaturationFromLastBitmapCreation ?
+                    360 * (hsvColor.S * 100.0 - _minSaturationFromLastBitmapCreation) / (_maxSaturationFromLastBitmapCreation - _minSaturationFromLastBitmapCreation) :
+                    0;
+                double vThetaValue =
+                    _maxValueFromLastBitmapCreation != _minValueFromLastBitmapCreation ?
+                    360 * (hsvColor.V * 100.0 - _minValueFromLastBitmapCreation) / (_maxValueFromLastBitmapCreation - _minValueFromLastBitmapCreation) :
+                    0;
+                double hRValue = _maxHueFromLastBitmapCreation != _minHueFromLastBitmapCreation ?
+                    (hsvColor.H - _minHueFromLastBitmapCreation) / (_maxHueFromLastBitmapCreation - _minHueFromLastBitmapCreation) - 1 :
+                    0;
+                double sRValue = _maxSaturationFromLastBitmapCreation != _minSaturationFromLastBitmapCreation ?
+                    (hsvColor.S * 100.0 - _minSaturationFromLastBitmapCreation) / (_maxSaturationFromLastBitmapCreation - _minSaturationFromLastBitmapCreation) - 1 :
+                    0;
+                double vRValue = _maxValueFromLastBitmapCreation != _minValueFromLastBitmapCreation ?
+                    (hsvColor.V * 100.0 - _minValueFromLastBitmapCreation) / (_maxValueFromLastBitmapCreation - _minValueFromLastBitmapCreation) - 1 :
+                    0;
+
+                // In the case where saturation was an axis in the spectrum with hue, or value is an axis, full stop,
+                // we inverted the direction of that axis in order to put more hue on the outside of the ring,
+                // so we need to do similarly here when positioning the ellipse.
+                if (_componentsFromLastBitmapCreation == ColorSpectrumComponents.HueSaturation ||
+                    _componentsFromLastBitmapCreation == ColorSpectrumComponents.SaturationHue)
+                {
+                    sThetaValue = 360 - sThetaValue;
+                    sRValue = -sRValue - 1;
+                }
+                else
+                {
+                    vThetaValue = 360 - vThetaValue;
+                    vRValue = -vRValue - 1;
+                }
+
+                switch (_componentsFromLastBitmapCreation)
+                {
+                    case ColorSpectrumComponents.HueValue:
+                        thetaValue = hThetaValue;
+                        rValue = vRValue;
+                        break;
+
+                    case ColorSpectrumComponents.HueSaturation:
+                        thetaValue = hThetaValue;
+                        rValue = sRValue;
+                        break;
+
+                    case ColorSpectrumComponents.ValueHue:
+                        thetaValue = vThetaValue;
+                        rValue = hRValue;
+                        break;
+
+                    case ColorSpectrumComponents.ValueSaturation:
+                        thetaValue = vThetaValue;
+                        rValue = sRValue;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationHue:
+                        thetaValue = sThetaValue;
+                        rValue = hRValue;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        thetaValue = sThetaValue;
+                        rValue = vRValue;
+                        break;
+                }
+
+                double radius = Math.Min(_imageWidthFromLastBitmapCreation, _imageHeightFromLastBitmapCreation) / 2;
+
+                xPosition = (Math.Cos((thetaValue * Math.PI / 180.0) + Math.PI) * radius * rValue) + radius;
+                yPosition = (Math.Sin((thetaValue * Math.PI / 180.0) + Math.PI) * radius * rValue) + radius;
+            }
+
+            // Remember the bitmap size follows physical device pixels
+            // Warning: LayoutHelper.GetLayoutScale() doesn't work unless the control is visible
+            // This will not be true in all cases if the color is updated from another control or code-behind
+            var scale = LayoutHelper.GetLayoutScale(this);
+            Canvas.SetLeft(_selectionEllipsePanel, (xPosition / scale) - (_selectionEllipsePanel.Width / 2));
+            Canvas.SetTop(_selectionEllipsePanel, (yPosition / scale) - (_selectionEllipsePanel.Height / 2));
+
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (IsFocused &&
+                _selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, true);
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc cref="InputElement.PointerEntered"/>
+        private void InputTarget_PointerEntered(object? sender, PointerEventArgs args)
+        {
+            UpdatePseudoClasses();
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerExited"/>
+        private void InputTarget_PointerExited(object? sender, PointerEventArgs args)
+        {
+            UpdatePseudoClasses();
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerPressed"/>
+        private void InputTarget_PointerPressed(object? sender, PointerPressedEventArgs args)
+        {
+            var inputTarget = _inputTarget;
+
+            Focus();
+
+            _isPointerPressed = true;
+            _shouldShowLargeSelection =
+                // TODO: After Pen PR is merged: https://github.com/AvaloniaUI/Avalonia/pull/7412
+                // args.Pointer.Type == PointerType.Pen ||
+                args.Pointer.Type == PointerType.Touch;
+
+            args.Pointer.Capture(inputTarget);
+            UpdateColorFromPoint(args.GetCurrentPoint(inputTarget));
+            UpdatePseudoClasses();
+            UpdateEllipse();
+
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerMoved"/>
+        private void InputTarget_PointerMoved(object? sender, PointerEventArgs args)
+        {
+            if (!_isPointerPressed)
+            {
+                return;
+            }
+
+            UpdateColorFromPoint(args.GetCurrentPoint(_inputTarget));
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerReleased"/>
+        private void InputTarget_PointerReleased(object? sender, PointerReleasedEventArgs args)
+        {
+            _isPointerPressed = false;
+            _shouldShowLargeSelection = false;
+
+            args.Pointer.Capture(null);
+            UpdatePseudoClasses();
+            UpdateEllipse();
+
+            args.Handled = true;
+        }
+
+        private async void CreateBitmapsAndColorMap()
+        {
+            if (_layoutRoot == null ||
+                _sizingPanel == null ||
+                _inputTarget == null ||
+                _spectrumRectangle == null ||
+                _spectrumEllipse == null ||
+                _spectrumOverlayRectangle == null ||
+                _spectrumOverlayEllipse == null
+                /*|| SharedHelpers.IsInDesignMode*/)
+            {
+                return;
+            }
+
+            // We want ColorSpectrum to always be a square, so we'll take the smaller of the dimensions
+            // and size the sizing panel to that.
+            double minDimension = Math.Min(_layoutRoot.Bounds.Width, _layoutRoot.Bounds.Height);
+
+            if (minDimension == 0)
+            {
+                return;
+            }
+
+            _sizingPanel.Width = minDimension;
+            _sizingPanel.Height = minDimension;
+            _inputTarget.Width = minDimension;
+            _inputTarget.Height = minDimension;
+            _spectrumRectangle.Width = minDimension;
+            _spectrumRectangle.Height = minDimension;
+            _spectrumEllipse.Width = minDimension;
+            _spectrumEllipse.Height = minDimension;
+            _spectrumOverlayRectangle.Width = minDimension;
+            _spectrumOverlayRectangle.Height = minDimension;
+            _spectrumOverlayEllipse.Width = minDimension;
+            _spectrumOverlayEllipse.Height = minDimension;
+
+            HsvColor hsvColor = HsvColor;
+            int minHue = MinHue;
+            int maxHue = MaxHue;
+            int minSaturation = MinSaturation;
+            int maxSaturation = MaxSaturation;
+            int minValue = MinValue;
+            int maxValue = MaxValue;
+            ColorSpectrumShape shape = Shape;
+            ColorSpectrumComponents components = Components;
+
+            // If min >= max, then by convention, min is the only number that a property can have.
+            if (minHue >= maxHue)
+            {
+                maxHue = minHue;
+            }
+
+            if (minSaturation >= maxSaturation)
+            {
+                maxSaturation = minSaturation;
+            }
+
+            if (minValue >= maxValue)
+            {
+                maxValue = minValue;
+            }
+
+            Hsv hsv = new Hsv(hsvColor);
+
+            // The middle 4 are only needed and used in the case of hue as the third dimension.
+            // Saturation and luminosity need only a min and max.
+            ArrayList<byte> bgraMinPixelData;
+            ArrayList<byte> bgraMiddle1PixelData;
+            ArrayList<byte> bgraMiddle2PixelData;
+            ArrayList<byte> bgraMiddle3PixelData;
+            ArrayList<byte> bgraMiddle4PixelData;
+            ArrayList<byte> bgraMaxPixelData;
+            List<Hsv> newHsvValues;
+
+            // In Avalonia, Bounds returns the actual device-independent pixel size of a control.
+            // However, this is not necessarily the size of the control rendered on a display.
+            // A desktop or application scaling factor may be applied which must be accounted for here.
+            // Remember bitmaps in Avalonia are rendered mapping to actual device pixels, not the device-
+            // independent pixels of controls.
+            var scale = LayoutHelper.GetLayoutScale(this);
+            int pixelDimension = (int)Math.Round(minDimension * scale);
+            var pixelCount = pixelDimension * pixelDimension;
+            var pixelDataSize = pixelCount * 4;
+
+            bgraMinPixelData = new ArrayList<byte>(pixelDataSize);
+            bgraMaxPixelData = new ArrayList<byte>(pixelDataSize);
+            newHsvValues = new List<Hsv>(pixelCount);
+
+            // We'll only save pixel data for the middle bitmaps if our third dimension is hue.
+            if (components == ColorSpectrumComponents.ValueSaturation ||
+                components == ColorSpectrumComponents.SaturationValue)
+            {
+                bgraMiddle1PixelData = new ArrayList<byte>(pixelDataSize);
+                bgraMiddle2PixelData = new ArrayList<byte>(pixelDataSize);
+                bgraMiddle3PixelData = new ArrayList<byte>(pixelDataSize);
+                bgraMiddle4PixelData = new ArrayList<byte>(pixelDataSize);
+            }
+            else
+            {
+                bgraMiddle1PixelData = new ArrayList<byte>(0);
+                bgraMiddle2PixelData = new ArrayList<byte>(0);
+                bgraMiddle3PixelData = new ArrayList<byte>(0);
+                bgraMiddle4PixelData = new ArrayList<byte>(0);
+            }
+
+            await Task.Run(() =>
+            {
+                // As the user perceives it, every time the third dimension not represented in the ColorSpectrum changes,
+                // the ColorSpectrum will visually change to accommodate that value.  For example, if the ColorSpectrum handles hue and luminosity,
+                // and the saturation externally goes from 1.0 to 0.5, then the ColorSpectrum will visually change to look more washed out
+                // to represent that third dimension's new value.
+                // Internally, however, we don't want to regenerate the ColorSpectrum bitmap every single time this happens, since that's very expensive.
+                // In order to make it so that we don't have to, we implement an optimization where, rather than having only one bitmap,
+                // we instead have multiple that we blend together using opacity to create the effect that we want.
+                // In the case where the third dimension is saturation or luminosity, we only need two: one bitmap at the minimum value
+                // of the third dimension, and one bitmap at the maximum.  Then we set the second's opacity at whatever the value of
+                // the third dimension is - e.g., a saturation of 0.5 implies an opacity of 50%.
+                // In the case where the third dimension is hue, we need six: one bitmap corresponding to red, yellow, green, cyan, blue, and purple.
+                // We'll then blend between whichever colors our hue exists between - e.g., an orange color would use red and yellow with an opacity of 50%.
+                // This optimization does incur slightly more startup time initially since we have to generate multiple bitmaps at once instead of only one,
+                // but the running time savings after that are *huge* when we can just set an opacity instead of generating a brand new bitmap.
+                if (shape == ColorSpectrumShape.Box)
+                {
+                    for (int x = pixelDimension - 1; x >= 0; --x)
+                    {
+                        for (int y = pixelDimension - 1; y >= 0; --y)
+                        {
+                            FillPixelForBox(
+                                x, y, hsv, pixelDimension, components, minHue, maxHue, minSaturation, maxSaturation, minValue, maxValue,
+                                bgraMinPixelData, bgraMiddle1PixelData, bgraMiddle2PixelData, bgraMiddle3PixelData, bgraMiddle4PixelData, bgraMaxPixelData,
+                                newHsvValues);
+                        }
+                    }
+                }
+                else
+                {
+                    for (int y = 0; y < pixelDimension; ++y)
+                    {
+                        for (int x = 0; x < pixelDimension; ++x)
+                        {
+                            FillPixelForRing(
+                                x, y, pixelDimension / 2.0, hsv, components, minHue, maxHue, minSaturation, maxSaturation, minValue, maxValue,
+                                bgraMinPixelData, bgraMiddle1PixelData, bgraMiddle2PixelData, bgraMiddle3PixelData, bgraMiddle4PixelData, bgraMaxPixelData,
+                                newHsvValues);
+                        }
+                    }
+                }
+            });
+
+            Dispatcher.UIThread.Post(() =>
+            {
+                int pixelWidth = pixelDimension;
+                int pixelHeight = pixelDimension;
+
+                ColorSpectrumComponents components2 = Components;
+
+                _minBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMinPixelData, pixelWidth, pixelHeight);
+                _maxBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMaxPixelData, pixelWidth, pixelHeight);
+
+                switch (components2)
+                {
+                    case ColorSpectrumComponents.HueValue:
+                    case ColorSpectrumComponents.ValueHue:
+                        _saturationMinimumBitmap = _minBitmap;
+                        _saturationMaximumBitmap = _maxBitmap;
+                        break;
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.SaturationHue:
+                        _valueBitmap = _maxBitmap;
+                        break;
+                    case ColorSpectrumComponents.ValueSaturation:
+                    case ColorSpectrumComponents.SaturationValue:
+                        _hueRedBitmap = _minBitmap;
+                        _hueYellowBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle1PixelData, pixelWidth, pixelHeight);
+                        _hueGreenBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle2PixelData, pixelWidth, pixelHeight);
+                        _hueCyanBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle3PixelData, pixelWidth, pixelHeight);
+                        _hueBlueBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle4PixelData, pixelWidth, pixelHeight);
+                        _huePurpleBitmap = _maxBitmap;
+                        break;
+                }
+
+                _shapeFromLastBitmapCreation = Shape;
+                _componentsFromLastBitmapCreation = Components;
+                _imageWidthFromLastBitmapCreation = pixelDimension;
+                _imageHeightFromLastBitmapCreation = pixelDimension;
+                _minHueFromLastBitmapCreation = MinHue;
+                _maxHueFromLastBitmapCreation = MaxHue;
+                _minSaturationFromLastBitmapCreation = MinSaturation;
+                _maxSaturationFromLastBitmapCreation = MaxSaturation;
+                _minValueFromLastBitmapCreation = MinValue;
+                _maxValueFromLastBitmapCreation = MaxValue;
+
+                _hsvValues = newHsvValues;
+
+                UpdateBitmapSources();
+                UpdateEllipse();
+            });
+        }
+
+        private void FillPixelForBox(
+            double x,
+            double y,
+            Hsv baseHsv,
+            int minDimension,
+            ColorSpectrumComponents components,
+            double minHue,
+            double maxHue,
+            double minSaturation,
+            double maxSaturation,
+            double minValue,
+            double maxValue,
+            ArrayList<byte> bgraMinPixelData,
+            ArrayList<byte> bgraMiddle1PixelData,
+            ArrayList<byte> bgraMiddle2PixelData,
+            ArrayList<byte> bgraMiddle3PixelData,
+            ArrayList<byte> bgraMiddle4PixelData,
+            ArrayList<byte> bgraMaxPixelData,
+            List<Hsv> newHsvValues)
+        {
+            double hMin = minHue;
+            double hMax = maxHue;
+            double sMin = minSaturation / 100.0;
+            double sMax = maxSaturation / 100.0;
+            double vMin = minValue / 100.0;
+            double vMax = maxValue / 100.0;
+
+            Hsv hsvMin = baseHsv;
+            Hsv hsvMiddle1 = baseHsv;
+            Hsv hsvMiddle2 = baseHsv;
+            Hsv hsvMiddle3 = baseHsv;
+            Hsv hsvMiddle4 = baseHsv;
+            Hsv hsvMax = baseHsv;
+
+            double xPercent = (minDimension - 1 - x) / (minDimension - 1);
+            double yPercent = (minDimension - 1 - y) / (minDimension - 1);
+
+            switch (components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + yPercent * (hMax - hMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + xPercent * (vMax - vMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + yPercent * (hMax - hMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + xPercent * (sMax - sMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueHue:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + yPercent * (vMax - vMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + xPercent * (hMax - hMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + yPercent * (vMax - vMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + xPercent * (sMax - sMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+
+                case ColorSpectrumComponents.SaturationHue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + yPercent * (sMax - sMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + xPercent * (hMax - hMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.SaturationValue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + yPercent * (sMax - sMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + xPercent * (vMax - vMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+            }
+
+            // If saturation is an axis in the spectrum with hue, or value is an axis, then we want
+            // that axis to go from maximum at the top to minimum at the bottom,
+            // or maximum at the outside to minimum at the inside in the case of the ring configuration,
+            // so we'll invert the number before assigning the HSL value to the array.
+            // Otherwise, we'll have a very narrow section in the middle that actually has meaningful hue
+            // in the case of the ring configuration.
+            if (components == ColorSpectrumComponents.HueSaturation ||
+                components == ColorSpectrumComponents.SaturationHue)
+            {
+                hsvMin.S = sMax - hsvMin.S + sMin;
+                hsvMiddle1.S = sMax - hsvMiddle1.S + sMin;
+                hsvMiddle2.S = sMax - hsvMiddle2.S + sMin;
+                hsvMiddle3.S = sMax - hsvMiddle3.S + sMin;
+                hsvMiddle4.S = sMax - hsvMiddle4.S + sMin;
+                hsvMax.S = sMax - hsvMax.S + sMin;
+            }
+            else
+            {
+                hsvMin.V = vMax - hsvMin.V + vMin;
+                hsvMiddle1.V = vMax - hsvMiddle1.V + vMin;
+                hsvMiddle2.V = vMax - hsvMiddle2.V + vMin;
+                hsvMiddle3.V = vMax - hsvMiddle3.V + vMin;
+                hsvMiddle4.V = vMax - hsvMiddle4.V + vMin;
+                hsvMax.V = vMax - hsvMax.V + vMin;
+            }
+
+            newHsvValues.Add(hsvMin);
+
+            Rgb rgbMin = hsvMin.ToRgb();
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.B * 255.0)); // b
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.G * 255.0)); // g
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.R * 255.0)); // r
+            bgraMinPixelData.Add(255); // a - ignored
+
+            // We'll only save pixel data for the middle bitmaps if our third dimension is hue.
+            if (components == ColorSpectrumComponents.ValueSaturation ||
+                components == ColorSpectrumComponents.SaturationValue)
+            {
+                Rgb rgbMiddle1 = hsvMiddle1.ToRgb();
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.B * 255.0)); // b
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.G * 255.0)); // g
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.R * 255.0)); // r
+                bgraMiddle1PixelData.Add(255); // a - ignored
+
+                Rgb rgbMiddle2 = hsvMiddle2.ToRgb();
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.B * 255.0)); // b
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.G * 255.0)); // g
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.R * 255.0)); // r
+                bgraMiddle2PixelData.Add(255); // a - ignored
+
+                Rgb rgbMiddle3 = hsvMiddle3.ToRgb();
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.B * 255.0)); // b
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.G * 255.0)); // g
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.R * 255.0)); // r
+                bgraMiddle3PixelData.Add(255); // a - ignored
+
+                Rgb rgbMiddle4 = hsvMiddle4.ToRgb();
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.B * 255.0)); // b
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.G * 255.0)); // g
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.R * 255.0)); // r
+                bgraMiddle4PixelData.Add(255); // a - ignored
+            }
+
+            Rgb rgbMax = hsvMax.ToRgb();
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.B * 255.0)); // b
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.G * 255.0)); // g
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.R * 255.0)); // r
+            bgraMaxPixelData.Add(255); // a - ignored
+        }
+
+        private void FillPixelForRing(
+            double x,
+            double y,
+            double radius,
+            Hsv baseHsv,
+            ColorSpectrumComponents components,
+            double minHue,
+            double maxHue,
+            double minSaturation,
+            double maxSaturation,
+            double minValue,
+            double maxValue,
+            ArrayList<byte> bgraMinPixelData,
+            ArrayList<byte> bgraMiddle1PixelData,
+            ArrayList<byte> bgraMiddle2PixelData,
+            ArrayList<byte> bgraMiddle3PixelData,
+            ArrayList<byte> bgraMiddle4PixelData,
+            ArrayList<byte> bgraMaxPixelData,
+            List<Hsv> newHsvValues)
+        {
+            double hMin = minHue;
+            double hMax = maxHue;
+            double sMin = minSaturation / 100.0;
+            double sMax = maxSaturation / 100.0;
+            double vMin = minValue / 100.0;
+            double vMax = maxValue / 100.0;
+
+            double distanceFromRadius = Math.Sqrt(Math.Pow(x - radius, 2) + Math.Pow(y - radius, 2));
+
+            double xToUse = x;
+            double yToUse = y;
+
+            // If we're outside the ring, then we want the pixel to appear as blank.
+            // However, to avoid issues with rounding errors, we'll act as though this point
+            // is on the edge of the ring for the purposes of returning an HSL value.
+            // That way, hit testing on the edges will always return the correct value.
+            if (distanceFromRadius > radius)
+            {
+                xToUse = (radius / distanceFromRadius) * (x - radius) + radius;
+                yToUse = (radius / distanceFromRadius) * (y - radius) + radius;
+                distanceFromRadius = radius;
+            }
+
+            Hsv hsvMin = baseHsv;
+            Hsv hsvMiddle1 = baseHsv;
+            Hsv hsvMiddle2 = baseHsv;
+            Hsv hsvMiddle3 = baseHsv;
+            Hsv hsvMiddle4 = baseHsv;
+            Hsv hsvMax = baseHsv;
+
+            double r = 1 - distanceFromRadius / radius;
+
+            double theta = Math.Atan2((radius - yToUse), (radius - xToUse)) * 180.0 / Math.PI;
+            theta += 180.0;
+            theta = Math.Floor(theta);
+
+            while (theta > 360)
+            {
+                theta -= 360;
+            }
+
+            double thetaPercent = theta / 360;
+
+            switch (components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + thetaPercent * (hMax - hMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + r * (vMax - vMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + thetaPercent * (hMax - hMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + r * (sMax - sMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueHue:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + thetaPercent * (vMax - vMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + r * (hMax - hMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + thetaPercent * (vMax - vMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + r * (sMax - sMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+
+                case ColorSpectrumComponents.SaturationHue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + thetaPercent * (sMax - sMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + r * (hMax - hMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.SaturationValue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + thetaPercent * (sMax - sMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + r * (vMax - vMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+            }
+
+            // If saturation is an axis in the spectrum with hue, or value is an axis, then we want
+            // that axis to go from maximum at the top to minimum at the bottom,
+            // or maximum at the outside to minimum at the inside in the case of the ring configuration,
+            // so we'll invert the number before assigning the HSL value to the array.
+            // Otherwise, we'll have a very narrow section in the middle that actually has meaningful hue
+            // in the case of the ring configuration.
+            if (components == ColorSpectrumComponents.HueSaturation ||
+                components == ColorSpectrumComponents.SaturationHue)
+            {
+                hsvMin.S = sMax - hsvMin.S + sMin;
+                hsvMiddle1.S = sMax - hsvMiddle1.S + sMin;
+                hsvMiddle2.S = sMax - hsvMiddle2.S + sMin;
+                hsvMiddle3.S = sMax - hsvMiddle3.S + sMin;
+                hsvMiddle4.S = sMax - hsvMiddle4.S + sMin;
+                hsvMax.S = sMax - hsvMax.S + sMin;
+            }
+            else
+            {
+                hsvMin.V = vMax - hsvMin.V + vMin;
+                hsvMiddle1.V = vMax - hsvMiddle1.V + vMin;
+                hsvMiddle2.V = vMax - hsvMiddle2.V + vMin;
+                hsvMiddle3.V = vMax - hsvMiddle3.V + vMin;
+                hsvMiddle4.V = vMax - hsvMiddle4.V + vMin;
+                hsvMax.V = vMax - hsvMax.V + vMin;
+            }
+
+            newHsvValues.Add(hsvMin);
+
+            Rgb rgbMin = hsvMin.ToRgb();
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.B * 255)); // b
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.G * 255)); // g
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.R * 255)); // r
+            bgraMinPixelData.Add(255); // a
+
+            // We'll only save pixel data for the middle bitmaps if our third dimension is hue.
+            if (components == ColorSpectrumComponents.ValueSaturation ||
+                components == ColorSpectrumComponents.SaturationValue)
+            {
+                Rgb rgbMiddle1 = hsvMiddle1.ToRgb();
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.B * 255)); // b
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.G * 255)); // g
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.R * 255)); // r
+                bgraMiddle1PixelData.Add(255); // a
+
+                Rgb rgbMiddle2 = hsvMiddle2.ToRgb();
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.B * 255)); // b
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.G * 255)); // g
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.R * 255)); // r
+                bgraMiddle2PixelData.Add(255); // a
+
+                Rgb rgbMiddle3 = hsvMiddle3.ToRgb();
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.B * 255)); // b
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.G * 255)); // g
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.R * 255)); // r
+                bgraMiddle3PixelData.Add(255); // a
+
+                Rgb rgbMiddle4 = hsvMiddle4.ToRgb();
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.B * 255)); // b
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.G * 255)); // g
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.R * 255)); // r
+                bgraMiddle4PixelData.Add(255); // a
+            }
+
+            Rgb rgbMax = hsvMax.ToRgb();
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.B * 255)); // b
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.G * 255)); // g
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.R * 255)); // r
+            bgraMaxPixelData.Add(255); // a
+        }
+
+        private void UpdateBitmapSources()
+        {
+            if (_spectrumOverlayRectangle == null ||
+                _spectrumOverlayEllipse == null ||
+                _spectrumRectangle == null ||
+                _spectrumEllipse == null)
+            {
+                return;
+            }
+
+            HsvColor hsvColor = HsvColor;
+            ColorSpectrumComponents components = Components;
+
+            // We'll set the base image and the overlay image based on which component is our third dimension.
+            // If it's saturation or luminosity, then the base image is that dimension at its minimum value,
+            // while the overlay image is that dimension at its maximum value.
+            // If it's hue, then we'll figure out where in the color wheel we are, and then use the two
+            // colors on either side of our position as our base image and overlay image.
+            // For example, if our hue is orange, then the base image would be red and the overlay image yellow.
+            switch (components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                case ColorSpectrumComponents.ValueHue:
+                    {
+                        if (_saturationMinimumBitmap == null ||
+                            _saturationMaximumBitmap == null)
+                        {
+                            return;
+                        }
+
+                        ImageBrush spectrumBrush = new ImageBrush(_saturationMinimumBitmap);
+                        ImageBrush spectrumOverlayBrush = new ImageBrush(_saturationMaximumBitmap);
+
+                        _spectrumOverlayRectangle.Opacity = hsvColor.S;
+                        _spectrumOverlayEllipse.Opacity = hsvColor.S;
+                        _spectrumRectangle.Fill = spectrumBrush;
+                        _spectrumEllipse.Fill = spectrumBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                    }
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                case ColorSpectrumComponents.SaturationHue:
+                    {
+                        if (_valueBitmap == null)
+                        {
+                            return;
+                        }
+
+                        ImageBrush spectrumBrush = new ImageBrush(_valueBitmap);
+                        ImageBrush spectrumOverlayBrush = new ImageBrush(_valueBitmap);
+
+                        _spectrumOverlayRectangle.Opacity = 1.0;
+                        _spectrumOverlayEllipse.Opacity = 1.0;
+                        _spectrumRectangle.Fill = spectrumBrush;
+                        _spectrumEllipse.Fill = spectrumBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                    }
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                case ColorSpectrumComponents.SaturationValue:
+                    {
+                        if (_hueRedBitmap == null ||
+                            _hueYellowBitmap == null ||
+                            _hueGreenBitmap == null ||
+                            _hueCyanBitmap == null ||
+                            _hueBlueBitmap == null ||
+                            _huePurpleBitmap == null)
+                        {
+                            return;
+                        }
+
+                        ImageBrush spectrumBrush;
+                        ImageBrush spectrumOverlayBrush;
+
+                        double sextant = hsvColor.H / 60.0;
+
+                        if (sextant < 1)
+                        {
+                            spectrumBrush = new ImageBrush(_hueRedBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueYellowBitmap);
+                        }
+                        else if (sextant >= 1 && sextant < 2)
+                        {
+                            spectrumBrush = new ImageBrush(_hueYellowBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueGreenBitmap);
+                        }
+                        else if (sextant >= 2 && sextant < 3)
+                        {
+                            spectrumBrush = new ImageBrush(_hueGreenBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueCyanBitmap);
+                        }
+                        else if (sextant >= 3 && sextant < 4)
+                        {
+                            spectrumBrush = new ImageBrush(_hueCyanBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueBlueBitmap);
+                        }
+                        else if (sextant >= 4 && sextant < 5)
+                        {
+                            spectrumBrush = new ImageBrush(_hueBlueBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_huePurpleBitmap);
+                        }
+                        else
+                        {
+                            spectrumBrush = new ImageBrush(_huePurpleBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueRedBitmap);
+                        }
+
+                        _spectrumOverlayRectangle.Opacity = sextant - (int)sextant;
+                        _spectrumOverlayEllipse.Opacity = sextant - (int)sextant;
+                        _spectrumRectangle.Fill = spectrumBrush;
+                        _spectrumEllipse.Fill = spectrumBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                    }
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the selection ellipse should be light based on the relative
+        /// luminance of the selected color.
+        /// </summary>
+        private bool SelectionEllipseShouldBeLight()
+        {
+            // The selection ellipse should be light if and only if the chosen color
+            // contrasts more with black than it does with white.
+            // To find how much something contrasts with white, we use the equation
+            // for relative luminance.
+            //
+            // If the third component is value, then we won't be updating the spectrum's displayed colors,
+            // so in that case we should use a value of 1 when considering the backdrop
+            // for the selection ellipse.
+            Color displayedColor;
+
+            if (Components == ColorSpectrumComponents.HueSaturation ||
+                Components == ColorSpectrumComponents.SaturationHue)
+            {
+                HsvColor hsvColor = HsvColor;
+                Rgb color = (new Hsv(hsvColor.H, hsvColor.S, 1.0)).ToRgb();
+                displayedColor = color.ToColor(hsvColor.A);
+            }
+            else
+            {
+                displayedColor = Color;
+            }
+
+            var lum = ColorHelper.GetRelativeLuminance(displayedColor);
+
+            return lum <= 0.5;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumComponents.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumComponents.cs
new file mode 100644
index 0000000000..164089096e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumComponents.cs
@@ -0,0 +1,73 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the two HSV color components displayed by a <see cref="ColorSpectrum"/>.
+    /// </summary>
+    /// <remarks>
+    /// Order of the color components is important and correspond with an X/Y axis in Box
+    /// shape or a degree/radius in Ring shape.
+    /// </remarks>
+    public enum ColorSpectrumComponents
+    {
+        /// <summary>
+        /// The Hue and Value components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Hue is mapped to the X-axis and Value is mapped to the Y-axis.
+        /// In Ring shape, Hue is mapped to degrees and Value is mapped to radius.
+        /// </remarks>
+        HueValue,
+
+        /// <summary>
+        /// The Value and Hue components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Value is mapped to the X-axis and Hue is mapped to the Y-axis.
+        /// In Ring shape, Value is mapped to degrees and Hue is mapped to radius.
+        /// </remarks>
+        ValueHue,
+
+        /// <summary>
+        /// The Hue and Saturation components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Hue is mapped to the X-axis and Saturation is mapped to the Y-axis.
+        /// In Ring shape, Hue is mapped to degrees and Saturation is mapped to radius.
+        /// </remarks>
+        HueSaturation,
+
+        /// <summary>
+        /// The Saturation and Hue components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Saturation is mapped to the X-axis and Hue is mapped to the Y-axis.
+        /// In Ring shape, Saturation is mapped to degrees and Hue is mapped to radius.
+        /// </remarks>
+        SaturationHue,
+
+        /// <summary>
+        /// The Saturation and Value components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Saturation is mapped to the X-axis and Value is mapped to the Y-axis.
+        /// In Ring shape, Saturation is mapped to degrees and Value is mapped to radius.
+        /// </remarks>
+        SaturationValue,
+
+        /// <summary>
+        /// The Value and Saturation components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Value is mapped to the X-axis and Saturation is mapped to the Y-axis.
+        /// In Ring shape, Value is mapped to degrees and Saturation is mapped to radius.
+        /// </remarks>
+        ValueSaturation,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumShape.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumShape.cs
new file mode 100644
index 0000000000..0319d4a6c8
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumShape.cs
@@ -0,0 +1,26 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the shape of a <see cref="ColorSpectrum"/>.
+    /// </summary>
+    public enum ColorSpectrumShape
+    {
+        /// <summary>
+        /// The spectrum is in the shape of a rectangular or square box.
+        /// Note that more colors are visible to the user in Box shape.
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// The spectrum is in the shape of an ellipse or circle.
+        /// </summary>
+        Ring,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.Properties.cs
new file mode 100644
index 0000000000..b76059037b
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.Properties.cs
@@ -0,0 +1,495 @@
+using System.Collections.Generic;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <inheritdoc/>
+    public partial class ColorView
+    {
+        /// <summary>
+        /// Defines the <see cref="Color"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> ColorProperty =
+            AvaloniaProperty.Register<ColorView, Color>(
+                nameof(Color),
+                Colors.White,
+                defaultBindingMode: BindingMode.TwoWay,
+                coerce: CoerceColor) ;
+
+        /// <summary>
+        /// Defines the <see cref="ColorModel"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorModel> ColorModelProperty =
+            AvaloniaProperty.Register<ColorView, ColorModel>(
+                nameof(ColorModel),
+                ColorModel.Rgba);
+
+        /// <summary>
+        /// Defines the <see cref="ColorSpectrumComponents"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorSpectrumComponents> ColorSpectrumComponentsProperty =
+            AvaloniaProperty.Register<ColorView, ColorSpectrumComponents>(
+                nameof(ColorSpectrumComponents),
+                ColorSpectrumComponents.HueSaturation);
+
+        /// <summary>
+        /// Defines the <see cref="ColorSpectrumShape"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorSpectrumShape> ColorSpectrumShapeProperty =
+            AvaloniaProperty.Register<ColorView, ColorSpectrumShape>(
+                nameof(ColorSpectrumShape),
+                ColorSpectrumShape.Box);
+
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorView, HsvColor>(
+                nameof(HsvColor),
+                Colors.White.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay,
+                coerce: CoerceHsvColor);
+
+        /// <summary>
+        /// Defines the <see cref="IsAccentColorsVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAccentColorsVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsAccentColorsVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsAlphaEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAlphaEnabledProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsAlphaEnabled),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsAlphaVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAlphaVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsAlphaVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsColorComponentsVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsColorComponentsVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsColorComponentsVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsColorModelVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsColorModelVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsColorModelVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsColorPaletteVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsColorPaletteVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsColorPaletteVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsColorPreviewVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsColorPreviewVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsColorPreviewVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsColorSpectrumVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsColorSpectrumVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsColorSpectrumVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsColorSpectrumSliderVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsColorSpectrumSliderVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsColorSpectrumSliderVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsComponentSliderVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsComponentSliderVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsComponentSliderVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsComponentTextInputVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsComponentTextInputVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsComponentTextInputVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsHexInputVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsHexInputVisibleProperty =
+            AvaloniaProperty.Register<ColorView, bool>(
+                nameof(IsHexInputVisible),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="MaxHue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxHueProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(MaxHue),
+                359);
+
+        /// <summary>
+        /// Defines the <see cref="MaxSaturation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxSaturationProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(MaxSaturation),
+                100);
+
+        /// <summary>
+        /// Defines the <see cref="MaxValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxValueProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(MaxValue),
+                100);
+
+        /// <summary>
+        /// Defines the <see cref="MinHue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinHueProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(MinHue),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="MinSaturation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinSaturationProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(MinSaturation),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="MinValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinValueProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(MinValue),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="PaletteColors"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IEnumerable<Color>?> PaletteColorsProperty =
+            AvaloniaProperty.Register<ColorView, IEnumerable<Color>?>(
+                nameof(PaletteColors),
+                null);
+
+        /// <summary>
+        /// Defines the <see cref="PaletteColumnCount"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> PaletteColumnCountProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(PaletteColumnCount),
+                4);
+
+        /// <summary>
+        /// Defines the <see cref="Palette"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IColorPalette?> PaletteProperty =
+            AvaloniaProperty.Register<ColorView, IColorPalette?>(
+                nameof(Palette),
+                null);
+
+        /// <summary>
+        /// Defines the <see cref="SelectedIndex"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> SelectedIndexProperty =
+            AvaloniaProperty.Register<ColorView, int>(
+                nameof(SelectedIndex),
+                (int)ColorViewTab.Spectrum);
+
+        /// <inheritdoc cref="ColorSpectrum.Color"/>
+        public Color Color
+        {
+            get => GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSlider.ColorModel"/>
+        /// <remarks>
+        /// This property is only applicable to the components tab.
+        /// The spectrum tab must always be in HSV and the palette tab contains only pre-defined colors.
+        /// </remarks>
+        public ColorModel ColorModel
+        {
+            get => GetValue(ColorModelProperty);
+            set => SetValue(ColorModelProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.Components"/>
+        public ColorSpectrumComponents ColorSpectrumComponents
+        {
+            get => GetValue(ColorSpectrumComponentsProperty);
+            set => SetValue(ColorSpectrumComponentsProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.Shape"/>
+        public ColorSpectrumShape ColorSpectrumShape
+        {
+            get => GetValue(ColorSpectrumShapeProperty);
+            set => SetValue(ColorSpectrumShapeProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.HsvColor"/>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorPreviewer.IsAccentColorsVisible"/>
+        public bool IsAccentColorsVisible
+        {
+            get => GetValue(IsAccentColorsVisibleProperty);
+            set => SetValue(IsAccentColorsVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the alpha component is enabled.
+        /// When disabled (set to false) the alpha component will be fixed to maximum and
+        /// editing controls disabled.
+        /// </summary>
+        public bool IsAlphaEnabled
+        {
+            get => GetValue(IsAlphaEnabledProperty);
+            set => SetValue(IsAlphaEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the alpha component editing controls
+        /// (Slider(s) and TextBox) are visible. When hidden, the existing alpha component
+        /// value is maintained.
+        /// </summary>
+        /// <remarks>
+        /// Note that <see cref="IsComponentTextInputVisible"/> also controls the alpha
+        /// component TextBox visibility.
+        /// </remarks>
+        public bool IsAlphaVisible
+        {
+            get => GetValue(IsAlphaVisibleProperty);
+            set => SetValue(IsAlphaVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the color components tab/panel/page (subview) is visible.
+        /// </summary>
+        public bool IsColorComponentsVisible
+        {
+            get => GetValue(IsColorComponentsVisibleProperty);
+            set => SetValue(IsColorComponentsVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the active color model indicator/selector is visible.
+        /// </summary>
+        public bool IsColorModelVisible
+        {
+            get => GetValue(IsColorModelVisibleProperty);
+            set => SetValue(IsColorModelVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the color palette tab/panel/page (subview) is visible.
+        /// </summary>
+        public bool IsColorPaletteVisible
+        {
+            get => GetValue(IsColorPaletteVisibleProperty);
+            set => SetValue(IsColorPaletteVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the color preview is visible.
+        /// </summary>
+        /// <remarks>
+        /// Note that accent color visibility is controlled separately by
+        /// <see cref="IsAccentColorsVisible"/>.
+        /// </remarks>
+        public bool IsColorPreviewVisible
+        {
+            get => GetValue(IsColorPreviewVisibleProperty);
+            set => SetValue(IsColorPreviewVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the color spectrum tab/panel/page (subview) is visible.
+        /// </summary>
+        public bool IsColorSpectrumVisible
+        {
+            get => GetValue(IsColorSpectrumVisibleProperty);
+            set => SetValue(IsColorSpectrumVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the color spectrum's third component slider
+        /// is visible.
+        /// </summary>
+        public bool IsColorSpectrumSliderVisible
+        {
+            get => GetValue(IsColorSpectrumSliderVisibleProperty);
+            set => SetValue(IsColorSpectrumSliderVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether color component sliders are visible.
+        /// </summary>
+        /// <remarks>
+        /// All color components are controlled by this property but alpha can also be
+        /// controlled with <see cref="IsAlphaVisible"/>.
+        /// </remarks>
+        public bool IsComponentSliderVisible
+        {
+            get => GetValue(IsComponentSliderVisibleProperty);
+            set => SetValue(IsComponentSliderVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether color component text inputs are visible.
+        /// </summary>
+        /// <remarks>
+        /// All color components are controlled by this property but alpha can also be
+        /// controlled with <see cref="IsAlphaVisible"/>.
+        /// </remarks>
+        public bool IsComponentTextInputVisible
+        {
+            get => GetValue(IsComponentTextInputVisibleProperty);
+            set => SetValue(IsComponentTextInputVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the hexadecimal color value text input
+        /// is visible.
+        /// </summary>
+        public bool IsHexInputVisible
+        {
+            get => GetValue(IsHexInputVisibleProperty);
+            set => SetValue(IsHexInputVisibleProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.MaxHue"/>
+        public int MaxHue
+        {
+            get => GetValue(MaxHueProperty);
+            set => SetValue(MaxHueProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.MaxSaturation"/>
+        public int MaxSaturation
+        {
+            get => GetValue(MaxSaturationProperty);
+            set => SetValue(MaxSaturationProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.MaxValue"/>
+        public int MaxValue
+        {
+            get => GetValue(MaxValueProperty);
+            set => SetValue(MaxValueProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.MinHue"/>
+        public int MinHue
+        {
+            get => GetValue(MinHueProperty);
+            set => SetValue(MinHueProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.MinSaturation"/>
+        public int MinSaturation
+        {
+            get => GetValue(MinSaturationProperty);
+            set => SetValue(MinSaturationProperty, value);
+        }
+
+        /// <inheritdoc cref="ColorSpectrum.MinValue"/>
+        public int MinValue
+        {
+            get => GetValue(MinValueProperty);
+            set => SetValue(MinValueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the collection of individual colors in the palette.
+        /// </summary>
+        /// <remarks>
+        /// This is not commonly set manually. Instead, it should be set automatically by
+        /// providing an <see cref="IColorPalette"/> to the <see cref="Palette"/> property.
+        /// <br/><br/>
+        /// Also note that this property is what should be bound in the control template.
+        /// <see cref="Palette"/> is too high-level to use on its own.
+        /// </remarks>
+        public IEnumerable<Color>? PaletteColors
+        {
+            get => GetValue(PaletteColorsProperty);
+            set => SetValue(PaletteColorsProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the number of colors in each row (section) of the color palette.
+        /// Within a standard palette, rows are shades and columns are colors.
+        /// </summary>
+        /// <remarks>
+        /// This is not commonly set manually. Instead, it should be set automatically by
+        /// providing an <see cref="IColorPalette"/> to the <see cref="Palette"/> property.
+        /// <br/><br/>
+        /// Also note that this property is what should be bound in the control template.
+        /// <see cref="Palette"/> is too high-level to use on its own.
+        /// </remarks>
+        public int PaletteColumnCount
+        {
+            get => GetValue(PaletteColumnCountProperty);
+            set => SetValue(PaletteColumnCountProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the color palette.
+        /// </summary>
+        /// <remarks>
+        /// This will automatically set both <see cref="PaletteColors"/> and
+        /// <see cref="PaletteColumnCount"/> overwriting any existing values.
+        /// </remarks>
+        public IColorPalette? Palette
+        {
+            get => GetValue(PaletteProperty);
+            set => SetValue(PaletteProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the index of the selected tab/panel/page (subview).
+        /// </summary>
+        public int SelectedIndex
+        {
+            get => GetValue(SelectedIndexProperty);
+            set => SetValue(SelectedIndexProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs b/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs
new file mode 100644
index 0000000000..89f1afb1ac
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs
@@ -0,0 +1,379 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using Avalonia.Controls.Converters;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Presents a color for user editing using a spectrum, palette and component sliders.
+    /// </summary>
+    [TemplatePart("PART_HexTextBox", typeof(TextBox))]
+    [TemplatePart("PART_TabControl", typeof(TabControl))]
+    public partial class ColorView : TemplatedControl
+    {
+        /// <summary>
+        /// Event for when the selected color changes within the slider.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        // XAML template parts
+        private TextBox?    _hexTextBox;
+        private TabControl? _tabControl;
+
+        private ColorToHexConverter colorToHexConverter = new ColorToHexConverter();
+        protected bool ignorePropertyChanged = false;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorView"/> class.
+        /// </summary>
+        public ColorView() : base()
+        {
+        }
+
+        /// <summary>
+        /// Gets the value of the hex TextBox and sets it as the current <see cref="Color"/>.
+        /// If invalid, the TextBox hex text will revert back to the last valid color.
+        /// </summary>
+        private void GetColorFromHexTextBox()
+        {
+            if (_hexTextBox != null)
+            {
+                var convertedColor = colorToHexConverter.ConvertBack(_hexTextBox.Text, typeof(Color), null, CultureInfo.CurrentCulture);
+
+                if (convertedColor is Color color)
+                {
+                    Color = color;
+                }
+
+                // Re-apply the hex value
+                // This ensure the hex color value is always valid and formatted correctly
+                SetColorToHexTextBox();
+            }
+        }
+
+        /// <summary>
+        /// Sets the current <see cref="Color"/> to the hex TextBox.
+        /// </summary>
+        private void SetColorToHexTextBox()
+        {
+            if (_hexTextBox != null)
+            {
+                _hexTextBox.Text = colorToHexConverter.Convert(Color, typeof(string), null, CultureInfo.CurrentCulture) as string;
+            }
+        }
+
+        /// <summary>
+        /// Validates the tab/panel/page selection taking into account the visibility of each item
+        /// as well as the current selection.
+        /// </summary>
+        /// <remarks>
+        /// Derived controls may re-implement this based on their default style / control template
+        /// and any specialized selection needs.
+        /// </remarks>
+        protected virtual void ValidateSelection()
+        {
+            if (_tabControl != null &&
+                _tabControl.Items != null)
+            {
+                // Determine the number of visible tab items
+                int numVisibleItems = 0;
+                foreach (var item in _tabControl.Items)
+                {
+                    if (item is Control control &&
+                        control.IsVisible)
+                    {
+                        numVisibleItems++;
+                    }
+                }
+
+                // Verify the selection
+                if (numVisibleItems > 0)
+                {
+                    object? selectedItem = null;
+
+                    if (_tabControl.SelectedItem == null &&
+                        _tabControl.ItemCount > 0)
+                    {
+                        // As a failsafe, forcefully select the first item
+                        foreach (var item in _tabControl.Items)
+                        {
+                            selectedItem = item;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        selectedItem = _tabControl.SelectedItem;
+                    }
+
+                    if (selectedItem is Control selectedControl &&
+                        selectedControl.IsVisible == false)
+                    {
+                        // Select the first visible item instead
+                        foreach (var item in _tabControl.Items)
+                        {
+                            if (item is Control control &&
+                                control.IsVisible)
+                            {
+                                selectedItem = item;
+                                break;
+                            }
+                        }
+                    }
+
+                    _tabControl.SelectedItem = selectedItem;
+                    _tabControl.IsVisible = true;
+                }
+                else
+                {
+                    // Special case when all items are hidden
+                    // If TabControl ever properly supports no selected item /
+                    // all items hidden this can be removed
+                    _tabControl.SelectedItem = null;
+                    _tabControl.IsVisible = false;
+                }
+
+                // Hide the "tab strip" if there is only one tab
+                // This allows, for example, to view only the palette
+                /*
+                var itemsPresenter = _tabControl.FindDescendantOfType<ItemsPresenter>();
+                if (itemsPresenter != null)
+                {
+                    if (numVisibleItems == 1)
+                    {
+                        itemsPresenter.IsVisible = false;
+                    }
+                    else
+                    {
+                        itemsPresenter.IsVisible = true;
+                    }
+                }
+                */
+
+                // Note that if externally the SelectedIndex is set to 4 or something
+                // outside the valid range, the TabControl will ignore it and replace it
+                // with a valid SelectedIndex. This however is not propagated back through
+                // the TwoWay binding in the control template so the SelectedIndex and
+                // SelectedIndex become out of sync.
+                //
+                // The work-around for this is done here where SelectedIndex is forcefully
+                // synchronized with whatever the TabControl property value is. This is
+                // possible since selection validation is already done by this method.
+                SelectedIndex = _tabControl.SelectedIndex;
+            }
+
+            return;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            if (_hexTextBox != null)
+            {
+                _hexTextBox.KeyDown -= HexTextBox_KeyDown;
+                _hexTextBox.LostFocus -= HexTextBox_LostFocus;
+            }
+
+            _hexTextBox = e.NameScope.Find<TextBox>("PART_HexTextBox");
+            _tabControl = e.NameScope.Find<TabControl>("PART_TabControl");
+
+            SetColorToHexTextBox();
+
+            if (_hexTextBox != null)
+            {
+                _hexTextBox.KeyDown += HexTextBox_KeyDown;
+                _hexTextBox.LostFocus += HexTextBox_LostFocus;
+            }
+
+            base.OnApplyTemplate(e);
+            ValidateSelection();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (ignorePropertyChanged)
+            {
+                base.OnPropertyChanged(change);
+                return;
+            }
+
+            // Always keep the two color properties in sync
+            if (change.Property == ColorProperty)
+            {
+                ignorePropertyChanged = true;
+
+                HsvColor = Color.ToHsv();
+                SetColorToHexTextBox();
+
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<Color>(),
+                    change.GetNewValue<Color>()));
+
+                ignorePropertyChanged = false;
+            }
+            else if (change.Property == HsvColorProperty)
+            {
+                ignorePropertyChanged = true;
+
+                Color = HsvColor.ToRgb();
+                SetColorToHexTextBox();
+
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<HsvColor>().ToRgb(),
+                    change.GetNewValue<HsvColor>().ToRgb()));
+
+                ignorePropertyChanged = false;
+            }
+            else if (change.Property == PaletteProperty)
+            {
+                IColorPalette? palette = Palette;
+
+                // Any custom palette change must be automatically synced with the
+                // bound properties controlling the palette grid
+                if (palette != null)
+                {
+                    PaletteColumnCount = palette.ColorCount;
+
+                    List<Color> newPaletteColors = new List<Color>();
+                    for (int shadeIndex = 0; shadeIndex < palette.ShadeCount; shadeIndex++)
+                    {
+                        for (int colorIndex = 0; colorIndex < palette.ColorCount; colorIndex++)
+                        {
+                            newPaletteColors.Add(palette.GetColor(colorIndex, shadeIndex));
+                        }
+                    }
+
+                    PaletteColors = newPaletteColors;
+                }
+            }
+            else if (change.Property == IsAlphaEnabledProperty)
+            {
+                // Manually coerce the HsvColor value
+                // (Color will be coerced automatically if HsvColor changes)
+                HsvColor = OnCoerceHsvColor(HsvColor);
+            }
+            else if (change.Property == IsColorComponentsVisibleProperty ||
+                     change.Property == IsColorPaletteVisibleProperty ||
+                     change.Property == IsColorSpectrumVisibleProperty)
+            {
+                // When the property changed notification is received here the visibility
+                // of individual tab items has not yet been updated through the bindings.
+                // Therefore, the validation is delayed until after bindings update.
+                Dispatcher.UIThread.Post(() =>
+                {
+                    ValidateSelection();
+                }, DispatcherPriority.Background);
+            }
+            else if (change.Property == SelectedIndexProperty)
+            {
+                // Again, it is necessary to wait for the SelectedIndex value to
+                // be applied to the TabControl through binding before validation occurs.
+                Dispatcher.UIThread.Post(() =>
+                {
+                    ValidateSelection();
+                }, DispatcherPriority.Background);
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="ColorChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The <see cref="ColorChangedEventArgs"/> defining old/new colors.</param>
+        protected virtual void OnColorChanged(ColorChangedEventArgs e)
+        {
+            ColorChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Color"/> property has to be coerced.
+        /// </summary>
+        /// <param name="value">The value to coerce.</param>
+        protected virtual Color OnCoerceColor(Color value)
+        {
+            if (IsAlphaEnabled == false)
+            {
+                return new Color(255, value.R, value.G, value.B);
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="HsvColor"/> property has to be coerced.
+        /// </summary>
+        /// <param name="value">The value to coerce.</param>
+        protected virtual HsvColor OnCoerceHsvColor(HsvColor value)
+        {
+            if (IsAlphaEnabled == false)
+            {
+                return new HsvColor(1.0, value.H, value.S, value.V);
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Coerces/validates the <see cref="Color"/> property value.
+        /// </summary>
+        /// <param name="instance">The <see cref="ColorView"/> instance.</param>
+        /// <param name="value">The value to coerce.</param>
+        /// <returns>The coerced/validated value.</returns>
+        private static Color CoerceColor(IAvaloniaObject instance, Color value)
+        {
+            if (instance is ColorView colorView)
+            {
+                return colorView.OnCoerceColor(value);
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Coerces/validates the <see cref="HsvColor"/> property value.
+        /// </summary>
+        /// <param name="instance">The <see cref="ColorView"/> instance.</param>
+        /// <param name="value">The value to coerce.</param>
+        /// <returns>The coerced/validated value.</returns>
+        private static HsvColor CoerceHsvColor(IAvaloniaObject instance, HsvColor value)
+        {
+            if (instance is ColorView colorView)
+            {
+                return colorView.OnCoerceHsvColor(value);
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Event handler for when a key is pressed within the Hex RGB value TextBox.
+        /// This is used to trigger re-evaluation of the color based on the TextBox value.
+        /// </summary>
+        private void HexTextBox_KeyDown(object? sender, Input.KeyEventArgs e)
+        {
+            if (e.Key == Input.Key.Enter)
+            {
+                GetColorFromHexTextBox();
+            }
+        }
+
+        /// <summary>
+        /// Event handler for when the Hex RGB value TextBox looses focus.
+        /// This is used to trigger re-evaluation of the color based on the TextBox value.
+        /// </summary>
+        private void HexTextBox_LostFocus(object? sender, Interactivity.RoutedEventArgs e)
+        {
+            GetColorFromHexTextBox();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorView/ColorViewTab.cs b/src/Avalonia.Controls.ColorPicker/ColorView/ColorViewTab.cs
new file mode 100644
index 0000000000..582653e295
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorView/ColorViewTab.cs
@@ -0,0 +1,26 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific tab/page (subview) within the <see cref="ColorView"/>.
+    /// </summary>
+    /// <remarks>
+    /// This is indexed to match the default control template ordering.
+    /// </remarks>
+    public enum ColorViewTab
+    {
+        /// <summary>
+        /// The color spectrum subview with a box/ring spectrum and sliders.
+        /// </summary>
+        Spectrum = 0,
+
+        /// <summary>
+        /// The color palette subview with a grid of selectable colors.
+        /// </summary>
+        Palette = 1,
+
+        /// <summary>
+        /// The components subview with sliders and numeric input boxes.
+        /// </summary>
+        Components = 2,
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/AccentColorConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/AccentColorConverter.cs
new file mode 100644
index 0000000000..2c8e09adc9
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/AccentColorConverter.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives.Converters
+{
+    /// <summary>
+    /// Creates an accent color for a given base color value and step parameter.
+    /// </summary>
+    /// <remarks>
+    /// This is a highly-specialized converter for the color picker.
+    /// </remarks>
+    public class AccentColorConverter : IValueConverter
+    {
+        /// <summary>
+        /// The amount to change the Value component for each accent color step.
+        /// </summary>
+        public const double ValueDelta = 0.1;
+
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            int accentStep;
+            Color? rgbColor = null;
+            HsvColor? hsvColor = null;
+
+            if (value is Color valueColor)
+            {
+                rgbColor = valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                rgbColor = valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                hsvColor = valueHsvColor;
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                rgbColor = valueBrush.Color;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            // Get the value component delta
+            try
+            {
+                accentStep = int.Parse(parameter?.ToString() ?? "", CultureInfo.InvariantCulture);
+            }
+            catch
+            {
+                // Invalid parameter provided, unable to convert to integer
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            if (hsvColor == null &&
+                rgbColor != null)
+            {
+                hsvColor = rgbColor.Value.ToHsv();
+            }
+
+            if (hsvColor != null)
+            {
+                return new SolidColorBrush(GetAccent(hsvColor.Value, accentStep).ToRgb());
+            }
+            else
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <summary>
+        /// This does not account for perceptual differences and also does not match with
+        /// system accent color calculation.
+        /// </summary>
+        /// <remarks>
+        /// Use the HSV representation as it's more perceptual.
+        /// In most cases only the value is changed by a fixed percentage so the algorithm is reproducible.
+        /// </remarks>
+        /// <param name="hsvColor">The base color to calculate the accent from.</param>
+        /// <param name="accentStep">The number of accent color steps to move.</param>
+        /// <returns>The new accent color.</returns>
+        public static HsvColor GetAccent(HsvColor hsvColor, int accentStep)
+        {
+            if (accentStep != 0)
+            {
+                double colorValue = hsvColor.V;
+                colorValue += (accentStep * AccentColorConverter.ValueDelta);
+                colorValue = Math.Round(colorValue, 2);
+
+                return new HsvColor(hsvColor.A, hsvColor.H, hsvColor.S, colorValue);
+            }
+            else
+            {
+                return hsvColor;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ColorToDisplayNameConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ColorToDisplayNameConverter.cs
new file mode 100644
index 0000000000..4f727287ba
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ColorToDisplayNameConverter.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Gets the approximated display name for the color.
+    /// </summary>
+    public class ColorToDisplayNameConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            Color color;
+
+            if (value is Color valueColor)
+            {
+                color = valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                color = valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                color = valueHsvColor.ToRgb();
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                color = valueBrush.Color;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            // ColorHelper.ToDisplayName ignores the alpha component
+            // This means fully transparent colors will be named as a real color
+            // That undesirable behavior is specially overridden here
+            if (color.A == 0x00)
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+            else
+            {
+                return ColorHelper.ToDisplayName(color);
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ColorToHexConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ColorToHexConverter.cs
new file mode 100644
index 0000000000..8d5f2332be
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ColorToHexConverter.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts a color to a hex string and vice versa.
+    /// </summary>
+    public class ColorToHexConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            Color color;
+            bool includeSymbol = parameter as bool? ?? false;
+
+            if (value is Color valueColor)
+            {
+                color = valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                color = valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                color = valueHsvColor.ToRgb();
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                color = valueBrush.Color;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            string hexColor = color.ToUint32().ToString("x8", CultureInfo.InvariantCulture).ToUpperInvariant();
+
+            if (includeSymbol == false)
+            {
+                // TODO: When .net standard 2.0 is dropped, replace the below line
+                //hexColor = hexColor.Replace("#", string.Empty, StringComparison.Ordinal);
+                hexColor = hexColor.Replace("#", string.Empty);
+            }
+
+            return hexColor;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            string hexValue = value?.ToString() ?? string.Empty;
+
+            if (Color.TryParse(hexValue, out Color color))
+            {
+                return color;
+            }
+            else if (hexValue.StartsWith("#", StringComparison.Ordinal) == false &&
+                     Color.TryParse("#" + hexValue, out Color color2))
+            {
+                return color2;
+            }
+            else
+            {
+                // Invalid hex color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ContrastBrushConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ContrastBrushConverter.cs
new file mode 100644
index 0000000000..8b66b1a4e5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ContrastBrushConverter.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls.Converters;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives.Converters
+{
+    /// <summary>
+    /// Gets a <see cref="SolidColorBrush"/>, either black or white, depending on the luminance of the supplied color.
+    /// A default color supplied in the converter parameter may be returned if alpha is below the set threshold.
+    /// </summary>
+    /// <remarks>
+    /// This is a highly-specialized converter for the color picker.
+    /// </remarks>
+    public class ContrastBrushConverter : IValueConverter
+    {
+        private ToColorConverter toColorConverter = new ToColorConverter();
+
+        /// <summary>
+        /// Gets or sets the alpha channel threshold below which a default color is used instead of black/white.
+        /// </summary>
+        public byte AlphaThreshold { get; set; } = 128;
+
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            Color comparisonColor;
+            Color? defaultColor = null;
+
+            // Get the changing color to compare against
+            var convertedValue = toColorConverter.Convert(value, targetType, parameter, culture);
+            if (convertedValue is Color valueColor)
+            {
+                comparisonColor = valueColor;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            // Get the default color when transparency is high
+            var convertedParameter = toColorConverter.Convert(parameter, targetType, parameter, culture);
+            if (convertedParameter is Color parameterColor)
+            {
+                defaultColor = parameterColor;
+            }
+
+            if (comparisonColor.A < AlphaThreshold &&
+                defaultColor.HasValue)
+            {
+                // If the transparency is less than the threshold, just use the default brush
+                // This can commonly be something like the TextControlForeground brush
+                return new SolidColorBrush(defaultColor.Value);
+            }
+            else
+            {
+                // Chose a white/black brush based on contrast to the base color
+                if (ColorHelper.GetRelativeLuminance(comparisonColor) <= 0.5)
+                {
+                    // Dark color, return light for contrast
+                    return new SolidColorBrush(Colors.White);
+                }
+                else
+                {
+                    // Bright color, return dark for contrast
+                    return new SolidColorBrush(Colors.Black);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/DoNothingForNullConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/DoNothingForNullConverter.cs
new file mode 100644
index 0000000000..421a5acb28
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/DoNothingForNullConverter.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Globalization;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converter that will do nothing (not update bound values) when a null value is encountered.
+    /// This converter enables binding nullable with non-nullable properties in some scenarios.
+    /// </summary>
+    public class DoNothingForNullConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return value ?? BindingOperations.DoNothing;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return value ?? BindingOperations.DoNothing;
+        }
+    }
+}
+
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ToBrushConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ToBrushConverter.cs
new file mode 100644
index 0000000000..9e8c264dd3
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ToBrushConverter.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts the given value into an <see cref="IBrush"/> when a conversion is possible.
+    /// </summary>
+    public class ToBrushConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value is IBrush brush)
+            {
+                return brush;
+            }
+            else if (value is Color valueColor)
+            {
+                return new SolidColorBrush(valueColor);
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                return new SolidColorBrush(valueHslColor.ToRgb());
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                return new SolidColorBrush(valueHsvColor.ToRgb());
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ToColorConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ToColorConverter.cs
new file mode 100644
index 0000000000..14b2be225e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ToColorConverter.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts the given value into a <see cref="Color"/> when a conversion is possible.
+    /// </summary>
+    public class ToColorConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value is Color valueColor)
+            {
+                return valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                return valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                return valueHsvColor.ToRgb();
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                // A brush may have an opacity set along with alpha transparency
+                double alpha = valueBrush.Color.A * valueBrush.Opacity;
+
+                return new Color(
+                    (byte)MathUtilities.Clamp(alpha, 0x00, 0xFF),
+                    valueBrush.Color.R,
+                    valueBrush.Color.G,
+                    valueBrush.Color.B);
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/ArrayList.cs b/src/Avalonia.Controls.ColorPicker/Helpers/ArrayList.cs
new file mode 100644
index 0000000000..0b4c2f8579
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/ArrayList.cs
@@ -0,0 +1,71 @@
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// A thin wrapper over an <see cref="System.Array"/> that allows some additional list-like functionality.
+    /// </summary>
+    /// <remarks>
+    /// This is only for internal ColorPicker-related functionality and should not be used elsewhere.
+    /// It is added for performance to enjoy the simplicity of the IList.Add() method without requiring
+    /// an additional copy to turn a list into an array for bitmaps.
+    /// </remarks>
+    /// <typeparam name="T">The type of items in the array.</typeparam>
+    internal class ArrayList<T>
+    {
+        private int _nextIndex = 0;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayList{T}"/> class.
+        /// </summary>
+        public ArrayList(int capacity)
+        {
+            Capacity = capacity;
+            Array = new T[capacity];
+        }
+
+        /// <summary>
+        /// Provides access to the underlying array by index.
+        /// This exists for simplification and the <see cref="Array"/> property
+        /// may also be used.
+        /// </summary>
+        /// <param name="i">The index of the item to get or set.</param>
+        /// <returns>The item at the given index.</returns>
+        public T this[int i]
+        {
+            get => Array[i];
+            set => Array[i] = value;
+        }
+
+        /// <summary>
+        /// Gets the underlying array.
+        /// </summary>
+        public T[] Array { get; private set; }
+
+        /// <summary>
+        /// Gets the fixed capacity/size of the array.
+        /// This must be set during construction.
+        /// </summary>
+        public int Capacity { get; private set; }
+
+        /// <summary>
+        /// Adds the given item to the array at the next available index.
+        /// WARNING: This must be used carefully and only once, in sequence.
+        /// </summary>
+        /// <param name="item">The item to add.</param>
+        public void Add(T item)
+        {
+            if (_nextIndex >= 0 &&
+                _nextIndex < Capacity)
+            {
+                Array[_nextIndex] = item;
+                _nextIndex++;
+            }
+            else
+            {
+                // If necessary an exception could be thrown here
+                // throw new IndexOutOfRangeException();
+            }
+
+            return;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/ColorHelper.cs b/src/Avalonia.Controls.ColorPicker/Helpers/ColorHelper.cs
new file mode 100644
index 0000000000..c1a03b1b77
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/ColorHelper.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Globalization;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains helpers useful when working with colors.
+    /// </summary>
+    public static class ColorHelper
+    {
+        private static readonly Dictionary<Color, string> cachedDisplayNames = new Dictionary<Color, string>();
+        private static readonly object cacheMutex = new object();
+
+        /// <summary>
+        /// Gets the relative (perceptual) luminance/brightness of the given color.
+        /// 1 is closer to white while 0 is closer to black.
+        /// </summary>
+        /// <param name="color">The color to calculate relative luminance for.</param>
+        /// <returns>The relative (perceptual) luminance/brightness of the given color.</returns>
+        public static double GetRelativeLuminance(Color color)
+        {
+            // The equation for relative luminance is given by
+            //
+            // L = 0.2126 * Rg + 0.7152 * Gg + 0.0722 * Bg
+            //
+            // where Xg = { X/3294 if X <= 10, (R/269 + 0.0513)^2.4 otherwise }
+            //
+            // If L is closer to 1, then the color is closer to white; if it is closer to 0,
+            // then the color is closer to black.  This is based on the fact that the human
+            // eye perceives green to be much brighter than red, which in turn is perceived to be
+            // brighter than blue.
+
+            double rg = color.R <= 10 ? color.R / 3294.0 : Math.Pow(color.R / 269.0 + 0.0513, 2.4);
+            double gg = color.G <= 10 ? color.G / 3294.0 : Math.Pow(color.G / 269.0 + 0.0513, 2.4);
+            double bg = color.B <= 10 ? color.B / 3294.0 : Math.Pow(color.B / 269.0 + 0.0513, 2.4);
+
+            return (0.2126 * rg + 0.7152 * gg + 0.0722 * bg);
+        }
+
+        /// <summary>
+        /// Determines if color display names are supported based on the current thread culture.
+        /// </summary>
+        /// <remarks>
+        /// Only English names are currently supported following known color names.
+        /// In the future known color names could be localized.
+        /// </remarks>
+        public static bool ToDisplayNameExists
+        {
+            get => CultureInfo.CurrentUICulture.Name.StartsWith("EN", StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Determines an approximate display name for the given color.
+        /// </summary>
+        /// <param name="color">The color to get the display name for.</param>
+        /// <returns>The approximate color display name.</returns>
+        public static string ToDisplayName(Color color)
+        {
+            // Without rounding, there are 16,777,216 possible RGB colors (without alpha).
+            // This is too many to cache and search through for performance reasons.
+            // It is also needlessly large as there are only ~140 known/named colors.
+            // Therefore, rounding of the input color's component values is done to
+            // reduce the color space into something more useful.
+            //
+            // The rounding value of 5 is specially chosen.
+            // It is a factor of 255 and therefore evenly divisible which improves
+            // the quality of the calculations.
+            double rounding = 5;
+            var roundedColor = new Color(
+                0xFF,
+                Convert.ToByte(Math.Round(color.R / rounding) * rounding),
+                Convert.ToByte(Math.Round(color.G / rounding) * rounding),
+                Convert.ToByte(Math.Round(color.B / rounding) * rounding));
+
+            // Attempt to use a previously cached display name
+            lock (cacheMutex)
+            {
+                if (cachedDisplayNames.TryGetValue(roundedColor, out var displayName))
+                {
+                    return displayName;
+                }
+            }
+
+            // Find the closest known color by measuring 3D Euclidean distance (ignore alpha)
+            var closestKnownColor = KnownColor.None;
+            var closestKnownColorDistance = double.PositiveInfinity;
+            var knownColors = (KnownColor[])Enum.GetValues(typeof(KnownColor));
+
+            for (int i = 1; i < knownColors.Length; i++) // Skip 'None'
+            {
+                // Transparent is skipped since alpha is ignored making it equivalent to White
+                if (knownColors[i] != KnownColor.Transparent)
+                {
+                    Color knownColor = KnownColors.ToColor(knownColors[i]);
+
+                    double distance = Math.Sqrt(
+                        Math.Pow((double)(roundedColor.R - knownColor.R), 2.0) +
+                        Math.Pow((double)(roundedColor.G - knownColor.G), 2.0) +
+                        Math.Pow((double)(roundedColor.B - knownColor.B), 2.0));
+
+                    if (distance < closestKnownColorDistance)
+                    {
+                        closestKnownColor = knownColors[i];
+                        closestKnownColorDistance = distance;
+                    }
+                }
+            }
+
+            // Return the closest known color as the display name
+            // Cache results for next time as well
+            if (closestKnownColor != KnownColor.None)
+            {
+                var sb = StringBuilderCache.Acquire();
+                string name = closestKnownColor.ToString();
+
+                // Add spaces converting PascalCase to human-readable names
+                for (int i = 0; i < name.Length; i++)
+                {
+                    if (i != 0 &&
+                        char.IsUpper(name[i]))
+                    {
+                        sb.Append(' ');
+                    }
+
+                    sb.Append(name[i]);
+                }
+
+                string displayName = StringBuilderCache.GetStringAndRelease(sb);
+
+                lock (cacheMutex)
+                {
+                    cachedDisplayNames.Add(roundedColor, displayName);
+                }
+
+                return displayName;
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs b/src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs
new file mode 100644
index 0000000000..819d745772
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs
@@ -0,0 +1,647 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains internal, special-purpose helpers used with the color picker.
+    /// </summary>
+    internal static class ColorPickerHelpers
+    {
+        /// <summary>
+        /// Generates a new bitmap of the specified size by changing a specific color component.
+        /// This will produce a gradient representing a sweep of all possible values of the color component.
+        /// </summary>
+        /// <param name="width">The pixel width (X, horizontal) of the resulting bitmap.</param>
+        /// <param name="height">The pixel height (Y, vertical) of the resulting bitmap.</param>
+        /// <param name="orientation">The orientation of the resulting bitmap (gradient direction).</param>
+        /// <param name="colorModel">The color model being used: RGBA or HSVA.</param>
+        /// <param name="component">The specific color component to sweep.</param>
+        /// <param name="baseHsvColor">The base HSV color used for components not being changed.</param>
+        /// <param name="isAlphaMaxForced">Fix the alpha component value to maximum during calculation.
+        /// This will remove any alpha/transparency from the other component backgrounds.</param>
+        /// <param name="isSaturationValueMaxForced">Fix the saturation and value components to maximum
+        /// during calculation with the HSVA color model.
+        /// This will ensure colors are always discernible regardless of saturation/value.</param>
+        /// <returns>A new bitmap representing a gradient of color component values.</returns>
+        public static async Task<ArrayList<byte>> CreateComponentBitmapAsync(
+            int width,
+            int height,
+            Orientation orientation,
+            ColorModel colorModel,
+            ColorComponent component,
+            HsvColor baseHsvColor,
+            bool isAlphaMaxForced,
+            bool isSaturationValueMaxForced)
+        {
+            if (width == 0 || height == 0)
+            {
+                return new ArrayList<byte>(0);
+            }
+
+            var bitmap = await Task.Run<ArrayList<byte>>(() =>
+            {
+                int pixelDataIndex = 0;
+                double componentStep;
+                ArrayList<byte> bgraPixelData;
+                Color baseRgbColor = Colors.White;
+                Color rgbColor;
+                int bgraPixelDataHeight;
+                int bgraPixelDataWidth;
+
+                // Allocate the buffer
+                // BGRA formatted color components 1 byte each (4 bytes in a pixel)
+                bgraPixelData       = new ArrayList<byte>(width * height * 4);
+                bgraPixelDataHeight = height * 4;
+                bgraPixelDataWidth  = width * 4;
+
+                // Maximize alpha component value
+                if (isAlphaMaxForced &&
+                    component != ColorComponent.Alpha)
+                {
+                    baseHsvColor = new HsvColor(1.0, baseHsvColor.H, baseHsvColor.S, baseHsvColor.V);
+                }
+
+                // Convert HSV to RGB once
+                if (colorModel == ColorModel.Rgba)
+                {
+                    baseRgbColor = baseHsvColor.ToRgb();
+                }
+
+                // Maximize Saturation and Value components when in HSVA mode
+                if (isSaturationValueMaxForced &&
+                    colorModel == ColorModel.Hsva &&
+                    component != ColorComponent.Alpha)
+                {
+                    switch (component)
+                    {
+                        case ColorComponent.Component1:
+                            baseHsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, 1.0, 1.0);
+                            break;
+                        case ColorComponent.Component2:
+                            baseHsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, baseHsvColor.S, 1.0);
+                            break;
+                        case ColorComponent.Component3:
+                            baseHsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, 1.0, baseHsvColor.V);
+                            break;
+                    }
+                }
+
+                // Create the color component gradient
+                if (orientation == Orientation.Horizontal)
+                {
+                    // Determine the numerical increment of the color steps within the component
+                    if (colorModel == ColorModel.Hsva)
+                    {
+                        if (component == ColorComponent.Component1)
+                        {
+                            componentStep = 360.0 / width;
+                        }
+                        else
+                        {
+                            componentStep = 1.0 / width;
+                        }
+                    }
+                    else
+                    {
+                        componentStep = 255.0 / width;
+                    }
+
+                    for (int y = 0; y < height; y++)
+                    {
+                        for (int x = 0; x < width; x++)
+                        {
+                            if (y == 0)
+                            {
+                                rgbColor = GetColor(x * componentStep);
+
+                                // Get a new color
+                                bgraPixelData[pixelDataIndex + 0] = Convert.ToByte(rgbColor.B * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 1] = Convert.ToByte(rgbColor.G * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 2] = Convert.ToByte(rgbColor.R * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 3] = rgbColor.A;
+                            }
+                            else
+                            {
+                                // Use the color in the row above
+                                // Remember the pixel data is 1 dimensional instead of 2
+                                bgraPixelData[pixelDataIndex + 0] = bgraPixelData[pixelDataIndex + 0 - bgraPixelDataWidth];
+                                bgraPixelData[pixelDataIndex + 1] = bgraPixelData[pixelDataIndex + 1 - bgraPixelDataWidth];
+                                bgraPixelData[pixelDataIndex + 2] = bgraPixelData[pixelDataIndex + 2 - bgraPixelDataWidth];
+                                bgraPixelData[pixelDataIndex + 3] = bgraPixelData[pixelDataIndex + 3 - bgraPixelDataWidth];
+                            }
+
+                            pixelDataIndex += 4;
+                        }
+                    }
+                }
+                else
+                {
+                    // Determine the numerical increment of the color steps within the component
+                    if (colorModel == ColorModel.Hsva)
+                    {
+                        if (component == ColorComponent.Component1)
+                        {
+                            componentStep = 360.0 / height;
+                        }
+                        else
+                        {
+                            componentStep = 1.0 / height;
+                        }
+                    }
+                    else
+                    {
+                        componentStep = 255.0 / height;
+                    }
+
+                    for (int y = 0; y < height; y++)
+                    {
+                        for (int x = 0; x < width; x++)
+                        {
+                            if (x == 0)
+                            {
+                                // The lowest component value should be at the 'bottom' of the bitmap
+                                rgbColor = GetColor((height - 1 - y) * componentStep);
+
+                                // Get a new color
+                                bgraPixelData[pixelDataIndex + 0] = Convert.ToByte(rgbColor.B * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 1] = Convert.ToByte(rgbColor.G * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 2] = Convert.ToByte(rgbColor.R * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 3] = rgbColor.A;
+                            }
+                            else
+                            {
+                                // Use the color in the column to the left
+                                // Remember the pixel data is 1 dimensional instead of 2
+                                bgraPixelData[pixelDataIndex + 0] = bgraPixelData[pixelDataIndex - 4];
+                                bgraPixelData[pixelDataIndex + 1] = bgraPixelData[pixelDataIndex - 3];
+                                bgraPixelData[pixelDataIndex + 2] = bgraPixelData[pixelDataIndex - 2];
+                                bgraPixelData[pixelDataIndex + 3] = bgraPixelData[pixelDataIndex - 1];
+                            }
+
+                            pixelDataIndex += 4;
+                        }
+                    }
+                }
+
+                Color GetColor(double componentValue)
+                {
+                    Color newRgbColor = Colors.White;
+
+                    switch (component)
+                    {
+                        case ColorComponent.Component1:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep hue
+                                    newRgbColor = HsvColor.ToRgb(
+                                        MathUtilities.Clamp(componentValue, 0.0, 360.0),
+                                        baseHsvColor.S,
+                                        baseHsvColor.V,
+                                        baseHsvColor.A);
+                                }
+                                else
+                                {
+                                    // Sweep red
+                                    newRgbColor = new Color(
+                                        baseRgbColor.A,
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)),
+                                        baseRgbColor.G,
+                                        baseRgbColor.B);
+                                }
+
+                                break;
+                            }
+                        case ColorComponent.Component2:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep saturation
+                                    newRgbColor = HsvColor.ToRgb(
+                                        baseHsvColor.H,
+                                        MathUtilities.Clamp(componentValue, 0.0, 1.0),
+                                        baseHsvColor.V,
+                                        baseHsvColor.A);
+                                }
+                                else
+                                {
+                                    // Sweep green
+                                    newRgbColor = new Color(
+                                        baseRgbColor.A,
+                                        baseRgbColor.R,
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)),
+                                        baseRgbColor.B);
+                                }
+
+                                break;
+                            }
+                        case ColorComponent.Component3:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep value
+                                    newRgbColor = HsvColor.ToRgb(
+                                        baseHsvColor.H,
+                                        baseHsvColor.S,
+                                        MathUtilities.Clamp(componentValue, 0.0, 1.0),
+                                        baseHsvColor.A);
+                                }
+                                else
+                                {
+                                    // Sweep blue
+                                    newRgbColor = new Color(
+                                        baseRgbColor.A,
+                                        baseRgbColor.R,
+                                        baseRgbColor.G,
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)));
+                                }
+
+                                break;
+                            }
+                        case ColorComponent.Alpha:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep alpha
+                                    newRgbColor = HsvColor.ToRgb(
+                                        baseHsvColor.H,
+                                        baseHsvColor.S,
+                                        baseHsvColor.V,
+                                        MathUtilities.Clamp(componentValue, 0.0, 1.0));
+                                }
+                                else
+                                {
+                                    // Sweep alpha
+                                    newRgbColor = new Color(
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)),
+                                        baseRgbColor.R,
+                                        baseRgbColor.G,
+                                        baseRgbColor.B);
+                                }
+
+                                break;
+                            }
+                    }
+
+                    return newRgbColor;
+                }
+
+                return bgraPixelData;
+            });
+
+            return bitmap;
+        }
+
+        public static Hsv IncrementColorComponent(
+            Hsv originalHsv,
+            HsvComponent component,
+            IncrementDirection direction,
+            IncrementAmount amount,
+            bool shouldWrap,
+            double minBound,
+            double maxBound)
+        {
+            Hsv newHsv = originalHsv;
+
+            if (amount == IncrementAmount.Small || !ColorHelper.ToDisplayNameExists)
+            {
+                // In order to avoid working with small values that can incur rounding issues,
+                // we'll multiple saturation and value by 100 to put them in the range of 0-100 instead of 0-1.
+                newHsv.S *= 100;
+                newHsv.V *= 100;
+
+                // Note: *valueToIncrement replaced with ref local variable for C#, must be initialized
+                ref double valueToIncrement = ref newHsv.H;
+                double incrementAmount = 0.0;
+
+                // If we're adding a small increment, then we'll just add or subtract 1.
+                // If we're adding a large increment, then we want to snap to the next
+                // or previous major value - for hue, this is every increment of 30;
+                // for saturation and value, this is every increment of 10.
+                switch (component)
+                {
+                    case HsvComponent.Hue:
+                        valueToIncrement = ref newHsv.H;
+                        incrementAmount = amount == IncrementAmount.Small ? 1 : 30;
+                        break;
+
+                    case HsvComponent.Saturation:
+                        valueToIncrement = ref newHsv.S;
+                        incrementAmount = amount == IncrementAmount.Small ? 1 : 10;
+                        break;
+
+                    case HsvComponent.Value:
+                        valueToIncrement = ref newHsv.V;
+                        incrementAmount = amount == IncrementAmount.Small ? 1 : 10;
+                        break;
+
+                    default:
+                        throw new InvalidOperationException("Invalid HsvComponent.");
+                }
+
+                double previousValue = valueToIncrement;
+
+                valueToIncrement += (direction == IncrementDirection.Lower ? -incrementAmount : incrementAmount);
+
+                // If the value has reached outside the bounds, we were previous at the boundary, and we should wrap,
+                // then we'll place the selection on the other side of the spectrum.
+                // Otherwise, we'll place it on the boundary that was exceeded.
+                if (valueToIncrement < minBound)
+                {
+                    valueToIncrement = (shouldWrap && previousValue == minBound) ? maxBound : minBound;
+                }
+
+                if (valueToIncrement > maxBound)
+                {
+                    valueToIncrement = (shouldWrap && previousValue == maxBound) ? minBound : maxBound;
+                }
+
+                // We multiplied saturation and value by 100 previously, so now we want to put them back in the 0-1 range.
+                newHsv.S /= 100;
+                newHsv.V /= 100;
+            }
+            else
+            {
+                // While working with named colors, we're going to need to be working in actual HSV units,
+                // so we'll divide the min bound and max bound by 100 in the case of saturation or value,
+                // since we'll have received units between 0-100 and we need them within 0-1.
+                if (component == HsvComponent.Saturation ||
+                    component == HsvComponent.Value)
+                {
+                    minBound /= 100;
+                    maxBound /= 100;
+                }
+
+                newHsv = FindNextNamedColor(originalHsv, component, direction, shouldWrap, minBound, maxBound);
+            }
+
+            return newHsv;
+        }
+
+        public static Hsv FindNextNamedColor(
+            Hsv originalHsv,
+            HsvComponent component,
+            IncrementDirection direction,
+            bool shouldWrap,
+            double minBound,
+            double maxBound)
+        {
+            // There's no easy way to directly get the next named color, so what we'll do
+            // is just iterate in the direction that we want to find it until we find a color
+            // in that direction that has a color name different than our current color name.
+            // Once we find a new color name, then we'll iterate across that color name until
+            // we find its bounds on the other side, and then select the color that is exactly
+            // in the middle of that color's bounds.
+            Hsv newHsv = originalHsv;
+            
+            string originalColorName = ColorHelper.ToDisplayName(originalHsv.ToRgb().ToColor());
+            string newColorName = originalColorName;
+
+            // Note: *newValue replaced with ref local variable for C#, must be initialized
+            double originalValue = 0.0;
+            ref double newValue = ref newHsv.H;
+            double incrementAmount = 0.0;
+
+            switch (component)
+            {
+                case HsvComponent.Hue:
+                    originalValue = originalHsv.H;
+                    newValue = ref newHsv.H;
+                    incrementAmount = 1;
+                    break;
+
+                case HsvComponent.Saturation:
+                    originalValue = originalHsv.S;
+                    newValue = ref newHsv.S;
+                    incrementAmount = 0.01;
+                    break;
+
+                case HsvComponent.Value:
+                    originalValue = originalHsv.V;
+                    newValue = ref newHsv.V;
+                    incrementAmount = 0.01;
+                    break;
+
+                default:
+                    throw new InvalidOperationException("Invalid HsvComponent.");
+            }
+
+            bool shouldFindMidPoint = true;
+
+            while (newColorName == originalColorName)
+            {
+                double previousValue = newValue;
+                newValue += (direction == IncrementDirection.Lower ? -1 : 1) * incrementAmount;
+
+                bool justWrapped = false;
+
+                // If we've hit a boundary, then either we should wrap or we shouldn't.
+                // If we should, then we'll perform that wrapping if we were previously up against
+                // the boundary that we've now hit.  Otherwise, we'll stop at that boundary.
+                if (newValue > maxBound)
+                {
+                    if (shouldWrap)
+                    {
+                        newValue = minBound;
+                        justWrapped = true;
+                    }
+                    else
+                    {
+                        newValue = maxBound;
+                        shouldFindMidPoint = false;
+                        newColorName = ColorHelper.ToDisplayName(newHsv.ToRgb().ToColor());
+                        break;
+                    }
+                }
+                else if (newValue < minBound)
+                {
+                    if (shouldWrap)
+                    {
+                        newValue = maxBound;
+                        justWrapped = true;
+                    }
+                    else
+                    {
+                        newValue = minBound;
+                        shouldFindMidPoint = false;
+                        newColorName = ColorHelper.ToDisplayName(newHsv.ToRgb().ToColor());
+                        break;
+                    }
+                }
+
+                if (!justWrapped &&
+                    previousValue != originalValue &&
+                    Math.Sign(newValue - originalValue) != Math.Sign(previousValue - originalValue))
+                {
+                    // If we've wrapped all the way back to the start and have failed to find a new color name,
+                    // then we'll just quit - there isn't a new color name that we're going to find.
+                    shouldFindMidPoint = false;
+                    break;
+                }
+
+                newColorName = ColorHelper.ToDisplayName(newHsv.ToRgb().ToColor());
+            }
+
+            if (shouldFindMidPoint)
+            {
+                Hsv startHsv = newHsv;
+                Hsv currentHsv = startHsv;
+                double startEndOffset = 0;
+                string currentColorName = newColorName;
+
+                // Note: *startValue/*currentValue replaced with ref local variables for C#, must be initialized
+                ref double startValue = ref startHsv.H;
+                ref double currentValue = ref currentHsv.H;
+                double wrapIncrement = 0;
+
+                switch (component)
+                {
+                    case HsvComponent.Hue:
+                        startValue = ref startHsv.H;
+                        currentValue = ref currentHsv.H;
+                        wrapIncrement = 360.0;
+                        break;
+
+                    case HsvComponent.Saturation:
+                        startValue = ref startHsv.S;
+                        currentValue = ref currentHsv.S;
+                        wrapIncrement = 1.0;
+                        break;
+
+                    case HsvComponent.Value:
+                        startValue = ref startHsv.V;
+                        currentValue = ref currentHsv.V;
+                        wrapIncrement = 1.0;
+                        break;
+
+                    default:
+                        throw new InvalidOperationException("Invalid HsvComponent.");
+                }
+
+                while (newColorName == currentColorName)
+                {
+                    currentValue += (direction == IncrementDirection.Lower ? -1 : 1) * incrementAmount;
+
+                    // If we've hit a boundary, then either we should wrap or we shouldn't.
+                    // If we should, then we'll perform that wrapping if we were previously up against
+                    // the boundary that we've now hit.  Otherwise, we'll stop at that boundary.
+                    if (currentValue > maxBound)
+                    {
+                        if (shouldWrap)
+                        {
+                            currentValue = minBound;
+                            startEndOffset = maxBound - minBound;
+                        }
+                        else
+                        {
+                            currentValue = maxBound;
+                            break;
+                        }
+                    }
+                    else if (currentValue < minBound)
+                    {
+                        if (shouldWrap)
+                        {
+                            currentValue = maxBound;
+                            startEndOffset = minBound - maxBound;
+                        }
+                        else
+                        {
+                            currentValue = minBound;
+                            break;
+                        }
+                    }
+
+                    currentColorName = ColorHelper.ToDisplayName(currentHsv.ToRgb().ToColor());
+                }
+
+                newValue = (startValue + currentValue + startEndOffset) / 2;
+
+                // Dividing by 2 may have gotten us halfway through a single step, so we'll
+                // remove that half-step if it exists.
+                double leftoverValue = Math.Abs(newValue);
+
+                while (leftoverValue > incrementAmount)
+                {
+                    leftoverValue -= incrementAmount;
+                }
+
+                newValue -= leftoverValue;
+
+                while (newValue < minBound)
+                {
+                    newValue += wrapIncrement;
+                }
+
+                while (newValue > maxBound)
+                {
+                    newValue -= wrapIncrement;
+                }
+            }
+
+            return newHsv;
+        }
+
+        /// <summary>
+        /// Converts the given raw BGRA pre-multiplied alpha pixel data into a bitmap.
+        /// </summary>
+        /// <param name="bgraPixelData">The bitmap (in raw BGRA pre-multiplied alpha pixels).</param>
+        /// <param name="pixelWidth">The pixel width of the bitmap.</param>
+        /// <param name="pixelHeight">The pixel height of the bitmap.</param>
+        /// <returns>A new <see cref="WriteableBitmap"/>.</returns>
+        public static WriteableBitmap CreateBitmapFromPixelData(
+            ArrayList<byte> bgraPixelData,
+            int pixelWidth,
+            int pixelHeight)
+        {
+            // Standard may need to change on some devices
+            Vector dpi = new Vector(96, 96);
+
+            var bitmap = new WriteableBitmap(
+                new PixelSize(pixelWidth, pixelHeight),
+                dpi,
+                PixelFormat.Bgra8888,
+                AlphaFormat.Premul);
+
+            using (var frameBuffer = bitmap.Lock())
+            {
+                Marshal.Copy(bgraPixelData.Array, 0, frameBuffer.Address, bgraPixelData.Array.Length);
+            }
+
+            return bitmap;
+        }
+
+        /// <summary>
+        /// Updates the given <see cref="WriteableBitmap"/> with new, raw BGRA pre-multiplied alpha pixel data.
+        /// TODO: THIS METHOD IS CURRENTLY PROVIDED AS REFERENCE BUT CAUSES INTERMITTENT CRASHES IF USED.
+        /// WARNING: The bitmap's width, height and byte count MUST not have changed and MUST be enforced externally.
+        /// </summary>
+        /// <param name="bitmap">The existing <see cref="WriteableBitmap"/> to update.</param>
+        /// <param name="bgraPixelData">The bitmap (in raw BGRA pre-multiplied alpha pixels).</param>
+        public static void UpdateBitmapFromPixelData(
+            WriteableBitmap bitmap,
+            ArrayList<byte> bgraPixelData)
+        {
+            using (var frameBuffer = bitmap.Lock())
+            {
+                Marshal.Copy(bgraPixelData.Array, 0, frameBuffer.Address, bgraPixelData.Array.Length);
+            }
+
+            return;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/Hsv.cs b/src/Avalonia.Controls.ColorPicker/Helpers/Hsv.cs
new file mode 100644
index 0000000000..8a425b9581
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/Hsv.cs
@@ -0,0 +1,86 @@
+// Portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains and allows modification of Hue, Saturation and Value components.
+    /// </summary>
+    /// <remarks>
+    ///   The is a specialized struct optimized for permanence and memory:
+    ///   <list type="bullet">
+    ///     <item>This is not a read-only struct like <see cref="HsvColor"/> and allows editing the fields</item>
+    ///     <item>Removes the alpha component unnecessary in core calculations</item>
+    ///     <item>No component bounds checks or clamping is done.</item>
+    ///   </list>
+    /// </remarks>
+    internal struct Hsv
+    {
+        /// <summary>
+        /// The Hue component in the range from 0..359.
+        /// </summary>
+        public double H;
+
+        /// <summary>
+        /// The Saturation component in the range from 0..1.
+        /// </summary>
+        public double S;
+
+        /// <summary>
+        /// The Value component in the range from 0..1.
+        /// </summary>
+        public double V;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Hsv"/> struct.
+        /// </summary>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="v">The Value component in the range from 0..1.</param>
+        public Hsv(double h, double s, double v)
+        {
+            H = h;
+            S = s;
+            V = v;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Hsv"/> struct.
+        /// </summary>
+        /// <param name="hsvColor">An existing <see cref="HsvColor"/> to convert to <see cref="Hsv"/>.</param>
+        public Hsv(HsvColor hsvColor)
+        {
+            H = hsvColor.H;
+            S = hsvColor.S;
+            V = hsvColor.V;
+        }
+
+        /// <summary>
+        /// Converts this <see cref="Hsv"/> struct into a standard <see cref="HsvColor"/>.
+        /// </summary>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> representing this <see cref="Hsv"/> struct.</returns>
+        public HsvColor ToHsvColor(double alpha = 1.0)
+        {
+            // Clamping is done automatically in the constructor
+            return HsvColor.FromAhsv(alpha, H, S, V);
+        }
+
+        /// <summary>
+        /// Returns the <see cref="Rgb"/> color model equivalent of this <see cref="Hsv"/> color.
+        /// </summary>
+        /// <returns>The <see cref="Rgb"/> equivalent color.</returns>
+        public Rgb ToRgb()
+        {
+            // Instantiating a Color is unfortunately necessary to use existing conversions
+            // Clamping is done internally in the conversion method
+            Color color = HsvColor.ToRgb(H, S, V);
+
+            return new Rgb(color);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/IncrementAmount.cs b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementAmount.cs
new file mode 100644
index 0000000000..12aca593d5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementAmount.cs
@@ -0,0 +1,23 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Defines a relative amount that a color component should be incremented.
+    /// </summary>
+    internal enum IncrementAmount
+    {
+        /// <summary>
+        /// A smaller change in value.
+        /// </summary>
+        Small,
+
+        /// <summary>
+        /// A larger change in value.
+        /// </summary>
+        Large,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/IncrementDirection.cs b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementDirection.cs
new file mode 100644
index 0000000000..df9c1e3350
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementDirection.cs
@@ -0,0 +1,23 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Defines the direction a color component should be incremented.
+    /// </summary>
+    internal enum IncrementDirection
+    {
+        /// <summary>
+        /// Decreasing in value towards zero.
+        /// </summary>
+        Lower,
+
+        /// <summary>
+        /// Increasing in value towards positive infinity.
+        /// </summary>
+        Higher,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/Rgb.cs b/src/Avalonia.Controls.ColorPicker/Helpers/Rgb.cs
new file mode 100644
index 0000000000..72e3821c2b
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/Rgb.cs
@@ -0,0 +1,94 @@
+// Portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains and allows modification of Red, Green and Blue components.
+    /// </summary>
+    /// <remarks>
+    ///   The is a specialized struct optimized for permanence and memory:
+    ///   <list type="bullet">
+    ///     <item>This is not a read-only struct like <see cref="Color"/> and allows editing the fields</item>
+    ///     <item>Removes the alpha component unnecessary in core calculations</item>
+    ///     <item>Normalizes RGB components in the range of 0..1 to simplify calculations.</item>
+    ///     <item>No component bounds checks or clamping is done.</item>
+    ///   </list>
+    /// </remarks>
+    internal struct Rgb
+    {
+        /// <summary>
+        /// The Red component in the range from 0..1.
+        /// </summary>
+        public double R;
+
+        /// <summary>
+        /// The Green component in the range from 0..1.
+        /// </summary>
+        public double G;
+
+        /// <summary>
+        /// The Blue component in the range from 0..1.
+        /// </summary>
+        public double B;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rgb"/> struct.
+        /// </summary>
+        /// <param name="r">The Red component in the range from 0..1.</param>
+        /// <param name="g">The Green component in the range from 0..1.</param>
+        /// <param name="b">The Blue component in the range from 0..1.</param>
+        public Rgb(double r, double g, double b)
+        {
+            R = r;
+            G = g;
+            B = b;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rgb"/> struct.
+        /// </summary>
+        /// <param name="color">An existing <see cref="Color"/> to convert to <see cref="Rgb"/>.</param>
+        public Rgb(Color color)
+        {
+            R = color.R / 255.0;
+            G = color.G / 255.0;
+            B = color.B / 255.0;
+        }
+
+        /// <summary>
+        /// Converts this <see cref="Rgb"/> struct into a standard <see cref="Color"/>.
+        /// </summary>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new <see cref="Color"/> representing this <see cref="Rgb"/> struct.</returns>
+        public Color ToColor(double alpha = 1.0)
+        {
+            return Color.FromArgb(
+                (byte)MathUtilities.Clamp(alpha * 255.0, 0x00, 0xFF),
+                (byte)MathUtilities.Clamp(R * 255.0, 0x00, 0xFF),
+                (byte)MathUtilities.Clamp(G * 255.0, 0x00, 0xFF),
+                (byte)MathUtilities.Clamp(B * 255.0, 0x00, 0xFF));
+        }
+
+        /// <summary>
+        /// Returns the <see cref="Hsv"/> color model equivalent of this <see cref="Rgb"/> color.
+        /// </summary>
+        /// <returns>The <see cref="Hsv"/> equivalent color.</returns>
+        public Hsv ToHsv()
+        {
+            // Instantiating an HsvColor is unfortunately necessary to use existing conversions
+            // Clamping must be done here as it isn't done in the conversion method (internal-use only)
+            HsvColor hsvColor = Color.ToHsv(
+                MathUtilities.Clamp(R, 0.0, 1.0),
+                MathUtilities.Clamp(G, 0.0, 1.0),
+                MathUtilities.Clamp(B, 0.0, 1.0));
+
+            return new Hsv(hsvColor);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/HsvComponent.cs b/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
new file mode 100644
index 0000000000..1a7a13166a
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
@@ -0,0 +1,47 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component in the HSV color model.
+    /// </summary>
+    public enum HsvComponent
+    {
+        /// <summary>
+        /// The Alpha component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.A"/>
+        /// </remarks>
+        Alpha = 0,
+
+        /// <summary>
+        /// The Hue component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.H"/>
+        /// </remarks>
+        Hue = 1,
+
+        /// <summary>
+        /// The Saturation component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.S"/>
+        /// </remarks>
+        Saturation = 2,
+
+        /// <summary>
+        /// The Value component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.V"/>
+        /// </remarks>
+        Value = 3
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.ColorPicker/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..64769303d6
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
diff --git a/src/Avalonia.Controls.ColorPicker/RgbComponent.cs b/src/Avalonia.Controls.ColorPicker/RgbComponent.cs
new file mode 100644
index 0000000000..c3591573bb
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/RgbComponent.cs
@@ -0,0 +1,42 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component in the RGB color model.
+    /// </summary>
+    public enum RgbComponent
+    {
+        /// <summary>
+        /// The Alpha component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.A"/>
+        /// </remarks>
+        Alpha = 0,
+
+        /// <summary>
+        /// The Red component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.R"/>
+        /// </remarks>
+        Red = 1,
+
+        /// <summary>
+        /// The Green component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.G"/>
+        /// </remarks>
+        Green = 2,
+
+        /// <summary>
+        /// The Blue component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.B"/>
+        /// </remarks>
+        Blue = 3
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
new file mode 100644
index 0000000000..1bcd17393d
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -0,0 +1,508 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    xmlns:converters="using:Avalonia.Controls.Converters"
+                    xmlns:primitives="using:Avalonia.Controls.Primitives"
+                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+                    x:CompileBindings="True">
+
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <ControlTheme x:Key="{x:Type ColorPicker}"
+                TargetType="ColorPicker">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Height" Value="32" />
+    <Setter Property="Width" Value="64" />
+    <Setter Property="MinWidth" Value="64" />
+    <Setter Property="Palette">
+      <controls:FluentColorPalette />
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ColorPicker}">
+        <DropDownButton CornerRadius="{TemplateBinding CornerRadius}"
+                        Height="{TemplateBinding Height}"
+                        Width="{TemplateBinding Width}"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        Padding="0,0,10,0"
+                        UseLayoutRounding="False">
+          <DropDownButton.Styles>
+            <Style Selector="FlyoutPresenter.nopadding">
+              <Setter Property="Padding" Value="0" />
+            </Style>
+          </DropDownButton.Styles>
+          <DropDownButton.Content>
+            <!-- Preview color -->
+            <Panel>
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Margin="1,1,0,1" />
+              <Border Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Margin="1,1,0,1" />
+            </Panel>
+          </DropDownButton.Content>
+          <DropDownButton.Flyout>
+            <Flyout FlyoutPresenterClasses="nopadding">
+
+              <!-- The following is copy-pasted from the ColorView's control template.
+                   It MUST always be kept in sync with the ColorView (which is master).
+                   Note the only changes are resources specific to the ColorPicker. -->
+              <Grid RowDefinitions="Auto,Auto">
+
+                <Grid.Resources>
+                  <!-- This radius must follow OverlayCornerRadius -->
+                  <CornerRadius x:Key="ColorViewTabBackgroundCornerRadius">5,5,0,0</CornerRadius>
+                </Grid.Resources>
+
+                <!-- Backgrounds -->
+                <!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
+                <Border x:Name="TabBackgroundBorder"
+                        Grid.Row="0"
+                        Grid.RowSpan="2"
+                        Height="48"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Top"
+                        Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                        BorderBrush="{DynamicResource ColorViewTabBorderBrush}"
+                        CornerRadius="{DynamicResource ColorViewTabBackgroundCornerRadius}" />
+                <Border x:Name="ContentBackgroundBorder"
+                        Grid.Row="0"
+                        Grid.RowSpan="2"
+                        Margin="0,48,0,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                        Background="{DynamicResource ColorViewContentBackgroundBrush}"
+                        BorderBrush="{DynamicResource ColorViewContentBorderBrush}"
+                        BorderThickness="0,1,0,0" />
+
+                <TabControl x:Name="PART_TabControl"
+                            Grid.Row="0"
+                            Height="338"
+                            Width="350"
+                            Padding="0"
+                            SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+                  <TabControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                      <UniformGrid Columns="0"
+                                   Rows="1" />
+                    </ItemsPanelTemplate>
+                  </TabControl.ItemsPanel>
+                  <!-- Spectrum Tab -->
+                  <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                           IsVisible="{TemplateBinding IsColorSpectrumVisible}">
+                    <TabItem.Header>
+                      <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                        <PathIcon Width="20"
+                                  Height="20"
+                                  Data="{DynamicResource ColorViewSpectrumIconGeometry}" />
+                      </Border>
+                    </TabItem.Header>
+                    <Grid RowDefinitions="*"
+                          Margin="12">
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"
+                                          MinWidth="32" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"
+                                          MinWidth="32" />
+                      </Grid.ColumnDefinitions>
+                      <primitives:ColorSlider x:Name="ColorSpectrumThirdComponentSlider"
+                                              AutomationProperties.Name="Third Component"
+                                              Grid.Column="0"
+                                              IsAlphaMaxForced="True"
+                                              IsSaturationValueMaxForced="False"
+                                              Orientation="Vertical"
+                                              ColorModel="Hsva"
+                                              ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
+                                              HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Stretch"
+                                              Margin="0,0,12,0"
+                                              IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}" />
+                      <primitives:ColorSpectrum x:Name="ColorSpectrum"
+                                                Grid.Column="1"
+                                                Components="{TemplateBinding ColorSpectrumComponents}"
+                                                HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                                MinHue="{TemplateBinding MinHue}"
+                                                MaxHue="{TemplateBinding MaxHue}"
+                                                MinSaturation="{TemplateBinding MinSaturation}"
+                                                MaxSaturation="{TemplateBinding MaxSaturation}"
+                                                MinValue="{TemplateBinding MinValue}"
+                                                MaxValue="{TemplateBinding MaxValue}"
+                                                Shape="{TemplateBinding ColorSpectrumShape}"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch" />
+                      <primitives:ColorSlider x:Name="ColorSpectrumAlphaSlider"
+                                              AutomationProperties.Name="Alpha Component"
+                                              Grid.Column="2"
+                                              Orientation="Vertical"
+                                              ColorModel="Hsva"
+                                              ColorComponent="Alpha"
+                                              HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Stretch"
+                                              Margin="12,0,0,0"
+                                              IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <primitives:ColorSlider.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                          </MultiBinding>
+                        </primitives:ColorSlider.IsVisible>
+                      </primitives:ColorSlider>
+                    </Grid>
+                  </TabItem>
+                  <!-- Palette Tab -->
+                  <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                           IsVisible="{TemplateBinding IsColorPaletteVisible}">
+                    <TabItem.Header>
+                      <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                        <PathIcon Width="20"
+                                  Height="20"
+                                  Data="{DynamicResource ColorViewPaletteIconGeometry}" />
+                      </Border>
+                    </TabItem.Header>
+                    <ListBox Theme="{StaticResource ColorViewPaletteListBoxTheme}"
+                             ItemContainerTheme="{StaticResource ColorViewPaletteListBoxItemTheme}"
+                             Items="{TemplateBinding PaletteColors}"
+                             SelectedItem="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoNothingForNullConverter}, Mode=TwoWay}"
+                             UseLayoutRounding="False"
+                             Margin="12">
+                      <ListBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type Color}">
+                          <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                                  ToolTip.Tip="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch">
+                            <Border.Background>
+                              <SolidColorBrush Color="{Binding}" />
+                            </Border.Background>
+                          </Border>
+                        </DataTemplate>
+                      </ListBox.ItemTemplate>
+                      <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                          <UniformGrid Columns="{Binding $parent[ColorView].PaletteColumnCount}" />
+                        </ItemsPanelTemplate>
+                      </ListBox.ItemsPanel>
+                    </ListBox>
+                  </TabItem>
+                  <!-- Components Tab -->
+                  <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                           IsVisible="{TemplateBinding IsColorComponentsVisible}">
+                    <TabItem.Header>
+                      <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                        <PathIcon Width="20"
+                                  Height="20"
+                                  Data="{DynamicResource ColorViewComponentsIconGeometry}" />
+                      </Border>
+                    </TabItem.Header>
+                    <Grid ColumnDefinitions="Auto,Auto,*"
+                          RowDefinitions="Auto,24,1*,1*,1*,1*,12"
+                          Margin="12">
+                      <!-- Top color model & Hex input -->
+                      <Grid Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Grid.Row="0"
+                            ColumnDefinitions="1*,12,1*">
+                        <!-- Content RGB/HSV names are hard-coded and considered universal -->
+                        <!-- RadioButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                        <Grid ColumnDefinitions="1*,1*"
+                              IsVisible="{TemplateBinding IsColorModelVisible}">
+                          <RadioButton x:Name="RgbRadioButton"
+                                       Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                       Grid.Column="0"
+                                       Content="RGB"
+                                       CornerRadius="4,0,0,4"
+                                       BorderThickness="1,1,0,1"
+                                       IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=TwoWay}" />
+                          <RadioButton x:Name="HsvRadioButton"
+                                       Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                       Grid.Column="1"
+                                       Content="HSV"
+                                       CornerRadius="0,4,4,0"
+                                       BorderThickness="0,1,1,1"
+                                       IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=TwoWay}" />
+                        </Grid>
+                        <Grid x:Name="HexInputGrid"
+                              Grid.Column="2"
+                              IsVisible="{TemplateBinding IsHexInputVisible}">
+                          <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="30" />
+                            <ColumnDefinition Width="*" />
+                          </Grid.ColumnDefinitions>
+                          <Border Grid.Column="0"
+                                  Height="32"
+                                  Background="{DynamicResource TextControlBackgroundDisabled}"
+                                  BorderBrush="{DynamicResource TextControlBorderBrush}"
+                                  BorderThickness="1,1,0,1"
+                                  CornerRadius="4,0,0,4">
+                            <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                       FontWeight="SemiBold"
+                                       Text="#"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center" />
+                          </Border>
+                          <!-- Color updated in code-behind -->
+                          <TextBox x:Name="PART_HexTextBox"
+                                   Grid.Column="1"
+                                   AutomationProperties.Name="Hexadecimal Color"
+                                   Height="32"
+                                   MaxLength="8"
+                                   HorizontalAlignment="Stretch"
+                                   CornerRadius="0,4,4,0" />
+                        </Grid>
+                      </Grid>
+                      <!-- Color component editing controls -->
+                      <!-- Component 1 RGB:Red HSV:Hue -->
+                      <Border Grid.Column="0"
+                              Grid.Row="2"
+                              Height="{Binding ElementName=Component1NumericUpDown, Path=Bounds.Height}"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Background="{DynamicResource TextControlBackgroundDisabled}"
+                              BorderBrush="{DynamicResource TextControlBorderBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="4,0,0,4"
+                              VerticalAlignment="Center"
+                              IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                        <Panel HorizontalAlignment="Center"
+                               VerticalAlignment="Center">
+                          <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                     FontWeight="SemiBold"
+                                     Text="R"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                          <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                     FontWeight="SemiBold"
+                                     Text="H"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                        </Panel>
+                      </Border>
+                      <NumericUpDown x:Name="Component1NumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="2"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,4,4,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=Component1Slider}"
+                                     Maximum="{Binding Maximum, ElementName=Component1Slider}"
+                                     Value="{Binding Value, ElementName=Component1Slider}"
+                                     IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                      <primitives:ColorSlider x:Name="Component1Slider"
+                                              Grid.Column="2"
+                                              Grid.Row="2"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Component1"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                      <!-- Component 2 RGB:Green HSV:Saturation -->
+                      <Border Grid.Column="0"
+                              Grid.Row="3"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Height="{Binding ElementName=Component2NumericUpDown, Path=Bounds.Height}"
+                              Background="{DynamicResource TextControlBackgroundDisabled}"
+                              BorderBrush="{DynamicResource TextControlBorderBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="4,0,0,4"
+                              VerticalAlignment="Center"
+                              IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                        <Panel HorizontalAlignment="Center"
+                               VerticalAlignment="Center">
+                          <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                     FontWeight="SemiBold"
+                                     Text="G"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                          <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                     FontWeight="SemiBold"
+                                     Text="S"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                        </Panel>
+                      </Border>
+                      <NumericUpDown x:Name="Component2NumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="3"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,4,4,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=Component2Slider}"
+                                     Maximum="{Binding Maximum, ElementName=Component2Slider}"
+                                     Value="{Binding Value, ElementName=Component2Slider}"
+                                     IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                      <primitives:ColorSlider x:Name="Component2Slider"
+                                              Grid.Column="2"
+                                              Grid.Row="3"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Component2"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                      <!-- Component 3 RGB:Blue HSV:Value -->
+                      <Border Grid.Column="0"
+                              Grid.Row="4"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Height="{Binding ElementName=Component3NumericUpDown, Path=Bounds.Height}"
+                              Background="{DynamicResource TextControlBackgroundDisabled}"
+                              BorderBrush="{DynamicResource TextControlBorderBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="4,0,0,4"
+                              VerticalAlignment="Center"
+                              IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                        <Panel HorizontalAlignment="Center"
+                               VerticalAlignment="Center">
+                          <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                     FontWeight="SemiBold"
+                                     Text="B"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                          <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                     FontWeight="SemiBold"
+                                     Text="V"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                        </Panel>
+                      </Border>
+                      <NumericUpDown x:Name="Component3NumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="4"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,4,4,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=Component3Slider}"
+                                     Maximum="{Binding Maximum, ElementName=Component3Slider}"
+                                     Value="{Binding Value, ElementName=Component3Slider}"
+                                     IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                      <primitives:ColorSlider x:Name="Component3Slider"
+                                              Grid.Column="2"
+                                              Grid.Row="4"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Component3"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                      <!-- Alpha Component -->
+                      <Border Grid.Column="0"
+                              Grid.Row="5"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Height="{Binding ElementName=AlphaComponentNumericUpDown, Path=Bounds.Height}"
+                              Background="{DynamicResource TextControlBackgroundDisabled}"
+                              BorderBrush="{DynamicResource TextControlBorderBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="4,0,0,4"
+                              VerticalAlignment="Center"
+                              IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <TextBlock x:Name="AlphaComponentTextBlock"
+                                   Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                   FontWeight="SemiBold"
+                                   Text="A"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center" />
+                        <Border.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsComponentTextInputVisible" />
+                          </MultiBinding>
+                        </Border.IsVisible>
+                      </Border>
+                      <NumericUpDown x:Name="AlphaComponentNumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="5"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,4,4,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=AlphaComponentSlider}"
+                                     Maximum="{Binding Maximum, ElementName=AlphaComponentSlider}"
+                                     Value="{Binding Value, ElementName=AlphaComponentSlider}"
+                                     IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <NumericUpDown.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsComponentTextInputVisible" />
+                          </MultiBinding>
+                        </NumericUpDown.IsVisible>
+                      </NumericUpDown>
+                      <primitives:ColorSlider x:Name="AlphaComponentSlider"
+                                              Grid.Column="2"
+                                              Grid.Row="5"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Alpha"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <primitives:ColorSlider.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsComponentSliderVisible" />
+                          </MultiBinding>
+                        </primitives:ColorSlider.IsVisible>
+                      </primitives:ColorSlider>
+                    </Grid>
+                  </TabItem>
+                </TabControl>
+                <!-- Previewer -->
+                <!-- Note that top/bottom margins have -5 to remove for drop shadow padding -->
+                <primitives:ColorPreviewer Grid.Row="1"
+                                           HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                           IsAccentColorsVisible="{TemplateBinding IsAccentColorsVisible}"
+                                           Margin="12,-5,12,7"
+                                           IsVisible="{TemplateBinding IsColorPreviewVisible}" />
+              </Grid>
+            </Flyout>
+          </DropDownButton.Flyout>
+        </DropDownButton>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
new file mode 100644
index 0000000000..1c4a44d081
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
@@ -0,0 +1,101 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+                    x:CompileBindings="True">
+
+  <pc:AccentColorConverter x:Key="AccentColorConverter" />
+  <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
+  <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
+
+  <ControlTheme x:Key="{x:Type ColorPreviewer}"
+                TargetType="ColorPreviewer">
+    <Setter Property="Height" Value="70" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ColorPreviewer}">
+        <Panel>
+          <!-- Preview color with accents to the left and right -->
+          <Grid ColumnDefinitions="Auto,*,Auto"
+                IsVisible="{TemplateBinding IsAccentColorsVisible}">
+            <!-- Left accent colors -->
+            <Grid Grid.Column="0"
+                  Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                  Width="{StaticResource ColorPreviewerAccentSectionWidth}"
+                  ColumnDefinitions="*,*"
+                  Margin="0,0,-10,0"
+                  VerticalAlignment="Center">
+              <Border Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
+              <Border x:Name="PART_AccentDecrement2Border"
+                      Grid.Column="0"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                      Tag="-2"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='-2'}" />
+              <Border x:Name="PART_AccentDecrement1Border"
+                      Grid.Column="1"
+                      Tag="-1"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='-1'}" />
+            </Grid>
+            <!-- Right accent colors -->
+            <Grid Grid.Column="2"
+                  Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                  Width="{StaticResource ColorPreviewerAccentSectionWidth}"
+                  ColumnDefinitions="*,*"
+                  Margin="-10,0,0,0"
+                  VerticalAlignment="Center">
+              <Border Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
+              <Border x:Name="PART_AccentIncrement1Border"
+                      Grid.Column="0"
+                      Tag="1"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='1'}" />
+              <Border x:Name="PART_AccentIncrement2Border"
+                      Grid.Column="1"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                      Tag="2"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='2'}" />
+            </Grid>
+            <!-- Preview color: Must be last for drop shadow Z-index -->
+            <Border Grid.Column="1"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    BoxShadow="0 0 10 2 #BF000000"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Margin="10">
+              <Panel>
+                <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                <Border CornerRadius="{TemplateBinding CornerRadius}"
+                        Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch" />
+              </Panel>
+            </Border>
+          </Grid>
+          <!-- Only preview color -->
+          <Border CornerRadius="{TemplateBinding CornerRadius}"
+                  IsVisible="{TemplateBinding IsAccentColorsVisible, Converter={x:Static BoolConverters.Not}}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Margin="0,10,0,10">
+            <Panel>
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                      CornerRadius="{TemplateBinding CornerRadius}" />
+              <Border CornerRadius="{TemplateBinding CornerRadius}"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+            </Panel>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
new file mode 100644
index 0000000000..fe749827a7
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
@@ -0,0 +1,191 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+
+  <ControlTheme x:Key="ColorSliderThumbTheme"
+                TargetType="Thumb">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <!--TODO: <Setter Property="BorderBrush" Value="{DynamicResource ColorControlDefaultSelectorBrush}" />-->
+    <Setter Property="BorderThickness" Value="3" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type ColorSlider}"
+                TargetType="ColorSlider">
+
+    <Style Selector="^:horizontal">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Horizontal">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Height}"
+                       Width="{TemplateBinding Height}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:vertical">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Vertical">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Width}"
+                       Width="{TemplateBinding Width}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Selector/Thumb Color -->
+    <Style Selector="^:pointerover /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.75" />
+    </Style>
+    <Style Selector="^:pointerover:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
+
+    <Style Selector="^:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="{DynamicResource ColorControlDarkSelectorBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="{DynamicResource ColorControlLightSelectorBrush}" />
+    </Style>
+
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
new file mode 100644
index 0000000000..05d8eda9f7
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
@@ -0,0 +1,133 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    x:CompileBindings="True">
+
+  <ControlTheme x:Key="{x:Type ColorSpectrum}"
+                TargetType="ColorSpectrum">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ColorSpectrum}">
+          <Panel x:Name="PART_LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Panel x:Name="PART_SizingPanel"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   ClipToBounds="True">
+              <Rectangle x:Name="PART_SpectrumRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle x:Name="PART_SpectrumOverlayRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Ellipse x:Name="PART_SpectrumEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+              <Ellipse x:Name="PART_SpectrumOverlayEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+              <Canvas x:Name="PART_InputTarget"
+                      Background="Transparent"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <!-- Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers -->
+                <Panel x:Name="PART_SelectionEllipsePanel"
+                       ToolTip.VerticalOffset="-10"
+                       ToolTip.Placement="Top">
+                  <Ellipse x:Name="FocusEllipse"
+                           Margin="-2"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <Ellipse x:Name="SelectionEllipse"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <ToolTip.Tip>
+                    <!-- Set in code-behind -->
+                  </ToolTip.Tip>
+                </Panel>
+              </Canvas>
+              <Rectangle x:Name="BorderRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Ellipse x:Name="BorderEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+            </Panel>
+          </Panel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <!-- Normal -->
+    <!-- Separating this allows easier customization in applications -->
+    <Style Selector="^ /template/ Ellipse#BorderEllipse,
+                     ^ /template/ Rectangle#BorderRectangle">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlForegroundListLowBrush}" />
+      <Setter Property="StrokeThickness" Value="1" />
+    </Style>
+
+    <!-- Focus -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:focus-visible /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <!-- Selector Color -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlLightSelectorBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlDarkSelectorBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlDarkSelectorBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlLightSelectorBrush}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
+
+    <!-- Selector Size -->
+    <Style Selector="^ /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="16" />
+      <Setter Property="Height" Value="16" />
+    </Style>
+    <Style Selector="^:large-selector /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="48" />
+      <Setter Property="Height" Value="48" />
+    </Style>
+
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
new file mode 100644
index 0000000000..b3c6d1a430
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -0,0 +1,751 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    xmlns:converters="using:Avalonia.Controls.Converters"
+                    xmlns:primitives="using:Avalonia.Controls.Primitives"
+                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+                    xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
+                    x:CompileBindings="True">
+
+  <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
+  <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
+  <converters:ColorToHexConverter x:Key="ColorToHexConverter" />
+  <converters:DoNothingForNullConverter x:Key="DoNothingForNullConverter" />
+  <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
+  <x:Double x:Key="ColorViewTabStripHeight">48</x:Double>
+  <x:Double x:Key="ColorViewComponentLabelWidth">30</x:Double>
+  <x:Double x:Key="ColorViewComponentTextInputWidth">80</x:Double>
+  <!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewSpectrumIconGeometry">
+    M3 2C3.27614 2 3.5 2.22386 3.5 2.5V5.5C3.5 5.77614 3.72386 6 4 6H16C16.2761 6 16.5 5.77614
+    16.5 5.5V2.5C16.5 2.22386 16.7239 2 17 2C17.2761 2 17.5 2.22386 17.5 2.5V5.5C17.5 6.32843
+    16.8284 7 16 7H15.809L12.2236 14.1708C12.0615 14.4951 11.7914 14.7431 11.4695
+    14.8802C11.4905 15.0808 11.5 15.2891 11.5 15.5C11.5 16.0818 11.4278 16.6623 11.2268
+    17.1165C11.019 17.5862 10.6266 18 10 18C9.37343 18 8.98105 17.5862 8.77323 17.1165C8.57222
+    16.6623 8.5 16.0818 8.5 15.5C8.5 15.2891 8.50952 15.0808 8.53051 14.8802C8.20863 14.7431
+    7.93851 14.4951 7.77639 14.1708L4.19098 7H4C3.17157 7 2.5 6.32843 2.5 5.5V2.5C2.5 2.22386
+    2.72386 2 3 2ZM9.11803 14H10.882C11.0714 14 11.2445 13.893 11.3292 13.7236L14.691
+    7H5.30902L8.67082 13.7236C8.75552 13.893 8.92865 14 9.11803 14ZM9.52346 15C9.50787 15.1549
+    9.5 15.3225 9.5 15.5C9.5 16.0228 9.56841 16.4423 9.6877 16.7119C9.8002 16.9661 9.90782 17
+    10 17C10.0922 17 10.1998 16.9661 10.3123 16.7119C10.4316 16.4423 10.5 16.0228 10.5
+    15.5C10.5 15.3225 10.4921 15.1549 10.4765 15H9.52346Z
+  </PathGeometry>
+  <!-- Fluent UI System Icons : ic_fluent_color_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewPaletteIconGeometry">
+    M9.75003 6.5C10.1642 6.5 10.5 6.16421 10.5 5.75C10.5 5.33579 10.1642 5 9.75003 5C9.33582
+    5 9.00003 5.33579 9.00003 5.75C9.00003 6.16421 9.33582 6.5 9.75003 6.5ZM12.75 7.5C13.1642
+    7.5 13.5 7.16421 13.5 6.75C13.5 6.33579 13.1642 6 12.75 6C12.3358 6 12 6.33579 12 6.75C12
+    7.16421 12.3358 7.5 12.75 7.5ZM15.25 9C15.25 9.41421 14.9142 9.75 14.5 9.75C14.0858 9.75
+    13.75 9.41421 13.75 9C13.75 8.58579 14.0858 8.25 14.5 8.25C14.9142 8.25 15.25 8.58579
+    15.25 9ZM14.5 12.75C14.9142 12.75 15.25 12.4142 15.25 12C15.25 11.5858 14.9142 11.25 14.5
+    11.25C14.0858 11.25 13.75 11.5858 13.75 12C13.75 12.4142 14.0858 12.75 14.5 12.75ZM13.25
+    14C13.25 14.4142 12.9142 14.75 12.5 14.75C12.0858 14.75 11.75 14.4142 11.75 14C11.75
+    13.5858 12.0858 13.25 12.5 13.25C12.9142 13.25 13.25 13.5858 13.25 14ZM13.6972
+    2.99169C10.9426 1.57663 8.1432 1.7124 5.77007 3.16636C4.55909 3.9083 3.25331 5.46925
+    2.51605 7.05899C2.14542 7.85816 1.89915 8.70492 1.90238 9.49318C1.90566 10.2941 2.16983
+    11.0587 2.84039 11.6053C3.45058 12.1026 3.98165 12.353 4.49574 12.3784C5.01375 12.404
+    5.41804 12.1942 5.73429 12.0076C5.80382 11.9666 5.86891 11.927 5.93113 11.8892C6.17332
+    11.7421 6.37205 11.6214 6.62049 11.5426C6.90191 11.4534 7.2582 11.4205 7.77579
+    11.5787C7.96661 11.637 8.08161 11.7235 8.16212 11.8229C8.24792 11.9289 8.31662 12.0774
+    8.36788 12.2886C8.41955 12.5016 8.44767 12.7527 8.46868 13.0491C8.47651 13.1594 8.48379
+    13.2855 8.49142 13.4176C8.50252 13.6098 8.51437 13.8149 8.52974 14.0037C8.58435 14.6744
+    8.69971 15.4401 9.10362 16.1357C9.51764 16.8488 10.2047 17.439 11.307 17.8158C12.9093
+    18.3636 14.3731 17.9191 15.5126 17.0169C16.6391 16.125 17.4691 14.7761 17.8842
+    13.4272C19.1991 9.15377 17.6728 5.03394 13.6972 2.99169ZM6.29249 4.01905C8.35686 2.75426
+    10.7844 2.61959 13.2403 3.88119C16.7473 5.68275 18.1135 9.28161 16.9284 13.1332C16.5624
+    14.3227 15.8338 15.4871 14.8919 16.2329C13.963 16.9684 12.8486 17.286 11.6305
+    16.8696C10.7269 16.5607 10.2467 16.1129 9.96842 15.6336C9.68001 15.1369 9.57799 14.5556
+    9.52644 13.9225C9.51101 13.733 9.50132 13.5621 9.49147 13.3884C9.48399 13.2564 9.47642
+    13.1229 9.46618 12.9783C9.44424 12.669 9.41175 12.3499 9.33968 12.0529C9.26719 11.7541
+    9.14902 11.4527 8.93935 11.1937C8.72439 10.9282 8.43532 10.7346 8.06801 10.6223C7.36648
+    10.408 6.80266 10.4359 6.31839 10.5893C5.94331 10.7082 5.62016 10.9061 5.37179
+    11.0582C5.31992 11.0899 5.2713 11.1197 5.22616 11.1463C4.94094 11.3146 4.75357 11.39
+    4.54514 11.3796C4.33279 11.3691 4.00262 11.2625 3.47218 10.8301C3.0866 10.5158 2.90473
+    10.0668 2.90237 9.48908C2.89995 8.89865 3.08843 8.20165 3.42324 7.47971C4.09686 6.0272
+    5.28471 4.63649 6.29249 4.01905Z
+  </PathGeometry>
+  <!-- Fluent UI System Icons : ic_fluent_options_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewComponentsIconGeometry">
+    M14.95 5C14.7184 3.85888 13.7095 3 12.5 3C11.2905 3 10.2816 3.85888 10.05 5H2.5C2.22386
+    5 2 5.22386 2 5.5C2 5.77614 2.22386 6 2.5 6H10.05C10.2816 7.14112 11.2905 8 12.5 8C13.7297
+    8 14.752 7.11217 14.961 5.94254C14.9575 5.96177 14.9539 5.98093 14.95 6H17.5C17.7761 6 18
+    5.77614 18 5.5C18 5.22386 17.7761 5 17.5 5H14.95ZM12.5 7C11.6716 7 11 6.32843 11 5.5C11
+    4.67157 11.6716 4 12.5 4C13.3284 4 14 4.67157 14 5.5C14 6.32843 13.3284 7 12.5 7ZM9.94999
+    14C9.71836 12.8589 8.70948 12 7.5 12C6.29052 12 5.28164 12.8589 5.05001 14H2.5C2.22386
+    14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H5.05001C5.28164 16.1411 6.29052 17 7.5
+    17C8.70948 17 9.71836 16.1411 9.94999 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239
+    17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5
+    13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z
+  </PathGeometry>
+  <!-- This radius should follow ControlCornerRadius -->
+  <CornerRadius x:Key="ColorViewTabBackgroundCornerRadius">3</CornerRadius>
+
+  <ControlTheme x:Key="ColorViewPaletteListBoxTheme"
+                TargetType="ListBox">
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                ClipToBounds="{TemplateBinding ClipToBounds}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Name="PART_ScrollViewer"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{TemplateBinding Padding}"
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="ColorViewPaletteListBoxItemTheme"
+                TargetType="ListBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ListBoxItem}">
+        <Grid UseLayoutRounding="False">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+          <Rectangle x:Name="BorderRectangle"
+                     IsHitTestVisible="False"
+                     StrokeThickness="3"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ Rectangle#BorderRectangle">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Rectangle#BorderRectangle"
+           x:DataType="Color">
+      <Setter Property="Stroke" Value="{Binding Converter={StaticResource ContrastBrushConverter}}" />
+      <Setter Property="Opacity" Value="0.5" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Rectangle#BorderRectangle"
+           x:DataType="Color">
+      <!-- The below and above lines really should be:
+             'Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={DynamicResource TextControlForeground}}"'
+           However, DynamicResource and Binding is not currently supported in Avalonia for converter parameters.
+           This means certain colors with transparency less than 50% may have a selection border that is difficult
+           to see over top of the default control/window background. Since palettes do not usually have transparency
+           it is considered better to disable this functionality rather than work around it with a multi-value
+           converter. This should be revisited if Avalonia supports the above code in the future. -->
+      <Setter Property="Stroke" Value="{Binding Converter={StaticResource ContrastBrushConverter}}" />
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
+
+  <!-- Based on the Fluent ToggleButton ControlTheme -->
+  <ControlTheme x:Key="ColorViewColorModelRadioButtonTheme"
+                TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:checked">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
+  <!-- Based on the Fluent TabItem ControlTheme -->
+  <ControlTheme x:Key="ColorViewTabItemTheme"
+                TargetType="TabItem">
+    <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
+    <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
+    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
+    <Setter Property="Padding" Value="6,0,6,0" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource ColorViewTabStripHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{TemplateBinding Padding}">
+          <Panel>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              FontFamily="{TemplateBinding FontFamily}"
+                              FontSize="{TemplateBinding FontSize}"
+                              FontWeight="{TemplateBinding FontWeight}" />
+            <Border Name="PART_SelectedPipe"
+                    Height="{DynamicResource TabItemPipeThickness}"
+                    Margin="0,0,0,2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    IsVisible="False"/>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+      <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
+
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
+
+    <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type ColorView}"
+                TargetType="ColorView">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Palette">
+      <controls:FluentColorPalette />
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ColorView}">
+        <Grid RowDefinitions="Auto,Auto">
+
+          <!-- Backgrounds -->
+          <!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
+          <Border x:Name="TabBackgroundBorder"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Height="48"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Top"
+                  Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                  BorderBrush="{DynamicResource ColorViewTabBorderBrush}"
+                  CornerRadius="{DynamicResource ColorViewTabBackgroundCornerRadius}" />
+          <Border x:Name="ContentBackgroundBorder"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Margin="0,48,0,0"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                  Background="{DynamicResource ColorViewContentBackgroundBrush}"
+                  BorderBrush="{DynamicResource ColorViewContentBorderBrush}"
+                  BorderThickness="0,1,0,0" />
+
+          <TabControl x:Name="PART_TabControl"
+                      Grid.Row="0"
+                      Height="338"
+                      Width="350"
+                      Padding="0"
+                      SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+            <TabControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <UniformGrid Columns="0"
+                             Rows="1" />
+              </ItemsPanelTemplate>
+            </TabControl.ItemsPanel>
+            <!-- Spectrum Tab -->
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorSpectrumVisible}">
+              <TabItem.Header>
+                <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                  <PathIcon Width="20"
+                            Height="20"
+                            Data="{DynamicResource ColorViewSpectrumIconGeometry}" />
+                </Border>
+              </TabItem.Header>
+              <Grid RowDefinitions="*"
+                    Margin="12">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"
+                                    MinWidth="32" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto"
+                                    MinWidth="32" />
+                </Grid.ColumnDefinitions>
+                <primitives:ColorSlider x:Name="ColorSpectrumThirdComponentSlider"
+                                        AutomationProperties.Name="Third Component"
+                                        Grid.Column="0"
+                                        IsAlphaMaxForced="True"
+                                        IsSaturationValueMaxForced="False"
+                                        Orientation="Vertical"
+                                        ColorModel="Hsva"
+                                        ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
+                                        HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Stretch"
+                                        Margin="0,0,12,0"
+                                        IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"/>
+                <primitives:ColorSpectrum x:Name="ColorSpectrum"
+                                          Grid.Column="1"
+                                          Components="{TemplateBinding ColorSpectrumComponents}"
+                                          HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                          MinHue="{TemplateBinding MinHue}"
+                                          MaxHue="{TemplateBinding MaxHue}"
+                                          MinSaturation="{TemplateBinding MinSaturation}"
+                                          MaxSaturation="{TemplateBinding MaxSaturation}"
+                                          MinValue="{TemplateBinding MinValue}"
+                                          MaxValue="{TemplateBinding MaxValue}"
+                                          Shape="{TemplateBinding ColorSpectrumShape}"
+                                          HorizontalAlignment="Stretch"
+                                          VerticalAlignment="Stretch" />
+                <primitives:ColorSlider x:Name="ColorSpectrumAlphaSlider"
+                                        AutomationProperties.Name="Alpha Component"
+                                        Grid.Column="2"
+                                        Orientation="Vertical"
+                                        ColorModel="Hsva"
+                                        ColorComponent="Alpha"
+                                        HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Stretch"
+                                        Margin="12,0,0,0"
+                                        IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <primitives:ColorSlider.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                    </MultiBinding>
+                  </primitives:ColorSlider.IsVisible>
+                </primitives:ColorSlider>
+              </Grid>
+            </TabItem>
+            <!-- Palette Tab -->
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorPaletteVisible}">
+              <TabItem.Header>
+                <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                  <PathIcon Width="20"
+                            Height="20"
+                            Data="{DynamicResource ColorViewPaletteIconGeometry}" />
+                </Border>
+              </TabItem.Header>
+              <ListBox Theme="{StaticResource ColorViewPaletteListBoxTheme}"
+                       ItemContainerTheme="{StaticResource ColorViewPaletteListBoxItemTheme}"
+                       Items="{TemplateBinding PaletteColors}"
+                       SelectedItem="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoNothingForNullConverter}, Mode=TwoWay}"
+                       UseLayoutRounding="False"
+                       Margin="12">
+                <ListBox.ItemTemplate>
+                  <DataTemplate DataType="{x:Type Color}">
+                    <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                            ToolTip.Tip="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch">
+                      <Border.Background>
+                        <SolidColorBrush Color="{Binding}" />
+                      </Border.Background>
+                    </Border>
+                  </DataTemplate>
+                </ListBox.ItemTemplate>
+                <ListBox.ItemsPanel>
+                  <ItemsPanelTemplate>
+                    <UniformGrid Columns="{Binding $parent[ColorView].PaletteColumnCount}" />
+                  </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+              </ListBox>
+            </TabItem>
+            <!-- Components Tab -->
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorComponentsVisible}">
+              <TabItem.Header>
+                <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                  <PathIcon Width="20"
+                            Height="20"
+                            Data="{DynamicResource ColorViewComponentsIconGeometry}" />
+                </Border>
+              </TabItem.Header>
+              <Grid ColumnDefinitions="Auto,Auto,*"
+                    RowDefinitions="Auto,24,1*,1*,1*,1*,12"
+                    Margin="12">
+                <!-- Top color model & Hex input -->
+                <Grid Grid.Column="0"
+                      Grid.ColumnSpan="3"
+                      Grid.Row="0"
+                      ColumnDefinitions="1*,12,1*">
+                  <!-- Content RGB/HSV names are hard-coded and considered universal -->
+                  <!-- RadioButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                  <Grid ColumnDefinitions="1*,1*"
+                        IsVisible="{TemplateBinding IsColorModelVisible}">
+                    <RadioButton x:Name="RgbRadioButton"
+                                 Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                 Grid.Column="0"
+                                 Content="RGB"
+                                 CornerRadius="4,0,0,4"
+                                 BorderThickness="1,1,0,1"
+                                 IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=TwoWay}" />
+                    <RadioButton x:Name="HsvRadioButton"
+                                 Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                 Grid.Column="1"
+                                 Content="HSV"
+                                 CornerRadius="0,4,4,0"
+                                 BorderThickness="0,1,1,1"
+                                 IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=TwoWay}" />
+                  </Grid>
+                  <Grid x:Name="HexInputGrid"
+                        Grid.Column="2"
+                        IsVisible="{TemplateBinding IsHexInputVisible}">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="30" />
+                      <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Border Grid.Column="0"
+                            Height="32"
+                            Background="{DynamicResource TextControlBackgroundDisabled}"
+                            BorderBrush="{DynamicResource TextControlBorderBrush}"
+                            BorderThickness="1,1,0,1"
+                            CornerRadius="4,0,0,4">
+                      <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                                 FontWeight="SemiBold"
+                                 Text="#"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center" />
+                    </Border>
+                    <!-- Color updated in code-behind -->
+                    <TextBox x:Name="PART_HexTextBox"
+                             Grid.Column="1"
+                             AutomationProperties.Name="Hexadecimal Color"
+                             Height="32"
+                             MaxLength="8"
+                             HorizontalAlignment="Stretch"
+                             CornerRadius="0,4,4,0" />
+                  </Grid>
+                </Grid>
+                <!-- Color component editing controls -->
+                <!-- Component 1 RGB:Red HSV:Hue -->
+                <Border Grid.Column="0"
+                        Grid.Row="2"
+                        Height="{Binding ElementName=Component1NumericUpDown, Path=Bounds.Height}"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Background="{DynamicResource TextControlBackgroundDisabled}"
+                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="4,0,0,4"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                  <Panel HorizontalAlignment="Center"
+                         VerticalAlignment="Center">
+                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                               FontWeight="SemiBold"
+                               Text="R"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}"/>
+                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                               FontWeight="SemiBold"
+                               Text="H"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                  </Panel>
+                </Border>
+                <NumericUpDown x:Name="Component1NumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="2"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,4,4,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=Component1Slider}"
+                               Maximum="{Binding Maximum, ElementName=Component1Slider}"
+                               Value="{Binding Value, ElementName=Component1Slider}"
+                               IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                <primitives:ColorSlider x:Name="Component1Slider"
+                                        Grid.Column="2"
+                                        Grid.Row="2"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Component1"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                <!-- Component 2 RGB:Green HSV:Saturation -->
+                <Border Grid.Column="0"
+                        Grid.Row="3"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Height="{Binding ElementName=Component2NumericUpDown, Path=Bounds.Height}"
+                        Background="{DynamicResource TextControlBackgroundDisabled}"
+                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="4,0,0,4"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                  <Panel HorizontalAlignment="Center"
+                         VerticalAlignment="Center">
+                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                               FontWeight="SemiBold"
+                               Text="G"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                               FontWeight="SemiBold"
+                               Text="S"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                  </Panel>
+                </Border>
+                <NumericUpDown x:Name="Component2NumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="3"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,4,4,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=Component2Slider}"
+                               Maximum="{Binding Maximum, ElementName=Component2Slider}"
+                               Value="{Binding Value, ElementName=Component2Slider}"
+                               IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                <primitives:ColorSlider x:Name="Component2Slider"
+                                        Grid.Column="2"
+                                        Grid.Row="3"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Component2"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                <!-- Component 3 RGB:Blue HSV:Value -->
+                <Border Grid.Column="0"
+                        Grid.Row="4"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Height="{Binding ElementName=Component3NumericUpDown, Path=Bounds.Height}"
+                        Background="{DynamicResource TextControlBackgroundDisabled}"
+                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="4,0,0,4"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                  <Panel HorizontalAlignment="Center"
+                         VerticalAlignment="Center">
+                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                               FontWeight="SemiBold"
+                               Text="B"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                               FontWeight="SemiBold"
+                               Text="V"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                  </Panel>
+                </Border>
+                <NumericUpDown x:Name="Component3NumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="4"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,4,4,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=Component3Slider}"
+                               Maximum="{Binding Maximum, ElementName=Component3Slider}"
+                               Value="{Binding Value, ElementName=Component3Slider}"
+                               IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                <primitives:ColorSlider x:Name="Component3Slider"
+                                        Grid.Column="2"
+                                        Grid.Row="4"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Component3"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                <!-- Alpha Component -->
+                <Border Grid.Column="0"
+                        Grid.Row="5"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Height="{Binding ElementName=AlphaComponentNumericUpDown, Path=Bounds.Height}"
+                        Background="{DynamicResource TextControlBackgroundDisabled}"
+                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="4,0,0,4"
+                        VerticalAlignment="Center"
+                        IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <TextBlock x:Name="AlphaComponentTextBlock"
+                             Foreground="{DynamicResource TextControlForegroundDisabled}"
+                             FontWeight="SemiBold"
+                             Text="A"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center" />
+                  <Border.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsComponentTextInputVisible" />
+                    </MultiBinding>
+                  </Border.IsVisible>
+                </Border>
+                <NumericUpDown x:Name="AlphaComponentNumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="5"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,4,4,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=AlphaComponentSlider}"
+                               Maximum="{Binding Maximum, ElementName=AlphaComponentSlider}"
+                               Value="{Binding Value, ElementName=AlphaComponentSlider}"
+                               IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <NumericUpDown.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsComponentTextInputVisible" />
+                    </MultiBinding>
+                  </NumericUpDown.IsVisible>
+                </NumericUpDown>
+                <primitives:ColorSlider x:Name="AlphaComponentSlider"
+                                        Grid.Column="2"
+                                        Grid.Row="5"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Alpha"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <primitives:ColorSlider.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsComponentSliderVisible" />
+                    </MultiBinding>
+                  </primitives:ColorSlider.IsVisible>
+                </primitives:ColorSlider>
+              </Grid>
+            </TabItem>
+          </TabControl>
+          <!-- Previewer -->
+          <!-- Note that top/bottom margins have -5 to remove for drop shadow padding -->
+          <primitives:ColorPreviewer Grid.Row="1"
+                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                     IsAccentColorsVisible="{TemplateBinding IsAccentColorsVisible}"
+                                     Margin="12,-5,12,7"
+                                     IsVisible="{TemplateBinding IsColorPreviewVisible}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
new file mode 100644
index 0000000000..b0f6d89b32
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
@@ -0,0 +1,65 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <ResourceDictionary>
+
+      <!-- Shared Resources -->
+      <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
+                   TileMode="Tile"
+                   Stretch="Uniform"
+                   DestinationRect="0,0,8,8">
+        <VisualBrush.Visual>
+          <Image Width="8" Height="8">
+            <Image.Source>
+              <DrawingImage>
+                <DrawingImage.Drawing>
+                    <DrawingGroup>
+                      <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
+                                       Brush="Transparent" />
+                      <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
+                                       Brush="#19808080" />
+                    </DrawingGroup>
+                </DrawingImage.Drawing>
+              </DrawingImage>
+            </Image.Source>
+          </Image>
+        </VisualBrush.Visual>
+      </VisualBrush>
+
+      <!-- TODO: Enable the commented-out resources below once Avalonia supports extending light/dark resource dictionaries -->
+      <SolidColorBrush x:Key="ColorControlLightSelectorBrush" Color="#FFFFFFFF" />
+      <SolidColorBrush x:Key="ColorControlDarkSelectorBrush" Color="#E4000000" />
+      <!--<DynamicResource x:Key="ColorControlDefaultSelectorBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />-->
+      <SolidColorBrush x:Key="ColorViewContentBackgroundBrush" Color="Transparent" />
+      <SolidColorBrush x:Key="ColorViewContentBorderBrush" Color="Transparent" />
+      <!--<DynamicResource x:Key="ColorViewTabBackgroundBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />-->
+      <SolidColorBrush x:Key="ColorViewTabBorderBrush" Color="Transparent" />
+
+      <!-- Shared Converters -->
+      <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
+      <converters:ToBrushConverter x:Key="ToBrushConverter" />
+      <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
+      <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
+      <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
+      <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
+
+      <ResourceDictionary.MergedDictionaries>
+
+        <!-- Primitives -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml" />
+
+        <!-- Controls -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml" />
+
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
new file mode 100644
index 0000000000..fdee64dfd2
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
@@ -0,0 +1,508 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    xmlns:converters="using:Avalonia.Controls.Converters"
+                    xmlns:primitives="using:Avalonia.Controls.Primitives"
+                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+                    x:CompileBindings="True">
+
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <ControlTheme x:Key="{x:Type ColorPicker}"
+                TargetType="ColorPicker">
+    <Setter Property="CornerRadius" Value="0" />
+    <Setter Property="Height" Value="32" />
+    <Setter Property="Width" Value="64" />
+    <Setter Property="MinWidth" Value="64" />
+    <Setter Property="Palette">
+      <controls:FluentColorPalette />
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ColorPicker}">
+        <DropDownButton CornerRadius="{TemplateBinding CornerRadius}"
+                        Height="{TemplateBinding Height}"
+                        Width="{TemplateBinding Width}"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        Padding="0,0,10,0"
+                        UseLayoutRounding="False">
+          <DropDownButton.Styles>
+            <Style Selector="FlyoutPresenter.nopadding">
+              <Setter Property="Padding" Value="0" />
+            </Style>
+          </DropDownButton.Styles>
+          <DropDownButton.Content>
+            <!-- Preview color -->
+            <Panel>
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Margin="1,1,0,1" />
+              <Border Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Margin="1,1,0,1" />
+            </Panel>
+          </DropDownButton.Content>
+          <DropDownButton.Flyout>
+            <Flyout>
+
+              <!-- The following is copy-pasted from the ColorView's control template.
+                   It MUST always be kept in sync with the ColorView (which is master).
+                   Note the only changes are resources specific to the ColorPicker. -->
+              <Grid RowDefinitions="Auto,Auto">
+
+                <Grid.Resources>
+                  <!-- This radius must follow OverlayCornerRadius -->
+                  <CornerRadius x:Key="ColorViewTabBackgroundCornerRadius">0,0,0,0</CornerRadius>
+                </Grid.Resources>
+
+                <!-- Backgrounds -->
+                <!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
+                <Border x:Name="TabBackgroundBorder"
+                        Grid.Row="0"
+                        Grid.RowSpan="2"
+                        Height="48"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Top"
+                        Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                        BorderBrush="{DynamicResource ColorViewTabBorderBrush}"
+                        CornerRadius="{DynamicResource ColorViewTabBackgroundCornerRadius}" />
+                <Border x:Name="ContentBackgroundBorder"
+                        Grid.Row="0"
+                        Grid.RowSpan="2"
+                        Margin="0,48,0,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                        Background="{DynamicResource ColorViewContentBackgroundBrush}"
+                        BorderBrush="{DynamicResource ColorViewContentBorderBrush}"
+                        BorderThickness="0,1,0,0" />
+
+                <TabControl x:Name="PART_TabControl"
+                            Grid.Row="0"
+                            Height="338"
+                            Width="350"
+                            Padding="0"
+                            SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+                  <TabControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                      <UniformGrid Columns="0"
+                                   Rows="1" />
+                    </ItemsPanelTemplate>
+                  </TabControl.ItemsPanel>
+                  <!-- Spectrum Tab -->
+                  <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                           IsVisible="{TemplateBinding IsColorSpectrumVisible}">
+                    <TabItem.Header>
+                      <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                        <PathIcon Width="20"
+                                  Height="20"
+                                  Data="{DynamicResource ColorViewSpectrumIconGeometry}" />
+                      </Border>
+                    </TabItem.Header>
+                    <Grid RowDefinitions="*"
+                          Margin="12">
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"
+                                          MinWidth="32" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"
+                                          MinWidth="32" />
+                      </Grid.ColumnDefinitions>
+                      <primitives:ColorSlider x:Name="ColorSpectrumThirdComponentSlider"
+                                              AutomationProperties.Name="Third Component"
+                                              Grid.Column="0"
+                                              IsAlphaMaxForced="True"
+                                              IsSaturationValueMaxForced="False"
+                                              Orientation="Vertical"
+                                              ColorModel="Hsva"
+                                              ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
+                                              HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Stretch"
+                                              Margin="0,0,12,0"
+                                              IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}" />
+                      <primitives:ColorSpectrum x:Name="ColorSpectrum"
+                                                Grid.Column="1"
+                                                Components="{TemplateBinding ColorSpectrumComponents}"
+                                                HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                                MinHue="{TemplateBinding MinHue}"
+                                                MaxHue="{TemplateBinding MaxHue}"
+                                                MinSaturation="{TemplateBinding MinSaturation}"
+                                                MaxSaturation="{TemplateBinding MaxSaturation}"
+                                                MinValue="{TemplateBinding MinValue}"
+                                                MaxValue="{TemplateBinding MaxValue}"
+                                                Shape="{TemplateBinding ColorSpectrumShape}"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch" />
+                      <primitives:ColorSlider x:Name="ColorSpectrumAlphaSlider"
+                                              AutomationProperties.Name="Alpha Component"
+                                              Grid.Column="2"
+                                              Orientation="Vertical"
+                                              ColorModel="Hsva"
+                                              ColorComponent="Alpha"
+                                              HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Stretch"
+                                              Margin="12,0,0,0"
+                                              IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <primitives:ColorSlider.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                          </MultiBinding>
+                        </primitives:ColorSlider.IsVisible>
+                      </primitives:ColorSlider>
+                    </Grid>
+                  </TabItem>
+                  <!-- Palette Tab -->
+                  <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                           IsVisible="{TemplateBinding IsColorPaletteVisible}">
+                    <TabItem.Header>
+                      <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                        <PathIcon Width="20"
+                                  Height="20"
+                                  Data="{DynamicResource ColorViewPaletteIconGeometry}" />
+                      </Border>
+                    </TabItem.Header>
+                    <ListBox Theme="{StaticResource ColorViewPaletteListBoxTheme}"
+                             ItemContainerTheme="{StaticResource ColorViewPaletteListBoxItemTheme}"
+                             Items="{TemplateBinding PaletteColors}"
+                             SelectedItem="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoNothingForNullConverter}, Mode=TwoWay}"
+                             UseLayoutRounding="False"
+                             Margin="12">
+                      <ListBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type Color}">
+                          <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                                  ToolTip.Tip="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch">
+                            <Border.Background>
+                              <SolidColorBrush Color="{Binding}" />
+                            </Border.Background>
+                          </Border>
+                        </DataTemplate>
+                      </ListBox.ItemTemplate>
+                      <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                          <UniformGrid Columns="{Binding $parent[ColorView].PaletteColumnCount}" />
+                        </ItemsPanelTemplate>
+                      </ListBox.ItemsPanel>
+                    </ListBox>
+                  </TabItem>
+                  <!-- Components Tab -->
+                  <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                           IsVisible="{TemplateBinding IsColorComponentsVisible}">
+                    <TabItem.Header>
+                      <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                        <PathIcon Width="20"
+                                  Height="20"
+                                  Data="{DynamicResource ColorViewComponentsIconGeometry}" />
+                      </Border>
+                    </TabItem.Header>
+                    <Grid ColumnDefinitions="Auto,Auto,*"
+                          RowDefinitions="Auto,24,1*,1*,1*,1*,12"
+                          Margin="12">
+                      <!-- Top color model & Hex input -->
+                      <Grid Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Grid.Row="0"
+                            ColumnDefinitions="1*,12,1*">
+                        <!-- Content RGB/HSV names are hard-coded and considered universal -->
+                        <!-- RadioButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                        <Grid ColumnDefinitions="1*,1*"
+                              IsVisible="{TemplateBinding IsColorModelVisible}">
+                          <RadioButton x:Name="RgbRadioButton"
+                                       Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                       Grid.Column="0"
+                                       Content="RGB"
+                                       CornerRadius="0,0,0,0"
+                                       BorderThickness="1,1,0,1"
+                                       IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=TwoWay}" />
+                          <RadioButton x:Name="HsvRadioButton"
+                                       Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                       Grid.Column="1"
+                                       Content="HSV"
+                                       CornerRadius="0,0,0,0"
+                                       BorderThickness="0,1,1,1"
+                                       IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=TwoWay}" />
+                        </Grid>
+                        <Grid x:Name="HexInputGrid"
+                              Grid.Column="2"
+                              IsVisible="{TemplateBinding IsHexInputVisible}">
+                          <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="30" />
+                            <ColumnDefinition Width="*" />
+                          </Grid.ColumnDefinitions>
+                          <Border Grid.Column="0"
+                                  Height="32"
+                                  Background="{DynamicResource ThemeControlMidBrush}"
+                                  BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                                  BorderThickness="1,1,0,1"
+                                  CornerRadius="0,0,0,0">
+                            <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                       FontWeight="SemiBold"
+                                       Text="#"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center" />
+                          </Border>
+                          <!-- Color updated in code-behind -->
+                          <TextBox x:Name="PART_HexTextBox"
+                                   Grid.Column="1"
+                                   AutomationProperties.Name="Hexadecimal Color"
+                                   Height="32"
+                                   MaxLength="8"
+                                   HorizontalAlignment="Stretch"
+                                   CornerRadius="0,0,0,0" />
+                        </Grid>
+                      </Grid>
+                      <!-- Color component editing controls -->
+                      <!-- Component 1 RGB:Red HSV:Hue -->
+                      <Border Grid.Column="0"
+                              Grid.Row="2"
+                              Height="{Binding ElementName=Component1NumericUpDown, Path=Bounds.Height}"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Background="{DynamicResource ThemeControlMidBrush}"
+                              BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="0,0,0,0"
+                              VerticalAlignment="Center"
+                              IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                        <Panel HorizontalAlignment="Center"
+                               VerticalAlignment="Center">
+                          <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                     FontWeight="SemiBold"
+                                     Text="R"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                          <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                     FontWeight="SemiBold"
+                                     Text="H"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                        </Panel>
+                      </Border>
+                      <NumericUpDown x:Name="Component1NumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="2"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,0,0,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=Component1Slider}"
+                                     Maximum="{Binding Maximum, ElementName=Component1Slider}"
+                                     Value="{Binding Value, ElementName=Component1Slider}"
+                                     IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                      <primitives:ColorSlider x:Name="Component1Slider"
+                                              Grid.Column="2"
+                                              Grid.Row="2"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Component1"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                      <!-- Component 2 RGB:Green HSV:Saturation -->
+                      <Border Grid.Column="0"
+                              Grid.Row="3"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Height="{Binding ElementName=Component2NumericUpDown, Path=Bounds.Height}"
+                              Background="{DynamicResource ThemeControlMidBrush}"
+                              BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="0,0,0,0"
+                              VerticalAlignment="Center"
+                              IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                        <Panel HorizontalAlignment="Center"
+                               VerticalAlignment="Center">
+                          <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                     FontWeight="SemiBold"
+                                     Text="G"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                          <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                     FontWeight="SemiBold"
+                                     Text="S"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                        </Panel>
+                      </Border>
+                      <NumericUpDown x:Name="Component2NumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="3"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,0,0,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=Component2Slider}"
+                                     Maximum="{Binding Maximum, ElementName=Component2Slider}"
+                                     Value="{Binding Value, ElementName=Component2Slider}"
+                                     IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                      <primitives:ColorSlider x:Name="Component2Slider"
+                                              Grid.Column="2"
+                                              Grid.Row="3"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Component2"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                      <!-- Component 3 RGB:Blue HSV:Value -->
+                      <Border Grid.Column="0"
+                              Grid.Row="4"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Height="{Binding ElementName=Component3NumericUpDown, Path=Bounds.Height}"
+                              Background="{DynamicResource ThemeControlMidBrush}"
+                              BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="0,0,0,0"
+                              VerticalAlignment="Center"
+                              IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                        <Panel HorizontalAlignment="Center"
+                               VerticalAlignment="Center">
+                          <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                     FontWeight="SemiBold"
+                                     Text="B"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                          <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                     FontWeight="SemiBold"
+                                     Text="V"
+                                     IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                        </Panel>
+                      </Border>
+                      <NumericUpDown x:Name="Component3NumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="4"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,0,0,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=Component3Slider}"
+                                     Maximum="{Binding Maximum, ElementName=Component3Slider}"
+                                     Value="{Binding Value, ElementName=Component3Slider}"
+                                     IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                      <primitives:ColorSlider x:Name="Component3Slider"
+                                              Grid.Column="2"
+                                              Grid.Row="4"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Component3"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                      <!-- Alpha Component -->
+                      <Border Grid.Column="0"
+                              Grid.Row="5"
+                              Width="{DynamicResource ColorViewComponentLabelWidth}"
+                              Height="{Binding ElementName=AlphaComponentNumericUpDown, Path=Bounds.Height}"
+                              Background="{DynamicResource ThemeControlMidBrush}"
+                              BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                              BorderThickness="1,1,0,1"
+                              CornerRadius="0,0,0,0"
+                              VerticalAlignment="Center"
+                              IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <TextBlock x:Name="AlphaComponentTextBlock"
+                                   Foreground="{DynamicResource ThemeForegroundBrush}"
+                                   FontWeight="SemiBold"
+                                   Text="A"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center" />
+                        <Border.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsComponentTextInputVisible" />
+                          </MultiBinding>
+                        </Border.IsVisible>
+                      </Border>
+                      <NumericUpDown x:Name="AlphaComponentNumericUpDown"
+                                     Grid.Column="1"
+                                     Grid.Row="5"
+                                     AllowSpin="True"
+                                     ShowButtonSpinner="False"
+                                     Height="32"
+                                     Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                                     CornerRadius="0,0,0,0"
+                                     Margin="0,0,12,0"
+                                     VerticalAlignment="Center"
+                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                                     Minimum="{Binding Minimum, ElementName=AlphaComponentSlider}"
+                                     Maximum="{Binding Maximum, ElementName=AlphaComponentSlider}"
+                                     Value="{Binding Value, ElementName=AlphaComponentSlider}"
+                                     IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <NumericUpDown.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsComponentTextInputVisible" />
+                          </MultiBinding>
+                        </NumericUpDown.IsVisible>
+                      </NumericUpDown>
+                      <primitives:ColorSlider x:Name="AlphaComponentSlider"
+                                              Grid.Column="2"
+                                              Grid.Row="5"
+                                              Orientation="Horizontal"
+                                              IsRoundingEnabled="True"
+                                              IsSnapToTickEnabled="True"
+                                              TickFrequency="1"
+                                              ColorComponent="Alpha"
+                                              ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                              HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Center"
+                                              IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                        <primitives:ColorSlider.IsVisible>
+                          <MultiBinding Converter="{x:Static BoolConverters.And}">
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsAlphaVisible" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                                     Path="IsComponentSliderVisible" />
+                          </MultiBinding>
+                        </primitives:ColorSlider.IsVisible>
+                      </primitives:ColorSlider>
+                    </Grid>
+                  </TabItem>
+                </TabControl>
+                <!-- Previewer -->
+                <!-- Note that top/bottom margins have -5 to remove for drop shadow padding -->
+                <primitives:ColorPreviewer Grid.Row="1"
+                                           HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                           IsAccentColorsVisible="{TemplateBinding IsAccentColorsVisible}"
+                                           Margin="12,-5,12,7"
+                                           IsVisible="{TemplateBinding IsColorPreviewVisible}" />
+              </Grid>
+            </Flyout>
+          </DropDownButton.Flyout>
+        </DropDownButton>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
new file mode 100644
index 0000000000..e067fe4ab5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
@@ -0,0 +1,101 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+                    x:CompileBindings="True">
+
+  <pc:AccentColorConverter x:Key="AccentColorConverter" />
+  <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
+  <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
+
+  <ControlTheme x:Key="{x:Type ColorPreviewer}"
+                TargetType="ColorPreviewer">
+    <Setter Property="Height" Value="70" />
+    <Setter Property="CornerRadius" Value="0" />
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ColorPreviewer}">
+        <Panel>
+          <!-- Preview color with accents to the left and right -->
+          <Grid ColumnDefinitions="Auto,*,Auto"
+                IsVisible="{TemplateBinding IsAccentColorsVisible}">
+            <!-- Left accent colors -->
+            <Grid Grid.Column="0"
+                  Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                  Width="{StaticResource ColorPreviewerAccentSectionWidth}"
+                  ColumnDefinitions="*,*"
+                  Margin="0,0,-10,0"
+                  VerticalAlignment="Center">
+              <Border Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
+              <Border x:Name="PART_AccentDecrement2Border"
+                      Grid.Column="0"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                      Tag="-2"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='-2'}" />
+              <Border x:Name="PART_AccentDecrement1Border"
+                      Grid.Column="1"
+                      Tag="-1"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='-1'}" />
+            </Grid>
+            <!-- Right accent colors -->
+            <Grid Grid.Column="2"
+                  Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                  Width="{StaticResource ColorPreviewerAccentSectionWidth}"
+                  ColumnDefinitions="*,*"
+                  Margin="-10,0,0,0"
+                  VerticalAlignment="Center">
+              <Border Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
+              <Border x:Name="PART_AccentIncrement1Border"
+                      Grid.Column="0"
+                      Tag="1"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='1'}" />
+              <Border x:Name="PART_AccentIncrement2Border"
+                      Grid.Column="1"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                      Tag="2"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColorConverter}, ConverterParameter='2'}" />
+            </Grid>
+            <!-- Preview color: Must be last for drop shadow Z-index -->
+            <Border Grid.Column="1"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    BoxShadow="0 0 10 2 #BF000000"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Margin="10">
+              <Panel>
+                <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                <Border CornerRadius="{TemplateBinding CornerRadius}"
+                        Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch" />
+              </Panel>
+            </Border>
+          </Grid>
+          <!-- Only preview color -->
+          <Border CornerRadius="{TemplateBinding CornerRadius}"
+                  IsVisible="{TemplateBinding IsAccentColorsVisible, Converter={x:Static BoolConverters.Not}}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Margin="0,10,0,10">
+            <Panel>
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                      CornerRadius="{TemplateBinding CornerRadius}" />
+              <Border CornerRadius="{TemplateBinding CornerRadius}"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+            </Panel>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
new file mode 100644
index 0000000000..e1142f71df
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
@@ -0,0 +1,191 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+
+  <ControlTheme x:Key="ColorSliderThumbTheme"
+                TargetType="Thumb">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeForegroundBrush}" />
+    <!--TODO: <Setter Property="BorderBrush" Value="{DynamicResource ColorControlDefaultSelectorBrush}" />-->
+    <Setter Property="BorderThickness" Value="3" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type ColorSlider}"
+                TargetType="ColorSlider">
+
+    <Style Selector="^:horizontal">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Horizontal">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Height}"
+                       Width="{TemplateBinding Height}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:vertical">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Vertical">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Width}"
+                       Width="{TemplateBinding Width}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Selector/Thumb Color -->
+    <Style Selector="^:pointerover /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.75" />
+    </Style>
+    <Style Selector="^:pointerover:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
+
+    <Style Selector="^:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="{DynamicResource ColorControlDarkSelectorBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="{DynamicResource ColorControlLightSelectorBrush}" />
+    </Style>
+
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
new file mode 100644
index 0000000000..77eff3a69f
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
@@ -0,0 +1,133 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    x:CompileBindings="True">
+
+  <ControlTheme x:Key="{x:Type ColorSpectrum}"
+                TargetType="ColorSpectrum">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type ColorSpectrum}">
+          <Panel x:Name="PART_LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Panel x:Name="PART_SizingPanel"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   ClipToBounds="True">
+              <Rectangle x:Name="PART_SpectrumRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle x:Name="PART_SpectrumOverlayRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Ellipse x:Name="PART_SpectrumEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+              <Ellipse x:Name="PART_SpectrumOverlayEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+              <Canvas x:Name="PART_InputTarget"
+                      Background="Transparent"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <!-- Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers -->
+                <Panel x:Name="PART_SelectionEllipsePanel"
+                       ToolTip.VerticalOffset="-10"
+                       ToolTip.Placement="Top">
+                  <Ellipse x:Name="FocusEllipse"
+                           Margin="-2"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <Ellipse x:Name="SelectionEllipse"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <ToolTip.Tip>
+                    <!-- Set in code-behind -->
+                  </ToolTip.Tip>
+                </Panel>
+              </Canvas>
+              <Rectangle x:Name="BorderRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Ellipse x:Name="BorderEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+            </Panel>
+          </Panel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <!-- Normal -->
+    <!-- Separating this allows easier customization in applications -->
+    <Style Selector="^ /template/ Ellipse#BorderEllipse,
+                     ^ /template/ Rectangle#BorderRectangle">
+      <Setter Property="Stroke" Value="{DynamicResource ThemeBorderLowBrush}" />
+      <Setter Property="StrokeThickness" Value="1" />
+    </Style>
+
+    <!-- Focus -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:focus-visible /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <!-- Selector Color -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlLightSelectorBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlDarkSelectorBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlDarkSelectorBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource ColorControlLightSelectorBrush}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
+
+    <!-- Selector Size -->
+    <Style Selector="^ /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="16" />
+      <Setter Property="Height" Value="16" />
+    </Style>
+    <Style Selector="^:large-selector /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="48" />
+      <Setter Property="Height" Value="48" />
+    </Style>
+
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
new file mode 100644
index 0000000000..860dbe11d0
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
@@ -0,0 +1,713 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    xmlns:converters="using:Avalonia.Controls.Converters"
+                    xmlns:primitives="using:Avalonia.Controls.Primitives"
+                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+                    xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
+                    x:CompileBindings="True">
+
+  <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
+  <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
+  <converters:ColorToHexConverter x:Key="ColorToHexConverter" />
+  <converters:DoNothingForNullConverter x:Key="DoNothingForNullConverter" />
+  <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
+  <x:Double x:Key="ColorViewTabStripHeight">48</x:Double>
+  <x:Double x:Key="ColorViewComponentLabelWidth">30</x:Double>
+  <x:Double x:Key="ColorViewComponentTextInputWidth">80</x:Double>
+  <!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewSpectrumIconGeometry">
+    M3 2C3.27614 2 3.5 2.22386 3.5 2.5V5.5C3.5 5.77614 3.72386 6 4 6H16C16.2761 6 16.5 5.77614
+    16.5 5.5V2.5C16.5 2.22386 16.7239 2 17 2C17.2761 2 17.5 2.22386 17.5 2.5V5.5C17.5 6.32843
+    16.8284 7 16 7H15.809L12.2236 14.1708C12.0615 14.4951 11.7914 14.7431 11.4695
+    14.8802C11.4905 15.0808 11.5 15.2891 11.5 15.5C11.5 16.0818 11.4278 16.6623 11.2268
+    17.1165C11.019 17.5862 10.6266 18 10 18C9.37343 18 8.98105 17.5862 8.77323 17.1165C8.57222
+    16.6623 8.5 16.0818 8.5 15.5C8.5 15.2891 8.50952 15.0808 8.53051 14.8802C8.20863 14.7431
+    7.93851 14.4951 7.77639 14.1708L4.19098 7H4C3.17157 7 2.5 6.32843 2.5 5.5V2.5C2.5 2.22386
+    2.72386 2 3 2ZM9.11803 14H10.882C11.0714 14 11.2445 13.893 11.3292 13.7236L14.691
+    7H5.30902L8.67082 13.7236C8.75552 13.893 8.92865 14 9.11803 14ZM9.52346 15C9.50787 15.1549
+    9.5 15.3225 9.5 15.5C9.5 16.0228 9.56841 16.4423 9.6877 16.7119C9.8002 16.9661 9.90782 17
+    10 17C10.0922 17 10.1998 16.9661 10.3123 16.7119C10.4316 16.4423 10.5 16.0228 10.5
+    15.5C10.5 15.3225 10.4921 15.1549 10.4765 15H9.52346Z
+  </PathGeometry>
+  <!-- Fluent UI System Icons : ic_fluent_color_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewPaletteIconGeometry">
+    M9.75003 6.5C10.1642 6.5 10.5 6.16421 10.5 5.75C10.5 5.33579 10.1642 5 9.75003 5C9.33582
+    5 9.00003 5.33579 9.00003 5.75C9.00003 6.16421 9.33582 6.5 9.75003 6.5ZM12.75 7.5C13.1642
+    7.5 13.5 7.16421 13.5 6.75C13.5 6.33579 13.1642 6 12.75 6C12.3358 6 12 6.33579 12 6.75C12
+    7.16421 12.3358 7.5 12.75 7.5ZM15.25 9C15.25 9.41421 14.9142 9.75 14.5 9.75C14.0858 9.75
+    13.75 9.41421 13.75 9C13.75 8.58579 14.0858 8.25 14.5 8.25C14.9142 8.25 15.25 8.58579
+    15.25 9ZM14.5 12.75C14.9142 12.75 15.25 12.4142 15.25 12C15.25 11.5858 14.9142 11.25 14.5
+    11.25C14.0858 11.25 13.75 11.5858 13.75 12C13.75 12.4142 14.0858 12.75 14.5 12.75ZM13.25
+    14C13.25 14.4142 12.9142 14.75 12.5 14.75C12.0858 14.75 11.75 14.4142 11.75 14C11.75
+    13.5858 12.0858 13.25 12.5 13.25C12.9142 13.25 13.25 13.5858 13.25 14ZM13.6972
+    2.99169C10.9426 1.57663 8.1432 1.7124 5.77007 3.16636C4.55909 3.9083 3.25331 5.46925
+    2.51605 7.05899C2.14542 7.85816 1.89915 8.70492 1.90238 9.49318C1.90566 10.2941 2.16983
+    11.0587 2.84039 11.6053C3.45058 12.1026 3.98165 12.353 4.49574 12.3784C5.01375 12.404
+    5.41804 12.1942 5.73429 12.0076C5.80382 11.9666 5.86891 11.927 5.93113 11.8892C6.17332
+    11.7421 6.37205 11.6214 6.62049 11.5426C6.90191 11.4534 7.2582 11.4205 7.77579
+    11.5787C7.96661 11.637 8.08161 11.7235 8.16212 11.8229C8.24792 11.9289 8.31662 12.0774
+    8.36788 12.2886C8.41955 12.5016 8.44767 12.7527 8.46868 13.0491C8.47651 13.1594 8.48379
+    13.2855 8.49142 13.4176C8.50252 13.6098 8.51437 13.8149 8.52974 14.0037C8.58435 14.6744
+    8.69971 15.4401 9.10362 16.1357C9.51764 16.8488 10.2047 17.439 11.307 17.8158C12.9093
+    18.3636 14.3731 17.9191 15.5126 17.0169C16.6391 16.125 17.4691 14.7761 17.8842
+    13.4272C19.1991 9.15377 17.6728 5.03394 13.6972 2.99169ZM6.29249 4.01905C8.35686 2.75426
+    10.7844 2.61959 13.2403 3.88119C16.7473 5.68275 18.1135 9.28161 16.9284 13.1332C16.5624
+    14.3227 15.8338 15.4871 14.8919 16.2329C13.963 16.9684 12.8486 17.286 11.6305
+    16.8696C10.7269 16.5607 10.2467 16.1129 9.96842 15.6336C9.68001 15.1369 9.57799 14.5556
+    9.52644 13.9225C9.51101 13.733 9.50132 13.5621 9.49147 13.3884C9.48399 13.2564 9.47642
+    13.1229 9.46618 12.9783C9.44424 12.669 9.41175 12.3499 9.33968 12.0529C9.26719 11.7541
+    9.14902 11.4527 8.93935 11.1937C8.72439 10.9282 8.43532 10.7346 8.06801 10.6223C7.36648
+    10.408 6.80266 10.4359 6.31839 10.5893C5.94331 10.7082 5.62016 10.9061 5.37179
+    11.0582C5.31992 11.0899 5.2713 11.1197 5.22616 11.1463C4.94094 11.3146 4.75357 11.39
+    4.54514 11.3796C4.33279 11.3691 4.00262 11.2625 3.47218 10.8301C3.0866 10.5158 2.90473
+    10.0668 2.90237 9.48908C2.89995 8.89865 3.08843 8.20165 3.42324 7.47971C4.09686 6.0272
+    5.28471 4.63649 6.29249 4.01905Z
+  </PathGeometry>
+  <!-- Fluent UI System Icons : ic_fluent_options_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewComponentsIconGeometry">
+    M14.95 5C14.7184 3.85888 13.7095 3 12.5 3C11.2905 3 10.2816 3.85888 10.05 5H2.5C2.22386
+    5 2 5.22386 2 5.5C2 5.77614 2.22386 6 2.5 6H10.05C10.2816 7.14112 11.2905 8 12.5 8C13.7297
+    8 14.752 7.11217 14.961 5.94254C14.9575 5.96177 14.9539 5.98093 14.95 6H17.5C17.7761 6 18
+    5.77614 18 5.5C18 5.22386 17.7761 5 17.5 5H14.95ZM12.5 7C11.6716 7 11 6.32843 11 5.5C11
+    4.67157 11.6716 4 12.5 4C13.3284 4 14 4.67157 14 5.5C14 6.32843 13.3284 7 12.5 7ZM9.94999
+    14C9.71836 12.8589 8.70948 12 7.5 12C6.29052 12 5.28164 12.8589 5.05001 14H2.5C2.22386
+    14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H5.05001C5.28164 16.1411 6.29052 17 7.5
+    17C8.70948 17 9.71836 16.1411 9.94999 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239
+    17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5
+    13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z
+  </PathGeometry>
+  <!-- This radius should follow ControlCornerRadius -->
+  <CornerRadius x:Key="ColorViewTabBackgroundCornerRadius">3</CornerRadius>
+
+  <ControlTheme x:Key="ColorViewPaletteListBoxTheme"
+                TargetType="ListBox">
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                ClipToBounds="{TemplateBinding ClipToBounds}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Name="PART_ScrollViewer"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{TemplateBinding Padding}"
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="ColorViewPaletteListBoxItemTheme"
+                TargetType="ListBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ListBoxItem}">
+        <Grid UseLayoutRounding="False">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+          <Rectangle x:Name="BorderRectangle"
+                     IsHitTestVisible="False"
+                     StrokeThickness="3"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ Rectangle#BorderRectangle">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Rectangle#BorderRectangle"
+           x:DataType="Color">
+      <Setter Property="Stroke" Value="{Binding Converter={StaticResource ContrastBrushConverter}}" />
+      <Setter Property="Opacity" Value="0.5" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Rectangle#BorderRectangle"
+           x:DataType="Color">
+      <!-- The below and above lines really should be:
+             'Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={DynamicResource TextControlForeground}}"'
+           However, DynamicResource and Binding is not currently supported in Avalonia for converter parameters.
+           This means certain colors with transparency less than 50% may have a selection border that is difficult
+           to see over top of the default control/window background. Since palettes do not usually have transparency
+           it is considered better to disable this functionality rather than work around it with a multi-value
+           converter. This should be revisited if Avalonia supports the above code in the future. -->
+      <Setter Property="Stroke" Value="{Binding Converter={StaticResource ContrastBrushConverter}}" />
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
+
+  <!-- Based on the Simple ToggleButton ControlTheme -->
+  <ControlTheme x:Key="ColorViewColorModelRadioButtonTheme"
+                TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="CornerRadius" Value="0" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <!-- Based on the Simple TabItem ControlTheme -->
+  <ControlTheme x:Key="ColorViewTabItemTheme"
+                TargetType="TabItem">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    <Setter Property="Padding" Value="6,0,6,0" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource ColorViewTabStripHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{TemplateBinding Padding}">
+          <Panel>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              FontFamily="{TemplateBinding FontFamily}"
+                              FontSize="{TemplateBinding FontSize}"
+                              FontWeight="{TemplateBinding FontWeight}" />
+            <Border Name="PART_SelectedPipe"
+                    Height="2"
+                    Margin="0,0,0,2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom"
+                    Background="{DynamicResource ThemeAccentColor}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    IsVisible="False"/>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type ColorView}"
+                TargetType="ColorView">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Palette">
+      <controls:FluentColorPalette />
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate TargetType="{x:Type ColorView}">
+        <Grid RowDefinitions="Auto,Auto">
+
+          <!-- Backgrounds -->
+          <!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
+          <Border x:Name="TabBackgroundBorder"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Height="48"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Top"
+                  Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                  BorderBrush="{DynamicResource ColorViewTabBorderBrush}"
+                  CornerRadius="{DynamicResource ColorViewTabBackgroundCornerRadius}" />
+          <Border x:Name="ContentBackgroundBorder"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Margin="0,48,0,0"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                  Background="{DynamicResource ColorViewContentBackgroundBrush}"
+                  BorderBrush="{DynamicResource ColorViewContentBorderBrush}"
+                  BorderThickness="0,1,0,0" />
+
+          <TabControl x:Name="PART_TabControl"
+                      Grid.Row="0"
+                      Height="338"
+                      Width="350"
+                      Padding="0"
+                      SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+            <TabControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <UniformGrid Columns="0"
+                             Rows="1" />
+              </ItemsPanelTemplate>
+            </TabControl.ItemsPanel>
+            <!-- Spectrum Tab -->
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorSpectrumVisible}">
+              <TabItem.Header>
+                <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                  <PathIcon Width="20"
+                            Height="20"
+                            Data="{DynamicResource ColorViewSpectrumIconGeometry}" />
+                </Border>
+              </TabItem.Header>
+              <Grid RowDefinitions="*"
+                    Margin="12">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"
+                                    MinWidth="32" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto"
+                                    MinWidth="32" />
+                </Grid.ColumnDefinitions>
+                <primitives:ColorSlider x:Name="ColorSpectrumThirdComponentSlider"
+                                        AutomationProperties.Name="Third Component"
+                                        Grid.Column="0"
+                                        IsAlphaMaxForced="True"
+                                        IsSaturationValueMaxForced="False"
+                                        Orientation="Vertical"
+                                        ColorModel="Hsva"
+                                        ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
+                                        HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Stretch"
+                                        Margin="0,0,12,0"
+                                        IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"/>
+                <primitives:ColorSpectrum x:Name="ColorSpectrum"
+                                          Grid.Column="1"
+                                          Components="{TemplateBinding ColorSpectrumComponents}"
+                                          HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                          MinHue="{TemplateBinding MinHue}"
+                                          MaxHue="{TemplateBinding MaxHue}"
+                                          MinSaturation="{TemplateBinding MinSaturation}"
+                                          MaxSaturation="{TemplateBinding MaxSaturation}"
+                                          MinValue="{TemplateBinding MinValue}"
+                                          MaxValue="{TemplateBinding MaxValue}"
+                                          Shape="{TemplateBinding ColorSpectrumShape}"
+                                          HorizontalAlignment="Stretch"
+                                          VerticalAlignment="Stretch" />
+                <primitives:ColorSlider x:Name="ColorSpectrumAlphaSlider"
+                                        AutomationProperties.Name="Alpha Component"
+                                        Grid.Column="2"
+                                        Orientation="Vertical"
+                                        ColorModel="Hsva"
+                                        ColorComponent="Alpha"
+                                        HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Stretch"
+                                        Margin="12,0,0,0"
+                                        IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <primitives:ColorSlider.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                    </MultiBinding>
+                  </primitives:ColorSlider.IsVisible>
+                </primitives:ColorSlider>
+              </Grid>
+            </TabItem>
+            <!-- Palette Tab -->
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorPaletteVisible}">
+              <TabItem.Header>
+                <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                  <PathIcon Width="20"
+                            Height="20"
+                            Data="{DynamicResource ColorViewPaletteIconGeometry}" />
+                </Border>
+              </TabItem.Header>
+              <ListBox Theme="{StaticResource ColorViewPaletteListBoxTheme}"
+                       ItemContainerTheme="{StaticResource ColorViewPaletteListBoxItemTheme}"
+                       Items="{TemplateBinding PaletteColors}"
+                       SelectedItem="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoNothingForNullConverter}, Mode=TwoWay}"
+                       UseLayoutRounding="False"
+                       Margin="12">
+                <ListBox.ItemTemplate>
+                  <DataTemplate DataType="{x:Type Color}">
+                    <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                            ToolTip.Tip="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch">
+                      <Border.Background>
+                        <SolidColorBrush Color="{Binding}" />
+                      </Border.Background>
+                    </Border>
+                  </DataTemplate>
+                </ListBox.ItemTemplate>
+                <ListBox.ItemsPanel>
+                  <ItemsPanelTemplate>
+                    <UniformGrid Columns="{Binding $parent[ColorView].PaletteColumnCount}" />
+                  </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+              </ListBox>
+            </TabItem>
+            <!-- Components Tab -->
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorComponentsVisible}">
+              <TabItem.Header>
+                <Border Height="{DynamicResource ColorViewTabStripHeight}">
+                  <PathIcon Width="20"
+                            Height="20"
+                            Data="{DynamicResource ColorViewComponentsIconGeometry}" />
+                </Border>
+              </TabItem.Header>
+              <Grid ColumnDefinitions="Auto,Auto,*"
+                    RowDefinitions="Auto,24,1*,1*,1*,1*,12"
+                    Margin="12">
+                <!-- Top color model & Hex input -->
+                <Grid Grid.Column="0"
+                      Grid.ColumnSpan="3"
+                      Grid.Row="0"
+                      ColumnDefinitions="1*,12,1*">
+                  <!-- Content RGB/HSV names are hard-coded and considered universal -->
+                  <!-- RadioButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                  <Grid ColumnDefinitions="1*,1*"
+                        IsVisible="{TemplateBinding IsColorModelVisible}">
+                    <RadioButton x:Name="RgbRadioButton"
+                                 Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                 Grid.Column="0"
+                                 Content="RGB"
+                                 CornerRadius="0,0,0,0"
+                                 BorderThickness="1,1,0,1"
+                                 IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=TwoWay}" />
+                    <RadioButton x:Name="HsvRadioButton"
+                                 Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
+                                 Grid.Column="1"
+                                 Content="HSV"
+                                 CornerRadius="0,0,0,0"
+                                 BorderThickness="0,1,1,1"
+                                 IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=TwoWay}" />
+                  </Grid>
+                  <Grid x:Name="HexInputGrid"
+                        Grid.Column="2"
+                        IsVisible="{TemplateBinding IsHexInputVisible}">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="30" />
+                      <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Border Grid.Column="0"
+                            Height="32"
+                            Background="{DynamicResource ThemeControlMidBrush}"
+                            BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                            BorderThickness="1,1,0,1"
+                            CornerRadius="0,0,0,0">
+                      <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                                 FontWeight="SemiBold"
+                                 Text="#"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center" />
+                    </Border>
+                    <!-- Color updated in code-behind -->
+                    <TextBox x:Name="PART_HexTextBox"
+                             Grid.Column="1"
+                             AutomationProperties.Name="Hexadecimal Color"
+                             Height="32"
+                             MaxLength="8"
+                             HorizontalAlignment="Stretch"
+                             CornerRadius="0,0,0,0" />
+                  </Grid>
+                </Grid>
+                <!-- Color component editing controls -->
+                <!-- Component 1 RGB:Red HSV:Hue -->
+                <Border Grid.Column="0"
+                        Grid.Row="2"
+                        Height="{Binding ElementName=Component1NumericUpDown, Path=Bounds.Height}"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="0,0,0,0"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                  <Panel HorizontalAlignment="Center"
+                         VerticalAlignment="Center">
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                               FontWeight="SemiBold"
+                               Text="R"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}"/>
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                               FontWeight="SemiBold"
+                               Text="H"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                  </Panel>
+                </Border>
+                <NumericUpDown x:Name="Component1NumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="2"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,0,0,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=Component1Slider}"
+                               Maximum="{Binding Maximum, ElementName=Component1Slider}"
+                               Value="{Binding Value, ElementName=Component1Slider}"
+                               IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                <primitives:ColorSlider x:Name="Component1Slider"
+                                        Grid.Column="2"
+                                        Grid.Row="2"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Component1"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                <!-- Component 2 RGB:Green HSV:Saturation -->
+                <Border Grid.Column="0"
+                        Grid.Row="3"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Height="{Binding ElementName=Component2NumericUpDown, Path=Bounds.Height}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="0,0,0,0"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                  <Panel HorizontalAlignment="Center"
+                         VerticalAlignment="Center">
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                               FontWeight="SemiBold"
+                               Text="G"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                               FontWeight="SemiBold"
+                               Text="S"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                  </Panel>
+                </Border>
+                <NumericUpDown x:Name="Component2NumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="3"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,0,0,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=Component2Slider}"
+                               Maximum="{Binding Maximum, ElementName=Component2Slider}"
+                               Value="{Binding Value, ElementName=Component2Slider}"
+                               IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                <primitives:ColorSlider x:Name="Component2Slider"
+                                        Grid.Column="2"
+                                        Grid.Row="3"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Component2"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                <!-- Component 3 RGB:Blue HSV:Value -->
+                <Border Grid.Column="0"
+                        Grid.Row="4"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Height="{Binding ElementName=Component3NumericUpDown, Path=Bounds.Height}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="0,0,0,0"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding IsComponentTextInputVisible}">
+                  <Panel HorizontalAlignment="Center"
+                         VerticalAlignment="Center">
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                               FontWeight="SemiBold"
+                               Text="B"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
+                               FontWeight="SemiBold"
+                               Text="V"
+                               IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
+                  </Panel>
+                </Border>
+                <NumericUpDown x:Name="Component3NumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="4"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,0,0,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=Component3Slider}"
+                               Maximum="{Binding Maximum, ElementName=Component3Slider}"
+                               Value="{Binding Value, ElementName=Component3Slider}"
+                               IsVisible="{TemplateBinding IsComponentTextInputVisible}" />
+                <primitives:ColorSlider x:Name="Component3Slider"
+                                        Grid.Column="2"
+                                        Grid.Row="4"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Component3"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsVisible="{TemplateBinding IsComponentSliderVisible}" />
+                <!-- Alpha Component -->
+                <Border Grid.Column="0"
+                        Grid.Row="5"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
+                        Height="{Binding ElementName=AlphaComponentNumericUpDown, Path=Bounds.Height}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                        BorderThickness="1,1,0,1"
+                        CornerRadius="0,0,0,0"
+                        VerticalAlignment="Center"
+                        IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <TextBlock x:Name="AlphaComponentTextBlock"
+                             Foreground="{DynamicResource ThemeForegroundBrush}"
+                             FontWeight="SemiBold"
+                             Text="A"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center" />
+                  <Border.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsComponentTextInputVisible" />
+                    </MultiBinding>
+                  </Border.IsVisible>
+                </Border>
+                <NumericUpDown x:Name="AlphaComponentNumericUpDown"
+                               Grid.Column="1"
+                               Grid.Row="5"
+                               AllowSpin="True"
+                               ShowButtonSpinner="False"
+                               Height="32"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
+                               CornerRadius="0,0,0,0"
+                               Margin="0,0,12,0"
+                               VerticalAlignment="Center"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
+                               Minimum="{Binding Minimum, ElementName=AlphaComponentSlider}"
+                               Maximum="{Binding Maximum, ElementName=AlphaComponentSlider}"
+                               Value="{Binding Value, ElementName=AlphaComponentSlider}"
+                               IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <NumericUpDown.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsComponentTextInputVisible" />
+                    </MultiBinding>
+                  </NumericUpDown.IsVisible>
+                </NumericUpDown>
+                <primitives:ColorSlider x:Name="AlphaComponentSlider"
+                                        Grid.Column="2"
+                                        Grid.Row="5"
+                                        Orientation="Horizontal"
+                                        IsRoundingEnabled="True"
+                                        IsSnapToTickEnabled="True"
+                                        TickFrequency="1"
+                                        ColorComponent="Alpha"
+                                        ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
+                                        HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        IsEnabled="{TemplateBinding IsAlphaEnabled}">
+                  <primitives:ColorSlider.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsAlphaVisible" />
+                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                               Path="IsComponentSliderVisible" />
+                    </MultiBinding>
+                  </primitives:ColorSlider.IsVisible>
+                </primitives:ColorSlider>
+              </Grid>
+            </TabItem>
+          </TabControl>
+          <!-- Previewer -->
+          <!-- Note that top/bottom margins have -5 to remove for drop shadow padding -->
+          <primitives:ColorPreviewer Grid.Row="1"
+                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                     IsAccentColorsVisible="{TemplateBinding IsAccentColorsVisible}"
+                                     Margin="12,-5,12,7"
+                                     IsVisible="{TemplateBinding IsColorPreviewVisible}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
new file mode 100644
index 0000000000..bb362f4257
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
@@ -0,0 +1,65 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <ResourceDictionary>
+
+      <!-- Shared Resources -->
+      <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
+                   TileMode="Tile"
+                   Stretch="Uniform"
+                   DestinationRect="0,0,8,8">
+        <VisualBrush.Visual>
+          <Image Width="8" Height="8">
+            <Image.Source>
+              <DrawingImage>
+                <DrawingImage.Drawing>
+                  <DrawingGroup>
+                    <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
+                                     Brush="Transparent" />
+                    <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
+                                     Brush="#19808080" />
+                  </DrawingGroup>
+                </DrawingImage.Drawing>
+              </DrawingImage>
+            </Image.Source>
+          </Image>
+        </VisualBrush.Visual>
+      </VisualBrush>
+
+      <!-- TODO: Enable the commented-out resources below once Avalonia supports extending light/dark resource dictionaries -->
+      <SolidColorBrush x:Key="ColorControlLightSelectorBrush" Color="#FFFFFFFF" />
+      <SolidColorBrush x:Key="ColorControlDarkSelectorBrush" Color="#E4000000" />
+      <!--<DynamicResource x:Key="ColorControlDefaultSelectorBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />-->
+      <SolidColorBrush x:Key="ColorViewContentBackgroundBrush" Color="Transparent" />
+      <SolidColorBrush x:Key="ColorViewContentBorderBrush" Color="Transparent" />
+      <!--<DynamicResource x:Key="ColorViewTabBackgroundBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />-->
+      <SolidColorBrush x:Key="ColorViewTabBorderBrush" Color="Transparent" />
+
+      <!-- Shared Converters -->
+      <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
+      <converters:ToBrushConverter x:Key="ToBrushConverter" />
+      <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
+      <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
+      <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
+      <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
+
+      <ResourceDictionary.MergedDictionaries>
+
+        <!-- Primitives -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml" />
+
+        <!-- Controls -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml" />
+
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
+</Styles>
diff --git a/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..bfcec2960a
--- /dev/null
+++ b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt
@@ -0,0 +1,4 @@
+Compat issues with assembly Avalonia.Controls.DataGrid:
+MembersMustExist : Member 'protected void Avalonia.Controls.DataGridCheckBoxColumn.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.DataGridTextColumn.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+Total Issues: 2
diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
index c89157dc0f..6369961f0f 100644
--- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
+++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
@@ -4,14 +4,8 @@
     <PackageId>Avalonia.Controls.DataGrid</PackageId>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />    
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
@@ -23,4 +17,10 @@
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\ApiDiff.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Controls.DataGrid.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
index fe6acdc532..30517f4b00 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
@@ -3412,23 +3412,30 @@ namespace Avalonia.Collections
                 RefreshOrDefer();
                 return;
             }
-
-            object addedItem = args.NewItems?[0];
-            object removedItem = args.OldItems?[0];
-
+            
             // fire notifications for removes
-            if (args.Action == NotifyCollectionChangedAction.Remove ||
-                args.Action == NotifyCollectionChangedAction.Replace)
+            if (args.OldItems != null && 
+                (args.Action == NotifyCollectionChangedAction.Remove ||
+                args.Action == NotifyCollectionChangedAction.Replace))
             {
-                ProcessRemoveEvent(removedItem, args.Action == NotifyCollectionChangedAction.Replace);
+                foreach (var removedItem in args.OldItems)
+                {
+                    ProcessRemoveEvent(removedItem, args.Action == NotifyCollectionChangedAction.Replace);
+                }
             }
 
             // fire notifications for adds
-            if ((args.Action == NotifyCollectionChangedAction.Add ||
-                args.Action == NotifyCollectionChangedAction.Replace) &&
-                (Filter == null || PassesFilter(addedItem)))
+            if (args.NewItems != null && 
+                (args.Action == NotifyCollectionChangedAction.Add ||
+                 args.Action == NotifyCollectionChangedAction.Replace))
             {
-                ProcessAddEvent(addedItem, args.NewStartingIndex);
+                for (var i = 0; i < args.NewItems.Count; i++)
+                {
+                    if (Filter == null || PassesFilter(args.NewItems[i]))
+                    {
+                        ProcessAddEvent(args.NewItems[i], args.NewStartingIndex + i);
+                    }
+                }
             }
             if (args.Action != NotifyCollectionChangedAction.Replace)
             {
@@ -3946,7 +3953,7 @@ namespace Avalonia.Collections
             {
                 sort.Initialize(itemType); 
 
-                if(seq is IOrderedEnumerable<object> orderedEnum)
+                if (seq is IOrderedEnumerable<object> orderedEnum)
                 {
                     seq = sort.ThenBy(orderedEnum);
                 }
diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
index ca6020128c..ab73ed73c7 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
@@ -12,9 +12,6 @@ namespace Avalonia.Collections
     {
         public virtual string PropertyPath => null;
 
-        [Obsolete("Use Direction property to read or override sorting direction.")]
-        public virtual bool Descending => Direction == ListSortDirection.Descending;
-
         public virtual ListSortDirection Direction => ListSortDirection.Ascending;
         public bool HasPropertyPath => !String.IsNullOrEmpty(PropertyPath);
         public abstract IComparer<object> Comparer { get; }
@@ -254,13 +251,6 @@ namespace Avalonia.Collections
             return new DataGridPathSortDescription(propertyPath, direction, null, culture);
         }
 
-
-        [Obsolete("Use overload taking a ListSortDirection.")]
-        public static DataGridSortDescription FromPath(string propertyPath, bool descending, CultureInfo culture = null)
-        {
-            return new DataGridPathSortDescription(propertyPath, descending ? ListSortDirection.Descending : ListSortDirection.Ascending, null, culture);
-        }
-
         public static DataGridSortDescription FromPath(string propertyPath, ListSortDirection direction, IComparer comparer)
         {
             return new DataGridPathSortDescription(propertyPath, direction, comparer, null);
@@ -268,11 +258,11 @@ namespace Avalonia.Collections
 
         public static DataGridSortDescription FromComparer(IComparer comparer, ListSortDirection direction = ListSortDirection.Ascending)
         {
-            return new DataGridComparerSortDesctiption(comparer, direction);
+            return new DataGridComparerSortDescription(comparer, direction);
         }
     }
 
-    public class DataGridComparerSortDesctiption : DataGridSortDescription
+    public class DataGridComparerSortDescription : DataGridSortDescription
     {
         private readonly IComparer _innerComparer;
         private readonly ListSortDirection _direction;
@@ -281,7 +271,7 @@ namespace Avalonia.Collections
         public IComparer SourceComparer => _innerComparer;
         public override IComparer<object> Comparer => _comparer;
         public override ListSortDirection Direction => _direction;
-        public DataGridComparerSortDesctiption(IComparer comparer, ListSortDirection direction)
+        public DataGridComparerSortDescription(IComparer comparer, ListSortDirection direction)
         {
             _innerComparer = comparer;
             _direction = direction;
@@ -300,7 +290,7 @@ namespace Avalonia.Collections
         public override DataGridSortDescription SwitchSortDirection()
         {
             var newDirection = _direction == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending;
-            return new DataGridComparerSortDesctiption(_innerComparer, newDirection);
+            return new DataGridComparerSortDescription(_innerComparer, newDirection);
         }
     }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 5d71a499e3..c6cc9bf278 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -32,6 +32,14 @@ namespace Avalonia.Controls
     /// <summary>
     /// Displays data in a customizable grid.
     /// </summary>
+    [TemplatePart(DATAGRID_elementBottomRightCornerHeaderName,     typeof(IVisual))]
+    [TemplatePart(DATAGRID_elementColumnHeadersPresenterName,      typeof(DataGridColumnHeadersPresenter))]
+    [TemplatePart(DATAGRID_elementFrozenColumnScrollBarSpacerName, typeof(Control))]
+    [TemplatePart(DATAGRID_elementHorizontalScrollbarName,         typeof(ScrollBar))]
+    [TemplatePart(DATAGRID_elementRowsPresenterName,               typeof(DataGridRowsPresenter))]
+    [TemplatePart(DATAGRID_elementTopLeftCornerHeaderName,         typeof(ContentControl))]
+    [TemplatePart(DATAGRID_elementTopRightCornerHeaderName,        typeof(ContentControl))]
+    [TemplatePart(DATAGRID_elementVerticalScrollbarName,           typeof(ScrollBar))]
     [PseudoClasses(":invalid", ":empty-rows", ":empty-columns")]
     public partial class DataGrid : TemplatedControl
     {
@@ -669,8 +677,6 @@ namespace Avalonia.Controls
             ItemsProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnItemsPropertyChanged(e));
             CanUserResizeColumnsProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnCanUserResizeColumnsChanged(e));
             ColumnWidthProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnColumnWidthChanged(e));
-            RowBackgroundProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnRowBackgroundChanged(e));
-            AlternatingRowBackgroundProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnRowBackgroundChanged(e));
             FrozenColumnCountProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnFrozenColumnCountChanged(e));
             GridLinesVisibilityProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnGridLinesVisibilityChanged(e));
             HeadersVisibilityProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnHeadersVisibilityChanged(e));
@@ -1144,14 +1150,6 @@ namespace Avalonia.Controls
             InvalidateCellsArrange();
         }
 
-        private void OnRowBackgroundChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            foreach (DataGridRow row in GetAllRows())
-            {
-                row.EnsureBackground();
-            }
-        }
-
         private void OnColumnWidthChanged(AvaloniaPropertyChangedEventArgs e)
         {
             var value = (DataGridLength)e.NewValue;
@@ -2060,6 +2058,25 @@ namespace Avalonia.Controls
                     forceHorizontalScroll: true);
             }
         }
+        
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            if (DataConnection.DataSource != null && !DataConnection.EventsWired)
+            {
+                DataConnection.WireEvents(DataConnection.DataSource);
+            }
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            // When wired to INotifyCollectionChanged, the DataGrid will be cleaned up by GC
+            if (DataConnection.DataSource != null && DataConnection.EventsWired)
+            {
+                DataConnection.UnWireEvents(DataConnection.DataSource);
+            }
+        }
 
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.DataGridRow" />.
@@ -2150,7 +2167,23 @@ namespace Avalonia.Controls
 
             return desiredSize;
         }
+        
+        /// <inheritdoc/>
+        protected override void OnDataContextBeginUpdate()
+        {
+            base.OnDataContextBeginUpdate();
 
+            NotifyDataContextPropertyForAllRowCells(GetAllRows(), true);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDataContextEndUpdate()
+        {
+            base.OnDataContextEndUpdate();
+
+            NotifyDataContextPropertyForAllRowCells(GetAllRows(), false);
+        }
+        
         /// <summary>
         /// Raises the BeginningEdit event.
         /// </summary>
@@ -3148,6 +3181,20 @@ namespace Avalonia.Controls
             }
         }
 
+        private static void NotifyDataContextPropertyForAllRowCells(IEnumerable<DataGridRow> rowSource, bool arg2)
+        {
+            foreach (DataGridRow row in rowSource)
+            {
+                foreach (DataGridCell cell in row.Cells)
+                {
+                    if (cell.Content is StyledElement cellContent)
+                    {
+                        DataContextProperty.Notifying?.Invoke(cellContent, arg2);
+                    }
+                }
+            }
+        }
+
         private void UpdateRowDetailsVisibilityMode(DataGridRowDetailsVisibilityMode newDetailsMode)
         {
             int itemCount = DataConnection.Count;
@@ -5973,15 +6020,14 @@ namespace Avalonia.Controls
         /// <returns>The formatted string.</returns>
         private string FormatClipboardContent(DataGridRowClipboardEventArgs e)
         {
-            StringBuilder text = new StringBuilder();
-            for (int cellIndex = 0; cellIndex < e.ClipboardRowContent.Count; cellIndex++)
+            var text = StringBuilderCache.Acquire();
+            var clipboardRowContent = e.ClipboardRowContent;
+            var numberOfItem = clipboardRowContent.Count;
+            for (int cellIndex = 0; cellIndex < numberOfItem; cellIndex++)
             {
-                DataGridClipboardCellContent cellContent = e.ClipboardRowContent[cellIndex];
-                if (cellContent != null)
-                {
-                    text.Append(cellContent.Content);
-                }
-                if (cellIndex < e.ClipboardRowContent.Count - 1)
+                var cellContent = clipboardRowContent[cellIndex];
+                text.Append(cellContent.Content);
+                if (cellIndex < numberOfItem - 1)
                 {
                     text.Append('\t');
                 }
@@ -5991,7 +6037,7 @@ namespace Avalonia.Controls
                     text.Append('\n');
                 }
             }
-            return text.ToString();
+            return StringBuilderCache.GetStringAndRelease(text);
         }
 
         /// <summary>
@@ -6006,7 +6052,7 @@ namespace Avalonia.Controls
 
             if (ctrl && !shift && !alt && ClipboardCopyMode != DataGridClipboardCopyMode.None && SelectedItems.Count > 0)
             {
-                StringBuilder textBuilder = new StringBuilder();
+                var textBuilder = StringBuilderCache.Acquire();
 
                 if (ClipboardCopyMode == DataGridClipboardCopyMode.IncludeHeader)
                 {
@@ -6032,7 +6078,7 @@ namespace Avalonia.Controls
                     textBuilder.Append(FormatClipboardContent(itemArgs));
                 }
 
-                string text = textBuilder.ToString();
+                string text = StringBuilderCache.GetStringAndRelease(textBuilder);
 
                 if (!string.IsNullOrEmpty(text))
                 {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCell.cs b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
index e3f150f5c4..dd802678d4 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCell.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
@@ -13,7 +13,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> cell.
     /// </summary>
-    [PseudoClasses(":selected", ":current", ":edited", ":invalid")]
+    [TemplatePart(DATAGRIDCELL_elementRightGridLine, typeof(Rectangle))]
+    [PseudoClasses(":selected", ":current", ":edited", ":invalid", ":focus")]
     public class DataGridCell : ContentControl
     {
         private const string DATAGRIDCELL_elementRightGridLine = "PART_RightGridLine";
@@ -138,18 +139,18 @@ namespace Avalonia.Controls
             }
 
         }
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
 
             if (OwningRow != null)
             {
                 IsMouseOver = true;
             }
         }
-        protected override void OnPointerLeave(PointerEventArgs e)
+        protected override void OnPointerExited(PointerEventArgs e)
         {
-            base.OnPointerLeave(e);
+            base.OnPointerExited(e);
 
             if (OwningRow != null)
             {
@@ -177,9 +178,9 @@ namespace Avalonia.Controls
                 {
                     var handled = OwningGrid.UpdateStateOnMouseLeftButtonDown(e, ColumnIndex, OwningRow.Slot, !e.Handled);
 
-                    // Do not handle PointerPressed with touch,
+                    // Do not handle PointerPressed with touch or pen,
                     // so we can start scroll gesture on the same event.
-                    if (e.Pointer.Type != PointerType.Touch)
+                    if (e.Pointer.Type != PointerType.Touch && e.Pointer.Type != PointerType.Pen)
                     {
                         e.Handled = handled;
                     }
@@ -215,6 +216,8 @@ namespace Avalonia.Controls
             PseudoClasses.Set(":edited", IsEdited);
 
             PseudoClasses.Set(":invalid", !IsValid);
+            
+            PseudoClasses.Set(":focus", OwningGrid.IsFocused && IsCurrent);
         }
 
         // Makes sure the right gridline has the proper stroke and visibility. If lastVisibleColumn is specified, the 
@@ -244,9 +247,15 @@ namespace Avalonia.Controls
             if (column == null)
             {
                 Classes.Clear();
+                ClearValue(ThemeProperty);
             }
             else
             {
+                if (Theme != column.CellTheme)
+                {
+                    Theme = column.CellTheme;
+                }
+                
                 Classes.Replace(column.CellStyleClasses);
             }
         }
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
index ccf1f3f77a..9826c15598 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Controls
             set => SetValue(IsThreeStateProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index a77b482436..fbdb979e24 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -16,6 +16,7 @@ using Avalonia.Controls.Templates;
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -36,6 +37,7 @@ namespace Avalonia.Controls
         private IControl _editingElement;
         private ICellEditBinding _editBinding;
         private IBinding _clipboardContentBinding;
+        private ControlTheme _cellTheme;
         private readonly Classes _cellStyleClasses = new Classes();
 
         /// <summary>
@@ -192,14 +194,14 @@ namespace Avalonia.Controls
             set => SetValue(IsVisibleProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == IsVisibleProperty)
             {
                 OwningGrid?.OnColumnVisibleStateChanging(this);
-                var isVisible = (change as AvaloniaPropertyChangedEventArgs<bool>).NewValue.Value;
+                var isVisible = change.GetNewValue<bool>();
 
                 if (_headerCell != null)
                 {
@@ -399,6 +401,24 @@ namespace Avalonia.Controls
                 }
             }
         }
+        
+        /// <summary>
+        ///    Backing field for CellTheme property.
+        /// </summary>
+        public static readonly DirectProperty<DataGridColumn, ControlTheme> CellThemeProperty =
+            AvaloniaProperty.RegisterDirect<DataGridColumn, ControlTheme>(
+                nameof(CellTheme),
+                o => o.CellTheme,
+                (o, v) => o.CellTheme = v);
+
+        /// <summary>
+        ///    Gets or sets the <see cref="DataGridColumnHeader"/> cell theme. 
+        /// </summary>
+        public ControlTheme CellTheme
+        {
+            get { return _cellTheme; }
+            set { SetAndRaise(CellThemeProperty, ref _cellTheme, value); }
+        }
 
         /// <summary>
         ///    Backing field for Header property
@@ -855,7 +875,7 @@ namespace Avalonia.Controls
             if (OwningGrid != null && OwningGrid.UseLayoutRounding)
             {
                 var scale = LayoutHelper.GetLayoutScale(HeaderCell);
-                var roundSize = LayoutHelper.RoundLayoutSize(new Size(leftEdge + ActualWidth, 1), scale, scale);
+                var roundSize = LayoutHelper.RoundLayoutSizeUp(new Size(leftEdge + ActualWidth, 1), scale, scale);
                 LayoutRoundedWidth = roundSize.Width - leftEdge;
             }
             else
@@ -1091,7 +1111,7 @@ namespace Avalonia.Controls
                 {
                     return
                         OwningGrid.DataConnection.SortDescriptions
-                                  .OfType<DataGridComparerSortDesctiption>()
+                                  .OfType<DataGridComparerSortDescription>()
                                   .FirstOrDefault(s => s.SourceComparer == CustomSortComparer);
                 }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
index 922b1d9c08..e7f9a9a6c4 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
@@ -12,7 +12,8 @@ namespace Avalonia.Controls
 {
     internal class DataGridColumnCollection : ObservableCollection<DataGridColumn>
     {
-        private DataGrid _owningGrid;
+        private readonly Dictionary<int, int> _columnsMap = new Dictionary<int, int>();
+        private readonly DataGrid _owningGrid;
 
         public DataGridColumnCollection(DataGrid owningGrid)
         {
@@ -124,18 +125,8 @@ namespace Avalonia.Controls
 
         internal int VisibleColumnCount
         {
-            get
-            {
-                int visibleColumnCount = 0;
-                for (int columnIndex = 0; columnIndex < ItemsInternal.Count; columnIndex++)
-                {
-                    if (ItemsInternal[columnIndex].IsVisible)
-                    {
-                        visibleColumnCount++;
-                    }
-                }
-                return visibleColumnCount;
-            }
+            get;
+            private set;
         }
 
         internal double VisibleEdgedColumnsWidth
@@ -287,20 +278,31 @@ namespace Avalonia.Controls
         {
             VisibleStarColumnCount = 0;
             VisibleEdgedColumnsWidth = 0;
+            VisibleColumnCount = 0;
+            _columnsMap.Clear();
+
             for (int columnIndex = 0; columnIndex < ItemsInternal.Count; columnIndex++)
             {
-                if (ItemsInternal[columnIndex].IsVisible)
+                var item = ItemsInternal[columnIndex];
+                _columnsMap[columnIndex] = item.DisplayIndex;
+                if (item.IsVisible)
                 {
-                    ItemsInternal[columnIndex].EnsureWidth();
-                    if (ItemsInternal[columnIndex].Width.IsStar)
+                    VisibleColumnCount++;
+                    item.EnsureWidth();
+                    if (item.Width.IsStar)
                     {
                         VisibleStarColumnCount++;
                     }
-                    VisibleEdgedColumnsWidth += ItemsInternal[columnIndex].ActualWidth;
+                    VisibleEdgedColumnsWidth += item.ActualWidth;
                 }
             }
         }
 
+        internal int GetColumnDisplayIndex(int columnIndex)
+        {
+            return _columnsMap.TryGetValue(columnIndex, out var displayIndex) ? displayIndex : -1;
+        }
+
         internal DataGridColumn GetColumnAtDisplayIndex(int displayIndex)
         {
             if (displayIndex < 0 || displayIndex >= ItemsInternal.Count || displayIndex >= DisplayIndexMap.Count)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
index 915b36687c..d3bd968d62 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
@@ -83,9 +83,9 @@ namespace Avalonia.Controls
         {
             PointerPressed += DataGridColumnHeader_PointerPressed;
             PointerReleased += DataGridColumnHeader_PointerReleased;
-            PointerMoved += DataGridColumnHeader_PointerMove;
-            PointerEnter += DataGridColumnHeader_PointerEnter;
-            PointerLeave += DataGridColumnHeader_PointerLeave;
+            PointerMoved += DataGridColumnHeader_PointerMoved;
+            PointerEntered += DataGridColumnHeader_PointerEntered;
+            PointerExited += DataGridColumnHeader_PointerExited;
         }
 
         private void OnAreSeparatorsVisibleChanged(AvaloniaPropertyChangedEventArgs e)
@@ -452,7 +452,7 @@ namespace Avalonia.Controls
             SetDragCursor(mousePosition);
         }
 
-        private void DataGridColumnHeader_PointerEnter(object sender, PointerEventArgs e)
+        private void DataGridColumnHeader_PointerEntered(object sender, PointerEventArgs e)
         {
             if (!IsEnabled)
             {
@@ -464,7 +464,7 @@ namespace Avalonia.Controls
             UpdatePseudoClasses();
         }
 
-        private void DataGridColumnHeader_PointerLeave(object sender, PointerEventArgs e)
+        private void DataGridColumnHeader_PointerExited(object sender, PointerEventArgs e)
         {
             if (!IsEnabled)
             {
@@ -506,7 +506,7 @@ namespace Avalonia.Controls
             UpdatePseudoClasses();
         }
 
-        private void DataGridColumnHeader_PointerMove(object sender, PointerEventArgs e)
+        private void DataGridColumnHeader_PointerMoved(object sender, PointerEventArgs e)
         {
             if (OwningGrid == null || !IsEnabled)
             {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumns.cs b/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
index a4577ee952..52f0ad7537 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
@@ -444,12 +444,11 @@ namespace Avalonia.Controls
 
             // We need to explicitly collapse the cells of the invisible column because layout only goes through
             // visible ones
-            if (!updatedColumn.IsVisible)
+            ColumnHeaders?.InvalidateChildIndex();
+            foreach (var row in GetAllRows())
             {
-                foreach (DataGridRow row in GetAllRows())
-                {
-                    row.Cells[updatedColumn.Index].IsVisible = false;
-                }
+                row.Cells[updatedColumn.Index].IsVisible = updatedColumn.IsVisible;
+                row.InvalidateCellsIndex();
             }
         }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
index fade597ca1..ae52e5f970 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Controls
             private set;
         }
 
-        public int Count => GetCount(true);
+        public int Count => TryGetCount(true, false, out var count) ? count : 0;
 
         public bool DataIsPrimitive
         {
@@ -193,22 +193,28 @@ namespace Avalonia.Controls
             }
         }
 
-        internal bool Any()
-        {
-            return GetCount(false) > 0;
+        /// <summary>Try get number of DataSource itmes.</summary>
+        /// <param name="allowSlow">When "allowSlow" is false, method will not use Linq.Count() method and will return 0 or 1 instead.</param>
+        /// <param name="getAny">If "getAny" is true, method can use Linq.Any() method to speedup.</param>
+        /// <param name="count">number of DataSource itmes.</param>
+        /// <returns>true if able to retrieve number of DataSource itmes; otherwise, false.</returns>
+        internal bool TryGetCount(bool allowSlow, bool getAny, out int count)
+        {
+            bool result;
+            (result, count) = DataSource switch
+            {
+                ICollection collection => (true, collection.Count),
+                DataGridCollectionView cv => (true, cv.Count),
+                IEnumerable enumerable when allowSlow && !getAny => (true, enumerable.Cast<object>().Count()),
+                IEnumerable enumerable when getAny => (true, enumerable.Cast<object>().Any() ? 1 : 0),
+                _ => (false, 0)
+            };
+            return result;
         }
 
-        /// <param name="allowSlow">When "allowSlow" is false, method will not use Linq.Count() method and will return 0 or 1 instead.</param>
-        private int GetCount(bool allowSlow)
+        internal bool Any()
         {
-            return DataSource switch
-            {
-                ICollection collection => collection.Count,
-                DataGridCollectionView cv => cv.Count,
-                IEnumerable enumerable when allowSlow => enumerable.Cast<object>().Count(),
-                IEnumerable enumerable when !allowSlow => enumerable.Cast<object>().Any() ? 1 : 0,
-                _ => 0
-            };
+            return TryGetCount(false, true, out var count) && count > 0;
         }
 
         /// <summary>
@@ -383,7 +389,7 @@ namespace Avalonia.Controls
                     List<string> propertyNames = TypeHelper.SplitPropertyPath(propertyName);
                     for (int i = 0; i < propertyNames.Count; i++)
                     {
-                        propertyInfo = propertyType.GetPropertyOrIndexer(propertyNames[i], out object[] index);
+                        propertyInfo = propertyType.GetPropertyOrIndexer(propertyNames[i], out _);
                         if (propertyInfo == null || propertyType.GetIsReadOnly() || propertyInfo.GetIsReadOnly())
                         {
                             // Either the data type is read-only, the property doesn't exist, or it does exist but is read-only
@@ -391,11 +397,10 @@ namespace Avalonia.Controls
                         }
 
                         // Check if EditableAttribute is defined on the property and if it indicates uneditable
-                        object[] attributes = propertyInfo.GetCustomAttributes(typeof(EditableAttribute), true);
+                        var attributes = propertyInfo.GetCustomAttributes(typeof(EditableAttribute), true);
                         if (attributes != null && attributes.Length > 0)
                         {
-                            EditableAttribute editableAttribute = attributes[0] as EditableAttribute;
-                            Debug.Assert(editableAttribute != null);
+                            var editableAttribute = (EditableAttribute)attributes[0];
                             if (!editableAttribute.AllowEdit)
                             {
                                 return true;
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRow.cs b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
index 1efce7c0b8..1559763a1b 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRow.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
@@ -21,6 +21,11 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a <see cref="T:Avalonia.Controls.DataGrid" /> row.
     /// </summary>
+    [TemplatePart(DATAGRIDROW_elementBottomGridLine, typeof(Rectangle))]
+    [TemplatePart(DATAGRIDROW_elementCells,          typeof(DataGridCellsPresenter))]
+    [TemplatePart(DATAGRIDROW_elementDetails,        typeof(DataGridDetailsPresenter))]
+    [TemplatePart(DATAGRIDROW_elementRoot,           typeof(Panel))]
+    [TemplatePart(DATAGRIDROW_elementRowHeader,      typeof(DataGridRowHeader))]
     [PseudoClasses(":selected", ":editing", ":invalid")]
     public class DataGridRow : TemplatedControl
     {
@@ -543,7 +548,6 @@ namespace Avalonia.Controls
             RootElement = e.NameScope.Find<Panel>(DATAGRIDROW_elementRoot);
             if (RootElement != null)
             {
-                EnsureBackground();
                 UpdatePseudoClasses();
             }
 
@@ -603,15 +607,15 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
             IsMouseOver = true;
         }
-        protected override void OnPointerLeave(PointerEventArgs e)
+        protected override void OnPointerExited(PointerEventArgs e)
         {
             IsMouseOver = false;
-            base.OnPointerLeave(e);
+            base.OnPointerExited(e);
         }
 
         internal void ApplyCellsState()
@@ -668,43 +672,9 @@ namespace Avalonia.Controls
             Slot = -1;
         }
 
-        // Make sure the row's background is set to its correct value.  It could be explicity set or inherit
-        // DataGrid.RowBackground or DataGrid.AlternatingRowBackground
-        internal void EnsureBackground()
+        internal void InvalidateCellsIndex()
         {
-            // Inherit the DataGrid's RowBackground properties only if this row doesn't explicity have a background set
-            if (RootElement != null && OwningGrid != null)
-            {
-                IBrush newBackground = null;
-                if (Background == null)
-                {
-                    if (Index % 2 == 0 || OwningGrid.AlternatingRowBackground == null)
-                    {
-                        // Use OwningGrid.RowBackground if the index is even or if the OwningGrid.AlternatingRowBackground is null
-                        if (OwningGrid.RowBackground != null)
-                        {
-                            newBackground = OwningGrid.RowBackground;
-                        }
-                    }
-                    else
-                    {
-                        // Alternate row
-                        if (OwningGrid.AlternatingRowBackground != null)
-                        {
-                            newBackground = OwningGrid.AlternatingRowBackground;
-                        }
-                    }
-                }
-                else
-                {
-                    newBackground = Background;
-                }
-
-                if (RootElement.Background != newBackground)
-                {
-                    RootElement.Background = newBackground;
-                }
-            }
+            _cellsElement?.InvalidateChildIndex();
         }
 
         internal void EnsureFillerVisibility()
@@ -1092,7 +1062,7 @@ namespace Avalonia.Controls
         }
         
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == DataContextProperty)
             {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
index 49ca23d34c..69e6766bfd 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
@@ -14,13 +14,19 @@ using System.Reactive.Linq;
 
 namespace Avalonia.Controls
 {
+    [TemplatePart(DATAGRIDROWGROUPHEADER_expanderButton,      typeof(ToggleButton))]
+    [TemplatePart(DATAGRIDROWGROUPHEADER_indentSpacer,        typeof(Control))]
+    [TemplatePart(DATAGRIDROWGROUPHEADER_itemCountElement,    typeof(TextBlock))]
+    [TemplatePart(DATAGRIDROWGROUPHEADER_propertyNameElement, typeof(TextBlock))]
+    [TemplatePart(DataGridRow.DATAGRIDROW_elementRoot,        typeof(Panel))]
+    [TemplatePart(DataGridRow.DATAGRIDROW_elementRowHeader,   typeof(DataGridRowHeader))]
     [PseudoClasses(":pressed", ":current", ":expanded")]
     public class DataGridRowGroupHeader : TemplatedControl
     {
-        private const string DATAGRIDROWGROUPHEADER_expanderButton = "ExpanderButton";
-        private const string DATAGRIDROWGROUPHEADER_indentSpacer = "IndentSpacer";
-        private const string DATAGRIDROWGROUPHEADER_itemCountElement = "ItemCountElement";
-        private const string DATAGRIDROWGROUPHEADER_propertyNameElement = "PropertyNameElement";
+        private const string DATAGRIDROWGROUPHEADER_expanderButton = "PART_ExpanderButton";
+        private const string DATAGRIDROWGROUPHEADER_indentSpacer = "PART_IndentSpacer";
+        private const string DATAGRIDROWGROUPHEADER_itemCountElement = "PART_ItemCountElement";
+        private const string DATAGRIDROWGROUPHEADER_propertyNameElement = "PART_PropertyNameElement";
 
         private bool _areIsCheckedHandlersSuspended;
         private ToggleButton _expanderButton;
@@ -107,7 +113,6 @@ namespace Avalonia.Controls
         /// </summary>
         public DataGridRowGroupHeader()
         {
-            //DefaultStyleKey = typeof(DataGridRowGroupHeader);
             AddHandler(InputElement.PointerPressedEvent, (s, e) => DataGridRowGroupHeader_PointerPressed(e), handledEventsToo: true);
         }
 
@@ -369,7 +374,7 @@ namespace Avalonia.Controls
             ApplyHeaderStatus();
         }
 
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
             if (IsEnabled)
             {
@@ -377,10 +382,10 @@ namespace Avalonia.Controls
                 UpdatePseudoClasses();
             }
 
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
         }
 
-        protected override void OnPointerLeave(PointerEventArgs e)
+        protected override void OnPointerExited(PointerEventArgs e)
         {
             if (IsEnabled)
             {
@@ -388,7 +393,7 @@ namespace Avalonia.Controls
                 UpdatePseudoClasses();
             }
 
-            base.OnPointerLeave(e);
+            base.OnPointerExited(e);
         }
 
         private void SetIsCheckedNoCallBack(bool value)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
index 510072174f..fe3ba0abf6 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
@@ -13,6 +13,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> row header. 
     /// </summary>
+    [TemplatePart(DATAGRIDROWHEADER_elementRootName, typeof(Control))]
     [PseudoClasses(":invalid", ":selected", ":editing", ":current")]
     public class DataGridRowHeader : ContentControl
     {
@@ -157,23 +158,23 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
             if (OwningRow != null)
             {
                 OwningRow.IsMouseOver = true;
             }
 
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
         }
-        protected override void OnPointerLeave(PointerEventArgs e)
+        protected override void OnPointerExited(PointerEventArgs e)
         {
             if (OwningRow != null)
             {
                 OwningRow.IsMouseOver = false;
             }
 
-            base.OnPointerLeave(e);
+            base.OnPointerExited(e);
         }
 
         //TODO TabStop
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
index 1d5c899993..f3afe2c42d 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -5,6 +5,7 @@
 
 using Avalonia.Collections;
 using Avalonia.Controls.Utils;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using System;
@@ -811,7 +812,7 @@ namespace Avalonia.Controls
                 if (row.Slot > slotDeleted)
                 {
                     CorrectRowAfterDeletion(row, wasRow);
-                    row.EnsureBackground();
+                    _rowsPresenter?.InvalidateChildIndex(row);
                 }
             }
 
@@ -867,7 +868,7 @@ namespace Avalonia.Controls
                 if (row.Slot >= slotInserted)
                 {
                     DataGrid.CorrectRowAfterInsertion(row, rowInserted);
-                    row.EnsureBackground();
+                    _rowsPresenter?.InvalidateChildIndex(row);
                 }
             }
 
@@ -1485,8 +1486,8 @@ namespace Avalonia.Controls
             // If the row has been recycled, reapply the BackgroundBrush
             if (row.IsRecycled)
             {
-                row.EnsureBackground();
                 row.ApplyCellsState();
+                _rowsPresenter?.InvalidateChildIndex(row);
             }
             else if (row == EditingRow)
             {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
index 1cf6ab68ac..79247aa87f 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
@@ -10,6 +10,8 @@ using System;
 using System.ComponentModel;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Controls.Documents;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -18,21 +20,27 @@ namespace Avalonia.Controls
     /// </summary>
     public class DataGridTextColumn : DataGridBoundColumn
     {
-        private const string DATAGRID_TextColumnCellTextBlockMarginKey = "DataGridTextColumnCellTextBlockMargin";
-
+        private readonly Lazy<ControlTheme> _cellTextBoxTheme;
+        private readonly Lazy<ControlTheme> _cellTextBlockTheme;
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Avalonia.Controls.DataGridTextColumn" /> class.
         /// </summary>
         public DataGridTextColumn()
         {
             BindingTarget = TextBox.TextProperty;
+
+            _cellTextBoxTheme = new Lazy<ControlTheme>(() =>
+                OwningGrid.TryFindResource("DataGridCellTextBoxTheme", out var theme) ? (ControlTheme)theme : null);
+            _cellTextBlockTheme = new Lazy<ControlTheme>(() =>
+                OwningGrid.TryFindResource("DataGridCellTextBlockTheme", out var theme) ? (ControlTheme)theme : null);
         }
 
         /// <summary>
         /// Identifies the FontFamily dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontFamilyProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font name.
@@ -47,7 +55,7 @@ namespace Avalonia.Controls
         /// Identifies the FontSize dependency property.
         /// </summary>
         public static readonly AttachedProperty<double> FontSizeProperty =
-            TextBlock.FontSizeProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontSizeProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font size.
@@ -64,7 +72,7 @@ namespace Avalonia.Controls
         /// Identifies the FontStyle dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            TextBlock.FontStyleProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontStyleProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font style.
@@ -79,7 +87,7 @@ namespace Avalonia.Controls
         /// Identifies the FontWeight dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            TextBlock.FontWeightProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontWeightProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font weight or thickness.
@@ -90,11 +98,26 @@ namespace Avalonia.Controls
             set => SetValue(FontWeightProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the FontStretch dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<DataGridTextColumn>();
+
+        /// <summary>
+        /// Gets or sets the font weight or thickness.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => GetValue(FontStretchProperty);
+            set => SetValue(FontStretchProperty, value);
+        }
+
         /// <summary>
         /// Identifies the Foreground dependency property.
         /// </summary>
         public static readonly AttachedProperty<IBrush> ForegroundProperty =
-            TextBlock.ForegroundProperty.AddOwner<DataGridTextColumn>();
+            TextElement.ForegroundProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets a brush that describes the foreground of the column cells.
@@ -105,7 +128,7 @@ namespace Avalonia.Controls
             set => SetValue(ForegroundProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -142,16 +165,19 @@ namespace Avalonia.Controls
         protected override IControl GenerateEditingElementDirect(DataGridCell cell, object dataItem)
         {
             var textBox = new TextBox
-            {
-                VerticalAlignment = VerticalAlignment.Stretch,
-                Background = new SolidColorBrush(Colors.Transparent)
+            {                
+                Name = "CellTextBox"
             };
+            if (_cellTextBoxTheme.Value is { } theme)
+            {
+                textBox.Theme = theme;
+            }
 
             SyncProperties(textBox);
 
             return textBox;
         }
-
+        
         /// <summary>
         /// Gets a read-only <see cref="T:Avalonia.Controls.TextBlock" /> element that is bound to the column's <see cref="P:Avalonia.Controls.DataGridBoundColumn.Binding" /> property value.
         /// </summary>
@@ -160,11 +186,14 @@ namespace Avalonia.Controls
         /// <returns>A new, read-only <see cref="T:Avalonia.Controls.TextBlock" /> element that is bound to the column's <see cref="P:Avalonia.Controls.DataGridBoundColumn.Binding" /> property value.</returns>
         protected override IControl GenerateElement(DataGridCell cell, object dataItem)
         {
-            TextBlock textBlockElement = new TextBlock
+            var textBlockElement = new TextBlock
             {
-                [!Layoutable.MarginProperty] = new DynamicResourceExtension(DATAGRID_TextColumnCellTextBlockMarginKey),
-                VerticalAlignment = VerticalAlignment.Center
+                Name = "CellTextBlock"
             };
+            if (_cellTextBlockTheme.Value is { } theme)
+            {
+                textBlockElement.Theme = theme;
+            }
 
             SyncProperties(textBlockElement);
 
@@ -214,7 +243,7 @@ namespace Avalonia.Controls
         {
             if (element == null)
             {
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             }
 
             if (element is AvaloniaObject content)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridValueConverter.cs b/src/Avalonia.Controls.DataGrid/DataGridValueConverter.cs
index 82670bf989..6144679b60 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridValueConverter.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridValueConverter.cs
@@ -28,8 +28,8 @@ namespace Avalonia.Controls
         {
             if (targetType != null && targetType.IsNullableType())
             {
-                String strValue = value as String;
-                if (strValue == String.Empty)
+                var strValue = value as string;
+                if (string.IsNullOrEmpty(strValue))
                 {
                     return null;
                 }
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
index c5fe9f0cb2..38d559a031 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
@@ -3,12 +3,13 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Diagnostics;
-using Avalonia.Controls;
-using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -16,9 +17,10 @@ namespace Avalonia.Controls.Primitives
     /// Used within the template of a <see cref="T:Avalonia.Controls.DataGrid" />
     /// to specify the location in the control's visual tree where the cells are to be added. 
     /// </summary>
-    public sealed class DataGridCellsPresenter : Panel
+    public sealed class DataGridCellsPresenter : Panel, IChildIndexProvider
     {
         private double _fillerLeftEdge;
+        private EventHandler<ChildIndexChangedEventArgs> _childIndexChanged;
 
         // The desired height needs to be cached due to column virtualization; otherwise, the cells
         // would grow and shrink as the DataGrid scrolls horizontally
@@ -42,6 +44,25 @@ namespace Avalonia.Controls.Primitives
             set;
         }
 
+        event EventHandler<ChildIndexChangedEventArgs> IChildIndexProvider.ChildIndexChanged
+        {
+            add => _childIndexChanged += value;
+            remove => _childIndexChanged -= value;
+        }
+
+        int IChildIndexProvider.GetChildIndex(ILogical child)
+        {
+            return child is DataGridCell cell
+                ? OwningGrid.ColumnsInternal.GetColumnDisplayIndex(cell.ColumnIndex)
+                : throw new InvalidOperationException("Invalid cell type");
+        }
+
+        bool IChildIndexProvider.TryGetTotalCount(out int count)
+        {
+            count = OwningGrid.ColumnsInternal.VisibleColumnCount;
+            return true;
+        }
+
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.Primitives.DataGridCellsPresenter" />.
         /// </summary>
@@ -120,6 +141,13 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        protected override void ChildrenChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            base.ChildrenChanged(sender, e);
+
+            InvalidateChildIndex();
+        }
+
         private static void EnsureCellDisplay(DataGridCell cell, bool displayColumn)
         {
             if (cell.IsCurrent)
@@ -190,6 +218,8 @@ namespace Avalonia.Controls.Primitives
             {
                 // No explicit height values were set so we can autosize
                 autoSizeHeight = true;
+                // We need to invalidate desired height in order to grow or shrink as needed
+                InvalidateDesiredHeight();
                 measureHeight = double.PositiveInfinity;
             }
             else
@@ -304,6 +334,11 @@ namespace Avalonia.Controls.Primitives
             DesiredHeight = 0;
         }
 
+        internal void InvalidateChildIndex()
+        {
+            _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
+        }
+
         private bool ShouldDisplayCell(DataGridColumn column, double frozenLeftEdge, double scrollingLeftEdge)
         {
             if (!column.IsVisible)
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
index 4eed119240..108dc8ded7 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
@@ -3,8 +3,10 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using System;
+using System.Collections.Specialized;
 using System.Diagnostics;
 
 namespace Avalonia.Controls.Primitives
@@ -13,10 +15,11 @@ namespace Avalonia.Controls.Primitives
     /// Used within the template of a <see cref="T:Avalonia.Controls.DataGrid" /> to specify the 
     /// location in the control's visual tree where the column headers are to be added.
     /// </summary>
-    public sealed class DataGridColumnHeadersPresenter : Panel
+    public sealed class DataGridColumnHeadersPresenter : Panel, IChildIndexProvider
     {
         private Control _dragIndicator;
         private IControl _dropLocationIndicator;
+        private EventHandler<ChildIndexChangedEventArgs> _childIndexChanged;
 
         /// <summary>
         /// Tracks which column is currently being dragged.
@@ -104,6 +107,25 @@ namespace Avalonia.Controls.Primitives
             set;
         }
 
+        event EventHandler<ChildIndexChangedEventArgs> IChildIndexProvider.ChildIndexChanged
+        {
+            add => _childIndexChanged += value;
+            remove => _childIndexChanged -= value;
+        }
+
+        int IChildIndexProvider.GetChildIndex(ILogical child)
+        {
+            return child is DataGridColumnHeader header
+                ? OwningGrid.ColumnsInternal.GetColumnDisplayIndex(header.ColumnIndex)
+                : throw new InvalidOperationException("Invalid cell type");
+        }
+
+        bool IChildIndexProvider.TryGetTotalCount(out int count)
+        {
+            count = OwningGrid.ColumnsInternal.VisibleColumnCount;
+            return true;
+        }
+
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.Primitives.DataGridColumnHeadersPresenter" />.
         /// </summary>
@@ -391,5 +413,17 @@ namespace Avalonia.Controls.Primitives
             OwningGrid.ColumnsInternal.EnsureVisibleEdgedColumnsWidth();
             return new Size(OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth, height);
         }
+
+        protected override void ChildrenChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            base.ChildrenChanged(sender, e);
+
+            InvalidateChildIndex();
+        }
+
+        internal void InvalidateChildIndex()
+        {
+            _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
+        }
     }
 }
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
index 308ebc69d4..d906cd359c 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
@@ -7,8 +7,8 @@ using System;
 using System.Diagnostics;
 
 using Avalonia.Input;
-using Avalonia.Input.GestureRecognizers;
 using Avalonia.Layout;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives
@@ -17,8 +17,10 @@ namespace Avalonia.Controls.Primitives
     /// Used within the template of a <see cref="T:Avalonia.Controls.DataGrid" /> to specify the
     /// location in the control's visual tree where the rows are to be added.
     /// </summary>
-    public sealed class DataGridRowsPresenter : Panel
+    public sealed class DataGridRowsPresenter : Panel, IChildIndexProvider
     {
+        private EventHandler<ChildIndexChangedEventArgs> _childIndexChanged;
+
         public DataGridRowsPresenter()
         {
             AddHandler(Gestures.ScrollGestureEvent, OnScrollGesture);
@@ -44,6 +46,29 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        event EventHandler<ChildIndexChangedEventArgs> IChildIndexProvider.ChildIndexChanged
+        {
+            add => _childIndexChanged += value;
+            remove => _childIndexChanged -= value;
+        }
+
+        int IChildIndexProvider.GetChildIndex(ILogical child)
+        {
+            return child is DataGridRow row
+                ? row.Index
+                : throw new InvalidOperationException("Invalid DataGrid child");
+        }
+
+        bool IChildIndexProvider.TryGetTotalCount(out int count)
+        {
+            return OwningGrid.DataConnection.TryGetCount(false, true, out count);
+        }
+
+        internal void InvalidateChildIndex(DataGridRow row)
+        {
+            _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs(row));
+        }
+
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.Primitives.DataGridRowsPresenter" />.
         /// </summary>
@@ -72,7 +97,7 @@ namespace Avalonia.Controls.Primitives
 
             OwningGrid.OnFillerColumnWidthNeeded(finalSize.Width);
 
-            double rowDesiredWidth = OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth + OwningGrid.ColumnsInternal.FillerColumn.FillerWidth;
+            double rowDesiredWidth = OwningGrid.RowHeadersDesiredWidth + OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth + OwningGrid.ColumnsInternal.FillerColumn.FillerWidth;
             double topEdge = -OwningGrid.NegVerticalOffset;
             foreach (Control element in OwningGrid.DisplayData.GetScrollingElements())
             {
diff --git a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
index d61c05ab6e..64769303d6 100644
--- a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
@@ -1,9 +1,5 @@
-using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
deleted file mode 100644
index 6715b7ceb9..0000000000
--- a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
+++ /dev/null
@@ -1,270 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <!--TODO: Validation and Focus-->
-
-  <Styles.Resources>
-    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">4</Thickness>
-  </Styles.Resources>
-  
-  <Style Selector="DataGridCell">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-          <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            TextBlock.Foreground="{TemplateBinding Foreground}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-          <Rectangle Name="PART_RightGridLine"
-                     Grid.Column="1"
-                     VerticalAlignment="Stretch"
-                     Width="1" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-
-          <Grid ColumnDefinitions="*,Auto"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Margin="{TemplateBinding Padding}">
-            <ContentPresenter Content="{TemplateBinding Content}" 
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-            <Path Name="SortIcon"
-                  Grid.Column="1"
-                  Fill="{TemplateBinding Foreground}"
-                  HorizontalAlignment="Left"
-                  VerticalAlignment="Center"
-                  Stretch="Uniform"
-                  Width="8"
-                  Margin="4,0,0,0"
-                  Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
-
-          </Grid>
-
-          <Rectangle Name="VerticalSeparator"
-                     Grid.Column="1" Width="1"
-                     VerticalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:dragIndicator">
-    <Setter Property="Opacity" Value="0.5"/>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="RenderTransform">
-      <Setter.Value>
-        <ScaleTransform ScaleX="0.9" ScaleY="0.9" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True"/>
-    <Setter Property="RenderTransform">
-      <Setter.Value>
-        <ScaleTransform ScaleX="0.9" ScaleY="-0.9" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="PART_Root"
-                                 RowDefinitions="*,Auto,Auto"
-                                 ColumnDefinitions="Auto,*">
-
-          <Rectangle Name="BackgroundRectangle" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
-
-          <DataGridRowHeader Grid.RowSpan="3" Name="PART_RowHeader" DataGridFrozenGrid.IsFrozen="True" />
-          <DataGridCellsPresenter Grid.Column="1" Name="PART_CellsPresenter" DataGridFrozenGrid.IsFrozen="True" />
-          <DataGridDetailsPresenter Grid.Row="1" Grid.Column="1" Name="PART_DetailsPresenter"/>
-          <Rectangle Grid.Row="2" Grid.Column="1" Name="PART_BottomGridLine" HorizontalAlignment="Stretch" Height="1" />
-
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="IsVisible" Value="True"/>
-    <Setter Property="Opacity" Value="0.5"/>
-  </Style>
-
-  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="IsVisible" Value="True"/>
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="DataGridRow:selected">
-    <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="PART_Root"
-              RowDefinitions="*,*,Auto"
-              ColumnDefinitions="Auto,*">
-          <Border Grid.RowSpan="3"
-                  Grid.ColumnSpan="2"
-                  BorderBrush="{TemplateBinding SeparatorBrush}"
-                  BorderThickness="0,0,1,0">
-            <Grid Background="{TemplateBinding Background}">
-              <Rectangle x:Name="RowInvalidVisualElement"
-                         Stretch="Fill" />
-              <Rectangle x:Name="BackgroundRectangle"
-                         Stretch="Fill" />
-            </Grid>
-          </Border>
-          <Rectangle x:Name="HorizontalSeparator"
-                     Grid.Row="2"
-                     Grid.ColumnSpan="2"
-                     Height="1"
-                     Margin="1,0,1,0"
-                     HorizontalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-          <ContentPresenter Grid.RowSpan="2"
-                            Grid.Column="1"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Content}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
-    <Setter Property="Height" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="Root"
-                                 Background="{TemplateBinding Background}"
-                                 ColumnDefinitions="Auto,Auto,Auto,Auto"
-                                 RowDefinitions="Auto,*,Auto">
-
-          <Rectangle Grid.Column="1" Grid.Row="1" Name="IndentSpacer" />
-          <ToggleButton Grid.Column="2" Grid.Row="1" Name="ExpanderButton" Margin="2,0,0,0"/>
-
-          <StackPanel Grid.Column="3" Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,1,0,1">
-            <TextBlock Name="PropertyNameElement" Margin="4,0,0,0" IsVisible="{TemplateBinding IsPropertyNameVisible}"/>
-            <TextBlock Margin="4,0,0,0" Text="{Binding Key}" />
-            <TextBlock Name="ItemCountElement" Margin="4,0,0,0" IsVisible="{TemplateBinding IsItemCountVisible}"/>
-          </StackPanel>
-
-          <DataGridRowHeader Name="RowHeader" Grid.RowSpan="3" DataGridFrozenGrid.IsFrozen="True"/>
-
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Grid.Column="0" Width="20" Height="20" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Fill="{TemplateBinding Foreground}"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Data="M 0 2 L 4 6 L 0 10 Z" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="90" />
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGrid">
-    <Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" />
-    <Setter Property="AlternatingRowBackground" Value="#00FFFFFF" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="HeadersVisibility" Value="Column" />
-    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="SelectionMode" Value="Extended" />
-    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
-    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
-    <Setter Property="DropLocationIndicatorTemplate">
-      <Template>
-        <Rectangle Fill="{DynamicResource ThemeBorderHighColor}" Width="2"/>
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}">
-          <Grid RowDefinitions="Auto,*,Auto,Auto" ColumnDefinitions="Auto,*,Auto">
-
-            <DataGridColumnHeader Name="PART_TopLeftCornerHeader" Width="22" />
-            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter" Grid.Column="1"/>
-            <DataGridColumnHeader Name="PART_TopRightCornerHeader" Grid.Column="2"/>
-            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator" Grid.ColumnSpan="3" VerticalAlignment="Bottom" StrokeThickness="1" Height="1" Fill="{DynamicResource ThemeControlMidHighBrush}"/>
-
-            <DataGridRowsPresenter Name="PART_RowsPresenter" Grid.ColumnSpan="2" Grid.Row="1">
-              <DataGridRowsPresenter.GestureRecognizers>
-                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
-              </DataGridRowsPresenter.GestureRecognizers>
-            </DataGridRowsPresenter>
-            <Rectangle Name="PART_BottomRightCorner" Fill="{DynamicResource ThemeControlMidHighBrush}" Grid.Column="2" Grid.Row="2" />
-            <Rectangle Name="BottomLeftCorner" Fill="{DynamicResource ThemeControlMidHighBrush}" Grid.Row="2" Grid.ColumnSpan="2" />
-            <ScrollBar Name="PART_VerticalScrollbar" Orientation="Vertical" Grid.Column="2" Grid.Row="1" Width="{DynamicResource ScrollBarThickness}"/>
-
-            <Grid Grid.Column="1" Grid.Row="2"
-                  ColumnDefinitions="Auto,*">
-              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
-              <ScrollBar Name="PART_HorizontalScrollbar" Grid.Column="1" Orientation="Horizontal" Height="{DynamicResource ScrollBarThickness}"/>
-            </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 432fe2c0bf..b4bae02b9b 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -1,657 +1,574 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:CompileBindings="True">
   <Styles.Resources>
-    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">12,0,12,0</Thickness>
-
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
 
     <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
     <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
-    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M1939 1581l90 -90l-1005 -1005l-1005 1005l90 90l915 -915z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M109 486 19 576 1024 1581 2029 576 1939 486 1024 1401z</StreamGeometry>
+
+    <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush"
+                     Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush"
+                     Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+
+    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush"
+                     Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+    
+    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
 
     <SolidColorBrush x:Key="DataGridGridLinesBrush"
-                     Color="{StaticResource SystemBaseMediumLowColor}"
-                     Opacity="0.4" />
-    <SolidColorBrush x:Key="DataGridDropLocationIndicatorBackground"
-                     Color="#3F4346" />
-    <SolidColorBrush x:Key="DataGridDisabledVisualElementBackground"
-                     Color="#8CFFFFFF" />
-    <SolidColorBrush x:Key="DataGridFillerGridLinesBrush"
-                     Color="Transparent" />
-    <SolidColorBrush x:Key="DataGridCurrencyVisualPrimaryBrush"
-                     Color="Transparent" />
-    <StaticResource x:Key="DataGridColumnHeaderBackgroundColor"
-                    ResourceKey="SystemAltHighColor" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush"
-                     Color="{StaticResource DataGridColumnHeaderBackgroundColor}" />
-    <StaticResource x:Key="DataGridScrollBarsSeparatorBackground"
-                    ResourceKey="SystemChromeLowColor" />
-    <StaticResource x:Key="DataGridColumnHeaderForegroundBrush"
-                    ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="DataGridColumnHeaderHoveredBackgroundColor"
-                    ResourceKey="SystemListLowColor" />
-    <StaticResource x:Key="DataGridColumnHeaderPressedBackgroundColor"
-                    ResourceKey="SystemListMediumColor" />
-    <StaticResource x:Key="DataGridColumnHeaderDraggedBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
-    <StaticResource x:Key="DataGridColumnHeaderPointerOverBrush"
-                    ResourceKey="SystemControlHighlightListLowBrush" />
-    <StaticResource x:Key="DataGridColumnHeaderPressedBrush"
-                    ResourceKey="SystemControlHighlightListMediumBrush" />
-    <StaticResource x:Key="DataGridDetailsPresenterBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
-    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush"
-                    ResourceKey="DataGridFillerGridLinesBrush" />
-    <StaticResource x:Key="DataGridRowSelectedBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity"
-                    ResourceKey="ListAccentLowOpacity" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity"
-                    ResourceKey="ListAccentMediumOpacity" />
-    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity"
-                    ResourceKey="ListAccentLowOpacity" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity"
-                    ResourceKey="ListAccentMediumOpacity" />
-    <StaticResource x:Key="DataGridRowHeaderForegroundBrush"
-                    ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="DataGridRowHeaderBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundAltHighBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundChromeMediumBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundListLowBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderPressedBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundListMediumBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderForegroundBrush"
-                    ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="DataGridRowInvalidBrush"
-                    ResourceKey="SystemErrorTextColor" />
-    <StaticResource x:Key="DataGridCellBackgroundBrush"
-                    ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="DataGridCellFocusVisualPrimaryBrush"
-                    ResourceKey="SystemControlFocusVisualPrimaryBrush" />
-    <StaticResource x:Key="DataGridCellFocusVisualSecondaryBrush"
-                    ResourceKey="SystemControlFocusVisualSecondaryBrush" />
-    <StaticResource x:Key="DataGridCellInvalidBrush"
-                    ResourceKey="SystemErrorTextColor" />
-  </Styles.Resources>
+                     Opacity="0.4"
+                     Color="{DynamicResource SystemBaseMediumLowColor}" />
+    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush"
+                     Color="{DynamicResource SystemChromeMediumLowColor}" />
+    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
+
+    <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
+      <Setter Property="Margin" Value="12,0,12,0" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+    <ControlTheme x:Key="DataGridCellTextBoxTheme" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+      <Style Selector="^ /template/ DataValidationErrors">
+        <Setter Property="Theme" Value="{StaticResource TooltipDataValidationErrors}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridCell}" TargetType="DataGridCell">
+      <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="CellBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+
+              <Rectangle x:Name="CurrencyVisual"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                         StrokeThickness="1" />
+              <Grid Grid.Column="0" x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+
+              <ContentPresenter Grid.Column="0" Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}" />
+
+              <Rectangle Grid.Column="0" x:Name="InvalidVisualElement"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellInvalidBrush}"
+                         StrokeThickness="1" />
+
+              <Rectangle Name="PART_RightGridLine"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:current /template/ Rectangle#CurrencyVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:focus /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:invalid /template/ Rectangle#InvalidVisualElement">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridColumnHeader}" TargetType="DataGridColumnHeader">
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="Padding" Value="12,0,0,0" />
+      <Setter Property="FontSize" Value="12" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="HeaderBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+              <Grid Margin="{TemplateBinding Padding}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" MinWidth="32" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                <Path Name="SortIcon"
+                      IsVisible="False"
+                      Grid.Column="1"
+                      Height="12"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      Fill="{TemplateBinding Foreground}"
+                      Stretch="Uniform" />
+              </Grid>
 
-  <Style Selector="DataGridCell">
-    <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="FontSize" Value="15" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="PART_CellRoot"
-              ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-
-          <Rectangle x:Name="CurrencyVisual"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     Fill="Transparent"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                     StrokeThickness="1" />
-          <Grid x:Name="FocusVisual"
-                IsHitTestVisible="False">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                       StrokeThickness="2" />
-            <Rectangle Margin="2"
+              <Rectangle Name="VerticalSeparator"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding SeparatorBrush}"
+                         IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+              <Grid x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle x:Name="FocusVisualPrimary"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle x:Name="FocusVisualSecondary"
+                           Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:focus-visible /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:dragIndicator">
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:sortascending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
+      </Style>
+
+      <Style Selector="^:sortdescending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
+      </Style>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="DataGridTopLeftColumnHeader" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="TopLeftHeaderRoot"
+                RowDefinitions="*,*,Auto">
+            <Border Grid.RowSpan="2"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
+            <Rectangle Grid.Row="0" Grid.RowSpan="2"
+                       VerticalAlignment="Bottom"
+                       StrokeThickness="1"
+                       Height="1"
+                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowHeader}" TargetType="DataGridRowHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="AreSeparatorsVisible" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="PART_Root"
+                RowDefinitions="*,*,Auto"
+                ColumnDefinitions="Auto,*">
+            <Border Grid.RowSpan="3"
+                    Grid.ColumnSpan="2"
+                    BorderBrush="{TemplateBinding SeparatorBrush}"
+                    BorderThickness="0,0,1,0">
+              <Grid Background="{TemplateBinding Background}">
+                <Rectangle x:Name="RowInvalidVisualElement"
+                           Opacity="0"
+                           Fill="{DynamicResource DataGridRowInvalidBrush}"
+                           Stretch="Fill" />
+                <Rectangle x:Name="BackgroundRectangle"
+                           Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                           Stretch="Fill" />
+              </Grid>
+            </Border>
+            <Rectangle x:Name="HorizontalSeparator"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2"
+                       Height="1"
+                       Margin="1,0,1,0"
                        HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                       StrokeThickness="1" />
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            <ContentPresenter Grid.RowSpan="2"
+                              Grid.Column="1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Content}" />
           </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRow}" TargetType="DataGridRow">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="RowBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DataGridFrozenGrid Name="PART_Root"
+                                ColumnDefinitions="Auto,*"
+                                RowDefinitions="*,Auto,Auto">
+
+              <Rectangle Name="BackgroundRectangle"
+                         Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                         Grid.RowSpan="2"
+                         Grid.ColumnSpan="2" />
+              <Rectangle x:Name="InvalidVisualElement"
+                         Opacity="0"
+                         Grid.ColumnSpan="2"
+                         Fill="{DynamicResource DataGridRowInvalidBrush}" />
+
+              <DataGridRowHeader Name="PART_RowHeader"
+                                 Grid.RowSpan="3"
+                                 DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                      Grid.Column="1"
+                                      DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+              <Rectangle Name="PART_BottomGridLine"
+                         Grid.Row="2"
+                         Grid.Column="1"
+                         Height="1"
+                         HorizontalAlignment="Stretch" />
 
-          <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            TextBlock.Foreground="{TemplateBinding Foreground}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-          <Rectangle x:Name="InvalidVisualElement"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCellInvalidBrush}"
-                     StrokeThickness="1" />
-
-          <Rectangle Name="PART_RightGridLine"
-                     Grid.Column="1"
-                     VerticalAlignment="Stretch"
-                     Width="1"
-                     Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridCell /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell:current /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGridCell /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell:invalid /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGridCell > TextBox DataValidationErrors">
-    <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-    <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader">
-    <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="Padding" Value="12,0,0,0" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="PART_ColumnHeaderRoot"
-              ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-
-          <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Margin="{TemplateBinding Padding}">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition MinWidth="32"
-                                Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter Content="{TemplateBinding Content}" 
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-            <Path Name="SortIcon"
-                  Grid.Column="1"
-                  Fill="{TemplateBinding Foreground}"
+            </DataGridFrozenGrid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:nth-child(even)">
+        <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+      </Style>
+
+      <Style Selector="^:invalid">
+        <Style Selector="^ /template/ Rectangle#InvalidVisualElement">
+          <Setter Property="Opacity" Value="0.4" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Opacity" Value="0" />
+        </Style>
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+      </Style>
+
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="FluentDataGridRowGroupExpanderButtonTheme" TargetType="ToggleButton">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Width="12"
+                  Height="12"
+                  Background="Transparent"
                   HorizontalAlignment="Center"
+                  VerticalAlignment="Center">
+            <Path Fill="{TemplateBinding Foreground}"
+                  Data="{StaticResource DataGridRowGroupHeaderIconOpenedPath}"
+                  HorizontalAlignment="Right"
                   VerticalAlignment="Center"
-                  Stretch="Uniform"
-                  Height="12" />
-          </Grid>
-
-          <Rectangle Name="VerticalSeparator"
-                     Grid.Column="1"
-                     Width="1"
-                     VerticalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-          <Grid x:Name="FocusVisual"
-                IsHitTestVisible="False">
-            <Rectangle x:Name="FocusVisualPrimary"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                       StrokeThickness="2" />
-            <Rectangle x:Name="FocusVisualSecondary"
-                       Margin="2"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                       StrokeThickness="1" />
-          </Grid>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridColumnHeader:focus-visible /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundColor}" />
-  </Style>
-  <Style Selector="DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundColor}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:dragIndicator">
-    <Setter Property="Opacity" Value="0.5" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="PART_Root"
-                            RowDefinitions="*,Auto,Auto"
-                            ColumnDefinitions="Auto,*">
-
-          <Rectangle Name="BackgroundRectangle"
-                     Grid.RowSpan="2"
-                     Grid.ColumnSpan="2" />
-          <Rectangle x:Name="InvalidVisualElement"
-                     Grid.ColumnSpan="2"
-                     Fill="{DynamicResource DataGridRowInvalidBrush}" />
-
-          <DataGridRowHeader Name="PART_RowHeader"
-                             Grid.RowSpan="3"
-                             DataGridFrozenGrid.IsFrozen="True" />
-          <DataGridCellsPresenter Name="PART_CellsPresenter"
-                                  Grid.Column="1"
-                                  DataGridFrozenGrid.IsFrozen="True" />
-          <DataGridDetailsPresenter Name="PART_DetailsPresenter"
-                                    Grid.Row="1"
-                                    Grid.Column="1"
-                                    Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
-          <Rectangle Name="PART_BottomGridLine"
-                     Grid.Row="2"
-                     Grid.Column="1"
-                     HorizontalAlignment="Stretch"
-                     Height="1" />
-
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="DataGridRow:invalid /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="Opacity" Value="0.4" />
-  </Style>
-  <Style Selector="DataGridRow:invalid /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemControlTransparentBrush}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemListLowColor}" />
-  </Style>
-  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowHeaderBackgroundBrush}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="AreSeparatorsVisible" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="PART_Root"
-              RowDefinitions="*,*,Auto"
-              ColumnDefinitions="Auto,*">
-          <Border Grid.RowSpan="3"
-                  Grid.ColumnSpan="2"
-                  BorderBrush="{TemplateBinding SeparatorBrush}"
-                  BorderThickness="0,0,1,0">
-            <Grid Background="{TemplateBinding Background}">
-              <Rectangle x:Name="RowInvalidVisualElement"
-                         Fill="{DynamicResource DataGridRowInvalidBrush}"
-                         Stretch="Fill" />
-              <Rectangle x:Name="BackgroundRectangle"
-                         Stretch="Fill" />
-            </Grid>
+                  Stretch="Uniform" />
           </Border>
-          <Rectangle x:Name="HorizontalSeparator"
-                     Grid.Row="2"
-                     Grid.ColumnSpan="2"
-                     Height="1"
-                     Margin="1,0,1,0"
-                     HorizontalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-          <ContentPresenter Grid.RowSpan="2"
-                            Grid.Column="1"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Content}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowHeader /template/ Rectangle#RowInvalidVisualElement">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#RowInvalidVisualElement">
-    <Setter Property="Opacity" Value="0.4" />
-  </Style>
-  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemControlTransparentBrush}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemListLowColor}" />
-  </Style>
-  <Style Selector="DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundColor}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
-    <Setter Property="FontSize" Value="15" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="PART_Root"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            ColumnDefinitions="Auto,Auto,Auto,Auto,*"
-                            RowDefinitions="*,Auto">
-
-          <Rectangle Name="IndentSpacer"
-                     Grid.Column="1" />
-          <ToggleButton Name="ExpanderButton"
-                        Grid.Column="2"
-                        Width="12"
-                        Height="12"
-                        Margin="12,0,0,0"
-                        Background="{TemplateBinding Background}"
-                        Foreground="{TemplateBinding Foreground}"
-                        Focusable="False" />
-
-          <StackPanel Grid.Column="3"
-                      Orientation="Horizontal"
-                      VerticalAlignment="Center"
-                      Margin="12,0,0,0">
-            <TextBlock Name="PropertyNameElement"
-                       Margin="4,0,0,0"
-                       IsVisible="{TemplateBinding IsPropertyNameVisible}"
-                       Foreground="{TemplateBinding Foreground}" />
-            <TextBlock Margin="4,0,0,0"
-                       Text="{Binding Key}"
-                       Foreground="{TemplateBinding Foreground}" />
-            <TextBlock Name="ItemCountElement"
-                       Margin="4,0,0,0"
-                       IsVisible="{TemplateBinding IsItemCountVisible}"
-                       Foreground="{TemplateBinding Foreground}" />
-          </StackPanel>
-
-          <Rectangle x:Name="CurrencyVisual"
-                     Grid.ColumnSpan="5"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     Fill="Transparent"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                     StrokeThickness="1" />
-          <Grid x:Name="FocusVisual"
-                Grid.ColumnSpan="5"
-                IsHitTestVisible="False">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                       StrokeThickness="2" />
-            <Rectangle Margin="2"
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:checked /template/ Path">
+        <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataGridFrozenGrid Name="PART_Root"
+                              Background="{TemplateBinding Background}"
+                              MinHeight="{TemplateBinding MinHeight}"
+                              ColumnDefinitions="Auto,Auto,Auto,Auto,*"
+                              RowDefinitions="*,Auto">
+
+            <Rectangle Name="PART_IndentSpacer"
+                       Grid.Column="1" />
+            <ToggleButton Name="PART_ExpanderButton"
+                          Grid.Column="2"
+                          Width="12"
+                          Height="12"
+                          Margin="12,0,0,0"
+                          Theme="{StaticResource FluentDataGridRowGroupExpanderButtonTheme}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Background="{TemplateBinding Background}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Focusable="False"
+                          Foreground="{TemplateBinding Foreground}" />
+
+            <StackPanel Grid.Column="3"
+                        Orientation="Horizontal"
+                        VerticalAlignment="Center"
+                        Margin="12,0,0,0">
+              <TextBlock Name="PART_PropertyNameElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsPropertyNameVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Margin="4,0,0,0"
+                         Text="{ReflectionBinding Key}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Name="PART_ItemCountElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsItemCountVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+            </StackPanel>
+
+            <Rectangle x:Name="CurrencyVisual"
+                       Grid.ColumnSpan="5"
+                       IsVisible="False"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
                        Fill="Transparent"
                        IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
                        StrokeThickness="1" />
-          </Grid>
+            <Grid x:Name="FocusVisual"
+                  Grid.ColumnSpan="5"
+                  IsVisible="False"
+                  IsHitTestVisible="False">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+            </Grid>
 
-          <DataGridRowHeader Name="PART_RowHeader"
-                             Grid.RowSpan="2"
-                             DataGridFrozenGrid.IsFrozen="True" />
-
-          <Rectangle x:Name="PART_BottomGridLine"
-                     Grid.Row="1"
-                     Grid.ColumnSpan="5"
-                     Height="1" />
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Grid.Column="0"
-                Width="12"
-                Height="12"
-                Background="Transparent"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-          <Path Fill="{TemplateBinding Foreground}"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Stretch="Uniform" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton /template/ Path">
-    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
-    <Setter Property="Stretch" Value="Uniform" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
-    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
-    <Setter Property="Stretch" Value="UniformToFill" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{Binding $parent[DataGridRowGroupHeader].Background}" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:pointerover /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderHoveredBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:pressed /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderPressedBackgroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:current /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGrid:focus DataGridRowGroupHeader:current /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGrid">
-    <Setter Property="RowBackground" Value="Transparent" />
-    <Setter Property="AlternatingRowBackground" Value="Transparent" />
-    <Setter Property="HeadersVisibility" Value="Column" />
-    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="SelectionMode" Value="Extended" />
-    <Setter Property="GridLinesVisibility" Value="None" />
-    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="DropLocationIndicatorTemplate">
-      <Template>
-        <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
-                   Width="2" />
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}">
-          <Grid RowDefinitions="Auto,*,Auto,Auto"
-                ColumnDefinitions="Auto,*,Auto">
-            <Grid.Resources>
-              <ControlTemplate x:Key="TopLeftHeaderTemplate"
-                               TargetType="DataGridColumnHeader">
-                <Grid x:Name="TopLeftHeaderRoot"
-                      RowDefinitions="*,*,Auto">
-                  <Border Grid.RowSpan="2"
-                          BorderThickness="0,0,1,0"
-                          BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
-                  <Rectangle Grid.RowSpan="2"
-                             VerticalAlignment="Bottom"
-                             StrokeThickness="1"
-                             Height="1"
-                             Fill="{DynamicResource DataGridGridLinesBrush}" />
-                </Grid>
-              </ControlTemplate>
-              <ControlTemplate x:Key="TopRightHeaderTemplate"
-                               TargetType="DataGridColumnHeader">
-                <Grid x:Name="RootElement" />
-              </ControlTemplate>
-            </Grid.Resources>
-
-            <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
-                                  Template="{StaticResource TopLeftHeaderTemplate}" />
-            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
-                                            Grid.Column="1"
-                                            Grid.ColumnSpan="2" />
-            <!--<DataGridColumnHeader Name="PART_TopRightCornerHeader"
-                                  Grid.Column="2"
-                                  Template="{StaticResource TopRightHeaderTemplate}" />-->
-            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Bottom"
-                       Height="1"
-                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+            <DataGridRowHeader Name="PART_RowHeader"
+                               Grid.RowSpan="2"
+                               DataGridFrozenGrid.IsFrozen="True" />
 
-            <DataGridRowsPresenter Name="PART_RowsPresenter"
-                                   Grid.Row="1"
-                                   Grid.RowSpan="2"
-                                   Grid.ColumnSpan="3">
-              <DataGridRowsPresenter.GestureRecognizers>
-                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
-              </DataGridRowsPresenter.GestureRecognizers>
-            </DataGridRowsPresenter>
-            <Rectangle Name="PART_BottomRightCorner"
-                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
-                       Grid.Column="2"
-                       Grid.Row="2" />
-            <!--<Rectangle Name="BottomLeftCorner"
-                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
-                       Grid.Row="2"
-                       Grid.ColumnSpan="2" />-->
-            <ScrollBar Name="PART_VerticalScrollbar"
-                       Orientation="Vertical"
-                       Grid.Column="2"
+            <Rectangle x:Name="PART_BottomGridLine"
                        Grid.Row="1"
-                       Width="{DynamicResource ScrollBarSize}" />
-
-            <Grid Grid.Column="1"
-                  Grid.Row="2"
-                  ColumnDefinitions="Auto,*">
-              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
-              <ScrollBar Name="PART_HorizontalScrollbar"
-                         Grid.Column="1"
-                         Orientation="Horizontal"
-                         Height="{DynamicResource ScrollBarSize}" />
+                       Grid.ColumnSpan="5"
+                       Height="1" />
+          </DataGridFrozenGrid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGrid}" TargetType="DataGrid">
+      <Setter Property="RowBackground" Value="Transparent" />
+      <Setter Property="AlternatingRowBackground" Value="Transparent" />
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="SelectionMode" Value="Extended" />
+      <Setter Property="GridLinesVisibility" Value="None" />
+      <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="DropLocationIndicatorTemplate">
+        <Template>
+          <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
+                     Width="2" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="DataGridBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
+              <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                    Theme="{StaticResource DataGridTopLeftColumnHeader}" />
+              <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                              Grid.Column="1"
+                                              Grid.Row="0" Grid.ColumnSpan="2" />
+              <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                         Grid.Row="0" Grid.ColumnSpan="3" Grid.Column="0"
+                         VerticalAlignment="Bottom"
+                         Height="1"
+                         Fill="{DynamicResource DataGridGridLinesBrush}" />
+
+              <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                     Grid.Row="1"
+                                     Grid.RowSpan="2"
+                                     Grid.ColumnSpan="3" Grid.Column="0">
+                <DataGridRowsPresenter.GestureRecognizers>
+                  <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+                </DataGridRowsPresenter.GestureRecognizers>
+              </DataGridRowsPresenter>
+              <Rectangle Name="PART_BottomRightCorner"
+                         Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                         Grid.Column="2"
+                         Grid.Row="2" />
+              <ScrollBar Name="PART_VerticalScrollbar"
+                         Orientation="Vertical"
+                         Grid.Column="2"
+                         Grid.Row="1"
+                         Width="{DynamicResource ScrollBarSize}" />
+
+              <Grid Grid.Column="1"
+                    Grid.Row="2"
+                    ColumnDefinitions="Auto,*">
+                <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+                <ScrollBar Name="PART_HorizontalScrollbar"
+                           Grid.Column="1"
+                           Orientation="Horizontal"
+                           Height="{DynamicResource ScrollBarSize}" />
+              </Grid>
+              <Border x:Name="PART_DisabledVisualElement"
+                      Grid.ColumnSpan="3" Grid.Column="0"
+                      Grid.Row="0" Grid.RowSpan="4"
+                      IsHitTestVisible="False"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      CornerRadius="2"
+                      Background="{DynamicResource DataGridDisabledVisualElementBackground}"
+                      IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
             </Grid>
-            <Border x:Name="PART_DisabledVisualElement"
-                    Grid.ColumnSpan="3"
-                    Grid.RowSpan="4"
-                    IsHitTestVisible="False"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    CornerRadius="2"
-                    Background="{DynamicResource DataGridDisabledVisualElementBackground}"
-                    IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGrid:empty-columns /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:empty-columns">
+        <Style Selector="^ /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+      </Style>
+    </ControlTheme>
+  </Styles.Resources>
 </Styles>
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
new file mode 100644
index 0000000000..b43addff86
--- /dev/null
+++ b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
@@ -0,0 +1,377 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">4</Thickness>
+    <ControlTheme x:Key="DataGridCellTextBlockTheme"
+                  TargetType="TextBlock">
+      <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+    <ControlTheme x:Key="DataGridCellTextBoxTheme"
+                  BasedOn="{StaticResource {x:Type TextBox}}"
+                  TargetType="TextBox">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridCell}"
+                  TargetType="DataGridCell">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="CellBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="*,Auto">
+              <ContentPresenter Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}" />
+
+              <Rectangle Name="PART_RightGridLine"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridColumnHeader}"
+                  TargetType="DataGridColumnHeader">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
+      <Setter Property="Padding" Value="4" />
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="HeaderBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="*,Auto">
+
+              <Grid Margin="{TemplateBinding Padding}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    ColumnDefinitions="*,Auto">
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                <Path Name="SortIcon"
+                      Grid.Column="1"
+                      Width="8"
+                      Margin="4,0,0,0"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "
+                      Fill="{TemplateBinding Foreground}"
+                      IsVisible="False"
+                      Stretch="Uniform" />
+
+              </Grid>
+
+              <Rectangle Name="VerticalSeparator"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding SeparatorBrush}"
+                         IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:focus-visible /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:dragIndicator">
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:sortascending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:sortdescending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="RenderTransform">
+          <Setter.Value>
+            <ScaleTransform ScaleX="1" ScaleY="-1" />
+          </Setter.Value>
+        </Setter>
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowHeader}"
+                  TargetType="DataGridRowHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="PART_Root"
+                ColumnDefinitions="Auto,*"
+                RowDefinitions="*,*,Auto">
+            <Border Grid.RowSpan="3"
+                    Grid.ColumnSpan="2"
+                    BorderBrush="{TemplateBinding SeparatorBrush}"
+                    BorderThickness="0,0,1,0">
+              <Grid Background="{TemplateBinding Background}">
+                <Rectangle x:Name="RowInvalidVisualElement"
+                           Stretch="Fill" />
+                <Rectangle x:Name="BackgroundRectangle"
+                           Stretch="Fill" />
+              </Grid>
+            </Border>
+            <Rectangle x:Name="HorizontalSeparator"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2"
+                       Height="1"
+                       Margin="1,0,1,0"
+                       HorizontalAlignment="Stretch"
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            <ContentPresenter Grid.RowSpan="2"
+                              Grid.Column="1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Content}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRow}"
+                  TargetType="DataGridRow">
+      <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="RowBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DataGridFrozenGrid Name="PART_Root"
+                                ColumnDefinitions="Auto,*"
+                                RowDefinitions="*,Auto,Auto">
+
+              <Rectangle Name="BackgroundRectangle"
+                         Grid.RowSpan="2"
+                         Grid.ColumnSpan="2" />
+
+              <DataGridRowHeader Name="PART_RowHeader"
+                                 Grid.RowSpan="3"
+                                 DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                      Grid.Column="1"
+                                      DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                        Grid.Row="1"
+                                        Grid.Column="1" />
+              <Rectangle Name="PART_BottomGridLine"
+                         Grid.Row="2"
+                         Grid.Column="1"
+                         Height="1"
+                         HorizontalAlignment="Stretch" />
+
+            </DataGridFrozenGrid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:nth-child(even)">
+        <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+      </Style>
+
+      <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="IsVisible" Value="False" />
+        <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:selected /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+
+      <Style Selector="^:selected">
+        <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="SimpleDataGridRowGroupExpanderButtonTheme"
+                  TargetType="ToggleButton">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Grid.Column="0"
+                  Width="20"
+                  Height="20"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Background="Transparent">
+            <Path HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M 0 2 L 4 6 L 0 10 Z"
+                  Fill="{TemplateBinding Foreground}" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:checked /template/ Path">
+        <Setter Property="RenderTransform">
+          <RotateTransform Angle="90" />
+        </Setter>
+      </Style>
+    </ControlTheme>
+
+
+    <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}"
+                  TargetType="DataGridRowGroupHeader">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataGridFrozenGrid Name="Root"
+                              ColumnDefinitions="Auto,Auto,Auto,Auto"
+                              RowDefinitions="Auto,*,Auto">
+
+            <Rectangle Name="PART_IndentSpacer"
+                       Grid.Row="1"
+                       Grid.Column="1" />
+            <ToggleButton Name="PART_ExpanderButton"
+                          Grid.Row="1"
+                          Grid.Column="2"
+                          Margin="2,0,0,0"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Foreground="{TemplateBinding Foreground}"
+                          Theme="{StaticResource SimpleDataGridRowGroupExpanderButtonTheme}" />
+
+            <StackPanel Grid.Row="1"
+                        Grid.Column="3"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+              <TextBlock Name="PART_PropertyNameElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsPropertyNameVisible}" />
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding Key}" />
+              <TextBlock Name="PART_ItemCountElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsItemCountVisible}" />
+            </StackPanel>
+
+            <DataGridRowHeader Name="RowHeader"
+                               Grid.RowSpan="3"
+                               DataGridFrozenGrid.IsFrozen="True" />
+
+          </DataGridFrozenGrid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGrid}"
+                  TargetType="DataGrid">
+      <Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" />
+      <Setter Property="AlternatingRowBackground" Value="#00FFFFFF" />
+      <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="SelectionMode" Value="Extended" />
+      <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+      <Setter Property="DropLocationIndicatorTemplate">
+        <Template>
+          <Rectangle Width="2"
+                     Fill="{DynamicResource ThemeBorderHighColor}" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="DataGridBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*,Auto"
+                  RowDefinitions="Auto,*,Auto,Auto">
+              <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                    Width="22" />
+              <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                              Grid.Column="1" />
+              <DataGridColumnHeader Name="PART_TopRightCornerHeader"
+                                    Grid.Column="2" />
+              <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                         Grid.ColumnSpan="3"
+                         Height="1"
+                         VerticalAlignment="Bottom"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}"
+                         StrokeThickness="1" />
+
+              <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                     Grid.Row="1"
+                                     Grid.ColumnSpan="2">
+                <DataGridRowsPresenter.GestureRecognizers>
+                  <ScrollGestureRecognizer CanHorizontallyScroll="True"
+                                           CanVerticallyScroll="True" />
+                </DataGridRowsPresenter.GestureRecognizers>
+              </DataGridRowsPresenter>
+              <Rectangle Name="PART_BottomRightCorner"
+                         Grid.Row="2"
+                         Grid.Column="2"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Rectangle Name="BottomLeftCorner"
+                         Grid.Row="2"
+                         Grid.ColumnSpan="2"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <ScrollBar Name="PART_VerticalScrollbar"
+                         Grid.Row="1"
+                         Grid.Column="2"
+                         Width="{DynamicResource ScrollBarThickness}"
+                         Orientation="Vertical" />
+
+              <Grid Grid.Row="2"
+                    Grid.Column="1"
+                    ColumnDefinitions="Auto,*">
+                <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+                <ScrollBar Name="PART_HorizontalScrollbar"
+                           Grid.Column="1"
+                           Height="{DynamicResource ScrollBarThickness}"
+                           Orientation="Horizontal" />
+              </Grid>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  </Styles.Resources>
+</Styles>
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
index 2c206b53f6..33e5efbc15 100644
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ b/src/Avalonia.Controls/ApiCompatBaseline.txt
@@ -1,9 +1,17 @@
 Compat issues with assembly Avalonia.Controls:
+MembersMustExist : Member 'protected void Avalonia.Controls.Button.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ButtonSpinner.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.CalendarDatePicker.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ContextMenu.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'Avalonia.Controls.DropDown' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'Avalonia.Controls.DropDownItem' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Expander.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick.get()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.IMenuItem.StaysOpenOnClick.set(System.Boolean)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseClosed()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseOpening()' is present in the implementation but not in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ItemsRepeater.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.DirectProperty<Avalonia.Controls.NumericUpDown, System.Double> Avalonia.DirectProperty<Avalonia.Controls.NumericUpDown, System.Double> Avalonia.Controls.NumericUpDown.ValueProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Double> Avalonia.StyledProperty<System.Double> Avalonia.Controls.NumericUpDown.IncrementProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Double> Avalonia.StyledProperty<System.Double> Avalonia.Controls.NumericUpDown.MaximumProperty' does not exist in the implementation but it does exist in the contract.
@@ -28,10 +36,35 @@ MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDown.Value.set
 MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDownValueChangedEventArgs..ctor(Avalonia.Interactivity.RoutedEvent, System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.NewValue.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.OldValue.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ProgressBar.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Boolean> Avalonia.StyledProperty<System.Boolean> Avalonia.Controls.ScrollViewer.AllowAutoHideProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Slider.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.FontFamily> Avalonia.AttachedProperty<Avalonia.Media.FontFamily> Avalonia.Controls.TextBlock.FontFamilyProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.FontStyle> Avalonia.AttachedProperty<Avalonia.Media.FontStyle> Avalonia.Controls.TextBlock.FontStyleProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.FontWeight> Avalonia.AttachedProperty<Avalonia.Media.FontWeight> Avalonia.Controls.TextBlock.FontWeightProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.IBrush> Avalonia.AttachedProperty<Avalonia.Media.IBrush> Avalonia.Controls.TextBlock.ForegroundProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<System.Double> Avalonia.AttachedProperty<System.Double> Avalonia.Controls.TextBlock.FontSizeProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Media.TextAlignment> Avalonia.StyledProperty<Avalonia.Media.TextAlignment> Avalonia.Controls.TextBlock.TextAlignmentProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Media.TextTrimming> Avalonia.StyledProperty<Avalonia.Media.TextTrimming> Avalonia.Controls.TextBlock.TextTrimmingProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Media.TextWrapping> Avalonia.StyledProperty<Avalonia.Media.TextWrapping> Avalonia.Controls.TextBlock.TextWrappingProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<System.Double> Avalonia.StyledProperty<System.Double> Avalonia.Controls.TextBlock.LineHeightProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<System.Int32> Avalonia.StyledProperty<System.Int32> Avalonia.Controls.TextBlock.MaxLinesProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.FontFamily Avalonia.Controls.TextBlock.GetFontFamily(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public System.Double Avalonia.Controls.TextBlock.GetFontSize(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.FontStyle Avalonia.Controls.TextBlock.GetFontStyle(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.FontWeight Avalonia.Controls.TextBlock.GetFontWeight(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.IBrush Avalonia.Controls.TextBlock.GetForeground(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontFamily(Avalonia.Controls.Control, Avalonia.Media.FontFamily)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontSize(Avalonia.Controls.Control, System.Double)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontStyle(Avalonia.Controls.Control, Avalonia.Media.FontStyle)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontWeight(Avalonia.Controls.Control, Avalonia.Media.FontWeight)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetForeground(Avalonia.Controls.Control, Avalonia.Media.IBrush)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.TextBox.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.TopLevel' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Viewbox' does not inherit from base type 'Avalonia.Controls.Decorator' in the implementation but it does in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Window' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Window.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.WindowBase' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs> Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.ShutdownRequested' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.add_ShutdownRequested(System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs>)' is present in the implementation but not in the contract.
@@ -42,13 +75,22 @@ MembersMustExist : Member 'public System.Action<Avalonia.Size> Avalonia.Controls
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.set(System.Action<Avalonia.Size>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Notifications.WindowNotificationManager.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.Platform.ITopLevelNativeMenuExporter.SetNativeMenu(Avalonia.Controls.NativeMenu)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'protected void Avalonia.Controls.Presenters.ScrollContentPresenter.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected Avalonia.Media.FormattedText Avalonia.Controls.Presenters.TextPresenter.CreateFormattedText()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Media.FormattedText Avalonia.Controls.Presenters.TextPresenter.FormattedText.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Int32 Avalonia.Controls.Presenters.TextPresenter.GetCaretIndex(Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected void Avalonia.Controls.Presenters.TextPresenter.InvalidateFormattedText()' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Primitives.PopupRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.ScrollBar.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.SelectingItemsControl.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.Track.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'Avalonia.Platform.ExportWindowingSubsystemAttribute' does not exist in the implementation but it does exist in the contract.
 EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromPoint(Avalonia.PixelPoint)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromRect(Avalonia.PixelRect)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize.get()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Action<Avalonia.Size, Avalonia.Platform.PlatformResizeReason> Avalonia.Platform.ITopLevelImpl.Resized.get()' is present in the implementation but not in the contract.
@@ -67,4 +109,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platfor
 MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.ITrayIconImpl Avalonia.Platform.IWindowingPlatform.CreateTrayIcon()' is present in the implementation but not in the contract.
-Total Issues: 68
+Total Issues: 110
diff --git a/src/Avalonia.Controls/AppBuilder.cs b/src/Avalonia.Controls/AppBuilder.cs
new file mode 100644
index 0000000000..5bcd87162e
--- /dev/null
+++ b/src/Avalonia.Controls/AppBuilder.cs
@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Initializes platform-specific services for an <see cref="Application"/>.
+    /// </summary>
+    public sealed class AppBuilder : AppBuilderBase<AppBuilder>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppBuilder"/> class.
+        /// </summary>
+        public AppBuilder()
+            : base(new StandardRuntimePlatform(),
+                builder => StandardRuntimePlatformServices.Register(builder.ApplicationType?.Assembly))
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 8779ae9122..1dfad7dcc5 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -120,38 +119,8 @@ namespace Avalonia.Controls
             return Self;
         }
 
-        /// <summary>
-        /// Starts the application with an instance of <typeparamref name="TMainWindow"/>.
-        /// </summary>
-        /// <typeparam name="TMainWindow">The window type.</typeparam>
-        /// <param name="dataContextProvider">A delegate that will be called to create a data context for the window (optional).</param>
-        [Obsolete("Use either lifetimes or AppMain overload. See see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details")]
-        public void Start<TMainWindow>(Func<object>? dataContextProvider = null)
-            where TMainWindow : Window, new()
-        {
-            AfterSetup(builder =>
-            {
-                var window = new TMainWindow();
-                if (dataContextProvider != null)
-                    window.DataContext = dataContextProvider();
-                ((IClassicDesktopStyleApplicationLifetime)builder.Instance!.ApplicationLifetime!)
-                    .MainWindow = window;
-            });
-            
-            // Copy-pasted because we can't call extension methods due to generic constraints
-            var lifetime = new ClassicDesktopStyleApplicationLifetime() {ShutdownMode = ShutdownMode.OnMainWindowClose};
-            SetupWithLifetime(lifetime);
-            lifetime.Start(Array.Empty<string>());
-        }
-
         public delegate void AppMainDelegate(Application app, string[] args);
-
-        [Obsolete("Use either lifetimes or AppMain overload. See see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details", true)]
-        public void Start()
-        {
-            throw new NotSupportedException();
-        }
-
+        
         public void Start(AppMainDelegate main, string[] args)
         {
             Setup();
@@ -234,13 +203,16 @@ namespace Avalonia.Controls
 
         protected virtual bool CheckSetup => true;
 
+        /// <summary>
+        /// Searches and initiates modules included with <see cref="ExportAvaloniaModuleAttribute"/> attribute.
+        /// </summary>
         private void SetupAvaloniaModules()
         {
             var moduleInitializers = from assembly in AppDomain.CurrentDomain.GetAssemblies()
                                      from attribute in assembly.GetCustomAttributes<ExportAvaloniaModuleAttribute>()
-                                     where attribute.ForWindowingSubsystem == ""
+                                     where string.IsNullOrEmpty(attribute.ForWindowingSubsystem)
                                       || attribute.ForWindowingSubsystem == WindowingSubsystemName
-                                     where attribute.ForRenderingSubsystem == ""
+                                     where string.IsNullOrEmpty(attribute.ForRenderingSubsystem)
                                       || attribute.ForRenderingSubsystem == RenderingSubsystemName
                                      group attribute by attribute.Name into exports
                                      select (from export in exports
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index 76e2d3a161..c59458311c 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -65,7 +65,7 @@ namespace Avalonia.Controls.ApplicationLifetimes
         /// <inheritdoc/>
         public Window? MainWindow { get; set; }
 
-        public IReadOnlyList<Window> Windows => _windows.ToList();
+        public IReadOnlyList<Window> Windows => _windows.ToArray();
 
         private void HandleWindowClosed(Window window)
         {
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs
index 9860d0cb38..b38a539d4a 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls.ApplicationLifetimes
 {
+    [NotClientImplementable]
     public interface IApplicationLifetime
     {
         
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
index 2bd5c1238d..4b88f6b537 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.ApplicationLifetimes
 {
     /// <summary>
     /// Controls application lifetime in classic desktop style
     /// </summary>
+    [NotClientImplementable]
     public interface IClassicDesktopStyleApplicationLifetime : IControlledApplicationLifetime
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs
index 3f61aeb536..d7eda790df 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.ApplicationLifetimes
 {
+    [NotClientImplementable]
     public interface IControlledApplicationLifetime : IApplicationLifetime
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs
index e25815602e..480c65e5ad 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls.ApplicationLifetimes
 {
+    [NotClientImplementable]
     public interface ISingleViewApplicationLifetime : IApplicationLifetime
     {
         Control? MainView { get; set; }
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
deleted file mode 100644
index 930e250334..0000000000
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ /dev/null
@@ -1,2827 +0,0 @@
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia.Collections;
-using Avalonia.Controls.Metadata;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Controls.Utils;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Provides data for the
-    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
-    /// event.
-    /// </summary>
-    public class PopulatedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets the list of possible matches added to the drop-down portion of
-        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
-        /// control.
-        /// </summary>
-        /// <value>The list of possible matches added to the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
-        public IEnumerable Data { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />.
-        /// </summary>
-        /// <param name="data">The list of possible matches added to the
-        /// drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
-        public PopulatedEventArgs(IEnumerable data)
-        {
-            Data = data;
-        }
-    }
-
-    /// <summary>
-    /// Provides data for the
-    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
-    /// event.
-    /// </summary>
-    public class PopulatingEventArgs : CancelEventArgs
-    {
-        /// <summary>
-        /// Gets the text that is used to determine which items to display in
-        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
-        /// control.
-        /// </summary>
-        /// <value>The text that is used to determine which items to display in
-        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
-        public string? Parameter { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" />.
-        /// </summary>
-        /// <param name="parameter">The value of the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
-        /// property, which is used to filter items for the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
-        public PopulatingEventArgs(string? parameter)
-        {
-            Parameter = parameter;
-        }
-    }
-
-    /// <summary>
-    /// Represents the filter used by the
-    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control to
-    /// determine whether an item is a possible match for the specified text.
-    /// </summary>
-    /// <returns>true to indicate <paramref name="item" /> is a possible match
-    /// for <paramref name="search" />; otherwise false.</returns>
-    /// <param name="search">The string used as the basis for filtering.</param>
-    /// <param name="item">The item that is compared with the
-    /// <paramref name="search" /> parameter.</param>
-    /// <typeparam name="T">The type used for filtering the
-    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />. This type can
-    /// be either a string or an object.</typeparam>
-    public delegate bool AutoCompleteFilterPredicate<T>(string? search, T item);
-
-    /// <summary>
-    /// Specifies how text in the text box portion of the
-    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control is used
-    /// to filter items specified by the
-    /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-    /// property for display in the drop-down.
-    /// </summary>
-    public enum AutoCompleteFilterMode
-    {
-        /// <summary>
-        /// Specifies that no filter is used. All items are returned.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Specifies a culture-sensitive, case-insensitive filter where the
-        /// returned items start with the specified text. The filter uses the
-        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
-        /// method, specifying
-        /// <see cref="P:System.StringComparer.CurrentCultureIgnoreCase" /> as
-        /// the string comparison criteria.
-        /// </summary>
-        StartsWith = 1,
-
-        /// <summary>
-        /// Specifies a culture-sensitive, case-sensitive filter where the
-        /// returned items start with the specified text. The filter uses the
-        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
-        /// method, specifying
-        /// <see cref="P:System.StringComparer.CurrentCulture" /> as the string
-        /// comparison criteria.
-        /// </summary>
-        StartsWithCaseSensitive = 2,
-
-        /// <summary>
-        /// Specifies an ordinal, case-insensitive filter where the returned
-        /// items start with the specified text. The filter uses the
-        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
-        /// method, specifying
-        /// <see cref="P:System.StringComparer.OrdinalIgnoreCase" /> as the
-        /// string comparison criteria.
-        /// </summary>
-        StartsWithOrdinal = 3,
-
-        /// <summary>
-        /// Specifies an ordinal, case-sensitive filter where the returned items
-        /// start with the specified text. The filter uses the
-        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
-        /// method, specifying <see cref="P:System.StringComparer.Ordinal" /> as
-        /// the string comparison criteria.
-        /// </summary>
-        StartsWithOrdinalCaseSensitive = 4,
-
-        /// <summary>
-        /// Specifies a culture-sensitive, case-insensitive filter where the
-        /// returned items contain the specified text.
-        /// </summary>
-        Contains = 5,
-
-        /// <summary>
-        /// Specifies a culture-sensitive, case-sensitive filter where the
-        /// returned items contain the specified text.
-        /// </summary>
-        ContainsCaseSensitive = 6,
-
-        /// <summary>
-        /// Specifies an ordinal, case-insensitive filter where the returned
-        /// items contain the specified text.
-        /// </summary>
-        ContainsOrdinal = 7,
-
-        /// <summary>
-        /// Specifies an ordinal, case-sensitive filter where the returned items
-        /// contain the specified text.
-        /// </summary>
-        ContainsOrdinalCaseSensitive = 8,
-
-        /// <summary>
-        /// Specifies a culture-sensitive, case-insensitive filter where the
-        /// returned items equal the specified text. The filter uses the
-        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
-        /// method, specifying
-        /// <see cref="P:System.StringComparer.CurrentCultureIgnoreCase" /> as
-        /// the search comparison criteria.
-        /// </summary>
-        Equals = 9,
-
-        /// <summary>
-        /// Specifies a culture-sensitive, case-sensitive filter where the
-        /// returned items equal the specified text. The filter uses the
-        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
-        /// method, specifying
-        /// <see cref="P:System.StringComparer.CurrentCulture" /> as the string
-        /// comparison criteria.
-        /// </summary>
-        EqualsCaseSensitive = 10,
-
-        /// <summary>
-        /// Specifies an ordinal, case-insensitive filter where the returned
-        /// items equal the specified text. The filter uses the
-        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
-        /// method, specifying
-        /// <see cref="P:System.StringComparer.OrdinalIgnoreCase" /> as the
-        /// string comparison criteria.
-        /// </summary>
-        EqualsOrdinal = 11,
-
-        /// <summary>
-        /// Specifies an ordinal, case-sensitive filter where the returned items
-        /// equal the specified text. The filter uses the
-        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
-        /// method, specifying <see cref="P:System.StringComparer.Ordinal" /> as
-        /// the string comparison criteria.
-        /// </summary>
-        EqualsOrdinalCaseSensitive = 12,
-
-        /// <summary>
-        /// Specifies that a custom filter is used. This mode is used when the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
-        /// or
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
-        /// properties are set.
-        /// </summary>
-        Custom = 13,
-    }
-
-    /// <summary>
-    /// Represents the selector used by the
-    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control to
-    /// determine how the specified text should be modified with an item.
-    /// </summary>
-    /// <returns>
-    /// Modified text that will be used by the
-    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.
-    /// </returns>
-    /// <param name="search">The string used as the basis for filtering.</param>
-    /// <param name="item">
-    /// The selected item that should be combined with the
-    /// <paramref name="search" /> parameter.
-    /// </param>
-    /// <typeparam name="T">
-    /// The type used for filtering the
-    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.
-    /// This type can be either a string or an object.
-    /// </typeparam>
-    public delegate string AutoCompleteSelector<T>(string? search, T item);
-
-    /// <summary>
-    /// Represents a control that provides a text box for user input and a
-    /// drop-down that contains possible matches based on the input in the text
-    /// box.
-    /// </summary>
-    [PseudoClasses(":dropdownopen")]
-    public class AutoCompleteBox : TemplatedControl
-    {
-        /// <summary>
-        /// Specifies the name of the selection adapter TemplatePart.
-        /// </summary>
-        private const string ElementSelectionAdapter = "PART_SelectionAdapter";
-
-        /// <summary>
-        /// Specifies the name of the Selector TemplatePart.
-        /// </summary>
-        private const string ElementSelector = "PART_SelectingItemsControl";
-
-        /// <summary>
-        /// Specifies the name of the Popup TemplatePart.
-        /// </summary>
-        private const string ElementPopup = "PART_Popup";
-
-        /// <summary>
-        /// The name for the text box part.
-        /// </summary>
-        private const string ElementTextBox = "PART_TextBox";
-
-        private IEnumerable? _itemsEnumerable;
-
-        /// <summary>
-        /// Gets or sets a local cached copy of the items data.
-        /// </summary>
-        private List<object>? _items;
-
-        /// <summary>
-        /// Gets or sets the observable collection that contains references to
-        /// all of the items in the generated view of data that is provided to
-        /// the selection-style control adapter.
-        /// </summary>
-        private AvaloniaList<object>? _view;
-
-        /// <summary>
-        /// Gets or sets a value to ignore a number of pending change handlers.
-        /// The value is decremented after each use. This is used to reset the
-        /// value of properties without performing any of the actions in their
-        /// change handlers.
-        /// </summary>
-        /// <remarks>The int is important as a value because the TextBox
-        /// TextChanged event does not immediately fire, and this will allow for
-        /// nested property changes to be ignored.</remarks>
-        private int _ignoreTextPropertyChange;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to ignore calling a pending
-        /// change handlers.
-        /// </summary>
-        private bool _ignorePropertyChange;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to ignore the selection
-        /// changed event.
-        /// </summary>
-        private bool _ignoreTextSelectionChange;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to skip the text update
-        /// processing when the selected item is updated.
-        /// </summary>
-        private bool _skipSelectedItemTextUpdate;
-
-        /// <summary>
-        /// Gets or sets the last observed text box selection start location.
-        /// </summary>
-        private int _textSelectionStart;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the user initiated the
-        /// current populate call.
-        /// </summary>
-        private bool _userCalledPopulate;
-
-        /// <summary>
-        /// A value indicating whether the popup has been opened at least once.
-        /// </summary>
-        private bool _popupHasOpened;
-
-        /// <summary>
-        /// Gets or sets the DispatcherTimer used for the MinimumPopulateDelay
-        /// condition for auto completion.
-        /// </summary>
-        private DispatcherTimer? _delayTimer;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether a read-only dependency
-        /// property change handler should allow the value to be set.  This is
-        /// used to ensure that read-only properties cannot be changed via
-        /// SetValue, etc.
-        /// </summary>
-        private bool _allowWrite;
-
-        /// <summary>
-        /// The TextBox template part.
-        /// </summary>
-        private TextBox? _textBox;
-        private IDisposable? _textBoxSubscriptions;
-
-        /// <summary>
-        /// The SelectionAdapter.
-        /// </summary>
-        private ISelectionAdapter? _adapter;
-
-        /// <summary>
-        /// A control that can provide updated string values from a binding.
-        /// </summary>
-        private BindingEvaluator<string>? _valueBindingEvaluator;
-
-        /// <summary>
-        /// A weak subscription for the collection changed event.
-        /// </summary>
-        private IDisposable? _collectionChangeSubscription;
-
-        private Func<string?, CancellationToken, Task<IEnumerable<object>>>? _asyncPopulator;
-        private CancellationTokenSource? _populationCancellationTokenSource;
-
-        private bool _itemTemplateIsFromValueMemberBinding = true;
-        private bool _settingItemTemplateFromValueMemberBinding;
-
-        private object? _selectedItem;
-        private bool _isDropDownOpen;
-        private bool _isFocused = false;
-
-        private string? _text = string.Empty;
-        private string? _searchText = string.Empty;
-
-        private AutoCompleteFilterPredicate<object?>? _itemFilter;
-        private AutoCompleteFilterPredicate<string?>? _textFilter = AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith);
-
-        private AutoCompleteSelector<object>? _itemSelector;
-        private AutoCompleteSelector<string?>? _textSelector;
-
-        public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
-            RoutedEvent.Register<SelectionChangedEventArgs>(nameof(SelectionChanged), RoutingStrategies.Bubble, typeof(AutoCompleteBox));
-
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            TextBox.WatermarkProperty.AddOwner<AutoCompleteBox>();
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPrefixLength" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPrefixLength" />
-        /// dependency property.</value>
-        public static readonly StyledProperty<int> MinimumPrefixLengthProperty =
-            AvaloniaProperty.Register<AutoCompleteBox, int>(
-                nameof(MinimumPrefixLength), 1,
-                validate: IsValidMinimumPrefixLength);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPopulateDelay" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPopulateDelay" />
-        /// dependency property.</value>
-        public static readonly StyledProperty<TimeSpan> MinimumPopulateDelayProperty =
-            AvaloniaProperty.Register<AutoCompleteBox, TimeSpan>(
-                nameof(MinimumPopulateDelay),
-                TimeSpan.Zero,
-                validate: IsValidMinimumPopulateDelay);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MaxDropDownHeight" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MaxDropDownHeight" />
-        /// dependency property.</value>
-        public static readonly StyledProperty<double> MaxDropDownHeightProperty =
-            AvaloniaProperty.Register<AutoCompleteBox, double>(
-                nameof(MaxDropDownHeight),
-                double.PositiveInfinity,
-                validate: IsValidMaxDropDownHeight);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsTextCompletionEnabled" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsTextCompletionEnabled" />
-        /// dependency property.</value>
-        public static readonly StyledProperty<bool> IsTextCompletionEnabledProperty =
-            AvaloniaProperty.Register<AutoCompleteBox, bool>(nameof(IsTextCompletionEnabled));
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemTemplate" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemTemplate" />
-        /// dependency property.</value>
-        public static readonly StyledProperty<IDataTemplate> ItemTemplateProperty =
-            AvaloniaProperty.Register<AutoCompleteBox, IDataTemplate>(nameof(ItemTemplate));
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, bool> IsDropDownOpenProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, bool>(
-                nameof(IsDropDownOpen),
-                o => o.IsDropDownOpen,
-                (o, v) => o.IsDropDownOpen = v);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SelectedItem" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SelectedItem" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, object?> SelectedItemProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, object?>(
-                nameof(SelectedItem),
-                o => o.SelectedItem,
-                (o, v) => o.SelectedItem = v,
-                defaultBindingMode: BindingMode.TwoWay,
-                enableDataValidation: true);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, string?> TextProperty =
-            TextBlock.TextProperty.AddOwnerWithDataValidation<AutoCompleteBox>(
-                o => o.Text,
-                (o, v) => o.Text = v,
-                defaultBindingMode: BindingMode.TwoWay,
-                enableDataValidation: true);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, string?> SearchTextProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string?>(
-                nameof(SearchText),
-                o => o.SearchText,
-                unsetValue: string.Empty);
-
-        /// <summary>
-        /// Gets the identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.FilterMode" />
-        /// dependency property.
-        /// </summary>
-        public static readonly StyledProperty<AutoCompleteFilterMode> FilterModeProperty =
-            AvaloniaProperty.Register<AutoCompleteBox, AutoCompleteFilterMode>(
-                nameof(FilterMode),
-                defaultValue: AutoCompleteFilterMode.StartsWith,
-                validate: IsValidFilterMode);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<object?>?> ItemFilterProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<object?>?>(
-                nameof(ItemFilter),
-                o => o.ItemFilter,
-                (o, v) => o.ItemFilter = v);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<string?>?> TextFilterProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<string?>?>(
-                nameof(TextFilter),
-                o => o.TextFilter,
-                (o, v) => o.TextFilter = v,
-                unsetValue: AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemSelector" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemSelector" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteSelector<object>?> ItemSelectorProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteSelector<object>?>(
-                nameof(ItemSelector),
-                o => o.ItemSelector,
-                (o, v) => o.ItemSelector = v);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextSelector" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextSelector" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteSelector<string?>?> TextSelectorProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteSelector<string?>?>(
-                nameof(TextSelector),
-                o => o.TextSelector,
-                (o, v) => o.TextSelector = v);
-
-        /// <summary>
-        /// Identifies the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// dependency property.
-        /// </summary>
-        /// <value>The identifier for the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// dependency property.</value>
-        public static readonly DirectProperty<AutoCompleteBox, IEnumerable?> ItemsProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, IEnumerable?>(
-                nameof(Items),
-                o => o.Items,
-                (o, v) => o.Items = v);
-
-        public static readonly DirectProperty<AutoCompleteBox, Func<string?, CancellationToken, Task<IEnumerable<object>>>?> AsyncPopulatorProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, Func<string?, CancellationToken, Task<IEnumerable<object>>>?>(
-                nameof(AsyncPopulator),
-                o => o.AsyncPopulator,
-                (o, v) => o.AsyncPopulator = v);
-
-        private static bool IsValidMinimumPrefixLength(int value) => value >= -1;
-
-        private static bool IsValidMinimumPopulateDelay(TimeSpan value) => value.TotalMilliseconds >= 0.0;
-
-        private static bool IsValidMaxDropDownHeight(double value) => value >= 0.0;
-
-        private static bool IsValidFilterMode(AutoCompleteFilterMode mode)
-        {
-            switch (mode)
-            {
-                case AutoCompleteFilterMode.None:
-                case AutoCompleteFilterMode.StartsWith:
-                case AutoCompleteFilterMode.StartsWithCaseSensitive:
-                case AutoCompleteFilterMode.StartsWithOrdinal:
-                case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
-                case AutoCompleteFilterMode.Contains:
-                case AutoCompleteFilterMode.ContainsCaseSensitive:
-                case AutoCompleteFilterMode.ContainsOrdinal:
-                case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
-                case AutoCompleteFilterMode.Equals:
-                case AutoCompleteFilterMode.EqualsCaseSensitive:
-                case AutoCompleteFilterMode.EqualsOrdinal:
-                case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
-                case AutoCompleteFilterMode.Custom:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Handle the change of the IsEnabled property.
-        /// </summary>
-        /// <param name="e">The event data.</param>
-        private void OnControlIsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            bool isEnabled = (bool)e.NewValue!;
-            if (!isEnabled)
-            {
-                IsDropDownOpen = false;
-            }
-        }
-
-        /// <summary>
-        /// MinimumPopulateDelayProperty property changed handler. Any current
-        /// dispatcher timer will be stopped. The timer will not be restarted
-        /// until the next TextUpdate call by the user.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        private void OnMinimumPopulateDelayChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var newValue = (TimeSpan)e.NewValue!;
-
-            // Stop any existing timer
-            if (_delayTimer != null)
-            {
-                _delayTimer.Stop();
-
-                if (newValue == TimeSpan.Zero)
-                {
-                    _delayTimer = null;
-                }
-            }
-
-            if (newValue > TimeSpan.Zero)
-            {
-                // Create or clear a dispatcher timer instance
-                if (_delayTimer == null)
-                {
-                    _delayTimer = new DispatcherTimer();
-                    _delayTimer.Tick += PopulateDropDown;
-                }
-
-                // Set the new tick interval
-                _delayTimer.Interval = newValue;
-            }
-        }
-
-        /// <summary>
-        /// IsDropDownOpenProperty property changed handler.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            // Ignore the change if requested
-            if (_ignorePropertyChange)
-            {
-                _ignorePropertyChange = false;
-                return;
-            }
-
-            bool oldValue = (bool)e.OldValue!;
-            bool newValue = (bool)e.NewValue!;
-
-            if (newValue)
-            {
-                TextUpdated(Text, true);
-            }
-            else
-            {
-                ClosingDropDown(oldValue);
-            }
-
-            UpdatePseudoClasses();
-        }
-
-        private void OnSelectedItemPropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (_ignorePropertyChange)
-            {
-                _ignorePropertyChange = false;
-                return;
-            }
-
-            // Update the text display
-            if (_skipSelectedItemTextUpdate)
-            {
-                _skipSelectedItemTextUpdate = false;
-            }
-            else
-            {
-                OnSelectedItemChanged(e.NewValue);
-            }
-
-            // Fire the SelectionChanged event
-            List<object> removed = new List<object>();
-            if (e.OldValue != null)
-            {
-                removed.Add(e.OldValue);
-            }
-
-            List<object> added = new List<object>();
-            if (e.NewValue != null)
-            {
-                added.Add(e.NewValue);
-            }
-
-            OnSelectionChanged(new SelectionChangedEventArgs(SelectionChangedEvent, removed, added));
-        }
-
-        /// <summary>
-        /// TextProperty property changed handler.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        private void OnTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            TextUpdated((string?)e.NewValue, false);
-        }
-
-        private void OnSearchTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (_ignorePropertyChange)
-            {
-                _ignorePropertyChange = false;
-                return;
-            }
-
-            // Ensure the property is only written when expected
-            if (!_allowWrite)
-            {
-                // Reset the old value before it was incorrectly written
-                _ignorePropertyChange = true;
-                SetValue(e.Property, e.OldValue);
-
-                throw new InvalidOperationException("Cannot set read-only property SearchText.");
-            }
-        }
-
-        /// <summary>
-        /// FilterModeProperty property changed handler.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        private void OnFilterModePropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            AutoCompleteFilterMode mode = (AutoCompleteFilterMode)e.NewValue!;
-
-            // Sets the filter predicate for the new value
-            TextFilter = AutoCompleteSearch.GetFilter(mode);
-        }
-
-        /// <summary>
-        /// ItemFilterProperty property changed handler.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        private void OnItemFilterPropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var value = e.NewValue as AutoCompleteFilterPredicate<object>;
-
-            // If null, revert to the "None" predicate
-            if (value == null)
-            {
-                FilterMode = AutoCompleteFilterMode.None;
-            }
-            else
-            {
-                FilterMode = AutoCompleteFilterMode.Custom;
-                TextFilter = null;
-            }
-        }
-
-        /// <summary>
-        /// ItemsSourceProperty property changed handler.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        private void OnItemsPropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            OnItemsChanged((IEnumerable?)e.NewValue);
-        }
-
-        private void OnItemTemplatePropertyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (!_settingItemTemplateFromValueMemberBinding)
-                _itemTemplateIsFromValueMemberBinding = false;
-        }
-        private void OnValueMemberBindingChanged(IBinding? value)
-        {
-            if(_itemTemplateIsFromValueMemberBinding)
-            {
-                var template =
-                    new FuncDataTemplate(
-                        typeof(object),
-                        (o, _) =>
-                        {
-                            var control = new ContentControl();
-                            if (value is not null)
-                                control.Bind(ContentControl.ContentProperty, value);
-                            return control;
-                        });
-
-                _settingItemTemplateFromValueMemberBinding = true;
-                ItemTemplate = template;
-                _settingItemTemplateFromValueMemberBinding = false;
-            }
-        }
-
-        static AutoCompleteBox()
-        {
-            FocusableProperty.OverrideDefaultValue<AutoCompleteBox>(true);
-
-            MinimumPopulateDelayProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnMinimumPopulateDelayChanged(e));
-            IsDropDownOpenProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnIsDropDownOpenChanged(e));
-            SelectedItemProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnSelectedItemPropertyChanged(e));
-            TextProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnTextPropertyChanged(e));
-            SearchTextProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnSearchTextPropertyChanged(e));
-            FilterModeProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnFilterModePropertyChanged(e));
-            ItemFilterProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnItemFilterPropertyChanged(e));
-            ItemsProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnItemsPropertyChanged(e));
-            IsEnabledProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnControlIsEnabledChanged(e));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> class.
-        /// </summary>
-        public AutoCompleteBox()
-        {
-            ClearView();
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum number of characters required to be entered
-        /// in the text box before the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> displays
-        /// possible matches.
-        /// matches.
-        /// </summary>
-        /// <value>
-        /// The minimum number of characters to be entered in the text box
-        /// before the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
-        /// displays possible matches. The default is 1.
-        /// </value>
-        /// <remarks>
-        /// If you set MinimumPrefixLength to -1, the AutoCompleteBox will
-        /// not provide possible matches. There is no maximum value, but
-        /// setting MinimumPrefixLength to value that is too large will
-        /// prevent the AutoCompleteBox from providing possible matches as well.
-        /// </remarks>
-        public int MinimumPrefixLength
-        {
-            get { return GetValue(MinimumPrefixLengthProperty); }
-            set { SetValue(MinimumPrefixLengthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the first possible match
-        /// found during the filtering process will be displayed automatically
-        /// in the text box.
-        /// </summary>
-        /// <value>
-        /// True if the first possible match found will be displayed
-        /// automatically in the text box; otherwise, false. The default is
-        /// false.
-        /// </value>
-        public bool IsTextCompletionEnabled
-        {
-            get { return GetValue(IsTextCompletionEnabledProperty); }
-            set { SetValue(IsTextCompletionEnabledProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Avalonia.DataTemplate" /> used
-        /// to display each item in the drop-down portion of the control.
-        /// </summary>
-        /// <value>The <see cref="T:Avalonia.DataTemplate" /> used to
-        /// display each item in the drop-down. The default is null.</value>
-        /// <remarks>
-        /// You use the ItemTemplate property to specify the visualization
-        /// of the data objects in the drop-down portion of the AutoCompleteBox
-        /// control. If your AutoCompleteBox is bound to a collection and you
-        /// do not provide specific display instructions by using a
-        /// DataTemplate, the resulting UI of each item is a string
-        /// representation of each object in the underlying collection.
-        /// </remarks>
-        public IDataTemplate ItemTemplate
-        {
-            get { return GetValue(ItemTemplateProperty); }
-            set { SetValue(ItemTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum delay, after text is typed
-        /// in the text box before the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
-        /// populates the list of possible matches in the drop-down.
-        /// </summary>
-        /// <value>The minimum delay, after text is typed in
-        /// the text box, but before the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> populates
-        /// the list of possible matches in the drop-down. The default is 0.</value>
-        public TimeSpan MinimumPopulateDelay
-        {
-            get { return GetValue(MinimumPopulateDelayProperty); }
-            set { SetValue(MinimumPopulateDelayProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum height of the drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
-        /// </summary>
-        /// <value>The maximum height of the drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
-        /// The default is <see cref="F:System.Double.PositiveInfinity" />.</value>
-        /// <exception cref="T:System.ArgumentException">The specified value is less than 0.</exception>
-        public double MaxDropDownHeight
-        {
-            get { return GetValue(MaxDropDownHeightProperty); }
-            set { SetValue(MaxDropDownHeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the drop-down portion of
-        /// the control is open.
-        /// </summary>
-        /// <value>
-        /// True if the drop-down is open; otherwise, false. The default is
-        /// false.
-        /// </value>
-        public bool IsDropDownOpen
-        {
-            get { return  _isDropDownOpen; }
-            set { SetAndRaise(IsDropDownOpenProperty, ref  _isDropDownOpen, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the  <see cref="T:Avalonia.Data.Binding" /> that
-        /// is used to get the values for display in the text portion of
-        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
-        /// control.
-        /// </summary>
-        /// <value>The <see cref="T:Avalonia.Data.IBinding" /> object used
-        /// when binding to a collection property.</value>
-        [AssignBinding]
-        public IBinding? ValueMemberBinding
-        {
-            get { return _valueBindingEvaluator?.ValueBinding; }
-            set
-            {
-                if (ValueMemberBinding != value)
-                {
-                    _valueBindingEvaluator = new BindingEvaluator<string>(value);
-                    OnValueMemberBindingChanged(value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the selected item in the drop-down.
-        /// </summary>
-        /// <value>The selected item in the drop-down.</value>
-        /// <remarks>
-        /// If the IsTextCompletionEnabled property is true and text typed by
-        /// the user matches an item in the ItemsSource collection, which is
-        /// then displayed in the text box, the SelectedItem property will be
-        /// a null reference.
-        /// </remarks>
-        public object? SelectedItem
-        {
-            get { return _selectedItem; }
-            set { SetAndRaise(SelectedItemProperty, ref _selectedItem, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the text in the text box portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
-        /// </summary>
-        /// <value>The text in the text box portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
-        public string? Text
-        {
-            get { return _text; }
-            set { SetAndRaise(TextProperty, ref _text, value); }
-        }
-
-        /// <summary>
-        /// Gets the text that is used to filter items in the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// item collection.
-        /// </summary>
-        /// <value>The text that is used to filter items in the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// item collection.</value>
-        /// <remarks>
-        /// The SearchText value is typically the same as the
-        /// Text property, but is set after the TextChanged event occurs
-        /// and before the Populating event.
-        /// </remarks>
-        public string? SearchText
-        {
-            get { return _searchText; }
-            private set
-            {
-                try
-                {
-                    _allowWrite = true;
-                    SetAndRaise(SearchTextProperty, ref _searchText, value);
-                }
-                finally
-                {
-                    _allowWrite = false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets how the text in the text box is used to filter items
-        /// specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// property for display in the drop-down.
-        /// </summary>
-        /// <value>One of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteFilterMode" />
-        /// values The default is
-        /// <see cref="F:Avalonia.Controls.AutoCompleteFilterMode.StartsWith" />.</value>
-        /// <exception cref="T:System.ArgumentException">The specified value is
-        /// not a valid
-        /// <see cref="T:Avalonia.Controls.AutoCompleteFilterMode" />.</exception>
-        /// <remarks>
-        /// Use the FilterMode property to specify how possible matches are
-        /// filtered. For example, possible matches can be filtered in a
-        /// predefined or custom way. The search mode is automatically set to
-        /// Custom if you set the ItemFilter property.
-        /// </remarks>
-        public AutoCompleteFilterMode FilterMode
-        {
-            get { return GetValue(FilterModeProperty); }
-            set { SetValue(FilterModeProperty, value); }
-        }
-
-        public string? Watermark
-        {
-            get { return GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the custom method that uses user-entered text to filter
-        /// the items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// property for display in the drop-down.
-        /// </summary>
-        /// <value>The custom method that uses the user-entered text to filter
-        /// the items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// property. The default is null.</value>
-        /// <remarks>
-        /// The filter mode is automatically set to Custom if you set the
-        /// ItemFilter property.
-        /// </remarks>
-        public AutoCompleteFilterPredicate<object?>? ItemFilter
-        {
-            get { return _itemFilter; }
-            set { SetAndRaise(ItemFilterProperty, ref _itemFilter, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the custom method that uses the user-entered text to
-        /// filter items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// property in a text-based way for display in the drop-down.
-        /// </summary>
-        /// <value>The custom method that uses the user-entered text to filter
-        /// items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// property in a text-based way for display in the drop-down.</value>
-        /// <remarks>
-        /// The search mode is automatically set to Custom if you set the
-        /// TextFilter property.
-        /// </remarks>
-        public AutoCompleteFilterPredicate<string?>? TextFilter
-        {
-            get { return _textFilter; }
-            set { SetAndRaise(TextFilterProperty, ref _textFilter, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the custom method that combines the user-entered
-        /// text and one of the items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />.
-        /// </summary>
-        /// <value>
-        /// The custom method that combines the user-entered
-        /// text and one of the items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />.
-        /// </value>
-        public AutoCompleteSelector<object>? ItemSelector
-        {
-            get { return _itemSelector; }
-            set { SetAndRaise(ItemSelectorProperty, ref _itemSelector, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the custom method that combines the user-entered
-        /// text and one of the items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// in a text-based way.
-        /// </summary>
-        /// <value>
-        /// The custom method that combines the user-entered
-        /// text and one of the items specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
-        /// in a text-based way.
-        /// </value>
-        public AutoCompleteSelector<string?>? TextSelector
-        {
-            get { return _textSelector; }
-            set { SetAndRaise(TextSelectorProperty, ref _textSelector, value); }
-        }
-
-        public Func<string?, CancellationToken, Task<IEnumerable<object>>>? AsyncPopulator
-        {
-            get { return _asyncPopulator; }
-            set { SetAndRaise(AsyncPopulatorProperty, ref _asyncPopulator, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a collection that is used to generate the items for the
-        /// drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
-        /// </summary>
-        /// <value>The collection that is used to generate the items of the
-        /// drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
-        public IEnumerable? Items
-        {
-            get { return _itemsEnumerable; }
-            set { SetAndRaise(ItemsProperty, ref _itemsEnumerable, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the drop down popup control.
-        /// </summary>
-        private Popup? DropDownPopup { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Text template part.
-        /// </summary>
-        private TextBox? TextBox
-        {
-            get { return _textBox; }
-            set
-            {
-                _textBoxSubscriptions?.Dispose();
-                _textBox = value;
-
-                // Attach handlers
-                if (_textBox != null)
-                {
-                    _textBoxSubscriptions =
-                        _textBox.GetObservable(TextBox.TextProperty)
-                                .Skip(1)
-                                .Subscribe(_ => OnTextBoxTextChanged());
-
-                    if (Text != null)
-                    {
-                        UpdateTextValue(Text);
-                    }
-                }
-            }
-        }
-
-        private int TextBoxSelectionStart
-        {
-            get
-            {
-                if (TextBox != null)
-                {
-                    return Math.Min(TextBox.SelectionStart, TextBox.SelectionEnd);
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-        }
-        private int TextBoxSelectionLength
-        {
-            get
-            {
-                if (TextBox != null)
-                {
-                    return Math.Abs(TextBox.SelectionEnd - TextBox.SelectionStart);
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the selection adapter used to populate the drop-down
-        /// with a list of selectable items.
-        /// </summary>
-        /// <value>The selection adapter used to populate the drop-down with a
-        /// list of selectable items.</value>
-        /// <remarks>
-        /// You can use this property when you create an automation peer to
-        /// use with AutoCompleteBox or deriving from AutoCompleteBox to
-        /// create a custom control.
-        /// </remarks>
-        protected ISelectionAdapter? SelectionAdapter
-        {
-            get { return _adapter; }
-            set
-            {
-                if (_adapter != null)
-                {
-                    _adapter.SelectionChanged -= OnAdapterSelectionChanged;
-                    _adapter.Commit -= OnAdapterSelectionComplete;
-                    _adapter.Cancel -= OnAdapterSelectionCanceled;
-                    _adapter.Cancel -= OnAdapterSelectionComplete;
-                    _adapter.Items = null;
-                }
-
-                _adapter = value;
-
-                if (_adapter != null)
-                {
-                    _adapter.SelectionChanged += OnAdapterSelectionChanged;
-                    _adapter.Commit += OnAdapterSelectionComplete;
-                    _adapter.Cancel += OnAdapterSelectionCanceled;
-                    _adapter.Cancel += OnAdapterSelectionComplete;
-                    _adapter.Items = _view;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns the
-        /// <see cref="T:Avalonia.Controls.ISelectionAdapter" /> part, if
-        /// possible.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="T:Avalonia.Controls.ISelectionAdapter" /> object,
-        /// if possible. Otherwise, null.
-        /// </returns>
-        protected virtual ISelectionAdapter? GetSelectionAdapterPart(INameScope nameScope)
-        {
-            ISelectionAdapter? adapter = null;
-            SelectingItemsControl? selector = nameScope.Find<SelectingItemsControl>(ElementSelector);
-            if (selector != null)
-            {
-                // Check if it is already an IItemsSelector
-                adapter = selector as ISelectionAdapter;
-                if (adapter == null)
-                {
-                    // Built in support for wrapping a Selector control
-                    adapter = new SelectingItemsControlSelectionAdapter(selector);
-                }
-            }
-            if (adapter == null)
-            {
-                adapter = nameScope.Find<ISelectionAdapter>(ElementSelectionAdapter);
-            }
-            return adapter;
-        }
-
-        /// <summary>
-        /// Builds the visual tree for the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
-        /// when a new template is applied.
-        /// </summary>
-        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-        {
-
-            if (DropDownPopup != null)
-            {
-                DropDownPopup.Closed -= DropDownPopup_Closed;
-                DropDownPopup = null;
-            }
-
-            // Set the template parts. Individual part setters remove and add
-            // any event handlers.
-            Popup? popup = e.NameScope.Find<Popup>(ElementPopup);
-            if (popup != null)
-            {
-                DropDownPopup = popup;
-                DropDownPopup.Closed += DropDownPopup_Closed;
-            }
-
-            SelectionAdapter = GetSelectionAdapterPart(e.NameScope);
-            TextBox = e.NameScope.Find<TextBox>(ElementTextBox);
-
-            // If the drop down property indicates that the popup is open,
-            // flip its value to invoke the changed handler.
-            if (IsDropDownOpen && DropDownPopup != null && !DropDownPopup.IsOpen)
-            {
-                OpeningDropDown(false);
-            }
-
-            base.OnApplyTemplate(e);
-        }
-
-        /// <summary>
-        /// Called to update the validation state for properties for which data validation is
-        /// enabled.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
-        {
-            if (property == TextProperty || property == SelectedItemProperty)
-            {
-                DataValidationErrors.SetError(this, value.Error);
-            }
-        }
-
-        /// <summary>
-        /// Provides handling for the
-        /// <see cref="E:Avalonia.InputElement.KeyDown" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
-        /// that contains the event data.</param>
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            _ = e ?? throw new ArgumentNullException(nameof(e));
-
-            base.OnKeyDown(e);
-
-            if (e.Handled || !IsEnabled)
-            {
-                return;
-            }
-
-            // The drop down is open, pass along the key event arguments to the
-            // selection adapter. If it isn't handled by the adapter's logic,
-            // then we handle some simple navigation scenarios for controlling
-            // the drop down.
-            if (IsDropDownOpen)
-            {
-                if (SelectionAdapter != null)
-                {
-                    SelectionAdapter.HandleKeyDown(e);
-                    if (e.Handled)
-                    {
-                        return;
-                    }
-                }
-
-                if (e.Key == Key.Escape)
-                {
-                    OnAdapterSelectionCanceled(this, new RoutedEventArgs());
-                    e.Handled = true;
-                }
-            }
-            else
-            {
-                // The drop down is not open, the Down key will toggle it open.
-                if (e.Key == Key.Down)
-                {
-                    IsDropDownOpen = true;
-                    e.Handled = true;
-                }
-            }
-
-            // Standard drop down navigation
-            switch (e.Key)
-            {
-                case Key.F4:
-                    IsDropDownOpen = !IsDropDownOpen;
-                    e.Handled = true;
-                    break;
-
-                case Key.Enter:
-                    if (IsDropDownOpen)
-                    {
-                        OnAdapterSelectionComplete(this, new RoutedEventArgs());
-                        e.Handled = true;
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Provides handling for the
-        /// <see cref="E:Avalonia.UIElement.GotFocus" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
-        /// that contains the event data.</param>
-        protected override void OnGotFocus(GotFocusEventArgs e)
-        {
-            base.OnGotFocus(e);
-            FocusChanged(HasFocus());
-        }
-
-        /// <summary>
-        /// Provides handling for the
-        /// <see cref="E:Avalonia.UIElement.LostFocus" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
-        /// that contains the event data.</param>
-        protected override void OnLostFocus(RoutedEventArgs e)
-        {
-            base.OnLostFocus(e);
-            FocusChanged(HasFocus());
-        }
-
-        /// <summary>
-        /// Determines whether the text box or drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control has
-        /// focus.
-        /// </summary>
-        /// <returns>true to indicate the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus;
-        /// otherwise, false.</returns>
-        protected bool HasFocus()
-        {
-            IVisual? focused = FocusManager.Instance?.Current;
-
-            while (focused != null)
-            {
-                if (object.ReferenceEquals(focused, this))
-                {
-                    return true;
-                }
-
-                // This helps deal with popups that may not be in the same
-                // visual tree
-                IVisual? parent = focused.GetVisualParent();
-                if (parent == null)
-                {
-                    // Try the logical parent.
-                    IControl? element = focused as IControl;
-                    if (element != null)
-                    {
-                        parent = element.Parent;
-                    }
-                }
-                focused = parent;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Handles the FocusChanged event.
-        /// </summary>
-        /// <param name="hasFocus">A value indicating whether the control
-        /// currently has the focus.</param>
-        private void FocusChanged(bool hasFocus)
-        {
-            // The OnGotFocus & OnLostFocus are asynchronously and cannot
-            // reliably tell you that have the focus.  All they do is let you
-            // know that the focus changed sometime in the past.  To determine
-            // if you currently have the focus you need to do consult the
-            // FocusManager (see HasFocus()).
-
-            bool wasFocused = _isFocused;
-            _isFocused = hasFocus;
-
-            if (hasFocus)
-            {
-
-                if (!wasFocused && TextBox != null && TextBoxSelectionLength <= 0)
-                {
-                    TextBox.Focus();
-                    TextBox.SelectionStart = 0;
-                    TextBox.SelectionEnd = TextBox.Text?.Length ?? 0;
-                }
-            }
-            else
-            {
-                IsDropDownOpen = false;
-                _userCalledPopulate = false;
-                ClearTextBoxSelection();
-            }
-
-            _isFocused = hasFocus;
-        }
-
-        /// <summary>
-        /// Occurs when the text in the text box portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> changes.
-        /// </summary>
-        public event EventHandler? TextChanged;
-
-        /// <summary>
-        /// Occurs when the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> is
-        /// populating the drop-down with possible matches based on the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
-        /// property.
-        /// </summary>
-        /// <remarks>
-        /// If the event is canceled, by setting the PopulatingEventArgs.Cancel
-        /// property to true, the AutoCompleteBox will not automatically
-        /// populate the selection adapter contained in the drop-down.
-        /// In this case, if you want possible matches to appear, you must
-        /// provide the logic for populating the selection adapter.
-        /// </remarks>
-        public event EventHandler<PopulatingEventArgs>? Populating;
-
-        /// <summary>
-        /// Occurs when the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
-        /// populated the drop-down with possible matches based on the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
-        /// property.
-        /// </summary>
-        public event EventHandler<PopulatedEventArgs>? Populated;
-
-        /// <summary>
-        /// Occurs when the value of the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
-        /// property is changing from false to true.
-        /// </summary>
-        public event EventHandler<CancelEventArgs>? DropDownOpening;
-
-        /// <summary>
-        /// Occurs when the value of the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
-        /// property has changed from false to true and the drop-down is open.
-        /// </summary>
-        public event EventHandler? DropDownOpened;
-
-        /// <summary>
-        /// Occurs when the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
-        /// property is changing from true to false.
-        /// </summary>
-        public event EventHandler<CancelEventArgs>? DropDownClosing;
-
-        /// <summary>
-        /// Occurs when the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
-        /// property was changed from true to false and the drop-down is open.
-        /// </summary>
-        public event EventHandler? DropDownClosed;
-
-        /// <summary>
-        /// Occurs when the selected item in the drop-down portion of the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
-        /// changed.
-        /// </summary>
-        public event EventHandler<SelectionChangedEventArgs> SelectionChanged
-        {
-            add { AddHandler(SelectionChangedEvent, value); }
-            remove { RemoveHandler(SelectionChangedEvent, value); }
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" /> that
-        /// contains the event data.</param>
-        protected virtual void OnPopulating(PopulatingEventArgs e)
-        {
-            Populating?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />
-        /// that contains the event data.</param>
-        protected virtual void OnPopulated(PopulatedEventArgs e)
-        {
-            Populated?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.SelectionChanged" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.SelectionChangedEventArgs" />
-        /// that contains the event data.</param>
-        protected virtual void OnSelectionChanged(SelectionChangedEventArgs e)
-        {
-            RaiseEvent(e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpening" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.CancelEventArgs" />
-        /// that contains the event data.</param>
-        protected virtual void OnDropDownOpening(CancelEventArgs e)
-        {
-            DropDownOpening?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpened" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:System.EventArgs" />
-        /// that contains the event data.</param>
-        protected virtual void OnDropDownOpened(EventArgs e)
-        {
-            DropDownOpened?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosing" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.CancelEventArgs" />
-        /// that contains the event data.</param>
-        protected virtual void OnDropDownClosing(CancelEventArgs e)
-        {
-            DropDownClosing?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosed" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A
-        /// <see cref="T:System.EventArgs" />
-        /// which contains the event data.</param>
-        protected virtual void OnDropDownClosed(EventArgs e)
-        {
-            DropDownClosed?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.TextChanged" />
-        /// event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
-        /// that contains the event data.</param>
-        protected virtual void OnTextChanged(RoutedEventArgs e)
-        {
-            TextChanged?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Begin closing the drop-down.
-        /// </summary>
-        /// <param name="oldValue">The original value.</param>
-        private void ClosingDropDown(bool oldValue)
-        {
-            var args = new CancelEventArgs();
-            OnDropDownClosing(args);
-
-            if (args.Cancel)
-            {
-                _ignorePropertyChange = true;
-                SetValue(IsDropDownOpenProperty, oldValue);
-            }
-            else
-            {
-                CloseDropDown();
-            }
-
-            UpdatePseudoClasses();
-        }
-
-        /// <summary>
-        /// Begin opening the drop down by firing cancelable events, opening the
-        /// drop-down or reverting, depending on the event argument values.
-        /// </summary>
-        /// <param name="oldValue">The original value, if needed for a revert.</param>
-        private void OpeningDropDown(bool oldValue)
-        {
-            var args = new CancelEventArgs();
-
-            // Opening
-            OnDropDownOpening(args);
-
-            if (args.Cancel)
-            {
-                _ignorePropertyChange = true;
-                SetValue(IsDropDownOpenProperty, oldValue);
-            }
-            else
-            {
-                OpenDropDown();
-            }
-
-            UpdatePseudoClasses();
-        }
-
-        /// <summary>
-        /// Connects to the DropDownPopup Closed event.
-        /// </summary>
-        /// <param name="sender">The source object.</param>
-        /// <param name="e">The event data.</param>
-        private void DropDownPopup_Closed(object? sender, EventArgs e)
-        {
-            // Force the drop down dependency property to be false.
-            if (IsDropDownOpen)
-            {
-                IsDropDownOpen = false;
-            }
-
-            // Fire the DropDownClosed event
-            if (_popupHasOpened)
-            {
-                OnDropDownClosed(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Handles the timer tick when using a populate delay.
-        /// </summary>
-        /// <param name="sender">The source object.</param>
-        /// <param name="e">The event arguments.</param>
-        private void PopulateDropDown(object? sender, EventArgs e)
-        {
-            if (_delayTimer != null)
-            {
-                _delayTimer.Stop();
-            }
-
-            // Update the prefix/search text.
-            SearchText = Text;
-
-            if(TryPopulateAsync(SearchText))
-            {
-                return;
-            }
-
-            // The Populated event enables advanced, custom filtering. The
-            // client needs to directly update the ItemsSource collection or
-            // call the Populate method on the control to continue the
-            // display process if Cancel is set to true.
-            PopulatingEventArgs populating = new PopulatingEventArgs(SearchText);
-            OnPopulating(populating);
-            if (!populating.Cancel)
-            {
-                PopulateComplete();
-            }
-        }
-        private bool TryPopulateAsync(string? searchText)
-        {
-            _populationCancellationTokenSource?.Cancel(false);
-            _populationCancellationTokenSource?.Dispose();
-            _populationCancellationTokenSource = null;
-
-            if(_asyncPopulator == null)
-            {
-                return false;
-            }
-
-            _populationCancellationTokenSource = new CancellationTokenSource();
-            var task = PopulateAsync(searchText, _populationCancellationTokenSource.Token);
-            if (task.Status == TaskStatus.Created)
-                task.Start();
-
-            return true;
-        }
-        private async Task PopulateAsync(string? searchText, CancellationToken cancellationToken)
-        {
-
-            try
-            {
-                IEnumerable<object> result = await _asyncPopulator!.Invoke(searchText, cancellationToken);
-                var resultList = result.ToList();
-
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return;
-                }
-
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    if (!cancellationToken.IsCancellationRequested)
-                    {
-                        Items = resultList;
-                        PopulateComplete();
-                    }
-                });
-            }
-            catch (TaskCanceledException)
-            { }
-            finally
-            {
-                _populationCancellationTokenSource?.Dispose();
-                _populationCancellationTokenSource = null;
-            }
-
-        }
-
-        /// <summary>
-        /// Private method that directly opens the popup, checks the expander
-        /// button, and then fires the Opened event.
-        /// </summary>
-        private void OpenDropDown()
-        {
-            if (DropDownPopup != null)
-            {
-                DropDownPopup.IsOpen = true;
-            }
-            _popupHasOpened = true;
-            OnDropDownOpened(EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Private method that directly closes the popup, flips the Checked
-        /// value, and then fires the Closed event.
-        /// </summary>
-        private void CloseDropDown()
-        {
-            if (_popupHasOpened)
-            {
-                if (SelectionAdapter != null)
-                {
-                    SelectionAdapter.SelectedItem = null;
-                }
-                if (DropDownPopup != null)
-                {
-                    DropDownPopup.IsOpen = false;
-                }
-                OnDropDownClosed(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Formats an Item for text comparisons based on Converter
-        /// and ConverterCulture properties.
-        /// </summary>
-        /// <param name="value">The object to format.</param>
-        /// <param name="clearDataContext">A value indicating whether to clear
-        /// the data context after the lookup is performed.</param>
-        /// <returns>Formatted Value.</returns>
-        private string? FormatValue(object? value, bool clearDataContext)
-        {
-            string? result = FormatValue(value);
-            if(clearDataContext && _valueBindingEvaluator != null)
-            {
-                _valueBindingEvaluator.ClearDataContext();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Converts the specified object to a string by using the
-        /// <see cref="P:Avalonia.Data.Binding.Converter" /> and
-        /// <see cref="P:Avalonia.Data.Binding.ConverterCulture" /> values
-        /// of the binding object specified by the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ValueMemberBinding" />
-        /// property.
-        /// </summary>
-        /// <param name="value">The object to format as a string.</param>
-        /// <returns>The string representation of the specified object.</returns>
-        /// <remarks>
-        /// Override this method to provide a custom string conversion.
-        /// </remarks>
-        protected virtual string? FormatValue(object? value)
-        {
-            if (_valueBindingEvaluator != null)
-            {
-                return _valueBindingEvaluator.GetDynamicValue(value) ?? String.Empty;
-            }
-
-            return value == null ? String.Empty : value.ToString();
-        }
-
-        /// <summary>
-        /// Handle the TextChanged event that is directly attached to the
-        /// TextBox part. This ensures that only user initiated actions will
-        /// result in an AutoCompleteBox suggestion and operation.
-        /// </summary>
-        private void OnTextBoxTextChanged()
-        {
-            //Uses Dispatcher.Post to allow the TextBox selection to update before processing
-            Dispatcher.UIThread.Post(() =>
-            {
-                // Call the central updated text method as a user-initiated action
-                TextUpdated(_textBox!.Text, true);
-            });
-        }
-
-        /// <summary>
-        /// Updates both the text box value and underlying text dependency
-        /// property value if and when they change. Automatically fires the
-        /// text changed events when there is a change.
-        /// </summary>
-        /// <param name="value">The new string value.</param>
-        private void UpdateTextValue(string? value)
-        {
-            UpdateTextValue(value, null);
-        }
-
-        /// <summary>
-        /// Updates both the text box value and underlying text dependency
-        /// property value if and when they change. Automatically fires the
-        /// text changed events when there is a change.
-        /// </summary>
-        /// <param name="value">The new string value.</param>
-        /// <param name="userInitiated">A nullable bool value indicating whether
-        /// the action was user initiated. In a user initiated mode, the
-        /// underlying text dependency property is updated. In a non-user
-        /// interaction, the text box value is updated. When user initiated is
-        /// null, all values are updated.</param>
-        private void UpdateTextValue(string? value, bool? userInitiated)
-        {
-            bool callTextChanged = false;
-            // Update the Text dependency property
-            if ((userInitiated ?? true) && Text != value)
-            {
-                _ignoreTextPropertyChange++;
-                Text = value;
-                callTextChanged = true;
-            }
-
-            // Update the TextBox's Text dependency property
-            if ((userInitiated == null || userInitiated == false) && TextBox != null && TextBox.Text != value)
-            {
-                _ignoreTextPropertyChange++;
-                TextBox.Text = value ?? string.Empty;
-
-                // Text dependency property value was set, fire event
-                if (!callTextChanged && (Text == value || Text == null))
-                {
-                    callTextChanged = true;
-                }
-            }
-
-            if (callTextChanged)
-            {
-                OnTextChanged(new RoutedEventArgs());
-            }
-        }
-
-        /// <summary>
-        /// Handle the update of the text for the control from any source,
-        /// including the TextBox part and the Text dependency property.
-        /// </summary>
-        /// <param name="newText">The new text.</param>
-        /// <param name="userInitiated">A value indicating whether the update
-        /// is a user-initiated action. This should be a True value when the
-        /// TextUpdated method is called from a TextBox event handler.</param>
-        private void TextUpdated(string? newText, bool userInitiated)
-        {
-            // Only process this event if it is coming from someone outside
-            // setting the Text dependency property directly.
-            if (_ignoreTextPropertyChange > 0)
-            {
-                _ignoreTextPropertyChange--;
-                return;
-            }
-
-            if (newText == null)
-            {
-                newText = string.Empty;
-            }
-
-            // The TextBox.TextChanged event was not firing immediately and
-            // was causing an immediate update, even with wrapping. If there is
-            // a selection currently, no update should happen.
-            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != (TextBox.Text?.Length ?? 0))
-            {
-                return;
-            }
-
-            // Evaluate the conditions needed for completion.
-            // 1. Minimum prefix length
-            // 2. If a delay timer is in use, use it
-            bool populateReady = newText.Length >= MinimumPrefixLength && MinimumPrefixLength >= 0;
-            if(populateReady && MinimumPrefixLength == 0 && String.IsNullOrEmpty(newText) && String.IsNullOrEmpty(SearchText))
-            {
-                populateReady = false;
-            }
-            _userCalledPopulate = populateReady ? userInitiated : false;
-
-            // Update the interface and values only as necessary
-            UpdateTextValue(newText, userInitiated);
-
-            if (populateReady)
-            {
-                _ignoreTextSelectionChange = true;
-
-                if (_delayTimer != null)
-                {
-                    _delayTimer.Start();
-                }
-                else
-                {
-                    PopulateDropDown(this, EventArgs.Empty);
-                }
-            }
-            else
-            {
-                SearchText = string.Empty;
-                if (SelectedItem != null)
-                {
-                    _skipSelectedItemTextUpdate = true;
-                }
-                SelectedItem = null;
-                if (IsDropDownOpen)
-                {
-                    IsDropDownOpen = false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// A simple helper method to clear the view and ensure that a view
-        /// object is always present and not null.
-        /// </summary>
-        private void ClearView()
-        {
-            if (_view == null)
-            {
-                _view = new AvaloniaList<object>();
-            }
-            else
-            {
-                _view.Clear();
-            }
-        }
-
-        /// <summary>
-        /// Walks through the items enumeration. Performance is not going to be
-        /// perfect with the current implementation.
-        /// </summary>
-        private void RefreshView()
-        {
-            if (_items == null)
-            {
-                ClearView();
-                return;
-            }
-
-            // Cache the current text value
-            string text = Text ?? string.Empty;
-
-            // Determine if any filtering mode is on
-            bool stringFiltering = TextFilter != null;
-            bool objectFiltering = FilterMode == AutoCompleteFilterMode.Custom && TextFilter == null;
-
-            int view_index = 0;
-            int view_count = _view!.Count;
-            List<object> items = _items;
-            foreach (object item in items)
-            {
-                bool inResults = !(stringFiltering || objectFiltering);
-                if (!inResults)
-                {
-                    if (stringFiltering)
-                    {
-                        inResults = TextFilter!(text, FormatValue(item));
-                    }
-                    else
-                    {
-                        if (ItemFilter is null)
-                        {
-                            throw new Exception("ItemFilter property can not be null when FilterMode has value AutoCompleteFilterMode.Custom");
-                        }
-                        else
-                        {
-                            inResults = ItemFilter(text, item);
-                        }
-                    }
-                }
-
-                if (view_count > view_index && inResults && _view[view_index] == item)
-                {
-                    // Item is still in the view
-                    view_index++;
-                }
-                else if (inResults)
-                {
-                    // Insert the item
-                    if (view_count > view_index && _view[view_index] != item)
-                    {
-                        // Replace item
-                        // Unfortunately replacing via index throws a fatal
-                        // exception: View[view_index] = item;
-                        // Cost: O(n) vs O(1)
-                        _view.RemoveAt(view_index);
-                        _view.Insert(view_index, item);
-                        view_index++;
-                    }
-                    else
-                    {
-                        // Add the item
-                        if (view_index == view_count)
-                        {
-                            // Constant time is preferred (Add).
-                            _view.Add(item);
-                        }
-                        else
-                        {
-                            _view.Insert(view_index, item);
-                        }
-                        view_index++;
-                        view_count++;
-                    }
-                }
-                else if (view_count > view_index && _view[view_index] == item)
-                {
-                    // Remove the item
-                    _view.RemoveAt(view_index);
-                    view_count--;
-                }
-            }
-
-            // Clear the evaluator to discard a reference to the last item
-            if (_valueBindingEvaluator != null)
-            {
-                _valueBindingEvaluator.ClearDataContext();
-            }
-        }
-
-        /// <summary>
-        /// Handle any change to the ItemsSource dependency property, update
-        /// the underlying ObservableCollection view, and set the selection
-        /// adapter's ItemsSource to the view if appropriate.
-        /// </summary>
-        /// <param name="newValue">The new enumerable reference.</param>
-        private void OnItemsChanged(IEnumerable? newValue)
-        {
-            // Remove handler for oldValue.CollectionChanged (if present)
-            _collectionChangeSubscription?.Dispose();
-            _collectionChangeSubscription = null;
-
-            // Add handler for newValue.CollectionChanged (if possible)
-            if (newValue is INotifyCollectionChanged newValueINotifyCollectionChanged)
-            {
-                _collectionChangeSubscription = newValueINotifyCollectionChanged.WeakSubscribe(ItemsCollectionChanged);
-            }
-
-            // Store a local cached copy of the data
-            _items = newValue == null ? null : new List<object>(newValue.Cast<object>().ToList());
-
-            // Clear and set the view on the selection adapter
-            ClearView();
-            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
-            {
-                SelectionAdapter.Items = _view;
-            }
-            if (IsDropDownOpen)
-            {
-                RefreshView();
-            }
-        }
-
-        /// <summary>
-        /// Method that handles the ObservableCollection.CollectionChanged event for the ItemsSource property.
-        /// </summary>
-        /// <param name="sender">The object that raised the event.</param>
-        /// <param name="e">The event data.</param>
-        private void ItemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            // Update the cache
-            if (e.Action == NotifyCollectionChangedAction.Remove && e.OldItems != null)
-            {
-                for (int index = 0; index < e.OldItems.Count; index++)
-                {
-                    _items!.RemoveAt(e.OldStartingIndex);
-                }
-            }
-            if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems != null && _items!.Count >= e.NewStartingIndex)
-            {
-                for (int index = 0; index < e.NewItems.Count; index++)
-                {
-                    _items.Insert(e.NewStartingIndex + index, e.NewItems[index]!);
-                }
-            }
-            if (e.Action == NotifyCollectionChangedAction.Replace && e.NewItems != null && e.OldItems != null)
-            {
-                for (int index = 0; index < e.NewItems.Count; index++)
-                {
-                    _items![e.NewStartingIndex] = e.NewItems[index]!;
-                }
-            }
-
-            // Update the view
-            if ((e.Action == NotifyCollectionChangedAction.Remove || e.Action == NotifyCollectionChangedAction.Replace) && e.OldItems != null)
-            {
-                for (int index = 0; index < e.OldItems.Count; index++)
-                {
-                    _view!.Remove(e.OldItems[index]!);
-                }
-            }
-
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                // Significant changes to the underlying data.
-                ClearView();
-                if (Items != null)
-                {
-                    _items = new List<object>(Items.Cast<object>().ToList());
-                }
-            }
-
-            // Refresh the observable collection used in the selection adapter.
-            RefreshView();
-        }
-
-        /// <summary>
-        /// Notifies the
-        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> that the
-        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Items" />
-        /// property has been set and the data can be filtered to provide
-        /// possible matches in the drop-down.
-        /// </summary>
-        /// <remarks>
-        /// Call this method when you are providing custom population of
-        /// the drop-down portion of the AutoCompleteBox, to signal the control
-        /// that you are done with the population process.
-        /// Typically, you use PopulateComplete when the population process
-        /// is a long-running process and you want to cancel built-in filtering
-        ///  of the ItemsSource items. In this case, you can handle the
-        /// Populated event and set PopulatingEventArgs.Cancel to true.
-        /// When the long-running process has completed you call
-        /// PopulateComplete to indicate the drop-down is populated.
-        /// </remarks>
-        public void PopulateComplete()
-        {
-            // Apply the search filter
-            RefreshView();
-
-            // Fire the Populated event containing the read-only view data.
-            PopulatedEventArgs populated = new PopulatedEventArgs(new ReadOnlyCollection<object>(_view!));
-            OnPopulated(populated);
-
-            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
-            {
-                SelectionAdapter.Items = _view;
-            }
-
-            bool isDropDownOpen = _userCalledPopulate && (_view!.Count > 0);
-            if (isDropDownOpen != IsDropDownOpen)
-            {
-                _ignorePropertyChange = true;
-                IsDropDownOpen = isDropDownOpen;
-            }
-            if (IsDropDownOpen)
-            {
-                OpeningDropDown(false);
-            }
-            else
-            {
-                ClosingDropDown(true);
-            }
-
-            UpdateTextCompletion(_userCalledPopulate);
-        }
-
-        /// <summary>
-        /// Performs text completion, if enabled, and a lookup on the underlying
-        /// item values for an exact match. Will update the SelectedItem value.
-        /// </summary>
-        /// <param name="userInitiated">A value indicating whether the operation
-        /// was user initiated. Text completion will not be performed when not
-        /// directly initiated by the user.</param>
-        private void UpdateTextCompletion(bool userInitiated)
-        {
-            // By default this method will clear the selected value
-            object? newSelectedItem = null;
-            string? text = Text;
-
-            // Text search is StartsWith explicit and only when enabled, in
-            // line with WPF's ComboBox lookup. When in use it will associate
-            // a Value with the Text if it is found in ItemsSource. This is
-            // only valid when there is data and the user initiated the action.
-            if (_view!.Count > 0)
-            {
-                if (IsTextCompletionEnabled && TextBox != null && userInitiated)
-                {
-                    int currentLength = TextBox.Text?.Length ?? 0;
-                    int selectionStart = TextBoxSelectionStart;
-                    if (selectionStart == text?.Length && selectionStart > _textSelectionStart)
-                    {
-                        // When the FilterMode dependency property is set to
-                        // either StartsWith or StartsWithCaseSensitive, the
-                        // first item in the view is used. This will improve
-                        // performance on the lookup. It assumes that the
-                        // FilterMode the user has selected is an acceptable
-                        // case sensitive matching function for their scenario.
-                        object? top = FilterMode == AutoCompleteFilterMode.StartsWith || FilterMode == AutoCompleteFilterMode.StartsWithCaseSensitive
-                            ? _view[0]
-                            : TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
-
-                        // If the search was successful, update SelectedItem
-                        if (top != null)
-                        {
-                            newSelectedItem = top;
-                            string? topString = FormatValue(top, true);
-
-                            // Only replace partially when the two words being the same
-                            int minLength = Math.Min(topString?.Length ?? 0, Text?.Length ?? 0);
-                            if (AutoCompleteSearch.Equals(Text?.Substring(0, minLength), topString?.Substring(0, minLength)))
-                            {
-                                // Update the text
-                                UpdateTextValue(topString);
-
-                                // Select the text past the user's caret
-                                TextBox.SelectionStart = currentLength;
-                                TextBox.SelectionEnd = topString?.Length ?? 0;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    // Perform an exact string lookup for the text. This is a
-                    // design change from the original Toolkit release when the
-                    // IsTextCompletionEnabled property behaved just like the
-                    // WPF ComboBox's IsTextSearchEnabled property.
-                    //
-                    // This change provides the behavior that most people expect
-                    // to find: a lookup for the value is always performed.
-                    newSelectedItem = TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive));
-                }
-            }
-
-            // Update the selected item property
-
-            if (SelectedItem != newSelectedItem)
-            {
-                _skipSelectedItemTextUpdate = true;
-            }
-            SelectedItem = newSelectedItem;
-
-            // Restore updates for TextSelection
-            if (_ignoreTextSelectionChange)
-            {
-                _ignoreTextSelectionChange = false;
-                if (TextBox != null)
-                {
-                    _textSelectionStart = TextBoxSelectionStart;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Attempts to look through the view and locate the specific exact
-        /// text match.
-        /// </summary>
-        /// <param name="searchText">The search text.</param>
-        /// <param name="view">The view reference.</param>
-        /// <param name="predicate">The predicate to use for the partial or
-        /// exact match.</param>
-        /// <returns>Returns the object or null.</returns>
-        private object? TryGetMatch(string? searchText, AvaloniaList<object> view, AutoCompleteFilterPredicate<string?>? predicate)
-        {
-            if (predicate is null)
-                return null;
-
-            if (view != null && view.Count > 0)
-            {
-                foreach (object o in view)
-                {
-                    if (predicate(searchText, FormatValue(o)))
-                    {
-                        return o;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private void UpdatePseudoClasses()
-        {
-            PseudoClasses.Set(":dropdownopen", IsDropDownOpen);
-        }
-
-        private void ClearTextBoxSelection()
-        {
-            if (TextBox != null)
-            {
-                int length = TextBox.Text?.Length ?? 0;
-                TextBox.SelectionStart = length;
-                TextBox.SelectionEnd = length;
-            }
-        }
-
-        /// <summary>
-        /// Called when the selected item is changed, updates the text value
-        /// that is displayed in the text box part.
-        /// </summary>
-        /// <param name="newItem">The new item.</param>
-        private void OnSelectedItemChanged(object? newItem)
-        {
-            string? text;
-
-            if (newItem == null)
-            {
-                text = SearchText;
-            }
-            else if (TextSelector != null)
-            {
-                text = TextSelector(SearchText, FormatValue(newItem, true));
-            }
-            else if (ItemSelector != null)
-            {
-                text = ItemSelector(SearchText, newItem);
-            }
-            else
-            {
-                text = FormatValue(newItem, true);
-            }
-
-            // Update the Text property and the TextBox values
-            UpdateTextValue(text);
-
-            // Move the caret to the end of the text box
-            ClearTextBoxSelection();
-        }
-
-        /// <summary>
-        /// Handles the SelectionChanged event of the selection adapter.
-        /// </summary>
-        /// <param name="sender">The source object.</param>
-        /// <param name="e">The selection changed event data.</param>
-        private void OnAdapterSelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            SelectedItem = _adapter!.SelectedItem;
-        }
-
-        //TODO Check UpdateTextCompletion
-        /// <summary>
-        /// Handles the Commit event on the selection adapter.
-        /// </summary>
-        /// <param name="sender">The source object.</param>
-        /// <param name="e">The event data.</param>
-        private void OnAdapterSelectionComplete(object? sender, RoutedEventArgs e)
-        {
-            IsDropDownOpen = false;
-
-            // Completion will update the selected value
-            //UpdateTextCompletion(false);
-
-            // Text should not be selected
-            ClearTextBoxSelection();
-
-            TextBox!.Focus();
-        }
-
-        /// <summary>
-        /// Handles the Cancel event on the selection adapter.
-        /// </summary>
-        /// <param name="sender">The source object.</param>
-        /// <param name="e">The event data.</param>
-        private void OnAdapterSelectionCanceled(object? sender, RoutedEventArgs e)
-        {
-            UpdateTextValue(SearchText);
-
-            // Completion will update the selected value
-            UpdateTextCompletion(false);
-        }
-
-        /// <summary>
-        /// A predefined set of filter functions for the known, built-in
-        /// AutoCompleteFilterMode enumeration values.
-        /// </summary>
-        private static class AutoCompleteSearch
-        {
-            /// <summary>
-            /// Index function that retrieves the filter for the provided
-            /// AutoCompleteFilterMode.
-            /// </summary>
-            /// <param name="FilterMode">The built-in search mode.</param>
-            /// <returns>Returns the string-based comparison function.</returns>
-            public static AutoCompleteFilterPredicate<string?>? GetFilter(AutoCompleteFilterMode FilterMode)
-            {
-                switch (FilterMode)
-                {
-                    case AutoCompleteFilterMode.Contains:
-                        return Contains;
-
-                    case AutoCompleteFilterMode.ContainsCaseSensitive:
-                        return ContainsCaseSensitive;
-
-                    case AutoCompleteFilterMode.ContainsOrdinal:
-                        return ContainsOrdinal;
-
-                    case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
-                        return ContainsOrdinalCaseSensitive;
-
-                    case AutoCompleteFilterMode.Equals:
-                        return Equals;
-
-                    case AutoCompleteFilterMode.EqualsCaseSensitive:
-                        return EqualsCaseSensitive;
-
-                    case AutoCompleteFilterMode.EqualsOrdinal:
-                        return EqualsOrdinal;
-
-                    case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
-                        return EqualsOrdinalCaseSensitive;
-
-                    case AutoCompleteFilterMode.StartsWith:
-                        return StartsWith;
-
-                    case AutoCompleteFilterMode.StartsWithCaseSensitive:
-                        return StartsWithCaseSensitive;
-
-                    case AutoCompleteFilterMode.StartsWithOrdinal:
-                        return StartsWithOrdinal;
-
-                    case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
-                        return StartsWithOrdinalCaseSensitive;
-
-                    case AutoCompleteFilterMode.None:
-                    case AutoCompleteFilterMode.Custom:
-                    default:
-                        return null;
-                }
-            }
-
-            /// <summary>
-            /// An implementation of the Contains member of string that takes in a
-            /// string comparison. The traditional .NET string Contains member uses
-            /// StringComparison.Ordinal.
-            /// </summary>
-            /// <param name="s">The string.</param>
-            /// <param name="value">The string value to search for.</param>
-            /// <param name="comparison">The string comparison type.</param>
-            /// <returns>Returns true when the substring is found.</returns>
-            private static bool Contains(string? s, string? value, StringComparison comparison)
-            {
-                if (s is not null && value is not null)
-                    return s.IndexOf(value, comparison) >= 0;
-                return false;
-            }
-
-            /// <summary>
-            /// Check if the string value begins with the text.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool StartsWith(string? text, string? value)
-            {
-                if (value is not null && text is not null)
-                    return value.StartsWith(text, StringComparison.CurrentCultureIgnoreCase);
-                return false;
-            }
-
-            /// <summary>
-            /// Check if the string value begins with the text.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool StartsWithCaseSensitive(string? text, string? value)
-            {
-                if (value is not null && text is not null)
-                    return value.StartsWith(text, StringComparison.CurrentCulture);
-                return false;
-            }
-
-            /// <summary>
-            /// Check if the string value begins with the text.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool StartsWithOrdinal(string? text, string? value)
-            {
-                if (value is not null && text is not null)
-                    return value.StartsWith(text, StringComparison.OrdinalIgnoreCase);
-                return false;
-            }
-
-            /// <summary>
-            /// Check if the string value begins with the text.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool StartsWithOrdinalCaseSensitive(string? text, string? value)
-            {
-                if (value is not null && text is not null)
-                    return value.StartsWith(text, StringComparison.Ordinal);
-                return false;
-            }
-
-            /// <summary>
-            /// Check if the prefix is contained in the string value. The current
-            /// culture's case insensitive string comparison operator is used.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool Contains(string? text, string? value)
-            {
-                return Contains(value, text, StringComparison.CurrentCultureIgnoreCase);
-            }
-
-            /// <summary>
-            /// Check if the prefix is contained in the string value.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool ContainsCaseSensitive(string? text, string? value)
-            {
-                return Contains(value, text, StringComparison.CurrentCulture);
-            }
-
-            /// <summary>
-            /// Check if the prefix is contained in the string value.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool ContainsOrdinal(string? text, string? value)
-            {
-                return Contains(value, text, StringComparison.OrdinalIgnoreCase);
-            }
-
-            /// <summary>
-            /// Check if the prefix is contained in the string value.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool ContainsOrdinalCaseSensitive(string? text, string? value)
-            {
-                return Contains(value, text, StringComparison.Ordinal);
-            }
-
-            /// <summary>
-            /// Check if the string values are equal.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool Equals(string? text, string? value)
-            {
-                return string.Equals(value, text, StringComparison.CurrentCultureIgnoreCase);
-            }
-
-            /// <summary>
-            /// Check if the string values are equal.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool EqualsCaseSensitive(string? text, string? value)
-            {
-                return string.Equals(value, text, StringComparison.CurrentCulture);
-            }
-
-            /// <summary>
-            /// Check if the string values are equal.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool EqualsOrdinal(string? text, string? value)
-            {
-                return string.Equals(value, text, StringComparison.OrdinalIgnoreCase);
-            }
-
-            /// <summary>
-            /// Check if the string values are equal.
-            /// </summary>
-            /// <param name="text">The AutoCompleteBox prefix text.</param>
-            /// <param name="value">The item's string value.</param>
-            /// <returns>Returns true if the condition is met.</returns>
-            public static bool EqualsOrdinalCaseSensitive(string? text, string? value)
-            {
-                return string.Equals(value, text, StringComparison.Ordinal);
-            }
-        }
-
-        /// <summary>
-        /// A framework element that permits a binding to be evaluated in a new data
-        /// context leaf node.
-        /// </summary>
-        /// <typeparam name="T">The type of dynamic binding to return.</typeparam>
-        public class BindingEvaluator<T> : Control
-        {
-            /// <summary>
-            /// Gets or sets the string value binding used by the control.
-            /// </summary>
-            private IBinding? _binding;
-
-            #region public T Value
-
-            /// <summary>
-            /// Identifies the Value dependency property.
-            /// </summary>
-            public static readonly StyledProperty<T> ValueProperty =
-                AvaloniaProperty.Register<BindingEvaluator<T>, T>(nameof(Value));
-
-            /// <summary>
-            /// Gets or sets the data item value.
-            /// </summary>
-            public T Value
-            {
-                get { return GetValue(ValueProperty); }
-                set { SetValue(ValueProperty, value); }
-            }
-
-            #endregion public string Value
-
-            /// <summary>
-            /// Gets or sets the value binding.
-            /// </summary>
-            public IBinding? ValueBinding
-            {
-                get { return _binding; }
-                set
-                {
-                    _binding = value;
-                    if (value is not null)
-                        AvaloniaObjectExtensions.Bind(this, ValueProperty, value);
-                }
-            }
-
-            /// <summary>
-            /// Initializes a new instance of the BindingEvaluator class.
-            /// </summary>
-            public BindingEvaluator()
-            { }
-
-            /// <summary>
-            /// Initializes a new instance of the BindingEvaluator class,
-            /// setting the initial binding to the provided parameter.
-            /// </summary>
-            /// <param name="binding">The initial string value binding.</param>
-            public BindingEvaluator(IBinding? binding)
-                : this()
-            {
-                ValueBinding = binding;
-            }
-
-            /// <summary>
-            /// Clears the data context so that the control does not keep a
-            /// reference to the last-looked up item.
-            /// </summary>
-            public void ClearDataContext()
-            {
-                DataContext = null;
-            }
-
-            /// <summary>
-            /// Updates the data context of the framework element and returns the
-            /// updated binding value.
-            /// </summary>
-            /// <param name="o">The object to use as the data context.</param>
-            /// <param name="clearDataContext">If set to true, this parameter will
-            /// clear the data context immediately after retrieving the value.</param>
-            /// <returns>Returns the evaluated T value of the bound dependency
-            /// property.</returns>
-            public T GetDynamicValue(object o, bool clearDataContext)
-            {
-                DataContext = o;
-                T value = Value;
-                if (clearDataContext)
-                {
-                    DataContext = null;
-                }
-                return value;
-            }
-
-            /// <summary>
-            /// Updates the data context of the framework element and returns the
-            /// updated binding value.
-            /// </summary>
-            /// <param name="o">The object to use as the data context.</param>
-            /// <returns>Returns the evaluated T value of the bound dependency
-            /// property.</returns>
-            public T GetDynamicValue(object? o)
-            {
-                DataContext = o;
-                return Value;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
new file mode 100644
index 0000000000..ecbe01d8b7
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
@@ -0,0 +1,463 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+
+namespace Avalonia.Controls
+{
+    public partial class AutoCompleteBox
+    {
+        public static readonly StyledProperty<string?> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<AutoCompleteBox>();
+
+        /// <summary>
+        /// Identifies the <see cref="MinimumPrefixLength" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="MinimumPrefixLength" /> property.</value>
+        public static readonly StyledProperty<int> MinimumPrefixLengthProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, int>(
+                nameof(MinimumPrefixLength), 1,
+                validate: IsValidMinimumPrefixLength);
+
+        /// <summary>
+        /// Identifies the <see cref="MinimumPopulateDelay" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="MinimumPopulateDelay" /> property.</value>
+        public static readonly StyledProperty<TimeSpan> MinimumPopulateDelayProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, TimeSpan>(
+                nameof(MinimumPopulateDelay),
+                TimeSpan.Zero,
+                validate: IsValidMinimumPopulateDelay);
+
+        /// <summary>
+        /// Identifies the <see cref="MaxDropDownHeight" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="MaxDropDownHeight" /> property.</value>
+        public static readonly StyledProperty<double> MaxDropDownHeightProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, double>(
+                nameof(MaxDropDownHeight),
+                double.PositiveInfinity,
+                validate: IsValidMaxDropDownHeight);
+
+        /// <summary>
+        /// Identifies the <see cref="IsTextCompletionEnabled" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="IsTextCompletionEnabled" /> property.</value>
+        public static readonly StyledProperty<bool> IsTextCompletionEnabledProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, bool>(nameof(IsTextCompletionEnabled));
+
+        /// <summary>
+        /// Identifies the <see cref="ItemTemplate" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="ItemTemplate" /> property.</value>
+        public static readonly StyledProperty<IDataTemplate> ItemTemplateProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, IDataTemplate>(nameof(ItemTemplate));
+
+        /// <summary>
+        /// Identifies the <see cref="IsDropDownOpen" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="IsDropDownOpen" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        /// <summary>
+        /// Identifies the <see cref="SelectedItem" /> property.
+        /// </summary>
+        /// <value>The identifier the <see cref="SelectedItem" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, object?> SelectedItemProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, object?>(
+                nameof(SelectedItem),
+                o => o.SelectedItem,
+                (o, v) => o.SelectedItem = v,
+                defaultBindingMode: BindingMode.TwoWay,
+                enableDataValidation: true);
+
+        /// <summary>
+        /// Identifies the <see cref="Text" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="Text" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, string?> TextProperty =
+            TextBlock.TextProperty.AddOwnerWithDataValidation<AutoCompleteBox>(
+                o => o.Text,
+                (o, v) => o.Text = v,
+                defaultBindingMode: BindingMode.TwoWay,
+                enableDataValidation: true);
+
+        /// <summary>
+        /// Identifies the <see cref="SearchText" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="SearchText" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, string?> SearchTextProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string?>(
+                nameof(SearchText),
+                o => o.SearchText,
+                unsetValue: string.Empty);
+
+        /// <summary>
+        /// Gets the identifier for the <see cref="FilterMode" /> property.
+        /// </summary>
+        public static readonly StyledProperty<AutoCompleteFilterMode> FilterModeProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, AutoCompleteFilterMode>(
+                nameof(FilterMode),
+                defaultValue: AutoCompleteFilterMode.StartsWith,
+                validate: IsValidFilterMode);
+
+        /// <summary>
+        /// Identifies the <see cref="ItemFilter" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="ItemFilter" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<object?>?> ItemFilterProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<object?>?>(
+                nameof(ItemFilter),
+                o => o.ItemFilter,
+                (o, v) => o.ItemFilter = v);
+
+        /// <summary>
+        /// Identifies the <see cref="TextFilter" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="TextFilter" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<string?>?> TextFilterProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<string?>?>(
+                nameof(TextFilter),
+                o => o.TextFilter,
+                (o, v) => o.TextFilter = v,
+                unsetValue: AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
+
+        /// <summary>
+        /// Identifies the <see cref="ItemSelector" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="ItemSelector" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteSelector<object>?> ItemSelectorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteSelector<object>?>(
+                nameof(ItemSelector),
+                o => o.ItemSelector,
+                (o, v) => o.ItemSelector = v);
+
+        /// <summary>
+        /// Identifies the <see cref="TextSelector" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="TextSelector" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteSelector<string?>?> TextSelectorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteSelector<string?>?>(
+                nameof(TextSelector),
+                o => o.TextSelector,
+                (o, v) => o.TextSelector = v);
+
+        /// <summary>
+        /// Identifies the <see cref="Items" /> property.
+        /// </summary>
+        /// <value>The identifier for the <see cref="Items" /> property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, IEnumerable?> ItemsProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, IEnumerable?>(
+                nameof(Items),
+                o => o.Items,
+                (o, v) => o.Items = v);
+
+        public static readonly DirectProperty<AutoCompleteBox, Func<string?, CancellationToken, Task<IEnumerable<object>>>?> AsyncPopulatorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, Func<string?, CancellationToken, Task<IEnumerable<object>>>?>(
+                nameof(AsyncPopulator),
+                o => o.AsyncPopulator,
+                (o, v) => o.AsyncPopulator = v);
+
+        /// <summary>
+        /// Gets or sets the minimum number of characters required to be entered
+        /// in the text box before the <see cref="AutoCompleteBox" /> displays possible matches.
+        /// </summary>
+        /// <value>
+        /// The minimum number of characters to be entered in the text box
+        /// before the <see cref="AutoCompleteBox" />
+        /// displays possible matches. The default is 1.
+        /// </value>
+        /// <remarks>
+        /// If you set MinimumPrefixLength to -1, the AutoCompleteBox will
+        /// not provide possible matches. There is no maximum value, but
+        /// setting MinimumPrefixLength to value that is too large will
+        /// prevent the AutoCompleteBox from providing possible matches as well.
+        /// </remarks>
+        public int MinimumPrefixLength
+        {
+            get => GetValue(MinimumPrefixLengthProperty);
+            set => SetValue(MinimumPrefixLengthProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the first possible match
+        /// found during the filtering process will be displayed automatically
+        /// in the text box.
+        /// </summary>
+        /// <value>
+        /// True if the first possible match found will be displayed
+        /// automatically in the text box; otherwise, false. The default is
+        /// false.
+        /// </value>
+        public bool IsTextCompletionEnabled
+        {
+            get => GetValue(IsTextCompletionEnabledProperty);
+            set => SetValue(IsTextCompletionEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="T:Avalonia.DataTemplate" /> used
+        /// to display each item in the drop-down portion of the control.
+        /// </summary>
+        /// <value>The <see cref="T:Avalonia.DataTemplate" /> used to
+        /// display each item in the drop-down. The default is null.</value>
+        /// <remarks>
+        /// You use the ItemTemplate property to specify the visualization
+        /// of the data objects in the drop-down portion of the AutoCompleteBox
+        /// control. If your AutoCompleteBox is bound to a collection and you
+        /// do not provide specific display instructions by using a
+        /// DataTemplate, the resulting UI of each item is a string
+        /// representation of each object in the underlying collection.
+        /// </remarks>
+        public IDataTemplate ItemTemplate
+        {
+            get => GetValue(ItemTemplateProperty);
+            set => SetValue(ItemTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum delay, after text is typed
+        /// in the text box before the
+        /// <see cref="AutoCompleteBox" /> control
+        /// populates the list of possible matches in the drop-down.
+        /// </summary>
+        /// <value>The minimum delay, after text is typed in
+        /// the text box, but before the
+        /// <see cref="AutoCompleteBox" /> populates
+        /// the list of possible matches in the drop-down. The default is 0.</value>
+        public TimeSpan MinimumPopulateDelay
+        {
+            get => GetValue(MinimumPopulateDelayProperty);
+            set => SetValue(MinimumPopulateDelayProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the drop-down portion of the
+        /// <see cref="AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The maximum height of the drop-down portion of the
+        /// <see cref="AutoCompleteBox" /> control.
+        /// The default is <see cref="F:System.Double.PositiveInfinity" />.</value>
+        /// <exception cref="T:System.ArgumentException">The specified value is less than 0.</exception>
+        public double MaxDropDownHeight
+        {
+            get => GetValue(MaxDropDownHeightProperty);
+            set => SetValue(MaxDropDownHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down portion of
+        /// the control is open.
+        /// </summary>
+        /// <value>
+        /// True if the drop-down is open; otherwise, false. The default is
+        /// false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get => _isDropDownOpen;
+            set => SetAndRaise(IsDropDownOpenProperty, ref  _isDropDownOpen, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the  <see cref="T:Avalonia.Data.Binding" /> that
+        /// is used to get the values for display in the text portion of
+        /// the <see cref="AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The <see cref="T:Avalonia.Data.IBinding" /> object used
+        /// when binding to a collection property.</value>
+        [AssignBinding]
+        public IBinding? ValueMemberBinding
+        {
+            get => _valueBindingEvaluator?.ValueBinding;
+            set
+            {
+                if (ValueMemberBinding != value)
+                {
+                    _valueBindingEvaluator = new BindingEvaluator<string>(value);
+                    OnValueMemberBindingChanged(value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected item in the drop-down.
+        /// </summary>
+        /// <value>The selected item in the drop-down.</value>
+        /// <remarks>
+        /// If the IsTextCompletionEnabled property is true and text typed by
+        /// the user matches an item in the ItemsSource collection, which is
+        /// then displayed in the text box, the SelectedItem property will be
+        /// a null reference.
+        /// </remarks>
+        public object? SelectedItem
+        {
+            get => _selectedItem;
+            set => SetAndRaise(SelectedItemProperty, ref _selectedItem, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text in the text box portion of the
+        /// <see cref="AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The text in the text box portion of the
+        /// <see cref="AutoCompleteBox" /> control.</value>
+        public string? Text
+        {
+            get => _text;
+            set => SetAndRaise(TextProperty, ref _text, value);
+        }
+
+        /// <summary>
+        /// Gets the text that is used to filter items in the
+        /// <see cref="Items" /> item collection.
+        /// </summary>
+        /// <value>The text that is used to filter items in the
+        /// <see cref="Items" /> item collection.</value>
+        /// <remarks>
+        /// The SearchText value is typically the same as the
+        /// Text property, but is set after the TextChanged event occurs
+        /// and before the Populating event.
+        /// </remarks>
+        public string? SearchText
+        {
+            get => _searchText;
+            private set
+            {
+                try
+                {
+                    _allowWrite = true;
+                    SetAndRaise(SearchTextProperty, ref _searchText, value);
+                }
+                finally
+                {
+                    _allowWrite = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how the text in the text box is used to filter items
+        /// specified by the <see cref="Items" />
+        /// property for display in the drop-down.
+        /// </summary>
+        /// <value>One of the <see cref="AutoCompleteFilterMode" />
+        /// values The default is <see cref="AutoCompleteFilterMode.StartsWith" />.</value>
+        /// <exception cref="T:System.ArgumentException">The specified value is not a valid
+        /// <see cref="AutoCompleteFilterMode" />.</exception>
+        /// <remarks>
+        /// Use the FilterMode property to specify how possible matches are
+        /// filtered. For example, possible matches can be filtered in a
+        /// predefined or custom way. The search mode is automatically set to
+        /// Custom if you set the ItemFilter property.
+        /// </remarks>
+        public AutoCompleteFilterMode FilterMode
+        {
+            get => GetValue(FilterModeProperty);
+            set => SetValue(FilterModeProperty, value);
+        }
+
+        public string? Watermark
+        {
+            get => GetValue(WatermarkProperty);
+            set => SetValue(WatermarkProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the custom method that uses user-entered text to filter
+        /// the items specified by the <see cref="Items" />
+        /// property for display in the drop-down.
+        /// </summary>
+        /// <value>The custom method that uses the user-entered text to filter
+        /// the items specified by the <see cref="Items" />
+        /// property. The default is null.</value>
+        /// <remarks>
+        /// The filter mode is automatically set to Custom if you set the
+        /// ItemFilter property.
+        /// </remarks>
+        public AutoCompleteFilterPredicate<object?>? ItemFilter
+        {
+            get => _itemFilter;
+            set => SetAndRaise(ItemFilterProperty, ref _itemFilter, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the custom method that uses the user-entered text to
+        /// filter items specified by the <see cref="Items" />
+        /// property in a text-based way for display in the drop-down.
+        /// </summary>
+        /// <value>The custom method that uses the user-entered text to filter
+        /// items specified by the <see cref="Items" />
+        /// property in a text-based way for display in the drop-down.</value>
+        /// <remarks>
+        /// The search mode is automatically set to Custom if you set the
+        /// TextFilter property.
+        /// </remarks>
+        public AutoCompleteFilterPredicate<string?>? TextFilter
+        {
+            get => _textFilter;
+            set => SetAndRaise(TextFilterProperty, ref _textFilter, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the custom method that combines the user-entered
+        /// text and one of the items specified by the <see cref="Items" />.
+        /// </summary>
+        /// <value>
+        /// The custom method that combines the user-entered
+        /// text and one of the items specified by the <see cref="Items" />.
+        /// </value>
+        public AutoCompleteSelector<object>? ItemSelector
+        {
+            get => _itemSelector;
+            set => SetAndRaise(ItemSelectorProperty, ref _itemSelector, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the custom method that combines the user-entered
+        /// text and one of the items specified by the
+        /// <see cref="Items" /> in a text-based way.
+        /// </summary>
+        /// <value>
+        /// The custom method that combines the user-entered
+        /// text and one of the items specified by the <see cref="Items" />
+        /// in a text-based way.
+        /// </value>
+        public AutoCompleteSelector<string?>? TextSelector
+        {
+            get => _textSelector;
+            set => SetAndRaise(TextSelectorProperty, ref _textSelector, value);
+        }
+
+        public Func<string?, CancellationToken, Task<IEnumerable<object>>>? AsyncPopulator
+        {
+            get => _asyncPopulator;
+            set => SetAndRaise(AsyncPopulatorProperty, ref _asyncPopulator, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a collection that is used to generate the items for the
+        /// drop-down portion of the <see cref="AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The collection that is used to generate the items of the
+        /// drop-down portion of the <see cref="AutoCompleteBox" /> control.</value>
+        public IEnumerable? Items
+        {
+            get => _itemsEnumerable;
+            set => SetAndRaise(ItemsProperty, ref _itemsEnumerable, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.cs
new file mode 100644
index 0000000000..a027b8b650
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.cs
@@ -0,0 +1,2140 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Collections;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Controls.Utils;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents the filter used by the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control to
+    /// determine whether an item is a possible match for the specified text.
+    /// </summary>
+    /// <returns>true to indicate <paramref name="item" /> is a possible match
+    /// for <paramref name="search" />; otherwise false.</returns>
+    /// <param name="search">The string used as the basis for filtering.</param>
+    /// <param name="item">The item that is compared with the
+    /// <paramref name="search" /> parameter.</param>
+    /// <typeparam name="T">The type used for filtering the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />. This type can
+    /// be either a string or an object.</typeparam>
+    public delegate bool AutoCompleteFilterPredicate<T>(string? search, T item);
+
+    /// <summary>
+    /// Represents the selector used by the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control to
+    /// determine how the specified text should be modified with an item.
+    /// </summary>
+    /// <returns>
+    /// Modified text that will be used by the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.
+    /// </returns>
+    /// <param name="search">The string used as the basis for filtering.</param>
+    /// <param name="item">
+    /// The selected item that should be combined with the
+    /// <paramref name="search" /> parameter.
+    /// </param>
+    /// <typeparam name="T">
+    /// The type used for filtering the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.
+    /// This type can be either a string or an object.
+    /// </typeparam>
+    public delegate string AutoCompleteSelector<T>(string? search, T item);
+
+    /// <summary>
+    /// Represents a control that provides a text box for user input and a
+    /// drop-down that contains possible matches based on the input in the text
+    /// box.
+    /// </summary>
+    [TemplatePart(ElementPopup,            typeof(Popup))]
+    [TemplatePart(ElementSelector,         typeof(SelectingItemsControl))]
+    [TemplatePart(ElementSelectionAdapter, typeof(ISelectionAdapter))]
+    [TemplatePart(ElementTextBox,          typeof(TextBox))]
+    [PseudoClasses(":dropdownopen")]
+    public partial class AutoCompleteBox : TemplatedControl
+    {
+        /// <summary>
+        /// Specifies the name of the selection adapter TemplatePart.
+        /// </summary>
+        private const string ElementSelectionAdapter = "PART_SelectionAdapter";
+
+        /// <summary>
+        /// Specifies the name of the Selector TemplatePart.
+        /// </summary>
+        private const string ElementSelector = "PART_SelectingItemsControl";
+
+        /// <summary>
+        /// Specifies the name of the Popup TemplatePart.
+        /// </summary>
+        private const string ElementPopup = "PART_Popup";
+
+        /// <summary>
+        /// The name for the text box part.
+        /// </summary>
+        private const string ElementTextBox = "PART_TextBox";
+
+        private IEnumerable? _itemsEnumerable;
+
+        /// <summary>
+        /// Gets or sets a local cached copy of the items data.
+        /// </summary>
+        private List<object>? _items;
+
+        /// <summary>
+        /// Gets or sets the observable collection that contains references to
+        /// all of the items in the generated view of data that is provided to
+        /// the selection-style control adapter.
+        /// </summary>
+        private AvaloniaList<object>? _view;
+
+        /// <summary>
+        /// Gets or sets a value to ignore a number of pending change handlers.
+        /// The value is decremented after each use. This is used to reset the
+        /// value of properties without performing any of the actions in their
+        /// change handlers.
+        /// </summary>
+        /// <remarks>The int is important as a value because the TextBox
+        /// TextChanged event does not immediately fire, and this will allow for
+        /// nested property changes to be ignored.</remarks>
+        private int _ignoreTextPropertyChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to ignore calling a pending
+        /// change handlers.
+        /// </summary>
+        private bool _ignorePropertyChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to ignore the selection
+        /// changed event.
+        /// </summary>
+        private bool _ignoreTextSelectionChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to skip the text update
+        /// processing when the selected item is updated.
+        /// </summary>
+        private bool _skipSelectedItemTextUpdate;
+
+        /// <summary>
+        /// Gets or sets the last observed text box selection start location.
+        /// </summary>
+        private int _textSelectionStart;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user initiated the
+        /// current populate call.
+        /// </summary>
+        private bool _userCalledPopulate;
+
+        /// <summary>
+        /// A value indicating whether the popup has been opened at least once.
+        /// </summary>
+        private bool _popupHasOpened;
+
+        /// <summary>
+        /// Gets or sets the DispatcherTimer used for the MinimumPopulateDelay
+        /// condition for auto completion.
+        /// </summary>
+        private DispatcherTimer? _delayTimer;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a read-only dependency
+        /// property change handler should allow the value to be set.  This is
+        /// used to ensure that read-only properties cannot be changed via
+        /// SetValue, etc.
+        /// </summary>
+        private bool _allowWrite;
+
+        /// <summary>
+        /// The TextBox template part.
+        /// </summary>
+        private TextBox? _textBox;
+        private IDisposable? _textBoxSubscriptions;
+
+        /// <summary>
+        /// The SelectionAdapter.
+        /// </summary>
+        private ISelectionAdapter? _adapter;
+
+        /// <summary>
+        /// A control that can provide updated string values from a binding.
+        /// </summary>
+        private BindingEvaluator<string>? _valueBindingEvaluator;
+
+        /// <summary>
+        /// A weak subscription for the collection changed event.
+        /// </summary>
+        private IDisposable? _collectionChangeSubscription;
+
+        private Func<string?, CancellationToken, Task<IEnumerable<object>>>? _asyncPopulator;
+        private CancellationTokenSource? _populationCancellationTokenSource;
+
+        private bool _itemTemplateIsFromValueMemberBinding = true;
+        private bool _settingItemTemplateFromValueMemberBinding;
+
+        private object? _selectedItem;
+        private bool _isDropDownOpen;
+        private bool _isFocused = false;
+
+        private string? _text = string.Empty;
+        private string? _searchText = string.Empty;
+
+        private AutoCompleteFilterPredicate<object?>? _itemFilter;
+        private AutoCompleteFilterPredicate<string?>? _textFilter = AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith);
+
+        private AutoCompleteSelector<object>? _itemSelector;
+        private AutoCompleteSelector<string?>? _textSelector;
+
+        private readonly EventHandler _populateDropDownHandler;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
+            RoutedEvent.Register<SelectionChangedEventArgs>(
+                nameof(SelectionChanged),
+                RoutingStrategies.Bubble,
+                typeof(AutoCompleteBox));
+
+        /// <summary>
+        /// Defines the <see cref="TextChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextChangedEventArgs> TextChangedEvent =
+            RoutedEvent.Register<AutoCompleteBox, TextChangedEventArgs>(
+                nameof(TextChanged),
+                RoutingStrategies.Bubble);
+
+        private static bool IsValidMinimumPrefixLength(int value) => value >= -1;
+
+        private static bool IsValidMinimumPopulateDelay(TimeSpan value) => value.TotalMilliseconds >= 0.0;
+
+        private static bool IsValidMaxDropDownHeight(double value) => value >= 0.0;
+
+        private static bool IsValidFilterMode(AutoCompleteFilterMode mode)
+        {
+            switch (mode)
+            {
+                case AutoCompleteFilterMode.None:
+                case AutoCompleteFilterMode.StartsWith:
+                case AutoCompleteFilterMode.StartsWithCaseSensitive:
+                case AutoCompleteFilterMode.StartsWithOrdinal:
+                case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Contains:
+                case AutoCompleteFilterMode.ContainsCaseSensitive:
+                case AutoCompleteFilterMode.ContainsOrdinal:
+                case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Equals:
+                case AutoCompleteFilterMode.EqualsCaseSensitive:
+                case AutoCompleteFilterMode.EqualsOrdinal:
+                case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Custom:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Handle the change of the IsEnabled property.
+        /// </summary>
+        /// <param name="e">The event data.</param>
+        private void OnControlIsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            bool isEnabled = (bool)e.NewValue!;
+            if (!isEnabled)
+            {
+                IsDropDownOpen = false;
+            }
+        }
+
+        /// <summary>
+        /// MinimumPopulateDelayProperty property changed handler. Any current
+        /// dispatcher timer will be stopped. The timer will not be restarted
+        /// until the next TextUpdate call by the user.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnMinimumPopulateDelayChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var newValue = (TimeSpan)e.NewValue!;
+
+            // Stop any existing timer
+            if (_delayTimer != null)
+            {
+                _delayTimer.Stop();
+
+                if (newValue == TimeSpan.Zero)
+                {
+                    _delayTimer.Tick -= _populateDropDownHandler;
+                    _delayTimer = null;
+                }
+            }
+
+            if (newValue > TimeSpan.Zero)
+            {
+                // Create or clear a dispatcher timer instance
+                if (_delayTimer == null)
+                {
+                    _delayTimer = new DispatcherTimer();
+                    _delayTimer.Tick += _populateDropDownHandler;
+                }
+
+                // Set the new tick interval
+                _delayTimer.Interval = newValue;
+            }
+        }
+
+        /// <summary>
+        /// IsDropDownOpenProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            // Ignore the change if requested
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            bool oldValue = (bool)e.OldValue!;
+            bool newValue = (bool)e.NewValue!;
+
+            if (newValue)
+            {
+                TextUpdated(Text, true);
+            }
+            else
+            {
+                ClosingDropDown(oldValue);
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        private void OnSelectedItemPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            // Update the text display
+            if (_skipSelectedItemTextUpdate)
+            {
+                _skipSelectedItemTextUpdate = false;
+            }
+            else
+            {
+                OnSelectedItemChanged(e.NewValue);
+            }
+
+            // Fire the SelectionChanged event
+            List<object> removed = new List<object>();
+            if (e.OldValue != null)
+            {
+                removed.Add(e.OldValue);
+            }
+
+            List<object> added = new List<object>();
+            if (e.NewValue != null)
+            {
+                added.Add(e.NewValue);
+            }
+
+            OnSelectionChanged(new SelectionChangedEventArgs(SelectionChangedEvent, removed, added));
+        }
+
+        /// <summary>
+        /// TextProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            TextUpdated((string?)e.NewValue, false);
+        }
+
+        private void OnSearchTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            // Ensure the property is only written when expected
+            if (!_allowWrite)
+            {
+                // Reset the old value before it was incorrectly written
+                _ignorePropertyChange = true;
+                SetValue(e.Property, e.OldValue);
+
+                throw new InvalidOperationException("Cannot set read-only property SearchText.");
+            }
+        }
+
+        /// <summary>
+        /// FilterModeProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnFilterModePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            AutoCompleteFilterMode mode = (AutoCompleteFilterMode)e.NewValue!;
+
+            // Sets the filter predicate for the new value
+            TextFilter = AutoCompleteSearch.GetFilter(mode);
+        }
+
+        /// <summary>
+        /// ItemFilterProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnItemFilterPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var value = e.NewValue as AutoCompleteFilterPredicate<object>;
+
+            // If null, revert to the "None" predicate
+            if (value == null)
+            {
+                FilterMode = AutoCompleteFilterMode.None;
+            }
+            else
+            {
+                FilterMode = AutoCompleteFilterMode.Custom;
+                TextFilter = null;
+            }
+        }
+
+        /// <summary>
+        /// ItemsSourceProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnItemsPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnItemsChanged((IEnumerable?)e.NewValue);
+        }
+
+        private void OnItemTemplatePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!_settingItemTemplateFromValueMemberBinding)
+                _itemTemplateIsFromValueMemberBinding = false;
+        }
+        private void OnValueMemberBindingChanged(IBinding? value)
+        {
+            if(_itemTemplateIsFromValueMemberBinding)
+            {
+                var template =
+                    new FuncDataTemplate(
+                        typeof(object),
+                        (o, _) =>
+                        {
+                            var control = new ContentControl();
+                            if (value is not null)
+                                control.Bind(ContentControl.ContentProperty, value);
+                            return control;
+                        });
+
+                _settingItemTemplateFromValueMemberBinding = true;
+                ItemTemplate = template;
+                _settingItemTemplateFromValueMemberBinding = false;
+            }
+        }
+
+        static AutoCompleteBox()
+        {
+            FocusableProperty.OverrideDefaultValue<AutoCompleteBox>(true);
+
+            MinimumPopulateDelayProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnMinimumPopulateDelayChanged(e));
+            IsDropDownOpenProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnIsDropDownOpenChanged(e));
+            SelectedItemProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnSelectedItemPropertyChanged(e));
+            TextProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnTextPropertyChanged(e));
+            SearchTextProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnSearchTextPropertyChanged(e));
+            FilterModeProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnFilterModePropertyChanged(e));
+            ItemFilterProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnItemFilterPropertyChanged(e));
+            ItemsProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnItemsPropertyChanged(e));
+            IsEnabledProperty.Changed.AddClassHandler<AutoCompleteBox>((x,e) => x.OnControlIsEnabledChanged(e));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> class.
+        /// </summary>
+        public AutoCompleteBox()
+        {
+            _populateDropDownHandler = PopulateDropDown;
+            ClearView();
+        }
+
+        /// <summary>
+        /// Gets or sets the drop down popup control.
+        /// </summary>
+        private Popup? DropDownPopup { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Text template part.
+        /// </summary>
+        private TextBox? TextBox
+        {
+            get => _textBox;
+            set
+            {
+                _textBoxSubscriptions?.Dispose();
+                _textBox = value;
+
+                // Attach handlers
+                if (_textBox != null)
+                {
+                    _textBoxSubscriptions =
+                        _textBox.GetObservable(TextBox.TextProperty)
+                                .Skip(1)
+                                .Subscribe(_ => OnTextBoxTextChanged());
+
+                    if (Text != null)
+                    {
+                        UpdateTextValue(Text);
+                    }
+                }
+            }
+        }
+
+        private int TextBoxSelectionStart
+        {
+            get
+            {
+                if (TextBox != null)
+                {
+                    return Math.Min(TextBox.SelectionStart, TextBox.SelectionEnd);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+        private int TextBoxSelectionLength
+        {
+            get
+            {
+                if (TextBox != null)
+                {
+                    return Math.Abs(TextBox.SelectionEnd - TextBox.SelectionStart);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selection adapter used to populate the drop-down
+        /// with a list of selectable items.
+        /// </summary>
+        /// <value>The selection adapter used to populate the drop-down with a
+        /// list of selectable items.</value>
+        /// <remarks>
+        /// You can use this property when you create an automation peer to
+        /// use with AutoCompleteBox or deriving from AutoCompleteBox to
+        /// create a custom control.
+        /// </remarks>
+        protected ISelectionAdapter? SelectionAdapter
+        {
+            get => _adapter;
+            set
+            {
+                if (_adapter != null)
+                {
+                    _adapter.SelectionChanged -= OnAdapterSelectionChanged;
+                    _adapter.Commit -= OnAdapterSelectionComplete;
+                    _adapter.Cancel -= OnAdapterSelectionCanceled;
+                    _adapter.Cancel -= OnAdapterSelectionComplete;
+                    _adapter.Items = null;
+                }
+
+                _adapter = value;
+
+                if (_adapter != null)
+                {
+                    _adapter.SelectionChanged += OnAdapterSelectionChanged;
+                    _adapter.Commit += OnAdapterSelectionComplete;
+                    _adapter.Cancel += OnAdapterSelectionCanceled;
+                    _adapter.Cancel += OnAdapterSelectionComplete;
+                    _adapter.Items = _view;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the
+        /// <see cref="T:Avalonia.Controls.ISelectionAdapter" /> part, if
+        /// possible.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="T:Avalonia.Controls.ISelectionAdapter" /> object,
+        /// if possible. Otherwise, null.
+        /// </returns>
+        protected virtual ISelectionAdapter? GetSelectionAdapterPart(INameScope nameScope)
+        {
+            ISelectionAdapter? adapter = null;
+            SelectingItemsControl? selector = nameScope.Find<SelectingItemsControl>(ElementSelector);
+            if (selector != null)
+            {
+                // Check if it is already an IItemsSelector
+                adapter = selector as ISelectionAdapter;
+                if (adapter == null)
+                {
+                    // Built in support for wrapping a Selector control
+                    adapter = new SelectingItemsControlSelectionAdapter(selector);
+                }
+            }
+            if (adapter == null)
+            {
+                adapter = nameScope.Find<ISelectionAdapter>(ElementSelectionAdapter);
+            }
+            return adapter;
+        }
+
+        /// <summary>
+        /// Builds the visual tree for the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
+        /// when a new template is applied.
+        /// </summary>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+
+            if (DropDownPopup != null)
+            {
+                DropDownPopup.Closed -= DropDownPopup_Closed;
+                DropDownPopup = null;
+            }
+
+            // Set the template parts. Individual part setters remove and add
+            // any event handlers.
+            Popup? popup = e.NameScope.Find<Popup>(ElementPopup);
+            if (popup != null)
+            {
+                DropDownPopup = popup;
+                DropDownPopup.Closed += DropDownPopup_Closed;
+            }
+
+            SelectionAdapter = GetSelectionAdapterPart(e.NameScope);
+            TextBox = e.NameScope.Find<TextBox>(ElementTextBox);
+
+            // If the drop down property indicates that the popup is open,
+            // flip its value to invoke the changed handler.
+            if (IsDropDownOpen && DropDownPopup != null && !DropDownPopup.IsOpen)
+            {
+                OpeningDropDown(false);
+            }
+
+            base.OnApplyTemplate(e);
+        }
+
+        /// <summary>
+        /// Called to update the validation state for properties for which data validation is
+        /// enabled.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
+        {
+            if (property == TextProperty || property == SelectedItemProperty)
+            {
+                DataValidationErrors.SetError(this, error);
+            }
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.InputElement.KeyDown" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            _ = e ?? throw new ArgumentNullException(nameof(e));
+
+            base.OnKeyDown(e);
+
+            if (e.Handled || !IsEnabled)
+            {
+                return;
+            }
+
+            // The drop down is open, pass along the key event arguments to the
+            // selection adapter. If it isn't handled by the adapter's logic,
+            // then we handle some simple navigation scenarios for controlling
+            // the drop down.
+            if (IsDropDownOpen)
+            {
+                if (SelectionAdapter != null)
+                {
+                    SelectionAdapter.HandleKeyDown(e);
+                    if (e.Handled)
+                    {
+                        return;
+                    }
+                }
+
+                if (e.Key == Key.Escape)
+                {
+                    OnAdapterSelectionCanceled(this, new RoutedEventArgs());
+                    e.Handled = true;
+                }
+            }
+            else
+            {
+                // The drop down is not open, the Down key will toggle it open.
+                if (e.Key == Key.Down)
+                {
+                    IsDropDownOpen = true;
+                    e.Handled = true;
+                }
+            }
+
+            // Standard drop down navigation
+            switch (e.Key)
+            {
+                case Key.F4:
+                    IsDropDownOpen = !IsDropDownOpen;
+                    e.Handled = true;
+                    break;
+
+                case Key.Enter:
+                    if (IsDropDownOpen)
+                    {
+                        OnAdapterSelectionComplete(this, new RoutedEventArgs());
+                        e.Handled = true;
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.UIElement.GotFocus" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            FocusChanged(HasFocus());
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.UIElement.LostFocus" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+            FocusChanged(HasFocus());
+        }
+
+        /// <summary>
+        /// Determines whether the text box or drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control has
+        /// focus.
+        /// </summary>
+        /// <returns>true to indicate the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus;
+        /// otherwise, false.</returns>
+        protected bool HasFocus()
+        {
+            IVisual? focused = FocusManager.Instance?.Current;
+
+            while (focused != null)
+            {
+                if (object.ReferenceEquals(focused, this))
+                {
+                    return true;
+                }
+
+                // This helps deal with popups that may not be in the same
+                // visual tree
+                IVisual? parent = focused.GetVisualParent();
+                if (parent == null)
+                {
+                    // Try the logical parent.
+                    IControl? element = focused as IControl;
+                    if (element != null)
+                    {
+                        parent = element.Parent;
+                    }
+                }
+                focused = parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Handles the FocusChanged event.
+        /// </summary>
+        /// <param name="hasFocus">A value indicating whether the control
+        /// currently has the focus.</param>
+        private void FocusChanged(bool hasFocus)
+        {
+            // The OnGotFocus & OnLostFocus are asynchronously and cannot
+            // reliably tell you that have the focus.  All they do is let you
+            // know that the focus changed sometime in the past.  To determine
+            // if you currently have the focus you need to do consult the
+            // FocusManager (see HasFocus()).
+
+            bool wasFocused = _isFocused;
+            _isFocused = hasFocus;
+
+            if (hasFocus)
+            {
+
+                if (!wasFocused && TextBox != null && TextBoxSelectionLength <= 0)
+                {
+                    TextBox.Focus();
+                    TextBox.SelectionStart = 0;
+                    TextBox.SelectionEnd = TextBox.Text?.Length ?? 0;
+                }
+            }
+            else
+            {
+                IsDropDownOpen = false;
+                _userCalledPopulate = false;
+                ClearTextBoxSelection();
+            }
+
+            _isFocused = hasFocus;
+        }
+
+        /// <summary>
+        /// Occurs asynchronously when the text in the <see cref="TextBox"/> portion of the
+        /// <see cref="AutoCompleteBox" /> changes.
+        /// </summary>
+        public event EventHandler<TextChangedEventArgs>? TextChanged
+        {
+            add => AddHandler(TextChangedEvent, value);
+            remove => RemoveHandler(TextChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> is
+        /// populating the drop-down with possible matches based on the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// property.
+        /// </summary>
+        /// <remarks>
+        /// If the event is canceled, by setting the PopulatingEventArgs.Cancel
+        /// property to true, the AutoCompleteBox will not automatically
+        /// populate the selection adapter contained in the drop-down.
+        /// In this case, if you want possible matches to appear, you must
+        /// provide the logic for populating the selection adapter.
+        /// </remarks>
+        public event EventHandler<PopulatingEventArgs>? Populating;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
+        /// populated the drop-down with possible matches based on the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// property.
+        /// </summary>
+        public event EventHandler<PopulatedEventArgs>? Populated;
+
+        /// <summary>
+        /// Occurs when the value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property is changing from false to true.
+        /// </summary>
+        public event EventHandler<CancelEventArgs>? DropDownOpening;
+
+        /// <summary>
+        /// Occurs when the value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property has changed from false to true and the drop-down is open.
+        /// </summary>
+        public event EventHandler? DropDownOpened;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property is changing from true to false.
+        /// </summary>
+        public event EventHandler<CancelEventArgs>? DropDownClosing;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property was changed from true to false and the drop-down is open.
+        /// </summary>
+        public event EventHandler? DropDownClosed;
+
+        /// <summary>
+        /// Occurs when the selected item in the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
+        /// changed.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged
+        {
+            add { AddHandler(SelectionChangedEvent, value); }
+            remove { RemoveHandler(SelectionChangedEvent, value); }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" /> that
+        /// contains the event data.</param>
+        protected virtual void OnPopulating(PopulatingEventArgs e)
+        {
+            Populating?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnPopulated(PopulatedEventArgs e)
+        {
+            Populated?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.SelectionChanged" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.SelectionChangedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpening" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.CancelEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownOpening(CancelEventArgs e)
+        {
+            DropDownOpening?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpened" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:System.EventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownOpened(EventArgs e)
+        {
+            DropDownOpened?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosing" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.CancelEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownClosing(CancelEventArgs e)
+        {
+            DropDownClosing?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosed" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:System.EventArgs" />
+        /// which contains the event data.</param>
+        protected virtual void OnDropDownClosed(EventArgs e)
+        {
+            DropDownClosed?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="TextChanged" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="TextChangedEventArgs" /> that contains the event data.</param>
+        protected virtual void OnTextChanged(TextChangedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Begin closing the drop-down.
+        /// </summary>
+        /// <param name="oldValue">The original value.</param>
+        private void ClosingDropDown(bool oldValue)
+        {
+            var args = new CancelEventArgs();
+            OnDropDownClosing(args);
+
+            if (args.Cancel)
+            {
+                _ignorePropertyChange = true;
+                SetValue(IsDropDownOpenProperty, oldValue);
+            }
+            else
+            {
+                CloseDropDown();
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <summary>
+        /// Begin opening the drop down by firing cancelable events, opening the
+        /// drop-down or reverting, depending on the event argument values.
+        /// </summary>
+        /// <param name="oldValue">The original value, if needed for a revert.</param>
+        private void OpeningDropDown(bool oldValue)
+        {
+            var args = new CancelEventArgs();
+
+            // Opening
+            OnDropDownOpening(args);
+
+            if (args.Cancel)
+            {
+                _ignorePropertyChange = true;
+                SetValue(IsDropDownOpenProperty, oldValue);
+            }
+            else
+            {
+                OpenDropDown();
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <summary>
+        /// Connects to the DropDownPopup Closed event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void DropDownPopup_Closed(object? sender, EventArgs e)
+        {
+            // Force the drop down dependency property to be false.
+            if (IsDropDownOpen)
+            {
+                IsDropDownOpen = false;
+            }
+
+            // Fire the DropDownClosed event
+            if (_popupHasOpened)
+            {
+                OnDropDownClosed(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Handles the timer tick when using a populate delay.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event arguments.</param>
+        private void PopulateDropDown(object? sender, EventArgs e)
+        {
+            _delayTimer?.Stop();
+
+            // Update the prefix/search text.
+            SearchText = Text;
+
+            if(TryPopulateAsync(SearchText))
+            {
+                return;
+            }
+
+            // The Populated event enables advanced, custom filtering. The
+            // client needs to directly update the ItemsSource collection or
+            // call the Populate method on the control to continue the
+            // display process if Cancel is set to true.
+            PopulatingEventArgs populating = new PopulatingEventArgs(SearchText);
+            OnPopulating(populating);
+            if (!populating.Cancel)
+            {
+                PopulateComplete();
+            }
+        }
+        private bool TryPopulateAsync(string? searchText)
+        {
+            _populationCancellationTokenSource?.Cancel(false);
+            _populationCancellationTokenSource?.Dispose();
+            _populationCancellationTokenSource = null;
+
+            if(_asyncPopulator == null)
+            {
+                return false;
+            }
+
+            _populationCancellationTokenSource = new CancellationTokenSource();
+            var task = PopulateAsync(searchText, _populationCancellationTokenSource.Token);
+            if (task.Status == TaskStatus.Created)
+                task.Start();
+
+            return true;
+        }
+        private async Task PopulateAsync(string? searchText, CancellationToken cancellationToken)
+        {
+
+            try
+            {
+                IEnumerable<object> result = await _asyncPopulator!.Invoke(searchText, cancellationToken);
+                var resultList = result.ToList();
+
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    if (!cancellationToken.IsCancellationRequested)
+                    {
+                        Items = resultList;
+                        PopulateComplete();
+                    }
+                });
+            }
+            catch (TaskCanceledException)
+            { }
+            finally
+            {
+                _populationCancellationTokenSource?.Dispose();
+                _populationCancellationTokenSource = null;
+            }
+
+        }
+
+        /// <summary>
+        /// Private method that directly opens the popup, checks the expander
+        /// button, and then fires the Opened event.
+        /// </summary>
+        private void OpenDropDown()
+        {
+            if (DropDownPopup != null)
+            {
+                DropDownPopup.IsOpen = true;
+            }
+            _popupHasOpened = true;
+            OnDropDownOpened(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Private method that directly closes the popup, flips the Checked
+        /// value, and then fires the Closed event.
+        /// </summary>
+        private void CloseDropDown()
+        {
+            if (_popupHasOpened)
+            {
+                if (SelectionAdapter != null)
+                {
+                    SelectionAdapter.SelectedItem = null;
+                }
+                if (DropDownPopup != null)
+                {
+                    DropDownPopup.IsOpen = false;
+                }
+                OnDropDownClosed(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Formats an Item for text comparisons based on Converter
+        /// and ConverterCulture properties.
+        /// </summary>
+        /// <param name="value">The object to format.</param>
+        /// <param name="clearDataContext">A value indicating whether to clear
+        /// the data context after the lookup is performed.</param>
+        /// <returns>Formatted Value.</returns>
+        private string? FormatValue(object? value, bool clearDataContext)
+        {
+            string? result = FormatValue(value);
+            if(clearDataContext && _valueBindingEvaluator != null)
+            {
+                _valueBindingEvaluator.ClearDataContext();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the specified object to a string by using the
+        /// <see cref="P:Avalonia.Data.Binding.Converter" /> and
+        /// <see cref="P:Avalonia.Data.Binding.ConverterCulture" /> values
+        /// of the binding object specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ValueMemberBinding" />
+        /// property.
+        /// </summary>
+        /// <param name="value">The object to format as a string.</param>
+        /// <returns>The string representation of the specified object.</returns>
+        /// <remarks>
+        /// Override this method to provide a custom string conversion.
+        /// </remarks>
+        protected virtual string? FormatValue(object? value)
+        {
+            if (_valueBindingEvaluator != null)
+            {
+                return _valueBindingEvaluator.GetDynamicValue(value) ?? String.Empty;
+            }
+
+            return value == null ? String.Empty : value.ToString();
+        }
+
+        /// <summary>
+        /// Handle the TextChanged event that is directly attached to the
+        /// TextBox part. This ensures that only user initiated actions will
+        /// result in an AutoCompleteBox suggestion and operation.
+        /// </summary>
+        private void OnTextBoxTextChanged()
+        {
+            //Uses Dispatcher.Post to allow the TextBox selection to update before processing
+            Dispatcher.UIThread.Post(() =>
+            {
+                // Call the central updated text method as a user-initiated action
+                TextUpdated(_textBox!.Text, true);
+            });
+        }
+
+        /// <summary>
+        /// Updates both the text box value and underlying text dependency
+        /// property value if and when they change. Automatically fires the
+        /// text changed events when there is a change.
+        /// </summary>
+        /// <param name="value">The new string value.</param>
+        private void UpdateTextValue(string? value)
+        {
+            UpdateTextValue(value, null);
+        }
+
+        /// <summary>
+        /// Updates both the text box value and underlying text dependency
+        /// property value if and when they change. Automatically fires the
+        /// text changed events when there is a change.
+        /// </summary>
+        /// <param name="value">The new string value.</param>
+        /// <param name="userInitiated">A nullable bool value indicating whether
+        /// the action was user initiated. In a user initiated mode, the
+        /// underlying text dependency property is updated. In a non-user
+        /// interaction, the text box value is updated. When user initiated is
+        /// null, all values are updated.</param>
+        private void UpdateTextValue(string? value, bool? userInitiated)
+        {
+            bool callTextChanged = false;
+            // Update the Text dependency property
+            if ((userInitiated ?? true) && Text != value)
+            {
+                _ignoreTextPropertyChange++;
+                Text = value;
+                callTextChanged = true;
+            }
+
+            // Update the TextBox's Text dependency property
+            if ((userInitiated == null || userInitiated == false) && TextBox != null && TextBox.Text != value)
+            {
+                _ignoreTextPropertyChange++;
+                TextBox.Text = value ?? string.Empty;
+
+                // Text dependency property value was set, fire event
+                if (!callTextChanged && (Text == value || Text == null))
+                {
+                    callTextChanged = true;
+                }
+            }
+
+            if (callTextChanged)
+            {
+                OnTextChanged(new TextChangedEventArgs(TextChangedEvent));
+            }
+        }
+
+        /// <summary>
+        /// Handle the update of the text for the control from any source,
+        /// including the TextBox part and the Text dependency property.
+        /// </summary>
+        /// <param name="newText">The new text.</param>
+        /// <param name="userInitiated">A value indicating whether the update
+        /// is a user-initiated action. This should be a True value when the
+        /// TextUpdated method is called from a TextBox event handler.</param>
+        private void TextUpdated(string? newText, bool userInitiated)
+        {
+            // Only process this event if it is coming from someone outside
+            // setting the Text dependency property directly.
+            if (_ignoreTextPropertyChange > 0)
+            {
+                _ignoreTextPropertyChange--;
+                return;
+            }
+
+            if (newText == null)
+            {
+                newText = string.Empty;
+            }
+
+            // The TextBox.TextChanged event was not firing immediately and
+            // was causing an immediate update, even with wrapping. If there is
+            // a selection currently, no update should happen.
+            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != (TextBox.Text?.Length ?? 0))
+            {
+                return;
+            }
+
+            // Evaluate the conditions needed for completion.
+            // 1. Minimum prefix length
+            // 2. If a delay timer is in use, use it
+            bool populateReady = newText.Length >= MinimumPrefixLength && MinimumPrefixLength >= 0;
+            if(populateReady && MinimumPrefixLength == 0 && String.IsNullOrEmpty(newText) && String.IsNullOrEmpty(SearchText))
+            {
+                populateReady = false;
+            }
+            _userCalledPopulate = populateReady ? userInitiated : false;
+
+            // Update the interface and values only as necessary
+            UpdateTextValue(newText, userInitiated);
+
+            if (populateReady)
+            {
+                _ignoreTextSelectionChange = true;
+
+                if (_delayTimer != null)
+                {
+                    _delayTimer.Start();
+                }
+                else
+                {
+                    PopulateDropDown(this, EventArgs.Empty);
+                }
+            }
+            else
+            {
+                SearchText = string.Empty;
+                if (SelectedItem != null)
+                {
+                    _skipSelectedItemTextUpdate = true;
+                }
+                SelectedItem = null;
+                if (IsDropDownOpen)
+                {
+                    IsDropDownOpen = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A simple helper method to clear the view and ensure that a view
+        /// object is always present and not null.
+        /// </summary>
+        private void ClearView()
+        {
+            if (_view == null)
+            {
+                _view = new AvaloniaList<object>();
+            }
+            else
+            {
+                _view.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Walks through the items enumeration. Performance is not going to be
+        /// perfect with the current implementation.
+        /// </summary>
+        private void RefreshView()
+        {
+            if (_items == null)
+            {
+                ClearView();
+                return;
+            }
+
+            // Cache the current text value
+            string text = Text ?? string.Empty;
+
+            // Determine if any filtering mode is on
+            bool stringFiltering = TextFilter != null;
+            bool objectFiltering = FilterMode == AutoCompleteFilterMode.Custom && TextFilter == null;
+
+            int view_index = 0;
+            int view_count = _view!.Count;
+            List<object> items = _items;
+            foreach (object item in items)
+            {
+                bool inResults = !(stringFiltering || objectFiltering);
+                if (!inResults)
+                {
+                    if (stringFiltering)
+                    {
+                        inResults = TextFilter!(text, FormatValue(item));
+                    }
+                    else
+                    {
+                        if (ItemFilter is null)
+                        {
+                            throw new Exception("ItemFilter property can not be null when FilterMode has value AutoCompleteFilterMode.Custom");
+                        }
+                        else
+                        {
+                            inResults = ItemFilter(text, item);
+                        }
+                    }
+                }
+
+                if (view_count > view_index && inResults && _view[view_index] == item)
+                {
+                    // Item is still in the view
+                    view_index++;
+                }
+                else if (inResults)
+                {
+                    // Insert the item
+                    if (view_count > view_index && _view[view_index] != item)
+                    {
+                        // Replace item
+                        // Unfortunately replacing via index throws a fatal
+                        // exception: View[view_index] = item;
+                        // Cost: O(n) vs O(1)
+                        _view.RemoveAt(view_index);
+                        _view.Insert(view_index, item);
+                        view_index++;
+                    }
+                    else
+                    {
+                        // Add the item
+                        if (view_index == view_count)
+                        {
+                            // Constant time is preferred (Add).
+                            _view.Add(item);
+                        }
+                        else
+                        {
+                            _view.Insert(view_index, item);
+                        }
+                        view_index++;
+                        view_count++;
+                    }
+                }
+                else if (view_count > view_index && _view[view_index] == item)
+                {
+                    // Remove the item
+                    _view.RemoveAt(view_index);
+                    view_count--;
+                }
+            }
+
+            // Clear the evaluator to discard a reference to the last item
+            if (_valueBindingEvaluator != null)
+            {
+                _valueBindingEvaluator.ClearDataContext();
+            }
+        }
+
+        /// <summary>
+        /// Handle any change to the ItemsSource dependency property, update
+        /// the underlying ObservableCollection view, and set the selection
+        /// adapter's ItemsSource to the view if appropriate.
+        /// </summary>
+        /// <param name="newValue">The new enumerable reference.</param>
+        private void OnItemsChanged(IEnumerable? newValue)
+        {
+            // Remove handler for oldValue.CollectionChanged (if present)
+            _collectionChangeSubscription?.Dispose();
+            _collectionChangeSubscription = null;
+
+            // Add handler for newValue.CollectionChanged (if possible)
+            if (newValue is INotifyCollectionChanged newValueINotifyCollectionChanged)
+            {
+                _collectionChangeSubscription = newValueINotifyCollectionChanged.WeakSubscribe(ItemsCollectionChanged);
+            }
+
+            // Store a local cached copy of the data
+            _items = newValue == null ? null : new List<object>(newValue.Cast<object>());
+
+            // Clear and set the view on the selection adapter
+            ClearView();
+            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
+            {
+                SelectionAdapter.Items = _view;
+            }
+            if (IsDropDownOpen)
+            {
+                RefreshView();
+            }
+        }
+
+        /// <summary>
+        /// Method that handles the ObservableCollection.CollectionChanged event for the ItemsSource property.
+        /// </summary>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="e">The event data.</param>
+        private void ItemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            // Update the cache
+            if (e.Action == NotifyCollectionChangedAction.Remove && e.OldItems != null)
+            {
+                for (int index = 0; index < e.OldItems.Count; index++)
+                {
+                    _items!.RemoveAt(e.OldStartingIndex);
+                }
+            }
+            if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems != null && _items!.Count >= e.NewStartingIndex)
+            {
+                for (int index = 0; index < e.NewItems.Count; index++)
+                {
+                    _items.Insert(e.NewStartingIndex + index, e.NewItems[index]!);
+                }
+            }
+            if (e.Action == NotifyCollectionChangedAction.Replace && e.NewItems != null && e.OldItems != null)
+            {
+                for (int index = 0; index < e.NewItems.Count; index++)
+                {
+                    _items![e.NewStartingIndex] = e.NewItems[index]!;
+                }
+            }
+
+            // Update the view
+            if ((e.Action == NotifyCollectionChangedAction.Remove || e.Action == NotifyCollectionChangedAction.Replace) && e.OldItems != null)
+            {
+                for (int index = 0; index < e.OldItems.Count; index++)
+                {
+                    _view!.Remove(e.OldItems[index]!);
+                }
+            }
+
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                // Significant changes to the underlying data.
+                ClearView();
+                if (Items != null)
+                {
+                    _items = new List<object>(Items.Cast<object>());
+                }
+            }
+
+            // Refresh the observable collection used in the selection adapter.
+            RefreshView();
+        }
+
+        /// <summary>
+        /// Notifies the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> that the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Items" />
+        /// property has been set and the data can be filtered to provide
+        /// possible matches in the drop-down.
+        /// </summary>
+        /// <remarks>
+        /// Call this method when you are providing custom population of
+        /// the drop-down portion of the AutoCompleteBox, to signal the control
+        /// that you are done with the population process.
+        /// Typically, you use PopulateComplete when the population process
+        /// is a long-running process and you want to cancel built-in filtering
+        ///  of the ItemsSource items. In this case, you can handle the
+        /// Populated event and set PopulatingEventArgs.Cancel to true.
+        /// When the long-running process has completed you call
+        /// PopulateComplete to indicate the drop-down is populated.
+        /// </remarks>
+        public void PopulateComplete()
+        {
+            // Apply the search filter
+            RefreshView();
+
+            // Fire the Populated event containing the read-only view data.
+            PopulatedEventArgs populated = new PopulatedEventArgs(new ReadOnlyCollection<object>(_view!));
+            OnPopulated(populated);
+
+            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
+            {
+                SelectionAdapter.Items = _view;
+            }
+
+            bool isDropDownOpen = _userCalledPopulate && (_view!.Count > 0);
+            if (isDropDownOpen != IsDropDownOpen)
+            {
+                _ignorePropertyChange = true;
+                IsDropDownOpen = isDropDownOpen;
+            }
+            if (IsDropDownOpen)
+            {
+                OpeningDropDown(false);
+            }
+            else
+            {
+                ClosingDropDown(true);
+            }
+
+            UpdateTextCompletion(_userCalledPopulate);
+        }
+
+        /// <summary>
+        /// Performs text completion, if enabled, and a lookup on the underlying
+        /// item values for an exact match. Will update the SelectedItem value.
+        /// </summary>
+        /// <param name="userInitiated">A value indicating whether the operation
+        /// was user initiated. Text completion will not be performed when not
+        /// directly initiated by the user.</param>
+        private void UpdateTextCompletion(bool userInitiated)
+        {
+            // By default this method will clear the selected value
+            object? newSelectedItem = null;
+            string? text = Text;
+
+            // Text search is StartsWith explicit and only when enabled, in
+            // line with WPF's ComboBox lookup. When in use it will associate
+            // a Value with the Text if it is found in ItemsSource. This is
+            // only valid when there is data and the user initiated the action.
+            if (_view!.Count > 0)
+            {
+                if (IsTextCompletionEnabled && TextBox != null && userInitiated)
+                {
+                    int currentLength = TextBox.Text?.Length ?? 0;
+                    int selectionStart = TextBoxSelectionStart;
+                    if (selectionStart == text?.Length && selectionStart > _textSelectionStart)
+                    {
+                        // When the FilterMode dependency property is set to
+                        // either StartsWith or StartsWithCaseSensitive, the
+                        // first item in the view is used. This will improve
+                        // performance on the lookup. It assumes that the
+                        // FilterMode the user has selected is an acceptable
+                        // case sensitive matching function for their scenario.
+                        object? top = FilterMode == AutoCompleteFilterMode.StartsWith || FilterMode == AutoCompleteFilterMode.StartsWithCaseSensitive
+                            ? _view[0]
+                            : TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
+
+                        // If the search was successful, update SelectedItem
+                        if (top != null)
+                        {
+                            newSelectedItem = top;
+                            string? topString = FormatValue(top, true);
+
+                            // Only replace partially when the two words being the same
+                            int minLength = Math.Min(topString?.Length ?? 0, Text?.Length ?? 0);
+                            if (AutoCompleteSearch.Equals(Text?.Substring(0, minLength), topString?.Substring(0, minLength)))
+                            {
+                                // Update the text
+                                UpdateTextValue(topString);
+
+                                // Select the text past the user's caret
+                                TextBox.SelectionStart = currentLength;
+                                TextBox.SelectionEnd = topString?.Length ?? 0;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // Perform an exact string lookup for the text. This is a
+                    // design change from the original Toolkit release when the
+                    // IsTextCompletionEnabled property behaved just like the
+                    // WPF ComboBox's IsTextSearchEnabled property.
+                    //
+                    // This change provides the behavior that most people expect
+                    // to find: a lookup for the value is always performed.
+                    newSelectedItem = TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive));
+                }
+            }
+
+            // Update the selected item property
+
+            if (SelectedItem != newSelectedItem)
+            {
+                _skipSelectedItemTextUpdate = true;
+            }
+            SelectedItem = newSelectedItem;
+
+            // Restore updates for TextSelection
+            if (_ignoreTextSelectionChange)
+            {
+                _ignoreTextSelectionChange = false;
+                if (TextBox != null)
+                {
+                    _textSelectionStart = TextBoxSelectionStart;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Attempts to look through the view and locate the specific exact
+        /// text match.
+        /// </summary>
+        /// <param name="searchText">The search text.</param>
+        /// <param name="view">The view reference.</param>
+        /// <param name="predicate">The predicate to use for the partial or
+        /// exact match.</param>
+        /// <returns>Returns the object or null.</returns>
+        private object? TryGetMatch(string? searchText, AvaloniaList<object> view, AutoCompleteFilterPredicate<string?>? predicate)
+        {
+            if (predicate is null)
+                return null;
+
+            if (view != null && view.Count > 0)
+            {
+                foreach (object o in view)
+                {
+                    if (predicate(searchText, FormatValue(o)))
+                    {
+                        return o;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(":dropdownopen", IsDropDownOpen);
+        }
+
+        private void ClearTextBoxSelection()
+        {
+            if (TextBox != null)
+            {
+                int length = TextBox.Text?.Length ?? 0;
+                TextBox.SelectionStart = length;
+                TextBox.SelectionEnd = length;
+            }
+        }
+
+        /// <summary>
+        /// Called when the selected item is changed, updates the text value
+        /// that is displayed in the text box part.
+        /// </summary>
+        /// <param name="newItem">The new item.</param>
+        private void OnSelectedItemChanged(object? newItem)
+        {
+            string? text;
+
+            if (newItem == null)
+            {
+                text = SearchText;
+            }
+            else if (TextSelector != null)
+            {
+                text = TextSelector(SearchText, FormatValue(newItem, true));
+            }
+            else if (ItemSelector != null)
+            {
+                text = ItemSelector(SearchText, newItem);
+            }
+            else
+            {
+                text = FormatValue(newItem, true);
+            }
+
+            // Update the Text property and the TextBox values
+            UpdateTextValue(text);
+
+            // Move the caret to the end of the text box
+            ClearTextBoxSelection();
+        }
+
+        /// <summary>
+        /// Handles the SelectionChanged event of the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The selection changed event data.</param>
+        private void OnAdapterSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            SelectedItem = _adapter!.SelectedItem;
+        }
+
+        //TODO Check UpdateTextCompletion
+        /// <summary>
+        /// Handles the Commit event on the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnAdapterSelectionComplete(object? sender, RoutedEventArgs e)
+        {
+            IsDropDownOpen = false;
+
+            // Completion will update the selected value
+            //UpdateTextCompletion(false);
+
+            // Text should not be selected
+            ClearTextBoxSelection();
+
+            TextBox!.Focus();
+        }
+
+        /// <summary>
+        /// Handles the Cancel event on the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnAdapterSelectionCanceled(object? sender, RoutedEventArgs e)
+        {
+            UpdateTextValue(SearchText);
+
+            // Completion will update the selected value
+            UpdateTextCompletion(false);
+        }
+
+        /// <summary>
+        /// A predefined set of filter functions for the known, built-in
+        /// AutoCompleteFilterMode enumeration values.
+        /// </summary>
+        private static class AutoCompleteSearch
+        {
+            /// <summary>
+            /// Index function that retrieves the filter for the provided
+            /// AutoCompleteFilterMode.
+            /// </summary>
+            /// <param name="FilterMode">The built-in search mode.</param>
+            /// <returns>Returns the string-based comparison function.</returns>
+            public static AutoCompleteFilterPredicate<string?>? GetFilter(AutoCompleteFilterMode FilterMode)
+            {
+                switch (FilterMode)
+                {
+                    case AutoCompleteFilterMode.Contains:
+                        return Contains;
+
+                    case AutoCompleteFilterMode.ContainsCaseSensitive:
+                        return ContainsCaseSensitive;
+
+                    case AutoCompleteFilterMode.ContainsOrdinal:
+                        return ContainsOrdinal;
+
+                    case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
+                        return ContainsOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.Equals:
+                        return Equals;
+
+                    case AutoCompleteFilterMode.EqualsCaseSensitive:
+                        return EqualsCaseSensitive;
+
+                    case AutoCompleteFilterMode.EqualsOrdinal:
+                        return EqualsOrdinal;
+
+                    case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
+                        return EqualsOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.StartsWith:
+                        return StartsWith;
+
+                    case AutoCompleteFilterMode.StartsWithCaseSensitive:
+                        return StartsWithCaseSensitive;
+
+                    case AutoCompleteFilterMode.StartsWithOrdinal:
+                        return StartsWithOrdinal;
+
+                    case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
+                        return StartsWithOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.None:
+                    case AutoCompleteFilterMode.Custom:
+                    default:
+                        return null;
+                }
+            }
+
+            /// <summary>
+            /// An implementation of the Contains member of string that takes in a
+            /// string comparison. The traditional .NET string Contains member uses
+            /// StringComparison.Ordinal.
+            /// </summary>
+            /// <param name="s">The string.</param>
+            /// <param name="value">The string value to search for.</param>
+            /// <param name="comparison">The string comparison type.</param>
+            /// <returns>Returns true when the substring is found.</returns>
+            private static bool Contains(string? s, string? value, StringComparison comparison)
+            {
+                if (s is not null && value is not null)
+                    return s.IndexOf(value, comparison) >= 0;
+                return false;
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWith(string? text, string? value)
+            {
+                if (value is not null && text is not null)
+                    return value.StartsWith(text, StringComparison.CurrentCultureIgnoreCase);
+                return false;
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithCaseSensitive(string? text, string? value)
+            {
+                if (value is not null && text is not null)
+                    return value.StartsWith(text, StringComparison.CurrentCulture);
+                return false;
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithOrdinal(string? text, string? value)
+            {
+                if (value is not null && text is not null)
+                    return value.StartsWith(text, StringComparison.OrdinalIgnoreCase);
+                return false;
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithOrdinalCaseSensitive(string? text, string? value)
+            {
+                if (value is not null && text is not null)
+                    return value.StartsWith(text, StringComparison.Ordinal);
+                return false;
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value. The current
+            /// culture's case insensitive string comparison operator is used.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool Contains(string? text, string? value)
+            {
+                return Contains(value, text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsCaseSensitive(string? text, string? value)
+            {
+                return Contains(value, text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsOrdinal(string? text, string? value)
+            {
+                return Contains(value, text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsOrdinalCaseSensitive(string? text, string? value)
+            {
+                return Contains(value, text, StringComparison.Ordinal);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool Equals(string? text, string? value)
+            {
+                return string.Equals(value, text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsCaseSensitive(string? text, string? value)
+            {
+                return string.Equals(value, text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsOrdinal(string? text, string? value)
+            {
+                return string.Equals(value, text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsOrdinalCaseSensitive(string? text, string? value)
+            {
+                return string.Equals(value, text, StringComparison.Ordinal);
+            }
+        }
+
+        /// <summary>
+        /// A framework element that permits a binding to be evaluated in a new data
+        /// context leaf node.
+        /// </summary>
+        /// <typeparam name="T">The type of dynamic binding to return.</typeparam>
+        public class BindingEvaluator<T> : Control
+        {
+            /// <summary>
+            /// Gets or sets the string value binding used by the control.
+            /// </summary>
+            private IBinding? _binding;
+
+            /// <summary>
+            /// Identifies the Value dependency property.
+            /// </summary>
+            public static readonly StyledProperty<T> ValueProperty =
+                AvaloniaProperty.Register<BindingEvaluator<T>, T>(nameof(Value));
+
+            /// <summary>
+            /// Gets or sets the data item value.
+            /// </summary>
+            public T Value
+            {
+                get => GetValue(ValueProperty);
+                set => SetValue(ValueProperty, value);
+            }
+
+            /// <summary>
+            /// Gets or sets the value binding.
+            /// </summary>
+            public IBinding? ValueBinding
+            {
+                get => _binding;
+                set
+                {
+                    _binding = value;
+                    if (value is not null)
+                        AvaloniaObjectExtensions.Bind(this, ValueProperty, value);
+                }
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the BindingEvaluator class.
+            /// </summary>
+            public BindingEvaluator()
+            { }
+
+            /// <summary>
+            /// Initializes a new instance of the BindingEvaluator class,
+            /// setting the initial binding to the provided parameter.
+            /// </summary>
+            /// <param name="binding">The initial string value binding.</param>
+            public BindingEvaluator(IBinding? binding)
+                : this()
+            {
+                ValueBinding = binding;
+            }
+
+            /// <summary>
+            /// Clears the data context so that the control does not keep a
+            /// reference to the last-looked up item.
+            /// </summary>
+            public void ClearDataContext()
+            {
+                DataContext = null;
+            }
+
+            /// <summary>
+            /// Updates the data context of the framework element and returns the
+            /// updated binding value.
+            /// </summary>
+            /// <param name="o">The object to use as the data context.</param>
+            /// <param name="clearDataContext">If set to true, this parameter will
+            /// clear the data context immediately after retrieving the value.</param>
+            /// <returns>Returns the evaluated T value of the bound dependency
+            /// property.</returns>
+            public T GetDynamicValue(object o, bool clearDataContext)
+            {
+                DataContext = o;
+                T value = Value;
+                if (clearDataContext)
+                {
+                    DataContext = null;
+                }
+                return value;
+            }
+
+            /// <summary>
+            /// Updates the data context of the framework element and returns the
+            /// updated binding value.
+            /// </summary>
+            /// <param name="o">The object to use as the data context.</param>
+            /// <returns>Returns the evaluated T value of the bound dependency
+            /// property.</returns>
+            public T GetDynamicValue(object? o)
+            {
+                DataContext = o;
+                return Value;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteFilterMode.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteFilterMode.cs
new file mode 100644
index 0000000000..c17f5a19ab
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteFilterMode.cs
@@ -0,0 +1,131 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Specifies how text in the text box portion of the <see cref="AutoCompleteBox" />
+    /// control is used to filter items specified by the <see cref="AutoCompleteBox.Items" />
+    /// property for display in the drop-down.
+    /// </summary>
+    public enum AutoCompleteFilterMode
+    {
+        /// <summary>
+        /// Specifies that no filter is used. All items are returned.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items start with the specified text. The filter uses the
+        /// <see cref="String.StartsWith(String,StringComparison)" />
+        /// method, specifying
+        /// <see cref="StringComparer.CurrentCultureIgnoreCase" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        StartsWith = 1,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items start with the specified text. The filter uses the
+        /// <see cref="String.StartsWith(String,StringComparison)" />
+        /// method, specifying
+        /// <see cref="StringComparer.CurrentCulture" /> as the string
+        /// comparison criteria.
+        /// </summary>
+        StartsWithCaseSensitive = 2,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items start with the specified text. The filter uses the
+        /// <see cref="String.StartsWith(String,StringComparison)" />
+        /// method, specifying
+        /// <see cref="StringComparer.OrdinalIgnoreCase" /> as the
+        /// string comparison criteria.
+        /// </summary>
+        StartsWithOrdinal = 3,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// start with the specified text. The filter uses the
+        /// <see cref="String.StartsWith(String,StringComparison)" />
+        /// method, specifying <see cref="StringComparer.Ordinal" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        StartsWithOrdinalCaseSensitive = 4,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items contain the specified text.
+        /// </summary>
+        Contains = 5,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items contain the specified text.
+        /// </summary>
+        ContainsCaseSensitive = 6,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items contain the specified text.
+        /// </summary>
+        ContainsOrdinal = 7,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// contain the specified text.
+        /// </summary>
+        ContainsOrdinalCaseSensitive = 8,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items equal the specified text. The filter uses the
+        /// <see cref="String.Equals(String,StringComparison)" />
+        /// method, specifying
+        /// <see cref="StringComparer.CurrentCultureIgnoreCase" /> as
+        /// the search comparison criteria.
+        /// </summary>
+        Equals = 9,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items equal the specified text. The filter uses the
+        /// <see cref="String.Equals(String,StringComparison)" />
+        /// method, specifying
+        /// <see cref="StringComparer.CurrentCulture" /> as the string
+        /// comparison criteria.
+        /// </summary>
+        EqualsCaseSensitive = 10,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items equal the specified text. The filter uses the
+        /// <see cref="String.Equals(String,StringComparison)" />
+        /// method, specifying
+        /// <see cref="StringComparer.OrdinalIgnoreCase" /> as the
+        /// string comparison criteria.
+        /// </summary>
+        EqualsOrdinal = 11,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// equal the specified text. The filter uses the
+        /// <see cref="String.Equals(String,StringComparison)" />
+        /// method, specifying <see cref="StringComparer.Ordinal" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        EqualsOrdinalCaseSensitive = 12,
+
+        /// <summary>
+        /// Specifies that a custom filter is used. This mode is used when the
+        /// <see cref="AutoCompleteBox.TextFilter" /> or <see cref="AutoCompleteBox.ItemFilter" />
+        /// properties are set.
+        /// </summary>
+        Custom = 13,
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox/PopulatedEventArgs.cs b/src/Avalonia.Controls/AutoCompleteBox/PopulatedEventArgs.cs
new file mode 100644
index 0000000000..22bc1d3cab
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox/PopulatedEventArgs.cs
@@ -0,0 +1,39 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
+    /// event.
+    /// </summary>
+    public class PopulatedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the list of possible matches added to the drop-down portion of
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The list of possible matches added to the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
+        public IEnumerable Data { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />.
+        /// </summary>
+        /// <param name="data">The list of possible matches added to the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
+        public PopulatedEventArgs(IEnumerable data)
+        {
+            Data = data;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox/PopulatingEventArgs.cs b/src/Avalonia.Controls/AutoCompleteBox/PopulatingEventArgs.cs
new file mode 100644
index 0000000000..c4941ad6fe
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox/PopulatingEventArgs.cs
@@ -0,0 +1,39 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System.ComponentModel;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
+    /// event.
+    /// </summary>
+    public class PopulatingEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Gets the text that is used to determine which items to display in
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The text that is used to determine which items to display in
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
+        public string? Parameter { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" />.
+        /// </summary>
+        /// <param name="parameter">The value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// property, which is used to filter items for the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
+        public PopulatingEventArgs(string? parameter)
+        {
+            Parameter = parameter;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/AutomationElementIdentifiers.cs b/src/Avalonia.Controls/Automation/AutomationElementIdentifiers.cs
new file mode 100644
index 0000000000..4566cd9db5
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/AutomationElementIdentifiers.cs
@@ -0,0 +1,28 @@
+using Avalonia.Automation.Peers;
+
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Contains values used as automation property identifiers by UI Automation providers.
+    /// </summary>
+    public static class AutomationElementIdentifiers
+    {
+        /// <summary>
+        /// Identifies the bounding rectangle automation property. The bounding rectangle property
+        /// value is returned by the <see cref="AutomationPeer.GetBoundingRectangle"/> method.
+        /// </summary>
+        public static AutomationProperty BoundingRectangleProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies the class name automation property. The class name property value is returned
+        /// by the <see cref="AutomationPeer.GetClassName"/> method.
+        /// </summary>
+        public static AutomationProperty ClassNameProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies the name automation property. The class name property value is returned
+        /// by the <see cref="AutomationPeer.GetName"/> method.
+        /// </summary>
+        public static AutomationProperty NameProperty { get; } = new AutomationProperty();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/AutomationLiveSetting.cs b/src/Avalonia.Controls/Automation/AutomationLiveSetting.cs
new file mode 100644
index 0000000000..55de657b32
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/AutomationLiveSetting.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Describes the notification characteristics of a particular live region
+    /// </summary>
+    public enum AutomationLiveSetting
+    {
+        /// <summary>
+        /// The element does not send notifications if the content of the live region has changed.
+        /// </summary>
+        Off = 0,
+
+        /// <summary>
+        /// The element sends non-interruptive notifications if the content of the live region has
+        /// changed. With this setting, UI Automation clients and assistive technologies are expected 
+        /// to not interrupt the user to inform of changes to the live region.
+        /// </summary>
+        Polite = 1,
+
+        /// <summary>
+        /// The element sends interruptive notifications if the content of the live region has changed. 
+        /// With this setting, UI Automation clients and assistive technologies are expected to interrupt 
+        /// the user to inform of changes to the live region.
+        /// </summary>
+        Assertive = 2,
+    }
+}
+
diff --git a/src/Avalonia.Controls/Automation/AutomationProperties.cs b/src/Avalonia.Controls/Automation/AutomationProperties.cs
new file mode 100644
index 0000000000..a192ef6420
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/AutomationProperties.cs
@@ -0,0 +1,634 @@
+using System;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls;
+
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Declares how a control should included in different views of the automation tree.
+    /// </summary>
+    public enum AccessibilityView
+    {
+        /// <summary>
+        /// The control's view is defined by its automation peer.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// The control is included in the Raw view of the automation tree.
+        /// </summary>
+        Raw,
+
+        /// <summary>
+        /// The control is included in the Control view of the automation tree.
+        /// </summary>
+        Control,
+
+        /// <summary>
+        /// The control is included in the Content view of the automation tree.
+        /// </summary>
+        Content,
+    }
+
+    public static class AutomationProperties
+    {
+        internal const int AutomationPositionInSetDefault = -1;
+        internal const int AutomationSizeOfSetDefault = -1;
+
+        /// <summary>
+        /// Defines the AutomationProperties.AcceleratorKey attached property.
+        /// </summary>
+        public static readonly AttachedProperty<string> AcceleratorKeyProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "AcceleratorKey",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.AccessibilityView attached property.
+        /// </summary>
+        public static readonly AttachedProperty<AccessibilityView> AccessibilityViewProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, AccessibilityView>(
+                "AccessibilityView",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.AccessKey attached property
+        /// </summary>
+        public static readonly AttachedProperty<string> AccessKeyProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "AccessKey",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.AutomationId attached property.
+        /// </summary>
+        public static readonly AttachedProperty<string> AutomationIdProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "AutomationId",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.ControlTypeOverride attached property.
+        /// </summary>
+        public static readonly AttachedProperty<AutomationControlType?> ControlTypeOverrideProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, AutomationControlType?>(
+                "ControlTypeOverride",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.HelpText attached property.
+        /// </summary>
+        public static readonly AttachedProperty<string> HelpTextProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "HelpText",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.IsColumnHeader attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> IsColumnHeaderProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, bool>(
+                "IsColumnHeader",
+                typeof(AutomationProperties),
+                false);
+
+        /// <summary>
+        /// Defines the AutomationProperties.IsRequiredForForm attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> IsRequiredForFormProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, bool>(
+                "IsRequiredForForm",
+                typeof(AutomationProperties),
+                false);
+
+        /// <summary>
+        /// Defines the AutomationProperties.IsRowHeader attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> IsRowHeaderProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, bool>(
+                "IsRowHeader",
+                typeof(AutomationProperties),
+                false);
+
+        /// <summary>
+        /// Defines the AutomationProperties.IsOffscreenBehavior attached property.
+        /// </summary>
+        public static readonly AttachedProperty<IsOffscreenBehavior> IsOffscreenBehaviorProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, IsOffscreenBehavior>(
+                "IsOffscreenBehavior",
+                typeof(AutomationProperties),
+                IsOffscreenBehavior.Default);
+
+        /// <summary>
+        /// Defines the AutomationProperties.ItemStatus attached property.
+        /// </summary>
+        public static readonly AttachedProperty<string> ItemStatusProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "ItemStatus",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.ItemType attached property.
+        /// </summary>
+        public static readonly AttachedProperty<string> ItemTypeProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "ItemType",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.LabeledBy attached property.
+        /// </summary>
+        public static readonly AttachedProperty<IControl> LabeledByProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, IControl>(
+                "LabeledBy",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.LiveSetting attached property.
+        /// </summary>
+        public static readonly AttachedProperty<AutomationLiveSetting> LiveSettingProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, AutomationLiveSetting>(
+                "LiveSetting",
+                typeof(AutomationProperties),
+                AutomationLiveSetting.Off);
+
+        /// <summary>
+        /// Defines the AutomationProperties.Name attached attached property.
+        /// </summary>
+        public static readonly AttachedProperty<string> NameProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, string>(
+                "Name",
+                typeof(AutomationProperties));
+
+        /// <summary>
+        /// Defines the AutomationProperties.PositionInSet attached property.
+        /// </summary>
+        /// <remarks>
+        /// The PositionInSet property describes the ordinal location of the element within a set
+        /// of elements which are considered to be siblings. PositionInSet works in coordination
+        /// with the SizeOfSet property to describe the ordinal location in the set.
+        /// </remarks>
+        public static readonly AttachedProperty<int> PositionInSetProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, int>(
+                "PositionInSet",
+                typeof(AutomationProperties),
+                AutomationPositionInSetDefault);
+
+        /// <summary>
+        /// Defines the AutomationProperties.SizeOfSet attached property.
+        /// </summary>
+        /// <remarks>
+        /// The SizeOfSet property describes the count of automation elements in a group or set
+        /// that are considered to be siblings. SizeOfSet works in coordination with the PositionInSet
+        /// property to describe the count of items in the set.
+        /// </remarks>
+        public static readonly AttachedProperty<int> SizeOfSetProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, int>(
+                "SizeOfSet",
+                typeof(AutomationProperties),
+                AutomationSizeOfSetDefault);
+
+        /// <summary>
+        /// Helper for setting AcceleratorKey property on a StyledElement. 
+        /// </summary>
+        public static void SetAcceleratorKey(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(AcceleratorKeyProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading AcceleratorKey property from a StyledElement.
+        /// </summary>
+        public static string GetAcceleratorKey(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((string)element.GetValue(AcceleratorKeyProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting AccessibilityView property on a StyledElement. 
+        /// </summary>
+        public static void SetAccessibilityView(StyledElement element, AccessibilityView value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(AccessibilityViewProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading AccessibilityView property from a StyledElement.
+        /// </summary>
+        public static AccessibilityView GetAccessibilityView(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return element.GetValue(AccessibilityViewProperty);
+        }
+
+        /// <summary>
+        /// Helper for setting AccessKey property on a StyledElement. 
+        /// </summary>
+        public static void SetAccessKey(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(AccessKeyProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading AccessKey property from a StyledElement.
+        /// </summary>
+        public static string GetAccessKey(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((string)element.GetValue(AccessKeyProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting AutomationId property on a StyledElement. 
+        /// </summary>
+        public static void SetAutomationId(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(AutomationIdProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading AutomationId property from a StyledElement.
+        /// </summary>
+        public static string GetAutomationId(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return element.GetValue(AutomationIdProperty);
+        }
+
+        /// <summary>
+        /// Helper for setting ControlTypeOverride property on a StyledElement. 
+        /// </summary>
+        public static void SetControlTypeOverride(StyledElement element, AutomationControlType? value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(ControlTypeOverrideProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading ControlTypeOverride property from a StyledElement.
+        /// </summary>
+        public static AutomationControlType? GetControlTypeOverride(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return element.GetValue(ControlTypeOverrideProperty);
+        }
+
+        /// <summary>
+        /// Helper for setting HelpText property on a StyledElement. 
+        /// </summary>
+        public static void SetHelpText(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(HelpTextProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading HelpText property from a StyledElement.
+        /// </summary>
+        public static string GetHelpText(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((string)element.GetValue(HelpTextProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting IsColumnHeader property on a StyledElement. 
+        /// </summary>
+        public static void SetIsColumnHeader(StyledElement element, bool value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(IsColumnHeaderProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading IsColumnHeader property from a StyledElement.
+        /// </summary>
+        public static bool GetIsColumnHeader(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((bool)element.GetValue(IsColumnHeaderProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting IsRequiredForForm property on a StyledElement. 
+        /// </summary>
+        public static void SetIsRequiredForForm(StyledElement element, bool value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(IsRequiredForFormProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading IsRequiredForForm property from a StyledElement.
+        /// </summary>
+        public static bool GetIsRequiredForForm(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((bool)element.GetValue(IsRequiredForFormProperty));
+        }
+
+        /// <summary>
+        /// Helper for reading IsRowHeader property from a StyledElement.
+        /// </summary>
+        public static bool GetIsRowHeader(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((bool)element.GetValue(IsRowHeaderProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting IsRowHeader property on a StyledElement. 
+        /// </summary>
+        public static void SetIsRowHeader(StyledElement element, bool value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(IsRowHeaderProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for setting IsOffscreenBehavior property on a StyledElement. 
+        /// </summary>
+        public static void SetIsOffscreenBehavior(StyledElement element, IsOffscreenBehavior value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(IsOffscreenBehaviorProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading IsOffscreenBehavior property from a StyledElement.
+        /// </summary>
+        public static IsOffscreenBehavior GetIsOffscreenBehavior(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((IsOffscreenBehavior)element.GetValue(IsOffscreenBehaviorProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting ItemStatus property on a StyledElement. 
+        /// </summary>
+        public static void SetItemStatus(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(ItemStatusProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading ItemStatus property from a StyledElement.
+        /// </summary>
+        public static string GetItemStatus(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((string)element.GetValue(ItemStatusProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting ItemType property on a StyledElement. 
+        /// </summary>
+        public static void SetItemType(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(ItemTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading ItemType property from a StyledElement.
+        /// </summary>
+        public static string GetItemType(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((string)element.GetValue(ItemTypeProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting LabeledBy property on a StyledElement. 
+        /// </summary>
+        public static void SetLabeledBy(StyledElement element, IControl value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(LabeledByProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading LabeledBy property from a StyledElement.
+        /// </summary>
+        public static IControl GetLabeledBy(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return element.GetValue(LabeledByProperty);
+        }
+
+        /// <summary>
+        /// Helper for setting LiveSetting property on a StyledElement. 
+        /// </summary>
+        public static void SetLiveSetting(StyledElement element, AutomationLiveSetting value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(LiveSettingProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading LiveSetting property from a StyledElement.
+        /// </summary>
+        public static AutomationLiveSetting GetLiveSetting(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((AutomationLiveSetting)element.GetValue(LiveSettingProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting Name property on a StyledElement. 
+        /// </summary>
+        public static void SetName(StyledElement element, string value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(NameProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading Name property from a StyledElement.
+        /// </summary>
+        public static string GetName(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((string)element.GetValue(NameProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting PositionInSet property on a StyledElement. 
+        /// </summary>
+        public static void SetPositionInSet(StyledElement element, int value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(PositionInSetProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading PositionInSet property from a StyledElement.
+        /// </summary>
+        public static int GetPositionInSet(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((int)element.GetValue(PositionInSetProperty));
+        }
+
+        /// <summary>
+        /// Helper for setting SizeOfSet property on a StyledElement. 
+        /// </summary>
+        public static void SetSizeOfSet(StyledElement element, int value)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            element.SetValue(SizeOfSetProperty, value);
+        }
+
+        /// <summary>
+        /// Helper for reading SizeOfSet property from a StyledElement.
+        /// </summary>
+        public static int GetSizeOfSet(StyledElement element)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            return ((int)element.GetValue(SizeOfSetProperty));
+        }
+    }
+}
+
diff --git a/src/Avalonia.Controls/Automation/AutomationProperty.cs b/src/Avalonia.Controls/Automation/AutomationProperty.cs
new file mode 100644
index 0000000000..16968b271d
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/AutomationProperty.cs
@@ -0,0 +1,11 @@
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Identifies a property of <see cref="AutomationElementIdentifiers"/> or of a specific
+    /// control pattern.
+    /// </summary>
+    public sealed class AutomationProperty
+    {
+        internal AutomationProperty() { }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/AutomationPropertyChangedEventArgs.cs b/src/Avalonia.Controls/Automation/AutomationPropertyChangedEventArgs.cs
new file mode 100644
index 0000000000..3b7eb70fcb
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/AutomationPropertyChangedEventArgs.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace Avalonia.Automation
+{
+    public class AutomationPropertyChangedEventArgs : EventArgs
+    {
+        public AutomationPropertyChangedEventArgs(
+            AutomationProperty property,
+            object? oldValue,
+            object? newValue)
+        {
+            Property = property;
+            OldValue = oldValue;
+            NewValue = newValue;
+        }
+
+        public AutomationProperty Property { get; }
+        public object? OldValue { get; }
+        public object? NewValue { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/ElementNotEnabledException.cs b/src/Avalonia.Controls/Automation/ElementNotEnabledException.cs
new file mode 100644
index 0000000000..ac73d50603
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/ElementNotEnabledException.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Avalonia.Automation
+{
+    public class ElementNotEnabledException : Exception
+    {
+        public ElementNotEnabledException() : base("Element not enabled.") { }
+        public ElementNotEnabledException(string message) : base(message) { }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/ExpandCollapsePatternIdentifiers.cs b/src/Avalonia.Controls/Automation/ExpandCollapsePatternIdentifiers.cs
new file mode 100644
index 0000000000..e2b6782162
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/ExpandCollapsePatternIdentifiers.cs
@@ -0,0 +1,15 @@
+using Avalonia.Automation.Provider;
+
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Contains values used as identifiers by <see cref="IExpandCollapseProvider"/>.
+    /// </summary>
+    public static class ExpandCollapsePatternIdentifiers
+    {
+        /// <summary>
+        /// Identifies <see cref="IExpandCollapseProvider.ExpandCollapseState"/> automation property.
+        /// </summary>
+        public static AutomationProperty ExpandCollapseStateProperty { get; } = new AutomationProperty();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/ExpandCollapseState.cs b/src/Avalonia.Controls/Automation/ExpandCollapseState.cs
new file mode 100644
index 0000000000..c6b4feeb50
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/ExpandCollapseState.cs
@@ -0,0 +1,29 @@
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Contains values that specify the <see cref="ExpandCollapseState"/> of a UI Automation element.
+    /// </summary>
+    public enum ExpandCollapseState
+    {
+        /// <summary>
+        /// No child nodes, controls, or content of the UI Automation element are displayed.
+        /// </summary>
+        Collapsed,
+
+        /// <summary>
+        /// All child nodes, controls or content of the UI Automation element are displayed.
+        /// </summary>
+        Expanded,
+
+        /// <summary>
+        /// The UI Automation element has no child nodes, controls, or content to display.
+        /// </summary>
+        LeafNode,
+
+        /// <summary>
+        /// Some, but not all, child nodes, controls, or content of the UI Automation element are
+        /// displayed.
+        /// </summary>
+        PartiallyExpanded
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/IsOffscreenBehavior.cs b/src/Avalonia.Controls/Automation/IsOffscreenBehavior.cs
new file mode 100644
index 0000000000..128c1e1dcc
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/IsOffscreenBehavior.cs
@@ -0,0 +1,26 @@
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// This enum offers different ways of evaluating the IsOffscreen AutomationProperty
+    /// </summary>
+    public enum IsOffscreenBehavior
+    {
+        /// <summary>
+        /// The AutomationProperty IsOffscreen is calculated based on IsVisible.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// The AutomationProperty IsOffscreen is false.
+        /// </summary>
+        Onscreen,
+        /// <summary>
+        /// The AutomationProperty IsOffscreen if true.
+        /// </summary>
+        Offscreen,
+        /// <summary>
+        /// The AutomationProperty IsOffscreen is calculated based on clip regions.
+        /// </summary>
+        FromClip,
+    }
+}
+
diff --git a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
new file mode 100644
index 0000000000..3d3fe35d29
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
@@ -0,0 +1,273 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Automation.Peers
+{
+    public enum AutomationControlType
+    {
+        None,
+        Button,
+        Calendar,
+        CheckBox,
+        ComboBox,
+        ComboBoxItem,
+        Edit,
+        Hyperlink,
+        Image,
+        ListItem,
+        List,
+        Menu,
+        MenuBar,
+        MenuItem,
+        ProgressBar,
+        RadioButton,
+        ScrollBar,
+        Slider,
+        Spinner,
+        StatusBar,
+        Tab,
+        TabItem,
+        Text,
+        ToolBar,
+        ToolTip,
+        Tree,
+        TreeItem,
+        Custom,
+        Group,
+        Thumb,
+        DataGrid,
+        DataItem,
+        Document,
+        SplitButton,
+        Window,
+        Pane,
+        Header,
+        HeaderItem,
+        Table,
+        TitleBar,
+        Separator,
+    }
+
+    /// <summary>
+    /// Provides a base class that exposes an element to UI Automation.
+    /// </summary>
+    public abstract class AutomationPeer
+    {
+        /// <summary>
+        /// Attempts to bring the element associated with the automation peer into view.
+        /// </summary>
+        public void BringIntoView() => BringIntoViewCore();
+
+        /// <summary>
+        /// Gets the accelerator key combinations for the element that is associated with the UI
+        /// Automation peer.
+        /// </summary>
+        public string? GetAcceleratorKey() => GetAcceleratorKeyCore();
+
+        /// <summary>
+        /// Gets the access key for the element that is associated with the automation peer.
+        /// </summary>
+        public string? GetAccessKey() => GetAccessKeyCore();
+
+        /// <summary>
+        /// Gets the control type for the element that is associated with the UI Automation peer.
+        /// </summary>
+        public AutomationControlType GetAutomationControlType() => GetControlTypeOverrideCore();
+
+        /// <summary>
+        /// Gets the automation ID of the element that is associated with the UI Automation peer.
+        /// </summary>
+        public string? GetAutomationId() => GetAutomationIdCore();
+
+        /// <summary>
+        /// Gets the bounding rectangle of the element that is associated with the automation peer
+        /// in top-level coordinates.
+        /// </summary>
+        public Rect GetBoundingRectangle() => GetBoundingRectangleCore();
+
+        /// <summary>
+        /// Gets the child automation peers.
+        /// </summary>
+        public IReadOnlyList<AutomationPeer> GetChildren() => GetOrCreateChildrenCore();
+
+        /// <summary>
+        /// Gets a string that describes the class of the element.
+        /// </summary>
+        public string GetClassName() => GetClassNameCore() ?? string.Empty;
+
+        /// <summary>
+        /// Gets the automation peer for the label that is targeted to the element.
+        /// </summary>
+        /// <returns></returns>
+        public AutomationPeer? GetLabeledBy() => GetLabeledByCore();
+
+        /// <summary>
+        /// Gets a human-readable localized string that represents the type of the control that is
+        /// associated with this automation peer.
+        /// </summary>
+        public string GetLocalizedControlType() => GetLocalizedControlTypeCore();
+
+        /// <summary>
+        /// Gets text that describes the element that is associated with this automation peer.
+        /// </summary>
+        public string GetName() => GetNameCore() ?? string.Empty;
+
+        /// <summary>
+        /// Gets the <see cref="AutomationPeer"/> that is the parent of this <see cref="AutomationPeer"/>.
+        /// </summary>
+        /// <returns></returns>
+        public AutomationPeer? GetParent() => GetParentCore();
+
+        /// <summary>
+        /// Gets a value that indicates whether the element that is associated with this automation
+        /// peer currently has keyboard focus.
+        /// </summary>
+        public bool HasKeyboardFocus() => HasKeyboardFocusCore();
+
+        /// <summary>
+        /// Gets a value that indicates whether the element that is associated with this automation
+        /// peer contains data that is presented to the user.
+        /// </summary>
+        public bool IsContentElement() => IsContentElementOverrideCore();
+
+        /// <summary>
+        /// Gets a value that indicates whether the element is understood by the user as
+        /// interactive or as contributing to the logical structure of the control in the GUI.
+        /// </summary>
+        public bool IsControlElement() => IsControlElementOverrideCore();
+
+        /// <summary>
+        /// Gets a value indicating whether the control is enabled for user interaction.
+        /// </summary>
+        public bool IsEnabled() => IsEnabledCore();
+
+        /// <summary>
+        /// Gets a value that indicates whether the element can accept keyboard focus.
+        /// </summary>
+        /// <returns></returns>
+        public bool IsKeyboardFocusable() => IsKeyboardFocusableCore();
+
+        /// <summary>
+        /// Sets the keyboard focus on the element that is associated with this automation peer.
+        /// </summary>
+        public void SetFocus() => SetFocusCore();
+
+        /// <summary>
+        /// Shows the context menu for the element that is associated with this automation peer.
+        /// </summary>
+        /// <returns>true if a context menu is present for the element; otherwise false.</returns>
+        public bool ShowContextMenu() => ShowContextMenuCore();
+
+        /// <summary>
+        /// Tries to get a provider of the specified type from the peer.
+        /// </summary>
+        /// <typeparam name="T">The provider type.</typeparam>
+        /// <returns>The provider, or null if not implemented on this peer.</returns>
+        public T? GetProvider<T>() => (T?)GetProviderCore(typeof(T));
+
+        /// <summary>
+        /// Occurs when the children of the automation peer have changed.
+        /// </summary>
+        public event EventHandler? ChildrenChanged;
+
+        /// <summary>
+        /// Occurs when a property value of the automation peer has changed.
+        /// </summary>
+        public event EventHandler<AutomationPropertyChangedEventArgs>? PropertyChanged;
+
+        /// <summary>
+        /// Raises an event to notify the automation client the the children of the peer have changed.
+        /// </summary>
+        protected void RaiseChildrenChangedEvent() => ChildrenChanged?.Invoke(this, EventArgs.Empty);
+
+        /// <summary>
+        /// Raises an event to notify the automation client of a changed property value.
+        /// </summary>
+        /// <param name="property">The property that changed.</param>
+        /// <param name="oldValue">The previous value of the property.</param>
+        /// <param name="newValue">The new value of the property.</param>
+        public void RaisePropertyChangedEvent(
+            AutomationProperty property,
+            object? oldValue,
+            object? newValue)
+        {
+            PropertyChanged?.Invoke(this, new AutomationPropertyChangedEventArgs(property, oldValue, newValue));
+        }
+
+        protected virtual string GetLocalizedControlTypeCore()
+        {
+            var controlType = GetAutomationControlType();
+
+            return controlType switch
+            {
+                AutomationControlType.CheckBox => "check box",
+                AutomationControlType.ComboBox => "combo box",
+                AutomationControlType.ListItem => "list item",
+                AutomationControlType.MenuBar => "menu bar",
+                AutomationControlType.MenuItem => "menu item",
+                AutomationControlType.ProgressBar => "progress bar",
+                AutomationControlType.RadioButton => "radio button",
+                AutomationControlType.ScrollBar => "scroll bar",
+                AutomationControlType.StatusBar => "status bar",
+                AutomationControlType.TabItem => "tab item",
+                AutomationControlType.ToolBar => "toolbar",
+                AutomationControlType.ToolTip => "tooltip",
+                AutomationControlType.TreeItem => "tree item",
+                AutomationControlType.Custom => "custom",
+                AutomationControlType.DataGrid => "data grid",
+                AutomationControlType.DataItem => "data item",
+                AutomationControlType.SplitButton => "split button",
+                AutomationControlType.HeaderItem => "header item",
+                AutomationControlType.TitleBar => "title bar",
+                _ => controlType.ToString().ToLowerInvariant(),
+            };
+        }
+
+        protected abstract void BringIntoViewCore();
+        protected abstract string? GetAcceleratorKeyCore();
+        protected abstract string? GetAccessKeyCore();
+        protected abstract AutomationControlType GetAutomationControlTypeCore();
+        protected abstract string? GetAutomationIdCore();
+        protected abstract Rect GetBoundingRectangleCore();
+        protected abstract IReadOnlyList<AutomationPeer> GetOrCreateChildrenCore();
+        protected abstract string GetClassNameCore();
+        protected abstract AutomationPeer? GetLabeledByCore();
+        protected abstract string? GetNameCore();
+        protected abstract AutomationPeer? GetParentCore();
+        protected abstract bool HasKeyboardFocusCore();
+        protected abstract bool IsContentElementCore();
+        protected abstract bool IsControlElementCore();
+        protected abstract bool IsEnabledCore();
+        protected abstract bool IsKeyboardFocusableCore();
+        protected abstract void SetFocusCore();
+        protected abstract bool ShowContextMenuCore();
+
+        protected virtual AutomationControlType GetControlTypeOverrideCore()
+        {
+            return GetAutomationControlTypeCore();
+        }
+
+        protected virtual bool IsContentElementOverrideCore()
+        {
+            return IsControlElement() && IsContentElementCore();
+        }
+
+        protected virtual bool IsControlElementOverrideCore()
+        {
+            return IsControlElementCore();
+        }
+
+        protected virtual object? GetProviderCore(Type providerType)
+        {
+            return providerType.IsAssignableFrom(this.GetType()) ? this : null;
+        }
+
+        protected internal abstract bool TrySetParent(AutomationPeer? parent);
+
+        protected void EnsureEnabled()
+        {
+            if (!IsEnabled())
+                throw new ElementNotEnabledException();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/ButtonAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ButtonAutomationPeer.cs
new file mode 100644
index 0000000000..4ac07717da
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ButtonAutomationPeer.cs
@@ -0,0 +1,43 @@
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ButtonAutomationPeer : ContentControlAutomationPeer,
+        IInvokeProvider
+    {
+        public ButtonAutomationPeer(Button owner)
+            : base(owner) 
+        {
+        }
+
+        public new Button Owner => (Button)base.Owner;
+
+        public void Invoke()
+        {
+            EnsureEnabled();
+            (Owner as Button)?.PerformClick();
+        }
+
+        protected override string? GetAcceleratorKeyCore()
+        {
+            var result = base.GetAcceleratorKeyCore();
+
+            if (string.IsNullOrWhiteSpace(result))
+            {
+                result = Owner.HotKey?.ToString();
+            }
+
+            return result;
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Button;
+        }
+
+        protected override bool IsContentElementCore() => true;
+        protected override bool IsControlElementCore() => true;
+    }
+}
+
diff --git a/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
new file mode 100644
index 0000000000..5ff291d972
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ComboBoxAutomationPeer : SelectingItemsControlAutomationPeer,
+        IExpandCollapseProvider,
+        IValueProvider
+    {
+        private UnrealizedSelectionPeer[]? _selection;
+
+        public ComboBoxAutomationPeer(ComboBox owner)
+            : base(owner)
+        {
+        }
+
+        public new ComboBox Owner => (ComboBox)base.Owner;
+
+        public ExpandCollapseState ExpandCollapseState => ToState(Owner.IsDropDownOpen);
+        public bool ShowsMenu => true;
+        public void Collapse() => Owner.IsDropDownOpen = false;
+        public void Expand() => Owner.IsDropDownOpen = true;
+        bool IValueProvider.IsReadOnly => true;
+
+        string? IValueProvider.Value
+        {
+            get
+            {
+                var selection = GetSelection();
+                return selection.Count == 1 ? selection[0].GetName() : null;
+            }
+        }
+        
+        void IValueProvider.SetValue(string? value) => throw new NotSupportedException();
+        
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.ComboBox;
+        }
+
+        protected override IReadOnlyList<AutomationPeer>? GetSelectionCore()
+        {
+            if (ExpandCollapseState == ExpandCollapseState.Expanded)
+                return base.GetSelectionCore();
+
+            // If the combo box is not open then we won't have an ItemsPresenter so the default
+            // GetSelectionCore implementation won't work. For this case we create a separate
+            // peer to represent the unrealized item.
+            if (Owner.SelectedItem is object selection)
+            {
+                _selection ??= new[] { new UnrealizedSelectionPeer(this) };
+                _selection[0].Item = selection;
+                return _selection;
+            }
+
+            return null;
+        }
+
+        protected override void OwnerPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            base.OwnerPropertyChanged(sender, e);
+
+            if (e.Property == ComboBox.IsDropDownOpenProperty)
+            {
+                RaisePropertyChangedEvent(
+                    ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty,
+                    ToState((bool)e.OldValue!),
+                    ToState((bool)e.NewValue!));
+            }
+        }
+
+        private ExpandCollapseState ToState(bool value)
+        {
+            return value ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed;
+        }
+
+        private class UnrealizedSelectionPeer : UnrealizedElementAutomationPeer
+        {
+            private readonly ComboBoxAutomationPeer _owner;
+            private object? _item;
+
+            public UnrealizedSelectionPeer(ComboBoxAutomationPeer owner)
+            {
+                _owner = owner;
+            }
+
+            public object? Item
+            {
+                get => _item;
+                set
+                {
+                    if (_item != value)
+                    {
+                        var oldValue = GetNameCore();
+                        _item = value;
+                        RaisePropertyChangedEvent(
+                            AutomationElementIdentifiers.NameProperty,
+                            oldValue,
+                            GetNameCore());
+                    }
+                }
+            }
+
+            protected override string? GetAcceleratorKeyCore() => null;
+            protected override string? GetAccessKeyCore() => null;
+            protected override string? GetAutomationIdCore() => null;
+            protected override string GetClassNameCore() => typeof(ComboBoxItem).Name;
+            protected override AutomationPeer? GetLabeledByCore() => null;
+            protected override AutomationPeer? GetParentCore() => _owner;
+            protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.ListItem;
+
+            protected override string? GetNameCore()
+            {
+                if (_item is Control c)
+                {
+                    var result = AutomationProperties.GetName(c);
+
+                    if (result is null && c is ContentControl cc && cc.Presenter?.Child is TextBlock text)
+                    {
+                        result = text.Text;
+                    }
+
+                    if (result is null)
+                    {
+                        result = c.GetValue(ContentControl.ContentProperty)?.ToString();
+                    }
+
+                    return result;
+                }
+
+                return _item?.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/ContentControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ContentControlAutomationPeer.cs
new file mode 100644
index 0000000000..df24222a0c
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ContentControlAutomationPeer.cs
@@ -0,0 +1,36 @@
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ContentControlAutomationPeer : ControlAutomationPeer
+    {
+        protected ContentControlAutomationPeer(ContentControl owner)
+            : base(owner) 
+        { 
+        }
+
+        public new ContentControl Owner => (ContentControl)base.Owner;
+
+        protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Pane;
+
+        protected override string? GetNameCore()
+        {
+            var result = base.GetNameCore();
+
+            if (result is null && Owner.Presenter?.Child is TextBlock text)
+            {
+                result = text.Text;
+            }
+
+            if (result is null)
+            {
+                result = Owner.Content?.ToString();
+            }
+
+            return result;
+        }
+
+        protected override bool IsContentElementCore() => false;
+        protected override bool IsControlElementCore() => false;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
new file mode 100644
index 0000000000..25172b2d1c
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Automation.Peers
+{
+    /// <summary>
+    /// An automation peer which represents a <see cref="Control"/> element.
+    /// </summary>
+    public class ControlAutomationPeer : AutomationPeer
+    {
+        private IReadOnlyList<AutomationPeer>? _children;
+        private bool _childrenValid;
+        private AutomationPeer? _parent;
+        private bool _parentValid;
+
+        public ControlAutomationPeer(Control owner)
+        {
+            Owner = owner ?? throw new ArgumentNullException("owner");
+            Initialize();
+        }
+
+        public Control Owner { get; }
+
+        public AutomationPeer GetOrCreate(Control element)
+        {
+            if (element == Owner)
+                return this;
+            return CreatePeerForElement(element);
+        }
+
+        public static AutomationPeer CreatePeerForElement(Control element)
+        {
+            return element.GetOrCreateAutomationPeer();
+        }
+
+        protected override void BringIntoViewCore() => Owner.BringIntoView();
+
+        protected override IReadOnlyList<AutomationPeer> GetOrCreateChildrenCore()
+        {
+            var children = _children ?? Array.Empty<AutomationPeer>();
+
+            if (_childrenValid)
+                return children;
+
+            var newChildren = GetChildrenCore() ?? Array.Empty<AutomationPeer>();
+
+            foreach (var peer in children.Except(newChildren))
+                peer.TrySetParent(null);
+            foreach (var peer in newChildren)
+                peer.TrySetParent(this);
+
+            _childrenValid = true;
+            return _children = newChildren;
+        }
+
+        protected virtual IReadOnlyList<AutomationPeer>? GetChildrenCore()
+        {
+            var children = ((IVisual)Owner).VisualChildren;
+
+            if (children.Count == 0)
+                return null;
+
+            var result = new List<AutomationPeer>();
+
+            foreach (var child in children)
+            {
+                if (child is Control c && c.IsVisible)
+                {
+                    result.Add(GetOrCreate(c));
+                }
+            }
+
+            return result;
+        }
+
+        protected override AutomationPeer? GetLabeledByCore()
+        {
+            var label = AutomationProperties.GetLabeledBy(Owner);
+            return label is Control c ? GetOrCreate(c) : null;
+        }
+
+        protected override string? GetNameCore()
+        {
+            var result = AutomationProperties.GetName(Owner);
+
+            if (string.IsNullOrWhiteSpace(result) && GetLabeledBy() is AutomationPeer labeledBy)
+            {
+                return labeledBy.GetName();
+            }
+
+            return null;
+        }
+
+        protected override AutomationPeer? GetParentCore()
+        {
+            EnsureConnected();
+            return _parent;
+        }
+
+        /// <summary>
+        /// Invalidates the peer's children and causes a re-read from <see cref="GetChildrenCore"/>.
+        /// </summary>
+        protected void InvalidateChildren()
+        {
+            _childrenValid = false;
+            RaiseChildrenChangedEvent();
+        }
+
+        /// <summary>
+        /// Invalidates the peer's parent.
+        /// </summary>
+        protected void InvalidateParent()
+        {
+            _parent = null;
+            _parentValid = false;
+        }
+
+        protected override bool ShowContextMenuCore()
+        {
+            var c = Owner;
+
+            while (c is object)
+            {
+                if (c.ContextMenu is object)
+                {
+                    c.ContextMenu.Open(c);
+                    return true;
+                }
+
+                c = c.Parent as Control;
+            }
+
+            return false;
+        }
+
+        protected internal override bool TrySetParent(AutomationPeer? parent)
+        {
+            _parent = parent;
+            return true;
+        }
+
+        protected override string? GetAcceleratorKeyCore() => AutomationProperties.GetAcceleratorKey(Owner);
+        protected override string? GetAccessKeyCore() => AutomationProperties.GetAccessKey(Owner);
+        protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Custom;
+        protected override string? GetAutomationIdCore() => AutomationProperties.GetAutomationId(Owner) ?? Owner.Name;
+        protected override Rect GetBoundingRectangleCore() => GetBounds(Owner);
+        protected override string GetClassNameCore() => Owner.GetType().Name;
+        protected override bool HasKeyboardFocusCore() => Owner.IsFocused;
+        protected override bool IsContentElementCore() => true;
+        protected override bool IsControlElementCore() => true;
+        protected override bool IsEnabledCore() => Owner.IsEnabled;
+        protected override bool IsKeyboardFocusableCore() => Owner.Focusable;
+        protected override void SetFocusCore() => Owner.Focus();
+
+        protected override AutomationControlType GetControlTypeOverrideCore()
+        {
+            return AutomationProperties.GetControlTypeOverride(Owner) ?? GetAutomationControlTypeCore();
+        }
+
+        protected override bool IsContentElementOverrideCore()
+        {
+            var view = AutomationProperties.GetAccessibilityView(Owner);
+            return view == AccessibilityView.Default ? IsContentElementCore() : view >= AccessibilityView.Content;
+        }
+
+        protected override bool IsControlElementOverrideCore()
+        {
+            var view = AutomationProperties.GetAccessibilityView(Owner);
+            return view == AccessibilityView.Default ? IsControlElementCore() : view >= AccessibilityView.Control;
+        }
+
+        private static Rect GetBounds(Control control)
+        {
+            var root = control.GetVisualRoot();
+
+            if (root is null)
+                return default;
+
+            var transform = control.TransformToVisual(root);
+
+            if (!transform.HasValue)
+                return default;
+
+            return new Rect(control.Bounds.Size).TransformToAABB(transform.Value);
+        }
+
+        private void Initialize()
+        {
+            Owner.PropertyChanged += OwnerPropertyChanged;
+            var visualChildren = ((IVisual)Owner).VisualChildren;
+            visualChildren.CollectionChanged += VisualChildrenChanged;
+        }
+
+        private void VisualChildrenChanged(object? sender, EventArgs e) => InvalidateChildren();
+
+        private void OwnerPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Property == Visual.IsVisibleProperty)
+            {
+                var parent = Owner.GetVisualParent();
+                if (parent is Control c)
+                    (GetOrCreate(c) as ControlAutomationPeer)?.InvalidateChildren();
+            }
+            else if (e.Property == Visual.BoundsProperty || 
+                     e.Property == Visual.RenderTransformProperty ||
+                     e.Property == Visual.RenderTransformOriginProperty)
+            {
+                RaisePropertyChangedEvent(
+                    AutomationElementIdentifiers.BoundingRectangleProperty,
+                    null,
+                    GetBounds(Owner));
+            }
+            else if (e.Property == Visual.VisualParentProperty)
+            {
+                InvalidateParent();
+            }
+        }
+
+
+        private void EnsureConnected()
+        {
+            if (!_parentValid)
+            {
+                var parent = Owner.GetVisualParent();
+
+                while (parent is object)
+                {
+                    if (parent is Control c)
+                    {
+                        var parentPeer = GetOrCreate(c);
+                        parentPeer.GetChildren();
+                    }
+
+                    parent = parent.GetVisualParent();
+                }
+
+                _parentValid = true;
+            }
+        }
+    }
+}
+
diff --git a/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
new file mode 100644
index 0000000000..db16bf0a53
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
@@ -0,0 +1,54 @@
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ItemsControlAutomationPeer : ControlAutomationPeer, IScrollProvider
+    {
+        private bool _searchedForScrollable;
+        private IScrollProvider? _scroller;
+
+        public ItemsControlAutomationPeer(ItemsControl owner)
+            : base(owner)
+        {
+        }
+
+        public new ItemsControl Owner => (ItemsControl)base.Owner;
+        public bool HorizontallyScrollable => _scroller?.HorizontallyScrollable ?? false;
+        public double HorizontalScrollPercent => _scroller?.HorizontalScrollPercent ?? -1;
+        public double HorizontalViewSize => _scroller?.HorizontalViewSize ?? 0;
+        public bool VerticallyScrollable => _scroller?.VerticallyScrollable ?? false;
+        public double VerticalScrollPercent => _scroller?.VerticalScrollPercent ?? -1;
+        public double VerticalViewSize => _scroller?.VerticalViewSize ?? 0;
+
+        protected virtual IScrollProvider? Scroller
+        {
+            get
+            {
+                if (!_searchedForScrollable)
+                {
+                    if (Owner.GetValue(ListBox.ScrollProperty) is Control scrollable)
+                        _scroller = GetOrCreate(scrollable) as IScrollProvider;
+                    _searchedForScrollable = true;
+                }
+
+                return _scroller;
+            }
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.List;
+        }
+
+        public void Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount)
+        {
+            _scroller?.Scroll(horizontalAmount, verticalAmount);
+        }
+
+        public void SetScrollPercent(double horizontalPercent, double verticalPercent)
+        {
+            _scroller?.SetScrollPercent(horizontalPercent, verticalPercent);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
new file mode 100644
index 0000000000..ac23873e6a
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
@@ -0,0 +1,82 @@
+using System;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Selection;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ListItemAutomationPeer : ContentControlAutomationPeer,
+        ISelectionItemProvider
+    {
+        public ListItemAutomationPeer(ContentControl owner)
+            : base(owner)
+        {
+        }
+
+        public bool IsSelected => Owner.GetValue(ListBoxItem.IsSelectedProperty);
+
+        public ISelectionProvider? SelectionContainer
+        {
+            get
+            {
+                if (Owner.Parent is Control parent)
+                {
+                    var parentPeer = GetOrCreate(parent);
+                    return parentPeer as ISelectionProvider;
+                }
+
+                return null;
+            }
+        }
+
+        public void Select()
+        {
+            EnsureEnabled();
+
+            if (Owner.Parent is SelectingItemsControl parent)
+            {
+                var index = parent.ItemContainerGenerator.IndexFromContainer(Owner);
+
+                if (index != -1)
+                    parent.SelectedIndex = index;
+            }
+        }
+
+        void ISelectionItemProvider.AddToSelection()
+        {
+            EnsureEnabled();
+
+            if (Owner.Parent is ItemsControl parent &&
+                parent.GetValue(ListBox.SelectionProperty) is ISelectionModel selectionModel)
+            {
+                var index = parent.ItemContainerGenerator.IndexFromContainer(Owner);
+
+                if (index != -1)
+                    selectionModel.Select(index);
+            }
+        }
+
+        void ISelectionItemProvider.RemoveFromSelection()
+        {
+            EnsureEnabled();
+
+            if (Owner.Parent is ItemsControl parent &&
+                parent.GetValue(ListBox.SelectionProperty) is ISelectionModel selectionModel)
+            {
+                var index = parent.ItemContainerGenerator.IndexFromContainer(Owner);
+
+                if (index != -1)
+                    selectionModel.Deselect(index);
+            }
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.ListItem;
+        }
+
+        protected override bool IsContentElementCore() => true;
+        protected override bool IsControlElementCore() => true;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/MenuItemAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/MenuItemAutomationPeer.cs
new file mode 100644
index 0000000000..c98c5c9a22
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/MenuItemAutomationPeer.cs
@@ -0,0 +1,59 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Automation.Peers
+{
+    public class MenuItemAutomationPeer : ControlAutomationPeer
+    {
+        public MenuItemAutomationPeer(MenuItem owner)
+            : base(owner) 
+        { 
+        }
+
+        public new MenuItem Owner => (MenuItem)base.Owner;
+
+        protected override string? GetAccessKeyCore()
+        {
+            var result = base.GetAccessKeyCore();
+
+            if (string.IsNullOrWhiteSpace(result))
+            {
+                if (Owner.HeaderPresenter?.Child is AccessText accessText)
+                {
+                    result = accessText.AccessKey.ToString();
+                }
+            }
+
+            return result;
+        }
+
+        protected override string? GetAcceleratorKeyCore()
+        {
+            var result = base.GetAcceleratorKeyCore();
+
+            if (string.IsNullOrWhiteSpace(result))
+            {
+                result = Owner.InputGesture?.ToString();
+            }
+
+            return result;
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.MenuItem;
+        }
+
+        protected override string? GetNameCore()
+        {
+            var result = base.GetNameCore();
+
+            if (result is null && Owner.Header is string header)
+            {
+                result = AccessText.RemoveAccessKeyMarker(header);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/NoneAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/NoneAutomationPeer.cs
new file mode 100644
index 0000000000..0f92fed6f3
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/NoneAutomationPeer.cs
@@ -0,0 +1,25 @@
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    /// <summary>
+    /// An automation peer which represents an element that is exposed to automation as non-
+    /// interactive or as not contributing to the logical structure of the application.
+    /// </summary>
+    public class NoneAutomationPeer : ControlAutomationPeer
+    {
+        public NoneAutomationPeer(Control owner)
+            : base(owner) 
+        { 
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.None;
+        }
+
+        protected override bool IsContentElementCore() => false;
+        protected override bool IsControlElementCore() => false;
+    }
+}
+
diff --git a/src/Avalonia.Controls/Automation/Peers/PopupAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/PopupAutomationPeer.cs
new file mode 100644
index 0000000000..25f6ca6e2d
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/PopupAutomationPeer.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Diagnostics;
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Automation.Peers
+{
+    public class PopupAutomationPeer : ControlAutomationPeer
+    {
+        public PopupAutomationPeer(Popup owner)
+            : base(owner)
+        {
+            owner.Opened += PopupOpenedClosed;
+            owner.Closed += PopupOpenedClosed;
+        }
+
+        protected override IReadOnlyList<AutomationPeer>? GetChildrenCore()
+        {
+            var host = (IPopupHostProvider)Owner;
+            return host.PopupHost is Control c ? new[] { GetOrCreate(c) } : null;
+        }
+
+        protected override bool IsContentElementCore() => false;
+        protected override bool IsControlElementCore() => false;
+
+        private void PopupOpenedClosed(object? sender, EventArgs e)
+        {
+            // This is golden. We're following WPF's automation peer API here where the
+            // parent of a peer is set when another peer returns it as a child. We want to
+            // add the popup root as a child of the popup, so we need to return it as a
+            // child right? Yeah except invalidating children doesn't automatically cause
+            // UIA to re-read the children meaning that the parent doesn't get set. So the
+            // MAIN MECHANISM FOR PARENTING CONTROLS IS BROKEN WITH THE ONLY AUTOMATION API
+            // IT WAS WRITTEN FOR. Luckily WPF provides an escape-hatch by exposing the
+            // TrySetParent API internally to work around this. We're exposing it publicly
+            // to shame whoever came up with this abomination of an API.
+            GetPopupRoot()?.TrySetParent(this);
+            InvalidateChildren();
+        }
+
+        private AutomationPeer? GetPopupRoot()
+        {
+            var popupRoot = ((IPopupHostProvider)Owner).PopupHost as Control;
+            return popupRoot is object ? GetOrCreate(popupRoot) : null;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/PopupRootAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/PopupRootAutomationPeer.cs
new file mode 100644
index 0000000000..cb65682c06
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/PopupRootAutomationPeer.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Automation.Peers
+{
+    public class PopupRootAutomationPeer : WindowBaseAutomationPeer
+    {
+        public PopupRootAutomationPeer(PopupRoot owner)
+            : base(owner)
+        {
+            if (owner.IsVisible)
+                StartTrackingFocus();
+            else
+                owner.Opened += OnOpened;
+            owner.Closed += OnClosed;
+        }
+
+        protected override bool IsContentElementCore() => false;
+        protected override bool IsControlElementCore() => false;
+
+
+        protected override AutomationPeer? GetParentCore()
+        {
+            var parent = base.GetParentCore();
+            return parent;
+        }
+
+        private void OnOpened(object? sender, EventArgs e)
+        {
+            ((PopupRoot)Owner).Opened -= OnOpened;
+            StartTrackingFocus();
+        }
+
+        private void OnClosed(object? sender, EventArgs e)
+        {
+            ((PopupRoot)Owner).Closed -= OnClosed;
+            StopTrackingFocus();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/RangeBaseAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/RangeBaseAutomationPeer.cs
new file mode 100644
index 0000000000..39398933fa
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/RangeBaseAutomationPeer.cs
@@ -0,0 +1,34 @@
+using Avalonia.Automation.Provider;
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Automation.Peers
+{
+    public abstract class RangeBaseAutomationPeer : ControlAutomationPeer, IRangeValueProvider
+    {
+        public RangeBaseAutomationPeer(RangeBase owner)
+            : base(owner) 
+        {
+            owner.PropertyChanged += OwnerPropertyChanged;
+        }
+
+        public new RangeBase Owner => (RangeBase)base.Owner;
+        public virtual bool IsReadOnly => false;
+        public double Maximum => Owner.Maximum;
+        public double Minimum => Owner.Minimum;
+        public double Value => Owner.Value;
+        public double SmallChange => Owner.SmallChange;
+        public double LargeChange => Owner.LargeChange;
+        
+        public void SetValue(double value) => Owner.Value = value;
+
+        protected virtual void OwnerPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Property == RangeBase.MinimumProperty)
+                RaisePropertyChangedEvent(RangeValuePatternIdentifiers.MinimumProperty, e.OldValue, e.NewValue);
+            else if (e.Property == RangeBase.MaximumProperty)
+                RaisePropertyChangedEvent(RangeValuePatternIdentifiers.MaximumProperty, e.OldValue, e.NewValue);
+            else if (e.Property == RangeBase.ValueProperty)
+                RaisePropertyChangedEvent(RangeValuePatternIdentifiers.ValueProperty, e.OldValue, e.NewValue);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/ScrollViewerAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ScrollViewerAutomationPeer.cs
new file mode 100644
index 0000000000..835ed1c4af
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ScrollViewerAutomationPeer.cs
@@ -0,0 +1,172 @@
+using System;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+using Avalonia.Utilities;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ScrollViewerAutomationPeer : ControlAutomationPeer, IScrollProvider
+    {
+        public ScrollViewerAutomationPeer(ScrollViewer owner)
+            : base(owner)
+        {
+        }
+
+        public new ScrollViewer Owner => (ScrollViewer)base.Owner;
+
+        public bool HorizontallyScrollable
+        {
+            get => MathUtilities.GreaterThan(Owner.Extent.Width, Owner.Viewport.Width);
+        }
+
+        public double HorizontalScrollPercent
+        {
+            get
+            {
+                if (!HorizontallyScrollable)
+                    return ScrollPatternIdentifiers.NoScroll;
+                return (double)(Owner.Offset.X * 100.0 / (Owner.Extent.Width - Owner.Viewport.Width));
+            }
+        }
+
+        public double HorizontalViewSize
+        {
+            get
+            {
+                if (MathUtilities.IsZero(Owner.Extent.Width))
+                    return 100;
+                return Math.Min(100, Owner.Viewport.Width * 100.0 / Owner.Extent.Width);
+            }
+        }
+
+        public bool VerticallyScrollable
+        {
+            get => MathUtilities.GreaterThan(Owner.Extent.Height, Owner.Viewport.Height);
+        }
+
+        public double VerticalScrollPercent
+        {
+            get
+            {
+                if (!VerticallyScrollable)
+                    return ScrollPatternIdentifiers.NoScroll;
+                return (double)(Owner.Offset.Y * 100.0 / (Owner.Extent.Height - Owner.Viewport.Height));
+            }
+        }
+
+        public double VerticalViewSize
+        {
+            get
+            {
+                if (MathUtilities.IsZero(Owner.Extent.Height))
+                    return 100;
+                return Math.Min(100, Owner.Viewport.Height * 100.0 / Owner.Extent.Height);
+            }
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Pane;
+        }
+
+        protected override bool IsContentElementCore() => false;
+
+        protected override bool IsControlElementCore()
+        {
+            // Return false if the control is part of a control template.
+            return Owner.TemplatedParent is null && base.IsControlElementCore();
+        }
+
+        public void Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount)
+        {
+            if (!IsEnabled())
+                throw new ElementNotEnabledException();
+
+            var scrollHorizontally = horizontalAmount != ScrollAmount.NoAmount;
+            var scrollVertically = verticalAmount != ScrollAmount.NoAmount;
+
+            if (scrollHorizontally && !HorizontallyScrollable || scrollVertically && !VerticallyScrollable)
+            {
+                throw new InvalidOperationException("Operation cannot be performed");
+            }
+
+            switch (horizontalAmount)
+            {
+                case ScrollAmount.LargeDecrement:
+                    Owner.PageLeft();
+                    break;
+                case ScrollAmount.SmallDecrement:
+                    Owner.LineLeft();
+                    break;
+                case ScrollAmount.SmallIncrement:
+                    Owner.LineRight();
+                    break;
+                case ScrollAmount.LargeIncrement:
+                    Owner.PageRight();
+                    break;
+                case ScrollAmount.NoAmount:
+                    break;
+                default:
+                    throw new InvalidOperationException("Operation cannot be performed");
+            }
+
+            switch (verticalAmount)
+            {
+                case ScrollAmount.LargeDecrement:
+                    Owner.PageUp();
+                    break;
+                case ScrollAmount.SmallDecrement:
+                    Owner.LineUp();
+                    break;
+                case ScrollAmount.SmallIncrement:
+                    Owner.LineDown();
+                    break;
+                case ScrollAmount.LargeIncrement:
+                    Owner.PageDown();
+                    break;
+                case ScrollAmount.NoAmount:
+                    break;
+                default:
+                    throw new InvalidOperationException("Operation cannot be performed");
+            }
+        }
+
+        public void SetScrollPercent(double horizontalPercent, double verticalPercent)
+        {
+            if (!IsEnabled())
+                throw new ElementNotEnabledException();
+
+            var scrollHorizontally = horizontalPercent != ScrollPatternIdentifiers.NoScroll;
+            var scrollVertically = verticalPercent != ScrollPatternIdentifiers.NoScroll;
+
+            if (scrollHorizontally && !HorizontallyScrollable || scrollVertically && !VerticallyScrollable)
+            {
+                throw new InvalidOperationException("Operation cannot be performed");
+            }
+
+            if (scrollHorizontally && (horizontalPercent < 0.0) || (horizontalPercent > 100.0))
+            {
+                throw new ArgumentOutOfRangeException("horizontalPercent");
+            }
+
+            if (scrollVertically && (verticalPercent < 0.0) || (verticalPercent > 100.0))
+            {
+                throw new ArgumentOutOfRangeException("verticalPercent");
+            }
+
+            var offset = Owner.Offset;
+
+            if (scrollHorizontally)
+            {
+                offset = offset.WithX((Owner.Extent.Width - Owner.Viewport.Width) * horizontalPercent * 0.01);
+            }
+            
+            if (scrollVertically)
+            {
+                offset = offset.WithY((Owner.Extent.Height - Owner.Viewport.Height) * verticalPercent * 0.01);
+            }
+
+            Owner.Offset = offset;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs
new file mode 100644
index 0000000000..4626e30ff1
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Selection;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Automation.Peers
+{
+    public abstract class SelectingItemsControlAutomationPeer : ItemsControlAutomationPeer,
+        ISelectionProvider
+    {
+        private ISelectionModel _selection;
+
+        protected SelectingItemsControlAutomationPeer(SelectingItemsControl owner)
+            : base(owner) 
+        {
+            _selection = owner.GetValue(ListBox.SelectionProperty);
+            _selection.SelectionChanged += OwnerSelectionChanged;
+            owner.PropertyChanged += OwnerPropertyChanged;
+        }
+
+        public bool CanSelectMultiple => GetSelectionModeCore().HasAllFlags(SelectionMode.Multiple);
+        public bool IsSelectionRequired => GetSelectionModeCore().HasAllFlags(SelectionMode.AlwaysSelected);
+        public IReadOnlyList<AutomationPeer> GetSelection() => GetSelectionCore() ?? Array.Empty<AutomationPeer>();
+
+        protected virtual IReadOnlyList<AutomationPeer>? GetSelectionCore()
+        {
+            List<AutomationPeer>? result = null;
+
+            if (Owner is SelectingItemsControl owner)
+            {
+                var selection = Owner.GetValue(ListBox.SelectionProperty);
+
+                foreach (var i in selection.SelectedIndexes)
+                {
+                    var container = owner.ItemContainerGenerator.ContainerFromIndex(i);
+
+                    if (container is Control c && ((IVisual)c).IsAttachedToVisualTree)
+                    {
+                        var peer = GetOrCreate(c);
+
+                        if (peer is object)
+                        {
+                            result ??= new List<AutomationPeer>();
+                            result.Add(peer);
+                        }
+                    }
+                }
+
+                return result;
+            }
+
+            return result;
+        }
+
+        protected virtual SelectionMode GetSelectionModeCore()
+        {
+            return (Owner as SelectingItemsControl)?.GetValue(ListBox.SelectionModeProperty) ?? SelectionMode.Single;
+        }
+
+        protected virtual void OwnerPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Property == ListBox.SelectionProperty)
+            {
+                _selection.SelectionChanged -= OwnerSelectionChanged;
+                _selection = Owner.GetValue(ListBox.SelectionProperty);
+                _selection.SelectionChanged += OwnerSelectionChanged;
+                RaiseSelectionChanged();
+            }
+        }
+
+        protected virtual void OwnerSelectionChanged(object? sender, SelectionModelSelectionChangedEventArgs e)
+        {
+            RaiseSelectionChanged();
+        }
+
+        private void RaiseSelectionChanged()
+        {
+            RaisePropertyChangedEvent(SelectionPatternIdentifiers.SelectionProperty, null, null);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/TextBlockAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/TextBlockAutomationPeer.cs
new file mode 100644
index 0000000000..8a89e38f62
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/TextBlockAutomationPeer.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class TextBlockAutomationPeer : ControlAutomationPeer
+    {
+        public TextBlockAutomationPeer(TextBlock owner)
+            : base(owner)
+        {
+        }
+
+        public new TextBlock Owner => (TextBlock)base.Owner;
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Text;
+        }
+
+        protected override string? GetNameCore() => Owner.Text;
+
+        protected override bool IsControlElementCore()
+        {
+            // Return false if the control is part of a control template.
+            return Owner.TemplatedParent is null && base.IsControlElementCore();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/TextBoxAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/TextBoxAutomationPeer.cs
new file mode 100644
index 0000000000..9be17afa8c
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/TextBoxAutomationPeer.cs
@@ -0,0 +1,23 @@
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class TextBoxAutomationPeer : ControlAutomationPeer, IValueProvider
+    {
+        public TextBoxAutomationPeer(TextBox owner)
+            : base(owner)
+        {
+        }
+
+        public new TextBox Owner => (TextBox)base.Owner;
+        public bool IsReadOnly => Owner.IsReadOnly;
+        public string? Value => Owner.Text;
+        public void SetValue(string? value) => Owner.Text = value;
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Edit;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/ToggleButtonAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ToggleButtonAutomationPeer.cs
new file mode 100644
index 0000000000..979d54f48e
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/ToggleButtonAutomationPeer.cs
@@ -0,0 +1,39 @@
+using Avalonia.Automation.Provider;
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Automation.Peers
+{
+    public class ToggleButtonAutomationPeer : ContentControlAutomationPeer, IToggleProvider
+    {
+        public ToggleButtonAutomationPeer(ToggleButton owner)
+            : base(owner)
+        {
+        }
+
+        public new ToggleButton Owner => (ToggleButton)base.Owner;
+
+        ToggleState IToggleProvider.ToggleState
+        {
+            get => Owner.IsChecked switch
+            {
+                true => ToggleState.On,
+                false => ToggleState.Off,
+                null => ToggleState.Indeterminate,
+            };
+        }
+
+        void IToggleProvider.Toggle()
+        {
+            EnsureEnabled();
+            Owner.PerformClick();
+        }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Button;
+        }
+
+        protected override bool IsContentElementCore() => true;
+        protected override bool IsControlElementCore() => true;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/UnrealizedElementAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/UnrealizedElementAutomationPeer.cs
new file mode 100644
index 0000000000..56d5aa79ae
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/UnrealizedElementAutomationPeer.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Automation.Peers
+{
+    /// <summary>
+    /// An automation peer which represents an unrealized element
+    /// </summary>
+    public abstract class UnrealizedElementAutomationPeer : AutomationPeer
+    {
+        public void SetParent(AutomationPeer? parent) => TrySetParent(parent);
+        protected override void BringIntoViewCore() => GetParent()?.BringIntoView();
+        protected override Rect GetBoundingRectangleCore() => GetParent()?.GetBoundingRectangle() ?? default;
+        protected override IReadOnlyList<AutomationPeer> GetOrCreateChildrenCore() => Array.Empty<AutomationPeer>();
+        protected override bool HasKeyboardFocusCore() => false;
+        protected override bool IsContentElementCore() => false;
+        protected override bool IsControlElementCore() => false;
+        protected override bool IsEnabledCore() => true;
+        protected override bool IsKeyboardFocusableCore() => false;
+        protected override void SetFocusCore() { }
+        protected override bool ShowContextMenuCore() => false;
+        protected internal override bool TrySetParent(AutomationPeer? parent) => false;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/WindowAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/WindowAutomationPeer.cs
new file mode 100644
index 0000000000..1162132d54
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/WindowAutomationPeer.cs
@@ -0,0 +1,36 @@
+using System;
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers
+{
+    public class WindowAutomationPeer : WindowBaseAutomationPeer
+    {
+        public WindowAutomationPeer(Window owner)
+            : base(owner)
+        {
+            if (owner.IsVisible)
+                StartTrackingFocus();
+            else
+                owner.Opened += OnOpened;
+            owner.Closed += OnClosed;
+        }
+
+        public new Window Owner => (Window)base.Owner;
+
+        protected override string? GetNameCore() => Owner.Title;
+
+        private void OnOpened(object? sender, EventArgs e)
+        {
+            Owner.Opened -= OnOpened;
+            StartTrackingFocus();
+        }
+
+        private void OnClosed(object? sender, EventArgs e)
+        {
+            Owner.Closed -= OnClosed;
+            StopTrackingFocus();
+        }
+    }
+}
+
+
diff --git a/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
new file mode 100644
index 0000000000..30b56bbd96
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
@@ -0,0 +1,78 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Automation.Peers
+{
+    public class WindowBaseAutomationPeer : ControlAutomationPeer, IRootProvider
+    {
+        private Control? _focus;
+
+        public WindowBaseAutomationPeer(WindowBase owner)
+            : base(owner)
+        {
+        }
+
+        public new WindowBase Owner => (WindowBase)base.Owner;
+        public ITopLevelImpl? PlatformImpl => Owner.PlatformImpl;
+
+        public event EventHandler? FocusChanged;
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Window;
+        }
+
+        public AutomationPeer? GetFocus() => _focus is object ? GetOrCreate(_focus) : null;
+
+        public AutomationPeer? GetPeerFromPoint(Point p)
+        {
+            var hit = Owner.GetVisualAt(p)?.FindAncestorOfType<Control>(includeSelf: true);
+            return hit is object ? GetOrCreate(hit) : null;
+        }
+
+        protected void StartTrackingFocus()
+        {
+            if (KeyboardDevice.Instance is not null)
+            {
+                KeyboardDevice.Instance.PropertyChanged += KeyboardDevicePropertyChanged;
+                OnFocusChanged(KeyboardDevice.Instance.FocusedElement);
+            }
+        }
+
+        protected void StopTrackingFocus()
+        {
+            if (KeyboardDevice.Instance is not null)
+                KeyboardDevice.Instance.PropertyChanged -= KeyboardDevicePropertyChanged;
+        }
+
+        private void OnFocusChanged(IInputElement? focus)
+        {
+            var oldFocus = _focus;
+            
+            _focus = focus?.VisualRoot == Owner ? focus as Control : null;
+            
+            if (_focus != oldFocus)
+            {
+                var peer = _focus is object ?
+                    _focus == Owner ? this :
+                    GetOrCreate(_focus) : null;
+                FocusChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void KeyboardDevicePropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(KeyboardDevice.FocusedElement))
+            {
+                OnFocusChanged(KeyboardDevice.Instance!.FocusedElement);
+            }
+        }
+    }
+}
+
+
diff --git a/src/Avalonia.Controls/Automation/Provider/IExpandCollapseProvider.cs b/src/Avalonia.Controls/Automation/Provider/IExpandCollapseProvider.cs
new file mode 100644
index 0000000000..a4691180a3
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IExpandCollapseProvider.cs
@@ -0,0 +1,33 @@
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposes methods and properties to support UI Automation client access to controls that
+    /// visually expand to display content and collapse to hide content.
+    /// </summary>
+    public interface IExpandCollapseProvider
+    {
+        /// <summary>
+        /// Gets the state, expanded or collapsed, of the control.
+        /// </summary>
+        ExpandCollapseState ExpandCollapseState { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether expanding the element shows a menu of items to the user,
+        /// such as drop-down list.
+        /// </summary>
+        /// <remarks>
+        /// Used in OSX to enable the "Show Menu" action on the element.
+        /// </remarks>
+        bool ShowsMenu { get; }
+        
+        /// <summary>
+        /// Displays all child nodes, controls, or content of the control.
+        /// </summary>
+        void Expand();
+
+        /// <summary>
+        /// Hides all nodes, controls, or content that are descendants of the control.
+        /// </summary>
+        void Collapse();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IInvokeProvider.cs b/src/Avalonia.Controls/Automation/Provider/IInvokeProvider.cs
new file mode 100644
index 0000000000..47d7211c92
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IInvokeProvider.cs
@@ -0,0 +1,15 @@
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposes methods and properties to support UI Automation client access to controls that
+    /// initiate or perform a single, unambiguous action and do not maintain state when
+    /// activated.
+    /// </summary>
+    public interface IInvokeProvider
+    {
+        /// <summary>
+        /// Sends a request to activate a control and initiate its single, unambiguous action.
+        /// </summary>
+        void Invoke();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IRangeValueProvider.cs b/src/Avalonia.Controls/Automation/Provider/IRangeValueProvider.cs
new file mode 100644
index 0000000000..43a877a21a
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IRangeValueProvider.cs
@@ -0,0 +1,47 @@
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposes methods and properties to support access by a UI Automation client to controls
+    /// that can be set to a value within a range.
+    /// </summary>
+    public interface IRangeValueProvider
+    {
+        /// <summary>
+        /// Gets a value that indicates whether the value of a control is read-only.
+        /// </summary>
+        bool IsReadOnly { get; }
+
+        /// <summary>
+        /// Gets the minimum range value that is supported by the control.
+        /// </summary>
+        double Minimum { get; }
+
+        /// <summary>
+        /// Gets the maximum range value that is supported by the control.
+        /// </summary>
+        double Maximum { get; }
+
+        /// <summary>
+        /// Gets the value of the control.
+        /// </summary>
+        double Value { get; }
+
+        /// <summary>
+        /// Gets the value that is added to or subtracted from the Value property when a large
+        /// change is made, such as with the PAGE DOWN key.
+        /// </summary>
+        double LargeChange { get; }
+
+        /// <summary>
+        /// Gets the value that is added to or subtracted from the Value property when a small
+        /// change is made, such as with an arrow key.
+        /// </summary>
+        double SmallChange { get; }
+        
+        /// <summary>
+        /// Sets the value of the control.
+        /// </summary>
+        /// <param name="value">The value to set.</param>
+        public void SetValue(double value);
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs b/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs
new file mode 100644
index 0000000000..ce38059559
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs
@@ -0,0 +1,14 @@
+using System;
+using Avalonia.Automation.Peers;
+using Avalonia.Platform;
+
+namespace Avalonia.Automation.Provider
+{
+    public interface IRootProvider
+    {
+        ITopLevelImpl? PlatformImpl { get; }
+        AutomationPeer? GetFocus();
+        AutomationPeer? GetPeerFromPoint(Point p);
+        event EventHandler? FocusChanged;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IScrollProvider.cs b/src/Avalonia.Controls/Automation/Provider/IScrollProvider.cs
new file mode 100644
index 0000000000..1055a2f1e1
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IScrollProvider.cs
@@ -0,0 +1,71 @@
+namespace Avalonia.Automation.Provider
+{
+    public enum ScrollAmount
+    {
+        LargeDecrement,
+        SmallDecrement,
+        NoAmount,
+        LargeIncrement,
+        SmallIncrement,
+    }
+
+    /// <summary>
+    /// Exposes methods and properties to support access by a UI Automation client to a control
+    /// that acts as a scrollable container for a collection of child objects. 
+    /// </summary>
+    public interface IScrollProvider
+    {
+        /// <summary>
+        /// Gets a value that indicates whether the control can scroll horizontally.
+        /// </summary>
+        bool HorizontallyScrollable { get; }
+
+        /// <summary>
+        /// Gets the current horizontal scroll position.
+        /// </summary>
+        double HorizontalScrollPercent { get; }
+
+        /// <summary>
+        /// Gets the current horizontal view size.
+        /// </summary>
+        double HorizontalViewSize { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the control can scroll vertically.
+        /// </summary>
+        bool VerticallyScrollable { get; }
+
+        /// <summary>
+        /// Gets the current vertical scroll position.
+        /// </summary>
+        double VerticalScrollPercent { get; }
+
+        /// <summary>
+        /// Gets the vertical view size.
+        /// </summary>
+        double VerticalViewSize { get; }
+
+        /// <summary>
+        /// Scrolls the visible region of the content area horizontally and vertically.
+        /// </summary>
+        /// <param name="horizontalAmount">The horizontal increment specific to the control.</param>
+        /// <param name="verticalAmount">The vertical increment specific to the control.</param>
+        void Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount);
+
+        /// <summary>
+        /// Sets the horizontal and vertical scroll position as a percentage of the total content
+        /// area within the control.
+        /// </summary>
+        /// <param name="horizontalPercent">
+        /// The horizontal position as a percentage of the content area's total range.
+        /// <see cref="ScrollPatternIdentifiers.NoScroll"/> should be passed in if the control
+        /// cannot be scrolled in this direction.
+        /// </param>
+        /// <param name="verticalPercent">
+        /// The vertical position as a percentage of the content area's total range.
+        /// <see cref="ScrollPatternIdentifiers.NoScroll"/> should be passed in if the control
+        /// cannot be scrolled in this direction.
+        /// </param>
+        void SetScrollPercent(double horizontalPercent, double verticalPercent);
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/ISelectionItemProvider .cs b/src/Avalonia.Controls/Automation/Provider/ISelectionItemProvider .cs
new file mode 100644
index 0000000000..6cea1d1350
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/ISelectionItemProvider .cs	
@@ -0,0 +1,35 @@
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposes methods and properties to support access by a UI Automation client to individual,
+    /// selectable child controls of containers that implement <see cref="ISelectionProvider"/>.
+    /// </summary>
+    public interface ISelectionItemProvider
+    {
+        /// <summary>
+        /// Gets a value that indicates whether an item is selected.
+        /// </summary>
+        bool IsSelected { get; }
+
+        /// <summary>
+        /// Gets the UI Automation provider that implements <see cref="ISelectionProvider"/> and
+        /// acts as the container for the calling object.
+        /// </summary>
+        ISelectionProvider? SelectionContainer { get; }
+
+        /// <summary>
+        /// Adds the current element to the collection of selected items.
+        /// </summary>
+        void AddToSelection();
+
+        /// <summary>
+        /// Removes the current element from the collection of selected items.
+        /// </summary>
+        void RemoveFromSelection();
+
+        /// <summary>
+        /// Clears any existing selection and then selects the current element.
+        /// </summary>
+        void Select();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/ISelectionProvider.cs b/src/Avalonia.Controls/Automation/Provider/ISelectionProvider.cs
new file mode 100644
index 0000000000..bf21c0151f
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/ISelectionProvider.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using Avalonia.Automation.Peers;
+
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposes methods and properties to support access by a UI Automation client to controls
+    /// that act as containers for a collection of individual, selectable child items.
+    /// </summary>
+    public interface ISelectionProvider
+    {
+        /// <summary>
+        /// Gets a value that indicates whether the provider allows more than one child element
+        /// to be selected concurrently.
+        /// </summary>
+        bool CanSelectMultiple { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the provider requires at least one child element
+        /// to be selected.
+        /// </summary>
+        bool IsSelectionRequired { get; }
+
+        /// <summary>
+        /// Retrieves a provider for each child element that is selected.
+        /// </summary>
+        IReadOnlyList<AutomationPeer> GetSelection();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IToggleProvider.cs b/src/Avalonia.Controls/Automation/Provider/IToggleProvider.cs
new file mode 100644
index 0000000000..67913e3204
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IToggleProvider.cs
@@ -0,0 +1,40 @@
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Contains values that specify the toggle state of a UI Automation element.
+    /// </summary>
+    public enum ToggleState
+    {
+        /// <summary>
+        /// The UI Automation element isn't selected, checked, marked, or otherwise activated.
+        /// </summary>
+        Off,
+
+        /// <summary>
+        /// The UI Automation element is selected, checked, marked, or otherwise activated.
+        /// </summary>
+        On,
+
+        /// <summary>
+        /// The UI Automation element is in an indeterminate state.
+        /// </summary>
+        Indeterminate,
+    }
+
+    /// <summary>
+    /// Exposes methods and properties to support UI Automation client access to controls that can
+    /// cycle through a set of states and maintain a particular state. 
+    /// </summary>
+    public interface IToggleProvider
+    {
+        /// <summary>
+        /// Gets the toggle state of the control.
+        /// </summary>
+        ToggleState ToggleState { get; }
+
+        /// <summary>
+        /// Cycles through the toggle states of a control.
+        /// </summary>
+        void Toggle();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IValueProvider.cs b/src/Avalonia.Controls/Automation/Provider/IValueProvider.cs
new file mode 100644
index 0000000000..e025e28782
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IValueProvider.cs
@@ -0,0 +1,29 @@
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposes methods and properties to support access by a UI Automation client to controls
+    /// that have an intrinsic value that does not span a range and that can be represented as
+    /// a string.
+    /// </summary>
+    public interface IValueProvider
+    {
+        /// <summary>
+        /// Gets a value that indicates whether the value of a control is read-only.
+        /// </summary>
+        bool IsReadOnly { get; }
+
+        /// <summary>
+        /// Gets the value of the control.
+        /// </summary>
+        public string? Value { get; }
+
+        /// <summary>
+        /// Sets the value of a control.
+        /// </summary>
+        /// <param name="value">
+        /// The value to set. The provider is responsible for converting the value to the
+        /// appropriate data type.
+        /// </param>
+        public void SetValue(string? value);
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/RangeValuePatternIdentifiers.cs b/src/Avalonia.Controls/Automation/RangeValuePatternIdentifiers.cs
new file mode 100644
index 0000000000..625b37d001
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/RangeValuePatternIdentifiers.cs
@@ -0,0 +1,30 @@
+using Avalonia.Automation.Provider;
+
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Contains values used as identifiers by <see cref="IRangeValueProvider"/>.
+    /// </summary>
+    public static class RangeValuePatternIdentifiers
+    {
+        /// <summary>
+        /// Identifies <see cref="IRangeValueProvider.IsReadOnly"/> automation property.
+        /// </summary>
+        public static AutomationProperty IsReadOnlyProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IRangeValueProvider.Minimum"/> automation property.
+        /// </summary>
+        public static AutomationProperty MinimumProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IRangeValueProvider.Maximum"/> automation property.
+        /// </summary>
+        public static AutomationProperty MaximumProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IRangeValueProvider.Value"/> automation property.
+        /// </summary>
+        public static AutomationProperty ValueProperty { get; } = new AutomationProperty();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/ScrollPatternIdentifiers.cs b/src/Avalonia.Controls/Automation/ScrollPatternIdentifiers.cs
new file mode 100644
index 0000000000..d9e843e75a
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/ScrollPatternIdentifiers.cs
@@ -0,0 +1,45 @@
+using Avalonia.Automation.Provider;
+
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Contains values used as identifiers by <see cref="IScrollProvider"/>.
+    /// </summary>
+    public static class ScrollPatternIdentifiers
+    {
+        /// <summary>
+        /// Specifies that scrolling should not be performed.
+        /// </summary>
+        public const double NoScroll = -1;
+
+        /// <summary>
+        /// Identifies <see cref="IScrollProvider.HorizontallyScrollable"/> automation property.
+        /// </summary>
+        public static AutomationProperty HorizontallyScrollableProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IScrollProvider.HorizontalScrollPercent"/> automation property.
+        /// </summary>
+        public static AutomationProperty HorizontalScrollPercentProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IScrollProvider.HorizontalViewSize"/> automation property.
+        /// </summary>
+        public static AutomationProperty HorizontalViewSizeProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IScrollProvider.VerticallyScrollable"/> automation property.
+        /// </summary>
+        public static AutomationProperty VerticallyScrollableProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IScrollProvider.VerticalScrollPercent"/> automation property.
+        /// </summary>
+        public static AutomationProperty VerticalScrollPercentProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="IScrollProvider.VerticalViewSize"/> automation property.
+        /// </summary>
+        public static AutomationProperty VerticalViewSizeProperty { get; } = new AutomationProperty();
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/SelectionPatternIdentifiers.cs b/src/Avalonia.Controls/Automation/SelectionPatternIdentifiers.cs
new file mode 100644
index 0000000000..c3669528cd
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/SelectionPatternIdentifiers.cs
@@ -0,0 +1,25 @@
+using Avalonia.Automation.Provider;
+
+namespace Avalonia.Automation
+{
+    /// <summary>
+    /// Contains values used as identifiers by <see cref="ISelectionProvider"/>.
+    /// </summary>
+    public static class SelectionPatternIdentifiers
+    {
+        /// <summary>
+        /// Identifies <see cref="ISelectionProvider.CanSelectMultiple"/> automation property.
+        /// </summary>
+        public static AutomationProperty CanSelectMultipleProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies <see cref="ISelectionProvider.IsSelectionRequired"/> automation property.
+        /// </summary>
+        public static AutomationProperty IsSelectionRequiredProperty { get; } = new AutomationProperty();
+
+        /// <summary>
+        /// Identifies the property that gets the selected items in a container.
+        /// </summary>
+        public static AutomationProperty SelectionProperty { get; } = new AutomationProperty();
+    }
+}
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 543a513d57..c4587a2d9c 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -3,20 +3,18 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Controls.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.LeakTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index ee3be1d5b3..bc740c133a 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,8 +1,10 @@
+using System;
 using Avalonia.Collections;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -69,6 +71,8 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Border, PenLineJoin>(nameof(BorderLineJoin), PenLineJoin.Miter);
 
         private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
+        private Thickness? _layoutThickness;
+        private double _scale;
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -88,6 +92,18 @@ namespace Avalonia.Controls
             AffectsMeasure<Border>(BorderThicknessProperty);
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            switch (change.Property.Name)
+            {
+                case nameof(UseLayoutRounding):
+                case nameof(BorderThickness):
+                    _layoutThickness = null;
+                    break;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a brush with which to paint the background.
         /// </summary>
@@ -169,13 +185,43 @@ namespace Avalonia.Controls
             set => SetValue(BoxShadowProperty, value);
         }
 
+        private Thickness LayoutThickness
+        {
+            get
+            {
+                VerifyScale();
+
+                if (_layoutThickness == null)
+                {
+                    var borderThickness = BorderThickness;
+
+                    if (UseLayoutRounding)
+                        borderThickness = LayoutHelper.RoundLayoutThickness(borderThickness, _scale, _scale);
+
+                    _layoutThickness = borderThickness;
+                }
+
+                return _layoutThickness.Value;
+            }
+        }
+
+        private void VerifyScale()
+        {
+            var currentScale = LayoutHelper.GetLayoutScale(this);
+            if (MathUtilities.AreClose(currentScale, _scale))
+                return;
+
+            _scale = currentScale;
+            _layoutThickness = null;
+        }
+
         /// <summary>
         /// Renders the control.
         /// </summary>
         /// <param name="context">The drawing context.</param>
         public override void Render(DrawingContext context)
         {
-            _borderRenderHelper.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush,
+            _borderRenderHelper.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush,
                 BoxShadow, BorderDashOffset, BorderLineCap, BorderLineJoin, BorderDashArray);
         }
 
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index a7a4759182..8e5d4e1e06 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows.Input;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
@@ -28,11 +30,14 @@ namespace Avalonia.Controls
     }
 
     /// <summary>
-    /// A button control.
+    /// A standard button control.
     /// </summary>
-    [PseudoClasses(":pressed")]
-    public class Button : ContentControl, ICommandSource
+    [PseudoClasses(pcFlyoutOpen, pcPressed)]
+    public class Button : ContentControl, ICommandSource, IClickableControl
     {
+        protected const string pcPressed    = ":pressed";
+        protected const string pcFlyoutOpen = ":flyout-open";
+
         /// <summary>
         /// Defines the <see cref="ClickMode"/> property.
         /// </summary>
@@ -91,6 +96,7 @@ namespace Avalonia.Controls
         private ICommand? _command;
         private bool _commandCanExecute = true;
         private KeyGesture? _hotkey;
+        private bool _isFlyoutOpen = false;
 
         /// <summary>
         /// Initializes static members of the <see cref="Button"/> class.
@@ -106,7 +112,6 @@ namespace Avalonia.Controls
         /// </summary>
         public Button()
         {
-            UpdatePseudoClasses(IsPressed);
         }
 
         /// <summary>
@@ -228,6 +233,13 @@ namespace Avalonia.Controls
                     StopListeningForDefault(inputElement);
                 }
             }
+            if (IsCancel)
+            {
+                if (e.Root is IInputElement inputElement)
+                {
+                    StopListeningForCancel(inputElement);
+                }
+            }
         }
 
         /// <inheritdoc/>
@@ -237,7 +249,7 @@ namespace Avalonia.Controls
             {
                 HotKey = _hotkey;
             }
-            
+
             base.OnAttachedToLogicalTree(e);
 
             if (Command != null)
@@ -270,24 +282,29 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnKeyDown(KeyEventArgs e)
         {
-            if (e.Key == Key.Enter)
-            {
-                OnClick();
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Space)
+            switch (e.Key)
             {
-                if (ClickMode == ClickMode.Press)
-                {
+                case Key.Enter:
                     OnClick();
+                    e.Handled = true;
+                    break;
+
+                case Key.Space:
+                {
+                    if (ClickMode == ClickMode.Press)
+                    {
+                        OnClick();
+                    }
+
+                    IsPressed = true;
+                    e.Handled = true;
+                    break;
                 }
-                IsPressed = true;
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Escape && Flyout != null)
-            {
-                // If Flyout doesn't have focusable content, close the flyout here
-                Flyout.Hide();
+
+                case Key.Escape when Flyout != null:
+                    // If Flyout doesn't have focusable content, close the flyout here
+                    CloseFlyout();
+                    break;
             }
 
             base.OnKeyDown(e);
@@ -305,6 +322,8 @@ namespace Avalonia.Controls
                 IsPressed = false;
                 e.Handled = true;
             }
+
+            base.OnKeyUp(e);
         }
 
         /// <summary>
@@ -314,7 +333,14 @@ namespace Avalonia.Controls
         {
             if (IsEffectivelyEnabled)
             {
-                OpenFlyout();
+                if (_isFlyoutOpen)
+                {
+                    CloseFlyout();
+                }
+                else
+                {
+                    OpenFlyout();
+                }
 
                 var e = new RoutedEventArgs(ClickEvent);
                 RaiseEvent(e);
@@ -327,11 +353,38 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Opens the button's flyout.
+        /// </summary>
         protected virtual void OpenFlyout()
         {
             Flyout?.ShowAt(this);
         }
 
+        /// <summary>
+        /// Closes the button's flyout.
+        /// </summary>
+        protected virtual void CloseFlyout()
+        {
+            Flyout?.Hide();
+        }
+
+        /// <summary>
+        /// Invoked when the button's flyout is opened.
+        /// </summary>
+        protected virtual void OnFlyoutOpened()
+        {
+            // Available for derived types
+        }
+
+        /// <summary>
+        /// Invoked when the button's flyout is closed.
+        /// </summary>
+        protected virtual void OnFlyoutClosed()
+        {
+            // Available for derived types
+        }
+
         /// <inheritdoc/>
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
@@ -370,6 +423,8 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
         {
+            base.OnPointerCaptureLost(e);
+
             IsPressed = false;
         }
 
@@ -382,7 +437,17 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            UnregisterFlyoutEvents(Flyout);
+            RegisterFlyoutEvents(Flyout);
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -390,12 +455,13 @@ namespace Avalonia.Controls
             {
                 if (((ILogical)this).IsAttachedToLogicalTree)
                 {
-                    if (change.OldValue.GetValueOrDefault() is ICommand oldCommand)
+                    var (oldValue, newValue) = change.GetOldAndNewValue<ICommand?>();
+                    if (oldValue is ICommand oldCommand)
                     {
                         oldCommand.CanExecuteChanged -= CanExecuteChanged;
                     }
 
-                    if (change.NewValue.GetValueOrDefault() is ICommand newCommand)
+                    if (newValue is ICommand newCommand)
                     {
                         newCommand.CanExecuteChanged += CanExecuteChanged;
                     }
@@ -409,7 +475,7 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsCancelProperty)
             {
-                var isCancel = change.NewValue.GetValueOrDefault<bool>();
+                var isCancel = change.GetNewValue<bool>();
 
                 if (VisualRoot is IInputElement inputRoot)
                 {
@@ -425,7 +491,7 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsDefaultProperty)
             {
-                var isDefault = change.NewValue.GetValueOrDefault<bool>();
+                var isDefault = change.GetNewValue<bool>();
 
                 if (VisualRoot is IInputElement inputRoot)
                 {
@@ -441,27 +507,39 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsPressedProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>());
+                UpdatePseudoClasses();
             }
             else if (change.Property == FlyoutProperty)
             {
+                var (oldFlyout, newFlyout) = change.GetOldAndNewValue<FlyoutBase?>();
+
                 // If flyout is changed while one is already open, make sure we 
                 // close the old one first
-                if (change.OldValue.GetValueOrDefault() is FlyoutBase oldFlyout &&
-                    oldFlyout.IsOpen)
+                if (oldFlyout != null && oldFlyout.IsOpen)
                 {
                     oldFlyout.Hide();
                 }
+
+                // Must unregister events here while a reference to the old flyout still exists
+                UnregisterFlyoutEvents(oldFlyout);
+
+                RegisterFlyoutEvents(newFlyout);
+                UpdatePseudoClasses();
             }
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer() => new ButtonAutomationPeer(this);
+
         /// <inheritdoc/>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
-            base.UpdateDataValidation(property, value);
+            base.UpdateDataValidation(property, state, error);
             if (property == CommandProperty)
             {
-                if (value.Type == BindingValueType.BindingError)
+                if (state == BindingValueType.BindingError)
                 {
                     if (_commandCanExecute)
                     {
@@ -472,6 +550,8 @@ namespace Avalonia.Controls
             }
         }
 
+        internal void PerformClick() => OnClick();
+
         /// <summary>
         /// Called when the <see cref="ICommand.CanExecuteChanged"/> event fires.
         /// </summary>
@@ -488,6 +568,32 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Registers all flyout events.
+        /// </summary>
+        /// <param name="flyout">The flyout to connect events to.</param>
+        private void RegisterFlyoutEvents(FlyoutBase? flyout)
+        {
+            if (flyout != null)
+            {
+                flyout.Opened += Flyout_Opened;
+                flyout.Closed += Flyout_Closed;
+            }
+        }
+
+        /// <summary>
+        /// Explicitly unregisters all flyout events.
+        /// </summary>
+        /// <param name="flyout">The flyout to disconnect events from.</param>
+        private void UnregisterFlyoutEvents(FlyoutBase? flyout)
+        {
+            if (flyout != null)
+            {
+                flyout.Opened -= Flyout_Opened;
+                flyout.Closed -= Flyout_Closed;
+             }
+        }
+
         /// <summary>
         /// Starts listening for the Enter key when the button <see cref="IsDefault"/>.
         /// </summary>
@@ -534,6 +640,7 @@ namespace Avalonia.Controls
             if (e.Key == Key.Enter && IsVisible && IsEnabled)
             {
                 OnClick();
+                e.Handled = true;
             }
         }
 
@@ -547,17 +654,60 @@ namespace Avalonia.Controls
             if (e.Key == Key.Escape && IsVisible && IsEnabled)
             {
                 OnClick();
+                e.Handled = true;
             }
         }
 
         /// <summary>
         /// Updates the visual state of the control by applying latest PseudoClasses.
         /// </summary>
-        private void UpdatePseudoClasses(bool isPressed)
+        private void UpdatePseudoClasses()
         {
-            PseudoClasses.Set(":pressed", isPressed);
+            PseudoClasses.Set(pcFlyoutOpen, _isFlyoutOpen);
+            PseudoClasses.Set(pcPressed, IsPressed);
         }
 
         void ICommandSource.CanExecuteChanged(object sender, EventArgs e) => this.CanExecuteChanged(sender, e);
+
+        void IClickableControl.RaiseClick() => OnClick();
+        
+        /// <summary>
+        /// Event handler for when the button's flyout is opened.
+        /// </summary>
+        private void Flyout_Opened(object? sender, EventArgs e)
+        {
+            var flyout = sender as FlyoutBase;
+
+            // It is possible to share flyouts among multiple controls including Button.
+            // This can cause a problem here since all controls that share a flyout receive
+            // the same Opened/Closed events at the same time.
+            // For Button that means they all would be updating their pseudoclasses accordingly.
+            // In other words, all Buttons with a shared Flyout would have the backgrounds changed together.
+            // To fix this, only continue here if the Flyout target matches this Button instance.
+            if (object.ReferenceEquals(flyout?.Target, this))
+            {
+                _isFlyoutOpen = true;
+                UpdatePseudoClasses();
+
+                OnFlyoutOpened();
+            }
+        }
+
+        /// <summary>
+        /// Event handler for when the button's flyout is closed.
+        /// </summary>
+        private void Flyout_Closed(object? sender, EventArgs e)
+        {
+            var flyout = sender as FlyoutBase;
+
+            // See comments in Flyout_Opened
+            if (object.ReferenceEquals(flyout?.Target, this))
+            {
+                _isFlyoutOpen = false;
+                UpdatePseudoClasses();
+
+                OnFlyoutClosed();
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index 31aba024ae..e455c6c6f3 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -16,6 +16,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a spinner control that includes two Buttons.
     /// </summary>
+    [TemplatePart("PART_DecreaseButton", typeof(Button))]
+    [TemplatePart("PART_IncreaseButton", typeof(Button))]
     [PseudoClasses(":left", ":right")]
     public class ButtonSpinner : Spinner
     {
@@ -208,13 +210,13 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == ButtonSpinnerLocationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Location>());
+                UpdatePseudoClasses(change.GetNewValue<Location>());
             }
         }
 
diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
index 6c83308b39..9c88bae5f6 100644
--- a/src/Avalonia.Controls/Calendar/Calendar.cs
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -1,11 +1,12 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -222,6 +223,8 @@ namespace Avalonia.Controls
     /// element in XAML.
     /// </para>
     /// </remarks>
+    [TemplatePart(PART_ElementMonth, typeof(CalendarItem))]
+    [TemplatePart(PART_ElementRoot, typeof(Panel))]
     public class Calendar : TemplatedControl
     {
         internal const int RowsPerMonth = 7;
@@ -261,6 +264,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Calendar, DayOfWeek>(
                     nameof(FirstDayOfWeek),
                     defaultValue: DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek);
+
         /// <summary>
         /// Gets or sets the day that is considered the beginning of the week.
         /// </summary>
@@ -273,6 +277,7 @@ namespace Avalonia.Controls
             get { return GetValue(FirstDayOfWeekProperty); }
             set { SetValue(FirstDayOfWeekProperty, value); }
         }
+
         /// <summary>
         /// FirstDayOfWeekProperty property changed handler.
         /// </summary>
@@ -289,6 +294,7 @@ namespace Avalonia.Controls
                 throw new ArgumentOutOfRangeException("d", "Invalid DayOfWeek");
             }
         }
+
         /// <summary>
         /// Inherited code: Requires comment.
         /// </summary>
@@ -311,6 +317,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Calendar, bool>(
                 nameof(IsTodayHighlighted),
                 defaultValue: true);
+
         /// <summary>
         /// Gets or sets a value indicating whether the current date is
         /// highlighted.
@@ -324,25 +331,24 @@ namespace Avalonia.Controls
             get { return GetValue(IsTodayHighlightedProperty); }
             set { SetValue(IsTodayHighlightedProperty, value); }
         }
+
         /// <summary>
         /// IsTodayHighlightedProperty property changed handler.
         /// </summary>
         /// <param name="e">The DependencyPropertyChangedEventArgs.</param>
         private void OnIsTodayHighlightedChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (DisplayDate != null)
-            {
-                int i = DateTimeHelper.CompareYearMonth(DisplayDateInternal, DateTime.Today);
+            int i = DateTimeHelper.CompareYearMonth(DisplayDateInternal, DateTime.Today);
 
-                if (i > -2 && i < 2)
-                {
-                    UpdateMonths();
-                }
+            if (i > -2 && i < 2)
+            {
+                UpdateMonths();
             }
         }
 
         public static readonly StyledProperty<IBrush> HeaderBackgroundProperty =
             AvaloniaProperty.Register<Calendar, IBrush>(nameof(HeaderBackground));
+
         public IBrush HeaderBackground
         {
             get { return GetValue(HeaderBackgroundProperty); }
@@ -367,6 +373,7 @@ namespace Avalonia.Controls
             get { return GetValue(DisplayModeProperty); }
             set { SetValue(DisplayModeProperty, value); }
         }
+
         /// <summary>
         /// DisplayModeProperty property changed handler.
         /// </summary>
@@ -424,6 +431,7 @@ namespace Avalonia.Controls
                 || mode == CalendarMode.Year
                 || mode == CalendarMode.Decade;
         }
+
         private void OnDisplayModeChanged(CalendarModeChangedEventArgs args)
         {
             DisplayModeChanged?.Invoke(this, args);
@@ -433,6 +441,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Calendar, CalendarSelectionMode>(
                 nameof(SelectionMode),
                 defaultValue: CalendarSelectionMode.SingleDate);
+
         /// <summary>
         /// Gets or sets a value that indicates what kind of selections are
         /// allowed.
@@ -457,6 +466,7 @@ namespace Avalonia.Controls
             get { return GetValue(SelectionModeProperty); }
             set { SetValue(SelectionModeProperty, value); }
         }
+
         private void OnSelectionModeChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (IsValidSelectionMode(e.NewValue!))
@@ -471,6 +481,7 @@ namespace Avalonia.Controls
                 throw new ArgumentOutOfRangeException("d", "Invalid SelectionMode");
             }
         }
+
         /// <summary>
         /// Inherited code: Requires comment.
         /// </summary>
@@ -492,6 +503,7 @@ namespace Avalonia.Controls
                 o => o.SelectedDate,
                 (o, v) => o.SelectedDate = v,
                 defaultBindingMode: BindingMode.TwoWay);
+
         /// <summary>
         /// Gets or sets the currently selected date.
         /// </summary>
@@ -640,7 +652,7 @@ namespace Avalonia.Controls
                 SelectedDatesChanged?.Invoke(this, e);
             }
         }
-        
+
         internal Collection<DateTime> RemovedItems { get; set; }
         internal DateTime? LastSelectedDateInternal { get; set; }
         internal DateTime? LastSelectedDate
@@ -720,6 +732,7 @@ namespace Avalonia.Controls
                 o => o.DisplayDate,
                 (o, v) => o.DisplayDate = v,
                 defaultBindingMode: BindingMode.TwoWay);
+
         /// <summary>
         /// Gets or sets the date to display.
         /// </summary>
@@ -898,7 +911,7 @@ namespace Avalonia.Controls
                 o => o.DisplayDateEnd,
                 (o, v) => o.DisplayDateEnd = v,
                 defaultBindingMode: BindingMode.TwoWay);
-        
+
         /// <summary>
         /// Gets or sets the last date to be displayed.
         /// </summary>
@@ -1226,7 +1239,7 @@ namespace Avalonia.Controls
                                     {
                                         b.IsSelected = false;
                                     }
-                                } 
+                                }
                             }
                         }
                     }
@@ -1262,7 +1275,7 @@ namespace Avalonia.Controls
 
         internal void OnPreviousClick()
         {
-            if (DisplayMode == CalendarMode.Month && DisplayDate != null)
+            if (DisplayMode == CalendarMode.Month)
             {
                 DateTime? d = DateTimeHelper.AddMonths(DateTimeHelper.DiscardDayTime(DisplayDate), -1);
                 if (d.HasValue)
@@ -1310,7 +1323,7 @@ namespace Avalonia.Controls
         }
         internal void OnNextClick()
         {
-            if (DisplayMode == CalendarMode.Month && DisplayDate != null)
+            if (DisplayMode == CalendarMode.Month)
             {
                 DateTime? d = DateTimeHelper.AddMonths(DateTimeHelper.DiscardDayTime(DisplayDate), 1);
                 if (d.HasValue)
@@ -1629,7 +1642,7 @@ namespace Avalonia.Controls
         {
             if (DisplayMode == CalendarMode.Month)
             {
-                if (LastSelectedDate.HasValue && DisplayDateInternal != null)
+                if (LastSelectedDate.HasValue)
                 {
                     // If a blackout day is inactive, when clicked on it, the
                     // previous inactive day which is not a blackout day can get
@@ -1881,24 +1894,21 @@ namespace Avalonia.Controls
             {
                 case CalendarMode.Month:
                     {
-                        if (DisplayDate != null)
-                        {
-                            DateTime? selectedDate = new DateTime(DisplayDateInternal.Year, DisplayDateInternal.Month, 1);
+                        DateTime? selectedDate = new DateTime(DisplayDateInternal.Year, DisplayDateInternal.Month, 1);
 
-                            if (DateTimeHelper.CompareYearMonth(DateTime.MaxValue, selectedDate.Value) > 0)
-                            {
-                                // since DisplayDate is not equal to
-                                // DateTime.MaxValue we are sure selectedDate is\
-                                // not null
-                                selectedDate = DateTimeHelper.AddMonths(selectedDate.Value, 1)!.Value;
-                                selectedDate = DateTimeHelper.AddDays(selectedDate.Value, -1)!.Value;
-                            }
-                            else
-                            {
-                                selectedDate = DateTime.MaxValue;
-                            }
-                            ProcessSelection(shift, selectedDate, null);
+                        if (DateTimeHelper.CompareYearMonth(DateTime.MaxValue, selectedDate.Value) > 0)
+                        {
+                            // since DisplayDate is not equal to
+                            // DateTime.MaxValue we are sure selectedDate is\
+                            // not null
+                            selectedDate = DateTimeHelper.AddMonths(selectedDate.Value, 1)!.Value;
+                            selectedDate = DateTimeHelper.AddDays(selectedDate.Value, -1)!.Value;
                         }
+                        else
+                        {
+                            selectedDate = DateTime.MaxValue;
+                        }
+                        ProcessSelection(shift, selectedDate, null);
                         break;
                     }
                 case CalendarMode.Year:
@@ -1973,6 +1983,7 @@ namespace Avalonia.Controls
                     }
             }
         }
+
         private void Calendar_KeyUp(KeyEventArgs e)
         {
             if (!e.Handled && (e.Key == Key.LeftShift || e.Key == Key.RightShift))
@@ -1980,6 +1991,7 @@ namespace Avalonia.Controls
                 ProcessShiftKeyUp();
             }
         }
+
         internal void ProcessShiftKeyUp()
         {
             if (_isShiftPressed && (SelectionMode == CalendarSelectionMode.SingleRange || SelectionMode == CalendarSelectionMode.MultipleRange))
@@ -2008,7 +2020,6 @@ namespace Avalonia.Controls
                             focusDate = DisplayDate;
                             LastSelectedDate = DisplayDate;
                         }
-                        Debug.Assert(focusDate != null, "focusDate should not be null!");
                         FocusButton = FindDayButtonFromDay(focusDate);
 
                         if (FocusButton != null)
@@ -2028,6 +2039,7 @@ namespace Avalonia.Controls
                     }
             }
         }
+
         protected override void OnLostFocus(RoutedEventArgs e)
         {
             base.OnLostFocus(e);
@@ -2054,6 +2066,7 @@ namespace Avalonia.Controls
                     }
             }
         }
+
         /// <summary>
         ///  Called when the IsEnabled property changes.
         /// </summary>
@@ -2071,17 +2084,17 @@ namespace Avalonia.Controls
 
         static Calendar()
         {
-            IsEnabledProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnIsEnabledChanged(e));
-            FirstDayOfWeekProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnFirstDayOfWeekChanged(e));
-            IsTodayHighlightedProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnIsTodayHighlightedChanged(e));
-            DisplayModeProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnDisplayModePropertyChanged(e));
-            SelectionModeProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnSelectionModeChanged(e));
-            SelectedDateProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnSelectedDateChanged(e));
-            DisplayDateProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnDisplayDateChanged(e));
-            DisplayDateStartProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnDisplayDateStartChanged(e));
-            DisplayDateEndProperty.Changed.AddClassHandler<Calendar>((x,e) => x.OnDisplayDateEndChanged(e));
-            KeyDownEvent.AddClassHandler<Calendar>((x,e) => x.Calendar_KeyDown(e));
-            KeyUpEvent.AddClassHandler<Calendar>((x,e) => x.Calendar_KeyUp(e));
+            IsEnabledProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnIsEnabledChanged(e));
+            FirstDayOfWeekProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnFirstDayOfWeekChanged(e));
+            IsTodayHighlightedProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnIsTodayHighlightedChanged(e));
+            DisplayModeProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnDisplayModePropertyChanged(e));
+            SelectionModeProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnSelectionModeChanged(e));
+            SelectedDateProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnSelectedDateChanged(e));
+            DisplayDateProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnDisplayDateChanged(e));
+            DisplayDateStartProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnDisplayDateStartChanged(e));
+            DisplayDateEndProperty.Changed.AddClassHandler<Calendar>((x, e) => x.OnDisplayDateEndChanged(e));
+            KeyDownEvent.AddClassHandler<Calendar>((x, e) => x.Calendar_KeyDown(e));
+            KeyUpEvent.AddClassHandler<Calendar>((x, e) => x.Calendar_KeyUp(e));
         }
 
         /// <summary>
@@ -2096,8 +2109,9 @@ namespace Avalonia.Controls
             RemovedItems = new Collection<DateTime>();
         }
 
-        private const string PART_ElementRoot = "Root";
-        private const string PART_ElementMonth = "CalendarItem";
+        private const string PART_ElementRoot = "PART_Root";
+        private const string PART_ElementMonth = "PART_CalendarItem";
+
         /// <summary>
         /// Builds the visual tree for the
         /// <see cref="T:System.Windows.Controls.Calendar" /> when a new
diff --git a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
index 5d883f2d14..a92feec509 100644
--- a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
diff --git a/src/Avalonia.Controls/Calendar/CalendarButton.cs b/src/Avalonia.Controls/Calendar/CalendarButton.cs
index 0a8e4dfae8..d8672cbf18 100644
--- a/src/Avalonia.Controls/Calendar/CalendarButton.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarButton.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using Avalonia.Controls.Metadata;
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
deleted file mode 100644
index c1f487c32d..0000000000
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ /dev/null
@@ -1,1136 +0,0 @@
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
-
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Globalization;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Layout;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Provides data for the
-    /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-    /// event.
-    /// </summary>
-    public class CalendarDatePickerDateValidationErrorEventArgs : EventArgs
-    {
-        private bool _throwException;
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
-        /// class.
-        /// </summary>
-        /// <param name="exception">
-        /// The initial exception from the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </param>
-        /// <param name="text">
-        /// The text that caused the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </param>
-        public CalendarDatePickerDateValidationErrorEventArgs(Exception exception, string text)
-        {
-            this.Text = text;
-            this.Exception = exception;
-        }
-
-        /// <summary>
-        /// Gets the initial exception associated with the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </summary>
-        /// <value>
-        /// The exception associated with the validation failure.
-        /// </value>
-        public Exception Exception { get; private set; }
-
-        /// <summary>
-        /// Gets the text that caused the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </summary>
-        /// <value>
-        /// The text that caused the validation failure.
-        /// </value>
-        public string Text { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether
-        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
-        /// should be thrown.
-        /// </summary>
-        /// <value>
-        /// True if the exception should be thrown; otherwise, false.
-        /// </value>
-        /// <exception cref="T:System.ArgumentException">
-        /// If set to true and
-        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
-        /// is null.
-        /// </exception>
-        public bool ThrowException
-        {
-            get { return this._throwException; }
-            set
-            {
-                if (value && this.Exception == null)
-                {
-                    throw new ArgumentException("Cannot Throw Null Exception");
-                }
-                this._throwException = value;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Specifies date formats for a
-    /// <see cref="T:Avalonia.Controls.CalendarDatePicker" />.
-    /// </summary>
-    public enum CalendarDatePickerFormat
-    {
-        /// <summary>
-        /// Specifies that the date should be displayed using unabbreviated days
-        /// of the week and month names.
-        /// </summary>
-        Long = 0,
-
-        /// <summary>
-        /// Specifies that the date should be displayed using abbreviated days
-        /// of the week and month names.
-        /// </summary>
-        Short = 1,
-
-        /// <summary>
-        /// Specifies that the date should be displayed using a custom format string.
-        /// </summary>
-        Custom = 2
-    }
-
-    public class CalendarDatePicker : TemplatedControl
-    {
-        private const string ElementTextBox = "PART_TextBox";
-        private const string ElementButton = "PART_Button";
-        private const string ElementPopup = "PART_Popup";
-        private const string ElementCalendar = "PART_Calendar";
-
-        private Calendar? _calendar;
-        private string _defaultText;
-        private Button? _dropDownButton;
-        //private Canvas _outsideCanvas;
-        //private Canvas _outsidePopupCanvas;
-        private Popup? _popUp;
-        private TextBox? _textBox;
-        private IDisposable? _textBoxTextChangedSubscription;
-        private IDisposable? _buttonPointerPressedSubscription;
-
-        private DateTime? _onOpenSelectedDate;
-        private bool _settingSelectedDate;
-
-        private DateTime _displayDate;
-        private DateTime? _displayDateStart;
-        private DateTime? _displayDateEnd;
-        private bool _isDropDownOpen;
-        private DateTime? _selectedDate;
-        private string? _text;
-        private bool _suspendTextChangeHandler = false;
-        private bool _isPopupClosing = false;
-        private bool _ignoreButtonClick = false;
-
-        /// <summary>
-        /// Gets a collection of dates that are marked as not selectable.
-        /// </summary>
-        /// <value>
-        /// A collection of dates that cannot be selected. The default value is
-        /// an empty collection.
-        /// </value>
-        public CalendarBlackoutDatesCollection? BlackoutDates { get; private set; }
-
-        public static readonly DirectProperty<CalendarDatePicker, DateTime> DisplayDateProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime>(
-                nameof(DisplayDate),
-                o => o.DisplayDate,
-                (o, v) => o.DisplayDate = v);
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateStartProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(DisplayDateStart),
-                o => o.DisplayDateStart,
-                (o, v) => o.DisplayDateStart = v);
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateEndProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(DisplayDateEnd),
-                o => o.DisplayDateEnd,
-                (o, v) => o.DisplayDateEnd = v);
-        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
-
-        public static readonly DirectProperty<CalendarDatePicker, bool> IsDropDownOpenProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, bool>(
-                nameof(IsDropDownOpen),
-                o => o.IsDropDownOpen,
-                (o, v) => o.IsDropDownOpen = v);
-
-        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, bool>(nameof(IsTodayHighlighted));
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> SelectedDateProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(SelectedDate),
-                o => o.SelectedDate,
-                (o, v) => o.SelectedDate = v,
-                enableDataValidation: true);
-
-        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
-                nameof(SelectedDateFormat),
-                defaultValue: CalendarDatePickerFormat.Short,
-                validate: IsValidSelectedDateFormat);
-
-        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, string>(
-                nameof(CustomDateFormatString),
-                defaultValue: "d",
-                validate: IsValidDateFormatString);
-
-        public static readonly DirectProperty<CalendarDatePicker, string?> TextProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, string?>(
-                nameof(Text),
-                o => o.Text,
-                (o, v) => o.Text = v);
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
-
-
-        /// <summary>
-        /// Defines the <see cref="HorizontalContentAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
-            ContentControl.HorizontalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Defines the <see cref="VerticalContentAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
-            ContentControl.VerticalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Gets or sets the date to display.
-        /// </summary>
-        /// <value>
-        /// The date to display. The default 
-        /// <see cref="P:System.DateTime.Today" />.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateStart" />
-        /// and
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateEnd" />.
-        /// </exception>
-        public DateTime DisplayDate
-        {
-            get { return _displayDate; }
-            set { SetAndRaise(DisplayDateProperty, ref _displayDate, value); }
-        }
-        
-        /// <summary>
-        /// Gets or sets the first date to be displayed.
-        /// </summary>
-        /// <value>The first date to display.</value>
-        public DateTime? DisplayDateStart
-        {
-            get { return _displayDateStart; }
-            set { SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the last date to be displayed.
-        /// </summary>
-        /// <value>The last date to display.</value>
-        public DateTime? DisplayDateEnd
-        {
-            get { return _displayDateEnd; }
-            set { SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the day that is considered the beginning of the week.
-        /// </summary>
-        /// <value>
-        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
-        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
-        /// </value>
-        public DayOfWeek FirstDayOfWeek
-        {
-            get { return GetValue(FirstDayOfWeekProperty); }
-            set { SetValue(FirstDayOfWeekProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
-        /// </summary>
-        /// <value>
-        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
-        /// open; otherwise, false. The default is false.
-        /// </value>
-        public bool IsDropDownOpen
-        {
-            get { return _isDropDownOpen; }
-            set { SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the current date will be
-        /// highlighted.
-        /// </summary>
-        /// <value>
-        /// True if the current date is highlighted; otherwise, false. The
-        /// default is true.
-        /// </value>
-        public bool IsTodayHighlighted
-        {
-            get { return GetValue(IsTodayHighlightedProperty); }
-            set { SetValue(IsTodayHighlightedProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the currently selected date.
-        /// </summary>
-        /// <value>
-        /// The date currently selected. The default is null.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
-        /// and
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />,
-        /// or the specified date is in the
-        /// <see cref="P:Avalonia.Controls.DatePicker.BlackoutDates" />
-        /// collection.
-        /// </exception>
-        public DateTime? SelectedDate
-        {
-            get { return _selectedDate; }
-            set { SetAndRaise(SelectedDateProperty, ref _selectedDate, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the format that is used to display the selected date.
-        /// </summary>
-        /// <value>
-        /// The format that is used to display the selected date. The default is
-        /// <see cref="F:Avalonia.Controls.DatePickerFormat.Short" />.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// An specified format is not valid.
-        /// </exception>
-        public CalendarDatePickerFormat SelectedDateFormat
-        {
-            get { return GetValue(SelectedDateFormatProperty); }
-            set { SetValue(SelectedDateFormatProperty, value); }
-        }
-
-        public string CustomDateFormatString
-        {
-            get { return GetValue(CustomDateFormatStringProperty); }
-            set { SetValue(CustomDateFormatStringProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the text that is displayed by the
-        /// <see cref="T:Avalonia.Controls.DatePicker" />.
-        /// </summary>
-        /// <value>
-        /// The text displayed by the
-        /// <see cref="T:Avalonia.Controls.DatePicker" />.
-        /// </value>
-        /// <exception cref="T:System.FormatException">
-        /// The text entered cannot be parsed to a valid date, and the exception
-        /// is not suppressed.
-        /// </exception>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The text entered parses to a date that is not selectable.
-        /// </exception>
-        public string? Text
-        {
-            get { return _text; }
-            set { SetAndRaise(TextProperty, ref _text, value); }
-        }
-
-        public string? Watermark
-        {
-            get { return GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
-        public bool UseFloatingWatermark
-        {
-            get { return GetValue(UseFloatingWatermarkProperty); }
-            set { SetValue(UseFloatingWatermarkProperty, value); }
-        }
-
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of the content within the control.
-        /// </summary>
-        public HorizontalAlignment HorizontalContentAlignment
-        {
-            get => GetValue(HorizontalContentAlignmentProperty);
-            set => SetValue(HorizontalContentAlignmentProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the vertical alignment of the content within the control.
-        /// </summary>
-        public VerticalAlignment VerticalContentAlignment
-        {
-            get => GetValue(VerticalContentAlignmentProperty);
-            set => SetValue(VerticalContentAlignmentProperty, value);
-        }
-
-        /// <summary>
-        /// Occurs when the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is closed.
-        /// </summary>
-        public event EventHandler? CalendarClosed;
-
-        /// <summary>
-        /// Occurs when the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is opened.
-        /// </summary>
-        public event EventHandler? CalendarOpened;
-
-        /// <summary>
-        /// Occurs when <see cref="P:Avalonia.Controls.DatePicker.Text" />
-        /// is assigned a value that cannot be interpreted as a date.
-        /// </summary>
-        public event EventHandler<CalendarDatePickerDateValidationErrorEventArgs>? DateValidationError;
-
-        /// <summary>
-        /// Occurs when the
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.SelectedDate" />
-        /// property is changed.
-        /// </summary>
-        public event EventHandler<SelectionChangedEventArgs>? SelectedDateChanged;
-
-        static CalendarDatePicker()
-        {
-            FocusableProperty.OverrideDefaultValue<CalendarDatePicker>(true);
-
-            IsDropDownOpenProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnIsDropDownOpenChanged(e));
-            SelectedDateProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnSelectedDateChanged(e));
-            SelectedDateFormatProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnSelectedDateFormatChanged(e));
-            CustomDateFormatStringProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnCustomDateFormatStringChanged(e));
-            TextProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnTextChanged(e));
-        }
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.DatePicker" /> class.
-        /// </summary>
-        public CalendarDatePicker()
-        {
-            FirstDayOfWeek = DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek;
-            _defaultText = string.Empty;
-            DisplayDate = DateTime.Today;
-        }
-
-        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-        {
-            if (_calendar != null)
-            {
-                _calendar.DayButtonMouseUp -= Calendar_DayButtonMouseUp;
-                _calendar.DisplayDateChanged -= Calendar_DisplayDateChanged;
-                _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
-                _calendar.PointerReleased -= Calendar_PointerReleased;
-                _calendar.KeyDown -= Calendar_KeyDown;
-            }
-            _calendar = e.NameScope.Find<Calendar>(ElementCalendar);
-            if (_calendar != null)
-            {
-                _calendar.SelectionMode = CalendarSelectionMode.SingleDate;
-
-                _calendar.DayButtonMouseUp += Calendar_DayButtonMouseUp;
-                _calendar.DisplayDateChanged += Calendar_DisplayDateChanged;
-                _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-                _calendar.PointerReleased += Calendar_PointerReleased;
-                _calendar.KeyDown += Calendar_KeyDown;
-
-                var currentBlackoutDays = BlackoutDates;
-                BlackoutDates = _calendar.BlackoutDates;
-                if(currentBlackoutDays != null)
-                {
-                    foreach (var range in currentBlackoutDays)
-                    {
-                        BlackoutDates.Add(range);
-                    }
-                }
-            }
-
-            if (_popUp != null)
-            {
-                _popUp.Child = null;
-                _popUp.Closed -= PopUp_Closed;
-            }
-            _popUp = e.NameScope.Find<Popup>(ElementPopup);
-            if(_popUp != null)
-            {
-                _popUp.Closed += PopUp_Closed;
-                if (IsDropDownOpen)
-                {
-                    OpenDropDown();
-                }
-            }
-
-            if(_dropDownButton != null)
-            {
-                _dropDownButton.Click -= DropDownButton_Click;
-                _buttonPointerPressedSubscription?.Dispose();
-            }
-            _dropDownButton = e.NameScope.Find<Button>(ElementButton);
-            if(_dropDownButton != null)
-            {
-                _dropDownButton.Click += DropDownButton_Click;
-                _buttonPointerPressedSubscription =
-                    _dropDownButton.AddDisposableHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true);
-            }
-
-            if (_textBox != null)
-            {
-                _textBox.KeyDown -= TextBox_KeyDown;
-                _textBox.GotFocus -= TextBox_GotFocus;
-                _textBoxTextChangedSubscription?.Dispose();
-            }
-            _textBox = e.NameScope.Find<TextBox>(ElementTextBox);
-
-            if(!SelectedDate.HasValue)
-            {
-                SetWaterMarkText();
-            }
-
-            if(_textBox != null)
-            {
-                _textBox.KeyDown += TextBox_KeyDown;
-                _textBox.GotFocus += TextBox_GotFocus;
-                _textBoxTextChangedSubscription = _textBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBox_TextChanged());
-
-                if(SelectedDate.HasValue)
-                {
-                    _textBox.Text = DateTimeToString(SelectedDate.Value);
-                }
-                else if(!String.IsNullOrEmpty(_defaultText))
-                {
-                    _textBox.Text = _defaultText;
-                    SetSelectedDate();
-                }
-            }
-        }
-
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
-        {
-            if (property == SelectedDateProperty)
-            {
-                DataValidationErrors.SetError(this, value.Error);
-            }
-        }
-
-        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
-        {
-            base.OnPointerWheelChanged(e);
-            if (!e.Handled && SelectedDate.HasValue && _calendar != null)
-            {
-                DateTime selectedDate = this.SelectedDate.Value;
-                DateTime? newDate = DateTimeHelper.AddDays(selectedDate, e.Delta.Y > 0 ? -1 : 1);
-                if (newDate.HasValue && Calendar.IsValidDateSelection(_calendar, newDate.Value))
-                {
-                    SelectedDate = newDate;
-                    e.Handled = true;
-                }
-            }
-        }
-        protected override void OnGotFocus(GotFocusEventArgs e)
-        {
-            base.OnGotFocus(e);
-            if(IsEnabled && _textBox != null && e.NavigationMethod == NavigationMethod.Tab)
-            {
-                _textBox.Focus();
-                var text = _textBox.Text;
-                if(!string.IsNullOrEmpty(text))
-                {
-                    _textBox.SelectionStart = 0;
-                    _textBox.SelectionEnd = text.Length;
-                }
-            }
-        }
-        protected override void OnLostFocus(RoutedEventArgs e)
-        {
-            base.OnLostFocus(e);
-
-            SetSelectedDate();
-        }
-        
-        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var oldValue = (bool)e.OldValue!;
-            var value = (bool)e.NewValue!;
-
-            if (_popUp != null && _popUp.Child != null)
-            {
-                if (value != oldValue)
-                {
-                    if (_calendar!.DisplayMode != CalendarMode.Month)
-                    {
-                        _calendar.DisplayMode = CalendarMode.Month;
-                    }
-
-                    if (value)
-                    {
-                        OpenDropDown();
-                    }
-                    else
-                    {
-                        _popUp.IsOpen = false;
-                        OnCalendarClosed(new RoutedEventArgs());
-                    }
-                }
-            }
-        }
-        private void OnSelectedDateChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var addedDate = (DateTime?)e.NewValue;
-            var removedDate = (DateTime?)e.OldValue;
-
-            if (SelectedDate != null)
-            {
-                DateTime day = SelectedDate.Value;
-
-                // When the SelectedDateProperty change is done from
-                // OnTextPropertyChanged method, two-way binding breaks if
-                // BeginInvoke is not used:
-                Threading.Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    _settingSelectedDate = true;
-                    Text = DateTimeToString(day);
-                    _settingSelectedDate = false;
-                    OnDateSelected(addedDate, removedDate);
-                });
-
-                // When DatePickerDisplayDateFlag is TRUE, the SelectedDate
-                // change is coming from the Calendar UI itself, so, we
-                // shouldn't change the DisplayDate since it will automatically
-                // be changed by the Calendar
-                if ((day.Month != DisplayDate.Month || day.Year != DisplayDate.Year) && (_calendar == null || !_calendar.CalendarDatePickerDisplayDateFlag))
-                {
-                    DisplayDate = day;
-                }
-                if(_calendar != null)
-                    _calendar.CalendarDatePickerDisplayDateFlag = false;
-            }
-            else
-            {
-                _settingSelectedDate = true;
-                SetWaterMarkText();
-                _settingSelectedDate = false;
-                OnDateSelected(addedDate, removedDate);
-            }
-        }
-        private void OnDateFormatChanged()
-        {
-            if (_textBox != null)
-            {
-                if (SelectedDate.HasValue)
-                {
-                    Text = DateTimeToString(SelectedDate.Value);
-                }
-                else if (string.IsNullOrEmpty(_textBox.Text))
-                {
-                    SetWaterMarkText();
-                }
-                else
-                {
-                    DateTime? date = ParseText(_textBox.Text);
-
-                    if (date != null)
-                    {
-                        string? s = DateTimeToString((DateTime)date);
-                        Text = s;
-                    }
-                }
-            }
-        }
-        private void OnSelectedDateFormatChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            OnDateFormatChanged();
-        }
-        private void OnCustomDateFormatStringChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if(SelectedDateFormat == CalendarDatePickerFormat.Custom)
-            {
-                OnDateFormatChanged();
-            }
-        }
-        private void OnTextChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var oldValue = (string?)e.OldValue;
-            var value = (string?)e.NewValue;
-
-            if (!_suspendTextChangeHandler)
-            {
-                if (value != null)
-                {
-                    if (_textBox != null)
-                    {
-                        _textBox.Text = value;
-                    }
-                    else
-                    {
-                        _defaultText = value;
-                    }
-                    if (!_settingSelectedDate)
-                    {
-                        SetSelectedDate();
-                    }
-                }
-                else
-                {
-                    if (!_settingSelectedDate)
-                    {
-                        _settingSelectedDate = true;
-                        SelectedDate = null;
-                        _settingSelectedDate = false;
-                    }
-                }
-            }
-            else
-            {
-                SetWaterMarkText();
-            }
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </summary>
-        /// <param name="e">
-        /// A
-        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
-        /// that contains the event data.
-        /// </param>
-        protected virtual void OnDateValidationError(CalendarDatePickerDateValidationErrorEventArgs e)
-        {
-            DateValidationError?.Invoke(this, e);
-        }
-        private void OnDateSelected(DateTime? addedDate, DateTime? removedDate)
-        {
-            EventHandler<SelectionChangedEventArgs>? handler = this.SelectedDateChanged;
-            if (null != handler)
-            {
-                Collection<DateTime> addedItems = new Collection<DateTime>();
-                Collection<DateTime> removedItems = new Collection<DateTime>();
-
-                if (addedDate.HasValue)
-                {
-                    addedItems.Add(addedDate.Value);
-                }
-
-                if (removedDate.HasValue)
-                {
-                    removedItems.Add(removedDate.Value);
-                }
-
-                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, removedItems, addedItems));
-            }
-        }
-        private void OnCalendarClosed(EventArgs e)
-        {
-            CalendarClosed?.Invoke(this, e);
-        }
-        private void OnCalendarOpened(EventArgs e)
-        {
-            CalendarOpened?.Invoke(this, e);
-        }
-
-        private void Calendar_DayButtonMouseUp(object? sender, PointerReleasedEventArgs e)
-        {
-            Focus();
-            IsDropDownOpen = false;
-        }      
-        private void Calendar_DisplayDateChanged(object? sender, CalendarDateChangedEventArgs e)
-        {
-            if (e.AddedDate != this.DisplayDate)
-            {
-                SetValue(DisplayDateProperty, (DateTime) e.AddedDate!);
-            }
-        }
-        private void Calendar_SelectedDatesChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            Debug.Assert(e.AddedItems.Count < 2, "There should be less than 2 AddedItems!");
-
-            if (e.AddedItems.Count > 0 && SelectedDate.HasValue && DateTime.Compare((DateTime)e.AddedItems[0]!, SelectedDate.Value) != 0)
-            {
-                SelectedDate = (DateTime?)e.AddedItems[0];
-            }
-            else
-            {
-                if (e.AddedItems.Count == 0)
-                {
-                    SelectedDate = null;
-                    return;
-                }
-
-                if (!SelectedDate.HasValue)
-                {
-                    if (e.AddedItems.Count > 0)
-                    {
-                        SelectedDate = (DateTime?)e.AddedItems[0];
-                    }
-                }
-            }
-        }
-        private void Calendar_PointerReleased(object? sender, PointerReleasedEventArgs e)
-        {
-             
-            if (e.InitialPressMouseButton == MouseButton.Left)
-            {
-                e.Handled = true;
-            }
-        }
-        private void Calendar_KeyDown(object? sender, KeyEventArgs e)
-        {
-            Calendar? c = sender as Calendar ?? throw new ArgumentException("Sender must be Calendar.", nameof(sender));
-
-            if (!e.Handled && (e.Key == Key.Enter || e.Key == Key.Space || e.Key == Key.Escape) && c.DisplayMode == CalendarMode.Month)
-            {
-                Focus();
-                IsDropDownOpen = false;
-
-                if (e.Key == Key.Escape)
-                {
-                    SelectedDate = _onOpenSelectedDate;
-                }
-            }
-        }
-        private void TextBox_GotFocus(object? sender, RoutedEventArgs e)
-        {
-            IsDropDownOpen = false;
-        }
-        private void TextBox_KeyDown(object? sender, KeyEventArgs e)
-        {
-            if (!e.Handled)
-            {
-                e.Handled = ProcessDatePickerKey(e);
-            }
-        }
-        private void TextBox_TextChanged()
-        {
-            if (_textBox != null)
-            {
-                _suspendTextChangeHandler = true;
-                Text = _textBox.Text;
-                _suspendTextChangeHandler = false;
-            }
-        }
-        private void DropDownButton_PointerPressed(object? sender, PointerPressedEventArgs e)
-        {
-            _ignoreButtonClick = _isPopupClosing;
-        }
-        private void DropDownButton_Click(object? sender, RoutedEventArgs e)
-        {
-            if (!_ignoreButtonClick)
-            {
-                HandlePopUp();
-            }
-            else
-            {
-                _ignoreButtonClick = false;
-            }
-        }
-        private void PopUp_Closed(object? sender, EventArgs e)
-        {
-            IsDropDownOpen = false;
-
-            if(!_isPopupClosing)
-            {
-                _isPopupClosing = true;
-                Threading.Dispatcher.UIThread.InvokeAsync(() => _isPopupClosing = false);
-            }
-        }
-
-        private void HandlePopUp()
-        {
-            if (IsDropDownOpen)
-            {
-                Focus();
-                IsDropDownOpen = false;
-            }
-            else
-            {
-                ProcessTextBox();
-            }
-        }
-        private void OpenDropDown()
-        {
-            if (_calendar != null)
-            {
-                _calendar.Focus();
-                OpenPopUp();
-                _calendar.ResetStates();
-                OnCalendarOpened(new RoutedEventArgs());
-            }
-        }
-        private void OpenPopUp()
-        {
-            _onOpenSelectedDate = SelectedDate;
-            _popUp!.IsOpen = true;
-        }
-
-        /// <summary>
-        /// Input text is parsed in the correct format and changed into a
-        /// DateTime object.  If the text can not be parsed TextParseError Event
-        /// is thrown.
-        /// </summary>
-        /// <param name="text">Inherited code: Requires comment.</param>
-        /// <returns>
-        /// IT SHOULD RETURN NULL IF THE STRING IS NOT VALID, RETURN THE
-        /// DATETIME VALUE IF IT IS VALID.
-        /// </returns>
-        private DateTime? ParseText(string text)
-        {
-            DateTime newSelectedDate;
-
-            // TryParse is not used in order to be able to pass the exception to
-            // the TextParseError event
-            try
-            {
-                newSelectedDate = DateTime.Parse(text, DateTimeHelper.GetCurrentDateFormat());
-
-                if (Calendar.IsValidDateSelection(this._calendar!, newSelectedDate))
-                {
-                    return newSelectedDate;
-                }
-                else
-                {
-                    var dateValidationError = new CalendarDatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException(nameof(text), "SelectedDate value is not valid."), text);
-                    OnDateValidationError(dateValidationError);
-
-                    if (dateValidationError.ThrowException)
-                    {
-                        throw dateValidationError.Exception;
-                    }
-                }
-            }
-            catch (FormatException ex)
-            {
-                CalendarDatePickerDateValidationErrorEventArgs textParseError = new CalendarDatePickerDateValidationErrorEventArgs(ex, text);
-                OnDateValidationError(textParseError);
-
-                if (textParseError.ThrowException)
-                {
-                    throw textParseError.Exception;
-                }
-            }
-            return null;
-        }
-        private string? DateTimeToString(DateTime d)
-        {
-            DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
-
-            switch (SelectedDateFormat)
-            {
-                case CalendarDatePickerFormat.Short:
-                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.ShortDatePattern, dtfi));
-                case CalendarDatePickerFormat.Long:
-                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.LongDatePattern, dtfi));
-                case CalendarDatePickerFormat.Custom:
-                    return string.Format(CultureInfo.CurrentCulture, d.ToString(CustomDateFormatString, dtfi));
-            }
-            return null;
-        }
-        private bool ProcessDatePickerKey(KeyEventArgs e)
-        {
-            
-            switch (e.Key)
-            {
-                case Key.Enter:
-                    {
-                        SetSelectedDate();
-                        return true;
-                    }
-                case Key.Down:
-                    { 
-                        if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control)
-                        {
-                            HandlePopUp();
-                            return true;
-                        }
-                        break;
-                    }
-            }
-            return false;
-        }
-        private void ProcessTextBox()
-        {
-            SetSelectedDate();
-            IsDropDownOpen = true;
-            _calendar!.Focus();
-        }
-        private void SetSelectedDate()
-        {
-            if (_textBox != null)
-            {
-                if (!string.IsNullOrEmpty(_textBox.Text))
-                {
-                    string s = _textBox.Text;
-
-                    if (SelectedDate != null)
-                    {
-                        // If the string value of the SelectedDate and the
-                        // TextBox string value are equal, we do not parse the
-                        // string again if we do an extra parse, we lose data in
-                        // M/d/yy format.
-                        // ex: SelectedDate = DateTime(1008,12,19) but when
-                        // "12/19/08" is parsed it is interpreted as
-                        // DateTime(2008,12,19)
-                        string? selectedDate = DateTimeToString(SelectedDate.Value);
-                        if (selectedDate == s)
-                        {
-                            return;
-                        }
-                    }
-                    DateTime? d = SetTextBoxValue(s);
-                    
-                    if (SelectedDate != d)
-                    {
-                        SelectedDate = d;
-                    }
-                }
-                else
-                {
-                    if (SelectedDate != null)
-                    {
-                        SelectedDate = null;
-                    }
-                }
-            }
-            else
-            {
-                DateTime? d = SetTextBoxValue(_defaultText);
-
-                if (SelectedDate != d)
-                {
-                    SelectedDate = d;
-                }
-            }
-        }
-        private DateTime? SetTextBoxValue(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                SetValue(TextProperty, s);
-                return SelectedDate;
-            }
-            else
-            {
-                DateTime? d = ParseText(s);
-                if (d != null)
-                {
-                    SetValue(TextProperty, s);
-                    return d;
-                }
-                else
-                {
-                    // If parse error: TextBox should have the latest valid
-                    // SelectedDate value:
-                    if (SelectedDate != null)
-                    {
-                        string? newtext = this.DateTimeToString(SelectedDate.Value);
-                        SetValue(TextProperty, newtext);
-                        return SelectedDate;
-                    }
-                    else
-                    {
-                        SetWaterMarkText();
-                        return null;
-                    }
-                }
-            }
-        }
-        private void SetWaterMarkText()
-        {
-            if (_textBox != null)
-            {
-                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
-                {
-                    DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
-                    Text = string.Empty;
-                    _defaultText = string.Empty;
-                    var watermarkFormat = "<{0}>";
-                    string watermarkText;
-
-                    switch (SelectedDateFormat)
-                    {
-                        case CalendarDatePickerFormat.Long:
-                            {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
-                                break;
-                            }
-                        case CalendarDatePickerFormat.Short:
-                        default:
-                            {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
-                                break;
-                            }
-                    }
-                    _textBox.Watermark = watermarkText;
-                }
-                else
-                {
-                    _textBox.ClearValue(TextBox.WatermarkProperty);
-                }
-            }
-        }
-
-        private static bool IsValidSelectedDateFormat(CalendarDatePickerFormat value)
-        {
-            return value == CalendarDatePickerFormat.Long
-                || value == CalendarDatePickerFormat.Short
-                || value == CalendarDatePickerFormat.Custom;
-        }
-        private static bool IsValidDateFormatString(string formatString)
-        {
-            return !string.IsNullOrWhiteSpace(formatString);
-        }
-        private static DateTime DiscardDayTime(DateTime d)
-        {
-            int year = d.Year;
-            int month = d.Month;
-            DateTime newD = new DateTime(year, month, 1, 0, 0, 0);
-            return newD;
-        }
-        private static DateTime? DiscardTime(DateTime? d)
-        {
-            if (d == null)
-            {
-                return null;
-            }
-            else
-            {
-                DateTime discarded = (DateTime) d;
-                int year = discarded.Year;
-                int month = discarded.Month;
-                int day = discarded.Day;
-                DateTime newD = new DateTime(year, month, day, 0, 0, 0);
-                return newD;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Controls/Calendar/CalendarDateRange.cs b/src/Avalonia.Controls/Calendar/CalendarDateRange.cs
index 88bc5ed7bd..793ef7a2ee 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDateRange.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDateRange.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
diff --git a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
index 2ba4e36260..3d0befdba7 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
diff --git a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
index 00b5ce10bc..cb3ee06a9e 100644
--- a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using Avalonia.Input;
diff --git a/src/Avalonia.Controls/Calendar/CalendarItem.cs b/src/Avalonia.Controls/Calendar/CalendarItem.cs
index 616b9083ff..eec3bdc9f2 100644
--- a/src/Avalonia.Controls/Calendar/CalendarItem.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarItem.cs
@@ -1,12 +1,12 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using Avalonia.Collections.Pooled;
 using Avalonia.Controls.Metadata;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -19,6 +19,11 @@ namespace Avalonia.Controls.Primitives
     /// Represents the currently displayed month or year on a
     /// <see cref="T:Avalonia.Controls.Calendar" />.
     /// </summary>
+    [TemplatePart(PART_ElementHeaderButton,   typeof(Button))]
+    [TemplatePart(PART_ElementMonthView,      typeof(Grid))]
+    [TemplatePart(PART_ElementNextButton,     typeof(Button))]
+    [TemplatePart(PART_ElementPreviousButton, typeof(Button))]
+    [TemplatePart(PART_ElementYearView,       typeof(Grid))]
     [PseudoClasses(":calendardisabled")]
     public sealed class CalendarItem : TemplatedControl
     {
@@ -27,11 +32,11 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         private const int NumberOfDaysPerWeek = 7;
 
-        private const string PART_ElementHeaderButton = "HeaderButton";
-        private const string PART_ElementPreviousButton = "PreviousButton";
-        private const string PART_ElementNextButton = "NextButton";
-        private const string PART_ElementMonthView = "MonthView";
-        private const string PART_ElementYearView = "YearView";
+        private const string PART_ElementHeaderButton = "PART_HeaderButton";
+        private const string PART_ElementPreviousButton = "PART_PreviousButton";
+        private const string PART_ElementNextButton = "PART_NextButton";
+        private const string PART_ElementMonthView = "PART_MonthView";
+        private const string PART_ElementYearView = "PART_YearView";
 
         private Button? _headerButton;
         private Button? _nextButton;
@@ -167,13 +172,13 @@ namespace Avalonia.Controls.Primitives
             if (MonthView != null)
             {
                 var childCount = Calendar.RowsPerMonth + Calendar.RowsPerMonth * Calendar.ColumnsPerMonth;
-                var children = new List<IControl>(childCount);
+                using var children = new PooledList<IControl>(childCount);
 
                 for (int i = 0; i < Calendar.RowsPerMonth; i++)
                 {
                     if (_dayTitleTemplate != null)
                     {
-                        var cell = _dayTitleTemplate.Build();
+                        var cell = (Control) _dayTitleTemplate.Build();
                         cell.DataContext = string.Empty;
                         cell.SetValue(Grid.RowProperty, 0);
                         cell.SetValue(Grid.ColumnProperty, i);
@@ -181,11 +186,16 @@ namespace Avalonia.Controls.Primitives
                     }
                 }
 
+                EventHandler<PointerPressedEventArgs> cellMouseLeftButtonDown = Cell_MouseLeftButtonDown;
+                EventHandler<PointerReleasedEventArgs> cellMouseLeftButtonUp = Cell_MouseLeftButtonUp;
+                EventHandler<PointerEventArgs> cellMouseEntered = Cell_MouseEntered;
+                EventHandler<RoutedEventArgs> cellClick = Cell_Click;
+
                 for (int i = 1; i < Calendar.RowsPerMonth; i++)
                 {
                     for (int j = 0; j < Calendar.ColumnsPerMonth; j++)
                     {
-                        CalendarDayButton cell = new CalendarDayButton();
+                        var cell = new CalendarDayButton();
 
                         if (Owner != null)
                         {
@@ -193,10 +203,10 @@ namespace Avalonia.Controls.Primitives
                         }
                         cell.SetValue(Grid.RowProperty, i);
                         cell.SetValue(Grid.ColumnProperty, j);
-                        cell.CalendarDayButtonMouseDown += Cell_MouseLeftButtonDown;
-                        cell.CalendarDayButtonMouseUp += Cell_MouseLeftButtonUp;
-                        cell.PointerEnter += Cell_MouseEnter;
-                        cell.Click += Cell_Click;
+                        cell.CalendarDayButtonMouseDown += cellMouseLeftButtonDown;
+                        cell.CalendarDayButtonMouseUp += cellMouseLeftButtonUp;
+                        cell.PointerEntered += cellMouseEntered;
+                        cell.Click += cellClick;
                         children.Add(cell);
                     }
                 }
@@ -207,14 +217,17 @@ namespace Avalonia.Controls.Primitives
             if (YearView != null)
             {
                 var childCount = Calendar.RowsPerYear * Calendar.ColumnsPerYear;
-                var children = new List<IControl>(childCount);
+                using var children = new PooledList<IControl>(childCount);
+
+                EventHandler<PointerPressedEventArgs> monthCalendarButtonMouseDown = Month_CalendarButtonMouseDown;
+                EventHandler<PointerReleasedEventArgs> monthCalendarButtonMouseUp = Month_CalendarButtonMouseUp;
+                EventHandler<PointerEventArgs> monthMouseEntered = Month_MouseEntered;
 
-                CalendarButton month;
                 for (int i = 0; i < Calendar.RowsPerYear; i++)
                 {
                     for (int j = 0; j < Calendar.ColumnsPerYear; j++)
                     {
-                        month = new CalendarButton();
+                        var month = new CalendarButton();
 
                         if (Owner != null)
                         {
@@ -222,9 +235,9 @@ namespace Avalonia.Controls.Primitives
                         }
                         month.SetValue(Grid.RowProperty, i);
                         month.SetValue(Grid.ColumnProperty, j);
-                        month.CalendarLeftMouseButtonDown += Month_CalendarButtonMouseDown;
-                        month.CalendarLeftMouseButtonUp += Month_CalendarButtonMouseUp;
-                        month.PointerEnter += Month_MouseEnter;
+                        month.CalendarLeftMouseButtonDown += monthCalendarButtonMouseDown;
+                        month.CalendarLeftMouseButtonUp += monthCalendarButtonMouseUp;
+                        month.PointerEntered += monthMouseEntered;
                         children.Add(month);
                     }
                 }
@@ -339,7 +352,6 @@ namespace Avalonia.Controls.Primitives
         {
             if (Owner != null)
             {
-                Debug.Assert(Owner.DisplayDate != null, "The Owner Calendar's DisplayDate should not be null!");
                 _currentMonth = Owner.DisplayDateInternal;
             }
             else
@@ -347,17 +359,14 @@ namespace Avalonia.Controls.Primitives
                 _currentMonth = DateTime.Today;
             }
 
-            if (_currentMonth != null)
-            {
-                SetMonthModeHeaderButton();
-                SetMonthModePreviousButton(_currentMonth);
-                SetMonthModeNextButton(_currentMonth);
+            SetMonthModeHeaderButton();
+            SetMonthModePreviousButton(_currentMonth);
+            SetMonthModeNextButton(_currentMonth);
 
-                if (MonthView != null)
-                {
-                    SetDayTitles();
-                    SetCalendarDayButtons(_currentMonth);
-                }
+            if (MonthView != null)
+            {
+                SetDayTitles();
+                SetCalendarDayButtons(_currentMonth);
             }
         }
         private void SetMonthModeHeaderButton()
@@ -578,7 +587,6 @@ namespace Avalonia.Controls.Primitives
         {
             if (Owner != null)
             {
-                Debug.Assert(Owner.SelectedMonth != null, "The Owner Calendar's SelectedMonth should not be null!");
                 _currentMonth = (DateTime)Owner.SelectedMonth;
             }
             else
@@ -586,16 +594,13 @@ namespace Avalonia.Controls.Primitives
                 _currentMonth = DateTime.Today;
             }
 
-            if (_currentMonth != null)
-            {
-                SetYearModeHeaderButton();
-                SetYearModePreviousButton();
-                SetYearModeNextButton();
+            SetYearModeHeaderButton();
+            SetYearModePreviousButton();
+            SetYearModeNextButton();
 
-                if (YearView != null)
-                {
-                    SetMonthButtonsForYearMode();
-                }
+            if (YearView != null)
+            {
+                SetMonthButtonsForYearMode();
             }
         }
         private void SetYearModeHeaderButton()
@@ -646,7 +651,6 @@ namespace Avalonia.Controls.Primitives
                         childButton.IsCalendarButtonFocused = false;
                     }
 
-                    Debug.Assert(Owner.DisplayDateInternal != null, "The Owner Calendar's DisplayDateInternal should not be null!");
                     childButton.IsSelected = (DateTimeHelper.CompareYearMonth(day, Owner.DisplayDateInternal) == 0);
 
                     if (DateTimeHelper.CompareYearMonth(day, Owner.DisplayDateRangeStart) < 0 || DateTimeHelper.CompareYearMonth(day, Owner.DisplayDateRangeEnd) > 0)
@@ -671,7 +675,6 @@ namespace Avalonia.Controls.Primitives
 
             if (Owner != null)
             {
-                Debug.Assert(Owner.SelectedYear != null, "The owning Calendar's selected year should not be null!");
                 selectedYear = Owner.SelectedYear;
                 _currentMonth = (DateTime)Owner.SelectedMonth;
             }
@@ -681,19 +684,16 @@ namespace Avalonia.Controls.Primitives
                 selectedYear = DateTime.Today;
             }
 
-            if (_currentMonth != null)
-            {
-                int decade = DateTimeHelper.DecadeOfDate(selectedYear);
-                int decadeEnd = DateTimeHelper.EndOfDecade(selectedYear);
+            int decade = DateTimeHelper.DecadeOfDate(selectedYear);
+            int decadeEnd = DateTimeHelper.EndOfDecade(selectedYear);
 
-                SetDecadeModeHeaderButton(decade, decadeEnd);
-                SetDecadeModePreviousButton(decade);
-                SetDecadeModeNextButton(decadeEnd);
+            SetDecadeModeHeaderButton(decade, decadeEnd);
+            SetDecadeModePreviousButton(decade);
+            SetDecadeModeNextButton(decadeEnd);
 
-                if (YearView != null)
-                {
-                    SetYearButtons(decade, decadeEnd);
-                }
+            if (YearView != null)
+            {
+                SetYearButtons(decade, decadeEnd);
             }
         }
         internal void UpdateYearViewSelection(CalendarButton calendarButton)
@@ -808,22 +808,15 @@ namespace Avalonia.Controls.Primitives
                 {
                     if (Owner.DisplayMode == CalendarMode.Month)
                     {
-                        if (Owner.DisplayDate != null)
-                        {
-                            d = Owner.DisplayDateInternal;
-                            Owner.SelectedMonth = new DateTime(d.Year, d.Month, 1);
-                        }
+                        d = Owner.DisplayDateInternal;
+                        Owner.SelectedMonth = new DateTime(d.Year, d.Month, 1);
                         Owner.DisplayMode = CalendarMode.Year;
                     }
                     else
                     {
                         Debug.Assert(Owner.DisplayMode == CalendarMode.Year, "The Owner Calendar's DisplayMode should be Year!");
-
-                        if (Owner.SelectedMonth != null)
-                        {
-                            d = Owner.SelectedMonth;
-                            Owner.SelectedYear = new DateTime(d.Year, d.Month, 1);
-                        }
+                        d = Owner.SelectedMonth;
+                        Owner.SelectedYear = new DateTime(d.Year, d.Month, 1);
                         Owner.DisplayMode = CalendarMode.Decade;
                     }
                 }
@@ -862,7 +855,7 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        internal void Cell_MouseEnter(object? sender, PointerEventArgs e)
+        internal void Cell_MouseEntered(object? sender, PointerEventArgs e)
         {
             if (Owner != null)
             {
@@ -1148,7 +1141,7 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        private void Month_MouseEnter(object? sender, PointerEventArgs e)
+        private void Month_MouseEntered(object? sender, PointerEventArgs e)
         {
             if (_isMouseLeftButtonDownYearView)
             {
diff --git a/src/Avalonia.Controls/Calendar/DateTimeHelper.cs b/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
index eb90f6c399..bfff03a926 100644
--- a/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
+++ b/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
@@ -68,10 +68,7 @@ namespace Avalonia.Controls
 
         public static DateTime DiscardDayTime(DateTime d)
         {
-            int year = d.Year;
-            int month = d.Month;
-            DateTime newD = new DateTime(year, month, 1, 0, 0, 0);
-            return newD;
+            return new DateTime(d.Year, d.Month, 1, 0, 0, 0);
         }
 
         [return: NotNullIfNotNull("d")]
diff --git a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
index c7c35718e0..211b5edb0d 100644
--- a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using Avalonia.Threading;
@@ -297,7 +297,7 @@ namespace Avalonia.Controls.Primitives
                 }
                 else
                 {
-                    if (item != null && DateTime.Compare(this[index], item) != 0 && Calendar.IsValidDateSelection(_owner, item))
+                    if (DateTime.Compare(this[index], item) != 0 && Calendar.IsValidDateSelection(_owner, item))
                     {
                         removedItems.Add(this[index]);
                         base.SetItem(index, item);
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
new file mode 100644
index 0000000000..6c2356b411
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -0,0 +1,303 @@
+using System;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Layout;
+
+namespace Avalonia.Controls
+{
+    /// <inheritdoc/>
+    public partial class CalendarDatePicker
+    {
+        /// <summary>
+        /// Defines the <see cref="DisplayDate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime> DisplayDateProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime>(
+                nameof(DisplayDate),
+                o => o.DisplayDate,
+                (o, v) => o.DisplayDate = v);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDateStart"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateStartProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(DisplayDateStart),
+                o => o.DisplayDateStart,
+                (o, v) => o.DisplayDateStart = v);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDateEnd"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateEndProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(DisplayDateEnd),
+                o => o.DisplayDateEnd,
+                (o, v) => o.DisplayDateEnd = v);
+
+        /// <summary>
+        /// Defines the <see cref="FirstDayOfWeek"/> property.
+        /// </summary>
+        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
+
+        /// <summary>
+        /// Defines the <see cref="IsDropDownOpen"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        /// <summary>
+        /// Defines the <see cref="IsTodayHighlighted"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, bool>(nameof(IsTodayHighlighted));
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> SelectedDateProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(SelectedDate),
+                o => o.SelectedDate,
+                (o, v) => o.SelectedDate = v,
+                enableDataValidation: true, 
+                defaultBindingMode:BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDateFormat"/> property.
+        /// </summary>
+        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
+                nameof(SelectedDateFormat),
+                defaultValue: CalendarDatePickerFormat.Short,
+                validate: IsValidSelectedDateFormat);
+
+        /// <summary>
+        /// Defines the <see cref="CustomDateFormatString"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, string>(
+                nameof(CustomDateFormatString),
+                defaultValue: "d",
+                validate: IsValidDateFormatString);
+
+        /// <summary>
+        /// Defines the <see cref="Text"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, string?> TextProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, string?>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+
+        /// <summary>
+        /// Defines the <see cref="Watermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string?> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="UseFloatingWatermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
+            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Gets a collection of dates that are marked as not selectable.
+        /// </summary>
+        /// <value>
+        /// A collection of dates that cannot be selected. The default value is
+        /// an empty collection.
+        /// </value>
+        public CalendarBlackoutDatesCollection? BlackoutDates { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the date to display.
+        /// </summary>
+        /// <value>
+        /// The date to display. The default is <see cref="DateTime.Today" />.
+        /// </value>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="CalendarDatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="CalendarDatePicker.DisplayDateEnd" />.
+        /// </exception>
+        public DateTime DisplayDate
+        {
+            get => _displayDate;
+            set => SetAndRaise(DisplayDateProperty, ref _displayDate, value);
+        }
+        
+        /// <summary>
+        /// Gets or sets the first date to be displayed.
+        /// </summary>
+        /// <value>The first date to display.</value>
+        public DateTime? DisplayDateStart
+        {
+            get => _displayDateStart;
+            set => SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the last date to be displayed.
+        /// </summary>
+        /// <value>The last date to display.</value>
+        public DateTime? DisplayDateEnd
+        {
+            get => _displayDateEnd;
+            set => SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the day that is considered the beginning of the week.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
+        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
+        /// </value>
+        public DayOfWeek FirstDayOfWeek
+        {
+            get => GetValue(FirstDayOfWeekProperty);
+            set => SetValue(FirstDayOfWeekProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
+        /// </summary>
+        /// <value>
+        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
+        /// open; otherwise, false. The default is false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get => _isDropDownOpen;
+            set => SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the current date will be
+        /// highlighted.
+        /// </summary>
+        /// <value>
+        /// True if the current date is highlighted; otherwise, false. The
+        /// default is true.
+        /// </value>
+        public bool IsTodayHighlighted
+        {
+            get => GetValue(IsTodayHighlightedProperty);
+            set => SetValue(IsTodayHighlightedProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected date.
+        /// </summary>
+        /// <value>
+        /// The date currently selected. The default is null.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="CalendarDatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="CalendarDatePicker.DisplayDateEnd" />,
+        /// or the specified date is in the
+        /// <see cref="CalendarDatePicker.BlackoutDates" />
+        /// collection.
+        /// </exception>
+        public DateTime? SelectedDate
+        {
+            get => _selectedDate;
+            set => SetAndRaise(SelectedDateProperty, ref _selectedDate, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the format that is used to display the selected date.
+        /// </summary>
+        /// <value>
+        /// The format that is used to display the selected date. The default is
+        /// <see cref="CalendarDatePickerFormat.Short" />.
+        /// </value>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// An specified format is not valid.
+        /// </exception>
+        public CalendarDatePickerFormat SelectedDateFormat
+        {
+            get => GetValue(SelectedDateFormatProperty);
+            set => SetValue(SelectedDateFormatProperty, value);
+        }
+
+        public string CustomDateFormatString
+        {
+            get => GetValue(CustomDateFormatStringProperty);
+            set => SetValue(CustomDateFormatStringProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed by the <see cref="CalendarDatePicker" />.
+        /// </summary>
+        /// <value>
+        /// The text displayed by the <see cref="CalendarDatePicker" />.
+        /// </value>
+        /// <exception cref="FormatException">
+        /// The text entered cannot be parsed to a valid date, and the exception
+        /// is not suppressed.
+        /// </exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// The text entered parses to a date that is not selectable.
+        /// </exception>
+        public string? Text
+        {
+            get => _text;
+            set => SetAndRaise(TextProperty, ref _text, value);
+        }
+
+        /// <inheritdoc cref="TextBox.Watermark"/>
+        public string? Watermark
+        {
+            get => GetValue(WatermarkProperty);
+            set => SetValue(WatermarkProperty, value);
+        }
+
+        /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
+        public bool UseFloatingWatermark
+        {
+            get => GetValue(UseFloatingWatermarkProperty);
+            set => SetValue(UseFloatingWatermarkProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of the content within the control.
+        /// </summary>
+        public HorizontalAlignment HorizontalContentAlignment
+        {
+            get => GetValue(HorizontalContentAlignmentProperty);
+            set => SetValue(HorizontalContentAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical alignment of the content within the control.
+        /// </summary>
+        public VerticalAlignment VerticalContentAlignment
+        {
+            get => GetValue(VerticalContentAlignmentProperty);
+            set => SetValue(VerticalContentAlignmentProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
new file mode 100644
index 0000000000..ec1273ca98
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
@@ -0,0 +1,927 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Reactive.Disposables;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A date selection control that allows the user to select dates from a drop down calendar.
+    /// </summary>
+    [TemplatePart(ElementButton,   typeof(Button))]
+    [TemplatePart(ElementCalendar, typeof(Calendar))]
+    [TemplatePart(ElementPopup,    typeof(Popup))]
+    [TemplatePart(ElementTextBox,  typeof(TextBox))]
+    [PseudoClasses(pcFlyoutOpen, pcPressed)]
+    public partial class CalendarDatePicker : TemplatedControl
+    {
+        protected const string pcPressed    = ":pressed";
+        protected const string pcFlyoutOpen = ":flyout-open";
+
+        private const string ElementTextBox = "PART_TextBox";
+        private const string ElementButton = "PART_Button";
+        private const string ElementPopup = "PART_Popup";
+        private const string ElementCalendar = "PART_Calendar";
+
+        private Calendar? _calendar;
+        private string _defaultText;
+        private Button? _dropDownButton;
+        private Popup? _popUp;
+        private TextBox? _textBox;
+        private IDisposable? _textBoxTextChangedSubscription;
+        private IDisposable? _buttonPointerPressedSubscription;
+
+        private DateTime? _onOpenSelectedDate;
+        private bool _settingSelectedDate;
+
+        private DateTime _displayDate;
+        private DateTime? _displayDateStart;
+        private DateTime? _displayDateEnd;
+        private bool _isDropDownOpen;
+        private DateTime? _selectedDate;
+        private string? _text;
+        private bool _suspendTextChangeHandler = false;
+        private bool _isPopupClosing = false;
+        private bool _ignoreButtonClick = false;
+        private bool _isFlyoutOpen = false;
+        private bool _isPressed = false;
+
+        /// <summary>
+        /// Occurs when the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is closed.
+        /// </summary>
+        public event EventHandler? CalendarClosed;
+
+        /// <summary>
+        /// Occurs when the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is opened.
+        /// </summary>
+        public event EventHandler? CalendarOpened;
+
+        /// <summary>
+        /// Occurs when <see cref="P:Avalonia.Controls.DatePicker.Text" />
+        /// is assigned a value that cannot be interpreted as a date.
+        /// </summary>
+        public event EventHandler<CalendarDatePickerDateValidationErrorEventArgs>? DateValidationError;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.SelectedDate" />
+        /// property is changed.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs>? SelectedDateChanged;
+
+        static CalendarDatePicker()
+        {
+            FocusableProperty.OverrideDefaultValue<CalendarDatePicker>(true);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CalendarDatePicker" /> class.
+        /// </summary>
+        public CalendarDatePicker()
+        {
+            FirstDayOfWeek = DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek;
+            _defaultText = string.Empty;
+            DisplayDate = DateTime.Today;
+        }
+
+        /// <summary>
+        /// Updates the visual state of the control by applying latest PseudoClasses.
+        /// </summary>
+        protected void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(pcFlyoutOpen, _isFlyoutOpen);
+            PseudoClasses.Set(pcPressed, _isPressed);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            if (_calendar != null)
+            {
+                _calendar.DayButtonMouseUp -= Calendar_DayButtonMouseUp;
+                _calendar.DisplayDateChanged -= Calendar_DisplayDateChanged;
+                _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
+                _calendar.PointerReleased -= Calendar_PointerReleased;
+                _calendar.KeyDown -= Calendar_KeyDown;
+            }
+            _calendar = e.NameScope.Find<Calendar>(ElementCalendar);
+            if (_calendar != null)
+            {
+                _calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+
+                _calendar.DayButtonMouseUp += Calendar_DayButtonMouseUp;
+                _calendar.DisplayDateChanged += Calendar_DisplayDateChanged;
+                _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+                _calendar.PointerReleased += Calendar_PointerReleased;
+                _calendar.KeyDown += Calendar_KeyDown;
+
+                var currentBlackoutDays = BlackoutDates;
+                BlackoutDates = _calendar.BlackoutDates;
+                if(currentBlackoutDays != null)
+                {
+                    foreach (var range in currentBlackoutDays)
+                    {
+                        BlackoutDates.Add(range);
+                    }
+                }
+            }
+
+            if (_popUp != null)
+            {
+                _popUp.Child = null;
+                _popUp.Closed -= PopUp_Closed;
+            }
+            _popUp = e.NameScope.Find<Popup>(ElementPopup);
+            if(_popUp != null)
+            {
+                _popUp.Closed += PopUp_Closed;
+                if (IsDropDownOpen)
+                {
+                    OpenDropDown();
+                }
+            }
+
+            if(_dropDownButton != null)
+            {
+                _dropDownButton.Click -= DropDownButton_Click;
+                _buttonPointerPressedSubscription?.Dispose();
+            }
+            _dropDownButton = e.NameScope.Find<Button>(ElementButton);
+            if(_dropDownButton != null)
+            {
+                _dropDownButton.Click += DropDownButton_Click;
+                _buttonPointerPressedSubscription = new CompositeDisposable(
+                    _dropDownButton.AddDisposableHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true),
+                    _dropDownButton.AddDisposableHandler(PointerReleasedEvent, DropDownButton_PointerReleased, handledEventsToo: true));
+            }
+
+            if (_textBox != null)
+            {
+                _textBox.KeyDown -= TextBox_KeyDown;
+                _textBox.GotFocus -= TextBox_GotFocus;
+                _textBoxTextChangedSubscription?.Dispose();
+            }
+            _textBox = e.NameScope.Find<TextBox>(ElementTextBox);
+
+            if(!SelectedDate.HasValue)
+            {
+                SetWaterMarkText();
+            }
+
+            if(_textBox != null)
+            {
+                _textBox.KeyDown += TextBox_KeyDown;
+                _textBox.GotFocus += TextBox_GotFocus;
+                _textBoxTextChangedSubscription = _textBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBox_TextChanged());
+
+                if(SelectedDate.HasValue)
+                {
+                    _textBox.Text = DateTimeToString(SelectedDate.Value);
+                }
+                else if(!String.IsNullOrEmpty(_defaultText))
+                {
+                    _textBox.Text = _defaultText;
+                    SetSelectedDate();
+                }
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            // CustomDateFormatString
+            if (change.Property == CustomDateFormatStringProperty)
+            {
+                if (SelectedDateFormat == CalendarDatePickerFormat.Custom)
+                {
+                    OnDateFormatChanged();
+                }
+            }
+            // IsDropDownOpen
+            else if (change.Property == IsDropDownOpenProperty)
+            {
+                var (oldValue, newValue) = change.GetOldAndNewValue<bool>();
+
+                if (_popUp != null && _popUp.Child != null)
+                {
+                    if (newValue != oldValue)
+                    {
+                        if (_calendar!.DisplayMode != CalendarMode.Month)
+                        {
+                            _calendar.DisplayMode = CalendarMode.Month;
+                        }
+
+                        if (newValue)
+                        {
+                            OpenDropDown();
+                        }
+                        else
+                        {
+                            _popUp.IsOpen = false;
+                            _isFlyoutOpen = _popUp.IsOpen;
+                            _isPressed = false;
+
+                            UpdatePseudoClasses();
+                            OnCalendarClosed(new RoutedEventArgs());
+                        }
+                    }
+                }
+            }
+            // SelectedDate
+            else if (change.Property == SelectedDateProperty)
+            {
+                var (removedDate, addedDate) = change.GetOldAndNewValue<DateTime?>();
+
+                if (SelectedDate != null)
+                {
+                    DateTime day = SelectedDate.Value;
+
+                    // When the SelectedDateProperty change is done from
+                    // OnTextPropertyChanged method, two-way binding breaks if
+                    // BeginInvoke is not used:
+                    Threading.Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        _settingSelectedDate = true;
+                        Text = DateTimeToString(day);
+                        _settingSelectedDate = false;
+                        OnDateSelected(addedDate, removedDate);
+                    });
+
+                    // When DatePickerDisplayDateFlag is TRUE, the SelectedDate
+                    // change is coming from the Calendar UI itself, so, we
+                    // shouldn't change the DisplayDate since it will automatically
+                    // be changed by the Calendar
+                    if ((day.Month != DisplayDate.Month || day.Year != DisplayDate.Year) && (_calendar == null || !_calendar.CalendarDatePickerDisplayDateFlag))
+                    {
+                        DisplayDate = day;
+                    }
+
+                    if(_calendar != null)
+                    {
+                        _calendar.CalendarDatePickerDisplayDateFlag = false;
+                    }
+                }
+                else
+                {
+                    _settingSelectedDate = true;
+                    SetWaterMarkText();
+                    _settingSelectedDate = false;
+                    OnDateSelected(addedDate, removedDate);
+                }
+            }
+            // SelectedDateFormat
+            else if (change.Property == SelectedDateFormatProperty)
+            {
+                OnDateFormatChanged();
+            }
+            // Text
+            else if (change.Property == TextProperty)
+            {
+                var (oldValue, newValue) = change.GetOldAndNewValue<string>();
+
+                if (!_suspendTextChangeHandler)
+                {
+                    if (newValue != null)
+                    {
+                        if (_textBox != null)
+                        {
+                            _textBox.Text = newValue;
+                        }
+                        else
+                        {
+                            _defaultText = newValue;
+                        }
+
+                        if (!_settingSelectedDate)
+                        {
+                            SetSelectedDate();
+                        }
+                    }
+                    else
+                    {
+                        if (!_settingSelectedDate)
+                        {
+                            _settingSelectedDate = true;
+                            SelectedDate = null;
+                            _settingSelectedDate = false;
+                        }
+                    }
+                }
+                else
+                {
+                    SetWaterMarkText();
+                }
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <inheritdoc/>
+        protected override void UpdateDataValidation(AvaloniaProperty property, BindingValueType state, Exception? error)
+        {
+            if (property == SelectedDateProperty)
+            {
+                DataValidationErrors.SetError(this, error);
+            }
+
+            base.UpdateDataValidation(property, state, error);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                e.Handled = true;
+
+                _ignoreButtonClick = _isPopupClosing;
+
+                _isPressed = true;
+                UpdatePseudoClasses();
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            if (_isPressed && e.InitialPressMouseButton == MouseButton.Left)
+            {
+                e.Handled = true;
+
+                if (!_ignoreButtonClick)
+                {
+                    TogglePopUp();
+                }
+                else
+                {
+                    _ignoreButtonClick = false;
+                }
+
+                _isPressed = false;
+                UpdatePseudoClasses();
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+        {
+            base.OnPointerCaptureLost(e);
+
+            _isPressed = false;
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+            if (!e.Handled && SelectedDate.HasValue && _calendar != null)
+            {
+                DateTime selectedDate = this.SelectedDate.Value;
+                DateTime? newDate = DateTimeHelper.AddDays(selectedDate, e.Delta.Y > 0 ? -1 : 1);
+                if (newDate.HasValue && Calendar.IsValidDateSelection(_calendar, newDate.Value))
+                {
+                    SelectedDate = newDate;
+                    e.Handled = true;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            if(IsEnabled && _textBox != null && e.NavigationMethod == NavigationMethod.Tab)
+            {
+                _textBox.Focus();
+                var text = _textBox.Text;
+                if(!string.IsNullOrEmpty(text))
+                {
+                    _textBox.SelectionStart = 0;
+                    _textBox.SelectionEnd = text.Length;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            _isPressed = false;
+            UpdatePseudoClasses();
+
+            SetSelectedDate();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            var key = e.Key;
+
+            if ((key == Key.Space || key == Key.Enter) && IsEffectivelyEnabled) // Key.GamepadA is not currently supported
+            {
+                // Since the TextBox is used for direct date entry,
+                // it isn't supported to open the popup/flyout using these keys.
+                // Other controls open the popup/flyout here.
+            }
+            else if (key == Key.Down && e.KeyModifiers.HasAllFlags(KeyModifiers.Alt) && IsEffectivelyEnabled)
+            {
+                // It is only possible to open the popup using these keys.
+                // This is important as the down key is handled by calendar.
+                // If down also closed the popup, the date would move 1 week
+                // and then close the popup. This isn't user friendly at all.
+                // (calendar doesn't mark as handled either).
+                // The Escape key will still close the popup.
+                if (IsDropDownOpen == false)
+                {
+                    e.Handled = true;
+
+                    if (!_ignoreButtonClick)
+                    {
+                        TogglePopUp();
+                    }
+                    else
+                    {
+                        _ignoreButtonClick = false;
+                    }
+
+                    UpdatePseudoClasses();
+                }
+            }
+
+            base.OnKeyUp(e);
+        }
+
+        private void OnDateFormatChanged()
+        {
+            if (_textBox != null)
+            {
+                if (SelectedDate.HasValue)
+                {
+                    Text = DateTimeToString(SelectedDate.Value);
+                }
+                else if (string.IsNullOrEmpty(_textBox.Text))
+                {
+                    SetWaterMarkText();
+                }
+                else
+                {
+                    DateTime? date = ParseText(_textBox.Text);
+
+                    if (date != null)
+                    {
+                        string? s = DateTimeToString((DateTime)date);
+                        Text = s;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <param name="e">
+        /// A
+        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
+        /// that contains the event data.
+        /// </param>
+        protected virtual void OnDateValidationError(CalendarDatePickerDateValidationErrorEventArgs e)
+        {
+            DateValidationError?.Invoke(this, e);
+        }
+
+        private void OnDateSelected(DateTime? addedDate, DateTime? removedDate)
+        {
+            EventHandler<SelectionChangedEventArgs>? handler = this.SelectedDateChanged;
+            if (null != handler)
+            {
+                Collection<DateTime> addedItems = new Collection<DateTime>();
+                Collection<DateTime> removedItems = new Collection<DateTime>();
+
+                if (addedDate.HasValue)
+                {
+                    addedItems.Add(addedDate.Value);
+                }
+
+                if (removedDate.HasValue)
+                {
+                    removedItems.Add(removedDate.Value);
+                }
+
+                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, removedItems, addedItems));
+            }
+        }
+
+        private void OnCalendarClosed(EventArgs e)
+        {
+            CalendarClosed?.Invoke(this, e);
+        }
+
+        private void OnCalendarOpened(EventArgs e)
+        {
+            CalendarOpened?.Invoke(this, e);
+        }
+
+        private void Calendar_DayButtonMouseUp(object? sender, PointerReleasedEventArgs e)
+        {
+            Focus();
+            IsDropDownOpen = false;
+        }
+
+        private void Calendar_DisplayDateChanged(object? sender, CalendarDateChangedEventArgs e)
+        {
+            if (e.AddedDate != this.DisplayDate)
+            {
+                SetValue(DisplayDateProperty, (DateTime) e.AddedDate!);
+            }
+        }
+
+        private void Calendar_SelectedDatesChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            Debug.Assert(e.AddedItems.Count < 2, "There should be less than 2 AddedItems!");
+
+            if (e.AddedItems.Count > 0 && SelectedDate.HasValue && DateTime.Compare((DateTime)e.AddedItems[0]!, SelectedDate.Value) != 0)
+            {
+                SelectedDate = (DateTime?)e.AddedItems[0];
+            }
+            else
+            {
+                if (e.AddedItems.Count == 0)
+                {
+                    SelectedDate = null;
+                    return;
+                }
+
+                if (!SelectedDate.HasValue)
+                {
+                    if (e.AddedItems.Count > 0)
+                    {
+                        SelectedDate = (DateTime?)e.AddedItems[0];
+                    }
+                }
+            }
+        }
+
+        private void Calendar_PointerReleased(object? sender, PointerReleasedEventArgs e)
+        {
+             
+            if (e.InitialPressMouseButton == MouseButton.Left)
+            {
+                e.Handled = true;
+            }
+        }
+
+        private void Calendar_KeyDown(object? sender, KeyEventArgs e)
+        {
+            Calendar? c = sender as Calendar ?? throw new ArgumentException("Sender must be Calendar.", nameof(sender));
+
+            if (!e.Handled && (e.Key == Key.Enter || e.Key == Key.Space || e.Key == Key.Escape) && c.DisplayMode == CalendarMode.Month)
+            {
+                Focus();
+                IsDropDownOpen = false;
+
+                if (e.Key == Key.Escape)
+                {
+                    SelectedDate = _onOpenSelectedDate;
+                }
+            }
+        }
+
+        private void TextBox_GotFocus(object? sender, RoutedEventArgs e)
+        {
+            IsDropDownOpen = false;
+        }
+
+        private void TextBox_KeyDown(object? sender, KeyEventArgs e)
+        {
+            if (!e.Handled)
+            {
+                e.Handled = ProcessDatePickerKey(e);
+            }
+        }
+
+        private void TextBox_TextChanged()
+        {
+            if (_textBox != null)
+            {
+                _suspendTextChangeHandler = true;
+                Text = _textBox.Text;
+                _suspendTextChangeHandler = false;
+            }
+        }
+
+        private void DropDownButton_PointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            _ignoreButtonClick = _isPopupClosing;
+
+            _isPressed = true;
+            UpdatePseudoClasses();
+        }
+
+        private void DropDownButton_PointerReleased(object? sender, PointerReleasedEventArgs e)
+        {
+            _isPressed = false;
+            UpdatePseudoClasses();
+        }
+
+        private void DropDownButton_Click(object? sender, RoutedEventArgs e)
+        {
+            if (!_ignoreButtonClick)
+            {
+                TogglePopUp();
+            }
+            else
+            {
+                _ignoreButtonClick = false;
+            }
+        }
+
+        private void PopUp_Closed(object? sender, EventArgs e)
+        {
+            IsDropDownOpen = false;
+
+            if(!_isPopupClosing)
+            {
+                _isPopupClosing = true;
+                Threading.Dispatcher.UIThread.InvokeAsync(() => _isPopupClosing = false);
+            }
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="IsDropDownOpen"/> property to open/close the calendar popup.
+        /// This will automatically adjust control focus as well.
+        /// </summary>
+        private void TogglePopUp()
+        {
+            if (IsDropDownOpen)
+            {
+                Focus();
+                IsDropDownOpen = false;
+            }
+            else
+            {
+                SetSelectedDate();
+                IsDropDownOpen = true;
+                _calendar!.Focus();
+            }
+        }
+
+        private void OpenDropDown()
+        {
+            if (_calendar != null)
+            {
+                _calendar.Focus();
+
+                // Open the PopUp
+                _onOpenSelectedDate = SelectedDate;
+                _popUp!.IsOpen = true;
+                _isFlyoutOpen = _popUp!.IsOpen;
+
+                UpdatePseudoClasses();
+                _calendar.ResetStates();
+                OnCalendarOpened(new RoutedEventArgs());
+            }
+        }
+
+        /// <summary>
+        /// Input text is parsed in the correct format and changed into a
+        /// DateTime object.  If the text can not be parsed TextParseError Event
+        /// is thrown.
+        /// </summary>
+        /// <param name="text">Inherited code: Requires comment.</param>
+        /// <returns>
+        /// IT SHOULD RETURN NULL IF THE STRING IS NOT VALID, RETURN THE
+        /// DATETIME VALUE IF IT IS VALID.
+        /// </returns>
+        private DateTime? ParseText(string text)
+        {
+            DateTime newSelectedDate;
+
+            // TryParse is not used in order to be able to pass the exception to
+            // the TextParseError event
+            try
+            {
+                newSelectedDate = DateTime.Parse(text, DateTimeHelper.GetCurrentDateFormat());
+
+                if (Calendar.IsValidDateSelection(this._calendar!, newSelectedDate))
+                {
+                    return newSelectedDate;
+                }
+                else
+                {
+                    var dateValidationError = new CalendarDatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException(nameof(text), "SelectedDate value is not valid."), text);
+                    OnDateValidationError(dateValidationError);
+
+                    if (dateValidationError.ThrowException)
+                    {
+                        throw dateValidationError.Exception;
+                    }
+                }
+            }
+            catch (FormatException ex)
+            {
+                CalendarDatePickerDateValidationErrorEventArgs textParseError = new CalendarDatePickerDateValidationErrorEventArgs(ex, text);
+                OnDateValidationError(textParseError);
+
+                if (textParseError.ThrowException)
+                {
+                    throw textParseError.Exception;
+                }
+            }
+
+            return null;
+        }
+
+        private string? DateTimeToString(DateTime d)
+        {
+            DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
+
+            switch (SelectedDateFormat)
+            {
+                case CalendarDatePickerFormat.Short:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.ShortDatePattern, dtfi));
+                case CalendarDatePickerFormat.Long:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.LongDatePattern, dtfi));
+                case CalendarDatePickerFormat.Custom:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(CustomDateFormatString, dtfi));
+            }
+
+            return null;
+        }
+
+        private bool ProcessDatePickerKey(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    {
+                        SetSelectedDate();
+                        return true;
+                    }
+                case Key.Down:
+                    { 
+                        if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control)
+                        {
+                            TogglePopUp();
+                            return true;
+                        }
+                        break;
+                    }
+            }
+
+            return false;
+        }
+
+        private void SetSelectedDate()
+        {
+            if (_textBox != null)
+            {
+                if (!string.IsNullOrEmpty(_textBox.Text))
+                {
+                    string s = _textBox.Text;
+
+                    if (SelectedDate != null)
+                    {
+                        // If the string value of the SelectedDate and the
+                        // TextBox string value are equal, we do not parse the
+                        // string again if we do an extra parse, we lose data in
+                        // M/d/yy format.
+                        // ex: SelectedDate = DateTime(1008,12,19) but when
+                        // "12/19/08" is parsed it is interpreted as
+                        // DateTime(2008,12,19)
+                        string? selectedDate = DateTimeToString(SelectedDate.Value);
+                        if (selectedDate == s)
+                        {
+                            return;
+                        }
+                    }
+                    DateTime? d = SetTextBoxValue(s);
+                    
+                    if (SelectedDate != d)
+                    {
+                        SelectedDate = d;
+                    }
+                }
+                else
+                {
+                    if (SelectedDate != null)
+                    {
+                        SelectedDate = null;
+                    }
+                }
+            }
+            else
+            {
+                DateTime? d = SetTextBoxValue(_defaultText);
+
+                if (SelectedDate != d)
+                {
+                    SelectedDate = d;
+                }
+            }
+        }
+
+        private DateTime? SetTextBoxValue(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                SetValue(TextProperty, s);
+                return SelectedDate;
+            }
+            else
+            {
+                DateTime? d = ParseText(s);
+                if (d != null)
+                {
+                    SetValue(TextProperty, s);
+                    return d;
+                }
+                else
+                {
+                    // If parse error: TextBox should have the latest valid
+                    // SelectedDate value:
+                    if (SelectedDate != null)
+                    {
+                        string? newtext = this.DateTimeToString(SelectedDate.Value);
+                        SetValue(TextProperty, newtext);
+                        return SelectedDate;
+                    }
+                    else
+                    {
+                        SetWaterMarkText();
+                        return null;
+                    }
+                }
+            }
+        }
+
+        private void SetWaterMarkText()
+        {
+            if (_textBox != null)
+            {
+                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
+                {
+                    DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
+                    Text = string.Empty;
+                    _defaultText = string.Empty;
+                    var watermarkFormat = "<{0}>";
+                    string watermarkText;
+
+                    switch (SelectedDateFormat)
+                    {
+                        case CalendarDatePickerFormat.Long:
+                            {
+                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
+                                break;
+                            }
+                        case CalendarDatePickerFormat.Short:
+                        default:
+                            {
+                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
+                                break;
+                            }
+                    }
+                    _textBox.Watermark = watermarkText;
+                }
+                else
+                {
+                    _textBox.ClearValue(TextBox.WatermarkProperty);
+                }
+            }
+        }
+
+        private static bool IsValidSelectedDateFormat(CalendarDatePickerFormat value)
+        {
+            return value == CalendarDatePickerFormat.Long
+                || value == CalendarDatePickerFormat.Short
+                || value == CalendarDatePickerFormat.Custom;
+        }
+
+        private static bool IsValidDateFormatString(string formatString)
+        {
+            return !string.IsNullOrWhiteSpace(formatString);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs
new file mode 100644
index 0000000000..b58b549030
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs
@@ -0,0 +1,87 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+    /// event.
+    /// </summary>
+    public class CalendarDatePickerDateValidationErrorEventArgs : EventArgs
+    {
+        private bool _throwException;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
+        /// class.
+        /// </summary>
+        /// <param name="exception">
+        /// The initial exception from the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </param>
+        /// <param name="text">
+        /// The text that caused the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </param>
+        public CalendarDatePickerDateValidationErrorEventArgs(Exception exception, string text)
+        {
+            Text = text;
+            Exception = exception;
+        }
+
+        /// <summary>
+        /// Gets the initial exception associated with the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <value>
+        /// The exception associated with the validation failure.
+        /// </value>
+        public Exception Exception { get; private set; }
+
+        /// <summary>
+        /// Gets the text that caused the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <value>
+        /// The text that caused the validation failure.
+        /// </value>
+        public string Text { get; private set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether
+        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
+        /// should be thrown.
+        /// </summary>
+        /// <value>
+        /// True if the exception should be thrown; otherwise, false.
+        /// </value>
+        /// <exception cref="T:System.ArgumentException">
+        /// If set to true and
+        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
+        /// is null.
+        /// </exception>
+        public bool ThrowException
+        {
+            get => _throwException;
+            set
+            {
+                if (value && Exception == null)
+                {
+                    throw new ArgumentException("Cannot Throw Null Exception");
+                }
+
+                _throwException = value;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs
new file mode 100644
index 0000000000..ffd1f6f594
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs
@@ -0,0 +1,31 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Specifies date formats for a
+    /// <see cref="T:Avalonia.Controls.CalendarDatePicker" />.
+    /// </summary>
+    public enum CalendarDatePickerFormat
+    {
+        /// <summary>
+        /// Specifies that the date should be displayed using unabbreviated days
+        /// of the week and month names.
+        /// </summary>
+        Long = 0,
+
+        /// <summary>
+        /// Specifies that the date should be displayed using abbreviated days
+        /// of the week and month names.
+        /// </summary>
+        Short = 1,
+
+        /// <summary>
+        /// Specifies that the date should be displayed using a custom format string.
+        /// </summary>
+        Custom = 2
+    }
+}
diff --git a/src/Avalonia.Controls/Canvas.cs b/src/Avalonia.Controls/Canvas.cs
index fabf8978c7..adee7d4d90 100644
--- a/src/Avalonia.Controls/Canvas.cs
+++ b/src/Avalonia.Controls/Canvas.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reactive.Concurrency;
 using Avalonia.Input;
 using Avalonia.Layout;
 
@@ -159,47 +160,57 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Arranges the control's children.
+        /// Arranges a single child.
         /// </summary>
-        /// <param name="finalSize">The size allocated to the control.</param>
-        /// <returns>The space taken.</returns>
-        protected override Size ArrangeOverride(Size finalSize)
+        /// <param name="child">The child to arrange.</param>
+        /// <param name="finalSize">The size allocated to the canvas.</param>
+        protected virtual void ArrangeChild(Control child, Size finalSize)
         {
-            foreach (Control child in Children)
-            {
-                double x = 0.0;
-                double y = 0.0;
-                double elementLeft = GetLeft(child);
+            double x = 0.0;
+            double y = 0.0;
+            double elementLeft = GetLeft(child);
 
-                if (!double.IsNaN(elementLeft))
-                {
-                    x = elementLeft;
-                }
-                else
+            if (!double.IsNaN(elementLeft))
+            {
+                x = elementLeft;
+            }
+            else
+            {
+                // Arrange with right.
+                double elementRight = GetRight(child);
+                if (!double.IsNaN(elementRight))
                 {
-                    // Arrange with right.
-                    double elementRight = GetRight(child);
-                    if (!double.IsNaN(elementRight))
-                    {
-                        x = finalSize.Width - child.DesiredSize.Width - elementRight;
-                    }
+                    x = finalSize.Width - child.DesiredSize.Width - elementRight;
                 }
+            }
 
-                double elementTop = GetTop(child);
-                if (!double.IsNaN(elementTop) )
-                {
-                    y = elementTop;
-                }
-                else
+            double elementTop = GetTop(child);
+            if (!double.IsNaN(elementTop))
+            {
+                y = elementTop;
+            }
+            else
+            {
+                double elementBottom = GetBottom(child);
+                if (!double.IsNaN(elementBottom))
                 {
-                    double elementBottom = GetBottom(child);
-                    if (!double.IsNaN(elementBottom))
-                    {
-                        y = finalSize.Height - child.DesiredSize.Height - elementBottom;
-                    }
+                    y = finalSize.Height - child.DesiredSize.Height - elementBottom;
                 }
+            }
 
-                child.Arrange(new Rect(new Point(x, y), child.DesiredSize));
+            child.Arrange(new Rect(new Point(x, y), child.DesiredSize));
+        }
+
+        /// <summary>
+        /// Arranges the control's children.
+        /// </summary>
+        /// <param name="finalSize">The size allocated to the control.</param>
+        /// <returns>The space taken.</returns>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            foreach (Control child in Children)
+            {
+                ArrangeChild(child, finalSize);
             }
 
             return finalSize;
diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs
index 4cacf51fa1..28a4aa6436 100644
--- a/src/Avalonia.Controls/Carousel.cs
+++ b/src/Avalonia.Controls/Carousel.cs
@@ -20,8 +20,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="PageTransition"/> property.
         /// </summary>
-        public static readonly StyledProperty<IPageTransition> PageTransitionProperty =
-            AvaloniaProperty.Register<Carousel, IPageTransition>(nameof(PageTransition));
+        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
+            AvaloniaProperty.Register<Carousel, IPageTransition?>(nameof(PageTransition));
 
         /// <summary>
         /// The default value of <see cref="ItemsControl.ItemsPanelProperty"/> for 
@@ -54,7 +54,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the transition to use when moving between pages.
         /// </summary>
-        public IPageTransition PageTransition
+        public IPageTransition? PageTransition
         {
             get { return GetValue(PageTransitionProperty); }
             set { SetValue(PageTransitionProperty, value); }
diff --git a/src/Avalonia.Controls/CheckBox.cs b/src/Avalonia.Controls/CheckBox.cs
index 05d49a44b1..238a21393f 100644
--- a/src/Avalonia.Controls/CheckBox.cs
+++ b/src/Avalonia.Controls/CheckBox.cs
@@ -1,3 +1,5 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
@@ -7,5 +9,9 @@ namespace Avalonia.Controls
     /// </summary>
     public class CheckBox : ToggleButton
     {
+        static CheckBox()
+        {
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<CheckBox>(AutomationControlType.CheckBox);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
index 1cad1a4c69..6d7e542bb2 100644
--- a/src/Avalonia.Controls/Chrome/CaptionButtons.cs
+++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
@@ -8,6 +8,10 @@ namespace Avalonia.Controls.Chrome
     /// <summary>
     /// Draws window minimize / maximize / close buttons in a <see cref="TitleBar"/> when managed client decorations are enabled.
     /// </summary>
+    [TemplatePart("PART_CloseButton",      typeof(Button))]
+    [TemplatePart("PART_RestoreButton",    typeof(Button))]
+    [TemplatePart("PART_MinimiseButton",   typeof(Button))]
+    [TemplatePart("PART_FullScreenButton", typeof(Button))]
     [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
     public class CaptionButtons : TemplatedControl
     {
@@ -84,18 +88,15 @@ namespace Avalonia.Controls.Chrome
         {
             base.OnApplyTemplate(e);
 
-            var closeButton = e.NameScope.Get<Panel>("PART_CloseButton");
-            var restoreButton = e.NameScope.Get<Panel>("PART_RestoreButton");
-            var minimiseButton = e.NameScope.Get<Panel>("PART_MinimiseButton");
-            var fullScreenButton = e.NameScope.Get<Panel>("PART_FullScreenButton");
+            var closeButton = e.NameScope.Get<Button>("PART_CloseButton");
+            var restoreButton = e.NameScope.Get<Button>("PART_RestoreButton");
+            var minimiseButton = e.NameScope.Get<Button>("PART_MinimiseButton");
+            var fullScreenButton = e.NameScope.Get<Button>("PART_FullScreenButton");
 
-            closeButton.PointerReleased += (sender, e) => OnClose();
-
-            restoreButton.PointerReleased += (sender, e) => OnRestore();
-
-            minimiseButton.PointerReleased += (sender, e) => OnMinimize();
-
-            fullScreenButton.PointerReleased += (sender, e) => OnToggleFullScreen();
+            closeButton.Click += (sender, e) => OnClose();
+            restoreButton.Click += (sender, e) => OnRestore();
+            minimiseButton.Click += (sender, e) => OnMinimize();
+            fullScreenButton.Click += (sender, e) => OnToggleFullScreen();
         }
     }
 }
diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
index 4da50e7220..1bf13111a9 100644
--- a/src/Avalonia.Controls/Chrome/TitleBar.cs
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -8,6 +8,7 @@ namespace Avalonia.Controls.Chrome
     /// <summary>
     /// Draws a titlebar when managed client decorations are enabled.
     /// </summary>
+    [TemplatePart("PART_CaptionButtons", typeof(CaptionButtons))]
     [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
     public class TitleBar : TemplatedControl
     {
@@ -43,13 +44,13 @@ namespace Avalonia.Controls.Chrome
             base.OnApplyTemplate(e);
 
             _captionButtons?.Detach();
-            
+
             _captionButtons = e.NameScope.Get<CaptionButtons>("PART_CaptionButtons");
 
             if (VisualRoot is Window window)
             {
-                _captionButtons?.Attach(window);   
-                
+                _captionButtons?.Attach(window);
+
                 UpdateSize(window);
             }
         }
@@ -89,7 +90,7 @@ namespace Avalonia.Controls.Chrome
             base.OnDetachedFromVisualTree(e);
 
             _disposables?.Dispose();
-            
+
             _captionButtons?.Detach();
             _captionButtons = null;
         }
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index 72b09b7a3c..54196bdf1a 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Avalonia.Automation.Peers;
 using System.Reactive.Disposables;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Mixins;
@@ -12,14 +13,19 @@ using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.VisualTree;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A drop-down list control.
     /// </summary>
+    [TemplatePart("PART_Popup", typeof(Popup))]
+    [PseudoClasses(pcDropdownOpen, pcPressed)]
     public class ComboBox : SelectingItemsControl
     {
+        public const string pcDropdownOpen = ":dropdownopen";
+        public const string pcPressed = ":pressed";
         /// <summary>
         /// The default value for the <see cref="ItemsControl.ItemsPanel"/> property.
         /// </summary>
@@ -92,6 +98,7 @@ namespace Avalonia.Controls
             SelectedItemProperty.Changed.AddClassHandler<ComboBox>((x, e) => x.SelectedItemChanged(e));
             KeyDownEvent.AddClassHandler<ComboBox>((x, e) => x.OnKeyDown(e), Interactivity.RoutingStrategies.Tunnel);
             IsTextSearchEnabledProperty.OverrideDefaultValue<ComboBox>(true);
+            IsDropDownOpenProperty.Changed.AddClassHandler<ComboBox>((x, e) => x.DropdownChanged(e));
         }
 
         /// <summary>
@@ -178,7 +185,13 @@ namespace Avalonia.Controls
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            this.UpdateSelectionBoxItem(SelectedItem);
+            UpdateSelectionBoxItem(SelectedItem);
+        }
+
+        public override void InvalidateMirrorTransform()
+        {
+            base.InvalidateMirrorTransform();
+            UpdateFlowDirection();
         }
 
         /// <inheritdoc/>
@@ -258,6 +271,20 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <inheritdoc/>
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+            if(!e.Handled && e.Source is IVisual source)
+            {
+                if (_popup?.IsInsidePopup(source) == true)
+                {
+                    return;
+                }
+            }
+            PseudoClasses.Set(pcPressed, true);
+        }
+
         /// <inheritdoc/>
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
         {
@@ -277,10 +304,12 @@ namespace Avalonia.Controls
                     e.Handled = true;
                 }
             }
-
+            PseudoClasses.Set(pcPressed, false);
             base.OnPointerReleased(e);
+            
         }
 
+
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
@@ -295,6 +324,11 @@ namespace Avalonia.Controls
             _popup.Closed += PopupClosed;
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new ComboBoxAutomationPeer(this);
+        }
+
         internal void ItemFocused(ComboBoxItem dropDownItem)
         {
             if (IsDropDownOpen && dropDownItem.IsFocused && dropDownItem.IsArrangeValid)
@@ -338,6 +372,8 @@ namespace Avalonia.Controls
             {
                 parent.GetObservable(IsVisibleProperty).Subscribe(IsVisibleChanged).DisposeWith(_subscriptionsOnOpen);
             }
+
+            UpdateFlowDirection();
         }
 
         private void IsVisibleChanged(bool isVisible)
@@ -405,6 +441,8 @@ namespace Avalonia.Controls
                         }
                     };
                 }
+
+                UpdateFlowDirection();
             }
             else
             {
@@ -412,6 +450,19 @@ namespace Avalonia.Controls
             }
         }
 
+        private void UpdateFlowDirection()
+        {
+            if (SelectionBoxItem is Rectangle rectangle)
+            {
+                if ((rectangle.Fill as VisualBrush)?.Visual is Control content)
+                {
+                    var flowDirection = (((IVisual)content!).VisualParent as Control)?.FlowDirection ?? 
+                        FlowDirection.LeftToRight;
+                    rectangle.FlowDirection = flowDirection;
+                }
+            }
+        }
+
         private void SelectFocusedItem()
         {
             foreach (ItemContainerInfo dropdownItem in ItemContainerGenerator.Containers)
@@ -426,42 +477,24 @@ namespace Avalonia.Controls
 
         private void SelectNext()
         {
-            int next = SelectedIndex + 1;
-
-            if (next >= ItemCount)
+            if (ItemCount >= 1)
             {
-                if (WrapSelection == true)
-                {
-                    next = 0;
-                }
-                else
-                {
-                    return;
-                }
+                MoveSelection(NavigationDirection.Next, WrapSelection);
             }
-
-
-
-            SelectedIndex = next;
         }
 
         private void SelectPrev()
         {
-            int prev = SelectedIndex - 1;
-
-            if (prev < 0)
+            if (ItemCount >= 1)
             {
-                if (WrapSelection == true)
-                {
-                    prev = ItemCount - 1;
-                }
-                else
-                {
-                    return;
-                }
+                MoveSelection(NavigationDirection.Previous, WrapSelection);
             }
+        }
 
-            SelectedIndex = prev;
+        private void DropdownChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            bool newValue = e.GetNewValue<bool>();
+            PseudoClasses.Set(pcDropdownOpen, newValue);
         }
     }
 }
diff --git a/src/Avalonia.Controls/ComboBoxItem.cs b/src/Avalonia.Controls/ComboBoxItem.cs
index a0a1f2a4aa..83057d139f 100644
--- a/src/Avalonia.Controls/ComboBoxItem.cs
+++ b/src/Avalonia.Controls/ComboBoxItem.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Reactive.Linq;
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 
 namespace Avalonia.Controls
 {
@@ -13,5 +15,10 @@ namespace Avalonia.Controls
             this.GetObservable(ComboBoxItem.IsFocusedProperty).Where(focused => focused)
                 .Subscribe(_ => (Parent as ComboBox)?.ItemFocused(this));
         }
+
+        static ComboBoxItem()
+        {
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<ComboBoxItem>(AutomationControlType.ComboBoxItem);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index ac7d24be92..b8a45e102f 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -1,4 +1,5 @@
 using Avalonia.Collections;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -12,6 +13,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Displays <see cref="Content"/> according to a <see cref="FuncDataTemplate"/>.
     /// </summary>
+    [TemplatePart("PART_ContentPresenter", typeof(IContentPresenter))]
     public class ContentControl : TemplatedControl, IContentControl, IContentPresenterHost
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index dff06a6369..7b35e35278 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Avalonia.Automation.Peers;
 using System.Linq;
 using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Generators;
@@ -13,6 +14,7 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Styling;
+using Avalonia.Automation;
 
 namespace Avalonia.Controls
 {
@@ -61,7 +63,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PlacementRect"/> property.
         /// </summary>
         public static readonly StyledProperty<Rect?> PlacementRectProperty =
-            AvaloniaProperty.Register<Popup, Rect?>(nameof(PlacementRect));
+            Popup.PlacementRectProperty.AddOwner<ContextMenu>();
 
         /// <summary>
         /// Defines the <see cref="WindowManagerAddShadowHint"/> property.
@@ -107,6 +109,8 @@ namespace Avalonia.Controls
             ItemsPanelProperty.OverrideDefaultValue<ContextMenu>(DefaultPanel);
             PlacementModeProperty.OverrideDefaultValue<ContextMenu>(PlacementMode.Pointer);
             ContextMenuProperty.Changed.Subscribe(ContextMenuChanged);
+            AutomationProperties.AccessibilityViewProperty.OverrideDefaultValue<ContextMenu>(AccessibilityView.Control);
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<ContextMenu>(AutomationControlType.Menu);
         }
 
         /// <summary>
@@ -237,13 +241,13 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == WindowManagerAddShadowHintProperty && _popup != null)
             {
-                _popup.WindowManagerAddShadowHint = change.NewValue.GetValueOrDefault<bool>();
+                _popup.WindowManagerAddShadowHint = change.GetNewValue<bool>();
             }
         }
 
@@ -347,6 +351,11 @@ namespace Avalonia.Controls
                 ? PlacementMode.Bottom
                 : PlacementMode;
 
+            //Position of the line below is really important. 
+            //All styles are being applied only when control has logical parent.
+            //Line below will add ContextMenu as child to the Popup and this will trigger styles and they would be applied.
+            //If you will move line below somewhere else it may cause that ContextMenu will behave differently from what you are expecting.
+            _popup.Child = this;
             _popup.PlacementTarget = placementTarget;
             _popup.HorizontalOffset = HorizontalOffset;
             _popup.VerticalOffset = VerticalOffset;
@@ -355,7 +364,6 @@ namespace Avalonia.Controls
             _popup.PlacementGravity = PlacementGravity;
             _popup.PlacementRect = PlacementRect;
             _popup.WindowManagerAddShadowHint = WindowManagerAddShadowHint;
-            _popup.Child = this;
             IsOpen = true;
             _popup.IsOpen = true;
 
@@ -442,6 +450,11 @@ namespace Avalonia.Controls
             if (sender is Control control
                 && control.ContextMenu is ContextMenu contextMenu)
             {
+                if (contextMenu._popup?.Parent == control)
+                {
+                    ((ISetLogicalParent)contextMenu._popup).SetParent(null);
+                }
+
                 contextMenu.Close();
             }
         }
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index b9f3bd8890..beaee34b07 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -1,14 +1,18 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Runtime.CompilerServices;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Rendering;
 using Avalonia.Styling;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -52,23 +56,66 @@ namespace Avalonia.Controls
         /// Event raised when an element wishes to be scrolled into view.
         /// </summary>
         public static readonly RoutedEvent<RequestBringIntoViewEventArgs> RequestBringIntoViewEvent =
-            RoutedEvent.Register<Control, RequestBringIntoViewEventArgs>("RequestBringIntoView", RoutingStrategies.Bubble);
+            RoutedEvent.Register<Control, RequestBringIntoViewEventArgs>(
+                "RequestBringIntoView",
+                RoutingStrategies.Bubble);
 
         /// <summary>
         /// Provides event data for the <see cref="ContextRequested"/> event.
         /// </summary>
         public static readonly RoutedEvent<ContextRequestedEventArgs> ContextRequestedEvent =
-            RoutedEvent.Register<Control, ContextRequestedEventArgs>(nameof(ContextRequested),
+            RoutedEvent.Register<Control, ContextRequestedEventArgs>(
+                nameof(ContextRequested),
                 RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
         
+        /// <summary>
+        /// Defines the <see cref="Loaded"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> LoadedEvent =
+            RoutedEvent.Register<Control, RoutedEventArgs>(
+                nameof(Loaded),
+                RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="Unloaded"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> UnloadedEvent =
+            RoutedEvent.Register<Control, RoutedEventArgs>(
+                nameof(Unloaded),
+                RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="SizeChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<SizeChangedEventArgs> SizeChangedEvent =
+            RoutedEvent.Register<Control, SizeChangedEventArgs>(
+                nameof(SizeChanged), RoutingStrategies.Direct);
+
         /// <summary>
         /// Defines the <see cref="FlowDirection"/> property.
         /// </summary>
         public static readonly AttachedProperty<FlowDirection> FlowDirectionProperty =
-            AvaloniaProperty.RegisterAttached<Control, Control, FlowDirection>(nameof(FlowDirection), inherits: true);
-        
+            AvaloniaProperty.RegisterAttached<Control, Control, FlowDirection>(
+                nameof(FlowDirection),
+                inherits: true);
+
+        // Note the following:
+        // _loadedQueue :
+        //   Is the queue where any control will be added to indicate that its loaded
+        //   event should be scheduled and called later.
+        // _loadedProcessingQueue :
+        //   Contains a copied snapshot of the _loadedQueue at the time when processing
+        //   starts and individual events are being fired. This was needed to avoid
+        //   exceptions if new controls were added in the Loaded event itself.
+
+        private static bool _isLoadedProcessing = false;
+        private static readonly HashSet<Control> _loadedQueue = new HashSet<Control>();
+        private static readonly HashSet<Control> _loadedProcessingQueue = new HashSet<Control>();
+
+        private bool _isLoaded = false;
         private DataTemplates? _dataTemplates;
         private IControl? _focusAdorner;
+        private AutomationPeer? _automationPeer;
 
         /// <summary>
         /// Gets or sets the control's focus adorner.
@@ -106,6 +153,15 @@ namespace Avalonia.Controls
             set => SetValue(ContextFlyoutProperty, value);
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the control is fully constructed in the visual tree
+        /// and both layout and render are complete.
+        /// </summary>
+        /// <remarks>
+        /// This is set to true while raising the <see cref="Loaded"/> event.
+        /// </remarks>
+        public bool IsLoaded => _isLoaded;
+
         /// <summary>
         /// Gets or sets a user-defined object attached to the control.
         /// </summary>
@@ -133,11 +189,79 @@ namespace Avalonia.Controls
             remove => RemoveHandler(ContextRequestedEvent, value);
         }
 
+        /// <summary>
+        /// Occurs when the control has been fully constructed in the visual tree and both
+        /// layout and render are complete.
+        /// </summary>
+        /// <remarks>
+        /// This event is guaranteed to occur after the control template is applied and references
+        /// to objects created after the template is applied are available. This makes it different
+        /// from OnAttachedToVisualTree which doesn't have these references. This event occurs at the
+        /// latest possible time in the control creation life-cycle.
+        /// </remarks>
+        public event EventHandler<RoutedEventArgs>? Loaded
+        {
+            add => AddHandler(LoadedEvent, value);
+            remove => RemoveHandler(LoadedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs when the control is removed from the visual tree.
+        /// </summary>
+        /// <remarks>
+        /// This is API symmetrical with <see cref="Loaded"/> and exists for compatibility with other
+        /// XAML frameworks; however, it behaves the same as OnDetachedFromVisualTree.
+        /// </remarks>
+        public event EventHandler<RoutedEventArgs>? Unloaded
+        {
+            add => AddHandler(UnloadedEvent, value);
+            remove => RemoveHandler(UnloadedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs when the bounds (actual size) of the control have changed.
+        /// </summary>
+        public event EventHandler<SizeChangedEventArgs>? SizeChanged
+        {
+            add => AddHandler(SizeChangedEvent, value);
+            remove => RemoveHandler(SizeChangedEvent, value);
+        }
+
         public new IControl? Parent => (IControl?)base.Parent;
 
+        /// <summary>
+        /// Gets the value of the attached <see cref="FlowDirectionProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The flow direction.</returns>
+        public static FlowDirection GetFlowDirection(Control control)
+        {
+            return control.GetValue(FlowDirectionProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FlowDirectionProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFlowDirection(Control control, FlowDirection value)
+        {
+            control.SetValue(FlowDirectionProperty, value);
+        }
+
         /// <inheritdoc/>
         bool IDataTemplateHost.IsDataTemplatesInitialized => _dataTemplates != null;
 
+        /// <summary>
+        /// Gets a value indicating whether control bypass FlowDirecton policies.
+        /// </summary>
+        /// <remarks>
+        /// Related to FlowDirection system and returns false as default, so if 
+        /// <see cref="FlowDirection"/> is RTL then control will get a mirror presentation. 
+        /// For controls that want to avoid this behavior, override this property and return true.
+        /// </remarks>
+        protected virtual bool BypassFlowDirectionPolicies => false;
+
         /// <inheritdoc/>
         void ISetterValue.Initialize(ISetter setter)
         {
@@ -183,18 +307,130 @@ namespace Avalonia.Controls
         /// <returns>The control that receives the focus adorner.</returns>
         protected virtual IControl? GetTemplateFocusTarget() => this;
 
+        private static Action loadedProcessingAction = () =>
+        {
+            // Copy the loaded queue for processing
+            // There was a possibility of the "Collection was modified; enumeration operation may not execute."
+            // exception when only a single hash set was used. This could happen when new controls are added
+            // within the Loaded callback/event itself. To fix this, two hash sets are used and while one is
+            // being processed the other accepts adding new controls to process next.
+            _loadedProcessingQueue.Clear();
+            foreach (Control control in _loadedQueue)
+            {
+                _loadedProcessingQueue.Add(control);
+            }
+            _loadedQueue.Clear();
+
+            foreach (Control control in _loadedProcessingQueue)
+            {
+                control.OnLoadedCore();
+            }
+
+            _loadedProcessingQueue.Clear();
+            _isLoadedProcessing = false;
+
+            // Restart if any controls were added to the queue while processing
+            if (_loadedQueue.Count > 0)
+            {
+                _isLoadedProcessing = true;
+                Dispatcher.UIThread.Post(loadedProcessingAction!, DispatcherPriority.Loaded);
+            }
+        };
+
+        /// <summary>
+        /// Schedules <see cref="OnLoadedCore"/> to be called for this control.
+        /// For performance, it will be queued with other controls.
+        /// </summary>
+        internal void ScheduleOnLoadedCore()
+        {
+            if (_isLoaded == false)
+            {
+                bool isAdded = _loadedQueue.Add(this);
+
+                if (isAdded &&
+                    _isLoadedProcessing == false)
+                {
+                    _isLoadedProcessing = true;
+                    Dispatcher.UIThread.Post(loadedProcessingAction!, DispatcherPriority.Loaded);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Invoked as the first step of marking the control as loaded and raising the
+        /// <see cref="Loaded"/> event.
+        /// </summary>
+        internal void OnLoadedCore()
+        {
+            if (_isLoaded == false &&
+                ((ILogical)this).IsAttachedToLogicalTree)
+            {
+                _isLoaded = true;
+                OnLoaded();
+            }
+        }
+
+        /// <summary>
+        /// Invoked as the first step of marking the control as unloaded and raising the
+        /// <see cref="Unloaded"/> event.
+        /// </summary>
+        internal void OnUnloadedCore()
+        {
+            if (_isLoaded)
+            {
+                // Remove from the loaded event queue here as a failsafe in case the control
+                // is detached before the dispatcher runs the Loaded jobs.
+                _loadedQueue.Remove(this);
+
+                _isLoaded = false;
+                OnUnloaded();
+            }
+        }
+
+        /// <summary>
+        /// Invoked just before the <see cref="Loaded"/> event.
+        /// </summary>
+        protected virtual void OnLoaded()
+        {
+            var eventArgs = new RoutedEventArgs(LoadedEvent);
+            eventArgs.Source = null;
+            RaiseEvent(eventArgs);
+        }
+
+        /// <summary>
+        /// Invoked just before the <see cref="Unloaded"/> event.
+        /// </summary>
+        protected virtual void OnUnloaded()
+        {
+            var eventArgs = new RoutedEventArgs(UnloadedEvent);
+            eventArgs.Source = null;
+            RaiseEvent(eventArgs);
+        }
+
         /// <inheritdoc/>
         protected sealed override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTreeCore(e);
 
             InitializeIfNeeded();
+
+            ScheduleOnLoadedCore();
         }
 
         /// <inheritdoc/>
         protected sealed override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTreeCore(e);
+
+            OnUnloadedCore();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            InvalidateMirrorTransform();
         }
 
         /// <inheritdoc/>
@@ -242,6 +478,24 @@ namespace Avalonia.Controls
             }
         }
 
+        protected virtual AutomationPeer OnCreateAutomationPeer()
+        {
+            return new NoneAutomationPeer(this);
+        }
+
+        internal AutomationPeer GetOrCreateAutomationPeer()
+        {
+            VerifyAccess();
+
+            if (_automationPeer is object)
+            {
+                return _automationPeer;
+            }
+
+            _automationPeer = OnCreateAutomationPeer();
+            return _automationPeer;
+        }
+
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
         {
             base.OnPointerReleased(e);
@@ -266,7 +520,9 @@ namespace Avalonia.Controls
                 var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>()?.OpenContextMenu;
 
                 if (keymap is null)
+                {
                     return;
+                }
 
                 var matches = false;
 
@@ -289,5 +545,71 @@ namespace Avalonia.Controls
                 }
             }
         }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == BoundsProperty)
+            {
+                var oldValue = change.GetOldValue<Rect>();
+                var newValue = change.GetNewValue<Rect>();
+
+                // Bounds is a Rect with an X/Y Position as well as Height/Width.
+                // This means it is possible for the Rect to change position but not size.
+                // Therefore, we want to explicity check only the size and raise an event
+                // only when that size has changed.
+                if (newValue.Size != oldValue.Size)
+                {
+                    var sizeChangedEventArgs = new SizeChangedEventArgs(
+                        SizeChangedEvent,
+                        source: this,
+                        previousSize: new Size(oldValue.Width, oldValue.Height),
+                        newSize: new Size(newValue.Width, newValue.Height));
+
+                    RaiseEvent(sizeChangedEventArgs);
+                }
+            }
+            else if (change.Property == FlowDirectionProperty)
+            {
+                InvalidateMirrorTransform();
+
+                foreach (var visual in VisualChildren)
+                {
+                    if (visual is Control child)
+                    {
+                        child.InvalidateMirrorTransform();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Computes the <see cref="IVisual.HasMirrorTransform"/> value according to the 
+        /// <see cref="FlowDirection"/> and <see cref="BypassFlowDirectionPolicies"/>
+        /// </summary>
+        public virtual void InvalidateMirrorTransform()
+        {
+            var flowDirection = this.FlowDirection;
+            var parentFlowDirection = FlowDirection.LeftToRight;
+
+            bool bypassFlowDirectionPolicies = BypassFlowDirectionPolicies;
+            bool parentBypassFlowDirectionPolicies = false;
+
+            var parent = ((IVisual)this).VisualParent as Control;
+            if (parent != null)
+            {
+                parentFlowDirection = parent.FlowDirection;
+                parentBypassFlowDirectionPolicies = parent.BypassFlowDirectionPolicies;
+            }
+
+            bool thisShouldBeMirrored = flowDirection == FlowDirection.RightToLeft && !bypassFlowDirectionPolicies;
+            bool parentShouldBeMirrored = parentFlowDirection == FlowDirection.RightToLeft && !parentBypassFlowDirectionPolicies;
+
+            bool shouldApplyMirrorTransform = thisShouldBeMirrored != parentShouldBeMirrored;
+
+            HasMirrorTransform = shouldApplyMirrorTransform;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
index 643c30178e..a91f143019 100644
--- a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
+++ b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
@@ -1,27 +1,32 @@
 using System;
 using System.Globalization;
-
 using Avalonia.Data.Converters;
 
 namespace Avalonia.Controls.Converters
 {
     /// <summary>
     /// Converts an existing CornerRadius struct to a new CornerRadius struct,
-    /// with filters applied to extract only the specified fields, leaving the others set to 0.
+    /// with filters applied to extract only the specified corners, leaving the others set to 0.
     /// </summary>
     public class CornerRadiusFilterConverter : IValueConverter
     {
         /// <summary>
-        /// Gets or sets the type of the filter applied to the <see cref="CornerRadiusFilterConverter"/>.
+        /// Gets or sets the corners to filter by.
+        /// Only the specified corners will be included in the converted <see cref="CornerRadius"/>.
         /// </summary>
-        public CornerRadiusFilterKinds Filter { get; set; }
+        public Corners Filter { get; set; }
 
         /// <summary>
-        /// Gets or sets the scale multiplier applied to the <see cref="CornerRadiusFilterConverter"/>.
+        /// Gets or sets the scale multiplier applied uniformly to each corner.
         /// </summary>
         public double Scale { get; set; } = 1;
 
-        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
         {
             if (!(value is CornerRadius radius))
             {
@@ -29,13 +34,18 @@ namespace Avalonia.Controls.Converters
             }
 
             return new CornerRadius(
-                Filter.HasAllFlags(CornerRadiusFilterKinds.TopLeft) ? radius.TopLeft * Scale : 0,
-                Filter.HasAllFlags(CornerRadiusFilterKinds.TopRight) ? radius.TopRight * Scale : 0,
-                Filter.HasAllFlags(CornerRadiusFilterKinds.BottomRight) ? radius.BottomRight * Scale : 0,
-                Filter.HasAllFlags(CornerRadiusFilterKinds.BottomLeft) ? radius.BottomLeft * Scale : 0);
+                Filter.HasAllFlags(Corners.TopLeft) ? radius.TopLeft * Scale : 0,
+                Filter.HasAllFlags(Corners.TopRight) ? radius.TopRight * Scale : 0,
+                Filter.HasAllFlags(Corners.BottomRight) ? radius.BottomRight * Scale : 0,
+                Filter.HasAllFlags(Corners.BottomLeft) ? radius.BottomLeft * Scale : 0);
         }
 
-        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Avalonia.Controls/Converters/CornerRadiusFilterKind.cs b/src/Avalonia.Controls/Converters/CornerRadiusFilterKind.cs
deleted file mode 100644
index 6a9d0596be..0000000000
--- a/src/Avalonia.Controls/Converters/CornerRadiusFilterKind.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-namespace Avalonia.Controls.Converters
-{
-    /// <summary>
-    /// Defines constants that specify the filter type for a <see cref="CornerRadiusFilterConverter"/> instance.
-    /// </summary>
-    [Flags]
-    public enum CornerRadiusFilterKinds
-    {
-        /// <summary>
-        /// No filter applied.
-        /// </summary>
-        None,
-        /// <summary>
-        /// Filters TopLeft value.
-        /// </summary>
-        TopLeft = 1,
-        /// <summary>
-        /// Filters TopRight value.
-        /// </summary>
-        TopRight = 2,
-        /// <summary>
-        /// Filters BottomLeft value.
-        /// </summary>
-        BottomLeft = 4,
-        /// <summary>
-        /// Filters BottomRight value.
-        /// </summary>
-        BottomRight = 8
-    }
-}
diff --git a/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs
new file mode 100644
index 0000000000..6da15b61e6
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts one corner of a <see cref="CornerRadius"/> to its double value.
+    /// </summary>
+    public class CornerRadiusToDoubleConverter : IValueConverter
+    {
+        /// <summary>
+        /// Gets or sets the specific corner of the <see cref="CornerRadius"/> to convert to double.
+        /// </summary>
+        public Corners Corner { get; set; }
+
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (!(value is CornerRadius cornerRadius))
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            switch (Corner)
+            {
+                case Corners.TopLeft:
+                    return cornerRadius.TopLeft;
+                case Corners.TopRight:
+                    return cornerRadius.TopRight;
+                case Corners.BottomRight:
+                    return cornerRadius.BottomRight;
+                case Corners.BottomLeft:
+                    return cornerRadius.BottomLeft;
+                default:
+                    return 0.0;
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/Corners.cs b/src/Avalonia.Controls/Converters/Corners.cs
new file mode 100644
index 0000000000..22ac4cb5f9
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/Corners.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Defines constants that specify one or more corners of a <see cref="CornerRadius"/>.
+    /// </summary>
+    [Flags]
+    public enum Corners
+    {
+        /// <summary>
+        /// No corner.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The TopLeft corner.
+        /// </summary>
+        TopLeft = 1,
+
+        /// <summary>
+        /// The TopRight corner.
+        /// </summary>
+        TopRight = 2,
+
+        /// <summary>
+        /// The BottomLeft corner.
+        /// </summary>
+        BottomLeft = 4,
+
+        /// <summary>
+        /// The BottomRight corner.
+        /// </summary>
+        BottomRight = 8
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/EnumToBoolConverter.cs b/src/Avalonia.Controls/Converters/EnumToBoolConverter.cs
new file mode 100644
index 0000000000..ed3065809e
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/EnumToBoolConverter.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Globalization;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converter to convert an enum value to bool by comparing to the given parameter.
+    /// Both value and parameter must be of the same enum type.
+    /// </summary>
+    /// <remarks>
+    /// This converter is useful to enable binding of radio buttons with a selected enum value.
+    /// </remarks>
+    public class EnumToBoolConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value == null &&
+                parameter == null)
+            {
+                return true;
+            }
+            else if (value == null ||
+                     parameter == null)
+            {
+                return false;
+            }
+            else
+            {
+                return value!.Equals(parameter);
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value is bool boolValue &&
+                boolValue == true)
+            {
+                return parameter;
+            }
+
+            return BindingOperations.DoNothing;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
index b0c30ea11f..7931b63d8e 100644
--- a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
+++ b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
@@ -35,7 +35,6 @@ namespace Avalonia.Controls.Converters
                     Bottom ? Indent * thicknessDepth.Bottom : 0);
             }
             return new Thickness(0);
-            
         }
 
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs b/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
index 6ab2f4c517..9d859a753a 100644
--- a/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
+++ b/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Controls.Converters
 
             if (visibility == ScrollBarVisibility.Auto)
             {
-                if (extent == viewport)
+                if (MathUtilities.AreClose(extent, viewport))
                 {
                     return false;
                 }
diff --git a/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs b/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs
index 9a657cce68..0fa43809ac 100644
--- a/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs
+++ b/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs
@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Avalonia.Data.Converters;
 using Avalonia.Input;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Converters
 {
@@ -62,7 +63,7 @@ namespace Avalonia.Controls.Converters
 
         private static string ToString(KeyGesture gesture, string meta)
         {
-            var s = new StringBuilder();
+            var s = StringBuilderCache.Acquire();
 
             static void Plus(StringBuilder s)
             {
@@ -98,12 +99,12 @@ namespace Avalonia.Controls.Converters
             Plus(s);
             s.Append(ToString(gesture.Key));
 
-            return s.ToString();
+            return StringBuilderCache.GetStringAndRelease(s);
         }
 
         private static string ToOSXString(KeyGesture gesture)
         {
-            var s = new StringBuilder();
+            var s = StringBuilderCache.Acquire();
 
             if (gesture.KeyModifiers.HasAllFlags(KeyModifiers.Control))
             {
@@ -127,7 +128,7 @@ namespace Avalonia.Controls.Converters
 
             s.Append(ToOSXString(gesture.Key));
 
-            return s.ToString();
+            return StringBuilderCache.GetStringAndRelease(s);
         }
 
         private static string ToString(Key key)
diff --git a/src/Avalonia.Controls/Converters/StringFormatConverter.cs b/src/Avalonia.Controls/Converters/StringFormatConverter.cs
new file mode 100644
index 0000000000..82e75d9c34
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/StringFormatConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Converters;
+
+/// <summary>
+/// Calls <see cref="string.Format(string, object[])"/> on the passed in values, where the first element in the list
+/// is the string, and everything after it is passed into the object array in order.
+/// </summary>
+public class StringFormatConverter : IMultiValueConverter
+{
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values[0] is string format)
+        {
+            try
+            {
+                return string.Format(format, values.Skip(1).ToArray());
+            }
+            catch
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+        }
+        return AvaloniaProperty.UnsetValue;
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
index 8c6ac17280..bb05cd1b1f 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -13,6 +14,15 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control to allow the user to select a date
     /// </summary>
+    [TemplatePart("PART_ButtonContentGrid", typeof(Grid))]
+    [TemplatePart("PART_DayTextBlock",      typeof(TextBlock))]
+    [TemplatePart("PART_FirstSpacer",       typeof(Rectangle))]
+    [TemplatePart("PART_FlyoutButton",      typeof(Button))]
+    [TemplatePart("PART_MonthTextBlock",    typeof(TextBlock))]
+    [TemplatePart("PART_PickerPresenter",   typeof(DatePickerPresenter))]
+    [TemplatePart("PART_Popup",             typeof(Popup))]
+    [TemplatePart("PART_SecondSpacer",      typeof(Rectangle))]
+    [TemplatePart("PART_YearTextBlock",     typeof(TextBlock))]
     [PseudoClasses(":hasnodate")]
     public class DatePicker : TemplatedControl
     {
@@ -30,18 +40,6 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<DatePicker, bool>(nameof(DayVisible),
                 x => x.DayVisible, (x, v) => x.DayVisible = v);
 
-        /// <summary>
-        /// Defines the <see cref="Header"/> Property
-        /// </summary>
-        public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<DatePicker, object>(nameof(Header));
-
-        /// <summary>
-        /// Defines the <see cref="HeaderTemplate"/> Property
-        /// </summary>
-        public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
-            AvaloniaProperty.Register<DatePicker, IDataTemplate>(nameof(HeaderTemplate));
-
         /// <summary>
         /// Defines the <see cref="MaxYear"/> Property
         /// </summary>
@@ -142,24 +140,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Gets or sets the DatePicker header
-        /// </summary>
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the header template
-        /// </summary>
-        public IDataTemplate HeaderTemplate
-        {
-            get => GetValue(HeaderTemplateProperty);
-            set => SetValue(HeaderTemplateProperty, value);
-        }
-
         /// <summary>
         /// Gets or sets the maximum year for the picker
         /// </summary>
@@ -270,15 +250,15 @@ namespace Avalonia.Controls
             }
 
             base.OnApplyTemplate(e);
-            _flyoutButton = e.NameScope.Find<Button>("FlyoutButton");
-            _dayText = e.NameScope.Find<TextBlock>("DayText");
-            _monthText = e.NameScope.Find<TextBlock>("MonthText");
-            _yearText = e.NameScope.Find<TextBlock>("YearText");
-            _container = e.NameScope.Find<Grid>("ButtonContentGrid");
-            _spacer1 = e.NameScope.Find<Rectangle>("FirstSpacer");
-            _spacer2 = e.NameScope.Find<Rectangle>("SecondSpacer");
-            _popup = e.NameScope.Find<Popup>("Popup");
-            _presenter = e.NameScope.Find<DatePickerPresenter>("PickerPresenter");
+            _flyoutButton = e.NameScope.Find<Button>("PART_FlyoutButton");
+            _dayText = e.NameScope.Find<TextBlock>("PART_DayTextBlock");
+            _monthText = e.NameScope.Find<TextBlock>("PART_MonthTextBlock");
+            _yearText = e.NameScope.Find<TextBlock>("PART_YearTextBlock");
+            _container = e.NameScope.Find<Grid>("PART_ButtonContentGrid");
+            _spacer1 = e.NameScope.Find<Rectangle>("PART_FirstSpacer");
+            _spacer2 = e.NameScope.Find<Rectangle>("PART_SecondSpacer");
+            _popup = e.NameScope.Find<Popup>("PART_Popup");
+            _presenter = e.NameScope.Find<DatePickerPresenter>("PART_PickerPresenter");
 
             _areControlsAvailable = true;
 
@@ -398,18 +378,27 @@ namespace Avalonia.Controls
         private void OnFlyoutButtonClicked(object? sender, RoutedEventArgs e)
         {
             if (_presenter == null)
-                throw new InvalidOperationException("No DatePickerPresenter found");
+                throw new InvalidOperationException("No DatePickerPresenter found.");
+            if (_popup == null)
+                throw new InvalidOperationException("No Popup found.");
 
             _presenter.Date = SelectedDate ?? DateTimeOffset.Now;
 
-            _popup!.IsOpen = true;
+            _popup.PlacementMode = PlacementMode.AnchorAndGravity;
+            _popup.PlacementAnchor = Primitives.PopupPositioning.PopupAnchor.Bottom;
+            _popup.PlacementGravity = Primitives.PopupPositioning.PopupGravity.Bottom;
+            _popup.PlacementConstraintAdjustment = Primitives.PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
+            _popup.IsOpen = true;
+
+            // Overlay popup hosts won't get measured until the next layout pass, but we need the
+            // template to be applied to `_presenter` now. Detect this case and force a layout pass.
+            if (!_presenter.IsMeasureValid)
+                (VisualRoot as ILayoutRoot)?.LayoutManager?.ExecuteInitialLayoutPass();
 
             var deltaY = _presenter.GetOffsetForPopup();
 
             // The extra 5 px I think is related to default popup placement behavior
-            _popup!.Host!.ConfigurePosition(_popup.PlacementTarget!, PlacementMode.AnchorAndGravity, new Point(0, deltaY + 5),
-                Primitives.PopupPositioning.PopupAnchor.Bottom, Primitives.PopupPositioning.PopupGravity.Bottom,
-                 Primitives.PopupPositioning.PopupPositionerConstraintAdjustment.SlideY);
+            _popup.VerticalOffset = deltaY + 5;
         }
 
         protected virtual void OnSelectedDateChanged(object? sender, DatePickerSelectedValueChangedEventArgs e)
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
index eac6d83074..2057480490 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -12,6 +13,23 @@ namespace Avalonia.Controls
     /// Defines the presenter used for selecting a date for a 
     /// <see cref="DatePicker"/>
     /// </summary>
+    [TemplatePart("PART_AcceptButton",    typeof(Button))]
+    [TemplatePart("PART_DayDownButton",   typeof(RepeatButton))]
+    [TemplatePart("PART_DayHost",         typeof(Panel))]
+    [TemplatePart("PART_DaySelector",     typeof(DateTimePickerPanel))]
+    [TemplatePart("PART_DayUpButton",     typeof(RepeatButton))]
+    [TemplatePart("PART_DismissButton",   typeof(Button))]
+    [TemplatePart("PART_FirstSpacer",     typeof(Rectangle))]
+    [TemplatePart("PART_MonthDownButton", typeof(RepeatButton))]
+    [TemplatePart("PART_MonthHost",       typeof(Panel))]
+    [TemplatePart("PART_MonthSelector",   typeof(DateTimePickerPanel))]
+    [TemplatePart("PART_MonthUpButton",   typeof(RepeatButton))]
+    [TemplatePart("PART_PickerContainer", typeof(Grid))]
+    [TemplatePart("PART_SecondSpacer",    typeof(Rectangle))]
+    [TemplatePart("PART_YearDownButton",  typeof(RepeatButton))]
+    [TemplatePart("PART_YearHost",        typeof(Panel))]
+    [TemplatePart("PART_YearSelector",    typeof(DateTimePickerPanel))]
+    [TemplatePart("PART_YearUpButton",    typeof(RepeatButton))]
     public class DatePickerPresenter : PickerPresenterBase
     {
         /// <summary>
@@ -235,58 +253,58 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
             // These are requirements, so throw if not found
-            _pickerContainer = e.NameScope.Get<Grid>("PickerContainer");
-            _monthHost = e.NameScope.Get<Panel>("MonthHost");
-            _dayHost = e.NameScope.Get<Panel>("DayHost");
-            _yearHost = e.NameScope.Get<Panel>("YearHost");
+            _pickerContainer = e.NameScope.Get<Grid>("PART_PickerContainer");
+            _monthHost = e.NameScope.Get<Panel>("PART_MonthHost");
+            _dayHost = e.NameScope.Get<Panel>("PART_DayHost");
+            _yearHost = e.NameScope.Get<Panel>("PART_YearHost");
 
-            _monthSelector = e.NameScope.Get<DateTimePickerPanel>("MonthSelector");
+            _monthSelector = e.NameScope.Get<DateTimePickerPanel>("PART_MonthSelector");
             _monthSelector.SelectionChanged += OnMonthChanged;
 
-            _daySelector = e.NameScope.Get<DateTimePickerPanel>("DaySelector");
+            _daySelector = e.NameScope.Get<DateTimePickerPanel>("PART_DaySelector");
             _daySelector.SelectionChanged += OnDayChanged;
 
-            _yearSelector = e.NameScope.Get<DateTimePickerPanel>("YearSelector");
+            _yearSelector = e.NameScope.Get<DateTimePickerPanel>("PART_YearSelector");
             _yearSelector.SelectionChanged += OnYearChanged;
 
-            _acceptButton = e.NameScope.Get<Button>("AcceptButton");
+            _acceptButton = e.NameScope.Get<Button>("PART_AcceptButton");
 
-            _monthUpButton = e.NameScope.Find<RepeatButton>("MonthUpButton");
+            _monthUpButton = e.NameScope.Find<RepeatButton>("PART_MonthUpButton");
             if (_monthUpButton != null)
             {
                 _monthUpButton.Click += OnSelectorButtonClick;
             }
-            _monthDownButton = e.NameScope.Find<RepeatButton>("MonthDownButton");
+            _monthDownButton = e.NameScope.Find<RepeatButton>("PART_MonthDownButton");
             if (_monthDownButton != null)
             {
                 _monthDownButton.Click += OnSelectorButtonClick;
             }
 
-            _dayUpButton = e.NameScope.Find<RepeatButton>("DayUpButton");
+            _dayUpButton = e.NameScope.Find<RepeatButton>("PART_DayUpButton");
             if (_dayUpButton != null)
             {
                 _dayUpButton.Click += OnSelectorButtonClick;
             }
-            _dayDownButton = e.NameScope.Find<RepeatButton>("DayDownButton");
+            _dayDownButton = e.NameScope.Find<RepeatButton>("PART_DayDownButton");
             if (_dayDownButton != null)
             {
                 _dayDownButton.Click += OnSelectorButtonClick;
             }
 
-            _yearUpButton = e.NameScope.Find<RepeatButton>("YearUpButton");
+            _yearUpButton = e.NameScope.Find<RepeatButton>("PART_YearUpButton");
             if (_yearUpButton != null)
             {
                 _yearUpButton.Click += OnSelectorButtonClick;
             }
-            _yearDownButton = e.NameScope.Find<RepeatButton>("YearDownButton");
+            _yearDownButton = e.NameScope.Find<RepeatButton>("PART_YearDownButton");
             if (_yearDownButton != null)
             {
                 _yearDownButton.Click += OnSelectorButtonClick;
             }
 
-            _dismissButton = e.NameScope.Find<Button>("DismissButton");
-            _spacer1 = e.NameScope.Find<Rectangle>("FirstSpacer");
-            _spacer2 = e.NameScope.Find<Rectangle>("SecondSpacer");
+            _dismissButton = e.NameScope.Find<Button>("PART_DismissButton");
+            _spacer1 = e.NameScope.Find<Rectangle>("PART_FirstSpacer");
+            _spacer2 = e.NameScope.Find<Rectangle>("PART_SecondSpacer");
 
             if (_acceptButton != null)
             {
@@ -537,8 +555,11 @@ namespace Avalonia.Controls
 
         internal double GetOffsetForPopup()
         {
+            if (_monthSelector is null)
+                return 0;
+
             var acceptDismissButtonHeight = _acceptButton != null ? _acceptButton.Bounds.Height : 41;
-            return -(MaxHeight - acceptDismissButtonHeight) / 2 - (_monthSelector!.ItemHeight / 2);
+            return -(MaxHeight - acceptDismissButtonHeight) / 2 - (_monthSelector.ItemHeight / 2);
         }
     }
 }
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index 5948d81810..3fdfbee54d 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using Avalonia.Controls.Presenters;
 using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -58,18 +62,18 @@ namespace Avalonia.Controls.Primitives
         private Vector _offset;
         private bool _hasInit;
         private bool _suppressUpdateOffset;
-        private ListBoxItem? _pressedItem;
+        private ScrollContentPresenter? _parentScroller;
 
         public DateTimePickerPanel()
         {
             FormatDate = DateTime.Now;
-            AddHandler(ListBoxItem.PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
-            AddHandler(ListBoxItem.PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(TappedEvent, OnItemTapped, RoutingStrategies.Bubble);
         }
 
         static DateTimePickerPanel()
         {
             FocusableProperty.OverrideDefaultValue<DateTimePickerPanel>(true);
+            BackgroundProperty.OverrideDefaultValue<DateTimePickerPanel>(Brushes.Transparent);
             AffectsMeasure<DateTimePickerPanel>(ItemHeightProperty);
         }
 
@@ -254,6 +258,8 @@ namespace Avalonia.Controls.Primitives
                 _suppressUpdateOffset = true;
                 SelectedValue = (int)newSel * Increment + MinimumValue;
                 _suppressUpdateOffset = false;
+
+                System.Diagnostics.Debug.WriteLine($"Offset: {_offset} ItemHeight: {ItemHeight}");
             }
         }
 
@@ -269,7 +275,7 @@ namespace Avalonia.Controls.Primitives
 
         public Size Extent => _extent;
 
-        public Size Viewport => new Size(0, ItemHeight);
+        public Size Viewport => Bounds.Size;
 
         public event EventHandler? ScrollInvalidated;
 
@@ -340,6 +346,20 @@ namespace Avalonia.Controls.Primitives
             return finalSize;
         }
 
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            _parentScroller = this.GetVisualParent() as ScrollContentPresenter;
+            _parentScroller?.AddHandler(Gestures.ScrollGestureEndedEvent, OnScrollGestureEnded);
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            _parentScroller?.RemoveHandler(Gestures.ScrollGestureEndedEvent, OnScrollGestureEnded);
+            _parentScroller = null;
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             switch (e.Key)
@@ -434,7 +454,7 @@ namespace Avalonia.Controls.Primitives
                 children.Add(new ListBoxItem
                 {
                     Height = ItemHeight,
-                    Classes = new Classes("DateTimePickerItem", $"{PanelType}Item"),
+                    Classes = new Classes($"{PanelType}Item"),
                     VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Center,
                     Focusable = false
                 });
@@ -523,26 +543,13 @@ namespace Avalonia.Controls.Primitives
             return newValue;
         }
 
-        private void OnItemPointerDown(object? sender, PointerPressedEventArgs e)
+        private void OnItemTapped(object? sender, TappedEventArgs e)
         {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed &&
-                e.Source is IVisual source)
-            {
-                _pressedItem = GetItemFromSource(source);
-                e.Handled = true;
-            }
-        }
-
-        private void OnItemPointerUp(object? sender, PointerReleasedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased &&
-                _pressedItem != null &&
-                e.Source is IVisual source &&
-                GetItemFromSource(source) is ListBoxItem item &&
-                item.Tag is int tag)
+            if (e.Source is IVisual source && 
+                GetItemFromSource(source) is ListBoxItem listBoxItem &&
+                listBoxItem.Tag is int tag)
             {
                 SelectedValue = tag;
-                _pressedItem = null;
                 e.Handled = true;
             }
         }
@@ -566,5 +573,15 @@ namespace Avalonia.Controls.Primitives
         {
             ScrollInvalidated?.Invoke(this, e);
         }
+
+        private void OnScrollGestureEnded(object? sender, ScrollGestureEndedEventArgs e)
+        {
+            var snapY = Math.Round(Offset.Y / ItemHeight) * ItemHeight;
+
+            if (snapY != Offset.Y)
+            {
+                Offset = Offset.WithY(snapY);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index a0a27bd4ed..a7a6881fe5 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Layout;
 using System;
 using System.Globalization;
 
@@ -11,6 +12,18 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control to allow the user to select a time.
     /// </summary>
+    [TemplatePart("PART_FirstColumnDivider",      typeof(Rectangle))]
+    [TemplatePart("PART_FirstPickerHost",         typeof(Border))]
+    [TemplatePart("PART_FlyoutButton",            typeof(Button))]
+    [TemplatePart("PART_FlyoutButtonContentGrid", typeof(Grid))]
+    [TemplatePart("PART_HourTextBlock",           typeof(TextBlock))]
+    [TemplatePart("PART_MinuteTextBlock",         typeof(TextBlock))]
+    [TemplatePart("PART_PeriodTextBlock",         typeof(TextBlock))]
+    [TemplatePart("PART_PickerPresenter",         typeof(TimePickerPresenter))]
+    [TemplatePart("PART_Popup",                   typeof(Popup))]
+    [TemplatePart("PART_SecondColumnDivider",     typeof(Rectangle))]
+    [TemplatePart("PART_SecondPickerHost",        typeof(Border))]
+    [TemplatePart("PART_ThirdPickerHost",         typeof(Border))]
     [PseudoClasses(":hasnotime")]
     public class TimePicker : TemplatedControl
     {
@@ -21,18 +34,6 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<TimePicker, int>(nameof(MinuteIncrement),
                 x => x.MinuteIncrement, (x, v) => x.MinuteIncrement = v);
 
-        /// <summary>
-        /// Defines the <see cref="Header"/> property
-        /// </summary>
-        public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<DatePicker, object>(nameof(Header));
-
-        /// <summary>
-        /// Defines the <see cref="HeaderTemplate"/> property
-        /// </summary>
-        public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
-            AvaloniaProperty.Register<DatePicker, IDataTemplate>(nameof(HeaderTemplate));
-
         /// <summary>
         /// Defines the <see cref="ClockIdentifier"/> property
         /// </summary>
@@ -90,24 +91,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Gets or sets the header
-        /// </summary>
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the header template
-        /// </summary>
-        public IDataTemplate HeaderTemplate
-        {
-            get => GetValue(HeaderTemplateProperty);
-            set => SetValue(HeaderTemplateProperty, value);
-        }
-
         /// <summary>
         /// Gets or sets the clock identifier, either 12HourClock or 24HourClock
         /// </summary>
@@ -116,7 +99,7 @@ namespace Avalonia.Controls
             get => _clockIdentifier;
             set
             {
-                if (!(string.IsNullOrEmpty(value) || value == "" || value == "12HourClock" || value == "24HourClock"))
+                if (!(string.IsNullOrEmpty(value) || value == "12HourClock" || value == "24HourClock"))
                     throw new ArgumentException("Invalid ClockIdentifier");
                 SetAndRaise(ClockIdentifierProperty, ref _clockIdentifier, value);
                 SetGrid();
@@ -156,23 +139,23 @@ namespace Avalonia.Controls
             }
             base.OnApplyTemplate(e);
 
-            _flyoutButton = e.NameScope.Find<Button>("FlyoutButton");
+            _flyoutButton = e.NameScope.Find<Button>("PART_FlyoutButton");
 
-            _firstPickerHost = e.NameScope.Find<Border>("FirstPickerHost");
-            _secondPickerHost = e.NameScope.Find<Border>("SecondPickerHost");
-            _thirdPickerHost = e.NameScope.Find<Border>("ThirdPickerHost");
+            _firstPickerHost = e.NameScope.Find<Border>("PART_FirstPickerHost");
+            _secondPickerHost = e.NameScope.Find<Border>("PART_SecondPickerHost");
+            _thirdPickerHost = e.NameScope.Find<Border>("PART_ThirdPickerHost");
 
-            _hourText = e.NameScope.Find<TextBlock>("HourTextBlock");
-            _minuteText = e.NameScope.Find<TextBlock>("MinuteTextBlock");
-            _periodText = e.NameScope.Find<TextBlock>("PeriodTextBlock");
+            _hourText = e.NameScope.Find<TextBlock>("PART_HourTextBlock");
+            _minuteText = e.NameScope.Find<TextBlock>("PART_MinuteTextBlock");
+            _periodText = e.NameScope.Find<TextBlock>("PART_PeriodTextBlock");
 
-            _firstSplitter = e.NameScope.Find<Rectangle>("FirstColumnDivider");
-            _secondSplitter = e.NameScope.Find<Rectangle>("SecondColumnDivider");
+            _firstSplitter = e.NameScope.Find<Rectangle>("PART_FirstColumnDivider");
+            _secondSplitter = e.NameScope.Find<Rectangle>("PART_SecondColumnDivider");
 
-            _contentGrid = e.NameScope.Find<Grid>("FlyoutButtonContentGrid");
+            _contentGrid = e.NameScope.Find<Grid>("PART_FlyoutButtonContentGrid");
 
-            _popup = e.NameScope.Find<Popup>("Popup");
-            _presenter = e.NameScope.Find<TimePickerPresenter>("PickerPresenter");
+            _popup = e.NameScope.Find<Popup>("PART_Popup");
+            _presenter = e.NameScope.Find<TimePickerPresenter>("PART_PickerPresenter");
 
             if (_flyoutButton != null)
                 _flyoutButton.Click += OnFlyoutButtonClicked;
@@ -254,16 +237,28 @@ namespace Avalonia.Controls
 
         private void OnFlyoutButtonClicked(object? sender, Interactivity.RoutedEventArgs e)
         {
-            _presenter!.Time = SelectedTime ?? DateTime.Now.TimeOfDay;
+            if (_presenter == null)
+                throw new InvalidOperationException("No DatePickerPresenter found.");
+            if (_popup == null)
+                throw new InvalidOperationException("No Popup found.");
+
+            _presenter.Time = SelectedTime ?? DateTime.Now.TimeOfDay;
+
+            _popup.PlacementMode = PlacementMode.AnchorAndGravity;
+            _popup.PlacementAnchor = Primitives.PopupPositioning.PopupAnchor.Bottom;
+            _popup.PlacementGravity = Primitives.PopupPositioning.PopupGravity.Bottom;
+            _popup.PlacementConstraintAdjustment = Primitives.PopupPositioning.PopupPositionerConstraintAdjustment.SlideY;
+            _popup.IsOpen = true;
 
-            _popup!.IsOpen = true;
+            // Overlay popup hosts won't get measured until the next layout pass, but we need the
+            // template to be applied to `_presenter` now. Detect this case and force a layout pass.
+            if (!_presenter.IsMeasureValid)
+                (VisualRoot as ILayoutRoot)?.LayoutManager?.ExecuteInitialLayoutPass();
 
             var deltaY = _presenter.GetOffsetForPopup();
 
             // The extra 5 px I think is related to default popup placement behavior
-            _popup.Host!.ConfigurePosition(_popup.PlacementTarget!, PlacementMode.AnchorAndGravity, new Point(0, deltaY + 5),
-                Primitives.PopupPositioning.PopupAnchor.Bottom, Primitives.PopupPositioning.PopupGravity.Bottom,
-                 Primitives.PopupPositioning.PopupPositionerConstraintAdjustment.SlideY);
+            _popup.VerticalOffset = deltaY + 5;
         }
 
         private void OnDismissPicker(object? sender, EventArgs e)
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
index 55bc1af3a7..d6599c9f18 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -10,6 +11,20 @@ namespace Avalonia.Controls
     /// Defines the presenter used for selecting a time. Intended for use with
     /// <see cref="TimePicker"/> but can be used independently
     /// </summary>
+    [TemplatePart("PART_AcceptButton",     typeof(Button))]
+    [TemplatePart("PART_DismissButton",    typeof(Button))]
+    [TemplatePart("PART_HourDownButton",   typeof(RepeatButton))]
+    [TemplatePart("PART_HourSelector",     typeof(DateTimePickerPanel))]
+    [TemplatePart("PART_HourUpButton",     typeof(RepeatButton))]
+    [TemplatePart("PART_MinuteDownButton", typeof(RepeatButton))]
+    [TemplatePart("PART_MinuteSelector",   typeof(DateTimePickerPanel))]
+    [TemplatePart("PART_MinuteUpButton",   typeof(RepeatButton))]
+    [TemplatePart("PART_PeriodDownButton", typeof(RepeatButton))]
+    [TemplatePart("PART_PeriodHost",       typeof(Panel))]
+    [TemplatePart("PART_PeriodSelector",   typeof(DateTimePickerPanel))]
+    [TemplatePart("PART_PeriodUpButton",   typeof(RepeatButton))]
+    [TemplatePart("PART_PickerContainer",  typeof(Grid))]
+    [TemplatePart("PART_SecondSpacer",     typeof(Rectangle))]
     public class TimePickerPresenter : PickerPresenterBase
     {
         /// <summary>
@@ -107,40 +122,40 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
 
-            _pickerContainer = e.NameScope.Get<Grid>("PickerContainer");
-            _periodHost = e.NameScope.Get<Panel>("PeriodHost");
+            _pickerContainer = e.NameScope.Get<Grid>("PART_PickerContainer");
+            _periodHost = e.NameScope.Get<Panel>("PART_PeriodHost");
 
-            _hourSelector = e.NameScope.Get<DateTimePickerPanel>("HourSelector");
-            _minuteSelector = e.NameScope.Get<DateTimePickerPanel>("MinuteSelector");
-            _periodSelector = e.NameScope.Get<DateTimePickerPanel>("PeriodSelector");
+            _hourSelector = e.NameScope.Get<DateTimePickerPanel>("PART_HourSelector");
+            _minuteSelector = e.NameScope.Get<DateTimePickerPanel>("PART_MinuteSelector");
+            _periodSelector = e.NameScope.Get<DateTimePickerPanel>("PART_PeriodSelector");
 
-            _spacer2 = e.NameScope.Get<Rectangle>("SecondSpacer");
+            _spacer2 = e.NameScope.Get<Rectangle>("PART_SecondSpacer");
 
-            _acceptButton = e.NameScope.Get<Button>("AcceptButton");
+            _acceptButton = e.NameScope.Get<Button>("PART_AcceptButton");
             _acceptButton.Click += OnAcceptButtonClicked;
 
-            _hourUpButton = e.NameScope.Find<RepeatButton>("HourUpButton");
+            _hourUpButton = e.NameScope.Find<RepeatButton>("PART_HourUpButton");
             if (_hourUpButton != null)
                 _hourUpButton.Click += OnSelectorButtonClick;
-            _hourDownButton = e.NameScope.Find<RepeatButton>("HourDownButton");
+            _hourDownButton = e.NameScope.Find<RepeatButton>("PART_HourDownButton");
             if (_hourDownButton != null)
                 _hourDownButton.Click += OnSelectorButtonClick;
 
-            _minuteUpButton = e.NameScope.Find<RepeatButton>("MinuteUpButton");
+            _minuteUpButton = e.NameScope.Find<RepeatButton>("PART_MinuteUpButton");
             if (_minuteUpButton != null)
                 _minuteUpButton.Click += OnSelectorButtonClick;
-            _minuteDownButton = e.NameScope.Find<RepeatButton>("MinuteDownButton");
+            _minuteDownButton = e.NameScope.Find<RepeatButton>("PART_MinuteDownButton");
             if (_minuteDownButton != null)
                 _minuteDownButton.Click += OnSelectorButtonClick;
 
-            _periodUpButton = e.NameScope.Find<RepeatButton>("PeriodUpButton");
+            _periodUpButton = e.NameScope.Find<RepeatButton>("PART_PeriodUpButton");
             if (_periodUpButton != null)
                 _periodUpButton.Click += OnSelectorButtonClick;
-            _periodDownButton = e.NameScope.Find<RepeatButton>("PeriodDownButton");
+            _periodDownButton = e.NameScope.Find<RepeatButton>("PART_PeriodDownButton");
             if (_periodDownButton != null)
                 _periodDownButton.Click += OnSelectorButtonClick;
 
-            _dismissButton = e.NameScope.Find<Button>("DismissButton");
+            _dismissButton = e.NameScope.Find<Button>("PART_DismissButton");
             if (_dismissButton != null)
                 _dismissButton.Click += OnDismissButtonClicked;
 
@@ -179,7 +194,7 @@ namespace Avalonia.Controls
 
             if (ClockIdentifier == "12HourClock")
             {
-                hr = per == 1 ? hr + 12 : per == 0 && hr == 12 ? 0 : hr;
+                hr = per == 1 ? (hr == 12) ? 12 : hr + 12 : per == 0 && hr == 12 ? 0 : hr;
             }
 
             Time = new TimeSpan(hr, min, 0);
@@ -256,8 +271,11 @@ namespace Avalonia.Controls
 
         internal double GetOffsetForPopup()
         {
+            if (_hourSelector is null)
+                return 0;
+
             var acceptDismissButtonHeight = _acceptButton != null ? _acceptButton.Bounds.Height : 41;
-            return -(MaxHeight - acceptDismissButtonHeight) / 2 - (_hourSelector!.ItemHeight / 2);
+            return -(MaxHeight - acceptDismissButtonHeight) / 2 - (_hourSelector.ItemHeight / 2);
         }
     }
 }
diff --git a/src/Avalonia.Controls/DefinitionBase.cs b/src/Avalonia.Controls/DefinitionBase.cs
index eb09ff397a..64a02ccb46 100644
--- a/src/Avalonia.Controls/DefinitionBase.cs
+++ b/src/Avalonia.Controls/DefinitionBase.cs
@@ -366,7 +366,7 @@ namespace Avalonia.Controls
 
             string id = (string)value;
 
-            if (id != string.Empty)
+            if (!string.IsNullOrEmpty(id))
             {
                 int i = -1;
                 while (++i < id.Length)
diff --git a/src/Avalonia.Controls/Design.cs b/src/Avalonia.Controls/Design.cs
index 07d2918a88..80600b2276 100644
--- a/src/Avalonia.Controls/Design.cs
+++ b/src/Avalonia.Controls/Design.cs
@@ -1,4 +1,5 @@
 
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Avalonia.Styling;
 
@@ -6,6 +7,8 @@ namespace Avalonia.Controls
 {
     public static class Design
     {
+        private static Dictionary<object, Control?>? _previewWith;
+
         public static bool IsDesignMode { get; internal set; }
 
         public static readonly AttachedProperty<double> HeightProperty = AvaloniaProperty
@@ -47,19 +50,30 @@ namespace Avalonia.Controls
             return control.GetValue(DataContextProperty);
         }
         
-        public static readonly AttachedProperty<Control> PreviewWithProperty = AvaloniaProperty
-            .RegisterAttached<AvaloniaObject, Control>("PreviewWith", typeof (Design));
+        public static readonly AttachedProperty<Control?> PreviewWithProperty = AvaloniaProperty
+            .RegisterAttached<AvaloniaObject, Control?>("PreviewWith", typeof (Design));
 
-        public static void SetPreviewWith(AvaloniaObject target, Control control)
+        public static void SetPreviewWith(AvaloniaObject target, Control? control)
         {
             target.SetValue(PreviewWithProperty, control);
         }
 
-        public static Control GetPreviewWith(AvaloniaObject target)
+        public static void SetPreviewWith(ResourceDictionary target, Control? control)
+        {
+            _previewWith ??= new();
+            _previewWith[target] = control;
+        }
+
+        public static Control? GetPreviewWith(AvaloniaObject target)
         {
             return target.GetValue(PreviewWithProperty);
         }
 
+        public static Control? GetPreviewWith(ResourceDictionary target)
+        {
+            return _previewWith?[target];
+        }
+
         public static readonly AttachedProperty<IStyle> DesignStyleProperty = AvaloniaProperty
             .RegisterAttached<Control, IStyle>("DesignStyle", typeof(Design));
 
diff --git a/src/Avalonia.Controls/DesktopApplicationExtensions.cs b/src/Avalonia.Controls/DesktopApplicationExtensions.cs
index ddd4e57a40..ddaed6bb0d 100644
--- a/src/Avalonia.Controls/DesktopApplicationExtensions.cs
+++ b/src/Avalonia.Controls/DesktopApplicationExtensions.cs
@@ -8,8 +8,6 @@ namespace Avalonia.Controls
 {
     public static class DesktopApplicationExtensions
     {
-        [Obsolete("Running application without a cancellation token and a lifetime is no longer supported, see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details", true)]
-        public static void Run(this Application app) => throw new NotSupportedException();
 
         /// <summary>
         /// On desktop-style platforms runs the application's main loop until closable is closed
diff --git a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
index 45cd1d727e..64978248e5 100644
--- a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
+++ b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
@@ -1,11 +1,13 @@
 using System;
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Diagnostics
 {
     /// <summary>
     /// Diagnostics interface to retrieve an associated <see cref="IPopupHost"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IPopupHostProvider
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/DockPanel.cs b/src/Avalonia.Controls/DockPanel.cs
index 8e23555c2d..3e3ed509b5 100644
--- a/src/Avalonia.Controls/DockPanel.cs
+++ b/src/Avalonia.Controls/DockPanel.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly StyledProperty<bool> LastChildFillProperty =
             AvaloniaProperty.Register<DockPanel, bool>(
-                nameof(LastChildFillProperty),
+                nameof(LastChildFill),
                 defaultValue: true);
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Documents/Bold.cs b/src/Avalonia.Controls/Documents/Bold.cs
new file mode 100644
index 0000000000..7d0a9130ae
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/Bold.cs
@@ -0,0 +1,17 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// Bold element - markup helper for indicating bolded content.
+    /// Equivalent to a Span with FontWeight property set to FontWeights.Bold.
+    /// Can contain other inline elements.
+    /// </summary>
+    public sealed class Bold : Span
+    {
+        static Bold()
+        {
+            FontWeightProperty.OverrideDefaultValue<Bold>(FontWeight.Bold);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/IInlineHost.cs b/src/Avalonia.Controls/Documents/IInlineHost.cs
new file mode 100644
index 0000000000..5d142952ab
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/IInlineHost.cs
@@ -0,0 +1,9 @@
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls.Documents
+{
+    internal interface IInlineHost : ILogical
+    {
+        void Invalidate();
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/Inline.cs b/src/Avalonia.Controls/Documents/Inline.cs
new file mode 100644
index 0000000000..47581e87f1
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/Inline.cs
@@ -0,0 +1,100 @@
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// Inline element.
+    /// </summary>
+    public abstract class Inline : TextElement
+    {
+        /// <summary>
+        /// AvaloniaProperty for <see cref="TextDecorations" /> property.
+        /// </summary>
+        public static readonly StyledProperty<TextDecorationCollection> TextDecorationsProperty =
+            AvaloniaProperty.Register<Inline, TextDecorationCollection>(
+                nameof(TextDecorations));
+
+        /// <summary>
+        /// AvaloniaProperty for <see cref="BaselineAlignment" /> property.
+        /// </summary>
+        public static readonly StyledProperty<BaselineAlignment> BaselineAlignmentProperty =
+            AvaloniaProperty.Register<Inline, BaselineAlignment>(
+                nameof(BaselineAlignment),
+                BaselineAlignment.Baseline);
+
+        /// <summary>
+        /// The TextDecorations property specifies decorations that are added to the text of an element.
+        /// </summary>
+        public TextDecorationCollection TextDecorations
+        {
+            get { return GetValue(TextDecorationsProperty); }
+            set { SetValue(TextDecorationsProperty, value); }
+        }
+
+        /// <summary>
+        /// Describes how the baseline for a text-based element is positioned on the vertical axis,
+        /// relative to the established baseline for text.
+        /// </summary>
+        public BaselineAlignment BaselineAlignment
+        {
+            get { return GetValue(BaselineAlignmentProperty); }
+            set { SetValue(BaselineAlignmentProperty, value); }
+        }
+
+        internal abstract void BuildTextRun(IList<TextRun> textRuns);
+
+        internal abstract void AppendText(StringBuilder stringBuilder);
+
+        protected TextRunProperties CreateTextRunProperties()
+        {
+            var textDecorations = TextDecorations;
+            var background = Background;
+
+            if(Parent is Inline inline)
+            {
+                if(textDecorations == null)
+                {
+                    textDecorations = inline.TextDecorations;
+                }
+
+                if(background == null)
+                {
+                    background = inline.Background;
+                }
+            }
+            
+            var fontStyle = FontStyle;
+
+            if(Parent is Italic)
+            {
+                fontStyle = FontStyle.Italic;
+            }
+
+            var fontWeight = FontWeight;
+
+            if(Parent is Bold)
+            {
+                fontWeight = FontWeight.Bold;
+            }
+
+            return new GenericTextRunProperties(new Typeface(FontFamily, fontStyle, fontWeight), FontSize,
+                textDecorations, Foreground, background, BaselineAlignment);
+        }
+        
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            switch (change.Property.Name)
+            {
+                case nameof(TextDecorations):
+                case nameof(BaselineAlignment):
+                    InlineHost?.Invalidate();
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/InlineCollection.cs b/src/Avalonia.Controls/Documents/InlineCollection.cs
new file mode 100644
index 0000000000..5b68402f87
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/InlineCollection.cs
@@ -0,0 +1,178 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.LogicalTree;
+using Avalonia.Metadata;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// A collection of <see cref="Inline"/>s.
+    /// </summary>
+    [WhitespaceSignificantCollection]
+    public class InlineCollection : AvaloniaList<Inline>
+    {
+        private IAvaloniaList<ILogical>? _logicalChildren;
+        private IInlineHost? _inlineHost;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InlineCollection"/> class.
+        /// </summary>
+        public InlineCollection()
+        {
+            ResetBehavior = ResetBehavior.Remove;
+
+            this.ForEachItem(
+                x =>
+                {                   
+                    x.InlineHost = InlineHost;
+                    LogicalChildren?.Add(x);
+                    Invalidate();
+                },
+                x =>
+                {
+                    LogicalChildren?.Remove(x);
+                    x.InlineHost = InlineHost;
+                    Invalidate();
+                },
+                () => throw new NotSupportedException());
+        }
+
+        internal IAvaloniaList<ILogical>? LogicalChildren
+        {
+            get => _logicalChildren;
+            set
+            {
+                var oldValue = _logicalChildren;
+
+                _logicalChildren = value;
+
+                OnParentChanged(oldValue, value);
+            }
+        }
+
+        internal IInlineHost? InlineHost
+        {
+            get => _inlineHost;
+            set
+            {
+                _inlineHost = value;
+
+                OnInlineHostChanged(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or adds the text held by the inlines collection.
+        /// <remarks>
+        /// Can be null for complex content.
+        /// </remarks>
+        /// </summary>
+        public string? Text
+        {
+            get
+            {
+                if (Count == 0)
+                {
+                    return null;
+                }
+
+                var builder = StringBuilderCache.Acquire();
+
+                foreach (var inline in this)
+                {
+                    inline.AppendText(builder);
+                }
+
+                return StringBuilderCache.GetStringAndRelease(builder);
+            }
+
+        }
+
+        public override void Add(Inline inline)
+        {
+            if (InlineHost is TextBlock textBlock && !string.IsNullOrEmpty(textBlock._text))
+            {          
+                base.Add(new Run(textBlock._text));
+
+                textBlock._text = null;                
+            }
+
+            base.Add(inline);
+        }
+
+        /// <summary>
+        /// Adds a text segment to the collection.
+        /// <remarks>
+        /// For non complex content this appends the text to the end of currently held text.
+        /// For complex content this adds a <see cref="Run"/> to the collection.
+        /// </remarks>
+        /// </summary>
+        /// <param name="text">The to be added text.</param>
+        public void Add(string text)
+        {
+            if (InlineHost is TextBlock textBlock && !textBlock.HasComplexContent)
+            {
+                textBlock._text += text;
+            }
+            else
+            {
+                Add(new Run(text));
+            }
+        }
+
+        /// <summary>
+        /// Adds a control wrapped inside a <see cref="InlineUIContainer"/> to the collection.
+        /// </summary>
+        /// <param name="control">The to be added control.</param>
+        public void Add(IControl control)
+        {
+            Add(new InlineUIContainer(control));
+        }
+
+        /// <summary>
+        /// Raised when an inline in the collection changes.
+        /// </summary>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        protected void Invalidate()
+        {
+            if (InlineHost != null)
+            {
+                InlineHost.Invalidate();
+            }
+
+            Invalidated?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void OnParentChanged(IAvaloniaList<ILogical>? oldParent, IAvaloniaList<ILogical>? newParent)
+        {
+            foreach (var child in this)
+            {
+                if (oldParent != newParent)
+                {
+                    if (oldParent != null)
+                    {
+                        oldParent.Remove(child);
+                    }
+
+                    if(newParent != null)
+                    {
+                        newParent.Add(child);
+                    }
+                }
+            }
+        }
+
+        private void OnInlineHostChanged(IInlineHost? inlineHost)
+        {
+            foreach (var child in this)
+            {
+                child.InlineHost = inlineHost;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/InlineRun.cs b/src/Avalonia.Controls/Documents/InlineRun.cs
new file mode 100644
index 0000000000..68c61ca3fa
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/InlineRun.cs
@@ -0,0 +1,42 @@
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Documents
+{
+    internal class EmbeddedControlRun : DrawableTextRun
+    {
+        public EmbeddedControlRun(IControl control, TextRunProperties properties)
+        {
+            Control = control;
+            Properties = properties;
+        }
+
+        public IControl Control { get; }
+
+        public override TextRunProperties? Properties { get; }
+
+        public override Size Size => Control.DesiredSize;
+
+        public override double Baseline
+        {
+            get
+            {
+                double baseline = Size.Height;
+                double baselineOffsetValue = Control.GetValue<double>(TextBlock.BaselineOffsetProperty);
+
+                if (!MathUtilities.IsZero(baselineOffsetValue))
+                {
+                    baseline = baselineOffsetValue;
+                }
+
+                return -baseline;
+            }
+        }
+
+        public override void Draw(DrawingContext drawingContext, Point origin)
+        {
+            //noop            
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/InlineUIContainer.cs b/src/Avalonia.Controls/Documents/InlineUIContainer.cs
new file mode 100644
index 0000000000..7107fb7fed
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/InlineUIContainer.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// InlineUIContainer - a wrapper for embedded UIElements in text 
+    /// flow content inline collections
+    /// </summary>
+    public class InlineUIContainer : Inline
+    {
+        /// <summary>
+        /// Defines the <see cref="Child"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IControl> ChildProperty =
+            AvaloniaProperty.Register<InlineUIContainer, IControl>(nameof(Child));
+
+        static InlineUIContainer()
+        {
+            BaselineAlignmentProperty.OverrideDefaultValue<InlineUIContainer>(BaselineAlignment.Top);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of InlineUIContainer element.
+        /// </summary>
+        /// <remarks>
+        /// The purpose of this element is to be a wrapper for UIElements
+        /// when they are embedded into text flow - as items of
+        /// InlineCollections.
+        /// </remarks>
+        public InlineUIContainer()
+        {
+        }
+
+        /// <summary>
+        /// Initializes an InlineBox specifying its child UIElement
+        /// </summary>
+        /// <param name="child">
+        /// UIElement set as a child of this inline item
+        /// </param>
+        public InlineUIContainer(IControl child)
+        {
+            Child = child;
+        }
+
+        /// <summary>
+        /// The content spanned by this TextElement.
+        /// </summary>
+        [Content]
+        public IControl Child
+        {
+            get => GetValue(ChildProperty);
+            set => SetValue(ChildProperty, value);
+        }
+
+        internal override void BuildTextRun(IList<TextRun> textRuns)
+        {
+            textRuns.Add(new EmbeddedControlRun(Child, CreateTextRunProperties()));
+        }
+
+        internal override void AppendText(StringBuilder stringBuilder)
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/Italic.cs b/src/Avalonia.Controls/Documents/Italic.cs
new file mode 100644
index 0000000000..e9f4698fc4
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/Italic.cs
@@ -0,0 +1,17 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// Italic element - markup helper for indicating italicized content.
+    /// Equivalent to a Span with FontStyle property set to FontStyles.Italic.
+    /// Can contain other inline elements.
+    /// </summary>
+    public sealed class Italic : Span
+    {
+        static Italic()
+        {
+            FontStyleProperty.OverrideDefaultValue<Italic>(FontStyle.Italic);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/LineBreak.cs b/src/Avalonia.Controls/Documents/LineBreak.cs
new file mode 100644
index 0000000000..108a38d86b
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/LineBreak.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Documents 
+{
+    /// <summary>
+    /// LineBreak element that forces a line breaking. 
+    /// </summary>
+    [TrimSurroundingWhitespace]
+    public class LineBreak : Inline
+    {
+        /// <summary>
+        /// Creates a new LineBreak instance.
+        /// </summary>
+        public LineBreak()
+        {
+        }
+
+        internal override void BuildTextRun(IList<TextRun> textRuns)
+        {
+            var text = Environment.NewLine.AsMemory();
+
+            var textRunProperties = CreateTextRunProperties();
+
+            var textCharacters = new TextCharacters(text, textRunProperties);
+
+            textRuns.Add(textCharacters);
+        }
+
+        internal override void AppendText(StringBuilder stringBuilder)
+        {
+            stringBuilder.Append(Environment.NewLine);
+        }
+    }
+}
+
diff --git a/src/Avalonia.Controls/Documents/Run.cs b/src/Avalonia.Controls/Documents/Run.cs
new file mode 100644
index 0000000000..2bd66b8a64
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/Run.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Data;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// A terminal element in text flow hierarchy - contains a uniformatted run of unicode characters
+    /// </summary>
+    public class Run : Inline
+    {
+        /// <summary>
+        /// Initializes an instance of Run class.
+        /// </summary>
+        public Run()
+        {
+        }
+
+        /// <summary>
+        /// Initializes an instance of Run class specifying its text content.
+        /// </summary>
+        /// <param name="text">
+        /// Text content assigned to the Run.
+        /// </param>
+        public Run(string? text)
+        {
+            Text = text;
+        }
+
+        /// <summary>
+        /// Dependency property backing Text.
+        /// </summary>
+        /// <remarks>
+        /// Note that when a TextRange that intersects with this Run gets modified (e.g. by editing 
+        /// a selection in RichTextBox), we will get two changes to this property since we delete 
+        /// and then insert when setting the content of a TextRange.
+        /// </remarks>
+        public static readonly StyledProperty<string?> TextProperty = AvaloniaProperty.Register<Run, string?> (
+            nameof (Text), defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// The content spanned by this TextElement.
+        /// </summary>
+        [Content]
+        public string? Text {
+            get { return GetValue (TextProperty); }
+            set { SetValue (TextProperty, value); }
+        }
+
+        internal override void BuildTextRun(IList<TextRun> textRuns)
+        {
+            var text = (Text ?? "").AsMemory();
+
+            var textRunProperties = CreateTextRunProperties();           
+
+            var textCharacters = new TextCharacters(text, textRunProperties);
+
+            textRuns.Add(textCharacters);
+        }
+
+        internal override void AppendText(StringBuilder stringBuilder)
+        {
+            var text = Text ?? "";
+
+            stringBuilder.Append(text);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            switch (change.Property.Name)
+            {
+                case nameof(Text):
+                    InlineHost?.Invalidate();
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/Span.cs b/src/Avalonia.Controls/Documents/Span.cs
new file mode 100644
index 0000000000..a7a702ceae
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/Span.cs
@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// Span element used for grouping other Inline elements.
+    /// </summary>
+    public class Span : Inline
+    {
+        /// <summary>
+        /// Defines the <see cref="Inlines"/> property.
+        /// </summary>
+        public static readonly StyledProperty<InlineCollection> InlinesProperty =
+            AvaloniaProperty.Register<Span, InlineCollection>(
+                nameof(Inlines));
+
+        public Span()
+        {
+            Inlines = new InlineCollection
+            {
+                LogicalChildren = LogicalChildren
+            };
+        }
+
+        /// <summary>
+        /// Gets or sets the inlines.
+        /// </summary>
+        [Content]
+        public InlineCollection Inlines
+        {
+            get => GetValue(InlinesProperty);
+            set => SetValue(InlinesProperty, value);
+        }
+
+        internal override void BuildTextRun(IList<TextRun> textRuns)
+        {
+            foreach (var inline in Inlines)
+            {
+                inline.BuildTextRun(textRuns);
+            }
+        }
+
+        internal override void AppendText(StringBuilder stringBuilder)
+        {
+            foreach (var inline in Inlines)
+            {
+                inline.AppendText(stringBuilder);
+            }
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            switch (change.Property.Name)
+            {
+                case nameof(InlinesProperty):
+                    OnInlinesChanged(change.OldValue as InlineCollection, change.NewValue as InlineCollection);
+                    InlineHost?.Invalidate();
+                    break;
+            }
+        }
+
+        internal override void OnInlineHostChanged(IInlineHost? oldValue, IInlineHost? newValue)
+        {
+            base.OnInlineHostChanged(oldValue, newValue);
+
+            if (Inlines is not null)
+            {
+                Inlines.InlineHost = newValue;
+            }
+        }
+
+        private void OnInlinesChanged(InlineCollection? oldValue, InlineCollection? newValue)
+        {
+            if (oldValue is not null)
+            {
+                oldValue.LogicalChildren = null;
+                oldValue.InlineHost = null;
+                oldValue.Invalidated -= (s, e) => InlineHost?.Invalidate();
+            }
+
+            if (newValue is not null)
+            {
+                newValue.LogicalChildren = LogicalChildren;
+                newValue.InlineHost = InlineHost;
+                newValue.Invalidated += (s, e) => InlineHost?.Invalidate();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/TextElement.cs b/src/Avalonia.Controls/Documents/TextElement.cs
new file mode 100644
index 0000000000..2034f05fc0
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/TextElement.cs
@@ -0,0 +1,289 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// TextElement is an  base class for content in text based controls.
+    /// TextElements span other content, applying property values or providing structural information.
+    /// </summary>
+    public abstract class TextElement : StyledElement
+    {
+        /// <summary>
+        /// Defines the <see cref="Background"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> BackgroundProperty =
+            Border.BackgroundProperty.AddOwner<TextElement>();
+
+        /// <summary>
+        /// Defines the <see cref="FontFamily"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontFamily>(
+                nameof(FontFamily),
+                defaultValue: FontFamily.Default,
+                inherits: true);
+
+        /// <summary>
+        /// Defines the <see cref="FontSize"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<double> FontSizeProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, double>(
+                nameof(FontSize),
+                defaultValue: 12,
+                inherits: true);
+
+        /// <summary>
+        /// Defines the <see cref="FontStyle"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStyle> FontStyleProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontStyle>(
+                nameof(FontStyle),
+                inherits: true);
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<FontWeight> FontWeightProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontWeight>(
+                nameof(FontWeight),
+                inherits: true,
+                defaultValue: FontWeight.Normal);
+
+        /// <summary>
+        /// Defines the <see cref="FontStretch"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontStretch>(
+                nameof(FontStretch),
+                inherits: true,
+                defaultValue: FontStretch.Normal);
+
+        /// <summary>
+        /// Defines the <see cref="Foreground"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<IBrush?> ForegroundProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, IBrush?>(
+                nameof(Foreground),
+                Brushes.Black,
+                inherits: true);
+
+        private IInlineHost? _inlineHost;
+
+        /// <summary>
+        /// Gets or sets a brush used to paint the control's background.
+        /// </summary>
+        public IBrush? Background
+        {
+            get { return GetValue(BackgroundProperty); }
+            set { SetValue(BackgroundProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font family.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get { return GetValue(FontFamilyProperty); }
+            set { SetValue(FontFamilyProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font size.
+        /// </summary>
+        public double FontSize
+        {
+            get { return GetValue(FontSizeProperty); }
+            set { SetValue(FontSizeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font style.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get { return GetValue(FontStyleProperty); }
+            set { SetValue(FontStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get { return GetValue(FontWeightProperty); }
+            set { SetValue(FontWeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a brush used to paint the text.
+        /// </summary>
+        public IBrush? Foreground
+        {
+            get { return GetValue(ForegroundProperty); }
+            set { SetValue(ForegroundProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font family.</returns>
+        public static FontFamily GetFontFamily(Control control)
+        {
+            return control.GetValue(FontFamilyProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontFamily(Control control, FontFamily value)
+        {
+            control.SetValue(FontFamilyProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font size.</returns>
+        public static double GetFontSize(Control control)
+        {
+            return control.GetValue(FontSizeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontSize(Control control, double value)
+        {
+            control.SetValue(FontSizeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font style.</returns>
+        public static FontStyle GetFontStyle(Control control)
+        {
+            return control.GetValue(FontStyleProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontStyle(Control control, FontStyle value)
+        {
+            control.SetValue(FontStyleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font weight.</returns>
+        public static FontWeight GetFontWeight(Control control)
+        {
+            return control.GetValue(FontWeightProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontWeight(Control control, FontWeight value)
+        {
+            control.SetValue(FontWeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontStretchProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font stretch.</returns>
+        public static FontStretch GetFontStretch(Control control)
+        {
+            return control.GetValue(FontStretchProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontStretchProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontStretch(Control control, FontStretch value)
+        {
+            control.SetValue(FontStretchProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The foreground.</returns>
+        public static IBrush? GetForeground(Control control)
+        {
+            return control.GetValue(ForegroundProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetForeground(Control control, IBrush? value)
+        {
+            control.SetValue(ForegroundProperty, value);
+        }
+
+        internal IInlineHost? InlineHost
+        {
+            get => _inlineHost;
+            set
+            {
+                var oldValue = _inlineHost;
+                _inlineHost = value;
+                OnInlineHostChanged(oldValue, value);
+            }
+        }
+
+        internal virtual void OnInlineHostChanged(IInlineHost? oldValue, IInlineHost? newValue)
+        {
+
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            switch (change.Property.Name)
+            {
+                case nameof(Background):
+                case nameof(FontFamily):
+                case nameof(FontSize):
+                case nameof(FontStyle):
+                case nameof(FontWeight):
+                case nameof(FontStretch):
+                case nameof(Foreground):
+                    InlineHost?.Invalidate();
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/Underline.cs b/src/Avalonia.Controls/Documents/Underline.cs
new file mode 100644
index 0000000000..fcd46c8439
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/Underline.cs
@@ -0,0 +1,15 @@
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// Underline element - markup helper for indicating superscript content.
+    /// Equivalent to a Span with TextDecorations property set to TextDecorations.Underlined.
+    /// Can contain other inline elements.
+    /// </summary>
+    public sealed class Underline : Span
+    {
+        static Underline()
+        {
+            TextDecorationsProperty.OverrideDefaultValue<Underline>(Media.TextDecorations.Underline);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DrawingPresenter.cs b/src/Avalonia.Controls/DrawingPresenter.cs
deleted file mode 100644
index ee27aa7ec1..0000000000
--- a/src/Avalonia.Controls/DrawingPresenter.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using Avalonia.Controls.Shapes;
-using Avalonia.Media;
-using Avalonia.Metadata;
-
-namespace Avalonia.Controls
-{
-    [Obsolete("Use Image control with DrawingImage source")]
-    public class DrawingPresenter : Control
-    {
-        static DrawingPresenter()
-        {
-            AffectsMeasure<DrawingPresenter>(DrawingProperty);
-            AffectsRender<DrawingPresenter>(DrawingProperty);
-        }
-
-        public static readonly StyledProperty<Drawing> DrawingProperty =
-            AvaloniaProperty.Register<DrawingPresenter, Drawing>(nameof(Drawing));
-
-        public static readonly StyledProperty<Stretch> StretchProperty =
-            AvaloniaProperty.Register<DrawingPresenter, Stretch>(nameof(Stretch), Stretch.Uniform);
-
-        [Content]
-        public Drawing Drawing
-        {
-            get => GetValue(DrawingProperty);
-            set => SetValue(DrawingProperty, value);
-        }
-
-        public Stretch Stretch
-        {
-            get => GetValue(StretchProperty);
-            set => SetValue(StretchProperty, value);
-        }
-
-        private Matrix _transform = Matrix.Identity;
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            if (Drawing == null) return new Size();
-
-            var (size, transform) = Shape.CalculateSizeAndTransform(availableSize, Drawing.GetBounds(), Stretch);
-
-            _transform = transform;
-
-            return size;
-        }
-
-        public override void Render(DrawingContext context)
-        {
-            if (Drawing != null)
-            {
-                using (context.PushPreTransform(_transform))
-                using (context.PushClip(new Rect(Bounds.Size)))
-                {
-                    Drawing.Draw(context);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
deleted file mode 100644
index 4e17f5bff5..0000000000
--- a/src/Avalonia.Controls/DropDown.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using Avalonia.Logging;
-using Avalonia.Styling;
-
-namespace Avalonia.Controls
-{
-    [Obsolete("Use ComboBox")]
-    public class DropDown : ComboBox, IStyleable
-    {
-        public DropDown()
-        {
-            Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDown is deprecated: Use ComboBox");
-        }
-
-        Type IStyleable.StyleKey => typeof(ComboBox);
-    }
-
-    [Obsolete("Use ComboBoxItem")]
-    public class DropDownItem : ComboBoxItem, IStyleable
-    {
-        public DropDownItem()
-        {
-            Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDownItem is deprecated: Use ComboBoxItem");
-        }
-
-        Type IStyleable.StyleKey => typeof(ComboBoxItem);
-    }
-}
diff --git a/src/Avalonia.Controls/DropDownButton.cs b/src/Avalonia.Controls/DropDownButton.cs
new file mode 100644
index 0000000000..8dc40f42af
--- /dev/null
+++ b/src/Avalonia.Controls/DropDownButton.cs
@@ -0,0 +1,15 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A button with an added drop-down chevron to visually indicate it has a flyout with additional actions.
+    /// </summary>
+    public class DropDownButton : Button
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DropDownButton"/> class.
+        /// </summary>
+        public DropDownButton()
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
index 08d559a5c1..1c7bdb9b37 100644
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
@@ -2,11 +2,13 @@
 using System.Collections.Generic;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 
 namespace Avalonia.Controls.Embedding.Offscreen
 {
+    [Unstable]
     public abstract class OffscreenTopLevelImplBase : ITopLevelImpl
     {
         private double _scaling = 1;
diff --git a/src/Avalonia.Controls/Expander.cs b/src/Avalonia.Controls/Expander.cs
index 020b162864..3ba99d8a67 100644
--- a/src/Avalonia.Controls/Expander.cs
+++ b/src/Avalonia.Controls/Expander.cs
@@ -106,13 +106,13 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == ExpandDirectionProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<ExpandDirection>());
+                UpdatePseudoClasses(change.GetNewValue<ExpandDirection>());
             }
         }
 
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index d024f86b32..65ec4cc54c 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -12,17 +12,12 @@ namespace Avalonia.Controls.Primitives
 {
     public abstract class FlyoutBase : AvaloniaObject, IPopupHostProvider
     {
-        static FlyoutBase()
-        {
-            Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
-        }
-
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property
         /// </summary>
         public static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
-           AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
-               x => x.IsOpen);
+            AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
+                x => x.IsOpen);
 
         /// <summary>
         /// Defines the <see cref="Target"/> property
@@ -43,6 +38,14 @@ namespace Avalonia.Controls.Primitives
             AvaloniaProperty.RegisterDirect<FlyoutBase, FlyoutShowMode>(nameof(ShowMode),
                 x => x.ShowMode, (x, v) => x.ShowMode = v);
 
+        /// <summary>
+        /// Defines the <see cref="OverlayInputPassThroughElement"/> property
+        /// </summary>
+        public static readonly DirectProperty<FlyoutBase, IInputElement?> OverlayInputPassThroughElementProperty =
+            Popup.OverlayInputPassThroughElementProperty.AddOwner<FlyoutBase>(
+                o => o._overlayInputPassThroughElement,
+                (o, v) => o._overlayInputPassThroughElement = v);
+
         /// <summary>
         /// Defines the AttachedFlyout property
         /// </summary>
@@ -57,6 +60,12 @@ namespace Avalonia.Controls.Primitives
         private PixelRect? _enlargePopupRectScreenPixelRect;
         private IDisposable? _transientDisposable;
         private Action<IPopupHost?>? _popupHostChangedHandler;
+        private IInputElement? _overlayInputPassThroughElement;
+
+        static FlyoutBase()
+        {
+            Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
+        }
 
         public FlyoutBase()
         {
@@ -101,11 +110,21 @@ namespace Avalonia.Controls.Primitives
             private set => SetAndRaise(TargetProperty, ref _target, value);
         }
 
+        /// <summary>
+        /// Gets or sets an element that should receive pointer input events even when underneath
+        /// the flyout's overlay.
+        /// </summary>
+        public IInputElement? OverlayInputPassThroughElement
+        {
+            get => _overlayInputPassThroughElement;
+            set => SetAndRaise(OverlayInputPassThroughElementProperty, ref _overlayInputPassThroughElement, value);
+        }
+
         IPopupHost? IPopupHostProvider.PopupHost => Popup?.Host;
 
-        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
-        { 
-            add => _popupHostChangedHandler += value; 
+        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged
+        {
+            add => _popupHostChangedHandler += value;
             remove => _popupHostChangedHandler -= value;
         }
 
@@ -176,6 +195,8 @@ namespace Avalonia.Controls.Primitives
             IsOpen = false;
             Popup.IsOpen = false;
 
+            ((ISetLogicalParent)Popup).SetParent(null);
+
             // Ensure this isn't active
             _transientDisposable?.Dispose();
             _transientDisposable = null;
@@ -218,10 +239,11 @@ namespace Avalonia.Controls.Primitives
                 ((ISetLogicalParent)Popup).SetParent(null);
             }
 
-            if (Popup.PlacementTarget != placementTarget)
+            if (Popup.Parent == null || Popup.PlacementTarget != placementTarget)
             {
                 Popup.PlacementTarget = Target = placementTarget;
                 ((ISetLogicalParent)Popup).SetParent(placementTarget);
+                Popup.SetValue(StyledElement.TemplatedParentProperty, placementTarget.TemplatedParent);
             }
 
             if (Popup.Child == null)
@@ -229,6 +251,8 @@ namespace Avalonia.Controls.Primitives
                 Popup.Child = CreatePresenter();
             }
 
+            Popup.OverlayInputPassThroughElement = OverlayInputPassThroughElement;
+
             if (CancelOpening())
             {
                 return false;
@@ -354,10 +378,13 @@ namespace Avalonia.Controls.Primitives
 
         private Popup CreatePopup()
         {
-            var popup = new Popup();
-            popup.WindowManagerAddShadowHint = false;
-            popup.IsLightDismissEnabled = true;
-            popup.OverlayDismissEventPassThrough = true;
+            var popup = new Popup
+            {
+                WindowManagerAddShadowHint = false,
+                IsLightDismissEnabled = true,
+                //Note: This is required to prevent Button.Flyout from opening the flyout again after dismiss.
+                OverlayDismissEventPassThrough = false
+            };
 
             popup.Opened += OnPopupOpened;
             popup.Closed += OnPopupClosed;
@@ -370,7 +397,7 @@ namespace Avalonia.Controls.Primitives
         {
             IsOpen = true;
 
-            _popupHostChangedHandler?.Invoke(Popup!.Host);
+            _popupHostChangedHandler?.Invoke(Popup.Host);
         }
 
         private void OnPopupClosing(object? sender, CancelEventArgs e)
@@ -570,7 +597,7 @@ namespace Avalonia.Controls.Primitives
             for (int i = presenter.Classes.Count - 1; i >= 0; i--)
             {
                 if (!classes.Contains(presenter.Classes[i]) &&
-                    !presenter.Classes[i].Contains(":"))
+                    !presenter.Classes[i].Contains(':'))
                 {
                     presenter.Classes.RemoveAt(i);
                 }
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index bcd859100a..278e498a67 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -8,21 +8,17 @@ namespace Avalonia.Controls
 {
     public class MenuFlyoutPresenter : MenuBase
     {
-        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
-            Border.CornerRadiusProperty.AddOwner<FlyoutPresenter>();
-
-        public CornerRadius CornerRadius
-        {
-            get => GetValue(CornerRadiusProperty);
-            set => SetValue(CornerRadiusProperty, value);
-        }
-
         public MenuFlyoutPresenter()
             :base(new DefaultMenuInteractionHandler(true))
         {
+        }
 
+        public MenuFlyoutPresenter(IMenuInteractionHandler menuInteractionHandler)
+            : base(menuInteractionHandler)
+        {
         }
 
+
         public override void Close()
         {
             // DefaultMenuInteractionHandler calls this
diff --git a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
index 70d9dbec08..f9772cb399 100644
--- a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls.Templates;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Generators
 {
@@ -14,6 +15,11 @@ namespace Avalonia.Controls.Generators
         /// </summary>
         IEnumerable<ItemContainerInfo> Containers { get; }
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the items in the control.
+        /// </summary>
+        ControlTheme? ItemContainerTheme { get; set; }
+
         /// <summary>
         /// Gets or sets the data template used to display the items in the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index 79a9e16879..8b36b07cec 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Generators
 {
@@ -35,6 +36,11 @@ namespace Avalonia.Controls.Generators
         /// <inheritdoc/>
         public event EventHandler<ItemContainerEventArgs>? Recycled;
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the items in the control.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme { get; set; }
+
         /// <summary>
         /// Gets or sets the data template used to display the items in the control.
         /// </summary>
@@ -82,7 +88,7 @@ namespace Avalonia.Controls.Generators
             {
                 var toMove = _containers.Where(x => x.Key >= index)
                     .OrderByDescending(x => x.Key)
-                    .ToList();
+                    .ToArray();
 
                 foreach (var i in toMove)
                 {
@@ -111,7 +117,7 @@ namespace Avalonia.Controls.Generators
                 }
 
                 var toMove = _containers.Where(x => x.Key >= startingIndex)
-                                        .OrderBy(x => x.Key).ToList();
+                                        .OrderBy(x => x.Key).ToArray();
 
                 foreach (var i in toMove)
                 {
@@ -122,9 +128,9 @@ namespace Avalonia.Controls.Generators
 
                 Dematerialized?.Invoke(this, new ItemContainerEventArgs(startingIndex, result));
 
-                if (toMove.Count > 0)
+                if (toMove.Length > 0)
                 {
-                    var containers = toMove.Select(x => x.Value).ToList();
+                    var containers = toMove.Select(x => x.Value).ToArray();
                     Recycled?.Invoke(this, new ItemContainerEventArgs(containers[0].Index, containers));
                 }
             }
@@ -138,10 +144,10 @@ namespace Avalonia.Controls.Generators
         /// <inheritdoc/>
         public virtual IEnumerable<ItemContainerInfo> Clear()
         {
-            var result = Containers.ToList();
+            var result = Containers.ToArray();
             _containers.Clear();
 
-            if (result.Count > 0)
+            if (result.Length > 0)
             {
                 Dematerialized?.Invoke(this, new ItemContainerEventArgs(0, result));
             }
@@ -190,10 +196,18 @@ namespace Avalonia.Controls.Generators
                     result.SetValue(
                         ContentPresenter.ContentTemplateProperty,
                         ItemTemplate,
-                        BindingPriority.TemplatedParent);
+                        BindingPriority.Style);
                 }
             }
 
+            if (ItemContainerTheme != null)
+            {
+                result.SetValue(
+                    StyledElement.ThemeProperty,
+                    ItemContainerTheme,
+                    BindingPriority.TemplatedParent);
+            }
+
             return result;
         }
 
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
index 635f3a7d37..3ff1b0702d 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
@@ -44,28 +44,29 @@ namespace Avalonia.Controls.Generators
         {
             var container = item as T;
 
-            if (container != null)
+            if (container is null)
             {
-                return container;
-            }
-            else
-            {
-                var result = new T();
+                container = new T();
 
                 if (ContentTemplateProperty != null)
                 {
-                    result.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
+                    container.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
                 }
 
-                result.SetValue(ContentProperty, item, BindingPriority.Style);
+                container.SetValue(ContentProperty, item, BindingPriority.Style);
 
                 if (!(item is IControl))
                 {
-                    result.DataContext = item;
+                    container.DataContext = item;
                 }
+            }
 
-                return result;
+            if (ItemContainerTheme != null)
+            {
+                container.SetValue(StyledElement.ThemeProperty, ItemContainerTheme, BindingPriority.Style);
             }
+
+            return container;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
index da13416700..eb60fca367 100644
--- a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
+++ b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
@@ -15,6 +15,7 @@ namespace Avalonia.Controls.Generators
     /// </remarks>
     public class TreeContainerIndex
     {
+        private readonly Dictionary<object, HashSet<IControl>> _itemToContainerSet = new Dictionary<object, HashSet<IControl>>();
         private readonly Dictionary<object, IControl> _itemToContainer = new Dictionary<object, IControl>();
         private readonly Dictionary<IControl, object> _containerToItem = new Dictionary<IControl, object>();
 
@@ -45,14 +46,45 @@ namespace Avalonia.Controls.Generators
         /// <param name="container">The item container.</param>
         public void Add(object item, IControl container)
         {
-            _itemToContainer.Add(item, container);
+            _itemToContainer[item] = container;
+            if (_itemToContainerSet.TryGetValue(item, out var set))
+            {
+                set.Add(container);
+            }
+            else
+            {
+                _itemToContainerSet.Add(item, new HashSet<IControl> { container });
+            }
+
             _containerToItem.Add(container, item);
 
             Materialized?.Invoke(
-                this, 
+                this,
                 new ItemContainerEventArgs(new ItemContainerInfo(container, item, 0)));
         }
 
+        /// <summary>
+        /// Removes a container from private collections.
+        /// </summary>
+        /// <param name="container">The item container.</param>
+        /// <param name="item">The DataContext object</param>
+        private void RemoveContainer(IControl container, object item)
+        {
+            if (_itemToContainerSet.TryGetValue(item, out var set))
+            {
+                set.Remove(container);
+                if (set.Count == 0)
+                {
+                    _itemToContainerSet.Remove(item);
+                    _itemToContainer.Remove(item);
+                }
+                else
+                {
+                    _itemToContainer[item] = set.First();
+                }
+            }
+        }
+        
         /// <summary>
         /// Removes a container from the index.
         /// </summary>
@@ -61,10 +93,10 @@ namespace Avalonia.Controls.Generators
         {
             var item = _containerToItem[container];
             _containerToItem.Remove(container);
-            _itemToContainer.Remove(item);
+            RemoveContainer(container, item);
 
             Dematerialized?.Invoke(
-                this, 
+                this,
                 new ItemContainerEventArgs(new ItemContainerInfo(container, item, 0)));
         }
 
@@ -79,7 +111,7 @@ namespace Avalonia.Controls.Generators
             {
                 var item = _containerToItem[container.ContainerControl];
                 _containerToItem.Remove(container.ContainerControl);
-                _itemToContainer.Remove(item);
+                RemoveContainer(container.ContainerControl, item);
             }
 
             Dematerialized?.Invoke(
@@ -97,6 +129,14 @@ namespace Avalonia.Controls.Generators
             if (item != null)
             {
                 _itemToContainer.TryGetValue(item, out var result);
+                if (result == null)
+                {
+                    _itemToContainerSet.TryGetValue(item, out var set);
+                    if (set?.Count > 0)
+                    {
+                        return set.FirstOrDefault();
+                    }
+                }
                 return result;
             }
 
@@ -113,6 +153,10 @@ namespace Avalonia.Controls.Generators
             if (container != null)
             {
                 _containerToItem.TryGetValue(container, out var result);
+                if (result != null)
+                {
+                    _itemToContainer[result] = container;
+                }
                 return result;
             }
 
diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
index 536a5fdd06..4e3deb5552 100644
--- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
@@ -71,6 +71,11 @@ namespace Avalonia.Controls.Generators
                 var template = GetTreeDataTemplate(item, ItemTemplate);
                 var result = new T();
 
+                if (ItemContainerTheme != null)
+                {
+                    result.SetValue(Control.ThemeProperty, ItemContainerTheme, BindingPriority.Style);
+                }
+
                 result.SetValue(ContentProperty, template.Build(item), BindingPriority.Style);
 
                 var itemsSelector = template.ItemsSelector(item);
diff --git a/src/Avalonia.Controls/GridLength.cs b/src/Avalonia.Controls/GridLength.cs
index d7022b80ce..0e2f8e7d0c 100644
--- a/src/Avalonia.Controls/GridLength.cs
+++ b/src/Avalonia.Controls/GridLength.cs
@@ -180,7 +180,7 @@ namespace Avalonia.Controls
                 return "Auto";
             }
 
-            string s = _value.ToString();
+            string s = _value.ToString(CultureInfo.InvariantCulture);
             return IsStar ? s + "*" : s;
         }
 
diff --git a/src/Avalonia.Controls/GridSplitter.cs b/src/Avalonia.Controls/GridSplitter.cs
index 216e43e1f0..85dad894fd 100644
--- a/src/Avalonia.Controls/GridSplitter.cs
+++ b/src/Avalonia.Controls/GridSplitter.cs
@@ -221,7 +221,8 @@ namespace Avalonia.Controls
                     ShowsPreview = showsPreview,
                     ResizeDirection = resizeDirection,
                     SplitterLength = Math.Min(Bounds.Width, Bounds.Height),
-                    ResizeBehavior = GetEffectiveResizeBehavior(resizeDirection)
+                    ResizeBehavior = GetEffectiveResizeBehavior(resizeDirection),
+                    Scaling = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1,
                 };
 
                 // Store the rows and columns to resize on drag events.
@@ -348,9 +349,9 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
 
             GridResizeDirection direction = GetEffectiveResizeDirection();
 
@@ -630,13 +631,17 @@ namespace Avalonia.Controls
             {
                 double actualLength1 = GetActualLength(definition1);
                 double actualLength2 = GetActualLength(definition2);
+                double pixelLength = 1 / _resizeData.Scaling;
+                double epsilon = pixelLength + LayoutHelper.LayoutEpsilon;
 
                 // When splitting, Check to see if the total pixels spanned by the definitions 
-                // is the same as before starting resize. If not cancel the drag.
+                // is the same as before starting resize. If not cancel the drag. We need to account for
+                // layout rounding here, so ignore differences of less than a device pixel to avoid problems
+                // that WPF has, such as https://stackoverflow.com/questions/28464843.
                 if (_resizeData.SplitBehavior == SplitBehavior.Split &&
                     !MathUtilities.AreClose(
                         actualLength1 + actualLength2,
-                        _resizeData.OriginalDefinition1ActualLength + _resizeData.OriginalDefinition2ActualLength, LayoutHelper.LayoutEpsilon))
+                        _resizeData.OriginalDefinition1ActualLength + _resizeData.OriginalDefinition2ActualLength, epsilon))
                 {
                     CancelResize();
 
@@ -798,6 +803,9 @@ namespace Avalonia.Controls
             // The minimum of Width/Height of Splitter.  Used to ensure splitter 
             // isn't hidden by resizing a row/column smaller than the splitter.
             public double SplitterLength;
+
+            // The current layout scaling factor.
+            public double Scaling;
         }
     }
 
diff --git a/src/Avalonia.Controls/HotkeyManager.cs b/src/Avalonia.Controls/HotkeyManager.cs
index d83b996aa0..bde1da509b 100644
--- a/src/Avalonia.Controls/HotkeyManager.cs
+++ b/src/Avalonia.Controls/HotkeyManager.cs
@@ -12,21 +12,61 @@ namespace Avalonia.Controls
 
         class HotkeyCommandWrapper : ICommand
         {
-            public HotkeyCommandWrapper(ICommandSource? control)
+            readonly WeakReference reference;
+
+            public HotkeyCommandWrapper(IControl control)
             {
-                CommandSource = control;
+                reference = new WeakReference(control);
             }
 
-            public readonly ICommandSource? CommandSource;
+            public ICommand? GetCommand()
+            {
+                if (reference.Target is { } target)
+                {
+                    if (target is ICommandSource commandSource && commandSource.Command is { } command)
+                    {
+                        return command;
+                    }
+                    else if (target is IClickableControl { })
+                    {
+                        return this;
+                    }
+                }
+                return null;
+            }
 
-            private ICommand? GetCommand() => CommandSource?.Command;
+            public bool CanExecute(object? parameter)
+            {
+                if (reference.Target is { } target)
+                {
+                    if (target is ICommandSource commandSource && commandSource.Command is { } command)
+                    {
+                        return commandSource.IsEffectivelyEnabled
+                            && command.CanExecute(commandSource.CommandParameter) == true;
+                    }
+                    else if (target is IClickableControl clickable)
+                    {
+                        return clickable.IsEffectivelyEnabled;
+                    }
+                }
+                return false;
+            }
 
-            public bool CanExecute(object? parameter) =>
-                CommandSource?.Command?.CanExecute(CommandSource.CommandParameter) == true
-                && CommandSource.IsEffectivelyEnabled;
+            public void Execute(object? parameter)
+            {
+                if (reference.Target is { } target)
+                {
+                    if (target is ICommandSource commandSource && commandSource.Command is { } command)
+                    {
+                        command.Execute(commandSource.CommandParameter);
+                    }
+                    else if (target is IClickableControl { IsEffectivelyEnabled: true } clickable)
+                    {
+                        clickable.RaiseClick();
+                    }
+                }
+            }
 
-            public void Execute(object? parameter) =>
-                GetCommand()?.Execute(CommandSource?.CommandParameter);
 
 #pragma warning disable 67 // Event not used
             public event EventHandler? CanExecuteChanged;
@@ -47,7 +87,7 @@ namespace Avalonia.Controls
             public Manager(IControl control)
             {
                 _control = control;
-                _wrapper = new HotkeyCommandWrapper(_control as ICommandSource);
+                _wrapper = new HotkeyCommandWrapper(_control);
             }
 
             public void Init()
@@ -104,13 +144,14 @@ namespace Avalonia.Controls
         {
             HotKeyProperty.Changed.Subscribe(args =>
             {
-                if (args.NewValue.Value is null) return;
+                if (args.NewValue.Value is null)
+                    return;
 
                 var control = args.Sender as IControl;
-                if (control is not ICommandSource)
+                if (control is not IClickableControl)
                 {
                     Logging.Logger.TryGet(Logging.LogEventLevel.Warning, Logging.LogArea.Control)?.Log(control,
-                        $"The element {args.Sender.GetType().Name} does not implement ICommandSource and does not support binding a HotKey ({args.NewValue}).");
+                        $"The element {args.Sender.GetType().Name} does not implement IClickableControl and does not support binding a HotKey ({args.NewValue}).");
                     return;
                 }
 
diff --git a/src/Avalonia.Controls/IContentControl.cs b/src/Avalonia.Controls/IContentControl.cs
index d28b0afb25..b4d8d0f574 100644
--- a/src/Avalonia.Controls/IContentControl.cs
+++ b/src/Avalonia.Controls/IContentControl.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
@@ -7,6 +8,7 @@ namespace Avalonia.Controls
     /// Defines a control that displays <see cref="Content"/> according to a
     /// <see cref="Avalonia.Controls.Templates.FuncDataTemplate"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IContentControl : IControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/IControl.cs b/src/Avalonia.Controls/IControl.cs
index b501bc15a7..3395fc1059 100644
--- a/src/Avalonia.Controls/IControl.cs
+++ b/src/Avalonia.Controls/IControl.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -8,6 +9,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Interface for Avalonia controls.
     /// </summary>
+    [NotClientImplementable]
     public interface IControl : IVisual,
         IDataTemplateHost,
         ILayoutable,
diff --git a/src/Avalonia.Controls/IGlobalDataTemplates.cs b/src/Avalonia.Controls/IGlobalDataTemplates.cs
index 92dcd2c189..f4499ddb5e 100644
--- a/src/Avalonia.Controls/IGlobalDataTemplates.cs
+++ b/src/Avalonia.Controls/IGlobalDataTemplates.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls.Templates;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Defines the application-global data templates.
     /// </summary>
+    [NotClientImplementable]
     public interface IGlobalDataTemplates : IDataTemplateHost
     {
     }
diff --git a/src/Avalonia.Controls/IMenu.cs b/src/Avalonia.Controls/IMenu.cs
index 0722a22f08..d90c5ea7a8 100644
--- a/src/Avalonia.Controls/IMenu.cs
+++ b/src/Avalonia.Controls/IMenu.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls.Platform;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents a <see cref="Menu"/> or <see cref="ContextMenu"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IMenu : IMenuElement
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/IMenuElement.cs b/src/Avalonia.Controls/IMenuElement.cs
index a3200d2b1b..c13c20b639 100644
--- a/src/Avalonia.Controls/IMenuElement.cs
+++ b/src/Avalonia.Controls/IMenuElement.cs
@@ -1,11 +1,13 @@
 using System.Collections.Generic;
 using Avalonia.Input;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents an <see cref="IMenu"/> or <see cref="IMenuItem"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IMenuElement : IControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/IMenuItem.cs b/src/Avalonia.Controls/IMenuItem.cs
index 35e36eb0f4..9d7ef3c18d 100644
--- a/src/Avalonia.Controls/IMenuItem.cs
+++ b/src/Avalonia.Controls/IMenuItem.cs
@@ -1,8 +1,11 @@
-namespace Avalonia.Controls
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents a <see cref="MenuItem"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IMenuItem : IMenuElement
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs b/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
index f492e6ca0f..29963e4821 100644
--- a/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
+++ b/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls
 {
+    [Unstable]
     public interface INativeMenuExporterEventsImplBridge
     {
         void RaiseNeedsUpdate ();
diff --git a/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs b/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
index 6cb68d8ddd..a6c7489971 100644
--- a/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
+++ b/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls
 {
+    [Unstable]
     public interface INativeMenuItemExporterEventsImplBridge
     {
         void RaiseClicked ();
diff --git a/src/Avalonia.Controls/IPanel.cs b/src/Avalonia.Controls/IPanel.cs
index 7b9e2c2074..8f2564ec74 100644
--- a/src/Avalonia.Controls/IPanel.cs
+++ b/src/Avalonia.Controls/IPanel.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Interface for controls that can contain multiple children.
     /// </summary>
+    [NotClientImplementable]
     public interface IPanel : IControl
     {
         /// <summary>
@@ -10,4 +13,4 @@ namespace Avalonia.Controls
         /// </summary>
         Controls Children { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/IScrollable.cs b/src/Avalonia.Controls/IScrollable.cs
index 2a98b3910a..680088290c 100644
--- a/src/Avalonia.Controls/IScrollable.cs
+++ b/src/Avalonia.Controls/IScrollable.cs
@@ -1,4 +1,3 @@
-
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index c448729643..7408bff902 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -1,3 +1,5 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
@@ -33,6 +35,7 @@ namespace Avalonia.Controls
         {
             AffectsRender<Image>(SourceProperty, StretchProperty, StretchDirectionProperty);
             AffectsMeasure<Image>(SourceProperty, StretchProperty, StretchDirectionProperty);
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<Image>(AutomationControlType.Image);
         }
 
         /// <summary>
@@ -63,6 +66,8 @@ namespace Avalonia.Controls
             set { SetValue(StretchDirectionProperty, value); }
         }
 
+        protected override bool BypassFlowDirectionPolicies => true;
+        
         /// <summary>
         /// Renders the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index ed8f9efb2e..345e7fcac8 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Collections;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
@@ -14,6 +15,7 @@ using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.VisualTree;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -35,6 +37,12 @@ namespace Avalonia.Controls
         public static readonly DirectProperty<ItemsControl, IEnumerable?> ItemsProperty =
             AvaloniaProperty.RegisterDirect<ItemsControl, IEnumerable?>(nameof(Items), o => o.Items, (o, v) => o.Items = v);
 
+        /// <summary>
+        /// Defines the <see cref="ItemContainerTheme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ItemContainerThemeProperty =
+            AvaloniaProperty.Register<ItemsControl, ControlTheme?>(nameof(ItemContainerTheme));
+
         /// <summary>
         /// Defines the <see cref="ItemCount"/> property.
         /// </summary>
@@ -87,6 +95,7 @@ namespace Avalonia.Controls
                 {
                     _itemContainerGenerator = CreateItemContainerGenerator();
 
+                    _itemContainerGenerator.ItemContainerTheme = ItemContainerTheme;
                     _itemContainerGenerator.ItemTemplate = ItemTemplate;
                     _itemContainerGenerator.Materialized += (_, e) => OnContainersMaterialized(e);
                     _itemContainerGenerator.Dematerialized += (_, e) => OnContainersDematerialized(e);
@@ -107,6 +116,15 @@ namespace Avalonia.Controls
             set { SetAndRaise(ItemsProperty, ref _items, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for each item.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme
+        {
+            get { return GetValue(ItemContainerThemeProperty); }
+            set { SetValue(ItemContainerThemeProperty, value); }
+        }
+
         /// <summary>
         /// Gets the number of items in <see cref="Items"/>.
         /// </summary>
@@ -165,7 +183,7 @@ namespace Avalonia.Controls
             if (Presenter is IChildIndexProvider innerProvider)
             {
                 innerProvider.ChildIndexChanged += PresenterChildIndexChanged;
-                _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs());
+                _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
             }
         }
 
@@ -335,13 +353,22 @@ namespace Avalonia.Controls
             base.OnKeyDown(e);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new ItemsControlAutomationPeer(this);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == ItemCountProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<int>());
+                UpdatePseudoClasses(change.GetNewValue<int>());
+            }
+            else if (change.Property == ItemContainerThemeProperty && _itemContainerGenerator is not null)
+            {
+                _itemContainerGenerator.ItemContainerTheme = change.GetNewValue<ControlTheme?>();
             }
         }
 
@@ -496,26 +523,47 @@ namespace Avalonia.Controls
             IInputElement? from,
             bool wrap)
         {
-            IInputElement? result;
-            var c = from;
+            var current = from;
 
-            do
+            for (;;)
             {
-                result = container.GetControl(direction, c, wrap);
-                from = from ?? result;
+                var result = container.GetControl(direction, current, wrap);
 
-                if (result != null &&
-                    result.Focusable &&
+                if (result is null)
+                {
+                    return null;
+                }
+
+                if (result.Focusable &&
                     result.IsEffectivelyEnabled &&
                     result.IsEffectivelyVisible)
                 {
                     return result;
                 }
 
-                c = result;
-            } while (c != null && c != from);
+                current = result;
 
-            return null;
+                if (current == from)
+                {
+                    return null;
+                }
+
+                switch (direction)
+                {
+                    //We did not find an enabled first item. Move downwards until we find one.
+                    case NavigationDirection.First:
+                        direction = NavigationDirection.Down;
+                        from = result;
+                        break;
+
+                    //We did not find an enabled last item. Move upwards until we find one.
+                    case NavigationDirection.Last:
+                        direction = NavigationDirection.Up;
+                        from = result;
+                        break;
+
+                }
+            }
         }
 
         private void PresenterChildIndexChanged(object? sender, ChildIndexChangedEventArgs e)
diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index 9b7ae0d324..86118d7b00 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -1,10 +1,12 @@
 using System.Collections;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -12,6 +14,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// An <see cref="ItemsControl"/> in which individual items can be selected.
     /// </summary>
+    [TemplatePart("PART_ScrollViewer", typeof(IScrollable))]
     public class ListBox : SelectingItemsControl
     {
         /// <summary>
@@ -136,7 +139,8 @@ namespace Avalonia.Controls
                     e.Source,
                     true,
                     e.KeyModifiers.HasAllFlags(KeyModifiers.Shift),
-                    e.KeyModifiers.HasAllFlags(KeyModifiers.Control));
+                    e.KeyModifiers.HasAllFlags(KeyModifiers.Control),
+                    fromFocus: true);
             }
         }
 
@@ -155,7 +159,7 @@ namespace Avalonia.Controls
                         e.Source,
                         true,
                         e.KeyModifiers.HasAllFlags(KeyModifiers.Shift),
-                        e.KeyModifiers.HasAllFlags(KeyModifiers.Control),
+                        e.KeyModifiers.HasAllFlags(AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>().CommandModifiers),
                         point.Properties.IsRightButtonPressed);
                 }
             }
diff --git a/src/Avalonia.Controls/ListBoxItem.cs b/src/Avalonia.Controls/ListBoxItem.cs
index 4fe5f4de40..66a46cab4a 100644
--- a/src/Avalonia.Controls/ListBoxItem.cs
+++ b/src/Avalonia.Controls/ListBoxItem.cs
@@ -1,6 +1,6 @@
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
-using Avalonia.Input;
 
 namespace Avalonia.Controls
 {
@@ -34,5 +34,10 @@ namespace Avalonia.Controls
             get { return GetValue(IsSelectedProperty); }
             set { SetValue(IsSelectedProperty, value); }
         }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new ListItemAutomationPeer(this);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/LoggingExtensions.cs b/src/Avalonia.Controls/LoggingExtensions.cs
index 9eb3b140f6..ef14d0b477 100644
--- a/src/Avalonia.Controls/LoggingExtensions.cs
+++ b/src/Avalonia.Controls/LoggingExtensions.cs
@@ -1,21 +1,10 @@
-using System;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Logging;
 
 namespace Avalonia
 {
     public static class LoggingExtensions
     {
-        [Obsolete("Use LogToTrace")]
-        public static T LogToDebug<T>(
-            this T builder,
-            LogEventLevel level = LogEventLevel.Warning,
-            params string[] areas)
-                where T : AppBuilderBase<T>, new()
-        {
-            return LogToTrace(builder, level, areas);
-        }
-
         /// <summary>
         /// Logs Avalonia events to the <see cref="System.Diagnostics.Trace"/> sink.
         /// </summary>
diff --git a/src/Avalonia.Controls/MaskedTextBox.cs b/src/Avalonia.Controls/MaskedTextBox.cs
index ad64c61ebe..080326606e 100644
--- a/src/Avalonia.Controls/MaskedTextBox.cs
+++ b/src/Avalonia.Controls/MaskedTextBox.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls
              AvaloniaProperty.Register<MaskedTextBox, string?>(nameof(Mask), string.Empty);
 
         public static new readonly StyledProperty<char> PasswordCharProperty =
-             AvaloniaProperty.Register<TextBox, char>(nameof(PasswordChar), '\0');
+             AvaloniaProperty.Register<MaskedTextBox, char>(nameof(PasswordChar), '\0');
 
         public static readonly StyledProperty<char> PromptCharProperty =
              AvaloniaProperty.Register<MaskedTextBox, char>(nameof(PromptChar), '_');
@@ -280,7 +280,7 @@ namespace Avalonia.Controls
             base.OnLostFocus(e);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             void UpdateMaskProvider()
             {
diff --git a/src/Avalonia.Controls/Menu.cs b/src/Avalonia.Controls/Menu.cs
index cc89677f82..611811f170 100644
--- a/src/Avalonia.Controls/Menu.cs
+++ b/src/Avalonia.Controls/Menu.cs
@@ -1,3 +1,5 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -35,6 +37,8 @@ namespace Avalonia.Controls
         static Menu()
         {
             ItemsPanelProperty.OverrideDefaultValue(typeof(Menu), DefaultPanel);
+            AutomationProperties.AccessibilityViewProperty.OverrideDefaultValue<Menu>(AccessibilityView.Control);
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<Menu>(AutomationControlType.Menu);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/MenuBase.cs b/src/Avalonia.Controls/MenuBase.cs
index bdcff5cd09..54cbc46a36 100644
--- a/src/Avalonia.Controls/MenuBase.cs
+++ b/src/Avalonia.Controls/MenuBase.cs
@@ -18,8 +18,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property.
         /// </summary>
-        public static readonly DirectProperty<Menu, bool> IsOpenProperty =
-            AvaloniaProperty.RegisterDirect<Menu, bool>(
+        public static readonly DirectProperty<MenuBase, bool> IsOpenProperty =
+            AvaloniaProperty.RegisterDirect<MenuBase, bool>(
                 nameof(IsOpen),
                 o => o.IsOpen);
 
@@ -40,7 +40,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuBase"/> class.
         /// </summary>
-        public MenuBase()
+        protected MenuBase()
         {
             InteractionHandler = new DefaultMenuInteractionHandler(false);
         }
@@ -49,7 +49,7 @@ namespace Avalonia.Controls
         /// Initializes a new instance of the <see cref="MenuBase"/> class.
         /// </summary>
         /// <param name="interactionHandler">The menu interaction handler.</param>
-        public MenuBase(IMenuInteractionHandler interactionHandler)
+        protected MenuBase(IMenuInteractionHandler interactionHandler)
         {
             InteractionHandler = interactionHandler ?? throw new ArgumentNullException(nameof(interactionHandler));
         }
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 185b834052..11c42f2ef3 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Windows.Input;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
@@ -19,8 +20,9 @@ namespace Avalonia.Controls
     /// <summary>
     /// A menu item control.
     /// </summary>
+    [TemplatePart("PART_Popup", typeof(Popup))]
     [PseudoClasses(":separator", ":icon", ":open", ":pressed", ":selected")]
-    public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable, ICommandSource
+    public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable, ICommandSource, IClickableControl
     {
         /// <summary>
         /// Defines the <see cref="Command"/> property.
@@ -77,25 +79,33 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Click"/> event.
         /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> ClickEvent =
-            RoutedEvent.Register<MenuItem, RoutedEventArgs>(nameof(Click), RoutingStrategies.Bubble);
+            RoutedEvent.Register<MenuItem, RoutedEventArgs>(
+                nameof(Click),
+                RoutingStrategies.Bubble);
 
         /// <summary>
-        /// Defines the <see cref="PointerEnterItem"/> event.
+        /// Defines the <see cref="PointerEnteredItem"/> event.
         /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerEnterItemEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnterItem), RoutingStrategies.Bubble);
+        public static readonly RoutedEvent<PointerEventArgs> PointerEnteredItemEvent =
+            RoutedEvent.Register<MenuItem, PointerEventArgs>(
+                nameof(PointerEnteredItem),
+                RoutingStrategies.Bubble);
 
         /// <summary>
-        /// Defines the <see cref="PointerLeaveItem"/> event.
+        /// Defines the <see cref="PointerExitedItem"/> event.
         /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerLeaveItemEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeaveItem), RoutingStrategies.Bubble);
+        public static readonly RoutedEvent<PointerEventArgs> PointerExitedItemEvent =
+            RoutedEvent.Register<MenuItem, PointerEventArgs>(
+                nameof(PointerExitedItem),
+                RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="SubmenuOpened"/> event.
         /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> SubmenuOpenedEvent =
-            RoutedEvent.Register<MenuItem, RoutedEventArgs>(nameof(SubmenuOpened), RoutingStrategies.Bubble);
+            RoutedEvent.Register<MenuItem, RoutedEventArgs>(
+                nameof(SubmenuOpened),
+                RoutingStrategies.Bubble);
 
         /// <summary>
         /// The default value for the <see cref="ItemsControl.ItemsPanel"/> property.
@@ -172,24 +182,24 @@ namespace Avalonia.Controls
         /// Occurs when the pointer enters a menu item.
         /// </summary>
         /// <remarks>
-        /// A bubbling version of the <see cref="InputElement.PointerEnter"/> event for menu items.
+        /// A bubbling version of the <see cref="InputElement.PointerEntered"/> event for menu items.
         /// </remarks>
-        public event EventHandler<PointerEventArgs>? PointerEnterItem
+        public event EventHandler<PointerEventArgs>? PointerEnteredItem
         {
-            add { AddHandler(PointerEnterItemEvent, value); }
-            remove { RemoveHandler(PointerEnterItemEvent, value); }
+            add { AddHandler(PointerEnteredItemEvent, value); }
+            remove { RemoveHandler(PointerEnteredItemEvent, value); }
         }
 
         /// <summary>
         /// Raised when the pointer leaves a menu item.
         /// </summary>
         /// <remarks>
-        /// A bubbling version of the <see cref="InputElement.PointerLeave"/> event for menu items.
+        /// A bubbling version of the <see cref="InputElement.PointerExited"/> event for menu items.
         /// </remarks>
-        public event EventHandler<PointerEventArgs>? PointerLeaveItem
+        public event EventHandler<PointerEventArgs>? PointerExitedItem
         {
-            add { AddHandler(PointerLeaveItemEvent, value); }
-            remove { RemoveHandler(PointerLeaveItemEvent, value); }
+            add { AddHandler(PointerExitedItemEvent, value); }
+            remove { RemoveHandler(PointerExitedItemEvent, value); }
         }
 
         /// <summary>
@@ -435,22 +445,22 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
 
             var point = e.GetCurrentPoint(null);
-            RaiseEvent(new PointerEventArgs(PointerEnterItemEvent, this, e.Pointer, this.VisualRoot, point.Position,
+            RaiseEvent(new PointerEventArgs(PointerEnteredItemEvent, this, e.Pointer, this.VisualRoot, point.Position,
                 e.Timestamp, point.Properties, e.KeyModifiers));
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerLeave(PointerEventArgs e)
+        protected override void OnPointerExited(PointerEventArgs e)
         {
-            base.OnPointerLeave(e);
+            base.OnPointerExited(e);
 
             var point = e.GetCurrentPoint(null);
-            RaiseEvent(new PointerEventArgs(PointerLeaveItemEvent, this, e.Pointer, this.VisualRoot, point.Position,
+            RaiseEvent(new PointerEventArgs(PointerExitedItemEvent, this, e.Pointer, this.VisualRoot, point.Position,
                 e.Timestamp, point.Properties, e.KeyModifiers));
         }
 
@@ -494,12 +504,20 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override AutomationPeer OnCreateAutomationPeer()
         {
-            base.UpdateDataValidation(property, value);
+            return new MenuItemAutomationPeer(this);
+        }
+
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
+        {
+            base.UpdateDataValidation(property, state, error);
             if (property == CommandProperty)
             {
-                _commandBindingError = value.Type == BindingValueType.BindingError;
+                _commandBindingError = state == BindingValueType.BindingError;
                 if (_commandBindingError && _commandCanExecute)
                 {
                     _commandCanExecute = false;
@@ -637,7 +655,9 @@ namespace Avalonia.Controls
         /// <param name="e">The property change event.</param>
         private void IsSelectedChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if ((bool)e.NewValue!)
+            var parentMenu = Parent as Menu;
+
+            if ((bool)e.NewValue! && (parentMenu is null || parentMenu.IsOpen))
             {
                 Focus();
             }
@@ -698,6 +718,14 @@ namespace Avalonia.Controls
 
         void ICommandSource.CanExecuteChanged(object sender, EventArgs e) => this.CanExecuteChanged(sender, e);
 
+        void IClickableControl.RaiseClick()
+        {
+            if (IsEffectivelyEnabled)
+            {
+                RaiseEvent(new RoutedEventArgs(ClickEvent));
+            }
+        }
+
         /// <summary>
         /// A dependency resolver which returns a <see cref="MenuItemAccessKeyHandler"/>.
         /// </summary>
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index 265e7119eb..d22fdb2f84 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -186,13 +186,6 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler? Click;
 
-        [Obsolete("Use Click event.")]
-        public event EventHandler Clicked
-        {
-            add => Click += value;
-            remove => Click -= value;
-        }
-
         void INativeMenuItemExporterEventsImplBridge.RaiseClicked()
         {
             Click?.Invoke(this, new EventArgs());
diff --git a/src/Avalonia.Controls/NativeMenuItemBase.cs b/src/Avalonia.Controls/NativeMenuItemBase.cs
index a5e3308e3b..4946d16f01 100644
--- a/src/Avalonia.Controls/NativeMenuItemBase.cs
+++ b/src/Avalonia.Controls/NativeMenuItemBase.cs
@@ -11,8 +11,8 @@ namespace Avalonia.Controls
 
         }
 
-        public static readonly DirectProperty<NativeMenuItem, NativeMenu?> ParentProperty =
-            AvaloniaProperty.RegisterDirect<NativeMenuItem, NativeMenu?>("Parent", o => o.Parent, (o, v) => o.Parent = v);
+        public static readonly DirectProperty<NativeMenuItemBase, NativeMenu?> ParentProperty =
+            AvaloniaProperty.RegisterDirect<NativeMenuItemBase, NativeMenu?>("Parent", o => o.Parent, (o, v) => o.Parent = v);
 
         public NativeMenu? Parent
         {
diff --git a/src/Avalonia.Controls/NativeMenuItemSeparator.cs b/src/Avalonia.Controls/NativeMenuItemSeparator.cs
index 49b36e714d..97278130b1 100644
--- a/src/Avalonia.Controls/NativeMenuItemSeparator.cs
+++ b/src/Avalonia.Controls/NativeMenuItemSeparator.cs
@@ -1,16 +1,7 @@
-using System;
-
-namespace Avalonia.Controls
+namespace Avalonia.Controls
 {
-
-    [Obsolete("This class exists to maintain backwards compatibility with existing code. Use NativeMenuItemSeparator instead")]
-    public class NativeMenuItemSeperator : NativeMenuItemSeparator 
-    {
-    }
-
     public class NativeMenuItemSeparator : NativeMenuItemBase
     {
-        [Obsolete("This is a temporary hack to make our MenuItem recognize this as a separator, don't use", true)]
-        public string Header => "-";
+
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 977544674d..b2e6e9e80b 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -1,4 +1,6 @@
-namespace Avalonia.Controls.Notifications
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification manager that can show arbitrary content.
@@ -9,6 +11,7 @@
     /// can display arbitrary content, as opposed to notification managers which display notifications
     /// using the host operating system's notification mechanism.
     /// </remarks>
+    [NotClientImplementable]
     public interface IManagedNotificationManager : INotificationManager
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
index fa08233097..9ccce5b2c4 100644
--- a/src/Avalonia.Controls/Notifications/INotification.cs
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -1,10 +1,12 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification that can be shown in a window or by the host operating system.
     /// </summary>
+    [NotClientImplementable]
     public interface INotification
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 72fb8e6c08..5fa479f2c3 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -1,9 +1,12 @@
-namespace Avalonia.Controls.Notifications
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification manager that can be used to show notifications in a window or using
 	/// the host operating system.
     /// </summary>
+    [NotClientImplementable]
     public interface INotificationManager
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 9499995da3..45beaa0b2f 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -3,17 +3,17 @@ using System.Collections;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Rendering;
-using Avalonia.Data;
 using Avalonia.VisualTree;
-using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// An <see cref="INotificationManager"/> that displays notifications in a <see cref="Window"/>.
     /// </summary>
+    [TemplatePart("PART_Items", typeof(Panel))]
     [PseudoClasses(":topleft", ":topright", ":bottomleft", ":bottomright")]
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager, ICustomSimpleHitTest
     {
@@ -54,20 +54,12 @@ namespace Avalonia.Controls.Notifications
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
         /// <param name="host">The window that will host the control.</param>
-        public WindowNotificationManager(Window host)
+        public WindowNotificationManager(TopLevel? host)
         {
-            if (VisualChildren.Count != 0)
+            if (host != null)
             {
                 Install(host);
             }
-            else
-            {
-                Observable.FromEventPattern<TemplateAppliedEventArgs>(host, nameof(host.TemplateApplied)).Take(1)
-                    .Subscribe(_ =>
-                    {
-                        Install(host);
-                    });
-            }
 
             UpdatePseudoClasses(Position);
         }
@@ -101,15 +93,12 @@ namespace Avalonia.Controls.Notifications
                 Content = content
             };
 
-            if (notification != null)
+            notificationControl.NotificationClosed += (sender, args) =>
             {
-                notificationControl.NotificationClosed += (sender, args) =>
-                {
-                    notification.OnClose?.Invoke();
+                notification?.OnClose?.Invoke();
 
-                    _items?.Remove(sender);
-                };
-            }
+                _items?.Remove(sender);
+            };
 
             notificationControl.PointerPressed += (sender, args) =>
             {
@@ -138,13 +127,13 @@ namespace Avalonia.Controls.Notifications
             notificationControl.Close();
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == PositionProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<NotificationPosition>());
+                UpdatePseudoClasses(change.GetNewValue<NotificationPosition>());
             }
         }
 
@@ -153,7 +142,7 @@ namespace Avalonia.Controls.Notifications
         /// of the host <see cref="Window"/>.
         /// </summary>
         /// <param name="host">The <see cref="Window"/> that will be the host.</param>
-        private void Install(Window host)
+        private void Install(TemplatedControl host)
         {
             var adornerLayer = host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer;
 
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index f67377b310..21373c6b76 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -2,8 +2,10 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
@@ -15,6 +17,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Control that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
     /// </summary>
+    [TemplatePart("PART_Spinner", typeof(Spinner))]
+    [TemplatePart("PART_TextBox", typeof(TextBox))]
     public class NumericUpDown : TemplatedControl
     {
         /// <summary>
@@ -42,14 +46,6 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<NumericUpDown, bool>(nameof(ClipValueToMinMax),
                 updown => updown.ClipValueToMinMax, (updown, b) => updown.ClipValueToMinMax = b);
 
-        /// <summary>
-        /// Defines the <see cref="CultureInfo"/> property.
-        /// </summary>
-        [Obsolete]
-        public static readonly DirectProperty<NumericUpDown, CultureInfo?> CultureInfoProperty =
-            AvaloniaProperty.RegisterDirect<NumericUpDown, CultureInfo?>(nameof(CultureInfo), o => o.CultureInfo,
-                (o, v) => o.CultureInfo = v, CultureInfo.CurrentCulture);
-
         /// <summary>
         /// Defines the <see cref="NumberFormat"/> property.
         /// </summary>
@@ -101,11 +97,18 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<NumericUpDown, string?>(nameof(Text), o => o.Text, (o, v) => o.Text = v,
                 defaultBindingMode: BindingMode.TwoWay, enableDataValidation: true);
 
+        /// <summary>
+        /// Defines the <see cref="TextConverter"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NumericUpDown, IValueConverter?> TextConverterProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, IValueConverter?>(nameof(TextConverter),
+                updown => updown.TextConverter, (o, v) => o.TextConverter = v, null, BindingMode.OneWay, false);
+
         /// <summary>
         /// Defines the <see cref="Value"/> property.
         /// </summary>
-        public static readonly DirectProperty<NumericUpDown, decimal> ValueProperty =
-            AvaloniaProperty.RegisterDirect<NumericUpDown, decimal>(nameof(Value), updown => updown.Value,
+        public static readonly DirectProperty<NumericUpDown, decimal?> ValueProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, decimal?>(nameof(Value), updown => updown.Value,
                 (updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay, enableDataValidation: true);
 
         /// <summary>
@@ -128,13 +131,13 @@ namespace Avalonia.Controls
 
         private IDisposable? _textBoxTextChangedSubscription;
 
-        private decimal _value;
+        private decimal? _value;
         private string? _text;
+        private IValueConverter? _textConverter;
         private bool _internalValueSet;
         private bool _clipValueToMinMax;
         private bool _isSyncingTextAndValueProperties;
         private bool _isTextChangedFromUI;
-        private CultureInfo? _cultureInfo;
         private NumberStyles _parsingNumberStyle = NumberStyles.Any;
         private NumberFormatInfo? _numberFormat;
 
@@ -184,21 +187,6 @@ namespace Avalonia.Controls
             set { SetAndRaise(ClipValueToMinMaxProperty, ref _clipValueToMinMax, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the current CultureInfo.
-        /// </summary>
-        [Obsolete("CultureInfo is obsolete, please use NumberFormat instead.")]
-        public CultureInfo? CultureInfo
-        {
-            get { return _cultureInfo; }
-            set
-            {
-                SetAndRaise(CultureInfoProperty, ref _cultureInfo, value);
-                //Set and Raise the NumberFormatProperty when CultureInfo is changed.
-                SetAndRaise(NumberFormatProperty, ref _numberFormat, value?.NumberFormat);
-            }
-        }
-
         /// <summary>
         /// Gets or sets the current NumberFormatInfo
         /// </summary>
@@ -255,6 +243,8 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Gets or sets the parsing style (AllowLeadingWhite, Float, AllowHexSpecifier, ...). By default, Any.
+        /// Note that Hex style does not work with decimal. 
+        /// For hexadecimal display, use <see cref="TextConverter"/>.
         /// </summary>
         public NumberStyles ParsingNumberStyle
         {
@@ -271,10 +261,21 @@ namespace Avalonia.Controls
             set { SetAndRaise(TextProperty, ref _text, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the custom bidirectional Text-Value converter.
+        /// Non-null converter overrides <see cref="ParsingNumberStyle"/>, providing finer control over 
+        /// string representation of the underlying value.
+        /// </summary>
+        public IValueConverter? TextConverter
+        {
+            get { return _textConverter; }
+            set { SetAndRaise(TextConverterProperty, ref _textConverter, value); }
+        }
+
         /// <summary>
         /// Gets or sets the value.
         /// </summary>
-        public decimal Value
+        public decimal? Value
         {
             get { return _value; }
             set
@@ -332,9 +333,6 @@ namespace Avalonia.Controls
         /// </summary>
         static NumericUpDown()
         {
-#pragma warning disable CS0612 // Type or member is obsolete
-            CultureInfoProperty.Changed.Subscribe(OnCultureInfoChanged);
-#pragma warning restore CS0612 // Type or member is obsolete
             NumberFormatProperty.Changed.Subscribe(OnNumberFormatChanged);
             FormatStringProperty.Changed.Subscribe(FormatStringChanged);
             IncrementProperty.Changed.Subscribe(IncrementChanged);
@@ -342,13 +340,14 @@ namespace Avalonia.Controls
             MaximumProperty.Changed.Subscribe(OnMaximumChanged);
             MinimumProperty.Changed.Subscribe(OnMinimumChanged);
             TextProperty.Changed.Subscribe(OnTextChanged);
+            TextConverterProperty.Changed.Subscribe(OnTextConverterChanged);
             ValueProperty.Changed.Subscribe(OnValueChanged);
         }
 
         /// <inheritdoc />
         protected override void OnLostFocus(RoutedEventArgs e)
         {
-            CommitInput();
+            CommitInput(true);
             base.OnLostFocus(e);
         }
 
@@ -400,25 +399,16 @@ namespace Avalonia.Controls
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == TextProperty || property == ValueProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="CultureInfo"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnCultureInfoChanged(CultureInfo? oldValue, CultureInfo? newValue)
-        {
-            if (IsInitialized)
-            {
-                SyncTextAndValueProperties(false, null);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
@@ -482,9 +472,9 @@ namespace Avalonia.Controls
             {
                 SetValidSpinDirection();
             }
-            if (ClipValueToMinMax)
+            if (ClipValueToMinMax && Value.HasValue)
             {
-                Value = MathUtilities.Clamp(Value, Minimum, Maximum);
+                Value = MathUtilities.Clamp(Value.Value, Minimum, Maximum);
             }
         }
 
@@ -499,9 +489,9 @@ namespace Avalonia.Controls
             {
                 SetValidSpinDirection();
             }
-            if (ClipValueToMinMax)
+            if (ClipValueToMinMax && Value.HasValue)
             {
-                Value = MathUtilities.Clamp(Value, Minimum, Maximum);
+                Value = MathUtilities.Clamp(Value.Value, Minimum, Maximum);
             }
         }
 
@@ -517,13 +507,26 @@ namespace Avalonia.Controls
                 SyncTextAndValueProperties(true, Text);
             }
         }
+        
+        /// <summary>
+        /// Called when the <see cref="Text"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnTextConverterChanged(IValueConverter? oldValue, IValueConverter? newValue)
+        {
+            if (IsInitialized)
+            {
+                SyncTextAndValueProperties(false, null);
+            }
+        }
 
         /// <summary>
         /// Called when the <see cref="Value"/> property value changed.
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void OnValueChanged(decimal oldValue, decimal newValue)
+        protected virtual void OnValueChanged(decimal? oldValue, decimal? newValue)
         {
             if (!_internalValueSet && IsInitialized)
             {
@@ -566,7 +569,7 @@ namespace Avalonia.Controls
         /// Called when the <see cref="Value"/> property has to be coerced.
         /// </summary>
         /// <param name="baseValue">The value.</param>
-        protected virtual decimal OnCoerceValue(decimal baseValue)
+        protected virtual decimal? OnCoerceValue(decimal? baseValue)
         {
             return baseValue;
         }
@@ -600,7 +603,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void RaiseValueChangedEvent(decimal oldValue, decimal newValue)
+        protected virtual void RaiseValueChangedEvent(decimal? oldValue, decimal? newValue)
         {
             var e = new NumericUpDownValueChangedEventArgs(ValueChangedEvent, oldValue, newValue);
             RaiseEvent(e);
@@ -609,9 +612,9 @@ namespace Avalonia.Controls
         /// <summary>
         /// Converts the formatted text to a value.
         /// </summary>
-        private decimal ConvertTextToValue(string text)
+        private decimal? ConvertTextToValue(string? text)
         {
-            decimal result = 0;
+            decimal? result = null;
 
             if (string.IsNullOrEmpty(text))
             {
@@ -628,9 +631,9 @@ namespace Avalonia.Controls
 
             result = ConvertTextToValueCore(currentValueText, text);
 
-            if (ClipValueToMinMax)
+            if (ClipValueToMinMax && result.HasValue)
             {
-                return MathUtilities.Clamp(result, Minimum, Maximum);
+                return MathUtilities.Clamp(result.Value, Minimum, Maximum);
             }
 
             ValidateMinMax(result);
@@ -642,15 +645,19 @@ namespace Avalonia.Controls
         /// Converts the value to formatted text.
         /// </summary>
         /// <returns></returns>
-        private string ConvertValueToText()
+        private string? ConvertValueToText()
         {
+            if (TextConverter != null)
+            {
+                return TextConverter.ConvertBack(Value, typeof(string), null, CultureInfo.CurrentCulture)?.ToString();
+            }
             //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
             if (FormatString.Contains("{0"))
             {
                 return string.Format(NumberFormat, FormatString, Value);
             }
 
-            return Value.ToString(FormatString, NumberFormat);
+            return Value?.ToString(FormatString, NumberFormat);
         }
 
         /// <summary>
@@ -658,7 +665,16 @@ namespace Avalonia.Controls
         /// </summary>
         private void OnIncrement()
         {
-            var result = Value + Increment;
+            decimal result;
+            if (Value.HasValue)
+            {
+                result = Value.Value + Increment;
+            }
+            else
+            {
+                result = Minimum;
+            }
+            
             Value = MathUtilities.Clamp(result, Minimum, Maximum);
         }
 
@@ -667,7 +683,17 @@ namespace Avalonia.Controls
         /// </summary>
         private void OnDecrement()
         {
-            var result = Value - Increment;
+            decimal result;
+            
+            if (Value.HasValue)
+            {
+                result = Value.Value - Increment;
+            }
+            else
+            {
+                result = Maximum;
+            }
+            
             Value = MathUtilities.Clamp(result, Minimum, Maximum);
         }
 
@@ -681,6 +707,11 @@ namespace Avalonia.Controls
             // Zero increment always prevents spin.
             if (Increment != 0 && !IsReadOnly)
             {
+                if (!Value.HasValue)
+                {
+                    validDirections = ValidSpinDirections.Increase | ValidSpinDirections.Decrease;
+                }
+                
                 if (Value < Maximum)
                 {
                     validDirections = validDirections | ValidSpinDirections.Increase;
@@ -698,20 +729,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Called when the <see cref="CultureInfo"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnCultureInfoChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is NumericUpDown upDown)
-            {
-                var oldValue = (CultureInfo?)e.OldValue;
-                var newValue = (CultureInfo?)e.NewValue;
-                upDown.OnCultureInfoChanged(oldValue, newValue);
-            }
-        }
-
         /// <summary>
         /// Called when the <see cref="NumberFormat"/> property value changed.
         /// </summary>
@@ -810,6 +827,21 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Called when the <see cref="TextConverter"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnTextConverterChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (IValueConverter?)e.OldValue;
+                var newValue = (IValueConverter?)e.NewValue;
+                upDown.OnTextConverterChanged(oldValue, newValue);
+            }
+        }
+
+
         /// <summary>
         /// Called when the <see cref="Value"/> property value changed.
         /// </summary>
@@ -818,13 +850,13 @@ namespace Avalonia.Controls
         {
             if (e.Sender is NumericUpDown upDown)
             {
-                var oldValue = (decimal)e.OldValue!;
-                var newValue = (decimal)e.NewValue!;
+                var oldValue = (decimal?)e.OldValue;
+                var newValue = (decimal?)e.NewValue;
                 upDown.OnValueChanged(oldValue, newValue);
             }
         }
 
-        private void SetValueInternal(decimal value)
+        private void SetValueInternal(decimal? value)
         {
             _internalValueSet = true;
             try
@@ -939,9 +971,9 @@ namespace Avalonia.Controls
             remove { RemoveHandler(ValueChangedEvent, value); }
         }
 
-        private bool CommitInput()
+        private bool CommitInput(bool forceTextUpdate = false)
         {
-            return SyncTextAndValueProperties(true, Text);
+            return SyncTextAndValueProperties(true, Text, forceTextUpdate);
         }
 
         /// <summary>
@@ -971,28 +1003,24 @@ namespace Avalonia.Controls
             {
                 if (updateValueFromText)
                 {
-                    if (!string.IsNullOrEmpty(text))
+                    try
                     {
-                        try
+                        var newValue = ConvertTextToValue(text);
+                        if (!Equals(newValue, Value))
                         {
-                            var newValue = ConvertTextToValue(text);
-                            if (!Equals(newValue, Value))
-                            {
-                                SetValueInternal(newValue);
-                            }
-                        }
-                        catch
-                        {
-                            parsedTextIsValid = false;
+                            SetValueInternal(newValue);
                         }
                     }
+                    catch
+                    {
+                        parsedTextIsValid = false;
+                    }
                 }
 
                 // Do not touch the ongoing text input from user.
                 if (!_isTextChangedFromUI)
                 {
-                    var keepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text);
-                    if (!keepEmpty)
+                    if (forceTextUpdate)
                     {
                         var newText = ConvertValueToText();
                         if (!Equals(Text, newText))
@@ -1029,10 +1057,21 @@ namespace Avalonia.Controls
             return parsedTextIsValid;
         }
 
-        private decimal ConvertTextToValueCore(string currentValueText, string text)
+        private decimal? ConvertTextToValueCore(string? currentValueText, string? text)
         {
             decimal result;
 
+            if (string.IsNullOrEmpty(text))
+            {
+                return null;
+            }
+            
+            if (TextConverter != null)
+            {
+                var valueFromText = TextConverter.Convert(text, typeof(decimal?), null, CultureInfo.CurrentCulture);
+                return (decimal?)valueFromText;
+            }
+
             if (IsPercent(FormatString))
             {
                 result = ParsePercent(text, NumberFormat);
@@ -1045,13 +1084,13 @@ namespace Avalonia.Controls
                     var shouldThrow = true;
 
                     // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
-                    if (!decimal.TryParse(currentValueText, ParsingNumberStyle, NumberFormat, out var _))
+                    if (!string.IsNullOrEmpty(currentValueText) && !decimal.TryParse(currentValueText, ParsingNumberStyle, NumberFormat, out var _))
                     {
                         // extract non-digit characters
                         var currentValueTextSpecialCharacters = currentValueText.Where(c => !char.IsDigit(c));
                         var textSpecialCharacters = text.Where(c => !char.IsDigit(c));
                         // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
-                        if (currentValueTextSpecialCharacters.Except(textSpecialCharacters).ToList().Count == 0)
+                        if (!currentValueTextSpecialCharacters.Except(textSpecialCharacters).Any())
                         {
                             foreach (var character in textSpecialCharacters)
                             {
@@ -1075,8 +1114,12 @@ namespace Avalonia.Controls
             return result;
         }
 
-        private void ValidateMinMax(decimal value)
+        private void ValidateMinMax(decimal? value)
         {
+            if (!value.HasValue)
+            {
+                return;
+            }
             if (value < Minimum)
             {
                 throw new ArgumentOutOfRangeException(nameof(value), string.Format("Value must be greater than Minimum value of {0}", Minimum));
@@ -1108,8 +1151,8 @@ namespace Avalonia.Controls
             if (PIndex >= 0)
             {
                 //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
-                var isText = stringToTest.Substring(0, PIndex).Contains("'")
-                             && stringToTest.Substring(PIndex, FormatString.Length - PIndex).Contains("'");
+                var isText = stringToTest.Substring(0, PIndex).Contains('\'')
+                             && stringToTest.Substring(PIndex, FormatString.Length - PIndex).Contains('\'');
 
                 return !isText;
             }
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
index 9b467d682c..af835541ae 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
@@ -4,13 +4,13 @@ namespace Avalonia.Controls
 {
     public class NumericUpDownValueChangedEventArgs : RoutedEventArgs
     {
-        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, decimal oldValue, decimal newValue) : base(routedEvent)
+        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, decimal? oldValue, decimal? newValue) : base(routedEvent)
         {
             OldValue = oldValue;
             NewValue = newValue;
         }
 
-        public decimal OldValue { get; }
-        public decimal NewValue { get; }
+        public decimal? OldValue { get; }
+        public decimal? NewValue { get; }
     }
 }
diff --git a/src/Avalonia.Controls/Panel.cs b/src/Avalonia.Controls/Panel.cs
index 482a7fab84..2230b4b0d2 100644
--- a/src/Avalonia.Controls/Panel.cs
+++ b/src/Avalonia.Controls/Panel.cs
@@ -147,7 +147,7 @@ namespace Avalonia.Controls
                     throw new NotSupportedException();
             }
 
-            _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs());
+            _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
             InvalidateMeasureOnChildrenChanged();
         }
 
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 23ecdb2e7b..16aeb2f559 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -4,6 +4,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Threading;
@@ -14,6 +15,7 @@ namespace Avalonia.Controls.Platform
     /// <summary>
     /// Provides the default keyboard and pointer interaction for menus.
     /// </summary>
+    [Unstable]
     public class DefaultMenuInteractionHandler : IMenuInteractionHandler
     {
         private readonly bool _isContextMenu;
@@ -51,9 +53,10 @@ namespace Avalonia.Controls.Platform
             Menu.PointerPressed += PointerPressed;
             Menu.PointerReleased += PointerReleased;
             Menu.AddHandler(AccessKeyHandler.AccessKeyPressedEvent, AccessKeyPressed);
-            Menu.AddHandler(Avalonia.Controls.Menu.MenuOpenedEvent, this.MenuOpened);
-            Menu.AddHandler(MenuItem.PointerEnterItemEvent, PointerEnter);
-            Menu.AddHandler(MenuItem.PointerLeaveItemEvent, PointerLeave);
+            Menu.AddHandler(MenuBase.MenuOpenedEvent, MenuOpened);
+            Menu.AddHandler(MenuItem.PointerEnteredItemEvent, PointerEntered);
+            Menu.AddHandler(MenuItem.PointerExitedItemEvent, PointerExited);
+            Menu.AddHandler(InputElement.PointerMovedEvent, PointerMoved);
 
             _root = Menu.VisualRoot;
 
@@ -86,9 +89,10 @@ namespace Avalonia.Controls.Platform
             Menu.PointerPressed -= PointerPressed;
             Menu.PointerReleased -= PointerReleased;
             Menu.RemoveHandler(AccessKeyHandler.AccessKeyPressedEvent, AccessKeyPressed);
-            Menu.RemoveHandler(Avalonia.Controls.Menu.MenuOpenedEvent, this.MenuOpened);
-            Menu.RemoveHandler(MenuItem.PointerEnterItemEvent, PointerEnter);
-            Menu.RemoveHandler(MenuItem.PointerLeaveItemEvent, PointerLeave);
+            Menu.RemoveHandler(MenuBase.MenuOpenedEvent, MenuOpened);
+            Menu.RemoveHandler(MenuItem.PointerEnteredItemEvent, PointerEntered);
+            Menu.RemoveHandler(MenuItem.PointerExitedItemEvent, PointerExited);
+            Menu.RemoveHandler(InputElement.PointerMovedEvent, PointerMoved);
 
             if (_root is InputElement inputRoot)
             {
@@ -149,13 +153,18 @@ namespace Avalonia.Controls.Platform
                 case Key.Up:
                 case Key.Down:
                 {
-                    if (item?.IsTopLevel == true)
+                    if (item?.IsTopLevel == true && item.HasSubMenu)
                     {
-                        if (item.HasSubMenu && !item.IsSubMenuOpen)
+                        if (!item.IsSubMenuOpen)
                         {
                             Open(item, true);
-                            e.Handled = true;
                         }
+                        else
+                        {
+                            item.MoveSelection(NavigationDirection.First, true);
+                        }
+
+                        e.Handled = true;
                     }
                     else
                     {
@@ -166,7 +175,11 @@ namespace Avalonia.Controls.Platform
 
                 case Key.Left:
                 {
-                    if (item?.Parent is IMenuItem parent && !parent.IsTopLevel && parent.IsSubMenuOpen)
+                    if (item is { IsSubMenuOpen: true, SelectedItem: null })
+                    {
+                        item.Close();
+                    }
+                    else if (item?.Parent is IMenuItem { IsTopLevel: false, IsSubMenuOpen: true } parent)
                     {
                         parent.Close();
                         parent.Focus();
@@ -247,7 +260,8 @@ namespace Avalonia.Controls.Platform
                             // new menu.
                             if (item.IsSubMenuOpen &&
                                 item.Parent is IMenu &&
-                                item.Parent.SelectedItem is object)
+                                item.Parent.SelectedItem is object &&
+                                item.Parent.SelectedItem != item)
                             {
                                 item.Close();
                                 Open(item.Parent.SelectedItem, true);
@@ -287,7 +301,7 @@ namespace Avalonia.Controls.Platform
             e.Handled = true;
         }
 
-        protected internal virtual void PointerEnter(object? sender, PointerEventArgs e)
+        protected internal virtual void PointerEntered(object? sender, PointerEventArgs e)
         {
             var item = GetMenuItem(e.Source as IControl);
 
@@ -332,7 +346,23 @@ namespace Avalonia.Controls.Platform
             }
         }
 
-        protected internal virtual void PointerLeave(object? sender, PointerEventArgs e)
+        protected internal virtual void PointerMoved(object? sender, PointerEventArgs e)
+        {
+            // HACK: #8179 needs to be addressed to correctly implement it in the PointerPressed method.
+            var item = GetMenuItem(e.Source as IControl) as MenuItem;
+            if (item?.TransformedBounds == null)
+            {
+                return;
+            }
+            var point = e.GetCurrentPoint(null);
+
+            if (point.Properties.IsLeftButtonPressed && item.TransformedBounds.Value.Contains(point.Position) == false)
+            {
+                e.Pointer.Capture(null);
+            }
+        }
+
+        protected internal virtual void PointerExited(object? sender, PointerEventArgs e)
         {
             var item = GetMenuItem(e.Source as IControl);
 
@@ -411,7 +441,7 @@ namespace Avalonia.Controls.Platform
 
         protected internal virtual void MenuOpened(object? sender, RoutedEventArgs e)
         {
-            if (e.Source == Menu)
+            if (e.Source is Menu)
             {
                 Menu?.MoveSelection(NavigationDirection.First, true);
             }
diff --git a/src/Avalonia.Controls/Platform/Dialogs/IStorageProviderFactory.cs b/src/Avalonia.Controls/Platform/Dialogs/IStorageProviderFactory.cs
new file mode 100644
index 0000000000..3eee8e848e
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/Dialogs/IStorageProviderFactory.cs
@@ -0,0 +1,12 @@
+#nullable enable
+using Avalonia.Platform.Storage;
+
+namespace Avalonia.Controls.Platform;
+
+/// <summary>
+/// Factory allows to register custom storage provider instead of native implementation.
+/// </summary>
+public interface IStorageProviderFactory
+{
+    IStorageProvider CreateProvider(TopLevel topLevel);
+}
diff --git a/src/Avalonia.Controls/Platform/Dialogs/ISystemDialogImpl.cs b/src/Avalonia.Controls/Platform/Dialogs/ISystemDialogImpl.cs
new file mode 100644
index 0000000000..996fff6775
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/Dialogs/ISystemDialogImpl.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Platform
+{
+    /// <summary>
+    /// Defines a platform-specific system dialog implementation.
+    /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
+    [Unstable]
+    public interface ISystemDialogImpl
+    {
+        /// <summary>
+        /// Shows a file dialog.
+        /// </summary>
+        /// <param name="dialog">The details of the file dialog to show.</param>
+        /// <param name="parent">The parent window.</param>
+        /// <returns>A task returning the selected filenames.</returns>
+        Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent);
+
+        Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent);
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs b/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs
new file mode 100644
index 0000000000..2775c53803
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+#nullable enable
+
+namespace Avalonia.Controls.Platform
+{
+    /// <summary>
+    /// Defines a platform-specific system dialog implementation.
+    /// </summary>
+    [Obsolete]
+    internal class SystemDialogImpl : ISystemDialogImpl
+    {
+        public async Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent)
+        {
+            if (dialog is OpenFileDialog openDialog)
+            {
+                var filePicker = parent.StorageProvider;
+                if (!filePicker.CanOpen)
+                {
+                    return null;
+                }
+
+                var options = openDialog.ToFilePickerOpenOptions();
+
+                var files = await filePicker.OpenFilePickerAsync(options);
+                return files
+                    .Select(file => file.TryGetUri(out var fullPath)
+                        ? fullPath.LocalPath
+                        : file.Name)
+                    .ToArray();
+            }
+            else if (dialog is SaveFileDialog saveDialog)
+            {
+                var filePicker = parent.StorageProvider;
+                if (!filePicker.CanSave)
+                {
+                    return null;
+                }
+
+                var options = saveDialog.ToFilePickerSaveOptions();
+
+                var file = await filePicker.SaveFilePickerAsync(options);
+                if (file is null)
+                {
+                    return null;
+                }
+
+                var filePath = file.TryGetUri(out var fullPath)
+                    ? fullPath.LocalPath
+                    : file.Name;
+                return new[] { filePath };
+            }
+            return null;
+        }
+
+        public async Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
+        {
+            var filePicker = parent.StorageProvider;
+            if (!filePicker.CanPickFolder)
+            {
+                return null;
+            }
+
+            var options = dialog.ToFolderPickerOpenOptions();
+
+            var folders = await filePicker.OpenFolderPickerAsync(options);
+            return folders
+                .Select(f => f.TryGetUri(out var uri) ? uri.LocalPath : null)
+                .FirstOrDefault(u => u is not null);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/ExportWindowingSubsystemAttribute.cs b/src/Avalonia.Controls/Platform/ExportWindowingSubsystemAttribute.cs
deleted file mode 100644
index 2a401ad912..0000000000
--- a/src/Avalonia.Controls/Platform/ExportWindowingSubsystemAttribute.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-    public class ExportWindowingSubsystemAttribute : Attribute
-    {
-        public ExportWindowingSubsystemAttribute(OperatingSystemType requiredRuntimePlatform, int priority, string name, Type initializationType,
-            string initializationMethod, Type? environmentChecker = null)
-        {
-            Name = name;
-            InitializationType = initializationType;
-            InitializationMethod = initializationMethod;
-            EnvironmentChecker = environmentChecker;
-            RequiredOS = requiredRuntimePlatform;
-            Priority = priority;
-        }
-
-        public string InitializationMethod { get; private set; }
-        public Type? EnvironmentChecker { get; }
-        public Type InitializationType { get; private set; }
-        public string Name { get; private set; }
-        public int Priority { get; private set; }
-        public OperatingSystemType RequiredOS { get; private set; }
-    }
-}
diff --git a/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs b/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs
index a8d3a3b3ac..99bbb8b56d 100644
--- a/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs
+++ b/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IApplicationPlatformEvents
     {
         void RaiseUrlsOpened(string[] urls);
diff --git a/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs
index dd8503f768..47b5a048b0 100644
--- a/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs
@@ -1,8 +1,11 @@
-namespace Avalonia.Controls.Platform
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Handles user interaction for menus.
     /// </summary>
+    [Unstable]
     public interface IMenuInteractionHandler
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs b/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
index 6e10163175..daeb9076e6 100644
--- a/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
+++ b/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using Avalonia.Platform;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Defines a platform-specific mount volumes info provider implementation.
     /// </summary>
+    [Unstable]
     public interface IMountedVolumeInfoProvider 
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs b/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
index df13613848..ffa79aa8d6 100644
--- a/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
+++ b/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Avalonia.Metadata;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public interface INativeControlHostImpl
     {
         INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent);
@@ -13,11 +14,13 @@ namespace Avalonia.Controls.Platform
         bool IsCompatibleWith(IPlatformHandle handle);
     }
 
+    [Unstable]
     public interface INativeControlHostDestroyableControlHandle : IPlatformHandle
     {
         void Destroy();
     }
 
+    [Unstable]
     public interface INativeControlHostControlTopLevelAttachment : IDisposable
     {
         INativeControlHostImpl? AttachedTo { get; set; }
@@ -27,6 +30,7 @@ namespace Avalonia.Controls.Platform
         void ShowInBounds(Rect rect);
     }
 
+    [Unstable]
     public interface ITopLevelImplWithNativeControlHost
     {
         INativeControlHostImpl? NativeControlHost { get; }
diff --git a/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs b/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
index ecbc6d2234..4c844ce30f 100644
--- a/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
+++ b/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
@@ -1,7 +1,9 @@
 using System.IO;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IPlatformIconLoader
     {
         IWindowIconImpl LoadIcon(string fileName);
diff --git a/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs b/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
index 4cd6640453..0658f9211c 100644
--- a/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
+++ b/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
@@ -1,9 +1,10 @@
 using System;
-using System.ComponentModel;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IPlatformLifetimeEventsImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs b/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs
new file mode 100644
index 0000000000..6ad07b1b13
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs
@@ -0,0 +1,12 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IPlatformNativeSurfaceHandle : IPlatformHandle
+    {
+        PixelSize Size { get; }
+        double Scaling { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/IPopupImpl.cs b/src/Avalonia.Controls/Platform/IPopupImpl.cs
index 477d5fab43..cd86045dee 100644
--- a/src/Avalonia.Controls/Platform/IPopupImpl.cs
+++ b/src/Avalonia.Controls/Platform/IPopupImpl.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
     /// <summary>
     /// Defines a platform-specific popup window implementation.
     /// </summary>
+    [Unstable]
     public interface IPopupImpl : IWindowBaseImpl
     {
         IPopupPositioner PopupPositioner { get; }
diff --git a/src/Avalonia.Controls/Platform/IScreenImpl.cs b/src/Avalonia.Controls/Platform/IScreenImpl.cs
index 5bd45057d9..e2a0b3e3f3 100644
--- a/src/Avalonia.Controls/Platform/IScreenImpl.cs
+++ b/src/Avalonia.Controls/Platform/IScreenImpl.cs
@@ -1,11 +1,25 @@
 using System.Collections.Generic;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IScreenImpl
     {
+        /// <summary>
+        /// Gets the total number of screens available on the device.
+        /// </summary>
         int ScreenCount { get; }
 
+        /// <summary>
+        /// Gets the list of all screens available on the device.
+        /// </summary>
         IReadOnlyList<Screen> AllScreens { get; }
+
+        Screen? ScreenFromWindow(IWindowBaseImpl window);
+
+        Screen? ScreenFromPoint(PixelPoint point);
+
+        Screen? ScreenFromRect(PixelRect rect);
     }
 }
diff --git a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
deleted file mode 100644
index 1685a6a38c..0000000000
--- a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Avalonia.Controls.Platform
-{
-    /// <summary>
-    /// Defines a platform-specific system dialog implementation.
-    /// </summary>
-    public interface ISystemDialogImpl
-    {
-        /// <summary>
-        /// Shows a file dialog.
-        /// </summary>
-        /// <param name="dialog">The details of the file dialog to show.</param>
-        /// <param name="parent">The parent window.</param>
-        /// <returns>A task returning the selected filenames.</returns>
-        Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent);
-
-        Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent);
-    }
-}
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
index 80434882f7..6bb94c6070 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
@@ -4,8 +4,8 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 using Avalonia.Rendering;
-using JetBrains.Annotations;
 
 namespace Avalonia.Platform
 {
@@ -50,6 +50,7 @@ namespace Avalonia.Platform
     /// This interface is the common interface to <see cref="IWindowImpl"/> and
     /// <see cref="IPopupImpl"/>.
     /// </remarks>
+    [Unstable]
     public interface ITopLevelImpl : IDisposable
     {
         /// <summary>
@@ -149,13 +150,7 @@ namespace Avalonia.Platform
         /// Gets or sets a method called when the input focus is lost.
         /// </summary>
         Action? LostFocus { get; set; }
-
-        /// <summary>
-        /// Gets a mouse device associated with toplevel
-        /// </summary>
-        [CanBeNull]
-        IMouseDevice MouseDevice { get; }
-
+        
         IPopupImpl? CreatePopup();
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImplWithStorageProvider.cs b/src/Avalonia.Controls/Platform/ITopLevelImplWithStorageProvider.cs
new file mode 100644
index 0000000000..b42040f3c3
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/ITopLevelImplWithStorageProvider.cs
@@ -0,0 +1,11 @@
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.Platform.Storage;
+
+namespace Avalonia.Controls.Platform;
+
+[Unstable]
+public interface ITopLevelImplWithStorageProvider : ITopLevelImpl
+{
+    public IStorageProvider StorageProvider { get; }
+}
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs b/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs
index bafb973765..a2e426ca08 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs
@@ -1,9 +1,11 @@
 using Avalonia.Input;
 using Avalonia.Input.TextInput;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public interface ITopLevelImplWithTextInputMethod : ITopLevelImpl
     {
         public ITextInputMethodImpl? TextInputMethod { get; }
diff --git a/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs b/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
index 9e72a40439..149a978c54 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
@@ -1,13 +1,16 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public interface INativeMenuExporter
     {
         void SetNativeMenu(NativeMenu? menu);
     }
 
+    [Unstable]
     public interface ITopLevelNativeMenuExporter : INativeMenuExporter
     {
         bool IsNativeMenuExported { get; }
@@ -15,11 +18,13 @@ namespace Avalonia.Controls.Platform
         event EventHandler OnIsNativeMenuExportedChanged;
     }
 
+    [Unstable]
     public interface INativeMenuExporterProvider
     {
         INativeMenuExporter? NativeMenuExporter { get; }
     }
-    
+
+    [Unstable]
     public interface ITopLevelImplWithNativeMenuExporter : ITopLevelImpl
     {
         ITopLevelNativeMenuExporter? NativeMenuExporter { get; }
diff --git a/src/Avalonia.Controls/Platform/ITrayIconImpl.cs b/src/Avalonia.Controls/Platform/ITrayIconImpl.cs
index 289b569645..4ef9397d04 100644
--- a/src/Avalonia.Controls/Platform/ITrayIconImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITrayIconImpl.cs
@@ -1,8 +1,10 @@
 using System;
 using Avalonia.Controls.Platform;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface ITrayIconImpl : IDisposable
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
index ff83e007b4..512fad6dfc 100644
--- a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
@@ -1,7 +1,10 @@
 using System;
+using Avalonia.Automation.Peers;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IWindowBaseImpl : ITopLevelImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
index 7086b7651c..4bb8844d97 100644
--- a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
@@ -1,7 +1,9 @@
 using System.IO;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IWindowIconImpl
     {
         void Save(Stream outputStream);
diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index d4be4f9f45..af9392d440 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -1,12 +1,14 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
     /// <summary>
     /// Defines a platform-specific window implementation.
     /// </summary>
+    [Unstable]
     public interface IWindowImpl : IWindowBaseImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
index fa26fe8fdd..5acc5adccd 100644
--- a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
+++ b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IWindowingPlatform
     {
         IWindowImpl CreateWindow();
diff --git a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
index 4e5908456e..e1f6db9c60 100644
--- a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
+++ b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@@ -1,14 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Threading;
-using System.Threading.Tasks;
+using Avalonia.Metadata;
 using Avalonia.Platform;
-using Avalonia.Rendering;
 using Avalonia.Threading;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public class InternalPlatformThreadingInterface : IPlatformThreadingInterface
     {
         public InternalPlatformThreadingInterface()
@@ -44,7 +43,7 @@ namespace Avalonia.Controls.Platform
                 _priority = priority;
                 _interval = interval;
                 _tick = tick;
-                _timer = new Timer(OnTimer, null, interval, TimeSpan.FromMilliseconds(-1));
+                _timer = new Timer(OnTimer, null, interval, Timeout.InfiniteTimeSpan);
                 _handle = GCHandle.Alloc(_timer);
             }
 
@@ -58,7 +57,7 @@ namespace Avalonia.Controls.Platform
                     if (_timer == null)
                         return;
                     _tick();
-                    _timer?.Change(_interval, TimeSpan.FromMilliseconds(-1));
+                    _timer?.Change(_interval, Timeout.InfiniteTimeSpan);
                 });
             }
 
diff --git a/src/Avalonia.Controls/Platform/MountedDriveInfo.cs b/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
index f3104e4360..620ac9303f 100644
--- a/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
+++ b/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
@@ -1,10 +1,12 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Describes a Drive's properties.
     /// </summary>
+    [Unstable]
     public class MountedVolumeInfo : IEquatable<MountedVolumeInfo>
     {
         public string? VolumeLabel { get; set; }
diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs
index ee62316922..de7708e869 100644
--- a/src/Avalonia.Controls/Platform/PlatformManager.cs
+++ b/src/Avalonia.Controls/Platform/PlatformManager.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Reactive.Disposables;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public static partial class PlatformManager
     {
         static bool s_designerMode;
@@ -18,17 +20,8 @@ namespace Avalonia.Controls.Platform
         {
         }
 
-        public static ITrayIconImpl? CreateTrayIcon()
-        {
-            var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
-
-            if (platform == null)
-            {
-                throw new Exception("Could not CreateTrayIcon(): IWindowingPlatform is not registered.");
-            }
-
-            return s_designerMode ? null : platform.CreateTrayIcon();
-        }
+        public static ITrayIconImpl? CreateTrayIcon() =>
+            s_designerMode ? null : AvaloniaLocator.Current.GetService<IWindowingPlatform>()?.CreateTrayIcon();
 
 
         public static IWindowImpl CreateWindow()
diff --git a/src/Avalonia.Controls/Platform/Screen.cs b/src/Avalonia.Controls/Platform/Screen.cs
index 976faed3fd..4898c5f912 100644
--- a/src/Avalonia.Controls/Platform/Screen.cs
+++ b/src/Avalonia.Controls/Platform/Screen.cs
@@ -1,21 +1,64 @@
-namespace Avalonia.Platform
+using System;
+
+namespace Avalonia.Platform
 {
+    /// <summary>
+    /// Represents a single display screen.
+    /// </summary>
     public class Screen
     {
-        public double PixelDensity { get; }
+        /// <summary>
+        /// Gets the scaling factor applied to the screen by the operating system.
+        /// </summary>
+        /// <remarks>
+        /// Multiply this value by 100 to get a percentage.
+        /// Both X and Y scaling factors are assumed uniform.
+        /// </remarks>
+        public double Scaling { get; }
+
+        /// <inheritdoc cref="Scaling"/>
+        [Obsolete("Use the Scaling property instead.")]
+        public double PixelDensity => Scaling;
 
+        /// <summary>
+        /// Gets the overall pixel-size of the screen.
+        /// </summary>
+        /// <remarks>
+        /// This generally is the raw pixel counts in both the X and Y direction.
+        /// </remarks>
         public PixelRect Bounds { get; }
 
+        /// <summary>
+        /// Gets the actual working-area pixel-size of the screen.
+        /// </summary>
+        /// <remarks>
+        /// This area may be smaller than <see href="Bounds"/> to account for notches and
+        /// other block-out areas such as taskbars etc.
+        /// </remarks>
         public PixelRect WorkingArea { get; }
 
-        public bool Primary { get; }
-        
-        public Screen(double pixelDensity, PixelRect bounds, PixelRect workingArea, bool primary)
+        /// <summary>
+        /// Gets a value indicating whether the screen is the primary one.
+        /// </summary>
+        public bool IsPrimary { get; }
+
+        /// <inheritdoc cref="IsPrimary"/>
+        [Obsolete("Use the IsPrimary property instead.")]
+        public bool Primary => IsPrimary;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Screen"/> class.
+        /// </summary>
+        /// <param name="scaling">The scaling factor applied to the screen by the operating system.</param>
+        /// <param name="bounds">The overall pixel-size of the screen.</param>
+        /// <param name="workingArea">The actual working-area pixel-size of the screen.</param>
+        /// <param name="isPrimary">Whether the screen is the primary one.</param>
+        public Screen(double scaling, PixelRect bounds, PixelRect workingArea, bool isPrimary)
         {
-            this.PixelDensity = pixelDensity;
+            this.Scaling = scaling;
             this.Bounds = bounds;
             this.WorkingArea = workingArea;
-            this.Primary = primary;
+            this.IsPrimary = isPrimary;
         } 
     }
 }
diff --git a/src/Avalonia.Controls/Platform/ScreenHelper.cs b/src/Avalonia.Controls/Platform/ScreenHelper.cs
new file mode 100644
index 0000000000..0bd2be69d0
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/ScreenHelper.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia.Platform
+{
+    public static class ScreenHelper
+    {
+        public static Screen? ScreenFromPoint(PixelPoint point, IReadOnlyList<Screen> screens)
+        {
+            foreach (Screen screen in screens)
+            {
+                if (screen.Bounds.ContainsExclusive(point))
+                {
+                    return screen;
+                }
+            }
+
+            return null;
+        }
+
+        public static Screen? ScreenFromRect(PixelRect bounds, IReadOnlyList<Screen> screens)
+        {
+            Screen? currMaxScreen = null;
+            double maxAreaSize = 0;
+
+            foreach (Screen screen in screens)
+            {
+                double left = MathUtilities.Clamp(bounds.X, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
+                double top = MathUtilities.Clamp(bounds.Y, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
+                double right = MathUtilities.Clamp(bounds.X + bounds.Width, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
+                double bottom = MathUtilities.Clamp(bounds.Y + bounds.Height, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
+                double area = (right - left) * (bottom - top);
+                if (area > maxAreaSize)
+                {
+                    maxAreaSize = area;
+                    currMaxScreen = screen;
+                }
+            }
+
+            return currMaxScreen;
+        }
+
+        public static Screen? ScreenFromWindow(IWindowBaseImpl window, IReadOnlyList<Screen> screens)
+        {
+            var rect = new PixelRect(
+                window.Position, 
+                PixelSize.FromSize(window.FrameSize ?? window.ClientSize, window.DesktopScaling));
+
+            return ScreenFromRect(rect, screens);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs b/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs
index 62cd012d51..0a7daeaa24 100644
--- a/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs
+++ b/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs
@@ -1,7 +1,9 @@
-using Avalonia.Platform;
+using Avalonia.Metadata;
+using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform.Surfaces
 {
+    [Unstable]
     public interface IFramebufferPlatformSurface
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
index 3d1e7eb5a8..87bbfce2a2 100644
--- a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="PageTransition"/> property.
         /// </summary>
-        public static readonly StyledProperty<IPageTransition> PageTransitionProperty =
+        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
             Carousel.PageTransitionProperty.AddOwner<CarouselPresenter>();
 
         private int _selectedIndex = -1;
@@ -85,7 +85,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets a transition to use when switching pages.
         /// </summary>
-        public IPageTransition PageTransition
+        public IPageTransition? PageTransition
         {
             get { return GetValue(PageTransitionProperty); }
             set { SetValue(PageTransitionProperty, value); }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 9886dd913a..39888c1239 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -8,6 +9,7 @@ using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Metadata;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -46,7 +48,73 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public static readonly StyledProperty<BoxShadows> BoxShadowProperty =
             Border.BoxShadowProperty.AddOwner<ContentPresenter>();
-        
+
+        /// <summary>
+        /// Defines the <see cref="Foreground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
+            TextElement.ForegroundProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontFamily"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextElement.FontFamilyProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontSize"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> FontSizeProperty =
+            TextElement.FontSizeProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontStyle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStyle> FontStyleProperty =
+            TextElement.FontStyleProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontWeight> FontWeightProperty =
+            TextElement.FontWeightProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontStretch"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextAlignment"/> property
+        /// </summary>
+        public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
+            TextBlock.TextAlignmentProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextWrapping"/> property
+        /// </summary>
+        public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
+            TextBlock.TextWrappingProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextTrimming"/> property
+        /// </summary>
+        public static readonly StyledProperty<TextTrimming> TextTrimmingProperty =
+            TextBlock.TextTrimmingProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="LineHeight"/> property
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            TextBlock.LineHeightProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="MaxLines"/> property
+        /// </summary>
+        public static readonly StyledProperty<int> MaxLinesProperty =
+            TextBlock.MaxLinesProperty.AddOwner<ContentPresenter>();
+                
         /// <summary>
         /// Defines the <see cref="Child"/> property.
         /// </summary>
@@ -107,9 +175,6 @@ namespace Avalonia.Controls.Presenters
             AffectsRender<ContentPresenter>(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
             AffectsArrange<ContentPresenter>(HorizontalContentAlignmentProperty, VerticalContentAlignmentProperty);
             AffectsMeasure<ContentPresenter>(BorderThicknessProperty, PaddingProperty);
-            ContentProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.ContentChanged(e));
-            ContentTemplateProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.ContentChanged(e));
-            TemplatedParentProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.TemplatedParentChanged(e));
         }
 
         public ContentPresenter()
@@ -162,6 +227,105 @@ namespace Avalonia.Controls.Presenters
             set => SetValue(BoxShadowProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a brush used to paint the text.
+        /// </summary>
+        public IBrush? Foreground
+        {
+            get => GetValue(ForegroundProperty);
+            set => SetValue(ForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font family.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get => GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font size.
+        /// </summary>
+        public double FontSize
+        {
+            get => GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font style.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get => GetValue(FontStyleProperty);
+            set => SetValue(FontStyleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get => GetValue(FontWeightProperty);
+            set => SetValue(FontWeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => GetValue(FontStretchProperty);
+            set => SetValue(FontStretchProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text alignment
+        /// </summary>
+        public TextAlignment TextAlignment
+        {
+            get => GetValue(TextAlignmentProperty);
+            set => SetValue(TextAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text wrapping
+        /// </summary>
+        public TextWrapping TextWrapping
+        {
+            get => GetValue(TextWrappingProperty);
+            set => SetValue(TextWrappingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text trimming
+        /// </summary>
+        public TextTrimming TextTrimming
+        {
+            get => GetValue(TextTrimmingProperty);
+            set => SetValue(TextTrimmingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the line height
+        /// </summary>
+        public double LineHeight
+        {
+            get => GetValue(LineHeightProperty);
+            set => SetValue(LineHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the max lines
+        /// </summary>
+        public int MaxLines
+        {
+            get => GetValue(MaxLinesProperty);
+            set => SetValue(MaxLinesProperty, value);
+        }
+
         /// <summary>
         /// Gets the control displayed by the presenter.
         /// </summary>
@@ -240,6 +404,25 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            switch (change.Property.Name)
+            {
+                case nameof(Content):
+                case nameof(ContentTemplate):
+                    ContentChanged(change);
+                    break;
+                case nameof(TemplatedParent):
+                    TemplatedParentChanged(change);
+                    break;
+                case nameof(UseLayoutRounding):
+                case nameof(BorderThickness):
+                    _layoutThickness = null;
+                    break;
+            }
+        }
+
         /// <summary>
         /// Updates the <see cref="Child"/> control based on the control's <see cref="Content"/>.
         /// </summary>
@@ -254,8 +437,14 @@ namespace Avalonia.Controls.Presenters
         public void UpdateChild()
         {
             var content = Content;
+            UpdateChild(content);
+        }
+
+        private void UpdateChild(object? content)
+        {
+            var contentTemplate = ContentTemplate;
             var oldChild = Child;
-            var newChild = CreateChild();
+            var newChild = CreateChild(content, oldChild, contentTemplate);
             var logicalChildren = Host?.LogicalChildren ?? LogicalChildren;
 
             // Remove the old child if we're not recycling it.
@@ -271,7 +460,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             // Set the DataContext if the data isn't a control.
-            if (!(content is IControl))
+            if (contentTemplate is { } || !(content is IControl))
             {
                 DataContext = content;
             }
@@ -299,6 +488,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             _createdChild = true;
+
         }
 
         /// <inheritdoc/>
@@ -310,10 +500,43 @@ namespace Avalonia.Controls.Presenters
             InvalidateMeasure();
         }
 
+        private Thickness? _layoutThickness;
+        private double _scale;
+
+        private Thickness LayoutThickness
+        {
+            get
+            {
+                VerifyScale();
+
+                if (_layoutThickness == null)
+                {
+                    var borderThickness = BorderThickness;
+
+                    if (UseLayoutRounding)
+                        borderThickness = LayoutHelper.RoundLayoutThickness(borderThickness, _scale, _scale);
+
+                    _layoutThickness = borderThickness;
+                }
+
+                return _layoutThickness.Value;
+            }
+        }
+
+        private void VerifyScale()
+        {
+            var currentScale = LayoutHelper.GetLayoutScale(this);
+            if (MathUtilities.AreClose(currentScale, _scale))
+                return;
+
+            _scale = currentScale;
+            _layoutThickness = null;
+        }
+
         /// <inheritdoc/>
         public override void Render(DrawingContext context)
         {
-            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush,
+            _borderRenderer.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush,
                 BoxShadow);
         }
 
@@ -325,18 +548,23 @@ namespace Avalonia.Controls.Presenters
         {
             var content = Content;
             var oldChild = Child;
+            return CreateChild(content, oldChild, ContentTemplate);
+        }
+
+        private IControl? CreateChild(object? content, IControl? oldChild, IDataTemplate? template)
+        {            
             var newChild = content as IControl;
 
             // We want to allow creating Child from the Template, if Content is null.
             // But it's important to not use DataTemplates, otherwise we will break content presenters in many places,
             // otherwise it will blow up every ContentPresenter without Content set.
-            if (newChild == null
-                && (content != null || ContentTemplate != null))
+            if ((newChild == null 
+                && (content != null || template != null)) || (newChild is { } && template is { }))
             {
-                var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ?? 
+                var dataTemplate = this.FindDataTemplate(content, template) ??
                     (
-                        RecognizesAccessKey 
-                            ? FuncDataTemplate.Access 
+                        RecognizesAccessKey
+                            ? FuncDataTemplate.Access
                             : FuncDataTemplate.Default
                     );
 
@@ -376,13 +604,22 @@ namespace Avalonia.Controls.Presenters
         {
             if (Child == null) return finalSize;
 
-            var padding = Padding + BorderThickness;
+            var useLayoutRounding = UseLayoutRounding;
+            var scale = LayoutHelper.GetLayoutScale(this);
+            var padding = Padding;
+            var borderThickness = BorderThickness;
+
+            if (useLayoutRounding)
+            {
+                padding = LayoutHelper.RoundLayoutThickness(padding, scale, scale);
+                borderThickness = LayoutHelper.RoundLayoutThickness(borderThickness, scale, scale);
+            }
+
+            padding += borderThickness;
             var horizontalContentAlignment = HorizontalContentAlignment;
             var verticalContentAlignment = VerticalContentAlignment;
-            var useLayoutRounding = UseLayoutRounding;
             var availableSize = finalSize;
             var sizeForChild = availableSize;
-            var scale = LayoutHelper.GetLayoutScale(this);
             var originX = offset.X;
             var originY = offset.Y;
 
@@ -398,8 +635,8 @@ namespace Avalonia.Controls.Presenters
 
             if (useLayoutRounding)
             {
-                sizeForChild = LayoutHelper.RoundLayoutSize(sizeForChild, scale, scale);
-                availableSize = LayoutHelper.RoundLayoutSize(availableSize, scale, scale);
+                sizeForChild = LayoutHelper.RoundLayoutSizeUp(sizeForChild, scale, scale);
+                availableSize = LayoutHelper.RoundLayoutSizeUp(availableSize, scale, scale);
             }
 
             switch (horizontalContentAlignment)
@@ -446,7 +683,14 @@ namespace Avalonia.Controls.Presenters
 
             if (((ILogical)this).IsAttachedToLogicalTree)
             {
-                UpdateChild();
+                if (e.Property.Name == nameof(Content))
+                {
+                    UpdateChild(e.NewValue);
+                }
+                else
+                {
+                    UpdateChild();
+                }
             }
             else if (Child != null)
             {
diff --git a/src/Avalonia.Controls/Presenters/IContentPresenter.cs b/src/Avalonia.Controls/Presenters/IContentPresenter.cs
index ab4d61e3bd..673de4700b 100644
--- a/src/Avalonia.Controls/Presenters/IContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IContentPresenter.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -6,6 +7,7 @@ namespace Avalonia.Controls.Presenters
     /// Interface for controls that present a single item of data inside a
     /// <see cref="TemplatedControl"/> template.
     /// </summary>
+    [NotClientImplementable]
     public interface IContentPresenter : IPresenter
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs b/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
index 78c4affe44..562638e94a 100644
--- a/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
+++ b/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
@@ -1,5 +1,6 @@
 using Avalonia.Collections;
 using Avalonia.LogicalTree;
+using Avalonia.Metadata;
 using Avalonia.Styling;
 
 namespace Avalonia.Controls.Presenters
@@ -15,6 +16,7 @@ namespace Avalonia.Controls.Presenters
     /// parent control's template is instantiated so they register themselves using this 
     /// interface.
     /// </remarks>
+    [NotClientImplementable]
     public interface IContentPresenterHost : ITemplatedControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
index e7da3d4618..7cc72ef0a7 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
@@ -1,8 +1,10 @@
 using System.Collections;
 using System.Collections.Specialized;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Presenters
 {
+    [NotClientImplementable]
     public interface IItemsPresenter : IPresenter
     {
         IEnumerable? Items { get; set; }
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs b/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
index ba9ee0fe31..db11474871 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
@@ -1,3 +1,4 @@
+using Avalonia.Metadata;
 using Avalonia.Styling;
 
 namespace Avalonia.Controls.Presenters
@@ -13,6 +14,7 @@ namespace Avalonia.Controls.Presenters
     /// parent control's template is instantiated so they register themselves using this 
     /// interface.
     /// </remarks>
+    [NotClientImplementable]
     public interface IItemsPresenterHost : ITemplatedControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/IPresenter.cs b/src/Avalonia.Controls/Presenters/IPresenter.cs
index 5318ea2757..0399983189 100644
--- a/src/Avalonia.Controls/Presenters/IPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IPresenter.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -12,6 +13,7 @@ namespace Avalonia.Controls.Presenters
     /// of a <see cref="TemplatedControl"/> then that signals that the visual child
     /// of the presenter is not a part of the template.
     /// </remarks>
+    [NotClientImplementable]
     public interface IPresenter : IControl, INamed
     {
     }
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
index 39a512a773..4db2ec6d50 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
@@ -187,7 +187,7 @@ namespace Avalonia.Controls.Presenters
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        if ((e.OldStartingIndex >= FirstIndex && e.OldStartingIndex < NextIndex) ||
+                        if (e.OldStartingIndex < NextIndex ||
                             panel.Children.Count > ItemCount)
                         {
                             RecycleContainersOnRemove();
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
index f938c8d437..2821fa8cf0 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
@@ -158,7 +158,7 @@ namespace Avalonia.Controls.Presenters
             {
                 ItemsChanged(e);
 
-                _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs());
+                _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
             }
         }
 
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 97fb4c3f43..c526b7ac49 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -389,7 +389,7 @@ namespace Avalonia.Controls.Presenters
                     {
                         var logicalUnits = delta.Y / logicalScrollItemSize.Y;
                         delta = delta.WithY(delta.Y - logicalUnits * logicalScrollItemSize.Y);
-                        dy = logicalUnits * scrollable!.ScrollSize.Height;
+                        dy = logicalUnits;
                     }
                     else
                         dy = delta.Y;
@@ -407,7 +407,7 @@ namespace Avalonia.Controls.Presenters
                     {
                         var logicalUnits = delta.X / logicalScrollItemSize.X;
                         delta = delta.WithX(delta.X - logicalUnits * logicalScrollItemSize.X);
-                        dx = logicalUnits * scrollable!.ScrollSize.Width;
+                        dx = logicalUnits;
                     }
                     else
                         dx = delta.X;
@@ -469,7 +469,7 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == OffsetProperty && !_arranging)
             {
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 8629af5243..cc1fa6c513 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -8,6 +8,8 @@ using Avalonia.Utilities;
 using Avalonia.VisualTree;
 using Avalonia.Layout;
 using Avalonia.Media.Immutable;
+using Avalonia.Controls.Documents;
+using Avalonia.Input.TextInput;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -25,13 +27,13 @@ namespace Avalonia.Controls.Presenters
             AvaloniaProperty.Register<TextPresenter, char>(nameof(PasswordChar));
 
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
-            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionBrushProperty));
+            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionBrush));
 
         public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty =
-            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionForegroundBrushProperty));
+            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionForegroundBrush));
 
         public static readonly StyledProperty<IBrush?> CaretBrushProperty =
-            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(CaretBrushProperty));
+            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(CaretBrush));
 
         public static readonly DirectProperty<TextPresenter, int> SelectionStartProperty =
             TextBox.SelectionStartProperty.AddOwner<TextPresenter>(
@@ -52,6 +54,15 @@ namespace Avalonia.Controls.Presenters
                 o => o.Text,
                 (o, v) => o.Text = v);
 
+        /// <summary>
+        /// Defines the <see cref="PreeditText"/> property.
+        /// </summary>
+        public static readonly DirectProperty<TextPresenter, string?> PreeditTextProperty =
+            AvaloniaProperty.RegisterDirect<TextPresenter, string?>(
+                nameof(PreeditText),
+                o => o.PreeditText,
+                 (o, v) => o.PreeditText = v);
+
         /// <summary>
         /// Defines the <see cref="TextAlignment"/> property.
         /// </summary>
@@ -64,6 +75,18 @@ namespace Avalonia.Controls.Presenters
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextPresenter>();
 
+        /// <summary>
+        /// Defines the <see cref="LineHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            TextBlock.LineHeightProperty.AddOwner<TextPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="LetterSpacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LetterSpacingProperty =
+            TextBlock.LetterSpacingProperty.AddOwner<TextPresenter>();
+
         /// <summary>
         /// Defines the <see cref="Background"/> property.
         /// </summary>
@@ -82,6 +105,8 @@ namespace Avalonia.Controls.Presenters
         private CharacterHit _lastCharacterHit;
         private Rect _caretBounds;
         private Point _navigationPosition;
+        private string? _preeditText;
+        private CharacterHit _compositionStartHit = new CharacterHit(-1);
 
         static TextPresenter()
         {
@@ -96,7 +121,7 @@ namespace Avalonia.Controls.Presenters
         }
 
         public event EventHandler? CaretBoundsChanged;
-        
+
         /// <summary>
         /// Gets or sets a brush used to paint the control's background.
         /// </summary>
@@ -116,13 +141,19 @@ namespace Avalonia.Controls.Presenters
             set => SetAndRaise(TextProperty, ref _text, value);
         }
 
+        public string? PreeditText
+        {
+            get => _preeditText;
+            set => SetAndRaise(PreeditTextProperty, ref _preeditText, value);
+        }
+
         /// <summary>
         /// Gets or sets the font family.
         /// </summary>
         public FontFamily FontFamily
         {
-            get => TextBlock.GetFontFamily(this);
-            set => TextBlock.SetFontFamily(this, value);
+            get => TextElement.GetFontFamily(this);
+            set => TextElement.SetFontFamily(this, value);
         }
 
         /// <summary>
@@ -130,8 +161,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public double FontSize
         {
-            get => TextBlock.GetFontSize(this);
-            set => TextBlock.SetFontSize(this, value);
+            get => TextElement.GetFontSize(this);
+            set => TextElement.SetFontSize(this, value);
         }
 
         /// <summary>
@@ -139,8 +170,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public FontStyle FontStyle
         {
-            get => TextBlock.GetFontStyle(this);
-            set => TextBlock.SetFontStyle(this, value);
+            get => TextElement.GetFontStyle(this);
+            set => TextElement.SetFontStyle(this, value);
         }
 
         /// <summary>
@@ -148,8 +179,17 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public FontWeight FontWeight
         {
-            get => TextBlock.GetFontWeight(this);
-            set => TextBlock.SetFontWeight(this, value);
+            get => TextElement.GetFontWeight(this);
+            set => TextElement.SetFontWeight(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => TextElement.GetFontStretch(this);
+            set => TextElement.SetFontStretch(this, value);
         }
 
         /// <summary>
@@ -157,8 +197,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public IBrush? Foreground
         {
-            get => TextBlock.GetForeground(this);
-            set => TextBlock.SetForeground(this, value);
+            get => TextElement.GetForeground(this);
+            set => TextElement.SetForeground(this, value);
         }
 
         /// <summary>
@@ -170,6 +210,24 @@ namespace Avalonia.Controls.Presenters
             set => SetValue(TextWrappingProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the line height. By default, this is set to <see cref="double.NaN"/>, which determines the appropriate height automatically.
+        /// </summary>
+        public double LineHeight
+        {
+            get => GetValue(LineHeightProperty);
+            set => SetValue(LineHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the letter spacing.
+        /// </summary>
+        public double LetterSpacing
+        {
+            get => GetValue(LetterSpacingProperty);
+            set => SetValue(LetterSpacingProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the text alignment.
         /// </summary>
@@ -190,11 +248,11 @@ namespace Avalonia.Controls.Presenters
                 {
                     return _textLayout;
                 }
-                
+
                 _textLayout = CreateTextLayout();
 
-                UpdateCaret(_lastCharacterHit);
-                
+                UpdateCaret(_lastCharacterHit, false);
+
                 return _textLayout;
             }
         }
@@ -272,6 +330,8 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        protected override bool BypassFlowDirectionPolicies => true;
+
         /// <summary>
         /// Creates the <see cref="TextLayout"/> used to render the text.
         /// </summary>
@@ -286,10 +346,10 @@ namespace Avalonia.Controls.Presenters
             var foreground = Foreground;
             var maxWidth = MathUtilities.IsZero(constraint.Width) ? double.PositiveInfinity : constraint.Width;
             var maxHeight = MathUtilities.IsZero(constraint.Height) ? double.PositiveInfinity : constraint.Height;
-            
+
             var textLayout = new TextLayout(text, typeface, FontSize, foreground, TextAlignment,
-                TextWrapping, maxWidth: maxWidth, maxHeight: maxHeight, textStyleOverrides: textStyleOverrides, 
-                flowDirection: FlowDirection);
+                TextWrapping, maxWidth: maxWidth, maxHeight: maxHeight, textStyleOverrides: textStyleOverrides,
+                flowDirection: FlowDirection, lineHeight: LineHeight, letterSpacing: LetterSpacing);
 
             return textLayout;
         }
@@ -310,7 +370,7 @@ namespace Avalonia.Controls.Presenters
             var top = 0d;
             var left = 0.0;
 
-            var (_, textHeight) = TextLayout.Size;
+            var textHeight = TextLayout.Bounds.Height;
 
             if (Bounds.Height < textHeight)
             {
@@ -344,7 +404,7 @@ namespace Avalonia.Controls.Presenters
 
                 foreach (var rect in rects)
                 {
-                    context.FillRectangle(selectionBrush, rect);
+                    context.FillRectangle(selectionBrush, PixelRect.FromRect(rect, 1).ToRect(1));
                 }
             }
 
@@ -354,7 +414,7 @@ namespace Avalonia.Controls.Presenters
             {
                 return;
             }
-            
+
             var caretBrush = CaretBrush?.ToImmutable();
 
             if (caretBrush is null)
@@ -379,18 +439,22 @@ namespace Avalonia.Controls.Presenters
 
             context.DrawLine(new ImmutablePen(caretBrush), p1, p2);
         }
-        
+
         private (Point, Point) GetCaretPoints()
         {
             var x = Math.Floor(_caretBounds.X) + 0.5;
             var y = Math.Floor(_caretBounds.Y) + 0.5;
             var b = Math.Ceiling(_caretBounds.Bottom) - 0.5;
 
-            if (x >= Bounds.Width)
+            var caretIndex = _lastCharacterHit.FirstCharacterIndex + _lastCharacterHit.TrailingLength;
+            var lineIndex = TextLayout.GetLineIndexFromCharacterIndex(caretIndex, _lastCharacterHit.TrailingLength > 0);
+            var textLine = TextLayout.TextLines[lineIndex];
+
+            if (_caretBounds.X > 0 && _caretBounds.X >= textLine.WidthIncludingTrailingWhitespace)
             {
-                x = Math.Floor(_caretBounds.X - 1) + 0.5;
+                x -= 1;
             }
-            
+
             return (new Point(x, y), new Point(x, b));
         }
 
@@ -447,6 +511,23 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        private string? GetText()
+        {
+            if (!string.IsNullOrEmpty(_preeditText))
+            {
+                if (string.IsNullOrEmpty(_text) || _caretIndex > _text.Length)
+                {
+                    return _preeditText;
+                }
+
+                var text = _text.Substring(0, _caretIndex) + _preeditText + _text.Substring(_caretIndex);
+
+                return text;
+            }
+
+            return _text;
+        }
+
         /// <summary>
         /// Creates the <see cref="TextLayout"/> used to render the text.
         /// </summary>
@@ -455,26 +536,43 @@ namespace Avalonia.Controls.Presenters
         {
             TextLayout result;
 
-            var text = Text;
+            var text = GetText();
 
             var typeface = new Typeface(FontFamily, FontStyle, FontWeight);
 
-            var selectionStart = SelectionStart;
-            var selectionEnd = SelectionEnd;
+            var selectionStart = CoerceCaretIndex(SelectionStart);
+            var selectionEnd = CoerceCaretIndex(SelectionEnd);
             var start = Math.Min(selectionStart, selectionEnd);
             var length = Math.Max(selectionStart, selectionEnd) - start;
 
             IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null;
-            
-            if (length > 0)
+
+            var foreground = Foreground;
+
+            if (!string.IsNullOrEmpty(_preeditText))
             {
+                var preeditHighlight = new ValueSpan<TextRunProperties>(_caretIndex, _preeditText.Length,
+                        new GenericTextRunProperties(typeface, FontSize,
+                        foregroundBrush: foreground,
+                        textDecorations: TextDecorations.Underline));
+
                 textStyleOverrides = new[]
                 {
-                    new ValueSpan<TextRunProperties>(start, length,
-                        new GenericTextRunProperties(typeface, FontSize,
-                            foregroundBrush: SelectionForegroundBrush ?? Brushes.White))
+                    preeditHighlight
                 };
             }
+            else
+            {
+                if (length > 0 && SelectionForegroundBrush != null)
+                {
+                    textStyleOverrides = new[]
+                    {
+                        new ValueSpan<TextRunProperties>(start, length,
+                        new GenericTextRunProperties(typeface, FontSize,
+                            foregroundBrush: SelectionForegroundBrush))
+                    };
+                }
+            }
 
             if (PasswordChar != default(char) && !RevealPassword)
             {
@@ -492,31 +590,42 @@ namespace Avalonia.Controls.Presenters
         protected virtual void InvalidateTextLayout()
         {
             _textLayout = null;
-            
+
             InvalidateMeasure();
         }
-        
+
         protected override Size MeasureOverride(Size availableSize)
         {
+            _constraint = availableSize;
+
             _textLayout = null;
 
-            _constraint = availableSize;
+            InvalidateArrange();
 
-            return TextLayout.Size;
+            var measuredSize = TextLayout.Bounds.Size;
+
+            return measuredSize;
         }
 
         protected override Size ArrangeOverride(Size finalSize)
         {
-            if (!double.IsInfinity(_constraint.Width))
+            var textWidth = Math.Ceiling(TextLayout.Bounds.Width);
+
+            if (finalSize.Width < textWidth)
             {
-                return base.ArrangeOverride(finalSize);
+                finalSize = finalSize.WithWidth(textWidth);
             }
-            
-            _constraint = finalSize;
-            
+
+            if (MathUtilities.AreClose(_constraint.Width, finalSize.Width))
+            {
+                return finalSize;
+            }
+
+            _constraint = new Size(Math.Ceiling(finalSize.Width), double.PositiveInfinity);
+
             _textLayout = null;
 
-            return base.ArrangeOverride(finalSize); 
+            return finalSize;
         }
 
         private int CoerceCaretIndex(int value)
@@ -529,7 +638,7 @@ namespace Avalonia.Controls.Presenters
         private void CaretTimerTick(object? sender, EventArgs e)
         {
             _caretBlink = !_caretBlink;
-            
+
             InvalidateVisual();
         }
 
@@ -539,7 +648,7 @@ namespace Avalonia.Controls.Presenters
             var textLine = TextLayout.TextLines[lineIndex];
 
             var characterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(textPosition));
-            
+
             var nextCaretCharacterHit = textLine.GetNextCaretCharacterHit(characterHit);
 
             if (nextCaretCharacterHit.FirstCharacterIndex <= textPosition)
@@ -559,8 +668,8 @@ namespace Avalonia.Controls.Presenters
             _navigationPosition = _caretBounds.Position;
 
             CaretChanged();
-        } 
-        
+        }
+
         public void MoveCaretToPoint(Point point)
         {
             var hit = TextLayout.HitTestPoint(point);
@@ -591,7 +700,7 @@ namespace Avalonia.Controls.Presenters
                 }
 
                 var textLine = TextLayout.TextLines[lineIndex];
-                
+
                 currentY += textLine.Height;
             }
             else
@@ -607,36 +716,29 @@ namespace Avalonia.Controls.Presenters
             }
 
             var navigationPosition = _navigationPosition;
-            
+
             MoveCaretToPoint(new Point(currentX, currentY));
-            
+
             _navigationPosition = navigationPosition.WithY(_caretBounds.Y);
 
             CaretChanged();
         }
 
-        public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Forward)
+        public CharacterHit GetNextCharacterHit(LogicalDirection direction = LogicalDirection.Forward)
         {
             if (Text is null)
             {
-                return;
-            }
-            
-            if (FlowDirection == FlowDirection.RightToLeft)
-            {
-                direction = direction == LogicalDirection.Forward ?
-                    LogicalDirection.Backward :
-                    LogicalDirection.Forward;
+                return default;
             }
 
             var characterHit = _lastCharacterHit;
             var caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-            
+
             var lineIndex = TextLayout.GetLineIndexFromCharacterIndex(caretIndex, false);
 
             if (lineIndex < 0)
             {
-                return;
+                return default;
             }
 
             if (direction == LogicalDirection.Forward)
@@ -649,19 +751,19 @@ namespace Avalonia.Controls.Presenters
 
                     caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
-                    if (textLine.NewLineLength > 0 && caretIndex == textLine.TextRange.Start + textLine.TextRange.Length)
+                    if (textLine.TrailingWhitespaceLength > 0 && caretIndex == textLine.FirstTextSourceIndex + textLine.Length)
                     {
                         characterHit = new CharacterHit(caretIndex);
                     }
-                    
+
                     if (caretIndex >= Text.Length)
                     {
                         characterHit = new CharacterHit(Text.Length);
-                        
+
                         break;
                     }
 
-                    if (caretIndex - textLine.NewLineLength == textLine.TextRange.Start + textLine.TextRange.Length)
+                    if (caretIndex - textLine.NewLineLength == textLine.FirstTextSourceIndex + textLine.Length)
                     {
                         break;
                     }
@@ -669,10 +771,10 @@ namespace Avalonia.Controls.Presenters
                     if (caretIndex <= CaretIndex)
                     {
                         lineIndex++;
-                        
+
                         continue;
                     }
-                    
+
                     break;
                 }
             }
@@ -697,6 +799,20 @@ namespace Avalonia.Controls.Presenters
                 }
             }
 
+            return characterHit;
+        }
+
+        public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Forward)
+        {
+            if (FlowDirection == FlowDirection.RightToLeft)
+            {
+                direction = direction == LogicalDirection.Forward ?
+                    LogicalDirection.Backward :
+                    LogicalDirection.Forward;
+            }
+
+            var characterHit = GetNextCharacterHit(direction);
+
             UpdateCaret(characterHit);
 
             _navigationPosition = _caretBounds.Position;
@@ -704,12 +820,12 @@ namespace Avalonia.Controls.Presenters
             CaretChanged();
         }
 
-        private void UpdateCaret(CharacterHit characterHit)
+        private void UpdateCaret(CharacterHit characterHit, bool updateCaretIndex = true)
         {
             _lastCharacterHit = characterHit;
-            
+
             var caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-            
+
             var lineIndex = TextLayout.GetLineIndexFromCharacterIndex(caretIndex, characterHit.TrailingLength > 0);
             var textLine = TextLayout.TextLines[lineIndex];
             var distanceX = textLine.GetDistanceFromCharacterHit(characterHit);
@@ -724,7 +840,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             var caretBounds = new Rect(distanceX, distanceY, 0, textLine.Height);
-            
+
             if (caretBounds != _caretBounds)
             {
                 _caretBounds = caretBounds;
@@ -732,7 +848,10 @@ namespace Avalonia.Controls.Presenters
                 CaretBoundsChanged?.Invoke(this, EventArgs.Empty);
             }
 
-            SetAndRaise(CaretIndexProperty, ref _caretIndex, caretIndex);
+            if (updateCaretIndex)
+            {
+                SetAndRaise(CaretIndexProperty, ref _caretIndex, caretIndex);
+            }
         }
 
         internal Rect GetCursorRectangle()
@@ -745,33 +864,77 @@ namespace Avalonia.Controls.Presenters
             base.OnDetachedFromVisualTree(e);
 
             _caretTimer.Stop();
-            
+
             _caretTimer.Tick -= CaretTimerTick;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected void OnPreeditTextChanged(string? oldValue, string? newValue)
+        {
+            InvalidateTextLayout();
+
+            if (string.IsNullOrEmpty(newValue))
+            {
+                UpdateCaret(_lastCharacterHit);
+            }
+            else
+            {
+                var textPosition = _caretIndex + newValue?.Length ?? 0;
+
+                var characterHit = GetCharacterHitFromTextPosition(textPosition);
+
+                UpdateCaret(characterHit, false);
+            }
+        }
+
+        private CharacterHit GetCharacterHitFromTextPosition(int textPosition)
+        {
+            var lineIndex = TextLayout.GetLineIndexFromCharacterIndex(textPosition, true);
+
+            var textLine = TextLayout.TextLines[lineIndex];
+
+            var characterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(textPosition - 1));
+
+            return characterHit;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
-            
+
             switch (change.Property.Name)
             {
-                case nameof (TextBlock.Foreground):
-                case nameof (TextBlock.FontSize):
-                case nameof (TextBlock.FontStyle):
-                case nameof (TextBlock.FontWeight):
-                case nameof (TextBlock.FontFamily):
-                case nameof (Text):
-                case nameof (TextAlignment):
-                case nameof (TextWrapping):
-                case nameof (SelectionStart):
-                case nameof (SelectionEnd):
-                case nameof (SelectionForegroundBrush):
-                case nameof (PasswordChar):
-                case nameof (RevealPassword):
-                {
-                    InvalidateTextLayout();
-                    break;
-                }
+                case nameof(PreeditText):
+                    {
+                        OnPreeditTextChanged(change.OldValue as string, change.NewValue as string);
+                        break;
+                    }
+
+                case nameof(Foreground):
+                case nameof(FontSize):
+                case nameof(FontStyle):
+                case nameof(FontWeight):
+                case nameof(FontFamily):
+                case nameof(FontStretch):
+
+                case nameof(Text):
+                case nameof(TextAlignment):
+                case nameof(TextWrapping):
+
+                case nameof(LineHeight):
+                case nameof(LetterSpacing):
+
+                case nameof(SelectionStart):
+                case nameof(SelectionEnd):
+                case nameof(SelectionForegroundBrush):
+
+                case nameof(PasswordChar):
+                case nameof(RevealPassword):
+
+                case nameof(FlowDirection):
+                    {
+                        InvalidateTextLayout();
+                        break;
+                    }
             }
         }
     }
diff --git a/src/Avalonia.Controls/Primitives/AccessText.cs b/src/Avalonia.Controls/Primitives/AccessText.cs
index a6976721b1..7e5b34acd9 100644
--- a/src/Avalonia.Controls/Primitives/AccessText.cs
+++ b/src/Avalonia.Controls/Primitives/AccessText.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Avalonia.Automation.Peers;
 using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
@@ -78,9 +79,9 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <inheritdoc/>
-        protected override TextLayout? CreateTextLayout(Size constraint, string? text)
+        protected override TextLayout CreateTextLayout(string? text)
         {
-            return base.CreateTextLayout(constraint, StripAccessKey(text));
+            return base.CreateTextLayout(RemoveAccessKeyMarker(text));
         }
 
         /// <inheritdoc/>
@@ -107,29 +108,40 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        /// <summary>
-        /// Returns a string with the first underscore stripped.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <returns>The text with the first underscore stripped.</returns>
-        [return: NotNullIfNotNull("text")]
-        private string? StripAccessKey(string? text)
+        protected override AutomationPeer OnCreateAutomationPeer()
         {
-            if (text is null)
-            {
-                return null;
-            }
-
-            var position = text.IndexOf('_');
+            return new NoneAutomationPeer(this);
+        }
 
-            if (position == -1)
+        internal static string? RemoveAccessKeyMarker(string? text)
+        {
+            if (!string.IsNullOrEmpty(text))
             {
-                return text;
+                var accessKeyMarker = "_";
+                var doubleAccessKeyMarker = accessKeyMarker + accessKeyMarker;
+                int index = FindAccessKeyMarker(text);
+                if (index >= 0 && index < text.Length - 1)
+                    text = text.Remove(index, 1);
+                text = text.Replace(doubleAccessKeyMarker, accessKeyMarker);
             }
-            else
+            return text;
+        }
+
+        private static int FindAccessKeyMarker(string text)
+        {
+            var length = text.Length;
+            var startIndex = 0;
+            while (startIndex < length)
             {
-                return text.Substring(0, position) + text.Substring(position + 1);
+                int index = text.IndexOf('_', startIndex);
+                if (index == -1)
+                    return -1;
+                if (index + 1 < length && text[index + 1] != '_')
+                    return index;
+                startIndex = index + 2;
             }
+
+            return -1;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 353f12118f..d557424fbb 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -27,12 +27,22 @@ namespace Avalonia.Controls.Primitives
         public static readonly AttachedProperty<bool> IsClipEnabledProperty =
             AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, bool>("IsClipEnabled", true);
 
+        /// <summary>
+        /// Allows for getting and setting of the adorner for control.
+        /// </summary>
+        public static readonly AttachedProperty<Control?> AdornerProperty =
+            AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, Control?>("Adorner");
+
         private static readonly AttachedProperty<AdornedElementInfo> s_adornedElementInfoProperty =
             AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, AdornedElementInfo>("AdornedElementInfo");
 
+        private static readonly AttachedProperty<AdornerLayer?> s_savedAdornerLayerProperty =
+            AvaloniaProperty.RegisterAttached<Visual, Visual, AdornerLayer?>("SavedAdornerLayer");
+
         static AdornerLayer()
         {
             AdornedElementProperty.Changed.Subscribe(AdornedElementChanged);
+            AdornerProperty.Changed.Subscribe(AdornerChanged);
         }
 
         public AdornerLayer()
@@ -65,42 +75,149 @@ namespace Avalonia.Controls.Primitives
             adorner.SetValue(IsClipEnabledProperty, isClipEnabled);
         }
 
-        protected override Size MeasureOverride(Size availableSize)
+        public static Control? GetAdorner(Visual visual)
         {
-            foreach (var child in Children)
+            return visual.GetValue(AdornerProperty);
+        }
+
+        public static void SetAdorner(Visual visual, Control? adorner)
+        {
+            visual.SetValue(AdornerProperty, adorner);
+        }
+
+        private static void AdornerChanged(AvaloniaPropertyChangedEventArgs<Control?> e)
+        {
+            if (e.Sender is Visual visual)
             {
-                var info = child.GetValue(s_adornedElementInfoProperty);
+                var oldAdorner = e.OldValue.GetValueOrDefault();
+                var newAdorner = e.NewValue.GetValueOrDefault();
 
-                if (info != null && info.Bounds.HasValue)
+                if (Equals(oldAdorner, newAdorner))
                 {
-                    child.Measure(info.Bounds.Value.Bounds.Size);
+                    return;
                 }
-                else
+
+                if (oldAdorner is { })
+                {
+                    visual.AttachedToVisualTree -= VisualOnAttachedToVisualTree;
+                    visual.DetachedFromVisualTree -= VisualOnDetachedFromVisualTree;
+                    Detach(visual, oldAdorner);
+                }
+
+                if (newAdorner is { })
                 {
-                    child.Measure(availableSize);
+                    visual.AttachedToVisualTree += VisualOnAttachedToVisualTree;
+                    visual.DetachedFromVisualTree += VisualOnDetachedFromVisualTree;
+                    Attach(visual, newAdorner);
                 }
             }
+        }
 
-            return default;
+        private static void VisualOnAttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
+        {
+            if (sender is Visual visual)
+            {
+                var adorner = GetAdorner(visual);
+                if (adorner is { })
+                {
+                    Attach(visual, adorner);
+                }
+            }
         }
 
-        protected override Size ArrangeOverride(Size finalSize)
+        private static void VisualOnDetachedFromVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
         {
-            foreach (var child in Children)
+            if (sender is Visual visual)
             {
-                var info = child.GetValue(s_adornedElementInfoProperty);
-                var isClipEnabled = child.GetValue(IsClipEnabledProperty);
+                var adorner = GetAdorner(visual);
+                if (adorner is { })
+                {
+                    Detach(visual, adorner);
+                }
+            }
+        }
 
-                if (info != null && info.Bounds.HasValue)
+        private static void Attach(Visual visual, Control adorner)
+        {
+            var layer = AdornerLayer.GetAdornerLayer(visual);
+            AddVisualAdorner(visual, adorner, layer);
+            visual.SetValue(s_savedAdornerLayerProperty, layer);
+        }
+
+        private static void Detach(Visual visual, Control adorner)
+        {
+            var layer = visual.GetValue(s_savedAdornerLayerProperty);
+            RemoveVisualAdorner(visual, adorner, layer);
+            visual.ClearValue(s_savedAdornerLayerProperty);
+        }
+
+        private static void AddVisualAdorner(Visual visual, Control? adorner, AdornerLayer? layer)
+        {
+            if (adorner is null || layer == null || layer.Children.Contains(adorner))
+            {
+                return;
+            }
+
+            AdornerLayer.SetAdornedElement(adorner, visual);
+            AdornerLayer.SetIsClipEnabled(adorner, false);
+
+            ((ISetLogicalParent) adorner).SetParent(visual);
+            layer.Children.Add(adorner);
+        }
+
+        private static void RemoveVisualAdorner(Visual visual, Control? adorner, AdornerLayer? layer)
+        {
+            if (adorner is null || layer is null || !layer.Children.Contains(adorner))
+            {
+                return;
+            }
+
+            layer.Children.Remove(adorner);
+            ((ISetLogicalParent) adorner).SetParent(null);
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            foreach (var child in Children)
+            {
+                if (child is AvaloniaObject ao)
                 {
-                    child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
-                    child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
-                    UpdateClip(child, info.Bounds.Value, isClipEnabled);
-                    child.Arrange(info.Bounds.Value.Bounds);
+                    var info = ao.GetValue(s_adornedElementInfoProperty);
+
+                    if (info != null && info.Bounds.HasValue)
+                    {
+                        child.Measure(info.Bounds.Value.Bounds.Size);
+                    }
+                    else
+                    {
+                        child.Measure(availableSize);
+                    }
                 }
-                else
+            }
+
+            return default;
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            foreach (var child in Children)
+            {
+                if (child is AvaloniaObject ao)
                 {
-                    child.Arrange(new Rect(finalSize));
+                    var info = ao.GetValue(s_adornedElementInfoProperty);
+                    var isClipEnabled = ao.GetValue(IsClipEnabledProperty);
+
+                    if (info != null && info.Bounds.HasValue)
+                    {
+                        child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
+                        child.RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Absolute);
+                        UpdateClip(child, info.Bounds.Value, isClipEnabled);
+                        child.Arrange(info.Bounds.Value.Bounds);
+                    }
+                    else
+                    {
+                        ArrangeChild((Control) child, finalSize);
+                    }
                 }
             }
 
@@ -158,6 +275,9 @@ namespace Avalonia.Controls.Primitives
 
         private void UpdateAdornedElement(Visual adorner, Visual? adorned)
         {
+            if (adorner.CompositionVisual != null)
+                adorner.CompositionVisual.AdornedVisual = adorned?.CompositionVisual;
+            
             var info = adorner.GetValue(s_adornedElementInfoProperty);
 
             if (info != null)
@@ -178,11 +298,18 @@ namespace Avalonia.Controls.Primitives
                     adorner.SetValue(s_adornedElementInfoProperty, info);
                 }
 
-                info.Subscription = adorned.GetObservable(TransformedBoundsProperty).Subscribe(x =>
-                {
-                    info.Bounds = x;
-                    InvalidateMeasure();
-                });
+                if (adorner.CompositionVisual != null)
+                    info.Subscription = adorned.GetObservable(BoundsProperty).Subscribe(x =>
+                    {
+                        info.Bounds = new TransformedBounds(new Rect(adorned.Bounds.Size), new Rect(adorned.Bounds.Size), Matrix.Identity);
+                        InvalidateMeasure();
+                    });
+                else
+                    info.Subscription = adorned.GetObservable(TransformedBoundsProperty).Subscribe(x =>
+                    {
+                        info.Bounds = x;
+                        InvalidateMeasure();
+                    });
             }
         }
 
diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs
index 36d2ae9230..bd2aa39621 100644
--- a/src/Avalonia.Controls/Primitives/IPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs
@@ -2,6 +2,8 @@ using System;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -14,19 +16,54 @@ namespace Avalonia.Controls.Primitives
     /// (<see cref="PopupRoot"/>) or an <see cref="OverlayPopupHost"/> which is created
     /// on an <see cref="OverlayLayer"/>.
     /// </remarks>
+    [NotClientImplementable]
     public interface IPopupHost : IDisposable, IFocusScope
     {
         /// <summary>
-        /// Sets the control to display in the popup.
+        /// Gets or sets the fixed width of the popup.
         /// </summary>
-        /// <param name="control"></param>
-        void SetChild(IControl? control);
+        double Width { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum width of the popup.
+        /// </summary>
+        double MinWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum width of the popup.
+        /// </summary>
+        double MaxWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed height of the popup.
+        /// </summary>
+        double Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum height of the popup.
+        /// </summary>
+        double MinHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the popup.
+        /// </summary>
+        double MaxHeight { get; set; }
 
         /// <summary>
         /// Gets the presenter from the control's template.
         /// </summary>
         IContentPresenter? Presenter { get; }
 
+        /// <summary>
+        /// Gets or sets whether the popup appears on top of all other windows.
+        /// </summary>
+        bool Topmost { get; set; }
+
+        /// <summary>
+        /// Gets or sets a transform that will be applied to the popup.
+        /// </summary>
+        Transform? Transform { get; set; }
+
         /// <summary>
         /// Gets the root of the visual tree in the case where the popup is presented using a
         /// separate visual tree.
@@ -57,6 +94,12 @@ namespace Avalonia.Controls.Primitives
             PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
             Rect? rect = null);
 
+        /// <summary>
+        /// Sets the control to display in the popup.
+        /// </summary>
+        /// <param name="control"></param>
+        void SetChild(IControl? control);
+
         /// <summary>
         /// Shows the popup.
         /// </summary>
@@ -66,14 +109,5 @@ namespace Avalonia.Controls.Primitives
         /// Hides the popup.
         /// </summary>
         void Hide();
-
-        /// <summary>
-        /// Binds the constraints of the popup host to a set of properties, usally those present on
-        /// <see cref="Popup"/>.
-        /// </summary>
-        IDisposable BindConstraints(AvaloniaObject popup, StyledProperty<double> widthProperty,
-            StyledProperty<double> minWidthProperty, StyledProperty<double> maxWidthProperty,
-            StyledProperty<double> heightProperty, StyledProperty<double> minHeightProperty,
-            StyledProperty<double> maxHeightProperty, StyledProperty<bool> topmostProperty);
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index 6a0408d6d1..468879edd1 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -23,7 +23,14 @@ namespace Avalonia.Controls.Primitives
         }
 
         public bool HitTest(Point point) => Children.HitTestCustom(point);
-        
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            foreach (Control child in Children)
+                child.Measure(availableSize);
+            return availableSize;
+        }
+
         protected override Size ArrangeOverride(Size finalSize)
         {
             // We are saving it here since child controls might need to know the entire size of the overlay
diff --git a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
index 6251d5cda7..4765718c3b 100644
--- a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
@@ -11,6 +11,12 @@ namespace Avalonia.Controls.Primitives
 {
     public class OverlayPopupHost : ContentControl, IPopupHost, IInteractive, IManagedPopupPositionerPopup
     {
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transform?> TransformProperty =
+            PopupRoot.TransformProperty.AddOwner<OverlayPopupHost>();
+
         private readonly OverlayLayer _overlayLayer;
         private PopupPositionerParameters _positionerParameters = new PopupPositionerParameters();
         private ManagedPopupPositioner _positioner;
@@ -29,10 +35,22 @@ namespace Avalonia.Controls.Primitives
         }
 
         public IVisual? HostedVisualTreeRoot => null;
-        
+
+        public Transform? Transform
+        {
+            get => GetValue(TransformProperty);
+            set => SetValue(TransformProperty, value);
+        }
+
         /// <inheritdoc/>
         IInteractive? IInteractive.InteractiveParent => Parent;
 
+        bool IPopupHost.Topmost
+        {
+            get => false;
+            set { /* Not currently supported in overlay popups */ }
+        }
+
         public void Dispose() => Hide();
 
 
@@ -48,35 +66,13 @@ namespace Avalonia.Controls.Primitives
             _shown = false;
         }
 
-        public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty<double> widthProperty, StyledProperty<double> minWidthProperty,
-            StyledProperty<double> maxWidthProperty, StyledProperty<double> heightProperty, StyledProperty<double> minHeightProperty,
-            StyledProperty<double> maxHeightProperty, StyledProperty<bool> topmostProperty)
-        {
-            // Topmost property is not supported
-            var bindings = new List<IDisposable>();
-
-            void Bind(AvaloniaProperty what, AvaloniaProperty to) => bindings.Add(this.Bind(what, popup[~to]));
-            Bind(WidthProperty, widthProperty);
-            Bind(MinWidthProperty, minWidthProperty);
-            Bind(MaxWidthProperty, maxWidthProperty);
-            Bind(HeightProperty, heightProperty);
-            Bind(MinHeightProperty, minHeightProperty);
-            Bind(MaxHeightProperty, maxHeightProperty);
-            
-            return Disposable.Create(() =>
-            {
-                foreach (var x in bindings)
-                    x.Dispose();
-            });
-        }
-
         public void ConfigurePosition(IVisual target, PlacementMode placement, Point offset,
             PopupAnchor anchor = PopupAnchor.None, PopupGravity gravity = PopupGravity.None,
             PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
             Rect? rect = null)
         {
             _positionerParameters.ConfigurePosition((TopLevel)_overlayLayer.GetVisualRoot()!, target, placement, offset, anchor,
-                gravity, constraintAdjustment, rect);
+                gravity, constraintAdjustment, rect, FlowDirection);
             UpdatePosition();
         }
 
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index f3fec95bcc..ccb81ba276 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -2,6 +2,7 @@ using System;
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Presenters;
@@ -13,18 +14,18 @@ using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.VisualTree;
+using Avalonia.Media;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
     /// Displays a popup window.
     /// </summary>
-#pragma warning disable CS0612 // Type or member is obsolete
-    public class Popup : Control, IVisualTreeHost, IPopupHostProvider
-#pragma warning restore CS0612 // Type or member is obsolete
+    public class Popup : Control, IPopupHostProvider
     {
         public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty =
-            AvaloniaProperty.Register<PopupRoot, bool>(nameof(WindowManagerAddShadowHint), false);
+            AvaloniaProperty.Register<Popup, bool>(nameof(WindowManagerAddShadowHint), false);
 
         /// <summary>
         /// Defines the <see cref="Child"/> property.
@@ -32,6 +33,12 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<Control?> ChildProperty =
             AvaloniaProperty.Register<Popup, Control?>(nameof(Child));
 
+        /// <summary>
+        /// Defines the <see cref="InheritsTransform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> InheritsTransformProperty =
+            AvaloniaProperty.Register<Popup, bool>(nameof(InheritsTransform));
+
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property.
         /// </summary>
@@ -81,14 +88,6 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<Control?> PlacementTargetProperty =
             AvaloniaProperty.Register<Popup, Control?>(nameof(PlacementTarget));
 
-#pragma warning disable 618
-        /// <summary>
-        /// Defines the <see cref="ObeyScreenEdges"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> ObeyScreenEdgesProperty =
-            AvaloniaProperty.Register<Popup, bool>(nameof(ObeyScreenEdges), true);
-#pragma warning restore 618
-
         public static readonly StyledProperty<bool> OverlayDismissEventPassThroughProperty =
             AvaloniaProperty.Register<Popup, bool>(nameof(OverlayDismissEventPassThrough));
 
@@ -116,17 +115,6 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<double> VerticalOffsetProperty =
             AvaloniaProperty.Register<Popup, double>(nameof(VerticalOffset));
 
-        /// <summary>
-        /// Defines the <see cref="StaysOpen"/> property.
-        /// </summary>
-        [Obsolete("Use IsLightDismissEnabledProperty")]
-        public static readonly DirectProperty<Popup, bool> StaysOpenProperty =
-            AvaloniaProperty.RegisterDirect<Popup, bool>(
-                nameof(StaysOpen),
-                o => o.StaysOpen,
-                (o, v) => o.StaysOpen = v,
-                true);
-
         /// <summary>
         /// Defines the <see cref="Topmost"/> property.
         /// </summary>
@@ -195,6 +183,16 @@ namespace Avalonia.Controls.Primitives
             set;
         }
 
+        /// <summary>
+        /// Gets or sets a value that determines whether the popup inherits the render transform
+        /// from its <see cref="PlacementTarget"/>. Defaults to false.
+        /// </summary>
+        public bool InheritsTransform
+        {
+            get => GetValue(InheritsTransformProperty);
+            set => SetValue(InheritsTransformProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a value that determines how the <see cref="Popup"/> can be dismissed.
         /// </summary>
@@ -282,13 +280,6 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(PlacementTargetProperty, value); }
         }
 
-        [Obsolete("This property has no effect")]
-        public bool ObeyScreenEdges
-        {
-            get => GetValue(ObeyScreenEdgesProperty);
-            set => SetValue(ObeyScreenEdgesProperty, value);
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether the event that closes the popup is passed
         /// through to the parent window.
@@ -333,17 +324,6 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(VerticalOffsetProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the popup should stay open when the popup is
-        /// pressed or loses focus.
-        /// </summary>
-        [Obsolete("Use IsLightDismissEnabled")]
-        public bool StaysOpen
-        {
-            get => !IsLightDismissEnabled;
-            set => IsLightDismissEnabled = !value;
-        }
-
         /// <summary>
         /// Gets or sets whether this popup appears on top of all other windows
         /// </summary>
@@ -353,11 +333,6 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(TopmostProperty, value); }
         }
 
-        /// <summary>
-        /// Gets the root of the popup window.
-        /// </summary>
-        IVisual? IVisualTreeHost.Root => _openState?.PopupHost.HostedVisualTreeRoot;
-
         IPopupHost? IPopupHostProvider.PopupHost => Host;
 
         event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
@@ -394,24 +369,29 @@ namespace Avalonia.Controls.Primitives
             }
 
             _isOpenRequested = false;
-            var popupHost = OverlayPopupHost.CreatePopupHost(placementTarget, DependencyResolver);
 
+            var popupHost = OverlayPopupHost.CreatePopupHost(placementTarget, DependencyResolver);
             var handlerCleanup = new CompositeDisposable(7);
 
-            popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
-                HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty).DisposeWith(handlerCleanup);
-
+            UpdateHostSizing(popupHost, topLevel, placementTarget);
+            popupHost.Topmost = Topmost;
             popupHost.SetChild(Child);
             ((ISetLogicalParent)popupHost).SetParent(this);
 
-            popupHost.ConfigurePosition(
-                placementTarget,
-                PlacementMode,
-                new Point(HorizontalOffset, VerticalOffset),
-                PlacementAnchor,
-                PlacementGravity,
-                PlacementConstraintAdjustment,
-                PlacementRect);
+            if (InheritsTransform && placementTarget is Control c)
+            {
+                SubscribeToEventHandler<Control, EventHandler<AvaloniaPropertyChangedEventArgs>>(
+                    c,
+                    PlacementTargetPropertyChanged,
+                    (x, handler) => x.PropertyChanged += handler,
+                    (x, handler) => x.PropertyChanged -= handler).DisposeWith(handlerCleanup);
+            }
+            else
+            {
+                popupHost.Transform = null;
+            }
+
+            UpdateHostPosition(popupHost, placementTarget);
 
             SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,
                 (x, handler) => x.TemplateApplied += handler,
@@ -477,7 +457,7 @@ namespace Avalonia.Controls.Primitives
                 if (dismissLayer != null)
                 {
                     dismissLayer.IsVisible = true;
-                    dismissLayer.InputPassThroughElement = _overlayInputPassThroughElement;
+                    dismissLayer.InputPassThroughElement = OverlayInputPassThroughElement;
                     
                     Disposable.Create(() =>
                     {
@@ -493,7 +473,7 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            _openState = new PopupOpenState(topLevel, popupHost, cleanupPopup);
+            _openState = new PopupOpenState(placementTarget, topLevel, popupHost, cleanupPopup);
 
             WindowManagerAddShadowHintChanged(popupHost, WindowManagerAddShadowHint);
 
@@ -541,7 +521,94 @@ namespace Avalonia.Controls.Primitives
             base.OnDetachedFromLogicalTree(e);
             Close();
         }
-        
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (_openState is not null)
+            {
+                if (change.Property == WidthProperty ||
+                    change.Property == MinWidthProperty ||
+                    change.Property == MaxWidthProperty ||
+                    change.Property == HeightProperty ||
+                    change.Property == MinHeightProperty ||
+                    change.Property == MaxHeightProperty)
+                {
+                    UpdateHostSizing(_openState.PopupHost, _openState.TopLevel, _openState.PlacementTarget);
+                }
+                else if (change.Property == PlacementTargetProperty ||
+                         change.Property == PlacementModeProperty ||
+                         change.Property == HorizontalOffsetProperty ||
+                         change.Property == VerticalOffsetProperty ||
+                         change.Property == PlacementAnchorProperty ||
+                         change.Property == PlacementConstraintAdjustmentProperty ||
+                         change.Property == PlacementRectProperty)
+                {
+                    if (change.Property == PlacementTargetProperty)
+                    {
+                        var newTarget = change.GetNewValue<Control?>() ?? this.FindLogicalAncestorOfType<IControl>();
+
+                        if (newTarget is null || newTarget.GetVisualRoot() != _openState.TopLevel)
+                        {
+                            Close();
+                            return;
+                        }
+
+                        _openState.PlacementTarget = newTarget;
+                    }
+
+                    UpdateHostPosition(_openState.PopupHost, _openState.PlacementTarget);
+                }
+                else if (change.Property == TopmostProperty)
+                {
+                    _openState.PopupHost.Topmost = change.GetNewValue<bool>();
+                }
+            }
+        }
+
+        private void UpdateHostPosition(IPopupHost popupHost, IControl placementTarget)
+        {
+            popupHost.ConfigurePosition(
+                placementTarget,
+                PlacementMode,
+                new Point(HorizontalOffset, VerticalOffset),
+                PlacementAnchor,
+                PlacementGravity,
+                PlacementConstraintAdjustment,
+                PlacementRect ?? new Rect(default, placementTarget.Bounds.Size));
+        }
+
+        private void UpdateHostSizing(IPopupHost popupHost, TopLevel topLevel, IControl placementTarget)
+        {
+            var scaleX = 1.0;
+            var scaleY = 1.0;
+
+            if (InheritsTransform && placementTarget.TransformToVisual(topLevel) is Matrix m)
+            {
+                scaleX = Math.Sqrt(m.M11 * m.M11 + m.M12 * m.M12);
+                scaleY = Math.Sqrt(m.M11 * m.M11 + m.M12 * m.M12);
+
+                // Ideally we'd only assign a ScaleTransform here when the scale != 1, but there's
+                // an issue with LayoutTransformControl in that it sets its LayoutTransform property
+                // with LocalValue priority in ArrangeOverride in certain cases when LayoutTransform
+                // is null, which breaks TemplateBindings to this property. Offending commit/line:
+                //
+                // https://github.com/AvaloniaUI/Avalonia/commit/6fbe1c2180ef45a940e193f1b4637e64eaab80ed#diff-5344e793df13f462126a8153ef46c44194f244b6890f25501709bae51df97f82R54
+                popupHost.Transform = new ScaleTransform(scaleX, scaleY);
+            }
+            else
+            {
+                popupHost.Transform = null;
+            }
+
+            popupHost.Width = Width * scaleX;
+            popupHost.MinWidth = MinWidth * scaleX;
+            popupHost.MaxWidth = MaxWidth * scaleX;
+            popupHost.Height = Height * scaleY;
+            popupHost.MinHeight = MinHeight * scaleY;
+            popupHost.MaxHeight = MaxHeight * scaleY;
+        }
+
         private void HandlePositionChange()
         {
             if (_openState != null)
@@ -560,6 +627,11 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new PopupAutomationPeer(this);
+        }
+
         private static IDisposable SubscribeToEventHandler<T, TEventHandler>(T target, TEventHandler handler, Action<T, TEventHandler> subscribe, Action<T, TEventHandler> unsubscribe)
         {
             subscribe(target, handler);
@@ -651,7 +723,17 @@ namespace Avalonia.Controls.Primitives
             {
                 if (PlacementTarget != null)
                 {
-                    FocusManager.Instance?.Focus(PlacementTarget);
+                    var e = (IControl?)PlacementTarget;
+
+                    while (e is object && (!e.Focusable || !e.IsEffectivelyEnabled || !e.IsVisible))
+                    {
+                        e = e.Parent;
+                    }
+
+                    if (e is object)
+                    {
+                        FocusManager.Instance?.Focus(e);
+                    }
                 }
                 else
                 {
@@ -735,22 +817,7 @@ namespace Avalonia.Controls.Primitives
         {
             if (control != null)
             {
-                var templatedParent = TemplatedParent;
-
-                if (control.TemplatedParent == null)
-                {
-                    control.SetValue(TemplatedParentProperty, templatedParent);
-                }
-
-                control.ApplyTemplate();
-
-                if (!(control is IPresenter) && control.TemplatedParent == templatedParent)
-                {
-                    foreach (IControl child in control.VisualChildren)
-                    {
-                        SetTemplatedParentAndApplyChildTemplates(child);
-                    }
-                }
+                TemplatedControl.ApplyTemplatedParent(control, TemplatedParent);
             }
         }
 
@@ -808,6 +875,14 @@ namespace Avalonia.Controls.Primitives
             }
         }
         
+        private void PlacementTargetPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_openState is not null && e.Property == Visual.TransformedBoundsProperty)
+            {
+                UpdateHostSizing(_openState.PopupHost, _openState.TopLevel, _openState.PlacementTarget);
+            }
+        }
+
         private void WindowLostFocus()
         {
             if (IsLightDismissEnabled)
@@ -846,15 +921,16 @@ namespace Avalonia.Controls.Primitives
             private readonly IDisposable _cleanup;
             private IDisposable? _presenterCleanup;
 
-            public PopupOpenState(TopLevel topLevel, IPopupHost popupHost, IDisposable cleanup)
+            public PopupOpenState(IControl placementTarget, TopLevel topLevel, IPopupHost popupHost, IDisposable cleanup)
             {
+                PlacementTarget = placementTarget;
                 TopLevel = topLevel;
                 PopupHost = popupHost;
                 _cleanup = cleanup;
             }
 
             public TopLevel TopLevel { get; }
-
+            public IControl PlacementTarget { get; set; }
             public IPopupHost PopupHost { get; }
 
             public void SetPresenterSubscription(IDisposable? presenterCleanup)
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
index 340076a407..615eb69fe3 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 
 The above is the version of the MIT "Expat" License used by X.org:
 
-    http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
+    https://cgit.freedesktop.org/xorg/xserver/tree/COPYING
     
     
 Adjustments for Avalonia needs:
@@ -45,7 +45,10 @@ Copyright © 2019 Nikita Tsukanov
 */
 
 using System;
+using Avalonia.Input;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives.PopupPositioning
 {
@@ -60,6 +63,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
     /// requirement that a popup must intersect with or be at least partially adjacent to its parent
     /// surface.
     /// </remarks>
+    [Unstable]
     public struct PopupPositionerParameters
     {
         private PopupGravity _gravity;
@@ -428,6 +432,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
     /// managed implementation is provided in <see cref="ManagedPopupPositioner"/> for platforms
     /// on which popups can be arbitrarily positioned.
     /// </remarks>
+    [NotClientImplementable]
     public interface IPopupPositioner
     {
         /// <summary>
@@ -438,24 +443,24 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
         void Update(PopupPositionerParameters parameters);
     }
 
+    [Unstable]
     static class PopupPositionerExtensions
     {
         public static void ConfigurePosition(ref this PopupPositionerParameters positionerParameters,
             TopLevel topLevel,
             IVisual target, PlacementMode placement, Point offset,
             PopupAnchor anchor, PopupGravity gravity,
-            PopupPositionerConstraintAdjustment constraintAdjustment, Rect? rect)
+            PopupPositionerConstraintAdjustment constraintAdjustment, Rect? rect,
+            FlowDirection flowDirection)
         {
-            // We need a better way for tracking the last pointer position
-#pragma warning disable CS0618 // Type or member is obsolete
-            var pointer = topLevel.PointToClient(topLevel.PlatformImpl?.MouseDevice.Position ?? default);
-#pragma warning restore CS0618 // Type or member is obsolete
-
             positionerParameters.Offset = offset;
             positionerParameters.ConstraintAdjustment = constraintAdjustment;
             if (placement == PlacementMode.Pointer)
             {
-                positionerParameters.AnchorRectangle = new Rect(pointer, new Size(1, 1));
+                // We need a better way for tracking the last pointer position
+                var position = topLevel.PointToClient(topLevel.LastPointerPosition ?? default);
+
+                positionerParameters.AnchorRectangle = new Rect(position, new Size(1, 1));
                 positionerParameters.Anchor = PopupAnchor.TopLeft;
                 positionerParameters.Gravity = PopupGravity.BottomRight;
             }
@@ -503,6 +508,32 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
                 else
                     throw new InvalidOperationException("Invalid value for Popup.PlacementMode");
             }
+
+            // Invert coordinate system if FlowDirection is RTL
+            if (flowDirection == FlowDirection.RightToLeft)
+            {
+                if ((positionerParameters.Anchor & PopupAnchor.Right) == PopupAnchor.Right)
+                {
+                    positionerParameters.Anchor ^= PopupAnchor.Right;
+                    positionerParameters.Anchor |= PopupAnchor.Left;
+                }
+                else if ((positionerParameters.Anchor & PopupAnchor.Left) == PopupAnchor.Left)
+                {
+                    positionerParameters.Anchor ^= PopupAnchor.Left;
+                    positionerParameters.Anchor |= PopupAnchor.Right;
+                }
+
+                if ((positionerParameters.Gravity & PopupGravity.Right) == PopupGravity.Right)
+                {
+                    positionerParameters.Gravity ^= PopupGravity.Right;
+                    positionerParameters.Gravity |= PopupGravity.Left;
+                }
+                else if ((positionerParameters.Gravity & PopupGravity.Left) == PopupGravity.Left)
+                {
+                    positionerParameters.Gravity ^= PopupGravity.Left;
+                    positionerParameters.Gravity |= PopupGravity.Right;
+                }
+            }
         }
     }
 
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
index 0f0dd7311d..a80a60350e 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
@@ -106,9 +106,9 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
             {
                 var screens = _popup.Screens;
                 
-                var targetScreen = screens.FirstOrDefault(s => s.Bounds.Contains(anchorRect.TopLeft))
+                var targetScreen =  screens.FirstOrDefault(s => s.Bounds.ContainsExclusive(anchorRect.TopLeft))
                                    ?? screens.FirstOrDefault(s => s.Bounds.Intersects(anchorRect))
-                                   ?? screens.FirstOrDefault(s => s.Bounds.Contains(parentGeometry.TopLeft))
+                                   ?? screens.FirstOrDefault(s => s.Bounds.ContainsExclusive(parentGeometry.TopLeft))
                                    ?? screens.FirstOrDefault(s => s.Bounds.Intersects(parentGeometry))
                                    ?? screens.FirstOrDefault();
 
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
index 91ed5d975d..51a21323d9 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
@@ -23,8 +23,9 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
         public IReadOnlyList<ManagedPopupPositionerScreenInfo> Screens =>
 
-            _parent.Screen.AllScreens.Select(s => new ManagedPopupPositionerScreenInfo(
-                s.Bounds.ToRect(1), s.WorkingArea.ToRect(1))).ToList();
+            _parent.Screen.AllScreens
+                .Select(s => new ManagedPopupPositionerScreenInfo(s.Bounds.ToRect(1), s.WorkingArea.ToRect(1)))
+                .ToArray();
 
         public Rect ParentClientAreaScreenGeometry
         {
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index be447ea512..f7bf7c1a27 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Reactive.Disposables;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
-using JetBrains.Annotations;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -16,7 +14,12 @@ namespace Avalonia.Controls.Primitives
     /// </summary>
     public sealed class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost, IPopupHost
     {
-        private readonly TopLevel _parent;
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transform?> TransformProperty =
+            AvaloniaProperty.Register<PopupRoot, Transform?>(nameof(Transform));
+
         private PopupPositionerParameters _positionerParameters;        
 
         /// <summary>
@@ -44,9 +47,9 @@ namespace Avalonia.Controls.Primitives
         /// The dependency resolver to use. If null the default dependency resolver will be used.
         /// </param>
         public PopupRoot(TopLevel parent, IPopupImpl impl, IAvaloniaDependencyResolver? dependencyResolver)
-            : base(ValidatingPopupImpl.Wrap(impl), dependencyResolver)
+            : base(impl, dependencyResolver)
         {
-            _parent = parent;
+            ParentTopLevel = parent;
         }
 
         /// <summary>
@@ -54,6 +57,15 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public new IPopupImpl? PlatformImpl => (IPopupImpl?)base.PlatformImpl;               
 
+        /// <summary>
+        /// Gets or sets a transform that will be applied to the popup.
+        /// </summary>
+        public Transform? Transform
+        {
+            get => GetValue(TransformProperty);
+            set => SetValue(TransformProperty, value);
+        }
+
         /// <summary>
         /// Gets the parent control in the event route.
         /// </summary>
@@ -72,6 +84,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         IStyleHost? IStyleHost.StylingParent => Parent;
 
+        public TopLevel ParentTopLevel { get; }
+
         /// <inheritdoc/>
         public void Dispose()
         {
@@ -90,8 +104,8 @@ namespace Avalonia.Controls.Primitives
             PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
             Rect? rect = null)
         {
-            _positionerParameters.ConfigurePosition(_parent, target,
-                placement, offset, anchor, gravity, constraintAdjustment, rect);
+            _positionerParameters.ConfigurePosition(ParentTopLevel, target,
+                placement, offset, anchor, gravity, constraintAdjustment, rect, FlowDirection);
 
             if (_positionerParameters.Size != default)
                 UpdatePosition();
@@ -101,27 +115,6 @@ namespace Avalonia.Controls.Primitives
 
         IVisual IPopupHost.HostedVisualTreeRoot => this;
         
-        public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty<double> widthProperty, StyledProperty<double> minWidthProperty,
-            StyledProperty<double> maxWidthProperty, StyledProperty<double> heightProperty, StyledProperty<double> minHeightProperty,
-            StyledProperty<double> maxHeightProperty, StyledProperty<bool> topmostProperty)
-        {
-            var bindings = new List<IDisposable>();
-
-            void Bind(AvaloniaProperty what, AvaloniaProperty to) => bindings.Add(this.Bind(what, popup[~to]));
-            Bind(WidthProperty, widthProperty);
-            Bind(MinWidthProperty, minWidthProperty);
-            Bind(MaxWidthProperty, maxWidthProperty);
-            Bind(HeightProperty, heightProperty);
-            Bind(MinHeightProperty, minHeightProperty);
-            Bind(MaxHeightProperty, maxHeightProperty);
-            Bind(TopmostProperty, topmostProperty);
-            return Disposable.Create(() =>
-            {
-                foreach (var x in bindings)
-                    x.Dispose();
-            });
-        }
-
         protected override Size MeasureOverride(Size availableSize)
         {
             var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
@@ -168,5 +161,10 @@ namespace Avalonia.Controls.Primitives
             UpdatePosition();
             return ClientSize;
         }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new PopupRootAutomationPeer(this);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/RangeBase.cs b/src/Avalonia.Controls/Primitives/RangeBase.cs
index acb8e0f006..38d848d69b 100644
--- a/src/Avalonia.Controls/Primitives/RangeBase.cs
+++ b/src/Avalonia.Controls/Primitives/RangeBase.cs
@@ -175,7 +175,7 @@ namespace Avalonia.Controls.Primitives
         /// <param name="value">The value.</param>
         private static bool ValidateDouble(double value)
         {
-            return !double.IsInfinity(value) || !double.IsNaN(value);
+            return !double.IsInfinity(value) && !double.IsNaN(value);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs
index 8460fe3017..e524db5444 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBar.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs
@@ -22,6 +22,10 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// A scrollbar control.
     /// </summary>
+    [TemplatePart("PART_LineDownButton", typeof(Button))]
+    [TemplatePart("PART_LineUpButton",   typeof(Button))]
+    [TemplatePart("PART_PageDownButton", typeof(Button))]
+    [TemplatePart("PART_PageUpButton",   typeof(Button))]
     [PseudoClasses(":vertical", ":horizontal")]
     public class ScrollBar : RangeBase
     {
@@ -190,13 +194,13 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(change.GetNewValue<Orientation>());
             }
             else if (change.Property == AllowAutoHideProperty)
             {
@@ -214,9 +218,9 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
 
             if (AllowAutoHide)
             {
@@ -224,9 +228,9 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnPointerLeave(PointerEventArgs e)
+        protected override void OnPointerExited(PointerEventArgs e)
         {
-            base.OnPointerLeave(e);
+            base.OnPointerExited(e);
 
             if (AllowAutoHide)
             {
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index c690726e71..e03b02a479 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -94,7 +94,7 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="IsTextSearchEnabled"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsTextSearchEnabledProperty =
-            AvaloniaProperty.Register<ItemsControl, bool>(nameof(IsTextSearchEnabled), false);
+            AvaloniaProperty.Register<SelectingItemsControl, bool>(nameof(IsTextSearchEnabled), false);
 
         /// <summary>
         /// Event that should be raised by items that implement <see cref="ISelectable"/> to
@@ -111,14 +111,14 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
             RoutedEvent.Register<SelectingItemsControl, SelectionChangedEventArgs>(
-                "SelectionChanged",
+                nameof(SelectionChanged),
                 RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="WrapSelection"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> WrapSelectionProperty =
-            AvaloniaProperty.Register<ItemsControl, bool>(nameof(WrapSelection), defaultValue: false);
+            AvaloniaProperty.Register<SelectingItemsControl, bool>(nameof(WrapSelection), defaultValue: false);
 
         private static readonly IList Empty = Array.Empty<object>();
         private string _textSearchTerm = string.Empty;
@@ -292,11 +292,11 @@ namespace Avalonia.Controls.Primitives
                             "collection is different to the Items on the control.");
                     }
 
-                    var oldSelection = _selection?.SelectedItems.ToList();
+                    var oldSelection = _selection?.SelectedItems.ToArray();
                     DeinitializeSelectionModel(_selection);
                     _selection = value;
 
-                    if (oldSelection?.Count > 0)
+                    if (oldSelection?.Length > 0)
                     {
                         RaiseEvent(new SelectionChangedEventArgs(
                             SelectionChangedEvent,
@@ -501,12 +501,16 @@ namespace Avalonia.Controls.Primitives
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == SelectedItemProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
         
@@ -533,9 +537,9 @@ namespace Avalonia.Controls.Primitives
 
                 bool Match(ItemContainerInfo info)
                 {
-                    if (info.ContainerControl.IsSet(TextSearch.TextProperty))
+                    if (info.ContainerControl is AvaloniaObject ao && ao.IsSet(TextSearch.TextProperty))
                     {
-                        var searchText = info.ContainerControl.GetValue(TextSearch.TextProperty);
+                        var searchText = ao.GetValue(TextSearch.TextProperty);
 
                         if (searchText?.StartsWith(_textSearchTerm, StringComparison.OrdinalIgnoreCase) == true)
                         {
@@ -582,10 +586,18 @@ namespace Avalonia.Controls.Primitives
                     Selection.SelectAll();
                     e.Handled = true;
                 }
+                else if (e.Key == Key.Space || e.Key == Key.Enter)
+                {
+                    e.Handled = UpdateSelectionFromEventSource(
+                          e.Source,
+                          true,
+                          e.KeyModifiers.HasFlag(KeyModifiers.Shift),
+                          e.KeyModifiers.HasFlag(KeyModifiers.Control));
+                }
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -595,7 +607,7 @@ namespace Avalonia.Controls.Primitives
             }
             if (change.Property == ItemsProperty && _updateState is null && _selection is object)
             {
-                var newValue = change.NewValue.GetValueOrDefault<IEnumerable>();
+                var newValue = change.GetNewValue<IEnumerable>();
                 _selection.Source = newValue;
 
                 if (newValue is null)
@@ -605,7 +617,7 @@ namespace Avalonia.Controls.Primitives
             }
             else if (change.Property == SelectionModeProperty && _selection is object)
             {
-                var newValue = change.NewValue.GetValueOrDefault<SelectionMode>();
+                var newValue = change.GetNewValue<SelectionMode>();
                 _selection.SingleSelect = !newValue.HasAllFlags(SelectionMode.Multiple);
             }
             else if (change.Property == WrapSelectionProperty)
@@ -658,12 +670,14 @@ namespace Avalonia.Controls.Primitives
         /// <param name="rangeModifier">Whether the range modifier is enabled (i.e. shift key).</param>
         /// <param name="toggleModifier">Whether the toggle modifier is enabled (i.e. ctrl key).</param>
         /// <param name="rightButton">Whether the event is a right-click.</param>
+        /// <param name="fromFocus">Wheter the event is a focus event</param>
         protected void UpdateSelection(
             int index,
             bool select = true,
             bool rangeModifier = false,
             bool toggleModifier = false,
-            bool rightButton = false)
+            bool rightButton = false,
+            bool fromFocus = false)
         {
             if (index < 0 || index >= ItemCount)
             {
@@ -692,22 +706,25 @@ namespace Avalonia.Controls.Primitives
                 Selection.Clear();
                 Selection.SelectRange(Selection.AnchorIndex, index);
             }
-            else if (multi && toggle)
+            else if (!fromFocus && toggle)
             {
-                if (Selection.IsSelected(index) == true)
+                if (multi)
                 {
-                    Selection.Deselect(index);
+                    if (Selection.IsSelected(index) == true)
+                    {
+                        Selection.Deselect(index);
+                    }
+                    else
+                    {
+                        Selection.Select(index);
+                    }
                 }
                 else
                 {
-                    Selection.Select(index);
+                    SelectedIndex = (SelectedIndex == index) ? -1 : index;
                 }
             }
-            else if (toggle)
-            {
-                SelectedIndex = (SelectedIndex == index) ? -1 : index;
-            }
-            else
+            else if (!toggle)
             {
                 using var operation = Selection.BatchUpdate();
                 Selection.Clear();
@@ -731,18 +748,20 @@ namespace Avalonia.Controls.Primitives
         /// <param name="rangeModifier">Whether the range modifier is enabled (i.e. shift key).</param>
         /// <param name="toggleModifier">Whether the toggle modifier is enabled (i.e. ctrl key).</param>
         /// <param name="rightButton">Whether the event is a right-click.</param>
+        /// <param name="fromFocus">Wheter the event is a focus event</param>
         protected void UpdateSelection(
             IControl container,
             bool select = true,
             bool rangeModifier = false,
             bool toggleModifier = false,
-            bool rightButton = false)
+            bool rightButton = false,
+            bool fromFocus = false)
         {
             var index = ItemContainerGenerator?.IndexFromContainer(container) ?? -1;
 
             if (index != -1)
             {
-                UpdateSelection(index, select, rangeModifier, toggleModifier, rightButton);
+                UpdateSelection(index, select, rangeModifier, toggleModifier, rightButton, fromFocus);
             }
         }
 
@@ -755,6 +774,7 @@ namespace Avalonia.Controls.Primitives
         /// <param name="rangeModifier">Whether the range modifier is enabled (i.e. shift key).</param>
         /// <param name="toggleModifier">Whether the toggle modifier is enabled (i.e. ctrl key).</param>
         /// <param name="rightButton">Whether the event is a right-click.</param>
+        /// <param name="fromFocus">Wheter the event is a focus event</param>
         /// <returns>
         /// True if the event originated from a container that belongs to the control; otherwise
         /// false.
@@ -764,13 +784,14 @@ namespace Avalonia.Controls.Primitives
             bool select = true,
             bool rangeModifier = false,
             bool toggleModifier = false,
-            bool rightButton = false)
+            bool rightButton = false,
+            bool fromFocus = false)
         {
             var container = GetContainerFromEventSource(eventSource);
 
             if (container != null)
             {
-                UpdateSelection(container, select, rangeModifier, toggleModifier, rightButton);
+                UpdateSelection(container, select, rangeModifier, toggleModifier, rightButton, fromFocus);
                 return true;
             }
 
@@ -845,8 +866,8 @@ namespace Avalonia.Controls.Primitives
             {
                 var ev = new SelectionChangedEventArgs(
                     SelectionChangedEvent,
-                    e.DeselectedItems.ToList(),
-                    e.SelectedItems.ToList());
+                    e.DeselectedItems.ToArray(),
+                    e.SelectedItems.ToArray());
                 RaiseEvent(ev);
             }
         }
@@ -988,7 +1009,7 @@ namespace Avalonia.Controls.Primitives
                 RaiseEvent(new SelectionChangedEventArgs(
                     SelectionChangedEvent,
                     Array.Empty<object>(),
-                    Selection.SelectedItems.ToList()));
+                    Selection.SelectedItems.ToArray()));
             }
         }
 
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index af681d6930..2441da8920 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 using Avalonia.Logging;
@@ -41,31 +42,37 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
         public static readonly StyledProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<TemplatedControl>();
+            TextElement.FontFamilyProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="FontSize"/> property.
         /// </summary>
         public static readonly StyledProperty<double> FontSizeProperty =
-            TextBlock.FontSizeProperty.AddOwner<TemplatedControl>();
+            TextElement.FontSizeProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="FontStyle"/> property.
         /// </summary>
         public static readonly StyledProperty<FontStyle> FontStyleProperty =
-            TextBlock.FontStyleProperty.AddOwner<TemplatedControl>();
+            TextElement.FontStyleProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
         public static readonly StyledProperty<FontWeight> FontWeightProperty =
-            TextBlock.FontWeightProperty.AddOwner<TemplatedControl>();
+            TextElement.FontWeightProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
         public static readonly StyledProperty<IBrush?> ForegroundProperty =
-            TextBlock.ForegroundProperty.AddOwner<TemplatedControl>();
+            TextElement.ForegroundProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="Padding"/> property.
@@ -90,7 +97,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public static readonly RoutedEvent<TemplateAppliedEventArgs> TemplateAppliedEvent =
             RoutedEvent.Register<TemplatedControl, TemplateAppliedEventArgs>(
-                "TemplateApplied", 
+                nameof(TemplateApplied), 
                 RoutingStrategies.Direct);
 
         private IControlTemplate? _appliedTemplate;
@@ -185,6 +192,15 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(FontWeightProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the font stretch used to draw the control's text.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the brush used to draw the control's text and other foreground elements.
         /// </summary>
@@ -269,19 +285,18 @@ namespace Avalonia.Controls.Primitives
                     Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(this, "Creating control template");
 
                     var (child, nameScope) = template.Build(this);
-                    ApplyTemplatedParent(child);
+                    ApplyTemplatedParent(child, this);
                     ((ISetLogicalParent)child).SetParent(this);
                     VisualChildren.Add(child);
                     
                     // Existing code kinda expect to see a NameScope even if it's empty
                     if (nameScope == null)
+                    {
                         nameScope = new NameScope();
+                    }
 
                     var e = new TemplateAppliedEventArgs(nameScope);
                     OnApplyTemplate(e);
-#pragma warning disable CS0618 // Type or member is obsolete
-                    OnTemplateApplied(e);
-#pragma warning restore CS0618 // Type or member is obsolete
                     RaiseEvent(e);
                 }
 
@@ -340,19 +355,26 @@ namespace Avalonia.Controls.Primitives
             base.OnDetachedFromLogicalTree(e);
         }
 
-        protected virtual void OnApplyTemplate(TemplateAppliedEventArgs e)
-        {
-        }
-
         /// <summary>
         /// Called when the control's template is applied.
+        /// In simple terms, this means the method is called just before the control is displayed.
         /// </summary>
         /// <param name="e">The event args.</param>
-        [Obsolete("Use OnApplyTemplate")]
-        protected virtual void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected virtual void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ThemeProperty)
+            {
+                foreach (var child in this.GetTemplateChildren())
+                    child.InvalidateStyles();
+            }
+        }
+
         /// <summary>
         /// Called when the <see cref="Template"/> property changes.
         /// </summary>
@@ -366,18 +388,19 @@ namespace Avalonia.Controls.Primitives
         /// Sets the TemplatedParent property for the created template children.
         /// </summary>
         /// <param name="control">The control.</param>
-        private void ApplyTemplatedParent(IControl control)
+        /// <param name="templatedParent">The templated parent to apply.</param>
+        internal static void ApplyTemplatedParent(IStyledElement control, ITemplatedControl? templatedParent)
         {
-            control.SetValue(TemplatedParentProperty, this);
+            control.SetValue(TemplatedParentProperty, templatedParent);
 
             var children = control.LogicalChildren;
             var count = children.Count;
 
             for (var i = 0; i < count; i++)
             {
-                if (children[i] is IControl child)
+                if (children[i] is IStyledElement child && child.TemplatedParent is null)
                 {
-                    ApplyTemplatedParent(child);
+                    ApplyTemplatedParent(child, templatedParent);
                 }
             }
         }
diff --git a/src/Avalonia.Controls/Primitives/ToggleButton.cs b/src/Avalonia.Controls/Primitives/ToggleButton.cs
index 4bdf6db2fc..148797c53a 100644
--- a/src/Avalonia.Controls/Primitives/ToggleButton.cs
+++ b/src/Avalonia.Controls/Primitives/ToggleButton.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
 using Avalonia.Data;
 using Avalonia.Interactivity;
@@ -169,6 +170,11 @@ namespace Avalonia.Controls.Primitives
             RaiseEvent(e);
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new ToggleButtonAutomationPeer(this);
+        }
+
         private void OnIsCheckedChanged(AvaloniaPropertyChangedEventArgs e)
         {
             var newValue = (bool?)e.NewValue;
diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index f8d6046101..14ec7a2849 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Controls.Primitives
             AvaloniaProperty.Register<Track, bool>(nameof(IsDirectionReversed));
 
         public static readonly StyledProperty<bool> IgnoreThumbDragProperty =
-            AvaloniaProperty.Register<Track, bool>(nameof(IsThumbDragHandled));
+            AvaloniaProperty.Register<Track, bool>(nameof(IgnoreThumbDrag));
 
         private double _minimum;
         private double _maximum = 100.0;
@@ -118,7 +118,7 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(IsDirectionReversedProperty, value); }
         }
 
-        public bool IsThumbDragHandled
+        public bool IgnoreThumbDrag
         {
             get { return GetValue(IgnoreThumbDragProperty); }
             set { SetValue(IgnoreThumbDragProperty, value); }
@@ -291,13 +291,13 @@ namespace Avalonia.Controls.Primitives
             return arrangeSize;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(change.GetNewValue<Orientation>());
             }
         }
 
@@ -442,7 +442,7 @@ namespace Avalonia.Controls.Primitives
 
         private void ThumbDragged(object? sender, VectorEventArgs e)
         {
-            if (IsThumbDragHandled)
+            if (IgnoreThumbDrag)
                 return;
                 
             Value = MathUtilities.Clamp(
diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 017a053c48..71a7a58da4 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Layout;
 using Avalonia.Media;
 
@@ -9,6 +10,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control used to indicate the progress of an operation.
     /// </summary>
+    [TemplatePart("PART_Indicator", typeof(Border))]
     [PseudoClasses(":vertical", ":horizontal", ":indeterminate")]
     public class ProgressBar : RangeBase
     {
@@ -94,9 +96,11 @@ namespace Avalonia.Controls
             }
         }
 
+        private double _percentage;
         private double _indeterminateStartingOffset;
         private double _indeterminateEndingOffset;
         private Border? _indicator;
+        private IDisposable? _trackSizeChangedListener;
 
         public static readonly StyledProperty<bool> IsIndeterminateProperty =
             AvaloniaProperty.Register<ProgressBar, bool>(nameof(IsIndeterminate));
@@ -104,31 +108,41 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> ShowProgressTextProperty =
             AvaloniaProperty.Register<ProgressBar, bool>(nameof(ShowProgressText));
 
+        public static readonly StyledProperty<string> ProgressTextFormatProperty =
+            AvaloniaProperty.Register<ProgressBar, string>(nameof(ProgressTextFormat), "{1:0}%");
+
         public static readonly StyledProperty<Orientation> OrientationProperty =
             AvaloniaProperty.Register<ProgressBar, Orientation>(nameof(Orientation), Orientation.Horizontal);
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
+        public static readonly DirectProperty<ProgressBar, double> PercentageProperty =
+            AvaloniaProperty.RegisterDirect<ProgressBar, double>(
+                nameof(Percentage),
+                o => o.Percentage);
+
         public static readonly DirectProperty<ProgressBar, double> IndeterminateStartingOffsetProperty =
             AvaloniaProperty.RegisterDirect<ProgressBar, double>(
                 nameof(IndeterminateStartingOffset),
                 p => p.IndeterminateStartingOffset,
                 (p, o) => p.IndeterminateStartingOffset = o);
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
         public static readonly DirectProperty<ProgressBar, double> IndeterminateEndingOffsetProperty =
             AvaloniaProperty.RegisterDirect<ProgressBar, double>(
                 nameof(IndeterminateEndingOffset),
                 p => p.IndeterminateEndingOffset,
                 (p, o) => p.IndeterminateEndingOffset = o);
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
+        public double Percentage
+        {
+            get { return _percentage; }
+            private set { SetAndRaise(PercentageProperty, ref _percentage, value); }
+        }
+
         public double IndeterminateStartingOffset
         {
             get => _indeterminateStartingOffset;
             set => SetAndRaise(IndeterminateStartingOffsetProperty, ref _indeterminateStartingOffset, value);
         }
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
         public double IndeterminateEndingOffset
         {
             get => _indeterminateEndingOffset;
@@ -137,10 +151,12 @@ namespace Avalonia.Controls
 
         static ProgressBar()
         {
+            ValueProperty.OverrideMetadata<ProgressBar>(new DirectPropertyMetadata<double>(defaultBindingMode: BindingMode.OneWay));
             ValueProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             MinimumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             MaximumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
+            OrientationProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
         }
 
         public ProgressBar()
@@ -162,6 +178,12 @@ namespace Avalonia.Controls
             set => SetValue(ShowProgressTextProperty, value);
         }
 
+        public string ProgressTextFormat
+        {
+            get => GetValue(ProgressTextFormatProperty);
+            set => SetValue(ProgressTextFormatProperty, value);
+        }
+
         public Orientation Orientation
         {
             get => GetValue(OrientationProperty);
@@ -171,41 +193,52 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            UpdateIndicator(finalSize);
-            return base.ArrangeOverride(finalSize);
+            var result = base.ArrangeOverride(finalSize);
+            UpdateIndicator();
+            return result;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == IsIndeterminateProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>(), null);
+                UpdatePseudoClasses(change.GetNewValue<bool>(), null);
             }
             else if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(null, change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(null, change.GetNewValue<Orientation>());
             }
         }
 
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            // dispose any previous track size listener
+            _trackSizeChangedListener?.Dispose();
+
             _indicator = e.NameScope.Get<Border>("PART_Indicator");
 
-            UpdateIndicator(Bounds.Size);
+            // listen to size changes of the indicators track (parent) and update the indicator there. 
+            _trackSizeChangedListener = _indicator.Parent?.GetPropertyChangedObservable(BoundsProperty)
+                .Subscribe(_ => UpdateIndicator());
+
+            UpdateIndicator();
         }
 
-        private void UpdateIndicator(Size bounds)
+        private void UpdateIndicator()
         {
+            // Gets the size of the parent indicator container
+            var barSize = _indicator?.Parent?.Bounds.Size ?? Bounds.Size;
+
             if (_indicator != null)
             {
                 if (IsIndeterminate)
                 {
                     // Pulled from ModernWPF.
 
-                    var dim = Orientation == Orientation.Horizontal ? bounds.Width : bounds.Height;
+                    var dim = Orientation == Orientation.Horizontal ? barSize.Width : barSize.Height;
                     var barIndicatorWidth = dim * 0.4; // Indicator width at 40% of ProgressBar
                     var barIndicatorWidth2 = dim * 0.6; // Indicator width at 60% of ProgressBar
 
@@ -219,36 +252,44 @@ namespace Avalonia.Controls
                     TemplateProperties.Container2AnimationEndPosition = barIndicatorWidth2 * 1.66; // Position at 166%
 
 
-#pragma warning disable CS0618 // Type or member is obsolete
                     // Remove these properties when we switch to fluent as default and removed the old one.
                     IndeterminateStartingOffset = -dim;
                     IndeterminateEndingOffset = dim;
-#pragma warning restore CS0618 // Type or member is obsolete
 
                     var padding = Padding;
                     var rectangle = new RectangleGeometry(
                         new Rect(
                             padding.Left,
                             padding.Top,
-                            bounds.Width - (padding.Right + padding.Left),
-                            bounds.Height - (padding.Bottom + padding.Top)
+                            barSize.Width - (padding.Right + padding.Left),
+                            barSize.Height - (padding.Bottom + padding.Top)
                             ));
                 }
                 else
                 {
                     double percent = Maximum == Minimum ? 1.0 : (Value - Minimum) / (Maximum - Minimum);
 
+                    // When the Orientation changed, the indicator's Width or Height should set to double.NaN.
                     if (Orientation == Orientation.Horizontal)
-                        _indicator.Width = bounds.Width * percent;
+                    {
+                        _indicator.Width = barSize.Width * percent;
+                        _indicator.Height = double.NaN;
+                    }
                     else
-                        _indicator.Height = bounds.Height * percent;
+                    {
+                        _indicator.Width = double.NaN;
+                        _indicator.Height = barSize.Height * percent;
+                    }
+
+
+                    Percentage = percent * 100;
                 }
             }
         }
 
         private void UpdateIndicatorWhenPropChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            UpdateIndicator(Bounds.Size);
+            UpdateIndicator();
         }
 
         private void UpdatePseudoClasses(
diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
index 05561a38ef..0f3da91107 100644
--- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
@@ -1,11 +1,7 @@
-using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Automation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Embedding")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Presenters")]
@@ -14,3 +10,4 @@ using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Templates")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Notifications")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Chrome")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Documents")]
diff --git a/src/Avalonia.Controls/RelativePanel.cs b/src/Avalonia.Controls/RelativePanel.cs
index 1125f0eb0e..ab8e064028 100644
--- a/src/Avalonia.Controls/RelativePanel.cs
+++ b/src/Avalonia.Controls/RelativePanel.cs
@@ -36,7 +36,10 @@ namespace Avalonia.Controls
             foreach (Layoutable child in Children)
             {
                 if (child == null)
+                {
                     continue;
+                }
+
                 var node = _childGraph.AddNode(child);
 
                 node.AlignLeftWithNode = _childGraph.AddLink(node, GetDependencyElement(AlignLeftWithProperty, child));
@@ -51,17 +54,18 @@ namespace Avalonia.Controls
 
                 node.AlignHorizontalCenterWith = _childGraph.AddLink(node, GetDependencyElement(AlignHorizontalCenterWithProperty, child));
                 node.AlignVerticalCenterWith = _childGraph.AddLink(node, GetDependencyElement(AlignVerticalCenterWithProperty, child));
-
             }
+
             _childGraph.Measure(availableSize);
 
             _childGraph.Reset(false);
-            var calcWidth = Width.IsNaN() && HorizontalAlignment != HorizontalAlignment.Stretch;
-            var calcHeight = Height.IsNaN() && VerticalAlignment != VerticalAlignment.Stretch;
+            var calcWidth = Width.IsNaN() && (HorizontalAlignment != HorizontalAlignment.Stretch);
+            var calcHeight = Height.IsNaN() && (VerticalAlignment != VerticalAlignment.Stretch);
 
             var boundingSize = _childGraph.GetBoundingSize(calcWidth, calcHeight);
             _childGraph.Reset();
             _childGraph.Measure(boundingSize);
+            
             return boundingSize;
         }
 
@@ -171,6 +175,7 @@ namespace Avalonia.Controls
                                 prevSize = prevSize.WithWidth(prevSize.Width + prevNode.OriginDesiredSize.Width);
                                 prevNode.HorizontalOffsetFlag = true;
                             }
+
                             if (node.VerticalOffsetFlag)
                             {
                                 prevNode.VerticalOffsetFlag = true;
@@ -186,6 +191,7 @@ namespace Avalonia.Controls
                                 prevSize = prevSize.WithHeight(prevSize.Height + node.OriginDesiredSize.Height);
                                 prevNode.VerticalOffsetFlag = true;
                             }
+
                             if (node.HorizontalOffsetFlag)
                             {
                                 prevNode.HorizontalOffsetFlag = true;
@@ -269,16 +275,16 @@ namespace Avalonia.Controls
                         MeasureChild(node);
                         continue;
                     }
-                    
+
                     if (node.OutgoingNodes.All(item => item.Measured))
                     {
                         MeasureChild(node);
                         continue;
                     }
-                    
+
                     if (!set.Add(node.Element))
                         throw new Exception("RelativePanel error: Circular dependency detected. Layout could not complete.");
-                    
+
                     Measure(node.OutgoingNodes, set);
 
                     if (!node.Measured)
@@ -507,8 +513,11 @@ namespace Avalonia.Controls
                     boundingSize = boundingSize.WithHeight(Math.Max(boundingSize.Height, size.Height));
                 }
 
-                boundingSize = boundingSize.WithWidth(calcWidth ? boundingSize.Width : AvailableSize.Width);
-                boundingSize = boundingSize.WithHeight(calcHeight ? boundingSize.Height : AvailableSize.Height);
+                var availableWidth = double.IsInfinity(AvailableSize.Width) ? boundingSize.Width : AvailableSize.Width;
+                var availableHeight = double.IsInfinity(AvailableSize.Height) ? boundingSize.Height : AvailableSize.Height;
+
+                boundingSize = boundingSize.WithWidth(calcWidth ? boundingSize.Width : availableWidth);
+                boundingSize = boundingSize.WithHeight(calcHeight ? boundingSize.Height : availableHeight);
                 return boundingSize;
             }
         }
diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
index f4cc91a0e6..2cf2d2b97d 100644
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -1,11 +1,12 @@
 using System;
 using Avalonia.Controls.Embedding;
 using Avalonia.Controls.Remote.Server;
-using Avalonia.Platform;
+using Avalonia.Metadata;
 using Avalonia.Remote.Protocol;
 
 namespace Avalonia.Controls.Remote
 {
+    [Unstable]
     public class RemoteServer
     {
         private EmbeddableControlRoot _topLevel;
diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index a88e0fd3d8..27578ddc78 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -77,10 +77,8 @@ namespace Avalonia.Controls.Remote
                     _bitmap.PixelSize.Height != _lastFrame.Height)
                 {
                     _bitmap?.Dispose();
-#pragma warning disable CS0618 // Type or member is obsolete
                     _bitmap = new WriteableBitmap(new PixelSize(_lastFrame.Width, _lastFrame.Height),
                         new Vector(96, 96), fmt);
-#pragma warning restore CS0618 // Type or member is obsolete
                 }
                 using (var l = _bitmap.Lock())
                 {
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index c9fd1dc3b8..3bc0593813 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -6,18 +6,19 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Input;
 using Avalonia.Remote.Protocol.Viewport;
 using Avalonia.Threading;
-using InputModifiers = Avalonia.Input.InputModifiers;
 using Key = Avalonia.Input.Key;
 using PixelFormat = Avalonia.Platform.PixelFormat;
 using ProtocolPixelFormat = Avalonia.Remote.Protocol.Viewport.PixelFormat;
 
 namespace Avalonia.Controls.Remote.Server
 {
+    [Unstable]
     public class RemoteServerTopLevelImpl : OffscreenTopLevelImplBase, IFramebufferPlatformSurface
     {
         private readonly IAvaloniaRemoteTransportConnection _transport;
diff --git a/src/Avalonia.Controls/RepeatButton.cs b/src/Avalonia.Controls/RepeatButton.cs
index 0415a78721..6a62172934 100644
--- a/src/Avalonia.Controls/RepeatButton.cs
+++ b/src/Avalonia.Controls/RepeatButton.cs
@@ -13,13 +13,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Interval"/> property.
         /// </summary>
         public static readonly StyledProperty<int> IntervalProperty =
-            AvaloniaProperty.Register<Button, int>(nameof(Interval), 100);
+            AvaloniaProperty.Register<RepeatButton, int>(nameof(Interval), 100);
 
         /// <summary>
         /// Defines the <see cref="Delay"/> property.
         /// </summary>
         public static readonly StyledProperty<int> DelayProperty =
-            AvaloniaProperty.Register<Button, int>(nameof(Delay), 300);
+            AvaloniaProperty.Register<RepeatButton, int>(nameof(Delay), 300);
 
         private DispatcherTimer? _repeatTimer;
 
@@ -70,11 +70,11 @@ namespace Avalonia.Controls
             _repeatTimer?.Stop();
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == IsPressedProperty && change.NewValue.GetValueOrDefault<bool>() == false)
+            if (change.Property == IsPressedProperty && change.GetNewValue<bool>() == false)
             {
                 StopTimer();
             }
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index 09c0e58332..ae663defd3 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Controls
     /// Represents a data-driven collection control that incorporates a flexible layout system,
     /// custom views, and virtualization.
     /// </summary>
-    public class ItemsRepeater : Panel, IChildIndexProvider, IWeakEventSubscriber<EventArgs>
+    public class ItemsRepeater : Panel, IChildIndexProvider
     {
         /// <summary>
         /// Defines the <see cref="HorizontalCacheLength"/> property.
@@ -60,6 +60,7 @@ namespace Avalonia.Controls
 
         private readonly ViewManager _viewManager;
         private readonly ViewportManager _viewportManager;
+        private readonly TargetWeakEventSubscriber<ItemsRepeater, EventArgs> _layoutWeakSubscriber;
         private IEnumerable? _items;
         private VirtualizingLayoutContext? _layoutContext;
         private EventHandler<ChildIndexChangedEventArgs>? _childIndexChanged;
@@ -74,6 +75,15 @@ namespace Avalonia.Controls
         /// </summary>
         public ItemsRepeater()
         {
+            _layoutWeakSubscriber = new TargetWeakEventSubscriber<ItemsRepeater, EventArgs>(
+                this, static (target, _, ev, _) =>
+                {
+                    if (ev == AttachedLayout.ArrangeInvalidatedWeakEvent)
+                        target.InvalidateArrange();
+                    else if (ev == AttachedLayout.MeasureInvalidatedWeakEvent)
+                        target.InvalidateMeasure();
+                });
+
             _viewManager = new ViewManager(this);
             _viewportManager = new ViewportManager(this);
             KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Once);
@@ -257,10 +267,9 @@ namespace Avalonia.Controls
 
         internal void UnpinElement(IControl element) => _viewManager.UpdatePin(element, false);
 
-        internal static VirtualizationInfo TryGetVirtualizationInfo(IControl element)
+        internal static VirtualizationInfo? TryGetVirtualizationInfo(IControl element)
         {
-            var value = element.GetValue(VirtualizationInfoProperty);
-            return value;
+            return (element as AvaloniaObject)?.GetValue(VirtualizationInfoProperty);
         }
 
         internal static VirtualizationInfo CreateAndInitializeVirtualizationInfo(IControl element)
@@ -277,15 +286,20 @@ namespace Avalonia.Controls
 
         internal static VirtualizationInfo GetVirtualizationInfo(IControl element)
         {
-            var result = element.GetValue(VirtualizationInfoProperty);
-
-            if (result == null)
+            if (element is AvaloniaObject ao)
             {
-                result = new VirtualizationInfo();
-                element.SetValue(VirtualizationInfoProperty, result);
+                var result = ao.GetValue(VirtualizationInfoProperty);
+
+                if (result == null)
+                {
+                    result = new VirtualizationInfo();
+                    ao.SetValue(VirtualizationInfoProperty, result);
+                }
+
+                return result;
             }
 
-            return result;
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         private protected override void InvalidateMeasureOnChildrenChanged()
@@ -391,11 +405,7 @@ namespace Avalonia.Controls
                         var newBounds = element.Bounds;
                         virtInfo.ArrangeBounds = newBounds;
 
-                        if (!virtInfo.IsRegisteredAsAnchorCandidate)
-                        {
-                            _viewportManager.RegisterScrollAnchorCandidate(element);
-                            virtInfo.IsRegisteredAsAnchorCandidate = true;
-                        }
+                        _viewportManager.RegisterScrollAnchorCandidate(element, virtInfo);
                     }
                 }
 
@@ -411,6 +421,7 @@ namespace Avalonia.Controls
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
+            base.OnAttachedToVisualTree(e);
             InvalidateMeasure();
             _viewportManager.ResetScrollers();
         }
@@ -420,12 +431,11 @@ namespace Avalonia.Controls
             _viewportManager.ResetScrollers();
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == ItemsProperty)
             {
-                var oldEnumerable = change.OldValue.GetValueOrDefault<IEnumerable>();
-                var newEnumerable = change.NewValue.GetValueOrDefault<IEnumerable>();
+                var (oldEnumerable, newEnumerable) = change.GetOldAndNewValue<IEnumerable?>();
 
                 if (oldEnumerable != newEnumerable)
                 {
@@ -440,23 +450,21 @@ namespace Avalonia.Controls
             }
             else if (change.Property == ItemTemplateProperty)
             {
-                OnItemTemplateChanged(
-                    change.OldValue.GetValueOrDefault<IDataTemplate>(),
-                    change.NewValue.GetValueOrDefault<IDataTemplate>());
+                var (oldvalue, newValue) = change.GetOldAndNewValue<IDataTemplate?>();
+                OnItemTemplateChanged(oldvalue, newValue);
             }
             else if (change.Property == LayoutProperty)
             {
-                OnLayoutChanged(
-                    change.OldValue.GetValueOrDefault<AttachedLayout>(),
-                    change.NewValue.GetValueOrDefault<AttachedLayout>());
+                var (oldvalue, newValue) = change.GetOldAndNewValue<AttachedLayout>();
+                OnLayoutChanged(oldvalue, newValue);
             }
             else if (change.Property == HorizontalCacheLengthProperty)
             {
-                _viewportManager.HorizontalCacheLength = change.NewValue.GetValueOrDefault<double>();
+                _viewportManager.HorizontalCacheLength = change.GetNewValue<double>();
             }
             else if (change.Property == VerticalCacheLengthProperty)
             {
-                _viewportManager.VerticalCacheLength = change.NewValue.GetValueOrDefault<double>();
+                _viewportManager.VerticalCacheLength = change.GetNewValue<double>();
             }
 
             base.OnPropertyChanged(change);
@@ -480,7 +488,7 @@ namespace Avalonia.Controls
                     _processingItemsSourceChange.Action == NotifyCollectionChangedAction.Reset);
 
             _viewManager.ClearElement(element, isClearedDueToCollectionChange);
-            _viewportManager.OnElementCleared(element);
+            _viewportManager.OnElementCleared(element, GetVirtualizationInfo(element));
         }
 
         private int GetElementIndexImpl(IControl element)
@@ -491,7 +499,7 @@ namespace Avalonia.Controls
             if (parent == this)
             {
                 var virtInfo = TryGetVirtualizationInfo(element);
-                return _viewManager.GetElementIndex(virtInfo);
+                return _viewManager.GetElementIndex(virtInfo!);
             }
 
             return -1;
@@ -728,8 +736,8 @@ namespace Avalonia.Controls
             {
                 oldValue.UninitializeForContext(LayoutContext);
 
-                AttachedLayout.MeasureInvalidatedWeakEvent.Unsubscribe(oldValue, this);
-                AttachedLayout.ArrangeInvalidatedWeakEvent.Unsubscribe(oldValue, this);
+                AttachedLayout.MeasureInvalidatedWeakEvent.Unsubscribe(oldValue, _layoutWeakSubscriber);
+                AttachedLayout.ArrangeInvalidatedWeakEvent.Unsubscribe(oldValue, _layoutWeakSubscriber);
 
                 // Walk through all the elements and make sure they are cleared
                 foreach (var element in Children)
@@ -747,8 +755,8 @@ namespace Avalonia.Controls
             {
                 newValue.InitializeForContext(LayoutContext);
 
-                AttachedLayout.MeasureInvalidatedWeakEvent.Subscribe(newValue, this);
-                AttachedLayout.ArrangeInvalidatedWeakEvent.Subscribe(newValue, this);
+                AttachedLayout.MeasureInvalidatedWeakEvent.Subscribe(newValue, _layoutWeakSubscriber);
+                AttachedLayout.ArrangeInvalidatedWeakEvent.Subscribe(newValue, _layoutWeakSubscriber);
             }
 
             bool isVirtualizingLayout = newValue != null && newValue is VirtualizingLayout;
@@ -798,15 +806,7 @@ namespace Avalonia.Controls
         {
             _viewportManager.OnBringIntoViewRequested(e);
         }
-
-        void IWeakEventSubscriber<EventArgs>.OnEvent(object? sender, WeakEvent ev, EventArgs e)
-        {
-            if(ev == AttachedLayout.ArrangeInvalidatedWeakEvent)
-                InvalidateArrange();
-            else if (ev == AttachedLayout.MeasureInvalidatedWeakEvent)
-                InvalidateMeasure();
-        }
-
+        
         private VirtualizingLayoutContext GetLayoutContext()
         {
             if (_layoutContext == null)
diff --git a/src/Avalonia.Controls/Repeater/RecyclePool.cs b/src/Avalonia.Controls/Repeater/RecyclePool.cs
index 9e2da81f99..cf2b40836e 100644
--- a/src/Avalonia.Controls/Repeater/RecyclePool.cs
+++ b/src/Avalonia.Controls/Repeater/RecyclePool.cs
@@ -80,8 +80,8 @@ namespace Avalonia.Controls
             return null;
         }
 
-        internal string GetReuseKey(IControl element) => element.GetValue(ReuseKeyProperty);
-        internal void SetReuseKey(IControl element, string value) => element.SetValue(ReuseKeyProperty, value);
+        internal string GetReuseKey(IControl element) => ((Control)element).GetValue(ReuseKeyProperty);
+        internal void SetReuseKey(IControl element, string value) => ((Control)element).SetValue(ReuseKeyProperty, value);
 
         private IPanel? EnsureOwnerIsPanelOrNull(IControl? owner)
         {
diff --git a/src/Avalonia.Controls/Repeater/ViewManager.cs b/src/Avalonia.Controls/Repeater/ViewManager.cs
index b28753b518..12db48a2c2 100644
--- a/src/Avalonia.Controls/Repeater/ViewManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewManager.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Controls
                 if (madeAnchor != null)
                 {
                     var anchorVirtInfo = ItemsRepeater.TryGetVirtualizationInfo(madeAnchor);
-                    if (anchorVirtInfo.Index == index)
+                    if (anchorVirtInfo!.Index == index)
                     {
                         element = madeAnchor;
                     }
@@ -60,12 +60,12 @@ namespace Avalonia.Controls
             var virtInfo = ItemsRepeater.TryGetVirtualizationInfo(element);
             if (suppressAutoRecycle)
             {
-                virtInfo.AutoRecycleCandidate = false;
+                virtInfo!.AutoRecycleCandidate = false;
                 Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "GetElement: {Index} Not AutoRecycleCandidate:", virtInfo.Index);
             }
             else
             {
-                virtInfo.AutoRecycleCandidate = true;
+                virtInfo!.AutoRecycleCandidate = true;
                 virtInfo.KeepAlive = true;
                 Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "GetElement: {Index} AutoRecycleCandidate:", virtInfo.Index);
             }
diff --git a/src/Avalonia.Controls/Repeater/ViewportManager.cs b/src/Avalonia.Controls/Repeater/ViewportManager.cs
index ec25fcb265..7f03cc575e 100644
--- a/src/Avalonia.Controls/Repeater/ViewportManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewportManager.cs
@@ -249,9 +249,10 @@ namespace Avalonia.Controls
             virtInfo.IsRegisteredAsAnchorCandidate = false;
         }
 
-        public void OnElementCleared(IControl element)
+        public void OnElementCleared(IControl element, VirtualizationInfo virtInfo)
         {
             _scroller?.UnregisterAnchorCandidate(element);
+            virtInfo.IsRegisteredAsAnchorCandidate = false;
         }
 
         public void OnOwnerMeasuring()
@@ -358,9 +359,12 @@ namespace Avalonia.Controls
                 {
                     foreach (var child in _owner.Children)
                     {
-                        if (child != targetChild)
+                        var info = ItemsRepeater.GetVirtualizationInfo(child);
+
+                        if (child != targetChild && info.IsRegisteredAsAnchorCandidate)
                         {
                             _scroller.UnregisterAnchorCandidate(child);
+                            info.IsRegisteredAsAnchorCandidate = false;
                         }
                     }
                 }
@@ -377,9 +381,13 @@ namespace Avalonia.Controls
             }
         }
 
-        public void RegisterScrollAnchorCandidate(IControl element)
+        public void RegisterScrollAnchorCandidate(IControl element, VirtualizationInfo virtInfo)
         {
-            _scroller?.RegisterAnchorCandidate(element);
+            if (!virtInfo.IsRegisteredAsAnchorCandidate)
+            {
+                _scroller?.RegisterAnchorCandidate(element);
+                virtInfo.IsRegisteredAsAnchorCandidate = true;
+            }
         }
 
         private IControl? GetImmediateChildOfRepeater(IControl descendant)
@@ -405,15 +413,18 @@ namespace Avalonia.Controls
             _isBringIntoViewInProgress = false;
             _makeAnchorElement = null;
 
+            // Undo the anchor deregistrations done by OnBringIntoViewRequested.
             if (_scroller is object)
             {
                 foreach (var child in _owner.Children)
                 {
                     var info = ItemsRepeater.GetVirtualizationInfo(child);
 
-                    if (info.IsRealized && info.IsHeldByLayout)
+                    // The item brought into view is still registered - don't register it more than once.
+                    if (info.IsRealized && info.IsHeldByLayout && !info.IsRegisteredAsAnchorCandidate)
                     {
                         _scroller.RegisterAnchorCandidate(child);
+                        info.IsRegisteredAsAnchorCandidate = true;
                     }
                 }
             }
@@ -430,7 +441,13 @@ namespace Avalonia.Controls
             {
                 foreach (var child in _owner.Children)
                 {
-                    _scroller.UnregisterAnchorCandidate(child);
+                    var info = ItemsRepeater.GetVirtualizationInfo(child);
+
+                    if (info.IsRegisteredAsAnchorCandidate)
+                    {
+                        _scroller.UnregisterAnchorCandidate(child);
+                        info.IsRegisteredAsAnchorCandidate = false;
+                    }
                 }
 
                 _scroller = null;
diff --git a/src/Avalonia.Controls/Screens.cs b/src/Avalonia.Controls/Screens.cs
index ef438576a7..dde6b71e6e 100644
--- a/src/Avalonia.Controls/Screens.cs
+++ b/src/Avalonia.Controls/Screens.cs
@@ -2,54 +2,62 @@
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Platform;
-using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Represents all screens available on a device.
+    /// </summary>
     public class Screens
     {
-        private readonly IScreenImpl? _iScreenImpl;
+        private readonly IScreenImpl _iScreenImpl;
 
+        /// <summary>
+        /// Gets the total number of screens available on the device.
+        /// </summary>
         public int ScreenCount => _iScreenImpl?.ScreenCount ?? 0;
+
+        /// <summary>
+        /// Gets the list of all screens available on the device.
+        /// </summary>
         public IReadOnlyList<Screen> All => _iScreenImpl?.AllScreens ?? Array.Empty<Screen>();
-        public Screen? Primary => All.FirstOrDefault(x => x.Primary);
 
-        public Screens(IScreenImpl? iScreenImpl)
+        /// <summary>
+        /// Gets the primary screen on the device.
+        /// </summary>
+        public Screen? Primary => All.FirstOrDefault(x => x.IsPrimary);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Screens"/> class.
+        /// </summary>
+        public Screens(IScreenImpl iScreenImpl)
         {
             _iScreenImpl = iScreenImpl;
         }
 
-        public Screen? ScreenFromBounds(PixelRect bounds){
-        
-            Screen? currMaxScreen = null;
-            double maxAreaSize = 0;
-            foreach (Screen screen in All)
-            {
-                double left = MathUtilities.Clamp(bounds.X, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
-                double top = MathUtilities.Clamp(bounds.Y, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
-                double right = MathUtilities.Clamp(bounds.X + bounds.Width, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
-                double bottom = MathUtilities.Clamp(bounds.Y + bounds.Height, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
-                double area = (right - left) * (bottom - top);
-                if (area > maxAreaSize)
-                {
-                    maxAreaSize = area;
-                    currMaxScreen = screen;
-                }
-            }
-
-            return currMaxScreen;
+        public Screen? ScreenFromBounds(PixelRect bounds)
+        {
+            return _iScreenImpl.ScreenFromRect(bounds);
         }
-        
+
+        public Screen? ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return _iScreenImpl.ScreenFromWindow(window);
+        }
+
         public Screen? ScreenFromPoint(PixelPoint point)
         {
-            return All.FirstOrDefault(x => x.Bounds.Contains(point));        
+            return _iScreenImpl.ScreenFromPoint(point);
         }
 
         public Screen? ScreenFromVisual(IVisual visual)
         {
             var tl = visual.PointToScreen(visual.Bounds.TopLeft);
             var br = visual.PointToScreen(visual.Bounds.BottomRight);
+
             return ScreenFromBounds(new PixelRect(tl, br));
         }
     }
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index 7c4b87e66a..535f9ae43e 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Reactive.Linq;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -8,8 +10,10 @@ using Avalonia.Interactivity;
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// A control scrolls its content if the content is bigger than the space available.
+    /// A control which scrolls its content if the content is bigger than the space available.
     /// </summary>
+    [TemplatePart("PART_HorizontalScrollBar", typeof(ScrollBar))]
+    [TemplatePart("PART_VerticalScrollBar",   typeof(ScrollBar))]
     public class ScrollViewer : ContentControl, IScrollable, IScrollAnchorProvider
     {
         /// <summary>
@@ -762,6 +766,11 @@ namespace Avalonia.Controls
             _scrollBarExpandSubscription = SubscribeToScrollBars(e);
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new ScrollViewerAutomationPeer(this);
+        }
+
         private IDisposable? SubscribeToScrollBars(TemplateAppliedEventArgs e)
         {
             static IObservable<bool>? GetExpandedObservable(ScrollBar? scrollBar)
diff --git a/src/Avalonia.Controls/SelectableTextBlock.cs b/src/Avalonia.Controls/SelectableTextBlock.cs
new file mode 100644
index 0000000000..b343439f98
--- /dev/null
+++ b/src/Avalonia.Controls/SelectableTextBlock.cs
@@ -0,0 +1,430 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls.Documents;
+using Avalonia.Controls.Utils;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A control that displays a block of formatted text.
+    /// </summary>
+    public class SelectableTextBlock : TextBlock, IInlineHost
+    {
+        public static readonly DirectProperty<SelectableTextBlock, int> SelectionStartProperty =
+            AvaloniaProperty.RegisterDirect<SelectableTextBlock, int>(
+                nameof(SelectionStart),
+                o => o.SelectionStart,
+                (o, v) => o.SelectionStart = v);
+
+        public static readonly DirectProperty<SelectableTextBlock, int> SelectionEndProperty =
+            AvaloniaProperty.RegisterDirect<SelectableTextBlock, int>(
+                nameof(SelectionEnd),
+                o => o.SelectionEnd,
+                (o, v) => o.SelectionEnd = v);
+
+        public static readonly DirectProperty<SelectableTextBlock, string> SelectedTextProperty =
+            AvaloniaProperty.RegisterDirect<SelectableTextBlock, string>(
+                nameof(SelectedText),
+                o => o.SelectedText);
+
+        public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
+            AvaloniaProperty.Register<SelectableTextBlock, IBrush?>(nameof(SelectionBrush), Brushes.Blue);
+
+
+        public static readonly DirectProperty<SelectableTextBlock, bool> CanCopyProperty =
+            AvaloniaProperty.RegisterDirect<SelectableTextBlock, bool>(
+                nameof(CanCopy),
+                o => o.CanCopy);
+
+        public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent =
+            RoutedEvent.Register<SelectableTextBlock, RoutedEventArgs>(
+                nameof(CopyingToClipboard), RoutingStrategies.Bubble);
+
+        private bool _canCopy;
+        private int _selectionStart;
+        private int _selectionEnd;
+        private int _wordSelectionStart = -1;
+
+        static SelectableTextBlock()
+        {
+            FocusableProperty.OverrideDefaultValue(typeof(SelectableTextBlock), true);
+            AffectsRender<SelectableTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionBrushProperty);
+        }
+
+        public event EventHandler<RoutedEventArgs>? CopyingToClipboard
+        {
+            add => AddHandler(CopyingToClipboardEvent, value);
+            remove => RemoveHandler(CopyingToClipboardEvent, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the brush that highlights selected text.
+        /// </summary>
+        public IBrush? SelectionBrush
+        {
+            get => GetValue(SelectionBrushProperty);
+            set => SetValue(SelectionBrushProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a character index for the beginning of the current selection.
+        /// </summary>
+        public int SelectionStart
+        {
+            get => _selectionStart;
+            set
+            {
+                if (SetAndRaise(SelectionStartProperty, ref _selectionStart, value))
+                {
+                    RaisePropertyChanged(SelectedTextProperty, "", "");
+
+                    UpdateCommandStates();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a character index for the end of the current selection.
+        /// </summary>
+        public int SelectionEnd
+        {
+            get => _selectionEnd;
+            set
+            {
+                if (SetAndRaise(SelectionEndProperty, ref _selectionEnd, value))
+                {
+                    RaisePropertyChanged(SelectedTextProperty, "", "");
+
+                    UpdateCommandStates();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the content of the current selection.
+        /// </summary>
+        public string SelectedText
+        {
+            get => GetSelection();
+        }
+
+        /// <summary>
+        /// Property for determining if the Copy command can be executed.
+        /// </summary>
+        public bool CanCopy
+        {
+            get => _canCopy;
+            private set => SetAndRaise(CanCopyProperty, ref _canCopy, value);
+        }
+
+        /// <summary>
+        /// Copies the current selection to the Clipboard.
+        /// </summary>
+        public async void Copy()
+        {
+            if (!_canCopy)
+            {
+                return;
+            }
+
+            var text = GetSelection();
+
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
+
+            var eventArgs = new RoutedEventArgs(CopyingToClipboardEvent);
+
+            RaiseEvent(eventArgs);
+
+            if (!eventArgs.Handled)
+            {
+                await ((IClipboard)AvaloniaLocator.Current.GetRequiredService(typeof(IClipboard)))
+                    .SetTextAsync(text);
+            }
+        }        
+
+        /// <summary>
+        /// Select all text in the TextBox
+        /// </summary>
+        public void SelectAll()
+        {
+            var text = Text;
+
+            SelectionStart = 0;
+            SelectionEnd = text?.Length ?? 0;
+        }
+
+        /// <summary>
+        /// Clears the current selection/>
+        /// </summary>
+        public void ClearSelection()
+        {
+            SelectionEnd = SelectionStart;
+        }
+
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+
+            UpdateCommandStates();
+        }
+
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            if ((ContextFlyout == null || !ContextFlyout.IsOpen) &&
+               (ContextMenu == null || !ContextMenu.IsOpen))
+            {
+                ClearSelection();
+            }
+
+            UpdateCommandStates();
+        }
+
+        protected override void RenderTextLayout(DrawingContext context, Point origin)
+        {
+            var selectionStart = SelectionStart;
+            var selectionEnd = SelectionEnd;
+            var selectionBrush = SelectionBrush;
+
+            if (selectionStart != selectionEnd && selectionBrush != null)
+            {
+                var start = Math.Min(selectionStart, selectionEnd);
+                var length = Math.Max(selectionStart, selectionEnd) - start;
+
+                var rects = TextLayout.HitTestTextRange(start, length);
+
+                using (context.PushPostTransform(Matrix.CreateTranslation(origin)))
+                {
+                    foreach (var rect in rects)
+                    {
+                        context.FillRectangle(selectionBrush, PixelRect.FromRect(rect, 1).ToRect(1));
+                    }
+                }
+            }
+
+            base.RenderTextLayout(context, origin);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            var handled = false;
+            var modifiers = e.KeyModifiers;
+            var keymap = AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>();
+
+            bool Match(List<KeyGesture> gestures) => gestures.Any(g => g.Matches(e));
+
+            if (Match(keymap.Copy))
+            {
+                Copy();
+
+                handled = true;
+            }
+
+            e.Handled = handled;
+        }
+
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+
+            var text = Text;
+            var clickInfo = e.GetCurrentPoint(this);
+
+            if (text != null && clickInfo.Properties.IsLeftButtonPressed)
+            {
+                var padding = Padding;
+
+                var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
+
+                var clickToSelect = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+
+                var oldIndex = SelectionStart;
+
+                var hit = TextLayout.HitTestPoint(point);
+                var index = hit.TextPosition;
+
+                switch (e.ClickCount)
+                {
+                    case 1:
+                        if (clickToSelect)
+                        {
+                            if (_wordSelectionStart >= 0)
+                            {
+                                var previousWord = StringUtils.PreviousWord(text, index);
+
+                                if (index > _wordSelectionStart)
+                                {
+                                    SelectionEnd = StringUtils.NextWord(text, index);
+                                }
+
+                                if (index < _wordSelectionStart || previousWord == _wordSelectionStart)
+                                {
+                                    SelectionStart = previousWord;
+                                }
+                            }
+                            else
+                            {
+                                SelectionStart = Math.Min(oldIndex, index);
+                                SelectionEnd = Math.Max(oldIndex, index);
+                            }
+                        }
+                        else
+                        {
+                            if (_wordSelectionStart == -1 || index < SelectionStart || index > SelectionEnd)
+                            {
+                                SelectionStart = SelectionEnd = index;
+
+                                _wordSelectionStart = -1;
+                            }
+                        }
+
+                        break;
+                    case 2:
+                        if (!StringUtils.IsStartOfWord(text, index))
+                        {
+                            SelectionStart = StringUtils.PreviousWord(text, index);
+                        }
+
+                        _wordSelectionStart = SelectionStart;
+
+                        SelectionEnd = StringUtils.NextWord(text, index);
+                        break;
+                    case 3:
+                        _wordSelectionStart = -1;
+
+                        SelectAll();
+                        break;
+                }
+            }
+
+            e.Pointer.Capture(this);
+            e.Handled = true;
+        }
+
+        protected override void OnPointerMoved(PointerEventArgs e)
+        {
+            base.OnPointerMoved(e);
+
+            // selection should not change during pointer move if the user right clicks
+            if (e.Pointer.Captured == this && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                var text = Text;
+                var padding = Padding;
+
+                var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
+
+                point = new Point(
+                    MathUtilities.Clamp(point.X, 0, Math.Max(TextLayout.Bounds.Width, 0)),
+                    MathUtilities.Clamp(point.Y, 0, Math.Max(TextLayout.Bounds.Width, 0)));
+
+                var hit = TextLayout.HitTestPoint(point);
+                var textPosition = hit.TextPosition;
+
+                if (text != null && _wordSelectionStart >= 0)
+                {
+                    var distance = textPosition - _wordSelectionStart;
+
+                    if (distance <= 0)
+                    {
+                        SelectionStart = StringUtils.PreviousWord(text, textPosition);
+                    }
+
+                    if (distance >= 0)
+                    {
+                        if (SelectionStart != _wordSelectionStart)
+                        {
+                            SelectionStart = _wordSelectionStart;
+                        }
+
+                        SelectionEnd = StringUtils.NextWord(text, textPosition);
+                    }
+                }
+                else
+                {
+                    SelectionEnd = textPosition;
+                }
+
+            }
+        }
+
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            if (e.Pointer.Captured != this)
+            {
+                return;
+            }
+
+            if (e.InitialPressMouseButton == MouseButton.Right)
+            {
+                var padding = Padding;
+
+                var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
+
+                var hit = TextLayout.HitTestPoint(point);
+
+                var caretIndex = hit.TextPosition;
+
+                // see if mouse clicked inside current selection
+                // if it did not, we change the selection to where the user clicked
+                var firstSelection = Math.Min(SelectionStart, SelectionEnd);
+                var lastSelection = Math.Max(SelectionStart, SelectionEnd);
+                var didClickInSelection = SelectionStart != SelectionEnd &&
+                                          caretIndex >= firstSelection && caretIndex <= lastSelection;
+                if (!didClickInSelection)
+                {
+                    SelectionStart = SelectionEnd = caretIndex;
+                }
+            }
+
+            e.Pointer.Capture(null);
+        }
+
+        private void UpdateCommandStates()
+        {
+            var text = GetSelection();
+
+            CanCopy = !string.IsNullOrEmpty(text);
+        }
+
+        private string GetSelection()
+        {
+            var text = GetText();
+
+            if (string.IsNullOrEmpty(text))
+            {
+                return "";
+            }
+
+            var selectionStart = SelectionStart;
+            var selectionEnd = SelectionEnd;
+            var start = Math.Min(selectionStart, selectionEnd);
+            var end = Math.Max(selectionStart, selectionEnd);
+
+            if (start == end || text.Length < end)
+            {
+                return "";
+            }
+
+            var length = Math.Max(0, end - start);
+
+            var selectedText = text.Substring(start, length);
+
+            return selectedText;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
index 40c6f63ed8..d0715e402d 100644
--- a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
+++ b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
@@ -168,7 +168,7 @@ namespace Avalonia.Controls.Selection
         {
             if (_writableSelectedItems is INotifyCollectionChanged incc)
             {
-                incc.CollectionChanged += OnSelectedItemsCollectionChanged;
+                incc.CollectionChanged -= OnSelectedItemsCollectionChanged;
             }
         }
 
@@ -182,8 +182,8 @@ namespace Avalonia.Controls.Selection
             try
             {
                 var items = WritableSelectedItems;
-                var deselected = e.DeselectedItems.ToList();
-                var selected = e.SelectedItems.ToList();
+                var deselected = e.DeselectedItems.ToArray();
+                var selected = e.SelectedItems.ToArray();
 
                 _ignoreSelectedItemsChanges = true;
 
diff --git a/src/Avalonia.Controls/Shapes/Arc.cs b/src/Avalonia.Controls/Shapes/Arc.cs
index 5ebb321f9b..de3814f215 100644
--- a/src/Avalonia.Controls/Shapes/Arc.cs
+++ b/src/Avalonia.Controls/Shapes/Arc.cs
@@ -1,8 +1,12 @@
 using System;
 using Avalonia.Media;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Shapes
 {
+    /// <summary>
+    /// Represents a circular or elliptical arc (a segment of a curve).
+    /// </summary>
     public class Arc : Shape
     {
         /// <summary>
@@ -19,8 +23,12 @@ namespace Avalonia.Controls.Shapes
 
         static Arc()
         {
-            StrokeThicknessProperty.OverrideDefaultValue<Arc>(1);
-            AffectsGeometry<Arc>(BoundsProperty, StrokeThicknessProperty, StartAngleProperty, SweepAngleProperty);
+            StrokeThicknessProperty.OverrideDefaultValue<Arc>(1.0d);
+            AffectsGeometry<Arc>(
+                BoundsProperty,
+                StrokeThicknessProperty,
+                StartAngleProperty,
+                SweepAngleProperty);
         }
 
         /// <summary>
@@ -42,10 +50,11 @@ namespace Avalonia.Controls.Shapes
             set => SetValue(SweepAngleProperty, value);
         }
 
+        /// <inheritdoc/>
         protected override Geometry CreateDefiningGeometry()
         {
-            var angle1 = DegreesToRad(StartAngle);
-            var angle2 = angle1 + DegreesToRad(SweepAngle);
+            var angle1 = MathUtilities.Deg2Rad(StartAngle);
+            var angle2 = angle1 + MathUtilities.Deg2Rad(SweepAngle);
 
             var startAngle = Math.Min(angle1, angle2);
             var sweepAngle = Math.Max(angle1, angle2);
@@ -80,24 +89,25 @@ namespace Avalonia.Controls.Shapes
 
                 var arcGeometry = new StreamGeometry();
 
-                using (var ctx = arcGeometry.Open())
+                using (StreamGeometryContext context = arcGeometry.Open())
                 {
-                    ctx.BeginFigure(startPoint, false);
-                    ctx.ArcTo(endPoint, new Size(radiusX, radiusY), angleGap, angleGap >= Math.PI,
+                    context.BeginFigure(startPoint, false);
+                    context.ArcTo(
+                        endPoint,
+                        new Size(radiusX, radiusY),
+                        rotationAngle: angleGap,
+                        isLargeArc: angleGap >= Math.PI,
                         SweepDirection.Clockwise);
-                    ctx.EndFigure(false);
+                    context.EndFigure(false);
                 }
 
                 return arcGeometry;
             }
         }
 
-        static double DegreesToRad(double inAngle) =>
-            inAngle * Math.PI / 180;
+        private static double RadToNormRad(double inAngle) => ((inAngle % (Math.PI * 2)) + (Math.PI * 2)) % (Math.PI * 2);
 
-        static double RadToNormRad(double inAngle) => ((inAngle % (Math.PI * 2)) + (Math.PI * 2)) % (Math.PI * 2);
-
-        static Point GetRingPoint(double radiusX, double radiusY, double centerX, double centerY, double angle) =>
+        private static Point GetRingPoint(double radiusX, double radiusY, double centerX, double centerY, double angle) =>
             new Point((radiusX * Math.Cos(angle)) + centerX, (radiusY * Math.Sin(angle)) + centerY);
     }
 }
diff --git a/src/Avalonia.Controls/Shapes/Rectangle.cs b/src/Avalonia.Controls/Shapes/Rectangle.cs
index f3db2644a9..d60180bab4 100644
--- a/src/Avalonia.Controls/Shapes/Rectangle.cs
+++ b/src/Avalonia.Controls/Shapes/Rectangle.cs
@@ -2,19 +2,139 @@ using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
 {
+    /// <summary>
+    /// Represents a rectangle with optional rounded corners.
+    /// </summary>
     public class Rectangle : Shape
     {
+        private const double PiOver2 = 1.57079633; // 90 deg to rad
+
+        /// <summary>
+        /// Defines the <see cref="RadiusX"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> RadiusXProperty =
+            AvaloniaProperty.Register<Rectangle, double>(nameof(RadiusX));
+
+        /// <summary>
+        /// Defines the <see cref="RadiusY"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> RadiusYProperty =
+            AvaloniaProperty.Register<Rectangle, double>(nameof(RadiusY));
+
         static Rectangle()
         {
-            AffectsGeometry<Rectangle>(BoundsProperty, StrokeThicknessProperty);
+            AffectsGeometry<Rectangle>(
+                BoundsProperty,
+                RadiusXProperty,
+                RadiusYProperty,
+                StrokeThicknessProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets the radius on the X-axis used to round the corners of the rectangle.
+        /// Corner radii are represented by an ellipse so this is the X-axis width of the ellipse.
+        /// </summary>
+        public double RadiusX
+        {
+            get => GetValue(RadiusXProperty);
+            set => SetValue(RadiusXProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the radius on the Y-axis used to round the corners of the rectangle.
+        /// Corner radii are represented by an ellipse so this is the Y-axis height of the ellipse.
+        /// </summary>
+        public double RadiusY
+        {
+            get => GetValue(RadiusYProperty);
+            set => SetValue(RadiusYProperty, value);
         }
 
+        /// <inheritdoc/>
         protected override Geometry CreateDefiningGeometry()
         {
-            var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2);
-            return new RectangleGeometry(rect);
+            // TODO: If RectangleGeometry ever supports RadiusX/Y like in WPF,
+            // this code can be removed/combined with that implementation
+
+            double x = RadiusX;
+            double y = RadiusY;
+
+            if (x == 0 && y == 0)
+            {
+                // Optimization when there are no corner radii
+                var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2);
+                return new RectangleGeometry(rect);
+            }
+            else
+            {
+                var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2);
+                var geometry = new StreamGeometry();
+                var arcSize = new Size(x, y);
+
+                using (StreamGeometryContext context = geometry.Open())
+                {
+                    // The rectangle is constructed as follows:
+                    //
+                    //   (origin)
+                    //   Corner 4            Corner 1
+                    //   Top/Left  Line 1    Top/Right
+                    //      \_   __________   _/
+                    //          |          |
+                    //   Line 4 |          | Line 2
+                    //       _  |__________|  _
+                    //      /      Line 3      \
+                    //   Corner 3            Corner 2
+                    //   Bottom/Left         Bottom/Right
+                    //
+                    // - Lines 1,3 follow the deflated rectangle bounds minus RadiusX
+                    // - Lines 2,4 follow the deflated rectangle bounds minus RadiusY
+                    // - All corners are constructed using elliptical arcs 
+
+                    // Line 1 + Corner 1
+                    context.BeginFigure(new Point(rect.Left + x, rect.Top), true);
+                    context.LineTo(new Point(rect.Right - x, rect.Top));
+                    context.ArcTo(
+                        new Point(rect.Right, rect.Top + y),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    // Line 2 + Corner 2
+                    context.LineTo(new Point(rect.Right, rect.Bottom - y));
+                    context.ArcTo(
+                        new Point(rect.Right - x, rect.Bottom),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    // Line 3 + Corner 3
+                    context.LineTo(new Point(rect.Left + x, rect.Bottom));
+                    context.ArcTo(
+                        new Point(rect.Left, rect.Bottom - y),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    // Line 4 + Corner 4
+                    context.LineTo(new Point(rect.Left, rect.Top + y));
+                    context.ArcTo(
+                        new Point(rect.Left + x, rect.Top),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    context.EndFigure(true);
+                }
+
+                return geometry;
+            }
         }
 
+        /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
             return new Size(StrokeThickness, StrokeThickness);
diff --git a/src/Avalonia.Controls/Shapes/Sector.cs b/src/Avalonia.Controls/Shapes/Sector.cs
new file mode 100644
index 0000000000..a9b7e8939b
--- /dev/null
+++ b/src/Avalonia.Controls/Shapes/Sector.cs
@@ -0,0 +1,97 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Shapes
+{
+    /// <summary>
+    /// Represents a circular or elliptical sector (a pie-shaped closed region of a circle or ellipse).
+    /// </summary>
+    public class Sector : Shape
+    {
+        /// <summary>
+        /// Defines the <see cref="StartAngle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> StartAngleProperty =
+            AvaloniaProperty.Register<Sector, double>(nameof(StartAngle), 0.0d);
+
+        /// <summary>
+        /// Defines the <see cref="SweepAngle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> SweepAngleProperty =
+            AvaloniaProperty.Register<Sector, double>(nameof(SweepAngle), 0.0d);
+
+        /// <summary>
+        /// Gets or sets the angle at which the sector's arc starts, in degrees.
+        /// </summary>
+        public double StartAngle
+        {
+            get => GetValue(StartAngleProperty);
+            set => SetValue(StartAngleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the angle, in degrees, added to the <see cref="StartAngle"/> defining where the sector's arc ends.
+        /// A positive value is clockwise, negative is counter-clockwise.
+        /// </summary>
+        public double SweepAngle
+        {
+            get => GetValue(SweepAngleProperty);
+            set => SetValue(SweepAngleProperty, value);
+        }
+
+        static Sector()
+        {
+            StrokeThicknessProperty.OverrideDefaultValue<Sector>(1.0d);
+            AffectsGeometry<Sector>(
+                BoundsProperty,
+                StrokeThicknessProperty,
+                StartAngleProperty,
+                SweepAngleProperty);
+        }
+
+        /// <inheritdoc/>
+        protected override Geometry? CreateDefiningGeometry()
+        {
+            Rect rect = new Rect(Bounds.Size);
+            Rect deflatedRect = rect.Deflate(StrokeThickness * 0.5d);
+
+            if (SweepAngle >= 360.0d || SweepAngle <= -360.0d)
+            {
+                return new EllipseGeometry(deflatedRect);
+            }
+
+            if (SweepAngle == 0.0d)
+            {
+                return new StreamGeometry();
+            }
+
+            (double startAngle, double endAngle) = MathUtilities.GetMinMaxFromDelta(
+                MathUtilities.Deg2Rad(StartAngle),
+                MathUtilities.Deg2Rad(SweepAngle));
+
+            Point centre = new Point(rect.Width * 0.5d, rect.Height * 0.5d);
+            double radiusX = deflatedRect.Width * 0.5d;
+            double radiusY = deflatedRect.Height * 0.5d;
+            Point startCurvePoint = MathUtilities.GetEllipsePoint(centre, radiusX, radiusY, startAngle);
+            Point endCurvePoint = MathUtilities.GetEllipsePoint(centre, radiusX, radiusY, endAngle);
+            Size size = new Size(radiusX, radiusY);
+
+            var streamGeometry = new StreamGeometry();
+            using (StreamGeometryContext context = streamGeometry.Open())
+            {
+                context.BeginFigure(startCurvePoint, false);
+                context.ArcTo(
+                    endCurvePoint,
+                    size,
+                    rotationAngle: 0.0d,
+                    isLargeArc: Math.Abs(SweepAngle) > 180.0d,
+                    SweepDirection.Clockwise);
+                context.LineTo(centre);
+                context.EndFigure(true);
+            }
+
+            return streamGeometry;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/SizeChangedEventArgs.cs b/src/Avalonia.Controls/SizeChangedEventArgs.cs
new file mode 100644
index 0000000000..2dc642b163
--- /dev/null
+++ b/src/Avalonia.Controls/SizeChangedEventArgs.cs
@@ -0,0 +1,83 @@
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data specific to a SizeChanged event.
+    /// </summary>
+    public class SizeChangedEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SizeChangedEventArgs"/> class.
+        /// </summary>
+        /// <param name="routedEvent">The routed event associated with these event args.</param>
+        public SizeChangedEventArgs(RoutedEvent? routedEvent)
+            : base (routedEvent)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SizeChangedEventArgs"/> class.
+        /// </summary>
+        /// <param name="routedEvent">The routed event associated with these event args.</param>
+        /// <param name="source">The source object that raised the routed event.</param>
+        public SizeChangedEventArgs(RoutedEvent? routedEvent, IInteractive? source)
+            : base(routedEvent, source)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SizeChangedEventArgs"/> class.
+        /// </summary>
+        /// <param name="routedEvent">The routed event associated with these event args.</param>
+        /// <param name="source">The source object that raised the routed event.</param>
+        /// <param name="previousSize">The previous size (or bounds) of the object.</param>
+        /// <param name="newSize">The new size (or bounds) of the object.</param>
+        public SizeChangedEventArgs(
+            RoutedEvent? routedEvent,
+            IInteractive? source,
+            Size previousSize,
+            Size newSize)
+            : base(routedEvent, source)
+        {
+            PreviousSize = previousSize;
+            NewSize = newSize;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the height of the new size is considered
+        /// different than the previous size height.
+        /// </summary>
+        /// <remarks>
+        /// This will take into account layout epsilon and will not be true if both
+        /// heights are considered equivalent for layout purposes. Remember there can
+        /// be small variations in the calculations between layout cycles due to
+        /// rounding and precision even when the size has not otherwise changed.
+        /// </remarks>
+        public bool HeightChanged => !MathUtilities.AreClose(NewSize.Height, PreviousSize.Height, LayoutHelper.LayoutEpsilon);
+
+        /// <summary>
+        /// Gets the new size (or bounds) of the object.
+        /// </summary>
+        public Size NewSize { get; init; }
+
+        /// <summary>
+        /// Gets the previous size (or bounds) of the object.
+        /// </summary>
+        public Size PreviousSize { get; init; }
+
+        /// <summary>
+        /// Gets a value indicating whether the width of the new size is considered
+        /// different than the previous size width.
+        /// </summary>
+        /// <remarks>
+        /// This will take into account layout epsilon and will not be true if both
+        /// widths are considered equivalent for layout purposes. Remember there can
+        /// be small variations in the calculations between layout cycles due to
+        /// rounding and precision even when the size has not otherwise changed.
+        /// </remarks>
+        public bool WidthChanged => !MathUtilities.AreClose(NewSize.Width, PreviousSize.Width, LayoutHelper.LayoutEpsilon);
+    }
+}
diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 87de04f92f..be87705b54 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Collections;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
@@ -8,6 +9,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Utilities;
+using Avalonia.Automation;
 
 namespace Avalonia.Controls
 {
@@ -40,6 +42,9 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control that lets the user select from a range of values by moving a Thumb control along a Track.
     /// </summary>
+    [TemplatePart("PART_DecreaseButton", typeof(Button))]
+    [TemplatePart("PART_IncreaseButton", typeof(Button))]
+    [TemplatePart("PART_Track",          typeof(Track))]
     [PseudoClasses(":vertical", ":horizontal", ":pressed")]
     public class Slider : RangeBase
     {
@@ -71,7 +76,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="TickPlacement"/> property.
         /// </summary>
         public static readonly StyledProperty<TickPlacement> TickPlacementProperty =
-            AvaloniaProperty.Register<TickBar, TickPlacement>(nameof(TickPlacement), 0d);
+            AvaloniaProperty.Register<Slider, TickPlacement>(nameof(TickPlacement), 0d);
 
         /// <summary>
         /// Defines the <see cref="TicksProperty"/> property.
@@ -105,6 +110,7 @@ namespace Avalonia.Controls
                 RoutingStrategies.Bubble);
 
             ValueProperty.OverrideMetadata<Slider>(new DirectPropertyMetadata<double>(enableDataValidation: true));
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<Slider>(AutomationControlType.Slider);
         }
 
         /// <summary>
@@ -191,7 +197,7 @@ namespace Avalonia.Controls
 
             if (_track != null)
             {
-                _track.IsThumbDragHandled = true;
+                _track.IgnoreThumbDrag = true;
             }
 
             if (_decreaseButton != null)
@@ -355,21 +361,24 @@ namespace Avalonia.Controls
             Value = IsSnapToTickEnabled ? SnapToTick(finalValue) : finalValue;
         }
 
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == ValueProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(change.GetNewValue<Orientation>());
             }
         }
 
diff --git a/src/Avalonia.Controls/SplitButton/SplitButton.cs b/src/Avalonia.Controls/SplitButton/SplitButton.cs
index f1d07b2679..f39064435d 100644
--- a/src/Avalonia.Controls/SplitButton/SplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/SplitButton.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Windows.Input;
 using Avalonia.Controls.Metadata;
-using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -13,6 +12,8 @@ namespace Avalonia.Controls
     /// A button with primary and secondary parts that can each be pressed separately.
     /// The primary part behaves like a <see cref="Button"/> and the secondary part opens a flyout.
     /// </summary>
+    [TemplatePart("PART_PrimaryButton",   typeof(Button))]
+    [TemplatePart("PART_SecondaryButton", typeof(Button))]
     [PseudoClasses(pcFlyoutOpen, pcPressed)]
     public class SplitButton : ContentControl, ICommandSource
     {
@@ -227,6 +228,8 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            base.OnApplyTemplate(e);
+
             UnregisterEvents();
             UnregisterFlyoutEvents(Flyout);
 
@@ -275,19 +278,21 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Property == CommandProperty)
             {
                 if (_isAttachedToLogicalTree)
                 {
                     // Must unregister events here while a reference to the old command still exists
-                    if (e.OldValue.GetValueOrDefault() is ICommand oldCommand)
+                    var (oldValue, newValue) = e.GetOldAndNewValue<ICommand?>();
+
+                    if (oldValue is ICommand oldCommand)
                     {
                         oldCommand.CanExecuteChanged -= CanExecuteChanged;
                     }
 
-                    if (e.NewValue.GetValueOrDefault() is ICommand newCommand)
+                    if (newValue is ICommand newCommand)
                     {
                         newCommand.CanExecuteChanged += CanExecuteChanged;
                     }
@@ -301,8 +306,7 @@ namespace Avalonia.Controls
             }
             else if (e.Property == FlyoutProperty)
             {
-                var oldFlyout = e.OldValue.GetValueOrDefault() as FlyoutBase;
-                var newFlyout = e.NewValue.GetValueOrDefault() as FlyoutBase;
+                var (oldFlyout, newFlyout) = e.GetOldAndNewValue<FlyoutBase?>();
 
                 // If flyout is changed while one is already open, make sure we 
                 // close the old one first
@@ -314,16 +318,9 @@ namespace Avalonia.Controls
                 }
 
                 // Must unregister events here while a reference to the old flyout still exists
-                if (oldFlyout != null)
-                {
-                    UnregisterFlyoutEvents(oldFlyout);
-                }
-
-                if (newFlyout != null)
-                {
-                    RegisterFlyoutEvents(newFlyout);
-                }
+                UnregisterFlyoutEvents(oldFlyout);
 
+                RegisterFlyoutEvents(newFlyout);
                 UpdatePseudoClasses();
             }
 
@@ -415,6 +412,22 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Invoked when the split button's flyout is opened.
+        /// </summary>
+        protected virtual void OnFlyoutOpened()
+        {
+            // Available for derived types
+        }
+
+        /// <summary>
+        /// Invoked when the split button's flyout is closed.
+        /// </summary>
+        protected virtual void OnFlyoutClosed()
+        {
+            // Available for derived types
+        }
+
         ////////////////////////////////////////////////////////////////////////
         // Event Handling
         ////////////////////////////////////////////////////////////////////////
@@ -464,6 +477,8 @@ namespace Avalonia.Controls
             {
                 _isFlyoutOpen = true;
                 UpdatePseudoClasses();
+
+                OnFlyoutOpened();
             }
         }
 
@@ -479,6 +494,8 @@ namespace Avalonia.Controls
             {
                 _isFlyoutOpen = false;
                 UpdatePseudoClasses();
+
+                OnFlyoutClosed();
             }
         }
     }
diff --git a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
index 879c1aa6e1..83bc9851c1 100644
--- a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
@@ -90,8 +90,9 @@ namespace Avalonia.Controls
         ////////////////////////////////////////////////////////////////////////
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
+            base.OnPropertyChanged(e);
             if (e.Property == IsCheckedProperty)
             {
                 OnIsCheckedChanged();
diff --git a/src/Avalonia.Controls/SplitView.cs b/src/Avalonia.Controls/SplitView.cs
index d2161deb6e..c344dd795d 100644
--- a/src/Avalonia.Controls/SplitView.cs
+++ b/src/Avalonia.Controls/SplitView.cs
@@ -77,6 +77,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control with two views: A collapsible pane and an area for content
     /// </summary>
+    [TemplatePart("PART_PaneRoot", typeof(Panel))]
     [PseudoClasses(":open", ":closed")]
     [PseudoClasses(":compactoverlay", ":compactinline", ":overlay", ":inline")]
     [PseudoClasses(":left", ":right")]
@@ -137,7 +138,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PaneTemplate"/> property.
         /// </summary>
         public static readonly StyledProperty<IDataTemplate> PaneTemplateProperty =
-            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate>(nameof(PaneTemplate));
+            AvaloniaProperty.Register<SplitView, IDataTemplate>(nameof(PaneTemplate));
 
         /// <summary>
         /// Defines the <see cref="UseLightDismissOverlayMode"/> property
@@ -430,23 +431,45 @@ namespace Avalonia.Controls
             }
         }
 
+        private string GetPseudoClass(SplitViewDisplayMode mode)
+        {
+            return mode switch
+            {
+                SplitViewDisplayMode.Inline => "inline",
+                SplitViewDisplayMode.CompactInline => "compactinline",
+                SplitViewDisplayMode.Overlay => "overlay",
+                SplitViewDisplayMode.CompactOverlay => "compactoverlay",
+                _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null)
+            };
+        }
+        
+        private string GetPseudoClass(SplitViewPanePlacement placement)
+        {
+            return placement switch
+            {
+                SplitViewPanePlacement.Left => "left",
+                SplitViewPanePlacement.Right => "right",
+                _ => throw new ArgumentOutOfRangeException(nameof(placement), placement, null)
+            };
+        }
+
         private void OnPanePlacementChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            var oldState = e.OldValue!.ToString()!.ToLower();
-            var newState = e.NewValue!.ToString()!.ToLower();
+            var oldState = GetPseudoClass(e.GetOldValue<SplitViewPanePlacement>());
+            var newState = GetPseudoClass(e.GetNewValue<SplitViewPanePlacement>());
             PseudoClasses.Remove($":{oldState}");
             PseudoClasses.Add($":{newState}");
         }
 
         private void OnDisplayModeChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            var oldState = e.OldValue!.ToString()!.ToLower();
-            var newState = e.NewValue!.ToString()!.ToLower();
+            var oldState = GetPseudoClass(e.GetOldValue<SplitViewDisplayMode>());
+            var newState = GetPseudoClass(e.GetNewValue<SplitViewDisplayMode>());
 
             PseudoClasses.Remove($":{oldState}");
             PseudoClasses.Add($":{newState}");
 
-            var (closedPaneWidth, paneColumnGridLength) = (SplitViewDisplayMode)e.NewValue switch
+            var (closedPaneWidth, paneColumnGridLength) = e.GetNewValue<SplitViewDisplayMode>() switch
             {
                 SplitViewDisplayMode.Overlay => (0, new GridLength(0, GridUnitType.Pixel)),
                 SplitViewDisplayMode.CompactOverlay => (CompactPaneLength, new GridLength(CompactPaneLength, GridUnitType.Pixel)),
diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index feb425a9c3..50c48d2bb0 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -123,7 +123,7 @@ namespace Avalonia.Controls
                     index = Children.Count - 1;
                     break;
                 case NavigationDirection.Next:
-                    if (index != -1) ++index;
+                    ++index;
                     break;
                 case NavigationDirection.Previous:
                     if (index != -1) --index;
diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs
index 4a9e745e30..ee41b94b5a 100644
--- a/src/Avalonia.Controls/SystemDialog.cs
+++ b/src/Avalonia.Controls/SystemDialog.cs
@@ -3,19 +3,22 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Platform;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Base class for system file dialogs.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public abstract class FileDialog : FileSystemDialog
     {
         /// <summary>
         /// Gets or sets a collection of filters which determine the types of files displayed in an
         /// <see cref="OpenFileDialog"/> or an <see cref="SaveFileDialog"/>.
         /// </summary>
-        public List<FileDialogFilter> Filters { get; set; } = new List<FileDialogFilter>();
+        public List<FileDialogFilter>? Filters { get; set; } = new List<FileDialogFilter>();
 
         /// <summary>
         /// Gets or sets initial file name that is displayed when the dialog is opened.
@@ -26,15 +29,9 @@ namespace Avalonia.Controls
     /// <summary>
     /// Base class for system file and directory dialogs.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public abstract class FileSystemDialog : SystemDialog
     {
-        [Obsolete("Use Directory")]
-        public string? InitialDirectory
-        {
-            get => Directory;
-            set => Directory = value;
-        }
-
         /// <summary>
         /// Gets or sets the initial directory that will be displayed when the file system dialog
         /// is opened.
@@ -45,6 +42,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a system dialog that prompts the user to select a location for saving a file.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public class SaveFileDialog : FileDialog
     {
         /// <summary>
@@ -73,11 +71,27 @@ namespace Avalonia.Controls
             return (await service.ShowFileDialogAsync(this, parent) ??
              Array.Empty<string>()).FirstOrDefault();
         }
+
+        public FilePickerSaveOptions ToFilePickerSaveOptions()
+        {
+            return new FilePickerSaveOptions
+            {
+                SuggestedFileName = InitialFileName,
+                DefaultExtension = DefaultExtension,
+                FileTypeChoices = Filters?.Select(f => new FilePickerFileType(f.Name!) { Patterns = f.Extensions.Select(e => $"*.{e}").ToArray() }).ToArray(),
+                Title = Title,
+                SuggestedStartLocation = Directory is { } directory
+                        ? new BclStorageFolder(new System.IO.DirectoryInfo(directory))
+                        : null,
+                ShowOverwritePrompt = ShowOverwritePrompt
+            };
+        }
     }
 
     /// <summary>
     /// Represents a system dialog that allows the user to select one or more files to open.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public class OpenFileDialog : FileDialog
     {
         /// <summary>
@@ -100,20 +114,27 @@ namespace Avalonia.Controls
             var service = AvaloniaLocator.Current.GetRequiredService<ISystemDialogImpl>();
             return service.ShowFileDialogAsync(this, parent);
         }
+
+        public FilePickerOpenOptions ToFilePickerOpenOptions()
+        {
+            return new FilePickerOpenOptions
+            {
+                AllowMultiple = AllowMultiple,
+                FileTypeFilter = Filters?.Select(f => new FilePickerFileType(f.Name!) { Patterns = f.Extensions.Select(e => $"*.{e}").ToArray() }).ToArray(),
+                Title = Title,
+                SuggestedStartLocation = Directory is { } directory
+                    ? new BclStorageFolder(new System.IO.DirectoryInfo(directory))
+                    : null
+            };
+        }
     }
 
     /// <summary>
     /// Represents a system dialog that allows the user to select a directory.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public class OpenFolderDialog : FileSystemDialog
     {
-        [Obsolete("Use Directory")]
-        public string? DefaultDirectory
-        {
-            get => Directory;
-            set => Directory = value;
-        }
-
         /// <summary>
         /// Shows the open folder dialog.
         /// </summary>
@@ -129,14 +150,35 @@ namespace Avalonia.Controls
             var service = AvaloniaLocator.Current.GetRequiredService<ISystemDialogImpl>();
             return service.ShowFolderDialogAsync(this, parent);
         }
+
+        public FolderPickerOpenOptions ToFolderPickerOpenOptions()
+        {
+            return new FolderPickerOpenOptions
+            {
+                Title = Title,
+                SuggestedStartLocation = Directory is { } directory
+                    ? new BclStorageFolder(new System.IO.DirectoryInfo(directory))
+                    : null
+            };
+        }
     }
 
 
     /// <summary>
     /// Base class for system dialogs.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public abstract class SystemDialog
     {
+        static SystemDialog()
+        {
+            if (AvaloniaLocator.Current.GetService<ISystemDialogImpl>() is null)
+            {
+                // Register default implementation.
+                AvaloniaLocator.CurrentMutable.Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>();
+            }
+        }
+        
         /// <summary>
         /// Gets or sets the dialog title.
         /// </summary>
@@ -146,6 +188,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a filter in an <see cref="OpenFileDialog"/> or an <see cref="SaveFileDialog"/>.
     /// </summary>
+    [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
     public class FileDialogFilter
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index e0ec23b31f..70fecc7ce1 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Avalonia.Collections;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -9,12 +10,15 @@ using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
+using Avalonia.Automation;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A tab control that displays a tab strip along with the content of the selected tab.
     /// </summary>
+    [TemplatePart("PART_ItemsPresenter", typeof(ItemsPresenter))]
     public class TabControl : SelectingItemsControl, IContentPresenterHost
     {
         /// <summary>
@@ -68,6 +72,7 @@ namespace Avalonia.Controls
             ItemsPanelProperty.OverrideDefaultValue<TabControl>(DefaultPanel);
             AffectsMeasure<TabControl>(TabStripPlacementProperty);
             SelectedItemProperty.Changed.AddClassHandler<TabControl>((x, e) => x.UpdateSelectedContent());
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<TabControl>(AutomationControlType.Tab);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/TabItem.cs b/src/Avalonia.Controls/TabItem.cs
index 593643a1eb..f68db4743b 100644
--- a/src/Avalonia.Controls/TabItem.cs
+++ b/src/Avalonia.Controls/TabItem.cs
@@ -1,3 +1,5 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
@@ -31,6 +33,7 @@ namespace Avalonia.Controls
             PressedMixin.Attach<TabItem>();
             FocusableProperty.OverrideDefaultValue(typeof(TabItem), true);
             DataContextProperty.Changed.AddClassHandler<TabItem>((x, e) => x.UpdateHeader(e));
+            AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<TabItem>(AutomationControlType.TabItem);
         }
 
         /// <summary>
@@ -53,6 +56,8 @@ namespace Avalonia.Controls
             set { SetValue(IsSelectedProperty, value); }
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer() => new ListItemAutomationPeer(this);
+
         private void UpdateHeader(AvaloniaPropertyChangedEventArgs obj)
         {
             if (Header == null)
diff --git a/src/Avalonia.Controls/Templates/DataTemplates.cs b/src/Avalonia.Controls/Templates/DataTemplates.cs
index f203539536..d4eeda7908 100644
--- a/src/Avalonia.Controls/Templates/DataTemplates.cs
+++ b/src/Avalonia.Controls/Templates/DataTemplates.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Collections;
 
 namespace Avalonia.Controls.Templates
@@ -13,6 +14,22 @@ namespace Avalonia.Controls.Templates
         public DataTemplates()
         {
             ResetBehavior = ResetBehavior.Remove;
+            
+            Validate += ValidateDataTemplate;
+        }
+
+        private static void ValidateDataTemplate(IDataTemplate template)
+        {
+            var valid = template switch
+            {
+                ITypedDataTemplate typed => typed.DataType is not null,
+                _ => true
+            };
+            
+            if (!valid)
+            {
+                throw new InvalidOperationException("DataTemplate inside of DataTemplates must have a DataType set. Set DataType property or use ItemTemplate with single template instead.");
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Templates/IDataTemplateHost.cs b/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
index 61986a0661..ce763c3336 100644
--- a/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
+++ b/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
@@ -1,9 +1,11 @@
-
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
     /// Defines an element that has a <see cref="DataTemplates"/> collection.
     /// </summary>
+    [NotClientImplementable]
     public interface IDataTemplateHost
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Templates/ITypedDataTemplate.cs b/src/Avalonia.Controls/Templates/ITypedDataTemplate.cs
new file mode 100644
index 0000000000..239dbd79f4
--- /dev/null
+++ b/src/Avalonia.Controls/Templates/ITypedDataTemplate.cs
@@ -0,0 +1,10 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Templates;
+
+public interface ITypedDataTemplate : IDataTemplate
+{
+    [DataType]
+    Type? DataType { get; }
+}
diff --git a/src/Avalonia.Controls/Templates/TemplateResult.cs b/src/Avalonia.Controls/Templates/TemplateResult.cs
deleted file mode 100644
index 770aecc329..0000000000
--- a/src/Avalonia.Controls/Templates/TemplateResult.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Avalonia.Controls.Templates
-{
-    public class TemplateResult<T>
-    {
-        public T Result { get; }
-        public INameScope NameScope { get; }
-
-        public TemplateResult(T result, INameScope nameScope)
-        {
-            Result = result;
-            NameScope = nameScope;
-        }
-
-        public void Deconstruct(out T result, out INameScope scope)
-        {
-            result = Result;
-            scope = NameScope;
-        }
-    }
-}
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index ed012bd8b1..c8e05e5cb3 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -1,16 +1,19 @@
-using System.Reactive.Linq;
-using Avalonia.LogicalTree;
+using System;
+using System.Collections.Generic;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls.Documents;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
-using Avalonia.Layout;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A control that displays a block of text.
     /// </summary>
-    public class TextBlock : Control
+    public class TextBlock : Control, IInlineHost
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -24,69 +27,78 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Thickness> PaddingProperty =
             Decorator.PaddingProperty.AddOwner<TextBlock>();
 
-        // TODO: Define these attached properties elsewhere (e.g. on a Text class) and AddOwner
-        // them into TextBlock.
-
         /// <summary>
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontFamily>(
-                nameof(FontFamily),
-                defaultValue: FontFamily.Default,
-                inherits: true);
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextElement.FontFamilyProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="FontSize"/> property.
         /// </summary>
-        public static readonly AttachedProperty<double> FontSizeProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
-                nameof(FontSize),
-                defaultValue: 12,
-                inherits: true);
+        public static readonly StyledProperty<double> FontSizeProperty =
+            TextElement.FontSizeProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="FontStyle"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontStyle>(
-                nameof(FontStyle),
-                inherits: true);
+        public static readonly StyledProperty<FontStyle> FontStyleProperty =
+            TextElement.FontStyleProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontWeight>(
-                nameof(FontWeight),
-                inherits: true,
-                defaultValue: FontWeight.Normal);
+        public static readonly StyledProperty<FontWeight> FontWeightProperty =
+            TextElement.FontWeightProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
-        public static readonly AttachedProperty<IBrush?> ForegroundProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, IBrush?>(
-                nameof(Foreground),
-                Brushes.Black,
-                inherits: true);
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
+            TextElement.ForegroundProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// DependencyProperty for <see cref="BaselineOffset" /> property.
+        /// </summary>
+        public static readonly AttachedProperty<double> BaselineOffsetProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
+                nameof(BaselineOffset),
+                0,
+                true);
 
         /// <summary>
         /// Defines the <see cref="LineHeight"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> LineHeightProperty =
-            AvaloniaProperty.Register<TextBlock, double>(
+        public static readonly AttachedProperty<double> LineHeightProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
                 nameof(LineHeight),
                 double.NaN,
-                validate: IsValidLineHeight);
+                validate: IsValidLineHeight,
+                inherits: true);
+
+        /// <summary>
+        /// Defines the <see cref="LetterSpacing"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<double> LetterSpacingProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
+                nameof(LetterSpacing),
+                0,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="MaxLines"/> property.
         /// </summary>
-        public static readonly StyledProperty<int> MaxLinesProperty =
-            AvaloniaProperty.Register<TextBlock, int>(
+        public static readonly AttachedProperty<int> MaxLinesProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, int>(
                 nameof(MaxLines),
-                validate: IsValidMaxLines);
+                validate: IsValidMaxLines,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="Text"/> property.
@@ -94,26 +106,32 @@ namespace Avalonia.Controls
         public static readonly DirectProperty<TextBlock, string?> TextProperty =
             AvaloniaProperty.RegisterDirect<TextBlock, string?>(
                 nameof(Text),
-                o => o.Text,
-                (o, v) => o.Text = v);
+                o => o.GetText(),
+                (o, v) => o.SetText(v));
 
         /// <summary>
         /// Defines the <see cref="TextAlignment"/> property.
         /// </summary>
-        public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
-            AvaloniaProperty.Register<TextBlock, TextAlignment>(nameof(TextAlignment));
+        public static readonly AttachedProperty<TextAlignment> TextAlignmentProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, TextAlignment>(
+                nameof(TextAlignment),
+                defaultValue: TextAlignment.Start,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="TextWrapping"/> property.
         /// </summary>
-        public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
-            AvaloniaProperty.Register<TextBlock, TextWrapping>(nameof(TextWrapping));
+        public static readonly AttachedProperty<TextWrapping> TextWrappingProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, TextWrapping>(nameof(TextWrapping),
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="TextTrimming"/> property.
         /// </summary>
-        public static readonly StyledProperty<TextTrimming> TextTrimmingProperty =
-            AvaloniaProperty.Register<TextBlock, TextTrimming>(nameof(TextTrimming));
+        public static readonly AttachedProperty<TextTrimming> TextTrimmingProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, TextTrimming>(nameof(TextTrimming),
+                defaultValue: TextTrimming.None,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="TextDecorations"/> property.
@@ -121,9 +139,17 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<TextDecorationCollection?> TextDecorationsProperty =
             AvaloniaProperty.Register<TextBlock, TextDecorationCollection?>(nameof(TextDecorations));
 
-        private string? _text;
-        private TextLayout? _textLayout;
-        private Size _constraint;
+        /// <summary>
+        /// Defines the <see cref="Inlines"/> property.
+        /// </summary>
+        public static readonly StyledProperty<InlineCollection?> InlinesProperty =
+            AvaloniaProperty.Register<TextBlock, InlineCollection?>(
+                nameof(Inlines));
+
+        internal string? _text;
+        protected TextLayout? _textLayout;
+        protected Size _constraint;
+        private IReadOnlyList<TextRun>? _textRuns;
 
         /// <summary>
         /// Initializes static members of the <see cref="TextBlock"/> class.
@@ -131,26 +157,27 @@ namespace Avalonia.Controls
         static TextBlock()
         {
             ClipToBoundsProperty.OverrideDefaultValue<TextBlock>(true);
-            
+
             AffectsRender<TextBlock>(BackgroundProperty, ForegroundProperty);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextBlock"/> class.
-        /// </summary>
         public TextBlock()
         {
-            _text = string.Empty;
+            Inlines = new InlineCollection
+            {
+                LogicalChildren = LogicalChildren,
+                InlineHost = this
+            };
         }
 
         /// <summary>
         /// Gets the <see cref="TextLayout"/> used to render the text.
         /// </summary>
-        public TextLayout? TextLayout
+        public TextLayout TextLayout
         {
             get
             {
-                return _textLayout ?? (_textLayout = CreateTextLayout(_constraint, Text));
+                return _textLayout ??= CreateTextLayout(_text);
             }
         }
 
@@ -175,15 +202,14 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the text.
         /// </summary>
-        [Content]
         public string? Text
         {
-            get { return _text; }
-            set { SetAndRaise(TextProperty, ref _text, value); }
+            get => GetText();
+            set => SetText(value);
         }
 
         /// <summary>
-        /// Gets or sets the font family.
+        /// Gets or sets the font family used to draw the control's text.
         /// </summary>
         public FontFamily FontFamily
         {
@@ -192,7 +218,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the font size.
+        /// Gets or sets the size of the control's text in points.
         /// </summary>
         public double FontSize
         {
@@ -201,7 +227,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the font style.
+        /// Gets or sets the font style used to draw the control's text.
         /// </summary>
         public FontStyle FontStyle
         {
@@ -210,7 +236,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the font weight.
+        /// Gets or sets the font weight used to draw the control's text.
         /// </summary>
         public FontWeight FontWeight
         {
@@ -219,7 +245,16 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets a brush used to paint the text.
+        /// Gets or sets the font stretch used to draw the control's text.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush used to draw the control's text and other foreground elements.
         /// </summary>
         public IBrush? Foreground
         {
@@ -236,6 +271,15 @@ namespace Avalonia.Controls
             set => SetValue(LineHeightProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the letter spacing.
+        /// </summary>
+        public double LetterSpacing
+        {
+            get => GetValue(LetterSpacingProperty);
+            set => SetValue(LetterSpacingProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the maximum number of text lines.
         /// </summary>
@@ -282,108 +326,229 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// Gets or sets the inlines.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font family.</returns>
-        public static FontFamily GetFontFamily(Control control)
+        [Content]
+        public InlineCollection? Inlines
         {
-            return control.GetValue(FontFamilyProperty);
+            get => GetValue(InlinesProperty);
+            set => SetValue(InlinesProperty, value);
         }
 
+        protected override bool BypassFlowDirectionPolicies => true;
+
+        internal bool HasComplexContent => Inlines != null && Inlines.Count > 0;
+
         /// <summary>
-        /// Gets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// The BaselineOffset property provides an adjustment to baseline offset
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font family.</returns>
-        public static double GetFontSize(Control control)
+        public double BaselineOffset
         {
-            return control.GetValue(FontSizeProperty);
+            get { return (double)GetValue(BaselineOffsetProperty); }
+            set { SetValue(BaselineOffsetProperty, value); }
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font family.</returns>
-        public static FontStyle GetFontStyle(Control control)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static double GetBaselineOffset(Control control)
         {
-            return control.GetValue(FontStyleProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(BaselineOffsetProperty);
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font family.</returns>
-        public static FontWeight GetFontWeight(Control control)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="value">The property value to set</param>
+        public static void SetBaselineOffset(Control control, double value)
         {
-            return control.GetValue(FontWeightProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(BaselineOffsetProperty, value);
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The foreground.</returns>
-        public static IBrush? GetForeground(Control control)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static TextAlignment GetTextAlignment(Control control)
         {
-            return control.GetValue(ForegroundProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(TextAlignmentProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        /// <returns>The font family.</returns>
-        public static void SetFontFamily(Control control, FontFamily value)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="alignment">The property value to set</param>
+        public static void SetTextAlignment(Control control, TextAlignment alignment)
         {
-            control.SetValue(FontFamilyProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(TextAlignmentProperty, alignment);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        /// <returns>The font family.</returns>
-        public static void SetFontSize(Control control, double value)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static TextWrapping GetTextWrapping(Control control)
         {
-            control.SetValue(FontSizeProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(TextWrappingProperty);
+        }
+
+        /// <summary>
+        /// Writes the attached property BaselineOffset to the given element.
+        /// </summary>
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="wrapping">The property value to set</param>
+        public static void SetTextWrapping(Control control, TextWrapping wrapping)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(TextWrappingProperty, wrapping);
+        }
+
+        /// <summary>
+        /// Reads the attached property from the given element
+        /// </summary>
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static TextTrimming GetTextTrimming(Control control)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(TextTrimmingProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        /// <returns>The font family.</returns>
-        public static void SetFontStyle(Control control, FontStyle value)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="trimming">The property value to set</param>
+        public static void SetTextTrimming(Control control, TextTrimming trimming)
         {
-            control.SetValue(FontStyleProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(TextTrimmingProperty, trimming);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        /// <returns>The font family.</returns>
-        public static void SetFontWeight(Control control, FontWeight value)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static double GetLineHeight(Control control)
         {
-            control.SetValue(FontWeightProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(LineHeightProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        /// <returns>The font family.</returns>
-        public static void SetForeground(Control control, IBrush? value)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="height">The property value to set</param>
+        public static void SetLineHeight(Control control, double height)
         {
-            control.SetValue(ForegroundProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(LineHeightProperty, height);
+        }
+
+        /// <summary>
+        /// Reads the attached property from the given element
+        /// </summary>
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static double GetLetterSpacing(Control control)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(LetterSpacingProperty);
+        }
+
+        /// <summary>
+        /// Writes the attached property LetterSpacing to the given element.
+        /// </summary>
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="letterSpacing">The property value to set</param>
+        public static void SetLetterSpacing(Control control, double letterSpacing)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(LetterSpacingProperty, letterSpacing);
+        }
+
+        /// <summary>
+        /// Reads the attached property from the given element
+        /// </summary>
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static int GetMaxLines(Control control)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(MaxLinesProperty);
+        }
+
+        /// <summary>
+        /// Writes the attached property BaselineOffset to the given element.
+        /// </summary>
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="maxLines">The property value to set</param>
+        public static void SetMaxLines(Control control, int maxLines)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(MaxLinesProperty, maxLines);
         }
 
         /// <summary>
@@ -399,57 +564,81 @@ namespace Avalonia.Controls
                 context.FillRectangle(background, new Rect(Bounds.Size));
             }
 
-            if (TextLayout is null)
-            {
-                return;
-            }
-            
             var padding = Padding;
             var top = padding.Top;
-            var textSize = TextLayout.Size;
+            var textHeight = TextLayout.Bounds.Height;
 
-            if (Bounds.Height < textSize.Height)
+            if (Bounds.Height < textHeight)
             {
                 switch (VerticalAlignment)
                 {
                     case VerticalAlignment.Center:
-                        top += (Bounds.Height - textSize.Height) / 2;
+                        top += (Bounds.Height - textHeight) / 2;
                         break;
 
                     case VerticalAlignment.Bottom:
-                        top += (Bounds.Height - textSize.Height);
+                        top += (Bounds.Height - textHeight);
                         break;
                 }
             }
 
-            TextLayout.Draw(context, new Point(padding.Left, top));
+            RenderTextLayout(context, new Point(padding.Left, top));
+        }
+
+        protected virtual void RenderTextLayout(DrawingContext context, Point origin)
+        {
+            TextLayout.Draw(context, origin);
+        }
+
+        protected virtual string? GetText()
+        {
+            return _text ?? Inlines?.Text;
+        }
+
+        protected virtual void SetText(string? text)
+        {
+            if (HasComplexContent)
+            {
+                Inlines?.Clear();
+            }
+           
+            SetAndRaise(TextProperty, ref _text, text);           
         }
 
         /// <summary>
         /// Creates the <see cref="TextLayout"/> used to render the text.
         /// </summary>
-        /// <param name="constraint">The constraint of the text.</param>
-        /// <param name="text">The text to format.</param>
         /// <returns>A <see cref="TextLayout"/> object.</returns>
-        protected virtual TextLayout? CreateTextLayout(Size constraint, string? text)
+        protected virtual TextLayout CreateTextLayout(string? text)
         {
-            if (constraint == Size.Empty)
+            var typeface = new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
+
+            var defaultProperties = new GenericTextRunProperties(
+                typeface,
+                FontSize,
+                TextDecorations,
+                Foreground);
+
+            var paragraphProperties = new GenericTextParagraphProperties(FlowDirection, TextAlignment, true, false,
+                defaultProperties, TextWrapping, LineHeight, 0, LetterSpacing);
+
+            ITextSource textSource;
+
+            if (_textRuns != null)
             {
-                return null;
+                textSource = new InlinesTextSource(_textRuns);
+            }
+            else
+            {
+                textSource = new SimpleTextSource((text ?? "").AsMemory(), defaultProperties);
             }
 
             return new TextLayout(
-                text ?? string.Empty,
-                new Typeface(FontFamily, FontStyle, FontWeight),
-                FontSize,
-                Foreground ?? Brushes.Transparent,
-                TextAlignment,
-                TextWrapping,
+                textSource,
+                paragraphProperties,
                 TextTrimming,
-                TextDecorations,
-                FlowDirection,
-                constraint.Width,
-                constraint.Height,
+                _constraint.Width,
+                _constraint.Height,
                 maxLines: MaxLines,
                 lineHeight: LineHeight);
         }
@@ -460,69 +649,251 @@ namespace Avalonia.Controls
         protected void InvalidateTextLayout()
         {
             _textLayout = null;
-            
+
+            InvalidateVisual();
+
             InvalidateMeasure();
         }
 
-        /// <summary>
-        /// Measures the control.
-        /// </summary>
-        /// <param name="availableSize">The available size for the control.</param>
-        /// <returns>The desired size.</returns>
         protected override Size MeasureOverride(Size availableSize)
         {
-            if (string.IsNullOrEmpty(Text))
-            {
-                return new Size();
-            }
+            var scale = LayoutHelper.GetLayoutScale(this);
 
-            var padding = Padding;
+            var padding = LayoutHelper.RoundLayoutThickness(Padding, scale, scale);
+
+            _constraint = availableSize.Deflate(padding);
+
+            _textLayout = null;
 
-            availableSize = availableSize.Deflate(padding);
+            var inlines = Inlines;
 
-            if (_constraint != availableSize)
+            if (HasComplexContent)
             {
-                _constraint = availableSize;
+                if (_textRuns != null)
+                {
+                    foreach (var textRun in _textRuns)
+                    {
+                        if (textRun is EmbeddedControlRun controlRun &&
+                            controlRun.Control is Control control)
+                        {
+                            VisualChildren.Remove(control);
+
+                            LogicalChildren.Remove(control);
+                        }
+                    }
+                }
+
+                var textRuns = new List<TextRun>();
 
-                InvalidateTextLayout();
+                foreach (var inline in inlines!)
+                {
+                    inline.BuildTextRun(textRuns);
+                }
+
+                foreach (var textRun in textRuns)
+                {
+                    if (textRun is EmbeddedControlRun controlRun &&
+                        controlRun.Control is Control control)
+                    {
+                        VisualChildren.Add(control);
+
+                        LogicalChildren.Add(control);
+
+                        control.Measure(Size.Infinity);
+                    }
+                }
+
+                _textRuns = textRuns;
             }
 
-            var measuredSize = TextLayout?.Size ?? Size.Empty;
+            var measuredSize = TextLayout.Bounds.Size.Inflate(padding);
 
-            return measuredSize.Inflate(padding);
+            return measuredSize;
         }
 
-        private static bool IsValidMaxLines(int maxLines) => maxLines >= 0;
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var textWidth = Math.Ceiling(TextLayout.Bounds.Width);
 
-        private static bool IsValidLineHeight(double lineHeight) => double.IsNaN(lineHeight) || lineHeight > 0;
+            if (finalSize.Width < textWidth)
+            {
+                finalSize = finalSize.WithWidth(textWidth);
+            }
+
+            var scale = LayoutHelper.GetLayoutScale(this);
+
+            var padding = LayoutHelper.RoundLayoutThickness(Padding, scale, scale);
+
+            _constraint = new Size(Math.Ceiling(finalSize.Deflate(padding).Width), double.PositiveInfinity);
+
+            _textLayout = null;
+
+            if (HasComplexContent)
+            {
+                var currentY = padding.Top;
+
+                foreach (var textLine in TextLayout.TextLines)
+                {
+                    var currentX = padding.Left + textLine.Start;
+
+                    foreach (var run in textLine.TextRuns)
+                    {
+                        if (run is DrawableTextRun drawable)
+                        {
+                            if (drawable is EmbeddedControlRun controlRun
+                                && controlRun.Control is Control control)
+                            {
+                                control.Arrange(new Rect(new Point(currentX, currentY), control.DesiredSize));
+                            }
+
+                            currentX += drawable.Size.Width;
+                        }
+                    }
+
+                    currentY += textLine.Height;
+                }
+            }
+
+            return finalSize;
+        }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new TextBlockAutomationPeer(this);
+        }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             switch (change.Property.Name)
             {
-                case nameof (FontSize):
-                case nameof (FontWeight):
-                case nameof (FontStyle):
-                case nameof (FontFamily):
+                case nameof(FontSize):
+                case nameof(FontWeight):
+                case nameof(FontStyle):
+                case nameof(FontFamily):
+                case nameof(FontStretch):
 
-                case nameof (TextWrapping):
-                case nameof (TextTrimming):
-                case nameof (TextAlignment):
-                case nameof (FlowDirection):
+                case nameof(TextWrapping):
+                case nameof(TextTrimming):
+                case nameof(TextAlignment):
+
+                case nameof(FlowDirection):
 
                 case nameof (Padding):
                 case nameof (LineHeight):
+                case nameof (LetterSpacing):
                 case nameof (MaxLines):
 
-                case nameof (Text):
-                case nameof (TextDecorations):
-                case nameof (Foreground):
+                case nameof(Text):
+                case nameof(TextDecorations):
+                case nameof(Foreground):
+                    {
+                        InvalidateTextLayout();
+                        break;
+                    }
+                case nameof(Inlines):
+                    {
+                        OnInlinesChanged(change.OldValue as InlineCollection, change.NewValue as InlineCollection);
+                        InvalidateTextLayout();
+                        break;
+                    }
+            }
+        }
+
+        private static bool IsValidMaxLines(int maxLines) => maxLines >= 0;
+
+        private static bool IsValidLineHeight(double lineHeight) => double.IsNaN(lineHeight) || lineHeight > 0;
+
+        private void OnInlinesChanged(InlineCollection? oldValue, InlineCollection? newValue)
+        {
+            if (oldValue is not null)
+            {
+                oldValue.LogicalChildren = null;
+                oldValue.InlineHost = null;
+                oldValue.Invalidated -= (s, e) => InvalidateTextLayout();
+            }
+
+            if (newValue is not null)
+            {
+                newValue.LogicalChildren = LogicalChildren;
+                newValue.InlineHost = this;
+                newValue.Invalidated += (s, e) => InvalidateTextLayout();
+            }
+        }
+
+        void IInlineHost.Invalidate()
+        {
+            InvalidateTextLayout();
+        }
+
+        protected readonly struct SimpleTextSource : ITextSource
+        {
+            private readonly ReadOnlySlice<char> _text;
+            private readonly TextRunProperties _defaultProperties;
+
+            public SimpleTextSource(ReadOnlySlice<char> text, TextRunProperties defaultProperties)
+            {
+                _text = text;
+                _defaultProperties = defaultProperties;
+            }
+
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                if (textSourceIndex > _text.Length)
                 {
-                    InvalidateTextLayout();
-                    break;
+                    return new TextEndOfParagraph();
                 }
+
+                var runText = _text.Skip(textSourceIndex);
+
+                if (runText.IsEmpty)
+                {
+                    return new TextEndOfParagraph();
+                }
+
+                return new TextCharacters(runText, _defaultProperties);
+            }
+        }
+
+        private readonly struct InlinesTextSource : ITextSource
+        {
+            private readonly IReadOnlyList<TextRun> _textRuns;
+
+            public InlinesTextSource(IReadOnlyList<TextRun> textRuns)
+            {
+                _textRuns = textRuns;
+            }
+
+            public IReadOnlyList<TextRun> TextRuns => _textRuns;
+
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                var currentPosition = 0;
+
+                foreach (var textRun in _textRuns)
+                {
+                    if (textRun.TextSourceLength == 0)
+                    {
+                        continue;
+                    }
+
+                    if (textSourceIndex >= currentPosition + textRun.TextSourceLength)
+                    {
+                        currentPosition += textRun.TextSourceLength;
+
+                        continue;
+                    }
+
+                    if (textRun is TextCharacters)
+                    {
+                        return new TextCharacters(textRun.Text.Skip(Math.Max(0, textSourceIndex - currentPosition)), textRun.Properties!);
+                    }
+
+                    return textRun;
+                }
+
+                return null;
             }
         }
     }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 4ec0c4c5e1..d5b45398e7 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -16,12 +16,16 @@ using Avalonia.Utilities;
 using Avalonia.Controls.Metadata;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Automation.Peers;
+using System.Diagnostics;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents a control that can be used to display or edit unformatted text.
     /// </summary>
+    [TemplatePart("PART_TextPresenter", typeof(TextPresenter))]
     [PseudoClasses(":empty")]
     public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {
@@ -53,13 +57,13 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<TextBox, char>(nameof(PasswordChar));
 
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionBrushProperty));
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionBrush));
 
         public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionForegroundBrushProperty));
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionForegroundBrush));
 
         public static readonly StyledProperty<IBrush?> CaretBrushProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(CaretBrushProperty));
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(CaretBrush));
 
         public static readonly DirectProperty<TextBox, int> SelectionStartProperty =
             AvaloniaProperty.RegisterDirect<TextBox, int>(
@@ -76,6 +80,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<int> MaxLengthProperty =
             AvaloniaProperty.Register<TextBox, int>(nameof(MaxLength), defaultValue: 0);
 
+        public static readonly StyledProperty<int> MaxLinesProperty =
+            AvaloniaProperty.Register<TextBox, int>(nameof(MaxLines), defaultValue: 0);
+
         public static readonly DirectProperty<TextBox, string?> TextProperty =
             TextBlock.TextProperty.AddOwnerWithDataValidation<TextBox>(
                 o => o.Text,
@@ -101,6 +108,18 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();
 
+        /// <summary>
+        /// Defines see <see cref="TextPresenter.LineHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            TextBlock.LineHeightProperty.AddOwner<TextBox>();
+
+        /// <summary>
+        /// Defines see <see cref="TextBlock.LetterSpacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LetterSpacingProperty =
+            TextBlock.LetterSpacingProperty.AddOwner<TextBox>();
+
         public static readonly StyledProperty<string?> WatermarkProperty =
             AvaloniaProperty.Register<TextBox, string?>(nameof(Watermark));
 
@@ -147,17 +166,40 @@ namespace Avalonia.Controls
                 (o, v) => o.UndoLimit = v,
                 unsetValue: -1);
 
+        /// <summary>
+        /// Defines the <see cref="CopyingToClipboard"/> event.
+        /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent =
             RoutedEvent.Register<TextBox, RoutedEventArgs>(
-                "CopyingToClipboard", RoutingStrategies.Bubble);
+                nameof(CopyingToClipboard), RoutingStrategies.Bubble);
 
+        /// <summary>
+        /// Defines the <see cref="CuttingToClipboard"/> event.
+        /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> CuttingToClipboardEvent =
             RoutedEvent.Register<TextBox, RoutedEventArgs>(
-                "CuttingToClipboard", RoutingStrategies.Bubble);
+                nameof(CuttingToClipboard), RoutingStrategies.Bubble);
 
+        /// <summary>
+        /// Defines the <see cref="PastingFromClipboard"/> event.
+        /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> PastingFromClipboardEvent =
             RoutedEvent.Register<TextBox, RoutedEventArgs>(
-                "PastingFromClipboard", RoutingStrategies.Bubble);
+                nameof(PastingFromClipboard), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="TextChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextChangedEventArgs> TextChangedEvent =
+            RoutedEvent.Register<TextBox, TextChangedEventArgs>(
+                nameof(TextChanged), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="TextChanging"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextChangingEventArgs> TextChangingEvent =
+            RoutedEvent.Register<TextBox, TextChangingEventArgs>(
+                nameof(TextChanging), RoutingStrategies.Bubble);
 
         readonly struct UndoRedoState : IEquatable<UndoRedoState>
         {
@@ -185,13 +227,13 @@ namespace Avalonia.Controls
         private TextBoxTextInputMethodClient _imClient = new TextBoxTextInputMethodClient();
         private UndoRedoHelper<UndoRedoState> _undoRedoHelper;
         private bool _isUndoingRedoing;
-        private bool _ignoreTextChanges;
         private bool _canCut;
         private bool _canCopy;
         private bool _canPaste;
         private string _newLine = Environment.NewLine;
         private static readonly string[] invalidCharacters = new String[1] { "\u007f" };
 
+        private int _wordSelectionStart = -1;
         private int _selectedTextChangesMadeSinceLastUndoSnapshot;
         private bool _hasDoneSnapshotOnce;
         private const int _maxCharsBeforeUndoSnapshot = 7;
@@ -201,7 +243,10 @@ namespace Avalonia.Controls
             FocusableProperty.OverrideDefaultValue(typeof(TextBox), true);
             TextInputMethodClientRequestedEvent.AddClassHandler<TextBox>((tb, e) =>
             {
-                e.Client = tb._imClient;
+                if (!tb.IsReadOnly)
+                {
+                    e.Client = tb._imClient;
+                }
             });
         }
 
@@ -231,23 +276,19 @@ namespace Avalonia.Controls
 
         public bool AcceptsReturn
         {
-            get { return GetValue(AcceptsReturnProperty); }
-            set { SetValue(AcceptsReturnProperty, value); }
+            get => GetValue(AcceptsReturnProperty);
+            set => SetValue(AcceptsReturnProperty, value);
         }
 
         public bool AcceptsTab
         {
-            get { return GetValue(AcceptsTabProperty); }
-            set { SetValue(AcceptsTabProperty, value); }
+            get => GetValue(AcceptsTabProperty);
+            set => SetValue(AcceptsTabProperty, value);
         }
 
         public int CaretIndex
         {
-            get
-            {
-                return _caretIndex;
-            }
-
+            get => _caretIndex;
             set
             {
                 value = CoerceCaretIndex(value);
@@ -256,13 +297,15 @@ namespace Avalonia.Controls
                 UndoRedoState state;
                 if (IsUndoEnabled && _undoRedoHelper.TryGetLastState(out state) && state.Text == Text)
                     _undoRedoHelper.UpdateLastState();
+
+                SelectionStart = SelectionEnd = value;
             }
         }
 
         public bool IsReadOnly
         {
-            get { return GetValue(IsReadOnlyProperty); }
-            set { SetValue(IsReadOnlyProperty, value); }
+            get => GetValue(IsReadOnlyProperty);
+            set => SetValue(IsReadOnlyProperty, value);
         }
 
         public char PasswordChar
@@ -291,45 +334,38 @@ namespace Avalonia.Controls
 
         public int SelectionStart
         {
-            get
-            {
-                return _selectionStart;
-            }
-
+            get => _selectionStart;
             set
             {
                 value = CoerceCaretIndex(value);
                 var changed = SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
+
                 if (changed)
                 {
                     UpdateCommandStates();
                 }
-                
-                if (value == SelectionEnd)
+
+                if (SelectionEnd == value && CaretIndex != value)
                 {
-                    CaretIndex = SelectionStart;
+                    CaretIndex = value;
                 }
             }
         }
 
         public int SelectionEnd
         {
-            get
-            {
-                return _selectionEnd;
-            }
-
+            get => _selectionEnd;
             set
             {
                 value = CoerceCaretIndex(value);
                 var changed = SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
-                
+
                 if (changed)
                 {
                     UpdateCommandStates();
                 }
 
-                if (value == SelectionStart)
+                if (SelectionStart == value && CaretIndex != value)
                 {
                     CaretIndex = value;
                 }
@@ -338,36 +374,63 @@ namespace Avalonia.Controls
 
         public int MaxLength
         {
-            get { return GetValue(MaxLengthProperty); }
-            set { SetValue(MaxLengthProperty, value); }
+            get => GetValue(MaxLengthProperty);
+            set => SetValue(MaxLengthProperty, value);
+        }
+
+        public int MaxLines
+        {
+            get => GetValue(MaxLinesProperty);
+            set => SetValue(MaxLinesProperty, value);
+        }
+
+        public double LetterSpacing
+        {
+            get => GetValue(LetterSpacingProperty);
+            set => SetValue(LetterSpacingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the line height.
+        /// </summary>
+        public double LineHeight
+        {
+            get => GetValue(LineHeightProperty);
+            set => SetValue(LineHeightProperty, value);
         }
 
         [Content]
         public string? Text
         {
-            get { return _text; }
+            get => _text;
             set
             {
-                if (!_ignoreTextChanges)
+                var caretIndex = CaretIndex;
+                var selectionStart = SelectionStart;
+                var selectionEnd = SelectionEnd;
+
+                CaretIndex = CoerceCaretIndex(caretIndex, value);
+                SelectionStart = CoerceCaretIndex(selectionStart, value);
+                SelectionEnd = CoerceCaretIndex(selectionEnd, value);
+
+                var textChanged = SetAndRaise(TextProperty, ref _text, value);
+
+                if (textChanged && IsUndoEnabled && !_isUndoingRedoing)
                 {
-                    var caretIndex = CaretIndex;
-                    
-                    SelectionStart = CoerceCaretIndex(SelectionStart, value);
-                    SelectionEnd = CoerceCaretIndex(SelectionEnd, value);
-                    CaretIndex = CoerceCaretIndex(caretIndex, value);
+                    _undoRedoHelper.Clear();
+                    SnapshotUndoRedo(); // so we always have an initial state
+                }
 
-                    if (SetAndRaise(TextProperty, ref _text, value) && IsUndoEnabled && !_isUndoingRedoing)
-                    {
-                        _undoRedoHelper.Clear();
-                        SnapshotUndoRedo(); // so we always have an initial state
-                    }
+                if (textChanged)
+                {
+                    RaiseTextChangeEvents();
                 }
             }
         }
 
         public string SelectedText
         {
-            get { return GetSelection(); }
+            get => GetSelection();
             set
             {
                 if (string.IsNullOrEmpty(value))
@@ -388,8 +451,8 @@ namespace Avalonia.Controls
         /// </summary>
         public HorizontalAlignment HorizontalContentAlignment
         {
-            get { return GetValue(HorizontalContentAlignmentProperty); }
-            set { SetValue(HorizontalContentAlignmentProperty, value); }
+            get => GetValue(HorizontalContentAlignmentProperty);
+            set => SetValue(HorizontalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -397,50 +460,58 @@ namespace Avalonia.Controls
         /// </summary>
         public VerticalAlignment VerticalContentAlignment
         {
-            get { return GetValue(VerticalContentAlignmentProperty); }
-            set { SetValue(VerticalContentAlignmentProperty, value); }
+            get => GetValue(VerticalContentAlignmentProperty);
+            set => SetValue(VerticalContentAlignmentProperty, value);
         }
 
         public TextAlignment TextAlignment
         {
-            get { return GetValue(TextAlignmentProperty); }
-            set { SetValue(TextAlignmentProperty, value); }
+            get => GetValue(TextAlignmentProperty);
+            set => SetValue(TextAlignmentProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the placeholder or descriptive text that is displayed even if the <see cref="Text"/>
+        /// property is not yet set.
+        /// </summary>
         public string? Watermark
         {
-            get { return GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
+            get => GetValue(WatermarkProperty);
+            set => SetValue(WatermarkProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the <see cref="Watermark"/> will still be shown above the
+        /// <see cref="Text"/> even after a text value is set.
+        /// </summary>
         public bool UseFloatingWatermark
         {
-            get { return GetValue(UseFloatingWatermarkProperty); }
-            set { SetValue(UseFloatingWatermarkProperty, value); }
+            get => GetValue(UseFloatingWatermarkProperty);
+            set => SetValue(UseFloatingWatermarkProperty, value);
         }
 
         public object InnerLeftContent
         {
-            get { return GetValue(InnerLeftContentProperty); }
-            set { SetValue(InnerLeftContentProperty, value); }
+            get => GetValue(InnerLeftContentProperty);
+            set => SetValue(InnerLeftContentProperty, value);
         }
 
         public object InnerRightContent
         {
-            get { return GetValue(InnerRightContentProperty); }
-            set { SetValue(InnerRightContentProperty, value); }
+            get => GetValue(InnerRightContentProperty);
+            set => SetValue(InnerRightContentProperty, value);
         }
 
         public bool RevealPassword
         {
-            get { return GetValue(RevealPasswordProperty); }
-            set { SetValue(RevealPasswordProperty, value); }
+            get => GetValue(RevealPasswordProperty);
+            set => SetValue(RevealPasswordProperty, value);
         }
 
         public TextWrapping TextWrapping
         {
-            get { return GetValue(TextWrappingProperty); }
-            set { SetValue(TextWrappingProperty, value); }
+            get => GetValue(TextWrappingProperty);
+            set => SetValue(TextWrappingProperty, value);
         }
 
         /// <summary>
@@ -448,8 +519,8 @@ namespace Avalonia.Controls
         /// </summary>
         public string NewLine
         {
-            get { return _newLine; }
-            set { SetAndRaise(NewLineProperty, ref _newLine, value); }
+            get => _newLine;
+            set => SetAndRaise(NewLineProperty, ref _newLine, value);
         }
 
         /// <summary>
@@ -457,7 +528,7 @@ namespace Avalonia.Controls
         /// </summary>
         public void ClearSelection()
         {
-            SelectionStart = SelectionEnd = CaretIndex;
+            CaretIndex = SelectionStart;
         }
 
         /// <summary>
@@ -465,8 +536,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanCut
         {
-            get { return _canCut; }
-            private set { SetAndRaise(CanCutProperty, ref _canCut, value); }
+            get => _canCut;
+            private set => SetAndRaise(CanCutProperty, ref _canCut, value);
         }
 
         /// <summary>
@@ -474,8 +545,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanCopy
         {
-            get { return _canCopy; }
-            private set { SetAndRaise(CanCopyProperty, ref _canCopy, value); }
+            get => _canCopy;
+            private set => SetAndRaise(CanCopyProperty, ref _canCopy, value);
         }
 
         /// <summary>
@@ -483,8 +554,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanPaste
         {
-            get { return _canPaste; }
-            private set { SetAndRaise(CanPasteProperty, ref _canPaste, value); }
+            get => _canPaste;
+            private set => SetAndRaise(CanPasteProperty, ref _canPaste, value);
         }
 
         /// <summary>
@@ -492,13 +563,13 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsUndoEnabled
         {
-            get { return GetValue(IsUndoEnabledProperty); }
-            set { SetValue(IsUndoEnabledProperty, value); }
+            get => GetValue(IsUndoEnabledProperty);
+            set => SetValue(IsUndoEnabledProperty, value);
         }
 
         public int UndoLimit
         {
-            get { return _undoRedoHelper.Limit; }
+            get => _undoRedoHelper.Limit;
             set
             {
                 if (_undoRedoHelper.Limit != value)
@@ -537,12 +608,33 @@ namespace Avalonia.Controls
             remove => RemoveHandler(PastingFromClipboardEvent, value);
         }
 
+        /// <summary>
+        /// Occurs asynchronously after text changes and the new text is rendered.
+        /// </summary>
+        public event EventHandler<TextChangedEventArgs>? TextChanged
+        {
+            add => AddHandler(TextChangedEvent, value);
+            remove => RemoveHandler(TextChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs synchronously when text starts to change but before it is rendered.
+        /// </summary>
+        /// <remarks>
+        /// This event occurs just after the <see cref="Text"/> property value has been updated.
+        /// </remarks>
+        public event EventHandler<TextChangingEventArgs>? TextChanging
+        {
+            add => AddHandler(TextChangingEvent, value);
+            remove => RemoveHandler(TextChangingEvent, value);
+        }
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
 
             _imClient.SetPresenter(_presenter, this);
-            
+
             if (IsFocused)
             {
                 _presenter?.ShowCaret();
@@ -552,7 +644,7 @@ namespace Avalonia.Controls
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            
+
             if (IsFocused)
             {
                 _presenter?.ShowCaret();
@@ -562,11 +654,11 @@ namespace Avalonia.Controls
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
-            
+
             _imClient.SetPresenter(null, null);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -575,7 +667,7 @@ namespace Avalonia.Controls
                 UpdatePseudoclasses();
                 UpdateCommandStates();
             }
-            else if (change.Property == IsUndoEnabledProperty && change.NewValue.GetValueOrDefault<bool>() == false)
+            else if (change.Property == IsUndoEnabledProperty && change.GetNewValue<bool>() == false)
             {
                 // from docs at
                 // https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.primitives.textboxbase.isundoenabled:
@@ -612,7 +704,7 @@ namespace Avalonia.Controls
             }
 
             UpdateCommandStates();
-            
+
             _imClient.SetPresenter(_presenter, this);
 
             _presenter?.ShowCaret();
@@ -632,7 +724,7 @@ namespace Avalonia.Controls
             UpdateCommandStates();
 
             _presenter?.HideCaret();
-            
+
             _imClient.SetPresenter(null, null);
         }
 
@@ -661,6 +753,39 @@ namespace Avalonia.Controls
             _selectedTextChangesMadeSinceLastUndoSnapshot++;
             SnapshotUndoRedo(ignoreChangeCount: false);
 
+            if (_presenter != null && MaxLines > 0)
+            {
+                var lineCount = _presenter.TextLayout.TextLines.Count;
+
+                var length = 0;
+
+                var graphemeEnumerator = new GraphemeEnumerator(input.AsMemory());
+
+                while (graphemeEnumerator.MoveNext())
+                {
+                    var grapheme = graphemeEnumerator.Current;
+
+                    if (grapheme.FirstCodepoint.IsBreakChar)
+                    {
+                        if (lineCount + 1 > MaxLines)
+                        {
+                            break;
+                        }
+                        else
+                        {
+                            lineCount++;
+                        }
+                    }
+
+                    length += grapheme.Text.Length;
+                }
+
+                if (length < input.Length)
+                {
+                    input = input.Remove(Math.Max(0, length));
+                }
+            }
+
             var text = Text ?? string.Empty;
             var newLength = input.Length + text.Length - Math.Abs(SelectionStart - SelectionEnd);
 
@@ -673,32 +798,23 @@ namespace Avalonia.Controls
             {
                 var oldText = _text;
 
-                _ignoreTextChanges = true;
+                DeleteSelection(false);
+                var caretIndex = CaretIndex;
+                text = Text ?? string.Empty;
+                SetTextInternal(text.Substring(0, caretIndex) + input + text.Substring(caretIndex));
+                ClearSelection();
 
-                try
+                if (IsUndoEnabled)
                 {
-                    DeleteSelection(false);
-                    var caretIndex = CaretIndex;
-                    text = Text ?? string.Empty;
-                    SetTextInternal(text.Substring(0, caretIndex) + input + text.Substring(caretIndex));
-                    ClearSelection();
-                    
-                    if (IsUndoEnabled)
-                    {
-                        _undoRedoHelper.DiscardRedo();
-                    }
-
-                    if (_text != oldText)
-                    {
-                        RaisePropertyChanged(TextProperty, oldText, _text);
-                    }
-                    
-                    CaretIndex = caretIndex + input.Length;
+                    _undoRedoHelper.DiscardRedo();
                 }
-                finally
+
+                if (_text != oldText)
                 {
-                    _ignoreTextChanges = false;
+                    RaisePropertyChanged(TextProperty, oldText, _text);
                 }
+
+                CaretIndex = caretIndex + input.Length;
             }
         }
 
@@ -779,7 +895,12 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
+            if (!string.IsNullOrEmpty(_presenter.PreeditText))
+            {
+                return;
+            }
+
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
             var movement = false;
@@ -855,6 +976,7 @@ namespace Avalonia.Controls
                 movement = true;
                 selection = false;
                 handled = true;
+                CaretIndex = _presenter.CaretIndex;
             }
             else if (Match(keymap.MoveCursorToTheEndOfDocument))
             {
@@ -862,6 +984,7 @@ namespace Avalonia.Controls
                 movement = true;
                 selection = false;
                 handled = true;
+                CaretIndex = _presenter.CaretIndex;
             }
             else if (Match(keymap.MoveCursorToTheStartOfLine))
             {
@@ -869,7 +992,7 @@ namespace Avalonia.Controls
                 movement = true;
                 selection = false;
                 handled = true;
-
+                CaretIndex = _presenter.CaretIndex;
             }
             else if (Match(keymap.MoveCursorToTheEndOfLine))
             {
@@ -877,24 +1000,31 @@ namespace Avalonia.Controls
                 movement = true;
                 selection = false;
                 handled = true;
+                CaretIndex = _presenter.CaretIndex;
             }
             else if (Match(keymap.MoveCursorToTheStartOfDocumentWithSelection))
             {
+                SelectionStart = caretIndex;
                 MoveHome(true);
+                SelectionEnd = _presenter.CaretIndex;
                 movement = true;
                 selection = true;
                 handled = true;
             }
             else if (Match(keymap.MoveCursorToTheEndOfDocumentWithSelection))
             {
+                SelectionStart = caretIndex;
                 MoveEnd(true);
+                SelectionEnd = _presenter.CaretIndex;
                 movement = true;
                 selection = true;
                 handled = true;
             }
             else if (Match(keymap.MoveCursorToTheStartOfLineWithSelection))
             {
+                SelectionStart = caretIndex;
                 MoveHome(false);
+                SelectionEnd = _presenter.CaretIndex;
                 movement = true;
                 selection = true;
                 handled = true;
@@ -902,7 +1032,9 @@ namespace Avalonia.Controls
             }
             else if (Match(keymap.MoveCursorToTheEndOfLineWithSelection))
             {
+                SelectionStart = caretIndex;
                 MoveEnd(false);
+                SelectionEnd = _presenter.CaretIndex;
                 movement = true;
                 selection = true;
                 handled = true;
@@ -925,108 +1057,107 @@ namespace Avalonia.Controls
                         break;
 
                     case Key.Up:
-                    {
-                        selection = DetectSelection();
-                        
-                        _presenter.MoveCaretVertical(LogicalDirection.Backward);
-                        
-                        if (caretIndex != _presenter.CaretIndex)
                         {
-                            movement = true;
-                        }
+                            selection = DetectSelection();
 
-                        if (selection)
-                        {
-                            SelectionEnd = _presenter.CaretIndex;
-                        }
-                        else
-                        {
-                            SelectionStart = SelectionEnd = _presenter.CaretIndex;
+                            _presenter.MoveCaretVertical(LogicalDirection.Backward);
+
+                            if (caretIndex != _presenter.CaretIndex)
+                            {
+                                movement = true;
+                            }
+
+                            if (selection)
+                            {
+                                SelectionEnd = _presenter.CaretIndex;
+                            }
+                            else
+                            {
+                                CaretIndex = _presenter.CaretIndex;
+                            }
+
+                            break;
                         }
-                        
-                        break;
-                    }
                     case Key.Down:
-                    {
-                        selection = DetectSelection();
-                        
-                        _presenter.MoveCaretVertical();
-                        
-                        if (caretIndex != _presenter.CaretIndex)
-                        {
-                            movement = true;
-                        }
-  
-                        if (selection)
-                        {
-                            SelectionEnd = _presenter.CaretIndex;
-                        }
-                        else
                         {
-                            SelectionStart = SelectionEnd = _presenter.CaretIndex;
-                        }
-                        
-                        break;
-                    }
-                    case Key.Back:
-                    {
-                        SnapshotUndoRedo();
-                        
-                        if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
-                        {
-                            SetSelectionForControlBackspace();
-                        }
+                            selection = DetectSelection();
 
-                        if (!DeleteSelection() && caretIndex > 0)
-                        {
-                            var removedCharacters = 0;
-                            
-                            // \r\n needs special treatment here
-                            if (caretIndex - 1 > 0 && text[caretIndex - 1] == '\n' && text[caretIndex - 2] == '\r')
+                            _presenter.MoveCaretVertical();
+
+                            if (caretIndex != _presenter.CaretIndex)
                             {
-                                removedCharacters = 2;
+                                movement = true;
+                            }
+
+                            if (selection)
+                            {
+                                SelectionEnd = _presenter.CaretIndex;
                             }
                             else
                             {
-                                Codepoint.ReadAt(text.AsMemory(), caretIndex - 1, out removedCharacters);
+                                CaretIndex = _presenter.CaretIndex;
+                            }
+
+                            break;
+                        }
+                    case Key.Back:
+                        {
+                            SnapshotUndoRedo();
+
+                            if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
+                            {
+                                SetSelectionForControlBackspace();
                             }
 
-                            if (removedCharacters == 0)
+                            if (!DeleteSelection())
                             {
-                                return;
+                                var characterHit = _presenter.GetNextCharacterHit(LogicalDirection.Backward);
+
+                                var backspacePosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+                                if (caretIndex != backspacePosition)
+                                {
+                                    var start = Math.Min(backspacePosition, caretIndex);
+                                    var end = Math.Max(backspacePosition, caretIndex);
+
+                                    var length = end - start;
+
+                                    var editedText = text.Substring(0, start) + text.Substring(Math.Min(end, text.Length));
+
+                                    SetTextInternal(editedText);
+
+                                    CaretIndex = start;
+                                }
                             }
 
-                            var length = Math.Max(0, caretIndex - removedCharacters);
+                            SnapshotUndoRedo();
 
-                            SetTextInternal(text.Substring(0, length) +
-                                            text.Substring(caretIndex));
-                            
-                            CaretIndex = caretIndex - removedCharacters;
-                            
-                            ClearSelection();
+                            handled = true;
+                            break;
                         }
-
-                        handled = true;
-                        break;
-                    }
                     case Key.Delete:
                         SnapshotUndoRedo();
-                        
+
                         if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
                         {
                             SetSelectionForControlDelete();
                         }
 
-                        if (!DeleteSelection() && caretIndex < text.Length)
+                        if (!DeleteSelection())
                         {
-                            _presenter.MoveCaretHorizontal();
+                            var characterHit = _presenter.GetNextCharacterHit();
+
+                            var nextPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
-                            var removedCharacters = Math.Max(0, _presenter.CaretIndex - caretIndex);
+                            if (nextPosition != caretIndex)
+                            {
+                                var start = Math.Min(nextPosition, caretIndex);
+                                var end = Math.Max(nextPosition, caretIndex);
 
-                            SetTextInternal(text.Substring(0, caretIndex) +
-                                            text.Substring(caretIndex + removedCharacters));
+                                var editedText = text.Substring(0, start) + text.Substring(Math.Min(end, text.Length));
 
-                            CaretIndex = caretIndex;
+                                SetTextInternal(editedText);
+                            }
                         }
 
                         SnapshotUndoRedo();
@@ -1081,11 +1212,11 @@ namespace Avalonia.Controls
 
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
-            if (_presenter == null)
+            if (_presenter == null )
             {
                 return;
             }
-            
+
             var text = Text;
             var clickInfo = e.GetCurrentPoint(this);
 
@@ -1104,31 +1235,55 @@ namespace Avalonia.Controls
 
                 SetAndRaise(CaretIndexProperty, ref _caretIndex, index);
 
-#pragma warning disable CS0618 // Type or member is obsolete
                 switch (e.ClickCount)
-#pragma warning restore CS0618 // Type or member is obsolete
                 {
                     case 1:
                         if (clickToSelect)
                         {
-                            SelectionStart = Math.Min(oldIndex, index);
-                            SelectionEnd = Math.Max(oldIndex, index);
+                            if (_wordSelectionStart >= 0)
+                            {
+                                var previousWord = StringUtils.PreviousWord(text, index);
+
+                                if (index > _wordSelectionStart)
+                                {
+                                    SelectionEnd = StringUtils.NextWord(text, index);
+                                }
+
+                                if (index < _wordSelectionStart || previousWord == _wordSelectionStart)
+                                {
+                                    SelectionStart = previousWord;
+                                }
+                            }
+                            else
+                            {
+                                SelectionStart = Math.Min(oldIndex, index);
+                                SelectionEnd = Math.Max(oldIndex, index);
+                            }
                         }
                         else
                         {
-                            SelectionStart = SelectionEnd = index;
+                            if(_wordSelectionStart == -1 || index < SelectionStart || index > SelectionEnd)
+                            {
+                                SelectionStart = SelectionEnd = index;
+                                _wordSelectionStart = -1;
+                            }                           
                         }
 
                         break;
-                    case 2:
+                    case 2:                       
+
                         if (!StringUtils.IsStartOfWord(text, index))
                         {
                             SelectionStart = StringUtils.PreviousWord(text, index);
                         }
 
+                        _wordSelectionStart = SelectionStart;
+
                         SelectionEnd = StringUtils.NextWord(text, index);
                         break;
                     case 3:
+                        _wordSelectionStart = -1;
+
                         SelectAll();
                         break;
                 }
@@ -1144,7 +1299,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             // selection should not change during pointer move if the user right clicks
             if (e.Pointer.Captured == _presenter && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
@@ -1154,9 +1309,35 @@ namespace Avalonia.Controls
                     MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
                     MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
 
-                _presenter.MoveCaretToPoint(point);
+                _presenter.MoveCaretToPoint(point);  
 
-                SelectionEnd = _presenter.CaretIndex;
+                var caretIndex = _presenter.CaretIndex;
+
+                var text = Text;
+
+                if (text != null && _wordSelectionStart >= 0)
+                {
+                    var distance = caretIndex - _wordSelectionStart;
+
+                    if (distance <= 0)
+                    {
+                        SelectionStart = StringUtils.PreviousWord(text, caretIndex);
+                    }
+
+                    if (distance >= 0)
+                    {
+                        if(SelectionStart != _wordSelectionStart)
+                        {
+                            SelectionStart = _wordSelectionStart;
+                        }
+
+                        SelectionEnd = StringUtils.NextWord(text, caretIndex);
+                    }
+                }
+                else
+                {
+                    SelectionEnd = caretIndex;
+                }
             }
         }
 
@@ -1175,9 +1356,9 @@ namespace Avalonia.Controls
             if (e.InitialPressMouseButton == MouseButton.Right)
             {
                 var point = e.GetPosition(_presenter);
-                    
+
                 _presenter.MoveCaretToPoint(point);
-                    
+
                 var caretIndex = _presenter.CaretIndex;
 
                 // see if mouse clicked inside current selection
@@ -1191,15 +1372,23 @@ namespace Avalonia.Controls
                     CaretIndex = SelectionEnd = SelectionStart = caretIndex;
                 }
             }
-            
+
             e.Pointer.Capture(null);
         }
 
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new TextBoxAutomationPeer(this);
+        }
+
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == TextProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
@@ -1238,40 +1427,69 @@ namespace Avalonia.Controls
 
         private void MoveHorizontal(int direction, bool wholeWord, bool isSelecting)
         {
+            if (_presenter == null)
+            {
+                return;
+            }
+
             var text = Text ?? string.Empty;
             var selectionStart = SelectionStart;
+            var selectionEnd = SelectionEnd;
 
             if (!wholeWord)
             {
-                if (_presenter == null)
-                {
-                    return;
-                }
-                
-                _presenter.MoveCaretHorizontal(direction > 0 ? LogicalDirection.Forward : LogicalDirection.Backward);
-
                 if (isSelecting)
                 {
+                    _presenter.MoveCaretToTextPosition(selectionEnd);
+
+                    _presenter.MoveCaretHorizontal(direction > 0 ?
+                        LogicalDirection.Forward :
+                        LogicalDirection.Backward);
+
                     SelectionEnd = _presenter.CaretIndex;
                 }
                 else
                 {
-                    SelectionStart = SelectionEnd = _presenter.CaretIndex;
+                    if (selectionStart != selectionEnd)
+                    {
+                        _presenter.MoveCaretToTextPosition(direction > 0 ?
+                            Math.Max(selectionStart, selectionEnd) :
+                            Math.Min(selectionStart, selectionEnd));
+                    }
+                    else
+                    {
+                        _presenter.MoveCaretHorizontal(direction > 0 ?
+                            LogicalDirection.Forward :
+                            LogicalDirection.Backward);
+                    }
+
+                    CaretIndex = _presenter.CaretIndex;
                 }
             }
             else
             {
+                int offset;
+
                 if (direction > 0)
                 {
-                    var offset = StringUtils.NextWord(text, selectionStart) - selectionStart;
-                    
-                    CaretIndex += offset;
+                    offset = StringUtils.NextWord(text, selectionEnd) - selectionEnd;
                 }
                 else
                 {
-                    var offset = StringUtils.PreviousWord(text, selectionStart) - selectionStart;
-                    
-                    CaretIndex += offset;
+                    offset = StringUtils.PreviousWord(text, selectionEnd) - selectionEnd;
+                }
+
+                SelectionEnd += offset;
+
+                _presenter.MoveCaretToTextPosition(SelectionEnd);
+
+                if (!isSelecting)
+                {
+                    CaretIndex = SelectionEnd;
+                }
+                else
+                {
+                    SelectionStart = selectionStart;
                 }
             }
         }
@@ -1282,33 +1500,21 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
-            var text = Text ?? string.Empty;
+
             var caretIndex = CaretIndex;
 
             if (document)
             {
-                caretIndex = 0;
+                _presenter.MoveCaretToTextPosition(0);
             }
             else
             {
-                var lines = _presenter.TextLayout.TextLines;
-                var pos = 0;
-
-                foreach (var line in lines)
-                {
-                    if (pos + line.TextRange.Length > caretIndex || pos + line.TextRange.Length == text.Length)
-                    {
-                        break;
-                    }
+                var textLines = _presenter.TextLayout.TextLines;
+                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, false);
+                var textLine = textLines[lineIndex];
 
-                    pos += line.TextRange.Length;
-                }
-
-                caretIndex = pos;
+                _presenter.MoveCaretToTextPosition(textLine.FirstTextSourceIndex);
             }
-
-            CaretIndex = caretIndex;
         }
 
         private void MoveEnd(bool document)
@@ -1317,42 +1523,24 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
 
             if (document)
             {
-                caretIndex = text.Length;
+                _presenter.MoveCaretToTextPosition(text.Length, true);
             }
             else
             {
-                var lines = _presenter.TextLayout.TextLines;
-                var pos = 0;
-
-                foreach (var line in lines)
-                {
-                    pos += line.TextRange.Length;
-
-                    if (pos > caretIndex)
-                    {
-                        if (pos < text.Length)
-                        {
-                            --pos;
-                            if (pos > 0 && text[pos - 1] == '\r' && text[pos] == '\n')
-                            {
-                                --pos;
-                            }
-                        }
+                var textLines = _presenter.TextLayout.TextLines;
+                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, false);
+                var textLine = textLines[lineIndex];
 
-                        break;
-                    }
-                }
+                var textPosition = textLine.FirstTextSourceIndex + textLine.Length;
 
-                caretIndex = pos;
+                _presenter.MoveCaretToTextPosition(textPosition, true);
             }
-
-            CaretIndex = caretIndex;
         }
 
         /// <summary>
@@ -1362,65 +1550,92 @@ namespace Avalonia.Controls
         {
             SelectionStart = 0;
             SelectionEnd = Text?.Length ?? 0;
-            CaretIndex = SelectionEnd;
         }
 
-        private bool DeleteSelection(bool raiseTextChanged = true)
+        internal bool DeleteSelection(bool raiseTextChanged = true)
         {
-            if (!IsReadOnly)
-            {
-                var selectionStart = SelectionStart;
-                var selectionEnd = SelectionEnd;
+            if (IsReadOnly)
+                return true;
 
-                if (selectionStart != selectionEnd)
-                {
-                    var start = Math.Min(selectionStart, selectionEnd);
-                    var end = Math.Max(selectionStart, selectionEnd);
-                    var text = Text!;
-                    SetTextInternal(text.Substring(0, start) + text.Substring(end), raiseTextChanged);
-                    CaretIndex = start;
-                    ClearSelection();
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
+            var selectionStart = SelectionStart;
+            var selectionEnd = SelectionEnd;
+
+            if (selectionStart != selectionEnd)
             {
+                var start = Math.Min(selectionStart, selectionEnd);
+                var end = Math.Max(selectionStart, selectionEnd);
+                var text = Text!;
+
+                SetTextInternal(text.Substring(0, start) + text.Substring(end), raiseTextChanged);
+
+                _presenter?.MoveCaretToTextPosition(start);
+
+                CaretIndex = start;
+
+                ClearSelection();
+
                 return true;
             }
+
+            CaretIndex = SelectionStart;
+
+            return false;
         }
 
         private string GetSelection()
         {
             var text = Text;
+
             if (string.IsNullOrEmpty(text))
+            {
                 return "";
+            }
+
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
             var start = Math.Min(selectionStart, selectionEnd);
             var end = Math.Max(selectionStart, selectionEnd);
+
             if (start == end || (Text?.Length ?? 0) < end)
             {
                 return "";
             }
+
             return text.Substring(start, end - start);
         }
 
+        /// <summary>
+        /// Raises both the <see cref="TextChanging"/> and <see cref="TextChanged"/> events.
+        /// </summary>
+        /// <remarks>
+        /// This must be called after the <see cref="Text"/> property is set.
+        /// </remarks>
+        private void RaiseTextChangeEvents()
+        {
+            // Note the following sequence of these events (following WinUI)
+            // 1. TextChanging occurs synchronously when text starts to change but before it is rendered.
+            //    This occurs after the Text property is set.
+            // 2. TextChanged occurs asynchronously after text changes and the new text is rendered.
+
+            var textChangingEventArgs = new TextChangingEventArgs(TextChangingEvent);
+            RaiseEvent(textChangingEventArgs);
+
+            Dispatcher.UIThread.Post(() =>
+            {
+                var textChangedEventArgs = new TextChangedEventArgs(TextChangedEvent);
+                RaiseEvent(textChangedEventArgs);
+            }, DispatcherPriority.Normal);
+        }
+
         private void SetTextInternal(string value, bool raiseTextChanged = true)
         {
             if (raiseTextChanged)
             {
-                try
-                {
-                    _ignoreTextChanges = true;
-                    SetAndRaise(TextProperty, ref _text, value);
-                }
-                finally
+                bool textChanged = SetAndRaise(TextProperty, ref _text, value);
+
+                if (textChanged)
                 {
-                    _ignoreTextChanges = false;
+                    RaiseTextChangeEvents();
                 }
             }
             else
@@ -1431,16 +1646,28 @@ namespace Avalonia.Controls
 
         private void SetSelectionForControlBackspace()
         {
-            SelectionStart = CaretIndex;
+            var selectionStart = CaretIndex;
+
             MoveHorizontal(-1, true, false);
-            SelectionEnd = CaretIndex;
+
+            SelectionStart = selectionStart;
         }
 
         private void SetSelectionForControlDelete()
         {
+            if (_text == null || _presenter == null)
+            {
+                return;
+            }
+
             SelectionStart = CaretIndex;
-            MoveHorizontal(1, true, false);
-            SelectionEnd = CaretIndex;
+
+            MoveHorizontal(1, true, true);
+
+            if (SelectionEnd < _text.Length && _text[SelectionEnd] == ' ')
+            {
+                SelectionEnd++;
+            }
         }
 
         private void UpdatePseudoclasses()
@@ -1452,7 +1679,7 @@ namespace Avalonia.Controls
 
         UndoRedoState UndoRedoHelper<UndoRedoState>.IUndoRedoHost.UndoRedoState
         {
-            get { return new UndoRedoState(Text, CaretIndex); }
+            get => new UndoRedoState(Text, CaretIndex);
             set
             {
                 Text = value.Text;
diff --git a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
index 4d2ed03440..5d5ffcc381 100644
--- a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
+++ b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
@@ -1,17 +1,24 @@
 using System;
-using System.Diagnostics;
 using Avalonia.Controls.Presenters;
-using Avalonia.Input;
 using Avalonia.Input.TextInput;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Threading;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
     internal class TextBoxTextInputMethodClient : ITextInputMethodClient
     {
-        private InputElement? _parent;
+        private TextBox? _parent;
         private TextPresenter? _presenter;
 
+        public IVisual TextViewVisual => _presenter!;
+
+        public bool SupportsPreedit => true;
+
+        public bool SupportsSurroundingText => true;
+
         public Rect CursorRectangle
         {
             get
@@ -20,41 +27,128 @@ namespace Avalonia.Controls
                 {
                     return default;
                 }
+
                 var transform = _presenter.TransformToVisual(_parent);
-                
+
                 if (transform == null)
                 {
                     return default;
                 }
-                
-                var rect =  _presenter.GetCursorRectangle().TransformToAABB(transform.Value);
+
+                var rect = _presenter.GetCursorRectangle().TransformToAABB(transform.Value);
 
                 return rect;
             }
         }
 
-        public event EventHandler? CursorRectangleChanged;
-        public IVisual TextViewVisual => _presenter!;
+        public TextInputMethodSurroundingText SurroundingText
+        {
+            get
+            {
+                if(_presenter is null || _parent is null)
+                {
+                    return default;
+                }
+
+                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(_presenter.CaretIndex, false);
+
+                var textLine = _presenter.TextLayout.TextLines[lineIndex];
+
+                var lineStart = textLine.FirstTextSourceIndex;
+
+                var lineText = GetTextLineText(textLine);
+
+                var anchorOffset = Math.Max(0, _parent.SelectionStart - lineStart);
+
+                var cursorOffset = Math.Max(0, _presenter.SelectionEnd - lineStart);
+
+                return new TextInputMethodSurroundingText
+                {
+                    Text = lineText ?? "",
+                    AnchorOffset = anchorOffset,
+                    CursorOffset = cursorOffset
+                };
+            }
+        }
+
+        private static string GetTextLineText(TextLine textLine)
+        {
+            var builder = StringBuilderCache.Acquire(textLine.Length);
+
+            foreach (var run in textLine.TextRuns)
+            {
+                if(run.Text.Length > 0)
+                {
+#if NET6_0
+                    builder.Append(run.Text.Span);
+#else
+                    builder.Append(run.Text.Span.ToArray());
+#endif
+                }
+            }
+
+            var lineText = builder.ToString();
+
+            StringBuilderCache.Release(builder);
+
+            return lineText;
+        }
+
         public event EventHandler? TextViewVisualChanged;
-        public bool SupportsPreedit => false;
-        public void SetPreeditText(string text) => throw new NotSupportedException();
 
-        public bool SupportsSurroundingText => false;
-        public TextInputMethodSurroundingText SurroundingText => throw new NotSupportedException();
-        public event EventHandler? SurroundingTextChanged { add { } remove { } }
-        public string? TextBeforeCursor => null;
-        public string? TextAfterCursor => null;
+        public event EventHandler? CursorRectangleChanged;
+
+        public event EventHandler? SurroundingTextChanged;
+
+        public void SetPreeditText(string? text)
+        {
+            if (_presenter == null)
+            {
+                return;
+            }
+
+            _presenter.PreeditText = text;
+        }
+
+        public void SelectInSurroundingText(int start, int end)
+        {
+            if(_parent is null ||_presenter is null)
+            {
+                return;
+            }
+
+            var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(_presenter.CaretIndex, false);
 
-        private void OnCaretBoundsChanged(object? sender, EventArgs e) => CursorRectangleChanged?.Invoke(this, EventArgs.Empty);
+            var textLine = _presenter.TextLayout.TextLines[lineIndex];
 
+            var lineStart = textLine.FirstTextSourceIndex;
 
-        public void SetPresenter(TextPresenter? presenter, InputElement? parent)
+            var selectionStart = lineStart + start;
+            var selectionEnd = lineStart + end;
+             
+            _parent.SelectionStart = selectionStart;
+            _parent.SelectionEnd = selectionEnd;
+        }    
+        
+        public void SetPresenter(TextPresenter? presenter, TextBox? parent)
         {
+            if(_parent != null)
+            {
+                _parent.PropertyChanged -= OnParentPropertyChanged;
+            }
+
             _parent = parent;
 
+            if(_parent != null)
+            {
+                _parent.PropertyChanged += OnParentPropertyChanged;
+            }
+
             if (_presenter != null)
             {
-                _presenter.CaretBoundsChanged -= OnCaretBoundsChanged;
+                _presenter.PreeditText = null;
+
+                _presenter.CaretBoundsChanged -= OnCaretBoundsChanged;             
             }
            
             _presenter = presenter;
@@ -63,9 +157,30 @@ namespace Avalonia.Controls
             {
                 _presenter.CaretBoundsChanged += OnCaretBoundsChanged;
             }
-            
+           
             TextViewVisualChanged?.Invoke(this, EventArgs.Empty);
-            CursorRectangleChanged?.Invoke(this, EventArgs.Empty);
+
+            OnCaretBoundsChanged(this, EventArgs.Empty);
+        }
+
+        private void OnParentPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if(e.Property == TextBox.SelectionStartProperty || e.Property == TextBox.SelectionEndProperty)
+            {
+                if (SupportsSurroundingText)
+                {
+                    SurroundingTextChanged?.Invoke(this, e);
+                }
+            }
+        }
+
+        private void OnCaretBoundsChanged(object? sender, EventArgs e)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                CursorRectangleChanged?.Invoke(this, e);
+
+            }, DispatcherPriority.Input);
         }
     }
 }
diff --git a/src/Avalonia.Controls/TextChangedEventArgs.cs b/src/Avalonia.Controls/TextChangedEventArgs.cs
new file mode 100644
index 0000000000..77c609f19b
--- /dev/null
+++ b/src/Avalonia.Controls/TextChangedEventArgs.cs
@@ -0,0 +1,20 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data specific to a TextChanged event.
+    /// </summary>
+    public class TextChangedEventArgs : RoutedEventArgs
+    {
+        public TextChangedEventArgs(RoutedEvent? routedEvent)
+            : base (routedEvent)
+        {
+        }
+
+        public TextChangedEventArgs(RoutedEvent? routedEvent, IInteractive? source)
+            : base(routedEvent, source)
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/TextChangingEventArgs.cs b/src/Avalonia.Controls/TextChangingEventArgs.cs
new file mode 100644
index 0000000000..4dedbc927b
--- /dev/null
+++ b/src/Avalonia.Controls/TextChangingEventArgs.cs
@@ -0,0 +1,20 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data specific to a TextChanging event.
+    /// </summary>
+    public class TextChangingEventArgs : RoutedEventArgs
+    {
+        public TextChangingEventArgs(RoutedEvent? routedEvent)
+            : base (routedEvent)
+        {
+        }
+
+        public TextChangingEventArgs(RoutedEvent? routedEvent, IInteractive? source)
+            : base(routedEvent, source)
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/ToggleSwitch.cs b/src/Avalonia.Controls/ToggleSwitch.cs
index f33f2b9df3..a28e9791f6 100644
--- a/src/Avalonia.Controls/ToggleSwitch.cs
+++ b/src/Avalonia.Controls/ToggleSwitch.cs
@@ -9,6 +9,10 @@ namespace Avalonia.Controls
     /// <summary>
     /// A Toggle Switch control.
     /// </summary>
+    [TemplatePart("PART_MovingKnobs",         typeof(Panel))]
+    [TemplatePart("PART_OffContentPresenter", typeof(ContentPresenter))]
+    [TemplatePart("PART_OnContentPresenter",  typeof(ContentPresenter))]
+    [TemplatePart("PART_SwitchKnob",          typeof(Panel))]
     [PseudoClasses(":dragging")]
     public class ToggleSwitch : ToggleButton
     {
@@ -161,8 +165,8 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
 
-            _switchKnob = e.NameScope.Find<Panel>("SwitchKnob");
-            _knobsPanel = e.NameScope.Get<Panel>("MovingKnobs");
+            _switchKnob = e.NameScope.Find<Panel>("PART_SwitchKnob");
+            _knobsPanel = e.NameScope.Get<Panel>("PART_MovingKnobs");
             
             _knobsPanel.PointerPressed += KnobsPanel_PointerPressed;
             _knobsPanel.PointerReleased += KnobsPanel_PointerReleased;
diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs
index 91c93c87c8..bb18bf4c64 100644
--- a/src/Avalonia.Controls/ToolTip.cs
+++ b/src/Avalonia.Controls/ToolTip.cs
@@ -271,8 +271,9 @@ namespace Avalonia.Controls
             _popupHost = OverlayPopupHost.CreatePopupHost(control, null);
             _popupHost.SetChild(this);
             ((ISetLogicalParent)_popupHost).SetParent(control);
-            
-            _popupHost.ConfigurePosition(control, GetPlacement(control), 
+            ApplyTemplatedParent(this, control.TemplatedParent);
+
+            _popupHost.ConfigurePosition(control, GetPlacement(control),
                 new Point(GetHorizontalOffset(control), GetVerticalOffset(control)));
 
             WindowManagerAddShadowHintChanged(_popupHost, false);
diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index a3100ff296..c6efe10488 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -26,14 +26,14 @@ namespace Avalonia.Controls
 
             if (e.OldValue != null)
             {
-                control.PointerEnter -= ControlPointerEnter;
-                control.PointerLeave -= ControlPointerLeave;
+                control.PointerEntered -= ControlPointerEntered;
+                control.PointerExited -= ControlPointerExited;
             }
 
             if (e.NewValue != null)
             {
-                control.PointerEnter += ControlPointerEnter;
-                control.PointerLeave += ControlPointerLeave;
+                control.PointerEntered += ControlPointerEntered;
+                control.PointerExited += ControlPointerExited;
             }
 
             if (ToolTip.GetIsOpen(control) && e.NewValue != e.OldValue && !(e.NewValue is ToolTip))
@@ -80,7 +80,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event args.</param>
-        private void ControlPointerEnter(object? sender, PointerEventArgs e)
+        private void ControlPointerEntered(object? sender, PointerEventArgs e)
         {
             StopTimer();
 
@@ -101,7 +101,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event args.</param>
-        private void ControlPointerLeave(object? sender, PointerEventArgs e)
+        private void ControlPointerExited(object? sender, PointerEventArgs e)
         {
             var control = (Control)sender!;
             Close(control);
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 6bba889748..6804c9ecb9 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Reactive.Linq;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -10,11 +12,11 @@ using Avalonia.Logging;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
-using JetBrains.Annotations;
 
 namespace Avalonia.Controls
 {
@@ -26,6 +28,7 @@ namespace Avalonia.Controls
     /// It handles scheduling layout, styling and rendering as well as
     /// tracking the widget's <see cref="ClientSize"/>.
     /// </remarks>
+    [TemplatePart("PART_TransparencyFallback", typeof(Border))]
     public abstract class TopLevel : ContentControl,
         IInputRoot,
         ILayoutRoot,
@@ -33,8 +36,7 @@ namespace Avalonia.Controls
         ICloseable,
         IStyleHost,
         ILogicalRoot,
-        ITextInputMethodRoot,
-        IWeakEventSubscriber<ResourcesChangedEventArgs>
+        ITextInputMethodRoot
     {
         /// <summary>
         /// Defines the <see cref="ClientSize"/> property.
@@ -85,12 +87,16 @@ namespace Avalonia.Controls
         private readonly IKeyboardNavigationHandler? _keyboardNavigationHandler;
         private readonly IPlatformRenderInterface? _renderInterface;
         private readonly IGlobalStyles? _globalStyles;
+        private readonly PointerOverPreProcessor? _pointerOverPreProcessor;
+        private readonly IDisposable? _pointerOverPreProcessorSubscription;
         private Size _clientSize;
         private Size? _frameSize;
         private WindowTransparencyLevel _actualTransparencyLevel;
         private ILayoutManager? _layoutManager;
         private Border? _transparencyFallbackBorder;
-
+        private TargetWeakEventSubscriber<TopLevel, ResourcesChangedEventArgs>? _resourcesChangesSubscriber;
+        private IStorageProvider? _storageProvider;
+        
         /// <summary>
         /// Initializes static members of the <see cref="TopLevel"/> class.
         /// </summary>
@@ -134,8 +140,6 @@ namespace Avalonia.Controls
                     "Could not create window implementation: maybe no windowing subsystem was initialized?");
             }
 
-            impl = ValidatingToplevelImpl.Wrap(impl);
-            
             PlatformImpl = impl;
 
             _actualTransparencyLevel = PlatformImpl.TransparencyLevel;            
@@ -191,10 +195,19 @@ namespace Avalonia.Controls
 
             if (((IStyleHost)this).StylingParent is IResourceHost applicationResources)
             {
-                ResourcesChangedWeakEvent.Subscribe(applicationResources, this);
+                _resourcesChangesSubscriber = new TargetWeakEventSubscriber<TopLevel, ResourcesChangedEventArgs>(
+                    this, static (target, _, _, e) =>
+                    {
+                        ((ILogical)target).NotifyResourcesChanged(e);
+                    });
+
+                ResourcesChangedWeakEvent.Subscribe(applicationResources, _resourcesChangesSubscriber);
             }
 
             impl.LostFocus += PlatformImpl_LostFocus;
+
+            _pointerOverPreProcessor = new PointerOverPreProcessor(this);
+            _pointerOverPreProcessorSubscription = _inputManager?.PreProcess.Subscribe(_pointerOverPreProcessor);
         }
 
         /// <summary>
@@ -273,6 +286,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IRenderer Renderer { get; private set; }
 
+        internal PixelPoint? LastPointerPosition => _pointerOverPreProcessor?.LastPosition;
+        
         /// <summary>
         /// Gets the access key handler for the window.
         /// </summary>
@@ -283,23 +298,13 @@ namespace Avalonia.Controls
         /// </summary>
         IKeyboardNavigationHandler IInputRoot.KeyboardNavigationHandler => _keyboardNavigationHandler!;
 
-        /// <summary>
-        /// Gets or sets the input element that the pointer is currently over.
-        /// </summary>
+        /// <inheritdoc/>
         IInputElement? IInputRoot.PointerOverElement
         {
             get { return GetValue(PointerOverElementProperty); }
             set { SetValue(PointerOverElementProperty, value); }
         }
 
-        /// <inheritdoc/>
-        IMouseDevice? IInputRoot.MouseDevice => PlatformImpl?.MouseDevice;
-
-        void IWeakEventSubscriber<ResourcesChangedEventArgs>.OnEvent(object? sender, WeakEvent ev, ResourcesChangedEventArgs e)
-        {
-            ((ILogical)this).NotifyResourcesChanged(e);
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether access keys are shown in the window.
         /// </summary>
@@ -316,6 +321,11 @@ namespace Avalonia.Controls
         double IRenderRoot.RenderScaling => PlatformImpl?.RenderScaling ?? 1;
 
         IStyleHost IStyleHost.StylingParent => _globalStyles!;
+        
+        public IStorageProvider StorageProvider => _storageProvider
+            ??= AvaloniaLocator.Current.GetService<IStorageProviderFactory>()?.CreateProvider(this)
+            ?? (PlatformImpl as ITopLevelImplWithStorageProvider)?.StorageProvider
+            ?? throw new InvalidOperationException("StorageProvider platform implementation is not available.");
 
         IRenderTarget IRenderRoot.CreateRenderTarget() => CreateRenderTarget();
 
@@ -350,6 +360,12 @@ namespace Avalonia.Controls
         /// </summary>
         protected virtual ILayoutManager CreateLayoutManager() => new LayoutManager(this);
 
+        public override void InvalidateMirrorTransform()
+        {
+        }
+        
+        protected override bool BypassFlowDirectionPolicies => true;
+        
         /// <summary>
         /// Handles a paint notification from <see cref="ITopLevelImpl.Resized"/>.
         /// </summary>
@@ -372,10 +388,12 @@ namespace Avalonia.Controls
 
             Renderer?.Dispose();
             Renderer = null!;
-            
-            (this as IInputRoot).MouseDevice?.TopLevelClosed(this);
+
+            _pointerOverPreProcessor?.OnCompleted();
+            _pointerOverPreProcessorSubscription?.Dispose();
+
             PlatformImpl = null;
-            
+
             var logicalArgs = new LogicalTreeAttachmentEventArgs(this, this, null);
             ((ILogical)this).NotifyDetachedFromLogicalTree(logicalArgs);
 
@@ -387,9 +405,6 @@ namespace Avalonia.Controls
             LayoutManager?.Dispose();
         }
 
-        [Obsolete("Use HandleResized(Size, PlatformResizeReason)")]
-        protected virtual void HandleResized(Size clientSize) => HandleResized(clientSize, PlatformResizeReason.Unspecified);
-
         /// <summary>
         /// Handles a resize notification from <see cref="ITopLevelImpl.Resized"/>.
         /// </summary>
@@ -473,7 +488,11 @@ namespace Avalonia.Controls
         /// Raises the <see cref="Opened"/> event.
         /// </summary>
         /// <param name="e">The event args.</param>
-        protected virtual void OnOpened(EventArgs e) => Opened?.Invoke(this, e);
+        protected virtual void OnOpened(EventArgs e)
+        {
+            FrameSize = PlatformImpl?.FrameSize;
+            Opened?.Invoke(this, e);  
+        } 
 
         /// <summary>
         /// Raises the <see cref="Closed"/> event.
@@ -509,12 +528,17 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         private void HandleInput(RawInputEventArgs e)
         {
+            if (e is RawPointerEventArgs pointerArgs)
+            {
+                pointerArgs.InputHitTestResult = this.InputHitTest(pointerArgs.Position);
+            }
+
             _inputManager?.ProcessInput(e);
         }
 
         private void SceneInvalidated(object? sender, SceneInvalidatedEventArgs e)
         {
-            (this as IInputRoot).MouseDevice?.SceneInvalidated(this, e.DirtyRect);
+            _pointerOverPreProcessor?.SceneInvalidated(e.DirtyRect);
         }
 
         void PlatformImpl_LostFocus()
diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index cb0d229110..70b21b7248 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -61,7 +61,7 @@ public class TransitioningContentControl : ContentControl
         _lastTransitionCts?.Cancel();
     }
 
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
 
@@ -84,13 +84,19 @@ public class TransitioningContentControl : ContentControl
 
         _lastTransitionCts?.Cancel();
         _lastTransitionCts = new CancellationTokenSource();
+        var localToken = _lastTransitionCts.Token;
 
         if (PageTransition != null)
-            await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
+            await PageTransition.Start(this, null, true, localToken);
+
+        if (localToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         CurrentContent = content;
 
         if (PageTransition != null)
-            await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
+            await PageTransition.Start(null, this, true, localToken);
     }
 }
diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
index b8ab48a2b7..41a1abd838 100644
--- a/src/Avalonia.Controls/TrayIcon.cs
+++ b/src/Avalonia.Controls/TrayIcon.cs
@@ -61,6 +61,10 @@ namespace Avalonia.Controls
                         args.NewValue.Value.CollectionChanged += Icons_CollectionChanged;
                     }
                 }
+                else
+                {
+                    throw new InvalidOperationException("TrayIcon.Icons must be set on the Application.");
+                }
             });
 
             var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
@@ -123,9 +127,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> IsVisibleProperty =
             Visual.IsVisibleProperty.AddOwner<TrayIcon>();
 
-        public static void SetIcons(AvaloniaObject o, TrayIcons trayIcons) => o.SetValue(IconsProperty, trayIcons);
+        public static void SetIcons(Application o, TrayIcons trayIcons) => o.SetValue(IconsProperty, trayIcons);
 
-        public static TrayIcons GetIcons(AvaloniaObject o) => o.GetValue(IconsProperty);
+        public static TrayIcons GetIcons(Application o) => o.GetValue(IconsProperty);
         
         /// <summary>
         /// Gets or sets the <see cref="Command"/> property of a TrayIcon.
@@ -189,7 +193,10 @@ namespace Avalonia.Controls
             var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
             var trayIcons = GetIcons(app);
 
-            RemoveIcons(trayIcons);
+            if (trayIcons != null)
+            {
+                RemoveIcons(trayIcons);
+            }
         }
 
         private static void Icons_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
@@ -206,7 +213,7 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -216,15 +223,15 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsVisibleProperty)
             {
-                _impl?.SetIsVisible(change.NewValue.GetValueOrDefault<bool>());
+                _impl?.SetIsVisible(change.GetNewValue<bool>());
             }
             else if (change.Property == ToolTipTextProperty)
             {
-                _impl?.SetToolTipText(change.NewValue.GetValueOrDefault<string?>());
+                _impl?.SetToolTipText(change.GetNewValue<string?>());
             }
             else if (change.Property == MenuProperty)
             {
-                _impl?.MenuExporter?.SetNativeMenu(change.NewValue.GetValueOrDefault<NativeMenu>());
+                _impl?.MenuExporter?.SetNativeMenu(change.GetNewValue<NativeMenu?>());
             }
         }
 
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 9a276e74d2..d78f9c82ef 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -401,7 +401,7 @@ namespace Avalonia.Controls
         protected virtual ITreeItemContainerGenerator CreateTreeItemContainerGenerator() =>
             CreateTreeItemContainerGenerator<TreeViewItem>();
 
-        protected virtual ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>() where TVItem: TreeViewItem, new()
+        protected ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>() where TVItem: TreeViewItem, new()
         {
             return new TreeItemContainerGenerator<TVItem>(
                 this,
@@ -495,6 +495,7 @@ namespace Avalonia.Controls
                     break;
 
                 case NavigationDirection.Down:
+                case NavigationDirection.Right:
                     if (from?.IsExpanded == true && intoChildren && from.ItemCount > 0)
                     {
                         result = (TreeViewItem)from.ItemContainerGenerator.ContainerFromIndex(0)!;
@@ -529,7 +530,7 @@ namespace Avalonia.Controls
                         e.Source,
                         true,
                         e.KeyModifiers.HasAllFlags(KeyModifiers.Shift),
-                        e.KeyModifiers.HasAllFlags(KeyModifiers.Control),
+                        e.KeyModifiers.HasAllFlags(AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>().CommandModifiers),
                         point.Properties.IsRightButtonPressed);
                 }
             }
@@ -849,7 +850,7 @@ namespace Avalonia.Controls
         /// <param name="desired">The desired items.</param>
         private static void SynchronizeItems(IList items, IEnumerable<object> desired)
         {
-            var list = items.Cast<object>().ToList();
+            var list = items.Cast<object>();
             var toRemove = list.Except(desired).ToList();
             var toAdd = desired.Except(list).ToList();
 
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index 20c0ed386d..2f96e6911f 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -6,12 +6,14 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// An item in a <see cref="TreeView"/>.
     /// </summary>
+    [TemplatePart("PART_Header", typeof(IControl))]
     [PseudoClasses(":pressed", ":selected")]
     public class TreeViewItem : HeaderedItemsControl, ISelectable
     {
@@ -44,6 +46,8 @@ namespace Avalonia.Controls
         private IControl? _header;
         private bool _isExpanded;
         private int _level;
+        private bool _templateApplied;
+        private bool _deferredBringIntoViewFlag;
 
         /// <summary>
         /// Initializes static members of the <see cref="TreeViewItem"/> class.
@@ -95,7 +99,7 @@ namespace Avalonia.Controls
         protected override IItemContainerGenerator CreateItemContainerGenerator() => CreateTreeItemContainerGenerator<TreeViewItem>();
 
         /// <inheritdoc/>
-        protected virtual ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>()
+        protected ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>()
             where TVItem: TreeViewItem, new()
         {
             return new TreeItemContainerGenerator<TVItem>(
@@ -120,6 +124,11 @@ namespace Avalonia.Controls
             {
                 ItemTemplate = _treeView.ItemTemplate;
             }
+
+            if (ItemContainerTheme == null && _treeView?.ItemContainerTheme != null)
+            {
+                ItemContainerTheme = _treeView.ItemContainerTheme;
+            }
         }
 
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
@@ -130,15 +139,24 @@ namespace Avalonia.Controls
 
         protected virtual void OnRequestBringIntoView(RequestBringIntoViewEventArgs e)
         {
-            if (e.TargetObject == this && _header != null)
+            if (e.TargetObject == this)
             {
-                var m = _header.TransformToVisual(this);
+                if (!_templateApplied)
+                {
+                    _deferredBringIntoViewFlag = true;
+                    return;
+                }
 
-                if (m.HasValue)
+                if (_header != null)
                 {
-                    var bounds = new Rect(_header.Bounds.Size);
-                    var rect = bounds.TransformToAABB(m.Value);
-                    e.TargetRect = rect;
+                    var m = _header.TransformToVisual(this);
+
+                    if (m.HasValue)
+                    {
+                        var bounds = new Rect(_header.Bounds.Size);
+                        var rect = bounds.TransformToAABB(m.Value);
+                        e.TargetRect = rect;
+                    }
                 }
             }
         }
@@ -151,17 +169,26 @@ namespace Avalonia.Controls
                 switch (e.Key)
                 {
                     case Key.Right:
-                        if (Items != null && Items.Cast<object>().Any())
+                        if (Items != null && Items.Cast<object>().Any() && !IsExpanded)
                         {
                             IsExpanded = true;
+                            e.Handled = true;
                         }
-
-                        e.Handled = true;
                         break;
 
                     case Key.Left:
-                        IsExpanded = false;
-                        e.Handled = true;
+                        if (Items is not null && Items.Cast<object>().Any() && IsExpanded)
+                        {
+                            if (IsFocused)
+                            {
+                                IsExpanded = false;
+                            }
+                            else
+                            {
+                                FocusManager.Instance?.Focus(this, NavigationMethod.Directional);
+                            }
+                            e.Handled = true;
+                        }
                         break;
                 }
             }
@@ -172,6 +199,12 @@ namespace Avalonia.Controls
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _header = e.NameScope.Find<IControl>("PART_Header");
+            _templateApplied = true;
+            if (_deferredBringIntoViewFlag)
+            {
+                _deferredBringIntoViewFlag = false;
+                Dispatcher.UIThread.Post(this.BringIntoView); // must use the Dispatcher, otherwise the TreeView doesn't scroll
+            }
         }
 
         private static int CalculateDistanceFromLogicalParent<T>(ILogical? logical, int @default = -1) where T : class
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
index ecc7cd98bb..eb9f38894d 100644
--- a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -61,7 +61,7 @@ namespace Avalonia.Controls.Utils
                     _backgroundGeometryCache = null;
                 }
 
-                if (boundRect.Width != 0 && innerRect.Height != 0)
+                if (boundRect.Width != 0 && boundRect.Height != 0)
                 {
                     var borderGeometryKeypoints =
                         new BorderGeometryKeypoints(boundRect, borderThickness, cornerRadius, false);
diff --git a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
index 0b1c4fc90e..9d13daa453 100644
--- a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
+++ b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
@@ -105,7 +105,7 @@ namespace Avalonia.Controls.Utils
                 static void Notify(
                     INotifyCollectionChanged incc,
                     NotifyCollectionChangedEventArgs args,
-                    List<WeakReference<ICollectionChangedListener>> listeners)
+                    WeakReference<ICollectionChangedListener>[] listeners)
                 {
                     foreach (var l in listeners)
                     {
@@ -132,7 +132,7 @@ namespace Avalonia.Controls.Utils
                     }
                 }
 
-                var l = Listeners.ToList();
+                var l = Listeners.ToArray();
 
                 if (Dispatcher.UIThread.CheckAccess())
                 {
diff --git a/src/Avalonia.Controls/Utils/ISelectionAdapter.cs b/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
index c5fb12197f..3ede518ffa 100644
--- a/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
+++ b/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
diff --git a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
index 0288f99dce..3c1b1262ae 100644
--- a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
+++ b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;
diff --git a/src/Avalonia.Controls/Utils/StringUtils.cs b/src/Avalonia.Controls/Utils/StringUtils.cs
index 53937003c8..b2e56434b2 100644
--- a/src/Avalonia.Controls/Utils/StringUtils.cs
+++ b/src/Avalonia.Controls/Utils/StringUtils.cs
@@ -150,17 +150,23 @@ namespace Avalonia.Controls.Utils
                 return cursor;
             }
 
-            CharClass cc = GetCharClass(text[cursor]);
             i = cursor;
 
-            // skip over the word, punctuation, or run of whitespace
-            while (i < cr && GetCharClass(text[i]) == cc)
+            // skip any whitespace after the word/punct
+            while (i < cr && char.IsWhiteSpace(text[i]))
             {
                 i++;
             }
 
-            // skip any whitespace after the word/punct
-            while (i < cr && char.IsWhiteSpace(text[i]))
+            if (i >= cr)
+            {
+                return i;
+            }
+            
+            var cc = GetCharClass(text[i]);
+            
+            // skip over the word, punctuation, or run of whitespace
+            while (i < cr && GetCharClass(text[i]) == cc)
             {
                 i++;
             }
diff --git a/src/Avalonia.Controls/ValidatingToplevel.cs b/src/Avalonia.Controls/ValidatingToplevel.cs
deleted file mode 100644
index 7e15bf4879..0000000000
--- a/src/Avalonia.Controls/ValidatingToplevel.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls.Platform;
-using Avalonia.Controls.Primitives.PopupPositioning;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-
-namespace Avalonia.Controls;
-
-internal class ValidatingToplevelImpl : ITopLevelImpl, ITopLevelImplWithNativeControlHost,
-    ITopLevelImplWithNativeMenuExporter, ITopLevelImplWithTextInputMethod
-{
-    private readonly ITopLevelImpl _impl;
-    private bool _disposed;
-
-    public ValidatingToplevelImpl(ITopLevelImpl impl)
-    {
-        _impl = impl ?? throw new InvalidOperationException(
-            "Could not create TopLevel implementation: maybe no windowing subsystem was initialized?");
-    }
-
-    public void Dispose()
-    {
-        _disposed = true;
-        _impl.Dispose();
-    }
-
-    protected void CheckDisposed()
-    {
-        if (_disposed)
-            throw new ObjectDisposedException(_impl.GetType().FullName);
-    }
-
-    protected ITopLevelImpl Inner
-    {
-        get
-        {
-            CheckDisposed();
-            return _impl;
-        }
-    }
-
-    public static ITopLevelImpl Wrap(ITopLevelImpl impl)
-    {
-#if DEBUG
-        if (impl is ValidatingToplevelImpl)
-            return impl;
-        return new ValidatingToplevelImpl(impl);
-#else
-        return impl;
-#endif
-    }
-
-    public Size ClientSize => Inner.ClientSize;
-    public Size? FrameSize => Inner.FrameSize;
-    public double RenderScaling => Inner.RenderScaling;
-    public IEnumerable<object> Surfaces => Inner.Surfaces;
-
-    public Action<RawInputEventArgs>? Input
-    {
-        get => Inner.Input;
-        set => Inner.Input = value;
-    }
-
-    public Action<Rect>? Paint
-    {
-        get => Inner.Paint;
-        set => Inner.Paint = value;
-    }
-
-    public Action<Size, PlatformResizeReason>? Resized
-    {
-        get => Inner.Resized;
-        set => Inner.Resized = value;
-    }
-
-    public Action<double>? ScalingChanged
-    {
-        get => Inner.ScalingChanged;
-        set => Inner.ScalingChanged = value;
-    }
-
-    public Action<WindowTransparencyLevel>? TransparencyLevelChanged
-    {
-        get => Inner.TransparencyLevelChanged;
-        set => Inner.TransparencyLevelChanged = value;
-    }
-
-    public IRenderer CreateRenderer(IRenderRoot root) => Inner.CreateRenderer(root);
-
-    public void Invalidate(Rect rect) => Inner.Invalidate(rect);
-
-    public void SetInputRoot(IInputRoot inputRoot) => Inner.SetInputRoot(inputRoot);
-
-    public Point PointToClient(PixelPoint point) => Inner.PointToClient(point);
-
-    public PixelPoint PointToScreen(Point point) => Inner.PointToScreen(point);
-
-    public void SetCursor(ICursorImpl? cursor) => Inner.SetCursor(cursor);
-
-    public Action? Closed
-    {
-        get => Inner.Closed;
-        set => Inner.Closed = value;
-    }
-
-    public Action? LostFocus
-    {
-        get => Inner.LostFocus;
-        set => Inner.LostFocus = value;
-    }
-
-    // Exception: for some reason we are notifying platform mouse device from TopLevel.cs
-    public IMouseDevice MouseDevice => _impl.MouseDevice;
-    public IPopupImpl? CreatePopup() => Inner.CreatePopup();
-
-    public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) =>
-        Inner.SetTransparencyLevelHint(transparencyLevel);
-
-
-    public WindowTransparencyLevel TransparencyLevel => Inner.TransparencyLevel;
-    public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => Inner.AcrylicCompensationLevels;
-    public INativeControlHostImpl? NativeControlHost => (Inner as ITopLevelImplWithNativeControlHost)?.NativeControlHost;
-
-    public ITopLevelNativeMenuExporter? NativeMenuExporter =>
-        (Inner as ITopLevelImplWithNativeMenuExporter)?.NativeMenuExporter;
-
-    public ITextInputMethodImpl? TextInputMethod => (Inner as ITopLevelImplWithTextInputMethod)?.TextInputMethod;
-}
-
-internal class ValidatingWindowBaseImpl : ValidatingToplevelImpl, IWindowBaseImpl
-{
-    private readonly IWindowBaseImpl _impl;
-
-    public ValidatingWindowBaseImpl(IWindowBaseImpl impl) : base(impl)
-    {
-        _impl = impl;
-    }
-
-    protected new IWindowBaseImpl Inner
-    {
-        get
-        {
-            CheckDisposed();
-            return _impl;
-        }
-    }
-    
-    public static IWindowBaseImpl Wrap(IWindowBaseImpl impl)
-    {
-#if DEBUG
-        if (impl is ValidatingToplevelImpl)
-            return impl;
-        return new ValidatingWindowBaseImpl(impl);
-#else
-        return impl;
-#endif
-    }
-
-    public void Show(bool activate, bool isDialog) => Inner.Show(activate, isDialog);
-
-    public void Hide() => Inner.Hide();
-
-    public double DesktopScaling => Inner.DesktopScaling;
-    public PixelPoint Position => Inner.Position;
-
-    public Action<PixelPoint>? PositionChanged
-    {
-        get => Inner.PositionChanged;
-        set => Inner.PositionChanged = value;
-    }
-
-    public void Activate() => Inner.Activate();
-
-    public Action? Deactivated
-    {
-        get => Inner.Deactivated;
-        set => Inner.Deactivated = value;
-    }
-
-    public Action? Activated
-    {
-        get => Inner.Activated;
-        set => Inner.Activated = value;
-    }
-
-    public IPlatformHandle Handle => Inner.Handle;
-    public Size MaxAutoSizeHint => Inner.MaxAutoSizeHint;
-    public void SetTopmost(bool value) => Inner.SetTopmost(value);
-    public IScreenImpl Screen => Inner.Screen;
-}
-
-internal class ValidatingWindowImpl : ValidatingWindowBaseImpl, IWindowImpl
-{
-    private readonly IWindowImpl _impl;
-
-    public ValidatingWindowImpl(IWindowImpl impl) : base(impl)
-    {
-        _impl = impl;
-    }
-
-    protected new IWindowImpl Inner
-    {
-        get
-        {
-            CheckDisposed();
-            return _impl;
-        }
-    }
-    
-    public static IWindowImpl Unwrap(IWindowImpl impl)
-    {
-        if (impl is ValidatingWindowImpl v)
-            return v.Inner;
-        return impl;
-    }
-
-    public static IWindowImpl Wrap(IWindowImpl impl)
-    {
-#if DEBUG
-        if (impl is ValidatingToplevelImpl)
-            return impl;
-        return new ValidatingWindowImpl(impl);
-#else
-        return impl;
-#endif
-    }
-
-    public WindowState WindowState
-    {
-        get => Inner.WindowState;
-        set => Inner.WindowState = value;
-    }
-
-    public Action<WindowState> WindowStateChanged
-    {
-        get => Inner.WindowStateChanged;
-        set => Inner.WindowStateChanged = value;
-    }
-
-    public void SetTitle(string? title) => Inner.SetTitle(title);
-
-    public void SetParent(IWindowImpl parent)
-    {
-        //Workaround. SetParent will cast IWindowImpl to WindowImpl but  ValidatingWindowImpl isn't actual WindowImpl so it will fail with InvalidCastException.
-        if (parent is ValidatingWindowImpl validatingToplevelImpl)
-        {
-            Inner.SetParent(validatingToplevelImpl.Inner);
-        }
-        else
-        {
-            Inner.SetParent(parent);
-        }
-    }
-
-    public void SetEnabled(bool enable) => Inner.SetEnabled(enable);
-
-    public Action GotInputWhenDisabled
-    {
-        get => Inner.GotInputWhenDisabled;
-        set => Inner.GotInputWhenDisabled = value;
-    }
-
-    public void SetSystemDecorations(SystemDecorations enabled) => Inner.SetSystemDecorations(enabled);
-
-    public void SetIcon(IWindowIconImpl? icon) => Inner.SetIcon(icon);
-
-    public void ShowTaskbarIcon(bool value) => Inner.ShowTaskbarIcon(value);
-
-    public void CanResize(bool value) => Inner.CanResize(value);
-
-    public Func<bool> Closing
-    {
-        get => Inner.Closing;
-        set => Inner.Closing = value;
-    }
-
-    public bool IsClientAreaExtendedToDecorations => Inner.IsClientAreaExtendedToDecorations;
-
-    public Action<bool> ExtendClientAreaToDecorationsChanged
-    {
-        get => Inner.ExtendClientAreaToDecorationsChanged;
-        set => Inner.ExtendClientAreaToDecorationsChanged = value;
-    }
-
-    public bool NeedsManagedDecorations => Inner.NeedsManagedDecorations;
-    public Thickness ExtendedMargins => Inner.ExtendedMargins;
-    public Thickness OffScreenMargin => Inner.OffScreenMargin;
-    public void BeginMoveDrag(PointerPressedEventArgs e) => Inner.BeginMoveDrag(e);
-
-    public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e) => Inner.BeginResizeDrag(edge, e);
-
-    public void Resize(Size clientSize, PlatformResizeReason reason) =>
-        Inner.Resize(clientSize, reason);
-
-    public void Move(PixelPoint point) => Inner.Move(point);
-
-    public void SetMinMaxSize(Size minSize, Size maxSize) => Inner.SetMinMaxSize(minSize, maxSize);
-
-    public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint) =>
-        Inner.SetExtendClientAreaToDecorationsHint(extendIntoClientAreaHint);
-
-    public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints) =>
-        Inner.SetExtendClientAreaChromeHints(hints);
-
-    public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight) =>
-        Inner.SetExtendClientAreaTitleBarHeightHint(titleBarHeight);
-}
-
-internal class ValidatingPopupImpl : ValidatingWindowBaseImpl, IPopupImpl
-{
-    private readonly IPopupImpl _impl;
-
-    public ValidatingPopupImpl(IPopupImpl impl) : base(impl)
-    {
-        _impl = impl;
-    }
-
-    protected new IPopupImpl Inner
-    {
-        get
-        {
-            CheckDisposed();
-            return _impl;
-        }
-    }
-    
-    public static IPopupImpl Wrap(IPopupImpl impl)
-    {
-#if DEBUG
-        if (impl is ValidatingToplevelImpl)
-            return impl;
-        return new ValidatingPopupImpl(impl);
-#else
-        return impl;
-#endif
-    }
-
-    public IPopupPositioner PopupPositioner => Inner.PopupPositioner;
-    public void SetWindowManagerAddShadowHint(bool enabled) => Inner.SetWindowManagerAddShadowHint(enabled);
-}
diff --git a/src/Avalonia.Controls/Viewbox.cs b/src/Avalonia.Controls/Viewbox.cs
index 624c61bb82..07d877142e 100644
--- a/src/Avalonia.Controls/Viewbox.cs
+++ b/src/Avalonia.Controls/Viewbox.cs
@@ -1,18 +1,21 @@
 using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Viewbox is used to scale single child to fit in the available space.
     /// </summary>
-    /// <seealso cref="Avalonia.Controls.Decorator" />
-    public class Viewbox : Decorator
+    public class Viewbox : Control
     {
+        private readonly ViewboxContainer _containerVisual;
+
         /// <summary>
         /// Defines the <see cref="Stretch"/> property.
         /// </summary>
         public static readonly StyledProperty<Stretch> StretchProperty =
-            AvaloniaProperty.Register<Image, Stretch>(nameof(Stretch), Stretch.Uniform);
+            AvaloniaProperty.Register<Viewbox, Stretch>(nameof(Stretch), Stretch.Uniform);
 
         /// <summary>
         /// Defines the <see cref="StretchDirection"/> property.
@@ -20,12 +23,29 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<StretchDirection> StretchDirectionProperty =
             AvaloniaProperty.Register<Viewbox, StretchDirection>(nameof(StretchDirection), StretchDirection.Both);
 
+        /// <summary>
+        /// Defines the <see cref="Child"/> property
+        /// </summary>
+        public static readonly StyledProperty<IControl?> ChildProperty =
+            Decorator.ChildProperty.AddOwner<Viewbox>();
+
         static Viewbox()
         {
             ClipToBoundsProperty.OverrideDefaultValue<Viewbox>(true);
+            UseLayoutRoundingProperty.OverrideDefaultValue<Viewbox>(true);
             AffectsMeasure<Viewbox>(StretchProperty, StretchDirectionProperty);
         }
 
+        public Viewbox()
+        {
+            // The Child control is hosted inside a ViewboxContainer control so that the transform
+            // can be applied independently of the Viewbox and Child transforms.
+            _containerVisual = new ViewboxContainer();
+            _containerVisual.RenderTransformOrigin = RelativePoint.TopLeft;
+            ((ISetLogicalParent)_containerVisual).SetParent(this);
+            VisualChildren.Add(_containerVisual);
+        }
+
         /// <summary>
         /// Gets or sets the stretch mode, 
         /// which determines how child fits into the available space.
@@ -45,9 +65,55 @@ namespace Avalonia.Controls
             set => SetValue(StretchDirectionProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the child of the Viewbox
+        /// </summary>
+        [Content]
+        public IControl? Child
+        {
+            get => GetValue(ChildProperty);
+            set => SetValue(ChildProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the transform applied to the container visual that
+        /// hosts the child of the Viewbox
+        /// </summary>
+        protected internal ITransform? InternalTransform
+        {
+            get => _containerVisual.RenderTransform;
+            set => _containerVisual.RenderTransform = value;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ChildProperty)
+            {
+                var (oldChild, newChild) = change.GetOldAndNewValue<IControl>();
+
+                if (oldChild is not null)
+                {
+                    ((ISetLogicalParent)oldChild).SetParent(null);
+                    LogicalChildren.Remove(oldChild);
+                }
+
+                _containerVisual.Child = newChild;
+
+                if (newChild is not null)
+                {
+                    ((ISetLogicalParent)newChild).SetParent(this);
+                    LogicalChildren.Add(newChild);
+                }
+
+                InvalidateMeasure();
+            }
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
-            var child = Child;
+            var child = _containerVisual;
 
             if (child != null)
             {
@@ -57,7 +123,7 @@ namespace Avalonia.Controls
 
                 var size = Stretch.CalculateSize(availableSize, childSize, StretchDirection);
 
-                return size.Constrain(availableSize);
+                return size;
             }
 
             return new Size();
@@ -65,31 +131,49 @@ namespace Avalonia.Controls
 
         protected override Size ArrangeOverride(Size finalSize)
         {
-            var child = Child;
+            var child = _containerVisual;
 
             if (child != null)
             {
                 var childSize = child.DesiredSize;
                 var scale = Stretch.CalculateScaling(finalSize, childSize, StretchDirection);
 
-                // TODO: Viewbox should have another decorator as a child so we won't affect other render transforms.
-                var scaleTransform = child.RenderTransform as ScaleTransform;
-
-                if (scaleTransform == null)
-                {
-                    child.RenderTransform = scaleTransform = new ScaleTransform(scale.X, scale.Y);
-                    child.RenderTransformOrigin = RelativePoint.TopLeft;
-                }
-
-                scaleTransform.ScaleX = scale.X;
-                scaleTransform.ScaleY = scale.Y;
+                InternalTransform = new ImmutableTransform(Matrix.CreateScale(scale.X, scale.Y));
 
                 child.Arrange(new Rect(childSize));
 
                 return childSize * scale;
             }
 
-            return new Size();
+            return finalSize;
+        }
+
+        /// <summary>
+        /// A simple container control which hosts its child as a visual but not logical child.
+        /// </summary>
+        private class ViewboxContainer : Control
+        {
+            private IControl? _child;
+
+            public IControl? Child
+            {
+                get => _child;
+                set
+                {
+                    if (_child != value)
+                    {
+                        if (_child is not null)
+                            VisualChildren.Remove(_child);
+
+                        _child = value;
+
+                        if (_child is not null)
+                            VisualChildren.Add(_child);
+
+                        InvalidateMeasure();
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index a5f48bd4a5..1a7dca737e 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -11,7 +12,6 @@ using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
-using JetBrains.Annotations;
 
 namespace Avalonia.Controls
 {
@@ -79,16 +79,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<SizeToContent> SizeToContentProperty =
             AvaloniaProperty.Register<Window, SizeToContent>(nameof(SizeToContent));
 
-        /// <summary>
-        /// Enables or disables system window decorations (title bar, buttons, etc)
-        /// </summary>
-        [Obsolete("Use SystemDecorationsProperty instead")]
-        public static readonly DirectProperty<Window, bool> HasSystemDecorationsProperty =
-            AvaloniaProperty.RegisterDirect<Window, bool>(
-                nameof(HasSystemDecorations),
-                o => o.HasSystemDecorations,
-                (o, v) => o.HasSystemDecorations = v);
-
         /// <summary>
         /// Defines the <see cref="ExtendClientAreaToDecorationsHint"/> property.
         /// </summary>
@@ -171,13 +161,13 @@ namespace Avalonia.Controls
         /// <summary>
         /// Routed event that can be used for global tracking of window destruction
         /// </summary>
-        public static readonly RoutedEvent WindowClosedEvent =
+        public static readonly RoutedEvent<RoutedEventArgs> WindowClosedEvent =
             RoutedEvent.Register<Window, RoutedEventArgs>("WindowClosed", RoutingStrategies.Direct);
 
         /// <summary>
         /// Routed event that can be used for global tracking of opening windows
         /// </summary>
-        public static readonly RoutedEvent WindowOpenedEvent =
+        public static readonly RoutedEvent<RoutedEventArgs> WindowOpenedEvent =
             RoutedEvent.Register<Window, RoutedEventArgs>("WindowOpened", RoutingStrategies.Direct);
 
 
@@ -237,14 +227,13 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="impl">The window implementation.</param>
         public Window(IWindowImpl impl)
-            : base(ValidatingWindowImpl.Wrap(impl))
+            : base(impl)
         {
-            var wrapped = (IWindowImpl)base.PlatformImpl!;
-            wrapped.Closing = HandleClosing;
-            wrapped.GotInputWhenDisabled = OnGotInputWhenDisabled;
-            wrapped.WindowStateChanged = HandleWindowStateChanged;
+            impl.Closing = HandleClosing;
+            impl.GotInputWhenDisabled = OnGotInputWhenDisabled;
+            impl.WindowStateChanged = HandleWindowStateChanged;
             _maxPlatformClientSize = PlatformImpl?.MaxAutoSizeHint ?? default(Size);
-            wrapped.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;            
+            impl.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;            
             this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x, PlatformResizeReason.Application));
 
             PlatformImpl?.ShowTaskbarIcon(ShowInTaskbar);
@@ -255,6 +244,11 @@ namespace Avalonia.Controls
         /// </summary>
         public new IWindowImpl? PlatformImpl => (IWindowImpl?)base.PlatformImpl;
 
+        /// <summary>
+        /// Gets a collection of child windows owned by this window.
+        /// </summary>
+        public IReadOnlyList<Window> OwnedWindows => _children.Select(x => x.child).ToArray();
+
         /// <summary>
         /// Gets or sets a value indicating how the window will size itself to fit its content.
         /// </summary>
@@ -285,25 +279,6 @@ namespace Avalonia.Controls
             set { SetValue(TitleProperty, value); }
         }
 
-        /// <summary>
-        /// Enables or disables system window decorations (title bar, buttons, etc)
-        /// </summary>
-        [Obsolete("Use SystemDecorations instead")]
-        public bool HasSystemDecorations
-        {
-            get => SystemDecorations == SystemDecorations.Full;
-            set
-            {
-                var oldValue = HasSystemDecorations;
-
-                if (oldValue != value)
-                {
-                    SystemDecorations = value ? SystemDecorations.Full : SystemDecorations.None;
-                    RaisePropertyChanged(HasSystemDecorationsProperty, oldValue, value);
-                }
-            }
-        }
-
         /// <summary>
         /// Gets or sets if the ClientArea is Extended into the Window Decorations (chrome or border).
         /// </summary>
@@ -403,8 +378,6 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Enables or disables resizing of the window.
-        /// Note that if <see cref="HasSystemDecorations"/> is set to False then this property
-        /// has no effect and should be treated as a recommendation for the user setting HasSystemDecorations.
         /// </summary>
         public bool CanResize
         {
@@ -522,7 +495,7 @@ namespace Avalonia.Controls
 
         private void CloseInternal()
         {
-            foreach (var (child, _) in _children.ToList())
+            foreach (var (child, _) in _children.ToArray())
             {
                 child.CloseInternal();
             }
@@ -546,7 +519,7 @@ namespace Avalonia.Controls
             
             bool canClose = true;
 
-            foreach (var (child, _) in _children.ToList())
+            foreach (var (child, _) in _children.ToArray())
             {
                 if (child.ShouldCancelClose(args))
                 {
@@ -677,8 +650,8 @@ namespace Avalonia.Controls
             IsVisible = true;
 
             var initialSize = new Size(
-                double.IsNaN(Width) ? ClientSize.Width : Width,
-                double.IsNaN(Height) ? ClientSize.Height : Height);
+                double.IsNaN(Width) ? Math.Max(MinWidth, ClientSize.Width) : Width,
+                double.IsNaN(Height) ? Math.Max(MinHeight, ClientSize.Height) : Height);
 
             if (initialSize != ClientSize)
             {
@@ -695,7 +668,7 @@ namespace Avalonia.Controls
             Owner = parent;
             parent?.AddChild(this, false);
 
-            SetWindowStartupLocation(Owner?.PlatformImpl);
+            SetWindowStartupLocation(parent?.PlatformImpl);
 
             PlatformImpl?.Show(ShowActivated, false);
             Renderer?.Start();
@@ -854,32 +827,49 @@ namespace Avalonia.Controls
 
         private void SetWindowStartupLocation(IWindowBaseImpl? owner = null)
         {
+            var startupLocation = WindowStartupLocation;
+
+            if (startupLocation == WindowStartupLocation.CenterOwner &&
+                (owner is null || 
+                 (Owner is Window ownerWindow && ownerWindow.WindowState == WindowState.Minimized))
+                )
+            {
+                // If startup location is CenterOwner, but owner is null or minimized then fall back
+                // to CenterScreen. This behavior is consistent with WPF.
+                startupLocation = WindowStartupLocation.CenterScreen;
+            }
+
             var scaling = owner?.DesktopScaling ?? PlatformImpl?.DesktopScaling ?? 1;
 
-            // TODO: We really need non-client size here.
-            var rect = new PixelRect(
-                PixelPoint.Origin,
-                PixelSize.FromSize(ClientSize, scaling));
+            // Use frame size, falling back to client size if the platform can't give it to us.
+            var rect = FrameSize.HasValue ?
+                new PixelRect(PixelSize.FromSize(FrameSize.Value, scaling)) :
+                new PixelRect(PixelSize.FromSize(ClientSize, scaling));
 
-            if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            if (startupLocation == WindowStartupLocation.CenterScreen)
             {
-                var screen = Screens.ScreenFromPoint(owner?.Position ?? Position);
+                Screen? screen = null;
 
-                if (screen != null)
+                if (owner is not null)
+                {
+                    screen = Screens.ScreenFromWindow(owner) 
+                             ?? Screens.ScreenFromPoint(owner.Position);
+                }
+
+                screen ??= Screens.ScreenFromPoint(Position);
+
+                if (screen is not null)
                 {
                     Position = screen.WorkingArea.CenterRect(rect).Position;
                 }
             }
-            else if (WindowStartupLocation == WindowStartupLocation.CenterOwner)
+            else if (startupLocation == WindowStartupLocation.CenterOwner)
             {
-                if (owner != null)
-                {
-                    // TODO: We really need non-client size here.
-                    var ownerRect = new PixelRect(
-                        owner.Position,
-                        PixelSize.FromSize(owner.ClientSize, scaling));
-                    Position = ownerRect.CenterRect(rect).Position;
-                }
+                var ownerSize = owner!.FrameSize ?? owner.ClientSize;
+                var ownerRect = new PixelRect(
+                    owner.Position,
+                    PixelSize.FromSize(ownerSize, scaling));
+                Position = ownerRect.CenterRect(rect).Position;
             }
         }
 
@@ -890,6 +880,15 @@ namespace Avalonia.Controls
             var constraint = clientSize;
             var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
 
+            if (MaxWidth > 0 && MaxWidth < maxAutoSize.Width)
+            {
+                maxAutoSize = maxAutoSize.WithWidth(MaxWidth);
+            }
+            if (MaxHeight > 0 && MaxHeight < maxAutoSize.Height)
+            {
+                maxAutoSize = maxAutoSize.WithHeight(MaxHeight);
+            }
+
             if (sizeToContent.HasAllFlags(SizeToContent.Width))
             {
                 constraint = constraint.WithWidth(maxAutoSize.Width);
@@ -949,35 +948,32 @@ namespace Avalonia.Controls
             Owner = null;
         }
 
-        [Obsolete("Use HandleResized(Size, PlatformResizeReason)")]
-        protected sealed override void HandleResized(Size clientSize) => HandleResized(clientSize, PlatformResizeReason.Unspecified);
-
         /// <inheritdoc/>
         protected sealed override void HandleResized(Size clientSize, PlatformResizeReason reason)
         {
-            if (ClientSize == clientSize)
-                return;
+            if (ClientSize != clientSize || double.IsNaN(Width) || double.IsNaN(Height))
+            {
+                var sizeToContent = SizeToContent;
 
-            var sizeToContent = SizeToContent;
+                // If auto-sizing is enabled, and the resize came from a user resize (or the reason was
+                // unspecified) then turn off auto-resizing for any window dimension that is not equal
+                // to the requested size.
+                if (sizeToContent != SizeToContent.Manual &&
+                    CanResize &&
+                    reason == PlatformResizeReason.Unspecified ||
+                    reason == PlatformResizeReason.User)
+                {
+                    if (clientSize.Width != ClientSize.Width)
+                        sizeToContent &= ~SizeToContent.Width;
+                    if (clientSize.Height != ClientSize.Height)
+                        sizeToContent &= ~SizeToContent.Height;
+                    SizeToContent = sizeToContent;
+                }
 
-            // If auto-sizing is enabled, and the resize came from a user resize (or the reason was
-            // unspecified) then turn off auto-resizing for any window dimension that is not equal
-            // to the requested size.
-            if (sizeToContent != SizeToContent.Manual &&
-                CanResize &&
-                reason == PlatformResizeReason.Unspecified ||  
-                reason == PlatformResizeReason.User)
-            {
-                if (clientSize.Width != ClientSize.Width)
-                    sizeToContent &= ~SizeToContent.Width;
-                if (clientSize.Height != ClientSize.Height)
-                    sizeToContent &= ~SizeToContent.Height;
-                SizeToContent = sizeToContent;
+                Width = clientSize.Width;
+                Height = clientSize.Height;
             }
 
-            Width = clientSize.Width;
-            Height = clientSize.Height;
-
             base.HandleResized(clientSize, reason);
         }
 
@@ -992,25 +988,20 @@ namespace Avalonia.Controls
         /// </remarks>
         protected virtual void OnClosing(CancelEventArgs e) => Closing?.Invoke(this, e);
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
             if (change.Property == SystemDecorationsProperty)
             {
-                var typedNewValue = change.NewValue.GetValueOrDefault<SystemDecorations>();
+                var (_, typedNewValue) = change.GetOldAndNewValue<SystemDecorations>();
 
                 PlatformImpl?.SetSystemDecorations(typedNewValue);
-
-                var o = change.OldValue.GetValueOrDefault<SystemDecorations>() == SystemDecorations.Full;
-                var n = typedNewValue == SystemDecorations.Full;
-
-                if (o != n)
-                {
-#pragma warning disable CS0618 // Type or member is obsolete
-                    RaisePropertyChanged(HasSystemDecorationsProperty, o, n);
-#pragma warning restore CS0618 // Type or member is obsolete
-                }
             }
         }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new WindowAutomationPeer(this);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 4464491020..89483cd566 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Layout;
@@ -57,13 +58,12 @@ namespace Avalonia.Controls
         {
         }
 
-        public WindowBase(IWindowBaseImpl impl, IAvaloniaDependencyResolver? dependencyResolver) : base(ValidatingWindowBaseImpl.Wrap(impl), dependencyResolver)
+        public WindowBase(IWindowBaseImpl impl, IAvaloniaDependencyResolver? dependencyResolver) : base(impl, dependencyResolver)
         {
-            Screens = new Screens(PlatformImpl?.Screen);
-            var wrapped = PlatformImpl!;
-            wrapped.Activated = HandleActivated;
-            wrapped.Deactivated = HandleDeactivated;
-            wrapped.PositionChanged = HandlePositionChanged;
+            Screens = new Screens(impl.Screen);
+            impl.Activated = HandleActivated;
+            impl.Deactivated = HandleDeactivated;
+            impl.PositionChanged = HandlePositionChanged;
         }
 
         /// <summary>
@@ -94,9 +94,6 @@ namespace Avalonia.Controls
         
         public Screens Screens { get; private set; }
 
-        [Obsolete("No longer used. Always returns false.")]
-        protected bool AutoSizing => false;
-
         /// <summary>
         /// Gets or sets the owner of the window.
         /// </summary>
@@ -169,10 +166,6 @@ namespace Avalonia.Controls
             }
         }
 
-
-        [Obsolete("No longer used. Has no effect.")]
-        protected IDisposable BeginAutoSizing() => Disposable.Empty;
-
         /// <summary>
         /// Ensures that the window is initialized.
         /// </summary>
@@ -186,6 +179,26 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <inheritdoc/>
+        protected override void OnClosed(EventArgs e)
+        {
+            // Window must manually raise Loaded/Unloaded events as it is a visual root and
+            // does not raise OnAttachedToVisualTreeCore/OnDetachedFromVisualTreeCore events
+            OnUnloadedCore();
+
+            base.OnClosed(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnOpened(EventArgs e)
+        {
+            // Window must manually raise Loaded/Unloaded events as it is a visual root and
+            // does not raise OnAttachedToVisualTreeCore/OnDetachedFromVisualTreeCore events
+            ScheduleOnLoadedCore();
+
+            base.OnOpened(e);
+        }
+
         protected override void HandleClosed()
         {
             _ignoreVisibilityChange = true;
@@ -207,9 +220,6 @@ namespace Avalonia.Controls
             }
         }
 
-        [Obsolete("Use HandleResized(Size, PlatformResizeReason)")]
-        protected override void HandleResized(Size clientSize) => HandleResized(clientSize, PlatformResizeReason.Unspecified);
-
         /// <summary>
         /// Handles a resize notification from <see cref="ITopLevelImpl.Resized"/>.
         /// </summary>
@@ -217,10 +227,14 @@ namespace Avalonia.Controls
         /// <param name="reason">The reason for the resize.</param>
         protected override void HandleResized(Size clientSize, PlatformResizeReason reason)
         {
-            ClientSize = clientSize;
             FrameSize = PlatformImpl?.FrameSize;
-            LayoutManager.ExecuteLayoutPass();
-            Renderer?.Resized(clientSize);
+
+            if (ClientSize != clientSize)
+            {
+                ClientSize = clientSize;
+                LayoutManager.ExecuteLayoutPass();
+                Renderer?.Resized(clientSize);
+            }
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/WindowTransparencyLevel.cs b/src/Avalonia.Controls/WindowTransparencyLevel.cs
index f416b5de91..d463f74a0e 100644
--- a/src/Avalonia.Controls/WindowTransparencyLevel.cs
+++ b/src/Avalonia.Controls/WindowTransparencyLevel.cs
@@ -22,6 +22,11 @@
         /// </summary>
         AcrylicBlur,
         
+        /// <summary>
+        /// Force acrylic on some incompatible versions of Windows 10. 
+        /// </summary>
+        ForceAcrylicBlur,
+        
         /// <summary>
         /// The window background is based on desktop wallpaper tint with a blur. This will only work on Windows 11 
         /// </summary>
diff --git a/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index f8a7cdc690..0be695e0a1 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -16,15 +16,8 @@
     <EmbeddedResource Condition="'$(Configuration)' == 'Debug'" Remove="Remote\HtmlTransport\webapp\build\**\*.map.gz" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />
diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
index b009778f97..811f9c7baa 100644
--- a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
+++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
@@ -37,6 +37,7 @@ namespace Avalonia.DesignerSupport
                 var localAsm = assemblyPath != null ? Assembly.LoadFile(Path.GetFullPath(assemblyPath)) : null;
                 var loaded = loader.Load(stream, localAsm, null, baseUri, true);
                 var style = loaded as IStyle;
+                var resources = loaded as ResourceDictionary;
                 if (style != null)
                 {
                     var substitute = Design.GetPreviewWith((AvaloniaObject)style);
@@ -58,6 +59,27 @@ namespace Avalonia.DesignerSupport
                             }
                         };
                 }
+                else if (resources != null)
+                {
+                    var substitute = Design.GetPreviewWith(resources);
+                    if (substitute != null)
+                    {
+                        substitute.Resources.MergedDictionaries.Add(resources);
+                        control = substitute;
+                    }
+                    else
+                        control = new StackPanel
+                        {
+                            Children =
+                            {
+                                new TextBlock {Text = "ResourceDictionaries can't be previewed without Design.PreviewWith. Add"},
+                                new TextBlock {Text = "<Design.PreviewWith>"},
+                                new TextBlock {Text = "    <Border Padding=20><!-- YOUR CONTROL FOR PREVIEW HERE --></Border>"},
+                                new TextBlock {Text = "</Design.PreviewWith>"},
+                                new TextBlock {Text = "in your resource dictionary"}
+                            }
+                        };
+                }
                 else if (loaded is Application)
                     control = new TextBlock {Text = "Application can't be previewed in design view"};
                 else
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
index 6b1934ed06..f100be5d5b 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
@@ -10,6 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Utilities;
 using InputProtocol = Avalonia.Remote.Protocol.Input;
 
 namespace Avalonia.DesignerSupport.Remote.HtmlTransport
@@ -320,15 +321,13 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
             ? null
             : modifiersText
                 .Split(',')
-                .Select(x => (InputProtocol.InputModifiers)Enum.Parse(
-                    typeof(InputProtocol.InputModifiers), x, true))
+                .Select(x => EnumHelper.Parse<InputProtocol.InputModifiers>(x, true))
                 .ToArray();
 
         private static InputProtocol.MouseButton ParseMouseButton(string buttonText) =>
             string.IsNullOrWhiteSpace(buttonText)
             ? InputProtocol.MouseButton.None
-            : (InputProtocol.MouseButton)Enum.Parse(
-                typeof(InputProtocol.MouseButton), buttonText, true);
+            : EnumHelper.Parse<InputProtocol.MouseButton>(buttonText, true);
 
         private static double ParseDouble(string text) =>
             double.Parse(text, NumberStyles.Float, CultureInfo.InvariantCulture);
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
index 6af21bbcf5..6bfae536c9 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
@@ -72,7 +72,7 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
                 while (true)
                 {
                     line = await ReadLineAsync();
-                    if (line == "")
+                    if (string.IsNullOrEmpty(line))
                         break;
                     sp = line.Split(new[] {':'}, 2);
                     headers[sp[0]] = sp[1].TrimStart();
@@ -140,7 +140,7 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
                 IsWebsocketRequest = true;
                 if (headers.TryGetValue("Sec-WebSocket-Protocol", out h))
                     WebSocketProtocols = h.Split(',').Select(x => x.Trim()).ToArray();
-                else WebSocketProtocols = new string[0];
+                else WebSocketProtocols = Array.Empty<string>();
             }
         }
 
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/build.js b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/build.js
new file mode 100644
index 0000000000..32016c5062
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/build.js
@@ -0,0 +1,28 @@
+import { build } from 'esbuild';
+import htmlPlugin from '@chialab/esbuild-plugin-html';
+import { compress } from 'esbuild-plugin-compress';
+
+build({
+    entryPoints: ['src/index.html'],
+    chunkNames: '[name]-[hash]',
+    logLevel: "warning",
+    outdir: "./build",
+    bundle: true,
+    treeShaking: true,
+    minify: true,
+    write: false,
+    format: "esm",
+    target: "es6",
+    platform: "browser",
+    sourcemap: "linked",
+    loader: {".ts": "tsx"},
+    plugins: [
+        htmlPlugin(),
+        compress({
+            brotli: false,
+            gzip: true
+        })
+    ]
+  })
+  .then(() => console.log("⚡ Done"))
+  .catch(() => process.exit(1));
\ No newline at end of file
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
index 6a5fea5b10..1660cf7d8f 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
@@ -1,490 +1,841 @@
 {
-  "name": "simple",
+  "name": "previewer",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
-  "dependencies": {
-    "@discoveryjs/json-ext": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz",
-      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
-      "dev": true
+  "packages": {
+    "": {
+      "name": "previewer",
+      "dependencies": {
+        "@types/react": "^17.0.38",
+        "@types/react-dom": "^17.0.11",
+        "mobx": "^6.3.13",
+        "mobx-react": "^7.2.1",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2"
+      },
+      "devDependencies": {
+        "@chialab/esbuild-plugin-html": "^0.17.0",
+        "esbuild": "^0.14.54",
+        "esbuild-plugin-compress": "^0.4.0",
+        "typescript": "^4.7.4"
+      }
     },
-    "@types/eslint": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
-      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
+    "node_modules/@chialab/esbuild-plugin-html": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@chialab/esbuild-plugin-html/-/esbuild-plugin-html-0.17.0.tgz",
+      "integrity": "sha512-a6TzUyT1VWb9wp71bpsd5+69Bk3BMCtWv2RSkzCYGV0AdKF8EVl/4BxKqGddz4rOFZFeqc4Ij08jqCnYFxymRA==",
       "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
+      "dependencies": {
+        "@chialab/esbuild-rna": "^0.17.0",
+        "@chialab/node-resolve": "^0.17.0"
+      },
+      "engines": {
+        "node": ">=13"
       }
     },
-    "@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+    "node_modules/@chialab/esbuild-rna": {
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/@chialab/esbuild-rna/-/esbuild-rna-0.17.2.tgz",
+      "integrity": "sha512-L6VRLdyBkTJPq+wpGVWi6IIM/jdstDLjz88m/AqWq0MGaS9YlKYJ5IHhYAAc6+EZQG+u/Oh8yfl1Bj35BnKgpg==",
       "dev": true,
-      "requires": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
+      "dependencies": {
+        "@chialab/estransform": "^0.17.0",
+        "@chialab/node-resolve": "^0.17.0"
+      },
+      "engines": {
+        "node": ">=13"
       }
     },
-    "@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+    "node_modules/@chialab/estransform": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@chialab/estransform/-/estransform-0.17.1.tgz",
+      "integrity": "sha512-sggpbjQ8RQyEDhbC2DoNK3DpTvcK9Qr+VtTg70uxVHNkVbyiZcY2CH6wZGlKJEP+duAx7xQVQ0lQU4QySIluLQ==",
       "dev": true,
-      "requires": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
+      "dependencies": {
+        "@parcel/source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=13"
       }
     },
-    "@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
+    "node_modules/@chialab/node-resolve": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@chialab/node-resolve/-/node-resolve-0.17.0.tgz",
+      "integrity": "sha512-u9VwO/0djjXsM70aH/Wrx0BrXjtjhfNOxaDks32xa1mZP9T0CXZ0be5Sv3hXI9g5UeJbfvCyFJS2hfJEu7Ifgg==",
+      "dev": true,
+      "engines": {
+        "node": ">=13"
+      }
     },
-    "@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
+      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "@types/node": {
-      "version": "17.0.14",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz",
-      "integrity": "sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==",
-      "dev": true
+    "node_modules/@parcel/source-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.1.0.tgz",
+      "integrity": "sha512-E7UOEIof2o89LrKk1agSLmwakjigmEdDp1ZaEdsLVEvq63R/bul4Ij5CT+0ZDcijGpl5tnTbQADY9EyYGtjYgQ==",
+      "dev": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
+      "engines": {
+        "node": "^12.18.3 || >=14"
+      }
     },
-    "@types/prop-types": {
+    "node_modules/@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
       "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
-    "@types/react": {
+    "node_modules/@types/react": {
       "version": "17.0.38",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.38.tgz",
       "integrity": "sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==",
-      "requires": {
+      "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
-    "@types/react-dom": {
+    "node_modules/@types/react-dom": {
       "version": "17.0.11",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz",
       "integrity": "sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==",
-      "requires": {
+      "dependencies": {
         "@types/react": "*"
       }
     },
-    "@types/scheduler": {
+    "node_modules/@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
       "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
-    "@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
     },
-    "@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
+    "node_modules/csstype": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
     },
-    "@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+    "node_modules/esbuild": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
+      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
       "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/linux-loong64": "0.14.54",
+        "esbuild-android-64": "0.14.54",
+        "esbuild-android-arm64": "0.14.54",
+        "esbuild-darwin-64": "0.14.54",
+        "esbuild-darwin-arm64": "0.14.54",
+        "esbuild-freebsd-64": "0.14.54",
+        "esbuild-freebsd-arm64": "0.14.54",
+        "esbuild-linux-32": "0.14.54",
+        "esbuild-linux-64": "0.14.54",
+        "esbuild-linux-arm": "0.14.54",
+        "esbuild-linux-arm64": "0.14.54",
+        "esbuild-linux-mips64le": "0.14.54",
+        "esbuild-linux-ppc64le": "0.14.54",
+        "esbuild-linux-riscv64": "0.14.54",
+        "esbuild-linux-s390x": "0.14.54",
+        "esbuild-netbsd-64": "0.14.54",
+        "esbuild-openbsd-64": "0.14.54",
+        "esbuild-sunos-64": "0.14.54",
+        "esbuild-windows-32": "0.14.54",
+        "esbuild-windows-64": "0.14.54",
+        "esbuild-windows-arm64": "0.14.54"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
+      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
+      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
+      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
+      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
+      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
+      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-32": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
+      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
+      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
+      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
+      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
+      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
+      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
+      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
+      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
+      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
+      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-plugin-compress": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/esbuild-plugin-compress/-/esbuild-plugin-compress-0.4.0.tgz",
+      "integrity": "sha512-W9L9f9ClfJe32y9850vkSpd2ib7klFszOyVoMa5imI3CSdW/UbxPBhb1ZaVKPnNCZqZisw8KtTiJTQdVawPB9w==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "fs-extra": "^10.0.0"
+      },
+      "peerDependencies": {
+        "esbuild": "^0.14.0"
+      }
+    },
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
+      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-32": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
+      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
+      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
+      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
+    "node_modules/mobx": {
+      "version": "6.3.13",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.3.13.tgz",
+      "integrity": "sha512-zDDKDhYUk9QCHQUdLG+wb4Jv/nXutSLt/P8kkwHyjdbrJO4OZS6QTEsrOnrKM39puqXSrJZHdB6+yRys2NBFFA==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
       }
     },
-    "@webpack-cli/configtest": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
-      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true
-    },
-    "@webpack-cli/info": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz",
-      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
-      "dev": true,
-      "requires": {
-        "envinfo": "^7.7.3"
+    "node_modules/mobx-react": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.1.tgz",
+      "integrity": "sha512-LZS99KFLn75VWDXPdRJhILzVQ7qLcRjQbzkK+wVs0Qg4kWw5hOI2USp7tmu+9zP9KYsVBmKyx2k/8cTTBfsymw==",
+      "dependencies": {
+        "mobx-react-lite": "^3.2.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      },
+      "peerDependencies": {
+        "mobx": "^6.1.0",
+        "react": "^16.8.0 || ^17"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
       }
     },
-    "@webpack-cli/serve": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
-      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+    "node_modules/mobx-react-lite": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.3.tgz",
+      "integrity": "sha512-7exWp1FV0M9dP08H9PIeHlJqDw4IdkQVRMfLYaZFMmlbzSS6ZU6p/kx392KN+rVf81hH3IQYewvRGQ70oiwmbw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      },
+      "peerDependencies": {
+        "mobx": "^6.1.0",
+        "react": "^16.8.0 || ^17"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
     },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
-      "dev": true
+    "node_modules/react": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true
+    "node_modules/react-dom": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
+      },
+      "peerDependencies": {
+        "react": "17.0.2"
+      }
     },
-    "acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true
+    "node_modules/scheduler": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
     },
-    "ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "requires": {
-        "ajv": "^8.0.0"
-      },
       "dependencies": {
-        "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        }
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/typescript": {
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+      "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
       "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
       }
     },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+      "engines": {
+        "node": ">= 10.0.0"
       }
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+    }
+  },
+  "dependencies": {
+    "@chialab/esbuild-plugin-html": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@chialab/esbuild-plugin-html/-/esbuild-plugin-html-0.17.0.tgz",
+      "integrity": "sha512-a6TzUyT1VWb9wp71bpsd5+69Bk3BMCtWv2RSkzCYGV0AdKF8EVl/4BxKqGddz4rOFZFeqc4Ij08jqCnYFxymRA==",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "@chialab/esbuild-rna": "^0.17.0",
+        "@chialab/node-resolve": "^0.17.0"
       }
     },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+    "@chialab/esbuild-rna": {
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/@chialab/esbuild-rna/-/esbuild-rna-0.17.2.tgz",
+      "integrity": "sha512-L6VRLdyBkTJPq+wpGVWi6IIM/jdstDLjz88m/AqWq0MGaS9YlKYJ5IHhYAAc6+EZQG+u/Oh8yfl1Bj35BnKgpg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.14"
+        "@chialab/estransform": "^0.17.0",
+        "@chialab/node-resolve": "^0.17.0"
       }
     },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "body": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+    "@chialab/estransform": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@chialab/estransform/-/estransform-0.17.1.tgz",
+      "integrity": "sha512-sggpbjQ8RQyEDhbC2DoNK3DpTvcK9Qr+VtTg70uxVHNkVbyiZcY2CH6wZGlKJEP+duAx7xQVQ0lQU4QySIluLQ==",
       "dev": true,
       "requires": {
-        "continuable-cache": "^0.3.1",
-        "error": "^7.0.0",
-        "raw-body": "~1.1.0",
-        "safe-json-parse": "~1.0.1"
+        "@parcel/source-map": "^2.0.0"
       }
     },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+    "@chialab/node-resolve": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@chialab/node-resolve/-/node-resolve-0.17.0.tgz",
+      "integrity": "sha512-u9VwO/0djjXsM70aH/Wrx0BrXjtjhfNOxaDks32xa1mZP9T0CXZ0be5Sv3hXI9g5UeJbfvCyFJS2hfJEu7Ifgg==",
       "dev": true
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "@esbuild/linux-loong64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
+      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
       "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
+      "optional": true
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "@parcel/source-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.1.0.tgz",
+      "integrity": "sha512-E7UOEIof2o89LrKk1agSLmwakjigmEdDp1ZaEdsLVEvq63R/bul4Ij5CT+0ZDcijGpl5tnTbQADY9EyYGtjYgQ==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "detect-libc": "^1.0.3"
       }
     },
-    "browserslist": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
-      "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
-      "dev": true,
+    "@types/prop-types": {
+      "version": "15.7.4",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+    },
+    "@types/react": {
+      "version": "17.0.38",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.38.tgz",
+      "integrity": "sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001286",
-        "electron-to-chromium": "^1.4.17",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "bytes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-      "dev": true
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
+    "@types/react-dom": {
+      "version": "17.0.11",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz",
+      "integrity": "sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "@types/react": "*"
       }
     },
-    "camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+    "@types/scheduler": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "requires": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
+        "color-convert": "^2.0.1"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30001305",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001305.tgz",
-      "integrity": "sha512-p7d9YQMji8haf0f+5rbcv9WlQ+N5jMPfRAnUmZRlNxsNeBO3Yr7RYG6M2uTY1h9tCVdlkJg6YNNc4kiAiBLdWA==",
-      "dev": true
-    },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -495,56 +846,13 @@
         "supports-color": "^7.1.0"
       }
     },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
-    },
-    "clean-css": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz",
-      "integrity": "sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg==",
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "clean-webpack-plugin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
-      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
-      "dev": true,
-      "requires": {
-        "del": "^4.1.1"
-      }
-    },
-    "clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "~1.1.4"
+        "color-name": "~1.1.4"
       }
     },
     "color-name": {
@@ -553,2322 +861,313 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
+    "csstype": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
     },
-    "commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true
     },
-    "compression-webpack-plugin": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz",
-      "integrity": "sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==",
+    "esbuild": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
+      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
       "dev": true,
       "requires": {
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "serialize-javascript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-          "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        }
+        "@esbuild/linux-loong64": "0.14.54",
+        "esbuild-android-64": "0.14.54",
+        "esbuild-android-arm64": "0.14.54",
+        "esbuild-darwin-64": "0.14.54",
+        "esbuild-darwin-arm64": "0.14.54",
+        "esbuild-freebsd-64": "0.14.54",
+        "esbuild-freebsd-arm64": "0.14.54",
+        "esbuild-linux-32": "0.14.54",
+        "esbuild-linux-64": "0.14.54",
+        "esbuild-linux-arm": "0.14.54",
+        "esbuild-linux-arm64": "0.14.54",
+        "esbuild-linux-mips64le": "0.14.54",
+        "esbuild-linux-ppc64le": "0.14.54",
+        "esbuild-linux-riscv64": "0.14.54",
+        "esbuild-linux-s390x": "0.14.54",
+        "esbuild-netbsd-64": "0.14.54",
+        "esbuild-openbsd-64": "0.14.54",
+        "esbuild-sunos-64": "0.14.54",
+        "esbuild-windows-32": "0.14.54",
+        "esbuild-windows-64": "0.14.54",
+        "esbuild-windows-arm64": "0.14.54"
       }
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "continuable-cache": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-      "dev": true
-    },
-    "cross-env": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+    "esbuild-android-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
+      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
       "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.1"
-      }
+      "optional": true
     },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "esbuild-android-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
+      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
       "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
+      "optional": true
     },
-    "css-loader": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
-      "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
+    "esbuild-darwin-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
+      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
       "dev": true,
-      "requires": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.2.15",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
+      "optional": true
     },
-    "css-select": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz",
-      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+    "esbuild-darwin-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
+      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
       "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.1.0",
-        "domhandler": "^4.3.0",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      }
-    },
-    "css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "csstype": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
+      "optional": true
     },
-    "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+    "esbuild-freebsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
+      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
       "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
-            }
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
-      }
+      "optional": true
     },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+    "esbuild-freebsd-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
+      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
       "dev": true,
-      "requires": {
-        "utila": "~0.4"
-      }
+      "optional": true
     },
-    "dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+    "esbuild-linux-32": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
+      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
       "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      }
-    },
-    "domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true
+      "optional": true
     },
-    "domhandler": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
-      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+    "esbuild-linux-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
+      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
       "dev": true,
-      "requires": {
-        "domelementtype": "^2.2.0"
-      }
+      "optional": true
     },
-    "domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+    "esbuild-linux-arm": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
+      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
       "dev": true,
-      "requires": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      }
+      "optional": true
     },
-    "dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+    "esbuild-linux-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
+      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
       "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.4.61",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.61.tgz",
-      "integrity": "sha512-kpzCOOFlx63C9qKRyIDEsKIUgzoe98ump7T4gU+/OLzj8gYkkWf2SIyBjhTSE0keAjMAp3i7C262YtkQOMYrGw==",
-      "dev": true
+      "optional": true
     },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
-    },
-    "enhanced-resolve": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-      "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+    "esbuild-linux-mips64le": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
+      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
       "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.9",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-          "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-          "dev": true
-        }
-      }
+      "optional": true
     },
-    "entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true
-    },
-    "envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true
-    },
-    "error": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
-      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
+    "esbuild-linux-ppc64le": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
+      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
       "dev": true,
-      "requires": {
-        "string-template": "~0.2.1"
-      }
-    },
-    "es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "optional": true
     },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "esbuild-linux-riscv64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
+      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
       "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
+      "optional": true
     },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "esbuild-linux-s390x": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
+      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
       "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true
+      "optional": true
     },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+    "esbuild-netbsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
+      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
       "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "optional": true
     },
-    "fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
-    },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+    "esbuild-openbsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
+      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
       "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
+      "optional": true
     },
-    "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+    "esbuild-plugin-compress": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/esbuild-plugin-compress/-/esbuild-plugin-compress-0.4.0.tgz",
+      "integrity": "sha512-W9L9f9ClfJe32y9850vkSpd2ib7klFszOyVoMa5imI3CSdW/UbxPBhb1ZaVKPnNCZqZisw8KtTiJTQdVawPB9w==",
       "dev": true,
       "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-          "dev": true
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "json5": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
+        "chalk": "^4.1.2",
+        "fs-extra": "^10.0.0"
       }
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "esbuild-sunos-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
+      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
       "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "optional": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+    "esbuild-windows-32": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
+      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
+      "dev": true,
+      "optional": true
     },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+    "esbuild-windows-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
+      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
       "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
+      "optional": true
     },
-    "get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true
+    "esbuild-windows-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
+      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
+      "dev": true,
+      "optional": true
     },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+    "fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
     },
     "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true
     },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
-      "requires": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dev": true,
-      "requires": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
-        },
-        "tapable": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-          "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-          "dev": true
-        }
-      }
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "htmlparser2": {
+    "jsonfile": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
       }
     },
-    "http-parser-js": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",
-      "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==",
-      "dev": true
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
-    },
-    "import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        }
-      }
+    "mobx": {
+      "version": "6.3.13",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.3.13.tgz",
+      "integrity": "sha512-zDDKDhYUk9QCHQUdLG+wb4Jv/nXutSLt/P8kkwHyjdbrJO4OZS6QTEsrOnrKM39puqXSrJZHdB6+yRys2NBFFA=="
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
+    "mobx-react": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.1.tgz",
+      "integrity": "sha512-LZS99KFLn75VWDXPdRJhILzVQ7qLcRjQbzkK+wVs0Qg4kWw5hOI2USp7tmu+9zP9KYsVBmKyx2k/8cTTBfsymw==",
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "mobx-react-lite": "^3.2.0"
       }
     },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+    "mobx-react-lite": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.3.tgz",
+      "integrity": "sha512-7exWp1FV0M9dP08H9PIeHlJqDw4IdkQVRMfLYaZFMmlbzSS6ZU6p/kx392KN+rVf81hH3IQYewvRGQ70oiwmbw==",
+      "requires": {}
     },
-    "interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
-    "is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-      "dev": true,
+    "react": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
       "requires": {
-        "has": "^1.0.3"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
+    "react-dom": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
       "requires": {
-        "is-path-inside": "^2.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
       }
     },
-    "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
+    "scheduler": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
       "requires": {
-        "path-is-inside": "^1.0.2"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "has-flag": "^4.0.0"
       }
     },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+    "typescript": {
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+      "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
       "dev": true
     },
-    "isexe": {
+    "universalify": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "jest-worker": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz",
-      "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "livereload-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
-      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-      "dev": true
-    },
-    "loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      }
-    },
-    "mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.51.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "mini-css-extract-plugin": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz",
-      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
-      "dev": true,
-      "requires": {
-        "schema-utils": "^4.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        }
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "mobx": {
-      "version": "6.3.13",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.3.13.tgz",
-      "integrity": "sha512-zDDKDhYUk9QCHQUdLG+wb4Jv/nXutSLt/P8kkwHyjdbrJO4OZS6QTEsrOnrKM39puqXSrJZHdB6+yRys2NBFFA=="
-    },
-    "mobx-react": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.1.tgz",
-      "integrity": "sha512-LZS99KFLn75VWDXPdRJhILzVQ7qLcRjQbzkK+wVs0Qg4kWw5hOI2USp7tmu+9zP9KYsVBmKyx2k/8cTTBfsymw==",
-      "requires": {
-        "mobx-react-lite": "^3.2.0"
-      }
-    },
-    "mobx-react-lite": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.3.tgz",
-      "integrity": "sha512-7exWp1FV0M9dP08H9PIeHlJqDw4IdkQVRMfLYaZFMmlbzSS6ZU6p/kx392KN+rVf81hH3IQYewvRGQ70oiwmbw=="
-    },
-    "nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
-      "dev": true
-    },
-    "no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node-releases": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-      "dev": true
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.0.0"
-      },
-      "dependencies": {
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        }
-      }
-    },
-    "nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true
-    },
-    "param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "requires": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "postcss": {
-      "version": "8.4.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
-      "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.2.0",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
-    },
-    "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.0.0"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
-      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "raw-body": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-      "dev": true,
-      "requires": {
-        "bytes": "1",
-        "string_decoder": "0.10"
-      },
-      "dependencies": {
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "react": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "react-dom": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
-      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "scheduler": "^0.20.2"
-      }
-    },
-    "rechoir": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.9.0"
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
-    "renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "requires": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
-        }
-      }
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^5.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-json-parse": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "scheduler": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
-      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      }
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
-      "dev": true
-    },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
-    },
-    "source-map-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
-      }
-    },
-    "string-template": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-      "dev": true
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true
-    },
-    "style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
-    },
-    "terser": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
-      "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.20"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.21",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.6.1",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
-      "requires": {
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "serialize-javascript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-          "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "tiny-lr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-      "dev": true,
-      "requires": {
-        "body": "^5.1.0",
-        "debug": "^3.1.0",
-        "faye-websocket": "~0.10.0",
-        "livereload-js": "^2.3.0",
-        "object-assign": "^4.1.0",
-        "qs": "^6.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "to-string-loader": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/to-string-loader/-/to-string-loader-1.2.0.tgz",
-      "integrity": "sha512-KsWUL8FccgBW9FPFm4vYoQbOOcO5m6hKOGYoXjbseD9/4Ft+ravXN5jolQ9kTKYcK4zPt1j+khx97GPGnVoi6A==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.0.0"
-      }
-    },
-    "ts-loader": {
-      "version": "9.2.6",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz",
-      "integrity": "sha512-QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.0.0",
-        "micromatch": "^4.0.0",
-        "semver": "^7.3.4"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
-      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "tsconfig-paths-webpack-plugin": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz",
-      "integrity": "sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.7.0",
-        "tsconfig-paths": "^3.9.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "enhanced-resolve": {
-          "version": "5.8.3",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-          "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.4",
-            "tapable": "^2.2.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.9",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-          "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "tapable": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-          "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-          "dev": true
-        }
-      }
-    },
-    "tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "typescript": {
-      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
-      "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-loader": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
-      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "mime-types": "^2.1.27",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-          "dev": true
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "json5": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
-      "requires": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "webpack": {
-      "version": "5.68.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz",
-      "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.50",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.3",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true
-        },
-        "enhanced-resolve": {
-          "version": "5.8.3",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-          "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.4",
-            "tapable": "^2.2.0"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "graceful-fs": {
-          "version": "4.2.9",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-          "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-          "dev": true
-        },
-        "neo-async": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-          "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "tapable": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-          "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-cli": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz",
-      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
-      "dev": true,
-      "requires": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.1.1",
-        "@webpack-cli/info": "^1.4.1",
-        "@webpack-cli/serve": "^1.6.1",
-        "colorette": "^2.0.14",
-        "commander": "^7.0.0",
-        "execa": "^5.0.0",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^2.2.0",
-        "rechoir": "^0.7.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-livereload-plugin": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/webpack-livereload-plugin/-/webpack-livereload-plugin-3.0.2.tgz",
-      "integrity": "sha512-5JeZ2dgsvSNG+clrkD/u2sEiPcNk4qwCVZZmW8KpqKcNlkGv7IJjdVrq13+etAmMZYaCF1EGXdHkVFuLgP4zfw==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^3.1.1",
-        "portfinder": "^1.0.17",
-        "schema-utils": ">1.0.0",
-        "tiny-lr": "^1.1.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        }
-      }
-    },
-    "webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-      "dev": true,
-      "requires": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     }
   }
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json
index b0b5547e62..f4aed6542e 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json
@@ -1,34 +1,16 @@
 {
-  "name": "simple",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
+  "name": "previewer",
   "scripts": {
-    "webpack-ver": "cross-env NODE_ENV=production webpack --version",
-    "dist": "cross-env NODE_ENV=production webpack",
-    "watch": "cross-env NODE_ENV=development webpack --watch"
+    "predist": "tsc -noEmit",
+    "dist": "node build.js"
   },
-  "author": "",
-  "license": "ISC",
   "devDependencies": {
-    "clean-webpack-plugin": "^4.0.0",
-    "compression-webpack-plugin": "^9.2.0",
-    "cross-env": "^7.0.3",
-    "css-loader": "^6.5.1",
-    "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.0",
-    "mini-css-extract-plugin": "^2.5.3",
-    "source-map-loader": "^3.0.1",
-    "style-loader": "^3.3.1",
-    "to-string-loader": "^1.2.0",
-    "ts-loader": "^9.2.6",
-    "tsconfig-paths-webpack-plugin": "^3.5.2",
-    "typescript": "^4.5.5",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.68.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-livereload-plugin": "^3.0.2"
+    "@chialab/esbuild-plugin-html": "^0.17.0",
+    "esbuild": "^0.14.54",
+    "esbuild-plugin-compress": "^0.4.0",
+    "typescript": "^4.7.4"
   },
+  "type": "module",
   "dependencies": {
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html
index f5847cdd58..9b1be377ed 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html
@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
     <title>Avalonia XAML previewer web edition</title>
 </head>
-
 <body>
-<div id="app">
-    <center>Loading...</center>
-</div>
-<noscript>Javascript is required</noscript>
+    <div id="app">
+        <center>Loading...</center>
+    </div>
+    <noscript>JavaScript is required</noscript>
+    <script src="index.tsx"></script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json
index f933cde76a..0324a239cf 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "outDir": "build/dist",
     "module": "esnext",
-    "target": "es5",
+    "target": "es6",
     "lib": ["es6", "dom"],
     "sourceMap": true,
     "allowJs": true,
@@ -25,11 +25,6 @@
   "include": ["./src/**/*"],
   "exclude": [
     "node_modules",
-    "build",
-    "scripts",
-    "acceptance-tests",
-    "webpack",
-    "jest",
-    "src/setupTests.ts"
+    "build"
   ]
 }
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
deleted file mode 100644
index 957eaff10b..0000000000
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
+++ /dev/null
@@ -1,116 +0,0 @@
-const webpack = require('webpack');
-const path = require('path');
-const LiveReloadPlugin = require('webpack-livereload-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CompressionPlugin = require('compression-webpack-plugin');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-const prod = process.env.NODE_ENV == 'production';
-
-class Printer {
-    apply(compiler) {
-        compiler.hooks.afterEmit.tap("Printer", ()=> console.log("Build completed at " + new Date().toString()));
-        compiler.hooks.watchRun.tap("Printer", ()=> console.log("Watch triggered at " + new Date().toString()));
-    }
-}
-
-const config = {
-    stats: {
-        errorDetails: true
-    },
-    entry: {
-            bundle: './src/index.tsx'
-        },
-    output: {
-        path: path.resolve(__dirname, 'build'),
-        publicPath: '/',
-        filename: '[name].[chunkhash].js'
-    },
-    performance: { hints: false },
-    mode: prod ? "production" : "development",
-    module: {
-        rules: [
-            {
-                enforce: "pre",
-                test: /\.js$/,
-                loader: "source-map-loader",
-                exclude: [
-                    path.resolve(__dirname, 'node_modules/mobx-state-router')
-                ]
-            },
-            {
-                "oneOf": [
-                    {
-                        test: /\.(ts|tsx)$/,
-                        exclude: /node_modules/,
-                        use: 'ts-loader'
-                    },
-                    {
-                        test: /\.css$/,
-                        use: [
-                            MiniCssExtractPlugin.loader,
-                            'css-loader'
-                        ]
-                    },
-                    {
-                        test: /\.(jpg|png)$/,
-                        use: {
-                            loader: "url-loader",
-                            options: {
-                                limit: 25000,
-                            },
-                        },
-                    },
-                    {
-                        test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
-                        use: [{
-                            loader: 'file-loader',
-                            options: {
-                                name: '[name].[ext]',
-                                outputPath: 'fonts/',    // where the fonts will go
-                            }
-                        }]
-                    },
-                    {
-                        loader: require.resolve('file-loader'),
-                        exclude: [/\.(js|jsx|mjs|tsx|ts)$/, /\.html$/, /\.json$/],
-                        options: {
-                            name: 'assets/[name].[hash:8].[ext]',
-                        },
-                    }]
-            },
-
-        ]
-    },
-    devtool: "source-map",
-    resolve: {
-        modules: [path.resolve(__dirname, 'node_modules')],
-        plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json", logLevel: 'info' })],
-        extensions: ['.ts', '.tsx', '.js', '.json'],
-        alias: {
-            'src': path.resolve(__dirname, 'src')
-        }
-    },
-    plugins:
-        [
-        new Printer(),
-        new CleanWebpackPlugin({
-            cleanAfterEveryBuildPatterns: ['dist']
-        }),
-        new MiniCssExtractPlugin({
-            filename: "[name].[chunkhash]h" +
-            ".css",
-            chunkFilename: "[id].[chunkhash].css"
-        }),
-        new LiveReloadPlugin({appendScriptTag: !prod}),
-        new HtmlWebpackPlugin({
-            template: path.resolve(__dirname, './src/index.html'),
-            filename: 'index.html' //relative to root of the application
-        }),
-        new CompressionPlugin({
-            test: /(\?.*)?$/i
-        })
-    ]
-};
-module.exports = config;
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 5cae29cafd..037c5e0c71 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -1,16 +1,17 @@
 using System;
-using System.Reactive.Disposables;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Controls.Remote.Server;
 using Avalonia.Input;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Viewport;
 using Avalonia.Threading;
 
 namespace Avalonia.DesignerSupport.Remote
 {
-    class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl
+    class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl, ITopLevelImplWithStorageProvider
     {
         private readonly IAvaloniaRemoteTransportConnection _transport;
 
@@ -91,6 +92,8 @@ namespace Avalonia.DesignerSupport.Remote
 
         public bool NeedsManagedDecorations => false;
 
+        public IStorageProvider StorageProvider => new NoopStorageProvider();
+
         public void Activate()
         {
         }
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
index 5d8b166b5a..cd14b2d69a 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
@@ -9,7 +9,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.DesignerSupport.Remote
 {
-    class PreviewerWindowingPlatform : IWindowingPlatform, IPlatformSettings
+    class PreviewerWindowingPlatform : IWindowingPlatform
     {
         static readonly IKeyboardDevice Keyboard = new KeyboardDevice();
         private static IAvaloniaRemoteTransportConnection s_transport;
@@ -51,22 +51,14 @@ namespace Avalonia.DesignerSupport.Remote
                 .Bind<IClipboard>().ToSingleton<ClipboardStub>()
                 .Bind<ICursorFactory>().ToSingleton<CursorFactoryStub>()
                 .Bind<IKeyboardDevice>().ToConstant(Keyboard)
-                .Bind<IPlatformSettings>().ToConstant(instance)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformThreadingInterface>().ToConstant(threading)
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
-                .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsStub>()
                 .Bind<IWindowingPlatform>().ToConstant(instance)
                 .Bind<IPlatformIconLoader>().ToSingleton<IconLoaderStub>()
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
 
         }
-
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
     }
 }
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index be2405efde..ca2c2c7fb2 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -168,8 +168,12 @@ namespace Avalonia.DesignerSupport.Remote
             var entryPoint = asm.EntryPoint;
             if (entryPoint == null)
                 throw Die($"Assembly {args.AppPath} doesn't have an entry point");
-            var builderMethod = entryPoint.DeclaringType.GetMethod(BuilderMethodName,
-                BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic, null, Array.Empty<Type>(), null);
+            var builderMethod = entryPoint.DeclaringType.GetMethod(
+                BuilderMethodName,
+                BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy,
+                null,
+                Array.Empty<Type>(),
+                null);
             if (builderMethod == null)
                 throw Die($"{entryPoint.DeclaringType.FullName} doesn't have a method named {BuilderMethodName}");
             Design.IsDesignMode = true;
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index 9dcd4d8e87..7d4a6518ef 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reactive.Disposables;
 using System.Threading.Tasks;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives.PopupPositioning;
@@ -10,6 +11,8 @@ using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
 using Avalonia.Rendering;
 
 namespace Avalonia.DesignerSupport.Remote
@@ -188,7 +191,7 @@ namespace Avalonia.DesignerSupport.Remote
 
         public Task ClearAsync() => Task.CompletedTask;
         public Task SetDataObjectAsync(IDataObject data) => Task.CompletedTask;
-        public Task<string[]> GetFormatsAsync() => Task.FromResult(new string[0]);
+        public Task<string[]> GetFormatsAsync() => Task.FromResult(Array.Empty<string>());
 
         public Task<object> GetDataAsync(string format) => Task.FromResult((object)null);
     }
@@ -221,20 +224,47 @@ namespace Avalonia.DesignerSupport.Remote
         public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) => new IconStub();
     }
 
-    class SystemDialogsStub : ISystemDialogImpl
-    {
-        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent) =>
-            Task.FromResult((string[])null);
-
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent) =>
-            Task.FromResult((string)null);
-    }
-
     class ScreenStub : IScreenImpl
     {
         public int ScreenCount => 1;
 
         public IReadOnlyList<Screen> AllScreens { get; } =
             new Screen[] { new Screen(1, new PixelRect(0, 0, 4000, 4000), new PixelRect(0, 0, 4000, 4000), true) };
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
+    }
+
+    internal class NoopStorageProvider : BclStorageProvider
+    {
+        public override bool CanOpen => false;
+        public override Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            return Task.FromResult<IReadOnlyList<IStorageFile>>(Array.Empty<IStorageFile>());
+        }
+
+        public override bool CanSave => false;
+        public override Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            return Task.FromResult<IStorageFile>(null);
+        }
+
+        public override bool CanPickFolder => false;
+        public override Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            return Task.FromResult<IReadOnlyList<IStorageFolder>>(Array.Empty<IStorageFolder>());
+        }
     }
 }
diff --git a/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt b/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt
deleted file mode 100644
index 0493db9ab3..0000000000
--- a/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Compat issues with assembly Avalonia.DesktopRuntime:
-TypesMustExist : Type 'Avalonia.Shared.PlatformSupport.AssetLoader' does not exist in the implementation but it does exist in the contract.
-Total Issues: 1
diff --git a/src/Avalonia.DesktopRuntime/AppBuilder.cs b/src/Avalonia.DesktopRuntime/AppBuilder.cs
deleted file mode 100644
index 2946324c83..0000000000
--- a/src/Avalonia.DesktopRuntime/AppBuilder.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Avalonia.Controls;
-using Avalonia.Platform;
-using Avalonia.PlatformSupport;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Initializes platform-specific services for an <see cref="Application"/>.
-    /// </summary>
-    public sealed class AppBuilder : AppBuilderBase<AppBuilder>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppBuilder"/> class.
-        /// </summary>
-        public AppBuilder()
-            : base(new StandardRuntimePlatform(),
-                builder => StandardRuntimePlatformServices.Register(builder.ApplicationType.Assembly))
-        {
-        }
-
-        bool CheckEnvironment(Type checkerType)
-        {
-            if (checkerType == null)
-                return true;
-            try
-            {
-                return ((IModuleEnvironmentChecker) Activator.CreateInstance(checkerType)).IsCompatible;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Instructs the <see cref="AppBuilder"/> to use the best settings for the platform.
-        /// </summary>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder UseSubsystemsFromStartupDirectory()
-        {
-            var os = RuntimePlatform.GetRuntimeInfo().OperatingSystem;
-
-            LoadAssembliesInDirectory();
-
-            var windowingSubsystemAttribute = (from assembly in AppDomain.CurrentDomain.GetAssemblies()
-                                               from attribute in assembly.GetCustomAttributes<ExportWindowingSubsystemAttribute>()
-                                               where attribute.RequiredOS == os && CheckEnvironment(attribute.EnvironmentChecker)
-                                               orderby attribute.Priority ascending
-                                               select attribute).FirstOrDefault();
-            if (windowingSubsystemAttribute == null)
-            {
-                throw new InvalidOperationException("No windowing subsystem found. Are you missing assembly references?");
-            }
-
-            var renderingSubsystemAttribute = (from assembly in AppDomain.CurrentDomain.GetAssemblies()
-                                               from attribute in assembly.GetCustomAttributes<ExportRenderingSubsystemAttribute>()
-                                               where attribute.RequiredOS == os && CheckEnvironment(attribute.EnvironmentChecker)
-                                               where attribute.RequiresWindowingSubsystem == null
-                                                || attribute.RequiresWindowingSubsystem == windowingSubsystemAttribute.Name
-                                               orderby attribute.Priority ascending
-                                               select attribute).FirstOrDefault();
-
-            if (renderingSubsystemAttribute == null)
-            {
-                throw new InvalidOperationException("No rendering subsystem found. Are you missing assembly references?");
-            }
-
-            UseWindowingSubsystem(() => windowingSubsystemAttribute.InitializationType
-                .GetRuntimeMethod(windowingSubsystemAttribute.InitializationMethod, Type.EmptyTypes).Invoke(null, null),
-                windowingSubsystemAttribute.Name);
-
-            UseRenderingSubsystem(() => renderingSubsystemAttribute.InitializationType
-                .GetRuntimeMethod(renderingSubsystemAttribute.InitializationMethod, Type.EmptyTypes).Invoke(null, null),
-                renderingSubsystemAttribute.Name);
-            
-            return this;
-        }
-
-        private void LoadAssembliesInDirectory()
-        {
-            var location = Assembly.GetEntryAssembly().Location;
-            if (string.IsNullOrWhiteSpace(location))
-                return;
-            var dir = new FileInfo(location).Directory;
-            if (dir == null)
-                return;
-            foreach (var file in dir.EnumerateFiles("*.dll"))
-            {
-                try
-                {
-                    Assembly.LoadFile(file.FullName);
-                }
-                catch (Exception)
-                {
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
deleted file mode 100644
index 25effae46e..0000000000
--- a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net461;netcoreapp2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <ProjectReference Include="../Avalonia.Base/Avalonia.Base.csproj" />
-      <ProjectReference Include="../Avalonia.Visuals/Avalonia.Visuals.csproj" />
-      <ProjectReference Include="../Avalonia.Controls/Avalonia.Controls.csproj" />
-      <ProjectReference Include="../Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" />
-  </ItemGroup>
-
-  <Import Project="..\..\build\NetCore.props" />
-  <Import Project="..\..\build\NetFX.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-</Project>
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 1fc3604f70..fe694b5730 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -10,28 +10,22 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" />
   </ItemGroup>
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml b/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml
index b7995c38e3..a1a2ab34bf 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml
@@ -19,7 +19,7 @@
                   Classes="textBoxClearButton"
                   ToolTip.Tip="Clear"
                   Cursor="Hand"
-                  Command="{ReflectionBinding $parent[TextBox].Clear}"
+                  Command="{Binding $parent[TextBox].Clear}"
                   Opacity="0.5" />
           <ToggleButton Classes="filter-text-box-toggle"
                         ToolTip.Tip="Match Case"
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
index cb98fb70f3..ec7e91c8be 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
@@ -92,7 +92,7 @@ namespace Avalonia.Diagnostics.Controls
             set => SetValue(HighlightProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -102,7 +102,7 @@ namespace Avalonia.Diagnostics.Controls
                 {
                     _isUpdatingThickness = true;
 
-                    var value = change.NewValue.GetValueOrDefault<Thickness>();
+                    var value = change.GetNewValue<Thickness>();
 
                     Left = value.Left;
                     Top = value.Top;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
new file mode 100644
index 0000000000..9091b83ba2
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Avalonia.Diagnostics
+{
+    internal static class Conventions
+    {
+        public static string DefaultScreenshotsRoot =>
+             System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures, Environment.SpecialFolderOption.Create),
+                "Screenshots");
+
+        public static IScreenshotHandler DefaultScreenshotHandler { get; } =
+            new Screenshots.FilePickerHandler();
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Convetions.cs b/src/Avalonia.Diagnostics/Diagnostics/Convetions.cs
deleted file mode 100644
index b41755f239..0000000000
--- a/src/Avalonia.Diagnostics/Diagnostics/Convetions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Reflection;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Diagnostics
-{
-    static class Convetions
-    {
-        public static string DefaultScreenshotsRoot =>
-             System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures, Environment.SpecialFolderOption.Create),
-                "Screenshots");
-
-        public static IScreenshotHandler DefaultScreenshotHandler { get; } =
-            new Screenshots.FilePickerHandler();
-    }
-}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
index 683c2e6549..9029ddf2bd 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
@@ -105,13 +105,15 @@ namespace Avalonia.Diagnostics
 
         private static IDisposable Open(Application? application, DevToolsOptions options, Window? owner = default)
         {
+            var focussedControl = KeyboardDevice.Instance?.FocusedElement as IControl;
             if (application is null)
             {
                 throw new ArgumentNullException(nameof(application));
             }
             if (s_open.TryGetValue(application, out var window))
-            {                
+            {
                 window.Activate();
+                window.SelectedControl(focussedControl);
             }
             else
             {
@@ -122,7 +124,7 @@ namespace Avalonia.Diagnostics
                     Height = options.Size.Height,
                 };
                 window.SetOptions(options);
-
+                window.SelectedControl(focussedControl);
                 window.Closed += DevToolsClosed;
                 s_open.Add(application, window);
                 if (options.ShowAsChildWindow && owner is { })
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 46ee8e686c..5fc274a4e9 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using Avalonia.Input;
+using Avalonia.Input;
 
 namespace Avalonia.Diagnostics
 {
@@ -36,10 +35,15 @@ namespace Avalonia.Diagnostics
         public bool ShowImplementedInterfaces { get; set; } = true;
         
         /// <summary>
-        /// Allow to customizze SreenshotHandler
+        /// Allow to customize SreenshotHandler
         /// </summary>
         /// <remarks>Default handler is <see cref="Screenshots.FilePickerHandler"/></remarks>
         public IScreenshotHandler ScreenshotHandler { get; set; }
-          = Convetions.DefaultScreenshotHandler;
+          = Conventions.DefaultScreenshotHandler;
+
+        /// <summary>
+        /// Gets or sets whether DevTools should use the dark mode theme
+        /// </summary>
+        public bool UseDarkMode { get; set; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index fb57058ae9..a4b56fcea1 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -1,8 +1,9 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
 using Lifetimes = Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Diagnostics.Screenshots
@@ -38,7 +39,7 @@ namespace Avalonia.Diagnostics.Screenshots
         /// The default root folder is [Environment.SpecialFolder.MyPictures]/Screenshots.
         /// </summary>
         public string ScreenshotsRoot { get; }
-            = Convetions.DefaultScreenshotsRoot;
+            = Conventions.DefaultScreenshotsRoot;
 
         /// <summary>
         /// SaveFilePicker Title
@@ -59,24 +60,25 @@ namespace Avalonia.Diagnostics.Screenshots
         protected async override Task<Stream?> GetStream(IControl control)
         {
             Stream? output = default;
-            var result = await new SaveFileDialog()
+            var result = await GetWindow(control).StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
             {
+                SuggestedStartLocation = new BclStorageFolder(new DirectoryInfo(ScreenshotsRoot)),
                 Title = Title,
-                Filters = new() { new FileDialogFilter() { Name = "PNG", Extensions = new() { "png" } } },
-                Directory = ScreenshotsRoot,
-            }.ShowAsync(GetWindow(control));
-            if (!string.IsNullOrWhiteSpace(result))
+                FileTypeChoices = new FilePickerFileType[] { new FilePickerFileType("PNG") { Patterns = new string[] { "*.png" } } }
+            });
+
+            if (result!=null && !string.IsNullOrWhiteSpace(result.Name))
             {
-                var foldler = Path.GetDirectoryName(result);
+                var folder = Path.GetDirectoryName(result.Name);
                 // Directory information for path, or null if path denotes a root directory or is
                 // null. Returns System.String.Empty if path does not contain directory information.
-                if (!string.IsNullOrWhiteSpace(foldler))
+                if (!string.IsNullOrWhiteSpace(folder))
                 {
-                    if (!Directory.Exists(foldler))
+                    if (!Directory.Exists(folder))
                     {
-                        Directory.CreateDirectory(foldler);
+                        Directory.CreateDirectory(folder);
                     }
-                    output = new FileStream(result, FileMode.Create);
+                    output = new FileStream(result.Name, FileMode.Create);
                 }
             }
             return output;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
index aa03330cc5..0e412a2fa5 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -1,13 +1,16 @@
+using System;
+using Avalonia.Data;
+
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal class AvaloniaPropertyViewModel : PropertyViewModel
     {
         private readonly AvaloniaObject _target;
-        private System.Type _assignedType;
+        private Type _assignedType;
         private object? _value;
         private string _priority;
         private string _group;
-        private readonly System.Type _propertyType;
+        private readonly Type _propertyType;
 
 #nullable disable
         // Remove "nullable disable" after MemberNotNull will work on our CI.
@@ -28,13 +31,9 @@ namespace Avalonia.Diagnostics.ViewModels
         public AvaloniaProperty Property { get; }
         public override object Key => Property;
         public override string Name { get; }
-        public override bool? IsAttached => 
-            Property.IsAttached;
-
-        public override string Priority =>
-            _priority;
-
-        public override System.Type AssignedType => _assignedType;
+        public override bool? IsAttached => Property.IsAttached;
+        public override string Priority => _priority;
+        public override Type AssignedType => _assignedType;
 
         public override string? Value
         {
@@ -53,30 +52,58 @@ namespace Avalonia.Diagnostics.ViewModels
 
         public override string Group => _group;
 
-        public override System.Type? DeclaringType { get; }
-        public override System.Type PropertyType => _propertyType;
+        public override Type? DeclaringType { get; }
+        public override Type PropertyType => _propertyType;
 
         // [MemberNotNull(nameof(_type), nameof(_group), nameof(_priority))]
         public override void Update()
         {
             if (Property.IsDirect)
             {
-                RaiseAndSetIfChanged(ref _value, _target.GetValue(Property), nameof(Value));
-                RaiseAndSetIfChanged(ref _assignedType,_value?.GetType() ?? Property.PropertyType, nameof(AssignedType));
+                object? value;
+                Type? valueType = null;
+
+                try
+                {
+                    value = _target.GetValue(Property);
+                    valueType = value?.GetType();
+                }
+                catch (Exception e)
+                {
+                    value = e.GetBaseException();
+                }
+
+                RaiseAndSetIfChanged(ref _value, value, nameof(Value));
+                RaiseAndSetIfChanged(ref _assignedType, valueType ?? Property.PropertyType, nameof(AssignedType));
                 RaiseAndSetIfChanged(ref _priority, "Direct", nameof(Priority));
 
                 _group = "Properties";
             }
             else
             {
-                var val = _target.GetDiagnostic(Property);
+                object? value;
+                Type? valueType = null;
+                BindingPriority? priority = null;
+
+                try
+                {
+                    var diag = _target.GetDiagnostic(Property);
+
+                    value = diag.Value;
+                    valueType = value?.GetType();
+                    priority = diag.Priority;
+                }
+                catch (Exception e)
+                {
+                    value = e.GetBaseException();
+                }
 
-                RaiseAndSetIfChanged(ref _value, val?.Value, nameof(Value));
-                RaiseAndSetIfChanged(ref _assignedType, _value?.GetType() ?? Property.PropertyType, nameof(AssignedType));
+                RaiseAndSetIfChanged(ref _value, value, nameof(Value));
+                RaiseAndSetIfChanged(ref _assignedType, valueType ?? Property.PropertyType, nameof(AssignedType));
 
-                if (val != null)
+                if (priority != null)
                 {
-                    RaiseAndSetIfChanged(ref _priority, val.Priority.ToString(), nameof(Priority));
+                    RaiseAndSetIfChanged(ref _priority, priority.ToString()!, nameof(Priority));
                     RaiseAndSetIfChanged(ref _group, IsAttached == true ? "Attached Properties" : "Properties", nameof(Group));
                 }
                 else
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
new file mode 100644
index 0000000000..16973a96ef
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
@@ -0,0 +1,56 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class BindingSetterViewModel : SetterViewModel
+    {
+        public BindingSetterViewModel(AvaloniaProperty property, object? value) : base(property, value)
+        {
+            switch (value)
+            {
+                case Binding binding:
+                    Path = binding.Path;
+                    Tint = Brushes.CornflowerBlue;
+                    ValueTypeTooltip = "Reflection Binding";
+
+                    break;
+                case CompiledBindingExtension binding:
+                    Path = binding.Path.ToString();
+                    Tint = Brushes.DarkGreen;
+                    ValueTypeTooltip = "Compiled Binding";
+
+                    break;
+                case TemplateBinding binding:
+                    if (binding.Property is AvaloniaProperty templateProperty)
+                    {
+                        Path = $"{templateProperty.OwnerType.Name}.{templateProperty.Name}";
+                    }
+                    else
+                    {
+                        Path = "Unassigned";
+                    }
+
+                    Tint = Brushes.OrangeRed;
+                    ValueTypeTooltip = "Template Binding";
+
+                    break;
+                default:
+                    throw new ArgumentException("Invalid binding type", nameof(value));
+            }
+        }
+
+        public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
+
+        public string Path { get; }
+
+        public override void CopyValue()
+        {
+            CopyToClipboard(Path);
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
index e2d8a30c8a..895ff41f7b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -1,13 +1,14 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal class ClrPropertyViewModel : PropertyViewModel
     {
         private readonly object _target;
-        private System.Type _assignedType;
+        private Type _assignedType;
         private object? _value;
-        private readonly System.Type _propertyType;
+        private readonly Type _propertyType;
 
 #nullable disable
         // Remove "nullable disable" after MemberNotNull will work on our CI.
@@ -25,6 +26,7 @@ namespace Avalonia.Diagnostics.ViewModels
             {
                 Name = property.DeclaringType.Name + '.' + property.Name;
             }
+
             DeclaringType = property.DeclaringType;
             _propertyType = property.PropertyType;
 
@@ -36,10 +38,10 @@ namespace Avalonia.Diagnostics.ViewModels
         public override string Name { get; }
         public override string Group => "CLR Properties";
 
-        public override System.Type AssignedType => _assignedType;
-        public override  System.Type PropertyType => _propertyType;
+        public override Type AssignedType => _assignedType;
+        public override Type PropertyType => _propertyType;
 
-        public override string? Value 
+        public override string? Value
         {
             get => ConvertToString(_value);
             set
@@ -54,20 +56,30 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public override string Priority => 
-            string.Empty;
+        public override string Priority => string.Empty;
 
-        public override bool? IsAttached => 
-            default;
+        public override bool? IsAttached => default;
 
-        public override System.Type? DeclaringType { get; }
+        public override Type? DeclaringType { get; }
 
         // [MemberNotNull(nameof(_type))]
         public override void Update()
         {
-            var val = Property.GetValue(_target);
-            RaiseAndSetIfChanged(ref _value, val, nameof(Value));
-            RaiseAndSetIfChanged(ref _assignedType, _value?.GetType() ?? Property.PropertyType, nameof(AssignedType));
+            object? value;
+            Type? valueType = null;
+
+            try
+            {
+                value = Property.GetValue(_target);
+                valueType = value?.GetType();
+            }
+            catch (Exception e)
+            {
+                value = e.GetBaseException();
+            }
+
+            RaiseAndSetIfChanged(ref _value, value, nameof(Value));
+            RaiseAndSetIfChanged(ref _assignedType, valueType ?? Property.PropertyType, nameof(AssignedType));
             RaisePropertyChanged(nameof(Type));
         }
     }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 8f0a4d07b0..71da543d70 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
+using Avalonia.Data;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
-    internal class ControlDetailsViewModel : ViewModelBase, IDisposable
+    internal class ControlDetailsViewModel : ViewModelBase, IDisposable, IClassesChangedListener
     {
         private readonly IAvaloniaObject _avaloniaObject;
-        private IDictionary<object, List<PropertyViewModel>>? _propertyIndex;
+        private IDictionary<object, PropertyViewModel[]>? _propertyIndex;
         private PropertyViewModel? _selectedProperty;
         private DataGridCollectionView? _propertiesView;
         private bool _snapshotStyles;
@@ -45,7 +45,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
             if (avaloniaObject is StyledElement styledElement)
             {
-                styledElement.Classes.CollectionChanged += OnClassesChanged;
+                styledElement.Classes.AddListener(this);
 
                 var pseudoClassAttributes = styledElement.GetType().GetCustomAttributes<PseudoClassesAttribute>(true);
 
@@ -59,14 +59,22 @@ namespace Avalonia.Diagnostics.ViewModels
 
                 var styleDiagnostics = styledElement.GetStyleDiagnostics();
 
-                foreach (var appliedStyle in styleDiagnostics.AppliedStyles)
+                // We need to place styles without activator first, such styles will be overwritten by ones with activators.
+                foreach (var appliedStyle in styleDiagnostics.AppliedStyles.OrderBy(s => s.HasActivator))
                 {
                     var styleSource = appliedStyle.Source;
 
                     var setters = new List<SetterViewModel>();
 
-                    if (styleSource is Style style)
+                    if (styleSource is StyleBase style)
                     {
+                        var selector = style switch
+                        {
+                            Style s => s.Selector?.ToString(),
+                            ControlTheme t => t.TargetType?.Name.ToString(),
+                            _ => null,
+                        };
+
                         foreach (var setter in style.Setters)
                         {
                             if (setter is Setter regularSetter
@@ -87,14 +95,23 @@ namespace Avalonia.Diagnostics.ViewModels
                                 }
                                 else
                                 {
-                                    setterVm = new SetterViewModel(regularSetter.Property, setterValue);
+                                    var isBinding = IsBinding(setterValue);
+
+                                    if (isBinding)
+                                    {
+                                        setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue);
+                                    }
+                                    else
+                                    {
+                                        setterVm = new SetterViewModel(regularSetter.Property, setterValue);
+                                    }
                                 }
 
                                 setters.Add(setterVm);
                             }
                         }
 
-                        AppliedStyles.Add(new StyleViewModel(appliedStyle, style.Selector?.ToString() ?? "No selector", setters));
+                        AppliedStyles.Add(new StyleViewModel(appliedStyle, selector ?? "No selector", setters));
                     }
                 }
 
@@ -102,6 +119,8 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
+        public bool CanNavigateToParentProperty => _selectedEntitiesStack.Count >= 1;
+
         private (object resourceKey, bool isDynamic)? GetResourceInfo(object? value)
         {
             if (value is StaticResourceExtension staticResource)
@@ -117,6 +136,19 @@ namespace Avalonia.Diagnostics.ViewModels
             return null;
         }
 
+        private bool IsBinding(object? value)
+        {
+            switch (value)
+            {
+                case Binding:
+                case CompiledBindingExtension:
+                case TemplateBinding:
+                    return true;
+            }
+
+            return false;
+        }
+
         public TreePageViewModel TreePage { get; }
 
         public DataGridCollectionView? PropertiesView
@@ -132,31 +164,19 @@ namespace Avalonia.Diagnostics.ViewModels
         public object? SelectedEntity
         {
             get => _selectedEntity;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntity, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntity, value);
         }
 
         public string? SelectedEntityName
         {
             get => _selectedEntityName;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityName, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityName, value);
         }
         
         public string? SelectedEntityType
         {
             get => _selectedEntityType;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityType, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityType, value);
         }
         
         public PropertyViewModel? SelectedProperty
@@ -229,7 +249,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
             if (_avaloniaObject is StyledElement se)
             {
-                se.Classes.CollectionChanged -= OnClassesChanged;
+                se.Classes.RemoveListener(this);
             }
         }
 
@@ -304,7 +324,7 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        private void OnClassesChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        void IClassesChangedListener.Changed()
         {
             if (!SnapshotStyles)
             {
@@ -403,7 +423,14 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public void ApplySelectedProperty()
+        private static IEnumerable<PropertyInfo> GetAllPublicProperties(Type type)
+        {
+            return type
+                .GetProperties()
+                .Concat(type.GetInterfaces().SelectMany(i => i.GetProperties()));
+        }
+
+        public void NavigateToSelectedProperty()
         {
             var selectedProperty = SelectedProperty;
             var selectedEntity = SelectedEntity;
@@ -411,72 +438,130 @@ namespace Avalonia.Diagnostics.ViewModels
             if (selectedEntity == null 
                 || selectedProperty == null 
                 || selectedProperty.PropertyType == typeof(string)
-                || selectedProperty.PropertyType.IsValueType
-                )
+                || selectedProperty.PropertyType.IsValueType)
                 return;
 
-            object? property;
-            if (selectedProperty.Key is AvaloniaProperty avaloniaProperty)
+            object? property = null;
+
+            switch (selectedProperty)
             {
-                property = (_selectedEntity as IControl)?.GetValue(avaloniaProperty);
+                case AvaloniaPropertyViewModel avaloniaProperty:
+
+                    property = (_selectedEntity as IControl)?.GetValue(avaloniaProperty.Property);
+
+                    break;
+
+                case ClrPropertyViewModel clrProperty:
+                {
+                    property = GetAllPublicProperties(selectedEntity.GetType())
+                        .FirstOrDefault(pi => clrProperty.Property == pi)?
+                        .GetValue(selectedEntity);
+
+                    break;
+                }
             }
-            else
+
+            if (property == null) 
+                return;
+
+            _selectedEntitiesStack.Push((Name:selectedEntityName!, Entry:selectedEntity));
+
+            var propertyName = selectedProperty.Name;
+
+            //Strip out interface names
+            if (propertyName.LastIndexOf('.') is var p && p != -1)
             {
-                property = selectedEntity.GetType().GetProperties()
-                     .FirstOrDefault(pi => pi.Name == selectedProperty.Name
-                           && pi.DeclaringType == selectedProperty.DeclaringType
-                           && pi.PropertyType.Name == selectedProperty.PropertyType.Name)
-                     ?.GetValue(selectedEntity);
+                propertyName = propertyName.Substring(p + 1);
             }
-            if (property == null) return;
-            _selectedEntitiesStack.Push((Name:selectedEntityName!,Entry:selectedEntity));
-            NavigateToProperty(property, selectedProperty.Name);
+
+            NavigateToProperty(property, selectedEntityName + "." + propertyName);
+
+            RaisePropertyChanged(nameof(CanNavigateToParentProperty));
         }
 
-        public void ApplyParentProperty()
+        public void NavigateToParentProperty()
         {
-            if (_selectedEntitiesStack.Any())
+            if (_selectedEntitiesStack.Count > 0)
             {
                 var property = _selectedEntitiesStack.Pop();
                 NavigateToProperty(property.Entry, property.Name);
+
+                RaisePropertyChanged(nameof(CanNavigateToParentProperty));
             }
         }
         
-        protected  void NavigateToProperty(object o, string? entityName)
+        protected void NavigateToProperty(object o, string? entityName)
         {
             var oldSelectedEntity = SelectedEntity;
-            if (oldSelectedEntity is IAvaloniaObject ao1)
-            {
-                ao1.PropertyChanged -= ControlPropertyChanged;
-            }
-            else if (oldSelectedEntity is INotifyPropertyChanged inpc1)
+
+            switch (oldSelectedEntity)
             {
-                inpc1.PropertyChanged -= ControlPropertyChanged;
+                case IAvaloniaObject ao1:
+                    ao1.PropertyChanged -= ControlPropertyChanged;
+                    break;
+
+                case INotifyPropertyChanged inpc1:
+                    inpc1.PropertyChanged -= ControlPropertyChanged;
+                    break;
             }
-      
+
             SelectedEntity = o;
             SelectedEntityName = entityName;
             SelectedEntityType = o.ToString();
+
             var properties = GetAvaloniaProperties(o)
                 .Concat(GetClrProperties(o, _showImplementedInterfaces))
                 .OrderBy(x => x, PropertyComparer.Instance)
                 .ThenBy(x => x.Name)
-                .ToList();
+                .ToArray();
+
+            _propertyIndex = properties
+                .GroupBy(x => x.Key)
+                .ToDictionary(x => x.Key, x => x.ToArray());
 
-            _propertyIndex = properties.GroupBy(x => x.Key).ToDictionary(x => x.Key, x => x.ToList());
+            TreePage.PropertiesFilter.FilterString = string.Empty;
 
             var view = new DataGridCollectionView(properties);
             view.GroupDescriptions.Add(new DataGridPathGroupDescription(nameof(AvaloniaPropertyViewModel.Group)));
             view.Filter = FilterProperty;
             PropertiesView = view;
 
-            if (o is IAvaloniaObject ao2)
+            switch (o)
             {
-                ao2.PropertyChanged += ControlPropertyChanged;
+                case IAvaloniaObject ao2:
+                    ao2.PropertyChanged += ControlPropertyChanged;
+                    break;
+
+                case INotifyPropertyChanged inpc2:
+                    inpc2.PropertyChanged += ControlPropertyChanged;
+                    break;
             }
-            else if (o is INotifyPropertyChanged inpc2)
+        }
+        
+        internal void SelectProperty(AvaloniaProperty property)
+        {
+            SelectedProperty = null;
+
+            if (SelectedEntity != _avaloniaObject)
+            {
+                NavigateToProperty(
+                    _avaloniaObject, 
+                    (_avaloniaObject as IControl)?.Name ?? _avaloniaObject.ToString());    
+            }
+            
+            if (PropertiesView is null)
             {
-                inpc2.PropertyChanged += ControlPropertyChanged;
+                return;
+            }
+
+            foreach (object o in PropertiesView)
+            {
+                if (o is AvaloniaPropertyViewModel propertyVm && propertyVm.Property == property)
+                {
+                    SelectedProperty = propertyVm;
+                    
+                    break;
+                }
             }
         }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
index 4dc0c34c0a..a453fef212 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
@@ -30,20 +30,28 @@ namespace Avalonia.Diagnostics.ViewModels
 
             if (control is AvaloniaObject ao)
             {
-                MarginThickness = ao.GetValue(Layoutable.MarginProperty);
-
-                if (HasPadding)
+                try
                 {
-                    PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
-                }
+                    _updatingFromControl = true;
+                    MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+
+                    if (HasPadding)
+                    {
+                        PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
+                    }
 
-                if (HasBorder)
+                    if (HasBorder)
+                    {
+                        BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
+                    }
+
+                    HorizontalAlignment = ao.GetValue(Layoutable.HorizontalAlignmentProperty);
+                    VerticalAlignment = ao.GetValue(Layoutable.VerticalAlignmentProperty);
+                }
+                finally
                 {
-                    BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
+                    _updatingFromControl = false;
                 }
-
-                HorizontalAlignment = ao.GetValue(Layoutable.HorizontalAlignmentProperty);
-                VerticalAlignment = ao.GetValue(Layoutable.VerticalAlignmentProperty);
             }
 
             UpdateSize();
@@ -110,7 +118,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
         private void UpdateSizeConstraints()
         {
-            if (_control is IAvaloniaObject ao)
+            if (_control is AvaloniaObject ao)
             {
                 string? CreateConstraintInfo(StyledProperty<double> minProperty, StyledProperty<double> maxProperty)
                 {
@@ -191,7 +199,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 }
                 else
                 {
-                    if (_control is IAvaloniaObject ao)
+                    if (_control is AvaloniaObject ao)
                     {
                         if (e.Property == Layoutable.MarginProperty)
                         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index e08c5bc8dd..a0514cdd76 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -1,14 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Diagnostics.Models;
 using Avalonia.Input;
 using Avalonia.Metadata;
 using Avalonia.Threading;
-using System.Reactive.Linq;
-using System.Linq;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
@@ -59,8 +56,8 @@ namespace Avalonia.Diagnostics.ViewModels
                     .Subscribe(e =>
                         {
                             PointerOverRoot = e.Root;
-                            PointerOverElement = e.Root.GetInputElementsAt(e.Position).FirstOrDefault();
-                        });                                     
+                            PointerOverElement = e.Root.InputHitTest(e.Position);
+                        });
 #nullable restore
             }
             Console = new ConsoleViewModel(UpdateConsoleContext);
@@ -97,7 +94,9 @@ namespace Avalonia.Diagnostics.ViewModels
                     changed = false;
                 }
                 if (changed)
-                RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+                {
+                    RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+                }
             }
         }
 
@@ -163,8 +162,7 @@ namespace Avalonia.Diagnostics.ViewModels
                             }
                             catch { }
                         },
-                        TimeSpan.FromMilliseconds(0),
-                        DispatcherPriority.ApplicationIdle);
+                        TimeSpan.FromMilliseconds(0));
                 }
 
                 RaiseAndSetIfChanged(ref _content, value);
@@ -333,7 +331,7 @@ namespace Avalonia.Diagnostics.ViewModels
             private set => RaiseAndSetIfChanged(ref _showImplementedInterfaces , value); 
         }
 
-        public void ToggleShowImplementedInterfaces(object parametr)
+        public void ToggleShowImplementedInterfaces(object parameter)
         {
             ShowImplementedInterfaces = !ShowImplementedInterfaces;
             if (Content is TreePageViewModel viewModel)
@@ -342,15 +340,15 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public bool ShowDettailsPropertyType 
+        public bool ShowDetailsPropertyType
         { 
             get => _showPropertyType; 
             private set => RaiseAndSetIfChanged(ref  _showPropertyType , value); 
         }
 
-        public void ToggleShowDettailsPropertyType(object paramter)
+        public void ToggleShowDetailsPropertyType(object parameter)
         {
-            ShowDettailsPropertyType = !ShowDettailsPropertyType;
+            ShowDetailsPropertyType = !ShowDetailsPropertyType;
         }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
index e93dc7361b..5202ac963e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
@@ -7,11 +7,14 @@ namespace Avalonia.Diagnostics.ViewModels
         public object Key { get; }
 
         public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
 
         public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic) : base(property, resourceValue)
         {
             Key = resourceKey;
             Tint = isDynamic ? Brushes.Orange : Brushes.Brown;
+            ValueTypeTooltip = isDynamic ? "Dynamic Resource" : "Static Resource";
         }
 
         public void CopyResourceKey()
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
index 38cbefcb93..559ed49911 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Diagnostics.ViewModels
             IsVisible = true;
         }
 
-        public void CopyValue()
+        public virtual void CopyValue()
         {
             var textToCopy = Value?.ToString();
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
index 5459810db9..4fc55333d0 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
@@ -6,7 +6,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
index 264a0de359..7dec878e69 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
@@ -11,7 +11,7 @@
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}">
             <DockPanel Margin="{TemplateBinding Padding}">
-              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0">></TextBlock>
+              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0"></TextBlock>
               <TextPresenter Name="PART_TextPresenter"
                              Text="{TemplateBinding Text, Mode=TwoWay}"
                              CaretIndex="{TemplateBinding CaretIndex}"
@@ -44,7 +44,7 @@
         <DataTemplate>
           <StackPanel Orientation="Vertical">
             <DockPanel>
-              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0">></TextBlock>
+              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0"></TextBlock>
               <TextBlock Text="{Binding Input}"/>
             </DockPanel>
             <TextBlock Foreground="{Binding Foreground}" Text="{Binding Output}"/>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index d7acbbd577..bf595d82a3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -19,7 +19,7 @@
       <ColumnDefinition Width="Auto"/>
       <!--
       When selecting the Application node, we need this trick to hide Layout Visualizer 
-      because when using the GridSplitter it sets the Witdth property of ColumnDefinition
+      because when using the GridSplitter it sets the Width property of ColumnDefinition
       (see https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Controls/GridSplitter.cs#L528) 
       and if we hide the contents of the column, the space is not reclaimed 
       (see discussion https://github.com/AvaloniaUI/Avalonia/discussions/6773). 
@@ -30,7 +30,11 @@
     <Grid Grid.Column="0" RowDefinitions="Auto,Auto,*">
 
       <Grid ColumnDefinitions="Auto, *" RowDefinitions="Auto, Auto">
-        <Button Grid.Column="0" Grid.RowSpan="2" Content="^" Command="{Binding ApplyParentProperty}" />
+        <Button Grid.Column="0" Grid.RowSpan="2" Content="^" 
+                IsEnabled="{Binding CanNavigateToParentProperty}"
+                Margin="0 0 4 0"
+                ToolTip.Tip="Navigate to parent property"
+                Command="{Binding NavigateToParentProperty}" />
         <TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding SelectedEntityName}" FontWeight="Bold" />
         <TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding SelectedEntityType}" FontStyle="Italic" />
       </Grid>
@@ -44,7 +48,9 @@
                               UseWholeWordFilter="{Binding UseWholeWordFilter}"
                               UseRegexFilter="{Binding UseRegexFilter}"/>
       
-      <DataGrid Items="{Binding PropertiesView}"
+      <DataGrid 
+                x:Name="DataGrid"
+                Items="{Binding PropertiesView}"
                 Grid.Row="2"
                 BorderThickness="0"
                 RowBackground="Transparent"
@@ -56,15 +62,15 @@
           <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
           <DataGridTextColumn Header="Type" Binding="{Binding Type}"
                               IsReadOnly="True"
-                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
-          <DataGridTextColumn Header="Assinged Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
+          <DataGridTextColumn Header="Assigned Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
           <DataGridTextColumn Header="Property Type" Binding="{Binding PropertyType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
           <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
         </DataGrid.Columns>
@@ -129,6 +135,26 @@
                     </Expander.Header>
 
                     <ItemsControl Margin="20,0,0,0" Grid.Row="1" Items="{Binding Setters}">
+                      
+                      <ItemsControl.Styles>
+                        <Style Selector="TextBlock.property-name">
+                          <Setter Property="FontWeight" Value="SemiBold" />
+                          <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                        
+                        <Style Selector="TextBlock.property-name:pointerover">
+                          <Setter Property="TextDecorations" Value="Underline" />
+                        </Style>
+                        
+                        <Style Selector="Rectangle.property-inactive">
+                          <Setter Property="IsHitTestVisible" Value="False" />
+                          <Setter Property="Height" Value="1" />
+                          <Setter Property="Fill" Value="#6C6C6C" />
+                          <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                        
+                      </ItemsControl.Styles>
+                      
                       <ItemsControl.DataTemplates>
 
                         <DataTemplate DataType="IBrush">
@@ -148,6 +174,26 @@
                             <TextBlock Text="{Binding}" />
                           </StackPanel>
                         </DataTemplate>
+                        
+                        <DataTemplate DataType="vm:BindingSetterViewModel">
+                          <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
+                            <Panel.ContextMenu>
+                              <ContextMenu>
+                                <MenuItem Header="Copy property name" Command="{Binding CopyPropertyName} "/>
+                                <MenuItem Header="Copy value" Command="{Binding CopyValue} "/>
+                              </ContextMenu>
+                            </Panel.ContextMenu>
+                            <StackPanel Orientation="Horizontal" Spacing="2">
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
+                              <TextBlock Text=":" />
+                              <TextBlock>{</TextBlock>
+                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
+                              <TextBlock Text="{Binding Path}" />
+                              <TextBlock>}</TextBlock>
+                            </StackPanel>
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
+                          </Panel>
+                        </DataTemplate>
 
                         <DataTemplate DataType="vm:ResourceSetterViewModel">
                           <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
@@ -159,15 +205,15 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2" HorizontalAlignment="Left">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                               <TextBlock>(</TextBlock>
-                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
                               <TextBlock>)</TextBlock>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
@@ -180,11 +226,11 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index 78919a2105..7e8ffa76cd 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -7,9 +7,13 @@ namespace Avalonia.Diagnostics.Views
 {
     internal class ControlDetailsView : UserControl
     {
+        private DataGrid _dataGrid;
+
         public ControlDetailsView()
         {
             InitializeComponent();
+
+            _dataGrid = this.GetControl<DataGrid>("DataGrid");
         }
 
         private void InitializeComponent()
@@ -21,9 +25,29 @@ namespace Avalonia.Diagnostics.Views
         {
             if (sender is DataGrid grid && grid.DataContext is ControlDetailsViewModel controlDetails)
             {
-                controlDetails.ApplySelectedProperty();
+                controlDetails.NavigateToSelectedProperty();
+            }
+            
+        }
+
+        private void PropertyNamePressed(object sender, PointerPressedEventArgs e)
+        {
+            var mainVm = (ControlDetailsViewModel?) DataContext;
+
+            if (mainVm is null)
+            {
+                return;
             }
             
+            if (sender is Control control && control.DataContext is SetterViewModel setterVm)
+            {
+                mainVm.SelectProperty(setterVm.Property);
+
+                if (mainVm.SelectedProperty is not null)
+                {
+                    _dataGrid.ScrollIntoView(mainVm.SelectedProperty, null);   
+                }
+            }
         }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
index af6c84a76a..c404a5c382 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -15,6 +15,7 @@
         <SolidColorBrush x:Key="PaddingHighlightBrush" Color="#CEDA8E" />
         <SolidColorBrush x:Key="SizeBackgroundBrush" Color="#88B2BD" />
         <SolidColorBrush x:Key="SizeHighlightBrush" Color="#9ED0DC" />
+        <SolidColorBrush x:Key="ThicknessEditorForeground" Color="Black" />
     </UserControl.Resources>
 
     <Grid RowDefinitions="*,Auto">
@@ -46,6 +47,7 @@
 
                 <controls:ThicknessEditor Grid.Row="0" Grid.Column="0" Header="margin" VerticalAlignment="Top"
                                           HorizontalAlignment="Center"
+                                          Foreground="{StaticResource ThicknessEditorForeground}"
                                           Background="{StaticResource MarginBackgroundBrush}"
                                           Highlight="{StaticResource MarginHighlightBrush}"
                                           Thickness="{Binding MarginThickness}">
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
index 35c9e27f1a..a6da929da3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -53,10 +53,10 @@
                         IsEnabled="False" />
             </MenuItem.Icon>
           </MenuItem>
-          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDettailsPropertyType}">
+          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDetailsPropertyType}">
             <MenuItem.Icon>
               <CheckBox BorderThickness="0"
-                        IsChecked="{Binding ShowDettailsPropertyType}"
+                        IsChecked="{Binding ShowDetailsPropertyType}"
                         IsEnabled="False"/>
             </MenuItem.Icon>
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index c32638f6ca..d2b31fdb20 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:views="clr-namespace:Avalonia.Diagnostics.Views"
         xmlns:diag="clr-namespace:Avalonia.Diagnostics"
-        xmlns:default="using:Avalonia.Themes.Default"
         Title="Avalonia DevTools"
         x:Class="Avalonia.Diagnostics.Views.MainWindow">
   <Window.DataTemplates>
@@ -10,11 +9,8 @@
   </Window.DataTemplates>
   
   <Window.Styles>
-    <default:SimpleTheme Mode="Light"/>
-    <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Themes.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
-    <Style Selector="DataGrid ContextMenu">
-      <Setter Property="Foreground" Value="Black"/>
-    </Style>
+    <SimpleTheme Mode="Light"/>
+    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml"/>
     <StyleInclude Source="avares://Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml" />
     <StyleInclude Source="avares://Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml" />
   </Window.Styles>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index a3cff7f3d3..e6e630112b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -11,6 +11,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using Avalonia.Themes.Simple;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.Views
@@ -18,17 +19,28 @@ namespace Avalonia.Diagnostics.Views
     internal class MainWindow : Window, IStyleHost
     {
         private readonly IDisposable? _keySubscription;
+        private readonly IDisposable? _pointerSubscription;
         private readonly Dictionary<Popup, IDisposable> _frozenPopupStates;
         private AvaloniaObject? _root;
+        private PixelPoint _lastPointerPosition;
 
         public MainWindow()
         {
             InitializeComponent();
 
+            // Apply the SimpleTheme.Window theme; this must be done after the XAML is parsed as
+            // the theme is included in the MainWindow's XAML.
+            if (Theme is null && this.FindResource(typeof(Window)) is ControlTheme windowTheme)
+                Theme = windowTheme;
+
             _keySubscription = InputManager.Instance?.Process
                 .OfType<RawKeyEventArgs>()
                 .Where(x => x.Type == RawKeyEventType.KeyDown)
                 .Subscribe(RawKeyDown);
+            _pointerSubscription = InputManager.Instance?.Process
+                .OfType<RawPointerEventArgs>()
+                .Subscribe(x => _lastPointerPosition = x.Root.PointToScreen(x.Position));
+
 
             _frozenPopupStates = new Dictionary<Popup, IDisposable>();
 
@@ -83,6 +95,7 @@ namespace Avalonia.Diagnostics.Views
         {
             base.OnClosed(e);
             _keySubscription?.Dispose();
+            _pointerSubscription?.Dispose();
 
             foreach (var state in _frozenPopupStates)
             {
@@ -107,9 +120,7 @@ namespace Avalonia.Diagnostics.Views
 
         private IControl? GetHoveredControl(TopLevel topLevel)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var point = (topLevel as IInputRoot)?.MouseDevice?.GetPosition(topLevel) ?? default;
-#pragma warning restore CS0618 // Type or member is obsolete                
+            var point = topLevel.PointToClient(_lastPointerPosition);
 
             return (IControl?)topLevel.GetVisualsAt(point, x =>
                 {
@@ -161,13 +172,18 @@ namespace Avalonia.Diagnostics.Views
                 return;
             }
 
-            var root = Root as TopLevel
-                ?? vm.PointerOverRoot as TopLevel;
+            var root = vm.PointerOverRoot as TopLevel;
+
             if (root is null)
             {
                 return;
             }
 
+            if (root is PopupRoot pr && pr.ParentTopLevel != null)
+            {
+                root = pr.ParentTopLevel;
+            }
+
             switch (e.Modifiers)
             {
                 case RawInputModifiers.Control when (e.Key == Key.LeftShift || e.Key == Key.RightShift):
@@ -242,7 +258,25 @@ namespace Avalonia.Diagnostics.Views
 
         private void RootClosed(object? sender, EventArgs e) => Close();
 
-        public void SetOptions(DevToolsOptions options) =>
+        public void SetOptions(DevToolsOptions options)
+        {
             (DataContext as MainViewModel)?.SetOptions(options);
+
+            if (options.UseDarkMode)
+            {
+                if (Styles[0] is SimpleTheme st)
+                {
+                    st.Mode = SimpleThemeMode.Dark;
+                }                
+            }
+        }
+
+        internal void SelectedControl(IControl? control)
+        {
+            if (control is { })
+            {
+                (DataContext as MainViewModel)?.SelectControl(control);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
index 2553ae90ce..587898ac6e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
@@ -36,6 +36,7 @@ namespace Avalonia.Diagnostics.Views
                     new Border { BorderBrush = new SolidColorBrush(Colors.Yellow, 0.5) }
                 },
             };
+            AdornerLayer.SetIsClipEnabled(_adorner, false);
         }
 
         protected void AddAdorner(object? sender, PointerEventArgs e)
@@ -120,8 +121,8 @@ namespace Avalonia.Diagnostics.Views
 
             if (header != null)
             {
-                header.PointerEnter += AddAdorner;
-                header.PointerLeave += RemoveAdorner;
+                header.PointerEntered += AddAdorner;
+                header.PointerExited += RemoveAdorner;
             }
 
             item.TemplateApplied -= TreeViewItemTemplateApplied;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs b/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
index 4adcd32302..13c8e070e8 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
@@ -2,6 +2,7 @@ using System;
 using System.Text;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics
@@ -10,9 +11,9 @@ namespace Avalonia.Diagnostics
     {
         public static string PrintVisualTree(IVisual visual)
         {
-            StringBuilder result = new StringBuilder();
+            var result = StringBuilderCache.Acquire();
             PrintVisualTree(visual, result, 0);
-            return result.ToString();
+            return StringBuilderCache.GetStringAndRelease(result);
         }
 
         private static void PrintVisualTree(IVisual visual, StringBuilder builder, int indent)
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
index a1d06f800f..65df347ee2 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
@@ -76,7 +76,11 @@
     </Canvas>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="18">
       <Border Height="70" Width="70">
-        <DrawingPresenter Drawing="{DynamicResource AvaloniaLogo}" />
+        <Image>
+          <Image.Source>
+            <DrawingImage Drawing="{DynamicResource AvaloniaLogo}"/>
+          </Image.Source>
+        </Image>
       </Border>
       <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,-10,0,0">
         <TextBlock Text="{Binding Version, StringFormat=Avalonia {0}}" FontSize="40" Foreground="White" />
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index 770d15ea27..a311efdfb0 100644
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@@ -15,4 +15,5 @@
   </ItemGroup>
 
   <Import Project="..\..\build\ApiDiff.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Dialogs/ByteSizeHelper.cs b/src/Avalonia.Dialogs/ByteSizeHelper.cs
deleted file mode 100644
index d849e33399..0000000000
--- a/src/Avalonia.Dialogs/ByteSizeHelper.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-namespace Avalonia.Dialogs
-{
-    internal static class ByteSizeHelper
-    {
-        private const string formatTemplate = "{0}{1:0.#} {2}";
-
-        private static readonly string[] Prefixes =
-        {
-            "B",
-            "KB",
-            "MB",
-            "GB",
-            "TB",
-            "PB",
-            "EB",
-            "ZB",
-            "YB" 
-        };
-
-        public static string ToString(ulong bytes)
-        {
-            if (bytes == 0)
-            {
-                return string.Format(formatTemplate, null, 0, Prefixes[0]);
-            }
-
-            var absSize = Math.Abs((double)bytes);
-            var fpPower = Math.Log(absSize, 1000);
-            var intPower = (int)fpPower;
-            var iUnit = intPower >= Prefixes.Length
-                ? Prefixes.Length - 1
-                : intPower;
-            var normSize = absSize / Math.Pow(1000, iUnit);
-
-            return string.Format(formatTemplate,bytes < 0 ? "-" : null, normSize, Prefixes[iUnit]);
-        }
-    }
-}
diff --git a/src/Avalonia.Dialogs/FileSizeStringConverter.cs b/src/Avalonia.Dialogs/FileSizeStringConverter.cs
index c2cdf1e502..144f50fd9c 100644
--- a/src/Avalonia.Dialogs/FileSizeStringConverter.cs
+++ b/src/Avalonia.Dialogs/FileSizeStringConverter.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Dialogs
         {
             if (value is long size && size > 0)
             {
-                return ByteSizeHelper.ToString((ulong)size);
+                return Avalonia.Utilities.ByteSizeHelper.ToString((ulong)size, true);
             }
 
             return "";
diff --git a/src/Avalonia.Dialogs/ManagedFileChooser.cs b/src/Avalonia.Dialogs/ManagedFileChooser.cs
index 9058c405a3..12436680b3 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooser.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooser.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -9,6 +10,8 @@ using Avalonia.LogicalTree;
 
 namespace Avalonia.Dialogs
 {
+    [TemplatePart("PART_QuickLinks", typeof(Control))]
+    [TemplatePart("PART_Files",      typeof(ListBox))]
     public class ManagedFileChooser : TemplatedControl
     {
         private Control _quickLinksRoot;
@@ -33,9 +36,8 @@ namespace Avalonia.Dialogs
             if (_quickLinksRoot != null)
             {
                 var isQuickLink = _quickLinksRoot.IsLogicalAncestorOf(e.Source as Control);
-#pragma warning disable CS0618 // Type or member is obsolete
+
                 if (e.ClickCount == 2 || isQuickLink)
-#pragma warning restore CS0618 // Type or member is obsolete
                 {
                     if (model.ItemType == ManagedFileChooserItemType.File)
                     {
@@ -88,8 +90,8 @@ namespace Avalonia.Dialogs
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            _quickLinksRoot = e.NameScope.Get<Control>("QuickLinks");
-            _filesView = e.NameScope.Get<ListBox>("Files");
+            _quickLinksRoot = e.NameScope.Get<Control>("PART_QuickLinks");
+            _filesView = e.NameScope.Get<ListBox>("PART_Files");
         }
     }
 }
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
index a0cb664b40..062daef225 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
@@ -1,48 +1,31 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Controls;
+using System.Text.RegularExpressions;
+using Avalonia.Platform.Storage;
 
 namespace Avalonia.Dialogs
 {
     internal class ManagedFileChooserFilterViewModel : InternalViewModelBase
     {
-        private readonly string[] _extensions;
+        private readonly Regex[] _patterns;
         public string Name { get; }
 
-        public ManagedFileChooserFilterViewModel(FileDialogFilter filter)
+        public ManagedFileChooserFilterViewModel(FilePickerFileType filter)
         {
             Name = filter.Name;
 
-            if (filter.Extensions.Contains("*"))
+            if (filter.Patterns?.Contains("*.*") == true)
             {
                 return;
             }
 
-            _extensions = filter.Extensions?.Select(e => "." + e.ToLowerInvariant()).ToArray();
-        }
-
-        public ManagedFileChooserFilterViewModel()
-        {
-            Name = "All files";
+            _patterns = filter.Patterns?
+                .Select(e => new Regex(Regex.Escape(e).Replace(@"\*", ".*").Replace(@"\?", "."), RegexOptions.Singleline | RegexOptions.IgnoreCase))
+                .ToArray();
         }
 
         public bool Match(string filename)
         {
-            if (_extensions == null)
-            {
-                return true;
-            }
-
-            foreach (var ext in _extensions)
-            {
-                if (filename.EndsWith(ext, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    return true;
-                }
-            }
-
-            return false;
+            return _patterns == null || _patterns.Any(ext => ext.IsMatch(filename));
         }
 
         public override string ToString() => Name;
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs b/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
index a217a67bc6..a76a84ba5a 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
@@ -6,6 +6,7 @@ using System.Reactive.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Controls.Platform;
 using Avalonia.Threading;
+using Avalonia.Utilities;
 
 namespace Avalonia.Dialogs
 {
@@ -60,7 +61,7 @@ namespace Avalonia.Dialogs
 
                        if (displayName == null & x.VolumeSizeBytes > 0)
                        {
-                           displayName = $"{ByteSizeHelper.ToString(x.VolumeSizeBytes)} Volume";
+                           displayName = $"{ByteSizeHelper.ToString(x.VolumeSizeBytes, true)} Volume";
                        };
 
                        try
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
index 405a248caf..986f43b1a1 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
@@ -8,6 +8,7 @@ using System.Runtime.InteropServices;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 
 namespace Avalonia.Dialogs
@@ -106,7 +107,7 @@ namespace Avalonia.Dialogs
             QuickLinks.AddRange(quickSources.GetAllItems().Select(i => new ManagedFileChooserItemViewModel(i)));
         }
 
-        public ManagedFileChooserViewModel(FileSystemDialog dialog, ManagedFileDialogOptions options)
+        public ManagedFileChooserViewModel(ManagedFileDialogOptions options)
         {
             _options = options;
             _disposables = new CompositeDisposable();
@@ -131,50 +132,63 @@ namespace Avalonia.Dialogs
             CancelRequested += delegate { _disposables?.Dispose(); };
 
             RefreshQuickLinks(quickSources);
+            
+            SelectedItems.CollectionChanged += OnSelectionChangedAsync;
+        }
 
-            Title = dialog.Title ?? (
-                        dialog is OpenFileDialog ? "Open file"
-                        : dialog is SaveFileDialog ? "Save file"
-                        : dialog is OpenFolderDialog ? "Select directory"
-                        : throw new ArgumentException(nameof(dialog)));
-
-            var directory = dialog.Directory;
-
-            if (directory == null || !Directory.Exists(directory))
+        public ManagedFileChooserViewModel(FilePickerOpenOptions filePickerOpen,  ManagedFileDialogOptions options)
+            : this(options)
+        {
+            Title = filePickerOpen.Title ?? "Open file";
+            
+            if (filePickerOpen.FileTypeFilter?.Count > 0)
             {
-                directory = Directory.GetCurrentDirectory();
+                Filters.AddRange(filePickerOpen.FileTypeFilter.Select(f => new ManagedFileChooserFilterViewModel(f)));
+                _selectedFilter = Filters[0];
+                ShowFilters = true;
             }
 
-            if (dialog is FileDialog fd)
+            if (filePickerOpen.AllowMultiple)
             {
-                if (fd.Filters?.Count > 0)
-                {
-                    Filters.AddRange(fd.Filters.Select(f => new ManagedFileChooserFilterViewModel(f)));
-                    _selectedFilter = Filters[0];
-                    ShowFilters = true;
-                }
+                SelectionMode = SelectionMode.Multiple;
+            }
 
-                if (dialog is OpenFileDialog ofd)
-                {
-                    if (ofd.AllowMultiple)
-                    {
-                        SelectionMode = SelectionMode.Multiple;
-                    }
-                }
+            Navigate(filePickerOpen.SuggestedStartLocation);
+        }
+        
+        public ManagedFileChooserViewModel(FilePickerSaveOptions filePickerSave,  ManagedFileDialogOptions options)
+            : this(options)
+        {
+            Title = filePickerSave.Title ?? "Save file";
+            
+            if (filePickerSave.FileTypeChoices?.Count > 0)
+            {
+                Filters.AddRange(filePickerSave.FileTypeChoices.Select(f => new ManagedFileChooserFilterViewModel(f)));
+                _selectedFilter = Filters[0];
+                ShowFilters = true;
             }
+            
+            _savingFile = true;
+            _defaultExtension = filePickerSave.DefaultExtension;
+            _overwritePrompt = filePickerSave.ShowOverwritePrompt ?? true;
+            FileName = filePickerSave.SuggestedFileName;
+            
+            Navigate(filePickerSave.SuggestedStartLocation, FileName);
+        }
+        
+        public ManagedFileChooserViewModel(FolderPickerOpenOptions folderPickerOpen,  ManagedFileDialogOptions options)
+            : this(options)
+        {
+            Title = folderPickerOpen.Title ?? "Select directory";
 
-            _selectingDirectory = dialog is OpenFolderDialog;
+            _selectingDirectory = true;
 
-            if (dialog is SaveFileDialog sfd)
+            if (folderPickerOpen.AllowMultiple)
             {
-                _savingFile = true;
-                _defaultExtension = sfd.DefaultExtension;
-                _overwritePrompt = sfd.ShowOverwritePrompt ?? true;
-                FileName = sfd.InitialFileName;
+                SelectionMode = SelectionMode.Multiple;
             }
 
-            Navigate(directory, (dialog as FileDialog)?.InitialFileName);
-            SelectedItems.CollectionChanged += OnSelectionChangedAsync;
+            Navigate(folderPickerOpen.SuggestedStartLocation);
         }
 
         public void EnterPressed()
@@ -247,6 +261,23 @@ namespace Avalonia.Dialogs
 
         public void Refresh() => Navigate(Location);
 
+        public void Navigate(IStorageFolder path, string initialSelectionName = null)
+        {
+            string fullDirectoryPath;
+
+            if (path?.TryGetUri(out var fullDirectoryUri) == true
+                && fullDirectoryUri.IsAbsoluteUri)
+            {
+                fullDirectoryPath = fullDirectoryUri.LocalPath;
+            }
+            else
+            {
+                fullDirectoryPath = Directory.GetCurrentDirectory();
+            }
+            
+            Navigate(fullDirectoryPath, initialSelectionName);
+        }
+        
         public void Navigate(string path, string initialSelectionName = null)
         {
             if (!Directory.Exists(path))
diff --git a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
index 1970c5557d..fe2dd99100 100644
--- a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
+++ b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
@@ -1,125 +1,26 @@
-using System.IO;
+#nullable enable
+
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Platform.Storage;
 
 namespace Avalonia.Dialogs
 {
     public static class ManagedFileDialogExtensions
     {
-        private class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
+        internal class ManagedStorageProviderFactory<T> : IStorageProviderFactory where T : Window, new()
         {
-            async Task<string[]> Show(SystemDialog d, Window parent, ManagedFileDialogOptions options = null)
+            public IStorageProvider CreateProvider(TopLevel topLevel)
             {
-                var model = new ManagedFileChooserViewModel((FileSystemDialog)d,
-                    options ?? new ManagedFileDialogOptions());
-
-                var dialog = new T
-                {
-                    Content = new ManagedFileChooser(),
-                    Title = d.Title,
-                    DataContext = model
-                };
-
-                dialog.Closed += delegate { model.Cancel(); };
-
-                string[] result = null;
-                
-                model.CompleteRequested += items =>
-                {
-                    result = items;
-                    dialog.Close();
-                };
-
-                model.OverwritePrompt += async (filename) =>
+                if (topLevel is Window window)
                 {
-                    Window overwritePromptDialog = new Window()
-                    {
-                        Title = "Confirm Save As",
-                        SizeToContent = SizeToContent.WidthAndHeight,
-                        WindowStartupLocation = WindowStartupLocation.CenterOwner,
-                        Padding = new Thickness(10),
-                        MinWidth = 270
-                    };
-
-                    string name = Path.GetFileName(filename);
-
-                    var panel = new DockPanel()
-                    {
-                        HorizontalAlignment = Layout.HorizontalAlignment.Stretch
-                    };
-
-                    var label = new Label()
-                    {
-                        Content = $"{name} already exists.\nDo you want to replace it?"
-                    };
-
-                    panel.Children.Add(label);
-                    DockPanel.SetDock(label, Dock.Top);
-
-                    var buttonPanel = new StackPanel()
-                    {
-                        HorizontalAlignment = Layout.HorizontalAlignment.Right,
-                        Orientation = Layout.Orientation.Horizontal,
-                        Spacing = 10
-                    };
-
-                    var button = new Button()
-                    {
-                        Content = "Yes",
-                        HorizontalAlignment = Layout.HorizontalAlignment.Right
-                    };
-
-                    button.Click += (sender, args) =>
-                    {
-                        result = new string[1] { filename };
-                        overwritePromptDialog.Close();
-                        dialog.Close();
-                    };
-
-                    buttonPanel.Children.Add(button);
-
-                    button = new Button()
-                    {
-                        Content = "No",
-                        HorizontalAlignment = Layout.HorizontalAlignment.Right
-                    };
-
-                    button.Click += (sender, args) =>
-                    {
-                        overwritePromptDialog.Close();
-                    };
-
-                    buttonPanel.Children.Add(button);
-
-                    panel.Children.Add(buttonPanel);
-                    DockPanel.SetDock(buttonPanel, Dock.Bottom);
-
-                    overwritePromptDialog.Content = panel;
-
-                    await overwritePromptDialog.ShowDialog(dialog);
-                };
-
-                model.CancelRequested += dialog.Close;
-
-                await dialog.ShowDialog<object>(parent);
-                return result;
-            }
-
-            public async Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
-            {
-                return await Show(dialog, parent);
-            }
-
-            public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
-            {
-                return (await Show(dialog, parent))?.FirstOrDefault();
-            }
-            
-            public async Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent, ManagedFileDialogOptions options)
-            {
-                return await Show(dialog, parent, options);
+                    var options = AvaloniaLocator.Current.GetService<ManagedFileDialogOptions>();
+                    return new ManagedStorageProvider<T>(window, options);
+                }
+                throw new InvalidOperationException("Current platform doesn't support managed picker dialogs");
             }
         }
 
@@ -127,7 +28,7 @@ namespace Avalonia.Dialogs
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
         {
             builder.AfterSetup(_ =>
-                AvaloniaLocator.CurrentMutable.Bind<ISystemDialogImpl>().ToSingleton<ManagedSystemDialogImpl<Window>>());
+                AvaloniaLocator.CurrentMutable.Bind<IStorageProviderFactory>().ToSingleton<ManagedStorageProviderFactory<Window>>());
             return builder;
         }
 
@@ -135,17 +36,26 @@ namespace Avalonia.Dialogs
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new() where TWindow : Window, new()
         {
             builder.AfterSetup(_ =>
-                AvaloniaLocator.CurrentMutable.Bind<ISystemDialogImpl>().ToSingleton<ManagedSystemDialogImpl<TWindow>>());
+                AvaloniaLocator.CurrentMutable.Bind<IStorageProviderFactory>().ToSingleton<ManagedStorageProviderFactory<TWindow>>());
             return builder;
         }
 
+        [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
         public static Task<string[]> ShowManagedAsync(this OpenFileDialog dialog, Window parent,
-            ManagedFileDialogOptions options = null) => ShowManagedAsync<Window>(dialog, parent, options);
-        
-        public static Task<string[]> ShowManagedAsync<TWindow>(this OpenFileDialog dialog, Window parent,
-            ManagedFileDialogOptions options = null) where TWindow : Window, new()
+            ManagedFileDialogOptions? options = null) => ShowManagedAsync<Window>(dialog, parent, options);
+
+        [Obsolete("Use Window.StorageProvider API or TopLevel.StorageProvider API")]
+        public static async Task<string[]> ShowManagedAsync<TWindow>(this OpenFileDialog dialog, Window parent,
+            ManagedFileDialogOptions? options = null) where TWindow : Window, new()
         {
-            return new ManagedSystemDialogImpl<TWindow>().ShowFileDialogAsync(dialog, parent, options);
+            var impl = new ManagedStorageProvider<TWindow>(parent, options);
+
+            var files = await impl.OpenFilePickerAsync(dialog.ToFilePickerOpenOptions());
+            return files
+                .Select(file => file.TryGetUri(out var fullPath)
+                    ? fullPath.LocalPath
+                    : file.Name)
+                .ToArray();
         }
     }
 }
diff --git a/src/Avalonia.Dialogs/ManagedStorageProvider.cs b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
new file mode 100644
index 0000000000..37d2781692
--- /dev/null
+++ b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
@@ -0,0 +1,147 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+
+namespace Avalonia.Dialogs;
+
+public class ManagedStorageProvider<T> : BclStorageProvider where T : Window, new()
+{
+    private readonly Window _parent;
+    private readonly ManagedFileDialogOptions _managedOptions;
+
+    public ManagedStorageProvider(Window parent, ManagedFileDialogOptions? managedOptions)
+    {
+        _parent = parent;
+        _managedOptions = managedOptions ?? new ManagedFileDialogOptions();
+    }
+
+    public override bool CanSave => true;
+    public override bool CanOpen => true;
+    public override bool CanPickFolder => true;
+            
+    public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+    {
+        var model = new ManagedFileChooserViewModel(options, _managedOptions);
+        var results = await Show(model, _parent);
+
+        return results.Select(f => new BclStorageFile(new FileInfo(f))).ToArray();
+    }
+
+    public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+    {
+        var model = new ManagedFileChooserViewModel(options, _managedOptions);
+        var results = await Show(model, _parent);
+
+        return results.FirstOrDefault() is { } result
+            ? new BclStorageFile(new FileInfo(result))
+            : null;
+    }
+
+    public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+    {
+        var model = new ManagedFileChooserViewModel(options, _managedOptions);
+        var results = await Show(model, _parent);
+
+        return results.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray();
+    }
+            
+    private async Task<string[]> Show(ManagedFileChooserViewModel model, Window parent)
+    {
+        var dialog = new T
+        {
+            Content = new ManagedFileChooser(),
+            Title = model.Title,
+            DataContext = model
+        };
+
+        dialog.Closed += delegate { model.Cancel(); };
+
+        string[]? result = null;
+                
+        model.CompleteRequested += items =>
+        {
+            result = items;
+            dialog.Close();
+        };
+
+        model.OverwritePrompt += async (filename) =>
+        {
+            var overwritePromptDialog = new Window()
+            {
+                Title = "Confirm Save As",
+                SizeToContent = SizeToContent.WidthAndHeight,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                Padding = new Thickness(10),
+                MinWidth = 270
+            };
+
+            string name = Path.GetFileName(filename);
+
+            var panel = new DockPanel()
+            {
+                HorizontalAlignment = Layout.HorizontalAlignment.Stretch
+            };
+
+            var label = new Label()
+            {
+                Content = $"{name} already exists.\nDo you want to replace it?"
+            };
+
+            panel.Children.Add(label);
+            DockPanel.SetDock(label, Dock.Top);
+
+            var buttonPanel = new StackPanel()
+            {
+                HorizontalAlignment = Layout.HorizontalAlignment.Right,
+                Orientation = Layout.Orientation.Horizontal,
+                Spacing = 10
+            };
+
+            var button = new Button()
+            {
+                Content = "Yes",
+                HorizontalAlignment = Layout.HorizontalAlignment.Right
+            };
+
+            button.Click += (sender, args) =>
+            {
+                result = new string[1] { filename };
+                overwritePromptDialog.Close();
+                dialog.Close();
+            };
+
+            buttonPanel.Children.Add(button);
+
+            button = new Button()
+            {
+                Content = "No",
+                HorizontalAlignment = Layout.HorizontalAlignment.Right
+            };
+
+            button.Click += (sender, args) =>
+            {
+                overwritePromptDialog.Close();
+            };
+
+            buttonPanel.Children.Add(button);
+
+            panel.Children.Add(buttonPanel);
+            DockPanel.SetDock(buttonPanel, Dock.Bottom);
+
+            overwritePromptDialog.Content = panel;
+
+            await overwritePromptDialog.ShowDialog(dialog);
+        };
+
+        model.CancelRequested += dialog.Close;
+
+        await dialog.ShowDialog<object>(parent);
+        return result ?? Array.Empty<string>();
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
index bcb63783a4..3b1c6cc7b1 100644
--- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
+++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
@@ -2,11 +2,19 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
     <PackageReference Include="Tmds.DBus" Version="0.9.0" />
   </ItemGroup>
-
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.X11, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.FreeDesktop/DBusCallQueue.cs b/src/Avalonia.FreeDesktop/DBusCallQueue.cs
index 5cd748be02..e7c07dcbf9 100644
--- a/src/Avalonia.FreeDesktop/DBusCallQueue.cs
+++ b/src/Avalonia.FreeDesktop/DBusCallQueue.cs
@@ -8,10 +8,9 @@ namespace Avalonia.FreeDesktop
     {
         private readonly Func<Exception, Task> _errorHandler;
 
-        class Item
+        record Item(Func<Task> Callback)
         {
-            public Func<Task> Callback;
-            public Action<Exception> OnFinish;
+            public Action<Exception?>? OnFinish;
         }
         private Queue<Item> _q = new Queue<Item>();
         private bool _processing;
@@ -23,19 +22,15 @@ namespace Avalonia.FreeDesktop
         
         public void Enqueue(Func<Task> cb)
         {
-            _q.Enqueue(new Item
-            {
-                Callback = cb
-            });
+            _q.Enqueue(new Item(cb));
             Process();
         }
 
         public Task EnqueueAsync(Func<Task> cb)
         {
             var tcs = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
-            _q.Enqueue(new Item
+            _q.Enqueue(new Item(cb)
             {
-                Callback = cb,
                 OnFinish = e =>
                 {
                     if (e == null)
@@ -51,13 +46,12 @@ namespace Avalonia.FreeDesktop
         public Task<T> EnqueueAsync<T>(Func<Task<T>> cb)
         {
             var tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
-            _q.Enqueue(new Item
-            {
-                Callback = async () =>
+            _q.Enqueue(new Item(async () =>
                 {
                     var res = await cb();
                     tcs.TrySetResult(res);
-                },
+                })
+            {
                 OnFinish = e =>
                 {
                     if (e != null)
diff --git a/src/Avalonia.FreeDesktop/DBusFileChooser.cs b/src/Avalonia.FreeDesktop/DBusFileChooser.cs
new file mode 100644
index 0000000000..24db614a02
--- /dev/null
+++ b/src/Avalonia.FreeDesktop/DBusFileChooser.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Tmds.DBus;
+
+[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
+namespace Avalonia.FreeDesktop
+{
+    [DBusInterface("org.freedesktop.portal.FileChooser")]
+    internal interface IFileChooser : IDBusObject
+    {
+        Task<ObjectPath> OpenFileAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<ObjectPath> SaveFileAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<ObjectPath> SaveFilesAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<T> GetAsync<T>(string prop);
+        Task<FileChooserProperties> GetAllAsync();
+        Task SetAsync(string prop, object val);
+        Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler);
+    }
+
+    [Dictionary]
+    internal class FileChooserProperties
+    {
+        public uint Version { get; set; }
+    }
+
+    internal static class FileChooserExtensions
+    {
+        public static Task<uint> GetVersionAsync(this IFileChooser o) => o.GetAsync<uint>("version");
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/DBusHelper.cs b/src/Avalonia.FreeDesktop/DBusHelper.cs
index c14539d7bf..ef99838208 100644
--- a/src/Avalonia.FreeDesktop/DBusHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusHelper.cs
@@ -6,7 +6,7 @@ using Tmds.DBus;
 
 namespace Avalonia.FreeDesktop
 {
-    public class DBusHelper
+    public static class DBusHelper
     {
         /// <summary>
         /// This class uses synchronous execution at DBus connection establishment stage
@@ -14,29 +14,27 @@ namespace Avalonia.FreeDesktop
         /// </summary>
         private class DBusSyncContext : SynchronizationContext
         {
-            private SynchronizationContext _ctx;
-            private object _lock = new object();
+            private readonly object _lock = new();
+            private SynchronizationContext? _ctx;
 
-            public override void Post(SendOrPostCallback d, object state)
+            public override void Post(SendOrPostCallback d, object? state)
             {
                 lock (_lock)
                 {
-                    if (_ctx != null)
+                    if (_ctx is not null)
                         _ctx?.Post(d, state);
                     else
-                        lock (_lock)
-                            d(state);
+                        d(state);
                 }
             }
 
-            public override void Send(SendOrPostCallback d, object state)
+            public override void Send(SendOrPostCallback d, object? state)
             {
                 lock (_lock)
                 {
-                    if (_ctx != null)
+                    if (_ctx is not null)
                         _ctx?.Send(d, state);
                     else
-
                         d(state);
                 }
             }
@@ -47,15 +45,14 @@ namespace Avalonia.FreeDesktop
                     _ctx = new AvaloniaSynchronizationContext();
             }
         }
-        public static Connection Connection { get; private set; }
 
-        public static Connection TryInitialize(string dbusAddress = null)
+        public static Connection? Connection { get; private set; }
+
+        public static Connection? TryInitialize(string? dbusAddress = null)
+            => Connection ?? TryCreateNewConnection(dbusAddress);
+
+        public static Connection? TryCreateNewConnection(string? dbusAddress = null)
         {
-            return Connection ?? TryCreateNewConnection(dbusAddress);
-        }
-        
-        public static Connection TryCreateNewConnection(string dbusAddress = null)
-        { 
             var oldContext = SynchronizationContext.Current;
             try
             {
diff --git a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
index a7e83140ae..899288b4a8 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
-using Avalonia.FreeDesktop.DBusIme.Fcitx;
 using Avalonia.Input.Raw;
 using Avalonia.Input.TextInput;
 using Avalonia.Logging;
@@ -26,7 +24,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             return (im, im);
         }
     }
-    
+
     internal abstract class DBusTextInputMethodBase : IX11InputMethodControl, ITextInputMethodImpl
     {
         private List<IDisposable> _disposables = new List<IDisposable>();
@@ -34,7 +32,7 @@ namespace Avalonia.FreeDesktop.DBusIme
         protected Connection Connection { get; }
         private readonly string[] _knownNames;
         private bool _connecting;
-        private string _currentName;
+        private string? _currentName;
         private DBusCallQueue _queue;
         private bool _controlActive, _windowActive;
         private bool? _imeActive;
@@ -42,9 +40,10 @@ namespace Avalonia.FreeDesktop.DBusIme
         private PixelRect? _lastReportedRect;
         private double _scaling = 1;
         private PixelPoint _windowPosition;
-        
+        private ITextInputMethodClient? _client;
+
         protected bool IsConnected => _currentName != null;
-        
+
         public DBusTextInputMethodBase(Connection connection, params string[] knownNames)
         {
             _queue = new DBusCallQueue(QueueOnError);
@@ -53,23 +52,27 @@ namespace Avalonia.FreeDesktop.DBusIme
             Watch();
         }
 
+        public ITextInputMethodClient Client => _client;
+
+        public bool IsActive => _client != null;
+
         async void Watch()
         {
             foreach (var name in _knownNames)
                 _disposables.Add(await Connection.ResolveServiceOwnerAsync(name, OnNameChange));
         }
-        
+
         protected abstract Task<bool> Connect(string name);
 
         protected string GetAppName() =>
-            Application.Current.Name ?? Assembly.GetEntryAssembly()?.GetName()?.Name ?? "Avalonia";
-        
+            Application.Current?.Name ?? Assembly.GetEntryAssembly()?.GetName()?.Name ?? "Avalonia";
+
         private async void OnNameChange(ServiceOwnerChangedEventArgs args)
         {
             if (args.NewOwner != null && _currentName == null)
             {
                 _onlineNamesQueue.Enqueue(args.ServiceName);
-                if(!_connecting)
+                if (!_connecting)
                 {
                     _connecting = true;
                     try
@@ -98,25 +101,25 @@ namespace Avalonia.FreeDesktop.DBusIme
                         _connecting = false;
                     }
                 }
-                
+
             }
-            
+
             // IME has crashed
             if (args.NewOwner == null && args.ServiceName == _currentName)
             {
                 _currentName = null;
-                foreach(var s in _disposables)
+                foreach (var s in _disposables)
                     s.Dispose();
                 _disposables.Clear();
-                
+
                 OnDisconnected();
                 Reset();
-                
+
                 // Watch again
                 Watch();
             }
         }
-        
+
         protected virtual Task Disconnect()
         {
             return Task.CompletedTask;
@@ -124,7 +127,7 @@ namespace Avalonia.FreeDesktop.DBusIme
 
         protected virtual void OnDisconnected()
         {
-            
+
         }
 
         protected virtual void Reset()
@@ -149,10 +152,14 @@ namespace Avalonia.FreeDesktop.DBusIme
             OnDisconnected();
             _currentName = null;
         }
-        
+
         protected void Enqueue(Func<Task> cb) => _queue.Enqueue(cb);
 
-        protected void AddDisposable(IDisposable d) => _disposables.Add(d);
+        protected void AddDisposable(IDisposable? d)
+        {
+            if(d is { })
+                _disposables.Add(d);
+        }
         
         public void Dispose()
         {
@@ -198,9 +205,9 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateActive();
         }
         
-        void ITextInputMethodImpl.SetActive(bool active)
+        void ITextInputMethodImpl.SetClient(ITextInputMethodClient? client)
         {
-            _controlActive = active;
+            _client = client;
             UpdateActive();
         }
 
@@ -225,7 +232,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             }
         }
 
-        private Action<string> _onCommit;
+        private Action<string>? _onCommit;
         event Action<string> IX11InputMethodControl.Commit
         {
             add => _onCommit += value;
@@ -234,7 +241,7 @@ namespace Avalonia.FreeDesktop.DBusIme
 
         protected void FireCommit(string s) => _onCommit?.Invoke(s);
         
-        private Action<X11InputMethodForwardedKey> _onForward;
+        private Action<X11InputMethodForwardedKey>? _onForward;
         event Action<X11InputMethodForwardedKey> IX11InputMethodControl.ForwardKey
         {
             add => _onForward += value;
@@ -272,7 +279,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateCursorRect();
         }
 
-        public abstract void SetOptions(TextInputOptionsQueryEventArgs options);
+        public abstract void SetOptions(TextInputOptions options);
 
         void ITextInputMethodImpl.Reset()
         {
diff --git a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxDBus.cs b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxDBus.cs
index 7ce2339763..06afacaa29 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxDBus.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxDBus.cs
@@ -31,15 +31,15 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
         Task SetSurroundingTextPositionAsync(uint Cursor, uint Anchor);
         Task DestroyICAsync();
         Task<int> ProcessKeyEventAsync(uint Keyval, uint Keycode, uint State, int Type, uint Time);
-        Task<IDisposable> WatchEnableIMAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCloseIMAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCommitStringAsync(Action<string> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdatePreeditAsync(Action<(string str, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateClientSideUIAsync(Action<(string auxup, string auxdown, string preedit, string candidateword, string imname, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchEnableIMAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCloseIMAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable?> WatchCommitStringAsync(Action<string> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdatePreeditAsync(Action<(string str, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateClientSideUIAsync(Action<(string auxup, string auxdown, string preedit, string candidateword, string imname, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable?> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception>? onError = null);
     }
     
     [DBusInterface("org.fcitx.Fcitx.InputContext1")]
@@ -54,11 +54,11 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
         Task SetSurroundingTextPositionAsync(uint Cursor, uint Anchor);
         Task DestroyICAsync();
         Task<bool> ProcessKeyEventAsync(uint Keyval, uint Keycode, uint State, bool Type, uint Time);
-        Task<IDisposable> WatchCommitStringAsync(Action<string> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchForwardKeyAsync(Action<(uint keyval, uint state, bool type)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception> onError = null);
+        Task<IDisposable?> WatchCommitStringAsync(Action<string> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable?> WatchForwardKeyAsync(Action<(uint keyval, uint state, bool type)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception>? onError = null);
     }
 
     [DBusInterface("org.fcitx.Fcitx.InputMethod1")]
diff --git a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs
index a03ea213aa..6c503edb41 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs
@@ -5,8 +5,8 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
 {
     internal class FcitxICWrapper
     {
-        private readonly IFcitxInputContext1 _modern;
-        private readonly IFcitxInputContext _old;
+        private readonly IFcitxInputContext1? _modern;
+        private readonly IFcitxInputContext? _old;
 
         public FcitxICWrapper(IFcitxInputContext old)
         {
@@ -18,34 +18,37 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
             _modern = modern;
         }
 
-        public Task FocusInAsync() => _old?.FocusInAsync() ?? _modern.FocusInAsync();
+        public Task FocusInAsync() => _old?.FocusInAsync() ?? _modern?.FocusInAsync() ?? Task.CompletedTask;
 
-        public Task FocusOutAsync() => _old?.FocusOutAsync() ?? _modern.FocusOutAsync();
+        public Task FocusOutAsync() => _old?.FocusOutAsync() ?? _modern?.FocusOutAsync() ?? Task.CompletedTask;
         
-        public Task ResetAsync() => _old?.ResetAsync() ?? _modern.ResetAsync();
+        public Task ResetAsync() => _old?.ResetAsync() ?? _modern?.ResetAsync() ?? Task.CompletedTask;
 
         public Task SetCursorRectAsync(int x, int y, int w, int h) =>
-            _old?.SetCursorRectAsync(x, y, w, h) ?? _modern.SetCursorRectAsync(x, y, w, h);
-        public Task DestroyICAsync() => _old?.DestroyICAsync() ?? _modern.DestroyICAsync();
+            _old?.SetCursorRectAsync(x, y, w, h) ?? _modern?.SetCursorRectAsync(x, y, w, h) ?? Task.CompletedTask;
+        public Task DestroyICAsync() => _old?.DestroyICAsync() ?? _modern?.DestroyICAsync() ?? Task.CompletedTask;
 
         public async Task<bool> ProcessKeyEventAsync(uint keyVal, uint keyCode, uint state, int type, uint time)
         {
             if(_old!=null)
                 return await _old.ProcessKeyEventAsync(keyVal, keyCode, state, type, time) != 0;
-            return await _modern.ProcessKeyEventAsync(keyVal, keyCode, state, type > 0, time);
+            return await (_modern?.ProcessKeyEventAsync(keyVal, keyCode, state, type > 0, time) ?? Task.FromResult(false));
         }
 
-        public Task<IDisposable> WatchCommitStringAsync(Action<string> handler) =>
-            _old?.WatchCommitStringAsync(handler) ?? _modern.WatchCommitStringAsync(handler);
+        public Task<IDisposable?> WatchCommitStringAsync(Action<string> handler) =>
+            _old?.WatchCommitStringAsync(handler) 
+                ?? _modern?.WatchCommitStringAsync(handler) 
+                    ?? Task.FromResult(default(IDisposable?));
 
-        public Task<IDisposable> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler)
+        public Task<IDisposable?> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler)
         {
             return _old?.WatchForwardKeyAsync(handler)
-                   ?? _modern.WatchForwardKeyAsync(ev =>
-                       handler((ev.keyval, ev.state, ev.type ? 1 : 0)));
+                   ?? _modern?.WatchForwardKeyAsync(ev =>
+                       handler((ev.keyval, ev.state, ev.type ? 1 : 0)))
+                    ?? Task.FromResult(default(IDisposable?));
         }
 
         public Task SetCapacityAsync(uint flags) =>
-            _old?.SetCapacityAsync(flags) ?? _modern.SetCapabilityAsync(flags);
+            _old?.SetCapacityAsync(flags) ?? _modern?.SetCapabilityAsync(flags) ?? Task.CompletedTask;
     }
 }
diff --git a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
index 31a061571f..791431dfa7 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
@@ -12,7 +12,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
 {
     internal class FcitxX11TextInputMethod : DBusTextInputMethodBase
     {
-        private FcitxICWrapper _context;
+        private FcitxICWrapper? _context;
         private FcitxCapabilityFlags? _lastReportedFlags;
 
         public FcitxX11TextInputMethod(Connection connection) : base(connection,
@@ -49,7 +49,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
             return true;
         }
 
-        protected override Task Disconnect() => _context.DestroyICAsync();
+        protected override Task Disconnect() => _context?.DestroyICAsync() ?? Task.CompletedTask;
 
         protected override void OnDisconnected() => _context = null;
 
@@ -60,18 +60,18 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
         }
 
         protected override Task SetCursorRectCore(PixelRect cursorRect) =>
-            _context.SetCursorRectAsync(cursorRect.X, cursorRect.Y, Math.Max(1, cursorRect.Width),
-                Math.Max(1, cursorRect.Height));
-
-        protected override Task SetActiveCore(bool active)
-        {
-            if (active)
-                return _context.FocusInAsync();
-            else
-                return _context.FocusOutAsync();
-        }
+            _context?.SetCursorRectAsync(cursorRect.X, cursorRect.Y, Math.Max(1, cursorRect.Width),
+                Math.Max(1, cursorRect.Height))
+            ?? Task.CompletedTask;
+
+        protected override Task SetActiveCore(bool active)=> (active 
+                ? _context?.FocusInAsync()
+                : _context?.FocusOutAsync())
+             ?? Task.CompletedTask;
+        
 
-        protected override Task ResetContextCore() => _context.ResetAsync();
+        protected override Task ResetContextCore() => _context?.ResetAsync() 
+            ?? Task.CompletedTask;
 
         protected override async Task<bool> HandleKeyCore(RawKeyEventArgs args, int keyVal, int keyCode)
         {
@@ -88,12 +88,18 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
             var type = args.Type == RawKeyEventType.KeyDown ?
                 FcitxKeyEventType.FCITX_PRESS_KEY :
                 FcitxKeyEventType.FCITX_RELEASE_KEY;
-            
-            return await _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state, (int)type,
-                (uint)args.Timestamp).ConfigureAwait(false);
+            if (_context is { })
+            {
+                return await _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state, (int)type,
+                    (uint)args.Timestamp).ConfigureAwait(false);
+            }
+            else
+            {
+                return false;
+            }
         }
         
-        public override void SetOptions(TextInputOptionsQueryEventArgs options) =>
+        public override void SetOptions(TextInputOptions options) =>
             Enqueue(async () =>
             {
                 if(_context == null)
@@ -111,7 +117,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
                     flags |= FcitxCapabilityFlags.CAPACITY_NUMBER;
                 else if (options.ContentType == TextInputContentType.Password)
                     flags |= FcitxCapabilityFlags.CAPACITY_PASSWORD;
-                else if (options.ContentType == TextInputContentType.Phone)
+                else if (options.ContentType == TextInputContentType.Digits)
                     flags |= FcitxCapabilityFlags.CAPACITY_DIALABLE;
                 else if (options.ContentType == TextInputContentType.Url)
                     flags |= FcitxCapabilityFlags.CAPACITY_URL;
diff --git a/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusDBus.cs b/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusDBus.cs
index 26c0d249f3..4ef034adb9 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusDBus.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusDBus.cs
@@ -22,25 +22,25 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
         Task<object> GetEngineAsync();
         Task DestroyAsync();
         Task SetSurroundingTextAsync(object Text, uint CursorPos, uint AnchorPos);
-        Task<IDisposable> WatchCommitTextAsync(Action<object> cb, Action<Exception> onError = null);
-        Task<IDisposable> WatchForwardKeyEventAsync(Action<(uint keyval, uint keycode, uint state)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchRequireSurroundingTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchars)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdatePreeditTextAsync(Action<(object text, uint cursorPos, bool visible)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchShowPreeditTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchHidePreeditTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateAuxiliaryTextAsync(Action<(object text, bool visible)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchShowAuxiliaryTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchHideAuxiliaryTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateLookupTableAsync(Action<(object table, bool visible)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchShowLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchHideLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchPageUpLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchPageDownLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCursorUpLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCursorDownLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchRegisterPropertiesAsync(Action<object> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdatePropertyAsync(Action<object> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchCommitTextAsync(Action<object> cb, Action<Exception>? onError = null);
+        Task<IDisposable> WatchForwardKeyEventAsync(Action<(uint keyval, uint keycode, uint state)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchRequireSurroundingTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchars)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdatePreeditTextAsync(Action<(object text, uint cursorPos, bool visible)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchShowPreeditTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchHidePreeditTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateAuxiliaryTextAsync(Action<(object text, bool visible)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchShowAuxiliaryTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchHideAuxiliaryTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateLookupTableAsync(Action<(object table, bool visible)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchShowLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchHideLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchPageUpLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchPageDownLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCursorUpLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCursorDownLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchRegisterPropertiesAsync(Action<object> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdatePropertyAsync(Action<object> handler, Action<Exception>? onError = null);
     }
     
     
diff --git a/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs b/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs
index a73de9dae8..2324ca44a7 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs
@@ -9,7 +9,7 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
 {
     internal class IBusX11TextInputMethod : DBusTextInputMethodBase
     {
-        private IIBusInputContext _context;
+        private IIBusInputContext? _context;
 
         public IBusX11TextInputMethod(Connection connection) : base(connection, 
             "org.freedesktop.portal.IBus")
@@ -53,16 +53,16 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
         private void OnCommitText(object wtf)
         {
             // Hello darkness, my old friend
-            var prop = wtf.GetType().GetField("Item3");
-            if (prop != null)
+            if (wtf.GetType().GetField("Item3") is { } prop)
             {
-                var text = (string)prop.GetValue(wtf);
+                var text = prop.GetValue(wtf) as string;
                 if (!string.IsNullOrEmpty(text))
-                    FireCommit(text);
+                    FireCommit(text!);
             }
         }
 
-        protected override Task Disconnect() => _context.DestroyAsync();
+        protected override Task Disconnect() => _context?.DestroyAsync()
+            ?? Task.CompletedTask;
 
         protected override void OnDisconnected()
         {
@@ -71,13 +71,15 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
         }
 
         protected override Task SetCursorRectCore(PixelRect rect) 
-            => _context.SetCursorLocationAsync(rect.X, rect.Y, rect.Width, rect.Height);
+            => _context?.SetCursorLocationAsync(rect.X, rect.Y, rect.Width, rect.Height)
+            ?? Task.CompletedTask;
 
         protected override Task SetActiveCore(bool active)
-            => active ? _context.FocusInAsync() : _context.FocusOutAsync();
+            => (active ? _context?.FocusInAsync() : _context?.FocusOutAsync())
+                ?? Task.CompletedTask;
 
         protected override Task ResetContextCore()
-            => _context.ResetAsync();
+            => _context?.ResetAsync() ?? Task.CompletedTask;
 
         protected override Task<bool> HandleKeyCore(RawKeyEventArgs args, int keyVal, int keyCode)
         {
@@ -94,10 +96,18 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
             if (args.Type == RawKeyEventType.KeyUp)
                 state |= IBusModifierMask.ReleaseMask;
 
-            return _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state);
+            if(_context is { })
+            {
+                return _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state);
+            }
+            else
+            {
+                return Task.FromResult(false);
+            }
+            
         }
 
-        public override void SetOptions(TextInputOptionsQueryEventArgs options)
+        public override void SetOptions(TextInputOptions options)
         {
             // No-op, because ibus 
         }
diff --git a/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs b/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
index 7f71ecf0ff..86978c8b60 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
@@ -17,7 +17,7 @@ namespace Avalonia.FreeDesktop.DBusIme
                     new DBusInputMethodFactory<IBusX11TextInputMethod>(_ => new IBusX11TextInputMethod(conn))
             };
         
-        static Func<Connection, IX11InputMethodFactory> DetectInputMethod()
+        static Func<Connection, IX11InputMethodFactory>? DetectInputMethod()
         {
             foreach (var name in new[] { "AVALONIA_IM_MODULE", "GTK_IM_MODULE", "QT_IM_MODULE" })
             {
diff --git a/src/Avalonia.FreeDesktop/DBusMenu.cs b/src/Avalonia.FreeDesktop/DBusMenu.cs
index 7180345386..3a1c65e7c9 100644
--- a/src/Avalonia.FreeDesktop/DBusMenu.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenu.cs
@@ -28,18 +28,18 @@ namespace Avalonia.FreeDesktop.DBusMenu
         Task<int[]> EventGroupAsync((int id, string eventId, object data, uint timestamp)[] events);
         Task<bool> AboutToShowAsync(int Id);
         Task<(int[] updatesNeeded, int[] idErrors)> AboutToShowGroupAsync(int[] Ids);
-        Task<IDisposable> WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception>? onError = null);
     }
 
     [Dictionary]
     class DBusMenuProperties
     {
         public uint Version { get; set; } = default (uint);
-        public string TextDirection { get; set; } = default (string);
-        public string Status { get; set; } = default (string);
-        public string[] IconThemePath { get; set; } = default (string[]);
+        public string? TextDirection { get; set; } = default (string);
+        public string? Status { get; set; } = default (string);
+        public string[]? IconThemePath { get; set; } = default (string[]);
     }
 
 
@@ -50,7 +50,7 @@ namespace Avalonia.FreeDesktop.DBusMenu
         Task UnregisterWindowAsync(uint WindowId);
         Task<(string service, ObjectPath menuObjectPath)> GetMenuForWindowAsync(uint WindowId);
         Task<(uint, string, ObjectPath)[]> GetMenusAsync();
-        Task<IDisposable> WatchWindowRegisteredAsync(Action<(uint windowId, string service, ObjectPath menuObjectPath)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchWindowUnregisteredAsync(Action<uint> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchWindowRegisteredAsync(Action<(uint windowId, string service, ObjectPath menuObjectPath)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchWindowUnregisteredAsync(Action<uint> handler, Action<Exception>? onError = null);
     }
 }
diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
index 206c24ad5e..657e324010 100644
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@@ -17,7 +17,7 @@ namespace Avalonia.FreeDesktop
 {
     public class DBusMenuExporter
     {
-        public static ITopLevelNativeMenuExporter TryCreateTopLevelNativeMenu(IntPtr xid)
+        public static ITopLevelNativeMenuExporter? TryCreateTopLevelNativeMenu(IntPtr xid)
         {
             if (DBusHelper.Connection == null)
                 return null;
@@ -37,10 +37,10 @@ namespace Avalonia.FreeDesktop
         {
             private readonly Connection _dbus;
             private readonly uint _xid;
-            private IRegistrar _registrar;
+            private IRegistrar? _registrar;
             private bool _disposed;
             private uint _revision = 1;
-            private NativeMenu _menu;
+            private NativeMenu? _menu;
             private readonly Dictionary<int, NativeMenuItemBase> _idsToItems = new Dictionary<int, NativeMenuItemBase>();
             private readonly Dictionary<NativeMenuItemBase, int> _itemsToIds = new Dictionary<NativeMenuItemBase, int>();
             private readonly HashSet<NativeMenu> _menus = new HashSet<NativeMenu>();
@@ -73,10 +73,10 @@ namespace Avalonia.FreeDesktop
                     if (_appMenu)
                     {
                         await _dbus.RegisterObjectAsync(this);
-                        _registrar = DBusHelper.Connection.CreateProxy<IRegistrar>(
+                        _registrar = DBusHelper.Connection?.CreateProxy<IRegistrar>(
                             "com.canonical.AppMenu.Registrar",
                             "/com/canonical/AppMenu/Registrar");
-                        if (!_disposed)
+                        if (!_disposed && _registrar is { })
                             await _registrar.RegisterWindowAsync(_xid, ObjectPath);
                     }
                     else
@@ -109,9 +109,9 @@ namespace Avalonia.FreeDesktop
 
 
             public bool IsNativeMenuExported { get; private set; }
-            public event EventHandler OnIsNativeMenuExportedChanged;
+            public event EventHandler? OnIsNativeMenuExportedChanged;
 
-            public void SetNativeMenu(NativeMenu menu)
+            public void SetNativeMenu(NativeMenu? menu)
             {
                 if (menu == null)
                     menu = new NativeMenu();
@@ -153,7 +153,7 @@ namespace Avalonia.FreeDesktop
                 Dispatcher.UIThread.Post(DoLayoutReset, DispatcherPriority.Background);
             }
 
-            private (NativeMenuItemBase item, NativeMenu menu) GetMenu(int id)
+            private (NativeMenuItemBase? item, NativeMenu? menu) GetMenu(int id)
             {
                 if (id == 0)
                     return (null, _menu);
@@ -161,7 +161,7 @@ namespace Avalonia.FreeDesktop
                 return (item, (item as NativeMenuItem)?.Menu);
             }
 
-            private void EnsureSubscribed(NativeMenu menu)
+            private void EnsureSubscribed(NativeMenu? menu)
             {
                 if(menu!=null && _menus.Add(menu))
                     ((INotifyCollectionChanged)menu.Items).CollectionChanged += OnMenuItemsChanged;
@@ -180,12 +180,12 @@ namespace Avalonia.FreeDesktop
                 return id;
             }
 
-            private void OnMenuItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+            private void OnMenuItemsChanged(object? sender, NotifyCollectionChangedEventArgs e)
             {
                 QueueReset();
             }
 
-            private void OnItemPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+            private void OnItemPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
             {
                 QueueReset();
             }
@@ -216,7 +216,7 @@ namespace Avalonia.FreeDesktop
                 "type", "label", "enabled", "visible", "shortcut", "toggle-type", "children-display", "toggle-state", "icon-data"
             };
             
-            object GetProperty((NativeMenuItemBase item, NativeMenu menu) i, string name)
+            object? GetProperty((NativeMenuItemBase? item, NativeMenu? menu) i, string name)
             {
                 var (it, menu) = i;
 
@@ -302,7 +302,7 @@ namespace Avalonia.FreeDesktop
             }
 
             private List<KeyValuePair<string, object>> _reusablePropertyList = new List<KeyValuePair<string, object>>();
-            KeyValuePair<string, object>[] GetProperties((NativeMenuItemBase item, NativeMenu menu) i, string[] names)
+            KeyValuePair<string, object>[] GetProperties((NativeMenuItemBase? item, NativeMenu? menu) i, string[] names)
             {
                 if (names?.Length > 0 != true)
                     names = AllProperties;
@@ -336,11 +336,11 @@ namespace Avalonia.FreeDesktop
                 return Task.FromResult(rv);
             }
 
-            (int, KeyValuePair<string, object>[], object[]) GetLayout(NativeMenuItemBase item, NativeMenu menu, int depth, string[] propertyNames)
+            (int, KeyValuePair<string, object>[], object[]) GetLayout(NativeMenuItemBase? item, NativeMenu? menu, int depth, string[] propertyNames)
             {
                 var id = item == null ? 0 : GetId(item);
                 var props = GetProperties((item, menu), propertyNames);
-                var children = (depth == 0 || menu == null) ? new object[0] : new object[menu.Items.Count];
+                var children = (depth == 0 || menu == null) ? Array.Empty<object>() : new object[menu.Items.Count];
                 if(menu != null)
                     for (var c = 0; c < children.Length; c++)
                     {
@@ -397,7 +397,7 @@ namespace Avalonia.FreeDesktop
             {
                 foreach (var e in Events)
                     HandleEvent(e.id, e.eventId, e.data, e.timestamp);
-                return Task.FromResult(new int[0]);
+                return Task.FromResult(Array.Empty<int>());
             }
 
             public async Task<bool> AboutToShowAsync(int Id)
@@ -407,29 +407,29 @@ namespace Avalonia.FreeDesktop
 
             public async Task<(int[] updatesNeeded, int[] idErrors)> AboutToShowGroupAsync(int[] Ids)
             {
-                return (new int[0], new int[0]);
+                return (Array.Empty<int>(), Array.Empty<int>());
             }
 
             #region Events
 
             private event Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)>
                 ItemsPropertiesUpdated { add { } remove { } }
-            private event Action<(uint revision, int parent)> LayoutUpdated;
+            private event Action<(uint revision, int parent)>? LayoutUpdated;
             private event Action<(int id, uint timestamp)> ItemActivationRequested { add { } remove { } }
             private event Action<PropertyChanges> PropertiesChanged { add { } remove { } }
 
-            async Task<IDisposable> IDBusMenu.WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception> onError)
+            async Task<IDisposable> IDBusMenu.WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception>? onError)
             {
                 ItemsPropertiesUpdated += handler;
                 return Disposable.Create(() => ItemsPropertiesUpdated -= handler);
             }
-            async Task<IDisposable> IDBusMenu.WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception> onError)
+            async Task<IDisposable> IDBusMenu.WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception>? onError)
             {
                 LayoutUpdated += handler;
                 return Disposable.Create(() => LayoutUpdated -= handler);
             }
 
-            async Task<IDisposable> IDBusMenu.WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception> onError)
+            async Task<IDisposable> IDBusMenu.WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception>? onError)
             {
                 ItemActivationRequested+= handler;
                 return Disposable.Create(() => ItemActivationRequested -= handler);
diff --git a/src/Avalonia.FreeDesktop/DBusRequest.cs b/src/Avalonia.FreeDesktop/DBusRequest.cs
new file mode 100644
index 0000000000..d84905324f
--- /dev/null
+++ b/src/Avalonia.FreeDesktop/DBusRequest.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Tmds.DBus;
+
+[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
+namespace Avalonia.FreeDesktop
+{
+    [DBusInterface("org.freedesktop.portal.Request")]
+    internal interface IRequest : IDBusObject
+    {
+        Task CloseAsync();
+        Task<IDisposable> WatchResponseAsync(Action<(uint response, IDictionary<string, object> results)> handler, Action<Exception>? onError = null);
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
new file mode 100644
index 0000000000..8597f3922a
--- /dev/null
+++ b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Logging;
+using Avalonia.Platform;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+
+using Tmds.DBus;
+
+namespace Avalonia.FreeDesktop
+{
+    internal class DBusSystemDialog : BclStorageProvider
+    {
+        private static readonly Lazy<IFileChooser?> s_fileChooser = new(() => DBusHelper.Connection?
+            .CreateProxy<IFileChooser>("org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop"));
+
+        internal static async Task<IStorageProvider?> TryCreate(IPlatformHandle handle)
+        {
+            if (handle.HandleDescriptor == "XID" && s_fileChooser.Value is { } fileChooser)
+            {
+                try
+                {
+                    await fileChooser.GetVersionAsync();
+                    return new DBusSystemDialog(fileChooser, handle);
+                }
+                catch (Exception e)
+                {
+                    Logger.TryGet(LogEventLevel.Error, LogArea.X11Platform)?.Log(null, $"Unable to connect to org.freedesktop.portal.Desktop: {e.Message}");
+                    return null;
+                }
+            }
+
+            return null;
+        }
+
+        private readonly IFileChooser _fileChooser;
+        private readonly IPlatformHandle _handle;
+
+        private DBusSystemDialog(IFileChooser fileChooser, IPlatformHandle handle)
+        {
+            _fileChooser = fileChooser;
+            _handle = handle;
+        }
+
+        public override bool CanOpen => true;
+
+        public override bool CanSave => true;
+
+        public override bool CanPickFolder => true;
+
+        public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            var parentWindow = $"x11:{_handle.Handle:X}";
+            ObjectPath objectPath;
+            var chooserOptions = new Dictionary<string, object>();
+            var filters = ParseFilters(options.FileTypeFilter);
+            if (filters.Any())
+            {
+                chooserOptions.Add("filters", filters);
+            }
+
+            chooserOptions.Add("multiple", options.AllowMultiple);
+
+            objectPath = await _fileChooser.OpenFileAsync(parentWindow, options.Title ?? string.Empty, chooserOptions);
+
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task ?? Array.Empty<string>();
+
+            return uris.Select(path => new BclStorageFile(new FileInfo(new Uri(path).LocalPath))).ToList();
+        }
+
+        public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            var parentWindow = $"x11:{_handle.Handle:X}";
+            ObjectPath objectPath;
+            var chooserOptions = new Dictionary<string, object>();
+            var filters = ParseFilters(options.FileTypeChoices);
+            if (filters.Any())
+            {
+                chooserOptions.Add("filters", filters);
+            }
+
+            if (options.SuggestedFileName is { } currentName)
+                chooserOptions.Add("current_name", currentName);
+            if (options.SuggestedStartLocation?.TryGetUri(out var currentFolder) == true)
+                chooserOptions.Add("current_folder", Encoding.UTF8.GetBytes(currentFolder.ToString()));
+            objectPath = await _fileChooser.SaveFileAsync(parentWindow, options.Title ?? string.Empty, chooserOptions);
+
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task;
+            var path = uris?.FirstOrDefault() is { } filePath ? new Uri(filePath).LocalPath : null;
+
+            if (path is null)
+            {
+                return null;
+            }
+            else
+            {
+                // WSL2 freedesktop automatically adds extension from selected file type, but we can't pass "default ext". So apply it manually.
+                path = StorageProviderHelpers.NameWithExtension(path, options.DefaultExtension, null);
+
+                return new BclStorageFile(new FileInfo(path));
+            }
+        }
+
+        public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            var parentWindow = $"x11:{_handle.Handle:X}";
+            var chooserOptions = new Dictionary<string, object>
+            {
+                { "directory", true },
+                { "multiple", options.AllowMultiple }
+            };
+            var objectPath = await _fileChooser.OpenFileAsync(parentWindow, options.Title ?? string.Empty, chooserOptions);
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task ?? Array.Empty<string>();
+
+            return uris
+                .Select(path => new Uri(path).LocalPath)
+                // WSL2 freedesktop allows to select files as well in directory picker, filter it out.
+                .Where(Directory.Exists)
+                .Select(path => new BclStorageFolder(new DirectoryInfo(path))).ToList();
+        }
+
+        private static (string name, (uint style, string extension)[])[] ParseFilters(IReadOnlyList<FilePickerFileType>? fileTypes)
+        {
+            // Example: [('Images', [(0, '*.ico'), (1, 'image/png')]), ('Text', [(0, '*.txt')])]
+
+            if (fileTypes is null)
+            {
+                return Array.Empty<(string name, (uint style, string extension)[])>();
+            }
+
+            var filters = new List<(string name, (uint style, string extension)[])>();
+            foreach (var fileType in fileTypes)
+            {
+                const uint globStyle = 0u;
+                const uint mimeStyle = 1u;
+
+                var extensions = Enumerable.Empty<(uint, string)>();
+
+                if (fileType.Patterns is { } patterns)
+                {
+                    extensions = extensions.Concat(patterns.Select(static x => (globStyle, x)));
+                }
+                else if (fileType.MimeTypes is { } mimeTypes)
+                {
+                    extensions = extensions.Concat(mimeTypes.Select(static x => (mimeStyle, x)));
+                }
+
+                if (extensions.Any())
+                {
+                    filters.Add((fileType.Name, extensions.ToArray()));
+                }
+            }
+
+            return filters.ToArray();
+        }
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
index a7cc4f4cc2..4a55212de3 100644
--- a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
+++ b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
@@ -12,10 +12,6 @@ using Tmds.DBus;
 
 [assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
 
-[assembly:
-    InternalsVisibleTo(
-        "Avalonia.X11, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
 namespace Avalonia.FreeDesktop
 {
     internal class DBusTrayIconImpl : ITrayIconImpl
diff --git a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
index f9737b461d..39ddd9d769 100644
--- a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
+++ b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
@@ -36,6 +36,13 @@ namespace Avalonia.FreeDesktop
 
         private string GetSymlinkTarget(string x) => Path.GetFullPath(Path.Combine(DevByLabelDir, NativeMethods.ReadLink(x)));
 
+        private string UnescapeString(string input, string regexText, int escapeBase) =>
+            new Regex(regexText).Replace(input, m => Convert.ToChar(Convert.ToByte(m.Groups[1].Value, escapeBase)).ToString());
+
+        private string UnescapePathFromProcMounts(string input) => UnescapeString(input, @"\\(\d{3})", 8);
+
+        private string UnescapeDeviceLabel(string input) => UnescapeString(input, @"\\x([0-9a-f]{2})", 16);
+
         private void Poll(long _)
         {
             var fProcPartitions = File.ReadAllLines(ProcPartitionsDir)
@@ -47,14 +54,14 @@ namespace Avalonia.FreeDesktop
 
             var fProcMounts = File.ReadAllLines(ProcMountsDir)
                                   .Select(x => x.Split(' '))
-                                  .Select(x => (x[0], x[1]))
+                                  .Select(x => (x[0], UnescapePathFromProcMounts(x[1])))
                                   .Where(x => !x.Item2.StartsWith("/snap/", StringComparison.InvariantCultureIgnoreCase));
 
             var labelDirEnum = Directory.Exists(DevByLabelDir) ?
                                new DirectoryInfo(DevByLabelDir).GetFiles() : Enumerable.Empty<FileInfo>();
 
             var labelDevPathPairs = labelDirEnum
-                                    .Select(x => (GetSymlinkTarget(x.FullName), x.Name));
+                                    .Select(x => (GetSymlinkTarget(x.FullName), UnescapeDeviceLabel(x.Name)));
 
             var q1 = from mount in fProcMounts
                      join device in fProcPartitions on mount.Item1 equals device.Item2
@@ -64,7 +71,7 @@ namespace Avalonia.FreeDesktop
                      {
                          VolumePath = mount.Item2,
                          VolumeSizeBytes = device.Item1,
-                         VolumeLabel = x.Name
+                         VolumeLabel = x.Item2
                      };
 
             var mountVolInfos = q1.ToArray();
diff --git a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs
index d68c02bfd6..b69ea68a76 100644
--- a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs
+++ b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs
@@ -10,7 +10,7 @@ namespace Avalonia.FreeDesktop
         public IDisposable Listen(ObservableCollection<MountedVolumeInfo> mountedDrives)
         {
             Contract.Requires<ArgumentNullException>(mountedDrives != null);
-            return new LinuxMountedVolumeInfoListener(ref mountedDrives);
+            return new LinuxMountedVolumeInfoListener(ref mountedDrives!);
         }
     }
 }
diff --git a/src/Avalonia.FreeDesktop/NativeMethods.cs b/src/Avalonia.FreeDesktop/NativeMethods.cs
index 8bbda98bb2..147955b6a3 100644
--- a/src/Avalonia.FreeDesktop/NativeMethods.cs
+++ b/src/Avalonia.FreeDesktop/NativeMethods.cs
@@ -14,15 +14,15 @@ namespace Avalonia.FreeDesktop
 
         public static string ReadLink(string path)
         {
-            var symlinkMaxSize = Encoding.ASCII.GetMaxByteCount(path.Length);
+            var symlinkSize = Encoding.UTF8.GetByteCount(path);
             var bufferSize = 4097; // PATH_MAX is (usually?) 4096, but we need to know if the result was truncated
 
-            var symlink = ArrayPool<byte>.Shared.Rent(symlinkMaxSize + 1);
+            var symlink = ArrayPool<byte>.Shared.Rent(symlinkSize + 1);
             var buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
 
             try
             {
-                var symlinkSize = Encoding.UTF8.GetBytes(path, 0, path.Length, symlink, 0);
+                Encoding.UTF8.GetBytes(path, 0, path.Length, symlink, 0);
                 symlink[symlinkSize] = 0;
 
                 var size = readlink(symlink, buffer, bufferSize);
diff --git a/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs b/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs
index bd215296c8..cc7d5ef30d 100644
--- a/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs
+++ b/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs
@@ -20,7 +20,11 @@ namespace Avalonia
             var tcpServer = new TcpListener(host == null ? IPAddress.Loopback : IPAddress.Parse(host), port);
             tcpServer.Start();    
             return builder
-                .UseHeadless(false)
+                .UseHeadless(new AvaloniaHeadlessPlatformOptions
+                {
+                    UseCompositor = true,
+                    UseHeadlessDrawing = false
+                })
                 .AfterSetup(_ =>
                 {
                     var lt = ((IClassicDesktopStyleApplicationLifetime)builder.Instance.ApplicationLifetime);
diff --git a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
index 0ca2733cde..8da10fa59b 100644
--- a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
+++ b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
@@ -7,12 +7,14 @@ using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 
 namespace Avalonia.Headless
 {
     public static class AvaloniaHeadlessPlatform
     {
+        internal static Compositor Compositor { get; private set; }
         class RenderTimer : DefaultRenderTimer
         {
             private readonly int _framesPerSecond;
@@ -55,14 +57,13 @@ namespace Avalonia.Headless
             public ITrayIconImpl CreateTrayIcon() => null;
         }
         
-        internal static void Initialize()
+        internal static void Initialize(AvaloniaHeadlessPlatformOptions opts)
         {
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformThreadingInterface>().ToConstant(new HeadlessPlatformThreadingInterface())
                 .Bind<IClipboard>().ToSingleton<HeadlessClipboardStub>()
                 .Bind<ICursorFactory>().ToSingleton<HeadlessCursorFactoryStub>()
-                .Bind<IPlatformSettings>().ToConstant(new HeadlessPlatformSettingsStub())
-                .Bind<ISystemDialogImpl>().ToSingleton<HeadlessSystemDialogsStub>()
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformIconLoader>().ToSingleton<HeadlessIconLoaderStub>()
                 .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
@@ -71,6 +72,8 @@ namespace Avalonia.Headless
                 .Bind<ITextShaperImpl>().ToSingleton<HeadlessTextShaperStub>()
                 .Bind<IWindowingPlatform>().ToConstant(new HeadlessWindowingPlatform())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
+            if (opts.UseCompositor)
+                Compositor = new Compositor(AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(), null);
         }
 
 
@@ -82,15 +85,21 @@ namespace Avalonia.Headless
 
         }
     }
-    
+
+    public class AvaloniaHeadlessPlatformOptions
+    {
+        public bool UseCompositor { get; set; } = true;
+        public bool UseHeadlessDrawing { get; set; } = true;
+    }
+
     public static class AvaloniaHeadlessPlatformExtensions
     {
-        public static T UseHeadless<T>(this T builder, bool headlessDrawing = true) 
+        public static T UseHeadless<T>(this T builder, AvaloniaHeadlessPlatformOptions opts) 
             where T : AppBuilderBase<T>, new()
         {
-            if (headlessDrawing)
+            if(opts.UseHeadlessDrawing)
                 builder.UseRenderingSubsystem(HeadlessPlatformRenderInterface.Initialize, "Headless");
-            return builder.UseWindowingSubsystem(AvaloniaHeadlessPlatform.Initialize, "Headless");
+            return builder.UseWindowingSubsystem(() => AvaloniaHeadlessPlatform.Initialize(opts), "Headless");
         }
     }
 }
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index 90221bb922..7abc0ca131 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -1,13 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Numerics;
 using System.Runtime.InteropServices;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 
 namespace Avalonia.Headless
 {
@@ -109,11 +110,23 @@ namespace Avalonia.Headless
             return new HeadlessBitmapStub(destinationSize, new Vector(96, 96));
         }
 
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
+        {
+            return new HeadlessGeometryStub(new Rect(glyphRun.Size));
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
         {
             return new HeadlessGlyphRunStub();
         }
 
+        class HeadlessGlyphRunStub : IGlyphRunImpl
+        {
+            public void Dispose()
+            {
+            }
+        }
+
         class HeadlessGeometryStub : IGeometryImpl
         {
             public HeadlessGeometryStub(Rect bounds)
@@ -197,13 +210,6 @@ namespace Avalonia.Headless
             public Matrix Transform { get; }
         }
 
-        class HeadlessGlyphRunStub : IGlyphRunImpl
-        {
-            public void Dispose()
-            {
-            }
-        }
-
         class HeadlessStreamingGeometryStub : HeadlessGeometryStub, IStreamGeometryImpl
         {
             public HeadlessStreamingGeometryStub() : base(Rect.Empty)
@@ -317,12 +323,12 @@ namespace Avalonia.Headless
             public Vector Dpi { get; }
             public PixelSize PixelSize { get; }
             public int Version { get; set; }
-            public void Save(string fileName)
+            public void Save(string fileName, int? quality = null)
             {
 
             }
 
-            public void Save(Stream stream)
+            public void Save(Stream stream, int? quality = null)
             {
 
             }
@@ -344,6 +350,7 @@ namespace Avalonia.Headless
             }
 
             public Matrix Transform { get; set; }
+
             public void Clear(Color color)
             {
 
@@ -409,9 +416,13 @@ namespace Avalonia.Headless
 
             }
 
+            public object GetFeature(Type t)
+            {
+                return null;
+            }
+
             public void DrawLine(IPen pen, Point p1, Point p2)
             {
-                throw new NotImplementedException();
             }
 
             public void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry)
diff --git a/src/Avalonia.Headless/HeadlessPlatformStubs.cs b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
index b619b9d129..688b8e0398 100644
--- a/src/Avalonia.Headless/HeadlessPlatformStubs.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
@@ -12,6 +12,8 @@ using Avalonia.Media;
 using Avalonia.Media.Fonts;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
 using Avalonia.Utilities;
 
 namespace Avalonia.Headless
@@ -63,31 +65,13 @@ namespace Avalonia.Headless
         }
     }
 
-    class HeadlessPlatformSettingsStub : IPlatformSettings
+    class HeadlessGlyphTypefaceImpl : IGlyphTypeface
     {
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        public Size TouchDoubleClickSize => new Size(16,16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-    }
-
-    class HeadlessSystemDialogsStub : ISystemDialogImpl
-    {
-        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
+        public FontMetrics Metrics => new FontMetrics
         {
-            return Task.Run(() => (string[])null);
-        }
 
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
-        {
-            return Task.Run(() => (string)null);
-        }
-    }
+        };
 
-    class HeadlessGlyphTypefaceImpl : IGlyphTypefaceImpl
-    {
         public short DesignEmHeight => 10;
 
         public int Ascent => 5;
@@ -106,6 +90,10 @@ namespace Avalonia.Headless
 
         public bool IsFixedPitch => true;
 
+        public int GlyphCount => 1337;
+
+        public FontSimulations FontSimulations { get; }
+
         public void Dispose()
         {
         }
@@ -115,6 +103,13 @@ namespace Avalonia.Headless
             return 1;
         }
 
+        public bool TryGetGlyph(uint codepoint, out ushort glyph)
+        {
+            glyph = 1;
+
+            return true;
+        }
+
         public int GetGlyphAdvance(ushort glyph)
         {
             return 1;
@@ -129,20 +124,40 @@ namespace Avalonia.Headless
         {
             return codepoints.ToArray().Select(x => (ushort)x).ToArray();
         }
+
+        public bool TryGetTable(uint tag, out byte[] table)
+        {
+            table = null;
+            return false;
+        }
+
+        public bool TryGetGlyphMetrics(ushort glyph, out GlyphMetrics metrics)
+        {
+            metrics = new GlyphMetrics
+            {
+                Height = 10,
+                Width = 10
+            };
+
+            return true;
+        }
     }
 
     class HeadlessTextShaperStub : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+
             return new ShapedBuffer(text, text.Length, typeface, fontRenderingEmSize, bidiLevel);
         }
     }
 
     class HeadlessFontManagerStub : IFontManagerImpl
     {
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphTypeface CreateGlyphTypeface(Typeface typeface)
         {
             return new HeadlessGlyphTypefaceImpl();
         }
@@ -157,9 +172,10 @@ namespace Avalonia.Headless
             return new List<string> { "Arial" };
         }
 
-        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily, CultureInfo culture, out Typeface typeface)
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontStretch fontStretch,
+            FontFamily fontFamily, CultureInfo culture, out Typeface typeface)
         {
-            typeface = new Typeface("Arial", fontStyle, fontWeight);
+            typeface = new Typeface("Arial", fontStyle, fontWeight, fontStretch);
             return true;
         }
     }
@@ -199,5 +215,41 @@ namespace Avalonia.Headless
             new Screen(1, new PixelRect(0, 0, 1920, 1280),
                 new PixelRect(0, 0, 1920, 1280), true),
         };
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
+    }
+
+    internal class NoopStorageProvider : BclStorageProvider
+    {
+        public override bool CanOpen => false;
+        public override Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            return Task.FromResult<IReadOnlyList<IStorageFile>>(Array.Empty<IStorageFile>());
+        }
+
+        public override bool CanSave => false;
+        public override Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            return Task.FromResult<IStorageFile>(null);
+        }
+
+        public override bool CanPickFolder => false;
+        public override Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            return Task.FromResult<IReadOnlyList<IStorageFolder>>(Array.Empty<IStorageFolder>());
+        }
     }
 }
diff --git a/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs b/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs
index e42a7b1a71..b233b46dd0 100644
--- a/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs
@@ -36,35 +36,35 @@ namespace Avalonia.Headless
 
         public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
         {
-            var cancelled = false;
-            var enqueued = false;
-            var l = new object();
-            var timer = new Timer(_ =>
+            if (interval.TotalMilliseconds < 10)
+                interval = TimeSpan.FromMilliseconds(10);
+
+            var stopped = false;
+            Timer timer = null;
+            timer = new Timer(_ =>
             {
-                lock (l)
+                if (stopped)
+                    return;
+
+                Dispatcher.UIThread.Post(() =>
                 {
-                    if (cancelled || enqueued)
-                        return;
-                    enqueued = true;
-                    Dispatcher.UIThread.Post(() =>
+                    try
                     {
-                        lock (l)
-                        {
-                            enqueued = false;
-                            if (cancelled)
-                                return;
-                            tick();
-                        }
-                    }, priority);
-                }
-            }, null, interval, interval);
+                        tick();
+                    }
+                    finally
+                    {
+                        if (!stopped)
+                            timer.Change(interval, Timeout.InfiniteTimeSpan);
+                    }
+                });
+            },
+            null, interval, Timeout.InfiniteTimeSpan);
+
             return Disposable.Create(() =>
             {
-                lock (l)
-                {
-                    timer.Dispose();
-                    cancelled = true;
-                }
+                stopped = true;
+                timer.Dispose();
             });
         }
 
diff --git a/src/Avalonia.Headless/HeadlessWindowImpl.cs b/src/Avalonia.Headless/HeadlessWindowImpl.cs
index 1b582d5775..742df3324b 100644
--- a/src/Avalonia.Headless/HeadlessWindowImpl.cs
+++ b/src/Avalonia.Headless/HeadlessWindowImpl.cs
@@ -1,20 +1,24 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Avalonia.Utilities;
 
 namespace Avalonia.Headless
 {
-    class HeadlessWindowImpl : IWindowImpl, IPopupImpl, IFramebufferPlatformSurface, IHeadlessWindow
+    class HeadlessWindowImpl : IWindowImpl, IPopupImpl, IFramebufferPlatformSurface, IHeadlessWindow, ITopLevelImplWithStorageProvider
     {
         private IKeyboardDevice _keyboard;
         private Stopwatch _st = Stopwatch.StartNew();
@@ -51,7 +55,9 @@ namespace Avalonia.Headless
         public Action<double> ScalingChanged { get; set; }
 
         public IRenderer CreateRenderer(IRenderRoot root)
-            => new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>());
+            => AvaloniaHeadlessPlatform.Compositor != null
+                ? new CompositingRenderer(root, AvaloniaHeadlessPlatform.Compositor)
+                : new DeferredRenderer(root, AvaloniaLocator.Current.GetRequiredService<IRenderLoop>());
 
         public void Invalidate(Rect rect)
         {
@@ -244,6 +250,8 @@ namespace Avalonia.Headless
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);
 
+        public IStorageProvider StorageProvider => new NoopStorageProvider();
+
         void IHeadlessWindow.KeyPress(Key key, RawInputModifiers modifiers)
         {
             Input?.Invoke(new RawKeyEventArgs(_keyboard, Timestamp, InputRoot, RawKeyEventType.KeyDown, key, modifiers));
diff --git a/src/Avalonia.Input/ApiCompatBaseline.txt b/src/Avalonia.Input/ApiCompatBaseline.txt
deleted file mode 100644
index 270c5305e5..0000000000
--- a/src/Avalonia.Input/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Compat issues with assembly Avalonia.Input:
-MembersMustExist : Member 'public Avalonia.Platform.IPlatformHandle Avalonia.Input.Cursor.PlatformCursor.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.Gestures.DoubleTappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.Gestures.RightTappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.Gestures.TappedEvent' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Input.IFocusManager.RemoveFocusScope(Avalonia.Input.IFocusScope)' is present in the implementation but not in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.InputElement.DoubleTappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.InputElement.TappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.add_DoubleTapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.add_Tapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.remove_DoubleTapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.remove_Tapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Platform.IStandardCursorFactory' does not exist in the implementation but it does exist in the contract.
-Total Issues: 12
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
deleted file mode 100644
index e66d1d7e7c..0000000000
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>  
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Input/Cursor.cs b/src/Avalonia.Input/Cursor.cs
deleted file mode 100644
index 122838f682..0000000000
--- a/src/Avalonia.Input/Cursor.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-
-#nullable enable
-
-namespace Avalonia.Input
-{
-    public enum StandardCursorType
-    {
-        Arrow,
-        Ibeam,
-        Wait,
-        Cross,
-        UpArrow,
-        SizeWestEast,
-        SizeNorthSouth,
-        SizeAll,
-        No,
-        Hand,
-        AppStarting,
-        Help,
-        TopSide,
-        BottomSide,
-        LeftSide,
-        RightSide,
-        TopLeftCorner,
-        TopRightCorner,
-        BottomLeftCorner,
-        BottomRightCorner,
-        DragMove,
-        DragCopy,
-        DragLink,
-        None,
-
-        [Obsolete("Use BottomSide")]
-        BottomSize = BottomSide
-
-        // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/ 
-        // We might enable them later, preferably, by loading pixmax directly from theme with fallback image
-        // SizeNorthWestSouthEast,
-        // SizeNorthEastSouthWest,
-    }
-
-    public class Cursor : IDisposable
-    {
-        public static readonly Cursor Default = new Cursor(StandardCursorType.Arrow);
-
-        internal Cursor(ICursorImpl platformImpl)
-        {
-            PlatformImpl = platformImpl;
-        }
-
-        public Cursor(StandardCursorType cursorType)
-            : this(GetCursorFactory().GetCursor(cursorType))
-        {
-        }
-
-        public Cursor(IBitmap cursor, PixelPoint hotSpot)
-            : this(GetCursorFactory().CreateCursor(cursor.PlatformImpl.Item, hotSpot))
-        {
-        }
-
-        public ICursorImpl PlatformImpl { get; }
-
-        public void Dispose() => PlatformImpl.Dispose();
-
-        public static Cursor Parse(string s)
-        {
-            return Enum.TryParse<StandardCursorType>(s, true, out var t) ?
-                new Cursor(t) :
-                throw new ArgumentException($"Unrecognized cursor type '{s}'.");
-        }
-
-        private static ICursorFactory GetCursorFactory()
-        {
-            return AvaloniaLocator.Current.GetService<ICursorFactory>() ??
-                throw new Exception("Could not create Cursor: ICursorFactory not registered.");
-        }
-    }
-}
diff --git a/src/Avalonia.Input/DragDrop.cs b/src/Avalonia.Input/DragDrop.cs
deleted file mode 100644
index 723d577964..0000000000
--- a/src/Avalonia.Input/DragDrop.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Input.Platform;
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input
-{
-    public static class DragDrop
-    {
-        /// <summary>
-        /// Event which is raised, when a drag-and-drop operation enters the element.
-        /// </summary>
-        public static readonly RoutedEvent<DragEventArgs> DragEnterEvent = RoutedEvent.Register<DragEventArgs>("DragEnter", RoutingStrategies.Bubble, typeof(DragDrop));
-        /// <summary>
-        /// Event which is raised, when a drag-and-drop operation leaves the element.
-        /// </summary>
-        public static readonly RoutedEvent<RoutedEventArgs> DragLeaveEvent = RoutedEvent.Register<RoutedEventArgs>("DragLeave", RoutingStrategies.Bubble, typeof(DragDrop));
-        /// <summary>
-        /// Event which is raised, when a drag-and-drop operation is updated while over the element.
-        /// </summary>
-        public static readonly RoutedEvent<DragEventArgs> DragOverEvent = RoutedEvent.Register<DragEventArgs>("DragOver", RoutingStrategies.Bubble, typeof(DragDrop));
-        /// <summary>
-        /// Event which is raised, when a drag-and-drop operation should complete over the element.
-        /// </summary>
-        public static readonly RoutedEvent<DragEventArgs> DropEvent = RoutedEvent.Register<DragEventArgs>("Drop", RoutingStrategies.Bubble, typeof(DragDrop));
-
-        public static readonly AttachedProperty<bool> AllowDropProperty = AvaloniaProperty.RegisterAttached<Interactive, bool>("AllowDrop", typeof(DragDrop), inherits: true);
-
-        /// <summary>
-        /// Gets a value indicating whether the given element can be used as the target of a drag-and-drop operation. 
-        /// </summary>
-        public static bool GetAllowDrop(Interactive interactive)
-        {
-            return interactive.GetValue(AllowDropProperty);
-        }
-
-        /// <summary>
-        /// Sets a value indicating whether the given interactive can be used as the target of a drag-and-drop operation. 
-        /// </summary>
-        public static void SetAllowDrop(Interactive interactive, bool value)
-        {
-            interactive.SetValue(AllowDropProperty, value);
-        }
-
-        /// <summary>
-        /// Starts a dragging operation with the given <see cref="IDataObject"/> and returns the applied drop effect from the target.
-        /// <seealso cref="DataObject"/>
-        /// </summary>
-        public static Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects)
-        {
-            var src = AvaloniaLocator.Current.GetService<IPlatformDragSource>();
-            return src?.DoDragDrop(triggerEvent, data, allowedEffects) ?? Task.FromResult(DragDropEffects.None);
-        }
-    }
-}
diff --git a/src/Avalonia.Input/DragDropDevice.cs b/src/Avalonia.Input/DragDropDevice.cs
deleted file mode 100644
index 30a08eda17..0000000000
--- a/src/Avalonia.Input/DragDropDevice.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-using System.Linq;
-using Avalonia.Input.Raw;
-
-namespace Avalonia.Input
-{
-    public class DragDropDevice : IDragDropDevice
-    {
-        public static readonly DragDropDevice Instance = new DragDropDevice();
-        
-        private Interactive? _lastTarget = null;
-        
-        private Interactive? GetTarget(IInputRoot root, Point local)
-        {
-            var target = root.InputHitTest(local)?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
-            if (target != null && DragDrop.GetAllowDrop(target))
-                return target;
-            return null;
-        }
-        
-        private DragDropEffects RaiseDragEvent(Interactive? target, IInputRoot inputRoot, Point point, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data, KeyModifiers modifiers)
-        {
-            if (target == null)
-                return DragDropEffects.None;
-
-            var p = inputRoot.TranslatePoint(point, target);
-
-            if (!p.HasValue)
-                return DragDropEffects.None;
-
-            var args = new DragEventArgs(routedEvent, data, target, p.Value, modifiers)
-            {
-                RoutedEvent = routedEvent,
-                DragEffects = operation
-            };
-            target.RaiseEvent(args);
-            return args.DragEffects;
-        }
-        
-        private DragDropEffects DragEnter(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
-        {
-            _lastTarget = GetTarget(inputRoot, point);
-            return RaiseDragEvent(_lastTarget, inputRoot, point, DragDrop.DragEnterEvent, effects, data, modifiers);
-        }
-
-        private DragDropEffects DragOver(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
-        {
-            var target = GetTarget(inputRoot, point);
-
-            if (target == _lastTarget)
-                return RaiseDragEvent(target, inputRoot, point, DragDrop.DragOverEvent, effects, data, modifiers);
-            
-            try
-            {
-                if (_lastTarget != null)
-                    _lastTarget.RaiseEvent(new RoutedEventArgs(DragDrop.DragLeaveEvent));
-                return RaiseDragEvent(target, inputRoot, point, DragDrop.DragEnterEvent, effects, data, modifiers);
-            }
-            finally
-            {
-                _lastTarget = target;
-            }            
-        }
-
-        private void DragLeave(IInputElement inputRoot)
-        {
-            if (_lastTarget == null)
-                return;
-            try
-            {
-                _lastTarget.RaiseEvent(new RoutedEventArgs(DragDrop.DragLeaveEvent));
-            }
-            finally 
-            {
-                _lastTarget = null;
-            }
-        }
-
-        private DragDropEffects Drop(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
-        {
-            try
-            {
-                return RaiseDragEvent(_lastTarget, inputRoot, point, DragDrop.DropEvent, effects, data, modifiers);
-            }
-            finally 
-            {
-                _lastTarget = null;
-            }
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs e)
-        {
-            if (!e.Handled && e is RawDragEvent margs)
-                ProcessRawEvent(margs);
-        }
-
-        private void ProcessRawEvent(RawDragEvent e)
-        {
-            switch (e.Type)
-            {
-                case RawDragEventType.DragEnter:
-                    e.Effects = DragEnter(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
-                    break;
-                case RawDragEventType.DragOver:
-                    e.Effects = DragOver(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
-                    break;
-                case RawDragEventType.DragLeave:
-                    DragLeave(e.Root);
-                    break;
-                case RawDragEventType.Drop:
-                    e.Effects = Drop(e.Root, e.Location, e.Data, e.Effects, e.KeyModifiers);
-                    break;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/DragEventArgs.cs b/src/Avalonia.Input/DragEventArgs.cs
deleted file mode 100644
index 22ca8358ff..0000000000
--- a/src/Avalonia.Input/DragEventArgs.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class DragEventArgs : RoutedEventArgs
-    {
-        private Interactive _target;
-        private Point _targetLocation;
-
-        public DragDropEffects DragEffects { get; set; }
-
-        public IDataObject Data { get; private set; }
-
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers { get; private set; }
-
-        public KeyModifiers KeyModifiers { get; private set; }
-
-        public Point GetPosition(IVisual relativeTo)
-        {
-            var point = new Point(0, 0);
-
-            if (relativeTo == null)
-            {
-                throw new ArgumentNullException(nameof(relativeTo));
-            }
-
-            if (_target != null)
-            {
-                point = _target.TranslatePoint(_targetLocation, relativeTo) ?? point;
-            }
-
-            return point;
-        }
-
-        [Obsolete("Use constructor taking KeyModifiers")]
-        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, InputModifiers modifiers)
-            : base(routedEvent)
-        {
-            Data = data;
-            _target = target;
-            _targetLocation = targetLocation;
-            Modifiers = modifiers;
-            KeyModifiers = (KeyModifiers)(((int)modifiers) & 0xF);
-        }
-
-        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
-            : base(routedEvent)
-        {
-            Data = data;
-            _target = target;
-            _targetLocation = targetLocation;
-            KeyModifiers = keyModifiers;
-#pragma warning disable CS0618 // Type or member is obsolete
-            Modifiers = (InputModifiers)keyModifiers;
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-
-    }
-}
diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs
deleted file mode 100644
index 30301788bc..0000000000
--- a/src/Avalonia.Input/FocusManager.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Manages focus for the application.
-    /// </summary>
-    public class FocusManager : IFocusManager
-    {
-        /// <summary>
-        /// The focus scopes in which the focus is currently defined.
-        /// </summary>
-        private readonly ConditionalWeakTable<IFocusScope, IInputElement?> _focusScopes =
-            new ConditionalWeakTable<IFocusScope, IInputElement?>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FocusManager"/> class.
-        /// </summary>
-        static FocusManager()
-        {
-            InputElement.PointerPressedEvent.AddClassHandler(
-                typeof(IInputElement),
-                new EventHandler<RoutedEventArgs>(OnPreviewPointerPressed),
-                RoutingStrategies.Tunnel);
-        }
-
-        /// <summary>
-        /// Gets the instance of the <see cref="IFocusManager"/>.
-        /// </summary>
-        public static IFocusManager? Instance => AvaloniaLocator.Current.GetService<IFocusManager>();
-
-        /// <summary>
-        /// Gets the currently focused <see cref="IInputElement"/>.
-        /// </summary>
-        public IInputElement? Current => KeyboardDevice.Instance?.FocusedElement;
-
-        /// <summary>
-        /// Gets the current focus scope.
-        /// </summary>
-        public IFocusScope? Scope
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Focuses a control.
-        /// </summary>
-        /// <param name="control">The control to focus.</param>
-        /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        public void Focus(
-            IInputElement? control, 
-            NavigationMethod method = NavigationMethod.Unspecified,
-            KeyModifiers keyModifiers = KeyModifiers.None)
-        {
-            if (control != null)
-            {
-                var scope = GetFocusScopeAncestors(control)
-                    .FirstOrDefault();
-
-                if (scope != null)
-                {
-                    Scope = scope;
-                    SetFocusedElement(scope, control, method, keyModifiers);
-                }
-            }
-            else if (Current != null)
-            {
-                // If control is null, set focus to the topmost focus scope.
-                foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToList())
-                {
-                    if (scope != Scope &&
-                        _focusScopes.TryGetValue(scope, out var element) &&
-                        element != null)
-                    {
-                        Focus(element, method);
-                        return;
-                    }
-                }
-
-                if (Scope is object)
-                {
-                    // Couldn't find a focus scope, clear focus.
-                    SetFocusedElement(Scope, null);
-                }
-            }
-        }
-
-        public IInputElement? GetFocusedElement(IInputElement e)
-        {
-            if (e is IFocusScope scope)
-            {
-                _focusScopes.TryGetValue(scope, out var result);
-                return result;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Sets the currently focused element in the specified scope.
-        /// </summary>
-        /// <param name="scope">The focus scope.</param>
-        /// <param name="element">The element to focus. May be null.</param>
-        /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        /// <remarks>
-        /// If the specified scope is the current <see cref="Scope"/> then the keyboard focus
-        /// will change.
-        /// </remarks>
-        public void SetFocusedElement(
-            IFocusScope scope,
-            IInputElement? element,
-            NavigationMethod method = NavigationMethod.Unspecified,
-            KeyModifiers keyModifiers = KeyModifiers.None)
-        {
-            scope = scope ?? throw new ArgumentNullException(nameof(scope));
-
-            if (_focusScopes.TryGetValue(scope, out var existingElement))
-            {
-                if (element != existingElement)
-                {
-                    _focusScopes.Remove(scope);
-                    _focusScopes.Add(scope, element);
-                }
-            }
-            else
-            {
-                _focusScopes.Add(scope, element);
-            }
-
-            if (Scope == scope)
-            {
-                KeyboardDevice.Instance?.SetFocusedElement(element, method, keyModifiers);
-            }
-        }
-
-        /// <summary>
-        /// Notifies the focus manager of a change in focus scope.
-        /// </summary>
-        /// <param name="scope">The new focus scope.</param>
-        public void SetFocusScope(IFocusScope scope)
-        {
-            scope = scope ?? throw new ArgumentNullException(nameof(scope));
-
-            if (!_focusScopes.TryGetValue(scope, out var e))
-            {
-                // TODO: Make this do something useful, i.e. select the first focusable
-                // control, select a control that the user has specified to have default
-                // focus etc.
-                e = scope as IInputElement;
-                _focusScopes.Add(scope, e);
-            }
-
-            Scope = scope;
-            Focus(e);
-        }
-
-        public void RemoveFocusScope(IFocusScope scope)
-        {
-            scope = scope ?? throw new ArgumentNullException(nameof(scope));
-            
-            if (_focusScopes.TryGetValue(scope, out _))
-            {
-                SetFocusedElement(scope, null);
-                _focusScopes.Remove(scope);
-            }
-
-            if (Scope == scope)
-            {
-                Scope = null;
-            }
-        }
-
-        public static bool GetIsFocusScope(IInputElement e) => e is IFocusScope;
-
-        /// <summary>
-        /// Checks if the specified element can be focused.
-        /// </summary>
-        /// <param name="e">The element.</param>
-        /// <returns>True if the element can be focused.</returns>
-        private static bool CanFocus(IInputElement e) => e.Focusable && e.IsEffectivelyEnabled && e.IsVisible;
-
-        /// <summary>
-        /// Gets the focus scope ancestors of the specified control, traversing popups.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The focus scopes.</returns>
-        private static IEnumerable<IFocusScope> GetFocusScopeAncestors(IInputElement control)
-        {
-            IInputElement? c = control;
-
-            while (c != null)
-            {
-                var scope = c as IFocusScope;
-
-                if (scope != null && c.VisualRoot?.IsVisible == true)
-                {
-                    yield return scope;
-                }
-
-                c = c.GetVisualParent<IInputElement>() ??
-                    ((c as IHostedVisualTreeRoot)?.Host as IInputElement);
-            }
-        }
-
-        /// <summary>
-        /// Global handler for pointer pressed events.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="e">The event args.</param>
-        private static void OnPreviewPointerPressed(object? sender, RoutedEventArgs e)
-        {
-            if (sender is null)
-                return;
-
-            var ev = (PointerPressedEventArgs)e;
-            var visual = (IVisual)sender;
-
-            if (sender == e.Source && ev.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
-            {
-                IVisual? element = ev.Pointer?.Captured ?? e.Source as IInputElement;
-
-                while (element != null)
-                {
-                    if (element is IInputElement inputElement && CanFocus(inputElement))
-                    {
-                        Instance?.Focus(inputElement, NavigationMethod.Pointer, ev.KeyModifiers);
-
-                        break;
-                    }
-                    
-                    element = element.VisualParent;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
deleted file mode 100644
index f8cedb636f..0000000000
--- a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Diagnostics;
-using Avalonia.Threading;
-
-namespace Avalonia.Input.GestureRecognizers
-{
-    public class ScrollGestureRecognizer 
-        : StyledElement, // It's not an "element" in any way, shape or form, but TemplateBinding refuse to work otherwise
-            IGestureRecognizer
-    {
-        private bool _scrolling;
-        private Point _trackedRootPoint;
-        private IPointer? _tracking;
-        private IInputElement? _target;
-        private IGestureRecognizerActionsDispatcher? _actions;
-        private bool _canHorizontallyScroll;
-        private bool _canVerticallyScroll;
-        private int _gestureId;
-        
-        // Movement per second
-        private Vector _inertia;
-        private ulong? _lastMoveTimestamp;
-        
-        /// <summary>
-        /// Defines the <see cref="CanHorizontallyScroll"/> property.
-        /// </summary>
-        public static readonly DirectProperty<ScrollGestureRecognizer, bool> CanHorizontallyScrollProperty =
-            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(
-                nameof(CanHorizontallyScroll),
-                o => o.CanHorizontallyScroll,
-                (o, v) => o.CanHorizontallyScroll = v);
-
-        /// <summary>
-        /// Defines the <see cref="CanVerticallyScroll"/> property.
-        /// </summary>
-        public static readonly DirectProperty<ScrollGestureRecognizer, bool> CanVerticallyScrollProperty =
-            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(
-                nameof(CanVerticallyScroll),
-                o => o.CanVerticallyScroll,
-                (o, v) => o.CanVerticallyScroll = v);
-        
-        /// <summary>
-        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
-        /// </summary>
-        public bool CanHorizontallyScroll
-        {
-            get => _canHorizontallyScroll;
-            set => SetAndRaise(CanHorizontallyScrollProperty, ref _canHorizontallyScroll, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
-        /// </summary>
-        public bool CanVerticallyScroll
-        {
-            get => _canVerticallyScroll;
-            set => SetAndRaise(CanVerticallyScrollProperty, ref _canVerticallyScroll, value);
-        }
-        
-
-        public void Initialize(IInputElement target, IGestureRecognizerActionsDispatcher actions)
-        {
-            _target = target;
-            _actions = actions;
-        }
-        
-        public void PointerPressed(PointerPressedEventArgs e)
-        {
-            if (e.Pointer.IsPrimary && e.Pointer.Type == PointerType.Touch)
-            {
-                EndGesture();
-                _tracking = e.Pointer;
-                _gestureId = ScrollGestureEventArgs.GetNextFreeId();;
-                _trackedRootPoint = e.GetPosition(_target);
-            }
-        }
-
-        // Arbitrary chosen value, probably need to move that to platform settings or something
-        private const double ScrollStartDistance = 30;
-        
-        // Pixels per second speed that is considered to be the stop of inertial scroll
-        private const double InertialScrollSpeedEnd = 5;
-        
-        public void PointerMoved(PointerEventArgs e)
-        {
-            if (e.Pointer == _tracking)
-            {
-                var rootPoint = e.GetPosition(_target);
-                if (!_scrolling)
-                {
-                    if (CanHorizontallyScroll && Math.Abs(_trackedRootPoint.X - rootPoint.X) > ScrollStartDistance)
-                        _scrolling = true;
-                    if (CanVerticallyScroll && Math.Abs(_trackedRootPoint.Y - rootPoint.Y) > ScrollStartDistance)
-                        _scrolling = true;
-                    if (_scrolling)
-                    {
-                        _actions!.Capture(e.Pointer, this);
-                    }
-                }
-
-                if (_scrolling)
-                {
-                    var vector = _trackedRootPoint - rootPoint;
-                    var elapsed = _lastMoveTimestamp.HasValue ?
-                        TimeSpan.FromMilliseconds(e.Timestamp - _lastMoveTimestamp.Value) :
-                        TimeSpan.Zero;
-                    
-                    _lastMoveTimestamp = e.Timestamp;
-                    _trackedRootPoint = rootPoint;
-                    if (elapsed.TotalSeconds > 0)
-                        _inertia = vector / elapsed.TotalSeconds;
-                    _target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, vector));
-                    e.Handled = true;
-                }
-            }
-        }
-
-        public void PointerCaptureLost(IPointer pointer)
-        {
-            if (pointer == _tracking) EndGesture();
-        }
-
-        void EndGesture()
-        {
-            _tracking = null;
-            if (_scrolling)
-            {
-                _inertia = default;
-                _scrolling = false;
-                _target!.RaiseEvent(new ScrollGestureEndedEventArgs(_gestureId));
-                _gestureId = 0;
-                _lastMoveTimestamp = null;
-            }
-            
-        }
-        
-        
-        public void PointerReleased(PointerReleasedEventArgs e)
-        {
-            if (e.Pointer == _tracking && _scrolling)
-            {
-                e.Handled = true;
-                if (_inertia == default
-                    || e.Timestamp == 0
-                    || _lastMoveTimestamp == 0
-                    || e.Timestamp - _lastMoveTimestamp > 200)
-                    EndGesture();
-                else
-                {
-                    _tracking = null;
-                    var savedGestureId = _gestureId;
-                    var st = Stopwatch.StartNew();
-                    var lastTime = TimeSpan.Zero;
-                    DispatcherTimer.Run(() =>
-                    {
-                        // Another gesture has started, finish the current one
-                        if (_gestureId != savedGestureId)
-                        {
-                            return false;
-                        }
-
-                        var elapsedSinceLastTick = st.Elapsed - lastTime;
-                        lastTime = st.Elapsed;
-
-                        var speed = _inertia * Math.Pow(0.15, st.Elapsed.TotalSeconds);
-                        var distance = speed * elapsedSinceLastTick.TotalSeconds;
-                        _target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, distance));
-
-
-
-                        if (Math.Abs(speed.X) < InertialScrollSpeedEnd || Math.Abs(speed.Y) <= InertialScrollSpeedEnd)
-                        {
-                            EndGesture();
-                            return false;
-                        }
-
-                        return true;
-                    }, TimeSpan.FromMilliseconds(16), DispatcherPriority.Background);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Gestures.cs b/src/Avalonia.Input/Gestures.cs
deleted file mode 100644
index 86e6e96a71..0000000000
--- a/src/Avalonia.Input/Gestures.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public static class Gestures
-    {
-        private static bool s_isDoubleTapped = false;
-        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = RoutedEvent.Register<TappedEventArgs>(
-            "Tapped",
-            RoutingStrategies.Bubble,
-            typeof(Gestures));
-
-        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = RoutedEvent.Register<TappedEventArgs>(
-            "DoubleTapped",
-            RoutingStrategies.Bubble,
-            typeof(Gestures));
-
-        public static readonly RoutedEvent<TappedEventArgs> RightTappedEvent = RoutedEvent.Register<TappedEventArgs>(
-            "RightTapped",
-            RoutingStrategies.Bubble,
-            typeof(Gestures));
-
-        public static readonly RoutedEvent<ScrollGestureEventArgs> ScrollGestureEvent =
-            RoutedEvent.Register<ScrollGestureEventArgs>(
-                "ScrollGesture", RoutingStrategies.Bubble, typeof(Gestures));
-
-        public static readonly RoutedEvent<ScrollGestureEventArgs> ScrollGestureEndedEvent =
-            RoutedEvent.Register<ScrollGestureEventArgs>(
-                "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
-        
-        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureMagnifyEvent =
-            RoutedEvent.Register<PointerDeltaEventArgs>(
-                "PointerMagnifyGesture", RoutingStrategies.Bubble, typeof(Gestures));
-        
-        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureRotateEvent =
-            RoutedEvent.Register<PointerDeltaEventArgs>(
-                "PointerRotateGesture", RoutingStrategies.Bubble, typeof(Gestures));
-        
-        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureSwipeEvent =
-            RoutedEvent.Register<PointerDeltaEventArgs>(
-                "PointerSwipeGesture", RoutingStrategies.Bubble, typeof(Gestures));
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-        private static readonly WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-
-        static Gestures()
-        {
-            InputElement.PointerPressedEvent.RouteFinished.Subscribe(PointerPressed);
-            InputElement.PointerReleasedEvent.RouteFinished.Subscribe(PointerReleased);
-        }
-
-        public static void AddTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.AddHandler(TappedEvent, handler);
-        }
-
-        public static void AddDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.AddHandler(DoubleTappedEvent, handler);
-        }
-
-        public static void AddRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.AddHandler(RightTappedEvent, handler);
-        }
-
-        public static void RemoveTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.RemoveHandler(TappedEvent, handler);
-        }
-
-        public static void RemoveDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.RemoveHandler(DoubleTappedEvent, handler);
-        }
-
-        public static void RemoveRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.RemoveHandler(RightTappedEvent, handler);
-        }
-
-        private static void PointerPressed(RoutedEventArgs ev)
-        {
-            if (ev.Source is null)
-            {
-                return;
-            }
-
-            if (ev.Route == RoutingStrategies.Bubble)
-            {
-                var e = (PointerPressedEventArgs)ev;
-                var visual = (IVisual)ev.Source;
-
-                if (e.ClickCount <= 1)
-                {
-                    s_isDoubleTapped = false;
-                    s_lastPress.SetTarget(ev.Source);
-                }
-                else if (e.ClickCount % 2 == 0 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
-                {
-                    if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
-                    {
-                        s_isDoubleTapped = true;
-                        e.Source.RaiseEvent(new TappedEventArgs(DoubleTappedEvent, e));
-                    }
-                }
-                else
-                {
-                    s_isDoubleTapped = false;
-                }
-            }
-        }
-
-        private static void PointerReleased(RoutedEventArgs ev)
-        {
-            if (ev.Route == RoutingStrategies.Bubble)
-            {
-                var e = (PointerReleasedEventArgs)ev;
-
-                if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
-                {
-                    if (e.InitialPressMouseButton == MouseButton.Left || e.InitialPressMouseButton == MouseButton.Right)
-                    {
-                        if (e.InitialPressMouseButton == MouseButton.Right)
-                        {
-                            e.Source.RaiseEvent(new TappedEventArgs(RightTappedEvent, e));
-                        }
-                        //s_isDoubleTapped needed here to prevent invoking Tapped event when DoubleTapped is called.
-                        //This behaviour matches UWP behaviour.
-                        else if (s_isDoubleTapped == false)
-                        {
-                            e.Source.RaiseEvent(new TappedEventArgs(TappedEvent, e));
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/GotFocusEventArgs.cs b/src/Avalonia.Input/GotFocusEventArgs.cs
deleted file mode 100644
index 9d958823fe..0000000000
--- a/src/Avalonia.Input/GotFocusEventArgs.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Holds arguments for a <see cref="InputElement.GotFocusEvent"/>.
-    /// </summary>
-    public class GotFocusEventArgs : RoutedEventArgs
-    {
-        /// <summary>
-        /// Gets or sets a value indicating how the change in focus occurred.
-        /// </summary>
-        public NavigationMethod NavigationMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets any input modifiers active at the time of focus.
-        /// </summary>
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers InputModifiers
-        {
-            get => (InputModifiers)KeyModifiers;
-            set => KeyModifiers = (KeyModifiers)((int)value & 0xF);
-        }
-
-        /// <summary>
-        /// Gets or sets any key modifiers active at the time of focus.
-        /// </summary>
-        public KeyModifiers KeyModifiers { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/IAccessKeyHandler.cs b/src/Avalonia.Input/IAccessKeyHandler.cs
deleted file mode 100644
index e484d003c7..0000000000
--- a/src/Avalonia.Input/IAccessKeyHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for classes that handle access keys for a window.
-    /// </summary>
-    public interface IAccessKeyHandler
-    {
-        /// <summary>
-        /// Gets or sets the window's main menu.
-        /// </summary>
-        IMainMenu? MainMenu { get; set; }
-
-        /// <summary>
-        /// Sets the owner of the access key handler.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <remarks>
-        /// This method can only be called once, typically by the owner itself on creation.
-        /// </remarks>
-        void SetOwner(IInputRoot owner);
-
-        /// <summary>
-        /// Registers an input element to be associated with an access key.
-        /// </summary>
-        /// <param name="accessKey">The access key.</param>
-        /// <param name="element">The input element.</param>
-        void Register(char accessKey, IInputElement element);
-
-        /// <summary>
-        /// Unregisters the access keys associated with the input element.
-        /// </summary>
-        /// <param name="element">The input element.</param>
-        void Unregister(IInputElement element);
-    }
-}
diff --git a/src/Avalonia.Input/IFocusManager.cs b/src/Avalonia.Input/IFocusManager.cs
deleted file mode 100644
index 2510479a8e..0000000000
--- a/src/Avalonia.Input/IFocusManager.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Manages focus for the application.
-    /// </summary>
-    public interface IFocusManager
-    {
-        /// <summary>
-        /// Gets the currently focused <see cref="IInputElement"/>.
-        /// </summary>
-        IInputElement? Current { get; }
-
-        /// <summary>
-        /// Gets the current focus scope.
-        /// </summary>
-        IFocusScope? Scope { get; }
-
-        /// <summary>
-        /// Focuses a control.
-        /// </summary>
-        /// <param name="control">The control to focus.</param>
-        /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        void Focus(
-            IInputElement? control,
-            NavigationMethod method = NavigationMethod.Unspecified,
-            KeyModifiers keyModifiers = KeyModifiers.None);
-
-        /// <summary>
-        /// Notifies the focus manager of a change in focus scope.
-        /// </summary>
-        /// <param name="scope">The new focus scope.</param>
-        /// <remarks>
-        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
-        /// when it activates, e.g. when a Window is activated.
-        /// </remarks>
-        void SetFocusScope(IFocusScope scope);
-
-        /// <summary>
-        /// Notifies the focus manager that a focus scope has been removed.
-        /// </summary>
-        /// <param name="scope">The focus scope to be removed.</param>
-        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
-        /// when it deactivates or closes, e.g. when a Window is closed.
-        void RemoveFocusScope(IFocusScope scope);
-    }
-}
diff --git a/src/Avalonia.Input/IInputDevice.cs b/src/Avalonia.Input/IInputDevice.cs
deleted file mode 100644
index ab0fae65df..0000000000
--- a/src/Avalonia.Input/IInputDevice.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia.Input.Raw;
-
-namespace Avalonia.Input
-{
-    public interface IInputDevice
-    {
-        /// <summary>
-        /// Processes raw event. Is called after preprocessing by InputManager
-        /// </summary>
-        /// <param name="ev"></param>
-        void ProcessRawEvent(RawInputEventArgs ev);
-    }
-}
diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs
deleted file mode 100644
index d1552a3a2a..0000000000
--- a/src/Avalonia.Input/IInputElement.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines input-related functionality for a control.
-    /// </summary>
-    public interface IInputElement : IInteractive, IVisual
-    {
-        /// <summary>
-        /// Occurs when the control receives focus.
-        /// </summary>
-        event EventHandler<GotFocusEventArgs>? GotFocus;
-
-        /// <summary>
-        /// Occurs when the control loses focus.
-        /// </summary>
-        event EventHandler<RoutedEventArgs>? LostFocus;
-
-        /// <summary>
-        /// Occurs when a key is pressed while the control has focus.
-        /// </summary>
-        event EventHandler<KeyEventArgs>? KeyDown;
-
-        /// <summary>
-        /// Occurs when a key is released while the control has focus.
-        /// </summary>
-        event EventHandler<KeyEventArgs>? KeyUp;
-
-        /// <summary>
-        /// Occurs when a user typed some text while the control has focus.
-        /// </summary>
-        event EventHandler<TextInputEventArgs>? TextInput;
-
-        /// <summary>
-        /// Occurs when the pointer enters the control.
-        /// </summary>
-        event EventHandler<PointerEventArgs>? PointerEnter;
-
-        /// <summary>
-        /// Occurs when the pointer leaves the control.
-        /// </summary>
-        event EventHandler<PointerEventArgs>? PointerLeave;
-
-        /// <summary>
-        /// Occurs when the pointer is pressed over the control.
-        /// </summary>
-        event EventHandler<PointerPressedEventArgs>? PointerPressed;
-
-        /// <summary>
-        /// Occurs when the pointer moves over the control.
-        /// </summary>
-        event EventHandler<PointerEventArgs>? PointerMoved;
-
-        /// <summary>
-        /// Occurs when the pointer is released over the control.
-        /// </summary>
-        event EventHandler<PointerReleasedEventArgs>? PointerReleased;
-
-        /// <summary>
-        /// Occurs when the mouse wheel is scrolled over the control.
-        /// </summary>
-        event EventHandler<PointerWheelEventArgs>? PointerWheelChanged;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control can receive keyboard focus.
-        /// </summary>
-        bool Focusable { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control is enabled for user interaction.
-        /// </summary>
-        bool IsEnabled { get; }
-
-        /// <summary>
-        /// Gets or sets the associated mouse cursor.
-        /// </summary>
-        Cursor? Cursor { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this control and all its parents are enabled.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="IsEnabled"/> property is used to toggle the enabled state for individual
-        /// controls. The <see cref="IsEffectivelyEnabled"/> property takes into account the
-        /// <see cref="IsEnabled"/> value of this control and its parent controls.
-        /// </remarks>
-        bool IsEffectivelyEnabled { get; }
-        
-        /// <summary>
-        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
-        /// </summary>
-        bool IsKeyboardFocusWithin { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control is focused.
-        /// </summary>
-        bool IsFocused { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control is considered for hit testing.
-        /// </summary>
-        bool IsHitTestVisible { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the pointer is currently over the control.
-        /// </summary>
-        bool IsPointerOver { get; }
-
-        /// <summary>
-        /// Focuses the control.
-        /// </summary>
-        void Focus();
-
-        /// <summary>
-        /// Gets the key bindings for the element.
-        /// </summary>
-        List<KeyBinding> KeyBindings { get; }
-    }
-}
diff --git a/src/Avalonia.Input/IInputManager.cs b/src/Avalonia.Input/IInputManager.cs
deleted file mode 100644
index 80b71d3e47..0000000000
--- a/src/Avalonia.Input/IInputManager.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Avalonia.Input.Raw;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Receives input from the windowing subsystem and dispatches it to interested parties
-    /// for processing.
-    /// </summary>
-    public interface IInputManager
-    {
-        /// <summary>
-        /// Gets an observable that notifies on each input event received before
-        /// <see cref="Process"/>.
-        /// </summary>
-        IObservable<RawInputEventArgs> PreProcess { get; }
-
-        /// <summary>
-        /// Gets an observable that notifies on each input event received.
-        /// </summary>
-        IObservable<RawInputEventArgs> Process { get; }
-
-        /// <summary>
-        /// Gets an observable that notifies on each input event received after
-        /// <see cref="Process"/>.
-        /// </summary>
-        IObservable<RawInputEventArgs> PostProcess { get; }
-
-        /// <summary>
-        /// Processes a raw input event.
-        /// </summary>
-        /// <param name="e">The raw input event.</param>
-        void ProcessInput(RawInputEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Input/IInputRoot.cs b/src/Avalonia.Input/IInputRoot.cs
deleted file mode 100644
index 3e2b8cc477..0000000000
--- a/src/Avalonia.Input/IInputRoot.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using JetBrains.Annotations;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for top-level input elements.
-    /// </summary>
-    public interface IInputRoot : IInputElement
-    {
-        /// <summary>
-        /// Gets or sets the access key handler.
-        /// </summary>
-        IAccessKeyHandler AccessKeyHandler { get; }
-
-        /// <summary>
-        /// Gets or sets the keyboard navigation handler.
-        /// </summary>
-        IKeyboardNavigationHandler KeyboardNavigationHandler { get; }
-
-        /// <summary>
-        /// Gets or sets the input element that the pointer is currently over.
-        /// </summary>
-        IInputElement? PointerOverElement { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether access keys are shown in the window.
-        /// </summary>
-        bool ShowAccessKeys { get; set; }
-
-        /// <summary>
-        /// Gets associated mouse device
-        /// </summary>
-        [CanBeNull]
-        IMouseDevice? MouseDevice { get; }
-    }
-}
diff --git a/src/Avalonia.Input/IKeyboardDevice.cs b/src/Avalonia.Input/IKeyboardDevice.cs
deleted file mode 100644
index 9506dc36fb..0000000000
--- a/src/Avalonia.Input/IKeyboardDevice.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Avalonia.Input
-{
-    [Flags, Obsolete("Use KeyModifiers and PointerPointProperties")]
-    public enum InputModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Windows = 8,
-        LeftMouseButton = 16,
-        RightMouseButton = 32,
-        MiddleMouseButton = 64
-    }
-
-    [Flags]
-    public enum KeyModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Meta = 8,
-    }
-
-    [Flags]
-    public enum KeyStates
-    {
-        None = 0,
-        Down = 1,
-        Toggled = 2,
-    }
-
-    [Flags]
-    public enum RawInputModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Meta = 8,
-        LeftMouseButton = 16,
-        RightMouseButton = 32,
-        MiddleMouseButton = 64,
-        XButton1MouseButton = 128,
-        XButton2MouseButton = 256,
-        KeyboardMask = Alt | Control | Shift | Meta
-    }
-
-    internal static class KeyModifiersUtils
-    {
-        public static KeyModifiers ConvertToKey(RawInputModifiers modifiers) =>
-            (KeyModifiers)(modifiers & RawInputModifiers.KeyboardMask);
-    }
-
-    public interface IKeyboardDevice : IInputDevice, INotifyPropertyChanged
-    {
-        IInputElement? FocusedElement { get; }
-
-        void SetFocusedElement(
-            IInputElement? element, 
-            NavigationMethod method,
-            KeyModifiers modifiers);
-    }
-}
diff --git a/src/Avalonia.Input/IKeyboardNavigationHandler.cs b/src/Avalonia.Input/IKeyboardNavigationHandler.cs
deleted file mode 100644
index 88d00b3b50..0000000000
--- a/src/Avalonia.Input/IKeyboardNavigationHandler.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for classes that handle keyboard navigation for a window.
-    /// </summary>
-    public interface IKeyboardNavigationHandler
-    {
-        /// <summary>
-        /// Sets the owner of the keyboard navigation handler.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <remarks>
-        /// This method can only be called once, typically by the owner itself on creation.
-        /// </remarks>
-        void SetOwner(IInputRoot owner);
-
-        /// <summary>
-        /// Moves the focus in the specified direction.
-        /// </summary>
-        /// <param name="element">The current element.</param>
-        /// <param name="direction">The direction to move.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        void Move(
-            IInputElement element, 
-            NavigationDirection direction,
-            KeyModifiers keyModifiers = KeyModifiers.None);
-    }
-}
diff --git a/src/Avalonia.Input/IMainMenu.cs b/src/Avalonia.Input/IMainMenu.cs
deleted file mode 100644
index 67b58c0ffc..0000000000
--- a/src/Avalonia.Input/IMainMenu.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for a window's main menu.
-    /// </summary>
-    public interface IMainMenu : IVisual
-    {
-        /// <summary>
-        /// Gets a value indicating whether the menu is open.
-        /// </summary>
-        bool IsOpen { get; }
-
-        /// <summary>
-        /// Closes the menu.
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// Opens the menu in response to the Alt/F10 key.
-        /// </summary>
-        void Open();
-
-        /// <summary>
-        /// Occurs when the main menu closes.
-        /// </summary>
-        event EventHandler<RoutedEventArgs>? MenuClosed;
-    }
-}
diff --git a/src/Avalonia.Input/IMouseDevice.cs b/src/Avalonia.Input/IMouseDevice.cs
deleted file mode 100644
index 272d1eb8d7..0000000000
--- a/src/Avalonia.Input/IMouseDevice.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Represents a mouse device.
-    /// </summary>
-    public interface IMouseDevice : IPointerDevice
-    {
-        /// <summary>
-        /// Gets the mouse position, in screen coordinates.
-        /// </summary>
-        [Obsolete("Use PointerEventArgs.GetPosition")]
-        PixelPoint Position { get; }
-
-        void TopLevelClosed(IInputRoot root);
-
-        void SceneInvalidated(IInputRoot root, Rect rect);
-    }
-}
diff --git a/src/Avalonia.Input/IPointer.cs b/src/Avalonia.Input/IPointer.cs
deleted file mode 100644
index 7af48cef82..0000000000
--- a/src/Avalonia.Input/IPointer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Input
-{
-    public interface IPointer
-    {
-        int Id { get; }
-        void Capture(IInputElement? control);
-        IInputElement? Captured { get; }
-        PointerType Type { get; }
-        bool IsPrimary { get; }
-        
-    }
-
-    public enum PointerType
-    {
-        Mouse,
-        Touch
-    }
-}
diff --git a/src/Avalonia.Input/IPointerDevice.cs b/src/Avalonia.Input/IPointerDevice.cs
deleted file mode 100644
index 1f82cb1ed7..0000000000
--- a/src/Avalonia.Input/IPointerDevice.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public interface IPointerDevice : IInputDevice
-    {
-        [Obsolete("Use IPointer")]
-        IInputElement? Captured { get; }
-        
-        [Obsolete("Use IPointer")]
-        void Capture(IInputElement? control);
-
-        [Obsolete("Use PointerEventArgs.GetPosition")]
-        Point GetPosition(IVisual relativeTo);
-    }
-}
diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs
deleted file mode 100644
index 5ec0bd6ee4..0000000000
--- a/src/Avalonia.Input/InputElement.cs
+++ /dev/null
@@ -1,710 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Metadata;
-using Avalonia.Data;
-using Avalonia.Input.GestureRecognizers;
-using Avalonia.Input.TextInput;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Implements input-related functionality for a control.
-    /// </summary>
-    [PseudoClasses(":disabled", ":focus", ":focus-visible", ":focus-within", ":pointerover")]
-    public class InputElement : Interactive, IInputElement
-    {
-        /// <summary>
-        /// Defines the <see cref="Focusable"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> FocusableProperty =
-            AvaloniaProperty.Register<InputElement, bool>(nameof(Focusable));
-
-        /// <summary>
-        /// Defines the <see cref="IsEnabled"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsEnabledProperty =
-            AvaloniaProperty.Register<InputElement, bool>(nameof(IsEnabled), true);
-
-        /// <summary>
-        /// Defines the <see cref="IsEffectivelyEnabled"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsEffectivelyEnabledProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(
-                nameof(IsEffectivelyEnabled),
-                o => o.IsEffectivelyEnabled);
-
-        /// <summary>
-        /// Gets or sets associated mouse cursor.
-        /// </summary>
-        public static readonly StyledProperty<Cursor?> CursorProperty =
-            AvaloniaProperty.Register<InputElement, Cursor?>(nameof(Cursor), null, true);
-
-        /// <summary>
-        /// Defines the <see cref="IsKeyboardFocusWithin"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsKeyboardFocusWithinProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(
-                nameof(IsKeyboardFocusWithin),
-                o => o.IsKeyboardFocusWithin);
-        
-        /// <summary>
-        /// Defines the <see cref="IsFocused"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsFocusedProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsFocused), o => o.IsFocused);
-
-        /// <summary>
-        /// Defines the <see cref="IsHitTestVisible"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsHitTestVisibleProperty =
-            AvaloniaProperty.Register<InputElement, bool>(nameof(IsHitTestVisible), true);
-
-        /// <summary>
-        /// Defines the <see cref="IsPointerOver"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsPointerOverProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsPointerOver), o => o.IsPointerOver);
-
-        /// <summary>
-        /// Defines the <see cref="IsTabStop"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsTabStopProperty =
-            KeyboardNavigation.IsTabStopProperty.AddOwner<InputElement>();
-
-        /// <summary>
-        /// Defines the <see cref="GotFocus"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<GotFocusEventArgs> GotFocusEvent =
-            RoutedEvent.Register<InputElement, GotFocusEventArgs>(nameof(GotFocus), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="LostFocus"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<RoutedEventArgs> LostFocusEvent =
-            RoutedEvent.Register<InputElement, RoutedEventArgs>(nameof(LostFocus), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="KeyDown"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<KeyEventArgs> KeyDownEvent =
-            RoutedEvent.Register<InputElement, KeyEventArgs>(
-                "KeyDown",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="KeyUp"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<KeyEventArgs> KeyUpEvent =
-            RoutedEvent.Register<InputElement, KeyEventArgs>(
-                "KeyUp",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="TabIndex"/> property.
-        /// </summary>
-        public static readonly StyledProperty<int> TabIndexProperty =
-            KeyboardNavigation.TabIndexProperty.AddOwner<InputElement>();
-
-        /// <summary>
-        /// Defines the <see cref="TextInput"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TextInputEventArgs> TextInputEvent =
-            RoutedEvent.Register<InputElement, TextInputEventArgs>(
-                "TextInput",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-        
-        /// <summary>
-        /// Defines the <see cref="TextInputMethodClientRequested"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TextInputMethodClientRequestedEventArgs> TextInputMethodClientRequestedEvent =
-            RoutedEvent.Register<InputElement, TextInputMethodClientRequestedEventArgs>(
-                "TextInputMethodClientRequested",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-        
-        /// <summary>
-        /// Defines the <see cref="TextInputOptionsQuery"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TextInputOptionsQueryEventArgs> TextInputOptionsQueryEvent =
-            RoutedEvent.Register<InputElement, TextInputOptionsQueryEventArgs>(
-                "TextInputOptionsQuery",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="PointerEnter"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerEnterEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnter), RoutingStrategies.Direct);
-
-        /// <summary>
-        /// Defines the <see cref="PointerLeave"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerLeaveEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeave), RoutingStrategies.Direct);
-
-        /// <summary>
-        /// Defines the <see cref="PointerMoved"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerMovedEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(
-                "PointerMove",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="PointerPressed"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent =
-            RoutedEvent.Register<InputElement, PointerPressedEventArgs>(
-                "PointerPressed",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="PointerReleased"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerReleasedEventArgs> PointerReleasedEvent =
-            RoutedEvent.Register<InputElement, PointerReleasedEventArgs>(
-                "PointerReleased",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-        
-        /// <summary>
-        /// Defines the <see cref="PointerCaptureLost"/> routed event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerCaptureLostEventArgs> PointerCaptureLostEvent =
-            RoutedEvent.Register<InputElement, PointerCaptureLostEventArgs>(
-                "PointerCaptureLost", 
-                RoutingStrategies.Direct);
-
-        /// <summary>
-        /// Defines the <see cref="PointerWheelChanged"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerWheelEventArgs> PointerWheelChangedEvent =
-            RoutedEvent.Register<InputElement, PointerWheelEventArgs>(
-                "PointerWheelChanged",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="Tapped"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = Gestures.TappedEvent;
-
-        /// <summary>
-        /// Defines the <see cref="DoubleTapped"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = Gestures.DoubleTappedEvent;
-        
-        private bool _isEffectivelyEnabled = true;
-        private bool _isFocused;
-        private bool _isKeyboardFocusWithin;
-        private bool _isFocusVisible;
-        private bool _isPointerOver;
-        private GestureRecognizerCollection? _gestureRecognizers;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="InputElement"/> class.
-        /// </summary>
-        static InputElement()
-        {
-            IsEnabledProperty.Changed.Subscribe(IsEnabledChanged);
-
-            GotFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnGotFocus(e));
-            LostFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnLostFocus(e));
-            KeyDownEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyDown(e));
-            KeyUpEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyUp(e));
-            TextInputEvent.AddClassHandler<InputElement>((x, e) => x.OnTextInput(e));
-            PointerEnterEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerEnterCore(e));
-            PointerLeaveEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerLeaveCore(e));
-            PointerMovedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerMoved(e));
-            PointerPressedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerPressed(e));
-            PointerReleasedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerReleased(e));
-            PointerCaptureLostEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerCaptureLost(e));
-            PointerWheelChangedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerWheelChanged(e));
-        }
-
-        public InputElement()
-        {
-            UpdatePseudoClasses(IsFocused, IsPointerOver);
-        }
-
-        /// <summary>
-        /// Occurs when the control receives focus.
-        /// </summary>
-        public event EventHandler<GotFocusEventArgs>? GotFocus
-        {
-            add { AddHandler(GotFocusEvent, value); }
-            remove { RemoveHandler(GotFocusEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the control loses focus.
-        /// </summary>
-        public event EventHandler<RoutedEventArgs>? LostFocus
-        {
-            add { AddHandler(LostFocusEvent, value); }
-            remove { RemoveHandler(LostFocusEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a key is pressed while the control has focus.
-        /// </summary>
-        public event EventHandler<KeyEventArgs>? KeyDown
-        {
-            add { AddHandler(KeyDownEvent, value); }
-            remove { RemoveHandler(KeyDownEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a key is released while the control has focus.
-        /// </summary>
-        public event EventHandler<KeyEventArgs>? KeyUp
-        {
-            add { AddHandler(KeyUpEvent, value); }
-            remove { RemoveHandler(KeyUpEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a user typed some text while the control has focus.
-        /// </summary>
-        public event EventHandler<TextInputEventArgs>? TextInput
-        {
-            add { AddHandler(TextInputEvent, value); }
-            remove { RemoveHandler(TextInputEvent, value); }
-        }
-        
-        /// <summary>
-        /// Occurs when an input element gains input focus and input method is looking for the corresponding client
-        /// </summary>
-        public event EventHandler<TextInputMethodClientRequestedEventArgs>? TextInputMethodClientRequested
-        {
-            add { AddHandler(TextInputMethodClientRequestedEvent, value); }
-            remove { RemoveHandler(TextInputMethodClientRequestedEvent, value); }
-        }
-        
-        /// <summary>
-        /// Occurs when an input element gains input focus and input method is asking for required content options
-        /// </summary>
-        public event EventHandler<TextInputOptionsQueryEventArgs>? TextInputOptionsQuery
-        {
-            add { AddHandler(TextInputOptionsQueryEvent, value); }
-            remove { RemoveHandler(TextInputOptionsQueryEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer enters the control.
-        /// </summary>
-        public event EventHandler<PointerEventArgs>? PointerEnter
-        {
-            add { AddHandler(PointerEnterEvent, value); }
-            remove { RemoveHandler(PointerEnterEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer leaves the control.
-        /// </summary>
-        public event EventHandler<PointerEventArgs>? PointerLeave
-        {
-            add { AddHandler(PointerLeaveEvent, value); }
-            remove { RemoveHandler(PointerLeaveEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer moves over the control.
-        /// </summary>
-        public event EventHandler<PointerEventArgs>? PointerMoved
-        {
-            add { AddHandler(PointerMovedEvent, value); }
-            remove { RemoveHandler(PointerMovedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer is pressed over the control.
-        /// </summary>
-        public event EventHandler<PointerPressedEventArgs>? PointerPressed
-        {
-            add { AddHandler(PointerPressedEvent, value); }
-            remove { RemoveHandler(PointerPressedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer is released over the control.
-        /// </summary>
-        public event EventHandler<PointerReleasedEventArgs>? PointerReleased
-        {
-            add { AddHandler(PointerReleasedEvent, value); }
-            remove { RemoveHandler(PointerReleasedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the control or its child control loses the pointer capture for any reason,
-        /// event will not be triggered for a parent control if capture was transferred to another child of that parent control
-        /// </summary>
-        public event EventHandler<PointerCaptureLostEventArgs>? PointerCaptureLost
-        {
-            add => AddHandler(PointerCaptureLostEvent, value);
-            remove => RemoveHandler(PointerCaptureLostEvent, value);
-        }
-        
-        /// <summary>
-        /// Occurs when the mouse is scrolled over the control.
-        /// </summary>
-        public event EventHandler<PointerWheelEventArgs>? PointerWheelChanged
-        {
-            add { AddHandler(PointerWheelChangedEvent, value); }
-            remove { RemoveHandler(PointerWheelChangedEvent, value); }
-        }
-        
-        /// <summary>
-        /// Occurs when a tap gesture occurs on the control.
-        /// </summary>
-        public event EventHandler<TappedEventArgs>? Tapped
-        {
-            add { AddHandler(TappedEvent, value); }
-            remove { RemoveHandler(TappedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a double-tap gesture occurs on the control.
-        /// </summary>
-        public event EventHandler<TappedEventArgs>? DoubleTapped
-        {
-            add { AddHandler(DoubleTappedEvent, value); }
-            remove { RemoveHandler(DoubleTappedEvent, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control can receive focus.
-        /// </summary>
-        public bool Focusable
-        {
-            get { return GetValue(FocusableProperty); }
-            set { SetValue(FocusableProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control is enabled for user interaction.
-        /// </summary>
-        public bool IsEnabled
-        {
-            get { return GetValue(IsEnabledProperty); }
-            set { SetValue(IsEnabledProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets associated mouse cursor.
-        /// </summary>
-        public Cursor? Cursor
-        {
-            get { return GetValue(CursorProperty); }
-            set { SetValue(CursorProperty, value); }
-        }
-        
-        /// <summary>
-        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
-        /// </summary>
-        public bool IsKeyboardFocusWithin
-        {
-            get => _isKeyboardFocusWithin;
-            internal set => SetAndRaise(IsKeyboardFocusWithinProperty, ref _isKeyboardFocusWithin, value); 
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the control is focused.
-        /// </summary>
-        public bool IsFocused
-        {
-            get { return _isFocused; }
-            private set { SetAndRaise(IsFocusedProperty, ref _isFocused, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control is considered for hit testing.
-        /// </summary>
-        public bool IsHitTestVisible
-        {
-            get { return GetValue(IsHitTestVisibleProperty); }
-            set { SetValue(IsHitTestVisibleProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the pointer is currently over the control.
-        /// </summary>
-        public bool IsPointerOver
-        {
-            get { return _isPointerOver; }
-            internal set { SetAndRaise(IsPointerOverProperty, ref _isPointerOver, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates whether the control is included in tab navigation.
-        /// </summary>
-        public bool IsTabStop
-        {
-            get => GetValue(IsTabStopProperty);
-            set => SetValue(IsTabStopProperty, value);
-        }
-
-        /// <inheritdoc/>
-        public bool IsEffectivelyEnabled
-        {
-            get => _isEffectivelyEnabled;
-            private set
-            {
-                SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value);
-                PseudoClasses.Set(":disabled", !value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value that determines the order in which elements receive focus when the
-        /// user navigates through controls by pressing the Tab key.
-        /// </summary>
-        public int TabIndex
-        {
-            get => GetValue(TabIndexProperty);
-            set => SetValue(TabIndexProperty, value);
-        }
-
-        public List<KeyBinding> KeyBindings { get; } = new List<KeyBinding>();
-
-        /// <summary>
-        /// Allows a derived class to override the enabled state of the control.
-        /// </summary>
-        /// <remarks>
-        /// Derived controls may wish to disable the enabled state of the control without overwriting the
-        /// user-supplied <see cref="IsEnabled"/> setting. This can be done by overriding this property
-        /// to return the overridden enabled state. If the value returned from <see cref="IsEnabledCore"/>
-        /// should change, then the derived control should call <see cref="UpdateIsEffectivelyEnabled()"/>.
-        /// </remarks>
-        protected virtual bool IsEnabledCore => IsEnabled;
-
-        public GestureRecognizerCollection GestureRecognizers
-            => _gestureRecognizers ?? (_gestureRecognizers = new GestureRecognizerCollection(this));
-
-        /// <summary>
-        /// Focuses the control.
-        /// </summary>
-        public void Focus()
-        {
-            FocusManager.Instance?.Focus(this);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnDetachedFromVisualTreeCore(e);
-
-            if (IsFocused)
-            {
-                FocusManager.Instance?.Focus(null);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTreeCore(e);
-            UpdateIsEffectivelyEnabled();
-        }
-
-        /// <summary>
-        /// Called before the <see cref="GotFocus"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnGotFocus(GotFocusEventArgs e)
-        {
-            var isFocused = e.Source == this;
-            _isFocusVisible = isFocused && (e.NavigationMethod == NavigationMethod.Directional || e.NavigationMethod == NavigationMethod.Tab);
-            IsFocused = isFocused;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="LostFocus"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnLostFocus(RoutedEventArgs e)
-        {
-            _isFocusVisible = false;
-            IsFocused = false;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="KeyDown"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnKeyDown(KeyEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="KeyUp"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnKeyUp(KeyEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="TextInput"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnTextInput(TextInputEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerEnter"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerEnter(PointerEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerLeave"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerLeave(PointerEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerMoved"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerMoved(PointerEventArgs e)
-        {
-            if (_gestureRecognizers?.HandlePointerMoved(e) == true)
-                e.Handled = true;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerPressed"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            if (_gestureRecognizers?.HandlePointerPressed(e) == true)
-                e.Handled = true;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerReleased"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            if (_gestureRecognizers?.HandlePointerReleased(e) == true)
-                e.Handled = true;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerCaptureLost"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
-        {
-            _gestureRecognizers?.HandlePointerCaptureLost(e);
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerWheelChanged"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerWheelChanged(PointerWheelEventArgs e)
-        {
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == IsFocusedProperty)
-            {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>(), null);
-            }
-            else if (change.Property == IsPointerOverProperty)
-            {
-                UpdatePseudoClasses(null, change.NewValue.GetValueOrDefault<bool>());
-            }
-            else if (change.Property == IsKeyboardFocusWithinProperty)
-            {
-                PseudoClasses.Set(":focus-within", change.NewValue.GetValueOrDefault<bool>());
-            }
-        }
-
-        /// <summary>
-        /// Updates the <see cref="IsEffectivelyEnabled"/> property value according to the parent
-        /// control's enabled state and <see cref="IsEnabledCore"/>.
-        /// </summary>
-        protected void UpdateIsEffectivelyEnabled()
-        {
-            UpdateIsEffectivelyEnabled(this.GetVisualParent<InputElement>());
-        }
-
-        private static void IsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            ((InputElement)e.Sender).UpdateIsEffectivelyEnabled();
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerEnter"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void OnPointerEnterCore(PointerEventArgs e)
-        {
-            IsPointerOver = true;
-            OnPointerEnter(e);
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerLeave"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void OnPointerLeaveCore(PointerEventArgs e)
-        {
-            IsPointerOver = false;
-            OnPointerLeave(e);
-        }
-
-        /// <summary>
-        /// Updates the <see cref="IsEffectivelyEnabled"/> property based on the parent's
-        /// <see cref="IsEffectivelyEnabled"/>.
-        /// </summary>
-        /// <param name="parent">The parent control.</param>
-        private void UpdateIsEffectivelyEnabled(InputElement? parent)
-        {
-            IsEffectivelyEnabled = IsEnabledCore && (parent?.IsEffectivelyEnabled ?? true);
-
-            // PERF-SENSITIVE: This is called on entire hierarchy and using foreach or LINQ
-            // will cause extra allocations and overhead.
-            
-            var children = VisualChildren;
-
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (int i = 0; i < children.Count; ++i)
-            {
-                var child = children[i] as InputElement;
-
-                child?.UpdateIsEffectivelyEnabled(this);
-            }
-        }
-
-        private void UpdatePseudoClasses(bool? isFocused, bool? isPointerOver)
-        {
-            if (isFocused.HasValue)
-            {
-                PseudoClasses.Set(":focus", isFocused.Value);
-                PseudoClasses.Set(":focus-visible", _isFocusVisible);
-            }
-            
-            if (isPointerOver.HasValue)
-            {
-                PseudoClasses.Set(":pointerover", isPointerOver.Value);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/KeyEventArgs.cs b/src/Avalonia.Input/KeyEventArgs.cs
deleted file mode 100644
index 67cd5a520a..0000000000
--- a/src/Avalonia.Input/KeyEventArgs.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input
-{
-    public class KeyEventArgs : RoutedEventArgs
-    {
-        public IKeyboardDevice? Device { get; set; }
-
-        public Key Key { get; set; }
-
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers => (InputModifiers)KeyModifiers;
-        public KeyModifiers KeyModifiers { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/KeyGesture.cs b/src/Avalonia.Input/KeyGesture.cs
deleted file mode 100644
index 0adbe73263..0000000000
--- a/src/Avalonia.Input/KeyGesture.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines a keyboard input combination.
-    /// </summary>
-    public sealed class KeyGesture : IEquatable<KeyGesture>
-    {
-        private static readonly Dictionary<string, Key> s_keySynonyms = new Dictionary<string, Key>
-        {
-            { "+", Key.OemPlus }, { "-", Key.OemMinus }, { ".", Key.OemPeriod }, { ",", Key.OemComma }
-        };
-
-        [Obsolete("Use constructor taking KeyModifiers")]
-        public KeyGesture(Key key, InputModifiers modifiers)
-        {
-            Key = key;
-            KeyModifiers = (KeyModifiers)(((int)modifiers) & 0xf);
-        }
-
-        public KeyGesture(Key key, KeyModifiers modifiers = KeyModifiers.None)
-        {
-            Key = key;
-            KeyModifiers = modifiers;
-        }
-
-        public bool Equals(KeyGesture? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return Key == other.Key && KeyModifiers == other.KeyModifiers;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-
-            return obj is KeyGesture gesture && Equals(gesture);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return ((int)Key * 397) ^ (int)KeyModifiers;
-            }
-        }
-
-        public static bool operator ==(KeyGesture? left, KeyGesture? right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(KeyGesture? left, KeyGesture? right)
-        {
-            return !Equals(left, right);
-        }
-
-        public Key Key { get; }
-
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers => (InputModifiers)KeyModifiers;
-
-        public KeyModifiers KeyModifiers { get; }
-
-        public static KeyGesture Parse(string gesture)
-        {
-            // string.Split can't be used here because "Ctrl++" is a perfectly valid key gesture
-
-            var key = Key.None;
-            var keyModifiers = KeyModifiers.None;
-
-            var cstart = 0;
-
-            for (var c = 0; c <= gesture.Length; c++)
-            {
-                var ch = c == gesture.Length ? '\0' : gesture[c];
-                bool isLast = c == gesture.Length;
-
-                if (isLast || (ch == '+' && cstart != c))
-                {
-                    var partSpan = gesture.AsSpan(cstart, c - cstart).Trim();
-
-                    if (isLast)
-                    {
-                        key = ParseKey(partSpan.ToString());
-                    }
-                    else
-                    {
-                        keyModifiers |= ParseModifier(partSpan);
-                    }
-
-                    cstart = c + 1;
-                }
-            }
-
-
-            return new KeyGesture(key, keyModifiers);
-        }
-
-        public override string ToString()
-        {
-            var s = new StringBuilder();
-
-            static void Plus(StringBuilder s)
-            {
-                if (s.Length > 0)
-                {
-                    s.Append("+");
-                }
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Control))
-            {
-                s.Append("Ctrl");
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Shift))
-            {
-                Plus(s);
-                s.Append("Shift");
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Alt))
-            {
-                Plus(s);
-                s.Append("Alt");
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Meta))
-            {
-                Plus(s);
-                s.Append("Cmd");
-            }
-
-            Plus(s);
-            s.Append(Key);
-
-            return s.ToString();
-        }
-
-        public bool Matches(KeyEventArgs keyEvent) =>
-            keyEvent != null &&
-            keyEvent.KeyModifiers == KeyModifiers &&
-            ResolveNumPadOperationKey(keyEvent.Key) == ResolveNumPadOperationKey(Key);
-
-        // TODO: Move that to external key parser
-        private static Key ParseKey(string key)
-        {
-            if (s_keySynonyms.TryGetValue(key.ToLower(), out Key rv))
-                return rv;
-
-            return (Key)Enum.Parse(typeof(Key), key, true);
-        }
-
-        private static KeyModifiers ParseModifier(ReadOnlySpan<char> modifier)
-        {
-            if (modifier.Equals("ctrl".AsSpan(), StringComparison.OrdinalIgnoreCase))
-            {
-                return KeyModifiers.Control;
-            }
-
-            if (modifier.Equals("cmd".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
-                modifier.Equals("win".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
-                modifier.Equals("⌘".AsSpan(), StringComparison.OrdinalIgnoreCase))
-            {
-                return KeyModifiers.Meta;
-            }
-
-            return (KeyModifiers)Enum.Parse(typeof(KeyModifiers), modifier.ToString(), true);
-        }
-
-        private Key ResolveNumPadOperationKey(Key key)
-        {
-            switch (key)
-            {
-                case Key.Add:
-                    return Key.OemPlus;
-                case Key.Subtract:
-                    return Key.OemMinus;
-                case Key.Decimal:
-                    return Key.OemPeriod;
-                default:
-                    return key;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
deleted file mode 100644
index 438e3fcadb..0000000000
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class KeyboardDevice : IKeyboardDevice, INotifyPropertyChanged
-    {
-        private IInputElement? _focusedElement;
-        private IInputRoot? _focusedRoot;
-
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        public static IKeyboardDevice? Instance => AvaloniaLocator.Current.GetService<IKeyboardDevice>();
-
-        public IInputManager? InputManager => AvaloniaLocator.Current.GetService<IInputManager>();
-
-        public IFocusManager? FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
-        
-        // This should live in the FocusManager, but with the current outdated architecture
-        // the source of truth about the input focus is in KeyboardDevice
-        private readonly TextInputMethodManager _textInputManager = new TextInputMethodManager();
-
-        public IInputElement? FocusedElement
-        {
-            get
-            {
-                return _focusedElement;
-            }
-
-            private set
-            {
-                _focusedElement = value;
-
-                if (_focusedElement != null && _focusedElement.IsAttachedToVisualTree)
-                {
-                    _focusedRoot = _focusedElement.VisualRoot as IInputRoot;
-                }
-                else
-                {
-                    _focusedRoot = null;
-                }
-                
-                RaisePropertyChanged();
-                _textInputManager.SetFocusedElement(value);
-            }
-        }
-
-        private void ClearFocusWithinAncestors(IInputElement? element)
-        {
-            var el = element;
-            
-            while (el != null)
-            {
-                if (el is InputElement ie)
-                {
-                    ie.IsKeyboardFocusWithin = false;
-                }
-
-                el = (IInputElement?)el.VisualParent;
-            }
-        }
-        
-        private void ClearFocusWithin(IInputElement element, bool clearRoot)
-        {
-            foreach (var visual in element.VisualChildren)
-            {
-                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
-                {
-                    ClearFocusWithin(el, true);
-                    break;
-                }
-            }
-            
-            if (clearRoot)
-            {
-                if (element is InputElement ie)
-                {
-                    ie.IsKeyboardFocusWithin = false;
-                }
-            }
-        }
-
-        private void SetIsFocusWithin(IInputElement? oldElement, IInputElement? newElement)
-        {
-            if (newElement == null && oldElement != null)
-            {
-                ClearFocusWithinAncestors(oldElement);
-                return;
-            }
-            
-            IInputElement? branch = null;
-
-            var el = newElement;
-
-            while (el != null)
-            {
-                if (el.IsKeyboardFocusWithin)
-                {
-                    branch = el;
-                    break;
-                }
-
-                el = el.VisualParent as IInputElement;
-            }
-
-            el = oldElement;
-
-            if (el != null && branch != null)
-            {
-                ClearFocusWithin(branch, false);
-            }
-
-            el = newElement;
-            
-            while (el != null && el != branch)
-            {
-                if (el is InputElement ie)
-                {
-                    ie.IsKeyboardFocusWithin = true;
-                }
-
-                el = el.VisualParent as IInputElement;
-            }
-        }
-        
-        private void ClearChildrenFocusWithin(IInputElement element, bool clearRoot)
-        {
-            foreach (var visual in element.VisualChildren)
-            {
-                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
-                {
-                    ClearChildrenFocusWithin(el, true);
-                    break;
-                }
-            }
-            
-            if (clearRoot && element is InputElement ie)
-            {
-                ie.IsKeyboardFocusWithin = false;
-            }
-        }
-
-        public void SetFocusedElement(
-            IInputElement? element, 
-            NavigationMethod method,
-            KeyModifiers keyModifiers)
-        {
-            if (element != FocusedElement)
-            {
-                var interactive = FocusedElement as IInteractive;
-
-                if (FocusedElement != null && 
-                    (!FocusedElement.IsAttachedToVisualTree ||
-                     _focusedRoot != element?.VisualRoot as IInputRoot) &&
-                    _focusedRoot != null)
-                {
-                    ClearChildrenFocusWithin(_focusedRoot, true);
-                }
-                
-                SetIsFocusWithin(FocusedElement, element);
-                
-                FocusedElement = element;
-
-                interactive?.RaiseEvent(new RoutedEventArgs
-                {
-                    RoutedEvent = InputElement.LostFocusEvent,
-                });
-
-                interactive = element as IInteractive;
-
-                interactive?.RaiseEvent(new GotFocusEventArgs
-                {
-                    RoutedEvent = InputElement.GotFocusEvent,
-                    NavigationMethod = method,
-                    KeyModifiers = keyModifiers,
-                });
-            }
-        }
-
-        protected void RaisePropertyChanged([CallerMemberName] string propertyName = "")
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs e)
-        {
-            if(e.Handled)
-                return;
-
-            var element = FocusedElement ?? e.Root;
-
-            if (e is RawKeyEventArgs keyInput)
-            {
-                switch (keyInput.Type)
-                {
-                    case RawKeyEventType.KeyDown:
-                    case RawKeyEventType.KeyUp:
-                        var routedEvent = keyInput.Type == RawKeyEventType.KeyDown
-                            ? InputElement.KeyDownEvent
-                            : InputElement.KeyUpEvent;
-
-                        KeyEventArgs ev = new KeyEventArgs
-                        {
-                            RoutedEvent = routedEvent,
-                            Device = this,
-                            Key = keyInput.Key,
-                            KeyModifiers = KeyModifiersUtils.ConvertToKey(keyInput.Modifiers),
-                            Source = element,
-                        };
-
-                        IVisual? currentHandler = element;
-                        while (currentHandler != null && !ev.Handled && keyInput.Type == RawKeyEventType.KeyDown)
-                        {
-                            var bindings = (currentHandler as IInputElement)?.KeyBindings;
-                            if (bindings != null)
-                            {
-                                KeyBinding[]? bindingsCopy = null;
-
-                                // Create a copy of the KeyBindings list if there's a binding which matches the event.
-                                // If we don't do this the foreach loop will throw an InvalidOperationException when the KeyBindings list is changed.
-                                // This can happen when a new view is loaded which adds its own KeyBindings to the handler.
-                                foreach (var binding in bindings)
-                                {
-                                    if (binding.Gesture?.Matches(ev) == true)
-                                    {
-                                        bindingsCopy = bindings.ToArray();
-                                        break;
-                                    }
-                                }
-
-                                if (bindingsCopy is object)
-                                {
-                                    foreach (var binding in bindingsCopy)
-                                    {
-                                        if (ev.Handled)
-                                            break;
-                                        binding.TryHandle(ev);
-                                    }
-                                }
-                            }
-                            currentHandler = currentHandler.VisualParent;
-                        }
-
-                        element.RaiseEvent(ev);
-                        e.Handled = ev.Handled;
-                        break;
-                }
-            }
-
-            if (e is RawTextInputEventArgs text)
-            {
-                var ev = new TextInputEventArgs()
-                {
-                    Device = this,
-                    Text = text.Text,
-                    Source = element,
-                    RoutedEvent = InputElement.TextInputEvent
-                };
-
-                element.RaiseEvent(ev);
-                e.Handled = ev.Handled;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/KeyboardNavigation.cs b/src/Avalonia.Input/KeyboardNavigation.cs
deleted file mode 100644
index a25aed6811..0000000000
--- a/src/Avalonia.Input/KeyboardNavigation.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines attached properties that control keyboard navigation behaviour for a container.
-    /// </summary>
-    public static class KeyboardNavigation
-    {
-        /// <summary>
-        /// Defines the TabIndex attached property.
-        /// </summary>
-        public static readonly AttachedProperty<int> TabIndexProperty =
-            AvaloniaProperty.RegisterAttached<StyledElement, int>(
-                "TabIndex",
-                typeof(KeyboardNavigation),
-                int.MaxValue);
-
-        /// <summary>
-        /// Defines the TabNavigation attached property.
-        /// </summary>
-        /// <remarks>
-        /// The TabNavigation attached property defines how pressing the Tab key causes focus to
-        /// be navigated between the children of the container.
-        /// </remarks>
-        public static readonly AttachedProperty<KeyboardNavigationMode> TabNavigationProperty =
-            AvaloniaProperty.RegisterAttached<InputElement, KeyboardNavigationMode>(
-                "TabNavigation",
-                typeof(KeyboardNavigation));
-
-        /// <summary>
-        /// Defines the TabOnceActiveElement attached property.
-        /// </summary>
-        /// <remarks>
-        /// When focus enters a container which has its <see cref="TabNavigationProperty"/>
-        /// attached property set to <see cref="KeyboardNavigationMode.Once"/>, this property
-        /// defines to which child the focus should move.
-        /// </remarks>
-        public static readonly AttachedProperty<IInputElement?> TabOnceActiveElementProperty =
-            AvaloniaProperty.RegisterAttached<InputElement, IInputElement?>(
-                "TabOnceActiveElement",
-                typeof(KeyboardNavigation));
-
-        /// <summary>
-        /// Defines the IsTabStop attached property.
-        /// </summary>
-        /// <remarks>
-        /// The IsTabStop attached property determines whether the control is focusable by tab navigation. 
-        /// </remarks>
-        public static readonly AttachedProperty<bool> IsTabStopProperty =
-            AvaloniaProperty.RegisterAttached<InputElement, bool>(
-                "IsTabStop",
-                typeof(KeyboardNavigation), 
-                true);
-
-        /// <summary>
-        /// Gets the <see cref="TabIndexProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
-        public static int GetTabIndex(IInputElement element)
-        {
-            return ((IAvaloniaObject)element).GetValue(TabIndexProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="TabIndexProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The element.</param>
-        /// <param name="value">The tab index.</param>
-        public static void SetTabIndex(IInputElement element, int value)
-        {
-            ((IAvaloniaObject)element).SetValue(TabIndexProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="TabNavigationProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
-        public static KeyboardNavigationMode GetTabNavigation(InputElement element)
-        {
-            return element.GetValue(TabNavigationProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="TabNavigationProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <param name="value">The <see cref="KeyboardNavigationMode"/> for the container.</param>
-        public static void SetTabNavigation(InputElement element, KeyboardNavigationMode value)
-        {
-            element.SetValue(TabNavigationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="TabOnceActiveElementProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>The active element for the container.</returns>
-        public static IInputElement? GetTabOnceActiveElement(InputElement element)
-        {
-            return element.GetValue(TabOnceActiveElementProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="TabOnceActiveElementProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <param name="value">The active element for the container.</param>
-        public static void SetTabOnceActiveElement(InputElement element, IInputElement? value)
-        {
-            element.SetValue(TabOnceActiveElementProperty, value);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="IsTabStopProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <param name="value">Value indicating whether the container is a tab stop.</param>
-        public static void SetIsTabStop(InputElement element, bool value)
-        {
-            element.SetValue(IsTabStopProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IsTabStopProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>Whether the container is a tab stop.</returns>
-        public static bool GetIsTabStop(InputElement element)
-        {
-            return element.GetValue(IsTabStopProperty);
-        }
-    }
-}
diff --git a/src/Avalonia.Input/MouseDevice.cs b/src/Avalonia.Input/MouseDevice.cs
deleted file mode 100644
index eed51e6c4a..0000000000
--- a/src/Avalonia.Input/MouseDevice.cs
+++ /dev/null
@@ -1,569 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Represents a mouse device.
-    /// </summary>
-    public class MouseDevice : IMouseDevice, IDisposable
-    {
-        private int _clickCount;
-        private Rect _lastClickRect;
-        private ulong _lastClickTime;
-
-        private readonly Pointer _pointer;
-        private bool _disposed;
-        private PixelPoint? _position; 
-
-        public MouseDevice(Pointer? pointer = null)
-        {
-            _pointer = pointer ?? new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
-        }
-        
-        /// <summary>
-        /// Gets the control that is currently capturing by the mouse, if any.
-        /// </summary>
-        /// <remarks>
-        /// When an element captures the mouse, it receives mouse input whether the cursor is 
-        /// within the control's bounds or not. To set the mouse capture, call the 
-        /// <see cref="Capture"/> method.
-        /// </remarks>
-        [Obsolete("Use IPointer instead")]
-        public IInputElement? Captured => _pointer.Captured;
-
-        /// <summary>
-        /// Gets the mouse position, in screen coordinates.
-        /// </summary>
-        [Obsolete("Use events instead")]
-        public PixelPoint Position
-        {
-            get => _position ?? new PixelPoint(-1, -1);
-            protected set => _position = value;
-        }
-
-        /// <summary>
-        /// Captures mouse input to the specified control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <remarks>
-        /// When an element captures the mouse, it receives mouse input whether the cursor is 
-        /// within the control's bounds or not. The current mouse capture control is exposed
-        /// by the <see cref="Captured"/> property.
-        /// </remarks>
-        public void Capture(IInputElement? control)
-        {
-            _pointer.Capture(control);
-        }
-
-        /// <summary>
-        /// Gets the mouse position relative to a control.
-        /// </summary>
-        /// <param name="relativeTo">The control.</param>
-        /// <returns>The mouse position in the control's coordinates.</returns>
-        public Point GetPosition(IVisual relativeTo)
-        {
-            relativeTo = relativeTo ?? throw new ArgumentNullException(nameof(relativeTo));
-
-            if (relativeTo.VisualRoot == null)
-            {
-                throw new InvalidOperationException("Control is not attached to visual tree.");
-            }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-            var rootPoint = relativeTo.VisualRoot.PointToClient(Position);
-#pragma warning restore CS0618 // Type or member is obsolete
-            var transform = relativeTo.VisualRoot.TransformToVisual(relativeTo);
-            return rootPoint * transform!.Value;
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs e)
-        {
-            if (!e.Handled && e is RawPointerEventArgs margs)
-                ProcessRawEvent(margs);
-        }
-
-        public void TopLevelClosed(IInputRoot root)
-        {
-            ClearPointerOver(this, 0, root, PointerPointProperties.None, KeyModifiers.None);
-        }
-
-        public void SceneInvalidated(IInputRoot root, Rect rect)
-        {
-            // Pointer is outside of the target area
-            if (_position == null )
-            {
-                if (root.PointerOverElement != null)
-                    ClearPointerOver(this, 0, root, PointerPointProperties.None, KeyModifiers.None);
-                return;
-            }
-            
-            
-            var clientPoint = root.PointToClient(_position.Value);
-
-            if (rect.Contains(clientPoint))
-            {
-                if (_pointer.Captured == null)
-                {
-                    SetPointerOver(this, 0 /* TODO: proper timestamp */, root, clientPoint,
-                        PointerPointProperties.None, KeyModifiers.None);
-                }
-                else
-                {
-                    SetPointerOver(this, 0 /* TODO: proper timestamp */, root, _pointer.Captured,
-                        PointerPointProperties.None, KeyModifiers.None);
-                }
-            }
-        }
-
-        int ButtonCount(PointerPointProperties props)
-        {
-            var rv = 0;
-            if (props.IsLeftButtonPressed)
-                rv++;
-            if (props.IsMiddleButtonPressed)
-                rv++;
-            if (props.IsRightButtonPressed)
-                rv++;
-            if (props.IsXButton1Pressed)
-                rv++;
-            if (props.IsXButton2Pressed)
-                rv++;
-            return rv;
-        }
-        
-        private void ProcessRawEvent(RawPointerEventArgs e)
-        {
-            e = e ?? throw new ArgumentNullException(nameof(e));
-
-            var mouse = (MouseDevice)e.Device;
-            if(mouse._disposed)
-                return;
-
-            _position = e.Root.PointToScreen(e.Position);
-            var props = CreateProperties(e);
-            var keyModifiers = KeyModifiersUtils.ConvertToKey(e.InputModifiers);
-            switch (e.Type)
-            {
-                case RawPointerEventType.LeaveWindow:
-                    LeaveWindow(mouse, e.Timestamp, e.Root, props, keyModifiers);
-                    break;
-                case RawPointerEventType.LeftButtonDown:
-                case RawPointerEventType.RightButtonDown:
-                case RawPointerEventType.MiddleButtonDown:
-                case RawPointerEventType.XButton1Down:
-                case RawPointerEventType.XButton2Down:
-                    if (ButtonCount(props) > 1)
-                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
-                    else
-                        e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position,
-                            props, keyModifiers);
-                    break;
-                case RawPointerEventType.LeftButtonUp:
-                case RawPointerEventType.RightButtonUp:
-                case RawPointerEventType.MiddleButtonUp:
-                case RawPointerEventType.XButton1Up:
-                case RawPointerEventType.XButton2Up:
-                    if (ButtonCount(props) != 0)
-                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
-                    else
-                        e.Handled = MouseUp(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers);
-                    break;
-                case RawPointerEventType.Move:
-                    e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
-                    break;
-                case RawPointerEventType.Wheel:
-                    e.Handled = MouseWheel(mouse, e.Timestamp, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, keyModifiers);
-                    break;
-                case RawPointerEventType.Magnify:
-                    e.Handled = GestureMagnify(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers);
-                    break;
-                case RawPointerEventType.Rotate:
-                    e.Handled = GestureRotate(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers);
-                    break;
-                case RawPointerEventType.Swipe:
-                    e.Handled = GestureSwipe(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers);
-                    break;
-            }
-        }
-
-        private void LeaveWindow(IMouseDevice device, ulong timestamp, IInputRoot root, PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            _position = null;
-            ClearPointerOver(this, timestamp, root, properties, inputModifiers);
-        }
-
-
-        PointerPointProperties CreateProperties(RawPointerEventArgs args)
-        {
-
-            var kind = PointerUpdateKind.Other;
-
-            if (args.Type == RawPointerEventType.LeftButtonDown)
-                kind = PointerUpdateKind.LeftButtonPressed;
-            if (args.Type == RawPointerEventType.MiddleButtonDown)
-                kind = PointerUpdateKind.MiddleButtonPressed;
-            if (args.Type == RawPointerEventType.RightButtonDown)
-                kind = PointerUpdateKind.RightButtonPressed;
-            if (args.Type == RawPointerEventType.XButton1Down)
-                kind = PointerUpdateKind.XButton1Pressed;
-            if (args.Type == RawPointerEventType.XButton2Down)
-                kind = PointerUpdateKind.XButton2Pressed;
-            if (args.Type == RawPointerEventType.LeftButtonUp)
-                kind = PointerUpdateKind.LeftButtonReleased;
-            if (args.Type == RawPointerEventType.MiddleButtonUp)
-                kind = PointerUpdateKind.MiddleButtonReleased;
-            if (args.Type == RawPointerEventType.RightButtonUp)
-                kind = PointerUpdateKind.RightButtonReleased;
-            if (args.Type == RawPointerEventType.XButton1Up)
-                kind = PointerUpdateKind.XButton1Released;
-            if (args.Type == RawPointerEventType.XButton2Up)
-                kind = PointerUpdateKind.XButton2Released;
-            
-            return new PointerPointProperties(args.InputModifiers, kind);
-        }
-
-        private MouseButton _lastMouseDownButton;
-        private bool MouseDown(IMouseDevice device, ulong timestamp, IInputElement root, Point p,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                _pointer.Capture(hit);
-                var source = GetSource(hit);
-                if (source != null)
-                {
-                    var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-                    var doubleClickTime = settings?.DoubleClickTime.TotalMilliseconds ?? 500;
-                    var doubleClickSize = settings?.DoubleClickSize ?? new Size(4, 4);
-
-                    if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
-                    {
-                        _clickCount = 0;
-                    }
-
-                    ++_clickCount;
-                    _lastClickTime = timestamp;
-                    _lastClickRect = new Rect(p, new Size())
-                        .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
-                    _lastMouseDownButton = properties.PointerUpdateKind.GetMouseButton();
-                    var e = new PointerPressedEventArgs(source, _pointer, root, p, timestamp, properties, inputModifiers, _clickCount);
-                    source.RaiseEvent(e);
-                    return e.Handled;
-                }
-            }
-
-            return false;
-        }
-
-        private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties properties,
-            KeyModifiers inputModifiers, Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            IInputElement? source;
-
-            if (_pointer.Captured == null)
-            {
-                source = SetPointerOver(this, timestamp, root, p,  properties, inputModifiers);
-            }
-            else
-            {
-                SetPointerOver(this, timestamp, root, _pointer.Captured, properties, inputModifiers);
-                source = _pointer.Captured;
-            }
-
-            if (source is object)
-            {
-                var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
-                    p, timestamp, properties, inputModifiers, intermediatePoints);
-
-                source.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-
-        private bool MouseUp(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties props,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-            var source = GetSource(hit);
-
-            if (source is not null)
-            {
-                var e = new PointerReleasedEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers,
-                    _lastMouseDownButton);
-
-                source?.RaiseEvent(e);
-                _pointer.Capture(null);
-                return e.Handled;
-            }
-
-            return false;
-        }
-
-        private bool MouseWheel(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props,
-            Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-            var source = GetSource(hit);
-
-            // KeyModifiers.Shift should scroll in horizontal direction. This does not work on every platform. 
-            // If Shift-Key is pressed and X is close to 0 we swap the Vector.
-            if (inputModifiers == KeyModifiers.Shift && MathUtilities.IsZero(delta.X))
-            {
-                delta = new Vector(delta.Y, delta.X);
-            }
-
-            if (source is not null)
-            {
-                var e = new PointerWheelEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-        
-        private bool GestureMagnify(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                var source = GetSource(hit);
-                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureMagnifyEvent, source,
-                    _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-        
-        private bool GestureRotate(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                var source = GetSource(hit);
-                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureRotateEvent, source,
-                    _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-        
-        private bool GestureSwipe(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                var source = GetSource(hit);
-                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureSwipeEvent, source, 
-                    _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-
-        private IInteractive? GetSource(IVisual? hit)
-        {
-            if (hit is null)
-                return null;
-
-            return _pointer.Captured ??
-                (hit as IInteractive) ??
-                hit.GetSelfAndVisualAncestors().OfType<IInteractive>().FirstOrDefault();
-        }
-
-        private IInputElement? HitTest(IInputElement root, Point p)
-        {
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            return _pointer.Captured ?? root.InputHitTest(p);
-        }
-
-        PointerEventArgs CreateSimpleEvent(RoutedEvent ev, ulong timestamp, IInteractive? source,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            return new PointerEventArgs(ev, source, _pointer, null, default,
-                timestamp, properties, inputModifiers);
-        }
-
-        private void ClearPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var element = root.PointerOverElement;
-            var e = CreateSimpleEvent(InputElement.PointerLeaveEvent, timestamp, element, properties, inputModifiers);
-
-            if (element!=null && !element.IsAttachedToVisualTree)
-            {
-                // element has been removed from visual tree so do top down cleanup
-                if (root.IsPointerOver)
-                    ClearChildrenPointerOver(e, root,true);
-            }
-            while (element != null)
-            {
-                e.Source = element;
-                e.Handled = false;
-                element.RaiseEvent(e);
-                element = (IInputElement?)element.VisualParent;
-            }
-            
-            root.PointerOverElement = null;
-        }
-
-        private void ClearChildrenPointerOver(PointerEventArgs e, IInputElement element,bool clearRoot)
-        {
-            foreach (IInputElement el in element.VisualChildren)
-            {
-                if (el.IsPointerOver)
-                {
-                    ClearChildrenPointerOver(e, el, true);
-                    break;
-                }
-            }
-            if(clearRoot)
-            {
-                e.Source = element;
-                e.Handled = false;
-                element.RaiseEvent(e);
-            }
-        }
-
-        private IInputElement? SetPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root, Point p, 
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var element = root.InputHitTest(p);
-
-            if (element != root.PointerOverElement)
-            {
-                if (element != null)
-                {
-                    SetPointerOver(device, timestamp, root, element, properties, inputModifiers);
-                }
-                else
-                {
-                    ClearPointerOver(device, timestamp, root, properties, inputModifiers);
-                }
-            }
-
-            return element;
-        }
-
-        private void SetPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root, IInputElement element,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-            element = element ?? throw new ArgumentNullException(nameof(element));
-
-            IInputElement? branch = null;
-
-            IInputElement? el = element;
-
-            while (el != null)
-            {
-                if (el.IsPointerOver)
-                {
-                    branch = el;
-                    break;
-                }
-                el = (IInputElement?)el.VisualParent;
-            }
-
-            el = root.PointerOverElement;
-
-            var e = CreateSimpleEvent(InputElement.PointerLeaveEvent, timestamp, el, properties, inputModifiers);
-            if (el!=null && branch!=null && !el.IsAttachedToVisualTree)
-            {
-                ClearChildrenPointerOver(e,branch,false);
-            }
-            
-            while (el != null && el != branch)
-            {
-                e.Source = el;
-                e.Handled = false;
-                el.RaiseEvent(e);
-                el = (IInputElement?)el.VisualParent;
-            }            
-
-            el = root.PointerOverElement = element;
-            e.RoutedEvent = InputElement.PointerEnterEvent;
-
-            while (el != null && el != branch)
-            {
-                e.Source = el;
-                e.Handled = false;
-                el.RaiseEvent(e);
-                el = (IInputElement?)el.VisualParent;
-            }
-        }
-
-        public void Dispose()
-        {
-            _disposed = true;
-            _pointer?.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
deleted file mode 100644
index c8290cb3b7..0000000000
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ /dev/null
@@ -1,673 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input.Navigation
-{
-    /// <summary>
-    /// The implementation for default tab navigation.
-    /// </summary>
-    internal static class TabNavigation
-    {
-        public static IInputElement? GetNextTab(IInputElement e, bool goDownOnly)
-        {
-            return GetNextTab(e, GetGroupParent(e), goDownOnly);
-        }
-
-        public static IInputElement? GetNextTab(IInputElement? e, IInputElement container, bool goDownOnly)
-        {
-            var tabbingType = GetKeyNavigationMode(container);
-
-            if (e == null)
-            {
-                if (IsTabStop(container))
-                    return container;
-
-                // Using ActiveElement if set
-                var activeElement = GetActiveElement(container);
-                if (activeElement != null)
-                    return GetNextTab(null, activeElement, true);
-            }
-            else
-            {
-                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
-                {
-                    if (container != e)
-                    {
-                        if (goDownOnly)
-                            return null;
-                        var parentContainer = GetGroupParent(container);
-                        return GetNextTab(container, parentContainer, goDownOnly);
-                    }
-                }
-            }
-
-            // All groups
-            IInputElement? loopStartElement = null;
-            var nextTabElement = e;
-            var currentTabbingType = tabbingType;
-
-            // Search down inside the container
-            while ((nextTabElement = GetNextTabInGroup(nextTabElement, container, currentTabbingType)) != null)
-            {
-                // Avoid the endless loop here for Cycle groups
-                if (loopStartElement == nextTabElement)
-                    break;
-                if (loopStartElement == null)
-                    loopStartElement = nextTabElement;
-
-                var firstTabElementInside = GetNextTab(null, nextTabElement, true);
-                if (firstTabElementInside != null)
-                    return firstTabElementInside;
-
-                // If we want to continue searching inside the Once groups, we should change the navigation mode
-                if (currentTabbingType == KeyboardNavigationMode.Once)
-                    currentTabbingType = KeyboardNavigationMode.Contained;
-            }
-
-            // If there is no next element in the group (nextTabElement == null)
-
-            // Search up in the tree if allowed
-            // consider: Use original tabbingType instead of currentTabbingType
-            if (!goDownOnly && currentTabbingType != KeyboardNavigationMode.Contained && GetParent(container) != null)
-            {
-                return GetNextTab(container, GetGroupParent(container), false);
-            }
-
-            return null;
-        }
-
-        public static IInputElement? GetNextTabOutside(ICustomKeyboardNavigation e)
-        {
-            if (e is IInputElement container)
-            {
-                var last = GetLastInTree(container);
-
-                if (last is object)
-                    return GetNextTab(last, false);
-            }
-
-            return null;
-        }
-
-        public static IInputElement? GetPrevTab(IInputElement? e, IInputElement? container, bool goDownOnly)
-        {
-            if (e is null && container is null)
-                throw new InvalidOperationException("Either 'e' or 'container' must be non-null.");
-
-            if (container is null)
-                container = GetGroupParent(e!);
-
-            KeyboardNavigationMode tabbingType = GetKeyNavigationMode(container);
-
-            if (e == null)
-            {
-                // Using ActiveElement if set
-                var activeElement = GetActiveElement(container);
-                if (activeElement != null)
-                    return GetPrevTab(null, activeElement, true);
-                else
-                {
-                    // If we Shift+Tab on a container with KeyboardNavigationMode=Once, and ActiveElement is null
-                    // then we want to go to the first item (not last) within the container
-                    if (tabbingType == KeyboardNavigationMode.Once)
-                    {
-                        var firstTabElement = GetNextTabInGroup(null, container, tabbingType);
-                        if (firstTabElement == null)
-                        {
-                            if (IsTabStop(container))
-                                return container;
-                            if (goDownOnly)
-                                return null;
-
-                            return GetPrevTab(container, null, false);
-                        }
-                        else
-                        {
-                            return GetPrevTab(null, firstTabElement, true);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
-                {
-                    if (goDownOnly || container == e)
-                        return null;
-
-                    // FocusedElement should not be e otherwise we will delegate focus to the same element
-                    if (IsTabStop(container))
-                        return container;
-
-                    return GetPrevTab(container, null, false);
-                }
-            }
-
-            // All groups (except Once) - continue
-            IInputElement? loopStartElement = null;
-            IInputElement? nextTabElement = e;
-
-            // Look for element with the same TabIndex before the current element
-            while ((nextTabElement = GetPrevTabInGroup(nextTabElement, container, tabbingType)) != null)
-            {
-                if (nextTabElement == container && tabbingType == KeyboardNavigationMode.Local)
-                    break;
-
-                // At this point nextTabElement is TabStop or TabGroup
-                // In case it is a TabStop only return the element
-                if (IsTabStop(nextTabElement) && !IsGroup(nextTabElement))
-                    return nextTabElement;
-
-                // Avoid the endless loop here
-                if (loopStartElement == nextTabElement)
-                    break;
-                if (loopStartElement == null)
-                    loopStartElement = nextTabElement;
-
-                // At this point nextTabElement is TabGroup
-                var lastTabElementInside = GetPrevTab(null, nextTabElement, true);
-                if (lastTabElementInside != null)
-                    return lastTabElementInside;
-            }
-
-            if (tabbingType == KeyboardNavigationMode.Contained)
-                return null;
-
-            if (e != container && IsTabStop(container))
-                return container;
-
-            // If end of the subtree is reached or there no other elements above
-            if (!goDownOnly && GetParent(container) != null)
-            {
-                return GetPrevTab(container, null, false);
-            }
-
-            return null;
-        }
-
-        public static IInputElement? GetPrevTabOutside(ICustomKeyboardNavigation e)
-        {
-            if (e is IInputElement container)
-            {
-                var first = GetFirstChild(container);
-
-                if (first is object)
-                    return GetPrevTab(first, null, false);
-            }
-
-            return null;
-        }
-
-        private static IInputElement? FocusedElement(IInputElement e)
-        {
-            var iie = e;
-            // Focus delegation is enabled only if keyboard focus is outside the container
-            if (iie != null && !iie.IsKeyboardFocusWithin)
-            {
-                var focusedElement = (FocusManager.Instance as FocusManager)?.GetFocusedElement(e);
-                if (focusedElement != null)
-                {
-                    if (!IsFocusScope(e))
-                    {
-                        // Verify if focusedElement is a visual descendant of e
-                        if (focusedElement is IVisual visualFocusedElement &&
-                            visualFocusedElement != e &&
-                            e.IsVisualAncestorOf(visualFocusedElement))
-                        {
-                            return focusedElement;
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetFirstChild(IInputElement e)
-        {
-            // If the element has a FocusedElement it should be its first child
-            if (FocusedElement(e) is IInputElement focusedElement)
-                return focusedElement;
-
-            // Return the first visible element.
-            var uiElement = e as InputElement;
-
-            if (uiElement is null || IsVisibleAndEnabled(uiElement))
-            {
-                if (e is IVisual elementAsVisual)
-                {
-                    var children = elementAsVisual.VisualChildren;
-                    var count = children.Count;
-
-                    for (int i = 0; i < count; i++)
-                    {
-                        if (children[i] is InputElement ie)
-                        {
-                            if (IsVisibleAndEnabled(ie))
-                                return ie;
-                            else
-                            {
-                                var firstChild = GetFirstChild(ie);
-                                if (firstChild != null)
-                                    return firstChild;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetLastChild(IInputElement e)
-        {
-            // If the element has a FocusedElement it should be its last child
-            if (FocusedElement(e) is IInputElement focusedElement)
-                return focusedElement;
-
-            // Return the last visible element.
-            var uiElement = e as InputElement;
-
-            if (uiElement == null || IsVisibleAndEnabled(uiElement))
-            {
-                var elementAsVisual = e as IVisual;
-
-                if (elementAsVisual != null)
-                {
-                    var children = elementAsVisual.VisualChildren;
-                    var count = children.Count;
-
-                    for (int i = count - 1; i >= 0; i--)
-                    {
-                        if (children[i] is InputElement ie)
-                        {
-                            if (IsVisibleAndEnabled(ie))
-                                return ie;
-                            else
-                            {
-                                var lastChild = GetLastChild(ie);
-                                if (lastChild != null)
-                                    return lastChild;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetFirstTabInGroup(IInputElement container)
-        {
-            IInputElement? firstTabElement = null;
-            int minIndexFirstTab = int.MinValue;
-
-            var currElement = container;
-            while ((currElement = GetNextInTree(currElement, container)) != null)
-            {
-                if (IsTabStopOrGroup(currElement))
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-
-                    if (currPriority < minIndexFirstTab || firstTabElement == null)
-                    {
-                        minIndexFirstTab = currPriority;
-                        firstTabElement = currElement;
-                    }
-                }
-            }
-            return firstTabElement;
-        }
-
-        private static IInputElement? GetLastInTree(IInputElement container)
-        {
-            IInputElement? result;
-            IInputElement? c = container;
-
-            do
-            {
-                result = c;
-                c = GetLastChild(c);
-            } while (c != null && !IsGroup(c));
-
-            if (c != null)
-                return c;
-
-            return result;
-        }
-
-        private static IInputElement? GetLastTabInGroup(IInputElement container)
-        {
-            IInputElement? lastTabElement = null;
-            int maxIndexFirstTab = int.MaxValue;
-            var currElement = GetLastInTree(container);
-            while (currElement != null && currElement != container)
-            {
-                if (IsTabStopOrGroup(currElement))
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-
-                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
-                    {
-                        maxIndexFirstTab = currPriority;
-                        lastTabElement = currElement;
-                    }
-                }
-                currElement = GetPreviousInTree(currElement, container);
-            }
-            return lastTabElement;
-        }
-
-        private static IInputElement? GetNextInTree(IInputElement e, IInputElement container)
-        {
-            IInputElement? result = null;
-
-            if (e == container || !IsGroup(e))
-                result = GetFirstChild(e);
-
-            if (result != null || e == container)
-                return result;
-
-            IInputElement? parent = e;
-            do
-            {
-                var sibling = GetNextSibling(parent);
-                if (sibling != null)
-                    return sibling;
-
-                parent = GetParent(parent);
-            } while (parent != null && parent != container);
-
-            return null;
-        }
-
-        private static IInputElement? GetNextSibling(IInputElement e)
-        {
-            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
-            {
-                var children = parentAsVisual.VisualChildren;
-                var count = children.Count;
-                var i = 0;
-
-                //go till itself
-                for (; i < count; i++)
-                {
-                    var vchild = children[i];
-                    if (vchild == elementAsVisual)
-                        break;
-                }
-                i++;
-                //search ahead
-                for (; i < count; i++)
-                {
-                    var visual = children[i];
-                    if (visual is IInputElement ie)
-                        return ie;
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetNextTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // None groups: Tab navigation is not supported
-            if (tabbingType == KeyboardNavigationMode.None)
-                return null;
-
-            // e == null or e == container -> return the first TabStopOrGroup
-            if (e == null || e == container)
-            {
-                return GetFirstTabInGroup(container);
-            }
-
-            if (tabbingType == KeyboardNavigationMode.Once)
-                return null;
-
-            var nextTabElement = GetNextTabWithSameIndex(e, container);
-            if (nextTabElement != null)
-                return nextTabElement;
-
-            return GetNextTabWithNextIndex(e, container, tabbingType);
-        }
-
-        private static IInputElement? GetNextTabWithSameIndex(IInputElement e, IInputElement container)
-        {
-            var elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-            var currElement = e;
-            while ((currElement = GetNextInTree(currElement, container)) != null)
-            {
-                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority)
-                {
-                    return currElement;
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetNextTabWithNextIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // Find the next min index in the tree
-            // min (index>currentTabIndex)
-            IInputElement? nextTabElement = null;
-            IInputElement? firstTabElement = null;
-            int minIndexFirstTab = int.MinValue;
-            int minIndex = int.MinValue;
-            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-
-            IInputElement? currElement = container;
-            while ((currElement = GetNextInTree(currElement, container)) != null)
-            {
-                if (IsTabStopOrGroup(currElement))
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-                    if (currPriority > elementTabPriority)
-                    {
-                        if (currPriority < minIndex || nextTabElement == null)
-                        {
-                            minIndex = currPriority;
-                            nextTabElement = currElement;
-                        }
-                    }
-
-                    if (currPriority < minIndexFirstTab || firstTabElement == null)
-                    {
-                        minIndexFirstTab = currPriority;
-                        firstTabElement = currElement;
-                    }
-                }
-            }
-
-            // Cycle groups: if not found - return first element
-            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
-                nextTabElement = firstTabElement;
-
-            return nextTabElement;
-        }
-
-        private static IInputElement? GetPrevTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // None groups: Tab navigation is not supported
-            if (tabbingType == KeyboardNavigationMode.None)
-                return null;
-
-            // Search the last index inside the group
-            if (e == null)
-            {
-                return GetLastTabInGroup(container);
-            }
-
-            if (tabbingType == KeyboardNavigationMode.Once)
-                return null;
-
-            if (e == container)
-                return null;
-
-            var nextTabElement = GetPrevTabWithSameIndex(e, container);
-            if (nextTabElement != null)
-                return nextTabElement;
-
-            return GetPrevTabWithPrevIndex(e, container, tabbingType);
-        }
-
-        private static IInputElement? GetPrevTabWithSameIndex(IInputElement e, IInputElement container)
-        {
-            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-            var currElement = GetPreviousInTree(e, container);
-            while (currElement != null)
-            {
-                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority && currElement != container)
-                {
-                    return currElement;
-                }
-                currElement = GetPreviousInTree(currElement, container);
-            }
-            return null;
-        }
-
-        private static IInputElement? GetPrevTabWithPrevIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // Find the next max index in the tree
-            // max (index<currentTabIndex)
-            IInputElement? lastTabElement = null;
-            IInputElement? nextTabElement = null;
-            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-            int maxIndexFirstTab = Int32.MaxValue;
-            int maxIndex = Int32.MaxValue;
-            var currElement = GetLastInTree(container);
-            while (currElement != null)
-            {
-                if (IsTabStopOrGroup(currElement) && currElement != container)
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-                    if (currPriority < elementTabPriority)
-                    {
-                        if (currPriority > maxIndex || nextTabElement == null)
-                        {
-                            maxIndex = currPriority;
-                            nextTabElement = currElement;
-                        }
-                    }
-
-                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
-                    {
-                        maxIndexFirstTab = currPriority;
-                        lastTabElement = currElement;
-                    }
-                }
-
-                currElement = GetPreviousInTree(currElement, container);
-            }
-
-            // Cycle groups: if not found - return first element
-            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
-                nextTabElement = lastTabElement;
-
-            return nextTabElement;
-        }
-
-        private static IInputElement? GetPreviousInTree(IInputElement e, IInputElement container)
-        {
-            if (e == container)
-                return null;
-
-            var result = GetPreviousSibling(e);
-
-            if (result != null)
-            {
-                if (IsGroup(result))
-                    return result;
-                else
-                    return GetLastInTree(result);
-            }
-            else
-                return GetParent(e);
-        }
-
-        private static IInputElement? GetPreviousSibling(IInputElement e)
-        {
-            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
-            {
-                var children = parentAsVisual.VisualChildren;
-                var count = children.Count;
-                IInputElement? prev = null;
-                
-                for (int i = 0; i < count; i++)
-                {
-                    var vchild = children[i];
-                    if (vchild == elementAsVisual)
-                        break;
-                    if (vchild is IInputElement ie && IsVisibleAndEnabled(ie))
-                        prev = ie;
-                }
-                return prev;
-            }
-            return null;
-        }
-
-        private static IInputElement? GetActiveElement(IInputElement e)
-        {
-            return ((IAvaloniaObject)e).GetValue(KeyboardNavigation.TabOnceActiveElementProperty);
-        }
-
-        private static IInputElement GetGroupParent(IInputElement e) => GetGroupParent(e, false);
-
-        private static IInputElement GetGroupParent(IInputElement element, bool includeCurrent)
-        {
-            var result = element; // Keep the last non null element
-            var e = element;
-
-            // If we don't want to include the current element,
-            // start at the parent of the element.  If the element
-            // is the root, then just return it as the group parent.
-            if (!includeCurrent)
-            {
-                result = e;
-                e = GetParent(e);
-                if (e == null)
-                    return result;
-            }
-
-            while (e != null)
-            {
-                if (IsGroup(e))
-                    return e;
-
-                result = e;
-                e = GetParent(e);
-            }
-
-            return result;
-        }
-
-        private static IInputElement? GetParent(IInputElement e)
-        {
-            // For Visual - go up the visual parent chain until we find Visual.
-            if (e is IVisual v)
-                return v.FindAncestorOfType<IInputElement>();
-
-            // This will need to be implemented when we have non-visual input elements.
-            throw new NotSupportedException();
-        }
-
-        private static KeyboardNavigationMode GetKeyNavigationMode(IInputElement e)
-        {
-            return ((IAvaloniaObject)e).GetValue(KeyboardNavigation.TabNavigationProperty);
-        }
-        private static bool IsFocusScope(IInputElement e) => FocusManager.GetIsFocusScope(e) || GetParent(e) == null;
-        private static bool IsGroup(IInputElement e) => GetKeyNavigationMode(e) != KeyboardNavigationMode.Continue;
-
-        private static bool IsTabStop(IInputElement e)
-        {
-            if (e is InputElement ie)
-                return ie.Focusable && KeyboardNavigation.GetIsTabStop(ie) && ie.IsVisible && ie.IsEnabled;
-            return false;
-        }
-
-        private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
-        private static bool IsVisibleAndEnabled(IInputElement e) => e.IsVisible && e.IsEnabled;
-    }
-}
diff --git a/src/Avalonia.Input/Platform/IClipboard.cs b/src/Avalonia.Input/Platform/IClipboard.cs
deleted file mode 100644
index eb880904eb..0000000000
--- a/src/Avalonia.Input/Platform/IClipboard.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Avalonia.Input.Platform
-{
-    public interface IClipboard
-    {
-        Task<string> GetTextAsync();
-
-        Task SetTextAsync(string text);
-
-        Task ClearAsync();
-
-        Task SetDataObjectAsync(IDataObject data);
-        
-        Task<string[]> GetFormatsAsync();
-        
-        Task<object> GetDataAsync(string format);
-    }
-}
diff --git a/src/Avalonia.Input/Platform/ICursorImpl.cs b/src/Avalonia.Input/Platform/ICursorImpl.cs
deleted file mode 100644
index 14235869f7..0000000000
--- a/src/Avalonia.Input/Platform/ICursorImpl.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Avalonia.Input;
-
-#nullable enable
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Represents a platform implementation of a <see cref="Cursor"/>.
-    /// </summary>
-    public interface ICursorImpl : IDisposable
-    {
-    }
-}
diff --git a/src/Avalonia.Input/Platform/IPlatformDragSource.cs b/src/Avalonia.Input/Platform/IPlatformDragSource.cs
deleted file mode 100644
index 30d8ee5337..0000000000
--- a/src/Avalonia.Input/Platform/IPlatformDragSource.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Avalonia.Input.Platform
-{
-    public interface IPlatformDragSource
-    {
-        Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects);
-    }
-}
diff --git a/src/Avalonia.Input/PointerDeltaEventArgs.cs b/src/Avalonia.Input/PointerDeltaEventArgs.cs
deleted file mode 100644
index b3085a038d..0000000000
--- a/src/Avalonia.Input/PointerDeltaEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class PointerDeltaEventArgs : PointerEventArgs
-    {
-        public Vector Delta { get; set; }
-
-        public PointerDeltaEventArgs(RoutedEvent routedEvent, IInteractive? source, 
-            IPointer pointer, IVisual rootVisual, Point rootVisualPosition, ulong timestamp,
-            PointerPointProperties properties, KeyModifiers modifiers, Vector delta) 
-            : base(routedEvent, source, pointer, rootVisual, rootVisualPosition,
-                timestamp, properties, modifiers)
-        {
-            Delta = delta;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/PointerEventArgs.cs b/src/Avalonia.Input/PointerEventArgs.cs
deleted file mode 100644
index 0604d09dc4..0000000000
--- a/src/Avalonia.Input/PointerEventArgs.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class PointerEventArgs : RoutedEventArgs
-    {
-        private readonly IVisual? _rootVisual;
-        private readonly Point _rootVisualPosition;
-        private readonly PointerPointProperties _properties;
-        private Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
-
-        public PointerEventArgs(RoutedEvent routedEvent,
-            IInteractive? source,
-            IPointer pointer,
-            IVisual? rootVisual, Point rootVisualPosition,
-            ulong timestamp,
-            PointerPointProperties properties,
-            KeyModifiers modifiers)
-           : base(routedEvent)
-        {
-            Source = source;
-            _rootVisual = rootVisual;
-            _rootVisualPosition = rootVisualPosition;
-            _properties = properties;
-            Pointer = pointer;
-            Timestamp = timestamp;
-            KeyModifiers = modifiers;
-        }
-        
-        public PointerEventArgs(RoutedEvent routedEvent,
-            IInteractive? source,
-            IPointer pointer,
-            IVisual? rootVisual, Point rootVisualPosition,
-            ulong timestamp,
-            PointerPointProperties properties,
-            KeyModifiers modifiers,
-            Lazy<IReadOnlyList<RawPointerPoint>?>? previousPoints)
-            : this(routedEvent, source, pointer, rootVisual, rootVisualPosition, timestamp, properties, modifiers)
-        {
-            _previousPoints = previousPoints;
-        }
-        
-
-        class EmulatedDevice : IPointerDevice
-        {
-            private readonly PointerEventArgs _ev;
-
-            public EmulatedDevice(PointerEventArgs ev)
-            {
-                _ev = ev;
-            }
-            
-            public void ProcessRawEvent(RawInputEventArgs ev) => throw new NotSupportedException();
-
-            public IInputElement? Captured => _ev.Pointer.Captured;
-            public void Capture(IInputElement? control)
-            {
-                _ev.Pointer.Capture(control);
-            }
-
-            public Point GetPosition(IVisual relativeTo) => _ev.GetPosition(relativeTo);
-        }
-
-        public IPointer Pointer { get; }
-        public ulong Timestamp { get; }
-
-        private IPointerDevice? _device;
-
-        [Obsolete("Use Pointer to get pointer-specific information")]
-        public IPointerDevice Device => _device ?? (_device = new EmulatedDevice(this));
-
-        [Obsolete("Use KeyModifiers and PointerPointProperties")]
-        public InputModifiers InputModifiers 
-        {
-            get
-            {
-                var mods = (InputModifiers)KeyModifiers;
-                if (_properties.IsLeftButtonPressed)
-                    mods |= InputModifiers.LeftMouseButton;
-                if (_properties.IsMiddleButtonPressed)
-                    mods |= InputModifiers.MiddleMouseButton;
-                if (_properties.IsRightButtonPressed)
-                    mods |= InputModifiers.RightMouseButton;
-                
-                return mods;
-            }
-        }
-        
-        public KeyModifiers KeyModifiers { get; }
-
-        private Point GetPosition(Point pt, IVisual? relativeTo)
-        {
-            if (_rootVisual == null)
-                return default;
-            if (relativeTo == null)
-                return pt;
-            return pt * _rootVisual.TransformToVisual(relativeTo) ?? default;
-        }
-        
-        public Point GetPosition(IVisual? relativeTo) => GetPosition(_rootVisualPosition, relativeTo);
-
-        [Obsolete("Use GetCurrentPoint")]
-        public PointerPoint GetPointerPoint(IVisual? relativeTo) => GetCurrentPoint(relativeTo);
-        
-        /// <summary>
-        /// Returns the PointerPoint associated with the current event
-        /// </summary>
-        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
-        /// <returns></returns>
-        public PointerPoint GetCurrentPoint(IVisual? relativeTo)
-            => new PointerPoint(Pointer, GetPosition(relativeTo), _properties);
-
-        /// <summary>
-        /// Returns the PointerPoint associated with the current event
-        /// </summary>
-        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
-        /// <returns></returns>
-        public IReadOnlyList<PointerPoint> GetIntermediatePoints(IVisual? relativeTo)
-        {
-            var previousPoints = _previousPoints?.Value;            
-            if (previousPoints == null || previousPoints.Count == 0)
-                return new[] { GetCurrentPoint(relativeTo) };
-            var points = new PointerPoint[previousPoints.Count + 1];
-            for (var c = 0; c < previousPoints.Count; c++)
-            {
-                var pt = previousPoints[c];
-                points[c] = new PointerPoint(Pointer, GetPosition(pt.Position, relativeTo), _properties);
-            }
-
-            points[points.Length - 1] = GetCurrentPoint(relativeTo);
-            return points;
-        }
-
-        /// <summary>
-        /// Returns the current pointer point properties
-        /// </summary>
-        protected PointerPointProperties Properties => _properties;
-    }
-    
-    public enum MouseButton
-    {
-        None,
-        Left,
-        Right,
-        Middle,
-        XButton1,
-        XButton2
-    }
-
-    public class PointerPressedEventArgs : PointerEventArgs
-    {
-        private readonly int _clickCount;
-
-        public PointerPressedEventArgs(
-            IInteractive source,
-            IPointer pointer,
-            IVisual rootVisual, Point rootVisualPosition,
-            ulong timestamp,
-            PointerPointProperties properties,
-            KeyModifiers modifiers,
-            int clickCount = 1)
-            : base(InputElement.PointerPressedEvent, source, pointer, rootVisual, rootVisualPosition,
-                timestamp, properties, modifiers)
-        {
-            _clickCount = clickCount;
-        }
-
-        public int ClickCount => _clickCount;
-
-        [Obsolete("Use PointerPressedEventArgs.GetCurrentPoint(this).Properties")]
-        public MouseButton MouseButton => Properties.PointerUpdateKind.GetMouseButton();
-    }
-
-    public class PointerReleasedEventArgs : PointerEventArgs
-    {
-        public PointerReleasedEventArgs(
-            IInteractive source, IPointer pointer,
-            IVisual rootVisual, Point rootVisualPosition, ulong timestamp,
-            PointerPointProperties properties, KeyModifiers modifiers,
-            MouseButton initialPressMouseButton)
-            : base(InputElement.PointerReleasedEvent, source, pointer, rootVisual, rootVisualPosition,
-                timestamp, properties, modifiers)
-        {
-            InitialPressMouseButton = initialPressMouseButton;
-        }
-
-        /// <summary>
-        /// Gets the mouse button that triggered the corresponding PointerPressed event
-        /// </summary>
-        public MouseButton InitialPressMouseButton { get; }
-
-        [Obsolete("Use InitialPressMouseButton")]
-        public MouseButton MouseButton => InitialPressMouseButton;
-    }
-
-    public class PointerCaptureLostEventArgs : RoutedEventArgs
-    {
-        public IPointer Pointer { get; }
-
-        public PointerCaptureLostEventArgs(IInteractive source, IPointer pointer) : base(InputElement.PointerCaptureLostEvent)
-        {
-            Pointer = pointer;
-            Source = source;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/PointerPoint.cs b/src/Avalonia.Input/PointerPoint.cs
deleted file mode 100644
index 9f8285a8e1..0000000000
--- a/src/Avalonia.Input/PointerPoint.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-namespace Avalonia.Input
-{
-    public sealed class PointerPoint
-    {
-        public PointerPoint(IPointer pointer, Point position, PointerPointProperties properties)
-        {
-            Pointer = pointer;
-            Position = position;
-            Properties = properties;
-        }
-        public IPointer Pointer { get; }
-        public PointerPointProperties Properties { get; }
-        public Point Position { get; }
-    }
-
-    public sealed class PointerPointProperties
-    {
-        public bool IsLeftButtonPressed { get; }
-        public bool IsMiddleButtonPressed { get; }
-        public bool IsRightButtonPressed { get; }
-        public bool IsXButton1Pressed { get; }
-        public bool IsXButton2Pressed { get; }
-
-        public PointerUpdateKind PointerUpdateKind { get; }
-
-        private PointerPointProperties()
-        {            
-        }
-        
-        public PointerPointProperties(RawInputModifiers modifiers, PointerUpdateKind kind)
-        {
-            PointerUpdateKind = kind;
-
-            IsLeftButtonPressed = modifiers.HasAllFlags(RawInputModifiers.LeftMouseButton);
-            IsMiddleButtonPressed = modifiers.HasAllFlags(RawInputModifiers.MiddleMouseButton);
-            IsRightButtonPressed = modifiers.HasAllFlags(RawInputModifiers.RightMouseButton);
-            IsXButton1Pressed = modifiers.HasAllFlags(RawInputModifiers.XButton1MouseButton);
-            IsXButton2Pressed = modifiers.HasAllFlags(RawInputModifiers.XButton2MouseButton);
-
-            // The underlying input source might be reporting the previous state,
-            // so make sure that we reflect the current state
-            
-            if (kind == PointerUpdateKind.LeftButtonPressed)
-                IsLeftButtonPressed = true;
-            if (kind == PointerUpdateKind.LeftButtonReleased)
-                IsLeftButtonPressed = false;
-            if (kind == PointerUpdateKind.MiddleButtonPressed)
-                IsMiddleButtonPressed = true;
-            if (kind == PointerUpdateKind.MiddleButtonReleased)
-                IsMiddleButtonPressed = false;
-            if (kind == PointerUpdateKind.RightButtonPressed)
-                IsRightButtonPressed = true;
-            if (kind == PointerUpdateKind.RightButtonReleased)
-                IsRightButtonPressed = false;
-            if (kind == PointerUpdateKind.XButton1Pressed)
-                IsXButton1Pressed = true;
-            if (kind == PointerUpdateKind.XButton1Released)
-                IsXButton1Pressed = false;
-            if (kind == PointerUpdateKind.XButton2Pressed)
-                IsXButton2Pressed = true;
-            if (kind == PointerUpdateKind.XButton2Released)
-                IsXButton2Pressed = false;
-        }
-
-        public static PointerPointProperties None { get; } = new PointerPointProperties();
-    }
-
-    public enum PointerUpdateKind
-    {
-        LeftButtonPressed,
-        MiddleButtonPressed,
-        RightButtonPressed,
-        XButton1Pressed,
-        XButton2Pressed,
-        LeftButtonReleased,
-        MiddleButtonReleased,
-        RightButtonReleased,
-        XButton1Released,
-        XButton2Released,
-        Other
-    }
-
-    public static class PointerUpdateKindExtensions
-    {
-        public static MouseButton GetMouseButton(this PointerUpdateKind kind)
-        {
-            if (kind == PointerUpdateKind.LeftButtonPressed || kind == PointerUpdateKind.LeftButtonReleased)
-                return MouseButton.Left;
-            if (kind == PointerUpdateKind.MiddleButtonPressed || kind == PointerUpdateKind.MiddleButtonReleased)
-                return MouseButton.Middle;
-            if (kind == PointerUpdateKind.RightButtonPressed || kind == PointerUpdateKind.RightButtonReleased)
-                return MouseButton.Right;
-            if (kind == PointerUpdateKind.XButton1Pressed || kind == PointerUpdateKind.XButton1Released)
-                return MouseButton.XButton1;
-            if (kind == PointerUpdateKind.XButton2Pressed || kind == PointerUpdateKind.XButton2Released)
-                return MouseButton.XButton2;
-            return MouseButton.None;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/PointerWheelEventArgs.cs b/src/Avalonia.Input/PointerWheelEventArgs.cs
deleted file mode 100644
index e5701dcf23..0000000000
--- a/src/Avalonia.Input/PointerWheelEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class PointerWheelEventArgs : PointerEventArgs
-    {
-        public Vector Delta { get; set; }
-
-        public PointerWheelEventArgs(IInteractive source, IPointer pointer, IVisual rootVisual,
-            Point rootVisualPosition, ulong timestamp,
-            PointerPointProperties properties, KeyModifiers modifiers, Vector delta) 
-            : base(InputElement.PointerWheelChangedEvent, source, pointer, rootVisual, rootVisualPosition,
-                timestamp, properties, modifiers)
-        {
-            Delta = delta;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Properties/AssemblyInfo.cs b/src/Avalonia.Input/Properties/AssemblyInfo.cs
deleted file mode 100644
index 433f821ca3..0000000000
--- a/src/Avalonia.Input/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Reflection;
-using Avalonia.Metadata;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.GestureRecognizers")]
diff --git a/src/Avalonia.Input/Raw/IDragDropDevice.cs b/src/Avalonia.Input/Raw/IDragDropDevice.cs
deleted file mode 100644
index f7b7914bd1..0000000000
--- a/src/Avalonia.Input/Raw/IDragDropDevice.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Avalonia.Input.Raw
-{
-    public interface IDragDropDevice : IInputDevice
-    {
-    }
-}
diff --git a/src/Avalonia.Input/Raw/RawDragEvent.cs b/src/Avalonia.Input/Raw/RawDragEvent.cs
deleted file mode 100644
index 6e9ce20ff1..0000000000
--- a/src/Avalonia.Input/Raw/RawDragEvent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-namespace Avalonia.Input.Raw
-{
-    public class RawDragEvent : RawInputEventArgs
-    {
-        public Point Location { get; set; }
-        public IDataObject Data { get; }
-        public DragDropEffects Effects { get; set; }
-        public RawDragEventType Type { get; }
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers { get; }
-        public KeyModifiers KeyModifiers { get; }
-
-        public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
-            IInputRoot root, Point location, IDataObject data, DragDropEffects effects, RawInputModifiers modifiers)
-            :base(inputDevice, 0, root)
-        {
-            Type = type;
-            Location = location;
-            Data = data;
-            Effects = effects;
-            KeyModifiers = KeyModifiersUtils.ConvertToKey(modifiers);
-#pragma warning disable CS0618 // Type or member is obsolete
-            Modifiers = (InputModifiers)modifiers;
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs b/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
deleted file mode 100644
index c157fa059c..0000000000
--- a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Input.Raw
-{
-    public enum RawPointerEventType
-    {
-        LeaveWindow,
-        LeftButtonDown,
-        LeftButtonUp,
-        RightButtonDown,
-        RightButtonUp,
-        MiddleButtonDown,
-        MiddleButtonUp,
-        XButton1Down,
-        XButton1Up,
-        XButton2Down,
-        XButton2Up,
-        Move,
-        Wheel,
-        NonClientLeftButtonDown,
-        TouchBegin,
-        TouchUpdate,
-        TouchEnd,
-        TouchCancel,
-        Magnify,
-        Rotate,
-        Swipe
-    }
-
-    /// <summary>
-    /// A raw mouse event.
-    /// </summary>
-    public class RawPointerEventArgs : RawInputEventArgs
-    {
-        private RawPointerPoint _point;
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
-        /// </summary>
-        /// <param name="device">The associated device.</param>
-        /// <param name="timestamp">The event timestamp.</param>
-        /// <param name="root">The root from which the event originates.</param>
-        /// <param name="type">The type of the event.</param>
-        /// <param name="position">The mouse position, in client DIPs.</param>
-        /// <param name="inputModifiers">The input modifiers.</param>
-        public RawPointerEventArgs(
-            IInputDevice device,
-            ulong timestamp,
-            IInputRoot root,
-            RawPointerEventType type,
-            Point position, 
-            RawInputModifiers inputModifiers)
-            : base(device, timestamp, root)
-        {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
-
-            Position = position;
-            Type = type;
-            InputModifiers = inputModifiers;
-        }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
-        /// </summary>
-        /// <param name="device">The associated device.</param>
-        /// <param name="timestamp">The event timestamp.</param>
-        /// <param name="root">The root from which the event originates.</param>
-        /// <param name="type">The type of the event.</param>
-        /// <param name="point">The point properties and position, in client DIPs.</param>
-        /// <param name="inputModifiers">The input modifiers.</param>
-        public RawPointerEventArgs(
-            IInputDevice device,
-            ulong timestamp,
-            IInputRoot root,
-            RawPointerEventType type,
-            RawPointerPoint point, 
-            RawInputModifiers inputModifiers)
-            : base(device, timestamp, root)
-        {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
-
-            Point = point;
-            Type = type;
-            InputModifiers = inputModifiers;
-        }
-
-        /// <summary>
-        /// Gets the pointer properties and position, in client DIPs.
-        /// </summary>
-        public RawPointerPoint Point
-        {
-            get => _point;
-            set => _point = value;
-        }
-
-        /// <summary>
-        /// Gets the mouse position, in client DIPs.
-        /// </summary>
-        public Point Position
-        {
-            get => _point.Position;
-            set => _point.Position = value;
-        }
-
-        /// <summary>
-        /// Gets the type of the event.
-        /// </summary>
-        public RawPointerEventType Type { get; set; }
-
-        /// <summary>
-        /// Gets the input modifiers.
-        /// </summary>
-        public RawInputModifiers InputModifiers { get; set; }
-        
-        /// <summary>
-        /// Points that were traversed by a pointer since the previous relevant event,
-        /// only valid for Move and TouchUpdate
-        /// </summary>
-        public Lazy<IReadOnlyList<RawPointerPoint>?>? IntermediatePoints { get; set; }
-    }
-
-    public struct RawPointerPoint
-    {
-        /// <summary>
-        /// Pointer position, in client DIPs.
-        /// </summary>
-        public Point Position { get; set; }
-        
-        public RawPointerPoint()
-        {
-            Position = default;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Raw/RawTouchEventArgs.cs b/src/Avalonia.Input/Raw/RawTouchEventArgs.cs
deleted file mode 100644
index 020b40e55b..0000000000
--- a/src/Avalonia.Input/Raw/RawTouchEventArgs.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Avalonia.Input.Raw
-{
-    public class RawTouchEventArgs : RawPointerEventArgs
-    {
-        public RawTouchEventArgs(IInputDevice device, ulong timestamp, IInputRoot root,
-            RawPointerEventType type, Point position, RawInputModifiers inputModifiers,
-            long touchPointId) 
-            : base(device, timestamp, root, type, position, inputModifiers)
-        {
-            TouchPointId = touchPointId;
-        }
-
-        public long TouchPointId { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/ScrollGestureEventArgs.cs b/src/Avalonia.Input/ScrollGestureEventArgs.cs
deleted file mode 100644
index a682e8f0a4..0000000000
--- a/src/Avalonia.Input/ScrollGestureEventArgs.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input
-{
-    public class ScrollGestureEventArgs : RoutedEventArgs
-    {
-        public int Id { get; }
-        public Vector Delta { get; }
-        private static int _nextId = 1;
-
-        public static int GetNextFreeId() => _nextId++;
-        
-        public ScrollGestureEventArgs(int id, Vector delta) : base(Gestures.ScrollGestureEvent)
-        {
-            Id = id;
-            Delta = delta;
-        }
-    }
-
-    public class ScrollGestureEndedEventArgs : RoutedEventArgs
-    {
-        public int Id { get; }
-
-        public ScrollGestureEndedEventArgs(int id) : base(Gestures.ScrollGestureEndedEvent)
-        {
-            Id = id;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/TappedEventArgs.cs b/src/Avalonia.Input/TappedEventArgs.cs
deleted file mode 100644
index daaab70632..0000000000
--- a/src/Avalonia.Input/TappedEventArgs.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class TappedEventArgs : RoutedEventArgs
-    {
-        private readonly PointerEventArgs lastPointerEventArgs;
-
-        public TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
-            : base(routedEvent)
-        {
-            this.lastPointerEventArgs = lastPointerEventArgs;
-        }
-
-        public IPointer Pointer => lastPointerEventArgs.Pointer;
-        public KeyModifiers KeyModifiers => lastPointerEventArgs.KeyModifiers;
-        public ulong Timestamp => lastPointerEventArgs.Timestamp;
-        
-        public Point GetPosition(IVisual? relativeTo) => lastPointerEventArgs.GetPosition(relativeTo);
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs b/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs
deleted file mode 100644
index 5af8fe0251..0000000000
--- a/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input.TextInput
-{
-    public interface ITextInputMethodClient
-    {
-        /// <summary>
-        /// The cursor rectangle relative to the TextViewVisual
-        /// </summary>
-        Rect CursorRectangle { get; }
-        /// <summary>
-        /// Should be fired when cursor rectangle is changed inside the TextViewVisual
-        /// </summary>
-        event EventHandler? CursorRectangleChanged;
-        /// <summary>
-        /// The visual that's showing the text
-        /// </summary>
-        IVisual TextViewVisual { get; }
-        /// <summary>
-        /// Should be fired when text-hosting visual is changed
-        /// </summary>
-        event EventHandler? TextViewVisualChanged;
-        /// <summary>
-        /// Indicates if TextViewVisual is capable of displaying non-committed input on the cursor position
-        /// </summary>
-        bool SupportsPreedit { get; }
-        /// <summary>
-        /// Sets the non-committed input string
-        /// </summary>
-        void SetPreeditText(string text);
-        /// <summary>
-        /// Indicates if text input client is capable of providing the text around the cursor
-        /// </summary>
-        bool SupportsSurroundingText { get; }
-        /// <summary>
-        /// Returns the text around the cursor, usually the current paragraph, the cursor position inside that text and selection start position
-        /// </summary>
-        TextInputMethodSurroundingText SurroundingText { get; }
-        /// <summary>
-        /// Should be fired when surrounding text changed
-        /// </summary>
-        event EventHandler? SurroundingTextChanged;
-        /// <summary>
-        /// Returns the text before the cursor. Must return a non-empty string if cursor is not at the beginning of the text entry
-        /// </summary>
-        string? TextBeforeCursor { get; }
-        /// <summary>
-        /// Returns the text before the cursor. Must return a non-empty string if cursor is not at the end of the text entry
-        /// </summary>
-        string? TextAfterCursor { get; }
-    }
-
-    public struct TextInputMethodSurroundingText
-    {
-        public string Text { get; set; }
-        public int CursorOffset { get; set; }
-        public int AnchorOffset { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs b/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
deleted file mode 100644
index 2d24ed30a0..0000000000
--- a/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Avalonia.Input.TextInput
-{
-    public interface ITextInputMethodImpl
-    {
-        void SetActive(bool active);
-        void SetCursorRect(Rect rect);
-        void SetOptions(TextInputOptionsQueryEventArgs options);
-        void Reset();
-    }
-    
-    public interface ITextInputMethodRoot : IInputRoot
-    {
-        ITextInputMethodImpl? InputMethod { get; }
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/InputMethodManager.cs b/src/Avalonia.Input/TextInput/InputMethodManager.cs
deleted file mode 100644
index 64422a7fdf..0000000000
--- a/src/Avalonia.Input/TextInput/InputMethodManager.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input.TextInput
-{
-    internal class TextInputMethodManager
-    {
-        private ITextInputMethodImpl? _im;
-        private IInputElement? _focusedElement;
-        private ITextInputMethodClient? _client;
-        private readonly TransformTrackingHelper _transformTracker = new TransformTrackingHelper();
-
-        public TextInputMethodManager()
-        {
-            _transformTracker.MatrixChanged += UpdateCursorRect;
-            InputMethod.IsInputMethodEnabledProperty.Changed.Subscribe(OnIsInputMethodEnabledChanged);
-        }
-
-        private ITextInputMethodClient? Client
-        {
-            get => _client;
-            set
-            {
-                if(_client == value)
-                    return;
-                if (_client != null)
-                {
-                    _client.CursorRectangleChanged -= OnCursorRectangleChanged;
-                    _client.TextViewVisualChanged -= OnTextViewVisualChanged;
-                }
-
-                _client = value;
-                
-                if (_client != null)
-                {
-                    _client.CursorRectangleChanged += OnCursorRectangleChanged;
-                    _client.TextViewVisualChanged += OnTextViewVisualChanged;
-                    var optionsQuery = new TextInputOptionsQueryEventArgs
-                    {
-                        RoutedEvent = InputElement.TextInputOptionsQueryEvent
-                    };
-                    _focusedElement?.RaiseEvent(optionsQuery);
-                    _im?.Reset();
-                    _im?.SetOptions(optionsQuery);
-                    _transformTracker?.SetVisual(_client?.TextViewVisual);
-                    UpdateCursorRect();
-                    
-                    _im?.SetActive(true);
-                }
-                else
-                {
-                    _im?.SetActive(false);
-                    _transformTracker.SetVisual(null);
-                }
-            }
-        }
-
-        private void OnIsInputMethodEnabledChanged(AvaloniaPropertyChangedEventArgs<bool> obj)
-        {
-            if (ReferenceEquals(obj.Sender, _focusedElement))
-            {
-                TryFindAndApplyClient();
-            }
-        }
-
-        private void OnTextViewVisualChanged(object? sender, EventArgs e) 
-            => _transformTracker.SetVisual(_client?.TextViewVisual);
-
-        private void UpdateCursorRect()
-        {
-            if (_im == null || _client == null || _focusedElement?.VisualRoot == null)
-                return;
-
-            var transform = _focusedElement.TransformToVisual(_focusedElement.VisualRoot);
-            if (transform == null)
-                _im.SetCursorRect(default);
-            else
-                _im.SetCursorRect(_client.CursorRectangle.TransformToAABB(transform.Value));
-        }
-
-        private void OnCursorRectangleChanged(object? sender, EventArgs e)
-        {
-            if (sender == _client)
-                UpdateCursorRect();
-        }
-        
-        public void SetFocusedElement(IInputElement? element)
-        {
-            if(_focusedElement == element)
-                return;
-            _focusedElement = element;
-
-            var inputMethod = (element?.VisualRoot as ITextInputMethodRoot)?.InputMethod;
-            if (_im != inputMethod)
-                _im?.SetActive(false);
-
-            _im = inputMethod;
-
-            TryFindAndApplyClient();
-        }
-
-        private void TryFindAndApplyClient()
-        {
-            if (_focusedElement is not InputElement focused ||
-                _im == null ||
-                !InputMethod.GetIsInputMethodEnabled(focused))
-            {
-                Client = null;
-                return;
-            }
-
-            var clientQuery = new TextInputMethodClientRequestedEventArgs
-            {
-                RoutedEvent = InputElement.TextInputMethodClientRequestedEvent
-            };
-
-            _focusedElement.RaiseEvent(clientQuery);
-            Client = clientQuery.Client;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/TextInputContentType.cs b/src/Avalonia.Input/TextInput/TextInputContentType.cs
deleted file mode 100644
index 5d73fc1552..0000000000
--- a/src/Avalonia.Input/TextInput/TextInputContentType.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Avalonia.Input.TextInput
-{
-    public enum TextInputContentType
-    {
-        Normal = 0,
-        Email = 1,
-        Phone = 2,
-        Number = 3,
-        Url = 4,
-        Password = 5
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/TextInputOptionsQueryEventArgs.cs b/src/Avalonia.Input/TextInput/TextInputOptionsQueryEventArgs.cs
deleted file mode 100644
index 924d0eb166..0000000000
--- a/src/Avalonia.Input/TextInput/TextInputOptionsQueryEventArgs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input.TextInput
-{
-    public class TextInputOptionsQueryEventArgs : RoutedEventArgs
-    {
-        /// <summary>
-        /// The content type (mostly for determining the shape of the virtual keyboard)
-        /// </summary>
-        public TextInputContentType ContentType { get; set; }
-        /// <summary>
-        /// Text is multiline
-        /// </summary>
-        public bool Multiline { get; set; }
-        /// <summary>
-        /// Text is in lower case
-        /// </summary>
-        public bool Lowercase { get; set; }
-        /// <summary>
-        /// Text is in upper case
-        /// </summary>
-        public bool Uppercase { get; set; }
-        /// <summary>
-        /// Automatically capitalize letters at the start of the sentence
-        /// </summary>
-        public bool AutoCapitalization { get; set; }
-        /// <summary>
-        /// Text contains sensitive data like card numbers and should not be stored  
-        /// </summary>
-        public bool IsSensitive { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/TextInputEventArgs.cs b/src/Avalonia.Input/TextInputEventArgs.cs
deleted file mode 100644
index cda0103749..0000000000
--- a/src/Avalonia.Input/TextInputEventArgs.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input
-{
-    public class TextInputEventArgs : RoutedEventArgs
-    {
-        public IKeyboardDevice? Device { get; set; }
-
-        public string? Text { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/TouchDevice.cs b/src/Avalonia.Input/TouchDevice.cs
deleted file mode 100644
index 12ad182bf8..0000000000
--- a/src/Avalonia.Input/TouchDevice.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Input.Raw;
-using Avalonia.Platform;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Handles raw touch events
-    /// <remarks>
-    /// This class is supposed to be used on per-toplevel basis, don't use a shared one
-    /// </remarks>
-    /// </summary>
-    public class TouchDevice : IInputDevice, IDisposable
-    {
-        private readonly Dictionary<long, Pointer> _pointers = new Dictionary<long, Pointer>();
-        private bool _disposed;
-        private int _clickCount;
-        private Rect _lastClickRect;
-        private ulong _lastClickTime;
-        KeyModifiers GetKeyModifiers(RawInputModifiers modifiers) =>
-            (KeyModifiers)(modifiers & RawInputModifiers.KeyboardMask);
-
-        RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
-        {
-            var rv = modifiers &= RawInputModifiers.KeyboardMask;
-            if (isLeftButtonDown)
-                rv |= RawInputModifiers.LeftMouseButton;
-            return rv;
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs ev)
-        {
-            if (_disposed)
-                return;
-            var args = (RawTouchEventArgs)ev;
-            if (!_pointers.TryGetValue(args.TouchPointId, out var pointer))
-            {
-                if (args.Type == RawPointerEventType.TouchEnd)
-                    return;
-                var hit = args.Root.InputHitTest(args.Position);
-
-                _pointers[args.TouchPointId] = pointer = new Pointer(Pointer.GetNextFreeId(),
-                    PointerType.Touch, _pointers.Count == 0);
-                pointer.Capture(hit);
-            }
-
-
-            var target = pointer.Captured ?? args.Root;
-            if (args.Type == RawPointerEventType.TouchBegin)
-            {
-                if (_pointers.Count > 1)
-                {
-                    _clickCount = 1;
-                    _lastClickTime = 0;
-                    _lastClickRect = new Rect();
-                }
-                else
-                {
-                    var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
-
-                    if (!_lastClickRect.Contains(args.Position)
-                        || ev.Timestamp - _lastClickTime > settings.TouchDoubleClickTime.TotalMilliseconds)
-                    {
-                        _clickCount = 0;
-                    }
-                    ++_clickCount;
-                    _lastClickTime = ev.Timestamp;
-                    _lastClickRect = new Rect(args.Position, new Size())
-                        .Inflate(new Thickness(settings.TouchDoubleClickSize.Width / 2, settings.TouchDoubleClickSize.Height / 2));
-                }
-
-                target.RaiseEvent(new PointerPressedEventArgs(target, pointer,
-                    args.Root, args.Position, ev.Timestamp,
-                    new PointerPointProperties(GetModifiers(args.InputModifiers, true),
-                        PointerUpdateKind.LeftButtonPressed),
-                    GetKeyModifiers(args.InputModifiers), _clickCount));
-            }
-
-            if (args.Type == RawPointerEventType.TouchEnd)
-            {
-                _pointers.Remove(args.TouchPointId);
-                using (pointer)
-                {
-                    target.RaiseEvent(new PointerReleasedEventArgs(target, pointer,
-                        args.Root, args.Position, ev.Timestamp,
-                        new PointerPointProperties(GetModifiers(args.InputModifiers, false),
-                            PointerUpdateKind.LeftButtonReleased),
-                        GetKeyModifiers(args.InputModifiers), MouseButton.Left));
-                }
-            }
-
-            if (args.Type == RawPointerEventType.TouchCancel)
-            {
-                _pointers.Remove(args.TouchPointId);
-                using (pointer)
-                    pointer.Capture(null);
-            }
-
-            if (args.Type == RawPointerEventType.TouchUpdate)
-            {
-                var modifiers = GetModifiers(args.InputModifiers, pointer.IsPrimary);
-                target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, target, pointer, args.Root,
-                    args.Position, ev.Timestamp,
-                    new PointerPointProperties(GetModifiers(args.InputModifiers, true), PointerUpdateKind.Other),
-                    GetKeyModifiers(args.InputModifiers), args.IntermediatePoints));
-            }
-
-
-        }
-
-        public void Dispose()
-        {
-            if (_disposed)
-                return;
-            var values = _pointers.Values.ToList();
-            _pointers.Clear();
-            _disposed = true;
-            foreach (var p in values)
-                p.Dispose();
-        }
-
-    }
-}
diff --git a/src/Avalonia.Input/VectorEventArgs.cs b/src/Avalonia.Input/VectorEventArgs.cs
deleted file mode 100644
index 000fd52f69..0000000000
--- a/src/Avalonia.Input/VectorEventArgs.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input
-{
-    public class VectorEventArgs : RoutedEventArgs
-    {
-        public Vector Vector { get; set; }
-    }
-}
diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
deleted file mode 100644
index 03a53f7d86..0000000000
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
\ No newline at end of file
diff --git a/src/Avalonia.Interactivity/IInteractive.cs b/src/Avalonia.Interactivity/IInteractive.cs
deleted file mode 100644
index afda29e329..0000000000
--- a/src/Avalonia.Interactivity/IInteractive.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Interactivity
-{
-    /// <summary>
-    /// Interface for objects that raise routed events.
-    /// </summary>
-    public interface IInteractive
-    {
-        /// <summary>
-        /// Gets the interactive parent of the object for bubbling and tunneling events.
-        /// </summary>
-        IInteractive? InteractiveParent { get; }
-
-        /// <summary>
-        /// Adds a handler for the specified routed event.
-        /// </summary>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        /// <param name="routes">The routing strategies to listen to.</param>
-        /// <param name="handledEventsToo">Whether handled events should also be listened for.</param>
-        /// <returns>A disposable that terminates the event subscription.</returns>
-        void AddHandler(
-            RoutedEvent routedEvent,
-            Delegate handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false);
-
-        /// <summary>
-        /// Adds a handler for the specified routed event.
-        /// </summary>
-        /// <typeparam name="TEventArgs">The type of the event's args.</typeparam>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        /// <param name="routes">The routing strategies to listen to.</param>
-        /// <param name="handledEventsToo">Whether handled events should also be listened for.</param>
-        /// <returns>A disposable that terminates the event subscription.</returns>
-        void AddHandler<TEventArgs>(
-            RoutedEvent<TEventArgs> routedEvent,
-            EventHandler<TEventArgs> handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false) where TEventArgs : RoutedEventArgs;
-
-        /// <summary>
-        /// Removes a handler for the specified routed event.
-        /// </summary>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        void RemoveHandler(RoutedEvent routedEvent, Delegate handler);
-
-        /// <summary>
-        /// Removes a handler for the specified routed event.
-        /// </summary>
-        /// <typeparam name="TEventArgs">The type of the event's args.</typeparam>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        void RemoveHandler<TEventArgs>(RoutedEvent<TEventArgs> routedEvent, EventHandler<TEventArgs> handler)
-            where TEventArgs : RoutedEventArgs;
-
-        /// <summary>
-        /// Adds the object's handlers for a routed event to an event route.
-        /// </summary>
-        /// <param name="routedEvent">The event.</param>
-        /// <param name="route">The event route.</param>
-        void AddToEventRoute(RoutedEvent routedEvent, EventRoute route);
-
-        /// <summary>
-        /// Raises a routed event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        void RaiseEvent(RoutedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Interactivity/RoutedEvent.cs b/src/Avalonia.Interactivity/RoutedEvent.cs
deleted file mode 100644
index a9b7dc8c89..0000000000
--- a/src/Avalonia.Interactivity/RoutedEvent.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Reactive.Subjects;
-
-namespace Avalonia.Interactivity
-{
-    [Flags]
-    public enum RoutingStrategies
-    {
-        Direct = 0x01,
-        Tunnel = 0x02,
-        Bubble = 0x04,
-    }
-
-    public class RoutedEvent
-    {
-        private readonly Subject<(object, RoutedEventArgs)> _raised = new Subject<(object, RoutedEventArgs)>();
-        private readonly Subject<RoutedEventArgs> _routeFinished = new Subject<RoutedEventArgs>();
-
-        public RoutedEvent(
-            string name,
-            RoutingStrategies routingStrategies,
-            Type eventArgsType,
-            Type ownerType)
-        {
-            name = name ?? throw new ArgumentNullException(nameof(name));
-            eventArgsType = eventArgsType ?? throw new ArgumentNullException(nameof(name));
-            ownerType = ownerType ?? throw new ArgumentNullException(nameof(name));
-
-            if (!typeof(RoutedEventArgs).IsAssignableFrom(eventArgsType))
-            {
-                throw new InvalidCastException("eventArgsType must be derived from RoutedEventArgs.");
-            }
-
-            EventArgsType = eventArgsType;
-            Name = name;
-            OwnerType = ownerType;
-            RoutingStrategies = routingStrategies;
-        }
-
-        public Type EventArgsType { get; }
-
-        public string Name { get; }
-
-        public Type OwnerType { get; }
-
-        public RoutingStrategies RoutingStrategies { get; }
-
-        public bool HasRaisedSubscriptions => _raised.HasObservers;
-
-        public IObservable<(object, RoutedEventArgs)> Raised => _raised;
-        public IObservable<RoutedEventArgs> RouteFinished => _routeFinished;
-
-        public static RoutedEvent<TEventArgs> Register<TOwner, TEventArgs>(
-            string name,
-            RoutingStrategies routingStrategy)
-                where TEventArgs : RoutedEventArgs
-        {
-            name = name ?? throw new ArgumentNullException(nameof(name));
-
-            var routedEvent = new RoutedEvent<TEventArgs>(name, routingStrategy, typeof(TOwner));
-            RoutedEventRegistry.Instance.Register(typeof(TOwner), routedEvent);
-            return routedEvent;
-        }
-
-        public static RoutedEvent<TEventArgs> Register<TEventArgs>(
-            string name,
-            RoutingStrategies routingStrategy,
-            Type ownerType)
-                where TEventArgs : RoutedEventArgs
-        {
-            name = name ?? throw new ArgumentNullException(nameof(name));
-
-            var routedEvent = new RoutedEvent<TEventArgs>(name, routingStrategy, ownerType);
-            RoutedEventRegistry.Instance.Register(ownerType, routedEvent);
-            return routedEvent;
-        }
-
-        public IDisposable AddClassHandler(
-            Type targetType,
-            EventHandler<RoutedEventArgs> handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false)
-        {
-            return Raised.Subscribe(args =>
-            {
-                (object sender, RoutedEventArgs e) = args;
-
-                if (targetType.IsInstanceOfType(sender) &&
-                    (e.Route == RoutingStrategies.Direct || (e.Route & routes) != 0) &&
-                    (!e.Handled || handledEventsToo))
-                {
-                    handler(sender, e);
-                }
-            });
-        }
-
-        internal void InvokeRaised(object sender, RoutedEventArgs e)
-        {
-            _raised.OnNext((sender, e));
-        }
-
-        internal void InvokeRouteFinished(RoutedEventArgs e)
-        {
-            _routeFinished.OnNext(e);
-        }
-    }
-
-    public class RoutedEvent<TEventArgs> : RoutedEvent
-        where TEventArgs : RoutedEventArgs
-    {
-        public RoutedEvent(string name, RoutingStrategies routingStrategies, Type ownerType)
-            : base(name, routingStrategies, typeof(TEventArgs), ownerType)
-        {
-        }
-
-        [Obsolete("Use overload taking Action<TTarget, TEventArgs>.")]
-        public IDisposable AddClassHandler<TTarget>(
-            Func<TTarget, Action<TEventArgs>> handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false)
-            where TTarget : class, IInteractive
-        {
-            void Adapter(object? sender, RoutedEventArgs e)
-            {
-                if (sender is TTarget target && e is TEventArgs args)
-                {
-                    handler(target)(args);
-                }
-            }
-
-            return AddClassHandler(typeof(TTarget), Adapter, routes, handledEventsToo);
-        }
-
-        public IDisposable AddClassHandler<TTarget>(
-            Action<TTarget, TEventArgs> handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false) where TTarget : class, IInteractive
-        {
-            void Adapter(object? sender, RoutedEventArgs e)
-            {
-                if (sender is TTarget target && e is TEventArgs args)
-                {
-                    handler(target, args);
-                }
-            }
-
-            return AddClassHandler(typeof(TTarget), Adapter, routes, handledEventsToo);
-        }
-    }
-}
diff --git a/src/Avalonia.Interactivity/RoutedEventArgs.cs b/src/Avalonia.Interactivity/RoutedEventArgs.cs
deleted file mode 100644
index ccbb41b7dc..0000000000
--- a/src/Avalonia.Interactivity/RoutedEventArgs.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-
-namespace Avalonia.Interactivity
-{
-    public class RoutedEventArgs : EventArgs
-    {
-        public RoutedEventArgs()
-        {
-        }
-
-        public RoutedEventArgs(RoutedEvent? routedEvent)
-        {
-            RoutedEvent = routedEvent;
-        }
-
-        public RoutedEventArgs(RoutedEvent? routedEvent, IInteractive? source)
-        {
-            RoutedEvent = routedEvent;
-            Source = source;
-        }
-
-        public bool Handled { get; set; }
-
-        public RoutedEvent? RoutedEvent { get; set; }
-
-        public RoutingStrategies Route { get; set; }
-
-        public IInteractive? Source { get; set; }
-    }
-}
diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj
deleted file mode 100644
index f2c4b0540b..0000000000
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>  
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs b/src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs
deleted file mode 100644
index 1cdc775b13..0000000000
--- a/src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Provides data for the <see cref="Layoutable.EffectiveViewportChanged"/> event.
-    /// </summary>
-    public class EffectiveViewportChangedEventArgs : EventArgs
-    {
-        public EffectiveViewportChangedEventArgs(Rect effectiveViewport)
-        {
-            EffectiveViewport = effectiveViewport;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Rect"/> representing the effective viewport.
-        /// </summary>
-        /// <remarks>
-        /// The viewport is expressed in coordinates relative to the control that the event is
-        /// raised on.
-        /// </remarks>
-        public Rect EffectiveViewport { get; }
-    }
-}
diff --git a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs b/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
deleted file mode 100644
index 3e516b4f97..0000000000
--- a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
+++ /dev/null
@@ -1,767 +0,0 @@
-// This source file is adapted from the WinUI project.
-// (https://github.com/microsoft/microsoft-ui-xaml)
-//
-// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
-
-using System;
-using System.Collections.Specialized;
-using Avalonia.Logging;
-
-namespace Avalonia.Layout
-{
-    internal class FlowLayoutAlgorithm
-    {
-        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
-        private readonly ElementManager _elementManager = new ElementManager();
-        private Size _lastAvailableSize;
-        private double _lastItemSpacing;
-        private bool _collectionChangePending;
-        private VirtualizingLayoutContext? _context;
-        private IFlowLayoutAlgorithmDelegates? _algorithmCallbacks;
-        private Rect _lastExtent;
-        private int _firstRealizedDataIndexInsideRealizationWindow = -1;
-        private int _lastRealizedDataIndexInsideRealizationWindow = -1;
-
-        // If the scroll orientation is the same as the follow orientation
-        // we will only have one line since we will never wrap. In that case
-        // we do not want to align the line. We could potentially switch the
-        // meaning of line alignment in this case, but I'll hold off on that
-        // feature until someone asks for it - This is not a common scenario
-        // anyway. 
-        private bool _scrollOrientationSameAsFlow;
-
-        public Rect LastExtent => _lastExtent;
-
-        private bool IsVirtualizingContext
-        {
-            get
-            {
-                if (_context != null)
-                {
-                    var rect = _context.RealizationRect;
-                    bool hasInfiniteSize = double.IsInfinity(rect.Height) || double.IsInfinity(rect.Width);
-                    return !hasInfiniteSize;
-                }
-                return false;
-            }
-        }
-
-        private Rect RealizationRect => IsVirtualizingContext ? _context!.RealizationRect : new Rect(Size.Infinity);
-
-        public void InitializeForContext(VirtualizingLayoutContext context, IFlowLayoutAlgorithmDelegates callbacks)
-        {
-            _algorithmCallbacks = callbacks;
-            _context = context;
-            _elementManager.SetContext(context);
-        }
-
-        public void UninitializeForContext(VirtualizingLayoutContext context)
-        {
-            if (IsVirtualizingContext)
-            {
-                // This layout is about to be detached. Let go of all elements
-                // being held and remove the layout state from the context.
-                _elementManager.ClearRealizedRange();
-            }
-
-            context.LayoutState = null;
-        }
-
-        public Size Measure(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            bool isWrapping,
-            double minItemSpacing,
-            double lineSpacing,
-            int maxItemsPerLine,
-            ScrollOrientation orientation,
-            bool disableVirtualization,
-            string? layoutId)
-        {
-            _orientation.ScrollOrientation = orientation;
-
-            // If minor size is infinity, there is only one line and no need to align that line.
-            _scrollOrientationSameAsFlow = double.IsInfinity(_orientation.Minor(availableSize));
-            var realizationRect = RealizationRect;
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: MeasureLayout Realization({Rect})",
-                layoutId,
-                realizationRect);
-
-            var suggestedAnchorIndex = _context!.RecommendedAnchorIndex;
-            if (_elementManager.IsIndexValidInData(suggestedAnchorIndex))
-            {
-                var anchorRealized = _elementManager.IsDataIndexRealized(suggestedAnchorIndex);
-                if (!anchorRealized)
-                {
-                    MakeAnchor(_context, suggestedAnchorIndex, availableSize);
-                }
-            }
-
-            _elementManager.OnBeginMeasure(orientation);
-
-            int anchorIndex = GetAnchorIndex(availableSize, isWrapping, minItemSpacing, layoutId);
-            Generate(GenerateDirection.Forward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
-            Generate(GenerateDirection.Backward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
-            if (isWrapping && IsReflowRequired())
-            {
-                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Reflow Pass", layoutId);
-                var firstElementBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
-                _orientation.SetMinorStart(ref firstElementBounds, 0);
-                _elementManager.SetLayoutBoundsForRealizedIndex(0, firstElementBounds);
-                Generate(GenerateDirection.Forward, 0 /*anchorIndex*/, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
-            }
-
-            RaiseLineArranged();
-            _collectionChangePending = false;
-            _lastExtent = EstimateExtent(availableSize, layoutId);
-            SetLayoutOrigin();
-
-            return new Size(_lastExtent.Width, _lastExtent.Height);
-        }
-
-        public Size Arrange(
-            Size finalSize,
-            VirtualizingLayoutContext context,
-            bool isWrapping,
-            LineAlignment lineAlignment,
-            string? layoutId)
-        {
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: ArrangeLayout", layoutId);
-            ArrangeVirtualizingLayout(finalSize, lineAlignment, isWrapping, layoutId);
-
-            return new Size(
-                Math.Max(finalSize.Width, _lastExtent.Width),
-                Math.Max(finalSize.Height, _lastExtent.Height));
-        }
-
-        public void OnItemsSourceChanged(
-            object? source,
-            NotifyCollectionChangedEventArgs args,
-            VirtualizingLayoutContext context)
-        {
-            _elementManager.DataSourceChanged(source, args);
-            _collectionChangePending = true;
-        }
-
-        public Size MeasureElement(
-            ILayoutable element,
-            int index,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            var measureSize = _algorithmCallbacks!.Algorithm_GetMeasureSize(index, availableSize, context);
-            element.Measure(measureSize);
-            var provisionalArrangeSize = _algorithmCallbacks.Algorithm_GetProvisionalArrangeSize(index, measureSize, element.DesiredSize, context);
-            _algorithmCallbacks.Algorithm_OnElementMeasured(element, index, availableSize, measureSize, element.DesiredSize, provisionalArrangeSize, context);
-
-            return provisionalArrangeSize; 
-        }
-
-        private int GetAnchorIndex(
-            Size availableSize,
-            bool isWrapping,
-            double minItemSpacing,
-            string? layoutId)
-        {
-            int anchorIndex = -1;
-            var anchorPosition= new Point();
-            var context = _context;
-
-            if (!IsVirtualizingContext)
-            {
-                // Non virtualizing host, start generating from the element 0
-                anchorIndex = context!.ItemCount > 0 ? 0 : -1;
-            }
-            else
-            {       
-                bool isRealizationWindowConnected = _elementManager.IsWindowConnected(RealizationRect, _orientation.ScrollOrientation, _scrollOrientationSameAsFlow);
-                // Item spacing and size in non-virtualizing direction change can cause elements to reflow
-                // and get a new column position. In that case we need the anchor to be positioned in the 
-                // correct column.
-                bool needAnchorColumnRevaluation = isWrapping && (
-                    _orientation.Minor(_lastAvailableSize) != _orientation.Minor(availableSize) ||
-                    _lastItemSpacing != minItemSpacing ||
-                    _collectionChangePending);
-
-                var suggestedAnchorIndex = _context!.RecommendedAnchorIndex;
-
-                var isAnchorSuggestionValid = suggestedAnchorIndex >= 0 &&
-                    _elementManager.IsDataIndexRealized(suggestedAnchorIndex);
-
-                if (isAnchorSuggestionValid)
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Using suggested anchor {Anchor}", layoutId, suggestedAnchorIndex);
-                    anchorIndex = _algorithmCallbacks!.Algorithm_GetAnchorForTargetElement(
-                        suggestedAnchorIndex,
-                        availableSize,
-                        context!).Index;
-
-                    if (_elementManager.IsDataIndexRealized(anchorIndex))
-                    {
-                        var anchorBounds = _elementManager.GetLayoutBoundsForDataIndex(anchorIndex);
-                        if (needAnchorColumnRevaluation)
-                        {
-                            // We were provided a valid anchor, but its position might be incorrect because for example it is in
-                            // the wrong column. We do know that the anchor is the first element in the row, so we can force the minor position
-                            // to start at 0.
-                            anchorPosition = _orientation.MinorMajorPoint(0, _orientation.MajorStart(anchorBounds));
-                        }
-                        else
-                        {
-                            anchorPosition = new Point(anchorBounds.X, anchorBounds.Y);
-                        }
-                    }
-                    else if (anchorIndex >= 0)
-                    {
-                        // It is possible to end up in a situation during a collection change where GetAnchorForTargetElement returns an index
-                        // which is not in the realized range. Eg. insert one item at index 0 for a grid layout. 
-                        // SuggestedAnchor will be 1 (used to be 0) and GetAnchorForTargetElement will return 0 (left most item in row). However 0 is not in the
-                        // realized range yet. In this case we realize the gap between the target anchor and the suggested anchor.
-                        int firstRealizedDataIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(0);
-
-                        for (int i = firstRealizedDataIndex - 1; i >= anchorIndex; --i)
-                        {
-                            _elementManager.EnsureElementRealized(false /*forward*/, i, layoutId);
-                        }
-
-                        var anchorBounds = _elementManager.GetLayoutBoundsForDataIndex(suggestedAnchorIndex);
-                        anchorPosition = _orientation.MinorMajorPoint(0, _orientation.MajorStart(anchorBounds));
-                    }
-                }
-                else if (needAnchorColumnRevaluation || !isRealizationWindowConnected)
-                {
-                    if (needAnchorColumnRevaluation) { Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: NeedAnchorColumnReevaluation", layoutId); }
-                    if (!isRealizationWindowConnected) { Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Disconnected Window", layoutId); }
-
-                    // The anchor is based on the realization window because a connected ItemsRepeater might intersect the realization window
-                    // but not the visible window. In that situation, we still need to produce a valid anchor.
-                    var anchorInfo = _algorithmCallbacks!.Algorithm_GetAnchorForRealizationRect(availableSize, context!);
-                    anchorIndex = anchorInfo.Index;
-                    anchorPosition = _orientation.MinorMajorPoint(0, anchorInfo.Offset);
-                }
-                else
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Connected Window - picking first realized element as anchor", layoutId);
-                    // No suggestion - just pick first in realized range
-                    anchorIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(0);
-                    var firstElementBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
-                    anchorPosition = new Point(firstElementBounds.X, firstElementBounds.Y);
-                }
-            }
-
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Picked anchor: {Anchor}", layoutId, anchorIndex);
-            _firstRealizedDataIndexInsideRealizationWindow = _lastRealizedDataIndexInsideRealizationWindow = anchorIndex;
-            if (_elementManager.IsIndexValidInData(anchorIndex))
-            {
-                if (!_elementManager.IsDataIndexRealized(anchorIndex))
-                {
-                    // Disconnected, throw everything and create new anchor
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Disconnected Window - throwing away all realized elements", layoutId);
-                    _elementManager.ClearRealizedRange();
-
-                    var anchor = _context!.GetOrCreateElementAt(anchorIndex, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
-                    _elementManager.Add(anchor, anchorIndex);
-                }
-
-                var anchorElement = _elementManager.GetRealizedElement(anchorIndex);
-                var desiredSize = MeasureElement(anchorElement!, anchorIndex, availableSize, _context!);
-                var layoutBounds = new Rect(anchorPosition.X, anchorPosition.Y, desiredSize.Width, desiredSize.Height);
-                _elementManager.SetLayoutBoundsForDataIndex(anchorIndex, layoutBounds);
-
-                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Layout bounds of anchor {anchor} are ({Bounds})",
-                    layoutId,
-                    anchorIndex,
-                    layoutBounds);
-            }
-            else
-            {
-                // Throw everything away
-                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Anchor index is not valid - throwing away all realized elements",
-                    layoutId);
-                _elementManager.ClearRealizedRange();
-            }
-
-            // TODO: Perhaps we can track changes in the property setter
-            _lastAvailableSize = availableSize;
-            _lastItemSpacing = minItemSpacing;
-
-            return anchorIndex;
-        }
-
-        private void Generate(
-            GenerateDirection direction,
-            int anchorIndex,
-            Size availableSize,
-            double minItemSpacing,
-            double lineSpacing,
-            int maxItemsPerLine,
-            bool disableVirtualization,
-            string? layoutId)
-        {
-            if (anchorIndex != -1)
-            {
-                int step = (direction == GenerateDirection.Forward) ? 1 : -1;
-
-                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Generating {Direction} from anchor {Anchor}",
-                    layoutId,
-                    direction,
-                    anchorIndex);
-
-                int previousIndex = anchorIndex;
-                int currentIndex = anchorIndex + step;
-                var anchorBounds = _elementManager.GetLayoutBoundsForDataIndex(anchorIndex);
-                var lineOffset = _orientation.MajorStart(anchorBounds);
-                var lineMajorSize = _orientation.MajorSize(anchorBounds);
-                var countInLine = 1;
-                int count = 0;
-                bool lineNeedsReposition = false;
-
-                while (_elementManager.IsIndexValidInData(currentIndex) &&
-                    (disableVirtualization || ShouldContinueFillingUpSpace(previousIndex, direction)))
-                {
-                    // Ensure layout element.
-                    _elementManager.EnsureElementRealized(direction == GenerateDirection.Forward, currentIndex, layoutId);
-                    var currentElement = _elementManager.GetRealizedElement(currentIndex);
-                    var desiredSize = MeasureElement(currentElement!, currentIndex, availableSize, _context!);
-                    ++count;
-
-                    // Lay it out.
-                    var previousElement = _elementManager.GetRealizedElement(previousIndex);
-                    var currentBounds = new Rect(0, 0, desiredSize.Width, desiredSize.Height);
-                    var previousElementBounds = _elementManager.GetLayoutBoundsForDataIndex(previousIndex);
-
-                    if (direction == GenerateDirection.Forward)
-                    {
-                        double remainingSpace = _orientation.Minor(availableSize) - (_orientation.MinorStart(previousElementBounds) + _orientation.MinorSize(previousElementBounds) + minItemSpacing + _orientation.Minor(desiredSize));
-                        if (countInLine >= maxItemsPerLine || _algorithmCallbacks!.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
-                        {
-                            // No more space in this row. wrap to next row.
-                            _orientation.SetMinorStart(ref currentBounds, 0);
-                            _orientation.SetMajorStart(ref currentBounds, _orientation.MajorStart(previousElementBounds) + lineMajorSize + lineSpacing);
-
-                            if (lineNeedsReposition)
-                            {
-                                // reposition the previous line (countInLine items)
-                                for (int i = 0; i < countInLine; i++)
-                                {
-                                    var dataIndex = currentIndex - 1 - i;
-                                    var bounds = _elementManager.GetLayoutBoundsForDataIndex(dataIndex);
-                                    _orientation.SetMajorSize(ref bounds, lineMajorSize);
-                                    _elementManager.SetLayoutBoundsForDataIndex(dataIndex, bounds);
-                                }
-                            }
-
-                            // Setup for next line.
-                            lineMajorSize = _orientation.MajorSize(currentBounds);
-                            lineOffset = _orientation.MajorStart(currentBounds);
-                            lineNeedsReposition = false;
-                            countInLine = 1;
-                        }
-                        else
-                        {
-                            // More space is available in this row.
-                            _orientation.SetMinorStart(ref currentBounds, _orientation.MinorStart(previousElementBounds) + _orientation.MinorSize(previousElementBounds) + minItemSpacing);
-                            _orientation.SetMajorStart(ref currentBounds, lineOffset);
-                            lineMajorSize = Math.Max(lineMajorSize, _orientation.MajorSize(currentBounds));
-                            lineNeedsReposition = _orientation.MajorSize(previousElementBounds) != _orientation.MajorSize(currentBounds);
-                            countInLine++;
-                        }
-                    }
-                    else
-                    {
-                        // Backward 
-                        double remainingSpace = _orientation.MinorStart(previousElementBounds) - (_orientation.Minor(desiredSize) + minItemSpacing);
-                        if (countInLine >= maxItemsPerLine || _algorithmCallbacks!.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
-                        {
-                            // Does not fit, wrap to the previous row
-                            var availableSizeMinor = _orientation.Minor(availableSize);
-
-                            _orientation.SetMinorStart(ref currentBounds, !double.IsInfinity(availableSizeMinor) ? availableSizeMinor - _orientation.Minor(desiredSize) : 0);
-                            _orientation.SetMajorStart(ref currentBounds, lineOffset - _orientation.Major(desiredSize) - lineSpacing);
-
-                            if (lineNeedsReposition)
-                            {
-                                var previousLineOffset = _orientation.MajorStart(_elementManager.GetLayoutBoundsForDataIndex(currentIndex + countInLine + 1));
-                                // reposition the previous line (countInLine items)
-                                for (int i = 0; i < countInLine; i++)
-                                {
-                                    var dataIndex = currentIndex + 1 + i;
-                                    if (dataIndex != anchorIndex)
-                                    {
-                                        var bounds = _elementManager.GetLayoutBoundsForDataIndex(dataIndex);
-                                        _orientation.SetMajorStart(ref bounds, previousLineOffset - lineMajorSize - lineSpacing);
-                                        _orientation.SetMajorSize(ref bounds, lineMajorSize);
-                                        _elementManager.SetLayoutBoundsForDataIndex(dataIndex, bounds);
-                                        Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Corrected Layout bounds of element {Index} are ({Bounds})",
-                                            layoutId,
-                                            dataIndex,
-                                            bounds);
-                                    }
-                                }
-                            }
-
-                            // Setup for next line.
-                            lineMajorSize = _orientation.MajorSize(currentBounds);
-                            lineOffset = _orientation.MajorStart(currentBounds);
-                            lineNeedsReposition = false;
-                            countInLine = 1;
-                        }
-                        else
-                        {
-                            // Fits in this row. put it in the previous position
-                            _orientation.SetMinorStart(ref currentBounds, _orientation.MinorStart(previousElementBounds) - _orientation.Minor(desiredSize) - minItemSpacing);
-                            _orientation.SetMajorStart(ref currentBounds, lineOffset);
-                            lineMajorSize = Math.Max(lineMajorSize, _orientation.MajorSize(currentBounds));
-                            lineNeedsReposition = _orientation.MajorSize(previousElementBounds) != _orientation.MajorSize(currentBounds);
-                            countInLine++;
-                        }
-                    }
-
-                    _elementManager.SetLayoutBoundsForDataIndex(currentIndex, currentBounds);
-
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Layout bounds of element {Index} are ({Bounds}).",
-                        layoutId,
-                        currentIndex,
-                        currentBounds);
-                    previousIndex = currentIndex;
-                    currentIndex += step;
-                }
-
-                // If we did not reach the top or bottom of the extent, we realized one 
-                // extra item before we knew we were outside the realization window. Do not
-                // account for that element in the indices inside the realization window.
-                if (direction == GenerateDirection.Forward)
-                {
-                    int dataCount = _context!.ItemCount;
-                    _lastRealizedDataIndexInsideRealizationWindow = previousIndex == dataCount - 1 ? dataCount - 1 : previousIndex - 1;
-                    _lastRealizedDataIndexInsideRealizationWindow = Math.Max(0, _lastRealizedDataIndexInsideRealizationWindow);
-                }
-                else
-                {
-                    int dataCount = _context!.ItemCount;
-                    _firstRealizedDataIndexInsideRealizationWindow = previousIndex == 0 ? 0 : previousIndex + 1;
-                    _firstRealizedDataIndexInsideRealizationWindow = Math.Min(dataCount - 1, _firstRealizedDataIndexInsideRealizationWindow);
-                }
-
-                _elementManager.DiscardElementsOutsideWindow(direction == GenerateDirection.Forward, currentIndex);
-            }
-        }
-
-        private void MakeAnchor(
-            VirtualizingLayoutContext context,
-            int index,
-            Size availableSize)
-        {
-            _elementManager.ClearRealizedRange();
-            // FlowLayout requires that the anchor is the first element in the row.
-            var internalAnchor = _algorithmCallbacks!.Algorithm_GetAnchorForTargetElement(index, availableSize, context);
-
-            // No need to set the position of the anchor.
-            // (0,0) is fine for now since the extent can
-            // grow in any direction.
-            for (int dataIndex = internalAnchor.Index; dataIndex < index + 1; ++dataIndex)
-            {
-                var element = context.GetOrCreateElementAt(dataIndex, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
-                element.Measure(_algorithmCallbacks.Algorithm_GetMeasureSize(dataIndex, availableSize, context));
-                _elementManager.Add(element, dataIndex);
-            }
-        }
-
-        private bool IsReflowRequired()
-        {
-            // If first element is realized and is not at the very beginning we need to reflow.
-            return
-                _elementManager.GetRealizedElementCount() > 0 &&
-                _elementManager.GetDataIndexFromRealizedRangeIndex(0) == 0 &&
-                _orientation.MinorStart(_elementManager.GetLayoutBoundsForRealizedIndex(0)) != 0;
-        }
-
-        private bool ShouldContinueFillingUpSpace(
-            int index,
-            GenerateDirection direction)
-        {
-            bool shouldContinue = false;
-            if (!IsVirtualizingContext)
-            {
-                shouldContinue = true;
-            }
-            else
-            {
-                var realizationRect = _context!.RealizationRect;
-                var elementBounds = _elementManager.GetLayoutBoundsForDataIndex(index);
-
-                var elementMajorStart = _orientation.MajorStart(elementBounds);
-                var elementMajorEnd = _orientation.MajorEnd(elementBounds);
-                var rectMajorStart = _orientation.MajorStart(realizationRect);
-                var rectMajorEnd = _orientation.MajorEnd(realizationRect);
-
-                var elementMinorStart = _orientation.MinorStart(elementBounds);
-                var elementMinorEnd = _orientation.MinorEnd(elementBounds);
-                var rectMinorStart = _orientation.MinorStart(realizationRect);
-                var rectMinorEnd = _orientation.MinorEnd(realizationRect);
-
-                // Ensure that both minor and major directions are taken into consideration so that if the scrolling direction
-                // is the same as the flow direction we still stop at the end of the viewport rectangle.
-                shouldContinue =
-                    (direction == GenerateDirection.Forward && elementMajorStart < rectMajorEnd && elementMinorStart < rectMinorEnd) ||
-                    (direction == GenerateDirection.Backward && elementMajorEnd > rectMajorStart && elementMinorEnd > rectMinorStart);
-            }
-
-            return shouldContinue;
-        }
-
-        private Rect EstimateExtent(Size availableSize, string? layoutId)
-        {
-            ILayoutable? firstRealizedElement = null;
-            Rect firstBounds = new Rect();
-            ILayoutable? lastRealizedElement = null;
-            Rect lastBounds = new Rect();
-            int firstDataIndex = -1;
-            int lastDataIndex = -1;
-
-            if (_elementManager.GetRealizedElementCount() > 0)
-            {
-                firstRealizedElement = _elementManager.GetAt(0);
-                firstBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
-                firstDataIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(0);;
-
-                int last = _elementManager.GetRealizedElementCount() - 1;
-                lastRealizedElement = _elementManager.GetAt(last);
-                lastDataIndex = _elementManager.GetDataIndexFromRealizedRangeIndex(last);
-                lastBounds = _elementManager.GetLayoutBoundsForRealizedIndex(last);
-            }
-
-            Rect extent = _algorithmCallbacks!.Algorithm_GetExtent(
-                availableSize,
-                _context!,
-                firstRealizedElement,
-                firstDataIndex,
-                firstBounds,
-                lastRealizedElement,
-                lastDataIndex,
-                lastBounds);
-
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Extent: ({Bounds})", layoutId, extent);
-            return extent;
-        }
-
-        private void RaiseLineArranged()
-        {
-            var realizationRect = RealizationRect;
-            if (realizationRect.Width != 0.0f || realizationRect.Height != 0.0f)
-            {
-                int realizedElementCount = _elementManager.GetRealizedElementCount();
-                if (realizedElementCount > 0)
-                {
-                    int countInLine = 0;
-                    var previousElementBounds = _elementManager.GetLayoutBoundsForDataIndex(_firstRealizedDataIndexInsideRealizationWindow);
-                    var currentLineOffset = _orientation.MajorStart(previousElementBounds);
-                    var currentLineSize = _orientation.MajorSize(previousElementBounds);
-                    for (int currentDataIndex = _firstRealizedDataIndexInsideRealizationWindow; currentDataIndex <= _lastRealizedDataIndexInsideRealizationWindow; currentDataIndex++)
-                    {
-                        var currentBounds = _elementManager.GetLayoutBoundsForDataIndex(currentDataIndex);
-                        if (_orientation.MajorStart(currentBounds) != currentLineOffset)
-                        {
-                            // Staring a new line
-                            _algorithmCallbacks!.Algorithm_OnLineArranged(currentDataIndex - countInLine, countInLine, currentLineSize, _context!);
-                            countInLine = 0;
-                            currentLineOffset = _orientation.MajorStart(currentBounds);
-                            currentLineSize = 0;
-                        }
-
-                        currentLineSize = Math.Max(currentLineSize, _orientation.MajorSize(currentBounds));
-                        countInLine++;
-                        previousElementBounds = currentBounds;
-                    }
-
-                    // Raise for the last line.
-                    _algorithmCallbacks!.Algorithm_OnLineArranged(_lastRealizedDataIndexInsideRealizationWindow - countInLine + 1, countInLine, currentLineSize, _context!);
-                }
-            }
-        }
-
-        private void ArrangeVirtualizingLayout(
-            Size finalSize,
-            LineAlignment lineAlignment,
-            bool isWrapping,
-            string? layoutId)
-        {
-            // Walk through the realized elements one line at a time and 
-            // align them, Then call element.Arrange with the arranged bounds.
-            int realizedElementCount = _elementManager.GetRealizedElementCount();
-            if (realizedElementCount > 0)
-            {
-                var countInLine = 1;
-                var previousElementBounds = _elementManager.GetLayoutBoundsForRealizedIndex(0);
-                var currentLineOffset = _orientation.MajorStart(previousElementBounds);
-                var spaceAtLineStart = _orientation.MinorStart(previousElementBounds);
-                var spaceAtLineEnd = 0.0;
-                var currentLineSize = _orientation.MajorSize(previousElementBounds);
-                for (int i = 1; i < realizedElementCount; i++)
-                {
-                    var currentBounds = _elementManager.GetLayoutBoundsForRealizedIndex(i);
-                    if (_orientation.MajorStart(currentBounds) != currentLineOffset)
-                    {
-                        spaceAtLineEnd = _orientation.Minor(finalSize) - _orientation.MinorStart(previousElementBounds) - _orientation.MinorSize(previousElementBounds);
-                        PerformLineAlignment(i - countInLine, countInLine, spaceAtLineStart, spaceAtLineEnd, currentLineSize, lineAlignment, isWrapping, finalSize, layoutId);
-                        spaceAtLineStart = _orientation.MinorStart(currentBounds);
-                        countInLine = 0;
-                        currentLineOffset = _orientation.MajorStart(currentBounds);
-                        currentLineSize = 0;
-                    }
-
-                    countInLine++; // for current element
-                    currentLineSize = Math.Max(currentLineSize, _orientation.MajorSize(currentBounds));
-                    previousElementBounds = currentBounds;
-                }
-
-                // Last line - potentially have a property to customize
-                // aligning the last line or not.
-                if (countInLine > 0)
-                {
-                    var spaceAtEnd = _orientation.Minor(finalSize) - _orientation.MinorStart(previousElementBounds) - _orientation.MinorSize(previousElementBounds);
-                    PerformLineAlignment(realizedElementCount - countInLine, countInLine, spaceAtLineStart, spaceAtEnd, currentLineSize, lineAlignment, isWrapping, finalSize, layoutId);
-                }
-            }
-        }
-
-        // Align elements within a line. Note that this does not modify LayoutBounds. So if we get
-        // repeated measures, the LayoutBounds remain the same in each layout.
-        private void PerformLineAlignment(
-            int lineStartIndex,
-            int countInLine,
-            double spaceAtLineStart,
-            double spaceAtLineEnd,
-            double lineSize,
-            LineAlignment lineAlignment,
-            bool isWrapping,
-            Size finalSize,
-            string? layoutId)
-        {
-            for (int rangeIndex = lineStartIndex; rangeIndex < lineStartIndex + countInLine; ++rangeIndex)
-            {
-                var bounds = _elementManager.GetLayoutBoundsForRealizedIndex(rangeIndex);
-                _orientation.SetMajorSize(ref bounds, lineSize);
-
-                if (!_scrollOrientationSameAsFlow)
-                {
-                    // Note: Space at start could potentially be negative
-                    if (spaceAtLineStart != 0 || spaceAtLineEnd != 0)
-                    {
-                        var totalSpace = spaceAtLineStart + spaceAtLineEnd;
-                        var minorStart = _orientation.MinorStart(bounds);
-                        switch (lineAlignment)
-                        {
-                            case LineAlignment.Start:
-                                {
-                                    _orientation.SetMinorStart(ref bounds, minorStart - spaceAtLineStart);
-                                    break;
-                                }
-
-                            case LineAlignment.End:
-                                {
-                                    _orientation.SetMinorStart(ref bounds, minorStart + spaceAtLineEnd);
-                                    break;
-                                }
-
-                            case LineAlignment.Center:
-                                {
-                                    _orientation.SetMinorStart(ref bounds, (minorStart - spaceAtLineStart) + (totalSpace / 2));
-                                    break;
-                                }
-
-                            case LineAlignment.SpaceAround:
-                                {
-                                    var interItemSpace = countInLine >= 1 ? totalSpace / (countInLine * 2) : 0;
-                                    _orientation.SetMinorStart(
-                                        ref bounds, 
-                                        (minorStart - spaceAtLineStart) + (interItemSpace * ((rangeIndex - lineStartIndex + 1) * 2 - 1)));
-                                    break;
-                                }
-
-                            case LineAlignment.SpaceBetween:
-                                {
-                                    var interItemSpace = countInLine > 1 ? totalSpace / (countInLine - 1) : 0;
-                                    _orientation.SetMinorStart(
-                                        ref bounds,
-                                        (minorStart - spaceAtLineStart) + (interItemSpace * (rangeIndex - lineStartIndex)));
-                                    break;
-                                }
-
-                            case LineAlignment.SpaceEvenly:
-                                {
-                                    var interItemSpace = countInLine >= 1 ? totalSpace / (countInLine + 1) : 0;
-                                    _orientation.SetMinorStart(
-                                        ref bounds,
-                                        (minorStart - spaceAtLineStart) + (interItemSpace * (rangeIndex - lineStartIndex + 1)));
-                                    break;
-                                }
-                        }
-                    }
-                }
-
-                bounds = bounds.Translate(-_lastExtent.Position);
-
-                if (!isWrapping)
-                {
-                    _orientation.SetMinorSize(
-                        ref bounds,
-                        Math.Max(_orientation.MinorSize(bounds), _orientation.Minor(finalSize)));
-                }
-
-                var element = _elementManager.GetAt(rangeIndex);
-
-                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Arranging element {Index} at ({Bounds})",
-                    layoutId,
-                    _elementManager.GetDataIndexFromRealizedRangeIndex(rangeIndex),
-                    bounds);
-                element.Arrange(bounds);
-            }
-        }
-
-        private void SetLayoutOrigin()
-        {
-            if (IsVirtualizingContext)
-            {
-                _context!.LayoutOrigin = new Point(_lastExtent.X, _lastExtent.Y);
-            }
-        }
-
-        public ILayoutable? GetElementIfRealized(int dataIndex)
-        {
-            if (_elementManager.IsDataIndexRealized(dataIndex))
-            {
-                return _elementManager.GetRealizedElement(dataIndex);
-            }
-
-            return null;
-        }
-
-        public bool TryAddElement0(ILayoutable element)
-        {
-            if (_elementManager.GetRealizedElementCount() == 0)
-            {
-                _elementManager.Add(element, 0);
-                return true;
-            }
-
-            return false;
-        }
-
-        public enum LineAlignment
-        {
-            Start,
-            Center,
-            End,
-            SpaceAround,
-            SpaceBetween,
-            SpaceEvenly,
-        }
-
-        private enum GenerateDirection
-        {
-            Forward,
-            Backward,
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/ILayoutManager.cs b/src/Avalonia.Layout/ILayoutManager.cs
deleted file mode 100644
index 614670a53b..0000000000
--- a/src/Avalonia.Layout/ILayoutManager.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Manages measuring and arranging of controls.
-    /// </summary>
-    public interface ILayoutManager : IDisposable
-    {
-        /// <summary>
-        /// Raised when the layout manager completes a layout pass.
-        /// </summary>
-        event EventHandler LayoutUpdated;
-
-        /// <summary>
-        /// Notifies the layout manager that a control requires a measure.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void InvalidateMeasure(ILayoutable control);
-
-        /// <summary>
-        /// Notifies the layout manager that a control requires an arrange.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void InvalidateArrange(ILayoutable control);
-
-        /// <summary>
-        /// Executes a layout pass.
-        /// </summary>
-        /// <remarks>
-        /// You should not usually need to call this method explictly, the layout manager will
-        /// schedule layout passes itself.
-        /// </remarks>
-        void ExecuteLayoutPass();
-
-        /// <summary>
-        /// Executes the initial layout pass on a layout root.
-        /// </summary>
-        /// <remarks>
-        /// You should not usually need to call this method explictly, the layout root will call
-        /// it to carry out the initial layout of the control.
-        /// </remarks>
-        void ExecuteInitialLayoutPass();
-
-        /// <summary>
-        /// Executes the initial layout pass on a layout root.
-        /// </summary>
-        /// <param name="root">The control to lay out.</param>
-        /// <remarks>
-        /// You should not usually need to call this method explictly, the layout root will call
-        /// it to carry out the initial layout of the control.
-        /// </remarks>
-        [Obsolete("Call ExecuteInitialLayoutPass without parameter")]
-        void ExecuteInitialLayoutPass(ILayoutRoot root);
-
-        /// <summary>
-        /// Registers a control as wanting to receive effective viewport notifications.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void RegisterEffectiveViewportListener(ILayoutable control);
-
-        /// <summary>
-        /// Registers a control as no longer wanting to receive effective viewport notifications.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void UnregisterEffectiveViewportListener(ILayoutable control);
-    }
-}
diff --git a/src/Avalonia.Layout/ILayoutRoot.cs b/src/Avalonia.Layout/ILayoutRoot.cs
deleted file mode 100644
index e2f16b338a..0000000000
--- a/src/Avalonia.Layout/ILayoutRoot.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines the root of a layoutable tree.
-    /// </summary>
-    public interface ILayoutRoot : ILayoutable
-    {
-        /// <summary>
-        /// The size available to lay out the controls.
-        /// </summary>
-        Size ClientSize { get; }
-
-        /// <summary>
-        /// The scaling factor to use in layout.
-        /// </summary>
-        double LayoutScaling { get; }
-
-        /// <summary>
-        /// Associated instance of layout manager
-        /// </summary>
-        ILayoutManager LayoutManager { get; }
-    }
-}
diff --git a/src/Avalonia.Layout/ILayoutable.cs b/src/Avalonia.Layout/ILayoutable.cs
deleted file mode 100644
index 54d3ba6a11..0000000000
--- a/src/Avalonia.Layout/ILayoutable.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines layout-related functionality for a control.
-    /// </summary>
-    public interface ILayoutable : IVisual
-    {
-        /// <summary>
-        /// Gets the size that this element computed during the measure pass of the layout process.
-        /// </summary>
-        Size DesiredSize { get; }
-
-        /// <summary>
-        /// Gets the width of the element.
-        /// </summary>
-        double Width { get; }
-
-        /// <summary>
-        /// Gets the height of the element.
-        /// </summary>
-        double Height { get; }
-
-        /// <summary>
-        /// Gets the minimum width of the element.
-        /// </summary>
-        double MinWidth { get; }
-
-        /// <summary>
-        /// Gets the maximum width of the element.
-        /// </summary>
-        double MaxWidth { get; }
-
-        /// <summary>
-        /// Gets the minimum height of the element.
-        /// </summary>
-        double MinHeight { get; }
-
-        /// <summary>
-        /// Gets the maximum height of the element.
-        /// </summary>
-        double MaxHeight { get; }
-
-        /// <summary>
-        /// Gets the margin around the element.
-        /// </summary>
-        Thickness Margin { get; }
-
-        /// <summary>
-        /// Gets the element's preferred horizontal alignment in its parent.
-        /// </summary>
-        HorizontalAlignment HorizontalAlignment { get; }
-
-        /// <summary>
-        /// Gets the element's preferred vertical alignment in its parent.
-        /// </summary>
-        VerticalAlignment VerticalAlignment { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layout measure is valid.
-        /// </summary>
-        bool IsMeasureValid { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layouts arrange is valid.
-        /// </summary>
-        bool IsArrangeValid { get; }
-
-        /// <summary>
-        /// Gets the available size passed in the previous layout pass, if any.
-        /// </summary>
-        Size? PreviousMeasure { get; }
-
-        /// <summary>
-        /// Gets the layout rect passed in the previous layout pass, if any.
-        /// </summary>
-        Rect? PreviousArrange { get; }
-
-        /// <summary>
-        /// Creates the visual children of the control, if necessary
-        /// </summary>
-        void ApplyTemplate();
-
-        /// <summary>
-        /// Carries out a measure of the control.
-        /// </summary>
-        /// <param name="availableSize">The available size for the control.</param>
-        void Measure(Size availableSize);
-
-        /// <summary>
-        /// Arranges the control and its children.
-        /// </summary>
-        /// <param name="rect">The control's new bounds.</param>
-        void Arrange(Rect rect);
-
-        /// <summary>
-        /// Invalidates the measurement of the control and queues a new layout pass.
-        /// </summary>
-        void InvalidateMeasure();
-
-        /// <summary>
-        /// Invalidates the arrangement of the control and queues a new layout pass.
-        /// </summary>
-        void InvalidateArrange();
-
-        /// <summary>
-        /// Called when a child control's desired size changes.
-        /// </summary>
-        /// <param name="control">The child control.</param>
-        void ChildDesiredSizeChanged(ILayoutable control);
-
-        /// <summary>
-        /// Used by the <see cref="LayoutManager"/> to notify the control that its effective
-        /// viewport is changed.
-        /// </summary>
-        /// <param name="e">The viewport information.</param>
-        void EffectiveViewportChanged(EffectiveViewportChangedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Layout/LayoutHelper.cs b/src/Avalonia.Layout/LayoutHelper.cs
deleted file mode 100644
index d4154a6d0c..0000000000
--- a/src/Avalonia.Layout/LayoutHelper.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Provides helper methods needed for layout.
-    /// </summary>
-    public static class LayoutHelper
-    {
-        /// <summary>
-        /// Epsilon value used for certain layout calculations.
-        /// Based on the value in WPF LayoutDoubleUtil.
-        /// </summary>
-        public static double LayoutEpsilon { get; } = 0.00000153;
-
-        /// <summary>
-        /// Calculates a control's size based on its <see cref="ILayoutable.Width"/>,
-        /// <see cref="ILayoutable.Height"/>, <see cref="ILayoutable.MinWidth"/>,
-        /// <see cref="ILayoutable.MaxWidth"/>, <see cref="ILayoutable.MinHeight"/> and
-        /// <see cref="ILayoutable.MaxHeight"/>.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="constraints">The space available for the control.</param>
-        /// <returns>The control's size.</returns>
-        public static Size ApplyLayoutConstraints(ILayoutable control, Size constraints)
-        {
-            var minmax = new MinMax(control);
-
-            return new Size(
-                MathUtilities.Clamp(constraints.Width, minmax.MinWidth, minmax.MaxWidth),
-                MathUtilities.Clamp(constraints.Height, minmax.MinHeight, minmax.MaxHeight));
-        }
-
-        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding,
-            Thickness borderThickness)
-        {
-            return MeasureChild(control, availableSize, padding + borderThickness);
-        }
-
-        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding)
-        {
-            if (control != null)
-            {
-                control.Measure(availableSize.Deflate(padding));
-                return control.DesiredSize.Inflate(padding);
-            }
-
-            return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
-        }
-
-        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding, Thickness borderThickness)
-        {
-            return ArrangeChild(child, availableSize, padding + borderThickness);
-        }
-
-        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding)
-        {
-            child?.Arrange(new Rect(availableSize).Deflate(padding));
-
-            return availableSize;
-        }
-
-        /// <summary>
-        /// Invalidates measure for given control and all visual children recursively.
-        /// </summary>
-        public static void InvalidateSelfAndChildrenMeasure(ILayoutable control)
-        {
-            void InnerInvalidateMeasure(IVisual target)
-            {
-                if (target is ILayoutable targetLayoutable)
-                {
-                    targetLayoutable.InvalidateMeasure();
-                }
-
-                var visualChildren = target.VisualChildren;
-                var visualChildrenCount = visualChildren.Count;
-
-                for (int i = 0; i < visualChildrenCount; i++)
-                {
-                    IVisual child = visualChildren[i];
-
-                    InnerInvalidateMeasure(child);
-                }
-            }
-
-            InnerInvalidateMeasure(control);
-        }
-
-        /// <summary>
-        /// Obtains layout scale of the given control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <exception cref="Exception">Thrown when control has no root or returned layout scaling is invalid.</exception>
-        public static double GetLayoutScale(ILayoutable control)
-        {
-            var visualRoot = control.VisualRoot;
-            
-            var result = (visualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
-
-            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
-            {
-                throw new Exception($"Invalid LayoutScaling returned from {visualRoot!.GetType()}");
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Rounds a size to integer values for layout purposes, compensating for high DPI screen
-        /// coordinates.
-        /// </summary>
-        /// <param name="size">Input size.</param>
-        /// <param name="dpiScaleX">DPI along x-dimension.</param>
-        /// <param name="dpiScaleY">DPI along y-dimension.</param>
-        /// <returns>Value of size that will be rounded under screen DPI.</returns>
-        /// <remarks>
-        /// This is a layout helper method. It takes DPI into account and also does not return
-        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
-        /// associated with the UseLayoutRounding property and should not be used as a general rounding
-        /// utility.
-        /// </remarks>
-        public static Size RoundLayoutSize(Size size, double dpiScaleX, double dpiScaleY)
-        {
-            return new Size(RoundLayoutValue(size.Width, dpiScaleX), RoundLayoutValue(size.Height, dpiScaleY));
-        }
-
-        /// <summary>
-        /// Calculates the value to be used for layout rounding at high DPI.
-        /// </summary>
-        /// <param name="value">Input value to be rounded.</param>
-        /// <param name="dpiScale">Ratio of screen's DPI to layout DPI</param>
-        /// <returns>Adjusted value that will produce layout rounding on screen at high dpi.</returns>
-        /// <remarks>
-        /// This is a layout helper method. It takes DPI into account and also does not return
-        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
-        /// associated with the UseLayoutRounding property and should not be used as a general rounding
-        /// utility.
-        /// </remarks>
-        public static double RoundLayoutValue(double value, double dpiScale)
-        {
-            double newValue;
-
-            // If DPI == 1, don't use DPI-aware rounding.
-            if (!MathUtilities.IsOne(dpiScale))
-            {
-                newValue = Math.Round(value * dpiScale) / dpiScale;
-
-                // If rounding produces a value unacceptable to layout (NaN, Infinity or MaxValue),
-                // use the original value.
-                if (double.IsNaN(newValue) ||
-                    double.IsInfinity(newValue) ||
-                    MathUtilities.AreClose(newValue, double.MaxValue))
-                {
-                    newValue = value;
-                }
-            }
-            else
-            {
-                newValue = Math.Round(value);
-            }
-
-            return newValue;
-        }
-
-
-        /// <summary>
-        /// Calculates the min and max height for a control. Ported from WPF.
-        /// </summary>
-        private readonly struct MinMax
-        {
-            public MinMax(ILayoutable e)
-            {
-                MaxHeight = e.MaxHeight;
-                MinHeight = e.MinHeight;
-                double l = e.Height;
-
-                double height = (double.IsNaN(l) ? double.PositiveInfinity : l);
-                MaxHeight = Math.Max(Math.Min(height, MaxHeight), MinHeight);
-
-                height = (double.IsNaN(l) ? 0 : l);
-                MinHeight = Math.Max(Math.Min(MaxHeight, height), MinHeight);
-
-                MaxWidth = e.MaxWidth;
-                MinWidth = e.MinWidth;
-                l = e.Width;
-
-                double width = (double.IsNaN(l) ? double.PositiveInfinity : l);
-                MaxWidth = Math.Max(Math.Min(width, MaxWidth), MinWidth);
-
-                width = (double.IsNaN(l) ? 0 : l);
-                MinWidth = Math.Max(Math.Min(MaxWidth, width), MinWidth);
-            }
-
-            public double MinWidth { get; }
-            public double MaxWidth { get; }
-            public double MinHeight { get; }
-            public double MaxHeight { get; }
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
deleted file mode 100644
index fc988a8d6c..0000000000
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ /dev/null
@@ -1,419 +0,0 @@
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Avalonia.Logging;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Manages measuring and arranging of controls.
-    /// </summary>
-    public class LayoutManager : ILayoutManager, IDisposable
-    {
-        private const int MaxPasses = 3;
-        private readonly ILayoutRoot _owner;
-        private readonly LayoutQueue<ILayoutable> _toMeasure = new LayoutQueue<ILayoutable>(v => !v.IsMeasureValid);
-        private readonly LayoutQueue<ILayoutable> _toArrange = new LayoutQueue<ILayoutable>(v => !v.IsArrangeValid);
-        private readonly Action _executeLayoutPass;
-        private List<EffectiveViewportChangedListener>? _effectiveViewportChangedListeners;
-        private bool _disposed;
-        private bool _queued;
-        private bool _running;
-
-        public LayoutManager(ILayoutRoot owner)
-        {
-            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
-            _executeLayoutPass = ExecuteLayoutPass;
-        }
-
-        public virtual event EventHandler? LayoutUpdated;
-
-        /// <inheritdoc/>
-        public virtual void InvalidateMeasure(ILayoutable control)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (!control.IsAttachedToVisualTree)
-            {
-#if DEBUG
-                throw new AvaloniaInternalException(
-                    "LayoutManager.InvalidateMeasure called on a control that is detached from the visual tree.");
-#else
-                return;
-#endif
-            }
-
-            if (control.VisualRoot != _owner)
-            {
-                throw new ArgumentException("Attempt to call InvalidateMeasure on wrong LayoutManager.");
-            }
-
-            _toMeasure.Enqueue(control);
-            _toArrange.Enqueue(control);
-            QueueLayoutPass();
-        }
-
-        /// <inheritdoc/>
-        public virtual void InvalidateArrange(ILayoutable control)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (!control.IsAttachedToVisualTree)
-            {
-#if DEBUG
-                throw new AvaloniaInternalException(
-                    "LayoutManager.InvalidateArrange called on a control that is detached from the visual tree.");
-#else
-                return;
-#endif
-            }
-
-            if (control.VisualRoot != _owner)
-            {
-                throw new ArgumentException("Attempt to call InvalidateArrange on wrong LayoutManager.");
-            }
-
-            _toArrange.Enqueue(control);
-            QueueLayoutPass();
-        }
-
-        /// <inheritdoc/>
-        public virtual void ExecuteLayoutPass()
-        {
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (!_running)
-            {
-                Stopwatch? stopwatch = null;
-
-                const LogEventLevel timingLogLevel = LogEventLevel.Information;
-                bool captureTiming = Logger.IsEnabled(timingLogLevel, LogArea.Layout);
-
-                if (captureTiming)
-                {
-                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(
-                        this,
-                        "Started layout pass. To measure: {Measure} To arrange: {Arrange}",
-                        _toMeasure.Count,
-                        _toArrange.Count);
-
-                    stopwatch = new Stopwatch();
-                    stopwatch.Start();
-                }
-
-                _toMeasure.BeginLoop(MaxPasses);
-                _toArrange.BeginLoop(MaxPasses);
-
-                try
-                {
-                    _running = true;
-
-                    for (var pass = 0; pass < MaxPasses; ++pass)
-                    {
-                        InnerLayoutPass();
-
-                        if (!RaiseEffectiveViewportChanged())
-                        {
-                            break;
-                        }
-                    }
-                }
-                finally
-                {
-                    _running = false;
-                }
-
-                _toMeasure.EndLoop();
-                _toArrange.EndLoop();
-
-                if (captureTiming)
-                {
-                    stopwatch!.Stop();
-
-                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(this, "Layout pass finished in {Time}", stopwatch.Elapsed);
-                }
-            }
-
-            _queued = false;
-            LayoutUpdated?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <inheritdoc/>
-        public virtual void ExecuteInitialLayoutPass()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            try
-            {
-                _running = true;
-                Measure(_owner);
-                Arrange(_owner);
-            }
-            finally
-            {
-                _running = false;
-            }
-
-            // Running the initial layout pass may have caused some control to be invalidated
-            // so run a full layout pass now (this usually due to scrollbars; its not known
-            // whether they will need to be shown until the layout pass has run and if the
-            // first guess was incorrect the layout will need to be updated).
-            ExecuteLayoutPass();
-        }
-
-        [Obsolete("Call ExecuteInitialLayoutPass without parameter")]
-        public void ExecuteInitialLayoutPass(ILayoutRoot root)
-        {
-            if (root != _owner)
-            {
-                throw new ArgumentException("ExecuteInitialLayoutPass called with incorrect root.");
-            }
-
-            ExecuteInitialLayoutPass();
-        }
-
-        public void Dispose()
-        {
-            _disposed = true;
-            _toMeasure.Dispose();
-            _toArrange.Dispose();
-        }
-
-        void ILayoutManager.RegisterEffectiveViewportListener(ILayoutable control)
-        {
-            _effectiveViewportChangedListeners ??= new List<EffectiveViewportChangedListener>();
-            _effectiveViewportChangedListeners.Add(new EffectiveViewportChangedListener(
-                control,
-                CalculateEffectiveViewport(control)));
-        }
-
-        void ILayoutManager.UnregisterEffectiveViewportListener(ILayoutable control)
-        {
-            if (_effectiveViewportChangedListeners is object)
-            {
-                for (var i = _effectiveViewportChangedListeners.Count - 1; i >= 0; --i)
-                {
-                    if (_effectiveViewportChangedListeners[i].Listener == control)
-                    {
-                        _effectiveViewportChangedListeners.RemoveAt(i);
-                    }
-                }
-            }
-        }
-
-        private void InnerLayoutPass()
-        {
-            for (var pass = 0; pass < MaxPasses; ++pass)
-            {
-                ExecuteMeasurePass();
-                ExecuteArrangePass();
-
-                if (_toMeasure.Count == 0)
-                {
-                    break;
-                }
-            }
-        }
-
-        private void ExecuteMeasurePass()
-        {
-            while (_toMeasure.Count > 0)
-            {
-                var control = _toMeasure.Dequeue();
-
-                if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
-                {
-                    Measure(control);
-                }
-            }
-        }
-
-        private void ExecuteArrangePass()
-        {
-            while (_toArrange.Count > 0)
-            {
-                var control = _toArrange.Dequeue();
-
-                if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
-                {
-                    Arrange(control);
-                }
-            }
-        }
-
-        private void Measure(ILayoutable control)
-        {
-            // Controls closest to the visual root need to be arranged first. We don't try to store
-            // ordered invalidation lists, instead we traverse the tree upwards, measuring the
-            // controls closest to the root first. This has been shown by benchmarks to be the
-            // fastest and most memory-efficient algorithm.
-            if (control.VisualParent is ILayoutable parent)
-            {
-                Measure(parent);
-            }
-
-            // If the control being measured has IsMeasureValid == true here then its measure was
-            // handed by an ancestor and can be ignored. The measure may have also caused the
-            // control to be removed.
-            if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
-            {
-                if (control is ILayoutRoot root)
-                {
-                    root.Measure(Size.Infinity);
-                }
-                else if (control.PreviousMeasure.HasValue)
-                {
-                    control.Measure(control.PreviousMeasure.Value);
-                }
-            }
-        }
-
-        private void Arrange(ILayoutable control)
-        {
-            if (control.VisualParent is ILayoutable parent)
-            {
-                Arrange(parent);
-            }
-
-            if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
-            {
-                if (control is IEmbeddedLayoutRoot embeddedRoot)
-                    control.Arrange(new Rect(embeddedRoot.AllocatedSize));
-                else if (control is ILayoutRoot root)
-                    control.Arrange(new Rect(root.DesiredSize));
-                else if (control.PreviousArrange != null)
-                {
-                    // Has been observed that PreviousArrange sometimes is null, probably a bug somewhere else.
-                    // Condition observed: control.VisualParent is Scrollbar, control is Border.
-                    control.Arrange(control.PreviousArrange.Value);
-                }
-            }
-        }
-
-        private void QueueLayoutPass()
-        {
-            if (!_queued && !_running)
-            {
-                Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
-                _queued = true;
-            }
-        }
-
-        private bool RaiseEffectiveViewportChanged()
-        {
-            var startCount = _toMeasure.Count + _toArrange.Count;
-
-            if (_effectiveViewportChangedListeners is object)
-            {
-                var count = _effectiveViewportChangedListeners.Count;
-                var pool = ArrayPool<EffectiveViewportChangedListener>.Shared;
-                var listeners = pool.Rent(count);
-
-                _effectiveViewportChangedListeners.CopyTo(listeners);
-
-                try
-                {
-                    for (var i = 0; i < count; ++i)
-                    {
-                        var l = _effectiveViewportChangedListeners[i];
-
-                        if (!l.Listener.IsAttachedToVisualTree)
-                        {
-                            continue;
-                        }
-
-                        var viewport = CalculateEffectiveViewport(l.Listener);
-
-                        if (viewport != l.Viewport)
-                        {
-                            l.Listener.EffectiveViewportChanged(new EffectiveViewportChangedEventArgs(viewport));
-                            _effectiveViewportChangedListeners[i] = new EffectiveViewportChangedListener(l.Listener, viewport);
-                        }
-                    }
-                }
-                finally
-                {
-                    pool.Return(listeners, clearArray: true);
-                }
-            }
-
-            return startCount != _toMeasure.Count + _toArrange.Count;
-        }
-
-        private Rect CalculateEffectiveViewport(IVisual control)
-        {
-            var viewport = new Rect(0, 0, double.PositiveInfinity, double.PositiveInfinity);
-            CalculateEffectiveViewport(control, control, ref viewport);
-            return viewport;
-        }
-
-        private void CalculateEffectiveViewport(IVisual target, IVisual control, ref Rect viewport)
-        {
-            // Recurse until the top level control.
-            if (control.VisualParent is object)
-            {
-                CalculateEffectiveViewport(target, control.VisualParent, ref viewport);
-            }
-            else
-            {
-                viewport = new Rect(control.Bounds.Size);
-            }
-
-            // Apply the control clip bounds if it's not the target control. We don't apply it to
-            // the target control because it may itself be clipped to bounds and if so the viewport
-            // we calculate would be of no use.
-            if (control != target && control.ClipToBounds)
-            {
-                viewport = control.Bounds.Intersect(viewport);
-            }
-
-            // Translate the viewport into this control's coordinate space.
-            viewport = viewport.Translate(-control.Bounds.Position);
-
-            if (control != target && control.RenderTransform is object)
-            {
-                var origin = control.RenderTransformOrigin.ToPixels(control.Bounds.Size);
-                var offset = Matrix.CreateTranslation(origin);
-                var renderTransform = (-offset) * control.RenderTransform.Value.Invert() * (offset);
-                viewport = viewport.TransformToAABB(renderTransform);
-            }
-        }
-
-        private readonly struct EffectiveViewportChangedListener
-        {
-            public EffectiveViewportChangedListener(ILayoutable listener, Rect viewport)
-            {
-                Listener = listener;
-                Viewport = viewport;
-            }
-
-            public ILayoutable Listener { get; }
-            public Rect Viewport { get; }
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
deleted file mode 100644
index 09e0c4263a..0000000000
--- a/src/Avalonia.Layout/Layoutable.cs
+++ /dev/null
@@ -1,837 +0,0 @@
-using System;
-using Avalonia.Logging;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines how a control aligns itself horizontally in its parent control.
-    /// </summary>
-    public enum HorizontalAlignment
-    {
-        /// <summary>
-        /// The control stretches to fill the width of the parent control.
-        /// </summary>
-        Stretch,
-
-        /// <summary>
-        /// The control aligns itself to the left of the parent control.
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// The control centers itself in the parent control.
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// The control aligns itself to the right of the parent control.
-        /// </summary>
-        Right,
-    }
-
-    /// <summary>
-    /// Defines how a control aligns itself vertically in its parent control.
-    /// </summary>
-    public enum VerticalAlignment
-    {
-        /// <summary>
-        /// The control stretches to fill the height of the parent control.
-        /// </summary>
-        Stretch,
-
-        /// <summary>
-        /// The control aligns itself to the top of the parent control.
-        /// </summary>
-        Top,
-
-        /// <summary>
-        /// The control centers itself within the parent control.
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// The control aligns itself to the bottom of the parent control.
-        /// </summary>
-        Bottom,
-    }
-
-    /// <summary>
-    /// Implements layout-related functionality for a control.
-    /// </summary>
-    public class Layoutable : Visual, ILayoutable
-    {
-        /// <summary>
-        /// Defines the <see cref="DesiredSize"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Layoutable, Size> DesiredSizeProperty =
-            AvaloniaProperty.RegisterDirect<Layoutable, Size>(nameof(DesiredSize), o => o.DesiredSize);
-
-        /// <summary>
-        /// Defines the <see cref="Width"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> WidthProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(Width), double.NaN);
-
-        /// <summary>
-        /// Defines the <see cref="Height"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> HeightProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(Height), double.NaN);
-
-        /// <summary>
-        /// Defines the <see cref="MinWidth"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinWidthProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MinWidth));
-
-        /// <summary>
-        /// Defines the <see cref="MaxWidth"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MaxWidthProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxWidth), double.PositiveInfinity);
-
-        /// <summary>
-        /// Defines the <see cref="MinHeight"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinHeightProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MinHeight));
-
-        /// <summary>
-        /// Defines the <see cref="MaxHeight"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MaxHeightProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxHeight), double.PositiveInfinity);
-
-        /// <summary>
-        /// Defines the <see cref="Margin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Thickness> MarginProperty =
-            AvaloniaProperty.Register<Layoutable, Thickness>(nameof(Margin));
-
-        /// <summary>
-        /// Defines the <see cref="HorizontalAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<HorizontalAlignment> HorizontalAlignmentProperty =
-            AvaloniaProperty.Register<Layoutable, HorizontalAlignment>(nameof(HorizontalAlignment));
-
-        /// <summary>
-        /// Defines the <see cref="VerticalAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<VerticalAlignment> VerticalAlignmentProperty =
-            AvaloniaProperty.Register<Layoutable, VerticalAlignment>(nameof(VerticalAlignment));
-
-        /// <summary>
-        /// Defines the <see cref="UseLayoutRoundingProperty"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> UseLayoutRoundingProperty =
-            AvaloniaProperty.Register<Layoutable, bool>(nameof(UseLayoutRounding), defaultValue: true, inherits: true);
-
-        private bool _measuring;
-        private Size? _previousMeasure;
-        private Rect? _previousArrange;
-        private EventHandler<EffectiveViewportChangedEventArgs>? _effectiveViewportChanged;
-        private EventHandler? _layoutUpdated;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="Layoutable"/> class.
-        /// </summary>
-        static Layoutable()
-        {
-            AffectsMeasure<Layoutable>(
-                IsVisibleProperty,
-                WidthProperty,
-                HeightProperty,
-                MinWidthProperty,
-                MaxWidthProperty,
-                MinHeightProperty,
-                MaxHeightProperty,
-                MarginProperty,
-                HorizontalAlignmentProperty,
-                VerticalAlignmentProperty);
-        }
-
-        /// <summary>
-        /// Occurs when the element's effective viewport changes.
-        /// </summary>
-        public event EventHandler<EffectiveViewportChangedEventArgs>? EffectiveViewportChanged
-        {
-            add
-            {
-                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.RegisterEffectiveViewportListener(this);
-                }
-
-                _effectiveViewportChanged += value;
-            }
-
-            remove
-            {
-                _effectiveViewportChanged -= value;
-
-                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Occurs when a layout pass completes for the control.
-        /// </summary>
-        public event EventHandler? LayoutUpdated
-        {
-            add
-            {
-                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
-                }
-
-                _layoutUpdated += value;
-            }
-
-            remove
-            {
-                _layoutUpdated -= value;
-
-                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the element.
-        /// </summary>
-        public double Width
-        {
-            get { return GetValue(WidthProperty); }
-            set { SetValue(WidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the element.
-        /// </summary>
-        public double Height
-        {
-            get { return GetValue(HeightProperty); }
-            set { SetValue(HeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum width of the element.
-        /// </summary>
-        public double MinWidth
-        {
-            get { return GetValue(MinWidthProperty); }
-            set { SetValue(MinWidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum width of the element.
-        /// </summary>
-        public double MaxWidth
-        {
-            get { return GetValue(MaxWidthProperty); }
-            set { SetValue(MaxWidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum height of the element.
-        /// </summary>
-        public double MinHeight
-        {
-            get { return GetValue(MinHeightProperty); }
-            set { SetValue(MinHeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum height of the element.
-        /// </summary>
-        public double MaxHeight
-        {
-            get { return GetValue(MaxHeightProperty); }
-            set { SetValue(MaxHeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the margin around the element.
-        /// </summary>
-        public Thickness Margin
-        {
-            get { return GetValue(MarginProperty); }
-            set { SetValue(MarginProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the element's preferred horizontal alignment in its parent.
-        /// </summary>
-        public HorizontalAlignment HorizontalAlignment
-        {
-            get { return GetValue(HorizontalAlignmentProperty); }
-            set { SetValue(HorizontalAlignmentProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the element's preferred vertical alignment in its parent.
-        /// </summary>
-        public VerticalAlignment VerticalAlignment
-        {
-            get { return GetValue(VerticalAlignmentProperty); }
-            set { SetValue(VerticalAlignmentProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the size that this element computed during the measure pass of the layout process.
-        /// </summary>
-        public Size DesiredSize
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layout measure is valid.
-        /// </summary>
-        public bool IsMeasureValid
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layouts arrange is valid.
-        /// </summary>
-        public bool IsArrangeValid
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value that determines whether the element should be snapped to pixel
-        /// boundaries at layout time.
-        /// </summary>
-        public bool UseLayoutRounding
-        {
-            get { return GetValue(UseLayoutRoundingProperty); }
-            set { SetValue(UseLayoutRoundingProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the available size passed in the previous layout pass, if any.
-        /// </summary>
-        Size? ILayoutable.PreviousMeasure => _previousMeasure;
-
-        /// <summary>
-        /// Gets the layout rect passed in the previous layout pass, if any.
-        /// </summary>
-        Rect? ILayoutable.PreviousArrange => _previousArrange;
-
-        /// <summary>
-        /// Creates the visual children of the control, if necessary
-        /// </summary>
-        public virtual void ApplyTemplate()
-        {
-        }
-
-        /// <summary>
-        /// Carries out a measure of the control.
-        /// </summary>
-        /// <param name="availableSize">The available size for the control.</param>
-        public void Measure(Size availableSize)
-        {
-            if (double.IsNaN(availableSize.Width) || double.IsNaN(availableSize.Height))
-            {
-                throw new InvalidOperationException("Cannot call Measure using a size with NaN values.");
-            }
-
-            if (!IsMeasureValid || _previousMeasure != availableSize)
-            {
-                var previousDesiredSize = DesiredSize;
-                var desiredSize = default(Size);
-
-                IsMeasureValid = true;
-
-                try
-                {
-                    _measuring = true;
-                    desiredSize = MeasureCore(availableSize);
-                }
-                finally
-                {
-                    _measuring = false;
-                }
-
-                if (IsInvalidSize(desiredSize))
-                {
-                    throw new InvalidOperationException("Invalid size returned for Measure.");
-                }
-
-                DesiredSize = desiredSize;
-                _previousMeasure = availableSize;
-
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Measure requested {DesiredSize}", DesiredSize);
-
-                if (DesiredSize != previousDesiredSize)
-                {
-                    this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Arranges the control and its children.
-        /// </summary>
-        /// <param name="rect">The control's new bounds.</param>
-        public void Arrange(Rect rect)
-        {
-            if (IsInvalidRect(rect))
-            {
-                throw new InvalidOperationException("Invalid Arrange rectangle.");
-            }
-
-            if (!IsMeasureValid)
-            {
-                Measure(_previousMeasure ?? rect.Size);
-            }
-
-            if (!IsArrangeValid || _previousArrange != rect)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Arrange to {Rect} ", rect);
-
-                IsArrangeValid = true;
-                ArrangeCore(rect);
-                _previousArrange = rect;
-            }
-        }
-
-        /// <summary>
-        /// Invalidates the measurement of the control and queues a new layout pass.
-        /// </summary>
-        public void InvalidateMeasure()
-        {
-            if (IsMeasureValid)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated measure");
-
-                IsMeasureValid = false;
-                IsArrangeValid = false;
-
-                if (((ILayoutable)this).IsAttachedToVisualTree)
-                {
-                    (VisualRoot as ILayoutRoot)?.LayoutManager.InvalidateMeasure(this);
-                    InvalidateVisual();
-                }
-                OnMeasureInvalidated();
-            }
-        }
-
-        /// <summary>
-        /// Invalidates the arrangement of the control and queues a new layout pass.
-        /// </summary>
-        public void InvalidateArrange()
-        {
-            if (IsArrangeValid)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated arrange");
-
-                IsArrangeValid = false;
-                (VisualRoot as ILayoutRoot)?.LayoutManager?.InvalidateArrange(this);
-                InvalidateVisual();
-            }
-        }
-
-        /// <inheritdoc/>
-        void ILayoutable.ChildDesiredSizeChanged(ILayoutable control)
-        {
-            if (!_measuring)
-            {
-                InvalidateMeasure();
-            }
-        }
-
-        void ILayoutable.EffectiveViewportChanged(EffectiveViewportChangedEventArgs e)
-        {
-            _effectiveViewportChanged?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's measurement.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
-        /// </remarks>
-        [Obsolete("Use AffectsMeasure<T> and specify the control type.")]
-        protected static void AffectsMeasure(params AvaloniaProperty[] properties)
-        {
-            AffectsMeasure<Layoutable>(properties);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's measurement.
-        /// </summary>
-        /// <typeparam name="T">The control which the property affects.</typeparam>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
-        /// </remarks>
-        protected static void AffectsMeasure<T>(params AvaloniaProperty[] properties)
-            where T : class, ILayoutable
-        {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.InvalidateMeasure();
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(Invalidate);
-            }
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's arrangement.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
-        /// </remarks>
-        [Obsolete("Use AffectsArrange<T> and specify the control type.")]
-        protected static void AffectsArrange(params AvaloniaProperty[] properties)
-        {
-            AffectsArrange<Layoutable>(properties);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's arrangement.
-        /// </summary>
-        /// <typeparam name="T">The control which the property affects.</typeparam>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
-        /// </remarks>
-        protected static void AffectsArrange<T>(params AvaloniaProperty[] properties)
-            where T : class, ILayoutable
-        {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.InvalidateArrange();
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(Invalidate);
-            }
-        }
-
-        /// <summary>
-        /// The default implementation of the control's measure pass.
-        /// </summary>
-        /// <param name="availableSize">The size available to the control.</param>
-        /// <returns>The desired size for the control.</returns>
-        /// <remarks>
-        /// This method calls <see cref="MeasureOverride(Size)"/> which is probably the method you
-        /// want to override in order to modify a control's arrangement.
-        /// </remarks>
-        protected virtual Size MeasureCore(Size availableSize)
-        {
-            if (IsVisible)
-            {
-                var margin = Margin;
-
-                ApplyStyling();
-                ApplyTemplate();
-
-                var constrained = LayoutHelper.ApplyLayoutConstraints(
-                    this,
-                    availableSize.Deflate(margin));
-                var measured = MeasureOverride(constrained);
-
-                var width = measured.Width;
-                var height = measured.Height;
-
-                {
-                    double widthCache = Width;
-
-                    if (!double.IsNaN(widthCache))
-                    {
-                        width = widthCache;
-                    }
-                }
-
-                width = Math.Min(width, MaxWidth);
-                width = Math.Max(width, MinWidth);
-
-                {
-                    double heightCache = Height;
-
-                    if (!double.IsNaN(heightCache))
-                    {
-                        height = heightCache;
-                    }
-                }
-
-                height = Math.Min(height, MaxHeight);
-                height = Math.Max(height, MinHeight);
-
-                width = Math.Min(width, availableSize.Width);
-                height = Math.Min(height, availableSize.Height);
-
-                if (UseLayoutRounding)
-                {
-                    var scale = LayoutHelper.GetLayoutScale(this);
-                    width = LayoutHelper.RoundLayoutValue(width, scale);
-                    height = LayoutHelper.RoundLayoutValue(height, scale);
-                }
-
-                return NonNegative(new Size(width, height).Inflate(margin));
-            }
-            else
-            {
-                return new Size();
-            }
-        }
-
-        /// <summary>
-        /// Measures the control and its child elements as part of a layout pass.
-        /// </summary>
-        /// <param name="availableSize">The size available to the control.</param>
-        /// <returns>The desired size for the control.</returns>
-        protected virtual Size MeasureOverride(Size availableSize)
-        {
-            double width = 0;
-            double height = 0;
-
-            var visualChildren = VisualChildren;
-            var visualCount = visualChildren.Count;
-
-            for (var i = 0; i < visualCount; i++)
-            {
-                IVisual visual = visualChildren[i];
-
-                if (visual is ILayoutable layoutable)
-                {
-                    layoutable.Measure(availableSize);
-                    width = Math.Max(width, layoutable.DesiredSize.Width);
-                    height = Math.Max(height, layoutable.DesiredSize.Height);
-                }
-            }
-
-            return new Size(width, height);
-        }
-
-        /// <summary>
-        /// The default implementation of the control's arrange pass.
-        /// </summary>
-        /// <param name="finalRect">The control's new bounds.</param>
-        /// <remarks>
-        /// This method calls <see cref="ArrangeOverride(Size)"/> which is probably the method you
-        /// want to override in order to modify a control's arrangement.
-        /// </remarks>
-        protected virtual void ArrangeCore(Rect finalRect)
-        {
-            if (IsVisible)
-            {
-                var margin = Margin;
-                var originX = finalRect.X + margin.Left;
-                var originY = finalRect.Y + margin.Top;
-                var availableSizeMinusMargins = new Size(
-                    Math.Max(0, finalRect.Width - margin.Left - margin.Right),
-                    Math.Max(0, finalRect.Height - margin.Top - margin.Bottom));
-                var horizontalAlignment = HorizontalAlignment;
-                var verticalAlignment = VerticalAlignment;
-                var size = availableSizeMinusMargins;
-                var scale = LayoutHelper.GetLayoutScale(this);
-                var useLayoutRounding = UseLayoutRounding;
-
-                if (horizontalAlignment != HorizontalAlignment.Stretch)
-                {
-                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - margin.Left - margin.Right));
-                }
-
-                if (verticalAlignment != VerticalAlignment.Stretch)
-                {
-                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - margin.Top - margin.Bottom));
-                }
-
-                size = LayoutHelper.ApplyLayoutConstraints(this, size);
-
-                if (useLayoutRounding)
-                {
-                    size = LayoutHelper.RoundLayoutSize(size, scale, scale);
-                    availableSizeMinusMargins = LayoutHelper.RoundLayoutSize(availableSizeMinusMargins, scale, scale);
-                }
-
-                size = ArrangeOverride(size).Constrain(size);
-
-                switch (horizontalAlignment)
-                {
-                    case HorizontalAlignment.Center:
-                    case HorizontalAlignment.Stretch:
-                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
-                        break;
-                    case HorizontalAlignment.Right:
-                        originX += availableSizeMinusMargins.Width - size.Width;
-                        break;
-                }
-
-                switch (verticalAlignment)
-                {
-                    case VerticalAlignment.Center:
-                    case VerticalAlignment.Stretch:
-                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
-                        break;
-                    case VerticalAlignment.Bottom:
-                        originY += availableSizeMinusMargins.Height - size.Height;
-                        break;
-                }
-
-                if (useLayoutRounding)
-                {
-                    originX = LayoutHelper.RoundLayoutValue(originX, scale);
-                    originY = LayoutHelper.RoundLayoutValue(originY, scale);
-                }
-
-                Bounds = new Rect(originX, originY, size.Width, size.Height);
-            }
-        }
-
-        /// <summary>
-        /// Positions child elements as part of a layout pass.
-        /// </summary>
-        /// <param name="finalSize">The size available to the control.</param>
-        /// <returns>The actual size used.</returns>
-        protected virtual Size ArrangeOverride(Size finalSize)
-        {
-            var arrangeRect = new Rect(finalSize);
-
-            var visualChildren = VisualChildren;
-            var visualCount = visualChildren.Count;
-
-            for (var i = 0; i < visualCount; i++)
-            {
-                IVisual visual = visualChildren[i];
-
-                if (visual is ILayoutable layoutable)
-                {
-                    layoutable.Arrange(arrangeRect);
-                }
-            }
-
-            return finalSize;
-        }
-
-        protected sealed override void InvalidateStyles()
-        {
-            base.InvalidateStyles();
-            InvalidateMeasure();
-        }
-
-        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTreeCore(e);
-
-            if (e.Root is ILayoutRoot r)
-            {
-                if (_layoutUpdated is object)
-                {
-                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
-                }
-
-                if (_effectiveViewportChanged is object)
-                {
-                    r.LayoutManager.RegisterEffectiveViewportListener(this);
-                }
-            }
-        }
-
-        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            if (e.Root is ILayoutRoot r)
-            {
-                if (_layoutUpdated is object)
-                {
-                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
-                }
-
-                if (_effectiveViewportChanged is object)
-                {
-                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
-                }
-            }
-
-            base.OnDetachedFromVisualTreeCore(e);
-        }
-
-        /// <summary>
-        /// Called by InvalidateMeasure
-        /// </summary>
-        protected virtual void OnMeasureInvalidated()
-        {
-        }
-
-        /// <inheritdoc/>
-        protected sealed override void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
-        {
-            LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
-
-            base.OnVisualParentChanged(oldParent, newParent);
-        }
-
-        /// <summary>
-        /// Called when the layout manager raises a LayoutUpdated event.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event args.</param>
-        private void LayoutManagedLayoutUpdated(object? sender, EventArgs e) => _layoutUpdated?.Invoke(this, e);
-
-        /// <summary>
-        /// Tests whether any of a <see cref="Rect"/>'s properties include negative values,
-        /// a NaN or Infinity.
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <returns>True if the rect is invalid; otherwise false.</returns>
-        private static bool IsInvalidRect(Rect rect)
-        {
-            return rect.Width < 0 || rect.Height < 0 ||
-                double.IsInfinity(rect.X) || double.IsInfinity(rect.Y) ||
-                double.IsInfinity(rect.Width) || double.IsInfinity(rect.Height) ||
-                double.IsNaN(rect.X) || double.IsNaN(rect.Y) ||
-                double.IsNaN(rect.Width) || double.IsNaN(rect.Height);
-        }
-
-        /// <summary>
-        /// Tests whether any of a <see cref="Size"/>'s properties include negative values,
-        /// a NaN or Infinity.
-        /// </summary>
-        /// <param name="size">The size.</param>
-        /// <returns>True if the size is invalid; otherwise false.</returns>
-        private static bool IsInvalidSize(Size size)
-        {
-            return size.Width < 0 || size.Height < 0 ||
-                double.IsInfinity(size.Width) || double.IsInfinity(size.Height) ||
-                double.IsNaN(size.Width) || double.IsNaN(size.Height);
-        }
-
-        /// <summary>
-        /// Ensures neither component of a <see cref="Size"/> is negative.
-        /// </summary>
-        /// <param name="size">The size.</param>
-        /// <returns>The non-negative size.</returns>
-        private static Size NonNegative(Size size)
-        {
-            return new Size(Math.Max(size.Width, 0), Math.Max(size.Height, 0));
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/Properties/AssemblyInfo.cs b/src/Avalonia.Layout/Properties/AssemblyInfo.cs
deleted file mode 100644
index efcbf184b5..0000000000
--- a/src/Avalonia.Layout/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Metadata;
-
-[assembly: InternalsVisibleTo("Avalonia.Layout.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]
-
diff --git a/src/Avalonia.Layout/StackLayout.cs b/src/Avalonia.Layout/StackLayout.cs
deleted file mode 100644
index c63fe5e405..0000000000
--- a/src/Avalonia.Layout/StackLayout.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-// This source file is adapted from the WinUI project.
-// (https://github.com/microsoft/microsoft-ui-xaml)
-//
-// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
-
-using System;
-using System.Collections.Specialized;
-using Avalonia.Data;
-using Avalonia.Logging;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Arranges elements into a single line (with spacing) that can be oriented horizontally or vertically.
-    /// </summary>
-    public class StackLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
-    {
-        /// <summary>
-        /// Defines the <see cref="DisableVirtualization"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> DisableVirtualizationProperty =
-            AvaloniaProperty.Register<StackLayout, bool>(nameof(DisableVirtualization));
-
-        /// <summary>
-        /// Defines the <see cref="Orientation"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Orientation> OrientationProperty =
-            AvaloniaProperty.Register<StackLayout, Orientation>(nameof(Orientation), Orientation.Vertical);
-
-        /// <summary>
-        /// Defines the <see cref="Spacing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> SpacingProperty =
-            AvaloniaProperty.Register<StackLayout, double>(nameof(Spacing));
-
-        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
-
-        /// <summary>
-        /// Initializes a new instance of the StackLayout class.
-        /// </summary>
-        public StackLayout()
-        {
-            LayoutId = "StackLayout";
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether virtualization is disabled on the layout.
-        /// </summary>
-        public bool DisableVirtualization
-        {
-            get => GetValue(DisableVirtualizationProperty);
-            set => SetValue(DisableVirtualizationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the axis along which items are laid out.
-        /// </summary>
-        /// <value>
-        /// One of the enumeration values that specifies the axis along which items are laid out.
-        /// The default is Vertical.
-        /// </value>
-        public Orientation Orientation
-        {
-            get => GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a uniform distance (in pixels) between stacked items. It is applied in the
-        /// direction of the StackLayout's Orientation.
-        /// </summary>
-        public double Spacing
-        {
-            get => GetValue(SpacingProperty);
-            set => SetValue(SpacingProperty, value);
-        }
-
-        internal Rect GetExtent(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            ILayoutable? firstRealized,
-            int firstRealizedItemIndex,
-            Rect firstRealizedLayoutBounds,
-            ILayoutable? lastRealized,
-            int lastRealizedItemIndex,
-            Rect lastRealizedLayoutBounds)
-        {
-            var extent = new Rect();
-
-            // Constants
-            int itemsCount = context.ItemCount;
-            var stackState = (StackLayoutState)context.LayoutState!;
-            double averageElementSize = GetAverageElementSize(availableSize, context, stackState) + Spacing;
-
-            _orientation.SetMinorSize(ref extent, stackState.MaxArrangeBounds);
-            _orientation.SetMajorSize(ref extent, Math.Max(0.0f, itemsCount * averageElementSize - Spacing));
-            if (itemsCount > 0)
-            {
-                if (firstRealized != null)
-                {
-                    _orientation.SetMajorStart(
-                        ref extent,
-                        _orientation.MajorStart(firstRealizedLayoutBounds) - firstRealizedItemIndex * averageElementSize);
-                    var remainingItems = itemsCount - lastRealizedItemIndex - 1;
-                    _orientation.SetMajorSize(
-                        ref extent,
-                        _orientation.MajorEnd(lastRealizedLayoutBounds) -
-                            _orientation.MajorStart(extent) + 
-                            (remainingItems * averageElementSize));
-                }
-                else
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements",
-                        LayoutId);
-                }
-            }
-
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on average {Average}",
-                LayoutId, extent.Size, averageElementSize);
-            return extent;
-        }
-
-        internal void OnElementMeasured(
-            ILayoutable element,
-            int index,
-            Size availableSize,
-            Size measureSize,
-            Size desiredSize,
-            Size provisionalArrangeSize,
-            VirtualizingLayoutContext context)
-        {
-            if (context is VirtualizingLayoutContext virtualContext)
-            {
-                var stackState = (StackLayoutState)virtualContext.LayoutState!;
-                var provisionalArrangeSizeWinRt = provisionalArrangeSize;
-                stackState.OnElementMeasured(
-                    index,
-                    _orientation.Major(provisionalArrangeSizeWinRt),
-                    _orientation.Minor(provisionalArrangeSizeWinRt));
-            }
-        }
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
-            int index,
-            Size availableSize,
-            VirtualizingLayoutContext context) => availableSize;
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
-            int index,
-            Size measureSize,
-            Size desiredSize,
-            VirtualizingLayoutContext context)
-        {
-            var measureSizeMinor = _orientation.Minor(measureSize);
-            return _orientation.MinorMajorSize(
-                !double.IsInfinity(measureSizeMinor) ?
-                    Math.Max(measureSizeMinor, _orientation.Minor(desiredSize)) :
-                    _orientation.Minor(desiredSize),
-                _orientation.Major(desiredSize));
-        }
-
-        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => true;
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
-            Size availableSize,
-            VirtualizingLayoutContext context) => GetAnchorForRealizationRect(availableSize, context);
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
-            int targetIndex,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            double offset = double.NaN;
-            int index = -1;
-            int itemsCount = context.ItemCount;
-
-            if (targetIndex >= 0 && targetIndex < itemsCount)
-            {
-                index = targetIndex;
-                var state = (StackLayoutState)context.LayoutState!;
-                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
-                offset = index * averageElementSize + _orientation.MajorStart(state.FlowAlgorithm.LastExtent);
-            }
-
-            return new FlowLayoutAnchorInfo { Index = index, Offset = offset };
-        }
-
-        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            ILayoutable? firstRealized,
-            int firstRealizedItemIndex,
-            Rect firstRealizedLayoutBounds,
-            ILayoutable? lastRealized,
-            int lastRealizedItemIndex,
-            Rect lastRealizedLayoutBounds)
-        {
-            return GetExtent(
-                availableSize,
-                context,
-                firstRealized,
-                firstRealizedItemIndex,
-                firstRealizedLayoutBounds,
-                lastRealized,
-                lastRealizedItemIndex,
-                lastRealizedLayoutBounds);
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
-        {
-            OnElementMeasured(
-                element,
-                index,
-                availableSize,
-                measureSize,
-                desiredSize,
-                provisionalArrangeSize,
-                context);
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
-        {
-        }
-
-        internal FlowLayoutAnchorInfo GetAnchorForRealizationRect(
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            int anchorIndex = -1;
-            double offset = double.NaN;
-
-            // Constants
-            int itemsCount = context.ItemCount;
-            if (itemsCount > 0)
-            {
-                var realizationRect = context.RealizationRect;
-                var state = (StackLayoutState)context.LayoutState!;
-                var lastExtent = state.FlowAlgorithm.LastExtent;
-
-                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
-                double realizationWindowOffsetInExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
-                double majorSize = _orientation.MajorSize(lastExtent) == 0 ? Math.Max(0.0, averageElementSize * itemsCount - Spacing) : _orientation.MajorSize(lastExtent);
-                if (itemsCount > 0 &&
-                    _orientation.MajorSize(realizationRect) >= 0 &&
-                    // MajorSize = 0 will account for when a nested repeater is outside the realization rect but still being measured. Also,
-                    // note that if we are measuring this repeater, then we are already realizing an element to figure out the size, so we could
-                    // just keep that element alive. It also helps in XYFocus scenarios to have an element realized for XYFocus to find a candidate
-                    // in the navigating direction.
-                    realizationWindowOffsetInExtent + _orientation.MajorSize(realizationRect) >= 0 && realizationWindowOffsetInExtent <= majorSize)
-                {
-                    anchorIndex = (int) (realizationWindowOffsetInExtent / averageElementSize);
-                    anchorIndex = Math.Max(0, Math.Min(itemsCount - 1, anchorIndex));
-                    offset = anchorIndex* averageElementSize + _orientation.MajorStart(lastExtent);
-                }
-        }
-
-            return new FlowLayoutAnchorInfo { Index = anchorIndex, Offset = offset, };
-        }
-
-        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var state = context.LayoutState;
-            var stackState = state as StackLayoutState;
-            
-            if (stackState == null)
-            {
-                if (state != null)
-                {
-                    throw new InvalidOperationException("LayoutState must derive from StackLayoutState.");
-                }
-
-                // Custom deriving layouts could potentially be stateful.
-                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
-                stackState = new StackLayoutState();
-            }
-
-            stackState.InitializeForContext(context, this);
-        }
-
-        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var stackState = (StackLayoutState)context.LayoutState!;
-            stackState.UninitializeForContext(context);
-        }
-
-        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
-        {
-            ((StackLayoutState)context.LayoutState!).OnMeasureStart();
-
-            var desiredSize = GetFlowAlgorithm(context).Measure(
-                availableSize,
-                context,
-                false,
-                0,
-                Spacing,
-                int.MaxValue,
-                _orientation.ScrollOrientation,
-                DisableVirtualization,
-                LayoutId);
-
-            return new Size(desiredSize.Width, desiredSize.Height);
-        }
-
-        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
-        {
-            var value = GetFlowAlgorithm(context).Arrange(
-               finalSize,
-               context,
-               false,
-               FlowLayoutAlgorithm.LineAlignment.Start,
-               LayoutId);
-
-            return new Size(value.Width, value.Height);
-        }
-
-        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
-        {
-            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
-            // Always invalidate layout to keep the view accurate.
-            InvalidateLayout();
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            if (change.Property == OrientationProperty)
-            {
-                var orientation = change.NewValue.GetValueOrDefault<Orientation>();
-
-                //Note: For StackLayout Vertical Orientation means we have a Vertical ScrollOrientation.
-                //Horizontal Orientation means we have a Horizontal ScrollOrientation.
-                _orientation.ScrollOrientation = orientation == Orientation.Horizontal ? ScrollOrientation.Horizontal : ScrollOrientation.Vertical;
-            }
-
-            InvalidateLayout();
-        }
-
-        private double GetAverageElementSize(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            StackLayoutState stackLayoutState)
-        {
-            double averageElementSize = 0;
-
-            if (context.ItemCount > 0)
-            {
-                if (stackLayoutState.TotalElementsMeasured == 0)
-                {
-                    var tmpElement = context.GetOrCreateElementAt(0, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
-                    stackLayoutState.FlowAlgorithm.MeasureElement(tmpElement, 0, availableSize, context);
-                    context.RecycleElement(tmpElement);
-                }
-
-                averageElementSize = Math.Round(stackLayoutState.TotalElementSize / stackLayoutState.TotalElementsMeasured);
-            }
-
-            return averageElementSize;
-        }
-
-        private void InvalidateLayout() => InvalidateMeasure();
-
-        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((StackLayoutState)context.LayoutState!).FlowAlgorithm;
-    }
-}
diff --git a/src/Avalonia.Layout/UniformGridLayout.cs b/src/Avalonia.Layout/UniformGridLayout.cs
deleted file mode 100644
index 3b82ece886..0000000000
--- a/src/Avalonia.Layout/UniformGridLayout.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-// This source file is adapted from the WinUI project.
-// (https://github.com/microsoft/microsoft-ui-xaml)
-//
-// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
-
-using System;
-using System.Collections.Specialized;
-using Avalonia.Data;
-using Avalonia.Logging;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines constants that specify how items are aligned on the non-scrolling or non-virtualizing axis.
-    /// </summary>
-    public enum UniformGridLayoutItemsJustification
-    {
-        /// <summary>
-        /// Items are aligned with the start of the row or column, with extra space at the end.
-        /// Spacing between items does not change.
-        /// </summary>
-        Start = 0,
-
-        /// <summary>
-        /// Items are aligned in the center of the row or column, with extra space at the start and
-        /// end. Spacing between items does not change.
-        /// </summary>
-        Center = 1,
-
-        /// <summary>
-        /// Items are aligned with the end of the row or column, with extra space at the start.
-        /// Spacing between items does not change.
-        /// </summary>
-        End = 2,
-
-        /// <summary>
-        /// Items are aligned so that extra space is added evenly before and after each item.
-        /// </summary>
-        SpaceAround = 3,
-
-        /// <summary>
-        /// Items are aligned so that extra space is added evenly between adjacent items. No space
-        /// is added at the start or end.
-        /// </summary>
-        SpaceBetween = 4,
-
-        SpaceEvenly = 5,
-    };
-
-    /// <summary>
-    /// Defines constants that specify how items are sized to fill the available space.
-    /// </summary>
-    public enum UniformGridLayoutItemsStretch
-    {
-        /// <summary>
-        /// The item retains its natural size. Use of extra space is determined by the
-        /// <see cref="UniformGridLayout.ItemsJustification"/> property.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The item is sized to fill the available space in the non-scrolling direction. Item size
-        /// in the scrolling direction is not changed.
-        /// </summary>
-        Fill = 1,
-
-        /// <summary>
-        /// The item is sized to both fill the available space in the non-scrolling direction and
-        /// maintain its aspect ratio.
-        /// </summary>
-        Uniform = 2,
-    };
-
-    /// <summary>
-    /// Positions elements sequentially from left to right or top to bottom in a wrapping layout.
-    /// </summary>
-    public class UniformGridLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
-    {
-        /// <summary>
-        /// Defines the <see cref="ItemsJustification"/> property.
-        /// </summary>
-        public static readonly StyledProperty<UniformGridLayoutItemsJustification> ItemsJustificationProperty =
-            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsJustification>(nameof(ItemsJustification));
-
-        /// <summary>
-        /// Defines the <see cref="ItemsStretch"/> property.
-        /// </summary>
-        public static readonly StyledProperty<UniformGridLayoutItemsStretch> ItemsStretchProperty =
-            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsStretch>(nameof(ItemsStretch));
-
-        /// <summary>
-        /// Defines the <see cref="MinColumnSpacing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinColumnSpacingProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinColumnSpacing));
-
-        /// <summary>
-        /// Defines the <see cref="MinItemHeight"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinItemHeightProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemHeight));
-
-        /// <summary>
-        /// Defines the <see cref="MinItemWidth"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinItemWidthProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemWidth));
-
-        /// <summary>
-        /// Defines the <see cref="MinRowSpacing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinRowSpacingProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinRowSpacing));
-
-        /// <summary>
-        /// Defines the <see cref="MaximumRowsOrColumnsProperty"/> property.
-        /// </summary>
-        public static readonly StyledProperty<int> MaximumRowsOrColumnsProperty =
-            AvaloniaProperty.Register<UniformGridLayout, int>(nameof(MinItemWidth));
-
-        /// <summary>
-        /// Defines the <see cref="Orientation"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Orientation> OrientationProperty =
-            StackLayout.OrientationProperty.AddOwner<UniformGridLayout>();
-
-        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
-        private double _minItemWidth = double.NaN;
-        private double _minItemHeight = double.NaN;
-        private double _minRowSpacing;
-        private double _minColumnSpacing;
-        private UniformGridLayoutItemsJustification _itemsJustification;
-        private UniformGridLayoutItemsStretch _itemsStretch;
-        private int _maximumRowsOrColumns = int.MaxValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UniformGridLayout"/> class.
-        /// </summary>
-        public UniformGridLayout()
-        {
-            LayoutId = "UniformGridLayout";
-        } 
-
-        static UniformGridLayout()
-        {
-            OrientationProperty.OverrideDefaultValue<UniformGridLayout>(Orientation.Horizontal);
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates how items are aligned on the non-scrolling or non-
-        /// virtualizing axis.
-        /// </summary>
-        /// <value>
-        /// An enumeration value that indicates how items are aligned. The default is Start.
-        /// </value>
-        public UniformGridLayoutItemsJustification ItemsJustification
-        {
-            get => GetValue(ItemsJustificationProperty);
-            set => SetValue(ItemsJustificationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates how items are sized to fill the available space.
-        /// </summary>
-        /// <value>
-        /// An enumeration value that indicates how items are sized to fill the available space.
-        /// The default is None.
-        /// </value>
-        /// <remarks>
-        /// This property enables adaptive layout behavior where the items are sized to fill the
-        /// available space along the non-scrolling axis, and optionally maintain their aspect ratio.
-        /// </remarks>
-        public UniformGridLayoutItemsStretch ItemsStretch
-        {
-            get => GetValue(ItemsStretchProperty);
-            set => SetValue(ItemsStretchProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum space between items on the horizontal axis.
-        /// </summary>
-        /// <remarks>
-        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
-        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
-        /// </remarks>
-        public double MinColumnSpacing
-        {
-            get => GetValue(MinColumnSpacingProperty);
-            set => SetValue(MinColumnSpacingProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum height of each item.
-        /// </summary>
-        /// <value>
-        /// The minimum height (in pixels) of each item. The default is NaN, in which case the
-        /// height of the first item is used as the minimum.
-        /// </value>
-        public double MinItemHeight
-        {
-            get => GetValue(MinItemHeightProperty);
-            set => SetValue(MinItemHeightProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum width of each item.
-        /// </summary>
-        /// <value>
-        /// The minimum width (in pixels) of each item. The default is NaN, in which case the width
-        /// of the first item is used as the minimum.
-        /// </value>
-        public double MinItemWidth
-        {
-            get => GetValue(MinItemWidthProperty);
-            set => SetValue(MinItemWidthProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum space between items on the vertical axis.
-        /// </summary>
-        /// <remarks>
-        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
-        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
-        /// </remarks>
-        public double MinRowSpacing
-        {
-            get => GetValue(MinRowSpacingProperty);
-            set => SetValue(MinRowSpacingProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum row or column count.
-        /// </summary>
-        public int MaximumRowsOrColumns
-        {
-            get => GetValue(MaximumRowsOrColumnsProperty);
-            set => SetValue(MaximumRowsOrColumnsProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the axis along which items are laid out.
-        /// </summary>
-        /// <value>
-        /// One of the enumeration values that specifies the axis along which items are laid out.
-        /// The default is Vertical.
-        /// </value>
-        public Orientation Orientation
-        {
-            get => GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        internal double LineSpacing => Orientation == Orientation.Horizontal ? _minRowSpacing : _minColumnSpacing;
-        internal double MinItemSpacing => Orientation == Orientation.Horizontal ? _minColumnSpacing : _minRowSpacing;
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
-            int index,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
-        }
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
-            int index,
-            Size measureSize,
-            Size desiredSize,
-            VirtualizingLayoutContext context)
-        {
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
-        }
-
-        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => remainingSpace < 0;
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            Rect bounds = new Rect(double.NaN, double.NaN, double.NaN, double.NaN);
-            int anchorIndex = -1;
-
-            int itemsCount = context.ItemCount;
-            var realizationRect = context.RealizationRect;
-            if (itemsCount > 0 && _orientation.MajorSize(realizationRect) > 0)
-            {
-                var gridState = (UniformGridLayoutState)context.LayoutState!;
-                var lastExtent = gridState.FlowAlgorithm.LastExtent;
-                var itemsPerLine = Math.Min( // note use of unsigned ints
-                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
-                    Math.Max(1u, (uint)_maximumRowsOrColumns));
-                var majorSize = (itemsCount / itemsPerLine) * GetMajorSizeWithSpacing(context);
-                var realizationWindowStartWithinExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
-                if ((realizationWindowStartWithinExtent + _orientation.MajorSize(realizationRect)) >= 0 && realizationWindowStartWithinExtent <= majorSize)
-                {
-                    double offset = Math.Max(0.0, _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent));
-                    int anchorRowIndex = (int)(offset / GetMajorSizeWithSpacing(context));
-
-                    anchorIndex = (int)Math.Max(0, Math.Min(itemsCount - 1, anchorRowIndex * itemsPerLine));
-                    bounds = GetLayoutRectForDataIndex(availableSize, anchorIndex, lastExtent, context);
-                }
-            }
-
-            return new FlowLayoutAnchorInfo
-            {
-                Index = anchorIndex,
-                Offset = _orientation.MajorStart(bounds)
-            };
-        }
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
-            int targetIndex,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            int index = -1;
-            double offset = double.NaN;
-            int count = context.ItemCount;
-            if (targetIndex >= 0 && targetIndex < count)
-            {
-                int itemsPerLine = (int)Math.Min( // note use of unsigned ints
-                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
-                    Math.Max(1u, _maximumRowsOrColumns));
-                int indexOfFirstInLine = (targetIndex / itemsPerLine) * itemsPerLine;
-                index = indexOfFirstInLine;
-                var state = (UniformGridLayoutState)context.LayoutState!;
-                offset = _orientation.MajorStart(GetLayoutRectForDataIndex(availableSize, indexOfFirstInLine, state.FlowAlgorithm.LastExtent, context));
-            }
-
-            return new FlowLayoutAnchorInfo
-            {
-                Index = index,
-                Offset = offset
-            };
-        }
-
-        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            ILayoutable? firstRealized,
-            int firstRealizedItemIndex,
-            Rect firstRealizedLayoutBounds,
-            ILayoutable? lastRealized,
-            int lastRealizedItemIndex,
-            Rect lastRealizedLayoutBounds)
-        {
-            var extent = new Rect();
-
-
-            // Constants
-            int itemsCount = context.ItemCount;
-            double availableSizeMinor = _orientation.Minor(availableSize);
-            int itemsPerLine =
-                (int)Math.Min( // note use of unsigned ints
-                    Math.Max(1u, !double.IsInfinity(availableSizeMinor)
-                        ? (uint)(availableSizeMinor / GetMinorSizeWithSpacing(context))
-                        : (uint)itemsCount),
-                Math.Max(1u, _maximumRowsOrColumns));
-            double lineSize = GetMajorSizeWithSpacing(context);
-
-            if (itemsCount > 0)
-            {
-                _orientation.SetMinorSize(
-                    ref extent,
-                    !double.IsInfinity(availableSizeMinor) && _itemsStretch == UniformGridLayoutItemsStretch.Fill ?
-                    availableSizeMinor :
-                    Math.Max(0.0, itemsPerLine * GetMinorSizeWithSpacing(context) - (double)MinItemSpacing));
-                _orientation.SetMajorSize(
-                    ref extent,
-                    Math.Max(0.0, (itemsCount / itemsPerLine) * lineSize - (double)LineSpacing));
-
-                if (firstRealized != null)
-                {
-                    _orientation.SetMajorStart(
-                        ref extent,
-                        _orientation.MajorStart(firstRealizedLayoutBounds) - (firstRealizedItemIndex / itemsPerLine) * lineSize);
-                    int remainingItems = itemsCount - lastRealizedItemIndex - 1;
-                    _orientation.SetMajorSize(
-                        ref extent,
-                        _orientation.MajorEnd(lastRealizedLayoutBounds) - _orientation.MajorStart(extent) + (remainingItems / itemsPerLine) * lineSize);
-                }
-                else
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements", LayoutId);
-                }
-            }
-
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on lineSize {LineSize} and items per line {ItemsPerLine}",
-                LayoutId, extent.Size, lineSize, itemsPerLine);
-            return extent;
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
-        {
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
-        {
-        }
-
-        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var state = context.LayoutState;
-            var gridState = state as UniformGridLayoutState;
-            
-            if (gridState == null)
-            {
-                if (state != null)
-                {
-                    throw new InvalidOperationException("LayoutState must derive from UniformGridLayoutState.");
-                }
-
-                // Custom deriving layouts could potentially be stateful.
-                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
-                gridState = new UniformGridLayoutState();
-            }
-
-            gridState.InitializeForContext(context, this);
-        }
-
-        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            gridState.UninitializeForContext(context);
-        }
-
-        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
-        {
-            // Set the width and height on the grid state. If the user already set them then use the preset. 
-            // If not, we have to measure the first element and get back a size which we're going to be using for the rest of the items.
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            gridState.EnsureElementSize(availableSize, context, _minItemWidth, _minItemHeight, _itemsStretch, Orientation, MinRowSpacing, MinColumnSpacing, _maximumRowsOrColumns);
-
-            var desiredSize = GetFlowAlgorithm(context).Measure(
-                availableSize,
-                context,
-                true,
-                MinItemSpacing,
-                LineSpacing,
-                _maximumRowsOrColumns,
-                _orientation.ScrollOrientation,
-                false,
-                LayoutId);
-
-            // If after Measure the first item is in the realization rect, then we revoke grid state's ownership,
-            // and only use the layout when to clear it when it's done.
-            gridState.EnsureFirstElementOwnership(context);
-
-            return desiredSize;
-        }
-
-        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
-        {
-            var value = GetFlowAlgorithm(context).Arrange(
-               finalSize,
-               context,
-               true,
-               (FlowLayoutAlgorithm.LineAlignment)_itemsJustification,
-               LayoutId);
-            return new Size(value.Width, value.Height);
-        }
-
-        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
-        {
-            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
-            // Always invalidate layout to keep the view accurate.
-            InvalidateLayout();
-
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            gridState.ClearElementOnDataSourceChange(context, args);
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            if (change.Property == OrientationProperty)
-            {
-                var orientation = change.NewValue.GetValueOrDefault<Orientation>();
-
-                //Note: For UniformGridLayout Vertical Orientation means we have a Horizontal ScrollOrientation. Horizontal Orientation means we have a Vertical ScrollOrientation.
-                //i.e. the properties are the inverse of each other.
-                var scrollOrientation = (orientation == Orientation.Horizontal) ? ScrollOrientation.Vertical : ScrollOrientation.Horizontal;
-                _orientation.ScrollOrientation = scrollOrientation;
-            }
-            else if (change.Property == MinColumnSpacingProperty)
-            {
-                _minColumnSpacing = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == MinRowSpacingProperty)
-            {
-                _minRowSpacing = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == ItemsJustificationProperty)
-            {
-                _itemsJustification = change.NewValue.GetValueOrDefault<UniformGridLayoutItemsJustification>();
-            }
-            else if (change.Property == ItemsStretchProperty)
-            {
-                _itemsStretch = change.NewValue.GetValueOrDefault<UniformGridLayoutItemsStretch>();
-            }
-            else if (change.Property == MinItemWidthProperty)
-            {
-                _minItemWidth = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == MinItemHeightProperty)
-            {
-                _minItemHeight = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == MaximumRowsOrColumnsProperty)
-            {
-                _maximumRowsOrColumns = change.NewValue.GetValueOrDefault<int>();
-            }
-
-            InvalidateLayout();
-        }
-
-        private double GetMinorSizeWithSpacing(VirtualizingLayoutContext context)
-        {
-            var minItemSpacing = MinItemSpacing;
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return _orientation.ScrollOrientation == ScrollOrientation.Vertical?
-                gridState.EffectiveItemWidth + minItemSpacing :
-                gridState.EffectiveItemHeight + minItemSpacing;
-        }
-
-        private double GetMajorSizeWithSpacing(VirtualizingLayoutContext context)
-        {
-            var lineSpacing = LineSpacing;
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return _orientation.ScrollOrientation == ScrollOrientation.Vertical ?
-                gridState.EffectiveItemHeight + lineSpacing :
-                gridState.EffectiveItemWidth + lineSpacing;
-        }
-
-        Rect GetLayoutRectForDataIndex(
-            Size availableSize,
-            int index,
-            Rect lastExtent,
-            VirtualizingLayoutContext context)
-        {
-            int itemsPerLine = (int)Math.Min( //note use of unsigned ints
-                Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
-                Math.Max(1u, _maximumRowsOrColumns));
-            int rowIndex = (int)(index / itemsPerLine);
-            int indexInRow = index - (rowIndex * itemsPerLine);
-
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            Rect bounds = _orientation.MinorMajorRect(
-                indexInRow * GetMinorSizeWithSpacing(context) + _orientation.MinorStart(lastExtent),
-                rowIndex * GetMajorSizeWithSpacing(context) + _orientation.MajorStart(lastExtent),
-                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemWidth : gridState.EffectiveItemHeight,
-                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemHeight : gridState.EffectiveItemWidth);
-
-            return bounds;
-        }
-
-        private void InvalidateLayout() => InvalidateMeasure();
-
-        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((UniformGridLayoutState)context.LayoutState!).FlowAlgorithm;
-    }
-}
diff --git a/src/Avalonia.Layout/UniformGridLayoutState.cs b/src/Avalonia.Layout/UniformGridLayoutState.cs
deleted file mode 100644
index d6b5a30bfc..0000000000
--- a/src/Avalonia.Layout/UniformGridLayoutState.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-// This source file is adapted from the WinUI project.
-// (https://github.com/microsoft/microsoft-ui-xaml)
-//
-// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
-
-using System;
-using System.Collections.Specialized;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Represents the state of a <see cref="UniformGridLayout"/>.
-    /// </summary>
-    public class UniformGridLayoutState
-    {
-        // We need to measure the element at index 0 to know what size to measure all other items. 
-        // If FlowlayoutAlgorithm has already realized element 0 then we can use that. 
-        // If it does not, then we need to do context.GetElement(0) at which point we have requested an element and are on point to clear it.
-        // If we are responsible for clearing element 0 we keep m_cachedFirstElement valid. 
-        // If we are not (because FlowLayoutAlgorithm is holding it for us) then we just null out this field and use the one from FlowLayoutAlgorithm.
-        private ILayoutable? _cachedFirstElement;
-
-        internal FlowLayoutAlgorithm FlowAlgorithm { get; } = new FlowLayoutAlgorithm();
-        internal double EffectiveItemWidth { get; private set; }
-        internal double EffectiveItemHeight { get; private set; }
-
-        internal void InitializeForContext(VirtualizingLayoutContext context, IFlowLayoutAlgorithmDelegates callbacks)
-        {
-            FlowAlgorithm.InitializeForContext(context, callbacks);
-            context.LayoutState = this;
-        }
-
-        internal void UninitializeForContext(VirtualizingLayoutContext context)
-        {
-            FlowAlgorithm.UninitializeForContext(context);
-
-            if (_cachedFirstElement != null)
-            {
-                context.RecycleElement(_cachedFirstElement);
-            }
-        }
-
-        internal void EnsureElementSize(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            double layoutItemWidth,
-            double layoutItemHeight,
-            UniformGridLayoutItemsStretch stretch,
-            Orientation orientation,
-            double minRowSpacing,
-            double minColumnSpacing,
-            int maxItemsPerLine)
-        {
-            if (maxItemsPerLine == 0)
-            {
-                maxItemsPerLine = 1;
-            }
-
-            if (context.ItemCount > 0)
-            {
-                // If the first element is realized we don't need to cache it or to get it from the context
-                var realizedElement = FlowAlgorithm.GetElementIfRealized(0);
-                if (realizedElement != null)
-                {
-                    realizedElement.Measure(availableSize);
-                    SetSize(realizedElement, layoutItemWidth, layoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing, maxItemsPerLine);
-                    _cachedFirstElement = null;
-                }
-                else
-                {
-                    if (_cachedFirstElement == null)
-                    {
-                        // we only cache if we aren't realizing it
-                        _cachedFirstElement = context.GetOrCreateElementAt(
-                            0,
-                            ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle); // expensive
-                    }
-
-                    _cachedFirstElement.Measure(availableSize);
-
-                    SetSize(_cachedFirstElement, layoutItemWidth, layoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing, maxItemsPerLine);
-
-                    // See if we can move ownership to the flow algorithm. If we can, we do not need a local cache.
-                    bool added = FlowAlgorithm.TryAddElement0(_cachedFirstElement);
-                    if (added)
-                    {
-                        _cachedFirstElement = null;
-                    }
-                }
-            }
-        }
-
-        private void SetSize(
-            ILayoutable element,
-            double layoutItemWidth,
-            double layoutItemHeight,
-            Size availableSize,
-            UniformGridLayoutItemsStretch stretch,
-            Orientation orientation,
-            double minRowSpacing,
-            double minColumnSpacing,
-            int maxItemsPerLine)
-        {
-            if (maxItemsPerLine == 0)
-            {
-                maxItemsPerLine = 1;
-            }
-
-            EffectiveItemWidth = (double.IsNaN(layoutItemWidth) ? element.DesiredSize.Width : layoutItemWidth);
-            EffectiveItemHeight = (double.IsNaN(layoutItemHeight) ? element.DesiredSize.Height : layoutItemHeight);
-
-            var availableSizeMinor = orientation == Orientation.Horizontal ? availableSize.Width : availableSize.Height;
-            var minorItemSpacing = orientation == Orientation.Vertical ? minRowSpacing : minColumnSpacing;
-
-            var itemSizeMinor = orientation == Orientation.Horizontal ? EffectiveItemWidth : EffectiveItemHeight;
-
-            double extraMinorPixelsForEachItem = 0.0;
-            if (!double.IsInfinity(availableSizeMinor))
-            {
-                var numItemsPerColumn = Math.Min(
-                    maxItemsPerLine,
-                    Math.Max(1.0, availableSizeMinor / (itemSizeMinor + minorItemSpacing)));
-                var usedSpace = (numItemsPerColumn * (itemSizeMinor + minorItemSpacing)) - minorItemSpacing;
-                var remainingSpace = ((int)(availableSizeMinor - usedSpace));
-                extraMinorPixelsForEachItem = remainingSpace / ((int)numItemsPerColumn);
-            }
-
-            if (stretch == UniformGridLayoutItemsStretch.Fill)
-            {
-                if (orientation == Orientation.Horizontal)
-                {
-                    EffectiveItemWidth += extraMinorPixelsForEachItem;
-                }
-                else
-                {
-                    EffectiveItemHeight += extraMinorPixelsForEachItem;
-                }
-            }
-            else if (stretch == UniformGridLayoutItemsStretch.Uniform)
-            {
-                var itemSizeMajor = orientation == Orientation.Horizontal ? EffectiveItemHeight : EffectiveItemWidth;
-                var extraMajorPixelsForEachItem = itemSizeMajor * (extraMinorPixelsForEachItem / itemSizeMinor);
-                if (orientation == Orientation.Horizontal)
-                {
-                    EffectiveItemWidth += extraMinorPixelsForEachItem;
-                    EffectiveItemHeight += extraMajorPixelsForEachItem;
-                }
-                else
-                {
-                    EffectiveItemHeight += extraMinorPixelsForEachItem;
-                    EffectiveItemWidth += extraMajorPixelsForEachItem;
-                }
-            }
-        }
-
-        internal void EnsureFirstElementOwnership(VirtualizingLayoutContext context)
-        {
-            if (_cachedFirstElement != null && FlowAlgorithm.GetElementIfRealized(0) != null)
-            {
-                // We created the element, but then flowlayout algorithm took ownership, so we can clear it and
-                // let flowlayout algorithm do its thing.
-                context.RecycleElement(_cachedFirstElement);
-                _cachedFirstElement = null;
-            }
-        }
-
-        internal void ClearElementOnDataSourceChange(
-            VirtualizingLayoutContext context,
-            NotifyCollectionChangedEventArgs args)
-        {
-            if (_cachedFirstElement != null)
-            {
-                bool shouldClear = false;
-                switch (args.Action)
-                {
-                case NotifyCollectionChangedAction.Add:
-                    shouldClear = args.NewStartingIndex == 0;
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    shouldClear = args.NewStartingIndex == 0 || args.OldStartingIndex == 0;
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    shouldClear = args.OldStartingIndex == 0;
-                    break;
-
-                case NotifyCollectionChangedAction.Reset:
-                    shouldClear = true;
-                    break;
-
-                case NotifyCollectionChangedAction.Move:
-                    throw new NotImplementedException();
-                }
-
-                if (shouldClear)
-                {
-                    context.RecycleElement(_cachedFirstElement);
-                    _cachedFirstElement = null;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
deleted file mode 100644
index aab0272f37..0000000000
--- a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Layout;
-using System;
-using System.Collections.Specialized;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Arranges elements by wrapping them to fit the available space.
-    /// When <see cref="Orientation"/> is set to Orientation.Horizontal, element are arranged in rows until the available width is reached and then to a new row.
-    /// When <see cref="Orientation"/> is set to Orientation.Vertical, element are arranged in columns until the available height is reached.
-    /// </summary>
-    public class WrapLayout : VirtualizingLayout
-    {
-        /// <summary>
-        /// Gets or sets a uniform Horizontal distance (in pixels) between items when <see cref="Orientation"/> is set to Horizontal,
-        /// or between columns of items when <see cref="Orientation"/> is set to Vertical.
-        /// </summary>
-        public double HorizontalSpacing
-        {
-            get { return (double)GetValue(HorizontalSpacingProperty); }
-            set { SetValue(HorizontalSpacingProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="HorizontalSpacing"/> dependency property.
-        /// </summary>
-        public static readonly StyledProperty<double> HorizontalSpacingProperty =
-            AvaloniaProperty.Register<WrapLayout, double>(nameof(HorizontalSpacing), 0);
-
-        /// <summary>
-        /// Gets or sets a uniform Vertical distance (in pixels) between items when <see cref="Orientation"/> is set to Vertical,
-        /// or between rows of items when <see cref="Orientation"/> is set to Horizontal.
-        /// </summary>
-        public double VerticalSpacing
-        {
-            get { return (double)GetValue(VerticalSpacingProperty); }
-            set { SetValue(VerticalSpacingProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="VerticalSpacing"/> dependency property.
-        /// </summary>
-        public static readonly StyledProperty<double> VerticalSpacingProperty =
-            AvaloniaProperty.Register<WrapLayout, double>(
-                nameof(VerticalSpacing), 0d);
-
-        /// <summary>
-        /// Gets or sets the orientation of the WrapLayout.
-        /// Horizontal means that child controls will be added horizontally until the width of the panel is reached, then a new row is added to add new child controls.
-        /// Vertical means that children will be added vertically until the height of the panel is reached, then a new column is added.
-        /// </summary>
-        public Orientation Orientation
-        {
-            get { return (Orientation)GetValue(OrientationProperty); }
-            set { SetValue(OrientationProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Orientation"/> dependency property.
-        /// </summary>
-        public static readonly StyledProperty<Orientation> OrientationProperty =
-            AvaloniaProperty.Register<WrapLayout, Orientation>(
-                nameof(Orientation),
-                Orientation.Horizontal);
-
-        /// <inheritdoc />
-        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var state = new WrapLayoutState(context);
-            context.LayoutState = state;
-            base.InitializeForContextCore(context);
-        }
-
-        /// <inheritdoc />
-        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            context.LayoutState = null;
-            base.UninitializeForContextCore(context);
-        }
-
-        /// <inheritdoc />
-        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
-        {
-            var state = (WrapLayoutState)context.LayoutState!;
-
-            switch (args.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    state.RemoveFromIndex(args.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Move:
-                    int minIndex = Math.Min(args.NewStartingIndex, args.OldStartingIndex);
-                    state.RemoveFromIndex(minIndex);
-
-                    state.RecycleElementAt(args.OldStartingIndex);
-                    state.RecycleElementAt(args.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    state.RemoveFromIndex(args.OldStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    state.RemoveFromIndex(args.NewStartingIndex);
-                    state.RecycleElementAt(args.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    state.Clear();
-                    break;
-            }
-
-            base.OnItemsChangedCore(context, source, args);
-        }
-
-        /// <inheritdoc />
-        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
-        {
-            var totalMeasure = UvMeasure.Zero;
-            var parentMeasure = new UvMeasure(Orientation, availableSize.Width, availableSize.Height);
-            var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
-            var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
-            var position = UvMeasure.Zero;
-
-            var state = (WrapLayoutState)context.LayoutState!;
-            if (state.Orientation != Orientation)
-            {
-                state.SetOrientation(Orientation);
-            }
-
-            if (spacingMeasure.Equals(state.Spacing) == false)
-            {
-                state.ClearPositions();
-                state.Spacing = spacingMeasure;
-            }
-
-            if (state.AvailableU != parentMeasure.U)
-            {
-                state.ClearPositions();
-                state.AvailableU = parentMeasure.U;
-            }
-
-            double currentV = 0;
-            for (int i = 0; i < context.ItemCount; i++)
-            {
-                bool measured = false;
-                WrapItem item = state.GetItemAt(i);
-                if (item.Measure == null)
-                {
-                    item.Element = context.GetOrCreateElementAt(i);
-                    item.Element.Measure(availableSize);
-                    item.Measure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
-                    measured = true;
-                }
-
-                UvMeasure currentMeasure = item.Measure.Value;
-                if (currentMeasure.U == 0)
-                {
-                    continue; // ignore collapsed items
-                }
-
-                if (item.Position == null)
-                {
-                    if (parentMeasure.U < position.U + currentMeasure.U)
-                    {
-                        // New Row
-                        position.U = 0;
-                        position.V += currentV + spacingMeasure.V;
-                        currentV = 0;
-                    }
-
-                    item.Position = position;
-                }
-
-                position = item.Position.Value;
-
-                double vEnd = position.V + currentMeasure.V;
-                if (vEnd < realizationBounds.VMin)
-                {
-                    // Item is "above" the bounds
-                    if (item.Element != null)
-                    {
-                        context.RecycleElement(item.Element);
-                        item.Element = null;
-                    }
-                }
-                else if (position.V > realizationBounds.VMax)
-                {
-                    // Item is "below" the bounds.
-                    if (item.Element != null)
-                    {
-                        context.RecycleElement(item.Element);
-                        item.Element = null;
-                    }
-
-                    // We don't need to measure anything below the bounds
-                    break;
-                }
-                else if (measured == false)
-                {
-                    // Always measure elements that are within the bounds
-                    item.Element = context.GetOrCreateElementAt(i);
-                    item.Element.Measure(availableSize);
-
-                    currentMeasure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
-                    if (currentMeasure.Equals(item.Measure) == false)
-                    {
-                        // this item changed size; we need to recalculate layout for everything after this
-                        state.RemoveFromIndex(i + 1);
-                        item.Measure = currentMeasure;
-
-                        // did the change make it go into the new row?
-                        if (parentMeasure.U < position.U + currentMeasure.U)
-                        {
-                            // New Row
-                            position.U = 0;
-                            position.V += currentV + spacingMeasure.V;
-                            currentV = 0;
-                        }
-
-                        item.Position = position;
-                    }
-                }
-
-                position.U += currentMeasure.U + spacingMeasure.U;
-                currentV = Math.Max(currentMeasure.V, currentV);
-            }
-
-            // update value with the last line
-            // if the the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
-            // if the last loop is (parentMeasure.U > currentMeasure.U) the currentMeasure isn't added to the total so add it here
-            // for the last condition it is zeros so adding it will make no difference
-            // this way is faster than an if condition in every loop for checking the last item
-            totalMeasure.U = parentMeasure.U;
-            
-            // Propagating an infinite size causes a crash. This can happen if the parent is scrollable and infinite in the opposite
-            // axis to the panel. Clearing to zero prevents the crash.
-            // This is likely an incorrect use of the control by the developer, however we need stability here so setting a default that wont crash.
-            if (double.IsInfinity(totalMeasure.U))
-            {
-                totalMeasure.U = 0.0;
-            }
-            
-            totalMeasure.V = state.GetHeight();
-
-            totalMeasure.U = Math.Ceiling(totalMeasure.U);
-
-            return Orientation == Orientation.Horizontal ? new Size(totalMeasure.U, totalMeasure.V) : new Size(totalMeasure.V, totalMeasure.U);
-        }
-
-        /// <inheritdoc />
-        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
-        {
-            if (context.ItemCount > 0)
-            {
-                var parentMeasure = new UvMeasure(Orientation, finalSize.Width, finalSize.Height);
-                var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
-                var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
-
-                var state = (WrapLayoutState)context.LayoutState!;
-                bool Arrange(WrapItem item, bool isLast = false)
-                {
-                    if (item.Measure.HasValue == false)
-                    {
-                        return false;
-                    }
-
-                    if (item.Position == null)
-                    {
-                        return false;
-                    }
-
-                    var desiredMeasure = item.Measure.Value;
-                    if (desiredMeasure.U == 0)
-                    {
-                        return true; // if an item is collapsed, avoid adding the spacing
-                    }
-
-                    UvMeasure position = item.Position.Value;
-
-                    // Stretch the last item to fill the available space
-                    if (isLast)
-                    {
-                        desiredMeasure.U = parentMeasure.U - position.U;
-                    }
-
-                    if (((position.V + desiredMeasure.V) >= realizationBounds.VMin) && (position.V <= realizationBounds.VMax))
-                    {
-                        // place the item
-                        var child = context.GetOrCreateElementAt(item.Index);
-                        if (Orientation == Orientation.Horizontal)
-                        {
-                            child.Arrange(new Rect(position.U, position.V, desiredMeasure.U, desiredMeasure.V));
-                        }
-                        else
-                        {
-                            child.Arrange(new Rect(position.V, position.U, desiredMeasure.V, desiredMeasure.U));
-                        }
-                    }
-                    else if (position.V > realizationBounds.VMax)
-                    {
-                        return false;
-                    }
-
-                    return true;
-                }
-
-                for (var i = 0; i < context.ItemCount; i++)
-                {
-                    bool continueArranging = Arrange(state.GetItemAt(i));
-                    if (continueArranging == false)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return finalSize;
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == OrientationProperty || change.Property == HorizontalSpacingProperty || change.Property == VerticalSpacingProperty)
-            {
-                InvalidateMeasure();
-                InvalidateArrange();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index b796e173c4..14dafb7284 100644
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -3,13 +3,13 @@
       <TargetFramework>netstandard2.0</TargetFramework>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup>
-    <_AvaloniaPatchComInterop>true</_AvaloniaPatchComInterop>
-  </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="MicroCom.Runtime" Version="0.11.0" />
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <ExcludeAssets>all</ExcludeAssets>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/src/Avalonia.MicroCom/CallbackBase.cs b/src/Avalonia.MicroCom/CallbackBase.cs
new file mode 100644
index 0000000000..49d589a5fc
--- /dev/null
+++ b/src/Avalonia.MicroCom/CallbackBase.cs
@@ -0,0 +1,55 @@
+using MicroCom.Runtime;
+
+namespace Avalonia.MicroCom
+{
+    public abstract class CallbackBase : IUnknown, IMicroComShadowContainer
+    {
+        private readonly object _lock = new object();
+        private bool _referencedFromManaged = true;
+        private bool _referencedFromNative = false;
+        private bool _destroyed;
+
+        public bool IsDestroyed => _destroyed;
+
+        protected virtual void Destroyed()
+        {
+
+        }
+
+        public void Dispose()
+        {
+            lock (_lock)
+            {
+                _referencedFromManaged = false;
+                DestroyIfNeeded();
+            }
+        }
+
+        void DestroyIfNeeded()
+        {
+            if(_destroyed)
+                return;
+            if (_referencedFromManaged == false && _referencedFromNative == false)
+            {
+                _destroyed = true;
+                Destroyed();
+            }
+        }
+
+        public MicroComShadow Shadow { get; set; }
+        public void OnReferencedFromNative()
+        {
+            lock (_lock) 
+                _referencedFromNative = true;
+        }
+
+        public void OnUnreferencedFromNative()
+        {
+            lock (_lock)
+            {
+                _referencedFromNative = false;
+                DestroyIfNeeded();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.MicroCom/IMicroComExceptionCallback.cs b/src/Avalonia.MicroCom/IMicroComExceptionCallback.cs
deleted file mode 100644
index 08f20339ec..0000000000
--- a/src/Avalonia.MicroCom/IMicroComExceptionCallback.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Avalonia.MicroCom
-{
-    public interface IMicroComExceptionCallback
-    {
-        void RaiseException(Exception e);
-    }
-}
diff --git a/src/Avalonia.MicroCom/IMicroComShadowContainer.cs b/src/Avalonia.MicroCom/IMicroComShadowContainer.cs
deleted file mode 100644
index a33d3a9811..0000000000
--- a/src/Avalonia.MicroCom/IMicroComShadowContainer.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Avalonia.MicroCom
-{
-    public interface IMicroComShadowContainer
-    {
-        MicroComShadow Shadow { get; set; }
-        void OnReferencedFromNative();
-        void OnUnreferencedFromNative();
-    }
-}
diff --git a/src/Avalonia.MicroCom/IUnknown.cs b/src/Avalonia.MicroCom/IUnknown.cs
deleted file mode 100644
index 0dc4106423..0000000000
--- a/src/Avalonia.MicroCom/IUnknown.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Avalonia.MicroCom
-{
-    public interface IUnknown : IDisposable
-    {
-    }
-}
diff --git a/src/Avalonia.MicroCom/LocalInterop.cs b/src/Avalonia.MicroCom/LocalInterop.cs
deleted file mode 100644
index 785f4e03a5..0000000000
--- a/src/Avalonia.MicroCom/LocalInterop.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace Avalonia.MicroCom
-{
-    unsafe class LocalInterop
-    {
-        public static unsafe void CalliStdCallvoid(void* thisObject, void* methodPtr)
-        {
-            throw null;
-        }
-        
-        public static unsafe int CalliStdCallint(void* thisObject, Guid* guid, IntPtr* ppv,  void* methodPtr)
-        {
-            throw null;
-        }
-    }
-}
diff --git a/src/Avalonia.MicroCom/MicroComProxyBase.cs b/src/Avalonia.MicroCom/MicroComProxyBase.cs
deleted file mode 100644
index 140af3e4ef..0000000000
--- a/src/Avalonia.MicroCom/MicroComProxyBase.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace Avalonia.MicroCom
-{
-    public unsafe class MicroComProxyBase : CriticalFinalizerObject, IUnknown
-    {
-        private IntPtr _nativePointer;
-        private bool _ownsHandle;
-        private SynchronizationContext _synchronizationContext;
-
-        public IntPtr NativePointer
-        {
-            get
-            {
-                if (_nativePointer == IntPtr.Zero)
-                    throw new ObjectDisposedException(this.GetType().FullName);
-                return _nativePointer;
-            }
-        }
-
-        public void*** PPV => (void***)NativePointer;
-
-        public MicroComProxyBase(IntPtr nativePointer, bool ownsHandle)
-        {
-            _nativePointer = nativePointer;
-            _ownsHandle = ownsHandle;
-            _synchronizationContext = SynchronizationContext.Current;
-            if(!_ownsHandle)
-                GC.SuppressFinalize(this);
-        }
-
-        protected virtual int VTableSize => 3;
-        
-        public void AddRef()
-        {
-            LocalInterop.CalliStdCallvoid(PPV, (*PPV)[1]);
-        }
-
-        public void Release()
-        {
-            LocalInterop.CalliStdCallvoid(PPV, (*PPV)[2]);
-        }
-
-        public int QueryInterface(Guid guid, out IntPtr ppv)
-        {
-            IntPtr r = default;
-            var rv = LocalInterop.CalliStdCallint(PPV, &guid, &r, (*PPV)[0]);
-            ppv = r;
-            return rv;
-        }
-
-        public T QueryInterface<T>() where T : IUnknown
-        {
-            var guid = MicroComRuntime.GetGuidFor(typeof(T));
-            var rv = QueryInterface(guid, out var ppv);
-            if (rv == 0)
-                return (T)MicroComRuntime.CreateProxyFor(typeof(T), ppv, true);
-            throw new COMException("QueryInterface failed", rv);
-        }
-
-        public bool IsDisposed => _nativePointer == IntPtr.Zero;
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if(_nativePointer == null)
-                return;
-            if (_ownsHandle)
-            {
-                Release();
-                _ownsHandle = false;
-            }
-            _nativePointer = IntPtr.Zero;
-            GC.SuppressFinalize(this);
-        }
-        
-        public void Dispose() => Dispose(true);
-
-        public bool OwnsHandle => _ownsHandle;
-        
-        public void EnsureOwned()
-        {
-            if (!_ownsHandle)
-            {
-                GC.ReRegisterForFinalize(true);
-                AddRef();
-                _ownsHandle = true;
-            }
-        }
-
-        private static readonly SendOrPostCallback _disposeDelegate = DisposeOnContext;
-
-        private static void DisposeOnContext(object state)
-        {
-            (state as MicroComProxyBase)?.Dispose(false);
-        }
-
-        ~MicroComProxyBase()
-        {
-            if(!_ownsHandle)
-                return;
-            if (_synchronizationContext == null)
-                Dispose();
-            else
-                _synchronizationContext.Post(_disposeDelegate, this);
-        }
-    }
-}
diff --git a/src/Avalonia.MicroCom/MicroComRuntime.cs b/src/Avalonia.MicroCom/MicroComRuntime.cs
deleted file mode 100644
index e0f524146a..0000000000
--- a/src/Avalonia.MicroCom/MicroComRuntime.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
-
-namespace Avalonia.MicroCom
-{
-    public static unsafe class MicroComRuntime
-    {
-        private static ConcurrentDictionary<Type, IntPtr> _vtables = new ConcurrentDictionary<Type, IntPtr>();
-
-        private static ConcurrentDictionary<Type, Func<IntPtr, bool, object>> _factories =
-            new ConcurrentDictionary<Type, Func<IntPtr, bool, object>>();
-        private static ConcurrentDictionary<Type, Guid> _guids = new ConcurrentDictionary<Type, Guid>();
-        private static ConcurrentDictionary<Guid, Type> _guidsToTypes = new ConcurrentDictionary<Guid, Type>();
-        
-        static MicroComRuntime()
-        {
-            Register(typeof(IUnknown), new Guid("00000000-0000-0000-C000-000000000046"),
-                (ppv, owns) => new MicroComProxyBase(ppv, owns));
-            RegisterVTable(typeof(IUnknown), MicroComVtblBase.Vtable);
-        }
-
-        public static void RegisterVTable(Type t, IntPtr vtable)
-        {
-            _vtables[t] = vtable;
-        }
-        
-        public static void Register(Type t, Guid guid, Func<IntPtr, bool, object> proxyFactory)
-        {
-            _factories[t] = proxyFactory;
-            _guids[t] = guid;
-            _guidsToTypes[guid] = t;
-        }
-
-        public static Guid GetGuidFor(Type type) => _guids[type];
-
-        public static T CreateProxyFor<T>(void* pObject, bool ownsHandle) => (T)CreateProxyFor(typeof(T), new IntPtr(pObject), ownsHandle);
-        public static T CreateProxyFor<T>(IntPtr pObject, bool ownsHandle) => (T)CreateProxyFor(typeof(T), pObject, ownsHandle);
-
-        public static T CreateProxyOrNullFor<T>(void* pObject, bool ownsHandle) where T : class =>
-            pObject == null ? null : (T)CreateProxyFor(typeof(T), new IntPtr(pObject), ownsHandle);
-        
-        public static T CreateProxyOrNullFor<T>(IntPtr pObject, bool ownsHandle) where T : class =>
-            pObject == IntPtr.Zero ? null : (T)CreateProxyFor(typeof(T), pObject, ownsHandle);
-
-        public static object CreateProxyFor(Type type, IntPtr pObject, bool ownsHandle) => _factories[type](pObject, ownsHandle);
-
-        public static IntPtr GetNativeIntPtr<T>(this T obj, bool owned = false) where T : IUnknown
-            => new IntPtr(GetNativePointer(obj, owned));
-        public static void* GetNativePointer<T>(T obj, bool owned = false) where T : IUnknown
-        {
-            if (obj == null)
-                return null;
-            if (obj is MicroComProxyBase proxy)
-            {
-                if(owned)
-                    proxy.AddRef();
-                return (void*)proxy.NativePointer;
-            }
-
-            if (obj is IMicroComShadowContainer container)
-            {
-                container.Shadow ??= new MicroComShadow(container);
-                void* ptr = null;
-                var res = container.Shadow.GetOrCreateNativePointer(typeof(T), &ptr);
-                if (res != 0)
-                    throw new COMException(
-                        "Unable to create native callable wrapper for type " + typeof(T) + " for instance of type " +
-                        obj.GetType(),
-                        res);
-                if (owned)
-                    container.Shadow.AddRef((Ccw*)ptr);
-                return ptr;
-            }
-            throw new ArgumentException("Unable to get a native pointer for " + obj);
-        }
-
-        public static object GetObjectFromCcw(IntPtr ccw)
-        {
-            var ptr = (Ccw*)ccw;
-            var shadow = (MicroComShadow)GCHandle.FromIntPtr(ptr->GcShadowHandle).Target;
-            return shadow.Target;
-        }
-
-        public static bool TryGetTypeForGuid(Guid guid, out Type t) => _guidsToTypes.TryGetValue(guid, out t);
-
-        public static bool GetVtableFor(Type type, out IntPtr ptr) => _vtables.TryGetValue(type, out ptr);
-
-        public static void UnhandledException(object target, Exception e)
-        {
-            if (target is IMicroComExceptionCallback cb)
-            {
-                try
-                {
-                    cb.RaiseException(e);
-                }
-                catch
-                {
-                    // We've tried
-                }
-            }
-
-        }
-
-        public static T CloneReference<T>(this T iface) where T : IUnknown
-        {
-            var proxy = (MicroComProxyBase)(object)iface;
-            var ownedPointer = GetNativePointer(iface, true);
-            return CreateProxyFor<T>(ownedPointer, true);
-        }
-
-        public static T QueryInterface<T>(this IUnknown unknown) where T : IUnknown
-        {
-            var proxy = (MicroComProxyBase)unknown;
-            return proxy.QueryInterface<T>();
-        }
-
-        public static void UnsafeAddRef(this IUnknown unknown)
-        {
-            ((MicroComProxyBase)unknown).AddRef();
-        }
-        
-        public static void UnsafeRelease(this IUnknown unknown)
-        {
-            ((MicroComProxyBase)unknown).Release();
-        }
-    }
-}
diff --git a/src/Avalonia.MicroCom/MicroComShadow.cs b/src/Avalonia.MicroCom/MicroComShadow.cs
deleted file mode 100644
index a6a0fd519e..0000000000
--- a/src/Avalonia.MicroCom/MicroComShadow.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace Avalonia.MicroCom
-{
-    public unsafe class MicroComShadow : IDisposable
-    {
-        private readonly object _lock = new object();
-        private readonly Dictionary<Type, IntPtr> _shadows = new Dictionary<Type, IntPtr>();
-        private readonly Dictionary<IntPtr, Type> _backShadows = new Dictionary<IntPtr, Type>();
-        private GCHandle? _handle;
-        private volatile int _refCount;
-        internal IMicroComShadowContainer Target { get; }
-        internal MicroComShadow(IMicroComShadowContainer target)
-        {
-            Target = target;
-            Target.Shadow = this;
-        }
-        
-        internal int QueryInterface(Ccw* ccw, Guid* guid, void** ppv)
-        {
-            if (MicroComRuntime.TryGetTypeForGuid(*guid, out var type))
-                return QueryInterface(type, ppv);
-            else
-                return unchecked((int)0x80004002u);
-        }
-
-        internal int QueryInterface(Type type, void** ppv)
-        {
-            if (!type.IsInstanceOfType(Target))
-                return unchecked((int)0x80004002u);
-
-            var rv = GetOrCreateNativePointer(type, ppv);
-            if (rv == 0)
-                AddRef((Ccw*)*ppv);
-            return rv;
-        }
-
-        internal int GetOrCreateNativePointer(Type type, void** ppv)
-        {
-            if (!MicroComRuntime.GetVtableFor(type, out var vtable))
-                return unchecked((int)0x80004002u);
-            lock (_lock)
-            {
-
-                if (_shadows.TryGetValue(type, out var shadow))
-                {
-                    var targetCcw = (Ccw*)shadow;
-                    AddRef(targetCcw);
-                    *ppv = targetCcw;
-                    return 0;
-                }
-                else
-                {
-                    var intPtr = Marshal.AllocHGlobal(Marshal.SizeOf<Ccw>());
-                    var targetCcw = (Ccw*)intPtr;
-                    *targetCcw = default;
-                    targetCcw->RefCount = 0;
-                    targetCcw->VTable = vtable;
-                    if (_handle == null)
-                        _handle = GCHandle.Alloc(this);
-                    targetCcw->GcShadowHandle = GCHandle.ToIntPtr(_handle.Value);
-                    _shadows[type] = intPtr;
-                    _backShadows[intPtr] = type;
-                    *ppv = targetCcw;
-
-                    return 0;
-                }
-            }
-        }
-
-        internal int AddRef(Ccw* ccw)
-        {
-            if (Interlocked.Increment(ref _refCount) == 1)
-            {
-                try
-                {
-                    Target.OnReferencedFromNative();
-                }
-                catch (Exception e)
-                {
-                    MicroComRuntime.UnhandledException(Target, e);
-                }
-            }
-            
-            return Interlocked.Increment(ref ccw->RefCount);
-        }
-
-        internal int Release(Ccw* ccw)
-        {
-            Interlocked.Decrement(ref _refCount);
-            var cnt = Interlocked.Decrement(ref ccw->RefCount);
-            if (cnt == 0)
-                return FreeCcw(ccw);
-
-            return cnt;
-        }
-
-        int FreeCcw(Ccw* ccw)
-        {
-            lock (_lock)
-            {
-                // Shadow got resurrected by a call to QueryInterface from another thread
-                if (ccw->RefCount != 0)
-                    return ccw->RefCount;
-                    
-                var intPtr = new IntPtr(ccw);
-                var type = _backShadows[intPtr];
-                _backShadows.Remove(intPtr);
-                _shadows.Remove(type);
-                Marshal.FreeHGlobal(intPtr);
-                if (_shadows.Count == 0)
-                {
-                    _handle?.Free();
-                    _handle = null;
-                    try
-                    {
-                        Target.OnUnreferencedFromNative();
-                    }
-                    catch(Exception e)
-                    {
-                        MicroComRuntime.UnhandledException(Target, e);
-                    }
-                }
-            }
-
-            return 0;
-        }
-
-        /*
-         Needs to be called to support the following scenario:
-         1) Object created
-         2) Object passed to native code, shadow is created, CCW is created
-         3) Native side has never called AddRef
-         
-         In that case the GC handle to the shadow object is still alive
-         */
-        
-        public void Dispose()
-        {
-            lock (_lock)
-            {
-                List<IntPtr> toRemove = null;
-                foreach (var kv in _backShadows)
-                {
-                    var ccw = (Ccw*)kv.Key;
-                    if (ccw->RefCount == 0)
-                    {
-                        toRemove ??= new List<IntPtr>();
-                        toRemove.Add(kv.Key);
-                    }
-                }
-
-                if(toRemove != null)
-                    foreach (var intPtr in toRemove)
-                        FreeCcw((Ccw*)intPtr);
-            }
-        }
-    }
-    
-    [StructLayout(LayoutKind.Sequential)]
-    struct Ccw
-    {
-        public IntPtr VTable;
-        public IntPtr GcShadowHandle;
-        public volatile int RefCount;
-        public MicroComShadow GetShadow() => (MicroComShadow)GCHandle.FromIntPtr(GcShadowHandle).Target;
-    }
-}
diff --git a/src/Avalonia.MicroCom/MicroComVtblBase.cs b/src/Avalonia.MicroCom/MicroComVtblBase.cs
deleted file mode 100644
index 7092f8131a..0000000000
--- a/src/Avalonia.MicroCom/MicroComVtblBase.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace Avalonia.MicroCom
-{
-    public unsafe class MicroComVtblBase
-    {
-        private List<IntPtr> _methods = new List<IntPtr>();
-        [UnmanagedFunctionPointerAttribute(CallingConvention.StdCall)]
-        private delegate int AddRefDelegate(Ccw* ccw);
-
-        [UnmanagedFunctionPointerAttribute(CallingConvention.StdCall)]
-        private delegate int QueryInterfaceDelegate(Ccw* ccw, Guid* guid, void** ppv);
-
-        public static IntPtr Vtable { get; } = new MicroComVtblBase().CreateVTable();
-        public MicroComVtblBase()
-        {
-            AddMethod((QueryInterfaceDelegate)QueryInterface);
-            AddMethod((AddRefDelegate)AddRef);
-            AddMethod((AddRefDelegate)Release);
-        }
-
-        protected void AddMethod(void* f)
-        {
-            _methods.Add(new IntPtr(f));
-        }
-
-        protected void AddMethod(Delegate d)
-        {
-            GCHandle.Alloc(d);
-            _methods.Add(Marshal.GetFunctionPointerForDelegate(d));
-        }
-
-        protected unsafe IntPtr CreateVTable()
-        {
-            var ptr = (IntPtr*)Marshal.AllocHGlobal((IntPtr.Size + 1) * _methods.Count);
-            for (var c = 0; c < _methods.Count; c++)
-                ptr[c] = _methods[c];
-            return new IntPtr(ptr);
-        }
-
-        static int QueryInterface(Ccw* ccw, Guid* guid, void** ppv) => ccw->GetShadow().QueryInterface(ccw, guid, ppv);
-        static int AddRef(Ccw* ccw) => ccw->GetShadow().AddRef(ccw);
-        static int Release(Ccw* ccw) => ccw->GetShadow().Release(ccw);
-    }
-}
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index 9301fd4d91..c924ef3a45 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -6,7 +6,6 @@
     <IsPackable Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'True'">true</IsPackable>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <MicroComGeneratorRuntimeNamespace>Avalonia.MicroCom</MicroComGeneratorRuntimeNamespace>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackAvaloniaNative)' == 'true'">
@@ -17,11 +16,17 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
-    <PackageReference Include="MicroCom.CodeGenerator.MSBuild" Version="0.10.4" PrivateAssets="all" />
+    <PackageReference Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.0" PrivateAssets="all" />
     <MicroComIdl Include="avn.idl" CSharpInteropPath="Interop.Generated.cs" />
   </ItemGroup>
+
+  <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
index 8084e06d28..ae24d06bad 100644
--- a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
@@ -6,7 +6,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Native
 {
-    internal class AvaloniaNativeApplicationPlatform : CallbackBase, IAvnApplicationEvents, IPlatformLifetimeEventsImpl
+    internal class AvaloniaNativeApplicationPlatform : NativeCallbackBase, IAvnApplicationEvents, IPlatformLifetimeEventsImpl
     {
         public event EventHandler<ShutdownRequestedEventArgs> ShutdownRequested;
         
diff --git a/src/Avalonia.Native/AvaloniaNativeDragSource.cs b/src/Avalonia.Native/AvaloniaNativeDragSource.cs
index 80d54d8a10..f91a299b3b 100644
--- a/src/Avalonia.Native/AvaloniaNativeDragSource.cs
+++ b/src/Avalonia.Native/AvaloniaNativeDragSource.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Native
             return visual.VisualRoot as TopLevel;
         }
 
-        class DndCallback : CallbackBase, IAvnDndResultCallback
+        class DndCallback : NativeCallbackBase, IAvnDndResultCallback
         {
             private TaskCompletionSource<DragDropEffects> _tcs;
 
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 1eadf70b13..db6b6f57cd 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -8,10 +8,13 @@ using Avalonia.Native.Interop;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using JetBrains.Annotations;
+using MicroCom.Runtime;
 
 namespace Avalonia.Native
 {
-    class AvaloniaNativePlatform : IPlatformSettings, IWindowingPlatform
+    class AvaloniaNativePlatform : IWindowingPlatform
     {
         private readonly IAvaloniaNativeFactory _factory;
         private AvaloniaNativePlatformOptions _options;
@@ -21,16 +24,7 @@ namespace Avalonia.Native
         static extern IntPtr CreateAvaloniaNative();
 
         internal static readonly KeyboardDevice KeyboardDevice = new KeyboardDevice();
-
-        public Size DoubleClickSize => new Size(4, 4);
-
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500); //TODO
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
+        [CanBeNull] internal static Compositor Compositor { get; private set; }
 
         public static AvaloniaNativePlatform Initialize(IntPtr factory, AvaloniaNativePlatformOptions options)
         {
@@ -79,7 +73,7 @@ namespace Avalonia.Native
             _factory = factory;
         }
 
-        class GCHandleDeallocator : CallbackBase, IAvnGCHandleDeallocatorCallback
+        class GCHandleDeallocator : NativeCallbackBase, IAvnGCHandleDeallocatorCallback
         {
             public void FreeGCHandle(IntPtr handle)
             {
@@ -99,6 +93,8 @@ namespace Avalonia.Native
                 var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
 
                 _factory.MacOptions.SetShowInDock(macOpts.ShowInDock ? 1 : 0);
+                _factory.MacOptions.SetDisableSetProcessName(macOpts.DisableSetProcessName ? 1 : 0);
+                _factory.MacOptions.SetDisableAppDelegate(macOpts.DisableAvaloniaAppDelegate ? 1 : 0);
             }
 
             AvaloniaLocator.CurrentMutable
@@ -107,36 +103,46 @@ namespace Avalonia.Native
                 .Bind<ICursorFactory>().ToConstant(new CursorFactory(_factory.CreateCursorFactory()))
                 .Bind<IPlatformIconLoader>().ToSingleton<IconLoader>()
                 .Bind<IKeyboardDevice>().ToConstant(KeyboardDevice)
-                .Bind<IPlatformSettings>().ToConstant(this)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IWindowingPlatform>().ToConstant(this)
                 .Bind<IClipboard>().ToConstant(new ClipboardImpl(_factory.CreateClipboard()))
-                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
-                .Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs()))
                 .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Meta, wholeWordTextActionModifiers: KeyModifiers.Alt))
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider())
                 .Bind<IPlatformDragSource>().ToConstant(new AvaloniaNativeDragSource(_factory))
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(applicationPlatform)
                 .Bind<INativeApplicationCommands>().ToConstant(new MacOSNativeMenuCommands(_factory.CreateApplicationCommands()));
 
+            var renderLoop = new RenderLoop();
+            AvaloniaLocator.CurrentMutable.Bind<IRenderLoop>().ToConstant(renderLoop);
+
             var hotkeys = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
             hotkeys.MoveCursorToTheStartOfLine.Add(new KeyGesture(Key.Left, hotkeys.CommandModifiers));
             hotkeys.MoveCursorToTheStartOfLineWithSelection.Add(new KeyGesture(Key.Left, hotkeys.CommandModifiers | hotkeys.SelectionModifiers));
             hotkeys.MoveCursorToTheEndOfLine.Add(new KeyGesture(Key.Right, hotkeys.CommandModifiers));
             hotkeys.MoveCursorToTheEndOfLineWithSelection.Add(new KeyGesture(Key.Right, hotkeys.CommandModifiers | hotkeys.SelectionModifiers));
-
+            
             if (_options.UseGpu)
             {
                 try
                 {
-                    AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>()
-                        .ToConstant(_platformGl = new AvaloniaNativePlatformOpenGlInterface(_factory.ObtainGlDisplay()));
+                    _platformGl = new AvaloniaNativePlatformOpenGlInterface(_factory.ObtainGlDisplay());
+                    AvaloniaLocator.CurrentMutable
+                        .Bind<IPlatformOpenGlInterface>().ToConstant(_platformGl)
+                        .Bind<IPlatformGpu>().ToConstant(_platformGl);
+
                 }
                 catch (Exception)
                 {
                     // ignored
                 }
             }
+            
+
+            if (_options.UseDeferredRendering && _options.UseCompositor)
+            {
+                Compositor = new Compositor(renderLoop, _platformGl);
+            }
         }
 
         public ITrayIconImpl CreateTrayIcon()
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
index 10619d675b..189f45d7c8 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -39,6 +39,11 @@ namespace Avalonia
         /// Immediate re-renders the whole scene when some element is changed on the scene. Deferred re-renders only changed elements.
         /// </remarks>
         public bool UseDeferredRendering { get; set; } = true;
+        
+        /// <summary>
+        /// Enables new compositing rendering with UWP-like API
+        /// </summary>
+        public bool UseCompositor { get; set; } = true;
 
         /// <summary>
         /// Determines whether to use GPU for rendering in your project. The default value is true.
@@ -78,5 +83,13 @@ namespace Avalonia
         /// Gets or sets a value indicating whether the native macOS menu bar will be enabled for the application.
         /// </summary>
         public bool DisableNativeMenus { get; set; }
+        
+        public bool DisableSetProcessName { get; set; }
+        
+        /// <summary>
+        /// Gets or sets a value indicating whether Avalonia can install its own AppDelegate.
+        /// Disabling this can be useful in some scenarios like when running as a plugin inside an existing macOS application.
+        /// </summary>
+        public bool DisableAvaloniaAppDelegate { get; set; }
     }
 }
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs b/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs
index 3b3d8836fd..14d27a90e9 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs
@@ -3,6 +3,7 @@ using Avalonia.OpenGL;
 using Avalonia.Native.Interop;
 using System.Drawing;
 using Avalonia.OpenGL.Surfaces;
+using Avalonia.Platform;
 using Avalonia.Threading;
 
 namespace Avalonia.Native
@@ -37,6 +38,7 @@ namespace Avalonia.Native
 
         internal GlContext MainContext { get; }
         public IGlContext PrimaryContext => MainContext;
+        IPlatformGpuContext IPlatformGpu.PrimaryContext => PrimaryContext;
         
         public bool CanShareContexts => true;
         public bool CanCreateContexts => true;
diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
new file mode 100644
index 0000000000..6c4e96b31b
--- /dev/null
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls;
+using Avalonia.Native.Interop;
+
+#nullable enable
+
+namespace Avalonia.Native
+{
+    internal class AvnAutomationPeer : NativeCallbackBase, IAvnAutomationPeer
+    {
+        private static readonly ConditionalWeakTable<AutomationPeer, AvnAutomationPeer> s_wrappers = new();
+        private readonly AutomationPeer _inner;
+
+        private AvnAutomationPeer(AutomationPeer inner)
+        {
+            _inner = inner;
+            _inner.ChildrenChanged += (_, _) => Node?.ChildrenChanged();
+            if (inner is WindowBaseAutomationPeer window)
+                window.FocusChanged += (_, _) => Node?.FocusChanged(); 
+        }
+
+        ~AvnAutomationPeer() => Node?.Dispose();
+        
+        public IAvnAutomationNode? Node { get; private set; }
+        public IAvnString? AcceleratorKey => _inner.GetAcceleratorKey().ToAvnString();
+        public IAvnString? AccessKey => _inner.GetAccessKey().ToAvnString();
+        public AvnAutomationControlType AutomationControlType => (AvnAutomationControlType)_inner.GetAutomationControlType();
+        public IAvnString? AutomationId => _inner.GetAutomationId().ToAvnString();
+        public AvnRect BoundingRectangle => _inner.GetBoundingRectangle().ToAvnRect();
+        public IAvnAutomationPeerArray Children => new AvnAutomationPeerArray(_inner.GetChildren());
+        public IAvnString ClassName => _inner.GetClassName().ToAvnString();
+        public IAvnAutomationPeer? LabeledBy => Wrap(_inner.GetLabeledBy());
+        public IAvnString Name => _inner.GetName().ToAvnString();
+        public IAvnAutomationPeer? Parent => Wrap(_inner.GetParent());
+
+        public int HasKeyboardFocus() => _inner.HasKeyboardFocus().AsComBool();
+        public int IsContentElement() => _inner.IsContentElement().AsComBool();
+        public int IsControlElement() => _inner.IsControlElement().AsComBool();
+        public int IsEnabled() => _inner.IsEnabled().AsComBool();
+        public int IsKeyboardFocusable() => _inner.IsKeyboardFocusable().AsComBool();
+        public void SetFocus() => _inner.SetFocus();
+        public int ShowContextMenu() => _inner.ShowContextMenu().AsComBool();
+
+        public IAvnAutomationPeer? RootPeer
+        {
+            get
+            {
+                var peer = _inner;
+                var parent = peer.GetParent();
+
+                while (peer is not IRootProvider && parent is not null)
+                {
+                    peer = parent;
+                    parent = peer.GetParent();
+                }
+
+                return Wrap(peer);
+            }
+        }
+
+        public void SetNode(IAvnAutomationNode node)
+        {
+            if (Node is not null)
+                throw new InvalidOperationException("The AvnAutomationPeer already has a node.");
+            Node = node;
+        }
+        
+        public int IsRootProvider() => (_inner is IRootProvider).AsComBool();
+
+        public IAvnWindowBase RootProvider_GetWindow()
+        {
+            var window = (WindowBase)((ControlAutomationPeer)_inner).Owner;
+            return ((WindowBaseImpl)window.PlatformImpl!).Native;
+        }
+        
+        public IAvnAutomationPeer? RootProvider_GetFocus() => Wrap(((IRootProvider)_inner).GetFocus());
+
+        public IAvnAutomationPeer? RootProvider_GetPeerFromPoint(AvnPoint point)
+        {
+            var result = ((IRootProvider)_inner).GetPeerFromPoint(point.ToAvaloniaPoint());
+
+            if (result is null)
+                return null;
+
+            // The OSX accessibility APIs expect non-ignored elements when hit-testing.
+            while (!result.IsControlElement())
+            {
+                var parent = result.GetParent();
+
+                if (parent is not null)
+                    result = parent;
+                else
+                    break;
+            }
+            
+            return Wrap(result);
+        }
+
+        public int IsExpandCollapseProvider() => (_inner is IExpandCollapseProvider).AsComBool();
+
+        public int ExpandCollapseProvider_GetIsExpanded() => ((IExpandCollapseProvider)_inner).ExpandCollapseState switch
+        {
+            ExpandCollapseState.Expanded => 1,
+            ExpandCollapseState.PartiallyExpanded => 1,
+            _ => 0,
+        };
+
+        public int ExpandCollapseProvider_GetShowsMenu() => ((IExpandCollapseProvider)_inner).ShowsMenu.AsComBool();
+        public void ExpandCollapseProvider_Expand() => ((IExpandCollapseProvider)_inner).Expand();
+        public void ExpandCollapseProvider_Collapse() => ((IExpandCollapseProvider)_inner).Collapse();
+
+        public int IsInvokeProvider() => (_inner is IInvokeProvider).AsComBool();
+        public void InvokeProvider_Invoke() => ((IInvokeProvider)_inner).Invoke();
+
+        public int IsRangeValueProvider() => (_inner is IRangeValueProvider).AsComBool();
+        public double RangeValueProvider_GetValue() => ((IRangeValueProvider)_inner).Value;
+        public double RangeValueProvider_GetMinimum() => ((IRangeValueProvider)_inner).Minimum;
+        public double RangeValueProvider_GetMaximum() => ((IRangeValueProvider)_inner).Maximum;
+        public double RangeValueProvider_GetSmallChange() => ((IRangeValueProvider)_inner).SmallChange;
+        public double RangeValueProvider_GetLargeChange() => ((IRangeValueProvider)_inner).LargeChange;
+        public void RangeValueProvider_SetValue(double value) => ((IRangeValueProvider)_inner).SetValue(value);
+
+        public int IsSelectionItemProvider() => (_inner is ISelectionItemProvider).AsComBool();
+        public int SelectionItemProvider_IsSelected() => ((ISelectionItemProvider)_inner).IsSelected.AsComBool();
+        
+        public int IsToggleProvider() => (_inner is IToggleProvider).AsComBool();
+        public int ToggleProvider_GetToggleState() => (int)((IToggleProvider)_inner).ToggleState;
+        public void ToggleProvider_Toggle() => ((IToggleProvider)_inner).Toggle();
+
+        public int IsValueProvider() => (_inner is IValueProvider).AsComBool();
+        public IAvnString ValueProvider_GetValue() => ((IValueProvider)_inner).Value.ToAvnString();
+        public void ValueProvider_SetValue(string value) => ((IValueProvider)_inner).SetValue(value);
+
+        [return: NotNullIfNotNull("peer")]
+        public static AvnAutomationPeer? Wrap(AutomationPeer? peer)
+        {
+            return peer is null ? null : s_wrappers.GetValue(peer, x => new(peer));
+        }
+    }
+
+    internal class AvnAutomationPeerArray : NativeCallbackBase, IAvnAutomationPeerArray
+    {
+        private readonly AvnAutomationPeer[] _items;
+        
+        public AvnAutomationPeerArray(IReadOnlyList<AutomationPeer> items)
+        {
+            _items = items.Select(x => AvnAutomationPeer.Wrap(x)).ToArray();
+        }
+        
+        public uint Count => (uint)_items.Length;
+        public IAvnAutomationPeer Get(uint index) => _items[index];
+    }
+}
diff --git a/src/Avalonia.Native/AvnString.cs b/src/Avalonia.Native/AvnString.cs
index dcd473bae3..1c92bf0eec 100644
--- a/src/Avalonia.Native/AvnString.cs
+++ b/src/Avalonia.Native/AvnString.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Avalonia.Native.Interop
 {
@@ -13,6 +14,53 @@ namespace Avalonia.Native.Interop
     {
         string[] ToStringArray();
     }
+
+    internal class AvnString : NativeCallbackBase, IAvnString
+    {
+        private IntPtr _native;
+        private int _nativeLen;
+
+        public AvnString(string s) => String = s;
+
+        public string String { get; }
+        public byte[] Bytes => Encoding.UTF8.GetBytes(String);
+        
+        public unsafe void* Pointer()
+        {
+            EnsureNative();
+            return _native.ToPointer();
+        }
+
+        public int Length()
+        {
+            EnsureNative();
+            return _nativeLen;
+        }
+
+        protected override void Destroyed()
+        {
+            if (_native != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(_native);
+                _native = IntPtr.Zero;
+            }
+        }
+        
+        private unsafe void EnsureNative()
+        {
+            if (string.IsNullOrEmpty(String))
+                return;
+            if (_native == IntPtr.Zero)
+            {
+                _nativeLen = Encoding.UTF8.GetByteCount(String);
+                _native = Marshal.AllocHGlobal(_nativeLen + 1);
+                var ptr = (byte*)_native.ToPointer();
+                fixed (char* chars = String)
+                    Encoding.UTF8.GetBytes(chars, String.Length, ptr, _nativeLen);
+                ptr[_nativeLen] = 0;
+            }
+        }
+    }
 }
 namespace Avalonia.Native.Interop.Impl
 {
diff --git a/src/Avalonia.Native/CallbackBase.cs b/src/Avalonia.Native/CallbackBase.cs
index 455ed4b159..2d875dbc0e 100644
--- a/src/Avalonia.Native/CallbackBase.cs
+++ b/src/Avalonia.Native/CallbackBase.cs
@@ -2,22 +2,12 @@
 using System.Runtime.ExceptionServices;
 using Avalonia.MicroCom;
 using Avalonia.Platform;
+using MicroCom.Runtime;
 
 namespace Avalonia.Native
 {
-    public class CallbackBase : IUnknown, IMicroComShadowContainer, IMicroComExceptionCallback
+    public abstract class NativeCallbackBase : CallbackBase, IMicroComExceptionCallback
     {
-        private readonly object _lock = new object();
-        private bool _referencedFromManaged = true;
-        private bool _referencedFromNative = false;
-        private bool _destroyed;
-        
-
-        protected virtual void Destroyed()
-        {
-
-        }
-
         public void RaiseException(Exception e)
         {
             if (AvaloniaLocator.Current.GetService<IPlatformThreadingInterface>() is PlatformThreadingInterface threadingInterface)
@@ -27,41 +17,5 @@ namespace Avalonia.Native
                 threadingInterface.DispatchException(ExceptionDispatchInfo.Capture(e));
             }
         }
-
-        public void Dispose()
-        {
-            lock (_lock)
-            {
-                _referencedFromManaged = false;
-                DestroyIfNeeded();
-            }
-        }
-
-        void DestroyIfNeeded()
-        {
-            if(_destroyed)
-                return;
-            if (_referencedFromManaged == false && _referencedFromNative == false)
-            {
-                _destroyed = true;
-                Destroyed();
-            }
-        }
-
-        public MicroComShadow Shadow { get; set; }
-        public void OnReferencedFromNative()
-        {
-            lock (_lock) 
-                _referencedFromNative = true;
-        }
-
-        public void OnUnreferencedFromNative()
-        {
-            lock (_lock)
-            {
-                _referencedFromNative = false;
-                DestroyIfNeeded();
-            }
-        }
     }
 }
diff --git a/src/Avalonia.Native/DeferredFramebuffer.cs b/src/Avalonia.Native/DeferredFramebuffer.cs
index 950b6a3197..4e0c037154 100644
--- a/src/Avalonia.Native/DeferredFramebuffer.cs
+++ b/src/Avalonia.Native/DeferredFramebuffer.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Native
         public Vector Dpi { get; set; }
         public PixelFormat Format { get; set; }
 
-        class Disposer : CallbackBase
+        class Disposer : NativeCallbackBase
         {
             private IntPtr _ptr;
 
diff --git a/src/Avalonia.Native/DoubleClickHelper.cs b/src/Avalonia.Native/DoubleClickHelper.cs
index 7618d6976a..02e74d7d63 100644
--- a/src/Avalonia.Native/DoubleClickHelper.cs
+++ b/src/Avalonia.Native/DoubleClickHelper.cs
@@ -1,3 +1,4 @@
+using Avalonia.Input;
 using Avalonia.Platform;
 
 namespace Avalonia.Native
@@ -13,7 +14,8 @@ namespace Avalonia.Native
             Point p)
         {
             var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-            var doubleClickTime = settings.DoubleClickTime.TotalMilliseconds;
+            var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Mouse).TotalMilliseconds ?? 500;
+            var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Mouse) ?? new Size(4, 4);
 
             if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
             {
@@ -23,7 +25,7 @@ namespace Avalonia.Native
             ++_clickCount;
             _lastClickTime = timestamp;
             _lastClickRect = new Rect(p, new Size())
-                .Inflate(new Thickness(settings.DoubleClickSize.Width / 2, settings.DoubleClickSize.Height / 2));
+                .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
 
             return _clickCount == 2;
         }
diff --git a/src/Avalonia.Native/Helpers.cs b/src/Avalonia.Native/Helpers.cs
index 564434a04c..764ff789dc 100644
--- a/src/Avalonia.Native/Helpers.cs
+++ b/src/Avalonia.Native/Helpers.cs
@@ -1,4 +1,5 @@
 using Avalonia.Native.Interop;
+using JetBrains.Annotations;
 
 namespace Avalonia.Native
 {
@@ -24,11 +25,21 @@ namespace Avalonia.Native
             return new AvnPoint { X = pt.X, Y = pt.Y };
         }
 
+        public static AvnRect ToAvnRect (this Rect rect)
+        {
+            return new AvnRect() { X = rect.X, Y= rect.Y, Height = rect.Height, Width = rect.Width };
+        }
+
         public static AvnSize ToAvnSize (this Size size)
         {
             return new AvnSize { Height = size.Height, Width = size.Width };
         }
 
+        public static IAvnString ToAvnString(this string s)
+        {
+            return s != null ? new AvnString(s) : null;
+        }
+        
         public static Size ToAvaloniaSize (this AvnSize size)
         {
             return new Size(size.Width, size.Height);
diff --git a/src/Avalonia.Native/IAvnMenu.cs b/src/Avalonia.Native/IAvnMenu.cs
index 0e6fdd2df0..e413023f6d 100644
--- a/src/Avalonia.Native/IAvnMenu.cs
+++ b/src/Avalonia.Native/IAvnMenu.cs
@@ -7,7 +7,7 @@ using Avalonia.Platform.Interop;
 
 namespace Avalonia.Native.Interop
 {
-    class MenuEvents : CallbackBase, IAvnMenuEvents
+    class MenuEvents : NativeCallbackBase, IAvnMenuEvents
     {
         private IAvnMenu _parent;
 
diff --git a/src/Avalonia.Native/IconLoader.cs b/src/Avalonia.Native/IconLoader.cs
index edb8b94e83..04779a43aa 100644
--- a/src/Avalonia.Native/IconLoader.cs
+++ b/src/Avalonia.Native/IconLoader.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Native
     // OSX doesn't have a concept of *window* icon. 
     // Icons in the title bar are only shown if there is 
     // an opened file (on disk) associated with the current window
-    // see http://stackoverflow.com/a/7038671/2231814
+    // see https://stackoverflow.com/a/7038671/2231814
     class IconLoader : IPlatformIconLoader
     {
         class IconStub : IWindowIconImpl
diff --git a/src/Avalonia.Native/MenuActionCallback.cs b/src/Avalonia.Native/MenuActionCallback.cs
index 5318195f30..3acbb9c19c 100644
--- a/src/Avalonia.Native/MenuActionCallback.cs
+++ b/src/Avalonia.Native/MenuActionCallback.cs
@@ -3,7 +3,7 @@ using Avalonia.Native.Interop;
 
 namespace Avalonia.Native
 {
-    public class MenuActionCallback : CallbackBase, IAvnActionCallback
+    public class MenuActionCallback : NativeCallbackBase, IAvnActionCallback
     {
         private Action _action;
 
diff --git a/src/Avalonia.Native/NativeControlHostImpl.cs b/src/Avalonia.Native/NativeControlHostImpl.cs
index 2c9c1728d3..8a3488d95e 100644
--- a/src/Avalonia.Native/NativeControlHostImpl.cs
+++ b/src/Avalonia.Native/NativeControlHostImpl.cs
@@ -4,6 +4,7 @@ using Avalonia.MicroCom;
 using Avalonia.Native.Interop;
 using Avalonia.Platform;
 using Avalonia.VisualTree;
+using MicroCom.Runtime;
 
 namespace Avalonia.Native
 {
diff --git a/src/Avalonia.Native/PlatformThreadingInterface.cs b/src/Avalonia.Native/PlatformThreadingInterface.cs
index 882d5a2ed3..99aa8a5850 100644
--- a/src/Avalonia.Native/PlatformThreadingInterface.cs
+++ b/src/Avalonia.Native/PlatformThreadingInterface.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Native
 {
     internal class PlatformThreadingInterface : IPlatformThreadingInterface
     {
-        class TimerCallback : CallbackBase, IAvnActionCallback
+        class TimerCallback : NativeCallbackBase, IAvnActionCallback
         {
             readonly Action _tick;
 
@@ -24,7 +24,7 @@ namespace Avalonia.Native
             }
         }
 
-        class SignaledCallback : CallbackBase, IAvnSignaledCallback
+        class SignaledCallback : NativeCallbackBase, IAvnSignaledCallback
         {
             readonly PlatformThreadingInterface _parent;
 
diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs
index 4680a2af17..76d3905b47 100644
--- a/src/Avalonia.Native/PopupImpl.cs
+++ b/src/Avalonia.Native/PopupImpl.cs
@@ -7,7 +7,6 @@ namespace Avalonia.Native
 {
     class PopupImpl : WindowBaseImpl, IPopupImpl
     {
-        private readonly IAvaloniaNativeFactory _factory;
         private readonly AvaloniaNativePlatformOptions _opts;
         private readonly AvaloniaNativePlatformOpenGlInterface _glFeature;
         private readonly IWindowBaseImpl _parent;
@@ -15,9 +14,8 @@ namespace Avalonia.Native
         public PopupImpl(IAvaloniaNativeFactory factory,
             AvaloniaNativePlatformOptions opts,
             AvaloniaNativePlatformOpenGlInterface glFeature,
-            IWindowBaseImpl parent) : base(opts, glFeature)
+            IWindowBaseImpl parent) : base(factory, opts, glFeature)
         {
-            _factory = factory;
             _opts = opts;
             _glFeature = glFeature;
             _parent = parent;
diff --git a/src/Avalonia.Native/PredicateCallback.cs b/src/Avalonia.Native/PredicateCallback.cs
index 19c470bcb3..dbb65791f0 100644
--- a/src/Avalonia.Native/PredicateCallback.cs
+++ b/src/Avalonia.Native/PredicateCallback.cs
@@ -3,7 +3,7 @@ using Avalonia.Native.Interop;
 
 namespace Avalonia.Native
 {
-    public class PredicateCallback : CallbackBase, IAvnPredicateCallback
+    public class PredicateCallback : NativeCallbackBase, IAvnPredicateCallback
     {
         private Func<bool> _predicate;
 
diff --git a/src/Avalonia.Native/Properties/AssemblyInfo.cs b/src/Avalonia.Native/Properties/AssemblyInfo.cs
deleted file mode 100644
index d4766e45dc..0000000000
--- a/src/Avalonia.Native/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using Avalonia.Native;
-using Avalonia.Platform;
-
-[assembly: ExportWindowingSubsystem(OperatingSystemType.OSX, 1, "AvaloniaNative", typeof(AvaloniaNativePlatform), nameof(AvaloniaNativePlatform.Initialize))]
diff --git a/src/Avalonia.Native/ScreenImpl.cs b/src/Avalonia.Native/ScreenImpl.cs
index 7b4a001486..53bd12cde1 100644
--- a/src/Avalonia.Native/ScreenImpl.cs
+++ b/src/Avalonia.Native/ScreenImpl.cs
@@ -30,10 +30,10 @@ namespace Avalonia.Native
                         var screen = _native.GetScreen(i);
 
                         result[i] = new Screen(
-                            screen.PixelDensity,
+                            screen.Scaling,
                             screen.Bounds.ToAvaloniaPixelRect(),
                             screen.WorkingArea.ToAvaloniaPixelRect(),
-                            screen.Primary.FromComBool());
+                            screen.IsPrimary.FromComBool());
                     }
 
                     return result;
@@ -48,5 +48,20 @@ namespace Avalonia.Native
             _native?.Dispose();
             _native = null;
         }
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
     }
 }
diff --git a/src/Avalonia.Native/SystemDialogs.cs b/src/Avalonia.Native/SystemDialogs.cs
index 8012813644..49ba652b1a 100644
--- a/src/Avalonia.Native/SystemDialogs.cs
+++ b/src/Avalonia.Native/SystemDialogs.cs
@@ -1,70 +1,114 @@
-using System;
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
 using Avalonia.Native.Interop;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
 
 namespace Avalonia.Native
 {
-    internal class SystemDialogs : ISystemDialogImpl
+    internal class SystemDialogs : BclStorageProvider
     {
-        IAvnSystemDialogs _native;
+        private readonly WindowBaseImpl _window;
+        private readonly IAvnSystemDialogs _native;
 
-        public SystemDialogs(IAvnSystemDialogs native)
+        public SystemDialogs(WindowBaseImpl window, IAvnSystemDialogs native)
         {
+            _window = window;
             _native = native;
         }
 
-        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
+        public override bool CanOpen => true;
+
+        public override bool CanSave => true;
+
+        public override bool CanPickFolder => true;
+
+        public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
         {
-            var events = new SystemDialogEvents();
+            using var events = new SystemDialogEvents();
 
-            var nativeParent = GetNativeWindow(parent);
+            var suggestedDirectory = options.SuggestedStartLocation?.TryGetUri(out var suggestedDirectoryTmp) == true
+                ? suggestedDirectoryTmp.LocalPath : string.Empty;
 
-            if (dialog is OpenFileDialog ofd)
-            {
-                _native.OpenFileDialog(nativeParent,
-                                        events, ofd.AllowMultiple.AsComBool(),
-                                        ofd.Title ?? "",
-                                        ofd.Directory ?? "",
-                                        ofd.InitialFileName ?? "",
-                                        string.Join(";", dialog.Filters.SelectMany(f => f.Extensions)));
-            }
-            else
-            {
-                _native.SaveFileDialog(nativeParent,
-                                        events,
-                                        dialog.Title ?? "",
-                                        dialog.Directory ?? "",
-                                        dialog.InitialFileName ?? "",
-                                        string.Join(";", dialog.Filters.SelectMany(f => f.Extensions)));
-            }
+            _native.OpenFileDialog((IAvnWindow)_window.Native,
+                                    events,
+                                    options.AllowMultiple.AsComBool(),
+                                    options.Title ?? string.Empty,
+                                    suggestedDirectory,
+                                    string.Empty,
+                                    PrepareFilterParameter(options.FileTypeFilter));
+
+            var result = await events.Task.ConfigureAwait(false);
+
+            return result?.Select(f => new BclStorageFile(new FileInfo(f))).ToArray()
+                   ?? Array.Empty<IStorageFile>();
+        }
 
-            return events.Task.ContinueWith(t => { events.Dispose(); return t.Result; });
+        public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            using var events = new SystemDialogEvents();
+
+            var suggestedDirectory = options.SuggestedStartLocation?.TryGetUri(out var suggestedDirectoryTmp) == true
+                ? suggestedDirectoryTmp.LocalPath : string.Empty;
+
+            _native.SaveFileDialog((IAvnWindow)_window.Native,
+                        events,
+                        options.Title ?? string.Empty,
+                        suggestedDirectory,
+                        options.SuggestedFileName ?? string.Empty,
+                        PrepareFilterParameter(options.FileTypeChoices));
+
+            var result = await events.Task.ConfigureAwait(false);
+            return result.FirstOrDefault() is string file
+                ? new BclStorageFile(new FileInfo(file))
+                : null;
         }
 
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
+        public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
         {
-            var events = new SystemDialogEvents();
+            using var events = new SystemDialogEvents();
 
-            var nativeParent = GetNativeWindow(parent);
+            var suggestedDirectory = options.SuggestedStartLocation?.TryGetUri(out var suggestedDirectoryTmp) == true
+                ? suggestedDirectoryTmp.LocalPath : string.Empty;
 
-            _native.SelectFolderDialog(nativeParent, events, dialog.Title ?? "", dialog.Directory ?? "");
+            _native.SelectFolderDialog((IAvnWindow)_window.Native, events, options.AllowMultiple.AsComBool(), options.Title ?? "", suggestedDirectory);
 
-            return events.Task.ContinueWith(t => { events.Dispose(); return t.Result.FirstOrDefault(); });
+            var result = await events.Task.ConfigureAwait(false);
+            return result?.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray()
+                   ?? Array.Empty<IStorageFolder>();
         }
 
-        private IAvnWindow GetNativeWindow(Window window)
+        private static string PrepareFilterParameter(IReadOnlyList<FilePickerFileType>? fileTypes)
         {
-            return (window?.PlatformImpl as WindowImpl)?.Native;
+            return string.Join(";",
+                fileTypes?.SelectMany(f =>
+                {
+                    // On the native side we will try to parse identifiers or mimetypes.
+                    if (f.AppleUniformTypeIdentifiers?.Any() == true)
+                    {
+                        return f.AppleUniformTypeIdentifiers;
+                    }
+                    else if (f.MimeTypes?.Any() == true)
+                    {
+                        // MacOS doesn't accept "all" type, so it's pointless to pass it.
+                        return f.MimeTypes.Where(t => t != "*/*");
+                    }
+
+                    return Array.Empty<string>();
+                }) ??
+                Array.Empty<string>());
         }
     }
 
-    internal unsafe class SystemDialogEvents : CallbackBase, IAvnSystemDialogEvents
+    internal unsafe class SystemDialogEvents : NativeCallbackBase, IAvnSystemDialogEvents
     {
-        private TaskCompletionSource<string[]> _tcs;
+        private readonly TaskCompletionSource<string[]> _tcs;
 
         public SystemDialogEvents()
         {
@@ -83,7 +127,7 @@ namespace Avalonia.Native
 
                 for (int i = 0; i < numResults; i++)
                 {
-                    results[i] = Marshal.PtrToStringAnsi(*ptr);
+                    results[i] = Marshal.PtrToStringAnsi(*ptr) ?? string.Empty;
 
                     ptr++;
                 }
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index f740be44a2..b5af927ea0 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -13,7 +13,6 @@ namespace Avalonia.Native
 {
     internal class WindowImpl : WindowBaseImpl, IWindowImpl, ITopLevelImplWithNativeMenuExporter
     {
-        private readonly IAvaloniaNativeFactory _factory;
         private readonly AvaloniaNativePlatformOptions _opts;
         private readonly AvaloniaNativePlatformOpenGlInterface _glFeature;
         IAvnWindow _native;
@@ -22,9 +21,8 @@ namespace Avalonia.Native
         
 
         internal WindowImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts,
-            AvaloniaNativePlatformOpenGlInterface glFeature) : base(opts, glFeature)
+            AvaloniaNativePlatformOpenGlInterface glFeature) : base(factory, opts, glFeature)
         {
-            _factory = factory;
             _opts = opts;
             _glFeature = glFeature;
             _doubleClickHelper = new DoubleClickHelper();
@@ -87,7 +85,10 @@ namespace Avalonia.Native
             _native.SetTitleBarColor(new AvnColor { Alpha = color.A, Red = color.R, Green = color.G, Blue = color.B });
         }
 
-        public void SetTitle(string title) => _native.SetTitle(title);
+        public void SetTitle(string title)
+        {
+            _native.SetTitle(title ?? "");
+        }
 
         public WindowState WindowState
         {
@@ -106,6 +107,13 @@ namespace Avalonia.Native
         private bool _isExtended;
         public bool IsClientAreaExtendedToDecorations => _isExtended;
 
+        public override void Show(bool activate, bool isDialog)
+        {
+            base.Show(activate, isDialog);
+            
+            InvalidateExtendedMargins();
+        }
+
         protected override bool ChromeHitTest (RawPointerEventArgs e)
         {
             if(_isExtended)
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 1917b1575d..381741cea9 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Platform.Surfaces;
@@ -10,7 +11,9 @@ using Avalonia.Input.Raw;
 using Avalonia.Native.Interop;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 
 namespace Avalonia.Native
@@ -44,8 +47,9 @@ namespace Avalonia.Native
     }
 
     internal abstract class WindowBaseImpl : IWindowBaseImpl,
-        IFramebufferPlatformSurface, ITopLevelImplWithNativeControlHost
+        IFramebufferPlatformSurface, ITopLevelImplWithNativeControlHost, ITopLevelImplWithStorageProvider
     {
+        protected readonly IAvaloniaNativeFactory _factory;
         protected IInputRoot _inputRoot;
         IAvnWindowBase _native;
         private object _syncRoot = new object();
@@ -61,14 +65,17 @@ namespace Avalonia.Native
         private NativeControlHostImpl _nativeControlHost;
         private IGlContext _glContext;
 
-        internal WindowBaseImpl(AvaloniaNativePlatformOptions opts, AvaloniaNativePlatformOpenGlInterface glFeature)
+        internal WindowBaseImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts,
+            AvaloniaNativePlatformOpenGlInterface glFeature)
         {
+            _factory = factory;
             _gpu = opts.UseGpu && glFeature != null;
             _deferredRendering = opts.UseDeferredRendering;
 
             _keyboard = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
             _mouse = new MouseDevice();
             _cursorFactory = AvaloniaLocator.Current.GetService<ICursorFactory>();
+            StorageProvider = new SystemDialogs(this, _factory.CreateSystemDialogs());
         }
 
         protected void Init(IAvnWindowBase window, IAvnScreens screens, IGlContext glContext)
@@ -80,16 +87,19 @@ namespace Avalonia.Native
             if (_gpu)
                 _glSurface = new GlPlatformSurface(window, _glContext);
             Screen = new ScreenImpl(screens);
+
             _savedLogicalSize = ClientSize;
             _savedScaling = RenderScaling;
             _nativeControlHost = new NativeControlHostImpl(_native.CreateNativeControlHost());
 
-            var monitor = Screen.AllScreens.OrderBy(x => x.PixelDensity)
+            var monitor = Screen.AllScreens.OrderBy(x => x.Scaling)
                     .FirstOrDefault(m => m.Bounds.Contains(Position));
 
             Resize(new Size(monitor.WorkingArea.Width * 0.75d, monitor.WorkingArea.Height * 0.7d), PlatformResizeReason.Layout);
         }
 
+        public IAvnWindowBase Native => _native;
+
         public Size ClientSize 
         {
             get
@@ -110,8 +120,12 @@ namespace Avalonia.Native
             {
                 if (_native != null)
                 {
-                    var s = _native.FrameSize;
-                    return new Size(s.Width, s.Height);
+                    unsafe
+                    {
+                        var s = new AvnSize { Width = -1, Height = -1 };
+                        _native.GetFrameSize(&s);
+                        return s.Width < 0  && s.Height < 0 ? null : new Size(s.Width, s.Height);
+                    }
                 }
 
                 return default;
@@ -151,7 +165,12 @@ namespace Avalonia.Native
         public IMouseDevice MouseDevice => _mouse;
         public abstract IPopupImpl CreatePopup();
 
-        protected unsafe class WindowBaseEvents : CallbackBase, IAvnWindowBaseEvents
+        public AutomationPeer GetAutomationPeer()
+        {
+            return _inputRoot is Control c ? ControlAutomationPeer.CreatePeerForElement(c) : null;
+        }
+
+        protected unsafe class WindowBaseEvents : NativeCallbackBase, IAvnWindowBaseEvents
         {
             private readonly WindowBaseImpl _parent;
 
@@ -216,7 +235,6 @@ namespace Avalonia.Native
                 return _parent.RawTextInputEvent(timeStamp, text).AsComBool();
             }
 
-
             void IAvnWindowBaseEvents.ScalingChanged(double scaling)
             {
                 _parent._savedScaling = scaling;
@@ -256,8 +274,13 @@ namespace Avalonia.Native
                     return (AvnDragDropEffects)args.Effects;
                 }
             }
-        }
 
+            IAvnAutomationPeer IAvnWindowBaseEvents.AutomationPeer
+            {
+                get => AvnAutomationPeer.Wrap(_parent.GetAutomationPeer());
+            }
+        }
+       
         public void Activate()
         {
             _native?.Activate();
@@ -344,13 +367,18 @@ namespace Avalonia.Native
 
         public IRenderer CreateRenderer(IRenderRoot root)
         {
+            var customRendererFactory = AvaloniaLocator.Current.GetService<IRendererFactory>();
+            var loop = AvaloniaLocator.Current.GetService<IRenderLoop>();
+            if (customRendererFactory != null)
+                return customRendererFactory.Create(root, loop);
+            
             if (_deferredRendering)
             {
-                var loop = AvaloniaLocator.Current.GetService<IRenderLoop>();
-                var customRendererFactory = AvaloniaLocator.Current.GetService<IRendererFactory>();
-
-                if (customRendererFactory != null)
-                    return customRendererFactory.Create(root, loop);
+                if (AvaloniaNativePlatform.Compositor != null)
+                    return new CompositingRenderer(root, AvaloniaNativePlatform.Compositor)
+                    {
+                        RenderOnlyOnRenderThread = false
+                    };
                 return new DeferredRenderer(root, loop);
             }
 
@@ -495,5 +523,7 @@ namespace Avalonia.Native
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0, 0);
 
         public IPlatformHandle Handle { get; private set; }
+
+        public IStorageProvider StorageProvider { get; }
     }
 }
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index f2b9d4997e..b90e144eab 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -2,6 +2,7 @@
 @clr-access internal
 @clr-map bool int
 @cpp-preamble @@
+#pragma once
 #include "com.h"
 #include "stddef.h"
 @@
@@ -218,6 +219,14 @@ enum SystemDecorations {
     SystemDecorationsFull = 2,
 }
 
+enum AvnAutomationProperty
+{
+    AutomationPeer_BoundingRectangle,
+    AutomationPeer_ClassName,
+    AutomationPeer_Name,
+    RangeValueProvider_Value,
+}
+
 struct AvnSize
 {
     double Width, Height;
@@ -247,8 +256,8 @@ struct AvnScreen
 {
     AvnRect Bounds;
     AvnRect WorkingArea;
-    float PixelDensity;
-    bool Primary;
+    float Scaling;
+    bool IsPrimary;
 }
 
 enum AvnPixelFormat
@@ -412,6 +421,51 @@ enum AvnPlatformResizeReason
     ResizeDpiChange,
 }
 
+enum AvnAutomationControlType
+{
+    AutomationNone,
+    AutomationButton,
+    AutomationCalendar,
+    AutomationCheckBox,
+    AutomationComboBox,
+    AutomationComboBoxItem,
+    AutomationEdit,
+    AutomationHyperlink,
+    AutomationImage,
+    AutomationListItem,
+    AutomationList,
+    AutomationMenu,
+    AutomationMenuBar,
+    AutomationMenuItem,
+    AutomationProgressBar,
+    AutomationRadioButton,
+    AutomationScrollBar,
+    AutomationSlider,
+    AutomationSpinner,
+    AutomationStatusBar,
+    AutomationTab,
+    AutomationTabItem,
+    AutomationText,
+    AutomationToolBar,
+    AutomationToolTip,
+    AutomationTree,
+    AutomationTreeItem,
+    AutomationCustom,
+    AutomationGroup,
+    AutomationThumb,
+    AutomationDataGrid,
+    AutomationDataItem,
+    AutomationDocument,
+    AutomationSplitButton,
+    AutomationWindow,
+    AutomationPane,
+    AutomationHeader,
+    AutomationHeaderItem,
+    AutomationTable,
+    AutomationTitleBar,
+    AutomationSeparator,
+}
+
 [uuid(809c652e-7396-11d2-9771-00a0c9b4d50c)]
 interface IAvaloniaNativeFactory : IUnknown
 {
@@ -450,7 +504,7 @@ interface IAvnWindowBase : IUnknown
      HRESULT Close();
      HRESULT Activate();
      HRESULT GetClientSize(AvnSize*ret);
-     HRESULT GetFrameSize(AvnSize*ret);
+     HRESULT GetFrameSize(AvnSize*result);
      HRESULT GetScaling(double*ret);
      HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
      HRESULT Resize(double width, double height, AvnPlatformResizeReason reason);
@@ -522,6 +576,7 @@ interface IAvnWindowBaseEvents : IUnknown
      AvnDragDropEffects DragEvent(AvnDragEventType type, AvnPoint position,
                                          AvnInputModifiers modifiers, AvnDragDropEffects effects,
                                          IAvnClipboard* clipboard, [intptr]void* dataObjectHandle);
+     IAvnAutomationPeer* GetAutomationPeer();
 }
 
 [uuid(1ae178ee-1fcc-447f-b6dd-b7bb727f934c)]
@@ -544,6 +599,8 @@ interface IAvnMacOptions : IUnknown
 {
      HRESULT SetShowInDock(int show);
      HRESULT SetApplicationTitle(char* utf8string);
+     HRESULT SetDisableSetProcessName(int disable);
+     HRESULT SetDisableAppDelegate(int disable);
 }
 
 [uuid(04c1b049-1f43-418a-9159-cae627ec1367)]
@@ -586,9 +643,10 @@ interface IAvnSystemDialogEvents : IUnknown
 interface IAvnSystemDialogs : IUnknown
 {
      void SelectFolderDialog(IAvnWindow* parentWindowHandle,
-                                     IAvnSystemDialogEvents* events,
-                                     [const] char* title,
-                                     [const] char* initialPath);
+                             IAvnSystemDialogEvents* events,
+                             bool allowMultiple,
+                             [const] char* title,
+                             [const] char* initialPath);
     
      void OpenFileDialog(IAvnWindow* parentWindowHandle,
                                  IAvnSystemDialogEvents* events,
@@ -765,3 +823,79 @@ interface IAvnApplicationCommands : IUnknown
     HRESULT ShowAll();
     HRESULT HideOthers();
 }
+
+[uuid(b87016f3-7eec-41de-b385-07844c268dc4)]
+interface IAvnAutomationPeer : IUnknown
+{
+     IAvnAutomationNode* GetNode();
+     void SetNode(IAvnAutomationNode* node);
+
+     IAvnString* GetAcceleratorKey();
+     IAvnString* GetAccessKey();
+     AvnAutomationControlType GetAutomationControlType();
+     IAvnString* GetAutomationId();
+     AvnRect GetBoundingRectangle();
+     IAvnAutomationPeerArray* GetChildren();
+     IAvnString* GetClassName();
+     IAvnAutomationPeer* GetLabeledBy();
+     IAvnString* GetName();
+     IAvnAutomationPeer* GetParent();
+     bool HasKeyboardFocus();
+     bool IsContentElement();
+     bool IsControlElement();
+     bool IsEnabled();
+     bool IsKeyboardFocusable();
+     void SetFocus();
+     bool ShowContextMenu();
+
+     IAvnAutomationPeer* GetRootPeer();
+     
+     bool IsRootProvider();
+     IAvnWindowBase* RootProvider_GetWindow();
+     IAvnAutomationPeer* RootProvider_GetFocus();
+     IAvnAutomationPeer* RootProvider_GetPeerFromPoint(AvnPoint point);
+     
+     bool IsExpandCollapseProvider();
+     bool ExpandCollapseProvider_GetIsExpanded();
+     bool ExpandCollapseProvider_GetShowsMenu();
+     void ExpandCollapseProvider_Expand();
+     void ExpandCollapseProvider_Collapse();
+     
+     bool IsInvokeProvider();
+     void InvokeProvider_Invoke();
+     
+     bool IsRangeValueProvider();
+     double RangeValueProvider_GetValue();
+     double RangeValueProvider_GetMinimum();
+     double RangeValueProvider_GetMaximum();
+     double RangeValueProvider_GetSmallChange();
+     double RangeValueProvider_GetLargeChange();
+     void RangeValueProvider_SetValue(double value);
+     
+     bool IsSelectionItemProvider();
+     bool SelectionItemProvider_IsSelected();
+     
+     bool IsToggleProvider();
+     int ToggleProvider_GetToggleState();
+     void ToggleProvider_Toggle();
+     
+     bool IsValueProvider();
+     IAvnString* ValueProvider_GetValue();
+     void ValueProvider_SetValue(char* value);
+}
+
+[uuid(b00af5da-78af-4b33-bfff-4ce13a6239a9)]
+interface IAvnAutomationPeerArray : IUnknown
+{
+     uint GetCount();
+     HRESULT Get(uint index, IAvnAutomationPeer**ppv);
+}
+
+[uuid(004dc40b-e435-49dc-bac5-6272ee35382a)]
+interface IAvnAutomationNode : IUnknown
+{
+    void Dispose();
+    void ChildrenChanged();
+    void PropertyChanged(AvnAutomationProperty property);
+    void FocusChanged();
+}
diff --git a/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs b/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
index 94e7728d68..3a8fdb8491 100644
--- a/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
+++ b/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
@@ -21,7 +21,7 @@ namespace Avalonia.OpenGL.Angle
             var display = IntPtr.Zero;
             AngleOptions.PlatformApi angleApi = default;
             {
-                if (_egl.GetPlatformDisplayEXT == null)
+                if (!_egl.IsGetPlatformDisplayExtAvailable)
                     throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl.dll");
 
                 var allowedApis = AvaloniaLocator.Current.GetService<AngleOptions>()?.AllowedPlatformApis
@@ -37,7 +37,7 @@ namespace Avalonia.OpenGL.Angle
                     else
                         continue;
 
-                    display = _egl.GetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero,
+                    display = _egl.GetPlatformDisplayExt(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero,
                         new[] { EGL_PLATFORM_ANGLE_TYPE_ANGLE, dapi, EGL_NONE });
                     if (display != IntPtr.Zero)
                     {
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 2b32926008..bacb10c792 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -8,6 +8,8 @@
     <ItemGroup>
       <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
       <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-      <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    </ItemGroup>    
+    </ItemGroup>
+
+    <Import Project="..\..\build\DevAnalyzers.props" />
+    <Import Project="..\..\build\SourceGenerators.props" />
 </Project>
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
index b3469c212b..279e7e750d 100644
--- a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -34,7 +34,7 @@ namespace Avalonia.OpenGL.Controls
                 _attachment.Present();
             }
 
-            context.DrawImage(_bitmap, new Rect(_bitmap.Size), Bounds);
+            context.DrawImage(_bitmap, new Rect(_bitmap.Size), new Rect(Bounds.Size));
             base.Render(context);
         }
         
@@ -66,11 +66,9 @@ namespace Avalonia.OpenGL.Controls
                 return;
                     
             gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderBuffer);
-            if (_depthBuffer != 0) gl.DeleteRenderbuffers(1, new[] { _depthBuffer });
+            if (_depthBuffer != 0) gl.DeleteRenderbuffer(_depthBuffer);
 
-            var oneArr = new int[1];
-            gl.GenRenderbuffers(1, oneArr);
-            _depthBuffer = oneArr[0];
+            _depthBuffer = gl.GenRenderbuffer();
             gl.BindRenderbuffer(GL_RENDERBUFFER, _depthBuffer);
             gl.RenderbufferStorage(GL_RENDERBUFFER,
                 GlVersion.Type == GlProfileType.OpenGLES ? GL_DEPTH_COMPONENT16 : GL_DEPTH_COMPONENT,
@@ -86,11 +84,12 @@ namespace Avalonia.OpenGL.Controls
                 using (_context.MakeCurrent())
                 {
                     var gl = _context.GlInterface;
+                    gl.ActiveTexture(GL_TEXTURE0);
                     gl.BindTexture(GL_TEXTURE_2D, 0);
                     gl.BindFramebuffer(GL_FRAMEBUFFER, 0);
-                    gl.DeleteFramebuffers(1, new[] { _fb });
+                    gl.DeleteFramebuffer(_fb);
                     _fb = 0;
-                    gl.DeleteRenderbuffers(1, new[] { _depthBuffer });
+                    gl.DeleteRenderbuffer(_depthBuffer);
                     _depthBuffer = 0;
                     _attachment?.Dispose();
                     _attachment = null;
@@ -148,6 +147,13 @@ namespace Avalonia.OpenGL.Controls
                 return false;
             }
 
+            if (_context == null)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to initialize OpenGL: unable to create additional OpenGL context.");
+                return false;
+            }
+
             GlVersion = _context.Version;
             try
             {
@@ -174,9 +180,7 @@ namespace Avalonia.OpenGL.Controls
                 {
                     _depthBufferSize = GetPixelSize();
                     var gl = _context.GlInterface;
-                    var oneArr = new int[1];
-                    gl.GenFramebuffers(1, oneArr);
-                    _fb = oneArr[0];
+                    _fb = gl.GenFramebuffer();
                     gl.BindFramebuffer(GL_FRAMEBUFFER, _fb);
                     
                     EnsureDepthBufferAttachment(gl);
diff --git a/src/Avalonia.OpenGL/Egl/EglConsts.cs b/src/Avalonia.OpenGL/Egl/EglConsts.cs
index 530d3401f6..1268845f0f 100644
--- a/src/Avalonia.OpenGL/Egl/EglConsts.cs
+++ b/src/Avalonia.OpenGL/Egl/EglConsts.cs
@@ -4,212 +4,212 @@ namespace Avalonia.OpenGL.Egl
 {
     public static class EglConsts
     {
-        public const int EGL_ALPHA_SIZE = 0x3021;
-        public const int EGL_BAD_ACCESS = 0x3002;
-        public const int EGL_BAD_ALLOC = 0x3003;
-        public const int EGL_BAD_ATTRIBUTE = 0x3004;
-        public const int EGL_BAD_CONFIG = 0x3005;
-        public const int EGL_BAD_CONTEXT = 0x3006;
-        public const int EGL_BAD_CURRENT_SURFACE = 0x3007;
-        public const int EGL_BAD_DISPLAY = 0x3008;
-        public const int EGL_BAD_MATCH = 0x3009;
-        public const int EGL_BAD_NATIVE_PIXMAP = 0x300A;
-        public const int EGL_BAD_NATIVE_WINDOW = 0x300B;
-        public const int EGL_BAD_PARAMETER = 0x300C;
-        public const int EGL_BAD_SURFACE = 0x300D;
-        public const int EGL_BLUE_SIZE = 0x3022;
-        public const int EGL_BUFFER_SIZE = 0x3020;
-        public const int EGL_CONFIG_CAVEAT = 0x3027;
-        public const int EGL_CONFIG_ID = 0x3028;
-        public const int EGL_CORE_NATIVE_ENGINE = 0x305B;
-        public const int EGL_DEPTH_SIZE = 0x3025;
-        public const int EGL_DONT_CARE = -1;
-        public const int EGL_DRAW = 0x3059;
-        public const int EGL_EXTENSIONS = 0x3055;
-        public const int EGL_FALSE = 0;
-        public const int EGL_GREEN_SIZE = 0x3023;
-        public const int EGL_HEIGHT = 0x3056;
-        public const int EGL_LARGEST_PBUFFER = 0x3058;
-        public const int EGL_LEVEL = 0x3029;
-        public const int EGL_MAX_PBUFFER_HEIGHT = 0x302A;
-        public const int EGL_MAX_PBUFFER_PIXELS = 0x302B;
-        public const int EGL_MAX_PBUFFER_WIDTH = 0x302C;
-        public const int EGL_NATIVE_RENDERABLE = 0x302D;
-        public const int EGL_NATIVE_VISUAL_ID = 0x302E;
-        public const int EGL_NATIVE_VISUAL_TYPE = 0x302F;
-        public const int EGL_NONE = 0x3038;
-        public const int EGL_NON_CONFORMANT_CONFIG = 0x3051;
-        public const int EGL_NOT_INITIALIZED = 0x3001;
-        public const int EGL_NO_CONTEXT = 0;
-        public const int EGL_NO_DISPLAY = 0;
-        public const int EGL_NO_SURFACE = 0;
-        public const int EGL_PBUFFER_BIT = 0x0001;
-        public const int EGL_PIXMAP_BIT = 0x0002;
-        public const int EGL_READ = 0x305A;
-        public const int EGL_RED_SIZE = 0x3024;
-        public const int EGL_SAMPLES = 0x3031;
-        public const int EGL_SAMPLE_BUFFERS = 0x3032;
-        public const int EGL_SLOW_CONFIG = 0x3050;
-        public const int EGL_STENCIL_SIZE = 0x3026;
-        public const int EGL_SUCCESS = 0x3000;
-        public const int EGL_SURFACE_TYPE = 0x3033;
-        public const int EGL_TRANSPARENT_BLUE_VALUE = 0x3035;
-        public const int EGL_TRANSPARENT_GREEN_VALUE = 0x3036;
-        public const int EGL_TRANSPARENT_RED_VALUE = 0x3037;
-        public const int EGL_TRANSPARENT_RGB = 0x3052;
-        public const int EGL_TRANSPARENT_TYPE = 0x3034;
-        public const int EGL_TRUE = 1;
-        public const int EGL_VENDOR = 0x3053;
-        public const int EGL_VERSION = 0x3054;
-        public const int EGL_WIDTH = 0x3057;
-        public const int EGL_WINDOW_BIT = 0x0004;
+        public const int  EGL_ALPHA_SIZE = 0x3021;
+        public const int  EGL_BAD_ACCESS = 0x3002;
+        public const int  EGL_BAD_ALLOC = 0x3003;
+        public const int  EGL_BAD_ATTRIBUTE = 0x3004;
+        public const int  EGL_BAD_CONFIG = 0x3005;
+        public const int  EGL_BAD_CONTEXT = 0x3006;
+        public const int  EGL_BAD_CURRENT_SURFACE = 0x3007;
+        public const int  EGL_BAD_DISPLAY = 0x3008;
+        public const int  EGL_BAD_MATCH = 0x3009;
+        public const int  EGL_BAD_NATIVE_PIXMAP = 0x300A;
+        public const int  EGL_BAD_NATIVE_WINDOW = 0x300B;
+        public const int  EGL_BAD_PARAMETER = 0x300C;
+        public const int  EGL_BAD_SURFACE = 0x300D;
+        public const int  EGL_BLUE_SIZE = 0x3022;
+//        public const int  EGL_BUFFER_SIZE = 0x3020;
+//        public const int  EGL_CONFIG_CAVEAT = 0x3027;
+//        public const int  EGL_CONFIG_ID = 0x3028;
+        public const int  EGL_CORE_NATIVE_ENGINE = 0x305B;
+        public const int  EGL_DEPTH_SIZE = 0x3025;
+//        public const int  EGL_DONT_CARE = -1;
+        public const int  EGL_DRAW = 0x3059;
+        public const int  EGL_EXTENSIONS = 0x3055;
+        public const int  EGL_FALSE = 0;
+        public const int  EGL_GREEN_SIZE = 0x3023;
+        public const int  EGL_HEIGHT = 0x3056;
+//        public const int  EGL_LARGEST_PBUFFER = 0x3058;
+//        public const int  EGL_LEVEL = 0x3029;
+//        public const int  EGL_MAX_PBUFFER_HEIGHT = 0x302A;
+//        public const int  EGL_MAX_PBUFFER_PIXELS = 0x302B;
+//        public const int  EGL_MAX_PBUFFER_WIDTH = 0x302C;
+//        public const int  EGL_NATIVE_RENDERABLE = 0x302D;
+//        public const int  EGL_NATIVE_VISUAL_ID = 0x302E;
+//        public const int  EGL_NATIVE_VISUAL_TYPE = 0x302F;
+        public const int  EGL_NONE = 0x3038;
+//        public const int  EGL_NON_CONFORMANT_CONFIG = 0x3051;
+        public const int  EGL_NOT_INITIALIZED = 0x3001;
+        public const int  EGL_NO_CONTEXT = 0;
+        public const int  EGL_NO_DISPLAY = 0;
+        public const int  EGL_NO_SURFACE = 0;
+        public const int  EGL_PBUFFER_BIT = 0x0001;
+//        public const int  EGL_PIXMAP_BIT = 0x0002;
+        public const int  EGL_READ = 0x305A;
+        public const int  EGL_RED_SIZE = 0x3024;
+        public const int  EGL_SAMPLES = 0x3031;
+//        public const int  EGL_SAMPLE_BUFFERS = 0x3032;
+//        public const int  EGL_SLOW_CONFIG = 0x3050;
+        public const int  EGL_STENCIL_SIZE = 0x3026;
+        public const int  EGL_SUCCESS = 0x3000;
+        public const int  EGL_SURFACE_TYPE = 0x3033;
+//        public const int  EGL_TRANSPARENT_BLUE_VALUE = 0x3035;
+//        public const int  EGL_TRANSPARENT_GREEN_VALUE = 0x3036;
+//        public const int  EGL_TRANSPARENT_RED_VALUE = 0x3037;
+//        public const int  EGL_TRANSPARENT_RGB = 0x3052;
+//        public const int  EGL_TRANSPARENT_TYPE = 0x3034;
+        public const int  EGL_TRUE = 1;
+//        public const int  EGL_VENDOR = 0x3053;
+//        public const int  EGL_VERSION = 0x3054;
+        public const int  EGL_WIDTH = 0x3057;
+        public const int  EGL_WINDOW_BIT = 0x0004;
 
-        public const int EGL_BACK_BUFFER = 0x3084;
-        public const int EGL_BIND_TO_TEXTURE_RGB = 0x3039;
-        public const int EGL_BIND_TO_TEXTURE_RGBA = 0x303A;
-        public const int EGL_CONTEXT_LOST = 0x300E;
-        public const int EGL_MIN_SWAP_INTERVAL = 0x303B;
-        public const int EGL_MAX_SWAP_INTERVAL = 0x303C;
-        public const int EGL_MIPMAP_TEXTURE = 0x3082;
-        public const int EGL_MIPMAP_LEVEL = 0x3083;
-        public const int EGL_NO_TEXTURE = 0x305C;
-        public const int EGL_TEXTURE_2D = 0x305F;
-        public const int EGL_TEXTURE_FORMAT = 0x3080;
-        public const int EGL_TEXTURE_RGB = 0x305D;
-        public const int EGL_TEXTURE_RGBA = 0x305E;
-        public const int EGL_TEXTURE_TARGET = 0x3081;
+//        public const int  EGL_BACK_BUFFER = 0x3084;
+//        public const int  EGL_BIND_TO_TEXTURE_RGB = 0x3039;
+//        public const int  EGL_BIND_TO_TEXTURE_RGBA = 0x303A;
+        public const int  EGL_CONTEXT_LOST = 0x300E;
+//        public const int  EGL_MIN_SWAP_INTERVAL = 0x303B;
+//        public const int  EGL_MAX_SWAP_INTERVAL = 0x303C;
+//        public const int  EGL_MIPMAP_TEXTURE = 0x3082;
+//        public const int  EGL_MIPMAP_LEVEL = 0x3083;
+//        public const int  EGL_NO_TEXTURE = 0x305C;
+//        public const int  EGL_TEXTURE_2D = 0x305F;
+//        public const int  EGL_TEXTURE_FORMAT = 0x3080;
+//        public const int  EGL_TEXTURE_RGB = 0x305D;
+//        public const int  EGL_TEXTURE_RGBA = 0x305E;
+//        public const int  EGL_TEXTURE_TARGET = 0x3081;
 
-        public const int EGL_ALPHA_FORMAT = 0x3088;
-        public const int EGL_ALPHA_FORMAT_NONPRE = 0x308B;
-        public const int EGL_ALPHA_FORMAT_PRE = 0x308C;
-        public const int EGL_ALPHA_MASK_SIZE = 0x303E;
-        public const int EGL_BUFFER_PRESERVED = 0x3094;
-        public const int EGL_BUFFER_DESTROYED = 0x3095;
-        public const int EGL_CLIENT_APIS = 0x308D;
-        public const int EGL_COLORSPACE = 0x3087;
-        public const int EGL_COLORSPACE_sRGB = 0x3089;
-        public const int EGL_COLORSPACE_LINEAR = 0x308A;
-        public const int EGL_COLOR_BUFFER_TYPE = 0x303F;
-        public const int EGL_CONTEXT_CLIENT_TYPE = 0x3097;
-        public const int EGL_DISPLAY_SCALING = 10000;
-        public const int EGL_HORIZONTAL_RESOLUTION = 0x3090;
-        public const int EGL_LUMINANCE_BUFFER = 0x308F;
-        public const int EGL_LUMINANCE_SIZE = 0x303D;
-        public const int EGL_OPENGL_ES_BIT = 0x0001;
-        public const int EGL_OPENVG_BIT = 0x0002;
-        public const int EGL_OPENGL_ES_API = 0x30A0;
-        public const int EGL_OPENVG_API = 0x30A1;
-        public const int EGL_OPENVG_IMAGE = 0x3096;
-        public const int EGL_PIXEL_ASPECT_RATIO = 0x3092;
-        public const int EGL_RENDERABLE_TYPE = 0x3040;
-        public const int EGL_RENDER_BUFFER = 0x3086;
-        public const int EGL_RGB_BUFFER = 0x308E;
-        public const int EGL_SINGLE_BUFFER = 0x3085;
-        public const int EGL_SWAP_BEHAVIOR = 0x3093;
-        public const int EGL_UNKNOWN = -1;
-        public const int EGL_VERTICAL_RESOLUTION = 0x3091;
-        public const int EGL_CONFORMANT = 0x3042;
-        public const int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-        public const int EGL_MATCH_NATIVE_PIXMAP = 0x3041;
-        public const int EGL_OPENGL_ES2_BIT = 0x0004;
-        public const int EGL_VG_ALPHA_FORMAT = 0x3088;
-        public const int EGL_VG_ALPHA_FORMAT_NONPRE = 0x308B;
-        public const int EGL_VG_ALPHA_FORMAT_PRE = 0x308C;
-        public const int EGL_VG_ALPHA_FORMAT_PRE_BIT = 0x0040;
-        public const int EGL_VG_COLORSPACE = 0x3087;
-        public const int EGL_VG_COLORSPACE_sRGB = 0x3089;
-        public const int EGL_VG_COLORSPACE_LINEAR = 0x308A;
-        public const int EGL_VG_COLORSPACE_LINEAR_BIT = 0x0020;
-        public const int EGL_DEFAULT_DISPLAY = 0;
-        public const int EGL_MULTISAMPLE_RESOLVE_BOX_BIT = 0x0200;
-        public const int EGL_MULTISAMPLE_RESOLVE = 0x3099;
-        public const int EGL_MULTISAMPLE_RESOLVE_DEFAULT = 0x309A;
-        public const int EGL_MULTISAMPLE_RESOLVE_BOX = 0x309B;
-        public const int EGL_OPENGL_API = 0x30A2;
-        public const int EGL_OPENGL_BIT = 0x0008;
-        public const int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
-        public const int EGL_CONTEXT_MAJOR_VERSION = 0x3098;
-        public const int EGL_CONTEXT_MINOR_VERSION = 0x30FB;
-        public const int EGL_CONTEXT_OPENGL_PROFILE_MASK = 0x30FD;
-        public const int EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY = 0x31BD;
-        public const int EGL_NO_RESET_NOTIFICATION = 0x31BE;
-        public const int EGL_LOSE_CONTEXT_ON_RESET = 0x31BF;
-        public const int EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT = 0x00000001;
-        public const int EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT = 0x00000002;
-        public const int EGL_CONTEXT_OPENGL_DEBUG = 0x31B0;
-        public const int EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE = 0x31B1;
-        public const int EGL_CONTEXT_OPENGL_ROBUST_ACCESS = 0x31B2;
-        public const int EGL_OPENGL_ES3_BIT = 0x00000040;
-        public const int EGL_CL_EVENT_HANDLE = 0x309C;
-        public const int EGL_SYNC_CL_EVENT = 0x30FE;
-        public const int EGL_SYNC_CL_EVENT_COMPLETE = 0x30FF;
-        public const int EGL_SYNC_PRIOR_COMMANDS_COMPLETE = 0x30F0;
-        public const int EGL_SYNC_TYPE = 0x30F7;
-        public const int EGL_SYNC_STATUS = 0x30F1;
-        public const int EGL_SYNC_CONDITION = 0x30F8;
-        public const int EGL_SIGNALED = 0x30F2;
-        public const int EGL_UNSIGNALED = 0x30F3;
+//        public const int  EGL_ALPHA_FORMAT = 0x3088;
+//        public const int  EGL_ALPHA_FORMAT_NONPRE = 0x308B;
+//        public const int  EGL_ALPHA_FORMAT_PRE = 0x308C;
+//        public const int  EGL_ALPHA_MASK_SIZE = 0x303E;
+//        public const int  EGL_BUFFER_PRESERVED = 0x3094;
+//        public const int  EGL_BUFFER_DESTROYED = 0x3095;
+//        public const int  EGL_CLIENT_APIS = 0x308D;
+//        public const int  EGL_COLORSPACE = 0x3087;
+//        public const int  EGL_COLORSPACE_sRGB = 0x3089;
+//        public const int  EGL_COLORSPACE_LINEAR = 0x308A;
+//        public const int  EGL_COLOR_BUFFER_TYPE = 0x303F;
+//        public const int  EGL_CONTEXT_CLIENT_TYPE = 0x3097;
+//        public const int  EGL_DISPLAY_SCALING = 10000;
+//        public const int  EGL_HORIZONTAL_RESOLUTION = 0x3090;
+//        public const int  EGL_LUMINANCE_BUFFER = 0x308F;
+//        public const int  EGL_LUMINANCE_SIZE = 0x303D;
+        public const int  EGL_OPENGL_ES_BIT = 0x0001;
+//        public const int  EGL_OPENVG_BIT = 0x0002;
+        public const int  EGL_OPENGL_ES_API = 0x30A0;
+//        public const int  EGL_OPENVG_API = 0x30A1;
+//        public const int  EGL_OPENVG_IMAGE = 0x3096;
+//        public const int  EGL_PIXEL_ASPECT_RATIO = 0x3092;
+        public const int  EGL_RENDERABLE_TYPE = 0x3040;
+//        public const int  EGL_RENDER_BUFFER = 0x3086;
+//        public const int  EGL_RGB_BUFFER = 0x308E;
+//        public const int  EGL_SINGLE_BUFFER = 0x3085;
+//        public const int  EGL_SWAP_BEHAVIOR = 0x3093;
+//        public const int  EGL_UNKNOWN = -1;
+//        public const int  EGL_VERTICAL_RESOLUTION = 0x3091;
+//        public const int  EGL_CONFORMANT = 0x3042;
+//        public const int  EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+//        public const int  EGL_MATCH_NATIVE_PIXMAP = 0x3041;
+        public const int  EGL_OPENGL_ES2_BIT = 0x0004;
+//        public const int  EGL_VG_ALPHA_FORMAT = 0x3088;
+//        public const int  EGL_VG_ALPHA_FORMAT_NONPRE = 0x308B;
+//        public const int  EGL_VG_ALPHA_FORMAT_PRE = 0x308C;
+//        public const int  EGL_VG_ALPHA_FORMAT_PRE_BIT = 0x0040;
+//        public const int  EGL_VG_COLORSPACE = 0x3087;
+//        public const int  EGL_VG_COLORSPACE_sRGB = 0x3089;
+//        public const int  EGL_VG_COLORSPACE_LINEAR = 0x308A;
+//        public const int  EGL_VG_COLORSPACE_LINEAR_BIT = 0x0020;
+//        public const int  EGL_DEFAULT_DISPLAY = 0;
+//        public const int  EGL_MULTISAMPLE_RESOLVE_BOX_BIT = 0x0200;
+//        public const int  EGL_MULTISAMPLE_RESOLVE = 0x3099;
+//        public const int  EGL_MULTISAMPLE_RESOLVE_DEFAULT = 0x309A;
+//        public const int  EGL_MULTISAMPLE_RESOLVE_BOX = 0x309B;
+//        public const int  EGL_OPENGL_API = 0x30A2;
+//        public const int  EGL_OPENGL_BIT = 0x0008;
+//        public const int  EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
+        public const int  EGL_CONTEXT_MAJOR_VERSION = 0x3098;
+        public const int  EGL_CONTEXT_MINOR_VERSION = 0x30FB;
+//        public const int  EGL_CONTEXT_OPENGL_PROFILE_MASK = 0x30FD;
+//        public const int  EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY = 0x31BD;
+//        public const int  EGL_NO_RESET_NOTIFICATION = 0x31BE;
+//        public const int  EGL_LOSE_CONTEXT_ON_RESET = 0x31BF;
+//        public const int  EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT = 0x00000001;
+//        public const int  EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+//        public const int  EGL_CONTEXT_OPENGL_DEBUG = 0x31B0;
+//        public const int  EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE = 0x31B1;
+//        public const int  EGL_CONTEXT_OPENGL_ROBUST_ACCESS = 0x31B2;
+        public const int  EGL_OPENGL_ES3_BIT = 0x00000040;
+//        public const int  EGL_CL_EVENT_HANDLE = 0x309C;
+//        public const int  EGL_SYNC_CL_EVENT = 0x30FE;
+//        public const int  EGL_SYNC_CL_EVENT_COMPLETE = 0x30FF;
+//        public const int  EGL_SYNC_PRIOR_COMMANDS_COMPLETE = 0x30F0;
+//        public const int  EGL_SYNC_TYPE = 0x30F7;
+//        public const int  EGL_SYNC_STATUS = 0x30F1;
+//        public const int  EGL_SYNC_CONDITION = 0x30F8;
+//        public const int  EGL_SIGNALED = 0x30F2;
+//        public const int  EGL_UNSIGNALED = 0x30F3;
 
-        public const int EGL_SYNC_FLUSH_COMMANDS_BIT = 0x0001;
+//        public const int  EGL_SYNC_FLUSH_COMMANDS_BIT = 0x0001;
 
-        public const int EGL_TIMEOUT_EXPIRED = 0x30F5;
-        public const int EGL_CONDITION_SATISFIED = 0x30F6;
-        public const int EGL_NO_SYNC = 0;
-        public const int EGL_SYNC_FENCE = 0x30F9;
-        public const int EGL_GL_COLORSPACE = 0x309D;
-        public const int EGL_GL_COLORSPACE_SRGB = 0x3089;
-        public const int EGL_GL_COLORSPACE_LINEAR = 0x308A;
-        public const int EGL_GL_RENDERBUFFER = 0x30B9;
-        public const int EGL_GL_TEXTURE_2D = 0x30B1;
-        public const int EGL_GL_TEXTURE_LEVEL = 0x30BC;
-        public const int EGL_GL_TEXTURE_3D = 0x30B2;
-        public const int EGL_GL_TEXTURE_ZOFFSET = 0x30BD;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x30B3;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x30B4;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x30B5;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x30B6;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x30B7;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x30B8;
-        public const int EGL_IMAGE_PRESERVED = 0x30D2;
-        public const int EGL_NO_IMAGE = 0;
+//        public const int  EGL_TIMEOUT_EXPIRED = 0x30F5;
+//        public const int  EGL_CONDITION_SATISFIED = 0x30F6;
+//        public const int  EGL_NO_SYNC = 0;
+//        public const int  EGL_SYNC_FENCE = 0x30F9;
+//        public const int  EGL_GL_COLORSPACE = 0x309D;
+//        public const int  EGL_GL_COLORSPACE_SRGB = 0x3089;
+//        public const int  EGL_GL_COLORSPACE_LINEAR = 0x308A;
+//        public const int  EGL_GL_RENDERBUFFER = 0x30B9;
+//        public const int  EGL_GL_TEXTURE_2D = 0x30B1;
+//        public const int  EGL_GL_TEXTURE_LEVEL = 0x30BC;
+//        public const int  EGL_GL_TEXTURE_3D = 0x30B2;
+//        public const int  EGL_GL_TEXTURE_ZOFFSET = 0x30BD;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x30B3;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x30B4;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x30B5;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x30B6;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x30B7;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x30B8;
+//        public const int  EGL_IMAGE_PRESERVED = 0x30D2;
+//        public const int  EGL_NO_IMAGE = 0;
 
 
-        public const int EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE = 0x3207;
-        public const int EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE = 0x3208;
+        public const int  EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE = 0x3207;
+        public const int  EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE = 0x3208;
         
         //EGL_ANGLE_platform_angle
-        public const int EGL_PLATFORM_ANGLE_ANGLE = 0x3202;
-        public const int EGL_PLATFORM_ANGLE_TYPE_ANGLE = 0x3203;
-        public const int EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE = 0x3204;
-        public const int EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE = 0x3205;
-        public const int EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED = 0x3451;
-        public const int EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE = 0x3206;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE = 0x320A;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE = 0x345E;
+        public const int  EGL_PLATFORM_ANGLE_ANGLE = 0x3202;
+        public const int  EGL_PLATFORM_ANGLE_TYPE_ANGLE = 0x3203;
+//        public const int  EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE = 0x3204;
+//        public const int  EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE = 0x3205;
+//        public const int  EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED = 0x3451;
+//        public const int  EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE = 0x3206;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE = 0x320A;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE = 0x345E;
 
-        public const int EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE = 0x320D;
-        public const int EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE = 0x320E;
+//        public const int  EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE = 0x320D;
+//        public const int  EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE = 0x320E;
         
         //EGL_ANGLE_platform_angle_d3d
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE = 0x3209;
-        public const int EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE = 0x320F;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE = 0x320B;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE = 0x320C;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE = 0x3209;
+//        public const int  EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE = 0x320F;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE = 0x320B;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE = 0x320C;
         
         //EXT_device_query
-        public const int EGL_DEVICE_EXT = 0x322C;
+        public const int  EGL_DEVICE_EXT = 0x322C;
 
         //ANGLE_device_d3d
-        public const int EGL_D3D9_DEVICE_ANGLE = 0x33A0;
-        public const int EGL_D3D11_DEVICE_ANGLE = 0x33A1;
+        public const int  EGL_D3D9_DEVICE_ANGLE = 0x33A0;
+        public const int  EGL_D3D11_DEVICE_ANGLE = 0x33A1;
 
-        public const int EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE = 0x3200;
-        public const int EGL_D3D_TEXTURE_ANGLE = 0x33A3;
+        public const int  EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE = 0x3200;
+        public const int  EGL_D3D_TEXTURE_ANGLE = 0x33A3;
 
 
-        public const int EGL_TEXTURE_OFFSET_X_ANGLE = 0x3490;
-        public const int EGL_TEXTURE_OFFSET_Y_ANGLE = 0x3491;
+        public const int  EGL_TEXTURE_OFFSET_X_ANGLE = 0x3490;
+        public const int  EGL_TEXTURE_OFFSET_Y_ANGLE = 0x3491;
 
-        public const int EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
+        public const int  EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
     }
 }
diff --git a/src/Avalonia.OpenGL/Egl/EglContext.cs b/src/Avalonia.OpenGL/Egl/EglContext.cs
index bc517c3e27..e7b5dc7c83 100644
--- a/src/Avalonia.OpenGL/Egl/EglContext.cs
+++ b/src/Avalonia.OpenGL/Egl/EglContext.cs
@@ -24,7 +24,7 @@ namespace Avalonia.OpenGL.Egl
             SampleCount = sampleCount;
             StencilSize = stencilSize;
             using (MakeCurrent())
-                GlInterface = GlInterface.FromNativeUtf8GetProcAddress(version, b => _egl.GetProcAddress(b));
+                GlInterface = GlInterface.FromNativeUtf8GetProcAddress(version, _egl.GetProcAddress);
         }
 
         public IntPtr Context { get; }
diff --git a/src/Avalonia.OpenGL/Egl/EglDisplay.cs b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
index 623364866b..d3d85e8c83 100644
--- a/src/Avalonia.OpenGL/Egl/EglDisplay.cs
+++ b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
@@ -34,9 +34,9 @@ namespace Avalonia.OpenGL.Egl
             }
             else
             {
-                if (egl.GetPlatformDisplayEXT == null)
+                if (!egl.IsGetPlatformDisplayExtAvailable)
                     throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl");
-                display = egl.GetPlatformDisplayEXT(platformType, platformDisplay, attrs);
+                display = egl.GetPlatformDisplayExt(platformType, platformDisplay, attrs);
             }
             
             if (display == IntPtr.Zero)
diff --git a/src/Avalonia.OpenGL/Egl/EglInterface.cs b/src/Avalonia.OpenGL/Egl/EglInterface.cs
index cadd7cc1f2..4fec8e5356 100644
--- a/src/Avalonia.OpenGL/Egl/EglInterface.cs
+++ b/src/Avalonia.OpenGL/Egl/EglInterface.cs
@@ -2,31 +2,26 @@
 using System.Runtime.InteropServices;
 using Avalonia.Platform;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
 
 namespace Avalonia.OpenGL.Egl
 {
-    public class EglInterface : GlInterfaceBase
+    public unsafe partial class EglInterface
     {
-        public EglInterface() : base(Load())
+        public EglInterface(Func<string, IntPtr> getProcAddress)
         {
-            
-        }
-
-        public EglInterface(Func<Utf8Buffer,IntPtr> getProcAddress) : base(getProcAddress)
-        {
-            
+            Initialize(getProcAddress);
         }
         
-        public EglInterface(Func<string, IntPtr> getProcAddress) : base(getProcAddress)
+        public EglInterface(string library) : this(Load(library))
         {
-            
         }
-        
-        public EglInterface(string library) : base(Load(library))
+
+        public EglInterface() : this(Load())
         {
+            
         }
 
-        
         static Func<string, IntPtr> Load()
         {
             var os = AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
@@ -46,98 +41,75 @@ namespace Avalonia.OpenGL.Egl
         }
 
         // ReSharper disable UnassignedGetOnlyAutoProperty
-        public delegate int EglGetError();
-        [GlEntryPoint("eglGetError")]
-        public EglGetError GetError { get; }
-
-        public delegate IntPtr EglGetDisplay(IntPtr nativeDisplay);
-        [GlEntryPoint("eglGetDisplay")]
-        public EglGetDisplay GetDisplay { get; }
         
-        public delegate IntPtr EglGetPlatformDisplayEXT(int platform, IntPtr nativeDisplay, int[] attrs);
-        [GlEntryPoint("eglGetPlatformDisplayEXT")]
-        [GlOptionalEntryPoint]
-        public EglGetPlatformDisplayEXT GetPlatformDisplayEXT { get; }
-
-        public delegate bool EglInitialize(IntPtr display, out int major, out int minor);
-        [GlEntryPoint("eglInitialize")]
-        public EglInitialize Initialize { get; }        
+        [GetProcAddress("eglGetError")]
+        public partial int GetError();
         
-        public delegate IntPtr EglGetProcAddress(Utf8Buffer proc);
-        [GlEntryPoint("eglGetProcAddress")]
-        public EglGetProcAddress GetProcAddress { get; }
+        [GetProcAddress("eglGetDisplay")]
+        public partial IntPtr GetDisplay(IntPtr nativeDisplay);
+        
+        [GetProcAddress("eglGetPlatformDisplayEXT", true)]
+        public partial IntPtr GetPlatformDisplayExt(int platform, IntPtr nativeDisplay, int[] attrs);
 
-        public delegate bool EglBindApi(int api);
-        [GlEntryPoint("eglBindAPI")]
-        public EglBindApi BindApi { get; }
+        [GetProcAddress("eglInitialize")]        
+        public partial bool Initialize(IntPtr display, out int major, out int minor);
 
-        public delegate bool EglChooseConfig(IntPtr display, int[] attribs,
-            out IntPtr surfaceConfig, int numConfigs, out int choosenConfig);
-        [GlEntryPoint("eglChooseConfig")]
-        public EglChooseConfig ChooseConfig { get; }
+        [GetProcAddress("eglGetProcAddress")]        
+        public partial IntPtr GetProcAddress(IntPtr proc);
+
+        [GetProcAddress("eglBindAPI")]
+        public partial bool BindApi(int api);
 
-        public delegate IntPtr EglCreateContext(IntPtr display, IntPtr config,
+        [GetProcAddress("eglChooseConfig")]
+        public partial bool ChooseConfig(IntPtr display, int[] attribs,
+            out IntPtr surfaceConfig, int numConfigs, out int choosenConfig);
+        
+        [GetProcAddress("eglCreateContext")]
+        public partial IntPtr CreateContext(IntPtr display, IntPtr config,
             IntPtr share, int[] attrs);
-        [GlEntryPoint("eglCreateContext")]
-        public EglCreateContext CreateContext { get; }
         
-        public delegate bool EglDestroyContext(IntPtr display, IntPtr context);
-        [GlEntryPoint("eglDestroyContext")]
-        public EglDestroyContext DestroyContext { get; }
-
-        public delegate IntPtr EglCreatePBufferSurface(IntPtr display, IntPtr config, int[] attrs);
-        [GlEntryPoint("eglCreatePbufferSurface")]
-        public EglCreatePBufferSurface CreatePBufferSurface { get; }
+        [GetProcAddress("eglDestroyContext")]
+        public partial bool DestroyContext(IntPtr display, IntPtr context);
+        
+        [GetProcAddress("eglCreatePbufferSurface")]
+        public partial IntPtr CreatePBufferSurface(IntPtr display, IntPtr config, int[] attrs);
 
-        public delegate bool EglMakeCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
-        [GlEntryPoint("eglMakeCurrent")]
-        public EglMakeCurrent MakeCurrent { get; }
+        [GetProcAddress("eglMakeCurrent")]
+        public partial bool MakeCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
+        
+        [GetProcAddress("eglGetCurrentContext")]
+        public partial IntPtr GetCurrentContext();
 
-        public delegate IntPtr EglGetCurrentContext();
-        [GlEntryPoint("eglGetCurrentContext")]
-        public EglGetCurrentContext GetCurrentContext { get; }
+        [GetProcAddress("eglGetCurrentDisplay")]
+        public partial IntPtr GetCurrentDisplay();
         
-        public delegate IntPtr EglGetCurrentDisplay();
-        [GlEntryPoint("eglGetCurrentDisplay")]
-        public EglGetCurrentContext GetCurrentDisplay { get; }
+        [GetProcAddress("eglGetCurrentSurface")] 
+        public partial IntPtr GetCurrentSurface(int readDraw);
 
-        public delegate IntPtr EglGetCurrentSurface(int readDraw);
-        [GlEntryPoint("eglGetCurrentSurface")] 
-        public EglGetCurrentSurface GetCurrentSurface { get; }
+        [GetProcAddress("eglDestroySurface")]
+        public partial void DestroySurface(IntPtr display, IntPtr surface);
 
-        public delegate void EglDisplaySurfaceVoidDelegate(IntPtr display, IntPtr surface);
-        [GlEntryPoint("eglDestroySurface")]
-        public EglDisplaySurfaceVoidDelegate DestroySurface { get; }
-        
-        [GlEntryPoint("eglSwapBuffers")]
-        public EglDisplaySurfaceVoidDelegate SwapBuffers { get; }
-        
-        public delegate IntPtr
-            EglCreateWindowSurface(IntPtr display, IntPtr config, IntPtr window, int[] attrs);
-        [GlEntryPoint("eglCreateWindowSurface")]
-        public EglCreateWindowSurface CreateWindowSurface { get; }
+        [GetProcAddress("eglSwapBuffers")]
+        public partial void SwapBuffers(IntPtr display, IntPtr surface);
 
-        public delegate bool EglGetConfigAttrib(IntPtr display, IntPtr config, int attr, out int rv);
-        [GlEntryPoint("eglGetConfigAttrib")]
-        public EglGetConfigAttrib GetConfigAttrib { get; }
+        [GetProcAddress("eglCreateWindowSurface")]
+        public partial IntPtr CreateWindowSurface(IntPtr display, IntPtr config, IntPtr window, int[] attrs);
 
-        public delegate bool EglWaitGL();
-        [GlEntryPoint("eglWaitGL")]
-        public EglWaitGL WaitGL { get; }
+        [GetProcAddress("eglGetConfigAttrib")]
+        public partial bool GetConfigAttrib(IntPtr display, IntPtr config, int attr, out int rv);
         
-        public delegate bool EglWaitClient();
-        [GlEntryPoint("eglWaitClient")]
-        public EglWaitGL WaitClient { get; }
+        [GetProcAddress("eglWaitGL")]
+        public partial bool WaitGL();
         
-        public delegate bool EglWaitNative(int engine);
-        [GlEntryPoint("eglWaitNative")]
-        public EglWaitNative WaitNative { get; }
+        [GetProcAddress("eglWaitClient")]
+        public partial bool WaitClient();
         
-        public delegate IntPtr EglQueryString(IntPtr display, int i);
+        [GetProcAddress("eglWaitNative")]
+        public partial bool WaitNative(int engine);
+        
+        [GetProcAddress("eglQueryString")]
+        public partial IntPtr QueryStringNative(IntPtr display, int i);
         
-        [GlEntryPoint("eglQueryString")]
-        public EglQueryString QueryStringNative { get; }
-
         public string QueryString(IntPtr display, int i)
         {
             var rv = QueryStringNative(display, i);
@@ -146,21 +118,14 @@ namespace Avalonia.OpenGL.Egl
             return Marshal.PtrToStringAnsi(rv);
         }
         
-        public delegate IntPtr EglCreatePbufferFromClientBuffer(IntPtr display, int buftype, IntPtr buffer, IntPtr config, int[] attrib_list);
-        [GlEntryPoint("eglCreatePbufferFromClientBuffer")]
-
-        public EglCreatePbufferFromClientBuffer CreatePbufferFromClientBuffer { get; }
+        [GetProcAddress("eglCreatePbufferFromClientBuffer")]
+        public partial IntPtr CreatePbufferFromClientBuffer(IntPtr display, int buftype, IntPtr buffer, IntPtr config, int[] attrib_list);
         
-        public delegate bool EglQueryDisplayAttribEXT(IntPtr display, int attr, out IntPtr res);
-
-        [GlEntryPoint("eglQueryDisplayAttribEXT"), GlOptionalEntryPoint]
-        public EglQueryDisplayAttribEXT QueryDisplayAttribExt { get; }
+        [GetProcAddress("eglQueryDisplayAttribEXT", true)]
+        public partial bool QueryDisplayAttribExt(IntPtr display, int attr, out IntPtr res);
 
-        public delegate bool EglQueryDeviceAttribEXT(IntPtr display, int attr, out IntPtr res);
-
-        [GlEntryPoint("eglQueryDeviceAttribEXT"), GlOptionalEntryPoint]
-        public EglQueryDisplayAttribEXT QueryDeviceAttribExt { get; }
-
-        // ReSharper restore UnassignedGetOnlyAutoProperty
+        
+        [GetProcAddress("eglQueryDeviceAttribEXT", true)]
+        public partial bool QueryDeviceAttribExt(IntPtr display, int attr, out IntPtr res);
     }
 }
diff --git a/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs b/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs
index 476f65a774..a1ac2a9d37 100644
--- a/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs
+++ b/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Logging;
+using Avalonia.Platform;
 using static Avalonia.OpenGL.Egl.EglConsts;
 
 namespace Avalonia.OpenGL.Egl
@@ -12,6 +13,7 @@ namespace Avalonia.OpenGL.Egl
         
         public EglContext PrimaryEglContext { get; }
         public IGlContext PrimaryContext => PrimaryEglContext;
+        IPlatformGpuContext IPlatformGpu.PrimaryContext => PrimaryContext;
         
         public EglPlatformOpenGlInterface(EglDisplay display)
         {
@@ -42,10 +44,13 @@ namespace Avalonia.OpenGL.Egl
 
         public IGlContext CreateContext() => Display.CreateContext(null);
         public IGlContext CreateSharedContext() => Display.CreateContext(PrimaryEglContext);
-        
+
 
         public EglSurface CreateWindowSurface(IntPtr window)
         {
+            if (window == IntPtr.Zero)
+                throw new OpenGlException($"Window {window} is invalid.");
+
             using (PrimaryContext.MakeCurrent())
             {
                 var s = Display.EglInterface.CreateWindowSurface(Display.Handle, Display.Config, window,
diff --git a/src/Avalonia.OpenGL/GlBasicInfoInterface.cs b/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
index a3383ac5ae..7a7110f15b 100644
--- a/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
+++ b/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
@@ -3,43 +3,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
 
 namespace Avalonia.OpenGL
 {
-    public class GlBasicInfoInterface : GlBasicInfoInterface<object>
+    public unsafe partial class GlBasicInfoInterface
     {
-        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress) : base(getProcAddress, null)
-        {
-        }
-
-        public GlBasicInfoInterface(Func<Utf8Buffer, IntPtr> nativeGetProcAddress) : base(nativeGetProcAddress, null)
-        {
+        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress){
+            Initialize(getProcAddress);
         }
-        
-        public delegate void GlGetIntegerv(int name, out int rv);
-        public delegate IntPtr GlGetString(int v);
-        public delegate IntPtr GlGetStringi(int v, int v1);
-    }
     
-    public class GlBasicInfoInterface<TContextInfo> : GlInterfaceBase<TContextInfo>
-    {
-        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress, TContextInfo context) : base(getProcAddress, context)
-        {
-        }
+        [GetProcAddress("glGetIntegerv")]
+        public partial void GetIntegerv(int name, out int rv);
 
-        public GlBasicInfoInterface(Func<Utf8Buffer, IntPtr> nativeGetProcAddress, TContextInfo context) : base(nativeGetProcAddress, context)
-        {
-        }
-        
-        [GlEntryPoint("glGetIntegerv")]
-        public GlBasicInfoInterface.GlGetIntegerv GetIntegerv { get; }
-        
-        
-        [GlEntryPoint("glGetString")]
-        public GlBasicInfoInterface.GlGetString GetStringNative { get; }
-        
-        [GlEntryPoint("glGetStringi")]
-        public GlBasicInfoInterface.GlGetStringi GetStringiNative { get; }
+        [GetProcAddress("glGetString")]
+        public partial IntPtr GetStringNative(int v);
+
+        [GetProcAddress("glGetStringi")]
+        public partial IntPtr GetStringiNative(int v, int v1);
 
         public string GetString(int v)
         {
diff --git a/src/Avalonia.OpenGL/GlConsts.cs b/src/Avalonia.OpenGL/GlConsts.cs
index 2a6aa0d14d..3fdc147701 100644
--- a/src/Avalonia.OpenGL/GlConsts.cs
+++ b/src/Avalonia.OpenGL/GlConsts.cs
@@ -1,457 +1,456 @@
-// ReSharper disable UnusedMember.Global
 // ReSharper disable IdentifierTypo
 namespace Avalonia.OpenGL
 {
     public static class GlConsts
     {
-        public const int GL_BYTE = 0x1400;
+//        public const int GL_BYTE = 0x1400
         public const int GL_UNSIGNED_BYTE = 0x1401;
-        public const int GL_SHORT = 0x1402;
+//        public const int GL_SHORT = 0x1402;
         public const int GL_UNSIGNED_SHORT = 0x1403;
-        public const int GL_INT = 0x1404;
-        public const int GL_UNSIGNED_INT = 0x1405;
+//        public const int GL_INT = 0x1404;
+//        public const int GL_UNSIGNED_INT = 0x1405;
         public const int GL_FLOAT = 0x1406;
-        public const int GL_2_BYTES = 0x1407;
-        public const int GL_3_BYTES = 0x1408;
-        public const int GL_4_BYTES = 0x1409;
-        public const int GL_DOUBLE = 0x140A;
-        public const int GL_POINTS = 0x0000;
-        public const int GL_LINES = 0x0001;
-        public const int GL_LINE_LOOP = 0x0002;
-        public const int GL_LINE_STRIP = 0x0003;
+//        public const int GL_2_BYTES = 0x1407;
+//        public const int GL_3_BYTES = 0x1408;
+//        public const int GL_4_BYTES = 0x1409;
+//        public const int GL_DOUBLE = 0x140A;
+//        public const int GL_POINTS = 0x0000;
+//        public const int GL_LINES = 0x0001;
+//        public const int GL_LINE_LOOP = 0x0002;
+//        public const int GL_LINE_STRIP = 0x0003;
         public const int GL_TRIANGLES = 0x0004;
-        public const int GL_TRIANGLE_STRIP = 0x0005;
-        public const int GL_TRIANGLE_FAN = 0x0006;
-        public const int GL_QUADS = 0x0007;
-        public const int GL_QUAD_STRIP = 0x0008;
-        public const int GL_POLYGON = 0x0009;
-        public const int GL_VERTEX_ARRAY = 0x8074;
-        public const int GL_NORMAL_ARRAY = 0x8075;
-        public const int GL_COLOR_ARRAY = 0x8076;
-        public const int GL_INDEX_ARRAY = 0x8077;
-        public const int GL_TEXTURE_COORD_ARRAY = 0x8078;
-        public const int GL_EDGE_FLAG_ARRAY = 0x8079;
-        public const int GL_VERTEX_ARRAY_SIZE = 0x807A;
-        public const int GL_VERTEX_ARRAY_TYPE = 0x807B;
-        public const int GL_VERTEX_ARRAY_STRIDE = 0x807C;
-        public const int GL_NORMAL_ARRAY_TYPE = 0x807E;
-        public const int GL_NORMAL_ARRAY_STRIDE = 0x807F;
-        public const int GL_COLOR_ARRAY_SIZE = 0x8081;
-        public const int GL_COLOR_ARRAY_TYPE = 0x8082;
-        public const int GL_COLOR_ARRAY_STRIDE = 0x8083;
-        public const int GL_INDEX_ARRAY_TYPE = 0x8085;
-        public const int GL_INDEX_ARRAY_STRIDE = 0x8086;
-        public const int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088;
-        public const int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089;
-        public const int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A;
-        public const int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C;
-        public const int GL_VERTEX_ARRAY_POINTER = 0x808E;
-        public const int GL_NORMAL_ARRAY_POINTER = 0x808F;
-        public const int GL_COLOR_ARRAY_POINTER = 0x8090;
-        public const int GL_INDEX_ARRAY_POINTER = 0x8091;
-        public const int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092;
-        public const int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093;
-        public const int GL_V2F = 0x2A20;
-        public const int GL_V3F = 0x2A21;
-        public const int GL_C4UB_V2F = 0x2A22;
-        public const int GL_C4UB_V3F = 0x2A23;
-        public const int GL_C3F_V3F = 0x2A24;
-        public const int GL_N3F_V3F = 0x2A25;
-        public const int GL_C4F_N3F_V3F = 0x2A26;
-        public const int GL_T2F_V3F = 0x2A27;
-        public const int GL_T4F_V4F = 0x2A28;
-        public const int GL_T2F_C4UB_V3F = 0x2A29;
-        public const int GL_T2F_C3F_V3F = 0x2A2A;
-        public const int GL_T2F_N3F_V3F = 0x2A2B;
-        public const int GL_T2F_C4F_N3F_V3F = 0x2A2C;
-        public const int GL_T4F_C4F_N3F_V4F = 0x2A2D;
-        public const int GL_MATRIX_MODE = 0x0BA0;
-        public const int GL_MODELVIEW = 0x1700;
-        public const int GL_PROJECTION = 0x1701;
-        public const int GL_TEXTURE = 0x1702;
-        public const int GL_POINT_SMOOTH = 0x0B10;
-        public const int GL_POINT_SIZE = 0x0B11;
-        public const int GL_POINT_SIZE_GRANULARITY = 0x0B13;
-        public const int GL_POINT_SIZE_RANGE = 0x0B12;
-        public const int GL_LINE_SMOOTH = 0x0B20;
-        public const int GL_LINE_STIPPLE = 0x0B24;
-        public const int GL_LINE_STIPPLE_PATTERN = 0x0B25;
-        public const int GL_LINE_STIPPLE_REPEAT = 0x0B26;
-        public const int GL_LINE_WIDTH = 0x0B21;
-        public const int GL_LINE_WIDTH_GRANULARITY = 0x0B23;
-        public const int GL_LINE_WIDTH_RANGE = 0x0B22;
-        public const int GL_POINT = 0x1B00;
-        public const int GL_LINE = 0x1B01;
-        public const int GL_FILL = 0x1B02;
-        public const int GL_CW = 0x0900;
-        public const int GL_CCW = 0x0901;
-        public const int GL_FRONT = 0x0404;
-        public const int GL_BACK = 0x0405;
-        public const int GL_POLYGON_MODE = 0x0B40;
-        public const int GL_POLYGON_SMOOTH = 0x0B41;
-        public const int GL_POLYGON_STIPPLE = 0x0B42;
-        public const int GL_EDGE_FLAG = 0x0B43;
-        public const int GL_CULL_FACE = 0x0B44;
-        public const int GL_CULL_FACE_MODE = 0x0B45;
-        public const int GL_FRONT_FACE = 0x0B46;
-        public const int GL_POLYGON_OFFSET_FACTOR = 0x8038;
-        public const int GL_POLYGON_OFFSET_UNITS = 0x2A00;
-        public const int GL_POLYGON_OFFSET_POINT = 0x2A01;
-        public const int GL_POLYGON_OFFSET_LINE = 0x2A02;
-        public const int GL_POLYGON_OFFSET_FILL = 0x8037;
-        public const int GL_COMPILE = 0x1300;
-        public const int GL_COMPILE_AND_EXECUTE = 0x1301;
-        public const int GL_LIST_BASE = 0x0B32;
-        public const int GL_LIST_INDEX = 0x0B33;
-        public const int GL_LIST_MODE = 0x0B30;
-        public const int GL_NEVER = 0x0200;
-        public const int GL_LESS = 0x0201;
-        public const int GL_EQUAL = 0x0202;
-        public const int GL_LEQUAL = 0x0203;
-        public const int GL_GREATER = 0x0204;
-        public const int GL_NOTEQUAL = 0x0205;
-        public const int GL_GEQUAL = 0x0206;
-        public const int GL_ALWAYS = 0x0207;
+//        public const int GL_TRIANGLE_STRIP = 0x0005;
+//        public const int GL_TRIANGLE_FAN = 0x0006;
+//        public const int GL_QUADS = 0x0007;
+//        public const int GL_QUAD_STRIP = 0x0008;
+//        public const int GL_POLYGON = 0x0009;
+//        public const int GL_VERTEX_ARRAY = 0x8074;
+//        public const int GL_NORMAL_ARRAY = 0x8075;
+//        public const int GL_COLOR_ARRAY = 0x8076;
+//        public const int GL_INDEX_ARRAY = 0x8077;
+//        public const int GL_TEXTURE_COORD_ARRAY = 0x8078;
+//        public const int GL_EDGE_FLAG_ARRAY = 0x8079;
+//        public const int GL_VERTEX_ARRAY_SIZE = 0x807A;
+//        public const int GL_VERTEX_ARRAY_TYPE = 0x807B;
+//        public const int GL_VERTEX_ARRAY_STRIDE = 0x807C;
+//        public const int GL_NORMAL_ARRAY_TYPE = 0x807E;
+//        public const int GL_NORMAL_ARRAY_STRIDE = 0x807F;
+//        public const int GL_COLOR_ARRAY_SIZE = 0x8081;
+//        public const int GL_COLOR_ARRAY_TYPE = 0x8082;
+//        public const int GL_COLOR_ARRAY_STRIDE = 0x8083;
+//        public const int GL_INDEX_ARRAY_TYPE = 0x8085;
+//        public const int GL_INDEX_ARRAY_STRIDE = 0x8086;
+//        public const int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088;
+//        public const int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089;
+//        public const int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A;
+//        public const int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C;
+//        public const int GL_VERTEX_ARRAY_POINTER = 0x808E;
+//        public const int GL_NORMAL_ARRAY_POINTER = 0x808F;
+//        public const int GL_COLOR_ARRAY_POINTER = 0x8090;
+//        public const int GL_INDEX_ARRAY_POINTER = 0x8091;
+//        public const int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092;
+//        public const int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093;
+//        public const int GL_V2F = 0x2A20;
+//        public const int GL_V3F = 0x2A21;
+//        public const int GL_C4UB_V2F = 0x2A22;
+//        public const int GL_C4UB_V3F = 0x2A23;
+//        public const int GL_C3F_V3F = 0x2A24;
+//        public const int GL_N3F_V3F = 0x2A25;
+//        public const int GL_C4F_N3F_V3F = 0x2A26;
+//        public const int GL_T2F_V3F = 0x2A27;
+//        public const int GL_T4F_V4F = 0x2A28;
+//        public const int GL_T2F_C4UB_V3F = 0x2A29;
+//        public const int GL_T2F_C3F_V3F = 0x2A2A;
+//        public const int GL_T2F_N3F_V3F = 0x2A2B;
+//        public const int GL_T2F_C4F_N3F_V3F = 0x2A2C;
+//        public const int GL_T4F_C4F_N3F_V4F = 0x2A2D;
+//        public const int GL_MATRIX_MODE = 0x0BA0;
+//        public const int GL_MODELVIEW = 0x1700;
+//        public const int GL_PROJECTION = 0x1701;
+//        public const int GL_TEXTURE = 0x1702;
+//        public const int GL_POINT_SMOOTH = 0x0B10;
+//        public const int GL_POINT_SIZE = 0x0B11;
+//        public const int GL_POINT_SIZE_GRANULARITY = 0x0B13;
+//        public const int GL_POINT_SIZE_RANGE = 0x0B12;
+//        public const int GL_LINE_SMOOTH = 0x0B20;
+//        public const int GL_LINE_STIPPLE = 0x0B24;
+//        public const int GL_LINE_STIPPLE_PATTERN = 0x0B25;
+//        public const int GL_LINE_STIPPLE_REPEAT = 0x0B26;
+//        public const int GL_LINE_WIDTH = 0x0B21;
+//        public const int GL_LINE_WIDTH_GRANULARITY = 0x0B23;
+//        public const int GL_LINE_WIDTH_RANGE = 0x0B22;
+//        public const int GL_POINT = 0x1B00;
+//        public const int GL_LINE = 0x1B01;
+//        public const int GL_FILL = 0x1B02;
+//        public const int GL_CW = 0x0900;
+//        public const int GL_CCW = 0x0901;
+//        public const int GL_FRONT = 0x0404;
+//        public const int GL_BACK = 0x0405;
+//        public const int GL_POLYGON_MODE = 0x0B40;
+//        public const int GL_POLYGON_SMOOTH = 0x0B41;
+//        public const int GL_POLYGON_STIPPLE = 0x0B42;
+//        public const int GL_EDGE_FLAG = 0x0B43;
+//        public const int GL_CULL_FACE = 0x0B44;
+//        public const int GL_CULL_FACE_MODE = 0x0B45;
+//        public const int GL_FRONT_FACE = 0x0B46;
+//        public const int GL_POLYGON_OFFSET_FACTOR = 0x8038;
+//        public const int GL_POLYGON_OFFSET_UNITS = 0x2A00;
+//        public const int GL_POLYGON_OFFSET_POINT = 0x2A01;
+//        public const int GL_POLYGON_OFFSET_LINE = 0x2A02;
+//        public const int GL_POLYGON_OFFSET_FILL = 0x8037;
+//        public const int GL_COMPILE = 0x1300;
+//        public const int GL_COMPILE_AND_EXECUTE = 0x1301;
+//        public const int GL_LIST_BASE = 0x0B32;
+//        public const int GL_LIST_INDEX = 0x0B33;
+//        public const int GL_LIST_MODE = 0x0B30;
+//        public const int GL_NEVER = 0x0200;
+//        public const int GL_LESS = 0x0201;
+//        public const int GL_EQUAL = 0x0202;
+//        public const int GL_LEQUAL = 0x0203;
+//        public const int GL_GREATER = 0x0204;
+//        public const int GL_NOTEQUAL = 0x0205;
+//        public const int GL_GEQUAL = 0x0206;
+//        public const int GL_ALWAYS = 0x0207;
         public const int GL_DEPTH_TEST = 0x0B71;
-        public const int GL_DEPTH_BITS = 0x0D56;
-        public const int GL_DEPTH_CLEAR_VALUE = 0x0B73;
-        public const int GL_DEPTH_FUNC = 0x0B74;
-        public const int GL_DEPTH_RANGE = 0x0B70;
-        public const int GL_DEPTH_WRITEMASK = 0x0B72;
+//        public const int GL_DEPTH_BITS = 0x0D56;
+//        public const int GL_DEPTH_CLEAR_VALUE = 0x0B73;
+//        public const int GL_DEPTH_FUNC = 0x0B74;
+//        public const int GL_DEPTH_RANGE = 0x0B70;
+//        public const int GL_DEPTH_WRITEMASK = 0x0B72;
         public const int GL_DEPTH_COMPONENT = 0x1902;
-        public const int GL_LIGHTING = 0x0B50;
-        public const int GL_LIGHT0 = 0x4000;
-        public const int GL_LIGHT1 = 0x4001;
-        public const int GL_LIGHT2 = 0x4002;
-        public const int GL_LIGHT3 = 0x4003;
-        public const int GL_LIGHT4 = 0x4004;
-        public const int GL_LIGHT5 = 0x4005;
-        public const int GL_LIGHT6 = 0x4006;
-        public const int GL_LIGHT7 = 0x4007;
-        public const int GL_SPOT_EXPONENT = 0x1205;
-        public const int GL_SPOT_CUTOFF = 0x1206;
-        public const int GL_CONSTANT_ATTENUATION = 0x1207;
-        public const int GL_LINEAR_ATTENUATION = 0x1208;
-        public const int GL_QUADRATIC_ATTENUATION = 0x1209;
-        public const int GL_AMBIENT = 0x1200;
-        public const int GL_DIFFUSE = 0x1201;
-        public const int GL_SPECULAR = 0x1202;
-        public const int GL_SHININESS = 0x1601;
-        public const int GL_EMISSION = 0x1600;
-        public const int GL_POSITION = 0x1203;
-        public const int GL_SPOT_DIRECTION = 0x1204;
-        public const int GL_AMBIENT_AND_DIFFUSE = 0x1602;
-        public const int GL_COLOR_INDEXES = 0x1603;
-        public const int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52;
-        public const int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51;
-        public const int GL_LIGHT_MODEL_AMBIENT = 0x0B53;
-        public const int GL_FRONT_AND_BACK = 0x0408;
-        public const int GL_SHADE_MODEL = 0x0B54;
-        public const int GL_FLAT = 0x1D00;
-        public const int GL_SMOOTH = 0x1D01;
-        public const int GL_COLOR_MATERIAL = 0x0B57;
-        public const int GL_COLOR_MATERIAL_FACE = 0x0B55;
-        public const int GL_COLOR_MATERIAL_PARAMETER = 0x0B56;
-        public const int GL_NORMALIZE = 0x0BA1;
-        public const int GL_CLIP_PLANE0 = 0x3000;
-        public const int GL_CLIP_PLANE1 = 0x3001;
-        public const int GL_CLIP_PLANE2 = 0x3002;
-        public const int GL_CLIP_PLANE3 = 0x3003;
-        public const int GL_CLIP_PLANE4 = 0x3004;
-        public const int GL_CLIP_PLANE5 = 0x3005;
-        public const int GL_ACCUM_RED_BITS = 0x0D58;
-        public const int GL_ACCUM_GREEN_BITS = 0x0D59;
-        public const int GL_ACCUM_BLUE_BITS = 0x0D5A;
-        public const int GL_ACCUM_ALPHA_BITS = 0x0D5B;
-        public const int GL_ACCUM_CLEAR_VALUE = 0x0B80;
-        public const int GL_ACCUM = 0x0100;
-        public const int GL_ADD = 0x0104;
-        public const int GL_LOAD = 0x0101;
-        public const int GL_MULT = 0x0103;
-        public const int GL_RETURN = 0x0102;
-        public const int GL_ALPHA_TEST = 0x0BC0;
-        public const int GL_ALPHA_TEST_REF = 0x0BC2;
-        public const int GL_ALPHA_TEST_FUNC = 0x0BC1;
-        public const int GL_BLEND = 0x0BE2;
-        public const int GL_BLEND_SRC = 0x0BE1;
-        public const int GL_BLEND_DST = 0x0BE0;
-        public const int GL_SRC_COLOR = 0x0300;
-        public const int GL_ONE_MINUS_SRC_COLOR = 0x0301;
-        public const int GL_SRC_ALPHA = 0x0302;
-        public const int GL_ONE_MINUS_SRC_ALPHA = 0x0303;
-        public const int GL_DST_ALPHA = 0x0304;
-        public const int GL_ONE_MINUS_DST_ALPHA = 0x0305;
-        public const int GL_DST_COLOR = 0x0306;
-        public const int GL_ONE_MINUS_DST_COLOR = 0x0307;
-        public const int GL_SRC_ALPHA_SATURATE = 0x0308;
-        public const int GL_FEEDBACK = 0x1C01;
-        public const int GL_RENDER = 0x1C00;
-        public const int GL_SELECT = 0x1C02;
-        public const int GL_2D = 0x0600;
-        public const int GL_3D = 0x0601;
-        public const int GL_3D_COLOR = 0x0602;
-        public const int GL_3D_COLOR_TEXTURE = 0x0603;
-        public const int GL_4D_COLOR_TEXTURE = 0x0604;
-        public const int GL_POINT_TOKEN = 0x0701;
-        public const int GL_LINE_TOKEN = 0x0702;
-        public const int GL_LINE_RESET_TOKEN = 0x0707;
-        public const int GL_POLYGON_TOKEN = 0x0703;
-        public const int GL_BITMAP_TOKEN = 0x0704;
-        public const int GL_DRAW_PIXEL_TOKEN = 0x0705;
-        public const int GL_COPY_PIXEL_TOKEN = 0x0706;
-        public const int GL_PASS_THROUGH_TOKEN = 0x0700;
-        public const int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0;
-        public const int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1;
-        public const int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2;
-        public const int GL_SELECTION_BUFFER_POINTER = 0x0DF3;
-        public const int GL_SELECTION_BUFFER_SIZE = 0x0DF4;
-        public const int GL_FOG = 0x0B60;
-        public const int GL_FOG_MODE = 0x0B65;
-        public const int GL_FOG_DENSITY = 0x0B62;
-        public const int GL_FOG_COLOR = 0x0B66;
-        public const int GL_FOG_INDEX = 0x0B61;
-        public const int GL_FOG_START = 0x0B63;
-        public const int GL_FOG_END = 0x0B64;
+//        public const int GL_LIGHTING = 0x0B50;
+//        public const int GL_LIGHT0 = 0x4000;
+//        public const int GL_LIGHT1 = 0x4001;
+//        public const int GL_LIGHT2 = 0x4002;
+//        public const int GL_LIGHT3 = 0x4003;
+//        public const int GL_LIGHT4 = 0x4004;
+//        public const int GL_LIGHT5 = 0x4005;
+//        public const int GL_LIGHT6 = 0x4006;
+//        public const int GL_LIGHT7 = 0x4007;
+//        public const int GL_SPOT_EXPONENT = 0x1205;
+//        public const int GL_SPOT_CUTOFF = 0x1206;
+//        public const int GL_CONSTANT_ATTENUATION = 0x1207;
+//        public const int GL_LINEAR_ATTENUATION = 0x1208;
+//        public const int GL_QUADRATIC_ATTENUATION = 0x1209;
+//        public const int GL_AMBIENT = 0x1200;
+//        public const int GL_DIFFUSE = 0x1201;
+//        public const int GL_SPECULAR = 0x1202;
+//        public const int GL_SHININESS = 0x1601;
+//        public const int GL_EMISSION = 0x1600;
+//        public const int GL_POSITION = 0x1203;
+//        public const int GL_SPOT_DIRECTION = 0x1204;
+//        public const int GL_AMBIENT_AND_DIFFUSE = 0x1602;
+//        public const int GL_COLOR_INDEXES = 0x1603;
+//        public const int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52;
+//        public const int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51;
+//        public const int GL_LIGHT_MODEL_AMBIENT = 0x0B53;
+//        public const int GL_FRONT_AND_BACK = 0x0408;
+//        public const int GL_SHADE_MODEL = 0x0B54;
+//        public const int GL_FLAT = 0x1D00;
+//        public const int GL_SMOOTH = 0x1D01;
+//        public const int GL_COLOR_MATERIAL = 0x0B57;
+//        public const int GL_COLOR_MATERIAL_FACE = 0x0B55;
+//        public const int GL_COLOR_MATERIAL_PARAMETER = 0x0B56;
+//        public const int GL_NORMALIZE = 0x0BA1;
+//        public const int GL_CLIP_PLANE0 = 0x3000;
+//        public const int GL_CLIP_PLANE1 = 0x3001;
+//        public const int GL_CLIP_PLANE2 = 0x3002;
+//        public const int GL_CLIP_PLANE3 = 0x3003;
+//        public const int GL_CLIP_PLANE4 = 0x3004;
+//        public const int GL_CLIP_PLANE5 = 0x3005;
+//        public const int GL_ACCUM_RED_BITS = 0x0D58;
+//        public const int GL_ACCUM_GREEN_BITS = 0x0D59;
+//        public const int GL_ACCUM_BLUE_BITS = 0x0D5A;
+//        public const int GL_ACCUM_ALPHA_BITS = 0x0D5B;
+//        public const int GL_ACCUM_CLEAR_VALUE = 0x0B80;
+//        public const int GL_ACCUM = 0x0100;
+//        public const int GL_ADD = 0x0104;
+//        public const int GL_LOAD = 0x0101;
+//        public const int GL_MULT = 0x0103;
+//        public const int GL_RETURN = 0x0102;
+//        public const int GL_ALPHA_TEST = 0x0BC0;
+//        public const int GL_ALPHA_TEST_REF = 0x0BC2;
+//        public const int GL_ALPHA_TEST_FUNC = 0x0BC1;
+//        public const int GL_BLEND = 0x0BE2;
+//        public const int GL_BLEND_SRC = 0x0BE1;
+//        public const int GL_BLEND_DST = 0x0BE0;
+//        public const int GL_SRC_COLOR = 0x0300;
+//        public const int GL_ONE_MINUS_SRC_COLOR = 0x0301;
+//        public const int GL_SRC_ALPHA = 0x0302;
+//        public const int GL_ONE_MINUS_SRC_ALPHA = 0x0303;
+//        public const int GL_DST_ALPHA = 0x0304;
+//        public const int GL_ONE_MINUS_DST_ALPHA = 0x0305;
+//        public const int GL_DST_COLOR = 0x0306;
+//        public const int GL_ONE_MINUS_DST_COLOR = 0x0307;
+//        public const int GL_SRC_ALPHA_SATURATE = 0x0308;
+//        public const int GL_FEEDBACK = 0x1C01;
+//        public const int GL_RENDER = 0x1C00;
+//        public const int GL_SELECT = 0x1C02;
+//        public const int GL_2D = 0x0600;
+//        public const int GL_3D = 0x0601;
+//        public const int GL_3D_COLOR = 0x0602;
+//        public const int GL_3D_COLOR_TEXTURE = 0x0603;
+//        public const int GL_4D_COLOR_TEXTURE = 0x0604;
+//        public const int GL_POINT_TOKEN = 0x0701;
+//        public const int GL_LINE_TOKEN = 0x0702;
+//        public const int GL_LINE_RESET_TOKEN = 0x0707;
+//        public const int GL_POLYGON_TOKEN = 0x0703;
+//        public const int GL_BITMAP_TOKEN = 0x0704;
+//        public const int GL_DRAW_PIXEL_TOKEN = 0x0705;
+//        public const int GL_COPY_PIXEL_TOKEN = 0x0706;
+//        public const int GL_PASS_THROUGH_TOKEN = 0x0700;
+//        public const int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0;
+//        public const int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1;
+//        public const int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2;
+//        public const int GL_SELECTION_BUFFER_POINTER = 0x0DF3;
+//        public const int GL_SELECTION_BUFFER_SIZE = 0x0DF4;
+//        public const int GL_FOG = 0x0B60;
+//        public const int GL_FOG_MODE = 0x0B65;
+//        public const int GL_FOG_DENSITY = 0x0B62;
+//        public const int GL_FOG_COLOR = 0x0B66;
+//        public const int GL_FOG_INDEX = 0x0B61;
+//        public const int GL_FOG_START = 0x0B63;
+//        public const int GL_FOG_END = 0x0B64;
         public const int GL_LINEAR = 0x2601;
-        public const int GL_EXP = 0x0800;
-        public const int GL_EXP2 = 0x0801;
-        public const int GL_LOGIC_OP = 0x0BF1;
-        public const int GL_INDEX_LOGIC_OP = 0x0BF1;
-        public const int GL_COLOR_LOGIC_OP = 0x0BF2;
-        public const int GL_LOGIC_OP_MODE = 0x0BF0;
-        public const int GL_CLEAR = 0x1500;
-        public const int GL_SET = 0x150F;
-        public const int GL_COPY = 0x1503;
-        public const int GL_COPY_INVERTED = 0x150C;
-        public const int GL_NOOP = 0x1505;
-        public const int GL_INVERT = 0x150A;
-        public const int GL_AND = 0x1501;
-        public const int GL_NAND = 0x150E;
-        public const int GL_OR = 0x1507;
-        public const int GL_NOR = 0x1508;
-        public const int GL_XOR = 0x1506;
-        public const int GL_EQUIV = 0x1509;
-        public const int GL_AND_REVERSE = 0x1502;
-        public const int GL_AND_INVERTED = 0x1504;
-        public const int GL_OR_REVERSE = 0x150B;
-        public const int GL_OR_INVERTED = 0x150D;
+//        public const int GL_EXP = 0x0800;
+//        public const int GL_EXP2 = 0x0801;
+//        public const int GL_LOGIC_OP = 0x0BF1;
+//        public const int GL_INDEX_LOGIC_OP = 0x0BF1;
+//        public const int GL_COLOR_LOGIC_OP = 0x0BF2;
+//        public const int GL_LOGIC_OP_MODE = 0x0BF0;
+//        public const int GL_CLEAR = 0x1500;
+//        public const int GL_SET = 0x150F;
+//        public const int GL_COPY = 0x1503;
+//        public const int GL_COPY_INVERTED = 0x150C;
+//        public const int GL_NOOP = 0x1505;
+//        public const int GL_INVERT = 0x150A;
+//        public const int GL_AND = 0x1501;
+//        public const int GL_NAND = 0x150E;
+//        public const int GL_OR = 0x1507;
+//        public const int GL_NOR = 0x1508;
+//        public const int GL_XOR = 0x1506;
+//        public const int GL_EQUIV = 0x1509;
+//        public const int GL_AND_REVERSE = 0x1502;
+//        public const int GL_AND_INVERTED = 0x1504;
+//        public const int GL_OR_REVERSE = 0x150B;
+//        public const int GL_OR_INVERTED = 0x150D;
         public const int GL_STENCIL_BITS = 0x0D57;
-        public const int GL_STENCIL_TEST = 0x0B90;
-        public const int GL_STENCIL_CLEAR_VALUE = 0x0B91;
-        public const int GL_STENCIL_FUNC = 0x0B92;
-        public const int GL_STENCIL_VALUE_MASK = 0x0B93;
-        public const int GL_STENCIL_FAIL = 0x0B94;
-        public const int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95;
-        public const int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96;
-        public const int GL_STENCIL_REF = 0x0B97;
-        public const int GL_STENCIL_WRITEMASK = 0x0B98;
-        public const int GL_STENCIL_INDEX = 0x1901;
-        public const int GL_KEEP = 0x1E00;
-        public const int GL_REPLACE = 0x1E01;
-        public const int GL_INCR = 0x1E02;
-        public const int GL_DECR = 0x1E03;
-        public const int GL_LEFT = 0x0406;
-        public const int GL_RIGHT = 0x0407;
-        public const int GL_FRONT_LEFT = 0x0400;
-        public const int GL_FRONT_RIGHT = 0x0401;
-        public const int GL_BACK_LEFT = 0x0402;
-        public const int GL_BACK_RIGHT = 0x0403;
-        public const int GL_AUX0 = 0x0409;
-        public const int GL_AUX1 = 0x040A;
-        public const int GL_AUX2 = 0x040B;
-        public const int GL_AUX3 = 0x040C;
-        public const int GL_COLOR_INDEX = 0x1900;
-        public const int GL_RED = 0x1903;
-        public const int GL_GREEN = 0x1904;
-        public const int GL_BLUE = 0x1905;
-        public const int GL_ALPHA = 0x1906;
-        public const int GL_LUMINANCE = 0x1909;
-        public const int GL_LUMINANCE_ALPHA = 0x190A;
-        public const int GL_ALPHA_BITS = 0x0D55;
-        public const int GL_RED_BITS = 0x0D52;
-        public const int GL_GREEN_BITS = 0x0D53;
-        public const int GL_BLUE_BITS = 0x0D54;
-        public const int GL_INDEX_BITS = 0x0D51;
-        public const int GL_SUBPIXEL_BITS = 0x0D50;
-        public const int GL_AUX_BUFFERS = 0x0C00;
-        public const int GL_READ_BUFFER = 0x0C02;
-        public const int GL_DRAW_BUFFER = 0x0C01;
-        public const int GL_DOUBLEBUFFER = 0x0C32;
-        public const int GL_STEREO = 0x0C33;
-        public const int GL_BITMAP = 0x1A00;
-        public const int GL_COLOR = 0x1800;
-        public const int GL_DEPTH = 0x1801;
-        public const int GL_STENCIL = 0x1802;
-        public const int GL_DITHER = 0x0BD0;
-        public const int GL_RGB = 0x1907;
+//        public const int GL_STENCIL_TEST = 0x0B90;
+//        public const int GL_STENCIL_CLEAR_VALUE = 0x0B91;
+//        public const int GL_STENCIL_FUNC = 0x0B92;
+//        public const int GL_STENCIL_VALUE_MASK = 0x0B93;
+//        public const int GL_STENCIL_FAIL = 0x0B94;
+//        public const int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95;
+//        public const int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96;
+//        public const int GL_STENCIL_REF = 0x0B97;
+//        public const int GL_STENCIL_WRITEMASK = 0x0B98;
+//        public const int GL_STENCIL_INDEX = 0x1901;
+//        public const int GL_KEEP = 0x1E00;
+//        public const int GL_REPLACE = 0x1E01;
+//        public const int GL_INCR = 0x1E02;
+//        public const int GL_DECR = 0x1E03;
+//        public const int GL_LEFT = 0x0406;
+//        public const int GL_RIGHT = 0x0407;
+//        public const int GL_FRONT_LEFT = 0x0400;
+//        public const int GL_FRONT_RIGHT = 0x0401;
+//        public const int GL_BACK_LEFT = 0x0402;
+//        public const int GL_BACK_RIGHT = 0x0403;
+//        public const int GL_AUX0 = 0x0409;
+//        public const int GL_AUX1 = 0x040A;
+//        public const int GL_AUX2 = 0x040B;
+//        public const int GL_AUX3 = 0x040C;
+//        public const int GL_COLOR_INDEX = 0x1900;
+//        public const int GL_RED = 0x1903;
+//        public const int GL_GREEN = 0x1904;
+//        public const int GL_BLUE = 0x1905;
+//        public const int GL_ALPHA = 0x1906;
+//        public const int GL_LUMINANCE = 0x1909;
+//        public const int GL_LUMINANCE_ALPHA = 0x190A;
+//        public const int GL_ALPHA_BITS = 0x0D55;
+//        public const int GL_RED_BITS = 0x0D52;
+//        public const int GL_GREEN_BITS = 0x0D53;
+//        public const int GL_BLUE_BITS = 0x0D54;
+//        public const int GL_INDEX_BITS = 0x0D51;
+//        public const int GL_SUBPIXEL_BITS = 0x0D50;
+//        public const int GL_AUX_BUFFERS = 0x0C00;
+//        public const int GL_READ_BUFFER = 0x0C02;
+//        public const int GL_DRAW_BUFFER = 0x0C01;
+//        public const int GL_DOUBLEBUFFER = 0x0C32;
+//        public const int GL_STEREO = 0x0C33;
+//        public const int GL_BITMAP = 0x1A00;
+//        public const int GL_COLOR = 0x1800;
+//        public const int GL_DEPTH = 0x1801;
+//        public const int GL_STENCIL = 0x1802;
+//        public const int GL_DITHER = 0x0BD0;
+//        public const int GL_RGB = 0x1907;
         public const int GL_RGBA = 0x1908;
-        public const int GL_MAX_LIST_NESTING = 0x0B31;
-        public const int GL_MAX_EVAL_ORDER = 0x0D30;
-        public const int GL_MAX_LIGHTS = 0x0D31;
-        public const int GL_MAX_CLIP_PLANES = 0x0D32;
-        public const int GL_MAX_TEXTURE_SIZE = 0x0D33;
-        public const int GL_MAX_PIXEL_MAP_TABLE = 0x0D34;
-        public const int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35;
-        public const int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36;
-        public const int GL_MAX_NAME_STACK_DEPTH = 0x0D37;
-        public const int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38;
-        public const int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39;
-        public const int GL_MAX_VIEWPORT_DIMS = 0x0D3A;
-        public const int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B;
-        public const int GL_ATTRIB_STACK_DEPTH = 0x0BB0;
-        public const int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1;
-        public const int GL_COLOR_CLEAR_VALUE = 0x0C22;
-        public const int GL_COLOR_WRITEMASK = 0x0C23;
-        public const int GL_CURRENT_INDEX = 0x0B01;
-        public const int GL_CURRENT_COLOR = 0x0B00;
-        public const int GL_CURRENT_NORMAL = 0x0B02;
-        public const int GL_CURRENT_RASTER_COLOR = 0x0B04;
-        public const int GL_CURRENT_RASTER_DISTANCE = 0x0B09;
-        public const int GL_CURRENT_RASTER_INDEX = 0x0B05;
-        public const int GL_CURRENT_RASTER_POSITION = 0x0B07;
-        public const int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06;
-        public const int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08;
-        public const int GL_CURRENT_TEXTURE_COORDS = 0x0B03;
-        public const int GL_INDEX_CLEAR_VALUE = 0x0C20;
-        public const int GL_INDEX_MODE = 0x0C30;
-        public const int GL_INDEX_WRITEMASK = 0x0C21;
-        public const int GL_MODELVIEW_MATRIX = 0x0BA6;
-        public const int GL_MODELVIEW_STACK_DEPTH = 0x0BA3;
-        public const int GL_NAME_STACK_DEPTH = 0x0D70;
-        public const int GL_PROJECTION_MATRIX = 0x0BA7;
-        public const int GL_PROJECTION_STACK_DEPTH = 0x0BA4;
-        public const int GL_RENDER_MODE = 0x0C40;
-        public const int GL_RGBA_MODE = 0x0C31;
-        public const int GL_TEXTURE_MATRIX = 0x0BA8;
-        public const int GL_TEXTURE_STACK_DEPTH = 0x0BA5;
-        public const int GL_VIEWPORT = 0x0BA2;
-        public const int GL_AUTO_NORMAL = 0x0D80;
-        public const int GL_MAP1_COLOR_4 = 0x0D90;
-        public const int GL_MAP1_INDEX = 0x0D91;
-        public const int GL_MAP1_NORMAL = 0x0D92;
-        public const int GL_MAP1_TEXTURE_COORD_1 = 0x0D93;
-        public const int GL_MAP1_TEXTURE_COORD_2 = 0x0D94;
-        public const int GL_MAP1_TEXTURE_COORD_3 = 0x0D95;
-        public const int GL_MAP1_TEXTURE_COORD_4 = 0x0D96;
-        public const int GL_MAP1_VERTEX_3 = 0x0D97;
-        public const int GL_MAP1_VERTEX_4 = 0x0D98;
-        public const int GL_MAP2_COLOR_4 = 0x0DB0;
-        public const int GL_MAP2_INDEX = 0x0DB1;
-        public const int GL_MAP2_NORMAL = 0x0DB2;
-        public const int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3;
-        public const int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4;
-        public const int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5;
-        public const int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6;
-        public const int GL_MAP2_VERTEX_3 = 0x0DB7;
-        public const int GL_MAP2_VERTEX_4 = 0x0DB8;
-        public const int GL_MAP1_GRID_DOMAIN = 0x0DD0;
-        public const int GL_MAP1_GRID_SEGMENTS = 0x0DD1;
-        public const int GL_MAP2_GRID_DOMAIN = 0x0DD2;
-        public const int GL_MAP2_GRID_SEGMENTS = 0x0DD3;
-        public const int GL_COEFF = 0x0A00;
-        public const int GL_ORDER = 0x0A01;
-        public const int GL_DOMAIN = 0x0A02;
-        public const int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50;
-        public const int GL_POINT_SMOOTH_HINT = 0x0C51;
-        public const int GL_LINE_SMOOTH_HINT = 0x0C52;
-        public const int GL_POLYGON_SMOOTH_HINT = 0x0C53;
-        public const int GL_FOG_HINT = 0x0C54;
-        public const int GL_DONT_CARE = 0x1100;
-        public const int GL_FASTEST = 0x1101;
-        public const int GL_NICEST = 0x1102;
-        public const int GL_SCISSOR_BOX = 0x0C10;
-        public const int GL_SCISSOR_TEST = 0x0C11;
-        public const int GL_MAP_COLOR = 0x0D10;
-        public const int GL_MAP_STENCIL = 0x0D11;
-        public const int GL_INDEX_SHIFT = 0x0D12;
-        public const int GL_INDEX_OFFSET = 0x0D13;
-        public const int GL_RED_SCALE = 0x0D14;
-        public const int GL_RED_BIAS = 0x0D15;
-        public const int GL_GREEN_SCALE = 0x0D18;
-        public const int GL_GREEN_BIAS = 0x0D19;
-        public const int GL_BLUE_SCALE = 0x0D1A;
-        public const int GL_BLUE_BIAS = 0x0D1B;
-        public const int GL_ALPHA_SCALE = 0x0D1C;
-        public const int GL_ALPHA_BIAS = 0x0D1D;
-        public const int GL_DEPTH_SCALE = 0x0D1E;
-        public const int GL_DEPTH_BIAS = 0x0D1F;
-        public const int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1;
-        public const int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0;
-        public const int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2;
-        public const int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3;
-        public const int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4;
-        public const int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5;
-        public const int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6;
-        public const int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7;
-        public const int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8;
-        public const int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9;
-        public const int GL_PIXEL_MAP_S_TO_S = 0x0C71;
-        public const int GL_PIXEL_MAP_I_TO_I = 0x0C70;
-        public const int GL_PIXEL_MAP_I_TO_R = 0x0C72;
-        public const int GL_PIXEL_MAP_I_TO_G = 0x0C73;
-        public const int GL_PIXEL_MAP_I_TO_B = 0x0C74;
-        public const int GL_PIXEL_MAP_I_TO_A = 0x0C75;
-        public const int GL_PIXEL_MAP_R_TO_R = 0x0C76;
-        public const int GL_PIXEL_MAP_G_TO_G = 0x0C77;
-        public const int GL_PIXEL_MAP_B_TO_B = 0x0C78;
-        public const int GL_PIXEL_MAP_A_TO_A = 0x0C79;
-        public const int GL_PACK_ALIGNMENT = 0x0D05;
-        public const int GL_PACK_LSB_FIRST = 0x0D01;
-        public const int GL_PACK_ROW_LENGTH = 0x0D02;
-        public const int GL_PACK_SKIP_PIXELS = 0x0D04;
-        public const int GL_PACK_SKIP_ROWS = 0x0D03;
-        public const int GL_PACK_SWAP_BYTES = 0x0D00;
-        public const int GL_UNPACK_ALIGNMENT = 0x0CF5;
-        public const int GL_UNPACK_LSB_FIRST = 0x0CF1;
-        public const int GL_UNPACK_ROW_LENGTH = 0x0CF2;
-        public const int GL_UNPACK_SKIP_PIXELS = 0x0CF4;
-        public const int GL_UNPACK_SKIP_ROWS = 0x0CF3;
-        public const int GL_UNPACK_SWAP_BYTES = 0x0CF0;
-        public const int GL_ZOOM_X = 0x0D16;
-        public const int GL_ZOOM_Y = 0x0D17;
-        public const int GL_TEXTURE_ENV = 0x2300;
-        public const int GL_TEXTURE_ENV_MODE = 0x2200;
-        public const int GL_TEXTURE_1D = 0x0DE0;
+//        public const int GL_MAX_LIST_NESTING = 0x0B31;
+//        public const int GL_MAX_EVAL_ORDER = 0x0D30;
+//        public const int GL_MAX_LIGHTS = 0x0D31;
+//        public const int GL_MAX_CLIP_PLANES = 0x0D32;
+//        public const int GL_MAX_TEXTURE_SIZE = 0x0D33;
+//        public const int GL_MAX_PIXEL_MAP_TABLE = 0x0D34;
+//        public const int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35;
+//        public const int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36;
+//        public const int GL_MAX_NAME_STACK_DEPTH = 0x0D37;
+//        public const int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38;
+//        public const int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39;
+//        public const int GL_MAX_VIEWPORT_DIMS = 0x0D3A;
+//        public const int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B;
+//        public const int GL_ATTRIB_STACK_DEPTH = 0x0BB0;
+//        public const int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1;
+//        public const int GL_COLOR_CLEAR_VALUE = 0x0C22;
+//        public const int GL_COLOR_WRITEMASK = 0x0C23;
+//        public const int GL_CURRENT_INDEX = 0x0B01;
+//        public const int GL_CURRENT_COLOR = 0x0B00;
+//        public const int GL_CURRENT_NORMAL = 0x0B02;
+//        public const int GL_CURRENT_RASTER_COLOR = 0x0B04;
+//        public const int GL_CURRENT_RASTER_DISTANCE = 0x0B09;
+//        public const int GL_CURRENT_RASTER_INDEX = 0x0B05;
+//        public const int GL_CURRENT_RASTER_POSITION = 0x0B07;
+//        public const int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06;
+//        public const int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08;
+//        public const int GL_CURRENT_TEXTURE_COORDS = 0x0B03;
+//        public const int GL_INDEX_CLEAR_VALUE = 0x0C20;
+//        public const int GL_INDEX_MODE = 0x0C30;
+//        public const int GL_INDEX_WRITEMASK = 0x0C21;
+//        public const int GL_MODELVIEW_MATRIX = 0x0BA6;
+//        public const int GL_MODELVIEW_STACK_DEPTH = 0x0BA3;
+//        public const int GL_NAME_STACK_DEPTH = 0x0D70;
+//        public const int GL_PROJECTION_MATRIX = 0x0BA7;
+//        public const int GL_PROJECTION_STACK_DEPTH = 0x0BA4;
+//        public const int GL_RENDER_MODE = 0x0C40;
+//        public const int GL_RGBA_MODE = 0x0C31;
+//        public const int GL_TEXTURE_MATRIX = 0x0BA8;
+//        public const int GL_TEXTURE_STACK_DEPTH = 0x0BA5;
+//        public const int GL_VIEWPORT = 0x0BA2;
+//        public const int GL_AUTO_NORMAL = 0x0D80;
+//        public const int GL_MAP1_COLOR_4 = 0x0D90;
+//        public const int GL_MAP1_INDEX = 0x0D91;
+//        public const int GL_MAP1_NORMAL = 0x0D92;
+//        public const int GL_MAP1_TEXTURE_COORD_1 = 0x0D93;
+//        public const int GL_MAP1_TEXTURE_COORD_2 = 0x0D94;
+//        public const int GL_MAP1_TEXTURE_COORD_3 = 0x0D95;
+//        public const int GL_MAP1_TEXTURE_COORD_4 = 0x0D96;
+//        public const int GL_MAP1_VERTEX_3 = 0x0D97;
+//        public const int GL_MAP1_VERTEX_4 = 0x0D98;
+//        public const int GL_MAP2_COLOR_4 = 0x0DB0;
+//        public const int GL_MAP2_INDEX = 0x0DB1;
+//        public const int GL_MAP2_NORMAL = 0x0DB2;
+//        public const int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3;
+//        public const int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4;
+//        public const int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5;
+//        public const int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6;
+//        public const int GL_MAP2_VERTEX_3 = 0x0DB7;
+//        public const int GL_MAP2_VERTEX_4 = 0x0DB8;
+//        public const int GL_MAP1_GRID_DOMAIN = 0x0DD0;
+//        public const int GL_MAP1_GRID_SEGMENTS = 0x0DD1;
+//        public const int GL_MAP2_GRID_DOMAIN = 0x0DD2;
+//        public const int GL_MAP2_GRID_SEGMENTS = 0x0DD3;
+//        public const int GL_COEFF = 0x0A00;
+//        public const int GL_ORDER = 0x0A01;
+//        public const int GL_DOMAIN = 0x0A02;
+//        public const int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50;
+//        public const int GL_POINT_SMOOTH_HINT = 0x0C51;
+//        public const int GL_LINE_SMOOTH_HINT = 0x0C52;
+//        public const int GL_POLYGON_SMOOTH_HINT = 0x0C53;
+//        public const int GL_FOG_HINT = 0x0C54;
+//        public const int GL_DONT_CARE = 0x1100;
+//        public const int GL_FASTEST = 0x1101;
+//        public const int GL_NICEST = 0x1102;
+//        public const int GL_SCISSOR_BOX = 0x0C10;
+//        public const int GL_SCISSOR_TEST = 0x0C11;
+//        public const int GL_MAP_COLOR = 0x0D10;
+//        public const int GL_MAP_STENCIL = 0x0D11;
+//        public const int GL_INDEX_SHIFT = 0x0D12;
+//        public const int GL_INDEX_OFFSET = 0x0D13;
+//        public const int GL_RED_SCALE = 0x0D14;
+//        public const int GL_RED_BIAS = 0x0D15;
+//        public const int GL_GREEN_SCALE = 0x0D18;
+//        public const int GL_GREEN_BIAS = 0x0D19;
+//        public const int GL_BLUE_SCALE = 0x0D1A;
+//        public const int GL_BLUE_BIAS = 0x0D1B;
+//        public const int GL_ALPHA_SCALE = 0x0D1C;
+//        public const int GL_ALPHA_BIAS = 0x0D1D;
+//        public const int GL_DEPTH_SCALE = 0x0D1E;
+//        public const int GL_DEPTH_BIAS = 0x0D1F;
+//        public const int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1;
+//        public const int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0;
+//        public const int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2;
+//        public const int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3;
+//        public const int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4;
+//        public const int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5;
+//        public const int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6;
+//        public const int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7;
+//        public const int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8;
+//        public const int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9;
+//        public const int GL_PIXEL_MAP_S_TO_S = 0x0C71;
+//        public const int GL_PIXEL_MAP_I_TO_I = 0x0C70;
+//        public const int GL_PIXEL_MAP_I_TO_R = 0x0C72;
+//        public const int GL_PIXEL_MAP_I_TO_G = 0x0C73;
+//        public const int GL_PIXEL_MAP_I_TO_B = 0x0C74;
+//        public const int GL_PIXEL_MAP_I_TO_A = 0x0C75;
+//        public const int GL_PIXEL_MAP_R_TO_R = 0x0C76;
+//        public const int GL_PIXEL_MAP_G_TO_G = 0x0C77;
+//        public const int GL_PIXEL_MAP_B_TO_B = 0x0C78;
+//        public const int GL_PIXEL_MAP_A_TO_A = 0x0C79;
+//        public const int GL_PACK_ALIGNMENT = 0x0D05;
+//        public const int GL_PACK_LSB_FIRST = 0x0D01;
+//        public const int GL_PACK_ROW_LENGTH = 0x0D02;
+//        public const int GL_PACK_SKIP_PIXELS = 0x0D04;
+//        public const int GL_PACK_SKIP_ROWS = 0x0D03;
+//        public const int GL_PACK_SWAP_BYTES = 0x0D00;
+//        public const int GL_UNPACK_ALIGNMENT = 0x0CF5;
+//        public const int GL_UNPACK_LSB_FIRST = 0x0CF1;
+//        public const int GL_UNPACK_ROW_LENGTH = 0x0CF2;
+//        public const int GL_UNPACK_SKIP_PIXELS = 0x0CF4;
+//        public const int GL_UNPACK_SKIP_ROWS = 0x0CF3;
+//        public const int GL_UNPACK_SWAP_BYTES = 0x0CF0;
+//        public const int GL_ZOOM_X = 0x0D16;
+//        public const int GL_ZOOM_Y = 0x0D17;
+//        public const int GL_TEXTURE_ENV = 0x2300;
+//        public const int GL_TEXTURE_ENV_MODE = 0x2200;
+//        public const int GL_TEXTURE_1D = 0x0DE0;
         public const int GL_TEXTURE_2D = 0x0DE1;
-        public const int GL_TEXTURE_WRAP_S = 0x2802;
-        public const int GL_TEXTURE_WRAP_T = 0x2803;
+//        public const int GL_TEXTURE_WRAP_S = 0x2802;
+//        public const int GL_TEXTURE_WRAP_T = 0x2803;
         public const int GL_TEXTURE_MAG_FILTER = 0x2800;
         public const int GL_TEXTURE_MIN_FILTER = 0x2801;
-        public const int GL_TEXTURE_ENV_COLOR = 0x2201;
-        public const int GL_TEXTURE_GEN_S = 0x0C60;
-        public const int GL_TEXTURE_GEN_T = 0x0C61;
-        public const int GL_TEXTURE_GEN_R = 0x0C62;
-        public const int GL_TEXTURE_GEN_Q = 0x0C63;
-        public const int GL_TEXTURE_GEN_MODE = 0x2500;
-        public const int GL_TEXTURE_BORDER_COLOR = 0x1004;
-        public const int GL_TEXTURE_WIDTH = 0x1000;
-        public const int GL_TEXTURE_HEIGHT = 0x1001;
-        public const int GL_TEXTURE_BORDER = 0x1005;
-        public const int GL_TEXTURE_COMPONENTS = 0x1003;
-        public const int GL_TEXTURE_RED_SIZE = 0x805C;
-        public const int GL_TEXTURE_GREEN_SIZE = 0x805D;
-        public const int GL_TEXTURE_BLUE_SIZE = 0x805E;
-        public const int GL_TEXTURE_ALPHA_SIZE = 0x805F;
-        public const int GL_TEXTURE_LUMINANCE_SIZE = 0x8060;
-        public const int GL_TEXTURE_INTENSITY_SIZE = 0x8061;
-        public const int GL_NEAREST_MIPMAP_NEAREST = 0x2700;
-        public const int GL_NEAREST_MIPMAP_LINEAR = 0x2702;
-        public const int GL_LINEAR_MIPMAP_NEAREST = 0x2701;
-        public const int GL_LINEAR_MIPMAP_LINEAR = 0x2703;
-        public const int GL_OBJECT_LINEAR = 0x2401;
-        public const int GL_OBJECT_PLANE = 0x2501;
-        public const int GL_EYE_LINEAR = 0x2400;
-        public const int GL_EYE_PLANE = 0x2502;
-        public const int GL_SPHERE_MAP = 0x2402;
-        public const int GL_DECAL = 0x2101;
-        public const int GL_MODULATE = 0x2100;
+//        public const int GL_TEXTURE_ENV_COLOR = 0x2201;
+//        public const int GL_TEXTURE_GEN_S = 0x0C60;
+//        public const int GL_TEXTURE_GEN_T = 0x0C61;
+//        public const int GL_TEXTURE_GEN_R = 0x0C62;
+//        public const int GL_TEXTURE_GEN_Q = 0x0C63;
+//        public const int GL_TEXTURE_GEN_MODE = 0x2500;
+//        public const int GL_TEXTURE_BORDER_COLOR = 0x1004;
+//        public const int GL_TEXTURE_WIDTH = 0x1000;
+//        public const int GL_TEXTURE_HEIGHT = 0x1001;
+//        public const int GL_TEXTURE_BORDER = 0x1005;
+//        public const int GL_TEXTURE_COMPONENTS = 0x1003;
+//        public const int GL_TEXTURE_RED_SIZE = 0x805C;
+//        public const int GL_TEXTURE_GREEN_SIZE = 0x805D;
+//        public const int GL_TEXTURE_BLUE_SIZE = 0x805E;
+//        public const int GL_TEXTURE_ALPHA_SIZE = 0x805F;
+//        public const int GL_TEXTURE_LUMINANCE_SIZE = 0x8060;
+//        public const int GL_TEXTURE_INTENSITY_SIZE = 0x8061;
+//        public const int GL_NEAREST_MIPMAP_NEAREST = 0x2700;
+//        public const int GL_NEAREST_MIPMAP_LINEAR = 0x2702;
+//        public const int GL_LINEAR_MIPMAP_NEAREST = 0x2701;
+//        public const int GL_LINEAR_MIPMAP_LINEAR = 0x2703;
+//        public const int GL_OBJECT_LINEAR = 0x2401;
+//        public const int GL_OBJECT_PLANE = 0x2501;
+//        public const int GL_EYE_LINEAR = 0x2400;
+//        public const int GL_EYE_PLANE = 0x2502;
+//        public const int GL_SPHERE_MAP = 0x2402;
+//        public const int GL_DECAL = 0x2101;
+//        public const int GL_MODULATE = 0x2100;
         public const int GL_NEAREST = 0x2600;
-        public const int GL_REPEAT = 0x2901;
-        public const int GL_CLAMP = 0x2900;
-        public const int GL_S = 0x2000;
-        public const int GL_T = 0x2001;
-        public const int GL_R = 0x2002;
-        public const int GL_Q = 0x2003;
+//        public const int GL_REPEAT = 0x2901;
+//        public const int GL_CLAMP = 0x2900;
+//        public const int GL_S = 0x2000;
+//        public const int GL_T = 0x2001;
+//        public const int GL_R = 0x2002;
+//        public const int GL_Q = 0x2003;
         public const int GL_VENDOR = 0x1F00;
         public const int GL_RENDERER = 0x1F01;
         public const int GL_VERSION = 0x1F02;
@@ -465,5000 +464,5000 @@ namespace Avalonia.OpenGL
         public const int GL_OUT_OF_MEMORY = 0x0505;
         public const int GL_INVALID_FRAMEBUFFER_OPERATION = 0x0506;
         public const int GL_CONTEXT_LOST = 0x0507;
-        public const int GL_CURRENT_BIT = 0x00000001;
-        public const int GL_POINT_BIT = 0x00000002;
-        public const int GL_LINE_BIT = 0x00000004;
-        public const int GL_POLYGON_BIT = 0x00000008;
-        public const int GL_POLYGON_STIPPLE_BIT = 0x00000010;
-        public const int GL_PIXEL_MODE_BIT = 0x00000020;
-        public const int GL_LIGHTING_BIT = 0x00000040;
-        public const int GL_FOG_BIT = 0x00000080;
+//        public const int GL_CURRENT_BIT = 0x00000001;
+//        public const int GL_POINT_BIT = 0x00000002;
+//        public const int GL_LINE_BIT = 0x00000004;
+//        public const int GL_POLYGON_BIT = 0x00000008;
+//        public const int GL_POLYGON_STIPPLE_BIT = 0x00000010;
+//        public const int GL_PIXEL_MODE_BIT = 0x00000020;
+//        public const int GL_LIGHTING_BIT = 0x00000040;
+//        public const int GL_FOG_BIT = 0x00000080;
         public const int GL_DEPTH_BUFFER_BIT = 0x00000100;
-        public const int GL_ACCUM_BUFFER_BIT = 0x00000200;
+//        public const int GL_ACCUM_BUFFER_BIT = 0x00000200;
         public const int GL_STENCIL_BUFFER_BIT = 0x00000400;
-        public const int GL_VIEWPORT_BIT = 0x00000800;
-        public const int GL_TRANSFORM_BIT = 0x00001000;
-        public const int GL_ENABLE_BIT = 0x00002000;
+//        public const int GL_VIEWPORT_BIT = 0x00000800;
+//        public const int GL_TRANSFORM_BIT = 0x00001000;
+//        public const int GL_ENABLE_BIT = 0x00002000;
         public const int GL_COLOR_BUFFER_BIT = 0x00004000;
-        public const int GL_HINT_BIT = 0x00008000;
-        public const int GL_EVAL_BIT = 0x00010000;
-        public const int GL_LIST_BIT = 0x00020000;
-        public const int GL_TEXTURE_BIT = 0x00040000;
-        public const int GL_SCISSOR_BIT = 0x00080000;
-        public const int GL_ALL_ATTRIB_BITS = -1;
-        public const int GL_PROXY_TEXTURE_1D = 0x8063;
-        public const int GL_PROXY_TEXTURE_2D = 0x8064;
-        public const int GL_TEXTURE_PRIORITY = 0x8066;
-        public const int GL_TEXTURE_RESIDENT = 0x8067;
-        public const int GL_TEXTURE_BINDING_1D = 0x8068;
+//        public const int GL_HINT_BIT = 0x00008000;
+//        public const int GL_EVAL_BIT = 0x00010000;
+//        public const int GL_LIST_BIT = 0x00020000;
+//        public const int GL_TEXTURE_BIT = 0x00040000;
+//        public const int GL_SCISSOR_BIT = 0x00080000;
+//        public const int GL_ALL_ATTRIB_BITS = -1;
+//        public const int GL_PROXY_TEXTURE_1D = 0x8063;
+//        public const int GL_PROXY_TEXTURE_2D = 0x8064;
+//        public const int GL_TEXTURE_PRIORITY = 0x8066;
+//        public const int GL_TEXTURE_RESIDENT = 0x8067;
+//        public const int GL_TEXTURE_BINDING_1D = 0x8068;
         public const int GL_TEXTURE_BINDING_2D = 0x8069;
-        public const int GL_TEXTURE_INTERNAL_FORMAT = 0x1003;
-        public const int GL_ALPHA4 = 0x803B;
-        public const int GL_ALPHA8 = 0x803C;
-        public const int GL_ALPHA12 = 0x803D;
-        public const int GL_ALPHA16 = 0x803E;
-        public const int GL_LUMINANCE4 = 0x803F;
-        public const int GL_LUMINANCE8 = 0x8040;
-        public const int GL_LUMINANCE12 = 0x8041;
-        public const int GL_LUMINANCE16 = 0x8042;
-        public const int GL_LUMINANCE4_ALPHA4 = 0x8043;
-        public const int GL_LUMINANCE6_ALPHA2 = 0x8044;
-        public const int GL_LUMINANCE8_ALPHA8 = 0x8045;
-        public const int GL_LUMINANCE12_ALPHA4 = 0x8046;
-        public const int GL_LUMINANCE12_ALPHA12 = 0x8047;
-        public const int GL_LUMINANCE16_ALPHA16 = 0x8048;
-        public const int GL_INTENSITY = 0x8049;
-        public const int GL_INTENSITY4 = 0x804A;
-        public const int GL_INTENSITY8 = 0x804B;
-        public const int GL_INTENSITY12 = 0x804C;
-        public const int GL_INTENSITY16 = 0x804D;
-        public const int GL_R3_G3_B2 = 0x2A10;
-        public const int GL_RGB4 = 0x804F;
-        public const int GL_RGB5 = 0x8050;
-        public const int GL_RGB8 = 0x8051;
-        public const int GL_RGB10 = 0x8052;
-        public const int GL_RGB12 = 0x8053;
-        public const int GL_RGB16 = 0x8054;
-        public const int GL_RGBA2 = 0x8055;
-        public const int GL_RGBA4 = 0x8056;
-        public const int GL_RGB5_A1 = 0x8057;
+//        public const int GL_TEXTURE_INTERNAL_FORMAT = 0x1003;
+//        public const int GL_ALPHA4 = 0x803B;
+//        public const int GL_ALPHA8 = 0x803C;
+//        public const int GL_ALPHA12 = 0x803D;
+//        public const int GL_ALPHA16 = 0x803E;
+//        public const int GL_LUMINANCE4 = 0x803F;
+//        public const int GL_LUMINANCE8 = 0x8040;
+//        public const int GL_LUMINANCE12 = 0x8041;
+//        public const int GL_LUMINANCE16 = 0x8042;
+//        public const int GL_LUMINANCE4_ALPHA4 = 0x8043;
+//        public const int GL_LUMINANCE6_ALPHA2 = 0x8044;
+//        public const int GL_LUMINANCE8_ALPHA8 = 0x8045;
+//        public const int GL_LUMINANCE12_ALPHA4 = 0x8046;
+//        public const int GL_LUMINANCE12_ALPHA12 = 0x8047;
+//        public const int GL_LUMINANCE16_ALPHA16 = 0x8048;
+//        public const int GL_INTENSITY = 0x8049;
+//        public const int GL_INTENSITY4 = 0x804A;
+//        public const int GL_INTENSITY8 = 0x804B;
+//        public const int GL_INTENSITY12 = 0x804C;
+//        public const int GL_INTENSITY16 = 0x804D;
+//        public const int GL_R3_G3_B2 = 0x2A10;
+//        public const int GL_RGB4 = 0x804F;
+//        public const int GL_RGB5 = 0x8050;
+//        public const int GL_RGB8 = 0x8051;
+//        public const int GL_RGB10 = 0x8052;
+//        public const int GL_RGB12 = 0x8053;
+//        public const int GL_RGB16 = 0x8054;
+//        public const int GL_RGBA2 = 0x8055;
+//        public const int GL_RGBA4 = 0x8056;
+//        public const int GL_RGB5_A1 = 0x8057;
         public const int GL_RGBA8 = 0x8058;
-        public const int GL_RGB10_A2 = 0x8059;
-        public const int GL_RGBA12 = 0x805A;
-        public const int GL_RGBA16 = 0x805B;
-        public const int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001;
-        public const int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002;
-        public const int GL_ALL_CLIENT_ATTRIB_BITS = -1;
-        public const int GL_CLIENT_ALL_ATTRIB_BITS = -1;
-        public const int GL_RESCALE_NORMAL = 0x803A;
-        public const int GL_CLAMP_TO_EDGE = 0x812F;
-        public const int GL_MAX_ELEMENTS_VERTICES = 0x80E8;
-        public const int GL_MAX_ELEMENTS_INDICES = 0x80E9;
-        public const int GL_BGR = 0x80E0;
-        public const int GL_BGRA = 0x80E1;
-        public const int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
-        public const int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
-        public const int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
-        public const int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364;
-        public const int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033;
-        public const int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
-        public const int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034;
-        public const int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
-        public const int GL_UNSIGNED_INT_8_8_8_8 = 0x8035;
-        public const int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367;
-        public const int GL_UNSIGNED_INT_10_10_10_2 = 0x8036;
-        public const int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368;
-        public const int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8;
-        public const int GL_SINGLE_COLOR = 0x81F9;
-        public const int GL_SEPARATE_SPECULAR_COLOR = 0x81FA;
-        public const int GL_TEXTURE_MIN_LOD = 0x813A;
-        public const int GL_TEXTURE_MAX_LOD = 0x813B;
-        public const int GL_TEXTURE_BASE_LEVEL = 0x813C;
-        public const int GL_TEXTURE_MAX_LEVEL = 0x813D;
-        public const int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12;
-        public const int GL_SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13;
-        public const int GL_SMOOTH_LINE_WIDTH_RANGE = 0x0B22;
-        public const int GL_SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23;
-        public const int GL_ALIASED_POINT_SIZE_RANGE = 0x846D;
-        public const int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E;
-        public const int GL_PACK_SKIP_IMAGES = 0x806B;
-        public const int GL_PACK_IMAGE_HEIGHT = 0x806C;
-        public const int GL_UNPACK_SKIP_IMAGES = 0x806D;
-        public const int GL_UNPACK_IMAGE_HEIGHT = 0x806E;
-        public const int GL_TEXTURE_3D = 0x806F;
-        public const int GL_PROXY_TEXTURE_3D = 0x8070;
-        public const int GL_TEXTURE_DEPTH = 0x8071;
-        public const int GL_TEXTURE_WRAP_R = 0x8072;
-        public const int GL_MAX_3D_TEXTURE_SIZE = 0x8073;
-        public const int GL_TEXTURE_BINDING_3D = 0x806A;
-        public const int GL_CONSTANT_COLOR = 0x8001;
-        public const int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002;
-        public const int GL_CONSTANT_ALPHA = 0x8003;
-        public const int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004;
-        public const int GL_COLOR_TABLE = 0x80D0;
-        public const int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1;
-        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2;
-        public const int GL_PROXY_COLOR_TABLE = 0x80D3;
-        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
-        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
-        public const int GL_COLOR_TABLE_SCALE = 0x80D6;
-        public const int GL_COLOR_TABLE_BIAS = 0x80D7;
-        public const int GL_COLOR_TABLE_FORMAT = 0x80D8;
-        public const int GL_COLOR_TABLE_WIDTH = 0x80D9;
-        public const int GL_COLOR_TABLE_RED_SIZE = 0x80DA;
-        public const int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB;
-        public const int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC;
-        public const int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD;
-        public const int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE;
-        public const int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF;
-        public const int GL_CONVOLUTION_1D = 0x8010;
-        public const int GL_CONVOLUTION_2D = 0x8011;
-        public const int GL_SEPARABLE_2D = 0x8012;
-        public const int GL_CONVOLUTION_BORDER_MODE = 0x8013;
-        public const int GL_CONVOLUTION_FILTER_SCALE = 0x8014;
-        public const int GL_CONVOLUTION_FILTER_BIAS = 0x8015;
-        public const int GL_REDUCE = 0x8016;
-        public const int GL_CONVOLUTION_FORMAT = 0x8017;
-        public const int GL_CONVOLUTION_WIDTH = 0x8018;
-        public const int GL_CONVOLUTION_HEIGHT = 0x8019;
-        public const int GL_MAX_CONVOLUTION_WIDTH = 0x801A;
-        public const int GL_MAX_CONVOLUTION_HEIGHT = 0x801B;
-        public const int GL_POST_CONVOLUTION_RED_SCALE = 0x801C;
-        public const int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D;
-        public const int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E;
-        public const int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F;
-        public const int GL_POST_CONVOLUTION_RED_BIAS = 0x8020;
-        public const int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021;
-        public const int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022;
-        public const int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023;
-        public const int GL_CONSTANT_BORDER = 0x8151;
-        public const int GL_REPLICATE_BORDER = 0x8153;
-        public const int GL_CONVOLUTION_BORDER_COLOR = 0x8154;
-        public const int GL_COLOR_MATRIX = 0x80B1;
-        public const int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2;
-        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3;
-        public const int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4;
-        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5;
-        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7;
-        public const int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8;
-        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9;
-        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB;
-        public const int GL_HISTOGRAM = 0x8024;
-        public const int GL_PROXY_HISTOGRAM = 0x8025;
-        public const int GL_HISTOGRAM_WIDTH = 0x8026;
-        public const int GL_HISTOGRAM_FORMAT = 0x8027;
-        public const int GL_HISTOGRAM_RED_SIZE = 0x8028;
-        public const int GL_HISTOGRAM_GREEN_SIZE = 0x8029;
-        public const int GL_HISTOGRAM_BLUE_SIZE = 0x802A;
-        public const int GL_HISTOGRAM_ALPHA_SIZE = 0x802B;
-        public const int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C;
-        public const int GL_HISTOGRAM_SINK = 0x802D;
-        public const int GL_MINMAX = 0x802E;
-        public const int GL_MINMAX_FORMAT = 0x802F;
-        public const int GL_MINMAX_SINK = 0x8030;
-        public const int GL_TABLE_TOO_LARGE = 0x8031;
-        public const int GL_BLEND_EQUATION = 0x8009;
-        public const int GL_MIN = 0x8007;
-        public const int GL_MAX = 0x8008;
-        public const int GL_FUNC_ADD = 0x8006;
-        public const int GL_FUNC_SUBTRACT = 0x800A;
-        public const int GL_FUNC_REVERSE_SUBTRACT = 0x800B;
-        public const int GL_BLEND_COLOR = 0x8005;
+//        public const int GL_RGB10_A2 = 0x8059;
+//        public const int GL_RGBA12 = 0x805A;
+//        public const int GL_RGBA16 = 0x805B;
+//        public const int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001;
+//        public const int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002;
+//        public const int GL_ALL_CLIENT_ATTRIB_BITS = -1;
+//        public const int GL_CLIENT_ALL_ATTRIB_BITS = -1;
+//        public const int GL_RESCALE_NORMAL = 0x803A;
+//        public const int GL_CLAMP_TO_EDGE = 0x812F;
+//        public const int GL_MAX_ELEMENTS_VERTICES = 0x80E8;
+//        public const int GL_MAX_ELEMENTS_INDICES = 0x80E9;
+//        public const int GL_BGR = 0x80E0;
+//        public const int GL_BGRA = 0x80E1;
+//        public const int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
+//        public const int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
+//        public const int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
+//        public const int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364;
+//        public const int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033;
+//        public const int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
+//        public const int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034;
+//        public const int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
+//        public const int GL_UNSIGNED_INT_8_8_8_8 = 0x8035;
+//        public const int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367;
+//        public const int GL_UNSIGNED_INT_10_10_10_2 = 0x8036;
+//        public const int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368;
+//        public const int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8;
+//        public const int GL_SINGLE_COLOR = 0x81F9;
+//        public const int GL_SEPARATE_SPECULAR_COLOR = 0x81FA;
+//        public const int GL_TEXTURE_MIN_LOD = 0x813A;
+//        public const int GL_TEXTURE_MAX_LOD = 0x813B;
+//        public const int GL_TEXTURE_BASE_LEVEL = 0x813C;
+//        public const int GL_TEXTURE_MAX_LEVEL = 0x813D;
+//        public const int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12;
+//        public const int GL_SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13;
+//        public const int GL_SMOOTH_LINE_WIDTH_RANGE = 0x0B22;
+//        public const int GL_SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23;
+//        public const int GL_ALIASED_POINT_SIZE_RANGE = 0x846D;
+//        public const int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E;
+//        public const int GL_PACK_SKIP_IMAGES = 0x806B;
+//        public const int GL_PACK_IMAGE_HEIGHT = 0x806C;
+//        public const int GL_UNPACK_SKIP_IMAGES = 0x806D;
+//        public const int GL_UNPACK_IMAGE_HEIGHT = 0x806E;
+//        public const int GL_TEXTURE_3D = 0x806F;
+//        public const int GL_PROXY_TEXTURE_3D = 0x8070;
+//        public const int GL_TEXTURE_DEPTH = 0x8071;
+//        public const int GL_TEXTURE_WRAP_R = 0x8072;
+//        public const int GL_MAX_3D_TEXTURE_SIZE = 0x8073;
+//        public const int GL_TEXTURE_BINDING_3D = 0x806A;
+//        public const int GL_CONSTANT_COLOR = 0x8001;
+//        public const int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002;
+//        public const int GL_CONSTANT_ALPHA = 0x8003;
+//        public const int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004;
+//        public const int GL_COLOR_TABLE = 0x80D0;
+//        public const int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1;
+//        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2;
+//        public const int GL_PROXY_COLOR_TABLE = 0x80D3;
+//        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
+//        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
+//        public const int GL_COLOR_TABLE_SCALE = 0x80D6;
+//        public const int GL_COLOR_TABLE_BIAS = 0x80D7;
+//        public const int GL_COLOR_TABLE_FORMAT = 0x80D8;
+//        public const int GL_COLOR_TABLE_WIDTH = 0x80D9;
+//        public const int GL_COLOR_TABLE_RED_SIZE = 0x80DA;
+//        public const int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB;
+//        public const int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC;
+//        public const int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD;
+//        public const int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE;
+//        public const int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF;
+//        public const int GL_CONVOLUTION_1D = 0x8010;
+//        public const int GL_CONVOLUTION_2D = 0x8011;
+//        public const int GL_SEPARABLE_2D = 0x8012;
+//        public const int GL_CONVOLUTION_BORDER_MODE = 0x8013;
+//        public const int GL_CONVOLUTION_FILTER_SCALE = 0x8014;
+//        public const int GL_CONVOLUTION_FILTER_BIAS = 0x8015;
+//        public const int GL_REDUCE = 0x8016;
+//        public const int GL_CONVOLUTION_FORMAT = 0x8017;
+//        public const int GL_CONVOLUTION_WIDTH = 0x8018;
+//        public const int GL_CONVOLUTION_HEIGHT = 0x8019;
+//        public const int GL_MAX_CONVOLUTION_WIDTH = 0x801A;
+//        public const int GL_MAX_CONVOLUTION_HEIGHT = 0x801B;
+//        public const int GL_POST_CONVOLUTION_RED_SCALE = 0x801C;
+//        public const int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D;
+//        public const int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E;
+//        public const int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F;
+//        public const int GL_POST_CONVOLUTION_RED_BIAS = 0x8020;
+//        public const int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021;
+//        public const int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022;
+//        public const int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023;
+//        public const int GL_CONSTANT_BORDER = 0x8151;
+//        public const int GL_REPLICATE_BORDER = 0x8153;
+//        public const int GL_CONVOLUTION_BORDER_COLOR = 0x8154;
+//        public const int GL_COLOR_MATRIX = 0x80B1;
+//        public const int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2;
+//        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3;
+//        public const int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7;
+//        public const int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB;
+//        public const int GL_HISTOGRAM = 0x8024;
+//        public const int GL_PROXY_HISTOGRAM = 0x8025;
+//        public const int GL_HISTOGRAM_WIDTH = 0x8026;
+//        public const int GL_HISTOGRAM_FORMAT = 0x8027;
+//        public const int GL_HISTOGRAM_RED_SIZE = 0x8028;
+//        public const int GL_HISTOGRAM_GREEN_SIZE = 0x8029;
+//        public const int GL_HISTOGRAM_BLUE_SIZE = 0x802A;
+//        public const int GL_HISTOGRAM_ALPHA_SIZE = 0x802B;
+//        public const int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C;
+//        public const int GL_HISTOGRAM_SINK = 0x802D;
+//        public const int GL_MINMAX = 0x802E;
+//        public const int GL_MINMAX_FORMAT = 0x802F;
+//        public const int GL_MINMAX_SINK = 0x8030;
+//        public const int GL_TABLE_TOO_LARGE = 0x8031;
+//        public const int GL_BLEND_EQUATION = 0x8009;
+//        public const int GL_MIN = 0x8007;
+//        public const int GL_MAX = 0x8008;
+//        public const int GL_FUNC_ADD = 0x8006;
+//        public const int GL_FUNC_SUBTRACT = 0x800A;
+//        public const int GL_FUNC_REVERSE_SUBTRACT = 0x800B;
+//        public const int GL_BLEND_COLOR = 0x8005;
         public const int GL_TEXTURE0 = 0x84C0;
-        public const int GL_TEXTURE1 = 0x84C1;
-        public const int GL_TEXTURE2 = 0x84C2;
-        public const int GL_TEXTURE3 = 0x84C3;
-        public const int GL_TEXTURE4 = 0x84C4;
-        public const int GL_TEXTURE5 = 0x84C5;
-        public const int GL_TEXTURE6 = 0x84C6;
-        public const int GL_TEXTURE7 = 0x84C7;
-        public const int GL_TEXTURE8 = 0x84C8;
-        public const int GL_TEXTURE9 = 0x84C9;
-        public const int GL_TEXTURE10 = 0x84CA;
-        public const int GL_TEXTURE11 = 0x84CB;
-        public const int GL_TEXTURE12 = 0x84CC;
-        public const int GL_TEXTURE13 = 0x84CD;
-        public const int GL_TEXTURE14 = 0x84CE;
-        public const int GL_TEXTURE15 = 0x84CF;
-        public const int GL_TEXTURE16 = 0x84D0;
-        public const int GL_TEXTURE17 = 0x84D1;
-        public const int GL_TEXTURE18 = 0x84D2;
-        public const int GL_TEXTURE19 = 0x84D3;
-        public const int GL_TEXTURE20 = 0x84D4;
-        public const int GL_TEXTURE21 = 0x84D5;
-        public const int GL_TEXTURE22 = 0x84D6;
-        public const int GL_TEXTURE23 = 0x84D7;
-        public const int GL_TEXTURE24 = 0x84D8;
-        public const int GL_TEXTURE25 = 0x84D9;
-        public const int GL_TEXTURE26 = 0x84DA;
-        public const int GL_TEXTURE27 = 0x84DB;
-        public const int GL_TEXTURE28 = 0x84DC;
-        public const int GL_TEXTURE29 = 0x84DD;
-        public const int GL_TEXTURE30 = 0x84DE;
-        public const int GL_TEXTURE31 = 0x84DF;
+//        public const int GL_TEXTURE1 = 0x84C1;
+//        public const int GL_TEXTURE2 = 0x84C2;
+//        public const int GL_TEXTURE3 = 0x84C3;
+//        public const int GL_TEXTURE4 = 0x84C4;
+//        public const int GL_TEXTURE5 = 0x84C5;
+//        public const int GL_TEXTURE6 = 0x84C6;
+//        public const int GL_TEXTURE7 = 0x84C7;
+//        public const int GL_TEXTURE8 = 0x84C8;
+//        public const int GL_TEXTURE9 = 0x84C9;
+//        public const int GL_TEXTURE10 = 0x84CA;
+//        public const int GL_TEXTURE11 = 0x84CB;
+//        public const int GL_TEXTURE12 = 0x84CC;
+//        public const int GL_TEXTURE13 = 0x84CD;
+//        public const int GL_TEXTURE14 = 0x84CE;
+//        public const int GL_TEXTURE15 = 0x84CF;
+//        public const int GL_TEXTURE16 = 0x84D0;
+//        public const int GL_TEXTURE17 = 0x84D1;
+//        public const int GL_TEXTURE18 = 0x84D2;
+//        public const int GL_TEXTURE19 = 0x84D3;
+//        public const int GL_TEXTURE20 = 0x84D4;
+//        public const int GL_TEXTURE21 = 0x84D5;
+//        public const int GL_TEXTURE22 = 0x84D6;
+//        public const int GL_TEXTURE23 = 0x84D7;
+//        public const int GL_TEXTURE24 = 0x84D8;
+//        public const int GL_TEXTURE25 = 0x84D9;
+//        public const int GL_TEXTURE26 = 0x84DA;
+//        public const int GL_TEXTURE27 = 0x84DB;
+//        public const int GL_TEXTURE28 = 0x84DC;
+//        public const int GL_TEXTURE29 = 0x84DD;
+//        public const int GL_TEXTURE30 = 0x84DE;
+//        public const int GL_TEXTURE31 = 0x84DF;
         public const int GL_ACTIVE_TEXTURE = 0x84E0;
-        public const int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1;
-        public const int GL_MAX_TEXTURE_UNITS = 0x84E2;
-        public const int GL_NORMAL_MAP = 0x8511;
-        public const int GL_REFLECTION_MAP = 0x8512;
-        public const int GL_TEXTURE_CUBE_MAP = 0x8513;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B;
-        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
-        public const int GL_COMPRESSED_ALPHA = 0x84E9;
-        public const int GL_COMPRESSED_LUMINANCE = 0x84EA;
-        public const int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB;
-        public const int GL_COMPRESSED_INTENSITY = 0x84EC;
-        public const int GL_COMPRESSED_RGB = 0x84ED;
-        public const int GL_COMPRESSED_RGBA = 0x84EE;
-        public const int GL_TEXTURE_COMPRESSION_HINT = 0x84EF;
-        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0;
-        public const int GL_TEXTURE_COMPRESSED = 0x86A1;
-        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
-        public const int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3;
-        public const int GL_MULTISAMPLE = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE = 0x809F;
-        public const int GL_SAMPLE_COVERAGE = 0x80A0;
-        public const int GL_SAMPLE_BUFFERS = 0x80A8;
+//        public const int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1;
+//        public const int GL_MAX_TEXTURE_UNITS = 0x84E2;
+//        public const int GL_NORMAL_MAP = 0x8511;
+//        public const int GL_REFLECTION_MAP = 0x8512;
+//        public const int GL_TEXTURE_CUBE_MAP = 0x8513;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B;
+//        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
+//        public const int GL_COMPRESSED_ALPHA = 0x84E9;
+//        public const int GL_COMPRESSED_LUMINANCE = 0x84EA;
+//        public const int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB;
+//        public const int GL_COMPRESSED_INTENSITY = 0x84EC;
+//        public const int GL_COMPRESSED_RGB = 0x84ED;
+//        public const int GL_COMPRESSED_RGBA = 0x84EE;
+//        public const int GL_TEXTURE_COMPRESSION_HINT = 0x84EF;
+//        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0;
+//        public const int GL_TEXTURE_COMPRESSED = 0x86A1;
+//        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
+//        public const int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3;
+//        public const int GL_MULTISAMPLE = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE = 0x809F;
+//        public const int GL_SAMPLE_COVERAGE = 0x80A0;
+//        public const int GL_SAMPLE_BUFFERS = 0x80A8;
         public const int GL_SAMPLES = 0x80A9;
-        public const int GL_SAMPLE_COVERAGE_VALUE = 0x80AA;
-        public const int GL_SAMPLE_COVERAGE_INVERT = 0x80AB;
-        public const int GL_MULTISAMPLE_BIT = 0x20000000;
-        public const int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3;
-        public const int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4;
-        public const int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5;
-        public const int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6;
-        public const int GL_COMBINE = 0x8570;
-        public const int GL_COMBINE_RGB = 0x8571;
-        public const int GL_COMBINE_ALPHA = 0x8572;
-        public const int GL_SOURCE0_RGB = 0x8580;
-        public const int GL_SOURCE1_RGB = 0x8581;
-        public const int GL_SOURCE2_RGB = 0x8582;
-        public const int GL_SOURCE0_ALPHA = 0x8588;
-        public const int GL_SOURCE1_ALPHA = 0x8589;
-        public const int GL_SOURCE2_ALPHA = 0x858A;
-        public const int GL_OPERAND0_RGB = 0x8590;
-        public const int GL_OPERAND1_RGB = 0x8591;
-        public const int GL_OPERAND2_RGB = 0x8592;
-        public const int GL_OPERAND0_ALPHA = 0x8598;
-        public const int GL_OPERAND1_ALPHA = 0x8599;
-        public const int GL_OPERAND2_ALPHA = 0x859A;
-        public const int GL_RGB_SCALE = 0x8573;
-        public const int GL_ADD_SIGNED = 0x8574;
-        public const int GL_INTERPOLATE = 0x8575;
-        public const int GL_SUBTRACT = 0x84E7;
-        public const int GL_CONSTANT = 0x8576;
-        public const int GL_PRIMARY_COLOR = 0x8577;
-        public const int GL_PREVIOUS = 0x8578;
-        public const int GL_DOT3_RGB = 0x86AE;
-        public const int GL_DOT3_RGBA = 0x86AF;
-        public const int GL_CLAMP_TO_BORDER = 0x812D;
-        public const int GL_TEXTURE0_ARB = 0x84C0;
-        public const int GL_TEXTURE1_ARB = 0x84C1;
-        public const int GL_TEXTURE2_ARB = 0x84C2;
-        public const int GL_TEXTURE3_ARB = 0x84C3;
-        public const int GL_TEXTURE4_ARB = 0x84C4;
-        public const int GL_TEXTURE5_ARB = 0x84C5;
-        public const int GL_TEXTURE6_ARB = 0x84C6;
-        public const int GL_TEXTURE7_ARB = 0x84C7;
-        public const int GL_TEXTURE8_ARB = 0x84C8;
-        public const int GL_TEXTURE9_ARB = 0x84C9;
-        public const int GL_TEXTURE10_ARB = 0x84CA;
-        public const int GL_TEXTURE11_ARB = 0x84CB;
-        public const int GL_TEXTURE12_ARB = 0x84CC;
-        public const int GL_TEXTURE13_ARB = 0x84CD;
-        public const int GL_TEXTURE14_ARB = 0x84CE;
-        public const int GL_TEXTURE15_ARB = 0x84CF;
-        public const int GL_TEXTURE16_ARB = 0x84D0;
-        public const int GL_TEXTURE17_ARB = 0x84D1;
-        public const int GL_TEXTURE18_ARB = 0x84D2;
-        public const int GL_TEXTURE19_ARB = 0x84D3;
-        public const int GL_TEXTURE20_ARB = 0x84D4;
-        public const int GL_TEXTURE21_ARB = 0x84D5;
-        public const int GL_TEXTURE22_ARB = 0x84D6;
-        public const int GL_TEXTURE23_ARB = 0x84D7;
-        public const int GL_TEXTURE24_ARB = 0x84D8;
-        public const int GL_TEXTURE25_ARB = 0x84D9;
-        public const int GL_TEXTURE26_ARB = 0x84DA;
-        public const int GL_TEXTURE27_ARB = 0x84DB;
-        public const int GL_TEXTURE28_ARB = 0x84DC;
-        public const int GL_TEXTURE29_ARB = 0x84DD;
-        public const int GL_TEXTURE30_ARB = 0x84DE;
-        public const int GL_TEXTURE31_ARB = 0x84DF;
-        public const int GL_ACTIVE_TEXTURE_ARB = 0x84E0;
-        public const int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1;
-        public const int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2;
-        public const int GL_DEPTH_STENCIL_MESA = 0x8750;
-        public const int GL_UNSIGNED_INT_24_8_MESA = 0x8751;
-        public const int GL_UNSIGNED_INT_8_24_REV_MESA = 0x8752;
-        public const int GL_UNSIGNED_SHORT_15_1_MESA = 0x8753;
-        public const int GL_UNSIGNED_SHORT_1_15_REV_MESA = 0x8754;
-        public const int GL_ALPHA_BLEND_EQUATION_ATI = 0x883D;
+//        public const int GL_SAMPLE_COVERAGE_VALUE = 0x80AA;
+//        public const int GL_SAMPLE_COVERAGE_INVERT = 0x80AB;
+//        public const int GL_MULTISAMPLE_BIT = 0x20000000;
+//        public const int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3;
+//        public const int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4;
+//        public const int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5;
+//        public const int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6;
+//        public const int GL_COMBINE = 0x8570;
+//        public const int GL_COMBINE_RGB = 0x8571;
+//        public const int GL_COMBINE_ALPHA = 0x8572;
+//        public const int GL_SOURCE0_RGB = 0x8580;
+//        public const int GL_SOURCE1_RGB = 0x8581;
+//        public const int GL_SOURCE2_RGB = 0x8582;
+//        public const int GL_SOURCE0_ALPHA = 0x8588;
+//        public const int GL_SOURCE1_ALPHA = 0x8589;
+//        public const int GL_SOURCE2_ALPHA = 0x858A;
+//        public const int GL_OPERAND0_RGB = 0x8590;
+//        public const int GL_OPERAND1_RGB = 0x8591;
+//        public const int GL_OPERAND2_RGB = 0x8592;
+//        public const int GL_OPERAND0_ALPHA = 0x8598;
+//        public const int GL_OPERAND1_ALPHA = 0x8599;
+//        public const int GL_OPERAND2_ALPHA = 0x859A;
+//        public const int GL_RGB_SCALE = 0x8573;
+//        public const int GL_ADD_SIGNED = 0x8574;
+//        public const int GL_INTERPOLATE = 0x8575;
+//        public const int GL_SUBTRACT = 0x84E7;
+//        public const int GL_CONSTANT = 0x8576;
+//        public const int GL_PRIMARY_COLOR = 0x8577;
+//        public const int GL_PREVIOUS = 0x8578;
+//        public const int GL_DOT3_RGB = 0x86AE;
+//        public const int GL_DOT3_RGBA = 0x86AF;
+//        public const int GL_CLAMP_TO_BORDER = 0x812D;
+//        public const int GL_TEXTURE0_ARB = 0x84C0;
+//        public const int GL_TEXTURE1_ARB = 0x84C1;
+//        public const int GL_TEXTURE2_ARB = 0x84C2;
+//        public const int GL_TEXTURE3_ARB = 0x84C3;
+//        public const int GL_TEXTURE4_ARB = 0x84C4;
+//        public const int GL_TEXTURE5_ARB = 0x84C5;
+//        public const int GL_TEXTURE6_ARB = 0x84C6;
+//        public const int GL_TEXTURE7_ARB = 0x84C7;
+//        public const int GL_TEXTURE8_ARB = 0x84C8;
+//        public const int GL_TEXTURE9_ARB = 0x84C9;
+//        public const int GL_TEXTURE10_ARB = 0x84CA;
+//        public const int GL_TEXTURE11_ARB = 0x84CB;
+//        public const int GL_TEXTURE12_ARB = 0x84CC;
+//        public const int GL_TEXTURE13_ARB = 0x84CD;
+//        public const int GL_TEXTURE14_ARB = 0x84CE;
+//        public const int GL_TEXTURE15_ARB = 0x84CF;
+//        public const int GL_TEXTURE16_ARB = 0x84D0;
+//        public const int GL_TEXTURE17_ARB = 0x84D1;
+//        public const int GL_TEXTURE18_ARB = 0x84D2;
+//        public const int GL_TEXTURE19_ARB = 0x84D3;
+//        public const int GL_TEXTURE20_ARB = 0x84D4;
+//        public const int GL_TEXTURE21_ARB = 0x84D5;
+//        public const int GL_TEXTURE22_ARB = 0x84D6;
+//        public const int GL_TEXTURE23_ARB = 0x84D7;
+//        public const int GL_TEXTURE24_ARB = 0x84D8;
+//        public const int GL_TEXTURE25_ARB = 0x84D9;
+//        public const int GL_TEXTURE26_ARB = 0x84DA;
+//        public const int GL_TEXTURE27_ARB = 0x84DB;
+//        public const int GL_TEXTURE28_ARB = 0x84DC;
+//        public const int GL_TEXTURE29_ARB = 0x84DD;
+//        public const int GL_TEXTURE30_ARB = 0x84DE;
+//        public const int GL_TEXTURE31_ARB = 0x84DF;
+//        public const int GL_ACTIVE_TEXTURE_ARB = 0x84E0;
+//        public const int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1;
+//        public const int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2;
+//        public const int GL_DEPTH_STENCIL_MESA = 0x8750;
+//        public const int GL_UNSIGNED_INT_24_8_MESA = 0x8751;
+//        public const int GL_UNSIGNED_INT_8_24_REV_MESA = 0x8752;
+//        public const int GL_UNSIGNED_SHORT_15_1_MESA = 0x8753;
+//        public const int GL_UNSIGNED_SHORT_1_15_REV_MESA = 0x8754;
+//        public const int GL_ALPHA_BLEND_EQUATION_ATI = 0x883D;
 
         
         // glext.h
-        public const int GL_BLEND_DST_RGB = 0x80C8;
-        public const int GL_BLEND_SRC_RGB = 0x80C9;
-        public const int GL_BLEND_DST_ALPHA = 0x80CA;
-        public const int GL_BLEND_SRC_ALPHA = 0x80CB;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128;
+//        public const int GL_BLEND_DST_RGB = 0x80C8;
+//        public const int GL_BLEND_SRC_RGB = 0x80C9;
+//        public const int GL_BLEND_DST_ALPHA = 0x80CA;
+//        public const int GL_BLEND_SRC_ALPHA = 0x80CB;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128;
         public const int GL_DEPTH_COMPONENT16 = 0x81A5;
-        public const int GL_DEPTH_COMPONENT24 = 0x81A6;
-        public const int GL_DEPTH_COMPONENT32 = 0x81A7;
-        public const int GL_MIRRORED_REPEAT = 0x8370;
-        public const int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD;
-        public const int GL_TEXTURE_LOD_BIAS = 0x8501;
-        public const int GL_INCR_WRAP = 0x8507;
-        public const int GL_DECR_WRAP = 0x8508;
-        public const int GL_TEXTURE_DEPTH_SIZE = 0x884A;
-        public const int GL_TEXTURE_COMPARE_MODE = 0x884C;
-        public const int GL_TEXTURE_COMPARE_FUNC = 0x884D;
-        public const int GL_POINT_SIZE_MIN = 0x8126;
-        public const int GL_POINT_SIZE_MAX = 0x8127;
-        public const int GL_POINT_DISTANCE_ATTENUATION = 0x8129;
-        public const int GL_GENERATE_MIPMAP = 0x8191;
-        public const int GL_GENERATE_MIPMAP_HINT = 0x8192;
-        public const int GL_FOG_COORDINATE_SOURCE = 0x8450;
-        public const int GL_FOG_COORDINATE = 0x8451;
-        public const int GL_FRAGMENT_DEPTH = 0x8452;
-        public const int GL_CURRENT_FOG_COORDINATE = 0x8453;
-        public const int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454;
-        public const int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455;
-        public const int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456;
-        public const int GL_FOG_COORDINATE_ARRAY = 0x8457;
-        public const int GL_COLOR_SUM = 0x8458;
-        public const int GL_CURRENT_SECONDARY_COLOR = 0x8459;
-        public const int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A;
-        public const int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B;
-        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C;
-        public const int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D;
-        public const int GL_SECONDARY_COLOR_ARRAY = 0x845E;
-        public const int GL_TEXTURE_FILTER_CONTROL = 0x8500;
-        public const int GL_DEPTH_TEXTURE_MODE = 0x884B;
-        public const int GL_COMPARE_R_TO_TEXTURE = 0x884E;
-        public const int GL_BUFFER_SIZE = 0x8764;
-        public const int GL_BUFFER_USAGE = 0x8765;
-        public const int GL_QUERY_COUNTER_BITS = 0x8864;
-        public const int GL_CURRENT_QUERY = 0x8865;
-        public const int GL_QUERY_RESULT = 0x8866;
-        public const int GL_QUERY_RESULT_AVAILABLE = 0x8867;
+//        public const int GL_DEPTH_COMPONENT24 = 0x81A6;
+//        public const int GL_DEPTH_COMPONENT32 = 0x81A7;
+//        public const int GL_MIRRORED_REPEAT = 0x8370;
+//        public const int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD;
+//        public const int GL_TEXTURE_LOD_BIAS = 0x8501;
+//        public const int GL_INCR_WRAP = 0x8507;
+//        public const int GL_DECR_WRAP = 0x8508;
+//        public const int GL_TEXTURE_DEPTH_SIZE = 0x884A;
+//        public const int GL_TEXTURE_COMPARE_MODE = 0x884C;
+//        public const int GL_TEXTURE_COMPARE_FUNC = 0x884D;
+//        public const int GL_POINT_SIZE_MIN = 0x8126;
+//        public const int GL_POINT_SIZE_MAX = 0x8127;
+//        public const int GL_POINT_DISTANCE_ATTENUATION = 0x8129;
+//        public const int GL_GENERATE_MIPMAP = 0x8191;
+//        public const int GL_GENERATE_MIPMAP_HINT = 0x8192;
+//        public const int GL_FOG_COORDINATE_SOURCE = 0x8450;
+//        public const int GL_FOG_COORDINATE = 0x8451;
+//        public const int GL_FRAGMENT_DEPTH = 0x8452;
+//        public const int GL_CURRENT_FOG_COORDINATE = 0x8453;
+//        public const int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454;
+//        public const int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455;
+//        public const int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456;
+//        public const int GL_FOG_COORDINATE_ARRAY = 0x8457;
+//        public const int GL_COLOR_SUM = 0x8458;
+//        public const int GL_CURRENT_SECONDARY_COLOR = 0x8459;
+//        public const int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A;
+//        public const int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C;
+//        public const int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D;
+//        public const int GL_SECONDARY_COLOR_ARRAY = 0x845E;
+//        public const int GL_TEXTURE_FILTER_CONTROL = 0x8500;
+//        public const int GL_DEPTH_TEXTURE_MODE = 0x884B;
+//        public const int GL_COMPARE_R_TO_TEXTURE = 0x884E;
+//        public const int GL_BUFFER_SIZE = 0x8764;
+//        public const int GL_BUFFER_USAGE = 0x8765;
+//        public const int GL_QUERY_COUNTER_BITS = 0x8864;
+//        public const int GL_CURRENT_QUERY = 0x8865;
+//        public const int GL_QUERY_RESULT = 0x8866;
+//        public const int GL_QUERY_RESULT_AVAILABLE = 0x8867;
         public const int GL_ARRAY_BUFFER = 0x8892;
         public const int GL_ELEMENT_ARRAY_BUFFER = 0x8893;
-        public const int GL_ARRAY_BUFFER_BINDING = 0x8894;
-        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING = 0x8895;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
-        public const int GL_READ_ONLY = 0x88B8;
-        public const int GL_WRITE_ONLY = 0x88B9;
-        public const int GL_READ_WRITE = 0x88BA;
-        public const int GL_BUFFER_ACCESS = 0x88BB;
-        public const int GL_BUFFER_MAPPED = 0x88BC;
-        public const int GL_BUFFER_MAP_POINTER = 0x88BD;
-        public const int GL_STREAM_DRAW = 0x88E0;
-        public const int GL_STREAM_READ = 0x88E1;
-        public const int GL_STREAM_COPY = 0x88E2;
+//        public const int GL_ARRAY_BUFFER_BINDING = 0x8894;
+//        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING = 0x8895;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
+//        public const int GL_READ_ONLY = 0x88B8;
+//        public const int GL_WRITE_ONLY = 0x88B9;
+//        public const int GL_READ_WRITE = 0x88BA;
+//        public const int GL_BUFFER_ACCESS = 0x88BB;
+//        public const int GL_BUFFER_MAPPED = 0x88BC;
+//        public const int GL_BUFFER_MAP_POINTER = 0x88BD;
+//        public const int GL_STREAM_DRAW = 0x88E0;
+//        public const int GL_STREAM_READ = 0x88E1;
+//        public const int GL_STREAM_COPY = 0x88E2;
         public const int GL_STATIC_DRAW = 0x88E4;
-        public const int GL_STATIC_READ = 0x88E5;
-        public const int GL_STATIC_COPY = 0x88E6;
-        public const int GL_DYNAMIC_DRAW = 0x88E8;
-        public const int GL_DYNAMIC_READ = 0x88E9;
-        public const int GL_DYNAMIC_COPY = 0x88EA;
-        public const int GL_SAMPLES_PASSED = 0x8914;
-        public const int GL_SRC1_ALPHA = 0x8589;
-        public const int GL_VERTEX_ARRAY_BUFFER_BINDING = 0x8896;
-        public const int GL_NORMAL_ARRAY_BUFFER_BINDING = 0x8897;
-        public const int GL_COLOR_ARRAY_BUFFER_BINDING = 0x8898;
-        public const int GL_INDEX_ARRAY_BUFFER_BINDING = 0x8899;
-        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 0x889A;
-        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING = 0x889B;
-        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING = 0x889C;
-        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING = 0x889D;
-        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING = 0x889E;
-        public const int GL_FOG_COORD_SRC = 0x8450;
-        public const int GL_FOG_COORD = 0x8451;
-        public const int GL_CURRENT_FOG_COORD = 0x8453;
-        public const int GL_FOG_COORD_ARRAY_TYPE = 0x8454;
-        public const int GL_FOG_COORD_ARRAY_STRIDE = 0x8455;
-        public const int GL_FOG_COORD_ARRAY_POINTER = 0x8456;
-        public const int GL_FOG_COORD_ARRAY = 0x8457;
-        public const int GL_FOG_COORD_ARRAY_BUFFER_BINDING = 0x889D;
-        public const int GL_SRC0_RGB = 0x8580;
-        public const int GL_SRC1_RGB = 0x8581;
-        public const int GL_SRC2_RGB = 0x8582;
-        public const int GL_SRC0_ALPHA = 0x8588;
-        public const int GL_SRC2_ALPHA = 0x858A;
-        public const int GL_BLEND_EQUATION_RGB = 0x8009;
-        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
-        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
-        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
-        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
-        public const int GL_CURRENT_VERTEX_ATTRIB = 0x8626;
-        public const int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642;
-        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
-        public const int GL_STENCIL_BACK_FUNC = 0x8800;
-        public const int GL_STENCIL_BACK_FAIL = 0x8801;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS = 0x8803;
-        public const int GL_MAX_DRAW_BUFFERS = 0x8824;
-        public const int GL_DRAW_BUFFER0 = 0x8825;
-        public const int GL_DRAW_BUFFER1 = 0x8826;
-        public const int GL_DRAW_BUFFER2 = 0x8827;
-        public const int GL_DRAW_BUFFER3 = 0x8828;
-        public const int GL_DRAW_BUFFER4 = 0x8829;
-        public const int GL_DRAW_BUFFER5 = 0x882A;
-        public const int GL_DRAW_BUFFER6 = 0x882B;
-        public const int GL_DRAW_BUFFER7 = 0x882C;
-        public const int GL_DRAW_BUFFER8 = 0x882D;
-        public const int GL_DRAW_BUFFER9 = 0x882E;
-        public const int GL_DRAW_BUFFER10 = 0x882F;
-        public const int GL_DRAW_BUFFER11 = 0x8830;
-        public const int GL_DRAW_BUFFER12 = 0x8831;
-        public const int GL_DRAW_BUFFER13 = 0x8832;
-        public const int GL_DRAW_BUFFER14 = 0x8833;
-        public const int GL_DRAW_BUFFER15 = 0x8834;
-        public const int GL_BLEND_EQUATION_ALPHA = 0x883D;
-        public const int GL_MAX_VERTEX_ATTRIBS = 0x8869;
-        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
-        public const int GL_MAX_TEXTURE_IMAGE_UNITS = 0x8872;
+//        public const int GL_STATIC_READ = 0x88E5;
+//        public const int GL_STATIC_COPY = 0x88E6;
+//        public const int GL_DYNAMIC_DRAW = 0x88E8;
+//        public const int GL_DYNAMIC_READ = 0x88E9;
+//        public const int GL_DYNAMIC_COPY = 0x88EA;
+//        public const int GL_SAMPLES_PASSED = 0x8914;
+//        public const int GL_SRC1_ALPHA = 0x8589;
+//        public const int GL_VERTEX_ARRAY_BUFFER_BINDING = 0x8896;
+//        public const int GL_NORMAL_ARRAY_BUFFER_BINDING = 0x8897;
+//        public const int GL_COLOR_ARRAY_BUFFER_BINDING = 0x8898;
+//        public const int GL_INDEX_ARRAY_BUFFER_BINDING = 0x8899;
+//        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 0x889A;
+//        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING = 0x889B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING = 0x889C;
+//        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING = 0x889D;
+//        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING = 0x889E;
+//        public const int GL_FOG_COORD_SRC = 0x8450;
+//        public const int GL_FOG_COORD = 0x8451;
+//        public const int GL_CURRENT_FOG_COORD = 0x8453;
+//        public const int GL_FOG_COORD_ARRAY_TYPE = 0x8454;
+//        public const int GL_FOG_COORD_ARRAY_STRIDE = 0x8455;
+//        public const int GL_FOG_COORD_ARRAY_POINTER = 0x8456;
+//        public const int GL_FOG_COORD_ARRAY = 0x8457;
+//        public const int GL_FOG_COORD_ARRAY_BUFFER_BINDING = 0x889D;
+//        public const int GL_SRC0_RGB = 0x8580;
+//        public const int GL_SRC1_RGB = 0x8581;
+//        public const int GL_SRC2_RGB = 0x8582;
+//        public const int GL_SRC0_ALPHA = 0x8588;
+//        public const int GL_SRC2_ALPHA = 0x858A;
+//        public const int GL_BLEND_EQUATION_RGB = 0x8009;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
+//        public const int GL_CURRENT_VERTEX_ATTRIB = 0x8626;
+//        public const int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
+//        public const int GL_STENCIL_BACK_FUNC = 0x8800;
+//        public const int GL_STENCIL_BACK_FAIL = 0x8801;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS = 0x8803;
+//        public const int GL_MAX_DRAW_BUFFERS = 0x8824;
+//        public const int GL_DRAW_BUFFER0 = 0x8825;
+//        public const int GL_DRAW_BUFFER1 = 0x8826;
+//        public const int GL_DRAW_BUFFER2 = 0x8827;
+//        public const int GL_DRAW_BUFFER3 = 0x8828;
+//        public const int GL_DRAW_BUFFER4 = 0x8829;
+//        public const int GL_DRAW_BUFFER5 = 0x882A;
+//        public const int GL_DRAW_BUFFER6 = 0x882B;
+//        public const int GL_DRAW_BUFFER7 = 0x882C;
+//        public const int GL_DRAW_BUFFER8 = 0x882D;
+//        public const int GL_DRAW_BUFFER9 = 0x882E;
+//        public const int GL_DRAW_BUFFER10 = 0x882F;
+//        public const int GL_DRAW_BUFFER11 = 0x8830;
+//        public const int GL_DRAW_BUFFER12 = 0x8831;
+//        public const int GL_DRAW_BUFFER13 = 0x8832;
+//        public const int GL_DRAW_BUFFER14 = 0x8833;
+//        public const int GL_DRAW_BUFFER15 = 0x8834;
+//        public const int GL_BLEND_EQUATION_ALPHA = 0x883D;
+//        public const int GL_MAX_VERTEX_ATTRIBS = 0x8869;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
+//        public const int GL_MAX_TEXTURE_IMAGE_UNITS = 0x8872;
         public const int GL_FRAGMENT_SHADER = 0x8B30;
         public const int GL_VERTEX_SHADER = 0x8B31;
-        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49;
-        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A;
-        public const int GL_MAX_VARYING_FLOATS = 0x8B4B;
-        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C;
-        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
-        public const int GL_SHADER_TYPE = 0x8B4F;
-        public const int GL_FLOAT_VEC2 = 0x8B50;
-        public const int GL_FLOAT_VEC3 = 0x8B51;
-        public const int GL_FLOAT_VEC4 = 0x8B52;
-        public const int GL_INT_VEC2 = 0x8B53;
-        public const int GL_INT_VEC3 = 0x8B54;
-        public const int GL_INT_VEC4 = 0x8B55;
-        public const int GL_BOOL = 0x8B56;
-        public const int GL_BOOL_VEC2 = 0x8B57;
-        public const int GL_BOOL_VEC3 = 0x8B58;
-        public const int GL_BOOL_VEC4 = 0x8B59;
-        public const int GL_FLOAT_MAT2 = 0x8B5A;
-        public const int GL_FLOAT_MAT3 = 0x8B5B;
-        public const int GL_FLOAT_MAT4 = 0x8B5C;
-        public const int GL_SAMPLER_1D = 0x8B5D;
-        public const int GL_SAMPLER_2D = 0x8B5E;
-        public const int GL_SAMPLER_3D = 0x8B5F;
-        public const int GL_SAMPLER_CUBE = 0x8B60;
-        public const int GL_SAMPLER_1D_SHADOW = 0x8B61;
-        public const int GL_SAMPLER_2D_SHADOW = 0x8B62;
-        public const int GL_DELETE_STATUS = 0x8B80;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49;
+//        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A;
+//        public const int GL_MAX_VARYING_FLOATS = 0x8B4B;
+//        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C;
+//        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
+//        public const int GL_SHADER_TYPE = 0x8B4F;
+//        public const int GL_FLOAT_VEC2 = 0x8B50;
+//        public const int GL_FLOAT_VEC3 = 0x8B51;
+//        public const int GL_FLOAT_VEC4 = 0x8B52;
+//        public const int GL_INT_VEC2 = 0x8B53;
+//        public const int GL_INT_VEC3 = 0x8B54;
+//        public const int GL_INT_VEC4 = 0x8B55;
+//        public const int GL_BOOL = 0x8B56;
+//        public const int GL_BOOL_VEC2 = 0x8B57;
+//        public const int GL_BOOL_VEC3 = 0x8B58;
+//        public const int GL_BOOL_VEC4 = 0x8B59;
+//        public const int GL_FLOAT_MAT2 = 0x8B5A;
+//        public const int GL_FLOAT_MAT3 = 0x8B5B;
+//        public const int GL_FLOAT_MAT4 = 0x8B5C;
+//        public const int GL_SAMPLER_1D = 0x8B5D;
+//        public const int GL_SAMPLER_2D = 0x8B5E;
+//        public const int GL_SAMPLER_3D = 0x8B5F;
+//        public const int GL_SAMPLER_CUBE = 0x8B60;
+//        public const int GL_SAMPLER_1D_SHADOW = 0x8B61;
+//        public const int GL_SAMPLER_2D_SHADOW = 0x8B62;
+//        public const int GL_DELETE_STATUS = 0x8B80;
         public const int GL_COMPILE_STATUS = 0x8B81;
         public const int GL_LINK_STATUS = 0x8B82;
-        public const int GL_VALIDATE_STATUS = 0x8B83;
+//        public const int GL_VALIDATE_STATUS = 0x8B83;
         public const int GL_INFO_LOG_LENGTH = 0x8B84;
-        public const int GL_ATTACHED_SHADERS = 0x8B85;
-        public const int GL_ACTIVE_UNIFORMS = 0x8B86;
-        public const int GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87;
-        public const int GL_SHADER_SOURCE_LENGTH = 0x8B88;
-        public const int GL_ACTIVE_ATTRIBUTES = 0x8B89;
-        public const int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A;
-        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B;
-        public const int GL_SHADING_LANGUAGE_VERSION = 0x8B8C;
-        public const int GL_CURRENT_PROGRAM = 0x8B8D;
-        public const int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0;
-        public const int GL_LOWER_LEFT = 0x8CA1;
-        public const int GL_UPPER_LEFT = 0x8CA2;
-        public const int GL_STENCIL_BACK_REF = 0x8CA3;
-        public const int GL_STENCIL_BACK_VALUE_MASK = 0x8CA4;
-        public const int GL_STENCIL_BACK_WRITEMASK = 0x8CA5;
-        public const int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643;
-        public const int GL_POINT_SPRITE = 0x8861;
-        public const int GL_COORD_REPLACE = 0x8862;
-        public const int GL_MAX_TEXTURE_COORDS = 0x8871;
-        public const int GL_VERSION_2_1 = 1;
-        public const int GL_PIXEL_PACK_BUFFER = 0x88EB;
-        public const int GL_PIXEL_UNPACK_BUFFER = 0x88EC;
-        public const int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ED;
-        public const int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88EF;
-        public const int GL_FLOAT_MAT2x3 = 0x8B65;
-        public const int GL_FLOAT_MAT2x4 = 0x8B66;
-        public const int GL_FLOAT_MAT3x2 = 0x8B67;
-        public const int GL_FLOAT_MAT3x4 = 0x8B68;
-        public const int GL_FLOAT_MAT4x2 = 0x8B69;
-        public const int GL_FLOAT_MAT4x3 = 0x8B6A;
-        public const int GL_SRGB = 0x8C40;
-        public const int GL_SRGB8 = 0x8C41;
-        public const int GL_SRGB_ALPHA = 0x8C42;
-        public const int GL_SRGB8_ALPHA8 = 0x8C43;
-        public const int GL_COMPRESSED_SRGB = 0x8C48;
-        public const int GL_COMPRESSED_SRGB_ALPHA = 0x8C49;
-        public const int GL_CURRENT_RASTER_SECONDARY_COLOR = 0x845F;
-        public const int GL_SLUMINANCE_ALPHA = 0x8C44;
-        public const int GL_SLUMINANCE8_ALPHA8 = 0x8C45;
-        public const int GL_SLUMINANCE = 0x8C46;
-        public const int GL_SLUMINANCE8 = 0x8C47;
-        public const int GL_COMPRESSED_SLUMINANCE = 0x8C4A;
-        public const int GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8C4B;
-        public const int GL_VERSION_3_0 = 1;
-        public const int GL_COMPARE_REF_TO_TEXTURE = 0x884E;
-        public const int GL_CLIP_DISTANCE0 = 0x3000;
-        public const int GL_CLIP_DISTANCE1 = 0x3001;
-        public const int GL_CLIP_DISTANCE2 = 0x3002;
-        public const int GL_CLIP_DISTANCE3 = 0x3003;
-        public const int GL_CLIP_DISTANCE4 = 0x3004;
-        public const int GL_CLIP_DISTANCE5 = 0x3005;
-        public const int GL_CLIP_DISTANCE6 = 0x3006;
-        public const int GL_CLIP_DISTANCE7 = 0x3007;
-        public const int GL_MAX_CLIP_DISTANCES = 0x0D32;
+//        public const int GL_ATTACHED_SHADERS = 0x8B85;
+//        public const int GL_ACTIVE_UNIFORMS = 0x8B86;
+//        public const int GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87;
+//        public const int GL_SHADER_SOURCE_LENGTH = 0x8B88;
+//        public const int GL_ACTIVE_ATTRIBUTES = 0x8B89;
+//        public const int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A;
+//        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B;
+//        public const int GL_SHADING_LANGUAGE_VERSION = 0x8B8C;
+//        public const int GL_CURRENT_PROGRAM = 0x8B8D;
+//        public const int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0;
+//        public const int GL_LOWER_LEFT = 0x8CA1;
+//        public const int GL_UPPER_LEFT = 0x8CA2;
+//        public const int GL_STENCIL_BACK_REF = 0x8CA3;
+//        public const int GL_STENCIL_BACK_VALUE_MASK = 0x8CA4;
+//        public const int GL_STENCIL_BACK_WRITEMASK = 0x8CA5;
+//        public const int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643;
+//        public const int GL_POINT_SPRITE = 0x8861;
+//        public const int GL_COORD_REPLACE = 0x8862;
+//        public const int GL_MAX_TEXTURE_COORDS = 0x8871;
+//        public const int GL_VERSION_2_1 = 1;
+//        public const int GL_PIXEL_PACK_BUFFER = 0x88EB;
+//        public const int GL_PIXEL_UNPACK_BUFFER = 0x88EC;
+//        public const int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ED;
+//        public const int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88EF;
+//        public const int GL_FLOAT_MAT2x3 = 0x8B65;
+//        public const int GL_FLOAT_MAT2x4 = 0x8B66;
+//        public const int GL_FLOAT_MAT3x2 = 0x8B67;
+//        public const int GL_FLOAT_MAT3x4 = 0x8B68;
+//        public const int GL_FLOAT_MAT4x2 = 0x8B69;
+//        public const int GL_FLOAT_MAT4x3 = 0x8B6A;
+//        public const int GL_SRGB = 0x8C40;
+//        public const int GL_SRGB8 = 0x8C41;
+//        public const int GL_SRGB_ALPHA = 0x8C42;
+//        public const int GL_SRGB8_ALPHA8 = 0x8C43;
+//        public const int GL_COMPRESSED_SRGB = 0x8C48;
+//        public const int GL_COMPRESSED_SRGB_ALPHA = 0x8C49;
+//        public const int GL_CURRENT_RASTER_SECONDARY_COLOR = 0x845F;
+//        public const int GL_SLUMINANCE_ALPHA = 0x8C44;
+//        public const int GL_SLUMINANCE8_ALPHA8 = 0x8C45;
+//        public const int GL_SLUMINANCE = 0x8C46;
+//        public const int GL_SLUMINANCE8 = 0x8C47;
+//        public const int GL_COMPRESSED_SLUMINANCE = 0x8C4A;
+//        public const int GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8C4B;
+//        public const int GL_VERSION_3_0 = 1;
+//        public const int GL_COMPARE_REF_TO_TEXTURE = 0x884E;
+//        public const int GL_CLIP_DISTANCE0 = 0x3000;
+//        public const int GL_CLIP_DISTANCE1 = 0x3001;
+//        public const int GL_CLIP_DISTANCE2 = 0x3002;
+//        public const int GL_CLIP_DISTANCE3 = 0x3003;
+//        public const int GL_CLIP_DISTANCE4 = 0x3004;
+//        public const int GL_CLIP_DISTANCE5 = 0x3005;
+//        public const int GL_CLIP_DISTANCE6 = 0x3006;
+//        public const int GL_CLIP_DISTANCE7 = 0x3007;
+//        public const int GL_MAX_CLIP_DISTANCES = 0x0D32;
         public const int GL_MAJOR_VERSION = 0x821B;
         public const int GL_MINOR_VERSION = 0x821C;
         public const int GL_NUM_EXTENSIONS = 0x821D;
-        public const int GL_CONTEXT_FLAGS = 0x821E;
-        public const int GL_COMPRESSED_RED = 0x8225;
-        public const int GL_COMPRESSED_RG = 0x8226;
-        public const int GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT = 0x00000001;
-        public const int GL_RGBA32F = 0x8814;
-        public const int GL_RGB32F = 0x8815;
-        public const int GL_RGBA16F = 0x881A;
-        public const int GL_RGB16F = 0x881B;
-        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD;
-        public const int GL_MAX_ARRAY_TEXTURE_LAYERS = 0x88FF;
-        public const int GL_MIN_PROGRAM_TEXEL_OFFSET = 0x8904;
-        public const int GL_MAX_PROGRAM_TEXEL_OFFSET = 0x8905;
-        public const int GL_CLAMP_READ_COLOR = 0x891C;
-        public const int GL_FIXED_ONLY = 0x891D;
-        public const int GL_MAX_VARYING_COMPONENTS = 0x8B4B;
-        public const int GL_TEXTURE_1D_ARRAY = 0x8C18;
-        public const int GL_PROXY_TEXTURE_1D_ARRAY = 0x8C19;
-        public const int GL_TEXTURE_2D_ARRAY = 0x8C1A;
-        public const int GL_PROXY_TEXTURE_2D_ARRAY = 0x8C1B;
-        public const int GL_TEXTURE_BINDING_1D_ARRAY = 0x8C1C;
-        public const int GL_TEXTURE_BINDING_2D_ARRAY = 0x8C1D;
-        public const int GL_R11F_G11F_B10F = 0x8C3A;
-        public const int GL_UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B;
-        public const int GL_RGB9_E5 = 0x8C3D;
-        public const int GL_UNSIGNED_INT_5_9_9_9_REV = 0x8C3E;
-        public const int GL_TEXTURE_SHARED_SIZE = 0x8C3F;
-        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80;
-        public const int GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85;
-        public const int GL_PRIMITIVES_GENERATED = 0x8C87;
-        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88;
-        public const int GL_RASTERIZER_DISCARD = 0x8C89;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B;
-        public const int GL_INTERLEAVED_ATTRIBS = 0x8C8C;
-        public const int GL_SEPARATE_ATTRIBS = 0x8C8D;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER = 0x8C8E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F;
-        public const int GL_RGBA32UI = 0x8D70;
-        public const int GL_RGB32UI = 0x8D71;
-        public const int GL_RGBA16UI = 0x8D76;
-        public const int GL_RGB16UI = 0x8D77;
-        public const int GL_RGBA8UI = 0x8D7C;
-        public const int GL_RGB8UI = 0x8D7D;
-        public const int GL_RGBA32I = 0x8D82;
-        public const int GL_RGB32I = 0x8D83;
-        public const int GL_RGBA16I = 0x8D88;
-        public const int GL_RGB16I = 0x8D89;
-        public const int GL_RGBA8I = 0x8D8E;
-        public const int GL_RGB8I = 0x8D8F;
-        public const int GL_RED_INTEGER = 0x8D94;
-        public const int GL_GREEN_INTEGER = 0x8D95;
-        public const int GL_BLUE_INTEGER = 0x8D96;
-        public const int GL_RGB_INTEGER = 0x8D98;
-        public const int GL_RGBA_INTEGER = 0x8D99;
-        public const int GL_BGR_INTEGER = 0x8D9A;
-        public const int GL_BGRA_INTEGER = 0x8D9B;
-        public const int GL_SAMPLER_1D_ARRAY = 0x8DC0;
-        public const int GL_SAMPLER_2D_ARRAY = 0x8DC1;
-        public const int GL_SAMPLER_1D_ARRAY_SHADOW = 0x8DC3;
-        public const int GL_SAMPLER_2D_ARRAY_SHADOW = 0x8DC4;
-        public const int GL_SAMPLER_CUBE_SHADOW = 0x8DC5;
-        public const int GL_UNSIGNED_INT_VEC2 = 0x8DC6;
-        public const int GL_UNSIGNED_INT_VEC3 = 0x8DC7;
-        public const int GL_UNSIGNED_INT_VEC4 = 0x8DC8;
-        public const int GL_INT_SAMPLER_1D = 0x8DC9;
-        public const int GL_INT_SAMPLER_2D = 0x8DCA;
-        public const int GL_INT_SAMPLER_3D = 0x8DCB;
-        public const int GL_INT_SAMPLER_CUBE = 0x8DCC;
-        public const int GL_INT_SAMPLER_1D_ARRAY = 0x8DCE;
-        public const int GL_INT_SAMPLER_2D_ARRAY = 0x8DCF;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D = 0x8DD1;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D = 0x8DD2;
-        public const int GL_UNSIGNED_INT_SAMPLER_3D = 0x8DD3;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7;
-        public const int GL_QUERY_WAIT = 0x8E13;
-        public const int GL_QUERY_NO_WAIT = 0x8E14;
-        public const int GL_QUERY_BY_REGION_WAIT = 0x8E15;
-        public const int GL_QUERY_BY_REGION_NO_WAIT = 0x8E16;
-        public const int GL_BUFFER_ACCESS_FLAGS = 0x911F;
-        public const int GL_BUFFER_MAP_LENGTH = 0x9120;
-        public const int GL_BUFFER_MAP_OFFSET = 0x9121;
-        public const int GL_DEPTH_COMPONENT32F = 0x8CAC;
-        public const int GL_DEPTH32F_STENCIL8 = 0x8CAD;
-        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
-        public const int GL_FRAMEBUFFER_DEFAULT = 0x8218;
-        public const int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
-        public const int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
-        public const int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
+//        public const int GL_CONTEXT_FLAGS = 0x821E;
+//        public const int GL_COMPRESSED_RED = 0x8225;
+//        public const int GL_COMPRESSED_RG = 0x8226;
+//        public const int GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT = 0x00000001;
+//        public const int GL_RGBA32F = 0x8814;
+//        public const int GL_RGB32F = 0x8815;
+//        public const int GL_RGBA16F = 0x881A;
+//        public const int GL_RGB16F = 0x881B;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD;
+//        public const int GL_MAX_ARRAY_TEXTURE_LAYERS = 0x88FF;
+//        public const int GL_MIN_PROGRAM_TEXEL_OFFSET = 0x8904;
+//        public const int GL_MAX_PROGRAM_TEXEL_OFFSET = 0x8905;
+//        public const int GL_CLAMP_READ_COLOR = 0x891C;
+//        public const int GL_FIXED_ONLY = 0x891D;
+//        public const int GL_MAX_VARYING_COMPONENTS = 0x8B4B;
+//        public const int GL_TEXTURE_1D_ARRAY = 0x8C18;
+//        public const int GL_PROXY_TEXTURE_1D_ARRAY = 0x8C19;
+//        public const int GL_TEXTURE_2D_ARRAY = 0x8C1A;
+//        public const int GL_PROXY_TEXTURE_2D_ARRAY = 0x8C1B;
+//        public const int GL_TEXTURE_BINDING_1D_ARRAY = 0x8C1C;
+//        public const int GL_TEXTURE_BINDING_2D_ARRAY = 0x8C1D;
+//        public const int GL_R11F_G11F_B10F = 0x8C3A;
+//        public const int GL_UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B;
+//        public const int GL_RGB9_E5 = 0x8C3D;
+//        public const int GL_UNSIGNED_INT_5_9_9_9_REV = 0x8C3E;
+//        public const int GL_TEXTURE_SHARED_SIZE = 0x8C3F;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85;
+//        public const int GL_PRIMITIVES_GENERATED = 0x8C87;
+//        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88;
+//        public const int GL_RASTERIZER_DISCARD = 0x8C89;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B;
+//        public const int GL_INTERLEAVED_ATTRIBS = 0x8C8C;
+//        public const int GL_SEPARATE_ATTRIBS = 0x8C8D;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER = 0x8C8E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F;
+//        public const int GL_RGBA32UI = 0x8D70;
+//        public const int GL_RGB32UI = 0x8D71;
+//        public const int GL_RGBA16UI = 0x8D76;
+//        public const int GL_RGB16UI = 0x8D77;
+//        public const int GL_RGBA8UI = 0x8D7C;
+//        public const int GL_RGB8UI = 0x8D7D;
+//        public const int GL_RGBA32I = 0x8D82;
+//        public const int GL_RGB32I = 0x8D83;
+//        public const int GL_RGBA16I = 0x8D88;
+//        public const int GL_RGB16I = 0x8D89;
+//        public const int GL_RGBA8I = 0x8D8E;
+//        public const int GL_RGB8I = 0x8D8F;
+//        public const int GL_RED_INTEGER = 0x8D94;
+//        public const int GL_GREEN_INTEGER = 0x8D95;
+//        public const int GL_BLUE_INTEGER = 0x8D96;
+//        public const int GL_RGB_INTEGER = 0x8D98;
+//        public const int GL_RGBA_INTEGER = 0x8D99;
+//        public const int GL_BGR_INTEGER = 0x8D9A;
+//        public const int GL_BGRA_INTEGER = 0x8D9B;
+//        public const int GL_SAMPLER_1D_ARRAY = 0x8DC0;
+//        public const int GL_SAMPLER_2D_ARRAY = 0x8DC1;
+//        public const int GL_SAMPLER_1D_ARRAY_SHADOW = 0x8DC3;
+//        public const int GL_SAMPLER_2D_ARRAY_SHADOW = 0x8DC4;
+//        public const int GL_SAMPLER_CUBE_SHADOW = 0x8DC5;
+//        public const int GL_UNSIGNED_INT_VEC2 = 0x8DC6;
+//        public const int GL_UNSIGNED_INT_VEC3 = 0x8DC7;
+//        public const int GL_UNSIGNED_INT_VEC4 = 0x8DC8;
+//        public const int GL_INT_SAMPLER_1D = 0x8DC9;
+//        public const int GL_INT_SAMPLER_2D = 0x8DCA;
+//        public const int GL_INT_SAMPLER_3D = 0x8DCB;
+//        public const int GL_INT_SAMPLER_CUBE = 0x8DCC;
+//        public const int GL_INT_SAMPLER_1D_ARRAY = 0x8DCE;
+//        public const int GL_INT_SAMPLER_2D_ARRAY = 0x8DCF;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D = 0x8DD1;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D = 0x8DD2;
+//        public const int GL_UNSIGNED_INT_SAMPLER_3D = 0x8DD3;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7;
+//        public const int GL_QUERY_WAIT = 0x8E13;
+//        public const int GL_QUERY_NO_WAIT = 0x8E14;
+//        public const int GL_QUERY_BY_REGION_WAIT = 0x8E15;
+//        public const int GL_QUERY_BY_REGION_NO_WAIT = 0x8E16;
+//        public const int GL_BUFFER_ACCESS_FLAGS = 0x911F;
+//        public const int GL_BUFFER_MAP_LENGTH = 0x9120;
+//        public const int GL_BUFFER_MAP_OFFSET = 0x9121;
+//        public const int GL_DEPTH_COMPONENT32F = 0x8CAC;
+//        public const int GL_DEPTH32F_STENCIL8 = 0x8CAD;
+//        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
+//        public const int GL_FRAMEBUFFER_DEFAULT = 0x8218;
+//        public const int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
+//        public const int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
+//        public const int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
         public const int GL_DEPTH_STENCIL = 0x84F9;
-        public const int GL_UNSIGNED_INT_24_8 = 0x84FA;
+//        public const int GL_UNSIGNED_INT_24_8 = 0x84FA;
         public const int GL_DEPTH24_STENCIL8 = 0x88F0;
-        public const int GL_TEXTURE_STENCIL_SIZE = 0x88F1;
-        public const int GL_TEXTURE_RED_TYPE = 0x8C10;
-        public const int GL_TEXTURE_GREEN_TYPE = 0x8C11;
-        public const int GL_TEXTURE_BLUE_TYPE = 0x8C12;
-        public const int GL_TEXTURE_ALPHA_TYPE = 0x8C13;
-        public const int GL_TEXTURE_DEPTH_TYPE = 0x8C16;
-        public const int GL_UNSIGNED_NORMALIZED = 0x8C17;
+//        public const int GL_TEXTURE_STENCIL_SIZE = 0x88F1;
+//        public const int GL_TEXTURE_RED_TYPE = 0x8C10;
+//        public const int GL_TEXTURE_GREEN_TYPE = 0x8C11;
+//        public const int GL_TEXTURE_BLUE_TYPE = 0x8C12;
+//        public const int GL_TEXTURE_ALPHA_TYPE = 0x8C13;
+//        public const int GL_TEXTURE_DEPTH_TYPE = 0x8C16;
+//        public const int GL_UNSIGNED_NORMALIZED = 0x8C17;
         public const int GL_FRAMEBUFFER_BINDING = 0x8CA6;
-        public const int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
+//        public const int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
         public const int GL_RENDERBUFFER_BINDING = 0x8CA7;
         public const int GL_READ_FRAMEBUFFER = 0x8CA8;
         public const int GL_DRAW_FRAMEBUFFER = 0x8CA9;
         public const int GL_READ_FRAMEBUFFER_BINDING = 0x8CAA;
-        public const int GL_RENDERBUFFER_SAMPLES = 0x8CAB;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
+//        public const int GL_RENDERBUFFER_SAMPLES = 0x8CAB;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
         public const int GL_FRAMEBUFFER_COMPLETE = 0x8CD5;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
-        public const int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
-        public const int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
+//        public const int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+//        public const int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
         public const int GL_COLOR_ATTACHMENT0 = 0x8CE0;
-        public const int GL_COLOR_ATTACHMENT1 = 0x8CE1;
-        public const int GL_COLOR_ATTACHMENT2 = 0x8CE2;
-        public const int GL_COLOR_ATTACHMENT3 = 0x8CE3;
-        public const int GL_COLOR_ATTACHMENT4 = 0x8CE4;
-        public const int GL_COLOR_ATTACHMENT5 = 0x8CE5;
-        public const int GL_COLOR_ATTACHMENT6 = 0x8CE6;
-        public const int GL_COLOR_ATTACHMENT7 = 0x8CE7;
-        public const int GL_COLOR_ATTACHMENT8 = 0x8CE8;
-        public const int GL_COLOR_ATTACHMENT9 = 0x8CE9;
-        public const int GL_COLOR_ATTACHMENT10 = 0x8CEA;
-        public const int GL_COLOR_ATTACHMENT11 = 0x8CEB;
-        public const int GL_COLOR_ATTACHMENT12 = 0x8CEC;
-        public const int GL_COLOR_ATTACHMENT13 = 0x8CED;
-        public const int GL_COLOR_ATTACHMENT14 = 0x8CEE;
-        public const int GL_COLOR_ATTACHMENT15 = 0x8CEF;
-        public const int GL_COLOR_ATTACHMENT16 = 0x8CF0;
-        public const int GL_COLOR_ATTACHMENT17 = 0x8CF1;
-        public const int GL_COLOR_ATTACHMENT18 = 0x8CF2;
-        public const int GL_COLOR_ATTACHMENT19 = 0x8CF3;
-        public const int GL_COLOR_ATTACHMENT20 = 0x8CF4;
-        public const int GL_COLOR_ATTACHMENT21 = 0x8CF5;
-        public const int GL_COLOR_ATTACHMENT22 = 0x8CF6;
-        public const int GL_COLOR_ATTACHMENT23 = 0x8CF7;
-        public const int GL_COLOR_ATTACHMENT24 = 0x8CF8;
-        public const int GL_COLOR_ATTACHMENT25 = 0x8CF9;
-        public const int GL_COLOR_ATTACHMENT26 = 0x8CFA;
-        public const int GL_COLOR_ATTACHMENT27 = 0x8CFB;
-        public const int GL_COLOR_ATTACHMENT28 = 0x8CFC;
-        public const int GL_COLOR_ATTACHMENT29 = 0x8CFD;
-        public const int GL_COLOR_ATTACHMENT30 = 0x8CFE;
-        public const int GL_COLOR_ATTACHMENT31 = 0x8CFF;
+//        public const int GL_COLOR_ATTACHMENT1 = 0x8CE1;
+//        public const int GL_COLOR_ATTACHMENT2 = 0x8CE2;
+//        public const int GL_COLOR_ATTACHMENT3 = 0x8CE3;
+//        public const int GL_COLOR_ATTACHMENT4 = 0x8CE4;
+//        public const int GL_COLOR_ATTACHMENT5 = 0x8CE5;
+//        public const int GL_COLOR_ATTACHMENT6 = 0x8CE6;
+//        public const int GL_COLOR_ATTACHMENT7 = 0x8CE7;
+//        public const int GL_COLOR_ATTACHMENT8 = 0x8CE8;
+//        public const int GL_COLOR_ATTACHMENT9 = 0x8CE9;
+//        public const int GL_COLOR_ATTACHMENT10 = 0x8CEA;
+//        public const int GL_COLOR_ATTACHMENT11 = 0x8CEB;
+//        public const int GL_COLOR_ATTACHMENT12 = 0x8CEC;
+//        public const int GL_COLOR_ATTACHMENT13 = 0x8CED;
+//        public const int GL_COLOR_ATTACHMENT14 = 0x8CEE;
+//        public const int GL_COLOR_ATTACHMENT15 = 0x8CEF;
+//        public const int GL_COLOR_ATTACHMENT16 = 0x8CF0;
+//        public const int GL_COLOR_ATTACHMENT17 = 0x8CF1;
+//        public const int GL_COLOR_ATTACHMENT18 = 0x8CF2;
+//        public const int GL_COLOR_ATTACHMENT19 = 0x8CF3;
+//        public const int GL_COLOR_ATTACHMENT20 = 0x8CF4;
+//        public const int GL_COLOR_ATTACHMENT21 = 0x8CF5;
+//        public const int GL_COLOR_ATTACHMENT22 = 0x8CF6;
+//        public const int GL_COLOR_ATTACHMENT23 = 0x8CF7;
+//        public const int GL_COLOR_ATTACHMENT24 = 0x8CF8;
+//        public const int GL_COLOR_ATTACHMENT25 = 0x8CF9;
+//        public const int GL_COLOR_ATTACHMENT26 = 0x8CFA;
+//        public const int GL_COLOR_ATTACHMENT27 = 0x8CFB;
+//        public const int GL_COLOR_ATTACHMENT28 = 0x8CFC;
+//        public const int GL_COLOR_ATTACHMENT29 = 0x8CFD;
+//        public const int GL_COLOR_ATTACHMENT30 = 0x8CFE;
+//        public const int GL_COLOR_ATTACHMENT31 = 0x8CFF;
         public const int GL_DEPTH_ATTACHMENT = 0x8D00;
         public const int GL_STENCIL_ATTACHMENT = 0x8D20;
         public const int GL_FRAMEBUFFER = 0x8D40;
         public const int GL_RENDERBUFFER = 0x8D41;
         public const int GL_RENDERBUFFER_WIDTH = 0x8D42;
         public const int GL_RENDERBUFFER_HEIGHT = 0x8D43;
-        public const int GL_RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
-        public const int GL_STENCIL_INDEX1 = 0x8D46;
-        public const int GL_STENCIL_INDEX4 = 0x8D47;
+//        public const int GL_RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
+//        public const int GL_STENCIL_INDEX1 = 0x8D46;
+//        public const int GL_STENCIL_INDEX4 = 0x8D47;
         public const int GL_STENCIL_INDEX8 = 0x8D48;
-        public const int GL_STENCIL_INDEX16 = 0x8D49;
-        public const int GL_RENDERBUFFER_RED_SIZE = 0x8D50;
-        public const int GL_RENDERBUFFER_GREEN_SIZE = 0x8D51;
-        public const int GL_RENDERBUFFER_BLUE_SIZE = 0x8D52;
-        public const int GL_RENDERBUFFER_ALPHA_SIZE = 0x8D53;
-        public const int GL_RENDERBUFFER_DEPTH_SIZE = 0x8D54;
-        public const int GL_RENDERBUFFER_STENCIL_SIZE = 0x8D55;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
-        public const int GL_MAX_SAMPLES = 0x8D57;
-        public const int GL_INDEX = 0x8222;
-        public const int GL_TEXTURE_LUMINANCE_TYPE = 0x8C14;
-        public const int GL_TEXTURE_INTENSITY_TYPE = 0x8C15;
-        public const int GL_FRAMEBUFFER_SRGB = 0x8DB9;
-        public const int GL_HALF_FLOAT = 0x140B;
-        public const int GL_MAP_READ_BIT = 0x0001;
-        public const int GL_MAP_WRITE_BIT = 0x0002;
-        public const int GL_MAP_INVALIDATE_RANGE_BIT = 0x0004;
-        public const int GL_MAP_INVALIDATE_BUFFER_BIT = 0x0008;
-        public const int GL_MAP_FLUSH_EXPLICIT_BIT = 0x0010;
-        public const int GL_MAP_UNSYNCHRONIZED_BIT = 0x0020;
-        public const int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
-        public const int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
-        public const int GL_COMPRESSED_RG_RGTC2 = 0x8DBD;
-        public const int GL_COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
-        public const int GL_RG = 0x8227;
-        public const int GL_RG_INTEGER = 0x8228;
-        public const int GL_R8 = 0x8229;
-        public const int GL_R16 = 0x822A;
-        public const int GL_RG8 = 0x822B;
-        public const int GL_RG16 = 0x822C;
-        public const int GL_R16F = 0x822D;
-        public const int GL_R32F = 0x822E;
-        public const int GL_RG16F = 0x822F;
-        public const int GL_RG32F = 0x8230;
-        public const int GL_R8I = 0x8231;
-        public const int GL_R8UI = 0x8232;
-        public const int GL_R16I = 0x8233;
-        public const int GL_R16UI = 0x8234;
-        public const int GL_R32I = 0x8235;
-        public const int GL_R32UI = 0x8236;
-        public const int GL_RG8I = 0x8237;
-        public const int GL_RG8UI = 0x8238;
-        public const int GL_RG16I = 0x8239;
-        public const int GL_RG16UI = 0x823A;
-        public const int GL_RG32I = 0x823B;
-        public const int GL_RG32UI = 0x823C;
-        public const int GL_VERTEX_ARRAY_BINDING = 0x85B5;
-        public const int GL_CLAMP_VERTEX_COLOR = 0x891A;
-        public const int GL_CLAMP_FRAGMENT_COLOR = 0x891B;
-        public const int GL_ALPHA_INTEGER = 0x8D97;
-        public const int GL_VERSION_3_1 = 1;
-        public const int GL_SAMPLER_2D_RECT = 0x8B63;
-        public const int GL_SAMPLER_2D_RECT_SHADOW = 0x8B64;
-        public const int GL_SAMPLER_BUFFER = 0x8DC2;
-        public const int GL_INT_SAMPLER_2D_RECT = 0x8DCD;
-        public const int GL_INT_SAMPLER_BUFFER = 0x8DD0;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT = 0x8DD5;
-        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER = 0x8DD8;
-        public const int GL_TEXTURE_BUFFER = 0x8C2A;
-        public const int GL_MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
-        public const int GL_TEXTURE_BINDING_BUFFER = 0x8C2C;
-        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
-        public const int GL_TEXTURE_RECTANGLE = 0x84F5;
-        public const int GL_TEXTURE_BINDING_RECTANGLE = 0x84F6;
-        public const int GL_PROXY_TEXTURE_RECTANGLE = 0x84F7;
-        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
-        public const int GL_R8_SNORM = 0x8F94;
-        public const int GL_RG8_SNORM = 0x8F95;
-        public const int GL_RGB8_SNORM = 0x8F96;
-        public const int GL_RGBA8_SNORM = 0x8F97;
-        public const int GL_R16_SNORM = 0x8F98;
-        public const int GL_RG16_SNORM = 0x8F99;
-        public const int GL_RGB16_SNORM = 0x8F9A;
-        public const int GL_RGBA16_SNORM = 0x8F9B;
-        public const int GL_SIGNED_NORMALIZED = 0x8F9C;
-        public const int GL_PRIMITIVE_RESTART = 0x8F9D;
-        public const int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
-        public const int GL_COPY_READ_BUFFER = 0x8F36;
-        public const int GL_COPY_WRITE_BUFFER = 0x8F37;
-        public const int GL_UNIFORM_BUFFER = 0x8A11;
-        public const int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
-        public const int GL_UNIFORM_BUFFER_START = 0x8A29;
-        public const int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
-        public const int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
-        public const int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
-        public const int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
-        public const int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
-        public const int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
-        public const int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
-        public const int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
-        public const int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
-        public const int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
-        public const int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
-        public const int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
-        public const int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
-        public const int GL_UNIFORM_TYPE = 0x8A37;
-        public const int GL_UNIFORM_SIZE = 0x8A38;
-        public const int GL_UNIFORM_NAME_LENGTH = 0x8A39;
-        public const int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
-        public const int GL_UNIFORM_OFFSET = 0x8A3B;
-        public const int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
-        public const int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
-        public const int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
-        public const int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
-        public const int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
-        public const int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
-        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
-        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
-        public const int GL_INVALID_INDEX = -1;
-        public const int GL_VERSION_3_2 = 1;
-        public const int GL_CONTEXT_CORE_PROFILE_BIT = 0x00000001;
-        public const int GL_CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002;
-        public const int GL_LINES_ADJACENCY = 0x000A;
-        public const int GL_LINE_STRIP_ADJACENCY = 0x000B;
-        public const int GL_TRIANGLES_ADJACENCY = 0x000C;
-        public const int GL_TRIANGLE_STRIP_ADJACENCY = 0x000D;
-        public const int GL_PROGRAM_POINT_SIZE = 0x8642;
-        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS = 0x8C29;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED = 0x8DA7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8;
-        public const int GL_GEOMETRY_SHADER = 0x8DD9;
-        public const int GL_GEOMETRY_VERTICES_OUT = 0x8916;
-        public const int GL_GEOMETRY_INPUT_TYPE = 0x8917;
-        public const int GL_GEOMETRY_OUTPUT_TYPE = 0x8918;
-        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS = 0x8DDF;
-        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES = 0x8DE0;
-        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 0x8DE1;
-        public const int GL_MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
-        public const int GL_MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123;
-        public const int GL_MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124;
-        public const int GL_MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
-        public const int GL_CONTEXT_PROFILE_MASK = 0x9126;
-        public const int GL_DEPTH_CLAMP = 0x864F;
-        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 0x8E4C;
-        public const int GL_FIRST_VERTEX_CONVENTION = 0x8E4D;
-        public const int GL_LAST_VERTEX_CONVENTION = 0x8E4E;
-        public const int GL_PROVOKING_VERTEX = 0x8E4F;
-        public const int GL_TEXTURE_CUBE_MAP_SEAMLESS = 0x884F;
-        public const int GL_MAX_SERVER_WAIT_TIMEOUT = 0x9111;
-        public const int GL_OBJECT_TYPE = 0x9112;
-        public const int GL_SYNC_CONDITION = 0x9113;
-        public const int GL_SYNC_STATUS = 0x9114;
-        public const int GL_SYNC_FLAGS = 0x9115;
-        public const int GL_SYNC_FENCE = 0x9116;
-        public const int GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
-        public const int GL_UNSIGNALED = 0x9118;
-        public const int GL_SIGNALED = 0x9119;
-        public const int GL_ALREADY_SIGNALED = 0x911A;
-        public const int GL_TIMEOUT_EXPIRED = 0x911B;
-        public const int GL_CONDITION_SATISFIED = 0x911C;
-        public const int GL_WAIT_FAILED = 0x911D;
-        public const int GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
-        public const int GL_SAMPLE_POSITION = 0x8E50;
-        public const int GL_SAMPLE_MASK = 0x8E51;
-        public const int GL_SAMPLE_MASK_VALUE = 0x8E52;
-        public const int GL_MAX_SAMPLE_MASK_WORDS = 0x8E59;
-        public const int GL_TEXTURE_2D_MULTISAMPLE = 0x9100;
-        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101;
-        public const int GL_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102;
-        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103;
-        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE = 0x9104;
-        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY = 0x9105;
-        public const int GL_TEXTURE_SAMPLES = 0x9106;
-        public const int GL_TEXTURE_FIXED_SAMPLE_LOCATIONS = 0x9107;
-        public const int GL_SAMPLER_2D_MULTISAMPLE = 0x9108;
-        public const int GL_INT_SAMPLER_2D_MULTISAMPLE = 0x9109;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 0x910A;
-        public const int GL_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910B;
-        public const int GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910C;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D;
-        public const int GL_MAX_COLOR_TEXTURE_SAMPLES = 0x910E;
-        public const int GL_MAX_DEPTH_TEXTURE_SAMPLES = 0x910F;
-        public const int GL_MAX_INTEGER_SAMPLES = 0x9110;
-        public const int GL_VERSION_3_3 = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE;
-        public const int GL_SRC1_COLOR = 0x88F9;
-        public const int GL_ONE_MINUS_SRC1_COLOR = 0x88FA;
-        public const int GL_ONE_MINUS_SRC1_ALPHA = 0x88FB;
-        public const int GL_MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC;
-        public const int GL_ANY_SAMPLES_PASSED = 0x8C2F;
-        public const int GL_SAMPLER_BINDING = 0x8919;
-        public const int GL_RGB10_A2UI = 0x906F;
-        public const int GL_TEXTURE_SWIZZLE_R = 0x8E42;
-        public const int GL_TEXTURE_SWIZZLE_G = 0x8E43;
-        public const int GL_TEXTURE_SWIZZLE_B = 0x8E44;
-        public const int GL_TEXTURE_SWIZZLE_A = 0x8E45;
-        public const int GL_TEXTURE_SWIZZLE_RGBA = 0x8E46;
-        public const int GL_TIME_ELAPSED = 0x88BF;
-        public const int GL_TIMESTAMP = 0x8E28;
-        public const int GL_INT_2_10_10_10_REV = 0x8D9F;
-        public const int GL_VERSION_4_0 = 1;
-        public const int GL_SAMPLE_SHADING = 0x8C36;
-        public const int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
-        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F;
-        public const int GL_TEXTURE_CUBE_MAP_ARRAY = 0x9009;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY = 0x900B;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY = 0x900C;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW = 0x900D;
-        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F;
-        public const int GL_DRAW_INDIRECT_BUFFER = 0x8F3F;
-        public const int GL_DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
-        public const int GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F;
-        public const int GL_MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A;
-        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B;
-        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C;
-        public const int GL_FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D;
-        public const int GL_MAX_VERTEX_STREAMS = 0x8E71;
-        public const int GL_DOUBLE_VEC2 = 0x8FFC;
-        public const int GL_DOUBLE_VEC3 = 0x8FFD;
-        public const int GL_DOUBLE_VEC4 = 0x8FFE;
-        public const int GL_DOUBLE_MAT2 = 0x8F46;
-        public const int GL_DOUBLE_MAT3 = 0x8F47;
-        public const int GL_DOUBLE_MAT4 = 0x8F48;
-        public const int GL_DOUBLE_MAT2x3 = 0x8F49;
-        public const int GL_DOUBLE_MAT2x4 = 0x8F4A;
-        public const int GL_DOUBLE_MAT3x2 = 0x8F4B;
-        public const int GL_DOUBLE_MAT3x4 = 0x8F4C;
-        public const int GL_DOUBLE_MAT4x2 = 0x8F4D;
-        public const int GL_DOUBLE_MAT4x3 = 0x8F4E;
-        public const int GL_ACTIVE_SUBROUTINES = 0x8DE5;
-        public const int GL_ACTIVE_SUBROUTINE_UNIFORMS = 0x8DE6;
-        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS = 0x8E47;
-        public const int GL_ACTIVE_SUBROUTINE_MAX_LENGTH = 0x8E48;
-        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH = 0x8E49;
-        public const int GL_MAX_SUBROUTINES = 0x8DE7;
-        public const int GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS = 0x8DE8;
-        public const int GL_NUM_COMPATIBLE_SUBROUTINES = 0x8E4A;
-        public const int GL_COMPATIBLE_SUBROUTINES = 0x8E4B;
-        public const int GL_PATCHES = 0x000E;
-        public const int GL_PATCH_VERTICES = 0x8E72;
-        public const int GL_PATCH_DEFAULT_INNER_LEVEL = 0x8E73;
-        public const int GL_PATCH_DEFAULT_OUTER_LEVEL = 0x8E74;
-        public const int GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75;
-        public const int GL_TESS_GEN_MODE = 0x8E76;
-        public const int GL_TESS_GEN_SPACING = 0x8E77;
-        public const int GL_TESS_GEN_VERTEX_ORDER = 0x8E78;
-        public const int GL_TESS_GEN_POINT_MODE = 0x8E79;
-        public const int GL_ISOLINES = 0x8E7A;
-        public const int GL_FRACTIONAL_ODD = 0x8E7B;
-        public const int GL_FRACTIONAL_EVEN = 0x8E7C;
-        public const int GL_MAX_PATCH_VERTICES = 0x8E7D;
-        public const int GL_MAX_TESS_GEN_LEVEL = 0x8E7E;
-        public const int GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E7F;
-        public const int GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E80;
-        public const int GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS = 0x8E81;
-        public const int GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS = 0x8E82;
-        public const int GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS = 0x8E83;
-        public const int GL_MAX_TESS_PATCH_COMPONENTS = 0x8E84;
-        public const int GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS = 0x8E85;
-        public const int GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS = 0x8E86;
-        public const int GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS = 0x8E89;
-        public const int GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS = 0x8E8A;
-        public const int GL_MAX_TESS_CONTROL_INPUT_COMPONENTS = 0x886C;
-        public const int GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS = 0x886D;
-        public const int GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E1E;
-        public const int GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E1F;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1;
-        public const int GL_TESS_EVALUATION_SHADER = 0x8E87;
-        public const int GL_TESS_CONTROL_SHADER = 0x8E88;
-        public const int GL_TRANSFORM_FEEDBACK = 0x8E22;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24;
-        public const int GL_TRANSFORM_FEEDBACK_BINDING = 0x8E25;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_BUFFERS = 0x8E70;
-        public const int GL_VERSION_4_1 = 1;
-        public const int GL_FIXED = 0x140C;
-        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A;
-        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
-        public const int GL_LOW_FLOAT = 0x8DF0;
-        public const int GL_MEDIUM_FLOAT = 0x8DF1;
-        public const int GL_HIGH_FLOAT = 0x8DF2;
-        public const int GL_LOW_INT = 0x8DF3;
-        public const int GL_MEDIUM_INT = 0x8DF4;
-        public const int GL_HIGH_INT = 0x8DF5;
-        public const int GL_SHADER_COMPILER = 0x8DFA;
-        public const int GL_SHADER_BINARY_FORMATS = 0x8DF8;
-        public const int GL_NUM_SHADER_BINARY_FORMATS = 0x8DF9;
-        public const int GL_MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB;
-        public const int GL_MAX_VARYING_VECTORS = 0x8DFC;
-        public const int GL_MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD;
-        public const int GL_RGB565 = 0x8D62;
-        public const int GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257;
-        public const int GL_PROGRAM_BINARY_LENGTH = 0x8741;
-        public const int GL_NUM_PROGRAM_BINARY_FORMATS = 0x87FE;
-        public const int GL_PROGRAM_BINARY_FORMATS = 0x87FF;
-        public const int GL_VERTEX_SHADER_BIT = 0x00000001;
-        public const int GL_FRAGMENT_SHADER_BIT = 0x00000002;
-        public const int GL_GEOMETRY_SHADER_BIT = 0x00000004;
-        public const int GL_TESS_CONTROL_SHADER_BIT = 0x00000008;
-        public const int GL_TESS_EVALUATION_SHADER_BIT = 0x00000010;
-        public const int GL_ALL_SHADER_BITS = -1;
-        public const int GL_PROGRAM_SEPARABLE = 0x8258;
-        public const int GL_ACTIVE_PROGRAM = 0x8259;
-        public const int GL_PROGRAM_PIPELINE_BINDING = 0x825A;
-        public const int GL_MAX_VIEWPORTS = 0x825B;
-        public const int GL_VIEWPORT_SUBPIXEL_BITS = 0x825C;
-        public const int GL_VIEWPORT_BOUNDS_RANGE = 0x825D;
-        public const int GL_LAYER_PROVOKING_VERTEX = 0x825E;
-        public const int GL_VIEWPORT_INDEX_PROVOKING_VERTEX = 0x825F;
-        public const int GL_UNDEFINED_VERTEX = 0x8260;
-        public const int GL_VERSION_4_2 = 1;
-        public const int GL_COPY_READ_BUFFER_BINDING = 0x8F36;
-        public const int GL_COPY_WRITE_BUFFER_BINDING = 0x8F37;
-        public const int GL_TRANSFORM_FEEDBACK_ACTIVE = 0x8E24;
-        public const int GL_TRANSFORM_FEEDBACK_PAUSED = 0x8E23;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_WIDTH = 0x9127;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_HEIGHT = 0x9128;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_DEPTH = 0x9129;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_SIZE = 0x912A;
-        public const int GL_PACK_COMPRESSED_BLOCK_WIDTH = 0x912B;
-        public const int GL_PACK_COMPRESSED_BLOCK_HEIGHT = 0x912C;
-        public const int GL_PACK_COMPRESSED_BLOCK_DEPTH = 0x912D;
-        public const int GL_PACK_COMPRESSED_BLOCK_SIZE = 0x912E;
-        public const int GL_NUM_SAMPLE_COUNTS = 0x9380;
-        public const int GL_MIN_MAP_BUFFER_ALIGNMENT = 0x90BC;
-        public const int GL_ATOMIC_COUNTER_BUFFER = 0x92C0;
-        public const int GL_ATOMIC_COUNTER_BUFFER_BINDING = 0x92C1;
-        public const int GL_ATOMIC_COUNTER_BUFFER_START = 0x92C2;
-        public const int GL_ATOMIC_COUNTER_BUFFER_SIZE = 0x92C3;
-        public const int GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE = 0x92C4;
-        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS = 0x92C5;
-        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES = 0x92C6;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER = 0x92C7;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER = 0x92C8;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER = 0x92CA;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER = 0x92CB;
-        public const int GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS = 0x92CC;
-        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS = 0x92CD;
-        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS = 0x92CE;
-        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS = 0x92CF;
-        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS = 0x92D0;
-        public const int GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 0x92D1;
-        public const int GL_MAX_VERTEX_ATOMIC_COUNTERS = 0x92D2;
-        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS = 0x92D3;
-        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS = 0x92D4;
-        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTERS = 0x92D5;
-        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTERS = 0x92D6;
-        public const int GL_MAX_COMBINED_ATOMIC_COUNTERS = 0x92D7;
-        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE = 0x92D8;
-        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS = 0x92DC;
-        public const int GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9;
-        public const int GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX = 0x92DA;
-        public const int GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 0x00000001;
-        public const int GL_ELEMENT_ARRAY_BARRIER_BIT = 0x00000002;
-        public const int GL_UNIFORM_BARRIER_BIT = 0x00000004;
-        public const int GL_TEXTURE_FETCH_BARRIER_BIT = 0x00000008;
-        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 0x00000020;
-        public const int GL_COMMAND_BARRIER_BIT = 0x00000040;
-        public const int GL_PIXEL_BUFFER_BARRIER_BIT = 0x00000080;
-        public const int GL_TEXTURE_UPDATE_BARRIER_BIT = 0x00000100;
-        public const int GL_BUFFER_UPDATE_BARRIER_BIT = 0x00000200;
-        public const int GL_FRAMEBUFFER_BARRIER_BIT = 0x00000400;
-        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT = 0x00000800;
-        public const int GL_ATOMIC_COUNTER_BARRIER_BIT = 0x00001000;
-        public const int GL_ALL_BARRIER_BITS = -1;
-        public const int GL_MAX_IMAGE_UNITS = 0x8F38;
-        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS = 0x8F39;
-        public const int GL_IMAGE_BINDING_NAME = 0x8F3A;
-        public const int GL_IMAGE_BINDING_LEVEL = 0x8F3B;
-        public const int GL_IMAGE_BINDING_LAYERED = 0x8F3C;
-        public const int GL_IMAGE_BINDING_LAYER = 0x8F3D;
-        public const int GL_IMAGE_BINDING_ACCESS = 0x8F3E;
-        public const int GL_IMAGE_1D = 0x904C;
-        public const int GL_IMAGE_2D = 0x904D;
-        public const int GL_IMAGE_3D = 0x904E;
-        public const int GL_IMAGE_2D_RECT = 0x904F;
-        public const int GL_IMAGE_CUBE = 0x9050;
-        public const int GL_IMAGE_BUFFER = 0x9051;
-        public const int GL_IMAGE_1D_ARRAY = 0x9052;
-        public const int GL_IMAGE_2D_ARRAY = 0x9053;
-        public const int GL_IMAGE_CUBE_MAP_ARRAY = 0x9054;
-        public const int GL_IMAGE_2D_MULTISAMPLE = 0x9055;
-        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9056;
-        public const int GL_INT_IMAGE_1D = 0x9057;
-        public const int GL_INT_IMAGE_2D = 0x9058;
-        public const int GL_INT_IMAGE_3D = 0x9059;
-        public const int GL_INT_IMAGE_2D_RECT = 0x905A;
-        public const int GL_INT_IMAGE_CUBE = 0x905B;
-        public const int GL_INT_IMAGE_BUFFER = 0x905C;
-        public const int GL_INT_IMAGE_1D_ARRAY = 0x905D;
-        public const int GL_INT_IMAGE_2D_ARRAY = 0x905E;
-        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY = 0x905F;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE = 0x9060;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9061;
-        public const int GL_UNSIGNED_INT_IMAGE_1D = 0x9062;
-        public const int GL_UNSIGNED_INT_IMAGE_2D = 0x9063;
-        public const int GL_UNSIGNED_INT_IMAGE_3D = 0x9064;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT = 0x9065;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE = 0x9066;
-        public const int GL_UNSIGNED_INT_IMAGE_BUFFER = 0x9067;
-        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY = 0x9068;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY = 0x9069;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY = 0x906A;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE = 0x906B;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x906C;
-        public const int GL_MAX_IMAGE_SAMPLES = 0x906D;
-        public const int GL_IMAGE_BINDING_FORMAT = 0x906E;
-        public const int GL_IMAGE_FORMAT_COMPATIBILITY_TYPE = 0x90C7;
-        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE = 0x90C8;
-        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = 0x90C9;
-        public const int GL_MAX_VERTEX_IMAGE_UNIFORMS = 0x90CA;
-        public const int GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS = 0x90CB;
-        public const int GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS = 0x90CC;
-        public const int GL_MAX_GEOMETRY_IMAGE_UNIFORMS = 0x90CD;
-        public const int GL_MAX_FRAGMENT_IMAGE_UNIFORMS = 0x90CE;
-        public const int GL_MAX_COMBINED_IMAGE_UNIFORMS = 0x90CF;
-        public const int GL_COMPRESSED_RGBA_BPTC_UNORM = 0x8E8C;
-        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM = 0x8E8D;
-        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT = 0x8E8E;
-        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = 0x8E8F;
-        public const int GL_TEXTURE_IMMUTABLE_FORMAT = 0x912F;
-        public const int GL_VERSION_4_3 = 1;
-        public const int GL_NUM_SHADING_LANGUAGE_VERSIONS = 0x82E9;
-        public const int GL_VERTEX_ATTRIB_ARRAY_LONG = 0x874E;
-        public const int GL_COMPRESSED_RGB8_ETC2 = 0x9274;
-        public const int GL_COMPRESSED_SRGB8_ETC2 = 0x9275;
-        public const int GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9276;
-        public const int GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277;
-        public const int GL_COMPRESSED_RGBA8_ETC2_EAC = 0x9278;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 0x9279;
-        public const int GL_COMPRESSED_R11_EAC = 0x9270;
-        public const int GL_COMPRESSED_SIGNED_R11_EAC = 0x9271;
-        public const int GL_COMPRESSED_RG11_EAC = 0x9272;
-        public const int GL_COMPRESSED_SIGNED_RG11_EAC = 0x9273;
-        public const int GL_PRIMITIVE_RESTART_FIXED_INDEX = 0x8D69;
-        public const int GL_ANY_SAMPLES_PASSED_CONSERVATIVE = 0x8D6A;
-        public const int GL_MAX_ELEMENT_INDEX = 0x8D6B;
-        public const int GL_COMPUTE_SHADER = 0x91B9;
-        public const int GL_MAX_COMPUTE_UNIFORM_BLOCKS = 0x91BB;
-        public const int GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS = 0x91BC;
-        public const int GL_MAX_COMPUTE_IMAGE_UNIFORMS = 0x91BD;
-        public const int GL_MAX_COMPUTE_SHARED_MEMORY_SIZE = 0x8262;
-        public const int GL_MAX_COMPUTE_UNIFORM_COMPONENTS = 0x8263;
-        public const int GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264;
-        public const int GL_MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265;
-        public const int GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266;
-        public const int GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB;
-        public const int GL_MAX_COMPUTE_WORK_GROUP_COUNT = 0x91BE;
-        public const int GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF;
-        public const int GL_COMPUTE_WORK_GROUP_SIZE = 0x8267;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED;
-        public const int GL_DISPATCH_INDIRECT_BUFFER = 0x90EE;
-        public const int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 0x90EF;
-        public const int GL_COMPUTE_SHADER_BIT = 0x00000020;
-        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS = 0x8242;
-        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH = 0x8243;
-        public const int GL_DEBUG_CALLBACK_FUNCTION = 0x8244;
-        public const int GL_DEBUG_CALLBACK_USER_PARAM = 0x8245;
-        public const int GL_DEBUG_SOURCE_API = 0x8246;
-        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247;
-        public const int GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248;
-        public const int GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249;
-        public const int GL_DEBUG_SOURCE_APPLICATION = 0x824A;
-        public const int GL_DEBUG_SOURCE_OTHER = 0x824B;
-        public const int GL_DEBUG_TYPE_ERROR = 0x824C;
-        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D;
-        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E;
-        public const int GL_DEBUG_TYPE_PORTABILITY = 0x824F;
-        public const int GL_DEBUG_TYPE_PERFORMANCE = 0x8250;
-        public const int GL_DEBUG_TYPE_OTHER = 0x8251;
-        public const int GL_MAX_DEBUG_MESSAGE_LENGTH = 0x9143;
-        public const int GL_MAX_DEBUG_LOGGED_MESSAGES = 0x9144;
-        public const int GL_DEBUG_LOGGED_MESSAGES = 0x9145;
-        public const int GL_DEBUG_SEVERITY_HIGH = 0x9146;
-        public const int GL_DEBUG_SEVERITY_MEDIUM = 0x9147;
-        public const int GL_DEBUG_SEVERITY_LOW = 0x9148;
-        public const int GL_DEBUG_TYPE_MARKER = 0x8268;
-        public const int GL_DEBUG_TYPE_PUSH_GROUP = 0x8269;
-        public const int GL_DEBUG_TYPE_POP_GROUP = 0x826A;
-        public const int GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
-        public const int GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C;
-        public const int GL_DEBUG_GROUP_STACK_DEPTH = 0x826D;
-        public const int GL_BUFFER = 0x82E0;
-        public const int GL_SHADER = 0x82E1;
-        public const int GL_PROGRAM = 0x82E2;
-        public const int GL_QUERY = 0x82E3;
-        public const int GL_PROGRAM_PIPELINE = 0x82E4;
-        public const int GL_SAMPLER = 0x82E6;
-        public const int GL_MAX_LABEL_LENGTH = 0x82E8;
-        public const int GL_DEBUG_OUTPUT = 0x92E0;
-        public const int GL_CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
-        public const int GL_MAX_UNIFORM_LOCATIONS = 0x826E;
-        public const int GL_FRAMEBUFFER_DEFAULT_WIDTH = 0x9310;
-        public const int GL_FRAMEBUFFER_DEFAULT_HEIGHT = 0x9311;
-        public const int GL_FRAMEBUFFER_DEFAULT_LAYERS = 0x9312;
-        public const int GL_FRAMEBUFFER_DEFAULT_SAMPLES = 0x9313;
-        public const int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 0x9314;
-        public const int GL_MAX_FRAMEBUFFER_WIDTH = 0x9315;
-        public const int GL_MAX_FRAMEBUFFER_HEIGHT = 0x9316;
-        public const int GL_MAX_FRAMEBUFFER_LAYERS = 0x9317;
-        public const int GL_MAX_FRAMEBUFFER_SAMPLES = 0x9318;
-        public const int GL_INTERNALFORMAT_SUPPORTED = 0x826F;
-        public const int GL_INTERNALFORMAT_PREFERRED = 0x8270;
-        public const int GL_INTERNALFORMAT_RED_SIZE = 0x8271;
-        public const int GL_INTERNALFORMAT_GREEN_SIZE = 0x8272;
-        public const int GL_INTERNALFORMAT_BLUE_SIZE = 0x8273;
-        public const int GL_INTERNALFORMAT_ALPHA_SIZE = 0x8274;
-        public const int GL_INTERNALFORMAT_DEPTH_SIZE = 0x8275;
-        public const int GL_INTERNALFORMAT_STENCIL_SIZE = 0x8276;
-        public const int GL_INTERNALFORMAT_SHARED_SIZE = 0x8277;
-        public const int GL_INTERNALFORMAT_RED_TYPE = 0x8278;
-        public const int GL_INTERNALFORMAT_GREEN_TYPE = 0x8279;
-        public const int GL_INTERNALFORMAT_BLUE_TYPE = 0x827A;
-        public const int GL_INTERNALFORMAT_ALPHA_TYPE = 0x827B;
-        public const int GL_INTERNALFORMAT_DEPTH_TYPE = 0x827C;
-        public const int GL_INTERNALFORMAT_STENCIL_TYPE = 0x827D;
-        public const int GL_MAX_WIDTH = 0x827E;
-        public const int GL_MAX_HEIGHT = 0x827F;
-        public const int GL_MAX_DEPTH = 0x8280;
-        public const int GL_MAX_LAYERS = 0x8281;
-        public const int GL_MAX_COMBINED_DIMENSIONS = 0x8282;
-        public const int GL_COLOR_COMPONENTS = 0x8283;
-        public const int GL_DEPTH_COMPONENTS = 0x8284;
-        public const int GL_STENCIL_COMPONENTS = 0x8285;
-        public const int GL_COLOR_RENDERABLE = 0x8286;
-        public const int GL_DEPTH_RENDERABLE = 0x8287;
-        public const int GL_STENCIL_RENDERABLE = 0x8288;
-        public const int GL_FRAMEBUFFER_RENDERABLE = 0x8289;
-        public const int GL_FRAMEBUFFER_RENDERABLE_LAYERED = 0x828A;
-        public const int GL_FRAMEBUFFER_BLEND = 0x828B;
-        public const int GL_READ_PIXELS = 0x828C;
-        public const int GL_READ_PIXELS_FORMAT = 0x828D;
-        public const int GL_READ_PIXELS_TYPE = 0x828E;
-        public const int GL_TEXTURE_IMAGE_FORMAT = 0x828F;
-        public const int GL_TEXTURE_IMAGE_TYPE = 0x8290;
-        public const int GL_GET_TEXTURE_IMAGE_FORMAT = 0x8291;
-        public const int GL_GET_TEXTURE_IMAGE_TYPE = 0x8292;
-        public const int GL_MIPMAP = 0x8293;
-        public const int GL_MANUAL_GENERATE_MIPMAP = 0x8294;
-        public const int GL_AUTO_GENERATE_MIPMAP = 0x8295;
-        public const int GL_COLOR_ENCODING = 0x8296;
-        public const int GL_SRGB_READ = 0x8297;
-        public const int GL_SRGB_WRITE = 0x8298;
-        public const int GL_FILTER = 0x829A;
-        public const int GL_VERTEX_TEXTURE = 0x829B;
-        public const int GL_TESS_CONTROL_TEXTURE = 0x829C;
-        public const int GL_TESS_EVALUATION_TEXTURE = 0x829D;
-        public const int GL_GEOMETRY_TEXTURE = 0x829E;
-        public const int GL_FRAGMENT_TEXTURE = 0x829F;
-        public const int GL_COMPUTE_TEXTURE = 0x82A0;
-        public const int GL_TEXTURE_SHADOW = 0x82A1;
-        public const int GL_TEXTURE_GATHER = 0x82A2;
-        public const int GL_TEXTURE_GATHER_SHADOW = 0x82A3;
-        public const int GL_SHADER_IMAGE_LOAD = 0x82A4;
-        public const int GL_SHADER_IMAGE_STORE = 0x82A5;
-        public const int GL_SHADER_IMAGE_ATOMIC = 0x82A6;
-        public const int GL_IMAGE_TEXEL_SIZE = 0x82A7;
-        public const int GL_IMAGE_COMPATIBILITY_CLASS = 0x82A8;
-        public const int GL_IMAGE_PIXEL_FORMAT = 0x82A9;
-        public const int GL_IMAGE_PIXEL_TYPE = 0x82AA;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST = 0x82AC;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST = 0x82AD;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE = 0x82AE;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE = 0x82AF;
-        public const int GL_TEXTURE_COMPRESSED_BLOCK_WIDTH = 0x82B1;
-        public const int GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT = 0x82B2;
-        public const int GL_TEXTURE_COMPRESSED_BLOCK_SIZE = 0x82B3;
-        public const int GL_CLEAR_BUFFER = 0x82B4;
-        public const int GL_TEXTURE_VIEW = 0x82B5;
-        public const int GL_VIEW_COMPATIBILITY_CLASS = 0x82B6;
-        public const int GL_FULL_SUPPORT = 0x82B7;
-        public const int GL_CAVEAT_SUPPORT = 0x82B8;
-        public const int GL_IMAGE_CLASS_4_X_32 = 0x82B9;
-        public const int GL_IMAGE_CLASS_2_X_32 = 0x82BA;
-        public const int GL_IMAGE_CLASS_1_X_32 = 0x82BB;
-        public const int GL_IMAGE_CLASS_4_X_16 = 0x82BC;
-        public const int GL_IMAGE_CLASS_2_X_16 = 0x82BD;
-        public const int GL_IMAGE_CLASS_1_X_16 = 0x82BE;
-        public const int GL_IMAGE_CLASS_4_X_8 = 0x82BF;
-        public const int GL_IMAGE_CLASS_2_X_8 = 0x82C0;
-        public const int GL_IMAGE_CLASS_1_X_8 = 0x82C1;
-        public const int GL_IMAGE_CLASS_11_11_10 = 0x82C2;
-        public const int GL_IMAGE_CLASS_10_10_10_2 = 0x82C3;
-        public const int GL_VIEW_CLASS_128_BITS = 0x82C4;
-        public const int GL_VIEW_CLASS_96_BITS = 0x82C5;
-        public const int GL_VIEW_CLASS_64_BITS = 0x82C6;
-        public const int GL_VIEW_CLASS_48_BITS = 0x82C7;
-        public const int GL_VIEW_CLASS_32_BITS = 0x82C8;
-        public const int GL_VIEW_CLASS_24_BITS = 0x82C9;
-        public const int GL_VIEW_CLASS_16_BITS = 0x82CA;
-        public const int GL_VIEW_CLASS_8_BITS = 0x82CB;
-        public const int GL_VIEW_CLASS_S3TC_DXT1_RGB = 0x82CC;
-        public const int GL_VIEW_CLASS_S3TC_DXT1_RGBA = 0x82CD;
-        public const int GL_VIEW_CLASS_S3TC_DXT3_RGBA = 0x82CE;
-        public const int GL_VIEW_CLASS_S3TC_DXT5_RGBA = 0x82CF;
-        public const int GL_VIEW_CLASS_RGTC1_RED = 0x82D0;
-        public const int GL_VIEW_CLASS_RGTC2_RG = 0x82D1;
-        public const int GL_VIEW_CLASS_BPTC_UNORM = 0x82D2;
-        public const int GL_VIEW_CLASS_BPTC_FLOAT = 0x82D3;
-        public const int GL_UNIFORM = 0x92E1;
-        public const int GL_UNIFORM_BLOCK = 0x92E2;
-        public const int GL_PROGRAM_INPUT = 0x92E3;
-        public const int GL_PROGRAM_OUTPUT = 0x92E4;
-        public const int GL_BUFFER_VARIABLE = 0x92E5;
-        public const int GL_SHADER_STORAGE_BLOCK = 0x92E6;
-        public const int GL_VERTEX_SUBROUTINE = 0x92E8;
-        public const int GL_TESS_CONTROL_SUBROUTINE = 0x92E9;
-        public const int GL_TESS_EVALUATION_SUBROUTINE = 0x92EA;
-        public const int GL_GEOMETRY_SUBROUTINE = 0x92EB;
-        public const int GL_FRAGMENT_SUBROUTINE = 0x92EC;
-        public const int GL_COMPUTE_SUBROUTINE = 0x92ED;
-        public const int GL_VERTEX_SUBROUTINE_UNIFORM = 0x92EE;
-        public const int GL_TESS_CONTROL_SUBROUTINE_UNIFORM = 0x92EF;
-        public const int GL_TESS_EVALUATION_SUBROUTINE_UNIFORM = 0x92F0;
-        public const int GL_GEOMETRY_SUBROUTINE_UNIFORM = 0x92F1;
-        public const int GL_FRAGMENT_SUBROUTINE_UNIFORM = 0x92F2;
-        public const int GL_COMPUTE_SUBROUTINE_UNIFORM = 0x92F3;
-        public const int GL_TRANSFORM_FEEDBACK_VARYING = 0x92F4;
-        public const int GL_ACTIVE_RESOURCES = 0x92F5;
-        public const int GL_MAX_NAME_LENGTH = 0x92F6;
-        public const int GL_MAX_NUM_ACTIVE_VARIABLES = 0x92F7;
-        public const int GL_MAX_NUM_COMPATIBLE_SUBROUTINES = 0x92F8;
-        public const int GL_NAME_LENGTH = 0x92F9;
-        public const int GL_TYPE = 0x92FA;
-        public const int GL_ARRAY_SIZE = 0x92FB;
-        public const int GL_OFFSET = 0x92FC;
-        public const int GL_BLOCK_INDEX = 0x92FD;
-        public const int GL_ARRAY_STRIDE = 0x92FE;
-        public const int GL_MATRIX_STRIDE = 0x92FF;
-        public const int GL_IS_ROW_MAJOR = 0x9300;
-        public const int GL_ATOMIC_COUNTER_BUFFER_INDEX = 0x9301;
-        public const int GL_BUFFER_BINDING = 0x9302;
-        public const int GL_BUFFER_DATA_SIZE = 0x9303;
-        public const int GL_NUM_ACTIVE_VARIABLES = 0x9304;
-        public const int GL_ACTIVE_VARIABLES = 0x9305;
-        public const int GL_REFERENCED_BY_VERTEX_SHADER = 0x9306;
-        public const int GL_REFERENCED_BY_TESS_CONTROL_SHADER = 0x9307;
-        public const int GL_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x9308;
-        public const int GL_REFERENCED_BY_GEOMETRY_SHADER = 0x9309;
-        public const int GL_REFERENCED_BY_FRAGMENT_SHADER = 0x930A;
-        public const int GL_REFERENCED_BY_COMPUTE_SHADER = 0x930B;
-        public const int GL_TOP_LEVEL_ARRAY_SIZE = 0x930C;
-        public const int GL_TOP_LEVEL_ARRAY_STRIDE = 0x930D;
-        public const int GL_LOCATION = 0x930E;
-        public const int GL_LOCATION_INDEX = 0x930F;
-        public const int GL_IS_PER_PATCH = 0x92E7;
-        public const int GL_SHADER_STORAGE_BUFFER = 0x90D2;
-        public const int GL_SHADER_STORAGE_BUFFER_BINDING = 0x90D3;
-        public const int GL_SHADER_STORAGE_BUFFER_START = 0x90D4;
-        public const int GL_SHADER_STORAGE_BUFFER_SIZE = 0x90D5;
-        public const int GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS = 0x90D6;
-        public const int GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS = 0x90D7;
-        public const int GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS = 0x90D8;
-        public const int GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS = 0x90D9;
-        public const int GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS = 0x90DA;
-        public const int GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS = 0x90DB;
-        public const int GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS = 0x90DC;
-        public const int GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS = 0x90DD;
-        public const int GL_MAX_SHADER_STORAGE_BLOCK_SIZE = 0x90DE;
-        public const int GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT = 0x90DF;
-        public const int GL_SHADER_STORAGE_BARRIER_BIT = 0x00002000;
-        public const int GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES = 0x8F39;
-        public const int GL_DEPTH_STENCIL_TEXTURE_MODE = 0x90EA;
-        public const int GL_TEXTURE_BUFFER_OFFSET = 0x919D;
-        public const int GL_TEXTURE_BUFFER_SIZE = 0x919E;
-        public const int GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT = 0x919F;
-        public const int GL_TEXTURE_VIEW_MIN_LEVEL = 0x82DB;
-        public const int GL_TEXTURE_VIEW_NUM_LEVELS = 0x82DC;
-        public const int GL_TEXTURE_VIEW_MIN_LAYER = 0x82DD;
-        public const int GL_TEXTURE_VIEW_NUM_LAYERS = 0x82DE;
-        public const int GL_TEXTURE_IMMUTABLE_LEVELS = 0x82DF;
-        public const int GL_VERTEX_ATTRIB_BINDING = 0x82D4;
-        public const int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D5;
-        public const int GL_VERTEX_BINDING_DIVISOR = 0x82D6;
-        public const int GL_VERTEX_BINDING_OFFSET = 0x82D7;
-        public const int GL_VERTEX_BINDING_STRIDE = 0x82D8;
-        public const int GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D9;
-        public const int GL_MAX_VERTEX_ATTRIB_BINDINGS = 0x82DA;
-        public const int GL_VERTEX_BINDING_BUFFER = 0x8F4F;
-        public const int GL_DISPLAY_LIST = 0x82E7;
-        public const int GL_VERSION_4_4 = 1;
-        public const int GL_MAX_VERTEX_ATTRIB_STRIDE = 0x82E5;
-        public const int GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 0x8221;
-        public const int GL_TEXTURE_BUFFER_BINDING = 0x8C2A;
-        public const int GL_MAP_PERSISTENT_BIT = 0x0040;
-        public const int GL_MAP_COHERENT_BIT = 0x0080;
-        public const int GL_DYNAMIC_STORAGE_BIT = 0x0100;
-        public const int GL_CLIENT_STORAGE_BIT = 0x0200;
-        public const int GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = 0x00004000;
-        public const int GL_BUFFER_IMMUTABLE_STORAGE = 0x821F;
-        public const int GL_BUFFER_STORAGE_FLAGS = 0x8220;
-        public const int GL_CLEAR_TEXTURE = 0x9365;
-        public const int GL_LOCATION_COMPONENT = 0x934A;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_INDEX = 0x934B;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE = 0x934C;
-        public const int GL_QUERY_BUFFER = 0x9192;
-        public const int GL_QUERY_BUFFER_BARRIER_BIT = 0x00008000;
-        public const int GL_QUERY_BUFFER_BINDING = 0x9193;
-        public const int GL_QUERY_RESULT_NO_WAIT = 0x9194;
-        public const int GL_MIRROR_CLAMP_TO_EDGE = 0x8743;
-        public const int GL_NEGATIVE_ONE_TO_ONE = 0x935E;
-        public const int GL_ZERO_TO_ONE = 0x935F;
-        public const int GL_CLIP_ORIGIN = 0x935C;
-        public const int GL_CLIP_DEPTH_MODE = 0x935D;
-        public const int GL_QUERY_WAIT_INVERTED = 0x8E17;
-        public const int GL_QUERY_NO_WAIT_INVERTED = 0x8E18;
-        public const int GL_QUERY_BY_REGION_WAIT_INVERTED = 0x8E19;
-        public const int GL_QUERY_BY_REGION_NO_WAIT_INVERTED = 0x8E1A;
-        public const int GL_MAX_CULL_DISTANCES = 0x82F9;
-        public const int GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES = 0x82FA;
-        public const int GL_TEXTURE_TARGET = 0x1006;
-        public const int GL_QUERY_TARGET = 0x82EA;
-        public const int GL_GUILTY_CONTEXT_RESET = 0x8253;
-        public const int GL_INNOCENT_CONTEXT_RESET = 0x8254;
-        public const int GL_UNKNOWN_CONTEXT_RESET = 0x8255;
-        public const int GL_RESET_NOTIFICATION_STRATEGY = 0x8256;
-        public const int GL_LOSE_CONTEXT_ON_RESET = 0x8252;
-        public const int GL_NO_RESET_NOTIFICATION = 0x8261;
-        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT = 0x00000004;
-        public const int GL_CONTEXT_RELEASE_BEHAVIOR = 0x82FB;
-        public const int GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x82FC;
-        public const int GL_VERSION_4_6 = 1;
-        public const int GL_SHADER_BINARY_FORMAT_SPIR_V = 0x9551;
-        public const int GL_SPIR_V_BINARY = 0x9552;
-        public const int GL_PARAMETER_BUFFER = 0x80EE;
-        public const int GL_PARAMETER_BUFFER_BINDING = 0x80EF;
-        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT = 0x00000008;
-        public const int GL_VERTICES_SUBMITTED = 0x82EE;
-        public const int GL_PRIMITIVES_SUBMITTED = 0x82EF;
-        public const int GL_VERTEX_SHADER_INVOCATIONS = 0x82F0;
-        public const int GL_TESS_CONTROL_SHADER_PATCHES = 0x82F1;
-        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS = 0x82F2;
-        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED = 0x82F3;
-        public const int GL_FRAGMENT_SHADER_INVOCATIONS = 0x82F4;
-        public const int GL_COMPUTE_SHADER_INVOCATIONS = 0x82F5;
-        public const int GL_CLIPPING_INPUT_PRIMITIVES = 0x82F6;
-        public const int GL_CLIPPING_OUTPUT_PRIMITIVES = 0x82F7;
-        public const int GL_POLYGON_OFFSET_CLAMP = 0x8E1B;
-        public const int GL_SPIR_V_EXTENSIONS = 0x9553;
-        public const int GL_NUM_SPIR_V_EXTENSIONS = 0x9554;
-        public const int GL_TEXTURE_MAX_ANISOTROPY = 0x84FE;
-        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY = 0x84FF;
-        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW = 0x82EC;
-        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW = 0x82ED;
-        public const int GL_ARB_ES2_compatibility = 1;
-        public const int GL_ARB_ES3_1_compatibility = 1;
-        public const int GL_ARB_ES3_2_compatibility = 1;
-        public const int GL_PRIMITIVE_BOUNDING_BOX_ARB = 0x92BE;
-        public const int GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB = 0x9381;
-        public const int GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB = 0x9382;
-        public const int GL_ARB_ES3_compatibility = 1;
-        public const int GL_ARB_arrays_of_arrays = 1;
-        public const int GL_ARB_base_instance = 1;
-        public const int GL_ARB_bindless_texture = 1;
-        public const int GL_UNSIGNED_INT64_ARB = 0x140F;
-        public const int GL_ARB_blend_func_extended = 1;
-        public const int GL_ARB_buffer_storage = 1;
-        public const int GL_ARB_cl_event = 1;
-        public const int GL_SYNC_CL_EVENT_ARB = 0x8240;
-        public const int GL_SYNC_CL_EVENT_COMPLETE_ARB = 0x8241;
-        public const int GL_ARB_clear_buffer_object = 1;
-        public const int GL_ARB_clear_texture = 1;
-        public const int GL_ARB_clip_control = 1;
-        public const int GL_ARB_color_buffer_float = 1;
-        public const int GL_RGBA_FLOAT_MODE_ARB = 0x8820;
-        public const int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A;
-        public const int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
-        public const int GL_CLAMP_READ_COLOR_ARB = 0x891C;
-        public const int GL_FIXED_ONLY_ARB = 0x891D;
-        public const int GL_ARB_compatibility = 1;
-        public const int GL_ARB_compressed_texture_pixel_storage = 1;
-        public const int GL_ARB_compute_shader = 1;
-        public const int GL_ARB_compute_variable_group_size = 1;
-        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB = 0x9344;
-        public const int GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB = 0x90EB;
-        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB = 0x9345;
-        public const int GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB = 0x91BF;
-        public const int GL_ARB_conditional_render_inverted = 1;
-        public const int GL_ARB_conservative_depth = 1;
-        public const int GL_ARB_copy_buffer = 1;
-        public const int GL_ARB_copy_image = 1;
-        public const int GL_ARB_cull_distance = 1;
-        public const int GL_ARB_debug_output = 1;
-        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB = 0x8242;
-        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB = 0x8243;
-        public const int GL_DEBUG_CALLBACK_FUNCTION_ARB = 0x8244;
-        public const int GL_DEBUG_CALLBACK_USER_PARAM_ARB = 0x8245;
-        public const int GL_DEBUG_SOURCE_API_ARB = 0x8246;
-        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB = 0x8247;
-        public const int GL_DEBUG_SOURCE_SHADER_COMPILER_ARB = 0x8248;
-        public const int GL_DEBUG_SOURCE_THIRD_PARTY_ARB = 0x8249;
-        public const int GL_DEBUG_SOURCE_APPLICATION_ARB = 0x824A;
-        public const int GL_DEBUG_SOURCE_OTHER_ARB = 0x824B;
-        public const int GL_DEBUG_TYPE_ERROR_ARB = 0x824C;
-        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB = 0x824D;
-        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB = 0x824E;
-        public const int GL_DEBUG_TYPE_PORTABILITY_ARB = 0x824F;
-        public const int GL_DEBUG_TYPE_PERFORMANCE_ARB = 0x8250;
-        public const int GL_DEBUG_TYPE_OTHER_ARB = 0x8251;
-        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_ARB = 0x9143;
-        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_ARB = 0x9144;
-        public const int GL_DEBUG_LOGGED_MESSAGES_ARB = 0x9145;
-        public const int GL_DEBUG_SEVERITY_HIGH_ARB = 0x9146;
-        public const int GL_DEBUG_SEVERITY_MEDIUM_ARB = 0x9147;
-        public const int GL_DEBUG_SEVERITY_LOW_ARB = 0x9148;
-        public const int GL_ARB_depth_buffer_float = 1;
-        public const int GL_ARB_depth_clamp = 1;
-        public const int GL_ARB_depth_texture = 1;
-        public const int GL_DEPTH_COMPONENT16_ARB = 0x81A5;
-        public const int GL_DEPTH_COMPONENT24_ARB = 0x81A6;
-        public const int GL_DEPTH_COMPONENT32_ARB = 0x81A7;
-        public const int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A;
-        public const int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B;
-        public const int GL_ARB_derivative_control = 1;
-        public const int GL_ARB_direct_state_access = 1;
-        public const int GL_ARB_draw_buffers = 1;
-        public const int GL_MAX_DRAW_BUFFERS_ARB = 0x8824;
-        public const int GL_DRAW_BUFFER0_ARB = 0x8825;
-        public const int GL_DRAW_BUFFER1_ARB = 0x8826;
-        public const int GL_DRAW_BUFFER2_ARB = 0x8827;
-        public const int GL_DRAW_BUFFER3_ARB = 0x8828;
-        public const int GL_DRAW_BUFFER4_ARB = 0x8829;
-        public const int GL_DRAW_BUFFER5_ARB = 0x882A;
-        public const int GL_DRAW_BUFFER6_ARB = 0x882B;
-        public const int GL_DRAW_BUFFER7_ARB = 0x882C;
-        public const int GL_DRAW_BUFFER8_ARB = 0x882D;
-        public const int GL_DRAW_BUFFER9_ARB = 0x882E;
-        public const int GL_DRAW_BUFFER10_ARB = 0x882F;
-        public const int GL_DRAW_BUFFER11_ARB = 0x8830;
-        public const int GL_DRAW_BUFFER12_ARB = 0x8831;
-        public const int GL_DRAW_BUFFER13_ARB = 0x8832;
-        public const int GL_DRAW_BUFFER14_ARB = 0x8833;
-        public const int GL_DRAW_BUFFER15_ARB = 0x8834;
-        public const int GL_ARB_draw_buffers_blend = 1;
-        public const int GL_ARB_draw_elements_base_vertex = 1;
-        public const int GL_ARB_draw_indirect = 1;
-        public const int GL_ARB_draw_instanced = 1;
-        public const int GL_ARB_enhanced_layouts = 1;
-        public const int GL_ARB_explicit_attrib_location = 1;
-        public const int GL_ARB_explicit_uniform_location = 1;
-        public const int GL_ARB_fragment_coord_conventions = 1;
-        public const int GL_ARB_fragment_layer_viewport = 1;
-        public const int GL_ARB_fragment_program = 1;
-        public const int GL_FRAGMENT_PROGRAM_ARB = 0x8804;
-        public const int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
-        public const int GL_PROGRAM_LENGTH_ARB = 0x8627;
-        public const int GL_PROGRAM_FORMAT_ARB = 0x8876;
-        public const int GL_PROGRAM_BINDING_ARB = 0x8677;
-        public const int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0;
-        public const int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1;
-        public const int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2;
-        public const int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3;
-        public const int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4;
-        public const int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5;
-        public const int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6;
-        public const int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7;
-        public const int GL_PROGRAM_PARAMETERS_ARB = 0x88A8;
-        public const int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9;
-        public const int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA;
-        public const int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB;
-        public const int GL_PROGRAM_ATTRIBS_ARB = 0x88AC;
-        public const int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD;
-        public const int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE;
-        public const int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF;
-        public const int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4;
-        public const int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5;
-        public const int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6;
-        public const int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805;
-        public const int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806;
-        public const int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807;
-        public const int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808;
-        public const int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809;
-        public const int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A;
-        public const int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B;
-        public const int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C;
-        public const int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D;
-        public const int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E;
-        public const int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F;
-        public const int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810;
-        public const int GL_PROGRAM_STRING_ARB = 0x8628;
-        public const int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B;
-        public const int GL_CURRENT_MATRIX_ARB = 0x8641;
-        public const int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7;
-        public const int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640;
-        public const int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F;
-        public const int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E;
-        public const int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
-        public const int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
-        public const int GL_PROGRAM_ERROR_STRING_ARB = 0x8874;
-        public const int GL_MATRIX0_ARB = 0x88C0;
-        public const int GL_MATRIX1_ARB = 0x88C1;
-        public const int GL_MATRIX2_ARB = 0x88C2;
-        public const int GL_MATRIX3_ARB = 0x88C3;
-        public const int GL_MATRIX4_ARB = 0x88C4;
-        public const int GL_MATRIX5_ARB = 0x88C5;
-        public const int GL_MATRIX6_ARB = 0x88C6;
-        public const int GL_MATRIX7_ARB = 0x88C7;
-        public const int GL_MATRIX8_ARB = 0x88C8;
-        public const int GL_MATRIX9_ARB = 0x88C9;
-        public const int GL_MATRIX10_ARB = 0x88CA;
-        public const int GL_MATRIX11_ARB = 0x88CB;
-        public const int GL_MATRIX12_ARB = 0x88CC;
-        public const int GL_MATRIX13_ARB = 0x88CD;
-        public const int GL_MATRIX14_ARB = 0x88CE;
-        public const int GL_MATRIX15_ARB = 0x88CF;
-        public const int GL_MATRIX16_ARB = 0x88D0;
-        public const int GL_MATRIX17_ARB = 0x88D1;
-        public const int GL_MATRIX18_ARB = 0x88D2;
-        public const int GL_MATRIX19_ARB = 0x88D3;
-        public const int GL_MATRIX20_ARB = 0x88D4;
-        public const int GL_MATRIX21_ARB = 0x88D5;
-        public const int GL_MATRIX22_ARB = 0x88D6;
-        public const int GL_MATRIX23_ARB = 0x88D7;
-        public const int GL_MATRIX24_ARB = 0x88D8;
-        public const int GL_MATRIX25_ARB = 0x88D9;
-        public const int GL_MATRIX26_ARB = 0x88DA;
-        public const int GL_MATRIX27_ARB = 0x88DB;
-        public const int GL_MATRIX28_ARB = 0x88DC;
-        public const int GL_MATRIX29_ARB = 0x88DD;
-        public const int GL_MATRIX30_ARB = 0x88DE;
-        public const int GL_MATRIX31_ARB = 0x88DF;
-        public const int GL_ARB_fragment_program_shadow = 1;
-        public const int GL_ARB_fragment_shader = 1;
-        public const int GL_FRAGMENT_SHADER_ARB = 0x8B30;
-        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49;
-        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B;
-        public const int GL_ARB_fragment_shader_interlock = 1;
-        public const int GL_ARB_framebuffer_no_attachments = 1;
-        public const int GL_ARB_framebuffer_object = 1;
-        public const int GL_ARB_framebuffer_sRGB = 1;
-        public const int GL_ARB_geometry_shader4 = 1;
-        public const int GL_LINES_ADJACENCY_ARB = 0x000A;
-        public const int GL_LINE_STRIP_ADJACENCY_ARB = 0x000B;
-        public const int GL_TRIANGLES_ADJACENCY_ARB = 0x000C;
-        public const int GL_TRIANGLE_STRIP_ADJACENCY_ARB = 0x000D;
-        public const int GL_PROGRAM_POINT_SIZE_ARB = 0x8642;
-        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB = 0x8C29;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB = 0x8DA7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB = 0x8DA8;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB = 0x8DA9;
-        public const int GL_GEOMETRY_SHADER_ARB = 0x8DD9;
-        public const int GL_GEOMETRY_VERTICES_OUT_ARB = 0x8DDA;
-        public const int GL_GEOMETRY_INPUT_TYPE_ARB = 0x8DDB;
-        public const int GL_GEOMETRY_OUTPUT_TYPE_ARB = 0x8DDC;
-        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB = 0x8DDD;
-        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_ARB = 0x8DDE;
-        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8DDF;
-        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB = 0x8DE0;
-        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB = 0x8DE1;
-        public const int GL_ARB_get_program_binary = 1;
-        public const int GL_ARB_get_texture_sub_image = 1;
-        public const int GL_ARB_gl_spirv = 1;
-        public const int GL_SHADER_BINARY_FORMAT_SPIR_V_ARB = 0x9551;
-        public const int GL_SPIR_V_BINARY_ARB = 0x9552;
-        public const int GL_ARB_gpu_shader5 = 1;
-        public const int GL_ARB_gpu_shader_fp64 = 1;
-        public const int GL_ARB_gpu_shader_int64 = 1;
-        public const int GL_INT64_ARB = 0x140E;
-        public const int GL_INT64_VEC2_ARB = 0x8FE9;
-        public const int GL_INT64_VEC3_ARB = 0x8FEA;
-        public const int GL_INT64_VEC4_ARB = 0x8FEB;
-        public const int GL_UNSIGNED_INT64_VEC2_ARB = 0x8FF5;
-        public const int GL_UNSIGNED_INT64_VEC3_ARB = 0x8FF6;
-        public const int GL_UNSIGNED_INT64_VEC4_ARB = 0x8FF7;
-        public const int GL_ARB_half_float_pixel = 1;
-        public const int GL_HALF_FLOAT_ARB = 0x140B;
-        public const int GL_ARB_half_float_vertex = 1;
-        public const int GL_ARB_imaging = 1;
-        public const int GL_ARB_indirect_parameters = 1;
-        public const int GL_PARAMETER_BUFFER_ARB = 0x80EE;
-        public const int GL_PARAMETER_BUFFER_BINDING_ARB = 0x80EF;
-        public const int GL_ARB_instanced_arrays = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = 0x88FE;
-        public const int GL_ARB_internalformat_query = 1;
-        public const int GL_ARB_internalformat_query2 = 1;
-        public const int GL_SRGB_DECODE_ARB = 0x8299;
-        public const int GL_ARB_invalidate_subdata = 1;
-        public const int GL_ARB_map_buffer_alignment = 1;
-        public const int GL_ARB_map_buffer_range = 1;
-        public const int GL_ARB_matrix_palette = 1;
-        public const int GL_MATRIX_PALETTE_ARB = 0x8840;
-        public const int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841;
-        public const int GL_MAX_PALETTE_MATRICES_ARB = 0x8842;
-        public const int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843;
-        public const int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844;
-        public const int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845;
-        public const int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846;
-        public const int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847;
-        public const int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848;
-        public const int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849;
-        public const int GL_ARB_multi_bind = 1;
-        public const int GL_ARB_multi_draw_indirect = 1;
-        public const int GL_ARB_multisample = 1;
-        public const int GL_MULTISAMPLE_ARB = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F;
-        public const int GL_SAMPLE_COVERAGE_ARB = 0x80A0;
-        public const int GL_SAMPLE_BUFFERS_ARB = 0x80A8;
-        public const int GL_SAMPLES_ARB = 0x80A9;
-        public const int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA;
-        public const int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB;
-        public const int GL_MULTISAMPLE_BIT_ARB = 0x20000000;
-        public const int GL_ARB_occlusion_query = 1;
-        public const int GL_QUERY_COUNTER_BITS_ARB = 0x8864;
-        public const int GL_CURRENT_QUERY_ARB = 0x8865;
-        public const int GL_QUERY_RESULT_ARB = 0x8866;
-        public const int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867;
-        public const int GL_SAMPLES_PASSED_ARB = 0x8914;
-        public const int GL_ARB_occlusion_query2 = 1;
-        public const int GL_ARB_parallel_shader_compile = 1;
-        public const int GL_MAX_SHADER_COMPILER_THREADS_ARB = 0x91B0;
-        public const int GL_COMPLETION_STATUS_ARB = 0x91B1;
-        public const int GL_ARB_pipeline_statistics_query = 1;
-        public const int GL_VERTICES_SUBMITTED_ARB = 0x82EE;
-        public const int GL_PRIMITIVES_SUBMITTED_ARB = 0x82EF;
-        public const int GL_VERTEX_SHADER_INVOCATIONS_ARB = 0x82F0;
-        public const int GL_TESS_CONTROL_SHADER_PATCHES_ARB = 0x82F1;
-        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB = 0x82F2;
-        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB = 0x82F3;
-        public const int GL_FRAGMENT_SHADER_INVOCATIONS_ARB = 0x82F4;
-        public const int GL_COMPUTE_SHADER_INVOCATIONS_ARB = 0x82F5;
-        public const int GL_CLIPPING_INPUT_PRIMITIVES_ARB = 0x82F6;
-        public const int GL_CLIPPING_OUTPUT_PRIMITIVES_ARB = 0x82F7;
-        public const int GL_ARB_pixel_buffer_object = 1;
-        public const int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB;
-        public const int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC;
-        public const int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED;
-        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88EF;
-        public const int GL_ARB_point_parameters = 1;
-        public const int GL_POINT_SIZE_MIN_ARB = 0x8126;
-        public const int GL_POINT_SIZE_MAX_ARB = 0x8127;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128;
-        public const int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129;
-        public const int GL_ARB_point_sprite = 1;
-        public const int GL_POINT_SPRITE_ARB = 0x8861;
-        public const int GL_COORD_REPLACE_ARB = 0x8862;
-        public const int GL_ARB_polygon_offset_clamp = 1;
-        public const int GL_ARB_post_depth_coverage = 1;
-        public const int GL_ARB_program_interface_query = 1;
-        public const int GL_ARB_provoking_vertex = 1;
-        public const int GL_ARB_query_buffer_object = 1;
-        public const int GL_ARB_robust_buffer_access_behavior = 1;
-        public const int GL_ARB_robustness = 1;
-        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB = 0x00000004;
-        public const int GL_LOSE_CONTEXT_ON_RESET_ARB = 0x8252;
-        public const int GL_GUILTY_CONTEXT_RESET_ARB = 0x8253;
-        public const int GL_INNOCENT_CONTEXT_RESET_ARB = 0x8254;
-        public const int GL_UNKNOWN_CONTEXT_RESET_ARB = 0x8255;
-        public const int GL_RESET_NOTIFICATION_STRATEGY_ARB = 0x8256;
-        public const int GL_NO_RESET_NOTIFICATION_ARB = 0x8261;
-        public const int GL_ARB_robustness_isolation = 1;
-        public const int GL_ARB_sample_locations = 1;
-        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB = 0x933D;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB = 0x933E;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB = 0x933F;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB = 0x9340;
-        public const int GL_SAMPLE_LOCATION_ARB = 0x8E50;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB = 0x9341;
-        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB = 0x9342;
-        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB = 0x9343;
-        public const int GL_ARB_sample_shading = 1;
-        public const int GL_SAMPLE_SHADING_ARB = 0x8C36;
-        public const int GL_MIN_SAMPLE_SHADING_VALUE_ARB = 0x8C37;
-        public const int GL_ARB_sampler_objects = 1;
-        public const int GL_ARB_seamless_cube_map = 1;
-        public const int GL_ARB_seamless_cubemap_per_texture = 1;
-        public const int GL_ARB_separate_shader_objects = 1;
-        public const int GL_ARB_shader_atomic_counter_ops = 1;
-        public const int GL_ARB_shader_atomic_counters = 1;
-        public const int GL_ARB_shader_ballot = 1;
-        public const int GL_ARB_shader_bit_encoding = 1;
-        public const int GL_ARB_shader_clock = 1;
-        public const int GL_ARB_shader_draw_parameters = 1;
-        public const int GL_ARB_shader_group_vote = 1;
-        public const int GL_ARB_shader_image_load_store = 1;
-        public const int GL_ARB_shader_image_size = 1;
-        public const int GL_ARB_shader_objects = 1;
-        public const int GL_PROGRAM_OBJECT_ARB = 0x8B40;
-        public const int GL_SHADER_OBJECT_ARB = 0x8B48;
-        public const int GL_OBJECT_TYPE_ARB = 0x8B4E;
-        public const int GL_OBJECT_SUBTYPE_ARB = 0x8B4F;
-        public const int GL_FLOAT_VEC2_ARB = 0x8B50;
-        public const int GL_FLOAT_VEC3_ARB = 0x8B51;
-        public const int GL_FLOAT_VEC4_ARB = 0x8B52;
-        public const int GL_INT_VEC2_ARB = 0x8B53;
-        public const int GL_INT_VEC3_ARB = 0x8B54;
-        public const int GL_INT_VEC4_ARB = 0x8B55;
-        public const int GL_BOOL_ARB = 0x8B56;
-        public const int GL_BOOL_VEC2_ARB = 0x8B57;
-        public const int GL_BOOL_VEC3_ARB = 0x8B58;
-        public const int GL_BOOL_VEC4_ARB = 0x8B59;
-        public const int GL_FLOAT_MAT2_ARB = 0x8B5A;
-        public const int GL_FLOAT_MAT3_ARB = 0x8B5B;
-        public const int GL_FLOAT_MAT4_ARB = 0x8B5C;
-        public const int GL_SAMPLER_1D_ARB = 0x8B5D;
-        public const int GL_SAMPLER_2D_ARB = 0x8B5E;
-        public const int GL_SAMPLER_3D_ARB = 0x8B5F;
-        public const int GL_SAMPLER_CUBE_ARB = 0x8B60;
-        public const int GL_SAMPLER_1D_SHADOW_ARB = 0x8B61;
-        public const int GL_SAMPLER_2D_SHADOW_ARB = 0x8B62;
-        public const int GL_SAMPLER_2D_RECT_ARB = 0x8B63;
-        public const int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64;
-        public const int GL_OBJECT_DELETE_STATUS_ARB = 0x8B80;
-        public const int GL_OBJECT_COMPILE_STATUS_ARB = 0x8B81;
-        public const int GL_OBJECT_LINK_STATUS_ARB = 0x8B82;
-        public const int GL_OBJECT_VALIDATE_STATUS_ARB = 0x8B83;
-        public const int GL_OBJECT_INFO_LOG_LENGTH_ARB = 0x8B84;
-        public const int GL_OBJECT_ATTACHED_OBJECTS_ARB = 0x8B85;
-        public const int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8B86;
-        public const int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87;
-        public const int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88;
-        public const int GL_ARB_shader_precision = 1;
-        public const int GL_ARB_shader_stencil_export = 1;
-        public const int GL_ARB_shader_storage_buffer_object = 1;
-        public const int GL_ARB_shader_subroutine = 1;
-        public const int GL_ARB_shader_texture_image_samples = 1;
-        public const int GL_ARB_shader_texture_lod = 1;
-        public const int GL_ARB_shader_viewport_layer_array = 1;
-        public const int GL_ARB_shading_language_100 = 1;
-        public const int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C;
-        public const int GL_ARB_shading_language_420pack = 1;
-        public const int GL_ARB_shading_language_include = 1;
-        public const int GL_SHADER_INCLUDE_ARB = 0x8DAE;
-        public const int GL_NAMED_STRING_LENGTH_ARB = 0x8DE9;
-        public const int GL_NAMED_STRING_TYPE_ARB = 0x8DEA;
-        public const int GL_ARB_shading_language_packing = 1;
-        public const int GL_ARB_shadow = 1;
-        public const int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C;
-        public const int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D;
-        public const int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E;
-        public const int GL_ARB_shadow_ambient = 1;
-        public const int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF;
-        public const int GL_ARB_sparse_buffer = 1;
-        public const int GL_SPARSE_STORAGE_BIT_ARB = 0x0400;
-        public const int GL_SPARSE_BUFFER_PAGE_SIZE_ARB = 0x82F8;
-        public const int GL_ARB_sparse_texture = 1;
-        public const int GL_TEXTURE_SPARSE_ARB = 0x91A6;
-        public const int GL_VIRTUAL_PAGE_SIZE_INDEX_ARB = 0x91A7;
-        public const int GL_NUM_SPARSE_LEVELS_ARB = 0x91AA;
-        public const int GL_NUM_VIRTUAL_PAGE_SIZES_ARB = 0x91A8;
-        public const int GL_VIRTUAL_PAGE_SIZE_X_ARB = 0x9195;
-        public const int GL_VIRTUAL_PAGE_SIZE_Y_ARB = 0x9196;
-        public const int GL_VIRTUAL_PAGE_SIZE_Z_ARB = 0x9197;
-        public const int GL_MAX_SPARSE_TEXTURE_SIZE_ARB = 0x9198;
-        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB = 0x9199;
-        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB = 0x919A;
-        public const int GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB = 0x91A9;
-        public const int GL_ARB_sparse_texture2 = 1;
-        public const int GL_ARB_sparse_texture_clamp = 1;
-        public const int GL_ARB_spirv_extensions = 1;
-        public const int GL_ARB_stencil_texturing = 1;
-        public const int GL_ARB_sync = 1;
-        public const int GL_ARB_tessellation_shader = 1;
-        public const int GL_ARB_texture_barrier = 1;
-        public const int GL_ARB_texture_border_clamp = 1;
-        public const int GL_CLAMP_TO_BORDER_ARB = 0x812D;
-        public const int GL_ARB_texture_buffer_object = 1;
-        public const int GL_TEXTURE_BUFFER_ARB = 0x8C2A;
-        public const int GL_MAX_TEXTURE_BUFFER_SIZE_ARB = 0x8C2B;
-        public const int GL_TEXTURE_BINDING_BUFFER_ARB = 0x8C2C;
-        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB = 0x8C2D;
-        public const int GL_TEXTURE_BUFFER_FORMAT_ARB = 0x8C2E;
-        public const int GL_ARB_texture_buffer_object_rgb32 = 1;
-        public const int GL_ARB_texture_buffer_range = 1;
-        public const int GL_ARB_texture_compression = 1;
-        public const int GL_COMPRESSED_ALPHA_ARB = 0x84E9;
-        public const int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA;
-        public const int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB;
-        public const int GL_COMPRESSED_INTENSITY_ARB = 0x84EC;
-        public const int GL_COMPRESSED_RGB_ARB = 0x84ED;
-        public const int GL_COMPRESSED_RGBA_ARB = 0x84EE;
-        public const int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF;
-        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB = 0x86A0;
-        public const int GL_TEXTURE_COMPRESSED_ARB = 0x86A1;
-        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2;
-        public const int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3;
-        public const int GL_ARB_texture_compression_bptc = 1;
-        public const int GL_COMPRESSED_RGBA_BPTC_UNORM_ARB = 0x8E8C;
-        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB = 0x8E8D;
-        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB = 0x8E8E;
-        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB = 0x8E8F;
-        public const int GL_ARB_texture_compression_rgtc = 1;
-        public const int GL_ARB_texture_cube_map = 1;
-        public const int GL_NORMAL_MAP_ARB = 0x8511;
-        public const int GL_REFLECTION_MAP_ARB = 0x8512;
-        public const int GL_TEXTURE_CUBE_MAP_ARB = 0x8513;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B;
-        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C;
-        public const int GL_ARB_texture_cube_map_array = 1;
-        public const int GL_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x9009;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB = 0x900A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x900B;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900C;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB = 0x900D;
-        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900E;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900F;
-        public const int GL_ARB_texture_env_add = 1;
-        public const int GL_ARB_texture_env_combine = 1;
-        public const int GL_COMBINE_ARB = 0x8570;
-        public const int GL_COMBINE_RGB_ARB = 0x8571;
-        public const int GL_COMBINE_ALPHA_ARB = 0x8572;
-        public const int GL_SOURCE0_RGB_ARB = 0x8580;
-        public const int GL_SOURCE1_RGB_ARB = 0x8581;
-        public const int GL_SOURCE2_RGB_ARB = 0x8582;
-        public const int GL_SOURCE0_ALPHA_ARB = 0x8588;
-        public const int GL_SOURCE1_ALPHA_ARB = 0x8589;
-        public const int GL_SOURCE2_ALPHA_ARB = 0x858A;
-        public const int GL_OPERAND0_RGB_ARB = 0x8590;
-        public const int GL_OPERAND1_RGB_ARB = 0x8591;
-        public const int GL_OPERAND2_RGB_ARB = 0x8592;
-        public const int GL_OPERAND0_ALPHA_ARB = 0x8598;
-        public const int GL_OPERAND1_ALPHA_ARB = 0x8599;
-        public const int GL_OPERAND2_ALPHA_ARB = 0x859A;
-        public const int GL_RGB_SCALE_ARB = 0x8573;
-        public const int GL_ADD_SIGNED_ARB = 0x8574;
-        public const int GL_INTERPOLATE_ARB = 0x8575;
-        public const int GL_SUBTRACT_ARB = 0x84E7;
-        public const int GL_CONSTANT_ARB = 0x8576;
-        public const int GL_PRIMARY_COLOR_ARB = 0x8577;
-        public const int GL_PREVIOUS_ARB = 0x8578;
-        public const int GL_ARB_texture_env_crossbar = 1;
-        public const int GL_ARB_texture_env_dot3 = 1;
-        public const int GL_DOT3_RGB_ARB = 0x86AE;
-        public const int GL_DOT3_RGBA_ARB = 0x86AF;
-        public const int GL_ARB_texture_filter_anisotropic = 1;
-        public const int GL_ARB_texture_filter_minmax = 1;
-        public const int GL_TEXTURE_REDUCTION_MODE_ARB = 0x9366;
-        public const int GL_WEIGHTED_AVERAGE_ARB = 0x9367;
-        public const int GL_ARB_texture_float = 1;
-        public const int GL_TEXTURE_RED_TYPE_ARB = 0x8C10;
-        public const int GL_TEXTURE_GREEN_TYPE_ARB = 0x8C11;
-        public const int GL_TEXTURE_BLUE_TYPE_ARB = 0x8C12;
-        public const int GL_TEXTURE_ALPHA_TYPE_ARB = 0x8C13;
-        public const int GL_TEXTURE_LUMINANCE_TYPE_ARB = 0x8C14;
-        public const int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8C15;
-        public const int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8C16;
-        public const int GL_UNSIGNED_NORMALIZED_ARB = 0x8C17;
-        public const int GL_RGBA32F_ARB = 0x8814;
-        public const int GL_RGB32F_ARB = 0x8815;
-        public const int GL_ALPHA32F_ARB = 0x8816;
-        public const int GL_INTENSITY32F_ARB = 0x8817;
-        public const int GL_LUMINANCE32F_ARB = 0x8818;
-        public const int GL_LUMINANCE_ALPHA32F_ARB = 0x8819;
-        public const int GL_RGBA16F_ARB = 0x881A;
-        public const int GL_RGB16F_ARB = 0x881B;
-        public const int GL_ALPHA16F_ARB = 0x881C;
-        public const int GL_INTENSITY16F_ARB = 0x881D;
-        public const int GL_LUMINANCE16F_ARB = 0x881E;
-        public const int GL_LUMINANCE_ALPHA16F_ARB = 0x881F;
-        public const int GL_ARB_texture_gather = 1;
-        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5E;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5F;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB = 0x8F9F;
-        public const int GL_ARB_texture_mirror_clamp_to_edge = 1;
-        public const int GL_ARB_texture_mirrored_repeat = 1;
-        public const int GL_MIRRORED_REPEAT_ARB = 0x8370;
-        public const int GL_ARB_texture_multisample = 1;
-        public const int GL_ARB_texture_non_power_of_two = 1;
-        public const int GL_ARB_texture_query_levels = 1;
-        public const int GL_ARB_texture_query_lod = 1;
-        public const int GL_ARB_texture_rectangle = 1;
-        public const int GL_TEXTURE_RECTANGLE_ARB = 0x84F5;
-        public const int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6;
-        public const int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7;
-        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8;
-        public const int GL_ARB_texture_rg = 1;
-        public const int GL_ARB_texture_rgb10_a2ui = 1;
-        public const int GL_ARB_texture_stencil8 = 1;
-        public const int GL_ARB_texture_storage = 1;
-        public const int GL_ARB_texture_storage_multisample = 1;
-        public const int GL_ARB_texture_swizzle = 1;
-        public const int GL_ARB_texture_view = 1;
-        public const int GL_ARB_timer_query = 1;
-        public const int GL_ARB_transform_feedback2 = 1;
-        public const int GL_ARB_transform_feedback3 = 1;
-        public const int GL_ARB_transform_feedback_instanced = 1;
-        public const int GL_ARB_transform_feedback_overflow_query = 1;
-        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB = 0x82EC;
-        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB = 0x82ED;
-        public const int GL_ARB_transpose_matrix = 1;
-        public const int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3;
-        public const int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4;
-        public const int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5;
-        public const int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6;
-        public const int GL_ARB_uniform_buffer_object = 1;
-        public const int GL_ARB_vertex_array_bgra = 1;
-        public const int GL_ARB_vertex_array_object = 1;
-        public const int GL_ARB_vertex_attrib_64bit = 1;
-        public const int GL_ARB_vertex_attrib_binding = 1;
-        public const int GL_ARB_vertex_blend = 1;
-        public const int GL_MAX_VERTEX_UNITS_ARB = 0x86A4;
-        public const int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5;
-        public const int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6;
-        public const int GL_VERTEX_BLEND_ARB = 0x86A7;
-        public const int GL_CURRENT_WEIGHT_ARB = 0x86A8;
-        public const int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9;
-        public const int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA;
-        public const int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB;
-        public const int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC;
-        public const int GL_WEIGHT_ARRAY_ARB = 0x86AD;
-        public const int GL_MODELVIEW0_ARB = 0x1700;
-        public const int GL_MODELVIEW1_ARB = 0x850A;
-        public const int GL_MODELVIEW2_ARB = 0x8722;
-        public const int GL_MODELVIEW3_ARB = 0x8723;
-        public const int GL_MODELVIEW4_ARB = 0x8724;
-        public const int GL_MODELVIEW5_ARB = 0x8725;
-        public const int GL_MODELVIEW6_ARB = 0x8726;
-        public const int GL_MODELVIEW7_ARB = 0x8727;
-        public const int GL_MODELVIEW8_ARB = 0x8728;
-        public const int GL_MODELVIEW9_ARB = 0x8729;
-        public const int GL_MODELVIEW10_ARB = 0x872A;
-        public const int GL_MODELVIEW11_ARB = 0x872B;
-        public const int GL_MODELVIEW12_ARB = 0x872C;
-        public const int GL_MODELVIEW13_ARB = 0x872D;
-        public const int GL_MODELVIEW14_ARB = 0x872E;
-        public const int GL_MODELVIEW15_ARB = 0x872F;
-        public const int GL_MODELVIEW16_ARB = 0x8730;
-        public const int GL_MODELVIEW17_ARB = 0x8731;
-        public const int GL_MODELVIEW18_ARB = 0x8732;
-        public const int GL_MODELVIEW19_ARB = 0x8733;
-        public const int GL_MODELVIEW20_ARB = 0x8734;
-        public const int GL_MODELVIEW21_ARB = 0x8735;
-        public const int GL_MODELVIEW22_ARB = 0x8736;
-        public const int GL_MODELVIEW23_ARB = 0x8737;
-        public const int GL_MODELVIEW24_ARB = 0x8738;
-        public const int GL_MODELVIEW25_ARB = 0x8739;
-        public const int GL_MODELVIEW26_ARB = 0x873A;
-        public const int GL_MODELVIEW27_ARB = 0x873B;
-        public const int GL_MODELVIEW28_ARB = 0x873C;
-        public const int GL_MODELVIEW29_ARB = 0x873D;
-        public const int GL_MODELVIEW30_ARB = 0x873E;
-        public const int GL_MODELVIEW31_ARB = 0x873F;
-        public const int GL_ARB_vertex_buffer_object = 1;
-        public const int GL_BUFFER_SIZE_ARB = 0x8764;
-        public const int GL_BUFFER_USAGE_ARB = 0x8765;
-        public const int GL_ARRAY_BUFFER_ARB = 0x8892;
-        public const int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893;
-        public const int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894;
-        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895;
-        public const int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896;
-        public const int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897;
-        public const int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898;
-        public const int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899;
-        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A;
-        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B;
-        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C;
-        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D;
-        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F;
-        public const int GL_READ_ONLY_ARB = 0x88B8;
-        public const int GL_WRITE_ONLY_ARB = 0x88B9;
-        public const int GL_READ_WRITE_ARB = 0x88BA;
-        public const int GL_BUFFER_ACCESS_ARB = 0x88BB;
-        public const int GL_BUFFER_MAPPED_ARB = 0x88BC;
-        public const int GL_BUFFER_MAP_POINTER_ARB = 0x88BD;
-        public const int GL_STREAM_DRAW_ARB = 0x88E0;
-        public const int GL_STREAM_READ_ARB = 0x88E1;
-        public const int GL_STREAM_COPY_ARB = 0x88E2;
-        public const int GL_STATIC_DRAW_ARB = 0x88E4;
-        public const int GL_STATIC_READ_ARB = 0x88E5;
-        public const int GL_STATIC_COPY_ARB = 0x88E6;
-        public const int GL_DYNAMIC_DRAW_ARB = 0x88E8;
-        public const int GL_DYNAMIC_READ_ARB = 0x88E9;
-        public const int GL_DYNAMIC_COPY_ARB = 0x88EA;
-        public const int GL_ARB_vertex_program = 1;
-        public const int GL_COLOR_SUM_ARB = 0x8458;
-        public const int GL_VERTEX_PROGRAM_ARB = 0x8620;
-        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
-        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
-        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
-        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
-        public const int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
-        public const int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
-        public const int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
-        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
-        public const int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
-        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
-        public const int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0;
-        public const int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1;
-        public const int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2;
-        public const int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3;
-        public const int GL_ARB_vertex_shader = 1;
-        public const int GL_VERTEX_SHADER_ARB = 0x8B31;
-        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
-        public const int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
-        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
-        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
-        public const int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
-        public const int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
-        public const int GL_ARB_vertex_type_10f_11f_11f_rev = 1;
-        public const int GL_ARB_vertex_type_2_10_10_10_rev = 1;
-        public const int GL_ARB_viewport_array = 1;
-        public const int GL_ARB_window_pos = 1;
-        public const int GL_KHR_blend_equation_advanced = 1;
-        public const int GL_MULTIPLY_KHR = 0x9294;
-        public const int GL_SCREEN_KHR = 0x9295;
-        public const int GL_OVERLAY_KHR = 0x9296;
-        public const int GL_DARKEN_KHR = 0x9297;
-        public const int GL_LIGHTEN_KHR = 0x9298;
-        public const int GL_COLORDODGE_KHR = 0x9299;
-        public const int GL_COLORBURN_KHR = 0x929A;
-        public const int GL_HARDLIGHT_KHR = 0x929B;
-        public const int GL_SOFTLIGHT_KHR = 0x929C;
-        public const int GL_DIFFERENCE_KHR = 0x929E;
-        public const int GL_EXCLUSION_KHR = 0x92A0;
-        public const int GL_HSL_HUE_KHR = 0x92AD;
-        public const int GL_HSL_SATURATION_KHR = 0x92AE;
-        public const int GL_HSL_COLOR_KHR = 0x92AF;
-        public const int GL_HSL_LUMINOSITY_KHR = 0x92B0;
-        public const int GL_KHR_blend_equation_advanced_coherent = 1;
-        public const int GL_BLEND_ADVANCED_COHERENT_KHR = 0x9285;
-        public const int GL_KHR_context_flush_control = 1;
-        public const int GL_KHR_debug = 1;
-        public const int GL_KHR_no_error = 1;
-        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR = 0x00000008;
-        public const int GL_KHR_parallel_shader_compile = 1;
-        public const int GL_MAX_SHADER_COMPILER_THREADS_KHR = 0x91B0;
-        public const int GL_COMPLETION_STATUS_KHR = 0x91B1;
-        public const int GL_KHR_robust_buffer_access_behavior = 1;
-        public const int GL_KHR_robustness = 1;
-        public const int GL_CONTEXT_ROBUST_ACCESS = 0x90F3;
-        public const int GL_KHR_texture_compression_astc_hdr = 1;
-        public const int GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 0x93B0;
-        public const int GL_COMPRESSED_RGBA_ASTC_5x4_KHR = 0x93B1;
-        public const int GL_COMPRESSED_RGBA_ASTC_5x5_KHR = 0x93B2;
-        public const int GL_COMPRESSED_RGBA_ASTC_6x5_KHR = 0x93B3;
-        public const int GL_COMPRESSED_RGBA_ASTC_6x6_KHR = 0x93B4;
-        public const int GL_COMPRESSED_RGBA_ASTC_8x5_KHR = 0x93B5;
-        public const int GL_COMPRESSED_RGBA_ASTC_8x6_KHR = 0x93B6;
-        public const int GL_COMPRESSED_RGBA_ASTC_8x8_KHR = 0x93B7;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x5_KHR = 0x93B8;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x6_KHR = 0x93B9;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x8_KHR = 0x93BA;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x10_KHR = 0x93BB;
-        public const int GL_COMPRESSED_RGBA_ASTC_12x10_KHR = 0x93BC;
-        public const int GL_COMPRESSED_RGBA_ASTC_12x12_KHR = 0x93BD;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR = 0x93D0;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR = 0x93D1;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR = 0x93D2;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR = 0x93D3;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR = 0x93D4;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR = 0x93D5;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR = 0x93D6;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR = 0x93D7;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR = 0x93D8;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR = 0x93D9;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR = 0x93DA;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR = 0x93DB;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR = 0x93DC;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR = 0x93DD;
-        public const int GL_KHR_texture_compression_astc_ldr = 1;
-        public const int GL_KHR_texture_compression_astc_sliced_3d = 1;
-        public const int GL_OES_byte_coordinates = 1;
-        public const int GL_OES_compressed_paletted_texture = 1;
-        public const int GL_PALETTE4_RGB8_OES = 0x8B90;
-        public const int GL_PALETTE4_RGBA8_OES = 0x8B91;
-        public const int GL_PALETTE4_R5_G6_B5_OES = 0x8B92;
-        public const int GL_PALETTE4_RGBA4_OES = 0x8B93;
-        public const int GL_PALETTE4_RGB5_A1_OES = 0x8B94;
-        public const int GL_PALETTE8_RGB8_OES = 0x8B95;
-        public const int GL_PALETTE8_RGBA8_OES = 0x8B96;
-        public const int GL_PALETTE8_R5_G6_B5_OES = 0x8B97;
-        public const int GL_PALETTE8_RGBA4_OES = 0x8B98;
-        public const int GL_PALETTE8_RGB5_A1_OES = 0x8B99;
-        public const int GL_OES_fixed_point = 1;
-        public const int GL_FIXED_OES = 0x140C;
-        public const int GL_OES_query_matrix = 1;
-        public const int GL_OES_read_format = 1;
-        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE_OES = 0x8B9A;
-        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES = 0x8B9B;
-        public const int GL_OES_single_precision = 1;
-        public const int GL_3DFX_multisample = 1;
-        public const int GL_MULTISAMPLE_3DFX = 0x86B2;
-        public const int GL_SAMPLE_BUFFERS_3DFX = 0x86B3;
-        public const int GL_SAMPLES_3DFX = 0x86B4;
-        public const int GL_MULTISAMPLE_BIT_3DFX = 0x20000000;
-        public const int GL_3DFX_tbuffer = 1;
-        public const int GL_3DFX_texture_compression_FXT1 = 1;
-        public const int GL_COMPRESSED_RGB_FXT1_3DFX = 0x86B0;
-        public const int GL_COMPRESSED_RGBA_FXT1_3DFX = 0x86B1;
-        public const int GL_AMD_blend_minmax_factor = 1;
-        public const int GL_FACTOR_MIN_AMD = 0x901C;
-        public const int GL_FACTOR_MAX_AMD = 0x901D;
-        public const int GL_AMD_conservative_depth = 1;
-        public const int GL_AMD_debug_output = 1;
-        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_AMD = 0x9143;
-        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_AMD = 0x9144;
-        public const int GL_DEBUG_LOGGED_MESSAGES_AMD = 0x9145;
-        public const int GL_DEBUG_SEVERITY_HIGH_AMD = 0x9146;
-        public const int GL_DEBUG_SEVERITY_MEDIUM_AMD = 0x9147;
-        public const int GL_DEBUG_SEVERITY_LOW_AMD = 0x9148;
-        public const int GL_DEBUG_CATEGORY_API_ERROR_AMD = 0x9149;
-        public const int GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD = 0x914A;
-        public const int GL_DEBUG_CATEGORY_DEPRECATION_AMD = 0x914B;
-        public const int GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD = 0x914C;
-        public const int GL_DEBUG_CATEGORY_PERFORMANCE_AMD = 0x914D;
-        public const int GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD = 0x914E;
-        public const int GL_DEBUG_CATEGORY_APPLICATION_AMD = 0x914F;
-        public const int GL_DEBUG_CATEGORY_OTHER_AMD = 0x9150;
-        public const int GL_AMD_depth_clamp_separate = 1;
-        public const int GL_DEPTH_CLAMP_NEAR_AMD = 0x901E;
-        public const int GL_DEPTH_CLAMP_FAR_AMD = 0x901F;
-        public const int GL_AMD_draw_buffers_blend = 1;
-        public const int GL_AMD_framebuffer_multisample_advanced = 1;
-        public const int GL_RENDERBUFFER_STORAGE_SAMPLES_AMD = 0x91B2;
-        public const int GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD = 0x91B3;
-        public const int GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD = 0x91B4;
-        public const int GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD = 0x91B5;
-        public const int GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B6;
-        public const int GL_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B7;
-        public const int GL_AMD_framebuffer_sample_positions = 1;
-        public const int GL_SUBSAMPLE_DISTANCE_AMD = 0x883F;
-        public const int GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD = 0x91AE;
-        public const int GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD = 0x91AF;
-        public const int GL_ALL_PIXELS_AMD = -1;
-        public const int GL_AMD_gcn_shader = 1;
-        public const int GL_AMD_gpu_shader_half_float = 1;
-        public const int GL_FLOAT16_NV = 0x8FF8;
-        public const int GL_FLOAT16_VEC2_NV = 0x8FF9;
-        public const int GL_FLOAT16_VEC3_NV = 0x8FFA;
-        public const int GL_FLOAT16_VEC4_NV = 0x8FFB;
-        public const int GL_FLOAT16_MAT2_AMD = 0x91C5;
-        public const int GL_FLOAT16_MAT3_AMD = 0x91C6;
-        public const int GL_FLOAT16_MAT4_AMD = 0x91C7;
-        public const int GL_FLOAT16_MAT2x3_AMD = 0x91C8;
-        public const int GL_FLOAT16_MAT2x4_AMD = 0x91C9;
-        public const int GL_FLOAT16_MAT3x2_AMD = 0x91CA;
-        public const int GL_FLOAT16_MAT3x4_AMD = 0x91CB;
-        public const int GL_FLOAT16_MAT4x2_AMD = 0x91CC;
-        public const int GL_FLOAT16_MAT4x3_AMD = 0x91CD;
-        public const int GL_AMD_gpu_shader_int16 = 1;
-        public const int GL_AMD_gpu_shader_int64 = 1;
-        public const int GL_INT64_NV = 0x140E;
-        public const int GL_UNSIGNED_INT64_NV = 0x140F;
-        public const int GL_INT8_NV = 0x8FE0;
-        public const int GL_INT8_VEC2_NV = 0x8FE1;
-        public const int GL_INT8_VEC3_NV = 0x8FE2;
-        public const int GL_INT8_VEC4_NV = 0x8FE3;
-        public const int GL_INT16_NV = 0x8FE4;
-        public const int GL_INT16_VEC2_NV = 0x8FE5;
-        public const int GL_INT16_VEC3_NV = 0x8FE6;
-        public const int GL_INT16_VEC4_NV = 0x8FE7;
-        public const int GL_INT64_VEC2_NV = 0x8FE9;
-        public const int GL_INT64_VEC3_NV = 0x8FEA;
-        public const int GL_INT64_VEC4_NV = 0x8FEB;
-        public const int GL_UNSIGNED_INT8_NV = 0x8FEC;
-        public const int GL_UNSIGNED_INT8_VEC2_NV = 0x8FED;
-        public const int GL_UNSIGNED_INT8_VEC3_NV = 0x8FEE;
-        public const int GL_UNSIGNED_INT8_VEC4_NV = 0x8FEF;
-        public const int GL_UNSIGNED_INT16_NV = 0x8FF0;
-        public const int GL_UNSIGNED_INT16_VEC2_NV = 0x8FF1;
-        public const int GL_UNSIGNED_INT16_VEC3_NV = 0x8FF2;
-        public const int GL_UNSIGNED_INT16_VEC4_NV = 0x8FF3;
-        public const int GL_UNSIGNED_INT64_VEC2_NV = 0x8FF5;
-        public const int GL_UNSIGNED_INT64_VEC3_NV = 0x8FF6;
-        public const int GL_UNSIGNED_INT64_VEC4_NV = 0x8FF7;
-        public const int GL_AMD_interleaved_elements = 1;
-        public const int GL_VERTEX_ELEMENT_SWIZZLE_AMD = 0x91A4;
-        public const int GL_VERTEX_ID_SWIZZLE_AMD = 0x91A5;
-        public const int GL_AMD_multi_draw_indirect = 1;
-        public const int GL_AMD_name_gen_delete = 1;
-        public const int GL_DATA_BUFFER_AMD = 0x9151;
-        public const int GL_PERFORMANCE_MONITOR_AMD = 0x9152;
-        public const int GL_QUERY_OBJECT_AMD = 0x9153;
-        public const int GL_VERTEX_ARRAY_OBJECT_AMD = 0x9154;
-        public const int GL_SAMPLER_OBJECT_AMD = 0x9155;
-        public const int GL_AMD_occlusion_query_event = 1;
-        public const int GL_OCCLUSION_QUERY_EVENT_MASK_AMD = 0x874F;
-        public const int GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD = 0x00000001;
-        public const int GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD = 0x00000002;
-        public const int GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD = 0x00000004;
-        public const int GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD = 0x00000008;
-        public const int GL_QUERY_ALL_EVENT_BITS_AMD = -1;
-        public const int GL_AMD_performance_monitor = 1;
-        public const int GL_COUNTER_TYPE_AMD = 0x8BC0;
-        public const int GL_COUNTER_RANGE_AMD = 0x8BC1;
-        public const int GL_UNSIGNED_INT64_AMD = 0x8BC2;
-        public const int GL_PERCENTAGE_AMD = 0x8BC3;
-        public const int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
-        public const int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
-        public const int GL_PERFMON_RESULT_AMD = 0x8BC6;
-        public const int GL_AMD_pinned_memory = 1;
-        public const int GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD = 0x9160;
-        public const int GL_AMD_query_buffer_object = 1;
-        public const int GL_QUERY_BUFFER_AMD = 0x9192;
-        public const int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
-        public const int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
-        public const int GL_AMD_sample_positions = 1;
-        public const int GL_AMD_seamless_cubemap_per_texture = 1;
-        public const int GL_AMD_shader_atomic_counter_ops = 1;
-        public const int GL_AMD_shader_ballot = 1;
-        public const int GL_AMD_shader_explicit_vertex_parameter = 1;
-        public const int GL_AMD_shader_gpu_shader_half_float_fetch = 1;
-        public const int GL_AMD_shader_image_load_store_lod = 1;
-        public const int GL_AMD_shader_stencil_export = 1;
-        public const int GL_AMD_shader_trinary_minmax = 1;
-        public const int GL_AMD_sparse_texture = 1;
-        public const int GL_VIRTUAL_PAGE_SIZE_X_AMD = 0x9195;
-        public const int GL_VIRTUAL_PAGE_SIZE_Y_AMD = 0x9196;
-        public const int GL_VIRTUAL_PAGE_SIZE_Z_AMD = 0x9197;
-        public const int GL_MAX_SPARSE_TEXTURE_SIZE_AMD = 0x9198;
-        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD = 0x9199;
-        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS = 0x919A;
-        public const int GL_MIN_SPARSE_LEVEL_AMD = 0x919B;
-        public const int GL_MIN_LOD_WARNING_AMD = 0x919C;
-        public const int GL_TEXTURE_STORAGE_SPARSE_BIT_AMD = 0x00000001;
-        public const int GL_AMD_stencil_operation_extended = 1;
-        public const int GL_SET_AMD = 0x874A;
-        public const int GL_REPLACE_VALUE_AMD = 0x874B;
-        public const int GL_STENCIL_OP_VALUE_AMD = 0x874C;
-        public const int GL_STENCIL_BACK_OP_VALUE_AMD = 0x874D;
-        public const int GL_AMD_texture_gather_bias_lod = 1;
-        public const int GL_AMD_texture_texture4 = 1;
-        public const int GL_AMD_transform_feedback3_lines_triangles = 1;
-        public const int GL_AMD_transform_feedback4 = 1;
-        public const int GL_STREAM_RASTERIZATION_AMD = 0x91A0;
-        public const int GL_AMD_vertex_shader_layer = 1;
-        public const int GL_AMD_vertex_shader_tessellator = 1;
-        public const int GL_SAMPLER_BUFFER_AMD = 0x9001;
-        public const int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
-        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
-        public const int GL_TESSELLATION_MODE_AMD = 0x9004;
-        public const int GL_TESSELLATION_FACTOR_AMD = 0x9005;
-        public const int GL_DISCRETE_AMD = 0x9006;
-        public const int GL_CONTINUOUS_AMD = 0x9007;
-        public const int GL_AMD_vertex_shader_viewport_index = 1;
-        public const int GL_APPLE_aux_depth_stencil = 1;
-        public const int GL_AUX_DEPTH_STENCIL_APPLE = 0x8A14;
-        public const int GL_APPLE_client_storage = 1;
-        public const int GL_UNPACK_CLIENT_STORAGE_APPLE = 0x85B2;
-        public const int GL_APPLE_element_array = 1;
-        public const int GL_ELEMENT_ARRAY_APPLE = 0x8A0C;
-        public const int GL_ELEMENT_ARRAY_TYPE_APPLE = 0x8A0D;
-        public const int GL_ELEMENT_ARRAY_POINTER_APPLE = 0x8A0E;
-        public const int GL_APPLE_fence = 1;
-        public const int GL_DRAW_PIXELS_APPLE = 0x8A0A;
-        public const int GL_FENCE_APPLE = 0x8A0B;
-        public const int GL_APPLE_float_pixels = 1;
-        public const int GL_HALF_APPLE = 0x140B;
-        public const int GL_RGBA_FLOAT32_APPLE = 0x8814;
-        public const int GL_RGB_FLOAT32_APPLE = 0x8815;
-        public const int GL_ALPHA_FLOAT32_APPLE = 0x8816;
-        public const int GL_INTENSITY_FLOAT32_APPLE = 0x8817;
-        public const int GL_LUMINANCE_FLOAT32_APPLE = 0x8818;
-        public const int GL_LUMINANCE_ALPHA_FLOAT32_APPLE = 0x8819;
-        public const int GL_RGBA_FLOAT16_APPLE = 0x881A;
-        public const int GL_RGB_FLOAT16_APPLE = 0x881B;
-        public const int GL_ALPHA_FLOAT16_APPLE = 0x881C;
-        public const int GL_INTENSITY_FLOAT16_APPLE = 0x881D;
-        public const int GL_LUMINANCE_FLOAT16_APPLE = 0x881E;
-        public const int GL_LUMINANCE_ALPHA_FLOAT16_APPLE = 0x881F;
-        public const int GL_COLOR_FLOAT_APPLE = 0x8A0F;
-        public const int GL_APPLE_flush_buffer_range = 1;
-        public const int GL_BUFFER_SERIALIZED_MODIFY_APPLE = 0x8A12;
-        public const int GL_BUFFER_FLUSHING_UNMAP_APPLE = 0x8A13;
-        public const int GL_APPLE_object_purgeable = 1;
-        public const int GL_BUFFER_OBJECT_APPLE = 0x85B3;
-        public const int GL_RELEASED_APPLE = 0x8A19;
-        public const int GL_VOLATILE_APPLE = 0x8A1A;
-        public const int GL_RETAINED_APPLE = 0x8A1B;
-        public const int GL_UNDEFINED_APPLE = 0x8A1C;
-        public const int GL_PURGEABLE_APPLE = 0x8A1D;
-        public const int GL_APPLE_rgb_422 = 1;
-        public const int GL_RGB_422_APPLE = 0x8A1F;
-        public const int GL_UNSIGNED_SHORT_8_8_APPLE = 0x85BA;
-        public const int GL_UNSIGNED_SHORT_8_8_REV_APPLE = 0x85BB;
-        public const int GL_RGB_RAW_422_APPLE = 0x8A51;
-        public const int GL_APPLE_row_bytes = 1;
-        public const int GL_PACK_ROW_BYTES_APPLE = 0x8A15;
-        public const int GL_UNPACK_ROW_BYTES_APPLE = 0x8A16;
-        public const int GL_APPLE_specular_vector = 1;
-        public const int GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE = 0x85B0;
-        public const int GL_APPLE_texture_range = 1;
-        public const int GL_TEXTURE_RANGE_LENGTH_APPLE = 0x85B7;
-        public const int GL_TEXTURE_RANGE_POINTER_APPLE = 0x85B8;
-        public const int GL_TEXTURE_STORAGE_HINT_APPLE = 0x85BC;
-        public const int GL_STORAGE_PRIVATE_APPLE = 0x85BD;
-        public const int GL_STORAGE_CACHED_APPLE = 0x85BE;
-        public const int GL_STORAGE_SHARED_APPLE = 0x85BF;
-        public const int GL_APPLE_transform_hint = 1;
-        public const int GL_TRANSFORM_HINT_APPLE = 0x85B1;
-        public const int GL_APPLE_vertex_array_object = 1;
-        public const int GL_VERTEX_ARRAY_BINDING_APPLE = 0x85B5;
-        public const int GL_APPLE_vertex_array_range = 1;
-        public const int GL_VERTEX_ARRAY_RANGE_APPLE = 0x851D;
-        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE = 0x851E;
-        public const int GL_VERTEX_ARRAY_STORAGE_HINT_APPLE = 0x851F;
-        public const int GL_VERTEX_ARRAY_RANGE_POINTER_APPLE = 0x8521;
-        public const int GL_STORAGE_CLIENT_APPLE = 0x85B4;
-        public const int GL_APPLE_vertex_program_evaluators = 1;
-        public const int GL_VERTEX_ATTRIB_MAP1_APPLE = 0x8A00;
-        public const int GL_VERTEX_ATTRIB_MAP2_APPLE = 0x8A01;
-        public const int GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE = 0x8A02;
-        public const int GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE = 0x8A03;
-        public const int GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE = 0x8A04;
-        public const int GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE = 0x8A05;
-        public const int GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE = 0x8A06;
-        public const int GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE = 0x8A07;
-        public const int GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE = 0x8A08;
-        public const int GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE = 0x8A09;
-        public const int GL_APPLE_ycbcr_422 = 1;
-        public const int GL_YCBCR_422_APPLE = 0x85B9;
-        public const int GL_ATI_draw_buffers = 1;
-        public const int GL_MAX_DRAW_BUFFERS_ATI = 0x8824;
-        public const int GL_DRAW_BUFFER0_ATI = 0x8825;
-        public const int GL_DRAW_BUFFER1_ATI = 0x8826;
-        public const int GL_DRAW_BUFFER2_ATI = 0x8827;
-        public const int GL_DRAW_BUFFER3_ATI = 0x8828;
-        public const int GL_DRAW_BUFFER4_ATI = 0x8829;
-        public const int GL_DRAW_BUFFER5_ATI = 0x882A;
-        public const int GL_DRAW_BUFFER6_ATI = 0x882B;
-        public const int GL_DRAW_BUFFER7_ATI = 0x882C;
-        public const int GL_DRAW_BUFFER8_ATI = 0x882D;
-        public const int GL_DRAW_BUFFER9_ATI = 0x882E;
-        public const int GL_DRAW_BUFFER10_ATI = 0x882F;
-        public const int GL_DRAW_BUFFER11_ATI = 0x8830;
-        public const int GL_DRAW_BUFFER12_ATI = 0x8831;
-        public const int GL_DRAW_BUFFER13_ATI = 0x8832;
-        public const int GL_DRAW_BUFFER14_ATI = 0x8833;
-        public const int GL_DRAW_BUFFER15_ATI = 0x8834;
-        public const int GL_ATI_element_array = 1;
-        public const int GL_ELEMENT_ARRAY_ATI = 0x8768;
-        public const int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769;
-        public const int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A;
-        public const int GL_ATI_envmap_bumpmap = 1;
-        public const int GL_BUMP_ROT_MATRIX_ATI = 0x8775;
-        public const int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776;
-        public const int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777;
-        public const int GL_BUMP_TEX_UNITS_ATI = 0x8778;
-        public const int GL_DUDV_ATI = 0x8779;
-        public const int GL_DU8DV8_ATI = 0x877A;
-        public const int GL_BUMP_ENVMAP_ATI = 0x877B;
-        public const int GL_BUMP_TARGET_ATI = 0x877C;
-        public const int GL_ATI_fragment_shader = 1;
-        public const int GL_FRAGMENT_SHADER_ATI = 0x8920;
-        public const int GL_REG_0_ATI = 0x8921;
-        public const int GL_REG_1_ATI = 0x8922;
-        public const int GL_REG_2_ATI = 0x8923;
-        public const int GL_REG_3_ATI = 0x8924;
-        public const int GL_REG_4_ATI = 0x8925;
-        public const int GL_REG_5_ATI = 0x8926;
-        public const int GL_REG_6_ATI = 0x8927;
-        public const int GL_REG_7_ATI = 0x8928;
-        public const int GL_REG_8_ATI = 0x8929;
-        public const int GL_REG_9_ATI = 0x892A;
-        public const int GL_REG_10_ATI = 0x892B;
-        public const int GL_REG_11_ATI = 0x892C;
-        public const int GL_REG_12_ATI = 0x892D;
-        public const int GL_REG_13_ATI = 0x892E;
-        public const int GL_REG_14_ATI = 0x892F;
-        public const int GL_REG_15_ATI = 0x8930;
-        public const int GL_REG_16_ATI = 0x8931;
-        public const int GL_REG_17_ATI = 0x8932;
-        public const int GL_REG_18_ATI = 0x8933;
-        public const int GL_REG_19_ATI = 0x8934;
-        public const int GL_REG_20_ATI = 0x8935;
-        public const int GL_REG_21_ATI = 0x8936;
-        public const int GL_REG_22_ATI = 0x8937;
-        public const int GL_REG_23_ATI = 0x8938;
-        public const int GL_REG_24_ATI = 0x8939;
-        public const int GL_REG_25_ATI = 0x893A;
-        public const int GL_REG_26_ATI = 0x893B;
-        public const int GL_REG_27_ATI = 0x893C;
-        public const int GL_REG_28_ATI = 0x893D;
-        public const int GL_REG_29_ATI = 0x893E;
-        public const int GL_REG_30_ATI = 0x893F;
-        public const int GL_REG_31_ATI = 0x8940;
-        public const int GL_CON_0_ATI = 0x8941;
-        public const int GL_CON_1_ATI = 0x8942;
-        public const int GL_CON_2_ATI = 0x8943;
-        public const int GL_CON_3_ATI = 0x8944;
-        public const int GL_CON_4_ATI = 0x8945;
-        public const int GL_CON_5_ATI = 0x8946;
-        public const int GL_CON_6_ATI = 0x8947;
-        public const int GL_CON_7_ATI = 0x8948;
-        public const int GL_CON_8_ATI = 0x8949;
-        public const int GL_CON_9_ATI = 0x894A;
-        public const int GL_CON_10_ATI = 0x894B;
-        public const int GL_CON_11_ATI = 0x894C;
-        public const int GL_CON_12_ATI = 0x894D;
-        public const int GL_CON_13_ATI = 0x894E;
-        public const int GL_CON_14_ATI = 0x894F;
-        public const int GL_CON_15_ATI = 0x8950;
-        public const int GL_CON_16_ATI = 0x8951;
-        public const int GL_CON_17_ATI = 0x8952;
-        public const int GL_CON_18_ATI = 0x8953;
-        public const int GL_CON_19_ATI = 0x8954;
-        public const int GL_CON_20_ATI = 0x8955;
-        public const int GL_CON_21_ATI = 0x8956;
-        public const int GL_CON_22_ATI = 0x8957;
-        public const int GL_CON_23_ATI = 0x8958;
-        public const int GL_CON_24_ATI = 0x8959;
-        public const int GL_CON_25_ATI = 0x895A;
-        public const int GL_CON_26_ATI = 0x895B;
-        public const int GL_CON_27_ATI = 0x895C;
-        public const int GL_CON_28_ATI = 0x895D;
-        public const int GL_CON_29_ATI = 0x895E;
-        public const int GL_CON_30_ATI = 0x895F;
-        public const int GL_CON_31_ATI = 0x8960;
-        public const int GL_MOV_ATI = 0x8961;
-        public const int GL_ADD_ATI = 0x8963;
-        public const int GL_MUL_ATI = 0x8964;
-        public const int GL_SUB_ATI = 0x8965;
-        public const int GL_DOT3_ATI = 0x8966;
-        public const int GL_DOT4_ATI = 0x8967;
-        public const int GL_MAD_ATI = 0x8968;
-        public const int GL_LERP_ATI = 0x8969;
-        public const int GL_CND_ATI = 0x896A;
-        public const int GL_CND0_ATI = 0x896B;
-        public const int GL_DOT2_ADD_ATI = 0x896C;
-        public const int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D;
-        public const int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E;
-        public const int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F;
-        public const int GL_NUM_PASSES_ATI = 0x8970;
-        public const int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971;
-        public const int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972;
-        public const int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973;
-        public const int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974;
-        public const int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975;
-        public const int GL_SWIZZLE_STR_ATI = 0x8976;
-        public const int GL_SWIZZLE_STQ_ATI = 0x8977;
-        public const int GL_SWIZZLE_STR_DR_ATI = 0x8978;
-        public const int GL_SWIZZLE_STQ_DQ_ATI = 0x8979;
-        public const int GL_SWIZZLE_STRQ_ATI = 0x897A;
-        public const int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B;
-        public const int GL_RED_BIT_ATI = 0x00000001;
-        public const int GL_GREEN_BIT_ATI = 0x00000002;
-        public const int GL_BLUE_BIT_ATI = 0x00000004;
-        public const int GL_2X_BIT_ATI = 0x00000001;
-        public const int GL_4X_BIT_ATI = 0x00000002;
-        public const int GL_8X_BIT_ATI = 0x00000004;
-        public const int GL_HALF_BIT_ATI = 0x00000008;
-        public const int GL_QUARTER_BIT_ATI = 0x00000010;
-        public const int GL_EIGHTH_BIT_ATI = 0x00000020;
-        public const int GL_SATURATE_BIT_ATI = 0x00000040;
-        public const int GL_COMP_BIT_ATI = 0x00000002;
-        public const int GL_NEGATE_BIT_ATI = 0x00000004;
-        public const int GL_BIAS_BIT_ATI = 0x00000008;
-        public const int GL_ATI_map_object_buffer = 1;
-        public const int GL_ATI_meminfo = 1;
-        public const int GL_VBO_FREE_MEMORY_ATI = 0x87FB;
-        public const int GL_TEXTURE_FREE_MEMORY_ATI = 0x87FC;
-        public const int GL_RENDERBUFFER_FREE_MEMORY_ATI = 0x87FD;
-        public const int GL_ATI_pixel_format_float = 1;
-        public const int GL_RGBA_FLOAT_MODE_ATI = 0x8820;
-        public const int GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI = 0x8835;
-        public const int GL_ATI_pn_triangles = 1;
-        public const int GL_PN_TRIANGLES_ATI = 0x87F0;
-        public const int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1;
-        public const int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2;
-        public const int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3;
-        public const int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4;
-        public const int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5;
-        public const int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6;
-        public const int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7;
-        public const int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8;
-        public const int GL_ATI_separate_stencil = 1;
-        public const int GL_STENCIL_BACK_FUNC_ATI = 0x8800;
-        public const int GL_STENCIL_BACK_FAIL_ATI = 0x8801;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803;
-        public const int GL_ATI_text_fragment_shader = 1;
-        public const int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
-        public const int GL_ATI_texture_env_combine3 = 1;
-        public const int GL_MODULATE_ADD_ATI = 0x8744;
-        public const int GL_MODULATE_SIGNED_ADD_ATI = 0x8745;
-        public const int GL_MODULATE_SUBTRACT_ATI = 0x8746;
-        public const int GL_ATI_texture_float = 1;
-        public const int GL_RGBA_FLOAT32_ATI = 0x8814;
-        public const int GL_RGB_FLOAT32_ATI = 0x8815;
-        public const int GL_ALPHA_FLOAT32_ATI = 0x8816;
-        public const int GL_INTENSITY_FLOAT32_ATI = 0x8817;
-        public const int GL_LUMINANCE_FLOAT32_ATI = 0x8818;
-        public const int GL_LUMINANCE_ALPHA_FLOAT32_ATI = 0x8819;
-        public const int GL_RGBA_FLOAT16_ATI = 0x881A;
-        public const int GL_RGB_FLOAT16_ATI = 0x881B;
-        public const int GL_ALPHA_FLOAT16_ATI = 0x881C;
-        public const int GL_INTENSITY_FLOAT16_ATI = 0x881D;
-        public const int GL_LUMINANCE_FLOAT16_ATI = 0x881E;
-        public const int GL_LUMINANCE_ALPHA_FLOAT16_ATI = 0x881F;
-        public const int GL_ATI_texture_mirror_once = 1;
-        public const int GL_MIRROR_CLAMP_ATI = 0x8742;
-        public const int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743;
-        public const int GL_ATI_vertex_array_object = 1;
-        public const int GL_STATIC_ATI = 0x8760;
-        public const int GL_DYNAMIC_ATI = 0x8761;
-        public const int GL_PRESERVE_ATI = 0x8762;
-        public const int GL_DISCARD_ATI = 0x8763;
-        public const int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764;
-        public const int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765;
-        public const int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766;
-        public const int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767;
-        public const int GL_ATI_vertex_attrib_array_object = 1;
-        public const int GL_ATI_vertex_streams = 1;
-        public const int GL_MAX_VERTEX_STREAMS_ATI = 0x876B;
-        public const int GL_VERTEX_STREAM0_ATI = 0x876C;
-        public const int GL_VERTEX_STREAM1_ATI = 0x876D;
-        public const int GL_VERTEX_STREAM2_ATI = 0x876E;
-        public const int GL_VERTEX_STREAM3_ATI = 0x876F;
-        public const int GL_VERTEX_STREAM4_ATI = 0x8770;
-        public const int GL_VERTEX_STREAM5_ATI = 0x8771;
-        public const int GL_VERTEX_STREAM6_ATI = 0x8772;
-        public const int GL_VERTEX_STREAM7_ATI = 0x8773;
-        public const int GL_VERTEX_SOURCE_ATI = 0x8774;
-        public const int GL_EXT_422_pixels = 1;
-        public const int GL_422_EXT = 0x80CC;
-        public const int GL_422_REV_EXT = 0x80CD;
-        public const int GL_422_AVERAGE_EXT = 0x80CE;
-        public const int GL_422_REV_AVERAGE_EXT = 0x80CF;
-        public const int GL_EXT_EGL_image_storage = 1;
-        public const int GL_EXT_abgr = 1;
-        public const int GL_ABGR_EXT = 0x8000;
-        public const int GL_EXT_bgra = 1;
-        public const int GL_BGR_EXT = 0x80E0;
-        public const int GL_BGRA_EXT = 0x80E1;
-        public const int GL_EXT_bindable_uniform = 1;
-        public const int GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT = 0x8DE2;
-        public const int GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT = 0x8DE3;
-        public const int GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT = 0x8DE4;
-        public const int GL_MAX_BINDABLE_UNIFORM_SIZE_EXT = 0x8DED;
-        public const int GL_UNIFORM_BUFFER_EXT = 0x8DEE;
-        public const int GL_UNIFORM_BUFFER_BINDING_EXT = 0x8DEF;
-        public const int GL_EXT_blend_color = 1;
-        public const int GL_CONSTANT_COLOR_EXT = 0x8001;
-        public const int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002;
-        public const int GL_CONSTANT_ALPHA_EXT = 0x8003;
-        public const int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004;
-        public const int GL_BLEND_COLOR_EXT = 0x8005;
-        public const int GL_EXT_blend_equation_separate = 1;
-        public const int GL_BLEND_EQUATION_RGB_EXT = 0x8009;
-        public const int GL_BLEND_EQUATION_ALPHA_EXT = 0x883D;
-        public const int GL_EXT_blend_func_separate = 1;
-        public const int GL_BLEND_DST_RGB_EXT = 0x80C8;
-        public const int GL_BLEND_SRC_RGB_EXT = 0x80C9;
-        public const int GL_BLEND_DST_ALPHA_EXT = 0x80CA;
-        public const int GL_BLEND_SRC_ALPHA_EXT = 0x80CB;
-        public const int GL_EXT_blend_logic_op = 1;
-        public const int GL_EXT_blend_minmax = 1;
-        public const int GL_MIN_EXT = 0x8007;
-        public const int GL_MAX_EXT = 0x8008;
-        public const int GL_FUNC_ADD_EXT = 0x8006;
-        public const int GL_BLEND_EQUATION_EXT = 0x8009;
-        public const int GL_EXT_blend_subtract = 1;
-        public const int GL_FUNC_SUBTRACT_EXT = 0x800A;
-        public const int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B;
-        public const int GL_EXT_clip_volume_hint = 1;
-        public const int GL_CLIP_VOLUME_CLIPPING_HINT_EXT = 0x80F0;
-        public const int GL_EXT_cmyka = 1;
-        public const int GL_CMYK_EXT = 0x800C;
-        public const int GL_CMYKA_EXT = 0x800D;
-        public const int GL_PACK_CMYK_HINT_EXT = 0x800E;
-        public const int GL_UNPACK_CMYK_HINT_EXT = 0x800F;
-        public const int GL_EXT_color_subtable = 1;
-        public const int GL_EXT_compiled_vertex_array = 1;
-        public const int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8;
-        public const int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9;
-        public const int GL_EXT_convolution = 1;
-        public const int GL_CONVOLUTION_1D_EXT = 0x8010;
-        public const int GL_CONVOLUTION_2D_EXT = 0x8011;
-        public const int GL_SEPARABLE_2D_EXT = 0x8012;
-        public const int GL_CONVOLUTION_BORDER_MODE_EXT = 0x8013;
-        public const int GL_CONVOLUTION_FILTER_SCALE_EXT = 0x8014;
-        public const int GL_CONVOLUTION_FILTER_BIAS_EXT = 0x8015;
-        public const int GL_REDUCE_EXT = 0x8016;
-        public const int GL_CONVOLUTION_FORMAT_EXT = 0x8017;
-        public const int GL_CONVOLUTION_WIDTH_EXT = 0x8018;
-        public const int GL_CONVOLUTION_HEIGHT_EXT = 0x8019;
-        public const int GL_MAX_CONVOLUTION_WIDTH_EXT = 0x801A;
-        public const int GL_MAX_CONVOLUTION_HEIGHT_EXT = 0x801B;
-        public const int GL_POST_CONVOLUTION_RED_SCALE_EXT = 0x801C;
-        public const int GL_POST_CONVOLUTION_GREEN_SCALE_EXT = 0x801D;
-        public const int GL_POST_CONVOLUTION_BLUE_SCALE_EXT = 0x801E;
-        public const int GL_POST_CONVOLUTION_ALPHA_SCALE_EXT = 0x801F;
-        public const int GL_POST_CONVOLUTION_RED_BIAS_EXT = 0x8020;
-        public const int GL_POST_CONVOLUTION_GREEN_BIAS_EXT = 0x8021;
-        public const int GL_POST_CONVOLUTION_BLUE_BIAS_EXT = 0x8022;
-        public const int GL_POST_CONVOLUTION_ALPHA_BIAS_EXT = 0x8023;
-        public const int GL_EXT_coordinate_frame = 1;
-        public const int GL_TANGENT_ARRAY_EXT = 0x8439;
-        public const int GL_BINORMAL_ARRAY_EXT = 0x843A;
-        public const int GL_CURRENT_TANGENT_EXT = 0x843B;
-        public const int GL_CURRENT_BINORMAL_EXT = 0x843C;
-        public const int GL_TANGENT_ARRAY_TYPE_EXT = 0x843E;
-        public const int GL_TANGENT_ARRAY_STRIDE_EXT = 0x843F;
-        public const int GL_BINORMAL_ARRAY_TYPE_EXT = 0x8440;
-        public const int GL_BINORMAL_ARRAY_STRIDE_EXT = 0x8441;
-        public const int GL_TANGENT_ARRAY_POINTER_EXT = 0x8442;
-        public const int GL_BINORMAL_ARRAY_POINTER_EXT = 0x8443;
-        public const int GL_MAP1_TANGENT_EXT = 0x8444;
-        public const int GL_MAP2_TANGENT_EXT = 0x8445;
-        public const int GL_MAP1_BINORMAL_EXT = 0x8446;
-        public const int GL_MAP2_BINORMAL_EXT = 0x8447;
-        public const int GL_EXT_copy_texture = 1;
-        public const int GL_EXT_cull_vertex = 1;
-        public const int GL_CULL_VERTEX_EXT = 0x81AA;
-        public const int GL_CULL_VERTEX_EYE_POSITION_EXT = 0x81AB;
-        public const int GL_CULL_VERTEX_OBJECT_POSITION_EXT = 0x81AC;
-        public const int GL_EXT_debug_label = 1;
-        public const int GL_PROGRAM_PIPELINE_OBJECT_EXT = 0x8A4F;
-        public const int GL_PROGRAM_OBJECT_EXT = 0x8B40;
-        public const int GL_SHADER_OBJECT_EXT = 0x8B48;
-        public const int GL_BUFFER_OBJECT_EXT = 0x9151;
-        public const int GL_QUERY_OBJECT_EXT = 0x9153;
-        public const int GL_VERTEX_ARRAY_OBJECT_EXT = 0x9154;
-        public const int GL_EXT_debug_marker = 1;
-        public const int GL_EXT_depth_bounds_test = 1;
-        public const int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890;
-        public const int GL_DEPTH_BOUNDS_EXT = 0x8891;
-        public const int GL_EXT_direct_state_access = 1;
-        public const int GL_PROGRAM_MATRIX_EXT = 0x8E2D;
-        public const int GL_TRANSPOSE_PROGRAM_MATRIX_EXT = 0x8E2E;
-        public const int GL_PROGRAM_MATRIX_STACK_DEPTH_EXT = 0x8E2F;
-        public const int GL_EXT_draw_buffers2 = 1;
-        public const int GL_EXT_draw_instanced = 1;
-        public const int GL_EXT_draw_range_elements = 1;
-        public const int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8;
-        public const int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9;
-        public const int GL_EXT_external_buffer = 1;
-        public const int GL_EXT_fog_coord = 1;
-        public const int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450;
-        public const int GL_FOG_COORDINATE_EXT = 0x8451;
-        public const int GL_FRAGMENT_DEPTH_EXT = 0x8452;
-        public const int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453;
-        public const int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454;
-        public const int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455;
-        public const int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456;
-        public const int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457;
-        public const int GL_EXT_framebuffer_blit = 1;
-        public const int GL_READ_FRAMEBUFFER_EXT = 0x8CA8;
-        public const int GL_DRAW_FRAMEBUFFER_EXT = 0x8CA9;
-        public const int GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
-        public const int GL_READ_FRAMEBUFFER_BINDING_EXT = 0x8CAA;
-        public const int GL_EXT_framebuffer_multisample = 1;
-        public const int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x8D56;
-        public const int GL_MAX_SAMPLES_EXT = 0x8D57;
-        public const int GL_EXT_framebuffer_multisample_blit_scaled = 1;
-        public const int GL_SCALED_RESOLVE_FASTEST_EXT = 0x90BA;
-        public const int GL_SCALED_RESOLVE_NICEST_EXT = 0x90BB;
-        public const int GL_EXT_framebuffer_object = 1;
-        public const int GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506;
-        public const int GL_MAX_RENDERBUFFER_SIZE_EXT = 0x84E8;
-        public const int GL_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
-        public const int GL_RENDERBUFFER_BINDING_EXT = 0x8CA7;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT = 0x8CD0;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT = 0x8CD1;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT = 0x8CD2;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT = 0x8CD4;
-        public const int GL_FRAMEBUFFER_COMPLETE_EXT = 0x8CD5;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT = 0x8CD6;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT = 0x8CD7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT = 0x8CD9;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT = 0x8CDA;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT = 0x8CDB;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT = 0x8CDC;
-        public const int GL_FRAMEBUFFER_UNSUPPORTED_EXT = 0x8CDD;
-        public const int GL_MAX_COLOR_ATTACHMENTS_EXT = 0x8CDF;
-        public const int GL_COLOR_ATTACHMENT0_EXT = 0x8CE0;
-        public const int GL_COLOR_ATTACHMENT1_EXT = 0x8CE1;
-        public const int GL_COLOR_ATTACHMENT2_EXT = 0x8CE2;
-        public const int GL_COLOR_ATTACHMENT3_EXT = 0x8CE3;
-        public const int GL_COLOR_ATTACHMENT4_EXT = 0x8CE4;
-        public const int GL_COLOR_ATTACHMENT5_EXT = 0x8CE5;
-        public const int GL_COLOR_ATTACHMENT6_EXT = 0x8CE6;
-        public const int GL_COLOR_ATTACHMENT7_EXT = 0x8CE7;
-        public const int GL_COLOR_ATTACHMENT8_EXT = 0x8CE8;
-        public const int GL_COLOR_ATTACHMENT9_EXT = 0x8CE9;
-        public const int GL_COLOR_ATTACHMENT10_EXT = 0x8CEA;
-        public const int GL_COLOR_ATTACHMENT11_EXT = 0x8CEB;
-        public const int GL_COLOR_ATTACHMENT12_EXT = 0x8CEC;
-        public const int GL_COLOR_ATTACHMENT13_EXT = 0x8CED;
-        public const int GL_COLOR_ATTACHMENT14_EXT = 0x8CEE;
-        public const int GL_COLOR_ATTACHMENT15_EXT = 0x8CEF;
-        public const int GL_DEPTH_ATTACHMENT_EXT = 0x8D00;
-        public const int GL_STENCIL_ATTACHMENT_EXT = 0x8D20;
-        public const int GL_FRAMEBUFFER_EXT = 0x8D40;
-        public const int GL_RENDERBUFFER_EXT = 0x8D41;
-        public const int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42;
-        public const int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43;
-        public const int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44;
-        public const int GL_STENCIL_INDEX1_EXT = 0x8D46;
-        public const int GL_STENCIL_INDEX4_EXT = 0x8D47;
-        public const int GL_STENCIL_INDEX8_EXT = 0x8D48;
-        public const int GL_STENCIL_INDEX16_EXT = 0x8D49;
-        public const int GL_RENDERBUFFER_RED_SIZE_EXT = 0x8D50;
-        public const int GL_RENDERBUFFER_GREEN_SIZE_EXT = 0x8D51;
-        public const int GL_RENDERBUFFER_BLUE_SIZE_EXT = 0x8D52;
-        public const int GL_RENDERBUFFER_ALPHA_SIZE_EXT = 0x8D53;
-        public const int GL_RENDERBUFFER_DEPTH_SIZE_EXT = 0x8D54;
-        public const int GL_RENDERBUFFER_STENCIL_SIZE_EXT = 0x8D55;
-        public const int GL_EXT_framebuffer_sRGB = 1;
-        public const int GL_FRAMEBUFFER_SRGB_EXT = 0x8DB9;
-        public const int GL_FRAMEBUFFER_SRGB_CAPABLE_EXT = 0x8DBA;
-        public const int GL_EXT_geometry_shader4 = 1;
-        public const int GL_GEOMETRY_SHADER_EXT = 0x8DD9;
-        public const int GL_GEOMETRY_VERTICES_OUT_EXT = 0x8DDA;
-        public const int GL_GEOMETRY_INPUT_TYPE_EXT = 0x8DDB;
-        public const int GL_GEOMETRY_OUTPUT_TYPE_EXT = 0x8DDC;
-        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT = 0x8C29;
-        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT = 0x8DDD;
-        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_EXT = 0x8DDE;
-        public const int GL_MAX_VARYING_COMPONENTS_EXT = 0x8B4B;
-        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT = 0x8DDF;
-        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT = 0x8DE0;
-        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT = 0x8DE1;
-        public const int GL_LINES_ADJACENCY_EXT = 0x000A;
-        public const int GL_LINE_STRIP_ADJACENCY_EXT = 0x000B;
-        public const int GL_TRIANGLES_ADJACENCY_EXT = 0x000C;
-        public const int GL_TRIANGLE_STRIP_ADJACENCY_EXT = 0x000D;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT = 0x8DA8;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT = 0x8DA9;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT = 0x8DA7;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT = 0x8CD4;
-        public const int GL_PROGRAM_POINT_SIZE_EXT = 0x8642;
-        public const int GL_EXT_gpu_program_parameters = 1;
-        public const int GL_EXT_gpu_shader4 = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT = 0x88FD;
-        public const int GL_SAMPLER_1D_ARRAY_EXT = 0x8DC0;
-        public const int GL_SAMPLER_2D_ARRAY_EXT = 0x8DC1;
-        public const int GL_SAMPLER_BUFFER_EXT = 0x8DC2;
-        public const int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3;
-        public const int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4;
-        public const int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5;
-        public const int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6;
-        public const int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7;
-        public const int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8;
-        public const int GL_INT_SAMPLER_1D_EXT = 0x8DC9;
-        public const int GL_INT_SAMPLER_2D_EXT = 0x8DCA;
-        public const int GL_INT_SAMPLER_3D_EXT = 0x8DCB;
-        public const int GL_INT_SAMPLER_CUBE_EXT = 0x8DCC;
-        public const int GL_INT_SAMPLER_2D_RECT_EXT = 0x8DCD;
-        public const int GL_INT_SAMPLER_1D_ARRAY_EXT = 0x8DCE;
-        public const int GL_INT_SAMPLER_2D_ARRAY_EXT = 0x8DCF;
-        public const int GL_INT_SAMPLER_BUFFER_EXT = 0x8DD0;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D_EXT = 0x8DD1;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_EXT = 0x8DD2;
-        public const int GL_UNSIGNED_INT_SAMPLER_3D_EXT = 0x8DD3;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_EXT = 0x8DD4;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT = 0x8DD5;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT = 0x8DD6;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT = 0x8DD7;
-        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT = 0x8DD8;
-        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_EXT = 0x8904;
-        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_EXT = 0x8905;
-        public const int GL_EXT_histogram = 1;
-        public const int GL_HISTOGRAM_EXT = 0x8024;
-        public const int GL_PROXY_HISTOGRAM_EXT = 0x8025;
-        public const int GL_HISTOGRAM_WIDTH_EXT = 0x8026;
-        public const int GL_HISTOGRAM_FORMAT_EXT = 0x8027;
-        public const int GL_HISTOGRAM_RED_SIZE_EXT = 0x8028;
-        public const int GL_HISTOGRAM_GREEN_SIZE_EXT = 0x8029;
-        public const int GL_HISTOGRAM_BLUE_SIZE_EXT = 0x802A;
-        public const int GL_HISTOGRAM_ALPHA_SIZE_EXT = 0x802B;
-        public const int GL_HISTOGRAM_LUMINANCE_SIZE_EXT = 0x802C;
-        public const int GL_HISTOGRAM_SINK_EXT = 0x802D;
-        public const int GL_MINMAX_EXT = 0x802E;
-        public const int GL_MINMAX_FORMAT_EXT = 0x802F;
-        public const int GL_MINMAX_SINK_EXT = 0x8030;
-        public const int GL_TABLE_TOO_LARGE_EXT = 0x8031;
-        public const int GL_EXT_index_array_formats = 1;
-        public const int GL_IUI_V2F_EXT = 0x81AD;
-        public const int GL_IUI_V3F_EXT = 0x81AE;
-        public const int GL_IUI_N3F_V2F_EXT = 0x81AF;
-        public const int GL_IUI_N3F_V3F_EXT = 0x81B0;
-        public const int GL_T2F_IUI_V2F_EXT = 0x81B1;
-        public const int GL_T2F_IUI_V3F_EXT = 0x81B2;
-        public const int GL_T2F_IUI_N3F_V2F_EXT = 0x81B3;
-        public const int GL_T2F_IUI_N3F_V3F_EXT = 0x81B4;
-        public const int GL_EXT_index_func = 1;
-        public const int GL_INDEX_TEST_EXT = 0x81B5;
-        public const int GL_INDEX_TEST_FUNC_EXT = 0x81B6;
-        public const int GL_INDEX_TEST_REF_EXT = 0x81B7;
-        public const int GL_EXT_index_material = 1;
-        public const int GL_INDEX_MATERIAL_EXT = 0x81B8;
-        public const int GL_INDEX_MATERIAL_PARAMETER_EXT = 0x81B9;
-        public const int GL_INDEX_MATERIAL_FACE_EXT = 0x81BA;
-        public const int GL_EXT_index_texture = 1;
-        public const int GL_EXT_light_texture = 1;
-        public const int GL_FRAGMENT_MATERIAL_EXT = 0x8349;
-        public const int GL_FRAGMENT_NORMAL_EXT = 0x834A;
-        public const int GL_FRAGMENT_COLOR_EXT = 0x834C;
-        public const int GL_ATTENUATION_EXT = 0x834D;
-        public const int GL_SHADOW_ATTENUATION_EXT = 0x834E;
-        public const int GL_TEXTURE_APPLICATION_MODE_EXT = 0x834F;
-        public const int GL_TEXTURE_LIGHT_EXT = 0x8350;
-        public const int GL_TEXTURE_MATERIAL_FACE_EXT = 0x8351;
-        public const int GL_TEXTURE_MATERIAL_PARAMETER_EXT = 0x8352;
-        public const int GL_EXT_memory_object = 1;
-        public const int GL_TEXTURE_TILING_EXT = 0x9580;
-        public const int GL_DEDICATED_MEMORY_OBJECT_EXT = 0x9581;
-        public const int GL_PROTECTED_MEMORY_OBJECT_EXT = 0x959B;
-        public const int GL_NUM_TILING_TYPES_EXT = 0x9582;
-        public const int GL_TILING_TYPES_EXT = 0x9583;
-        public const int GL_OPTIMAL_TILING_EXT = 0x9584;
-        public const int GL_LINEAR_TILING_EXT = 0x9585;
-        public const int GL_NUM_DEVICE_UUIDS_EXT = 0x9596;
-        public const int GL_DEVICE_UUID_EXT = 0x9597;
-        public const int GL_DRIVER_UUID_EXT = 0x9598;
-        public const int GL_UUID_SIZE_EXT = 16;
-        public const int GL_EXT_memory_object_fd = 1;
-        public const int GL_HANDLE_TYPE_OPAQUE_FD_EXT = 0x9586;
-        public const int GL_EXT_memory_object_win32 = 1;
-        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_EXT = 0x9587;
-        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT = 0x9588;
-        public const int GL_DEVICE_LUID_EXT = 0x9599;
-        public const int GL_DEVICE_NODE_MASK_EXT = 0x959A;
-        public const int GL_LUID_SIZE_EXT = 8;
-        public const int GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT = 0x9589;
-        public const int GL_HANDLE_TYPE_D3D12_RESOURCE_EXT = 0x958A;
-        public const int GL_HANDLE_TYPE_D3D11_IMAGE_EXT = 0x958B;
-        public const int GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT = 0x958C;
-        public const int GL_EXT_misc_attribute = 1;
-        public const int GL_EXT_multi_draw_arrays = 1;
-        public const int GL_EXT_multisample = 1;
-        public const int GL_MULTISAMPLE_EXT = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_MASK_EXT = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE_EXT = 0x809F;
-        public const int GL_SAMPLE_MASK_EXT = 0x80A0;
-        public const int GL_1PASS_EXT = 0x80A1;
-        public const int GL_2PASS_0_EXT = 0x80A2;
-        public const int GL_2PASS_1_EXT = 0x80A3;
-        public const int GL_4PASS_0_EXT = 0x80A4;
-        public const int GL_4PASS_1_EXT = 0x80A5;
-        public const int GL_4PASS_2_EXT = 0x80A6;
-        public const int GL_4PASS_3_EXT = 0x80A7;
-        public const int GL_SAMPLE_BUFFERS_EXT = 0x80A8;
-        public const int GL_SAMPLES_EXT = 0x80A9;
-        public const int GL_SAMPLE_MASK_VALUE_EXT = 0x80AA;
-        public const int GL_SAMPLE_MASK_INVERT_EXT = 0x80AB;
-        public const int GL_SAMPLE_PATTERN_EXT = 0x80AC;
-        public const int GL_MULTISAMPLE_BIT_EXT = 0x20000000;
-        public const int GL_EXT_packed_depth_stencil = 1;
-        public const int GL_DEPTH_STENCIL_EXT = 0x84F9;
-        public const int GL_UNSIGNED_INT_24_8_EXT = 0x84FA;
-        public const int GL_DEPTH24_STENCIL8_EXT = 0x88F0;
-        public const int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88F1;
-        public const int GL_EXT_packed_float = 1;
-        public const int GL_R11F_G11F_B10F_EXT = 0x8C3A;
-        public const int GL_UNSIGNED_INT_10F_11F_11F_REV_EXT = 0x8C3B;
-        public const int GL_RGBA_SIGNED_COMPONENTS_EXT = 0x8C3C;
-        public const int GL_EXT_packed_pixels = 1;
-        public const int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032;
-        public const int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033;
-        public const int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034;
-        public const int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035;
-        public const int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036;
-        public const int GL_EXT_paletted_texture = 1;
-        public const int GL_COLOR_INDEX1_EXT = 0x80E2;
-        public const int GL_COLOR_INDEX2_EXT = 0x80E3;
-        public const int GL_COLOR_INDEX4_EXT = 0x80E4;
-        public const int GL_COLOR_INDEX8_EXT = 0x80E5;
-        public const int GL_COLOR_INDEX12_EXT = 0x80E6;
-        public const int GL_COLOR_INDEX16_EXT = 0x80E7;
-        public const int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED;
-        public const int GL_EXT_pixel_buffer_object = 1;
-        public const int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB;
-        public const int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC;
-        public const int GL_PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED;
-        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF;
-        public const int GL_EXT_pixel_transform = 1;
-        public const int GL_PIXEL_TRANSFORM_2D_EXT = 0x8330;
-        public const int GL_PIXEL_MAG_FILTER_EXT = 0x8331;
-        public const int GL_PIXEL_MIN_FILTER_EXT = 0x8332;
-        public const int GL_PIXEL_CUBIC_WEIGHT_EXT = 0x8333;
-        public const int GL_CUBIC_EXT = 0x8334;
-        public const int GL_AVERAGE_EXT = 0x8335;
-        public const int GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8336;
-        public const int GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8337;
-        public const int GL_PIXEL_TRANSFORM_2D_MATRIX_EXT = 0x8338;
-        public const int GL_EXT_pixel_transform_color_table = 1;
-        public const int GL_EXT_point_parameters = 1;
-        public const int GL_POINT_SIZE_MIN_EXT = 0x8126;
-        public const int GL_POINT_SIZE_MAX_EXT = 0x8127;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128;
-        public const int GL_DISTANCE_ATTENUATION_EXT = 0x8129;
-        public const int GL_EXT_polygon_offset = 1;
-        public const int GL_POLYGON_OFFSET_EXT = 0x8037;
-        public const int GL_POLYGON_OFFSET_FACTOR_EXT = 0x8038;
-        public const int GL_POLYGON_OFFSET_BIAS_EXT = 0x8039;
-        public const int GL_EXT_polygon_offset_clamp = 1;
-        public const int GL_POLYGON_OFFSET_CLAMP_EXT = 0x8E1B;
-        public const int GL_EXT_post_depth_coverage = 1;
-        public const int GL_EXT_provoking_vertex = 1;
-        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = 0x8E4C;
-        public const int GL_FIRST_VERTEX_CONVENTION_EXT = 0x8E4D;
-        public const int GL_LAST_VERTEX_CONVENTION_EXT = 0x8E4E;
-        public const int GL_PROVOKING_VERTEX_EXT = 0x8E4F;
-        public const int GL_EXT_raster_multisample = 1;
-        public const int GL_RASTER_MULTISAMPLE_EXT = 0x9327;
-        public const int GL_RASTER_SAMPLES_EXT = 0x9328;
-        public const int GL_MAX_RASTER_SAMPLES_EXT = 0x9329;
-        public const int GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT = 0x932A;
-        public const int GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT = 0x932B;
-        public const int GL_EFFECTIVE_RASTER_SAMPLES_EXT = 0x932C;
-        public const int GL_EXT_rescale_normal = 1;
-        public const int GL_RESCALE_NORMAL_EXT = 0x803A;
-        public const int GL_EXT_secondary_color = 1;
-        public const int GL_COLOR_SUM_EXT = 0x8458;
-        public const int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459;
-        public const int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A;
-        public const int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B;
-        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C;
-        public const int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D;
-        public const int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E;
-        public const int GL_EXT_semaphore = 1;
-        public const int GL_LAYOUT_GENERAL_EXT = 0x958D;
-        public const int GL_LAYOUT_COLOR_ATTACHMENT_EXT = 0x958E;
-        public const int GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT = 0x958F;
-        public const int GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT = 0x9590;
-        public const int GL_LAYOUT_SHADER_READ_ONLY_EXT = 0x9591;
-        public const int GL_LAYOUT_TRANSFER_SRC_EXT = 0x9592;
-        public const int GL_LAYOUT_TRANSFER_DST_EXT = 0x9593;
-        public const int GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT = 0x9530;
-        public const int GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT = 0x9531;
-        public const int GL_EXT_semaphore_fd = 1;
-        public const int GL_EXT_semaphore_win32 = 1;
-        public const int GL_HANDLE_TYPE_D3D12_FENCE_EXT = 0x9594;
-        public const int GL_D3D12_FENCE_VALUE_EXT = 0x9595;
-        public const int GL_EXT_separate_shader_objects = 1;
-        public const int GL_ACTIVE_PROGRAM_EXT = 0x8B8D;
-        public const int GL_EXT_separate_specular_color = 1;
-        public const int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8;
-        public const int GL_SINGLE_COLOR_EXT = 0x81F9;
-        public const int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA;
-        public const int GL_EXT_shader_framebuffer_fetch = 1;
-        public const int GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT = 0x8A52;
-        public const int GL_EXT_shader_framebuffer_fetch_non_coherent = 1;
-        public const int GL_EXT_shader_image_load_formatted = 1;
-        public const int GL_EXT_shader_image_load_store = 1;
-        public const int GL_MAX_IMAGE_UNITS_EXT = 0x8F38;
-        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT = 0x8F39;
-        public const int GL_IMAGE_BINDING_NAME_EXT = 0x8F3A;
-        public const int GL_IMAGE_BINDING_LEVEL_EXT = 0x8F3B;
-        public const int GL_IMAGE_BINDING_LAYERED_EXT = 0x8F3C;
-        public const int GL_IMAGE_BINDING_LAYER_EXT = 0x8F3D;
-        public const int GL_IMAGE_BINDING_ACCESS_EXT = 0x8F3E;
-        public const int GL_IMAGE_1D_EXT = 0x904C;
-        public const int GL_IMAGE_2D_EXT = 0x904D;
-        public const int GL_IMAGE_3D_EXT = 0x904E;
-        public const int GL_IMAGE_2D_RECT_EXT = 0x904F;
-        public const int GL_IMAGE_CUBE_EXT = 0x9050;
-        public const int GL_IMAGE_BUFFER_EXT = 0x9051;
-        public const int GL_IMAGE_1D_ARRAY_EXT = 0x9052;
-        public const int GL_IMAGE_2D_ARRAY_EXT = 0x9053;
-        public const int GL_IMAGE_CUBE_MAP_ARRAY_EXT = 0x9054;
-        public const int GL_IMAGE_2D_MULTISAMPLE_EXT = 0x9055;
-        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9056;
-        public const int GL_INT_IMAGE_1D_EXT = 0x9057;
-        public const int GL_INT_IMAGE_2D_EXT = 0x9058;
-        public const int GL_INT_IMAGE_3D_EXT = 0x9059;
-        public const int GL_INT_IMAGE_2D_RECT_EXT = 0x905A;
-        public const int GL_INT_IMAGE_CUBE_EXT = 0x905B;
-        public const int GL_INT_IMAGE_BUFFER_EXT = 0x905C;
-        public const int GL_INT_IMAGE_1D_ARRAY_EXT = 0x905D;
-        public const int GL_INT_IMAGE_2D_ARRAY_EXT = 0x905E;
-        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x905F;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x9060;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9061;
-        public const int GL_UNSIGNED_INT_IMAGE_1D_EXT = 0x9062;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_EXT = 0x9063;
-        public const int GL_UNSIGNED_INT_IMAGE_3D_EXT = 0x9064;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT = 0x9065;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE_EXT = 0x9066;
-        public const int GL_UNSIGNED_INT_IMAGE_BUFFER_EXT = 0x9067;
-        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT = 0x9068;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT = 0x9069;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x906A;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x906B;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x906C;
-        public const int GL_MAX_IMAGE_SAMPLES_EXT = 0x906D;
-        public const int GL_IMAGE_BINDING_FORMAT_EXT = 0x906E;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT = 0x00000001;
-        public const int GL_ELEMENT_ARRAY_BARRIER_BIT_EXT = 0x00000002;
-        public const int GL_UNIFORM_BARRIER_BIT_EXT = 0x00000004;
-        public const int GL_TEXTURE_FETCH_BARRIER_BIT_EXT = 0x00000008;
-        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT = 0x00000020;
-        public const int GL_COMMAND_BARRIER_BIT_EXT = 0x00000040;
-        public const int GL_PIXEL_BUFFER_BARRIER_BIT_EXT = 0x00000080;
-        public const int GL_TEXTURE_UPDATE_BARRIER_BIT_EXT = 0x00000100;
-        public const int GL_BUFFER_UPDATE_BARRIER_BIT_EXT = 0x00000200;
-        public const int GL_FRAMEBUFFER_BARRIER_BIT_EXT = 0x00000400;
-        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT = 0x00000800;
-        public const int GL_ATOMIC_COUNTER_BARRIER_BIT_EXT = 0x00001000;
-        public const int GL_ALL_BARRIER_BITS_EXT = -1;
-        public const int GL_EXT_shader_integer_mix = 1;
-        public const int GL_EXT_shadow_funcs = 1;
-        public const int GL_EXT_shared_texture_palette = 1;
-        public const int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB;
-        public const int GL_EXT_sparse_texture2 = 1;
-        public const int GL_EXT_stencil_clear_tag = 1;
-        public const int GL_STENCIL_TAG_BITS_EXT = 0x88F2;
-        public const int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88F3;
-        public const int GL_EXT_stencil_two_side = 1;
-        public const int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910;
-        public const int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911;
-        public const int GL_EXT_stencil_wrap = 1;
-        public const int GL_INCR_WRAP_EXT = 0x8507;
-        public const int GL_DECR_WRAP_EXT = 0x8508;
-        public const int GL_EXT_subtexture = 1;
-        public const int GL_EXT_texture = 1;
-        public const int GL_ALPHA4_EXT = 0x803B;
-        public const int GL_ALPHA8_EXT = 0x803C;
-        public const int GL_ALPHA12_EXT = 0x803D;
-        public const int GL_ALPHA16_EXT = 0x803E;
-        public const int GL_LUMINANCE4_EXT = 0x803F;
-        public const int GL_LUMINANCE8_EXT = 0x8040;
-        public const int GL_LUMINANCE12_EXT = 0x8041;
-        public const int GL_LUMINANCE16_EXT = 0x8042;
-        public const int GL_LUMINANCE4_ALPHA4_EXT = 0x8043;
-        public const int GL_LUMINANCE6_ALPHA2_EXT = 0x8044;
-        public const int GL_LUMINANCE8_ALPHA8_EXT = 0x8045;
-        public const int GL_LUMINANCE12_ALPHA4_EXT = 0x8046;
-        public const int GL_LUMINANCE12_ALPHA12_EXT = 0x8047;
-        public const int GL_LUMINANCE16_ALPHA16_EXT = 0x8048;
-        public const int GL_INTENSITY_EXT = 0x8049;
-        public const int GL_INTENSITY4_EXT = 0x804A;
-        public const int GL_INTENSITY8_EXT = 0x804B;
-        public const int GL_INTENSITY12_EXT = 0x804C;
-        public const int GL_INTENSITY16_EXT = 0x804D;
-        public const int GL_RGB2_EXT = 0x804E;
-        public const int GL_RGB4_EXT = 0x804F;
-        public const int GL_RGB5_EXT = 0x8050;
-        public const int GL_RGB8_EXT = 0x8051;
-        public const int GL_RGB10_EXT = 0x8052;
-        public const int GL_RGB12_EXT = 0x8053;
-        public const int GL_RGB16_EXT = 0x8054;
-        public const int GL_RGBA2_EXT = 0x8055;
-        public const int GL_RGBA4_EXT = 0x8056;
-        public const int GL_RGB5_A1_EXT = 0x8057;
-        public const int GL_RGBA8_EXT = 0x8058;
-        public const int GL_RGB10_A2_EXT = 0x8059;
-        public const int GL_RGBA12_EXT = 0x805A;
-        public const int GL_RGBA16_EXT = 0x805B;
-        public const int GL_TEXTURE_RED_SIZE_EXT = 0x805C;
-        public const int GL_TEXTURE_GREEN_SIZE_EXT = 0x805D;
-        public const int GL_TEXTURE_BLUE_SIZE_EXT = 0x805E;
-        public const int GL_TEXTURE_ALPHA_SIZE_EXT = 0x805F;
-        public const int GL_TEXTURE_LUMINANCE_SIZE_EXT = 0x8060;
-        public const int GL_TEXTURE_INTENSITY_SIZE_EXT = 0x8061;
-        public const int GL_REPLACE_EXT = 0x8062;
-        public const int GL_PROXY_TEXTURE_1D_EXT = 0x8063;
-        public const int GL_PROXY_TEXTURE_2D_EXT = 0x8064;
-        public const int GL_TEXTURE_TOO_LARGE_EXT = 0x8065;
-        public const int GL_EXT_texture3D = 1;
-        public const int GL_PACK_SKIP_IMAGES_EXT = 0x806B;
-        public const int GL_PACK_IMAGE_HEIGHT_EXT = 0x806C;
-        public const int GL_UNPACK_SKIP_IMAGES_EXT = 0x806D;
-        public const int GL_UNPACK_IMAGE_HEIGHT_EXT = 0x806E;
-        public const int GL_TEXTURE_3D_EXT = 0x806F;
-        public const int GL_PROXY_TEXTURE_3D_EXT = 0x8070;
-        public const int GL_TEXTURE_DEPTH_EXT = 0x8071;
-        public const int GL_TEXTURE_WRAP_R_EXT = 0x8072;
-        public const int GL_MAX_3D_TEXTURE_SIZE_EXT = 0x8073;
-        public const int GL_EXT_texture_array = 1;
-        public const int GL_TEXTURE_1D_ARRAY_EXT = 0x8C18;
-        public const int GL_PROXY_TEXTURE_1D_ARRAY_EXT = 0x8C19;
-        public const int GL_TEXTURE_2D_ARRAY_EXT = 0x8C1A;
-        public const int GL_PROXY_TEXTURE_2D_ARRAY_EXT = 0x8C1B;
-        public const int GL_TEXTURE_BINDING_1D_ARRAY_EXT = 0x8C1C;
-        public const int GL_TEXTURE_BINDING_2D_ARRAY_EXT = 0x8C1D;
-        public const int GL_MAX_ARRAY_TEXTURE_LAYERS_EXT = 0x88FF;
-        public const int GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT = 0x884E;
-        public const int GL_EXT_texture_buffer_object = 1;
-        public const int GL_TEXTURE_BUFFER_EXT = 0x8C2A;
-        public const int GL_MAX_TEXTURE_BUFFER_SIZE_EXT = 0x8C2B;
-        public const int GL_TEXTURE_BINDING_BUFFER_EXT = 0x8C2C;
-        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT = 0x8C2D;
-        public const int GL_TEXTURE_BUFFER_FORMAT_EXT = 0x8C2E;
-        public const int GL_EXT_texture_compression_latc = 1;
-        public const int GL_COMPRESSED_LUMINANCE_LATC1_EXT = 0x8C70;
-        public const int GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT = 0x8C71;
-        public const int GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C72;
-        public const int GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C73;
-        public const int GL_EXT_texture_compression_rgtc = 1;
-        public const int GL_COMPRESSED_RED_RGTC1_EXT = 0x8DBB;
-        public const int GL_COMPRESSED_SIGNED_RED_RGTC1_EXT = 0x8DBC;
-        public const int GL_COMPRESSED_RED_GREEN_RGTC2_EXT = 0x8DBD;
-        public const int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT = 0x8DBE;
-        public const int GL_EXT_texture_compression_s3tc = 1;
-        public const int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
-        public const int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
-        public const int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2;
-        public const int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
-        public const int GL_EXT_texture_cube_map = 1;
-        public const int GL_NORMAL_MAP_EXT = 0x8511;
-        public const int GL_REFLECTION_MAP_EXT = 0x8512;
-        public const int GL_TEXTURE_CUBE_MAP_EXT = 0x8513;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_EXT = 0x8514;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT = 0x8515;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT = 0x8516;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT = 0x8517;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT = 0x8518;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT = 0x8519;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT = 0x851A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_EXT = 0x851B;
-        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT = 0x851C;
-        public const int GL_EXT_texture_env_add = 1;
-        public const int GL_EXT_texture_env_combine = 1;
-        public const int GL_COMBINE_EXT = 0x8570;
-        public const int GL_COMBINE_RGB_EXT = 0x8571;
-        public const int GL_COMBINE_ALPHA_EXT = 0x8572;
-        public const int GL_RGB_SCALE_EXT = 0x8573;
-        public const int GL_ADD_SIGNED_EXT = 0x8574;
-        public const int GL_INTERPOLATE_EXT = 0x8575;
-        public const int GL_CONSTANT_EXT = 0x8576;
-        public const int GL_PRIMARY_COLOR_EXT = 0x8577;
-        public const int GL_PREVIOUS_EXT = 0x8578;
-        public const int GL_SOURCE0_RGB_EXT = 0x8580;
-        public const int GL_SOURCE1_RGB_EXT = 0x8581;
-        public const int GL_SOURCE2_RGB_EXT = 0x8582;
-        public const int GL_SOURCE0_ALPHA_EXT = 0x8588;
-        public const int GL_SOURCE1_ALPHA_EXT = 0x8589;
-        public const int GL_SOURCE2_ALPHA_EXT = 0x858A;
-        public const int GL_OPERAND0_RGB_EXT = 0x8590;
-        public const int GL_OPERAND1_RGB_EXT = 0x8591;
-        public const int GL_OPERAND2_RGB_EXT = 0x8592;
-        public const int GL_OPERAND0_ALPHA_EXT = 0x8598;
-        public const int GL_OPERAND1_ALPHA_EXT = 0x8599;
-        public const int GL_OPERAND2_ALPHA_EXT = 0x859A;
-        public const int GL_EXT_texture_env_dot3 = 1;
-        public const int GL_DOT3_RGB_EXT = 0x8740;
-        public const int GL_DOT3_RGBA_EXT = 0x8741;
-        public const int GL_EXT_texture_filter_anisotropic = 1;
-        public const int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
-        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
-        public const int GL_EXT_texture_filter_minmax = 1;
-        public const int GL_TEXTURE_REDUCTION_MODE_EXT = 0x9366;
-        public const int GL_WEIGHTED_AVERAGE_EXT = 0x9367;
-        public const int GL_EXT_texture_integer = 1;
-        public const int GL_RGBA32UI_EXT = 0x8D70;
-        public const int GL_RGB32UI_EXT = 0x8D71;
-        public const int GL_ALPHA32UI_EXT = 0x8D72;
-        public const int GL_INTENSITY32UI_EXT = 0x8D73;
-        public const int GL_LUMINANCE32UI_EXT = 0x8D74;
-        public const int GL_LUMINANCE_ALPHA32UI_EXT = 0x8D75;
-        public const int GL_RGBA16UI_EXT = 0x8D76;
-        public const int GL_RGB16UI_EXT = 0x8D77;
-        public const int GL_ALPHA16UI_EXT = 0x8D78;
-        public const int GL_INTENSITY16UI_EXT = 0x8D79;
-        public const int GL_LUMINANCE16UI_EXT = 0x8D7A;
-        public const int GL_LUMINANCE_ALPHA16UI_EXT = 0x8D7B;
-        public const int GL_RGBA8UI_EXT = 0x8D7C;
-        public const int GL_RGB8UI_EXT = 0x8D7D;
-        public const int GL_ALPHA8UI_EXT = 0x8D7E;
-        public const int GL_INTENSITY8UI_EXT = 0x8D7F;
-        public const int GL_LUMINANCE8UI_EXT = 0x8D80;
-        public const int GL_LUMINANCE_ALPHA8UI_EXT = 0x8D81;
-        public const int GL_RGBA32I_EXT = 0x8D82;
-        public const int GL_RGB32I_EXT = 0x8D83;
-        public const int GL_ALPHA32I_EXT = 0x8D84;
-        public const int GL_INTENSITY32I_EXT = 0x8D85;
-        public const int GL_LUMINANCE32I_EXT = 0x8D86;
-        public const int GL_LUMINANCE_ALPHA32I_EXT = 0x8D87;
-        public const int GL_RGBA16I_EXT = 0x8D88;
-        public const int GL_RGB16I_EXT = 0x8D89;
-        public const int GL_ALPHA16I_EXT = 0x8D8A;
-        public const int GL_INTENSITY16I_EXT = 0x8D8B;
-        public const int GL_LUMINANCE16I_EXT = 0x8D8C;
-        public const int GL_LUMINANCE_ALPHA16I_EXT = 0x8D8D;
-        public const int GL_RGBA8I_EXT = 0x8D8E;
-        public const int GL_RGB8I_EXT = 0x8D8F;
-        public const int GL_ALPHA8I_EXT = 0x8D90;
-        public const int GL_INTENSITY8I_EXT = 0x8D91;
-        public const int GL_LUMINANCE8I_EXT = 0x8D92;
-        public const int GL_LUMINANCE_ALPHA8I_EXT = 0x8D93;
-        public const int GL_RED_INTEGER_EXT = 0x8D94;
-        public const int GL_GREEN_INTEGER_EXT = 0x8D95;
-        public const int GL_BLUE_INTEGER_EXT = 0x8D96;
-        public const int GL_ALPHA_INTEGER_EXT = 0x8D97;
-        public const int GL_RGB_INTEGER_EXT = 0x8D98;
-        public const int GL_RGBA_INTEGER_EXT = 0x8D99;
-        public const int GL_BGR_INTEGER_EXT = 0x8D9A;
-        public const int GL_BGRA_INTEGER_EXT = 0x8D9B;
-        public const int GL_LUMINANCE_INTEGER_EXT = 0x8D9C;
-        public const int GL_LUMINANCE_ALPHA_INTEGER_EXT = 0x8D9D;
-        public const int GL_RGBA_INTEGER_MODE_EXT = 0x8D9E;
-        public const int GL_EXT_texture_lod_bias = 1;
-        public const int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD;
-        public const int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500;
-        public const int GL_TEXTURE_LOD_BIAS_EXT = 0x8501;
-        public const int GL_EXT_texture_mirror_clamp = 1;
-        public const int GL_MIRROR_CLAMP_EXT = 0x8742;
-        public const int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743;
-        public const int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912;
-        public const int GL_EXT_texture_object = 1;
-        public const int GL_TEXTURE_PRIORITY_EXT = 0x8066;
-        public const int GL_TEXTURE_RESIDENT_EXT = 0x8067;
-        public const int GL_TEXTURE_1D_BINDING_EXT = 0x8068;
-        public const int GL_TEXTURE_2D_BINDING_EXT = 0x8069;
-        public const int GL_TEXTURE_3D_BINDING_EXT = 0x806A;
-        public const int GL_EXT_texture_perturb_normal = 1;
-        public const int GL_PERTURB_EXT = 0x85AE;
-        public const int GL_TEXTURE_NORMAL_EXT = 0x85AF;
-        public const int GL_EXT_texture_sRGB = 1;
-        public const int GL_SRGB_EXT = 0x8C40;
-        public const int GL_SRGB8_EXT = 0x8C41;
-        public const int GL_SRGB_ALPHA_EXT = 0x8C42;
-        public const int GL_SRGB8_ALPHA8_EXT = 0x8C43;
-        public const int GL_SLUMINANCE_ALPHA_EXT = 0x8C44;
-        public const int GL_SLUMINANCE8_ALPHA8_EXT = 0x8C45;
-        public const int GL_SLUMINANCE_EXT = 0x8C46;
-        public const int GL_SLUMINANCE8_EXT = 0x8C47;
-        public const int GL_COMPRESSED_SRGB_EXT = 0x8C48;
-        public const int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8C49;
-        public const int GL_COMPRESSED_SLUMINANCE_EXT = 0x8C4A;
-        public const int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8C4B;
-        public const int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C;
-        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D;
-        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E;
-        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8C4F;
-        public const int GL_EXT_texture_sRGB_decode = 1;
-        public const int GL_TEXTURE_SRGB_DECODE_EXT = 0x8A48;
-        public const int GL_DECODE_EXT = 0x8A49;
-        public const int GL_SKIP_DECODE_EXT = 0x8A4A;
-        public const int GL_EXT_texture_shared_exponent = 1;
-        public const int GL_RGB9_E5_EXT = 0x8C3D;
-        public const int GL_UNSIGNED_INT_5_9_9_9_REV_EXT = 0x8C3E;
-        public const int GL_TEXTURE_SHARED_SIZE_EXT = 0x8C3F;
-        public const int GL_EXT_texture_snorm = 1;
-        public const int GL_ALPHA_SNORM = 0x9010;
-        public const int GL_LUMINANCE_SNORM = 0x9011;
-        public const int GL_LUMINANCE_ALPHA_SNORM = 0x9012;
-        public const int GL_INTENSITY_SNORM = 0x9013;
-        public const int GL_ALPHA8_SNORM = 0x9014;
-        public const int GL_LUMINANCE8_SNORM = 0x9015;
-        public const int GL_LUMINANCE8_ALPHA8_SNORM = 0x9016;
-        public const int GL_INTENSITY8_SNORM = 0x9017;
-        public const int GL_ALPHA16_SNORM = 0x9018;
-        public const int GL_LUMINANCE16_SNORM = 0x9019;
-        public const int GL_LUMINANCE16_ALPHA16_SNORM = 0x901A;
-        public const int GL_INTENSITY16_SNORM = 0x901B;
-        public const int GL_RED_SNORM = 0x8F90;
-        public const int GL_RG_SNORM = 0x8F91;
-        public const int GL_RGB_SNORM = 0x8F92;
-        public const int GL_RGBA_SNORM = 0x8F93;
-        public const int GL_EXT_texture_swizzle = 1;
-        public const int GL_TEXTURE_SWIZZLE_R_EXT = 0x8E42;
-        public const int GL_TEXTURE_SWIZZLE_G_EXT = 0x8E43;
-        public const int GL_TEXTURE_SWIZZLE_B_EXT = 0x8E44;
-        public const int GL_TEXTURE_SWIZZLE_A_EXT = 0x8E45;
-        public const int GL_TEXTURE_SWIZZLE_RGBA_EXT = 0x8E46;
-        public const int GL_EXT_timer_query = 1;
-        public const int GL_TIME_ELAPSED_EXT = 0x88BF;
-        public const int GL_EXT_transform_feedback = 1;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_EXT = 0x8C8E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT = 0x8C84;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT = 0x8C85;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT = 0x8C8F;
-        public const int GL_INTERLEAVED_ATTRIBS_EXT = 0x8C8C;
-        public const int GL_SEPARATE_ATTRIBS_EXT = 0x8C8D;
-        public const int GL_PRIMITIVES_GENERATED_EXT = 0x8C87;
-        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT = 0x8C88;
-        public const int GL_RASTERIZER_DISCARD_EXT = 0x8C89;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT = 0x8C8B;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT = 0x8C80;
-        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_EXT = 0x8C83;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT = 0x8C7F;
-        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT = 0x8C76;
-        public const int GL_EXT_vertex_array = 1;
-        public const int GL_VERTEX_ARRAY_EXT = 0x8074;
-        public const int GL_NORMAL_ARRAY_EXT = 0x8075;
-        public const int GL_COLOR_ARRAY_EXT = 0x8076;
-        public const int GL_INDEX_ARRAY_EXT = 0x8077;
-        public const int GL_TEXTURE_COORD_ARRAY_EXT = 0x8078;
-        public const int GL_EDGE_FLAG_ARRAY_EXT = 0x8079;
-        public const int GL_VERTEX_ARRAY_SIZE_EXT = 0x807A;
-        public const int GL_VERTEX_ARRAY_TYPE_EXT = 0x807B;
-        public const int GL_VERTEX_ARRAY_STRIDE_EXT = 0x807C;
-        public const int GL_VERTEX_ARRAY_COUNT_EXT = 0x807D;
-        public const int GL_NORMAL_ARRAY_TYPE_EXT = 0x807E;
-        public const int GL_NORMAL_ARRAY_STRIDE_EXT = 0x807F;
-        public const int GL_NORMAL_ARRAY_COUNT_EXT = 0x8080;
-        public const int GL_COLOR_ARRAY_SIZE_EXT = 0x8081;
-        public const int GL_COLOR_ARRAY_TYPE_EXT = 0x8082;
-        public const int GL_COLOR_ARRAY_STRIDE_EXT = 0x8083;
-        public const int GL_COLOR_ARRAY_COUNT_EXT = 0x8084;
-        public const int GL_INDEX_ARRAY_TYPE_EXT = 0x8085;
-        public const int GL_INDEX_ARRAY_STRIDE_EXT = 0x8086;
-        public const int GL_INDEX_ARRAY_COUNT_EXT = 0x8087;
-        public const int GL_TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088;
-        public const int GL_TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089;
-        public const int GL_TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A;
-        public const int GL_TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B;
-        public const int GL_EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C;
-        public const int GL_EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D;
-        public const int GL_VERTEX_ARRAY_POINTER_EXT = 0x808E;
-        public const int GL_NORMAL_ARRAY_POINTER_EXT = 0x808F;
-        public const int GL_COLOR_ARRAY_POINTER_EXT = 0x8090;
-        public const int GL_INDEX_ARRAY_POINTER_EXT = 0x8091;
-        public const int GL_TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092;
-        public const int GL_EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093;
-        public const int GL_EXT_vertex_array_bgra = 1;
-        public const int GL_EXT_vertex_attrib_64bit = 1;
-        public const int GL_DOUBLE_VEC2_EXT = 0x8FFC;
-        public const int GL_DOUBLE_VEC3_EXT = 0x8FFD;
-        public const int GL_DOUBLE_VEC4_EXT = 0x8FFE;
-        public const int GL_DOUBLE_MAT2_EXT = 0x8F46;
-        public const int GL_DOUBLE_MAT3_EXT = 0x8F47;
-        public const int GL_DOUBLE_MAT4_EXT = 0x8F48;
-        public const int GL_DOUBLE_MAT2x3_EXT = 0x8F49;
-        public const int GL_DOUBLE_MAT2x4_EXT = 0x8F4A;
-        public const int GL_DOUBLE_MAT3x2_EXT = 0x8F4B;
-        public const int GL_DOUBLE_MAT3x4_EXT = 0x8F4C;
-        public const int GL_DOUBLE_MAT4x2_EXT = 0x8F4D;
-        public const int GL_DOUBLE_MAT4x3_EXT = 0x8F4E;
-        public const int GL_EXT_vertex_shader = 1;
-        public const int GL_VERTEX_SHADER_EXT = 0x8780;
-        public const int GL_VERTEX_SHADER_BINDING_EXT = 0x8781;
-        public const int GL_OP_INDEX_EXT = 0x8782;
-        public const int GL_OP_NEGATE_EXT = 0x8783;
-        public const int GL_OP_DOT3_EXT = 0x8784;
-        public const int GL_OP_DOT4_EXT = 0x8785;
-        public const int GL_OP_MUL_EXT = 0x8786;
-        public const int GL_OP_ADD_EXT = 0x8787;
-        public const int GL_OP_MADD_EXT = 0x8788;
-        public const int GL_OP_FRAC_EXT = 0x8789;
-        public const int GL_OP_MAX_EXT = 0x878A;
-        public const int GL_OP_MIN_EXT = 0x878B;
-        public const int GL_OP_SET_GE_EXT = 0x878C;
-        public const int GL_OP_SET_LT_EXT = 0x878D;
-        public const int GL_OP_CLAMP_EXT = 0x878E;
-        public const int GL_OP_FLOOR_EXT = 0x878F;
-        public const int GL_OP_ROUND_EXT = 0x8790;
-        public const int GL_OP_EXP_BASE_2_EXT = 0x8791;
-        public const int GL_OP_LOG_BASE_2_EXT = 0x8792;
-        public const int GL_OP_POWER_EXT = 0x8793;
-        public const int GL_OP_RECIP_EXT = 0x8794;
-        public const int GL_OP_RECIP_SQRT_EXT = 0x8795;
-        public const int GL_OP_SUB_EXT = 0x8796;
-        public const int GL_OP_CROSS_PRODUCT_EXT = 0x8797;
-        public const int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798;
-        public const int GL_OP_MOV_EXT = 0x8799;
-        public const int GL_OUTPUT_VERTEX_EXT = 0x879A;
-        public const int GL_OUTPUT_COLOR0_EXT = 0x879B;
-        public const int GL_OUTPUT_COLOR1_EXT = 0x879C;
-        public const int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D;
-        public const int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E;
-        public const int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F;
-        public const int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0;
-        public const int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1;
-        public const int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2;
-        public const int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3;
-        public const int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4;
-        public const int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5;
-        public const int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6;
-        public const int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7;
-        public const int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8;
-        public const int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9;
-        public const int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA;
-        public const int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB;
-        public const int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC;
-        public const int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD;
-        public const int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE;
-        public const int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF;
-        public const int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0;
-        public const int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1;
-        public const int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2;
-        public const int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3;
-        public const int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4;
-        public const int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5;
-        public const int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6;
-        public const int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7;
-        public const int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8;
-        public const int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9;
-        public const int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA;
-        public const int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB;
-        public const int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC;
-        public const int GL_OUTPUT_FOG_EXT = 0x87BD;
-        public const int GL_SCALAR_EXT = 0x87BE;
-        public const int GL_VECTOR_EXT = 0x87BF;
-        public const int GL_MATRIX_EXT = 0x87C0;
-        public const int GL_VARIANT_EXT = 0x87C1;
-        public const int GL_INVARIANT_EXT = 0x87C2;
-        public const int GL_LOCAL_CONSTANT_EXT = 0x87C3;
-        public const int GL_LOCAL_EXT = 0x87C4;
-        public const int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5;
-        public const int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6;
-        public const int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7;
-        public const int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8;
-        public const int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CC;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CD;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE;
-        public const int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF;
-        public const int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0;
-        public const int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1;
-        public const int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2;
-        public const int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3;
-        public const int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4;
-        public const int GL_X_EXT = 0x87D5;
-        public const int GL_Y_EXT = 0x87D6;
-        public const int GL_Z_EXT = 0x87D7;
-        public const int GL_W_EXT = 0x87D8;
-        public const int GL_NEGATIVE_X_EXT = 0x87D9;
-        public const int GL_NEGATIVE_Y_EXT = 0x87DA;
-        public const int GL_NEGATIVE_Z_EXT = 0x87DB;
-        public const int GL_NEGATIVE_W_EXT = 0x87DC;
-        public const int GL_ZERO_EXT = 0x87DD;
-        public const int GL_ONE_EXT = 0x87DE;
-        public const int GL_NEGATIVE_ONE_EXT = 0x87DF;
-        public const int GL_NORMALIZED_RANGE_EXT = 0x87E0;
-        public const int GL_FULL_RANGE_EXT = 0x87E1;
-        public const int GL_CURRENT_VERTEX_EXT = 0x87E2;
-        public const int GL_MVP_MATRIX_EXT = 0x87E3;
-        public const int GL_VARIANT_VALUE_EXT = 0x87E4;
-        public const int GL_VARIANT_DATATYPE_EXT = 0x87E5;
-        public const int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6;
-        public const int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7;
-        public const int GL_VARIANT_ARRAY_EXT = 0x87E8;
-        public const int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9;
-        public const int GL_INVARIANT_VALUE_EXT = 0x87EA;
-        public const int GL_INVARIANT_DATATYPE_EXT = 0x87EB;
-        public const int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC;
-        public const int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED;
-        public const int GL_EXT_vertex_weighting = 1;
-        public const int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3;
-        public const int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502;
-        public const int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6;
-        public const int GL_MODELVIEW1_MATRIX_EXT = 0x8506;
-        public const int GL_VERTEX_WEIGHTING_EXT = 0x8509;
-        public const int GL_MODELVIEW0_EXT = 0x1700;
-        public const int GL_MODELVIEW1_EXT = 0x850A;
-        public const int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B;
-        public const int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C;
-        public const int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D;
-        public const int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E;
-        public const int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F;
-        public const int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510;
-        public const int GL_EXT_win32_keyed_mutex = 1;
-        public const int GL_EXT_window_rectangles = 1;
-        public const int GL_INCLUSIVE_EXT = 0x8F10;
-        public const int GL_EXCLUSIVE_EXT = 0x8F11;
-        public const int GL_WINDOW_RECTANGLE_EXT = 0x8F12;
-        public const int GL_WINDOW_RECTANGLE_MODE_EXT = 0x8F13;
-        public const int GL_MAX_WINDOW_RECTANGLES_EXT = 0x8F14;
-        public const int GL_NUM_WINDOW_RECTANGLES_EXT = 0x8F15;
-        public const int GL_EXT_x11_sync_object = 1;
-        public const int GL_SYNC_X11_FENCE_EXT = 0x90E1;
-        public const int GL_GREMEDY_frame_terminator = 1;
-        public const int GL_GREMEDY_string_marker = 1;
-        public const int GL_HP_convolution_border_modes = 1;
-        public const int GL_IGNORE_BORDER_HP = 0x8150;
-        public const int GL_CONSTANT_BORDER_HP = 0x8151;
-        public const int GL_REPLICATE_BORDER_HP = 0x8153;
-        public const int GL_CONVOLUTION_BORDER_COLOR_HP = 0x8154;
-        public const int GL_HP_image_transform = 1;
-        public const int GL_IMAGE_SCALE_X_HP = 0x8155;
-        public const int GL_IMAGE_SCALE_Y_HP = 0x8156;
-        public const int GL_IMAGE_TRANSLATE_X_HP = 0x8157;
-        public const int GL_IMAGE_TRANSLATE_Y_HP = 0x8158;
-        public const int GL_IMAGE_ROTATE_ANGLE_HP = 0x8159;
-        public const int GL_IMAGE_ROTATE_ORIGIN_X_HP = 0x815A;
-        public const int GL_IMAGE_ROTATE_ORIGIN_Y_HP = 0x815B;
-        public const int GL_IMAGE_MAG_FILTER_HP = 0x815C;
-        public const int GL_IMAGE_MIN_FILTER_HP = 0x815D;
-        public const int GL_IMAGE_CUBIC_WEIGHT_HP = 0x815E;
-        public const int GL_CUBIC_HP = 0x815F;
-        public const int GL_AVERAGE_HP = 0x8160;
-        public const int GL_IMAGE_TRANSFORM_2D_HP = 0x8161;
-        public const int GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8162;
-        public const int GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8163;
-        public const int GL_HP_occlusion_test = 1;
-        public const int GL_OCCLUSION_TEST_HP = 0x8165;
-        public const int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;
-        public const int GL_HP_texture_lighting = 1;
-        public const int GL_TEXTURE_LIGHTING_MODE_HP = 0x8167;
-        public const int GL_TEXTURE_POST_SPECULAR_HP = 0x8168;
-        public const int GL_TEXTURE_PRE_SPECULAR_HP = 0x8169;
-        public const int GL_IBM_cull_vertex = 1;
-        public const int GL_CULL_VERTEX_IBM = 103050;
-        public const int GL_IBM_multimode_draw_arrays = 1;
-        public const int GL_IBM_rasterpos_clip = 1;
-        public const int GL_RASTER_POSITION_UNCLIPPED_IBM = 0x19262;
-        public const int GL_IBM_static_data = 1;
-        public const int GL_ALL_STATIC_DATA_IBM = 103060;
-        public const int GL_STATIC_VERTEX_ARRAY_IBM = 103061;
-        public const int GL_IBM_texture_mirrored_repeat = 1;
-        public const int GL_MIRRORED_REPEAT_IBM = 0x8370;
-        public const int GL_IBM_vertex_array_lists = 1;
-        public const int GL_VERTEX_ARRAY_LIST_IBM = 103070;
-        public const int GL_NORMAL_ARRAY_LIST_IBM = 103071;
-        public const int GL_COLOR_ARRAY_LIST_IBM = 103072;
-        public const int GL_INDEX_ARRAY_LIST_IBM = 103073;
-        public const int GL_TEXTURE_COORD_ARRAY_LIST_IBM = 103074;
-        public const int GL_EDGE_FLAG_ARRAY_LIST_IBM = 103075;
-        public const int GL_FOG_COORDINATE_ARRAY_LIST_IBM = 103076;
-        public const int GL_SECONDARY_COLOR_ARRAY_LIST_IBM = 103077;
-        public const int GL_VERTEX_ARRAY_LIST_STRIDE_IBM = 103080;
-        public const int GL_NORMAL_ARRAY_LIST_STRIDE_IBM = 103081;
-        public const int GL_COLOR_ARRAY_LIST_STRIDE_IBM = 103082;
-        public const int GL_INDEX_ARRAY_LIST_STRIDE_IBM = 103083;
-        public const int GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM = 103084;
-        public const int GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM = 103085;
-        public const int GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM = 103086;
-        public const int GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM = 103087;
-        public const int GL_INGR_blend_func_separate = 1;
-        public const int GL_INGR_color_clamp = 1;
-        public const int GL_RED_MIN_CLAMP_INGR = 0x8560;
-        public const int GL_GREEN_MIN_CLAMP_INGR = 0x8561;
-        public const int GL_BLUE_MIN_CLAMP_INGR = 0x8562;
-        public const int GL_ALPHA_MIN_CLAMP_INGR = 0x8563;
-        public const int GL_RED_MAX_CLAMP_INGR = 0x8564;
-        public const int GL_GREEN_MAX_CLAMP_INGR = 0x8565;
-        public const int GL_BLUE_MAX_CLAMP_INGR = 0x8566;
-        public const int GL_ALPHA_MAX_CLAMP_INGR = 0x8567;
-        public const int GL_INGR_interlace_read = 1;
-        public const int GL_INTERLACE_READ_INGR = 0x8568;
-        public const int GL_INTEL_blackhole_render = 1;
-        public const int GL_BLACKHOLE_RENDER_INTEL = 0x83FC;
-        public const int GL_INTEL_conservative_rasterization = 1;
-        public const int GL_CONSERVATIVE_RASTERIZATION_INTEL = 0x83FE;
-        public const int GL_INTEL_fragment_shader_ordering = 1;
-        public const int GL_INTEL_framebuffer_CMAA = 1;
-        public const int GL_INTEL_map_texture = 1;
-        public const int GL_TEXTURE_MEMORY_LAYOUT_INTEL = 0x83FF;
-        public const int GL_LAYOUT_DEFAULT_INTEL = 0;
-        public const int GL_LAYOUT_LINEAR_INTEL = 1;
-        public const int GL_LAYOUT_LINEAR_CPU_CACHED_INTEL = 2;
-        public const int GL_INTEL_parallel_arrays = 1;
-        public const int GL_PARALLEL_ARRAYS_INTEL = 0x83F4;
-        public const int GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F5;
-        public const int GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F6;
-        public const int GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F7;
-        public const int GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F8;
-        public const int GL_INTEL_performance_query = 1;
-        public const int GL_PERFQUERY_SINGLE_CONTEXT_INTEL = 0x00000000;
-        public const int GL_PERFQUERY_GLOBAL_CONTEXT_INTEL = 0x00000001;
-        public const int GL_PERFQUERY_WAIT_INTEL = 0x83FB;
-        public const int GL_PERFQUERY_FLUSH_INTEL = 0x83FA;
-        public const int GL_PERFQUERY_DONOT_FLUSH_INTEL = 0x83F9;
-        public const int GL_PERFQUERY_COUNTER_EVENT_INTEL = 0x94F0;
-        public const int GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL = 0x94F1;
-        public const int GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL = 0x94F2;
-        public const int GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL = 0x94F3;
-        public const int GL_PERFQUERY_COUNTER_RAW_INTEL = 0x94F4;
-        public const int GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL = 0x94F5;
-        public const int GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL = 0x94F8;
-        public const int GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL = 0x94F9;
-        public const int GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL = 0x94FA;
-        public const int GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL = 0x94FB;
-        public const int GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL = 0x94FC;
-        public const int GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL = 0x94FD;
-        public const int GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL = 0x94FE;
-        public const int GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL = 0x94FF;
-        public const int GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL = 0x9500;
-        public const int GL_MESAX_texture_stack = 1;
-        public const int GL_TEXTURE_1D_STACK_MESAX = 0x8759;
-        public const int GL_TEXTURE_2D_STACK_MESAX = 0x875A;
-        public const int GL_PROXY_TEXTURE_1D_STACK_MESAX = 0x875B;
-        public const int GL_PROXY_TEXTURE_2D_STACK_MESAX = 0x875C;
-        public const int GL_TEXTURE_1D_STACK_BINDING_MESAX = 0x875D;
-        public const int GL_TEXTURE_2D_STACK_BINDING_MESAX = 0x875E;
-        public const int GL_MESA_pack_invert = 1;
-        public const int GL_PACK_INVERT_MESA = 0x8758;
-        public const int GL_MESA_program_binary_formats = 1;
-        public const int GL_PROGRAM_BINARY_FORMAT_MESA = 0x875F;
-        public const int GL_MESA_resize_buffers = 1;
-        public const int GL_MESA_shader_integer_functions = 1;
-        public const int GL_MESA_tile_raster_order = 1;
-        public const int GL_TILE_RASTER_ORDER_FIXED_MESA = 0x8BB8;
-        public const int GL_TILE_RASTER_ORDER_INCREASING_X_MESA = 0x8BB9;
-        public const int GL_TILE_RASTER_ORDER_INCREASING_Y_MESA = 0x8BBA;
-        public const int GL_MESA_window_pos = 1;
-        public const int GL_MESA_ycbcr_texture = 1;
-        public const int GL_UNSIGNED_SHORT_8_8_MESA = 0x85BA;
-        public const int GL_UNSIGNED_SHORT_8_8_REV_MESA = 0x85BB;
-        public const int GL_YCBCR_MESA = 0x8757;
-        public const int GL_NVX_blend_equation_advanced_multi_draw_buffers = 1;
-        public const int GL_NVX_conditional_render = 1;
-        public const int GL_NVX_gpu_memory_info = 1;
-        public const int GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX = 0x9047;
-        public const int GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX = 0x9048;
-        public const int GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX = 0x9049;
-        public const int GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX = 0x904A;
-        public const int GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX = 0x904B;
-        public const int GL_NVX_linked_gpu_multicast = 1;
-        public const int GL_LGPU_SEPARATE_STORAGE_BIT_NVX = 0x0800;
-        public const int GL_MAX_LGPU_GPUS_NVX = 0x92BA;
-        public const int GL_NV_alpha_to_coverage_dither_control = 1;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV = 0x934D;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV = 0x934E;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV = 0x934F;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV = 0x92BF;
-        public const int GL_NV_bindless_multi_draw_indirect = 1;
-        public const int GL_NV_bindless_multi_draw_indirect_count = 1;
-        public const int GL_NV_bindless_texture = 1;
-        public const int GL_NV_blend_equation_advanced = 1;
-        public const int GL_BLEND_OVERLAP_NV = 0x9281;
-        public const int GL_BLEND_PREMULTIPLIED_SRC_NV = 0x9280;
-        public const int GL_BLUE_NV = 0x1905;
-        public const int GL_COLORBURN_NV = 0x929A;
-        public const int GL_COLORDODGE_NV = 0x9299;
-        public const int GL_CONJOINT_NV = 0x9284;
-        public const int GL_CONTRAST_NV = 0x92A1;
-        public const int GL_DARKEN_NV = 0x9297;
-        public const int GL_DIFFERENCE_NV = 0x929E;
-        public const int GL_DISJOINT_NV = 0x9283;
-        public const int GL_DST_ATOP_NV = 0x928F;
-        public const int GL_DST_IN_NV = 0x928B;
-        public const int GL_DST_NV = 0x9287;
-        public const int GL_DST_OUT_NV = 0x928D;
-        public const int GL_DST_OVER_NV = 0x9289;
-        public const int GL_EXCLUSION_NV = 0x92A0;
-        public const int GL_GREEN_NV = 0x1904;
-        public const int GL_HARDLIGHT_NV = 0x929B;
-        public const int GL_HARDMIX_NV = 0x92A9;
-        public const int GL_HSL_COLOR_NV = 0x92AF;
-        public const int GL_HSL_HUE_NV = 0x92AD;
-        public const int GL_HSL_LUMINOSITY_NV = 0x92B0;
-        public const int GL_HSL_SATURATION_NV = 0x92AE;
-        public const int GL_INVERT_OVG_NV = 0x92B4;
-        public const int GL_INVERT_RGB_NV = 0x92A3;
-        public const int GL_LIGHTEN_NV = 0x9298;
-        public const int GL_LINEARBURN_NV = 0x92A5;
-        public const int GL_LINEARDODGE_NV = 0x92A4;
-        public const int GL_LINEARLIGHT_NV = 0x92A7;
-        public const int GL_MINUS_CLAMPED_NV = 0x92B3;
-        public const int GL_MINUS_NV = 0x929F;
-        public const int GL_MULTIPLY_NV = 0x9294;
-        public const int GL_OVERLAY_NV = 0x9296;
-        public const int GL_PINLIGHT_NV = 0x92A8;
-        public const int GL_PLUS_CLAMPED_ALPHA_NV = 0x92B2;
-        public const int GL_PLUS_CLAMPED_NV = 0x92B1;
-        public const int GL_PLUS_DARKER_NV = 0x9292;
-        public const int GL_PLUS_NV = 0x9291;
-        public const int GL_RED_NV = 0x1903;
-        public const int GL_SCREEN_NV = 0x9295;
-        public const int GL_SOFTLIGHT_NV = 0x929C;
-        public const int GL_SRC_ATOP_NV = 0x928E;
-        public const int GL_SRC_IN_NV = 0x928A;
-        public const int GL_SRC_NV = 0x9286;
-        public const int GL_SRC_OUT_NV = 0x928C;
-        public const int GL_SRC_OVER_NV = 0x9288;
-        public const int GL_UNCORRELATED_NV = 0x9282;
-        public const int GL_VIVIDLIGHT_NV = 0x92A6;
-        public const int GL_XOR_NV = 0x1506;
-        public const int GL_NV_blend_equation_advanced_coherent = 1;
-        public const int GL_BLEND_ADVANCED_COHERENT_NV = 0x9285;
-        public const int GL_NV_blend_minmax_factor = 1;
-        public const int GL_NV_blend_square = 1;
-        public const int GL_NV_clip_space_w_scaling = 1;
-        public const int GL_VIEWPORT_POSITION_W_SCALE_NV = 0x937C;
-        public const int GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV = 0x937D;
-        public const int GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV = 0x937E;
-        public const int GL_NV_command_list = 1;
-        public const int GL_TERMINATE_SEQUENCE_COMMAND_NV = 0x0000;
-        public const int GL_NOP_COMMAND_NV = 0x0001;
-        public const int GL_DRAW_ELEMENTS_COMMAND_NV = 0x0002;
-        public const int GL_DRAW_ARRAYS_COMMAND_NV = 0x0003;
-        public const int GL_DRAW_ELEMENTS_STRIP_COMMAND_NV = 0x0004;
-        public const int GL_DRAW_ARRAYS_STRIP_COMMAND_NV = 0x0005;
-        public const int GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV = 0x0006;
-        public const int GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV = 0x0007;
-        public const int GL_ELEMENT_ADDRESS_COMMAND_NV = 0x0008;
-        public const int GL_ATTRIBUTE_ADDRESS_COMMAND_NV = 0x0009;
-        public const int GL_UNIFORM_ADDRESS_COMMAND_NV = 0x000A;
-        public const int GL_BLEND_COLOR_COMMAND_NV = 0x000B;
-        public const int GL_STENCIL_REF_COMMAND_NV = 0x000C;
-        public const int GL_LINE_WIDTH_COMMAND_NV = 0x000D;
-        public const int GL_POLYGON_OFFSET_COMMAND_NV = 0x000E;
-        public const int GL_ALPHA_REF_COMMAND_NV = 0x000F;
-        public const int GL_VIEWPORT_COMMAND_NV = 0x0010;
-        public const int GL_SCISSOR_COMMAND_NV = 0x0011;
-        public const int GL_FRONT_FACE_COMMAND_NV = 0x0012;
-        public const int GL_NV_compute_program5 = 1;
-        public const int GL_COMPUTE_PROGRAM_NV = 0x90FB;
-        public const int GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV = 0x90FC;
-        public const int GL_NV_conditional_render = 1;
-        public const int GL_QUERY_WAIT_NV = 0x8E13;
-        public const int GL_QUERY_NO_WAIT_NV = 0x8E14;
-        public const int GL_QUERY_BY_REGION_WAIT_NV = 0x8E15;
-        public const int GL_QUERY_BY_REGION_NO_WAIT_NV = 0x8E16;
-        public const int GL_NV_conservative_raster = 1;
-        public const int GL_CONSERVATIVE_RASTERIZATION_NV = 0x9346;
-        public const int GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV = 0x9347;
-        public const int GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV = 0x9348;
-        public const int GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV = 0x9349;
-        public const int GL_NV_conservative_raster_dilate = 1;
-        public const int GL_CONSERVATIVE_RASTER_DILATE_NV = 0x9379;
-        public const int GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV = 0x937A;
-        public const int GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV = 0x937B;
-        public const int GL_NV_conservative_raster_pre_snap = 1;
-        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV = 0x9550;
-        public const int GL_NV_conservative_raster_pre_snap_triangles = 1;
-        public const int GL_CONSERVATIVE_RASTER_MODE_NV = 0x954D;
-        public const int GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV = 0x954E;
-        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV = 0x954F;
-        public const int GL_NV_conservative_raster_underestimation = 1;
-        public const int GL_NV_copy_depth_to_color = 1;
-        public const int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E;
-        public const int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F;
-        public const int GL_NV_copy_image = 1;
-        public const int GL_NV_deep_texture3D = 1;
-        public const int GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV = 0x90D0;
-        public const int GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV = 0x90D1;
-        public const int GL_NV_depth_buffer_float = 1;
-        public const int GL_DEPTH_COMPONENT32F_NV = 0x8DAB;
-        public const int GL_DEPTH32F_STENCIL8_NV = 0x8DAC;
-        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV = 0x8DAD;
-        public const int GL_DEPTH_BUFFER_FLOAT_MODE_NV = 0x8DAF;
-        public const int GL_NV_depth_clamp = 1;
-        public const int GL_DEPTH_CLAMP_NV = 0x864F;
-        public const int GL_NV_draw_texture = 1;
-        public const int GL_NV_draw_vulkan_image = 1;
-        public const int GL_NV_evaluators = 1;
-        public const int GL_EVAL_2D_NV = 0x86C0;
-        public const int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1;
-        public const int GL_MAP_TESSELLATION_NV = 0x86C2;
-        public const int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3;
-        public const int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4;
-        public const int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5;
-        public const int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6;
-        public const int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7;
-        public const int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8;
-        public const int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9;
-        public const int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA;
-        public const int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB;
-        public const int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC;
-        public const int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD;
-        public const int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE;
-        public const int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF;
-        public const int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0;
-        public const int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1;
-        public const int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2;
-        public const int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3;
-        public const int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4;
-        public const int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5;
-        public const int GL_MAX_MAP_TESSELLATION_NV = 0x86D6;
-        public const int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7;
-        public const int GL_NV_explicit_multisample = 1;
-        public const int GL_SAMPLE_POSITION_NV = 0x8E50;
-        public const int GL_SAMPLE_MASK_NV = 0x8E51;
-        public const int GL_SAMPLE_MASK_VALUE_NV = 0x8E52;
-        public const int GL_TEXTURE_BINDING_RENDERBUFFER_NV = 0x8E53;
-        public const int GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV = 0x8E54;
-        public const int GL_TEXTURE_RENDERBUFFER_NV = 0x8E55;
-        public const int GL_SAMPLER_RENDERBUFFER_NV = 0x8E56;
-        public const int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
-        public const int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
-        public const int GL_MAX_SAMPLE_MASK_WORDS_NV = 0x8E59;
-        public const int GL_NV_fence = 1;
-        public const int GL_ALL_COMPLETED_NV = 0x84F2;
-        public const int GL_FENCE_STATUS_NV = 0x84F3;
-        public const int GL_FENCE_CONDITION_NV = 0x84F4;
-        public const int GL_NV_fill_rectangle = 1;
-        public const int GL_FILL_RECTANGLE_NV = 0x933C;
-        public const int GL_NV_float_buffer = 1;
-        public const int GL_FLOAT_R_NV = 0x8880;
-        public const int GL_FLOAT_RG_NV = 0x8881;
-        public const int GL_FLOAT_RGB_NV = 0x8882;
-        public const int GL_FLOAT_RGBA_NV = 0x8883;
-        public const int GL_FLOAT_R16_NV = 0x8884;
-        public const int GL_FLOAT_R32_NV = 0x8885;
-        public const int GL_FLOAT_RG16_NV = 0x8886;
-        public const int GL_FLOAT_RG32_NV = 0x8887;
-        public const int GL_FLOAT_RGB16_NV = 0x8888;
-        public const int GL_FLOAT_RGB32_NV = 0x8889;
-        public const int GL_FLOAT_RGBA16_NV = 0x888A;
-        public const int GL_FLOAT_RGBA32_NV = 0x888B;
-        public const int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C;
-        public const int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D;
-        public const int GL_FLOAT_RGBA_MODE_NV = 0x888E;
-        public const int GL_NV_fog_distance = 1;
-        public const int GL_FOG_DISTANCE_MODE_NV = 0x855A;
-        public const int GL_EYE_RADIAL_NV = 0x855B;
-        public const int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C;
-        public const int GL_NV_fragment_coverage_to_color = 1;
-        public const int GL_FRAGMENT_COVERAGE_TO_COLOR_NV = 0x92DD;
-        public const int GL_FRAGMENT_COVERAGE_COLOR_NV = 0x92DE;
-        public const int GL_NV_fragment_program = 1;
-        public const int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868;
-        public const int GL_FRAGMENT_PROGRAM_NV = 0x8870;
-        public const int GL_MAX_TEXTURE_COORDS_NV = 0x8871;
-        public const int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872;
-        public const int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873;
-        public const int GL_PROGRAM_ERROR_STRING_NV = 0x8874;
-        public const int GL_NV_fragment_program2 = 1;
-        public const int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4;
-        public const int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5;
-        public const int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88F6;
-        public const int GL_MAX_PROGRAM_LOOP_DEPTH_NV = 0x88F7;
-        public const int GL_MAX_PROGRAM_LOOP_COUNT_NV = 0x88F8;
-        public const int GL_NV_fragment_program4 = 1;
-        public const int GL_NV_fragment_program_option = 1;
-        public const int GL_NV_fragment_shader_interlock = 1;
-        public const int GL_NV_framebuffer_mixed_samples = 1;
-        public const int GL_COVERAGE_MODULATION_TABLE_NV = 0x9331;
-        public const int GL_COLOR_SAMPLES_NV = 0x8E20;
-        public const int GL_DEPTH_SAMPLES_NV = 0x932D;
-        public const int GL_STENCIL_SAMPLES_NV = 0x932E;
-        public const int GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV = 0x932F;
-        public const int GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV = 0x9330;
-        public const int GL_COVERAGE_MODULATION_NV = 0x9332;
-        public const int GL_COVERAGE_MODULATION_TABLE_SIZE_NV = 0x9333;
-        public const int GL_NV_framebuffer_multisample_coverage = 1;
-        public const int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = 0x8CAB;
-        public const int GL_RENDERBUFFER_COLOR_SAMPLES_NV = 0x8E10;
-        public const int GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E11;
-        public const int GL_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E12;
-        public const int GL_NV_geometry_program4 = 1;
-        public const int GL_GEOMETRY_PROGRAM_NV = 0x8C26;
-        public const int GL_MAX_PROGRAM_OUTPUT_VERTICES_NV = 0x8C27;
-        public const int GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV = 0x8C28;
-        public const int GL_NV_geometry_shader4 = 1;
-        public const int GL_NV_geometry_shader_passthrough = 1;
-        public const int GL_NV_gpu_multicast = 1;
-        public const int GL_PER_GPU_STORAGE_BIT_NV = 0x0800;
-        public const int GL_MULTICAST_GPUS_NV = 0x92BA;
-        public const int GL_RENDER_GPU_MASK_NV = 0x9558;
-        public const int GL_PER_GPU_STORAGE_NV = 0x9548;
-        public const int GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9549;
-        public const int GL_NV_gpu_program4 = 1;
-        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_NV = 0x8904;
-        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_NV = 0x8905;
-        public const int GL_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8906;
-        public const int GL_PROGRAM_RESULT_COMPONENTS_NV = 0x8907;
-        public const int GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8908;
-        public const int GL_MAX_PROGRAM_RESULT_COMPONENTS_NV = 0x8909;
-        public const int GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV = 0x8DA5;
-        public const int GL_MAX_PROGRAM_GENERIC_RESULTS_NV = 0x8DA6;
-        public const int GL_NV_gpu_program5 = 1;
-        public const int GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV = 0x8E5A;
-        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5B;
-        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5C;
-        public const int GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV = 0x8E5D;
-        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5E;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5F;
-        public const int GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV = 0x8F44;
-        public const int GL_MAX_PROGRAM_SUBROUTINE_NUM_NV = 0x8F45;
-        public const int GL_NV_gpu_program5_mem_extended = 1;
-        public const int GL_NV_gpu_shader5 = 1;
-        public const int GL_NV_half_float = 1;
-        public const int GL_HALF_FLOAT_NV = 0x140B;
-        public const int GL_NV_internalformat_sample_query = 1;
-        public const int GL_MULTISAMPLES_NV = 0x9371;
-        public const int GL_SUPERSAMPLE_SCALE_X_NV = 0x9372;
-        public const int GL_SUPERSAMPLE_SCALE_Y_NV = 0x9373;
-        public const int GL_CONFORMANT_NV = 0x9374;
-        public const int GL_NV_light_max_exponent = 1;
-        public const int GL_MAX_SHININESS_NV = 0x8504;
-        public const int GL_MAX_SPOT_EXPONENT_NV = 0x8505;
-        public const int GL_NV_multisample_coverage = 1;
-        public const int GL_NV_multisample_filter_hint = 1;
-        public const int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534;
-        public const int GL_NV_occlusion_query = 1;
-        public const int GL_PIXEL_COUNTER_BITS_NV = 0x8864;
-        public const int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865;
-        public const int GL_PIXEL_COUNT_NV = 0x8866;
-        public const int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867;
-        public const int GL_NV_packed_depth_stencil = 1;
-        public const int GL_DEPTH_STENCIL_NV = 0x84F9;
-        public const int GL_UNSIGNED_INT_24_8_NV = 0x84FA;
-        public const int GL_NV_parameter_buffer_object = 1;
-        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV = 0x8DA0;
-        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV = 0x8DA1;
-        public const int GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA2;
-        public const int GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA3;
-        public const int GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA4;
-        public const int GL_NV_parameter_buffer_object2 = 1;
-        public const int GL_NV_path_rendering = 1;
-        public const int GL_PATH_FORMAT_SVG_NV = 0x9070;
-        public const int GL_PATH_FORMAT_PS_NV = 0x9071;
-        public const int GL_STANDARD_FONT_NAME_NV = 0x9072;
-        public const int GL_SYSTEM_FONT_NAME_NV = 0x9073;
-        public const int GL_FILE_NAME_NV = 0x9074;
-        public const int GL_PATH_STROKE_WIDTH_NV = 0x9075;
-        public const int GL_PATH_END_CAPS_NV = 0x9076;
-        public const int GL_PATH_INITIAL_END_CAP_NV = 0x9077;
-        public const int GL_PATH_TERMINAL_END_CAP_NV = 0x9078;
-        public const int GL_PATH_JOIN_STYLE_NV = 0x9079;
-        public const int GL_PATH_MITER_LIMIT_NV = 0x907A;
-        public const int GL_PATH_DASH_CAPS_NV = 0x907B;
-        public const int GL_PATH_INITIAL_DASH_CAP_NV = 0x907C;
-        public const int GL_PATH_TERMINAL_DASH_CAP_NV = 0x907D;
-        public const int GL_PATH_DASH_OFFSET_NV = 0x907E;
-        public const int GL_PATH_CLIENT_LENGTH_NV = 0x907F;
-        public const int GL_PATH_FILL_MODE_NV = 0x9080;
-        public const int GL_PATH_FILL_MASK_NV = 0x9081;
-        public const int GL_PATH_FILL_COVER_MODE_NV = 0x9082;
-        public const int GL_PATH_STROKE_COVER_MODE_NV = 0x9083;
-        public const int GL_PATH_STROKE_MASK_NV = 0x9084;
-        public const int GL_COUNT_UP_NV = 0x9088;
-        public const int GL_COUNT_DOWN_NV = 0x9089;
-        public const int GL_PATH_OBJECT_BOUNDING_BOX_NV = 0x908A;
-        public const int GL_CONVEX_HULL_NV = 0x908B;
-        public const int GL_BOUNDING_BOX_NV = 0x908D;
-        public const int GL_TRANSLATE_X_NV = 0x908E;
-        public const int GL_TRANSLATE_Y_NV = 0x908F;
-        public const int GL_TRANSLATE_2D_NV = 0x9090;
-        public const int GL_TRANSLATE_3D_NV = 0x9091;
-        public const int GL_AFFINE_2D_NV = 0x9092;
-        public const int GL_AFFINE_3D_NV = 0x9094;
-        public const int GL_TRANSPOSE_AFFINE_2D_NV = 0x9096;
-        public const int GL_TRANSPOSE_AFFINE_3D_NV = 0x9098;
-        public const int GL_UTF8_NV = 0x909A;
-        public const int GL_UTF16_NV = 0x909B;
-        public const int GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = 0x909C;
-        public const int GL_PATH_COMMAND_COUNT_NV = 0x909D;
-        public const int GL_PATH_COORD_COUNT_NV = 0x909E;
-        public const int GL_PATH_DASH_ARRAY_COUNT_NV = 0x909F;
-        public const int GL_PATH_COMPUTED_LENGTH_NV = 0x90A0;
-        public const int GL_PATH_FILL_BOUNDING_BOX_NV = 0x90A1;
-        public const int GL_PATH_STROKE_BOUNDING_BOX_NV = 0x90A2;
-        public const int GL_SQUARE_NV = 0x90A3;
-        public const int GL_ROUND_NV = 0x90A4;
-        public const int GL_TRIANGULAR_NV = 0x90A5;
-        public const int GL_BEVEL_NV = 0x90A6;
-        public const int GL_MITER_REVERT_NV = 0x90A7;
-        public const int GL_MITER_TRUNCATE_NV = 0x90A8;
-        public const int GL_SKIP_MISSING_GLYPH_NV = 0x90A9;
-        public const int GL_USE_MISSING_GLYPH_NV = 0x90AA;
-        public const int GL_PATH_ERROR_POSITION_NV = 0x90AB;
-        public const int GL_ACCUM_ADJACENT_PAIRS_NV = 0x90AD;
-        public const int GL_ADJACENT_PAIRS_NV = 0x90AE;
-        public const int GL_FIRST_TO_REST_NV = 0x90AF;
-        public const int GL_PATH_GEN_MODE_NV = 0x90B0;
-        public const int GL_PATH_GEN_COEFF_NV = 0x90B1;
-        public const int GL_PATH_GEN_COMPONENTS_NV = 0x90B3;
-        public const int GL_PATH_STENCIL_FUNC_NV = 0x90B7;
-        public const int GL_PATH_STENCIL_REF_NV = 0x90B8;
-        public const int GL_PATH_STENCIL_VALUE_MASK_NV = 0x90B9;
-        public const int GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV = 0x90BD;
-        public const int GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV = 0x90BE;
-        public const int GL_PATH_COVER_DEPTH_FUNC_NV = 0x90BF;
-        public const int GL_PATH_DASH_OFFSET_RESET_NV = 0x90B4;
-        public const int GL_MOVE_TO_RESETS_NV = 0x90B5;
-        public const int GL_MOVE_TO_CONTINUES_NV = 0x90B6;
-        public const int GL_CLOSE_PATH_NV = 0x00;
-        public const int GL_MOVE_TO_NV = 0x02;
-        public const int GL_RELATIVE_MOVE_TO_NV = 0x03;
-        public const int GL_LINE_TO_NV = 0x04;
-        public const int GL_RELATIVE_LINE_TO_NV = 0x05;
-        public const int GL_HORIZONTAL_LINE_TO_NV = 0x06;
-        public const int GL_RELATIVE_HORIZONTAL_LINE_TO_NV = 0x07;
-        public const int GL_VERTICAL_LINE_TO_NV = 0x08;
-        public const int GL_RELATIVE_VERTICAL_LINE_TO_NV = 0x09;
-        public const int GL_QUADRATIC_CURVE_TO_NV = 0x0A;
-        public const int GL_RELATIVE_QUADRATIC_CURVE_TO_NV = 0x0B;
-        public const int GL_CUBIC_CURVE_TO_NV = 0x0C;
-        public const int GL_RELATIVE_CUBIC_CURVE_TO_NV = 0x0D;
-        public const int GL_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0E;
-        public const int GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0F;
-        public const int GL_SMOOTH_CUBIC_CURVE_TO_NV = 0x10;
-        public const int GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV = 0x11;
-        public const int GL_SMALL_CCW_ARC_TO_NV = 0x12;
-        public const int GL_RELATIVE_SMALL_CCW_ARC_TO_NV = 0x13;
-        public const int GL_SMALL_CW_ARC_TO_NV = 0x14;
-        public const int GL_RELATIVE_SMALL_CW_ARC_TO_NV = 0x15;
-        public const int GL_LARGE_CCW_ARC_TO_NV = 0x16;
-        public const int GL_RELATIVE_LARGE_CCW_ARC_TO_NV = 0x17;
-        public const int GL_LARGE_CW_ARC_TO_NV = 0x18;
-        public const int GL_RELATIVE_LARGE_CW_ARC_TO_NV = 0x19;
-        public const int GL_RESTART_PATH_NV = 0xF0;
-        public const int GL_DUP_FIRST_CUBIC_CURVE_TO_NV = 0xF2;
-        public const int GL_DUP_LAST_CUBIC_CURVE_TO_NV = 0xF4;
-        public const int GL_RECT_NV = 0xF6;
-        public const int GL_CIRCULAR_CCW_ARC_TO_NV = 0xF8;
-        public const int GL_CIRCULAR_CW_ARC_TO_NV = 0xFA;
-        public const int GL_CIRCULAR_TANGENT_ARC_TO_NV = 0xFC;
-        public const int GL_ARC_TO_NV = 0xFE;
-        public const int GL_RELATIVE_ARC_TO_NV = 0xFF;
-        public const int GL_BOLD_BIT_NV = 0x01;
-        public const int GL_ITALIC_BIT_NV = 0x02;
-        public const int GL_GLYPH_WIDTH_BIT_NV = 0x01;
-        public const int GL_GLYPH_HEIGHT_BIT_NV = 0x02;
-        public const int GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = 0x04;
-        public const int GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = 0x08;
-        public const int GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = 0x10;
-        public const int GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = 0x20;
-        public const int GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = 0x40;
-        public const int GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = 0x80;
-        public const int GL_GLYPH_HAS_KERNING_BIT_NV = 0x100;
-        public const int GL_FONT_X_MIN_BOUNDS_BIT_NV = 0x00010000;
-        public const int GL_FONT_Y_MIN_BOUNDS_BIT_NV = 0x00020000;
-        public const int GL_FONT_X_MAX_BOUNDS_BIT_NV = 0x00040000;
-        public const int GL_FONT_Y_MAX_BOUNDS_BIT_NV = 0x00080000;
-        public const int GL_FONT_UNITS_PER_EM_BIT_NV = 0x00100000;
-        public const int GL_FONT_ASCENDER_BIT_NV = 0x00200000;
-        public const int GL_FONT_DESCENDER_BIT_NV = 0x00400000;
-        public const int GL_FONT_HEIGHT_BIT_NV = 0x00800000;
-        public const int GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = 0x01000000;
-        public const int GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = 0x02000000;
-        public const int GL_FONT_UNDERLINE_POSITION_BIT_NV = 0x04000000;
-        public const int GL_FONT_UNDERLINE_THICKNESS_BIT_NV = 0x08000000;
-        public const int GL_FONT_HAS_KERNING_BIT_NV = 0x10000000;
-        public const int GL_ROUNDED_RECT_NV = 0xE8;
-        public const int GL_RELATIVE_ROUNDED_RECT_NV = 0xE9;
-        public const int GL_ROUNDED_RECT2_NV = 0xEA;
-        public const int GL_RELATIVE_ROUNDED_RECT2_NV = 0xEB;
-        public const int GL_ROUNDED_RECT4_NV = 0xEC;
-        public const int GL_RELATIVE_ROUNDED_RECT4_NV = 0xED;
-        public const int GL_ROUNDED_RECT8_NV = 0xEE;
-        public const int GL_RELATIVE_ROUNDED_RECT8_NV = 0xEF;
-        public const int GL_RELATIVE_RECT_NV = 0xF7;
-        public const int GL_FONT_GLYPHS_AVAILABLE_NV = 0x9368;
-        public const int GL_FONT_TARGET_UNAVAILABLE_NV = 0x9369;
-        public const int GL_FONT_UNAVAILABLE_NV = 0x936A;
-        public const int GL_FONT_UNINTELLIGIBLE_NV = 0x936B;
-        public const int GL_CONIC_CURVE_TO_NV = 0x1A;
-        public const int GL_RELATIVE_CONIC_CURVE_TO_NV = 0x1B;
-        public const int GL_FONT_NUM_GLYPH_INDICES_BIT_NV = 0x20000000;
-        public const int GL_STANDARD_FONT_FORMAT_NV = 0x936C;
-        public const int GL_2_BYTES_NV = 0x1407;
-        public const int GL_3_BYTES_NV = 0x1408;
-        public const int GL_4_BYTES_NV = 0x1409;
-        public const int GL_EYE_LINEAR_NV = 0x2400;
-        public const int GL_OBJECT_LINEAR_NV = 0x2401;
-        public const int GL_CONSTANT_NV = 0x8576;
-        public const int GL_PATH_FOG_GEN_MODE_NV = 0x90AC;
-        public const int GL_PRIMARY_COLOR_NV = 0x852C;
-        public const int GL_SECONDARY_COLOR_NV = 0x852D;
-        public const int GL_PATH_GEN_COLOR_FORMAT_NV = 0x90B2;
-        public const int GL_PATH_PROJECTION_NV = 0x1701;
-        public const int GL_PATH_MODELVIEW_NV = 0x1700;
-        public const int GL_PATH_MODELVIEW_STACK_DEPTH_NV = 0x0BA3;
-        public const int GL_PATH_MODELVIEW_MATRIX_NV = 0x0BA6;
-        public const int GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV = 0x0D36;
-        public const int GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV = 0x84E3;
-        public const int GL_PATH_PROJECTION_STACK_DEPTH_NV = 0x0BA4;
-        public const int GL_PATH_PROJECTION_MATRIX_NV = 0x0BA7;
-        public const int GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV = 0x0D38;
-        public const int GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV = 0x84E4;
-        public const int GL_FRAGMENT_INPUT_NV = 0x936D;
-        public const int GL_NV_path_rendering_shared_edge = 1;
-        public const int GL_SHARED_EDGE_NV = 0xC0;
-        public const int GL_NV_pixel_data_range = 1;
-        public const int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878;
-        public const int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879;
-        public const int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A;
-        public const int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B;
-        public const int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C;
-        public const int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D;
-        public const int GL_NV_point_sprite = 1;
-        public const int GL_POINT_SPRITE_NV = 0x8861;
-        public const int GL_COORD_REPLACE_NV = 0x8862;
-        public const int GL_POINT_SPRITE_R_MODE_NV = 0x8863;
-        public const int GL_NV_present_video = 1;
-        public const int GL_FRAME_NV = 0x8E26;
-        public const int GL_FIELDS_NV = 0x8E27;
-        public const int GL_CURRENT_TIME_NV = 0x8E28;
-        public const int GL_NUM_FILL_STREAMS_NV = 0x8E29;
-        public const int GL_PRESENT_TIME_NV = 0x8E2A;
-        public const int GL_PRESENT_DURATION_NV = 0x8E2B;
-        public const int GL_NV_primitive_restart = 1;
-        public const int GL_PRIMITIVE_RESTART_NV = 0x8558;
-        public const int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559;
-        public const int GL_NV_query_resource = 1;
-        public const int GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV = 0x9540;
-        public const int GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV = 0x9542;
-        public const int GL_QUERY_RESOURCE_SYS_RESERVED_NV = 0x9544;
-        public const int GL_QUERY_RESOURCE_TEXTURE_NV = 0x9545;
-        public const int GL_QUERY_RESOURCE_RENDERBUFFER_NV = 0x9546;
-        public const int GL_QUERY_RESOURCE_BUFFEROBJECT_NV = 0x9547;
-        public const int GL_NV_query_resource_tag = 1;
-        public const int GL_NV_register_combiners = 1;
-        public const int GL_REGISTER_COMBINERS_NV = 0x8522;
-        public const int GL_VARIABLE_A_NV = 0x8523;
-        public const int GL_VARIABLE_B_NV = 0x8524;
-        public const int GL_VARIABLE_C_NV = 0x8525;
-        public const int GL_VARIABLE_D_NV = 0x8526;
-        public const int GL_VARIABLE_E_NV = 0x8527;
-        public const int GL_VARIABLE_F_NV = 0x8528;
-        public const int GL_VARIABLE_G_NV = 0x8529;
-        public const int GL_CONSTANT_COLOR0_NV = 0x852A;
-        public const int GL_CONSTANT_COLOR1_NV = 0x852B;
-        public const int GL_SPARE0_NV = 0x852E;
-        public const int GL_SPARE1_NV = 0x852F;
-        public const int GL_DISCARD_NV = 0x8530;
-        public const int GL_E_TIMES_F_NV = 0x8531;
-        public const int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532;
-        public const int GL_UNSIGNED_IDENTITY_NV = 0x8536;
-        public const int GL_UNSIGNED_INVERT_NV = 0x8537;
-        public const int GL_EXPAND_NORMAL_NV = 0x8538;
-        public const int GL_EXPAND_NEGATE_NV = 0x8539;
-        public const int GL_HALF_BIAS_NORMAL_NV = 0x853A;
-        public const int GL_HALF_BIAS_NEGATE_NV = 0x853B;
-        public const int GL_SIGNED_IDENTITY_NV = 0x853C;
-        public const int GL_SIGNED_NEGATE_NV = 0x853D;
-        public const int GL_SCALE_BY_TWO_NV = 0x853E;
-        public const int GL_SCALE_BY_FOUR_NV = 0x853F;
-        public const int GL_SCALE_BY_ONE_HALF_NV = 0x8540;
-        public const int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541;
-        public const int GL_COMBINER_INPUT_NV = 0x8542;
-        public const int GL_COMBINER_MAPPING_NV = 0x8543;
-        public const int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544;
-        public const int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545;
-        public const int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546;
-        public const int GL_COMBINER_MUX_SUM_NV = 0x8547;
-        public const int GL_COMBINER_SCALE_NV = 0x8548;
-        public const int GL_COMBINER_BIAS_NV = 0x8549;
-        public const int GL_COMBINER_AB_OUTPUT_NV = 0x854A;
-        public const int GL_COMBINER_CD_OUTPUT_NV = 0x854B;
-        public const int GL_COMBINER_SUM_OUTPUT_NV = 0x854C;
-        public const int GL_MAX_GENERAL_COMBINERS_NV = 0x854D;
-        public const int GL_NUM_GENERAL_COMBINERS_NV = 0x854E;
-        public const int GL_COLOR_SUM_CLAMP_NV = 0x854F;
-        public const int GL_COMBINER0_NV = 0x8550;
-        public const int GL_COMBINER1_NV = 0x8551;
-        public const int GL_COMBINER2_NV = 0x8552;
-        public const int GL_COMBINER3_NV = 0x8553;
-        public const int GL_COMBINER4_NV = 0x8554;
-        public const int GL_COMBINER5_NV = 0x8555;
-        public const int GL_COMBINER6_NV = 0x8556;
-        public const int GL_COMBINER7_NV = 0x8557;
-        public const int GL_NV_register_combiners2 = 1;
-        public const int GL_PER_STAGE_CONSTANTS_NV = 0x8535;
-        public const int GL_NV_robustness_video_memory_purge = 1;
-        public const int GL_PURGED_CONTEXT_RESET_NV = 0x92BB;
-        public const int GL_NV_sample_locations = 1;
-        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV = 0x933D;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV = 0x933E;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV = 0x933F;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV = 0x9340;
-        public const int GL_SAMPLE_LOCATION_NV = 0x8E50;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9341;
-        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV = 0x9342;
-        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV = 0x9343;
-        public const int GL_NV_sample_mask_override_coverage = 1;
-        public const int GL_NV_shader_atomic_counters = 1;
-        public const int GL_NV_shader_atomic_float = 1;
-        public const int GL_NV_shader_atomic_float64 = 1;
-        public const int GL_NV_shader_atomic_fp16_vector = 1;
-        public const int GL_NV_shader_atomic_int64 = 1;
-        public const int GL_NV_shader_buffer_load = 1;
-        public const int GL_BUFFER_GPU_ADDRESS_NV = 0x8F1D;
-        public const int GL_GPU_ADDRESS_NV = 0x8F34;
-        public const int GL_MAX_SHADER_BUFFER_ADDRESS_NV = 0x8F35;
-        public const int GL_NV_shader_buffer_store = 1;
-        public const int GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV = 0x00000010;
-        public const int GL_NV_shader_storage_buffer_object = 1;
-        public const int GL_NV_shader_thread_group = 1;
-        public const int GL_WARP_SIZE_NV = 0x9339;
-        public const int GL_WARPS_PER_SM_NV = 0x933A;
-        public const int GL_SM_COUNT_NV = 0x933B;
-        public const int GL_NV_shader_thread_shuffle = 1;
-        public const int GL_NV_stereo_view_rendering = 1;
-        public const int GL_NV_tessellation_program5 = 1;
-        public const int GL_MAX_PROGRAM_PATCH_ATTRIBS_NV = 0x86D8;
-        public const int GL_TESS_CONTROL_PROGRAM_NV = 0x891E;
-        public const int GL_TESS_EVALUATION_PROGRAM_NV = 0x891F;
-        public const int GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV = 0x8C74;
-        public const int GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV = 0x8C75;
-        public const int GL_NV_texgen_emboss = 1;
-        public const int GL_EMBOSS_LIGHT_NV = 0x855D;
-        public const int GL_EMBOSS_CONSTANT_NV = 0x855E;
-        public const int GL_EMBOSS_MAP_NV = 0x855F;
-        public const int GL_NV_texgen_reflection = 1;
-        public const int GL_NORMAL_MAP_NV = 0x8511;
-        public const int GL_REFLECTION_MAP_NV = 0x8512;
-        public const int GL_NV_texture_barrier = 1;
-        public const int GL_NV_texture_compression_vtc = 1;
-        public const int GL_NV_texture_env_combine4 = 1;
-        public const int GL_COMBINE4_NV = 0x8503;
-        public const int GL_SOURCE3_RGB_NV = 0x8583;
-        public const int GL_SOURCE3_ALPHA_NV = 0x858B;
-        public const int GL_OPERAND3_RGB_NV = 0x8593;
-        public const int GL_OPERAND3_ALPHA_NV = 0x859B;
-        public const int GL_NV_texture_expand_normal = 1;
-        public const int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888F;
-        public const int GL_NV_texture_multisample = 1;
-        public const int GL_TEXTURE_COVERAGE_SAMPLES_NV = 0x9045;
-        public const int GL_TEXTURE_COLOR_SAMPLES_NV = 0x9046;
-        public const int GL_NV_texture_rectangle = 1;
-        public const int GL_TEXTURE_RECTANGLE_NV = 0x84F5;
-        public const int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6;
-        public const int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7;
-        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8;
-        public const int GL_NV_texture_rectangle_compressed = 1;
-        public const int GL_NV_texture_shader = 1;
-        public const int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C;
-        public const int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D;
-        public const int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E;
-        public const int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9;
-        public const int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA;
-        public const int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB;
-        public const int GL_DSDT_MAG_INTENSITY_NV = 0x86DC;
-        public const int GL_SHADER_CONSISTENT_NV = 0x86DD;
-        public const int GL_TEXTURE_SHADER_NV = 0x86DE;
-        public const int GL_SHADER_OPERATION_NV = 0x86DF;
-        public const int GL_CULL_MODES_NV = 0x86E0;
-        public const int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1;
-        public const int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2;
-        public const int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3;
-        public const int GL_OFFSET_TEXTURE_2D_MATRIX_NV = 0x86E1;
-        public const int GL_OFFSET_TEXTURE_2D_SCALE_NV = 0x86E2;
-        public const int GL_OFFSET_TEXTURE_2D_BIAS_NV = 0x86E3;
-        public const int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4;
-        public const int GL_CONST_EYE_NV = 0x86E5;
-        public const int GL_PASS_THROUGH_NV = 0x86E6;
-        public const int GL_CULL_FRAGMENT_NV = 0x86E7;
-        public const int GL_OFFSET_TEXTURE_2D_NV = 0x86E8;
-        public const int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9;
-        public const int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA;
-        public const int GL_DOT_PRODUCT_NV = 0x86EC;
-        public const int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED;
-        public const int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE;
-        public const int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0;
-        public const int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1;
-        public const int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2;
-        public const int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3;
-        public const int GL_HILO_NV = 0x86F4;
-        public const int GL_DSDT_NV = 0x86F5;
-        public const int GL_DSDT_MAG_NV = 0x86F6;
-        public const int GL_DSDT_MAG_VIB_NV = 0x86F7;
-        public const int GL_HILO16_NV = 0x86F8;
-        public const int GL_SIGNED_HILO_NV = 0x86F9;
-        public const int GL_SIGNED_HILO16_NV = 0x86FA;
-        public const int GL_SIGNED_RGBA_NV = 0x86FB;
-        public const int GL_SIGNED_RGBA8_NV = 0x86FC;
-        public const int GL_SIGNED_RGB_NV = 0x86FE;
-        public const int GL_SIGNED_RGB8_NV = 0x86FF;
-        public const int GL_SIGNED_LUMINANCE_NV = 0x8701;
-        public const int GL_SIGNED_LUMINANCE8_NV = 0x8702;
-        public const int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703;
-        public const int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704;
-        public const int GL_SIGNED_ALPHA_NV = 0x8705;
-        public const int GL_SIGNED_ALPHA8_NV = 0x8706;
-        public const int GL_SIGNED_INTENSITY_NV = 0x8707;
-        public const int GL_SIGNED_INTENSITY8_NV = 0x8708;
-        public const int GL_DSDT8_NV = 0x8709;
-        public const int GL_DSDT8_MAG8_NV = 0x870A;
-        public const int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B;
-        public const int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C;
-        public const int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D;
-        public const int GL_HI_SCALE_NV = 0x870E;
-        public const int GL_LO_SCALE_NV = 0x870F;
-        public const int GL_DS_SCALE_NV = 0x8710;
-        public const int GL_DT_SCALE_NV = 0x8711;
-        public const int GL_MAGNITUDE_SCALE_NV = 0x8712;
-        public const int GL_VIBRANCE_SCALE_NV = 0x8713;
-        public const int GL_HI_BIAS_NV = 0x8714;
-        public const int GL_LO_BIAS_NV = 0x8715;
-        public const int GL_DS_BIAS_NV = 0x8716;
-        public const int GL_DT_BIAS_NV = 0x8717;
-        public const int GL_MAGNITUDE_BIAS_NV = 0x8718;
-        public const int GL_VIBRANCE_BIAS_NV = 0x8719;
-        public const int GL_TEXTURE_BORDER_VALUES_NV = 0x871A;
-        public const int GL_TEXTURE_HI_SIZE_NV = 0x871B;
-        public const int GL_TEXTURE_LO_SIZE_NV = 0x871C;
-        public const int GL_TEXTURE_DS_SIZE_NV = 0x871D;
-        public const int GL_TEXTURE_DT_SIZE_NV = 0x871E;
-        public const int GL_TEXTURE_MAG_SIZE_NV = 0x871F;
-        public const int GL_NV_texture_shader2 = 1;
-        public const int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF;
-        public const int GL_NV_texture_shader3 = 1;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853;
-        public const int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854;
-        public const int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855;
-        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856;
-        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857;
-        public const int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858;
-        public const int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859;
-        public const int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A;
-        public const int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B;
-        public const int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C;
-        public const int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D;
-        public const int GL_HILO8_NV = 0x885E;
-        public const int GL_SIGNED_HILO8_NV = 0x885F;
-        public const int GL_FORCE_BLUE_TO_ONE_NV = 0x8860;
-        public const int GL_NV_transform_feedback = 1;
-        public const int GL_BACK_PRIMARY_COLOR_NV = 0x8C77;
-        public const int GL_BACK_SECONDARY_COLOR_NV = 0x8C78;
-        public const int GL_TEXTURE_COORD_NV = 0x8C79;
-        public const int GL_CLIP_DISTANCE_NV = 0x8C7A;
-        public const int GL_VERTEX_ID_NV = 0x8C7B;
-        public const int GL_PRIMITIVE_ID_NV = 0x8C7C;
-        public const int GL_GENERIC_ATTRIB_NV = 0x8C7D;
-        public const int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80;
-        public const int GL_ACTIVE_VARYINGS_NV = 0x8C81;
-        public const int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82;
-        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85;
-        public const int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8C86;
-        public const int GL_PRIMITIVES_GENERATED_NV = 0x8C87;
-        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8C88;
-        public const int GL_RASTERIZER_DISCARD_NV = 0x8C89;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B;
-        public const int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C;
-        public const int GL_SEPARATE_ATTRIBS_NV = 0x8C8D;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F;
-        public const int GL_LAYER_NV = 0x8DAA;
-        public const int GL_NEXT_BUFFER_NV = -2;
-        public const int GL_SKIP_COMPONENTS4_NV = -3;
-        public const int GL_SKIP_COMPONENTS3_NV = -4;
-        public const int GL_SKIP_COMPONENTS2_NV = -5;
-        public const int GL_SKIP_COMPONENTS1_NV = -6;
-        public const int GL_NV_transform_feedback2 = 1;
-        public const int GL_TRANSFORM_FEEDBACK_NV = 0x8E22;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV = 0x8E23;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV = 0x8E24;
-        public const int GL_TRANSFORM_FEEDBACK_BINDING_NV = 0x8E25;
-        public const int GL_NV_uniform_buffer_unified_memory = 1;
-        public const int GL_UNIFORM_BUFFER_UNIFIED_NV = 0x936E;
-        public const int GL_UNIFORM_BUFFER_ADDRESS_NV = 0x936F;
-        public const int GL_UNIFORM_BUFFER_LENGTH_NV = 0x9370;
-        public const int GL_NV_vdpau_interop = 1;
-        public const int GL_SURFACE_STATE_NV = 0x86EB;
-        public const int GL_SURFACE_REGISTERED_NV = 0x86FD;
-        public const int GL_SURFACE_MAPPED_NV = 0x8700;
-        public const int GL_WRITE_DISCARD_NV = 0x88BE;
-        public const int GL_NV_vertex_array_range = 1;
-        public const int GL_VERTEX_ARRAY_RANGE_NV = 0x851D;
-        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E;
-        public const int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F;
-        public const int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520;
-        public const int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521;
-        public const int GL_NV_vertex_array_range2 = 1;
-        public const int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533;
-        public const int GL_NV_vertex_attrib_integer_64bit = 1;
-        public const int GL_NV_vertex_buffer_unified_memory = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = 0x8F1E;
-        public const int GL_ELEMENT_ARRAY_UNIFIED_NV = 0x8F1F;
-        public const int GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV = 0x8F20;
-        public const int GL_VERTEX_ARRAY_ADDRESS_NV = 0x8F21;
-        public const int GL_NORMAL_ARRAY_ADDRESS_NV = 0x8F22;
-        public const int GL_COLOR_ARRAY_ADDRESS_NV = 0x8F23;
-        public const int GL_INDEX_ARRAY_ADDRESS_NV = 0x8F24;
-        public const int GL_TEXTURE_COORD_ARRAY_ADDRESS_NV = 0x8F25;
-        public const int GL_EDGE_FLAG_ARRAY_ADDRESS_NV = 0x8F26;
-        public const int GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV = 0x8F27;
-        public const int GL_FOG_COORD_ARRAY_ADDRESS_NV = 0x8F28;
-        public const int GL_ELEMENT_ARRAY_ADDRESS_NV = 0x8F29;
-        public const int GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV = 0x8F2A;
-        public const int GL_VERTEX_ARRAY_LENGTH_NV = 0x8F2B;
-        public const int GL_NORMAL_ARRAY_LENGTH_NV = 0x8F2C;
-        public const int GL_COLOR_ARRAY_LENGTH_NV = 0x8F2D;
-        public const int GL_INDEX_ARRAY_LENGTH_NV = 0x8F2E;
-        public const int GL_TEXTURE_COORD_ARRAY_LENGTH_NV = 0x8F2F;
-        public const int GL_EDGE_FLAG_ARRAY_LENGTH_NV = 0x8F30;
-        public const int GL_SECONDARY_COLOR_ARRAY_LENGTH_NV = 0x8F31;
-        public const int GL_FOG_COORD_ARRAY_LENGTH_NV = 0x8F32;
-        public const int GL_ELEMENT_ARRAY_LENGTH_NV = 0x8F33;
-        public const int GL_DRAW_INDIRECT_UNIFIED_NV = 0x8F40;
-        public const int GL_DRAW_INDIRECT_ADDRESS_NV = 0x8F41;
-        public const int GL_DRAW_INDIRECT_LENGTH_NV = 0x8F42;
-        public const int GL_NV_vertex_program = 1;
-        public const int GL_VERTEX_PROGRAM_NV = 0x8620;
-        public const int GL_VERTEX_STATE_PROGRAM_NV = 0x8621;
-        public const int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623;
-        public const int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624;
-        public const int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625;
-        public const int GL_CURRENT_ATTRIB_NV = 0x8626;
-        public const int GL_PROGRAM_LENGTH_NV = 0x8627;
-        public const int GL_PROGRAM_STRING_NV = 0x8628;
-        public const int GL_MODELVIEW_PROJECTION_NV = 0x8629;
-        public const int GL_IDENTITY_NV = 0x862A;
-        public const int GL_INVERSE_NV = 0x862B;
-        public const int GL_TRANSPOSE_NV = 0x862C;
-        public const int GL_INVERSE_TRANSPOSE_NV = 0x862D;
-        public const int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E;
-        public const int GL_MAX_TRACK_MATRICES_NV = 0x862F;
-        public const int GL_MATRIX0_NV = 0x8630;
-        public const int GL_MATRIX1_NV = 0x8631;
-        public const int GL_MATRIX2_NV = 0x8632;
-        public const int GL_MATRIX3_NV = 0x8633;
-        public const int GL_MATRIX4_NV = 0x8634;
-        public const int GL_MATRIX5_NV = 0x8635;
-        public const int GL_MATRIX6_NV = 0x8636;
-        public const int GL_MATRIX7_NV = 0x8637;
-        public const int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640;
-        public const int GL_CURRENT_MATRIX_NV = 0x8641;
-        public const int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642;
-        public const int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643;
-        public const int GL_PROGRAM_PARAMETER_NV = 0x8644;
-        public const int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645;
-        public const int GL_PROGRAM_TARGET_NV = 0x8646;
-        public const int GL_PROGRAM_RESIDENT_NV = 0x8647;
-        public const int GL_TRACK_MATRIX_NV = 0x8648;
-        public const int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649;
-        public const int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A;
-        public const int GL_PROGRAM_ERROR_POSITION_NV = 0x864B;
-        public const int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650;
-        public const int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651;
-        public const int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652;
-        public const int GL_VERTEX_ATTRIB_ARRAY3_NV = 0x8653;
-        public const int GL_VERTEX_ATTRIB_ARRAY4_NV = 0x8654;
-        public const int GL_VERTEX_ATTRIB_ARRAY5_NV = 0x8655;
-        public const int GL_VERTEX_ATTRIB_ARRAY6_NV = 0x8656;
-        public const int GL_VERTEX_ATTRIB_ARRAY7_NV = 0x8657;
-        public const int GL_VERTEX_ATTRIB_ARRAY8_NV = 0x8658;
-        public const int GL_VERTEX_ATTRIB_ARRAY9_NV = 0x8659;
-        public const int GL_VERTEX_ATTRIB_ARRAY10_NV = 0x865A;
-        public const int GL_VERTEX_ATTRIB_ARRAY11_NV = 0x865B;
-        public const int GL_VERTEX_ATTRIB_ARRAY12_NV = 0x865C;
-        public const int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865D;
-        public const int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E;
-        public const int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F;
-        public const int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660;
-        public const int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661;
-        public const int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662;
-        public const int GL_MAP1_VERTEX_ATTRIB3_4_NV = 0x8663;
-        public const int GL_MAP1_VERTEX_ATTRIB4_4_NV = 0x8664;
-        public const int GL_MAP1_VERTEX_ATTRIB5_4_NV = 0x8665;
-        public const int GL_MAP1_VERTEX_ATTRIB6_4_NV = 0x8666;
-        public const int GL_MAP1_VERTEX_ATTRIB7_4_NV = 0x8667;
-        public const int GL_MAP1_VERTEX_ATTRIB8_4_NV = 0x8668;
-        public const int GL_MAP1_VERTEX_ATTRIB9_4_NV = 0x8669;
-        public const int GL_MAP1_VERTEX_ATTRIB10_4_NV = 0x866A;
-        public const int GL_MAP1_VERTEX_ATTRIB11_4_NV = 0x866B;
-        public const int GL_MAP1_VERTEX_ATTRIB12_4_NV = 0x866C;
-        public const int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866D;
-        public const int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E;
-        public const int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F;
-        public const int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670;
-        public const int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671;
-        public const int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672;
-        public const int GL_MAP2_VERTEX_ATTRIB3_4_NV = 0x8673;
-        public const int GL_MAP2_VERTEX_ATTRIB4_4_NV = 0x8674;
-        public const int GL_MAP2_VERTEX_ATTRIB5_4_NV = 0x8675;
-        public const int GL_MAP2_VERTEX_ATTRIB6_4_NV = 0x8676;
-        public const int GL_MAP2_VERTEX_ATTRIB7_4_NV = 0x8677;
-        public const int GL_MAP2_VERTEX_ATTRIB8_4_NV = 0x8678;
-        public const int GL_MAP2_VERTEX_ATTRIB9_4_NV = 0x8679;
-        public const int GL_MAP2_VERTEX_ATTRIB10_4_NV = 0x867A;
-        public const int GL_MAP2_VERTEX_ATTRIB11_4_NV = 0x867B;
-        public const int GL_MAP2_VERTEX_ATTRIB12_4_NV = 0x867C;
-        public const int GL_MAP2_VERTEX_ATTRIB13_4_NV = 0x867D;
-        public const int GL_MAP2_VERTEX_ATTRIB14_4_NV = 0x867E;
-        public const int GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F;
-        public const int GL_NV_vertex_program1_1 = 1;
-        public const int GL_NV_vertex_program2 = 1;
-        public const int GL_NV_vertex_program2_option = 1;
-        public const int GL_NV_vertex_program3 = 1;
-        public const int GL_NV_vertex_program4 = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV = 0x88FD;
-        public const int GL_NV_video_capture = 1;
-        public const int GL_VIDEO_BUFFER_NV = 0x9020;
-        public const int GL_VIDEO_BUFFER_BINDING_NV = 0x9021;
-        public const int GL_FIELD_UPPER_NV = 0x9022;
-        public const int GL_FIELD_LOWER_NV = 0x9023;
-        public const int GL_NUM_VIDEO_CAPTURE_STREAMS_NV = 0x9024;
-        public const int GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV = 0x9025;
-        public const int GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV = 0x9026;
-        public const int GL_LAST_VIDEO_CAPTURE_STATUS_NV = 0x9027;
-        public const int GL_VIDEO_BUFFER_PITCH_NV = 0x9028;
-        public const int GL_VIDEO_COLOR_CONVERSION_MATRIX_NV = 0x9029;
-        public const int GL_VIDEO_COLOR_CONVERSION_MAX_NV = 0x902A;
-        public const int GL_VIDEO_COLOR_CONVERSION_MIN_NV = 0x902B;
-        public const int GL_VIDEO_COLOR_CONVERSION_OFFSET_NV = 0x902C;
-        public const int GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV = 0x902D;
-        public const int GL_PARTIAL_SUCCESS_NV = 0x902E;
-        public const int GL_SUCCESS_NV = 0x902F;
-        public const int GL_FAILURE_NV = 0x9030;
-        public const int GL_YCBYCR8_422_NV = 0x9031;
-        public const int GL_YCBAYCR8A_4224_NV = 0x9032;
-        public const int GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV = 0x9033;
-        public const int GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV = 0x9034;
-        public const int GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV = 0x9035;
-        public const int GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV = 0x9036;
-        public const int GL_Z4Y12Z4CB12Z4CR12_444_NV = 0x9037;
-        public const int GL_VIDEO_CAPTURE_FRAME_WIDTH_NV = 0x9038;
-        public const int GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV = 0x9039;
-        public const int GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV = 0x903A;
-        public const int GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV = 0x903B;
-        public const int GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV = 0x903C;
-        public const int GL_NV_viewport_array2 = 1;
-        public const int GL_NV_viewport_swizzle = 1;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV = 0x9350;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV = 0x9351;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV = 0x9352;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV = 0x9353;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV = 0x9354;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV = 0x9355;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV = 0x9356;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV = 0x9357;
-        public const int GL_VIEWPORT_SWIZZLE_X_NV = 0x9358;
-        public const int GL_VIEWPORT_SWIZZLE_Y_NV = 0x9359;
-        public const int GL_VIEWPORT_SWIZZLE_Z_NV = 0x935A;
-        public const int GL_VIEWPORT_SWIZZLE_W_NV = 0x935B;
-        public const int GL_OML_interlace = 1;
-        public const int GL_INTERLACE_OML = 0x8980;
-        public const int GL_INTERLACE_READ_OML = 0x8981;
-        public const int GL_OML_resample = 1;
-        public const int GL_PACK_RESAMPLE_OML = 0x8984;
-        public const int GL_UNPACK_RESAMPLE_OML = 0x8985;
-        public const int GL_RESAMPLE_REPLICATE_OML = 0x8986;
-        public const int GL_RESAMPLE_ZERO_FILL_OML = 0x8987;
-        public const int GL_RESAMPLE_AVERAGE_OML = 0x8988;
-        public const int GL_RESAMPLE_DECIMATE_OML = 0x8989;
-        public const int GL_OML_subsample = 1;
-        public const int GL_FORMAT_SUBSAMPLE_24_24_OML = 0x8982;
-        public const int GL_FORMAT_SUBSAMPLE_244_244_OML = 0x8983;
-        public const int GL_OVR_multiview = 1;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR = 0x9630;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR = 0x9632;
-        public const int GL_MAX_VIEWS_OVR = 0x9631;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR = 0x9633;
-        public const int GL_OVR_multiview2 = 1;
-        public const int GL_PGI_misc_hints = 1;
-        public const int GL_PREFER_DOUBLEBUFFER_HINT_PGI = 0x1A1F8;
-        public const int GL_CONSERVE_MEMORY_HINT_PGI = 0x1A1FD;
-        public const int GL_RECLAIM_MEMORY_HINT_PGI = 0x1A1FE;
-        public const int GL_NATIVE_GRAPHICS_HANDLE_PGI = 0x1A202;
-        public const int GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI = 0x1A203;
-        public const int GL_NATIVE_GRAPHICS_END_HINT_PGI = 0x1A204;
-        public const int GL_ALWAYS_FAST_HINT_PGI = 0x1A20C;
-        public const int GL_ALWAYS_SOFT_HINT_PGI = 0x1A20D;
-        public const int GL_ALLOW_DRAW_OBJ_HINT_PGI = 0x1A20E;
-        public const int GL_ALLOW_DRAW_WIN_HINT_PGI = 0x1A20F;
-        public const int GL_ALLOW_DRAW_FRG_HINT_PGI = 0x1A210;
-        public const int GL_ALLOW_DRAW_MEM_HINT_PGI = 0x1A211;
-        public const int GL_STRICT_DEPTHFUNC_HINT_PGI = 0x1A216;
-        public const int GL_STRICT_LIGHTING_HINT_PGI = 0x1A217;
-        public const int GL_STRICT_SCISSOR_HINT_PGI = 0x1A218;
-        public const int GL_FULL_STIPPLE_HINT_PGI = 0x1A219;
-        public const int GL_CLIP_NEAR_HINT_PGI = 0x1A220;
-        public const int GL_CLIP_FAR_HINT_PGI = 0x1A221;
-        public const int GL_WIDE_LINE_HINT_PGI = 0x1A222;
-        public const int GL_BACK_NORMALS_HINT_PGI = 0x1A223;
-        public const int GL_PGI_vertex_hints = 1;
-        public const int GL_VERTEX_DATA_HINT_PGI = 0x1A22A;
-        public const int GL_VERTEX_CONSISTENT_HINT_PGI = 0x1A22B;
-        public const int GL_MATERIAL_SIDE_HINT_PGI = 0x1A22C;
-        public const int GL_MAX_VERTEX_HINT_PGI = 0x1A22D;
-        public const int GL_COLOR3_BIT_PGI = 0x00010000;
-        public const int GL_COLOR4_BIT_PGI = 0x00020000;
-        public const int GL_EDGEFLAG_BIT_PGI = 0x00040000;
-        public const int GL_INDEX_BIT_PGI = 0x00080000;
-        public const int GL_MAT_AMBIENT_BIT_PGI = 0x00100000;
-        public const int GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI = 0x00200000;
-        public const int GL_MAT_DIFFUSE_BIT_PGI = 0x00400000;
-        public const int GL_MAT_EMISSION_BIT_PGI = 0x00800000;
-        public const int GL_MAT_COLOR_INDEXES_BIT_PGI = 0x01000000;
-        public const int GL_MAT_SHININESS_BIT_PGI = 0x02000000;
-        public const int GL_MAT_SPECULAR_BIT_PGI = 0x04000000;
-        public const int GL_NORMAL_BIT_PGI = 0x08000000;
-        public const int GL_TEXCOORD1_BIT_PGI = 0x10000000;
-        public const int GL_TEXCOORD2_BIT_PGI = 0x20000000;
-        public const int GL_TEXCOORD3_BIT_PGI = 0x40000000;
-        public const int GL_TEXCOORD4_BIT_PGI = unchecked((int)0x80000000);
-        public const int GL_VERTEX23_BIT_PGI = 0x00000004;
-        public const int GL_VERTEX4_BIT_PGI = 0x00000008;
-        public const int GL_REND_screen_coordinates = 1;
-        public const int GL_SCREEN_COORDINATES_REND = 0x8490;
-        public const int GL_INVERTED_SCREEN_W_REND = 0x8491;
-        public const int GL_S3_s3tc = 1;
-        public const int GL_RGB_S3TC = 0x83A0;
-        public const int GL_RGB4_S3TC = 0x83A1;
-        public const int GL_RGBA_S3TC = 0x83A2;
-        public const int GL_RGBA4_S3TC = 0x83A3;
-        public const int GL_RGBA_DXT5_S3TC = 0x83A4;
-        public const int GL_RGBA4_DXT5_S3TC = 0x83A5;
-        public const int GL_SGIS_detail_texture = 1;
-        public const int GL_DETAIL_TEXTURE_2D_SGIS = 0x8095;
-        public const int GL_DETAIL_TEXTURE_2D_BINDING_SGIS = 0x8096;
-        public const int GL_LINEAR_DETAIL_SGIS = 0x8097;
-        public const int GL_LINEAR_DETAIL_ALPHA_SGIS = 0x8098;
-        public const int GL_LINEAR_DETAIL_COLOR_SGIS = 0x8099;
-        public const int GL_DETAIL_TEXTURE_LEVEL_SGIS = 0x809A;
-        public const int GL_DETAIL_TEXTURE_MODE_SGIS = 0x809B;
-        public const int GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS = 0x809C;
-        public const int GL_SGIS_fog_function = 1;
-        public const int GL_FOG_FUNC_SGIS = 0x812A;
-        public const int GL_FOG_FUNC_POINTS_SGIS = 0x812B;
-        public const int GL_MAX_FOG_FUNC_POINTS_SGIS = 0x812C;
-        public const int GL_SGIS_generate_mipmap = 1;
-        public const int GL_GENERATE_MIPMAP_SGIS = 0x8191;
-        public const int GL_GENERATE_MIPMAP_HINT_SGIS = 0x8192;
-        public const int GL_SGIS_multisample = 1;
-        public const int GL_MULTISAMPLE_SGIS = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_MASK_SGIS = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE_SGIS = 0x809F;
-        public const int GL_SAMPLE_MASK_SGIS = 0x80A0;
-        public const int GL_1PASS_SGIS = 0x80A1;
-        public const int GL_2PASS_0_SGIS = 0x80A2;
-        public const int GL_2PASS_1_SGIS = 0x80A3;
-        public const int GL_4PASS_0_SGIS = 0x80A4;
-        public const int GL_4PASS_1_SGIS = 0x80A5;
-        public const int GL_4PASS_2_SGIS = 0x80A6;
-        public const int GL_4PASS_3_SGIS = 0x80A7;
-        public const int GL_SAMPLE_BUFFERS_SGIS = 0x80A8;
-        public const int GL_SAMPLES_SGIS = 0x80A9;
-        public const int GL_SAMPLE_MASK_VALUE_SGIS = 0x80AA;
-        public const int GL_SAMPLE_MASK_INVERT_SGIS = 0x80AB;
-        public const int GL_SAMPLE_PATTERN_SGIS = 0x80AC;
-        public const int GL_SGIS_pixel_texture = 1;
-        public const int GL_PIXEL_TEXTURE_SGIS = 0x8353;
-        public const int GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS = 0x8354;
-        public const int GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS = 0x8355;
-        public const int GL_PIXEL_GROUP_COLOR_SGIS = 0x8356;
-        public const int GL_SGIS_point_line_texgen = 1;
-        public const int GL_EYE_DISTANCE_TO_POINT_SGIS = 0x81F0;
-        public const int GL_OBJECT_DISTANCE_TO_POINT_SGIS = 0x81F1;
-        public const int GL_EYE_DISTANCE_TO_LINE_SGIS = 0x81F2;
-        public const int GL_OBJECT_DISTANCE_TO_LINE_SGIS = 0x81F3;
-        public const int GL_EYE_POINT_SGIS = 0x81F4;
-        public const int GL_OBJECT_POINT_SGIS = 0x81F5;
-        public const int GL_EYE_LINE_SGIS = 0x81F6;
-        public const int GL_OBJECT_LINE_SGIS = 0x81F7;
-        public const int GL_SGIS_point_parameters = 1;
-        public const int GL_POINT_SIZE_MIN_SGIS = 0x8126;
-        public const int GL_POINT_SIZE_MAX_SGIS = 0x8127;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE_SGIS = 0x8128;
-        public const int GL_DISTANCE_ATTENUATION_SGIS = 0x8129;
-        public const int GL_SGIS_sharpen_texture = 1;
-        public const int GL_LINEAR_SHARPEN_SGIS = 0x80AD;
-        public const int GL_LINEAR_SHARPEN_ALPHA_SGIS = 0x80AE;
-        public const int GL_LINEAR_SHARPEN_COLOR_SGIS = 0x80AF;
-        public const int GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS = 0x80B0;
-        public const int GL_SGIS_texture4D = 1;
-        public const int GL_PACK_SKIP_VOLUMES_SGIS = 0x8130;
-        public const int GL_PACK_IMAGE_DEPTH_SGIS = 0x8131;
-        public const int GL_UNPACK_SKIP_VOLUMES_SGIS = 0x8132;
-        public const int GL_UNPACK_IMAGE_DEPTH_SGIS = 0x8133;
-        public const int GL_TEXTURE_4D_SGIS = 0x8134;
-        public const int GL_PROXY_TEXTURE_4D_SGIS = 0x8135;
-        public const int GL_TEXTURE_4DSIZE_SGIS = 0x8136;
-        public const int GL_TEXTURE_WRAP_Q_SGIS = 0x8137;
-        public const int GL_MAX_4D_TEXTURE_SIZE_SGIS = 0x8138;
-        public const int GL_TEXTURE_4D_BINDING_SGIS = 0x814F;
-        public const int GL_SGIS_texture_border_clamp = 1;
-        public const int GL_CLAMP_TO_BORDER_SGIS = 0x812D;
-        public const int GL_SGIS_texture_color_mask = 1;
-        public const int GL_TEXTURE_COLOR_WRITEMASK_SGIS = 0x81EF;
-        public const int GL_SGIS_texture_edge_clamp = 1;
-        public const int GL_CLAMP_TO_EDGE_SGIS = 0x812F;
-        public const int GL_SGIS_texture_filter4 = 1;
-        public const int GL_FILTER4_SGIS = 0x8146;
-        public const int GL_TEXTURE_FILTER4_SIZE_SGIS = 0x8147;
-        public const int GL_SGIS_texture_lod = 1;
-        public const int GL_TEXTURE_MIN_LOD_SGIS = 0x813A;
-        public const int GL_TEXTURE_MAX_LOD_SGIS = 0x813B;
-        public const int GL_TEXTURE_BASE_LEVEL_SGIS = 0x813C;
-        public const int GL_TEXTURE_MAX_LEVEL_SGIS = 0x813D;
-        public const int GL_SGIS_texture_select = 1;
-        public const int GL_DUAL_ALPHA4_SGIS = 0x8110;
-        public const int GL_DUAL_ALPHA8_SGIS = 0x8111;
-        public const int GL_DUAL_ALPHA12_SGIS = 0x8112;
-        public const int GL_DUAL_ALPHA16_SGIS = 0x8113;
-        public const int GL_DUAL_LUMINANCE4_SGIS = 0x8114;
-        public const int GL_DUAL_LUMINANCE8_SGIS = 0x8115;
-        public const int GL_DUAL_LUMINANCE12_SGIS = 0x8116;
-        public const int GL_DUAL_LUMINANCE16_SGIS = 0x8117;
-        public const int GL_DUAL_INTENSITY4_SGIS = 0x8118;
-        public const int GL_DUAL_INTENSITY8_SGIS = 0x8119;
-        public const int GL_DUAL_INTENSITY12_SGIS = 0x811A;
-        public const int GL_DUAL_INTENSITY16_SGIS = 0x811B;
-        public const int GL_DUAL_LUMINANCE_ALPHA4_SGIS = 0x811C;
-        public const int GL_DUAL_LUMINANCE_ALPHA8_SGIS = 0x811D;
-        public const int GL_QUAD_ALPHA4_SGIS = 0x811E;
-        public const int GL_QUAD_ALPHA8_SGIS = 0x811F;
-        public const int GL_QUAD_LUMINANCE4_SGIS = 0x8120;
-        public const int GL_QUAD_LUMINANCE8_SGIS = 0x8121;
-        public const int GL_QUAD_INTENSITY4_SGIS = 0x8122;
-        public const int GL_QUAD_INTENSITY8_SGIS = 0x8123;
-        public const int GL_DUAL_TEXTURE_SELECT_SGIS = 0x8124;
-        public const int GL_QUAD_TEXTURE_SELECT_SGIS = 0x8125;
-        public const int GL_SGIX_async = 1;
-        public const int GL_ASYNC_MARKER_SGIX = 0x8329;
-        public const int GL_SGIX_async_histogram = 1;
-        public const int GL_ASYNC_HISTOGRAM_SGIX = 0x832C;
-        public const int GL_MAX_ASYNC_HISTOGRAM_SGIX = 0x832D;
-        public const int GL_SGIX_async_pixel = 1;
-        public const int GL_ASYNC_TEX_IMAGE_SGIX = 0x835C;
-        public const int GL_ASYNC_DRAW_PIXELS_SGIX = 0x835D;
-        public const int GL_ASYNC_READ_PIXELS_SGIX = 0x835E;
-        public const int GL_MAX_ASYNC_TEX_IMAGE_SGIX = 0x835F;
-        public const int GL_MAX_ASYNC_DRAW_PIXELS_SGIX = 0x8360;
-        public const int GL_MAX_ASYNC_READ_PIXELS_SGIX = 0x8361;
-        public const int GL_SGIX_blend_alpha_minmax = 1;
-        public const int GL_ALPHA_MIN_SGIX = 0x8320;
-        public const int GL_ALPHA_MAX_SGIX = 0x8321;
-        public const int GL_SGIX_calligraphic_fragment = 1;
-        public const int GL_CALLIGRAPHIC_FRAGMENT_SGIX = 0x8183;
-        public const int GL_SGIX_clipmap = 1;
-        public const int GL_LINEAR_CLIPMAP_LINEAR_SGIX = 0x8170;
-        public const int GL_TEXTURE_CLIPMAP_CENTER_SGIX = 0x8171;
-        public const int GL_TEXTURE_CLIPMAP_FRAME_SGIX = 0x8172;
-        public const int GL_TEXTURE_CLIPMAP_OFFSET_SGIX = 0x8173;
-        public const int GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8174;
-        public const int GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX = 0x8175;
-        public const int GL_TEXTURE_CLIPMAP_DEPTH_SGIX = 0x8176;
-        public const int GL_MAX_CLIPMAP_DEPTH_SGIX = 0x8177;
-        public const int GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8178;
-        public const int GL_NEAREST_CLIPMAP_NEAREST_SGIX = 0x844D;
-        public const int GL_NEAREST_CLIPMAP_LINEAR_SGIX = 0x844E;
-        public const int GL_LINEAR_CLIPMAP_NEAREST_SGIX = 0x844F;
-        public const int GL_SGIX_convolution_accuracy = 1;
-        public const int GL_CONVOLUTION_HINT_SGIX = 0x8316;
-        public const int GL_SGIX_depth_pass_instrument = 1;
-        public const int GL_SGIX_depth_texture = 1;
-        public const int GL_DEPTH_COMPONENT16_SGIX = 0x81A5;
-        public const int GL_DEPTH_COMPONENT24_SGIX = 0x81A6;
-        public const int GL_DEPTH_COMPONENT32_SGIX = 0x81A7;
-        public const int GL_SGIX_flush_raster = 1;
-        public const int GL_SGIX_fog_offset = 1;
-        public const int GL_FOG_OFFSET_SGIX = 0x8198;
-        public const int GL_FOG_OFFSET_VALUE_SGIX = 0x8199;
-        public const int GL_SGIX_fragment_lighting = 1;
-        public const int GL_FRAGMENT_LIGHTING_SGIX = 0x8400;
-        public const int GL_FRAGMENT_COLOR_MATERIAL_SGIX = 0x8401;
-        public const int GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX = 0x8402;
-        public const int GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX = 0x8403;
-        public const int GL_MAX_FRAGMENT_LIGHTS_SGIX = 0x8404;
-        public const int GL_MAX_ACTIVE_LIGHTS_SGIX = 0x8405;
-        public const int GL_CURRENT_RASTER_NORMAL_SGIX = 0x8406;
-        public const int GL_LIGHT_ENV_MODE_SGIX = 0x8407;
-        public const int GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX = 0x8408;
-        public const int GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX = 0x8409;
-        public const int GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX = 0x840A;
-        public const int GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX = 0x840B;
-        public const int GL_FRAGMENT_LIGHT0_SGIX = 0x840C;
-        public const int GL_FRAGMENT_LIGHT1_SGIX = 0x840D;
-        public const int GL_FRAGMENT_LIGHT2_SGIX = 0x840E;
-        public const int GL_FRAGMENT_LIGHT3_SGIX = 0x840F;
-        public const int GL_FRAGMENT_LIGHT4_SGIX = 0x8410;
-        public const int GL_FRAGMENT_LIGHT5_SGIX = 0x8411;
-        public const int GL_FRAGMENT_LIGHT6_SGIX = 0x8412;
-        public const int GL_FRAGMENT_LIGHT7_SGIX = 0x8413;
-        public const int GL_SGIX_framezoom = 1;
-        public const int GL_FRAMEZOOM_SGIX = 0x818B;
-        public const int GL_FRAMEZOOM_FACTOR_SGIX = 0x818C;
-        public const int GL_MAX_FRAMEZOOM_FACTOR_SGIX = 0x818D;
-        public const int GL_SGIX_igloo_interface = 1;
-        public const int GL_SGIX_instruments = 1;
-        public const int GL_INSTRUMENT_BUFFER_POINTER_SGIX = 0x8180;
-        public const int GL_INSTRUMENT_MEASUREMENTS_SGIX = 0x8181;
-        public const int GL_SGIX_interlace = 1;
-        public const int GL_INTERLACE_SGIX = 0x8094;
-        public const int GL_SGIX_ir_instrument1 = 1;
-        public const int GL_IR_INSTRUMENT1_SGIX = 0x817F;
-        public const int GL_SGIX_list_priority = 1;
-        public const int GL_LIST_PRIORITY_SGIX = 0x8182;
-        public const int GL_SGIX_pixel_texture = 1;
-        public const int GL_PIXEL_TEX_GEN_SGIX = 0x8139;
-        public const int GL_PIXEL_TEX_GEN_MODE_SGIX = 0x832B;
-        public const int GL_SGIX_pixel_tiles = 1;
-        public const int GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX = 0x813E;
-        public const int GL_PIXEL_TILE_CACHE_INCREMENT_SGIX = 0x813F;
-        public const int GL_PIXEL_TILE_WIDTH_SGIX = 0x8140;
-        public const int GL_PIXEL_TILE_HEIGHT_SGIX = 0x8141;
-        public const int GL_PIXEL_TILE_GRID_WIDTH_SGIX = 0x8142;
-        public const int GL_PIXEL_TILE_GRID_HEIGHT_SGIX = 0x8143;
-        public const int GL_PIXEL_TILE_GRID_DEPTH_SGIX = 0x8144;
-        public const int GL_PIXEL_TILE_CACHE_SIZE_SGIX = 0x8145;
-        public const int GL_SGIX_polynomial_ffd = 1;
-        public const int GL_TEXTURE_DEFORMATION_BIT_SGIX = 0x00000001;
-        public const int GL_GEOMETRY_DEFORMATION_BIT_SGIX = 0x00000002;
-        public const int GL_GEOMETRY_DEFORMATION_SGIX = 0x8194;
-        public const int GL_TEXTURE_DEFORMATION_SGIX = 0x8195;
-        public const int GL_DEFORMATIONS_MASK_SGIX = 0x8196;
-        public const int GL_MAX_DEFORMATION_ORDER_SGIX = 0x8197;
-        public const int GL_SGIX_reference_plane = 1;
-        public const int GL_REFERENCE_PLANE_SGIX = 0x817D;
-        public const int GL_REFERENCE_PLANE_EQUATION_SGIX = 0x817E;
-        public const int GL_SGIX_resample = 1;
-        public const int GL_PACK_RESAMPLE_SGIX = 0x842E;
-        public const int GL_UNPACK_RESAMPLE_SGIX = 0x842F;
-        public const int GL_RESAMPLE_REPLICATE_SGIX = 0x8433;
-        public const int GL_RESAMPLE_ZERO_FILL_SGIX = 0x8434;
-        public const int GL_RESAMPLE_DECIMATE_SGIX = 0x8430;
-        public const int GL_SGIX_scalebias_hint = 1;
-        public const int GL_SCALEBIAS_HINT_SGIX = 0x8322;
-        public const int GL_SGIX_shadow = 1;
-        public const int GL_TEXTURE_COMPARE_SGIX = 0x819A;
-        public const int GL_TEXTURE_COMPARE_OPERATOR_SGIX = 0x819B;
-        public const int GL_TEXTURE_LEQUAL_R_SGIX = 0x819C;
-        public const int GL_TEXTURE_GEQUAL_R_SGIX = 0x819D;
-        public const int GL_SGIX_shadow_ambient = 1;
-        public const int GL_SHADOW_AMBIENT_SGIX = 0x80BF;
-        public const int GL_SGIX_sprite = 1;
-        public const int GL_SPRITE_SGIX = 0x8148;
-        public const int GL_SPRITE_MODE_SGIX = 0x8149;
-        public const int GL_SPRITE_AXIS_SGIX = 0x814A;
-        public const int GL_SPRITE_TRANSLATION_SGIX = 0x814B;
-        public const int GL_SPRITE_AXIAL_SGIX = 0x814C;
-        public const int GL_SPRITE_OBJECT_ALIGNED_SGIX = 0x814D;
-        public const int GL_SPRITE_EYE_ALIGNED_SGIX = 0x814E;
-        public const int GL_SGIX_subsample = 1;
-        public const int GL_PACK_SUBSAMPLE_RATE_SGIX = 0x85A0;
-        public const int GL_UNPACK_SUBSAMPLE_RATE_SGIX = 0x85A1;
-        public const int GL_PIXEL_SUBSAMPLE_4444_SGIX = 0x85A2;
-        public const int GL_PIXEL_SUBSAMPLE_2424_SGIX = 0x85A3;
-        public const int GL_PIXEL_SUBSAMPLE_4242_SGIX = 0x85A4;
-        public const int GL_SGIX_tag_sample_buffer = 1;
-        public const int GL_SGIX_texture_add_env = 1;
-        public const int GL_TEXTURE_ENV_BIAS_SGIX = 0x80BE;
-        public const int GL_SGIX_texture_coordinate_clamp = 1;
-        public const int GL_TEXTURE_MAX_CLAMP_S_SGIX = 0x8369;
-        public const int GL_TEXTURE_MAX_CLAMP_T_SGIX = 0x836A;
-        public const int GL_TEXTURE_MAX_CLAMP_R_SGIX = 0x836B;
-        public const int GL_SGIX_texture_lod_bias = 1;
-        public const int GL_TEXTURE_LOD_BIAS_S_SGIX = 0x818E;
-        public const int GL_TEXTURE_LOD_BIAS_T_SGIX = 0x818F;
-        public const int GL_TEXTURE_LOD_BIAS_R_SGIX = 0x8190;
-        public const int GL_SGIX_texture_multi_buffer = 1;
-        public const int GL_TEXTURE_MULTI_BUFFER_HINT_SGIX = 0x812E;
-        public const int GL_SGIX_texture_scale_bias = 1;
-        public const int GL_POST_TEXTURE_FILTER_BIAS_SGIX = 0x8179;
-        public const int GL_POST_TEXTURE_FILTER_SCALE_SGIX = 0x817A;
-        public const int GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX = 0x817B;
-        public const int GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX = 0x817C;
-        public const int GL_SGIX_vertex_preclip = 1;
-        public const int GL_VERTEX_PRECLIP_SGIX = 0x83EE;
-        public const int GL_VERTEX_PRECLIP_HINT_SGIX = 0x83EF;
-        public const int GL_SGIX_ycrcb = 1;
-        public const int GL_YCRCB_422_SGIX = 0x81BB;
-        public const int GL_YCRCB_444_SGIX = 0x81BC;
-        public const int GL_SGIX_ycrcb_subsample = 1;
-        public const int GL_SGIX_ycrcba = 1;
-        public const int GL_YCRCB_SGIX = 0x8318;
-        public const int GL_YCRCBA_SGIX = 0x8319;
-        public const int GL_SGI_color_matrix = 1;
-        public const int GL_COLOR_MATRIX_SGI = 0x80B1;
-        public const int GL_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B2;
-        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B3;
-        public const int GL_POST_COLOR_MATRIX_RED_SCALE_SGI = 0x80B4;
-        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI = 0x80B5;
-        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI = 0x80B6;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI = 0x80B7;
-        public const int GL_POST_COLOR_MATRIX_RED_BIAS_SGI = 0x80B8;
-        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI = 0x80B9;
-        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI = 0x80BA;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI = 0x80BB;
-        public const int GL_SGI_color_table = 1;
-        public const int GL_COLOR_TABLE_SGI = 0x80D0;
-        public const int GL_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D1;
-        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D2;
-        public const int GL_PROXY_COLOR_TABLE_SGI = 0x80D3;
-        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D4;
-        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D5;
-        public const int GL_COLOR_TABLE_SCALE_SGI = 0x80D6;
-        public const int GL_COLOR_TABLE_BIAS_SGI = 0x80D7;
-        public const int GL_COLOR_TABLE_FORMAT_SGI = 0x80D8;
-        public const int GL_COLOR_TABLE_WIDTH_SGI = 0x80D9;
-        public const int GL_COLOR_TABLE_RED_SIZE_SGI = 0x80DA;
-        public const int GL_COLOR_TABLE_GREEN_SIZE_SGI = 0x80DB;
-        public const int GL_COLOR_TABLE_BLUE_SIZE_SGI = 0x80DC;
-        public const int GL_COLOR_TABLE_ALPHA_SIZE_SGI = 0x80DD;
-        public const int GL_COLOR_TABLE_LUMINANCE_SIZE_SGI = 0x80DE;
-        public const int GL_COLOR_TABLE_INTENSITY_SIZE_SGI = 0x80DF;
-        public const int GL_SGI_texture_color_table = 1;
-        public const int GL_TEXTURE_COLOR_TABLE_SGI = 0x80BC;
-        public const int GL_PROXY_TEXTURE_COLOR_TABLE_SGI = 0x80BD;
-        public const int GL_SUNX_constant_data = 1;
-        public const int GL_UNPACK_CONSTANT_DATA_SUNX = 0x81D5;
-        public const int GL_TEXTURE_CONSTANT_DATA_SUNX = 0x81D6;
-        public const int GL_SUN_convolution_border_modes = 1;
-        public const int GL_WRAP_BORDER_SUN = 0x81D4;
-        public const int GL_SUN_global_alpha = 1;
-        public const int GL_GLOBAL_ALPHA_SUN = 0x81D9;
-        public const int GL_GLOBAL_ALPHA_FACTOR_SUN = 0x81DA;
-        public const int GL_SUN_mesh_array = 1;
-        public const int GL_QUAD_MESH_SUN = 0x8614;
-        public const int GL_TRIANGLE_MESH_SUN = 0x8615;
-        public const int GL_SUN_slice_accum = 1;
-        public const int GL_SLICE_ACCUM_SUN = 0x85CC;
-        public const int GL_SUN_triangle_list = 1;
-        public const int GL_RESTART_SUN = 0x0001;
-        public const int GL_REPLACE_MIDDLE_SUN = 0x0002;
-        public const int GL_REPLACE_OLDEST_SUN = 0x0003;
-        public const int GL_TRIANGLE_LIST_SUN = 0x81D7;
-        public const int GL_REPLACEMENT_CODE_SUN = 0x81D8;
-        public const int GL_REPLACEMENT_CODE_ARRAY_SUN = 0x85C0;
-        public const int GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN = 0x85C1;
-        public const int GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN = 0x85C2;
-        public const int GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN = 0x85C3;
-        public const int GL_R1UI_V3F_SUN = 0x85C4;
-        public const int GL_R1UI_C4UB_V3F_SUN = 0x85C5;
-        public const int GL_R1UI_C3F_V3F_SUN = 0x85C6;
-        public const int GL_R1UI_N3F_V3F_SUN = 0x85C7;
-        public const int GL_R1UI_C4F_N3F_V3F_SUN = 0x85C8;
-        public const int GL_R1UI_T2F_V3F_SUN = 0x85C9;
-        public const int GL_R1UI_T2F_N3F_V3F_SUN = 0x85CA;
-        public const int GL_R1UI_T2F_C4F_N3F_V3F_SUN = 0x85CB;
-        public const int GL_SUN_vertex = 1;
-        public const int GL_WIN_phong_shading = 1;
-        public const int GL_PHONG_WIN = 0x80EA;
-        public const int GL_PHONG_HINT_WIN = 0x80EB;
-        public const int GL_WIN_specular_fog = 1;
-        public const int GL_FOG_SPECULAR_TEXTURE_WIN = 0x80EC;
+//        public const int GL_STENCIL_INDEX16 = 0x8D49;
+//        public const int GL_RENDERBUFFER_RED_SIZE = 0x8D50;
+//        public const int GL_RENDERBUFFER_GREEN_SIZE = 0x8D51;
+//        public const int GL_RENDERBUFFER_BLUE_SIZE = 0x8D52;
+//        public const int GL_RENDERBUFFER_ALPHA_SIZE = 0x8D53;
+//        public const int GL_RENDERBUFFER_DEPTH_SIZE = 0x8D54;
+//        public const int GL_RENDERBUFFER_STENCIL_SIZE = 0x8D55;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
+//        public const int GL_MAX_SAMPLES = 0x8D57;
+//        public const int GL_INDEX = 0x8222;
+//        public const int GL_TEXTURE_LUMINANCE_TYPE = 0x8C14;
+//        public const int GL_TEXTURE_INTENSITY_TYPE = 0x8C15;
+//        public const int GL_FRAMEBUFFER_SRGB = 0x8DB9;
+//        public const int GL_HALF_FLOAT = 0x140B;
+//        public const int GL_MAP_READ_BIT = 0x0001;
+//        public const int GL_MAP_WRITE_BIT = 0x0002;
+//        public const int GL_MAP_INVALIDATE_RANGE_BIT = 0x0004;
+//        public const int GL_MAP_INVALIDATE_BUFFER_BIT = 0x0008;
+//        public const int GL_MAP_FLUSH_EXPLICIT_BIT = 0x0010;
+//        public const int GL_MAP_UNSYNCHRONIZED_BIT = 0x0020;
+//        public const int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
+//        public const int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
+//        public const int GL_COMPRESSED_RG_RGTC2 = 0x8DBD;
+//        public const int GL_COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
+//        public const int GL_RG = 0x8227;
+//        public const int GL_RG_INTEGER = 0x8228;
+//        public const int GL_R8 = 0x8229;
+//        public const int GL_R16 = 0x822A;
+//        public const int GL_RG8 = 0x822B;
+//        public const int GL_RG16 = 0x822C;
+//        public const int GL_R16F = 0x822D;
+//        public const int GL_R32F = 0x822E;
+//        public const int GL_RG16F = 0x822F;
+//        public const int GL_RG32F = 0x8230;
+//        public const int GL_R8I = 0x8231;
+//        public const int GL_R8UI = 0x8232;
+//        public const int GL_R16I = 0x8233;
+//        public const int GL_R16UI = 0x8234;
+//        public const int GL_R32I = 0x8235;
+//        public const int GL_R32UI = 0x8236;
+//        public const int GL_RG8I = 0x8237;
+//        public const int GL_RG8UI = 0x8238;
+//        public const int GL_RG16I = 0x8239;
+//        public const int GL_RG16UI = 0x823A;
+//        public const int GL_RG32I = 0x823B;
+//        public const int GL_RG32UI = 0x823C;
+//        public const int GL_VERTEX_ARRAY_BINDING = 0x85B5;
+//        public const int GL_CLAMP_VERTEX_COLOR = 0x891A;
+//        public const int GL_CLAMP_FRAGMENT_COLOR = 0x891B;
+//        public const int GL_ALPHA_INTEGER = 0x8D97;
+//        public const int GL_VERSION_3_1 = 1;
+//        public const int GL_SAMPLER_2D_RECT = 0x8B63;
+//        public const int GL_SAMPLER_2D_RECT_SHADOW = 0x8B64;
+//        public const int GL_SAMPLER_BUFFER = 0x8DC2;
+//        public const int GL_INT_SAMPLER_2D_RECT = 0x8DCD;
+//        public const int GL_INT_SAMPLER_BUFFER = 0x8DD0;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT = 0x8DD5;
+//        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER = 0x8DD8;
+//        public const int GL_TEXTURE_BUFFER = 0x8C2A;
+//        public const int GL_MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
+//        public const int GL_TEXTURE_BINDING_BUFFER = 0x8C2C;
+//        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
+//        public const int GL_TEXTURE_RECTANGLE = 0x84F5;
+//        public const int GL_TEXTURE_BINDING_RECTANGLE = 0x84F6;
+//        public const int GL_PROXY_TEXTURE_RECTANGLE = 0x84F7;
+//        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
+//        public const int GL_R8_SNORM = 0x8F94;
+//        public const int GL_RG8_SNORM = 0x8F95;
+//        public const int GL_RGB8_SNORM = 0x8F96;
+//        public const int GL_RGBA8_SNORM = 0x8F97;
+//        public const int GL_R16_SNORM = 0x8F98;
+//        public const int GL_RG16_SNORM = 0x8F99;
+//        public const int GL_RGB16_SNORM = 0x8F9A;
+//        public const int GL_RGBA16_SNORM = 0x8F9B;
+//        public const int GL_SIGNED_NORMALIZED = 0x8F9C;
+//        public const int GL_PRIMITIVE_RESTART = 0x8F9D;
+//        public const int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
+//        public const int GL_COPY_READ_BUFFER = 0x8F36;
+//        public const int GL_COPY_WRITE_BUFFER = 0x8F37;
+//        public const int GL_UNIFORM_BUFFER = 0x8A11;
+//        public const int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
+//        public const int GL_UNIFORM_BUFFER_START = 0x8A29;
+//        public const int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
+//        public const int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
+//        public const int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
+//        public const int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
+//        public const int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
+//        public const int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
+//        public const int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
+//        public const int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
+//        public const int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
+//        public const int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
+//        public const int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
+//        public const int GL_UNIFORM_TYPE = 0x8A37;
+//        public const int GL_UNIFORM_SIZE = 0x8A38;
+//        public const int GL_UNIFORM_NAME_LENGTH = 0x8A39;
+//        public const int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
+//        public const int GL_UNIFORM_OFFSET = 0x8A3B;
+//        public const int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
+//        public const int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
+//        public const int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
+//        public const int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
+//        public const int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
+//        public const int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
+//        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
+//        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
+//        public const int GL_INVALID_INDEX = -1;
+//        public const int GL_VERSION_3_2 = 1;
+//        public const int GL_CONTEXT_CORE_PROFILE_BIT = 0x00000001;
+//        public const int GL_CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+//        public const int GL_LINES_ADJACENCY = 0x000A;
+//        public const int GL_LINE_STRIP_ADJACENCY = 0x000B;
+//        public const int GL_TRIANGLES_ADJACENCY = 0x000C;
+//        public const int GL_TRIANGLE_STRIP_ADJACENCY = 0x000D;
+//        public const int GL_PROGRAM_POINT_SIZE = 0x8642;
+//        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS = 0x8C29;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED = 0x8DA7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8;
+//        public const int GL_GEOMETRY_SHADER = 0x8DD9;
+//        public const int GL_GEOMETRY_VERTICES_OUT = 0x8916;
+//        public const int GL_GEOMETRY_INPUT_TYPE = 0x8917;
+//        public const int GL_GEOMETRY_OUTPUT_TYPE = 0x8918;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS = 0x8DDF;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES = 0x8DE0;
+//        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 0x8DE1;
+//        public const int GL_MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
+//        public const int GL_MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124;
+//        public const int GL_MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
+//        public const int GL_CONTEXT_PROFILE_MASK = 0x9126;
+//        public const int GL_DEPTH_CLAMP = 0x864F;
+//        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 0x8E4C;
+//        public const int GL_FIRST_VERTEX_CONVENTION = 0x8E4D;
+//        public const int GL_LAST_VERTEX_CONVENTION = 0x8E4E;
+//        public const int GL_PROVOKING_VERTEX = 0x8E4F;
+//        public const int GL_TEXTURE_CUBE_MAP_SEAMLESS = 0x884F;
+//        public const int GL_MAX_SERVER_WAIT_TIMEOUT = 0x9111;
+//        public const int GL_OBJECT_TYPE = 0x9112;
+//        public const int GL_SYNC_CONDITION = 0x9113;
+//        public const int GL_SYNC_STATUS = 0x9114;
+//        public const int GL_SYNC_FLAGS = 0x9115;
+//        public const int GL_SYNC_FENCE = 0x9116;
+//        public const int GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
+//        public const int GL_UNSIGNALED = 0x9118;
+//        public const int GL_SIGNALED = 0x9119;
+//        public const int GL_ALREADY_SIGNALED = 0x911A;
+//        public const int GL_TIMEOUT_EXPIRED = 0x911B;
+//        public const int GL_CONDITION_SATISFIED = 0x911C;
+//        public const int GL_WAIT_FAILED = 0x911D;
+//        public const int GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
+//        public const int GL_SAMPLE_POSITION = 0x8E50;
+//        public const int GL_SAMPLE_MASK = 0x8E51;
+//        public const int GL_SAMPLE_MASK_VALUE = 0x8E52;
+//        public const int GL_MAX_SAMPLE_MASK_WORDS = 0x8E59;
+//        public const int GL_TEXTURE_2D_MULTISAMPLE = 0x9100;
+//        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101;
+//        public const int GL_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102;
+//        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103;
+//        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE = 0x9104;
+//        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY = 0x9105;
+//        public const int GL_TEXTURE_SAMPLES = 0x9106;
+//        public const int GL_TEXTURE_FIXED_SAMPLE_LOCATIONS = 0x9107;
+//        public const int GL_SAMPLER_2D_MULTISAMPLE = 0x9108;
+//        public const int GL_INT_SAMPLER_2D_MULTISAMPLE = 0x9109;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 0x910A;
+//        public const int GL_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910B;
+//        public const int GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910C;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D;
+//        public const int GL_MAX_COLOR_TEXTURE_SAMPLES = 0x910E;
+//        public const int GL_MAX_DEPTH_TEXTURE_SAMPLES = 0x910F;
+//        public const int GL_MAX_INTEGER_SAMPLES = 0x9110;
+//        public const int GL_VERSION_3_3 = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE;
+//        public const int GL_SRC1_COLOR = 0x88F9;
+//        public const int GL_ONE_MINUS_SRC1_COLOR = 0x88FA;
+//        public const int GL_ONE_MINUS_SRC1_ALPHA = 0x88FB;
+//        public const int GL_MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC;
+//        public const int GL_ANY_SAMPLES_PASSED = 0x8C2F;
+//        public const int GL_SAMPLER_BINDING = 0x8919;
+//        public const int GL_RGB10_A2UI = 0x906F;
+//        public const int GL_TEXTURE_SWIZZLE_R = 0x8E42;
+//        public const int GL_TEXTURE_SWIZZLE_G = 0x8E43;
+//        public const int GL_TEXTURE_SWIZZLE_B = 0x8E44;
+//        public const int GL_TEXTURE_SWIZZLE_A = 0x8E45;
+//        public const int GL_TEXTURE_SWIZZLE_RGBA = 0x8E46;
+//        public const int GL_TIME_ELAPSED = 0x88BF;
+//        public const int GL_TIMESTAMP = 0x8E28;
+//        public const int GL_INT_2_10_10_10_REV = 0x8D9F;
+//        public const int GL_VERSION_4_0 = 1;
+//        public const int GL_SAMPLE_SHADING = 0x8C36;
+//        public const int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
+//        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F;
+//        public const int GL_TEXTURE_CUBE_MAP_ARRAY = 0x9009;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY = 0x900B;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY = 0x900C;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW = 0x900D;
+//        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F;
+//        public const int GL_DRAW_INDIRECT_BUFFER = 0x8F3F;
+//        public const int GL_DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
+//        public const int GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F;
+//        public const int GL_MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A;
+//        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B;
+//        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C;
+//        public const int GL_FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D;
+//        public const int GL_MAX_VERTEX_STREAMS = 0x8E71;
+//        public const int GL_DOUBLE_VEC2 = 0x8FFC;
+//        public const int GL_DOUBLE_VEC3 = 0x8FFD;
+//        public const int GL_DOUBLE_VEC4 = 0x8FFE;
+//        public const int GL_DOUBLE_MAT2 = 0x8F46;
+//        public const int GL_DOUBLE_MAT3 = 0x8F47;
+//        public const int GL_DOUBLE_MAT4 = 0x8F48;
+//        public const int GL_DOUBLE_MAT2x3 = 0x8F49;
+//        public const int GL_DOUBLE_MAT2x4 = 0x8F4A;
+//        public const int GL_DOUBLE_MAT3x2 = 0x8F4B;
+//        public const int GL_DOUBLE_MAT3x4 = 0x8F4C;
+//        public const int GL_DOUBLE_MAT4x2 = 0x8F4D;
+//        public const int GL_DOUBLE_MAT4x3 = 0x8F4E;
+//        public const int GL_ACTIVE_SUBROUTINES = 0x8DE5;
+//        public const int GL_ACTIVE_SUBROUTINE_UNIFORMS = 0x8DE6;
+//        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS = 0x8E47;
+//        public const int GL_ACTIVE_SUBROUTINE_MAX_LENGTH = 0x8E48;
+//        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH = 0x8E49;
+//        public const int GL_MAX_SUBROUTINES = 0x8DE7;
+//        public const int GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS = 0x8DE8;
+//        public const int GL_NUM_COMPATIBLE_SUBROUTINES = 0x8E4A;
+//        public const int GL_COMPATIBLE_SUBROUTINES = 0x8E4B;
+//        public const int GL_PATCHES = 0x000E;
+//        public const int GL_PATCH_VERTICES = 0x8E72;
+//        public const int GL_PATCH_DEFAULT_INNER_LEVEL = 0x8E73;
+//        public const int GL_PATCH_DEFAULT_OUTER_LEVEL = 0x8E74;
+//        public const int GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75;
+//        public const int GL_TESS_GEN_MODE = 0x8E76;
+//        public const int GL_TESS_GEN_SPACING = 0x8E77;
+//        public const int GL_TESS_GEN_VERTEX_ORDER = 0x8E78;
+//        public const int GL_TESS_GEN_POINT_MODE = 0x8E79;
+//        public const int GL_ISOLINES = 0x8E7A;
+//        public const int GL_FRACTIONAL_ODD = 0x8E7B;
+//        public const int GL_FRACTIONAL_EVEN = 0x8E7C;
+//        public const int GL_MAX_PATCH_VERTICES = 0x8E7D;
+//        public const int GL_MAX_TESS_GEN_LEVEL = 0x8E7E;
+//        public const int GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E7F;
+//        public const int GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E80;
+//        public const int GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS = 0x8E81;
+//        public const int GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS = 0x8E82;
+//        public const int GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS = 0x8E83;
+//        public const int GL_MAX_TESS_PATCH_COMPONENTS = 0x8E84;
+//        public const int GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS = 0x8E85;
+//        public const int GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS = 0x8E86;
+//        public const int GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS = 0x8E89;
+//        public const int GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS = 0x8E8A;
+//        public const int GL_MAX_TESS_CONTROL_INPUT_COMPONENTS = 0x886C;
+//        public const int GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS = 0x886D;
+//        public const int GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E1E;
+//        public const int GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E1F;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1;
+//        public const int GL_TESS_EVALUATION_SHADER = 0x8E87;
+//        public const int GL_TESS_CONTROL_SHADER = 0x8E88;
+//        public const int GL_TRANSFORM_FEEDBACK = 0x8E22;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24;
+//        public const int GL_TRANSFORM_FEEDBACK_BINDING = 0x8E25;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_BUFFERS = 0x8E70;
+//        public const int GL_VERSION_4_1 = 1;
+//        public const int GL_FIXED = 0x140C;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
+//        public const int GL_LOW_FLOAT = 0x8DF0;
+//        public const int GL_MEDIUM_FLOAT = 0x8DF1;
+//        public const int GL_HIGH_FLOAT = 0x8DF2;
+//        public const int GL_LOW_INT = 0x8DF3;
+//        public const int GL_MEDIUM_INT = 0x8DF4;
+//        public const int GL_HIGH_INT = 0x8DF5;
+//        public const int GL_SHADER_COMPILER = 0x8DFA;
+//        public const int GL_SHADER_BINARY_FORMATS = 0x8DF8;
+//        public const int GL_NUM_SHADER_BINARY_FORMATS = 0x8DF9;
+//        public const int GL_MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB;
+//        public const int GL_MAX_VARYING_VECTORS = 0x8DFC;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD;
+//        public const int GL_RGB565 = 0x8D62;
+//        public const int GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257;
+//        public const int GL_PROGRAM_BINARY_LENGTH = 0x8741;
+//        public const int GL_NUM_PROGRAM_BINARY_FORMATS = 0x87FE;
+//        public const int GL_PROGRAM_BINARY_FORMATS = 0x87FF;
+//        public const int GL_VERTEX_SHADER_BIT = 0x00000001;
+//        public const int GL_FRAGMENT_SHADER_BIT = 0x00000002;
+//        public const int GL_GEOMETRY_SHADER_BIT = 0x00000004;
+//        public const int GL_TESS_CONTROL_SHADER_BIT = 0x00000008;
+//        public const int GL_TESS_EVALUATION_SHADER_BIT = 0x00000010;
+//        public const int GL_ALL_SHADER_BITS = -1;
+//        public const int GL_PROGRAM_SEPARABLE = 0x8258;
+//        public const int GL_ACTIVE_PROGRAM = 0x8259;
+//        public const int GL_PROGRAM_PIPELINE_BINDING = 0x825A;
+//        public const int GL_MAX_VIEWPORTS = 0x825B;
+//        public const int GL_VIEWPORT_SUBPIXEL_BITS = 0x825C;
+//        public const int GL_VIEWPORT_BOUNDS_RANGE = 0x825D;
+//        public const int GL_LAYER_PROVOKING_VERTEX = 0x825E;
+//        public const int GL_VIEWPORT_INDEX_PROVOKING_VERTEX = 0x825F;
+//        public const int GL_UNDEFINED_VERTEX = 0x8260;
+//        public const int GL_VERSION_4_2 = 1;
+//        public const int GL_COPY_READ_BUFFER_BINDING = 0x8F36;
+//        public const int GL_COPY_WRITE_BUFFER_BINDING = 0x8F37;
+//        public const int GL_TRANSFORM_FEEDBACK_ACTIVE = 0x8E24;
+//        public const int GL_TRANSFORM_FEEDBACK_PAUSED = 0x8E23;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_WIDTH = 0x9127;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_HEIGHT = 0x9128;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_DEPTH = 0x9129;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_SIZE = 0x912A;
+//        public const int GL_PACK_COMPRESSED_BLOCK_WIDTH = 0x912B;
+//        public const int GL_PACK_COMPRESSED_BLOCK_HEIGHT = 0x912C;
+//        public const int GL_PACK_COMPRESSED_BLOCK_DEPTH = 0x912D;
+//        public const int GL_PACK_COMPRESSED_BLOCK_SIZE = 0x912E;
+//        public const int GL_NUM_SAMPLE_COUNTS = 0x9380;
+//        public const int GL_MIN_MAP_BUFFER_ALIGNMENT = 0x90BC;
+//        public const int GL_ATOMIC_COUNTER_BUFFER = 0x92C0;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_BINDING = 0x92C1;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_START = 0x92C2;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_SIZE = 0x92C3;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE = 0x92C4;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS = 0x92C5;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES = 0x92C6;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER = 0x92C7;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER = 0x92C8;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER = 0x92CA;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER = 0x92CB;
+//        public const int GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS = 0x92CC;
+//        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS = 0x92CD;
+//        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS = 0x92CE;
+//        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS = 0x92CF;
+//        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS = 0x92D0;
+//        public const int GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 0x92D1;
+//        public const int GL_MAX_VERTEX_ATOMIC_COUNTERS = 0x92D2;
+//        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS = 0x92D3;
+//        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS = 0x92D4;
+//        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTERS = 0x92D5;
+//        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTERS = 0x92D6;
+//        public const int GL_MAX_COMBINED_ATOMIC_COUNTERS = 0x92D7;
+//        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE = 0x92D8;
+//        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS = 0x92DC;
+//        public const int GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9;
+//        public const int GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX = 0x92DA;
+//        public const int GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 0x00000001;
+//        public const int GL_ELEMENT_ARRAY_BARRIER_BIT = 0x00000002;
+//        public const int GL_UNIFORM_BARRIER_BIT = 0x00000004;
+//        public const int GL_TEXTURE_FETCH_BARRIER_BIT = 0x00000008;
+//        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 0x00000020;
+//        public const int GL_COMMAND_BARRIER_BIT = 0x00000040;
+//        public const int GL_PIXEL_BUFFER_BARRIER_BIT = 0x00000080;
+//        public const int GL_TEXTURE_UPDATE_BARRIER_BIT = 0x00000100;
+//        public const int GL_BUFFER_UPDATE_BARRIER_BIT = 0x00000200;
+//        public const int GL_FRAMEBUFFER_BARRIER_BIT = 0x00000400;
+//        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT = 0x00000800;
+//        public const int GL_ATOMIC_COUNTER_BARRIER_BIT = 0x00001000;
+//        public const int GL_ALL_BARRIER_BITS = -1;
+//        public const int GL_MAX_IMAGE_UNITS = 0x8F38;
+//        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS = 0x8F39;
+//        public const int GL_IMAGE_BINDING_NAME = 0x8F3A;
+//        public const int GL_IMAGE_BINDING_LEVEL = 0x8F3B;
+//        public const int GL_IMAGE_BINDING_LAYERED = 0x8F3C;
+//        public const int GL_IMAGE_BINDING_LAYER = 0x8F3D;
+//        public const int GL_IMAGE_BINDING_ACCESS = 0x8F3E;
+//        public const int GL_IMAGE_1D = 0x904C;
+//        public const int GL_IMAGE_2D = 0x904D;
+//        public const int GL_IMAGE_3D = 0x904E;
+//        public const int GL_IMAGE_2D_RECT = 0x904F;
+//        public const int GL_IMAGE_CUBE = 0x9050;
+//        public const int GL_IMAGE_BUFFER = 0x9051;
+//        public const int GL_IMAGE_1D_ARRAY = 0x9052;
+//        public const int GL_IMAGE_2D_ARRAY = 0x9053;
+//        public const int GL_IMAGE_CUBE_MAP_ARRAY = 0x9054;
+//        public const int GL_IMAGE_2D_MULTISAMPLE = 0x9055;
+//        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9056;
+//        public const int GL_INT_IMAGE_1D = 0x9057;
+//        public const int GL_INT_IMAGE_2D = 0x9058;
+//        public const int GL_INT_IMAGE_3D = 0x9059;
+//        public const int GL_INT_IMAGE_2D_RECT = 0x905A;
+//        public const int GL_INT_IMAGE_CUBE = 0x905B;
+//        public const int GL_INT_IMAGE_BUFFER = 0x905C;
+//        public const int GL_INT_IMAGE_1D_ARRAY = 0x905D;
+//        public const int GL_INT_IMAGE_2D_ARRAY = 0x905E;
+//        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY = 0x905F;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE = 0x9060;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9061;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D = 0x9062;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D = 0x9063;
+//        public const int GL_UNSIGNED_INT_IMAGE_3D = 0x9064;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT = 0x9065;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE = 0x9066;
+//        public const int GL_UNSIGNED_INT_IMAGE_BUFFER = 0x9067;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY = 0x9068;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY = 0x9069;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY = 0x906A;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE = 0x906B;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x906C;
+//        public const int GL_MAX_IMAGE_SAMPLES = 0x906D;
+//        public const int GL_IMAGE_BINDING_FORMAT = 0x906E;
+//        public const int GL_IMAGE_FORMAT_COMPATIBILITY_TYPE = 0x90C7;
+//        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE = 0x90C8;
+//        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = 0x90C9;
+//        public const int GL_MAX_VERTEX_IMAGE_UNIFORMS = 0x90CA;
+//        public const int GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS = 0x90CB;
+//        public const int GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS = 0x90CC;
+//        public const int GL_MAX_GEOMETRY_IMAGE_UNIFORMS = 0x90CD;
+//        public const int GL_MAX_FRAGMENT_IMAGE_UNIFORMS = 0x90CE;
+//        public const int GL_MAX_COMBINED_IMAGE_UNIFORMS = 0x90CF;
+//        public const int GL_COMPRESSED_RGBA_BPTC_UNORM = 0x8E8C;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM = 0x8E8D;
+//        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT = 0x8E8E;
+//        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = 0x8E8F;
+//        public const int GL_TEXTURE_IMMUTABLE_FORMAT = 0x912F;
+//        public const int GL_VERSION_4_3 = 1;
+//        public const int GL_NUM_SHADING_LANGUAGE_VERSIONS = 0x82E9;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_LONG = 0x874E;
+//        public const int GL_COMPRESSED_RGB8_ETC2 = 0x9274;
+//        public const int GL_COMPRESSED_SRGB8_ETC2 = 0x9275;
+//        public const int GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9276;
+//        public const int GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277;
+//        public const int GL_COMPRESSED_RGBA8_ETC2_EAC = 0x9278;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 0x9279;
+//        public const int GL_COMPRESSED_R11_EAC = 0x9270;
+//        public const int GL_COMPRESSED_SIGNED_R11_EAC = 0x9271;
+//        public const int GL_COMPRESSED_RG11_EAC = 0x9272;
+//        public const int GL_COMPRESSED_SIGNED_RG11_EAC = 0x9273;
+//        public const int GL_PRIMITIVE_RESTART_FIXED_INDEX = 0x8D69;
+//        public const int GL_ANY_SAMPLES_PASSED_CONSERVATIVE = 0x8D6A;
+//        public const int GL_MAX_ELEMENT_INDEX = 0x8D6B;
+//        public const int GL_COMPUTE_SHADER = 0x91B9;
+//        public const int GL_MAX_COMPUTE_UNIFORM_BLOCKS = 0x91BB;
+//        public const int GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS = 0x91BC;
+//        public const int GL_MAX_COMPUTE_IMAGE_UNIFORMS = 0x91BD;
+//        public const int GL_MAX_COMPUTE_SHARED_MEMORY_SIZE = 0x8262;
+//        public const int GL_MAX_COMPUTE_UNIFORM_COMPONENTS = 0x8263;
+//        public const int GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264;
+//        public const int GL_MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265;
+//        public const int GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266;
+//        public const int GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB;
+//        public const int GL_MAX_COMPUTE_WORK_GROUP_COUNT = 0x91BE;
+//        public const int GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF;
+//        public const int GL_COMPUTE_WORK_GROUP_SIZE = 0x8267;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED;
+//        public const int GL_DISPATCH_INDIRECT_BUFFER = 0x90EE;
+//        public const int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 0x90EF;
+//        public const int GL_COMPUTE_SHADER_BIT = 0x00000020;
+//        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS = 0x8242;
+//        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH = 0x8243;
+//        public const int GL_DEBUG_CALLBACK_FUNCTION = 0x8244;
+//        public const int GL_DEBUG_CALLBACK_USER_PARAM = 0x8245;
+//        public const int GL_DEBUG_SOURCE_API = 0x8246;
+//        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247;
+//        public const int GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248;
+//        public const int GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249;
+//        public const int GL_DEBUG_SOURCE_APPLICATION = 0x824A;
+//        public const int GL_DEBUG_SOURCE_OTHER = 0x824B;
+//        public const int GL_DEBUG_TYPE_ERROR = 0x824C;
+//        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D;
+//        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E;
+//        public const int GL_DEBUG_TYPE_PORTABILITY = 0x824F;
+//        public const int GL_DEBUG_TYPE_PERFORMANCE = 0x8250;
+//        public const int GL_DEBUG_TYPE_OTHER = 0x8251;
+//        public const int GL_MAX_DEBUG_MESSAGE_LENGTH = 0x9143;
+//        public const int GL_MAX_DEBUG_LOGGED_MESSAGES = 0x9144;
+//        public const int GL_DEBUG_LOGGED_MESSAGES = 0x9145;
+//        public const int GL_DEBUG_SEVERITY_HIGH = 0x9146;
+//        public const int GL_DEBUG_SEVERITY_MEDIUM = 0x9147;
+//        public const int GL_DEBUG_SEVERITY_LOW = 0x9148;
+//        public const int GL_DEBUG_TYPE_MARKER = 0x8268;
+//        public const int GL_DEBUG_TYPE_PUSH_GROUP = 0x8269;
+//        public const int GL_DEBUG_TYPE_POP_GROUP = 0x826A;
+//        public const int GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
+//        public const int GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C;
+//        public const int GL_DEBUG_GROUP_STACK_DEPTH = 0x826D;
+//        public const int GL_BUFFER = 0x82E0;
+//        public const int GL_SHADER = 0x82E1;
+//        public const int GL_PROGRAM = 0x82E2;
+//        public const int GL_QUERY = 0x82E3;
+//        public const int GL_PROGRAM_PIPELINE = 0x82E4;
+//        public const int GL_SAMPLER = 0x82E6;
+//        public const int GL_MAX_LABEL_LENGTH = 0x82E8;
+//        public const int GL_DEBUG_OUTPUT = 0x92E0;
+//        public const int GL_CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
+//        public const int GL_MAX_UNIFORM_LOCATIONS = 0x826E;
+//        public const int GL_FRAMEBUFFER_DEFAULT_WIDTH = 0x9310;
+//        public const int GL_FRAMEBUFFER_DEFAULT_HEIGHT = 0x9311;
+//        public const int GL_FRAMEBUFFER_DEFAULT_LAYERS = 0x9312;
+//        public const int GL_FRAMEBUFFER_DEFAULT_SAMPLES = 0x9313;
+//        public const int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 0x9314;
+//        public const int GL_MAX_FRAMEBUFFER_WIDTH = 0x9315;
+//        public const int GL_MAX_FRAMEBUFFER_HEIGHT = 0x9316;
+//        public const int GL_MAX_FRAMEBUFFER_LAYERS = 0x9317;
+//        public const int GL_MAX_FRAMEBUFFER_SAMPLES = 0x9318;
+//        public const int GL_INTERNALFORMAT_SUPPORTED = 0x826F;
+//        public const int GL_INTERNALFORMAT_PREFERRED = 0x8270;
+//        public const int GL_INTERNALFORMAT_RED_SIZE = 0x8271;
+//        public const int GL_INTERNALFORMAT_GREEN_SIZE = 0x8272;
+//        public const int GL_INTERNALFORMAT_BLUE_SIZE = 0x8273;
+//        public const int GL_INTERNALFORMAT_ALPHA_SIZE = 0x8274;
+//        public const int GL_INTERNALFORMAT_DEPTH_SIZE = 0x8275;
+//        public const int GL_INTERNALFORMAT_STENCIL_SIZE = 0x8276;
+//        public const int GL_INTERNALFORMAT_SHARED_SIZE = 0x8277;
+//        public const int GL_INTERNALFORMAT_RED_TYPE = 0x8278;
+//        public const int GL_INTERNALFORMAT_GREEN_TYPE = 0x8279;
+//        public const int GL_INTERNALFORMAT_BLUE_TYPE = 0x827A;
+//        public const int GL_INTERNALFORMAT_ALPHA_TYPE = 0x827B;
+//        public const int GL_INTERNALFORMAT_DEPTH_TYPE = 0x827C;
+//        public const int GL_INTERNALFORMAT_STENCIL_TYPE = 0x827D;
+//        public const int GL_MAX_WIDTH = 0x827E;
+//        public const int GL_MAX_HEIGHT = 0x827F;
+//        public const int GL_MAX_DEPTH = 0x8280;
+//        public const int GL_MAX_LAYERS = 0x8281;
+//        public const int GL_MAX_COMBINED_DIMENSIONS = 0x8282;
+//        public const int GL_COLOR_COMPONENTS = 0x8283;
+//        public const int GL_DEPTH_COMPONENTS = 0x8284;
+//        public const int GL_STENCIL_COMPONENTS = 0x8285;
+//        public const int GL_COLOR_RENDERABLE = 0x8286;
+//        public const int GL_DEPTH_RENDERABLE = 0x8287;
+//        public const int GL_STENCIL_RENDERABLE = 0x8288;
+//        public const int GL_FRAMEBUFFER_RENDERABLE = 0x8289;
+//        public const int GL_FRAMEBUFFER_RENDERABLE_LAYERED = 0x828A;
+//        public const int GL_FRAMEBUFFER_BLEND = 0x828B;
+//        public const int GL_READ_PIXELS = 0x828C;
+//        public const int GL_READ_PIXELS_FORMAT = 0x828D;
+//        public const int GL_READ_PIXELS_TYPE = 0x828E;
+//        public const int GL_TEXTURE_IMAGE_FORMAT = 0x828F;
+//        public const int GL_TEXTURE_IMAGE_TYPE = 0x8290;
+//        public const int GL_GET_TEXTURE_IMAGE_FORMAT = 0x8291;
+//        public const int GL_GET_TEXTURE_IMAGE_TYPE = 0x8292;
+//        public const int GL_MIPMAP = 0x8293;
+//        public const int GL_MANUAL_GENERATE_MIPMAP = 0x8294;
+//        public const int GL_AUTO_GENERATE_MIPMAP = 0x8295;
+//        public const int GL_COLOR_ENCODING = 0x8296;
+//        public const int GL_SRGB_READ = 0x8297;
+//        public const int GL_SRGB_WRITE = 0x8298;
+//        public const int GL_FILTER = 0x829A;
+//        public const int GL_VERTEX_TEXTURE = 0x829B;
+//        public const int GL_TESS_CONTROL_TEXTURE = 0x829C;
+//        public const int GL_TESS_EVALUATION_TEXTURE = 0x829D;
+//        public const int GL_GEOMETRY_TEXTURE = 0x829E;
+//        public const int GL_FRAGMENT_TEXTURE = 0x829F;
+//        public const int GL_COMPUTE_TEXTURE = 0x82A0;
+//        public const int GL_TEXTURE_SHADOW = 0x82A1;
+//        public const int GL_TEXTURE_GATHER = 0x82A2;
+//        public const int GL_TEXTURE_GATHER_SHADOW = 0x82A3;
+//        public const int GL_SHADER_IMAGE_LOAD = 0x82A4;
+//        public const int GL_SHADER_IMAGE_STORE = 0x82A5;
+//        public const int GL_SHADER_IMAGE_ATOMIC = 0x82A6;
+//        public const int GL_IMAGE_TEXEL_SIZE = 0x82A7;
+//        public const int GL_IMAGE_COMPATIBILITY_CLASS = 0x82A8;
+//        public const int GL_IMAGE_PIXEL_FORMAT = 0x82A9;
+//        public const int GL_IMAGE_PIXEL_TYPE = 0x82AA;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST = 0x82AC;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST = 0x82AD;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE = 0x82AE;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE = 0x82AF;
+//        public const int GL_TEXTURE_COMPRESSED_BLOCK_WIDTH = 0x82B1;
+//        public const int GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT = 0x82B2;
+//        public const int GL_TEXTURE_COMPRESSED_BLOCK_SIZE = 0x82B3;
+//        public const int GL_CLEAR_BUFFER = 0x82B4;
+//        public const int GL_TEXTURE_VIEW = 0x82B5;
+//        public const int GL_VIEW_COMPATIBILITY_CLASS = 0x82B6;
+//        public const int GL_FULL_SUPPORT = 0x82B7;
+//        public const int GL_CAVEAT_SUPPORT = 0x82B8;
+//        public const int GL_IMAGE_CLASS_4_X_32 = 0x82B9;
+//        public const int GL_IMAGE_CLASS_2_X_32 = 0x82BA;
+//        public const int GL_IMAGE_CLASS_1_X_32 = 0x82BB;
+//        public const int GL_IMAGE_CLASS_4_X_16 = 0x82BC;
+//        public const int GL_IMAGE_CLASS_2_X_16 = 0x82BD;
+//        public const int GL_IMAGE_CLASS_1_X_16 = 0x82BE;
+//        public const int GL_IMAGE_CLASS_4_X_8 = 0x82BF;
+//        public const int GL_IMAGE_CLASS_2_X_8 = 0x82C0;
+//        public const int GL_IMAGE_CLASS_1_X_8 = 0x82C1;
+//        public const int GL_IMAGE_CLASS_11_11_10 = 0x82C2;
+//        public const int GL_IMAGE_CLASS_10_10_10_2 = 0x82C3;
+//        public const int GL_VIEW_CLASS_128_BITS = 0x82C4;
+//        public const int GL_VIEW_CLASS_96_BITS = 0x82C5;
+//        public const int GL_VIEW_CLASS_64_BITS = 0x82C6;
+//        public const int GL_VIEW_CLASS_48_BITS = 0x82C7;
+//        public const int GL_VIEW_CLASS_32_BITS = 0x82C8;
+//        public const int GL_VIEW_CLASS_24_BITS = 0x82C9;
+//        public const int GL_VIEW_CLASS_16_BITS = 0x82CA;
+//        public const int GL_VIEW_CLASS_8_BITS = 0x82CB;
+//        public const int GL_VIEW_CLASS_S3TC_DXT1_RGB = 0x82CC;
+//        public const int GL_VIEW_CLASS_S3TC_DXT1_RGBA = 0x82CD;
+//        public const int GL_VIEW_CLASS_S3TC_DXT3_RGBA = 0x82CE;
+//        public const int GL_VIEW_CLASS_S3TC_DXT5_RGBA = 0x82CF;
+//        public const int GL_VIEW_CLASS_RGTC1_RED = 0x82D0;
+//        public const int GL_VIEW_CLASS_RGTC2_RG = 0x82D1;
+//        public const int GL_VIEW_CLASS_BPTC_UNORM = 0x82D2;
+//        public const int GL_VIEW_CLASS_BPTC_FLOAT = 0x82D3;
+//        public const int GL_UNIFORM = 0x92E1;
+//        public const int GL_UNIFORM_BLOCK = 0x92E2;
+//        public const int GL_PROGRAM_INPUT = 0x92E3;
+//        public const int GL_PROGRAM_OUTPUT = 0x92E4;
+//        public const int GL_BUFFER_VARIABLE = 0x92E5;
+//        public const int GL_SHADER_STORAGE_BLOCK = 0x92E6;
+//        public const int GL_VERTEX_SUBROUTINE = 0x92E8;
+//        public const int GL_TESS_CONTROL_SUBROUTINE = 0x92E9;
+//        public const int GL_TESS_EVALUATION_SUBROUTINE = 0x92EA;
+//        public const int GL_GEOMETRY_SUBROUTINE = 0x92EB;
+//        public const int GL_FRAGMENT_SUBROUTINE = 0x92EC;
+//        public const int GL_COMPUTE_SUBROUTINE = 0x92ED;
+//        public const int GL_VERTEX_SUBROUTINE_UNIFORM = 0x92EE;
+//        public const int GL_TESS_CONTROL_SUBROUTINE_UNIFORM = 0x92EF;
+//        public const int GL_TESS_EVALUATION_SUBROUTINE_UNIFORM = 0x92F0;
+//        public const int GL_GEOMETRY_SUBROUTINE_UNIFORM = 0x92F1;
+//        public const int GL_FRAGMENT_SUBROUTINE_UNIFORM = 0x92F2;
+//        public const int GL_COMPUTE_SUBROUTINE_UNIFORM = 0x92F3;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYING = 0x92F4;
+//        public const int GL_ACTIVE_RESOURCES = 0x92F5;
+//        public const int GL_MAX_NAME_LENGTH = 0x92F6;
+//        public const int GL_MAX_NUM_ACTIVE_VARIABLES = 0x92F7;
+//        public const int GL_MAX_NUM_COMPATIBLE_SUBROUTINES = 0x92F8;
+//        public const int GL_NAME_LENGTH = 0x92F9;
+//        public const int GL_TYPE = 0x92FA;
+//        public const int GL_ARRAY_SIZE = 0x92FB;
+//        public const int GL_OFFSET = 0x92FC;
+//        public const int GL_BLOCK_INDEX = 0x92FD;
+//        public const int GL_ARRAY_STRIDE = 0x92FE;
+//        public const int GL_MATRIX_STRIDE = 0x92FF;
+//        public const int GL_IS_ROW_MAJOR = 0x9300;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_INDEX = 0x9301;
+//        public const int GL_BUFFER_BINDING = 0x9302;
+//        public const int GL_BUFFER_DATA_SIZE = 0x9303;
+//        public const int GL_NUM_ACTIVE_VARIABLES = 0x9304;
+//        public const int GL_ACTIVE_VARIABLES = 0x9305;
+//        public const int GL_REFERENCED_BY_VERTEX_SHADER = 0x9306;
+//        public const int GL_REFERENCED_BY_TESS_CONTROL_SHADER = 0x9307;
+//        public const int GL_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x9308;
+//        public const int GL_REFERENCED_BY_GEOMETRY_SHADER = 0x9309;
+//        public const int GL_REFERENCED_BY_FRAGMENT_SHADER = 0x930A;
+//        public const int GL_REFERENCED_BY_COMPUTE_SHADER = 0x930B;
+//        public const int GL_TOP_LEVEL_ARRAY_SIZE = 0x930C;
+//        public const int GL_TOP_LEVEL_ARRAY_STRIDE = 0x930D;
+//        public const int GL_LOCATION = 0x930E;
+//        public const int GL_LOCATION_INDEX = 0x930F;
+//        public const int GL_IS_PER_PATCH = 0x92E7;
+//        public const int GL_SHADER_STORAGE_BUFFER = 0x90D2;
+//        public const int GL_SHADER_STORAGE_BUFFER_BINDING = 0x90D3;
+//        public const int GL_SHADER_STORAGE_BUFFER_START = 0x90D4;
+//        public const int GL_SHADER_STORAGE_BUFFER_SIZE = 0x90D5;
+//        public const int GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS = 0x90D6;
+//        public const int GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS = 0x90D7;
+//        public const int GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS = 0x90D8;
+//        public const int GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS = 0x90D9;
+//        public const int GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS = 0x90DA;
+//        public const int GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS = 0x90DB;
+//        public const int GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS = 0x90DC;
+//        public const int GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS = 0x90DD;
+//        public const int GL_MAX_SHADER_STORAGE_BLOCK_SIZE = 0x90DE;
+//        public const int GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT = 0x90DF;
+//        public const int GL_SHADER_STORAGE_BARRIER_BIT = 0x00002000;
+//        public const int GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES = 0x8F39;
+//        public const int GL_DEPTH_STENCIL_TEXTURE_MODE = 0x90EA;
+//        public const int GL_TEXTURE_BUFFER_OFFSET = 0x919D;
+//        public const int GL_TEXTURE_BUFFER_SIZE = 0x919E;
+//        public const int GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT = 0x919F;
+//        public const int GL_TEXTURE_VIEW_MIN_LEVEL = 0x82DB;
+//        public const int GL_TEXTURE_VIEW_NUM_LEVELS = 0x82DC;
+//        public const int GL_TEXTURE_VIEW_MIN_LAYER = 0x82DD;
+//        public const int GL_TEXTURE_VIEW_NUM_LAYERS = 0x82DE;
+//        public const int GL_TEXTURE_IMMUTABLE_LEVELS = 0x82DF;
+//        public const int GL_VERTEX_ATTRIB_BINDING = 0x82D4;
+//        public const int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D5;
+//        public const int GL_VERTEX_BINDING_DIVISOR = 0x82D6;
+//        public const int GL_VERTEX_BINDING_OFFSET = 0x82D7;
+//        public const int GL_VERTEX_BINDING_STRIDE = 0x82D8;
+//        public const int GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D9;
+//        public const int GL_MAX_VERTEX_ATTRIB_BINDINGS = 0x82DA;
+//        public const int GL_VERTEX_BINDING_BUFFER = 0x8F4F;
+//        public const int GL_DISPLAY_LIST = 0x82E7;
+//        public const int GL_VERSION_4_4 = 1;
+//        public const int GL_MAX_VERTEX_ATTRIB_STRIDE = 0x82E5;
+//        public const int GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 0x8221;
+//        public const int GL_TEXTURE_BUFFER_BINDING = 0x8C2A;
+//        public const int GL_MAP_PERSISTENT_BIT = 0x0040;
+//        public const int GL_MAP_COHERENT_BIT = 0x0080;
+//        public const int GL_DYNAMIC_STORAGE_BIT = 0x0100;
+//        public const int GL_CLIENT_STORAGE_BIT = 0x0200;
+//        public const int GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = 0x00004000;
+//        public const int GL_BUFFER_IMMUTABLE_STORAGE = 0x821F;
+//        public const int GL_BUFFER_STORAGE_FLAGS = 0x8220;
+//        public const int GL_CLEAR_TEXTURE = 0x9365;
+//        public const int GL_LOCATION_COMPONENT = 0x934A;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_INDEX = 0x934B;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE = 0x934C;
+//        public const int GL_QUERY_BUFFER = 0x9192;
+//        public const int GL_QUERY_BUFFER_BARRIER_BIT = 0x00008000;
+//        public const int GL_QUERY_BUFFER_BINDING = 0x9193;
+//        public const int GL_QUERY_RESULT_NO_WAIT = 0x9194;
+//        public const int GL_MIRROR_CLAMP_TO_EDGE = 0x8743;
+//        public const int GL_NEGATIVE_ONE_TO_ONE = 0x935E;
+//        public const int GL_ZERO_TO_ONE = 0x935F;
+//        public const int GL_CLIP_ORIGIN = 0x935C;
+//        public const int GL_CLIP_DEPTH_MODE = 0x935D;
+//        public const int GL_QUERY_WAIT_INVERTED = 0x8E17;
+//        public const int GL_QUERY_NO_WAIT_INVERTED = 0x8E18;
+//        public const int GL_QUERY_BY_REGION_WAIT_INVERTED = 0x8E19;
+//        public const int GL_QUERY_BY_REGION_NO_WAIT_INVERTED = 0x8E1A;
+//        public const int GL_MAX_CULL_DISTANCES = 0x82F9;
+//        public const int GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES = 0x82FA;
+//        public const int GL_TEXTURE_TARGET = 0x1006;
+//        public const int GL_QUERY_TARGET = 0x82EA;
+//        public const int GL_GUILTY_CONTEXT_RESET = 0x8253;
+//        public const int GL_INNOCENT_CONTEXT_RESET = 0x8254;
+//        public const int GL_UNKNOWN_CONTEXT_RESET = 0x8255;
+//        public const int GL_RESET_NOTIFICATION_STRATEGY = 0x8256;
+//        public const int GL_LOSE_CONTEXT_ON_RESET = 0x8252;
+//        public const int GL_NO_RESET_NOTIFICATION = 0x8261;
+//        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT = 0x00000004;
+//        public const int GL_CONTEXT_RELEASE_BEHAVIOR = 0x82FB;
+//        public const int GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x82FC;
+//        public const int GL_VERSION_4_6 = 1;
+//        public const int GL_SHADER_BINARY_FORMAT_SPIR_V = 0x9551;
+//        public const int GL_SPIR_V_BINARY = 0x9552;
+//        public const int GL_PARAMETER_BUFFER = 0x80EE;
+//        public const int GL_PARAMETER_BUFFER_BINDING = 0x80EF;
+//        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT = 0x00000008;
+//        public const int GL_VERTICES_SUBMITTED = 0x82EE;
+//        public const int GL_PRIMITIVES_SUBMITTED = 0x82EF;
+//        public const int GL_VERTEX_SHADER_INVOCATIONS = 0x82F0;
+//        public const int GL_TESS_CONTROL_SHADER_PATCHES = 0x82F1;
+//        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS = 0x82F2;
+//        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED = 0x82F3;
+//        public const int GL_FRAGMENT_SHADER_INVOCATIONS = 0x82F4;
+//        public const int GL_COMPUTE_SHADER_INVOCATIONS = 0x82F5;
+//        public const int GL_CLIPPING_INPUT_PRIMITIVES = 0x82F6;
+//        public const int GL_CLIPPING_OUTPUT_PRIMITIVES = 0x82F7;
+//        public const int GL_POLYGON_OFFSET_CLAMP = 0x8E1B;
+//        public const int GL_SPIR_V_EXTENSIONS = 0x9553;
+//        public const int GL_NUM_SPIR_V_EXTENSIONS = 0x9554;
+//        public const int GL_TEXTURE_MAX_ANISOTROPY = 0x84FE;
+//        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY = 0x84FF;
+//        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW = 0x82EC;
+//        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW = 0x82ED;
+//        public const int GL_ARB_ES2_compatibility = 1;
+//        public const int GL_ARB_ES3_1_compatibility = 1;
+//        public const int GL_ARB_ES3_2_compatibility = 1;
+//        public const int GL_PRIMITIVE_BOUNDING_BOX_ARB = 0x92BE;
+//        public const int GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB = 0x9381;
+//        public const int GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB = 0x9382;
+//        public const int GL_ARB_ES3_compatibility = 1;
+//        public const int GL_ARB_arrays_of_arrays = 1;
+//        public const int GL_ARB_base_instance = 1;
+//        public const int GL_ARB_bindless_texture = 1;
+//        public const int GL_UNSIGNED_INT64_ARB = 0x140F;
+//        public const int GL_ARB_blend_func_extended = 1;
+//        public const int GL_ARB_buffer_storage = 1;
+//        public const int GL_ARB_cl_event = 1;
+//        public const int GL_SYNC_CL_EVENT_ARB = 0x8240;
+//        public const int GL_SYNC_CL_EVENT_COMPLETE_ARB = 0x8241;
+//        public const int GL_ARB_clear_buffer_object = 1;
+//        public const int GL_ARB_clear_texture = 1;
+//        public const int GL_ARB_clip_control = 1;
+//        public const int GL_ARB_color_buffer_float = 1;
+//        public const int GL_RGBA_FLOAT_MODE_ARB = 0x8820;
+//        public const int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A;
+//        public const int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
+//        public const int GL_CLAMP_READ_COLOR_ARB = 0x891C;
+//        public const int GL_FIXED_ONLY_ARB = 0x891D;
+//        public const int GL_ARB_compatibility = 1;
+//        public const int GL_ARB_compressed_texture_pixel_storage = 1;
+//        public const int GL_ARB_compute_shader = 1;
+//        public const int GL_ARB_compute_variable_group_size = 1;
+//        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB = 0x9344;
+//        public const int GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB = 0x90EB;
+//        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB = 0x9345;
+//        public const int GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB = 0x91BF;
+//        public const int GL_ARB_conditional_render_inverted = 1;
+//        public const int GL_ARB_conservative_depth = 1;
+//        public const int GL_ARB_copy_buffer = 1;
+//        public const int GL_ARB_copy_image = 1;
+//        public const int GL_ARB_cull_distance = 1;
+//        public const int GL_ARB_debug_output = 1;
+//        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB = 0x8242;
+//        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB = 0x8243;
+//        public const int GL_DEBUG_CALLBACK_FUNCTION_ARB = 0x8244;
+//        public const int GL_DEBUG_CALLBACK_USER_PARAM_ARB = 0x8245;
+//        public const int GL_DEBUG_SOURCE_API_ARB = 0x8246;
+//        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB = 0x8247;
+//        public const int GL_DEBUG_SOURCE_SHADER_COMPILER_ARB = 0x8248;
+//        public const int GL_DEBUG_SOURCE_THIRD_PARTY_ARB = 0x8249;
+//        public const int GL_DEBUG_SOURCE_APPLICATION_ARB = 0x824A;
+//        public const int GL_DEBUG_SOURCE_OTHER_ARB = 0x824B;
+//        public const int GL_DEBUG_TYPE_ERROR_ARB = 0x824C;
+//        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB = 0x824D;
+//        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB = 0x824E;
+//        public const int GL_DEBUG_TYPE_PORTABILITY_ARB = 0x824F;
+//        public const int GL_DEBUG_TYPE_PERFORMANCE_ARB = 0x8250;
+//        public const int GL_DEBUG_TYPE_OTHER_ARB = 0x8251;
+//        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_ARB = 0x9143;
+//        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_ARB = 0x9144;
+//        public const int GL_DEBUG_LOGGED_MESSAGES_ARB = 0x9145;
+//        public const int GL_DEBUG_SEVERITY_HIGH_ARB = 0x9146;
+//        public const int GL_DEBUG_SEVERITY_MEDIUM_ARB = 0x9147;
+//        public const int GL_DEBUG_SEVERITY_LOW_ARB = 0x9148;
+//        public const int GL_ARB_depth_buffer_float = 1;
+//        public const int GL_ARB_depth_clamp = 1;
+//        public const int GL_ARB_depth_texture = 1;
+//        public const int GL_DEPTH_COMPONENT16_ARB = 0x81A5;
+//        public const int GL_DEPTH_COMPONENT24_ARB = 0x81A6;
+//        public const int GL_DEPTH_COMPONENT32_ARB = 0x81A7;
+//        public const int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A;
+//        public const int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B;
+//        public const int GL_ARB_derivative_control = 1;
+//        public const int GL_ARB_direct_state_access = 1;
+//        public const int GL_ARB_draw_buffers = 1;
+//        public const int GL_MAX_DRAW_BUFFERS_ARB = 0x8824;
+//        public const int GL_DRAW_BUFFER0_ARB = 0x8825;
+//        public const int GL_DRAW_BUFFER1_ARB = 0x8826;
+//        public const int GL_DRAW_BUFFER2_ARB = 0x8827;
+//        public const int GL_DRAW_BUFFER3_ARB = 0x8828;
+//        public const int GL_DRAW_BUFFER4_ARB = 0x8829;
+//        public const int GL_DRAW_BUFFER5_ARB = 0x882A;
+//        public const int GL_DRAW_BUFFER6_ARB = 0x882B;
+//        public const int GL_DRAW_BUFFER7_ARB = 0x882C;
+//        public const int GL_DRAW_BUFFER8_ARB = 0x882D;
+//        public const int GL_DRAW_BUFFER9_ARB = 0x882E;
+//        public const int GL_DRAW_BUFFER10_ARB = 0x882F;
+//        public const int GL_DRAW_BUFFER11_ARB = 0x8830;
+//        public const int GL_DRAW_BUFFER12_ARB = 0x8831;
+//        public const int GL_DRAW_BUFFER13_ARB = 0x8832;
+//        public const int GL_DRAW_BUFFER14_ARB = 0x8833;
+//        public const int GL_DRAW_BUFFER15_ARB = 0x8834;
+//        public const int GL_ARB_draw_buffers_blend = 1;
+//        public const int GL_ARB_draw_elements_base_vertex = 1;
+//        public const int GL_ARB_draw_indirect = 1;
+//        public const int GL_ARB_draw_instanced = 1;
+//        public const int GL_ARB_enhanced_layouts = 1;
+//        public const int GL_ARB_explicit_attrib_location = 1;
+//        public const int GL_ARB_explicit_uniform_location = 1;
+//        public const int GL_ARB_fragment_coord_conventions = 1;
+//        public const int GL_ARB_fragment_layer_viewport = 1;
+//        public const int GL_ARB_fragment_program = 1;
+//        public const int GL_FRAGMENT_PROGRAM_ARB = 0x8804;
+//        public const int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
+//        public const int GL_PROGRAM_LENGTH_ARB = 0x8627;
+//        public const int GL_PROGRAM_FORMAT_ARB = 0x8876;
+//        public const int GL_PROGRAM_BINDING_ARB = 0x8677;
+//        public const int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0;
+//        public const int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1;
+//        public const int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2;
+//        public const int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3;
+//        public const int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4;
+//        public const int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5;
+//        public const int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6;
+//        public const int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7;
+//        public const int GL_PROGRAM_PARAMETERS_ARB = 0x88A8;
+//        public const int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9;
+//        public const int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA;
+//        public const int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB;
+//        public const int GL_PROGRAM_ATTRIBS_ARB = 0x88AC;
+//        public const int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD;
+//        public const int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE;
+//        public const int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF;
+//        public const int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4;
+//        public const int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5;
+//        public const int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6;
+//        public const int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805;
+//        public const int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806;
+//        public const int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807;
+//        public const int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808;
+//        public const int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809;
+//        public const int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A;
+//        public const int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B;
+//        public const int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C;
+//        public const int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D;
+//        public const int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E;
+//        public const int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F;
+//        public const int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810;
+//        public const int GL_PROGRAM_STRING_ARB = 0x8628;
+//        public const int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B;
+//        public const int GL_CURRENT_MATRIX_ARB = 0x8641;
+//        public const int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7;
+//        public const int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640;
+//        public const int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F;
+//        public const int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E;
+//        public const int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
+//        public const int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
+//        public const int GL_PROGRAM_ERROR_STRING_ARB = 0x8874;
+//        public const int GL_MATRIX0_ARB = 0x88C0;
+//        public const int GL_MATRIX1_ARB = 0x88C1;
+//        public const int GL_MATRIX2_ARB = 0x88C2;
+//        public const int GL_MATRIX3_ARB = 0x88C3;
+//        public const int GL_MATRIX4_ARB = 0x88C4;
+//        public const int GL_MATRIX5_ARB = 0x88C5;
+//        public const int GL_MATRIX6_ARB = 0x88C6;
+//        public const int GL_MATRIX7_ARB = 0x88C7;
+//        public const int GL_MATRIX8_ARB = 0x88C8;
+//        public const int GL_MATRIX9_ARB = 0x88C9;
+//        public const int GL_MATRIX10_ARB = 0x88CA;
+//        public const int GL_MATRIX11_ARB = 0x88CB;
+//        public const int GL_MATRIX12_ARB = 0x88CC;
+//        public const int GL_MATRIX13_ARB = 0x88CD;
+//        public const int GL_MATRIX14_ARB = 0x88CE;
+//        public const int GL_MATRIX15_ARB = 0x88CF;
+//        public const int GL_MATRIX16_ARB = 0x88D0;
+//        public const int GL_MATRIX17_ARB = 0x88D1;
+//        public const int GL_MATRIX18_ARB = 0x88D2;
+//        public const int GL_MATRIX19_ARB = 0x88D3;
+//        public const int GL_MATRIX20_ARB = 0x88D4;
+//        public const int GL_MATRIX21_ARB = 0x88D5;
+//        public const int GL_MATRIX22_ARB = 0x88D6;
+//        public const int GL_MATRIX23_ARB = 0x88D7;
+//        public const int GL_MATRIX24_ARB = 0x88D8;
+//        public const int GL_MATRIX25_ARB = 0x88D9;
+//        public const int GL_MATRIX26_ARB = 0x88DA;
+//        public const int GL_MATRIX27_ARB = 0x88DB;
+//        public const int GL_MATRIX28_ARB = 0x88DC;
+//        public const int GL_MATRIX29_ARB = 0x88DD;
+//        public const int GL_MATRIX30_ARB = 0x88DE;
+//        public const int GL_MATRIX31_ARB = 0x88DF;
+//        public const int GL_ARB_fragment_program_shadow = 1;
+//        public const int GL_ARB_fragment_shader = 1;
+//        public const int GL_FRAGMENT_SHADER_ARB = 0x8B30;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49;
+//        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B;
+//        public const int GL_ARB_fragment_shader_interlock = 1;
+//        public const int GL_ARB_framebuffer_no_attachments = 1;
+//        public const int GL_ARB_framebuffer_object = 1;
+//        public const int GL_ARB_framebuffer_sRGB = 1;
+//        public const int GL_ARB_geometry_shader4 = 1;
+//        public const int GL_LINES_ADJACENCY_ARB = 0x000A;
+//        public const int GL_LINE_STRIP_ADJACENCY_ARB = 0x000B;
+//        public const int GL_TRIANGLES_ADJACENCY_ARB = 0x000C;
+//        public const int GL_TRIANGLE_STRIP_ADJACENCY_ARB = 0x000D;
+//        public const int GL_PROGRAM_POINT_SIZE_ARB = 0x8642;
+//        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB = 0x8C29;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB = 0x8DA7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB = 0x8DA8;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB = 0x8DA9;
+//        public const int GL_GEOMETRY_SHADER_ARB = 0x8DD9;
+//        public const int GL_GEOMETRY_VERTICES_OUT_ARB = 0x8DDA;
+//        public const int GL_GEOMETRY_INPUT_TYPE_ARB = 0x8DDB;
+//        public const int GL_GEOMETRY_OUTPUT_TYPE_ARB = 0x8DDC;
+//        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB = 0x8DDD;
+//        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_ARB = 0x8DDE;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8DDF;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB = 0x8DE0;
+//        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB = 0x8DE1;
+//        public const int GL_ARB_get_program_binary = 1;
+//        public const int GL_ARB_get_texture_sub_image = 1;
+//        public const int GL_ARB_gl_spirv = 1;
+//        public const int GL_SHADER_BINARY_FORMAT_SPIR_V_ARB = 0x9551;
+//        public const int GL_SPIR_V_BINARY_ARB = 0x9552;
+//        public const int GL_ARB_gpu_shader5 = 1;
+//        public const int GL_ARB_gpu_shader_fp64 = 1;
+//        public const int GL_ARB_gpu_shader_int64 = 1;
+//        public const int GL_INT64_ARB = 0x140E;
+//        public const int GL_INT64_VEC2_ARB = 0x8FE9;
+//        public const int GL_INT64_VEC3_ARB = 0x8FEA;
+//        public const int GL_INT64_VEC4_ARB = 0x8FEB;
+//        public const int GL_UNSIGNED_INT64_VEC2_ARB = 0x8FF5;
+//        public const int GL_UNSIGNED_INT64_VEC3_ARB = 0x8FF6;
+//        public const int GL_UNSIGNED_INT64_VEC4_ARB = 0x8FF7;
+//        public const int GL_ARB_half_float_pixel = 1;
+//        public const int GL_HALF_FLOAT_ARB = 0x140B;
+//        public const int GL_ARB_half_float_vertex = 1;
+//        public const int GL_ARB_imaging = 1;
+//        public const int GL_ARB_indirect_parameters = 1;
+//        public const int GL_PARAMETER_BUFFER_ARB = 0x80EE;
+//        public const int GL_PARAMETER_BUFFER_BINDING_ARB = 0x80EF;
+//        public const int GL_ARB_instanced_arrays = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = 0x88FE;
+//        public const int GL_ARB_internalformat_query = 1;
+//        public const int GL_ARB_internalformat_query2 = 1;
+//        public const int GL_SRGB_DECODE_ARB = 0x8299;
+//        public const int GL_ARB_invalidate_subdata = 1;
+//        public const int GL_ARB_map_buffer_alignment = 1;
+//        public const int GL_ARB_map_buffer_range = 1;
+//        public const int GL_ARB_matrix_palette = 1;
+//        public const int GL_MATRIX_PALETTE_ARB = 0x8840;
+//        public const int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841;
+//        public const int GL_MAX_PALETTE_MATRICES_ARB = 0x8842;
+//        public const int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843;
+//        public const int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844;
+//        public const int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845;
+//        public const int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846;
+//        public const int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847;
+//        public const int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848;
+//        public const int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849;
+//        public const int GL_ARB_multi_bind = 1;
+//        public const int GL_ARB_multi_draw_indirect = 1;
+//        public const int GL_ARB_multisample = 1;
+//        public const int GL_MULTISAMPLE_ARB = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F;
+//        public const int GL_SAMPLE_COVERAGE_ARB = 0x80A0;
+//        public const int GL_SAMPLE_BUFFERS_ARB = 0x80A8;
+//        public const int GL_SAMPLES_ARB = 0x80A9;
+//        public const int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA;
+//        public const int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB;
+//        public const int GL_MULTISAMPLE_BIT_ARB = 0x20000000;
+//        public const int GL_ARB_occlusion_query = 1;
+//        public const int GL_QUERY_COUNTER_BITS_ARB = 0x8864;
+//        public const int GL_CURRENT_QUERY_ARB = 0x8865;
+//        public const int GL_QUERY_RESULT_ARB = 0x8866;
+//        public const int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867;
+//        public const int GL_SAMPLES_PASSED_ARB = 0x8914;
+//        public const int GL_ARB_occlusion_query2 = 1;
+//        public const int GL_ARB_parallel_shader_compile = 1;
+//        public const int GL_MAX_SHADER_COMPILER_THREADS_ARB = 0x91B0;
+//        public const int GL_COMPLETION_STATUS_ARB = 0x91B1;
+//        public const int GL_ARB_pipeline_statistics_query = 1;
+//        public const int GL_VERTICES_SUBMITTED_ARB = 0x82EE;
+//        public const int GL_PRIMITIVES_SUBMITTED_ARB = 0x82EF;
+//        public const int GL_VERTEX_SHADER_INVOCATIONS_ARB = 0x82F0;
+//        public const int GL_TESS_CONTROL_SHADER_PATCHES_ARB = 0x82F1;
+//        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB = 0x82F2;
+//        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB = 0x82F3;
+//        public const int GL_FRAGMENT_SHADER_INVOCATIONS_ARB = 0x82F4;
+//        public const int GL_COMPUTE_SHADER_INVOCATIONS_ARB = 0x82F5;
+//        public const int GL_CLIPPING_INPUT_PRIMITIVES_ARB = 0x82F6;
+//        public const int GL_CLIPPING_OUTPUT_PRIMITIVES_ARB = 0x82F7;
+//        public const int GL_ARB_pixel_buffer_object = 1;
+//        public const int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB;
+//        public const int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC;
+//        public const int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED;
+//        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88EF;
+//        public const int GL_ARB_point_parameters = 1;
+//        public const int GL_POINT_SIZE_MIN_ARB = 0x8126;
+//        public const int GL_POINT_SIZE_MAX_ARB = 0x8127;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128;
+//        public const int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129;
+//        public const int GL_ARB_point_sprite = 1;
+//        public const int GL_POINT_SPRITE_ARB = 0x8861;
+//        public const int GL_COORD_REPLACE_ARB = 0x8862;
+//        public const int GL_ARB_polygon_offset_clamp = 1;
+//        public const int GL_ARB_post_depth_coverage = 1;
+//        public const int GL_ARB_program_interface_query = 1;
+//        public const int GL_ARB_provoking_vertex = 1;
+//        public const int GL_ARB_query_buffer_object = 1;
+//        public const int GL_ARB_robust_buffer_access_behavior = 1;
+//        public const int GL_ARB_robustness = 1;
+//        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB = 0x00000004;
+//        public const int GL_LOSE_CONTEXT_ON_RESET_ARB = 0x8252;
+//        public const int GL_GUILTY_CONTEXT_RESET_ARB = 0x8253;
+//        public const int GL_INNOCENT_CONTEXT_RESET_ARB = 0x8254;
+//        public const int GL_UNKNOWN_CONTEXT_RESET_ARB = 0x8255;
+//        public const int GL_RESET_NOTIFICATION_STRATEGY_ARB = 0x8256;
+//        public const int GL_NO_RESET_NOTIFICATION_ARB = 0x8261;
+//        public const int GL_ARB_robustness_isolation = 1;
+//        public const int GL_ARB_sample_locations = 1;
+//        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB = 0x933D;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB = 0x933E;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB = 0x933F;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB = 0x9340;
+//        public const int GL_SAMPLE_LOCATION_ARB = 0x8E50;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB = 0x9341;
+//        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB = 0x9342;
+//        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB = 0x9343;
+//        public const int GL_ARB_sample_shading = 1;
+//        public const int GL_SAMPLE_SHADING_ARB = 0x8C36;
+//        public const int GL_MIN_SAMPLE_SHADING_VALUE_ARB = 0x8C37;
+//        public const int GL_ARB_sampler_objects = 1;
+//        public const int GL_ARB_seamless_cube_map = 1;
+//        public const int GL_ARB_seamless_cubemap_per_texture = 1;
+//        public const int GL_ARB_separate_shader_objects = 1;
+//        public const int GL_ARB_shader_atomic_counter_ops = 1;
+//        public const int GL_ARB_shader_atomic_counters = 1;
+//        public const int GL_ARB_shader_ballot = 1;
+//        public const int GL_ARB_shader_bit_encoding = 1;
+//        public const int GL_ARB_shader_clock = 1;
+//        public const int GL_ARB_shader_draw_parameters = 1;
+//        public const int GL_ARB_shader_group_vote = 1;
+//        public const int GL_ARB_shader_image_load_store = 1;
+//        public const int GL_ARB_shader_image_size = 1;
+//        public const int GL_ARB_shader_objects = 1;
+//        public const int GL_PROGRAM_OBJECT_ARB = 0x8B40;
+//        public const int GL_SHADER_OBJECT_ARB = 0x8B48;
+//        public const int GL_OBJECT_TYPE_ARB = 0x8B4E;
+//        public const int GL_OBJECT_SUBTYPE_ARB = 0x8B4F;
+//        public const int GL_FLOAT_VEC2_ARB = 0x8B50;
+//        public const int GL_FLOAT_VEC3_ARB = 0x8B51;
+//        public const int GL_FLOAT_VEC4_ARB = 0x8B52;
+//        public const int GL_INT_VEC2_ARB = 0x8B53;
+//        public const int GL_INT_VEC3_ARB = 0x8B54;
+//        public const int GL_INT_VEC4_ARB = 0x8B55;
+//        public const int GL_BOOL_ARB = 0x8B56;
+//        public const int GL_BOOL_VEC2_ARB = 0x8B57;
+//        public const int GL_BOOL_VEC3_ARB = 0x8B58;
+//        public const int GL_BOOL_VEC4_ARB = 0x8B59;
+//        public const int GL_FLOAT_MAT2_ARB = 0x8B5A;
+//        public const int GL_FLOAT_MAT3_ARB = 0x8B5B;
+//        public const int GL_FLOAT_MAT4_ARB = 0x8B5C;
+//        public const int GL_SAMPLER_1D_ARB = 0x8B5D;
+//        public const int GL_SAMPLER_2D_ARB = 0x8B5E;
+//        public const int GL_SAMPLER_3D_ARB = 0x8B5F;
+//        public const int GL_SAMPLER_CUBE_ARB = 0x8B60;
+//        public const int GL_SAMPLER_1D_SHADOW_ARB = 0x8B61;
+//        public const int GL_SAMPLER_2D_SHADOW_ARB = 0x8B62;
+//        public const int GL_SAMPLER_2D_RECT_ARB = 0x8B63;
+//        public const int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64;
+//        public const int GL_OBJECT_DELETE_STATUS_ARB = 0x8B80;
+//        public const int GL_OBJECT_COMPILE_STATUS_ARB = 0x8B81;
+//        public const int GL_OBJECT_LINK_STATUS_ARB = 0x8B82;
+//        public const int GL_OBJECT_VALIDATE_STATUS_ARB = 0x8B83;
+//        public const int GL_OBJECT_INFO_LOG_LENGTH_ARB = 0x8B84;
+//        public const int GL_OBJECT_ATTACHED_OBJECTS_ARB = 0x8B85;
+//        public const int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8B86;
+//        public const int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87;
+//        public const int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88;
+//        public const int GL_ARB_shader_precision = 1;
+//        public const int GL_ARB_shader_stencil_export = 1;
+//        public const int GL_ARB_shader_storage_buffer_object = 1;
+//        public const int GL_ARB_shader_subroutine = 1;
+//        public const int GL_ARB_shader_texture_image_samples = 1;
+//        public const int GL_ARB_shader_texture_lod = 1;
+//        public const int GL_ARB_shader_viewport_layer_array = 1;
+//        public const int GL_ARB_shading_language_100 = 1;
+//        public const int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C;
+//        public const int GL_ARB_shading_language_420pack = 1;
+//        public const int GL_ARB_shading_language_include = 1;
+//        public const int GL_SHADER_INCLUDE_ARB = 0x8DAE;
+//        public const int GL_NAMED_STRING_LENGTH_ARB = 0x8DE9;
+//        public const int GL_NAMED_STRING_TYPE_ARB = 0x8DEA;
+//        public const int GL_ARB_shading_language_packing = 1;
+//        public const int GL_ARB_shadow = 1;
+//        public const int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C;
+//        public const int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D;
+//        public const int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E;
+//        public const int GL_ARB_shadow_ambient = 1;
+//        public const int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF;
+//        public const int GL_ARB_sparse_buffer = 1;
+//        public const int GL_SPARSE_STORAGE_BIT_ARB = 0x0400;
+//        public const int GL_SPARSE_BUFFER_PAGE_SIZE_ARB = 0x82F8;
+//        public const int GL_ARB_sparse_texture = 1;
+//        public const int GL_TEXTURE_SPARSE_ARB = 0x91A6;
+//        public const int GL_VIRTUAL_PAGE_SIZE_INDEX_ARB = 0x91A7;
+//        public const int GL_NUM_SPARSE_LEVELS_ARB = 0x91AA;
+//        public const int GL_NUM_VIRTUAL_PAGE_SIZES_ARB = 0x91A8;
+//        public const int GL_VIRTUAL_PAGE_SIZE_X_ARB = 0x9195;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Y_ARB = 0x9196;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Z_ARB = 0x9197;
+//        public const int GL_MAX_SPARSE_TEXTURE_SIZE_ARB = 0x9198;
+//        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB = 0x9199;
+//        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB = 0x919A;
+//        public const int GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB = 0x91A9;
+//        public const int GL_ARB_sparse_texture2 = 1;
+//        public const int GL_ARB_sparse_texture_clamp = 1;
+//        public const int GL_ARB_spirv_extensions = 1;
+//        public const int GL_ARB_stencil_texturing = 1;
+//        public const int GL_ARB_sync = 1;
+//        public const int GL_ARB_tessellation_shader = 1;
+//        public const int GL_ARB_texture_barrier = 1;
+//        public const int GL_ARB_texture_border_clamp = 1;
+//        public const int GL_CLAMP_TO_BORDER_ARB = 0x812D;
+//        public const int GL_ARB_texture_buffer_object = 1;
+//        public const int GL_TEXTURE_BUFFER_ARB = 0x8C2A;
+//        public const int GL_MAX_TEXTURE_BUFFER_SIZE_ARB = 0x8C2B;
+//        public const int GL_TEXTURE_BINDING_BUFFER_ARB = 0x8C2C;
+//        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB = 0x8C2D;
+//        public const int GL_TEXTURE_BUFFER_FORMAT_ARB = 0x8C2E;
+//        public const int GL_ARB_texture_buffer_object_rgb32 = 1;
+//        public const int GL_ARB_texture_buffer_range = 1;
+//        public const int GL_ARB_texture_compression = 1;
+//        public const int GL_COMPRESSED_ALPHA_ARB = 0x84E9;
+//        public const int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA;
+//        public const int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB;
+//        public const int GL_COMPRESSED_INTENSITY_ARB = 0x84EC;
+//        public const int GL_COMPRESSED_RGB_ARB = 0x84ED;
+//        public const int GL_COMPRESSED_RGBA_ARB = 0x84EE;
+//        public const int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF;
+//        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB = 0x86A0;
+//        public const int GL_TEXTURE_COMPRESSED_ARB = 0x86A1;
+//        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2;
+//        public const int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3;
+//        public const int GL_ARB_texture_compression_bptc = 1;
+//        public const int GL_COMPRESSED_RGBA_BPTC_UNORM_ARB = 0x8E8C;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB = 0x8E8D;
+//        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB = 0x8E8E;
+//        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB = 0x8E8F;
+//        public const int GL_ARB_texture_compression_rgtc = 1;
+//        public const int GL_ARB_texture_cube_map = 1;
+//        public const int GL_NORMAL_MAP_ARB = 0x8511;
+//        public const int GL_REFLECTION_MAP_ARB = 0x8512;
+//        public const int GL_TEXTURE_CUBE_MAP_ARB = 0x8513;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B;
+//        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C;
+//        public const int GL_ARB_texture_cube_map_array = 1;
+//        public const int GL_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x9009;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB = 0x900A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x900B;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900C;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB = 0x900D;
+//        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900E;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900F;
+//        public const int GL_ARB_texture_env_add = 1;
+//        public const int GL_ARB_texture_env_combine = 1;
+//        public const int GL_COMBINE_ARB = 0x8570;
+//        public const int GL_COMBINE_RGB_ARB = 0x8571;
+//        public const int GL_COMBINE_ALPHA_ARB = 0x8572;
+//        public const int GL_SOURCE0_RGB_ARB = 0x8580;
+//        public const int GL_SOURCE1_RGB_ARB = 0x8581;
+//        public const int GL_SOURCE2_RGB_ARB = 0x8582;
+//        public const int GL_SOURCE0_ALPHA_ARB = 0x8588;
+//        public const int GL_SOURCE1_ALPHA_ARB = 0x8589;
+//        public const int GL_SOURCE2_ALPHA_ARB = 0x858A;
+//        public const int GL_OPERAND0_RGB_ARB = 0x8590;
+//        public const int GL_OPERAND1_RGB_ARB = 0x8591;
+//        public const int GL_OPERAND2_RGB_ARB = 0x8592;
+//        public const int GL_OPERAND0_ALPHA_ARB = 0x8598;
+//        public const int GL_OPERAND1_ALPHA_ARB = 0x8599;
+//        public const int GL_OPERAND2_ALPHA_ARB = 0x859A;
+//        public const int GL_RGB_SCALE_ARB = 0x8573;
+//        public const int GL_ADD_SIGNED_ARB = 0x8574;
+//        public const int GL_INTERPOLATE_ARB = 0x8575;
+//        public const int GL_SUBTRACT_ARB = 0x84E7;
+//        public const int GL_CONSTANT_ARB = 0x8576;
+//        public const int GL_PRIMARY_COLOR_ARB = 0x8577;
+//        public const int GL_PREVIOUS_ARB = 0x8578;
+//        public const int GL_ARB_texture_env_crossbar = 1;
+//        public const int GL_ARB_texture_env_dot3 = 1;
+//        public const int GL_DOT3_RGB_ARB = 0x86AE;
+//        public const int GL_DOT3_RGBA_ARB = 0x86AF;
+//        public const int GL_ARB_texture_filter_anisotropic = 1;
+//        public const int GL_ARB_texture_filter_minmax = 1;
+//        public const int GL_TEXTURE_REDUCTION_MODE_ARB = 0x9366;
+//        public const int GL_WEIGHTED_AVERAGE_ARB = 0x9367;
+//        public const int GL_ARB_texture_float = 1;
+//        public const int GL_TEXTURE_RED_TYPE_ARB = 0x8C10;
+//        public const int GL_TEXTURE_GREEN_TYPE_ARB = 0x8C11;
+//        public const int GL_TEXTURE_BLUE_TYPE_ARB = 0x8C12;
+//        public const int GL_TEXTURE_ALPHA_TYPE_ARB = 0x8C13;
+//        public const int GL_TEXTURE_LUMINANCE_TYPE_ARB = 0x8C14;
+//        public const int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8C15;
+//        public const int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8C16;
+//        public const int GL_UNSIGNED_NORMALIZED_ARB = 0x8C17;
+//        public const int GL_RGBA32F_ARB = 0x8814;
+//        public const int GL_RGB32F_ARB = 0x8815;
+//        public const int GL_ALPHA32F_ARB = 0x8816;
+//        public const int GL_INTENSITY32F_ARB = 0x8817;
+//        public const int GL_LUMINANCE32F_ARB = 0x8818;
+//        public const int GL_LUMINANCE_ALPHA32F_ARB = 0x8819;
+//        public const int GL_RGBA16F_ARB = 0x881A;
+//        public const int GL_RGB16F_ARB = 0x881B;
+//        public const int GL_ALPHA16F_ARB = 0x881C;
+//        public const int GL_INTENSITY16F_ARB = 0x881D;
+//        public const int GL_LUMINANCE16F_ARB = 0x881E;
+//        public const int GL_LUMINANCE_ALPHA16F_ARB = 0x881F;
+//        public const int GL_ARB_texture_gather = 1;
+//        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5E;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5F;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB = 0x8F9F;
+//        public const int GL_ARB_texture_mirror_clamp_to_edge = 1;
+//        public const int GL_ARB_texture_mirrored_repeat = 1;
+//        public const int GL_MIRRORED_REPEAT_ARB = 0x8370;
+//        public const int GL_ARB_texture_multisample = 1;
+//        public const int GL_ARB_texture_non_power_of_two = 1;
+//        public const int GL_ARB_texture_query_levels = 1;
+//        public const int GL_ARB_texture_query_lod = 1;
+//        public const int GL_ARB_texture_rectangle = 1;
+//        public const int GL_TEXTURE_RECTANGLE_ARB = 0x84F5;
+//        public const int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6;
+//        public const int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7;
+//        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8;
+//        public const int GL_ARB_texture_rg = 1;
+//        public const int GL_ARB_texture_rgb10_a2ui = 1;
+//        public const int GL_ARB_texture_stencil8 = 1;
+//        public const int GL_ARB_texture_storage = 1;
+//        public const int GL_ARB_texture_storage_multisample = 1;
+//        public const int GL_ARB_texture_swizzle = 1;
+//        public const int GL_ARB_texture_view = 1;
+//        public const int GL_ARB_timer_query = 1;
+//        public const int GL_ARB_transform_feedback2 = 1;
+//        public const int GL_ARB_transform_feedback3 = 1;
+//        public const int GL_ARB_transform_feedback_instanced = 1;
+//        public const int GL_ARB_transform_feedback_overflow_query = 1;
+//        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB = 0x82EC;
+//        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB = 0x82ED;
+//        public const int GL_ARB_transpose_matrix = 1;
+//        public const int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3;
+//        public const int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4;
+//        public const int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5;
+//        public const int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6;
+//        public const int GL_ARB_uniform_buffer_object = 1;
+//        public const int GL_ARB_vertex_array_bgra = 1;
+//        public const int GL_ARB_vertex_array_object = 1;
+//        public const int GL_ARB_vertex_attrib_64bit = 1;
+//        public const int GL_ARB_vertex_attrib_binding = 1;
+//        public const int GL_ARB_vertex_blend = 1;
+//        public const int GL_MAX_VERTEX_UNITS_ARB = 0x86A4;
+//        public const int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5;
+//        public const int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6;
+//        public const int GL_VERTEX_BLEND_ARB = 0x86A7;
+//        public const int GL_CURRENT_WEIGHT_ARB = 0x86A8;
+//        public const int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9;
+//        public const int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA;
+//        public const int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB;
+//        public const int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC;
+//        public const int GL_WEIGHT_ARRAY_ARB = 0x86AD;
+//        public const int GL_MODELVIEW0_ARB = 0x1700;
+//        public const int GL_MODELVIEW1_ARB = 0x850A;
+//        public const int GL_MODELVIEW2_ARB = 0x8722;
+//        public const int GL_MODELVIEW3_ARB = 0x8723;
+//        public const int GL_MODELVIEW4_ARB = 0x8724;
+//        public const int GL_MODELVIEW5_ARB = 0x8725;
+//        public const int GL_MODELVIEW6_ARB = 0x8726;
+//        public const int GL_MODELVIEW7_ARB = 0x8727;
+//        public const int GL_MODELVIEW8_ARB = 0x8728;
+//        public const int GL_MODELVIEW9_ARB = 0x8729;
+//        public const int GL_MODELVIEW10_ARB = 0x872A;
+//        public const int GL_MODELVIEW11_ARB = 0x872B;
+//        public const int GL_MODELVIEW12_ARB = 0x872C;
+//        public const int GL_MODELVIEW13_ARB = 0x872D;
+//        public const int GL_MODELVIEW14_ARB = 0x872E;
+//        public const int GL_MODELVIEW15_ARB = 0x872F;
+//        public const int GL_MODELVIEW16_ARB = 0x8730;
+//        public const int GL_MODELVIEW17_ARB = 0x8731;
+//        public const int GL_MODELVIEW18_ARB = 0x8732;
+//        public const int GL_MODELVIEW19_ARB = 0x8733;
+//        public const int GL_MODELVIEW20_ARB = 0x8734;
+//        public const int GL_MODELVIEW21_ARB = 0x8735;
+//        public const int GL_MODELVIEW22_ARB = 0x8736;
+//        public const int GL_MODELVIEW23_ARB = 0x8737;
+//        public const int GL_MODELVIEW24_ARB = 0x8738;
+//        public const int GL_MODELVIEW25_ARB = 0x8739;
+//        public const int GL_MODELVIEW26_ARB = 0x873A;
+//        public const int GL_MODELVIEW27_ARB = 0x873B;
+//        public const int GL_MODELVIEW28_ARB = 0x873C;
+//        public const int GL_MODELVIEW29_ARB = 0x873D;
+//        public const int GL_MODELVIEW30_ARB = 0x873E;
+//        public const int GL_MODELVIEW31_ARB = 0x873F;
+//        public const int GL_ARB_vertex_buffer_object = 1;
+//        public const int GL_BUFFER_SIZE_ARB = 0x8764;
+//        public const int GL_BUFFER_USAGE_ARB = 0x8765;
+//        public const int GL_ARRAY_BUFFER_ARB = 0x8892;
+//        public const int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893;
+//        public const int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894;
+//        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895;
+//        public const int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896;
+//        public const int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897;
+//        public const int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898;
+//        public const int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899;
+//        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A;
+//        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C;
+//        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D;
+//        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F;
+//        public const int GL_READ_ONLY_ARB = 0x88B8;
+//        public const int GL_WRITE_ONLY_ARB = 0x88B9;
+//        public const int GL_READ_WRITE_ARB = 0x88BA;
+//        public const int GL_BUFFER_ACCESS_ARB = 0x88BB;
+//        public const int GL_BUFFER_MAPPED_ARB = 0x88BC;
+//        public const int GL_BUFFER_MAP_POINTER_ARB = 0x88BD;
+//        public const int GL_STREAM_DRAW_ARB = 0x88E0;
+//        public const int GL_STREAM_READ_ARB = 0x88E1;
+//        public const int GL_STREAM_COPY_ARB = 0x88E2;
+//        public const int GL_STATIC_DRAW_ARB = 0x88E4;
+//        public const int GL_STATIC_READ_ARB = 0x88E5;
+//        public const int GL_STATIC_COPY_ARB = 0x88E6;
+//        public const int GL_DYNAMIC_DRAW_ARB = 0x88E8;
+//        public const int GL_DYNAMIC_READ_ARB = 0x88E9;
+//        public const int GL_DYNAMIC_COPY_ARB = 0x88EA;
+//        public const int GL_ARB_vertex_program = 1;
+//        public const int GL_COLOR_SUM_ARB = 0x8458;
+//        public const int GL_VERTEX_PROGRAM_ARB = 0x8620;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
+//        public const int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
+//        public const int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
+//        public const int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
+//        public const int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
+//        public const int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0;
+//        public const int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1;
+//        public const int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2;
+//        public const int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3;
+//        public const int GL_ARB_vertex_shader = 1;
+//        public const int GL_VERTEX_SHADER_ARB = 0x8B31;
+//        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
+//        public const int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
+//        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
+//        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
+//        public const int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
+//        public const int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
+//        public const int GL_ARB_vertex_type_10f_11f_11f_rev = 1;
+//        public const int GL_ARB_vertex_type_2_10_10_10_rev = 1;
+//        public const int GL_ARB_viewport_array = 1;
+//        public const int GL_ARB_window_pos = 1;
+//        public const int GL_KHR_blend_equation_advanced = 1;
+//        public const int GL_MULTIPLY_KHR = 0x9294;
+//        public const int GL_SCREEN_KHR = 0x9295;
+//        public const int GL_OVERLAY_KHR = 0x9296;
+//        public const int GL_DARKEN_KHR = 0x9297;
+//        public const int GL_LIGHTEN_KHR = 0x9298;
+//        public const int GL_COLORDODGE_KHR = 0x9299;
+//        public const int GL_COLORBURN_KHR = 0x929A;
+//        public const int GL_HARDLIGHT_KHR = 0x929B;
+//        public const int GL_SOFTLIGHT_KHR = 0x929C;
+//        public const int GL_DIFFERENCE_KHR = 0x929E;
+//        public const int GL_EXCLUSION_KHR = 0x92A0;
+//        public const int GL_HSL_HUE_KHR = 0x92AD;
+//        public const int GL_HSL_SATURATION_KHR = 0x92AE;
+//        public const int GL_HSL_COLOR_KHR = 0x92AF;
+//        public const int GL_HSL_LUMINOSITY_KHR = 0x92B0;
+//        public const int GL_KHR_blend_equation_advanced_coherent = 1;
+//        public const int GL_BLEND_ADVANCED_COHERENT_KHR = 0x9285;
+//        public const int GL_KHR_context_flush_control = 1;
+//        public const int GL_KHR_debug = 1;
+//        public const int GL_KHR_no_error = 1;
+//        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR = 0x00000008;
+//        public const int GL_KHR_parallel_shader_compile = 1;
+//        public const int GL_MAX_SHADER_COMPILER_THREADS_KHR = 0x91B0;
+//        public const int GL_COMPLETION_STATUS_KHR = 0x91B1;
+//        public const int GL_KHR_robust_buffer_access_behavior = 1;
+//        public const int GL_KHR_robustness = 1;
+//        public const int GL_CONTEXT_ROBUST_ACCESS = 0x90F3;
+//        public const int GL_KHR_texture_compression_astc_hdr = 1;
+//        public const int GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 0x93B0;
+//        public const int GL_COMPRESSED_RGBA_ASTC_5x4_KHR = 0x93B1;
+//        public const int GL_COMPRESSED_RGBA_ASTC_5x5_KHR = 0x93B2;
+//        public const int GL_COMPRESSED_RGBA_ASTC_6x5_KHR = 0x93B3;
+//        public const int GL_COMPRESSED_RGBA_ASTC_6x6_KHR = 0x93B4;
+//        public const int GL_COMPRESSED_RGBA_ASTC_8x5_KHR = 0x93B5;
+//        public const int GL_COMPRESSED_RGBA_ASTC_8x6_KHR = 0x93B6;
+//        public const int GL_COMPRESSED_RGBA_ASTC_8x8_KHR = 0x93B7;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x5_KHR = 0x93B8;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x6_KHR = 0x93B9;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x8_KHR = 0x93BA;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x10_KHR = 0x93BB;
+//        public const int GL_COMPRESSED_RGBA_ASTC_12x10_KHR = 0x93BC;
+//        public const int GL_COMPRESSED_RGBA_ASTC_12x12_KHR = 0x93BD;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR = 0x93D0;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR = 0x93D1;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR = 0x93D2;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR = 0x93D3;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR = 0x93D4;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR = 0x93D5;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR = 0x93D6;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR = 0x93D7;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR = 0x93D8;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR = 0x93D9;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR = 0x93DA;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR = 0x93DB;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR = 0x93DC;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR = 0x93DD;
+//        public const int GL_KHR_texture_compression_astc_ldr = 1;
+//        public const int GL_KHR_texture_compression_astc_sliced_3d = 1;
+//        public const int GL_OES_byte_coordinates = 1;
+//        public const int GL_OES_compressed_paletted_texture = 1;
+//        public const int GL_PALETTE4_RGB8_OES = 0x8B90;
+//        public const int GL_PALETTE4_RGBA8_OES = 0x8B91;
+//        public const int GL_PALETTE4_R5_G6_B5_OES = 0x8B92;
+//        public const int GL_PALETTE4_RGBA4_OES = 0x8B93;
+//        public const int GL_PALETTE4_RGB5_A1_OES = 0x8B94;
+//        public const int GL_PALETTE8_RGB8_OES = 0x8B95;
+//        public const int GL_PALETTE8_RGBA8_OES = 0x8B96;
+//        public const int GL_PALETTE8_R5_G6_B5_OES = 0x8B97;
+//        public const int GL_PALETTE8_RGBA4_OES = 0x8B98;
+//        public const int GL_PALETTE8_RGB5_A1_OES = 0x8B99;
+//        public const int GL_OES_fixed_point = 1;
+//        public const int GL_FIXED_OES = 0x140C;
+//        public const int GL_OES_query_matrix = 1;
+//        public const int GL_OES_read_format = 1;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE_OES = 0x8B9A;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES = 0x8B9B;
+//        public const int GL_OES_single_precision = 1;
+//        public const int GL_3DFX_multisample = 1;
+//        public const int GL_MULTISAMPLE_3DFX = 0x86B2;
+//        public const int GL_SAMPLE_BUFFERS_3DFX = 0x86B3;
+//        public const int GL_SAMPLES_3DFX = 0x86B4;
+//        public const int GL_MULTISAMPLE_BIT_3DFX = 0x20000000;
+//        public const int GL_3DFX_tbuffer = 1;
+//        public const int GL_3DFX_texture_compression_FXT1 = 1;
+//        public const int GL_COMPRESSED_RGB_FXT1_3DFX = 0x86B0;
+//        public const int GL_COMPRESSED_RGBA_FXT1_3DFX = 0x86B1;
+//        public const int GL_AMD_blend_minmax_factor = 1;
+//        public const int GL_FACTOR_MIN_AMD = 0x901C;
+//        public const int GL_FACTOR_MAX_AMD = 0x901D;
+//        public const int GL_AMD_conservative_depth = 1;
+//        public const int GL_AMD_debug_output = 1;
+//        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_AMD = 0x9143;
+//        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_AMD = 0x9144;
+//        public const int GL_DEBUG_LOGGED_MESSAGES_AMD = 0x9145;
+//        public const int GL_DEBUG_SEVERITY_HIGH_AMD = 0x9146;
+//        public const int GL_DEBUG_SEVERITY_MEDIUM_AMD = 0x9147;
+//        public const int GL_DEBUG_SEVERITY_LOW_AMD = 0x9148;
+//        public const int GL_DEBUG_CATEGORY_API_ERROR_AMD = 0x9149;
+//        public const int GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD = 0x914A;
+//        public const int GL_DEBUG_CATEGORY_DEPRECATION_AMD = 0x914B;
+//        public const int GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD = 0x914C;
+//        public const int GL_DEBUG_CATEGORY_PERFORMANCE_AMD = 0x914D;
+//        public const int GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD = 0x914E;
+//        public const int GL_DEBUG_CATEGORY_APPLICATION_AMD = 0x914F;
+//        public const int GL_DEBUG_CATEGORY_OTHER_AMD = 0x9150;
+//        public const int GL_AMD_depth_clamp_separate = 1;
+//        public const int GL_DEPTH_CLAMP_NEAR_AMD = 0x901E;
+//        public const int GL_DEPTH_CLAMP_FAR_AMD = 0x901F;
+//        public const int GL_AMD_draw_buffers_blend = 1;
+//        public const int GL_AMD_framebuffer_multisample_advanced = 1;
+//        public const int GL_RENDERBUFFER_STORAGE_SAMPLES_AMD = 0x91B2;
+//        public const int GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD = 0x91B3;
+//        public const int GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD = 0x91B4;
+//        public const int GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD = 0x91B5;
+//        public const int GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B6;
+//        public const int GL_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B7;
+//        public const int GL_AMD_framebuffer_sample_positions = 1;
+//        public const int GL_SUBSAMPLE_DISTANCE_AMD = 0x883F;
+//        public const int GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD = 0x91AE;
+//        public const int GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD = 0x91AF;
+//        public const int GL_ALL_PIXELS_AMD = -1;
+//        public const int GL_AMD_gcn_shader = 1;
+//        public const int GL_AMD_gpu_shader_half_float = 1;
+//        public const int GL_FLOAT16_NV = 0x8FF8;
+//        public const int GL_FLOAT16_VEC2_NV = 0x8FF9;
+//        public const int GL_FLOAT16_VEC3_NV = 0x8FFA;
+//        public const int GL_FLOAT16_VEC4_NV = 0x8FFB;
+//        public const int GL_FLOAT16_MAT2_AMD = 0x91C5;
+//        public const int GL_FLOAT16_MAT3_AMD = 0x91C6;
+//        public const int GL_FLOAT16_MAT4_AMD = 0x91C7;
+//        public const int GL_FLOAT16_MAT2x3_AMD = 0x91C8;
+//        public const int GL_FLOAT16_MAT2x4_AMD = 0x91C9;
+//        public const int GL_FLOAT16_MAT3x2_AMD = 0x91CA;
+//        public const int GL_FLOAT16_MAT3x4_AMD = 0x91CB;
+//        public const int GL_FLOAT16_MAT4x2_AMD = 0x91CC;
+//        public const int GL_FLOAT16_MAT4x3_AMD = 0x91CD;
+//        public const int GL_AMD_gpu_shader_int16 = 1;
+//        public const int GL_AMD_gpu_shader_int64 = 1;
+//        public const int GL_INT64_NV = 0x140E;
+//        public const int GL_UNSIGNED_INT64_NV = 0x140F;
+//        public const int GL_INT8_NV = 0x8FE0;
+//        public const int GL_INT8_VEC2_NV = 0x8FE1;
+//        public const int GL_INT8_VEC3_NV = 0x8FE2;
+//        public const int GL_INT8_VEC4_NV = 0x8FE3;
+//        public const int GL_INT16_NV = 0x8FE4;
+//        public const int GL_INT16_VEC2_NV = 0x8FE5;
+//        public const int GL_INT16_VEC3_NV = 0x8FE6;
+//        public const int GL_INT16_VEC4_NV = 0x8FE7;
+//        public const int GL_INT64_VEC2_NV = 0x8FE9;
+//        public const int GL_INT64_VEC3_NV = 0x8FEA;
+//        public const int GL_INT64_VEC4_NV = 0x8FEB;
+//        public const int GL_UNSIGNED_INT8_NV = 0x8FEC;
+//        public const int GL_UNSIGNED_INT8_VEC2_NV = 0x8FED;
+//        public const int GL_UNSIGNED_INT8_VEC3_NV = 0x8FEE;
+//        public const int GL_UNSIGNED_INT8_VEC4_NV = 0x8FEF;
+//        public const int GL_UNSIGNED_INT16_NV = 0x8FF0;
+//        public const int GL_UNSIGNED_INT16_VEC2_NV = 0x8FF1;
+//        public const int GL_UNSIGNED_INT16_VEC3_NV = 0x8FF2;
+//        public const int GL_UNSIGNED_INT16_VEC4_NV = 0x8FF3;
+//        public const int GL_UNSIGNED_INT64_VEC2_NV = 0x8FF5;
+//        public const int GL_UNSIGNED_INT64_VEC3_NV = 0x8FF6;
+//        public const int GL_UNSIGNED_INT64_VEC4_NV = 0x8FF7;
+//        public const int GL_AMD_interleaved_elements = 1;
+//        public const int GL_VERTEX_ELEMENT_SWIZZLE_AMD = 0x91A4;
+//        public const int GL_VERTEX_ID_SWIZZLE_AMD = 0x91A5;
+//        public const int GL_AMD_multi_draw_indirect = 1;
+//        public const int GL_AMD_name_gen_delete = 1;
+//        public const int GL_DATA_BUFFER_AMD = 0x9151;
+//        public const int GL_PERFORMANCE_MONITOR_AMD = 0x9152;
+//        public const int GL_QUERY_OBJECT_AMD = 0x9153;
+//        public const int GL_VERTEX_ARRAY_OBJECT_AMD = 0x9154;
+//        public const int GL_SAMPLER_OBJECT_AMD = 0x9155;
+//        public const int GL_AMD_occlusion_query_event = 1;
+//        public const int GL_OCCLUSION_QUERY_EVENT_MASK_AMD = 0x874F;
+//        public const int GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD = 0x00000001;
+//        public const int GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD = 0x00000002;
+//        public const int GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD = 0x00000004;
+//        public const int GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD = 0x00000008;
+//        public const int GL_QUERY_ALL_EVENT_BITS_AMD = -1;
+//        public const int GL_AMD_performance_monitor = 1;
+//        public const int GL_COUNTER_TYPE_AMD = 0x8BC0;
+//        public const int GL_COUNTER_RANGE_AMD = 0x8BC1;
+//        public const int GL_UNSIGNED_INT64_AMD = 0x8BC2;
+//        public const int GL_PERCENTAGE_AMD = 0x8BC3;
+//        public const int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
+//        public const int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
+//        public const int GL_PERFMON_RESULT_AMD = 0x8BC6;
+//        public const int GL_AMD_pinned_memory = 1;
+//        public const int GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD = 0x9160;
+//        public const int GL_AMD_query_buffer_object = 1;
+//        public const int GL_QUERY_BUFFER_AMD = 0x9192;
+//        public const int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
+//        public const int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
+//        public const int GL_AMD_sample_positions = 1;
+//        public const int GL_AMD_seamless_cubemap_per_texture = 1;
+//        public const int GL_AMD_shader_atomic_counter_ops = 1;
+//        public const int GL_AMD_shader_ballot = 1;
+//        public const int GL_AMD_shader_explicit_vertex_parameter = 1;
+//        public const int GL_AMD_shader_gpu_shader_half_float_fetch = 1;
+//        public const int GL_AMD_shader_image_load_store_lod = 1;
+//        public const int GL_AMD_shader_stencil_export = 1;
+//        public const int GL_AMD_shader_trinary_minmax = 1;
+//        public const int GL_AMD_sparse_texture = 1;
+//        public const int GL_VIRTUAL_PAGE_SIZE_X_AMD = 0x9195;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Y_AMD = 0x9196;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Z_AMD = 0x9197;
+//        public const int GL_MAX_SPARSE_TEXTURE_SIZE_AMD = 0x9198;
+//        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD = 0x9199;
+//        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS = 0x919A;
+//        public const int GL_MIN_SPARSE_LEVEL_AMD = 0x919B;
+//        public const int GL_MIN_LOD_WARNING_AMD = 0x919C;
+//        public const int GL_TEXTURE_STORAGE_SPARSE_BIT_AMD = 0x00000001;
+//        public const int GL_AMD_stencil_operation_extended = 1;
+//        public const int GL_SET_AMD = 0x874A;
+//        public const int GL_REPLACE_VALUE_AMD = 0x874B;
+//        public const int GL_STENCIL_OP_VALUE_AMD = 0x874C;
+//        public const int GL_STENCIL_BACK_OP_VALUE_AMD = 0x874D;
+//        public const int GL_AMD_texture_gather_bias_lod = 1;
+//        public const int GL_AMD_texture_texture4 = 1;
+//        public const int GL_AMD_transform_feedback3_lines_triangles = 1;
+//        public const int GL_AMD_transform_feedback4 = 1;
+//        public const int GL_STREAM_RASTERIZATION_AMD = 0x91A0;
+//        public const int GL_AMD_vertex_shader_layer = 1;
+//        public const int GL_AMD_vertex_shader_tessellator = 1;
+//        public const int GL_SAMPLER_BUFFER_AMD = 0x9001;
+//        public const int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
+//        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
+//        public const int GL_TESSELLATION_MODE_AMD = 0x9004;
+//        public const int GL_TESSELLATION_FACTOR_AMD = 0x9005;
+//        public const int GL_DISCRETE_AMD = 0x9006;
+//        public const int GL_CONTINUOUS_AMD = 0x9007;
+//        public const int GL_AMD_vertex_shader_viewport_index = 1;
+//        public const int GL_APPLE_aux_depth_stencil = 1;
+//        public const int GL_AUX_DEPTH_STENCIL_APPLE = 0x8A14;
+//        public const int GL_APPLE_client_storage = 1;
+//        public const int GL_UNPACK_CLIENT_STORAGE_APPLE = 0x85B2;
+//        public const int GL_APPLE_element_array = 1;
+//        public const int GL_ELEMENT_ARRAY_APPLE = 0x8A0C;
+//        public const int GL_ELEMENT_ARRAY_TYPE_APPLE = 0x8A0D;
+//        public const int GL_ELEMENT_ARRAY_POINTER_APPLE = 0x8A0E;
+//        public const int GL_APPLE_fence = 1;
+//        public const int GL_DRAW_PIXELS_APPLE = 0x8A0A;
+//        public const int GL_FENCE_APPLE = 0x8A0B;
+//        public const int GL_APPLE_float_pixels = 1;
+//        public const int GL_HALF_APPLE = 0x140B;
+//        public const int GL_RGBA_FLOAT32_APPLE = 0x8814;
+//        public const int GL_RGB_FLOAT32_APPLE = 0x8815;
+//        public const int GL_ALPHA_FLOAT32_APPLE = 0x8816;
+//        public const int GL_INTENSITY_FLOAT32_APPLE = 0x8817;
+//        public const int GL_LUMINANCE_FLOAT32_APPLE = 0x8818;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT32_APPLE = 0x8819;
+//        public const int GL_RGBA_FLOAT16_APPLE = 0x881A;
+//        public const int GL_RGB_FLOAT16_APPLE = 0x881B;
+//        public const int GL_ALPHA_FLOAT16_APPLE = 0x881C;
+//        public const int GL_INTENSITY_FLOAT16_APPLE = 0x881D;
+//        public const int GL_LUMINANCE_FLOAT16_APPLE = 0x881E;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT16_APPLE = 0x881F;
+//        public const int GL_COLOR_FLOAT_APPLE = 0x8A0F;
+//        public const int GL_APPLE_flush_buffer_range = 1;
+//        public const int GL_BUFFER_SERIALIZED_MODIFY_APPLE = 0x8A12;
+//        public const int GL_BUFFER_FLUSHING_UNMAP_APPLE = 0x8A13;
+//        public const int GL_APPLE_object_purgeable = 1;
+//        public const int GL_BUFFER_OBJECT_APPLE = 0x85B3;
+//        public const int GL_RELEASED_APPLE = 0x8A19;
+//        public const int GL_VOLATILE_APPLE = 0x8A1A;
+//        public const int GL_RETAINED_APPLE = 0x8A1B;
+//        public const int GL_UNDEFINED_APPLE = 0x8A1C;
+//        public const int GL_PURGEABLE_APPLE = 0x8A1D;
+//        public const int GL_APPLE_rgb_422 = 1;
+//        public const int GL_RGB_422_APPLE = 0x8A1F;
+//        public const int GL_UNSIGNED_SHORT_8_8_APPLE = 0x85BA;
+//        public const int GL_UNSIGNED_SHORT_8_8_REV_APPLE = 0x85BB;
+//        public const int GL_RGB_RAW_422_APPLE = 0x8A51;
+//        public const int GL_APPLE_row_bytes = 1;
+//        public const int GL_PACK_ROW_BYTES_APPLE = 0x8A15;
+//        public const int GL_UNPACK_ROW_BYTES_APPLE = 0x8A16;
+//        public const int GL_APPLE_specular_vector = 1;
+//        public const int GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE = 0x85B0;
+//        public const int GL_APPLE_texture_range = 1;
+//        public const int GL_TEXTURE_RANGE_LENGTH_APPLE = 0x85B7;
+//        public const int GL_TEXTURE_RANGE_POINTER_APPLE = 0x85B8;
+//        public const int GL_TEXTURE_STORAGE_HINT_APPLE = 0x85BC;
+//        public const int GL_STORAGE_PRIVATE_APPLE = 0x85BD;
+//        public const int GL_STORAGE_CACHED_APPLE = 0x85BE;
+//        public const int GL_STORAGE_SHARED_APPLE = 0x85BF;
+//        public const int GL_APPLE_transform_hint = 1;
+//        public const int GL_TRANSFORM_HINT_APPLE = 0x85B1;
+//        public const int GL_APPLE_vertex_array_object = 1;
+//        public const int GL_VERTEX_ARRAY_BINDING_APPLE = 0x85B5;
+//        public const int GL_APPLE_vertex_array_range = 1;
+//        public const int GL_VERTEX_ARRAY_RANGE_APPLE = 0x851D;
+//        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE = 0x851E;
+//        public const int GL_VERTEX_ARRAY_STORAGE_HINT_APPLE = 0x851F;
+//        public const int GL_VERTEX_ARRAY_RANGE_POINTER_APPLE = 0x8521;
+//        public const int GL_STORAGE_CLIENT_APPLE = 0x85B4;
+//        public const int GL_APPLE_vertex_program_evaluators = 1;
+//        public const int GL_VERTEX_ATTRIB_MAP1_APPLE = 0x8A00;
+//        public const int GL_VERTEX_ATTRIB_MAP2_APPLE = 0x8A01;
+//        public const int GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE = 0x8A02;
+//        public const int GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE = 0x8A03;
+//        public const int GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE = 0x8A04;
+//        public const int GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE = 0x8A05;
+//        public const int GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE = 0x8A06;
+//        public const int GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE = 0x8A07;
+//        public const int GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE = 0x8A08;
+//        public const int GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE = 0x8A09;
+//        public const int GL_APPLE_ycbcr_422 = 1;
+//        public const int GL_YCBCR_422_APPLE = 0x85B9;
+//        public const int GL_ATI_draw_buffers = 1;
+//        public const int GL_MAX_DRAW_BUFFERS_ATI = 0x8824;
+//        public const int GL_DRAW_BUFFER0_ATI = 0x8825;
+//        public const int GL_DRAW_BUFFER1_ATI = 0x8826;
+//        public const int GL_DRAW_BUFFER2_ATI = 0x8827;
+//        public const int GL_DRAW_BUFFER3_ATI = 0x8828;
+//        public const int GL_DRAW_BUFFER4_ATI = 0x8829;
+//        public const int GL_DRAW_BUFFER5_ATI = 0x882A;
+//        public const int GL_DRAW_BUFFER6_ATI = 0x882B;
+//        public const int GL_DRAW_BUFFER7_ATI = 0x882C;
+//        public const int GL_DRAW_BUFFER8_ATI = 0x882D;
+//        public const int GL_DRAW_BUFFER9_ATI = 0x882E;
+//        public const int GL_DRAW_BUFFER10_ATI = 0x882F;
+//        public const int GL_DRAW_BUFFER11_ATI = 0x8830;
+//        public const int GL_DRAW_BUFFER12_ATI = 0x8831;
+//        public const int GL_DRAW_BUFFER13_ATI = 0x8832;
+//        public const int GL_DRAW_BUFFER14_ATI = 0x8833;
+//        public const int GL_DRAW_BUFFER15_ATI = 0x8834;
+//        public const int GL_ATI_element_array = 1;
+//        public const int GL_ELEMENT_ARRAY_ATI = 0x8768;
+//        public const int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769;
+//        public const int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A;
+//        public const int GL_ATI_envmap_bumpmap = 1;
+//        public const int GL_BUMP_ROT_MATRIX_ATI = 0x8775;
+//        public const int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776;
+//        public const int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777;
+//        public const int GL_BUMP_TEX_UNITS_ATI = 0x8778;
+//        public const int GL_DUDV_ATI = 0x8779;
+//        public const int GL_DU8DV8_ATI = 0x877A;
+//        public const int GL_BUMP_ENVMAP_ATI = 0x877B;
+//        public const int GL_BUMP_TARGET_ATI = 0x877C;
+//        public const int GL_ATI_fragment_shader = 1;
+//        public const int GL_FRAGMENT_SHADER_ATI = 0x8920;
+//        public const int GL_REG_0_ATI = 0x8921;
+//        public const int GL_REG_1_ATI = 0x8922;
+//        public const int GL_REG_2_ATI = 0x8923;
+//        public const int GL_REG_3_ATI = 0x8924;
+//        public const int GL_REG_4_ATI = 0x8925;
+//        public const int GL_REG_5_ATI = 0x8926;
+//        public const int GL_REG_6_ATI = 0x8927;
+//        public const int GL_REG_7_ATI = 0x8928;
+//        public const int GL_REG_8_ATI = 0x8929;
+//        public const int GL_REG_9_ATI = 0x892A;
+//        public const int GL_REG_10_ATI = 0x892B;
+//        public const int GL_REG_11_ATI = 0x892C;
+//        public const int GL_REG_12_ATI = 0x892D;
+//        public const int GL_REG_13_ATI = 0x892E;
+//        public const int GL_REG_14_ATI = 0x892F;
+//        public const int GL_REG_15_ATI = 0x8930;
+//        public const int GL_REG_16_ATI = 0x8931;
+//        public const int GL_REG_17_ATI = 0x8932;
+//        public const int GL_REG_18_ATI = 0x8933;
+//        public const int GL_REG_19_ATI = 0x8934;
+//        public const int GL_REG_20_ATI = 0x8935;
+//        public const int GL_REG_21_ATI = 0x8936;
+//        public const int GL_REG_22_ATI = 0x8937;
+//        public const int GL_REG_23_ATI = 0x8938;
+//        public const int GL_REG_24_ATI = 0x8939;
+//        public const int GL_REG_25_ATI = 0x893A;
+//        public const int GL_REG_26_ATI = 0x893B;
+//        public const int GL_REG_27_ATI = 0x893C;
+//        public const int GL_REG_28_ATI = 0x893D;
+//        public const int GL_REG_29_ATI = 0x893E;
+//        public const int GL_REG_30_ATI = 0x893F;
+//        public const int GL_REG_31_ATI = 0x8940;
+//        public const int GL_CON_0_ATI = 0x8941;
+//        public const int GL_CON_1_ATI = 0x8942;
+//        public const int GL_CON_2_ATI = 0x8943;
+//        public const int GL_CON_3_ATI = 0x8944;
+//        public const int GL_CON_4_ATI = 0x8945;
+//        public const int GL_CON_5_ATI = 0x8946;
+//        public const int GL_CON_6_ATI = 0x8947;
+//        public const int GL_CON_7_ATI = 0x8948;
+//        public const int GL_CON_8_ATI = 0x8949;
+//        public const int GL_CON_9_ATI = 0x894A;
+//        public const int GL_CON_10_ATI = 0x894B;
+//        public const int GL_CON_11_ATI = 0x894C;
+//        public const int GL_CON_12_ATI = 0x894D;
+//        public const int GL_CON_13_ATI = 0x894E;
+//        public const int GL_CON_14_ATI = 0x894F;
+//        public const int GL_CON_15_ATI = 0x8950;
+//        public const int GL_CON_16_ATI = 0x8951;
+//        public const int GL_CON_17_ATI = 0x8952;
+//        public const int GL_CON_18_ATI = 0x8953;
+//        public const int GL_CON_19_ATI = 0x8954;
+//        public const int GL_CON_20_ATI = 0x8955;
+//        public const int GL_CON_21_ATI = 0x8956;
+//        public const int GL_CON_22_ATI = 0x8957;
+//        public const int GL_CON_23_ATI = 0x8958;
+//        public const int GL_CON_24_ATI = 0x8959;
+//        public const int GL_CON_25_ATI = 0x895A;
+//        public const int GL_CON_26_ATI = 0x895B;
+//        public const int GL_CON_27_ATI = 0x895C;
+//        public const int GL_CON_28_ATI = 0x895D;
+//        public const int GL_CON_29_ATI = 0x895E;
+//        public const int GL_CON_30_ATI = 0x895F;
+//        public const int GL_CON_31_ATI = 0x8960;
+//        public const int GL_MOV_ATI = 0x8961;
+//        public const int GL_ADD_ATI = 0x8963;
+//        public const int GL_MUL_ATI = 0x8964;
+//        public const int GL_SUB_ATI = 0x8965;
+//        public const int GL_DOT3_ATI = 0x8966;
+//        public const int GL_DOT4_ATI = 0x8967;
+//        public const int GL_MAD_ATI = 0x8968;
+//        public const int GL_LERP_ATI = 0x8969;
+//        public const int GL_CND_ATI = 0x896A;
+//        public const int GL_CND0_ATI = 0x896B;
+//        public const int GL_DOT2_ADD_ATI = 0x896C;
+//        public const int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D;
+//        public const int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E;
+//        public const int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F;
+//        public const int GL_NUM_PASSES_ATI = 0x8970;
+//        public const int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971;
+//        public const int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972;
+//        public const int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973;
+//        public const int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974;
+//        public const int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975;
+//        public const int GL_SWIZZLE_STR_ATI = 0x8976;
+//        public const int GL_SWIZZLE_STQ_ATI = 0x8977;
+//        public const int GL_SWIZZLE_STR_DR_ATI = 0x8978;
+//        public const int GL_SWIZZLE_STQ_DQ_ATI = 0x8979;
+//        public const int GL_SWIZZLE_STRQ_ATI = 0x897A;
+//        public const int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B;
+//        public const int GL_RED_BIT_ATI = 0x00000001;
+//        public const int GL_GREEN_BIT_ATI = 0x00000002;
+//        public const int GL_BLUE_BIT_ATI = 0x00000004;
+//        public const int GL_2X_BIT_ATI = 0x00000001;
+//        public const int GL_4X_BIT_ATI = 0x00000002;
+//        public const int GL_8X_BIT_ATI = 0x00000004;
+//        public const int GL_HALF_BIT_ATI = 0x00000008;
+//        public const int GL_QUARTER_BIT_ATI = 0x00000010;
+//        public const int GL_EIGHTH_BIT_ATI = 0x00000020;
+//        public const int GL_SATURATE_BIT_ATI = 0x00000040;
+//        public const int GL_COMP_BIT_ATI = 0x00000002;
+//        public const int GL_NEGATE_BIT_ATI = 0x00000004;
+//        public const int GL_BIAS_BIT_ATI = 0x00000008;
+//        public const int GL_ATI_map_object_buffer = 1;
+//        public const int GL_ATI_meminfo = 1;
+//        public const int GL_VBO_FREE_MEMORY_ATI = 0x87FB;
+//        public const int GL_TEXTURE_FREE_MEMORY_ATI = 0x87FC;
+//        public const int GL_RENDERBUFFER_FREE_MEMORY_ATI = 0x87FD;
+//        public const int GL_ATI_pixel_format_float = 1;
+//        public const int GL_RGBA_FLOAT_MODE_ATI = 0x8820;
+//        public const int GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI = 0x8835;
+//        public const int GL_ATI_pn_triangles = 1;
+//        public const int GL_PN_TRIANGLES_ATI = 0x87F0;
+//        public const int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1;
+//        public const int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2;
+//        public const int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3;
+//        public const int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4;
+//        public const int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5;
+//        public const int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6;
+//        public const int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7;
+//        public const int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8;
+//        public const int GL_ATI_separate_stencil = 1;
+//        public const int GL_STENCIL_BACK_FUNC_ATI = 0x8800;
+//        public const int GL_STENCIL_BACK_FAIL_ATI = 0x8801;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803;
+//        public const int GL_ATI_text_fragment_shader = 1;
+//        public const int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
+//        public const int GL_ATI_texture_env_combine3 = 1;
+//        public const int GL_MODULATE_ADD_ATI = 0x8744;
+//        public const int GL_MODULATE_SIGNED_ADD_ATI = 0x8745;
+//        public const int GL_MODULATE_SUBTRACT_ATI = 0x8746;
+//        public const int GL_ATI_texture_float = 1;
+//        public const int GL_RGBA_FLOAT32_ATI = 0x8814;
+//        public const int GL_RGB_FLOAT32_ATI = 0x8815;
+//        public const int GL_ALPHA_FLOAT32_ATI = 0x8816;
+//        public const int GL_INTENSITY_FLOAT32_ATI = 0x8817;
+//        public const int GL_LUMINANCE_FLOAT32_ATI = 0x8818;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT32_ATI = 0x8819;
+//        public const int GL_RGBA_FLOAT16_ATI = 0x881A;
+//        public const int GL_RGB_FLOAT16_ATI = 0x881B;
+//        public const int GL_ALPHA_FLOAT16_ATI = 0x881C;
+//        public const int GL_INTENSITY_FLOAT16_ATI = 0x881D;
+//        public const int GL_LUMINANCE_FLOAT16_ATI = 0x881E;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT16_ATI = 0x881F;
+//        public const int GL_ATI_texture_mirror_once = 1;
+//        public const int GL_MIRROR_CLAMP_ATI = 0x8742;
+//        public const int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743;
+//        public const int GL_ATI_vertex_array_object = 1;
+//        public const int GL_STATIC_ATI = 0x8760;
+//        public const int GL_DYNAMIC_ATI = 0x8761;
+//        public const int GL_PRESERVE_ATI = 0x8762;
+//        public const int GL_DISCARD_ATI = 0x8763;
+//        public const int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764;
+//        public const int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765;
+//        public const int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766;
+//        public const int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767;
+//        public const int GL_ATI_vertex_attrib_array_object = 1;
+//        public const int GL_ATI_vertex_streams = 1;
+//        public const int GL_MAX_VERTEX_STREAMS_ATI = 0x876B;
+//        public const int GL_VERTEX_STREAM0_ATI = 0x876C;
+//        public const int GL_VERTEX_STREAM1_ATI = 0x876D;
+//        public const int GL_VERTEX_STREAM2_ATI = 0x876E;
+//        public const int GL_VERTEX_STREAM3_ATI = 0x876F;
+//        public const int GL_VERTEX_STREAM4_ATI = 0x8770;
+//        public const int GL_VERTEX_STREAM5_ATI = 0x8771;
+//        public const int GL_VERTEX_STREAM6_ATI = 0x8772;
+//        public const int GL_VERTEX_STREAM7_ATI = 0x8773;
+//        public const int GL_VERTEX_SOURCE_ATI = 0x8774;
+//        public const int GL_EXT_422_pixels = 1;
+//        public const int GL_422_EXT = 0x80CC;
+//        public const int GL_422_REV_EXT = 0x80CD;
+//        public const int GL_422_AVERAGE_EXT = 0x80CE;
+//        public const int GL_422_REV_AVERAGE_EXT = 0x80CF;
+//        public const int GL_EXT_EGL_image_storage = 1;
+//        public const int GL_EXT_abgr = 1;
+//        public const int GL_ABGR_EXT = 0x8000;
+//        public const int GL_EXT_bgra = 1;
+//        public const int GL_BGR_EXT = 0x80E0;
+//        public const int GL_BGRA_EXT = 0x80E1;
+//        public const int GL_EXT_bindable_uniform = 1;
+//        public const int GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT = 0x8DE2;
+//        public const int GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT = 0x8DE3;
+//        public const int GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT = 0x8DE4;
+//        public const int GL_MAX_BINDABLE_UNIFORM_SIZE_EXT = 0x8DED;
+//        public const int GL_UNIFORM_BUFFER_EXT = 0x8DEE;
+//        public const int GL_UNIFORM_BUFFER_BINDING_EXT = 0x8DEF;
+//        public const int GL_EXT_blend_color = 1;
+//        public const int GL_CONSTANT_COLOR_EXT = 0x8001;
+//        public const int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002;
+//        public const int GL_CONSTANT_ALPHA_EXT = 0x8003;
+//        public const int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004;
+//        public const int GL_BLEND_COLOR_EXT = 0x8005;
+//        public const int GL_EXT_blend_equation_separate = 1;
+//        public const int GL_BLEND_EQUATION_RGB_EXT = 0x8009;
+//        public const int GL_BLEND_EQUATION_ALPHA_EXT = 0x883D;
+//        public const int GL_EXT_blend_func_separate = 1;
+//        public const int GL_BLEND_DST_RGB_EXT = 0x80C8;
+//        public const int GL_BLEND_SRC_RGB_EXT = 0x80C9;
+//        public const int GL_BLEND_DST_ALPHA_EXT = 0x80CA;
+//        public const int GL_BLEND_SRC_ALPHA_EXT = 0x80CB;
+//        public const int GL_EXT_blend_logic_op = 1;
+//        public const int GL_EXT_blend_minmax = 1;
+//        public const int GL_MIN_EXT = 0x8007;
+//        public const int GL_MAX_EXT = 0x8008;
+//        public const int GL_FUNC_ADD_EXT = 0x8006;
+//        public const int GL_BLEND_EQUATION_EXT = 0x8009;
+//        public const int GL_EXT_blend_subtract = 1;
+//        public const int GL_FUNC_SUBTRACT_EXT = 0x800A;
+//        public const int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B;
+//        public const int GL_EXT_clip_volume_hint = 1;
+//        public const int GL_CLIP_VOLUME_CLIPPING_HINT_EXT = 0x80F0;
+//        public const int GL_EXT_cmyka = 1;
+//        public const int GL_CMYK_EXT = 0x800C;
+//        public const int GL_CMYKA_EXT = 0x800D;
+//        public const int GL_PACK_CMYK_HINT_EXT = 0x800E;
+//        public const int GL_UNPACK_CMYK_HINT_EXT = 0x800F;
+//        public const int GL_EXT_color_subtable = 1;
+//        public const int GL_EXT_compiled_vertex_array = 1;
+//        public const int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8;
+//        public const int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9;
+//        public const int GL_EXT_convolution = 1;
+//        public const int GL_CONVOLUTION_1D_EXT = 0x8010;
+//        public const int GL_CONVOLUTION_2D_EXT = 0x8011;
+//        public const int GL_SEPARABLE_2D_EXT = 0x8012;
+//        public const int GL_CONVOLUTION_BORDER_MODE_EXT = 0x8013;
+//        public const int GL_CONVOLUTION_FILTER_SCALE_EXT = 0x8014;
+//        public const int GL_CONVOLUTION_FILTER_BIAS_EXT = 0x8015;
+//        public const int GL_REDUCE_EXT = 0x8016;
+//        public const int GL_CONVOLUTION_FORMAT_EXT = 0x8017;
+//        public const int GL_CONVOLUTION_WIDTH_EXT = 0x8018;
+//        public const int GL_CONVOLUTION_HEIGHT_EXT = 0x8019;
+//        public const int GL_MAX_CONVOLUTION_WIDTH_EXT = 0x801A;
+//        public const int GL_MAX_CONVOLUTION_HEIGHT_EXT = 0x801B;
+//        public const int GL_POST_CONVOLUTION_RED_SCALE_EXT = 0x801C;
+//        public const int GL_POST_CONVOLUTION_GREEN_SCALE_EXT = 0x801D;
+//        public const int GL_POST_CONVOLUTION_BLUE_SCALE_EXT = 0x801E;
+//        public const int GL_POST_CONVOLUTION_ALPHA_SCALE_EXT = 0x801F;
+//        public const int GL_POST_CONVOLUTION_RED_BIAS_EXT = 0x8020;
+//        public const int GL_POST_CONVOLUTION_GREEN_BIAS_EXT = 0x8021;
+//        public const int GL_POST_CONVOLUTION_BLUE_BIAS_EXT = 0x8022;
+//        public const int GL_POST_CONVOLUTION_ALPHA_BIAS_EXT = 0x8023;
+//        public const int GL_EXT_coordinate_frame = 1;
+//        public const int GL_TANGENT_ARRAY_EXT = 0x8439;
+//        public const int GL_BINORMAL_ARRAY_EXT = 0x843A;
+//        public const int GL_CURRENT_TANGENT_EXT = 0x843B;
+//        public const int GL_CURRENT_BINORMAL_EXT = 0x843C;
+//        public const int GL_TANGENT_ARRAY_TYPE_EXT = 0x843E;
+//        public const int GL_TANGENT_ARRAY_STRIDE_EXT = 0x843F;
+//        public const int GL_BINORMAL_ARRAY_TYPE_EXT = 0x8440;
+//        public const int GL_BINORMAL_ARRAY_STRIDE_EXT = 0x8441;
+//        public const int GL_TANGENT_ARRAY_POINTER_EXT = 0x8442;
+//        public const int GL_BINORMAL_ARRAY_POINTER_EXT = 0x8443;
+//        public const int GL_MAP1_TANGENT_EXT = 0x8444;
+//        public const int GL_MAP2_TANGENT_EXT = 0x8445;
+//        public const int GL_MAP1_BINORMAL_EXT = 0x8446;
+//        public const int GL_MAP2_BINORMAL_EXT = 0x8447;
+//        public const int GL_EXT_copy_texture = 1;
+//        public const int GL_EXT_cull_vertex = 1;
+//        public const int GL_CULL_VERTEX_EXT = 0x81AA;
+//        public const int GL_CULL_VERTEX_EYE_POSITION_EXT = 0x81AB;
+//        public const int GL_CULL_VERTEX_OBJECT_POSITION_EXT = 0x81AC;
+//        public const int GL_EXT_debug_label = 1;
+//        public const int GL_PROGRAM_PIPELINE_OBJECT_EXT = 0x8A4F;
+//        public const int GL_PROGRAM_OBJECT_EXT = 0x8B40;
+//        public const int GL_SHADER_OBJECT_EXT = 0x8B48;
+//        public const int GL_BUFFER_OBJECT_EXT = 0x9151;
+//        public const int GL_QUERY_OBJECT_EXT = 0x9153;
+//        public const int GL_VERTEX_ARRAY_OBJECT_EXT = 0x9154;
+//        public const int GL_EXT_debug_marker = 1;
+//        public const int GL_EXT_depth_bounds_test = 1;
+//        public const int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890;
+//        public const int GL_DEPTH_BOUNDS_EXT = 0x8891;
+//        public const int GL_EXT_direct_state_access = 1;
+//        public const int GL_PROGRAM_MATRIX_EXT = 0x8E2D;
+//        public const int GL_TRANSPOSE_PROGRAM_MATRIX_EXT = 0x8E2E;
+//        public const int GL_PROGRAM_MATRIX_STACK_DEPTH_EXT = 0x8E2F;
+//        public const int GL_EXT_draw_buffers2 = 1;
+//        public const int GL_EXT_draw_instanced = 1;
+//        public const int GL_EXT_draw_range_elements = 1;
+//        public const int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8;
+//        public const int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9;
+//        public const int GL_EXT_external_buffer = 1;
+//        public const int GL_EXT_fog_coord = 1;
+//        public const int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450;
+//        public const int GL_FOG_COORDINATE_EXT = 0x8451;
+//        public const int GL_FRAGMENT_DEPTH_EXT = 0x8452;
+//        public const int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453;
+//        public const int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454;
+//        public const int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455;
+//        public const int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456;
+//        public const int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457;
+//        public const int GL_EXT_framebuffer_blit = 1;
+//        public const int GL_READ_FRAMEBUFFER_EXT = 0x8CA8;
+//        public const int GL_DRAW_FRAMEBUFFER_EXT = 0x8CA9;
+//        public const int GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
+//        public const int GL_READ_FRAMEBUFFER_BINDING_EXT = 0x8CAA;
+//        public const int GL_EXT_framebuffer_multisample = 1;
+//        public const int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x8D56;
+//        public const int GL_MAX_SAMPLES_EXT = 0x8D57;
+//        public const int GL_EXT_framebuffer_multisample_blit_scaled = 1;
+//        public const int GL_SCALED_RESOLVE_FASTEST_EXT = 0x90BA;
+//        public const int GL_SCALED_RESOLVE_NICEST_EXT = 0x90BB;
+//        public const int GL_EXT_framebuffer_object = 1;
+//        public const int GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506;
+//        public const int GL_MAX_RENDERBUFFER_SIZE_EXT = 0x84E8;
+//        public const int GL_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
+//        public const int GL_RENDERBUFFER_BINDING_EXT = 0x8CA7;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT = 0x8CD0;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT = 0x8CD1;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT = 0x8CD2;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT = 0x8CD4;
+//        public const int GL_FRAMEBUFFER_COMPLETE_EXT = 0x8CD5;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT = 0x8CD6;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT = 0x8CD7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT = 0x8CD9;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT = 0x8CDA;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT = 0x8CDB;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT = 0x8CDC;
+//        public const int GL_FRAMEBUFFER_UNSUPPORTED_EXT = 0x8CDD;
+//        public const int GL_MAX_COLOR_ATTACHMENTS_EXT = 0x8CDF;
+//        public const int GL_COLOR_ATTACHMENT0_EXT = 0x8CE0;
+//        public const int GL_COLOR_ATTACHMENT1_EXT = 0x8CE1;
+//        public const int GL_COLOR_ATTACHMENT2_EXT = 0x8CE2;
+//        public const int GL_COLOR_ATTACHMENT3_EXT = 0x8CE3;
+//        public const int GL_COLOR_ATTACHMENT4_EXT = 0x8CE4;
+//        public const int GL_COLOR_ATTACHMENT5_EXT = 0x8CE5;
+//        public const int GL_COLOR_ATTACHMENT6_EXT = 0x8CE6;
+//        public const int GL_COLOR_ATTACHMENT7_EXT = 0x8CE7;
+//        public const int GL_COLOR_ATTACHMENT8_EXT = 0x8CE8;
+//        public const int GL_COLOR_ATTACHMENT9_EXT = 0x8CE9;
+//        public const int GL_COLOR_ATTACHMENT10_EXT = 0x8CEA;
+//        public const int GL_COLOR_ATTACHMENT11_EXT = 0x8CEB;
+//        public const int GL_COLOR_ATTACHMENT12_EXT = 0x8CEC;
+//        public const int GL_COLOR_ATTACHMENT13_EXT = 0x8CED;
+//        public const int GL_COLOR_ATTACHMENT14_EXT = 0x8CEE;
+//        public const int GL_COLOR_ATTACHMENT15_EXT = 0x8CEF;
+//        public const int GL_DEPTH_ATTACHMENT_EXT = 0x8D00;
+//        public const int GL_STENCIL_ATTACHMENT_EXT = 0x8D20;
+//        public const int GL_FRAMEBUFFER_EXT = 0x8D40;
+//        public const int GL_RENDERBUFFER_EXT = 0x8D41;
+//        public const int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42;
+//        public const int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43;
+//        public const int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44;
+//        public const int GL_STENCIL_INDEX1_EXT = 0x8D46;
+//        public const int GL_STENCIL_INDEX4_EXT = 0x8D47;
+//        public const int GL_STENCIL_INDEX8_EXT = 0x8D48;
+//        public const int GL_STENCIL_INDEX16_EXT = 0x8D49;
+//        public const int GL_RENDERBUFFER_RED_SIZE_EXT = 0x8D50;
+//        public const int GL_RENDERBUFFER_GREEN_SIZE_EXT = 0x8D51;
+//        public const int GL_RENDERBUFFER_BLUE_SIZE_EXT = 0x8D52;
+//        public const int GL_RENDERBUFFER_ALPHA_SIZE_EXT = 0x8D53;
+//        public const int GL_RENDERBUFFER_DEPTH_SIZE_EXT = 0x8D54;
+//        public const int GL_RENDERBUFFER_STENCIL_SIZE_EXT = 0x8D55;
+//        public const int GL_EXT_framebuffer_sRGB = 1;
+//        public const int GL_FRAMEBUFFER_SRGB_EXT = 0x8DB9;
+//        public const int GL_FRAMEBUFFER_SRGB_CAPABLE_EXT = 0x8DBA;
+//        public const int GL_EXT_geometry_shader4 = 1;
+//        public const int GL_GEOMETRY_SHADER_EXT = 0x8DD9;
+//        public const int GL_GEOMETRY_VERTICES_OUT_EXT = 0x8DDA;
+//        public const int GL_GEOMETRY_INPUT_TYPE_EXT = 0x8DDB;
+//        public const int GL_GEOMETRY_OUTPUT_TYPE_EXT = 0x8DDC;
+//        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT = 0x8C29;
+//        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT = 0x8DDD;
+//        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_EXT = 0x8DDE;
+//        public const int GL_MAX_VARYING_COMPONENTS_EXT = 0x8B4B;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT = 0x8DDF;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT = 0x8DE0;
+//        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT = 0x8DE1;
+//        public const int GL_LINES_ADJACENCY_EXT = 0x000A;
+//        public const int GL_LINE_STRIP_ADJACENCY_EXT = 0x000B;
+//        public const int GL_TRIANGLES_ADJACENCY_EXT = 0x000C;
+//        public const int GL_TRIANGLE_STRIP_ADJACENCY_EXT = 0x000D;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT = 0x8DA8;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT = 0x8DA9;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT = 0x8DA7;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT = 0x8CD4;
+//        public const int GL_PROGRAM_POINT_SIZE_EXT = 0x8642;
+//        public const int GL_EXT_gpu_program_parameters = 1;
+//        public const int GL_EXT_gpu_shader4 = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT = 0x88FD;
+//        public const int GL_SAMPLER_1D_ARRAY_EXT = 0x8DC0;
+//        public const int GL_SAMPLER_2D_ARRAY_EXT = 0x8DC1;
+//        public const int GL_SAMPLER_BUFFER_EXT = 0x8DC2;
+//        public const int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3;
+//        public const int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4;
+//        public const int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5;
+//        public const int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6;
+//        public const int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7;
+//        public const int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8;
+//        public const int GL_INT_SAMPLER_1D_EXT = 0x8DC9;
+//        public const int GL_INT_SAMPLER_2D_EXT = 0x8DCA;
+//        public const int GL_INT_SAMPLER_3D_EXT = 0x8DCB;
+//        public const int GL_INT_SAMPLER_CUBE_EXT = 0x8DCC;
+//        public const int GL_INT_SAMPLER_2D_RECT_EXT = 0x8DCD;
+//        public const int GL_INT_SAMPLER_1D_ARRAY_EXT = 0x8DCE;
+//        public const int GL_INT_SAMPLER_2D_ARRAY_EXT = 0x8DCF;
+//        public const int GL_INT_SAMPLER_BUFFER_EXT = 0x8DD0;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D_EXT = 0x8DD1;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_EXT = 0x8DD2;
+//        public const int GL_UNSIGNED_INT_SAMPLER_3D_EXT = 0x8DD3;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_EXT = 0x8DD4;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT = 0x8DD5;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT = 0x8DD6;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT = 0x8DD7;
+//        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT = 0x8DD8;
+//        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_EXT = 0x8904;
+//        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_EXT = 0x8905;
+//        public const int GL_EXT_histogram = 1;
+//        public const int GL_HISTOGRAM_EXT = 0x8024;
+//        public const int GL_PROXY_HISTOGRAM_EXT = 0x8025;
+//        public const int GL_HISTOGRAM_WIDTH_EXT = 0x8026;
+//        public const int GL_HISTOGRAM_FORMAT_EXT = 0x8027;
+//        public const int GL_HISTOGRAM_RED_SIZE_EXT = 0x8028;
+//        public const int GL_HISTOGRAM_GREEN_SIZE_EXT = 0x8029;
+//        public const int GL_HISTOGRAM_BLUE_SIZE_EXT = 0x802A;
+//        public const int GL_HISTOGRAM_ALPHA_SIZE_EXT = 0x802B;
+//        public const int GL_HISTOGRAM_LUMINANCE_SIZE_EXT = 0x802C;
+//        public const int GL_HISTOGRAM_SINK_EXT = 0x802D;
+//        public const int GL_MINMAX_EXT = 0x802E;
+//        public const int GL_MINMAX_FORMAT_EXT = 0x802F;
+//        public const int GL_MINMAX_SINK_EXT = 0x8030;
+//        public const int GL_TABLE_TOO_LARGE_EXT = 0x8031;
+//        public const int GL_EXT_index_array_formats = 1;
+//        public const int GL_IUI_V2F_EXT = 0x81AD;
+//        public const int GL_IUI_V3F_EXT = 0x81AE;
+//        public const int GL_IUI_N3F_V2F_EXT = 0x81AF;
+//        public const int GL_IUI_N3F_V3F_EXT = 0x81B0;
+//        public const int GL_T2F_IUI_V2F_EXT = 0x81B1;
+//        public const int GL_T2F_IUI_V3F_EXT = 0x81B2;
+//        public const int GL_T2F_IUI_N3F_V2F_EXT = 0x81B3;
+//        public const int GL_T2F_IUI_N3F_V3F_EXT = 0x81B4;
+//        public const int GL_EXT_index_func = 1;
+//        public const int GL_INDEX_TEST_EXT = 0x81B5;
+//        public const int GL_INDEX_TEST_FUNC_EXT = 0x81B6;
+//        public const int GL_INDEX_TEST_REF_EXT = 0x81B7;
+//        public const int GL_EXT_index_material = 1;
+//        public const int GL_INDEX_MATERIAL_EXT = 0x81B8;
+//        public const int GL_INDEX_MATERIAL_PARAMETER_EXT = 0x81B9;
+//        public const int GL_INDEX_MATERIAL_FACE_EXT = 0x81BA;
+//        public const int GL_EXT_index_texture = 1;
+//        public const int GL_EXT_light_texture = 1;
+//        public const int GL_FRAGMENT_MATERIAL_EXT = 0x8349;
+//        public const int GL_FRAGMENT_NORMAL_EXT = 0x834A;
+//        public const int GL_FRAGMENT_COLOR_EXT = 0x834C;
+//        public const int GL_ATTENUATION_EXT = 0x834D;
+//        public const int GL_SHADOW_ATTENUATION_EXT = 0x834E;
+//        public const int GL_TEXTURE_APPLICATION_MODE_EXT = 0x834F;
+//        public const int GL_TEXTURE_LIGHT_EXT = 0x8350;
+//        public const int GL_TEXTURE_MATERIAL_FACE_EXT = 0x8351;
+//        public const int GL_TEXTURE_MATERIAL_PARAMETER_EXT = 0x8352;
+//        public const int GL_EXT_memory_object = 1;
+//        public const int GL_TEXTURE_TILING_EXT = 0x9580;
+//        public const int GL_DEDICATED_MEMORY_OBJECT_EXT = 0x9581;
+//        public const int GL_PROTECTED_MEMORY_OBJECT_EXT = 0x959B;
+//        public const int GL_NUM_TILING_TYPES_EXT = 0x9582;
+//        public const int GL_TILING_TYPES_EXT = 0x9583;
+//        public const int GL_OPTIMAL_TILING_EXT = 0x9584;
+//        public const int GL_LINEAR_TILING_EXT = 0x9585;
+//        public const int GL_NUM_DEVICE_UUIDS_EXT = 0x9596;
+//        public const int GL_DEVICE_UUID_EXT = 0x9597;
+//        public const int GL_DRIVER_UUID_EXT = 0x9598;
+//        public const int GL_UUID_SIZE_EXT = 16;
+//        public const int GL_EXT_memory_object_fd = 1;
+//        public const int GL_HANDLE_TYPE_OPAQUE_FD_EXT = 0x9586;
+//        public const int GL_EXT_memory_object_win32 = 1;
+//        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_EXT = 0x9587;
+//        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT = 0x9588;
+//        public const int GL_DEVICE_LUID_EXT = 0x9599;
+//        public const int GL_DEVICE_NODE_MASK_EXT = 0x959A;
+//        public const int GL_LUID_SIZE_EXT = 8;
+//        public const int GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT = 0x9589;
+//        public const int GL_HANDLE_TYPE_D3D12_RESOURCE_EXT = 0x958A;
+//        public const int GL_HANDLE_TYPE_D3D11_IMAGE_EXT = 0x958B;
+//        public const int GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT = 0x958C;
+//        public const int GL_EXT_misc_attribute = 1;
+//        public const int GL_EXT_multi_draw_arrays = 1;
+//        public const int GL_EXT_multisample = 1;
+//        public const int GL_MULTISAMPLE_EXT = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_MASK_EXT = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE_EXT = 0x809F;
+//        public const int GL_SAMPLE_MASK_EXT = 0x80A0;
+//        public const int GL_1PASS_EXT = 0x80A1;
+//        public const int GL_2PASS_0_EXT = 0x80A2;
+//        public const int GL_2PASS_1_EXT = 0x80A3;
+//        public const int GL_4PASS_0_EXT = 0x80A4;
+//        public const int GL_4PASS_1_EXT = 0x80A5;
+//        public const int GL_4PASS_2_EXT = 0x80A6;
+//        public const int GL_4PASS_3_EXT = 0x80A7;
+//        public const int GL_SAMPLE_BUFFERS_EXT = 0x80A8;
+//        public const int GL_SAMPLES_EXT = 0x80A9;
+//        public const int GL_SAMPLE_MASK_VALUE_EXT = 0x80AA;
+//        public const int GL_SAMPLE_MASK_INVERT_EXT = 0x80AB;
+//        public const int GL_SAMPLE_PATTERN_EXT = 0x80AC;
+//        public const int GL_MULTISAMPLE_BIT_EXT = 0x20000000;
+//        public const int GL_EXT_packed_depth_stencil = 1;
+//        public const int GL_DEPTH_STENCIL_EXT = 0x84F9;
+//        public const int GL_UNSIGNED_INT_24_8_EXT = 0x84FA;
+//        public const int GL_DEPTH24_STENCIL8_EXT = 0x88F0;
+//        public const int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88F1;
+//        public const int GL_EXT_packed_float = 1;
+//        public const int GL_R11F_G11F_B10F_EXT = 0x8C3A;
+//        public const int GL_UNSIGNED_INT_10F_11F_11F_REV_EXT = 0x8C3B;
+//        public const int GL_RGBA_SIGNED_COMPONENTS_EXT = 0x8C3C;
+//        public const int GL_EXT_packed_pixels = 1;
+//        public const int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032;
+//        public const int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033;
+//        public const int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034;
+//        public const int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035;
+//        public const int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036;
+//        public const int GL_EXT_paletted_texture = 1;
+//        public const int GL_COLOR_INDEX1_EXT = 0x80E2;
+//        public const int GL_COLOR_INDEX2_EXT = 0x80E3;
+//        public const int GL_COLOR_INDEX4_EXT = 0x80E4;
+//        public const int GL_COLOR_INDEX8_EXT = 0x80E5;
+//        public const int GL_COLOR_INDEX12_EXT = 0x80E6;
+//        public const int GL_COLOR_INDEX16_EXT = 0x80E7;
+//        public const int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED;
+//        public const int GL_EXT_pixel_buffer_object = 1;
+//        public const int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB;
+//        public const int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC;
+//        public const int GL_PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED;
+//        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF;
+//        public const int GL_EXT_pixel_transform = 1;
+//        public const int GL_PIXEL_TRANSFORM_2D_EXT = 0x8330;
+//        public const int GL_PIXEL_MAG_FILTER_EXT = 0x8331;
+//        public const int GL_PIXEL_MIN_FILTER_EXT = 0x8332;
+//        public const int GL_PIXEL_CUBIC_WEIGHT_EXT = 0x8333;
+//        public const int GL_CUBIC_EXT = 0x8334;
+//        public const int GL_AVERAGE_EXT = 0x8335;
+//        public const int GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8336;
+//        public const int GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8337;
+//        public const int GL_PIXEL_TRANSFORM_2D_MATRIX_EXT = 0x8338;
+//        public const int GL_EXT_pixel_transform_color_table = 1;
+//        public const int GL_EXT_point_parameters = 1;
+//        public const int GL_POINT_SIZE_MIN_EXT = 0x8126;
+//        public const int GL_POINT_SIZE_MAX_EXT = 0x8127;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128;
+//        public const int GL_DISTANCE_ATTENUATION_EXT = 0x8129;
+//        public const int GL_EXT_polygon_offset = 1;
+//        public const int GL_POLYGON_OFFSET_EXT = 0x8037;
+//        public const int GL_POLYGON_OFFSET_FACTOR_EXT = 0x8038;
+//        public const int GL_POLYGON_OFFSET_BIAS_EXT = 0x8039;
+//        public const int GL_EXT_polygon_offset_clamp = 1;
+//        public const int GL_POLYGON_OFFSET_CLAMP_EXT = 0x8E1B;
+//        public const int GL_EXT_post_depth_coverage = 1;
+//        public const int GL_EXT_provoking_vertex = 1;
+//        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = 0x8E4C;
+//        public const int GL_FIRST_VERTEX_CONVENTION_EXT = 0x8E4D;
+//        public const int GL_LAST_VERTEX_CONVENTION_EXT = 0x8E4E;
+//        public const int GL_PROVOKING_VERTEX_EXT = 0x8E4F;
+//        public const int GL_EXT_raster_multisample = 1;
+//        public const int GL_RASTER_MULTISAMPLE_EXT = 0x9327;
+//        public const int GL_RASTER_SAMPLES_EXT = 0x9328;
+//        public const int GL_MAX_RASTER_SAMPLES_EXT = 0x9329;
+//        public const int GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT = 0x932A;
+//        public const int GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT = 0x932B;
+//        public const int GL_EFFECTIVE_RASTER_SAMPLES_EXT = 0x932C;
+//        public const int GL_EXT_rescale_normal = 1;
+//        public const int GL_RESCALE_NORMAL_EXT = 0x803A;
+//        public const int GL_EXT_secondary_color = 1;
+//        public const int GL_COLOR_SUM_EXT = 0x8458;
+//        public const int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459;
+//        public const int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A;
+//        public const int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C;
+//        public const int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D;
+//        public const int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E;
+//        public const int GL_EXT_semaphore = 1;
+//        public const int GL_LAYOUT_GENERAL_EXT = 0x958D;
+//        public const int GL_LAYOUT_COLOR_ATTACHMENT_EXT = 0x958E;
+//        public const int GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT = 0x958F;
+//        public const int GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT = 0x9590;
+//        public const int GL_LAYOUT_SHADER_READ_ONLY_EXT = 0x9591;
+//        public const int GL_LAYOUT_TRANSFER_SRC_EXT = 0x9592;
+//        public const int GL_LAYOUT_TRANSFER_DST_EXT = 0x9593;
+//        public const int GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT = 0x9530;
+//        public const int GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT = 0x9531;
+//        public const int GL_EXT_semaphore_fd = 1;
+//        public const int GL_EXT_semaphore_win32 = 1;
+//        public const int GL_HANDLE_TYPE_D3D12_FENCE_EXT = 0x9594;
+//        public const int GL_D3D12_FENCE_VALUE_EXT = 0x9595;
+//        public const int GL_EXT_separate_shader_objects = 1;
+//        public const int GL_ACTIVE_PROGRAM_EXT = 0x8B8D;
+//        public const int GL_EXT_separate_specular_color = 1;
+//        public const int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8;
+//        public const int GL_SINGLE_COLOR_EXT = 0x81F9;
+//        public const int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA;
+//        public const int GL_EXT_shader_framebuffer_fetch = 1;
+//        public const int GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT = 0x8A52;
+//        public const int GL_EXT_shader_framebuffer_fetch_non_coherent = 1;
+//        public const int GL_EXT_shader_image_load_formatted = 1;
+//        public const int GL_EXT_shader_image_load_store = 1;
+//        public const int GL_MAX_IMAGE_UNITS_EXT = 0x8F38;
+//        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT = 0x8F39;
+//        public const int GL_IMAGE_BINDING_NAME_EXT = 0x8F3A;
+//        public const int GL_IMAGE_BINDING_LEVEL_EXT = 0x8F3B;
+//        public const int GL_IMAGE_BINDING_LAYERED_EXT = 0x8F3C;
+//        public const int GL_IMAGE_BINDING_LAYER_EXT = 0x8F3D;
+//        public const int GL_IMAGE_BINDING_ACCESS_EXT = 0x8F3E;
+//        public const int GL_IMAGE_1D_EXT = 0x904C;
+//        public const int GL_IMAGE_2D_EXT = 0x904D;
+//        public const int GL_IMAGE_3D_EXT = 0x904E;
+//        public const int GL_IMAGE_2D_RECT_EXT = 0x904F;
+//        public const int GL_IMAGE_CUBE_EXT = 0x9050;
+//        public const int GL_IMAGE_BUFFER_EXT = 0x9051;
+//        public const int GL_IMAGE_1D_ARRAY_EXT = 0x9052;
+//        public const int GL_IMAGE_2D_ARRAY_EXT = 0x9053;
+//        public const int GL_IMAGE_CUBE_MAP_ARRAY_EXT = 0x9054;
+//        public const int GL_IMAGE_2D_MULTISAMPLE_EXT = 0x9055;
+//        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9056;
+//        public const int GL_INT_IMAGE_1D_EXT = 0x9057;
+//        public const int GL_INT_IMAGE_2D_EXT = 0x9058;
+//        public const int GL_INT_IMAGE_3D_EXT = 0x9059;
+//        public const int GL_INT_IMAGE_2D_RECT_EXT = 0x905A;
+//        public const int GL_INT_IMAGE_CUBE_EXT = 0x905B;
+//        public const int GL_INT_IMAGE_BUFFER_EXT = 0x905C;
+//        public const int GL_INT_IMAGE_1D_ARRAY_EXT = 0x905D;
+//        public const int GL_INT_IMAGE_2D_ARRAY_EXT = 0x905E;
+//        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x905F;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x9060;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9061;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D_EXT = 0x9062;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_EXT = 0x9063;
+//        public const int GL_UNSIGNED_INT_IMAGE_3D_EXT = 0x9064;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT = 0x9065;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE_EXT = 0x9066;
+//        public const int GL_UNSIGNED_INT_IMAGE_BUFFER_EXT = 0x9067;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT = 0x9068;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT = 0x9069;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x906A;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x906B;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x906C;
+//        public const int GL_MAX_IMAGE_SAMPLES_EXT = 0x906D;
+//        public const int GL_IMAGE_BINDING_FORMAT_EXT = 0x906E;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT = 0x00000001;
+//        public const int GL_ELEMENT_ARRAY_BARRIER_BIT_EXT = 0x00000002;
+//        public const int GL_UNIFORM_BARRIER_BIT_EXT = 0x00000004;
+//        public const int GL_TEXTURE_FETCH_BARRIER_BIT_EXT = 0x00000008;
+//        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT = 0x00000020;
+//        public const int GL_COMMAND_BARRIER_BIT_EXT = 0x00000040;
+//        public const int GL_PIXEL_BUFFER_BARRIER_BIT_EXT = 0x00000080;
+//        public const int GL_TEXTURE_UPDATE_BARRIER_BIT_EXT = 0x00000100;
+//        public const int GL_BUFFER_UPDATE_BARRIER_BIT_EXT = 0x00000200;
+//        public const int GL_FRAMEBUFFER_BARRIER_BIT_EXT = 0x00000400;
+//        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT = 0x00000800;
+//        public const int GL_ATOMIC_COUNTER_BARRIER_BIT_EXT = 0x00001000;
+//        public const int GL_ALL_BARRIER_BITS_EXT = -1;
+//        public const int GL_EXT_shader_integer_mix = 1;
+//        public const int GL_EXT_shadow_funcs = 1;
+//        public const int GL_EXT_shared_texture_palette = 1;
+//        public const int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB;
+//        public const int GL_EXT_sparse_texture2 = 1;
+//        public const int GL_EXT_stencil_clear_tag = 1;
+//        public const int GL_STENCIL_TAG_BITS_EXT = 0x88F2;
+//        public const int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88F3;
+//        public const int GL_EXT_stencil_two_side = 1;
+//        public const int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910;
+//        public const int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911;
+//        public const int GL_EXT_stencil_wrap = 1;
+//        public const int GL_INCR_WRAP_EXT = 0x8507;
+//        public const int GL_DECR_WRAP_EXT = 0x8508;
+//        public const int GL_EXT_subtexture = 1;
+//        public const int GL_EXT_texture = 1;
+//        public const int GL_ALPHA4_EXT = 0x803B;
+//        public const int GL_ALPHA8_EXT = 0x803C;
+//        public const int GL_ALPHA12_EXT = 0x803D;
+//        public const int GL_ALPHA16_EXT = 0x803E;
+//        public const int GL_LUMINANCE4_EXT = 0x803F;
+//        public const int GL_LUMINANCE8_EXT = 0x8040;
+//        public const int GL_LUMINANCE12_EXT = 0x8041;
+//        public const int GL_LUMINANCE16_EXT = 0x8042;
+//        public const int GL_LUMINANCE4_ALPHA4_EXT = 0x8043;
+//        public const int GL_LUMINANCE6_ALPHA2_EXT = 0x8044;
+//        public const int GL_LUMINANCE8_ALPHA8_EXT = 0x8045;
+//        public const int GL_LUMINANCE12_ALPHA4_EXT = 0x8046;
+//        public const int GL_LUMINANCE12_ALPHA12_EXT = 0x8047;
+//        public const int GL_LUMINANCE16_ALPHA16_EXT = 0x8048;
+//        public const int GL_INTENSITY_EXT = 0x8049;
+//        public const int GL_INTENSITY4_EXT = 0x804A;
+//        public const int GL_INTENSITY8_EXT = 0x804B;
+//        public const int GL_INTENSITY12_EXT = 0x804C;
+//        public const int GL_INTENSITY16_EXT = 0x804D;
+//        public const int GL_RGB2_EXT = 0x804E;
+//        public const int GL_RGB4_EXT = 0x804F;
+//        public const int GL_RGB5_EXT = 0x8050;
+//        public const int GL_RGB8_EXT = 0x8051;
+//        public const int GL_RGB10_EXT = 0x8052;
+//        public const int GL_RGB12_EXT = 0x8053;
+//        public const int GL_RGB16_EXT = 0x8054;
+//        public const int GL_RGBA2_EXT = 0x8055;
+//        public const int GL_RGBA4_EXT = 0x8056;
+//        public const int GL_RGB5_A1_EXT = 0x8057;
+//        public const int GL_RGBA8_EXT = 0x8058;
+//        public const int GL_RGB10_A2_EXT = 0x8059;
+//        public const int GL_RGBA12_EXT = 0x805A;
+//        public const int GL_RGBA16_EXT = 0x805B;
+//        public const int GL_TEXTURE_RED_SIZE_EXT = 0x805C;
+//        public const int GL_TEXTURE_GREEN_SIZE_EXT = 0x805D;
+//        public const int GL_TEXTURE_BLUE_SIZE_EXT = 0x805E;
+//        public const int GL_TEXTURE_ALPHA_SIZE_EXT = 0x805F;
+//        public const int GL_TEXTURE_LUMINANCE_SIZE_EXT = 0x8060;
+//        public const int GL_TEXTURE_INTENSITY_SIZE_EXT = 0x8061;
+//        public const int GL_REPLACE_EXT = 0x8062;
+//        public const int GL_PROXY_TEXTURE_1D_EXT = 0x8063;
+//        public const int GL_PROXY_TEXTURE_2D_EXT = 0x8064;
+//        public const int GL_TEXTURE_TOO_LARGE_EXT = 0x8065;
+//        public const int GL_EXT_texture3D = 1;
+//        public const int GL_PACK_SKIP_IMAGES_EXT = 0x806B;
+//        public const int GL_PACK_IMAGE_HEIGHT_EXT = 0x806C;
+//        public const int GL_UNPACK_SKIP_IMAGES_EXT = 0x806D;
+//        public const int GL_UNPACK_IMAGE_HEIGHT_EXT = 0x806E;
+//        public const int GL_TEXTURE_3D_EXT = 0x806F;
+//        public const int GL_PROXY_TEXTURE_3D_EXT = 0x8070;
+//        public const int GL_TEXTURE_DEPTH_EXT = 0x8071;
+//        public const int GL_TEXTURE_WRAP_R_EXT = 0x8072;
+//        public const int GL_MAX_3D_TEXTURE_SIZE_EXT = 0x8073;
+//        public const int GL_EXT_texture_array = 1;
+//        public const int GL_TEXTURE_1D_ARRAY_EXT = 0x8C18;
+//        public const int GL_PROXY_TEXTURE_1D_ARRAY_EXT = 0x8C19;
+//        public const int GL_TEXTURE_2D_ARRAY_EXT = 0x8C1A;
+//        public const int GL_PROXY_TEXTURE_2D_ARRAY_EXT = 0x8C1B;
+//        public const int GL_TEXTURE_BINDING_1D_ARRAY_EXT = 0x8C1C;
+//        public const int GL_TEXTURE_BINDING_2D_ARRAY_EXT = 0x8C1D;
+//        public const int GL_MAX_ARRAY_TEXTURE_LAYERS_EXT = 0x88FF;
+//        public const int GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT = 0x884E;
+//        public const int GL_EXT_texture_buffer_object = 1;
+//        public const int GL_TEXTURE_BUFFER_EXT = 0x8C2A;
+//        public const int GL_MAX_TEXTURE_BUFFER_SIZE_EXT = 0x8C2B;
+//        public const int GL_TEXTURE_BINDING_BUFFER_EXT = 0x8C2C;
+//        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT = 0x8C2D;
+//        public const int GL_TEXTURE_BUFFER_FORMAT_EXT = 0x8C2E;
+//        public const int GL_EXT_texture_compression_latc = 1;
+//        public const int GL_COMPRESSED_LUMINANCE_LATC1_EXT = 0x8C70;
+//        public const int GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT = 0x8C71;
+//        public const int GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C72;
+//        public const int GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C73;
+//        public const int GL_EXT_texture_compression_rgtc = 1;
+//        public const int GL_COMPRESSED_RED_RGTC1_EXT = 0x8DBB;
+//        public const int GL_COMPRESSED_SIGNED_RED_RGTC1_EXT = 0x8DBC;
+//        public const int GL_COMPRESSED_RED_GREEN_RGTC2_EXT = 0x8DBD;
+//        public const int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT = 0x8DBE;
+//        public const int GL_EXT_texture_compression_s3tc = 1;
+//        public const int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
+//        public const int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
+//        public const int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2;
+//        public const int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
+//        public const int GL_EXT_texture_cube_map = 1;
+//        public const int GL_NORMAL_MAP_EXT = 0x8511;
+//        public const int GL_REFLECTION_MAP_EXT = 0x8512;
+//        public const int GL_TEXTURE_CUBE_MAP_EXT = 0x8513;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_EXT = 0x8514;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT = 0x8515;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT = 0x8516;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT = 0x8517;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT = 0x8518;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT = 0x8519;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT = 0x851A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_EXT = 0x851B;
+//        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT = 0x851C;
+//        public const int GL_EXT_texture_env_add = 1;
+//        public const int GL_EXT_texture_env_combine = 1;
+//        public const int GL_COMBINE_EXT = 0x8570;
+//        public const int GL_COMBINE_RGB_EXT = 0x8571;
+//        public const int GL_COMBINE_ALPHA_EXT = 0x8572;
+//        public const int GL_RGB_SCALE_EXT = 0x8573;
+//        public const int GL_ADD_SIGNED_EXT = 0x8574;
+//        public const int GL_INTERPOLATE_EXT = 0x8575;
+//        public const int GL_CONSTANT_EXT = 0x8576;
+//        public const int GL_PRIMARY_COLOR_EXT = 0x8577;
+//        public const int GL_PREVIOUS_EXT = 0x8578;
+//        public const int GL_SOURCE0_RGB_EXT = 0x8580;
+//        public const int GL_SOURCE1_RGB_EXT = 0x8581;
+//        public const int GL_SOURCE2_RGB_EXT = 0x8582;
+//        public const int GL_SOURCE0_ALPHA_EXT = 0x8588;
+//        public const int GL_SOURCE1_ALPHA_EXT = 0x8589;
+//        public const int GL_SOURCE2_ALPHA_EXT = 0x858A;
+//        public const int GL_OPERAND0_RGB_EXT = 0x8590;
+//        public const int GL_OPERAND1_RGB_EXT = 0x8591;
+//        public const int GL_OPERAND2_RGB_EXT = 0x8592;
+//        public const int GL_OPERAND0_ALPHA_EXT = 0x8598;
+//        public const int GL_OPERAND1_ALPHA_EXT = 0x8599;
+//        public const int GL_OPERAND2_ALPHA_EXT = 0x859A;
+//        public const int GL_EXT_texture_env_dot3 = 1;
+//        public const int GL_DOT3_RGB_EXT = 0x8740;
+//        public const int GL_DOT3_RGBA_EXT = 0x8741;
+//        public const int GL_EXT_texture_filter_anisotropic = 1;
+//        public const int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
+//        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
+//        public const int GL_EXT_texture_filter_minmax = 1;
+//        public const int GL_TEXTURE_REDUCTION_MODE_EXT = 0x9366;
+//        public const int GL_WEIGHTED_AVERAGE_EXT = 0x9367;
+//        public const int GL_EXT_texture_integer = 1;
+//        public const int GL_RGBA32UI_EXT = 0x8D70;
+//        public const int GL_RGB32UI_EXT = 0x8D71;
+//        public const int GL_ALPHA32UI_EXT = 0x8D72;
+//        public const int GL_INTENSITY32UI_EXT = 0x8D73;
+//        public const int GL_LUMINANCE32UI_EXT = 0x8D74;
+//        public const int GL_LUMINANCE_ALPHA32UI_EXT = 0x8D75;
+//        public const int GL_RGBA16UI_EXT = 0x8D76;
+//        public const int GL_RGB16UI_EXT = 0x8D77;
+//        public const int GL_ALPHA16UI_EXT = 0x8D78;
+//        public const int GL_INTENSITY16UI_EXT = 0x8D79;
+//        public const int GL_LUMINANCE16UI_EXT = 0x8D7A;
+//        public const int GL_LUMINANCE_ALPHA16UI_EXT = 0x8D7B;
+//        public const int GL_RGBA8UI_EXT = 0x8D7C;
+//        public const int GL_RGB8UI_EXT = 0x8D7D;
+//        public const int GL_ALPHA8UI_EXT = 0x8D7E;
+//        public const int GL_INTENSITY8UI_EXT = 0x8D7F;
+//        public const int GL_LUMINANCE8UI_EXT = 0x8D80;
+//        public const int GL_LUMINANCE_ALPHA8UI_EXT = 0x8D81;
+//        public const int GL_RGBA32I_EXT = 0x8D82;
+//        public const int GL_RGB32I_EXT = 0x8D83;
+//        public const int GL_ALPHA32I_EXT = 0x8D84;
+//        public const int GL_INTENSITY32I_EXT = 0x8D85;
+//        public const int GL_LUMINANCE32I_EXT = 0x8D86;
+//        public const int GL_LUMINANCE_ALPHA32I_EXT = 0x8D87;
+//        public const int GL_RGBA16I_EXT = 0x8D88;
+//        public const int GL_RGB16I_EXT = 0x8D89;
+//        public const int GL_ALPHA16I_EXT = 0x8D8A;
+//        public const int GL_INTENSITY16I_EXT = 0x8D8B;
+//        public const int GL_LUMINANCE16I_EXT = 0x8D8C;
+//        public const int GL_LUMINANCE_ALPHA16I_EXT = 0x8D8D;
+//        public const int GL_RGBA8I_EXT = 0x8D8E;
+//        public const int GL_RGB8I_EXT = 0x8D8F;
+//        public const int GL_ALPHA8I_EXT = 0x8D90;
+//        public const int GL_INTENSITY8I_EXT = 0x8D91;
+//        public const int GL_LUMINANCE8I_EXT = 0x8D92;
+//        public const int GL_LUMINANCE_ALPHA8I_EXT = 0x8D93;
+//        public const int GL_RED_INTEGER_EXT = 0x8D94;
+//        public const int GL_GREEN_INTEGER_EXT = 0x8D95;
+//        public const int GL_BLUE_INTEGER_EXT = 0x8D96;
+//        public const int GL_ALPHA_INTEGER_EXT = 0x8D97;
+//        public const int GL_RGB_INTEGER_EXT = 0x8D98;
+//        public const int GL_RGBA_INTEGER_EXT = 0x8D99;
+//        public const int GL_BGR_INTEGER_EXT = 0x8D9A;
+//        public const int GL_BGRA_INTEGER_EXT = 0x8D9B;
+//        public const int GL_LUMINANCE_INTEGER_EXT = 0x8D9C;
+//        public const int GL_LUMINANCE_ALPHA_INTEGER_EXT = 0x8D9D;
+//        public const int GL_RGBA_INTEGER_MODE_EXT = 0x8D9E;
+//        public const int GL_EXT_texture_lod_bias = 1;
+//        public const int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD;
+//        public const int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500;
+//        public const int GL_TEXTURE_LOD_BIAS_EXT = 0x8501;
+//        public const int GL_EXT_texture_mirror_clamp = 1;
+//        public const int GL_MIRROR_CLAMP_EXT = 0x8742;
+//        public const int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743;
+//        public const int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912;
+//        public const int GL_EXT_texture_object = 1;
+//        public const int GL_TEXTURE_PRIORITY_EXT = 0x8066;
+//        public const int GL_TEXTURE_RESIDENT_EXT = 0x8067;
+//        public const int GL_TEXTURE_1D_BINDING_EXT = 0x8068;
+//        public const int GL_TEXTURE_2D_BINDING_EXT = 0x8069;
+//        public const int GL_TEXTURE_3D_BINDING_EXT = 0x806A;
+//        public const int GL_EXT_texture_perturb_normal = 1;
+//        public const int GL_PERTURB_EXT = 0x85AE;
+//        public const int GL_TEXTURE_NORMAL_EXT = 0x85AF;
+//        public const int GL_EXT_texture_sRGB = 1;
+//        public const int GL_SRGB_EXT = 0x8C40;
+//        public const int GL_SRGB8_EXT = 0x8C41;
+//        public const int GL_SRGB_ALPHA_EXT = 0x8C42;
+//        public const int GL_SRGB8_ALPHA8_EXT = 0x8C43;
+//        public const int GL_SLUMINANCE_ALPHA_EXT = 0x8C44;
+//        public const int GL_SLUMINANCE8_ALPHA8_EXT = 0x8C45;
+//        public const int GL_SLUMINANCE_EXT = 0x8C46;
+//        public const int GL_SLUMINANCE8_EXT = 0x8C47;
+//        public const int GL_COMPRESSED_SRGB_EXT = 0x8C48;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8C49;
+//        public const int GL_COMPRESSED_SLUMINANCE_EXT = 0x8C4A;
+//        public const int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8C4B;
+//        public const int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8C4F;
+//        public const int GL_EXT_texture_sRGB_decode = 1;
+//        public const int GL_TEXTURE_SRGB_DECODE_EXT = 0x8A48;
+//        public const int GL_DECODE_EXT = 0x8A49;
+//        public const int GL_SKIP_DECODE_EXT = 0x8A4A;
+//        public const int GL_EXT_texture_shared_exponent = 1;
+//        public const int GL_RGB9_E5_EXT = 0x8C3D;
+//        public const int GL_UNSIGNED_INT_5_9_9_9_REV_EXT = 0x8C3E;
+//        public const int GL_TEXTURE_SHARED_SIZE_EXT = 0x8C3F;
+//        public const int GL_EXT_texture_snorm = 1;
+//        public const int GL_ALPHA_SNORM = 0x9010;
+//        public const int GL_LUMINANCE_SNORM = 0x9011;
+//        public const int GL_LUMINANCE_ALPHA_SNORM = 0x9012;
+//        public const int GL_INTENSITY_SNORM = 0x9013;
+//        public const int GL_ALPHA8_SNORM = 0x9014;
+//        public const int GL_LUMINANCE8_SNORM = 0x9015;
+//        public const int GL_LUMINANCE8_ALPHA8_SNORM = 0x9016;
+//        public const int GL_INTENSITY8_SNORM = 0x9017;
+//        public const int GL_ALPHA16_SNORM = 0x9018;
+//        public const int GL_LUMINANCE16_SNORM = 0x9019;
+//        public const int GL_LUMINANCE16_ALPHA16_SNORM = 0x901A;
+//        public const int GL_INTENSITY16_SNORM = 0x901B;
+//        public const int GL_RED_SNORM = 0x8F90;
+//        public const int GL_RG_SNORM = 0x8F91;
+//        public const int GL_RGB_SNORM = 0x8F92;
+//        public const int GL_RGBA_SNORM = 0x8F93;
+//        public const int GL_EXT_texture_swizzle = 1;
+//        public const int GL_TEXTURE_SWIZZLE_R_EXT = 0x8E42;
+//        public const int GL_TEXTURE_SWIZZLE_G_EXT = 0x8E43;
+//        public const int GL_TEXTURE_SWIZZLE_B_EXT = 0x8E44;
+//        public const int GL_TEXTURE_SWIZZLE_A_EXT = 0x8E45;
+//        public const int GL_TEXTURE_SWIZZLE_RGBA_EXT = 0x8E46;
+//        public const int GL_EXT_timer_query = 1;
+//        public const int GL_TIME_ELAPSED_EXT = 0x88BF;
+//        public const int GL_EXT_transform_feedback = 1;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_EXT = 0x8C8E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT = 0x8C84;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT = 0x8C85;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT = 0x8C8F;
+//        public const int GL_INTERLEAVED_ATTRIBS_EXT = 0x8C8C;
+//        public const int GL_SEPARATE_ATTRIBS_EXT = 0x8C8D;
+//        public const int GL_PRIMITIVES_GENERATED_EXT = 0x8C87;
+//        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT = 0x8C88;
+//        public const int GL_RASTERIZER_DISCARD_EXT = 0x8C89;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT = 0x8C8B;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT = 0x8C80;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_EXT = 0x8C83;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT = 0x8C7F;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT = 0x8C76;
+//        public const int GL_EXT_vertex_array = 1;
+//        public const int GL_VERTEX_ARRAY_EXT = 0x8074;
+//        public const int GL_NORMAL_ARRAY_EXT = 0x8075;
+//        public const int GL_COLOR_ARRAY_EXT = 0x8076;
+//        public const int GL_INDEX_ARRAY_EXT = 0x8077;
+//        public const int GL_TEXTURE_COORD_ARRAY_EXT = 0x8078;
+//        public const int GL_EDGE_FLAG_ARRAY_EXT = 0x8079;
+//        public const int GL_VERTEX_ARRAY_SIZE_EXT = 0x807A;
+//        public const int GL_VERTEX_ARRAY_TYPE_EXT = 0x807B;
+//        public const int GL_VERTEX_ARRAY_STRIDE_EXT = 0x807C;
+//        public const int GL_VERTEX_ARRAY_COUNT_EXT = 0x807D;
+//        public const int GL_NORMAL_ARRAY_TYPE_EXT = 0x807E;
+//        public const int GL_NORMAL_ARRAY_STRIDE_EXT = 0x807F;
+//        public const int GL_NORMAL_ARRAY_COUNT_EXT = 0x8080;
+//        public const int GL_COLOR_ARRAY_SIZE_EXT = 0x8081;
+//        public const int GL_COLOR_ARRAY_TYPE_EXT = 0x8082;
+//        public const int GL_COLOR_ARRAY_STRIDE_EXT = 0x8083;
+//        public const int GL_COLOR_ARRAY_COUNT_EXT = 0x8084;
+//        public const int GL_INDEX_ARRAY_TYPE_EXT = 0x8085;
+//        public const int GL_INDEX_ARRAY_STRIDE_EXT = 0x8086;
+//        public const int GL_INDEX_ARRAY_COUNT_EXT = 0x8087;
+//        public const int GL_TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088;
+//        public const int GL_TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089;
+//        public const int GL_TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A;
+//        public const int GL_TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B;
+//        public const int GL_EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C;
+//        public const int GL_EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D;
+//        public const int GL_VERTEX_ARRAY_POINTER_EXT = 0x808E;
+//        public const int GL_NORMAL_ARRAY_POINTER_EXT = 0x808F;
+//        public const int GL_COLOR_ARRAY_POINTER_EXT = 0x8090;
+//        public const int GL_INDEX_ARRAY_POINTER_EXT = 0x8091;
+//        public const int GL_TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092;
+//        public const int GL_EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093;
+//        public const int GL_EXT_vertex_array_bgra = 1;
+//        public const int GL_EXT_vertex_attrib_64bit = 1;
+//        public const int GL_DOUBLE_VEC2_EXT = 0x8FFC;
+//        public const int GL_DOUBLE_VEC3_EXT = 0x8FFD;
+//        public const int GL_DOUBLE_VEC4_EXT = 0x8FFE;
+//        public const int GL_DOUBLE_MAT2_EXT = 0x8F46;
+//        public const int GL_DOUBLE_MAT3_EXT = 0x8F47;
+//        public const int GL_DOUBLE_MAT4_EXT = 0x8F48;
+//        public const int GL_DOUBLE_MAT2x3_EXT = 0x8F49;
+//        public const int GL_DOUBLE_MAT2x4_EXT = 0x8F4A;
+//        public const int GL_DOUBLE_MAT3x2_EXT = 0x8F4B;
+//        public const int GL_DOUBLE_MAT3x4_EXT = 0x8F4C;
+//        public const int GL_DOUBLE_MAT4x2_EXT = 0x8F4D;
+//        public const int GL_DOUBLE_MAT4x3_EXT = 0x8F4E;
+//        public const int GL_EXT_vertex_shader = 1;
+//        public const int GL_VERTEX_SHADER_EXT = 0x8780;
+//        public const int GL_VERTEX_SHADER_BINDING_EXT = 0x8781;
+//        public const int GL_OP_INDEX_EXT = 0x8782;
+//        public const int GL_OP_NEGATE_EXT = 0x8783;
+//        public const int GL_OP_DOT3_EXT = 0x8784;
+//        public const int GL_OP_DOT4_EXT = 0x8785;
+//        public const int GL_OP_MUL_EXT = 0x8786;
+//        public const int GL_OP_ADD_EXT = 0x8787;
+//        public const int GL_OP_MADD_EXT = 0x8788;
+//        public const int GL_OP_FRAC_EXT = 0x8789;
+//        public const int GL_OP_MAX_EXT = 0x878A;
+//        public const int GL_OP_MIN_EXT = 0x878B;
+//        public const int GL_OP_SET_GE_EXT = 0x878C;
+//        public const int GL_OP_SET_LT_EXT = 0x878D;
+//        public const int GL_OP_CLAMP_EXT = 0x878E;
+//        public const int GL_OP_FLOOR_EXT = 0x878F;
+//        public const int GL_OP_ROUND_EXT = 0x8790;
+//        public const int GL_OP_EXP_BASE_2_EXT = 0x8791;
+//        public const int GL_OP_LOG_BASE_2_EXT = 0x8792;
+//        public const int GL_OP_POWER_EXT = 0x8793;
+//        public const int GL_OP_RECIP_EXT = 0x8794;
+//        public const int GL_OP_RECIP_SQRT_EXT = 0x8795;
+//        public const int GL_OP_SUB_EXT = 0x8796;
+//        public const int GL_OP_CROSS_PRODUCT_EXT = 0x8797;
+//        public const int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798;
+//        public const int GL_OP_MOV_EXT = 0x8799;
+//        public const int GL_OUTPUT_VERTEX_EXT = 0x879A;
+//        public const int GL_OUTPUT_COLOR0_EXT = 0x879B;
+//        public const int GL_OUTPUT_COLOR1_EXT = 0x879C;
+//        public const int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D;
+//        public const int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E;
+//        public const int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F;
+//        public const int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0;
+//        public const int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1;
+//        public const int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2;
+//        public const int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3;
+//        public const int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4;
+//        public const int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5;
+//        public const int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6;
+//        public const int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7;
+//        public const int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8;
+//        public const int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9;
+//        public const int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA;
+//        public const int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB;
+//        public const int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC;
+//        public const int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD;
+//        public const int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE;
+//        public const int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF;
+//        public const int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0;
+//        public const int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1;
+//        public const int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2;
+//        public const int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3;
+//        public const int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4;
+//        public const int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5;
+//        public const int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6;
+//        public const int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7;
+//        public const int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8;
+//        public const int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9;
+//        public const int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA;
+//        public const int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB;
+//        public const int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC;
+//        public const int GL_OUTPUT_FOG_EXT = 0x87BD;
+//        public const int GL_SCALAR_EXT = 0x87BE;
+//        public const int GL_VECTOR_EXT = 0x87BF;
+//        public const int GL_MATRIX_EXT = 0x87C0;
+//        public const int GL_VARIANT_EXT = 0x87C1;
+//        public const int GL_INVARIANT_EXT = 0x87C2;
+//        public const int GL_LOCAL_CONSTANT_EXT = 0x87C3;
+//        public const int GL_LOCAL_EXT = 0x87C4;
+//        public const int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5;
+//        public const int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6;
+//        public const int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7;
+//        public const int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8;
+//        public const int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CC;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CD;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE;
+//        public const int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF;
+//        public const int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0;
+//        public const int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1;
+//        public const int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2;
+//        public const int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3;
+//        public const int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4;
+//        public const int GL_X_EXT = 0x87D5;
+//        public const int GL_Y_EXT = 0x87D6;
+//        public const int GL_Z_EXT = 0x87D7;
+//        public const int GL_W_EXT = 0x87D8;
+//        public const int GL_NEGATIVE_X_EXT = 0x87D9;
+//        public const int GL_NEGATIVE_Y_EXT = 0x87DA;
+//        public const int GL_NEGATIVE_Z_EXT = 0x87DB;
+//        public const int GL_NEGATIVE_W_EXT = 0x87DC;
+//        public const int GL_ZERO_EXT = 0x87DD;
+//        public const int GL_ONE_EXT = 0x87DE;
+//        public const int GL_NEGATIVE_ONE_EXT = 0x87DF;
+//        public const int GL_NORMALIZED_RANGE_EXT = 0x87E0;
+//        public const int GL_FULL_RANGE_EXT = 0x87E1;
+//        public const int GL_CURRENT_VERTEX_EXT = 0x87E2;
+//        public const int GL_MVP_MATRIX_EXT = 0x87E3;
+//        public const int GL_VARIANT_VALUE_EXT = 0x87E4;
+//        public const int GL_VARIANT_DATATYPE_EXT = 0x87E5;
+//        public const int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6;
+//        public const int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7;
+//        public const int GL_VARIANT_ARRAY_EXT = 0x87E8;
+//        public const int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9;
+//        public const int GL_INVARIANT_VALUE_EXT = 0x87EA;
+//        public const int GL_INVARIANT_DATATYPE_EXT = 0x87EB;
+//        public const int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC;
+//        public const int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED;
+//        public const int GL_EXT_vertex_weighting = 1;
+//        public const int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3;
+//        public const int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502;
+//        public const int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6;
+//        public const int GL_MODELVIEW1_MATRIX_EXT = 0x8506;
+//        public const int GL_VERTEX_WEIGHTING_EXT = 0x8509;
+//        public const int GL_MODELVIEW0_EXT = 0x1700;
+//        public const int GL_MODELVIEW1_EXT = 0x850A;
+//        public const int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510;
+//        public const int GL_EXT_win32_keyed_mutex = 1;
+//        public const int GL_EXT_window_rectangles = 1;
+//        public const int GL_INCLUSIVE_EXT = 0x8F10;
+//        public const int GL_EXCLUSIVE_EXT = 0x8F11;
+//        public const int GL_WINDOW_RECTANGLE_EXT = 0x8F12;
+//        public const int GL_WINDOW_RECTANGLE_MODE_EXT = 0x8F13;
+//        public const int GL_MAX_WINDOW_RECTANGLES_EXT = 0x8F14;
+//        public const int GL_NUM_WINDOW_RECTANGLES_EXT = 0x8F15;
+//        public const int GL_EXT_x11_sync_object = 1;
+//        public const int GL_SYNC_X11_FENCE_EXT = 0x90E1;
+//        public const int GL_GREMEDY_frame_terminator = 1;
+//        public const int GL_GREMEDY_string_marker = 1;
+//        public const int GL_HP_convolution_border_modes = 1;
+//        public const int GL_IGNORE_BORDER_HP = 0x8150;
+//        public const int GL_CONSTANT_BORDER_HP = 0x8151;
+//        public const int GL_REPLICATE_BORDER_HP = 0x8153;
+//        public const int GL_CONVOLUTION_BORDER_COLOR_HP = 0x8154;
+//        public const int GL_HP_image_transform = 1;
+//        public const int GL_IMAGE_SCALE_X_HP = 0x8155;
+//        public const int GL_IMAGE_SCALE_Y_HP = 0x8156;
+//        public const int GL_IMAGE_TRANSLATE_X_HP = 0x8157;
+//        public const int GL_IMAGE_TRANSLATE_Y_HP = 0x8158;
+//        public const int GL_IMAGE_ROTATE_ANGLE_HP = 0x8159;
+//        public const int GL_IMAGE_ROTATE_ORIGIN_X_HP = 0x815A;
+//        public const int GL_IMAGE_ROTATE_ORIGIN_Y_HP = 0x815B;
+//        public const int GL_IMAGE_MAG_FILTER_HP = 0x815C;
+//        public const int GL_IMAGE_MIN_FILTER_HP = 0x815D;
+//        public const int GL_IMAGE_CUBIC_WEIGHT_HP = 0x815E;
+//        public const int GL_CUBIC_HP = 0x815F;
+//        public const int GL_AVERAGE_HP = 0x8160;
+//        public const int GL_IMAGE_TRANSFORM_2D_HP = 0x8161;
+//        public const int GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8162;
+//        public const int GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8163;
+//        public const int GL_HP_occlusion_test = 1;
+//        public const int GL_OCCLUSION_TEST_HP = 0x8165;
+//        public const int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;
+//        public const int GL_HP_texture_lighting = 1;
+//        public const int GL_TEXTURE_LIGHTING_MODE_HP = 0x8167;
+//        public const int GL_TEXTURE_POST_SPECULAR_HP = 0x8168;
+//        public const int GL_TEXTURE_PRE_SPECULAR_HP = 0x8169;
+//        public const int GL_IBM_cull_vertex = 1;
+//        public const int GL_CULL_VERTEX_IBM = 103050;
+//        public const int GL_IBM_multimode_draw_arrays = 1;
+//        public const int GL_IBM_rasterpos_clip = 1;
+//        public const int GL_RASTER_POSITION_UNCLIPPED_IBM = 0x19262;
+//        public const int GL_IBM_static_data = 1;
+//        public const int GL_ALL_STATIC_DATA_IBM = 103060;
+//        public const int GL_STATIC_VERTEX_ARRAY_IBM = 103061;
+//        public const int GL_IBM_texture_mirrored_repeat = 1;
+//        public const int GL_MIRRORED_REPEAT_IBM = 0x8370;
+//        public const int GL_IBM_vertex_array_lists = 1;
+//        public const int GL_VERTEX_ARRAY_LIST_IBM = 103070;
+//        public const int GL_NORMAL_ARRAY_LIST_IBM = 103071;
+//        public const int GL_COLOR_ARRAY_LIST_IBM = 103072;
+//        public const int GL_INDEX_ARRAY_LIST_IBM = 103073;
+//        public const int GL_TEXTURE_COORD_ARRAY_LIST_IBM = 103074;
+//        public const int GL_EDGE_FLAG_ARRAY_LIST_IBM = 103075;
+//        public const int GL_FOG_COORDINATE_ARRAY_LIST_IBM = 103076;
+//        public const int GL_SECONDARY_COLOR_ARRAY_LIST_IBM = 103077;
+//        public const int GL_VERTEX_ARRAY_LIST_STRIDE_IBM = 103080;
+//        public const int GL_NORMAL_ARRAY_LIST_STRIDE_IBM = 103081;
+//        public const int GL_COLOR_ARRAY_LIST_STRIDE_IBM = 103082;
+//        public const int GL_INDEX_ARRAY_LIST_STRIDE_IBM = 103083;
+//        public const int GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM = 103084;
+//        public const int GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM = 103085;
+//        public const int GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM = 103086;
+//        public const int GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM = 103087;
+//        public const int GL_INGR_blend_func_separate = 1;
+//        public const int GL_INGR_color_clamp = 1;
+//        public const int GL_RED_MIN_CLAMP_INGR = 0x8560;
+//        public const int GL_GREEN_MIN_CLAMP_INGR = 0x8561;
+//        public const int GL_BLUE_MIN_CLAMP_INGR = 0x8562;
+//        public const int GL_ALPHA_MIN_CLAMP_INGR = 0x8563;
+//        public const int GL_RED_MAX_CLAMP_INGR = 0x8564;
+//        public const int GL_GREEN_MAX_CLAMP_INGR = 0x8565;
+//        public const int GL_BLUE_MAX_CLAMP_INGR = 0x8566;
+//        public const int GL_ALPHA_MAX_CLAMP_INGR = 0x8567;
+//        public const int GL_INGR_interlace_read = 1;
+//        public const int GL_INTERLACE_READ_INGR = 0x8568;
+//        public const int GL_INTEL_blackhole_render = 1;
+//        public const int GL_BLACKHOLE_RENDER_INTEL = 0x83FC;
+//        public const int GL_INTEL_conservative_rasterization = 1;
+//        public const int GL_CONSERVATIVE_RASTERIZATION_INTEL = 0x83FE;
+//        public const int GL_INTEL_fragment_shader_ordering = 1;
+//        public const int GL_INTEL_framebuffer_CMAA = 1;
+//        public const int GL_INTEL_map_texture = 1;
+//        public const int GL_TEXTURE_MEMORY_LAYOUT_INTEL = 0x83FF;
+//        public const int GL_LAYOUT_DEFAULT_INTEL = 0;
+//        public const int GL_LAYOUT_LINEAR_INTEL = 1;
+//        public const int GL_LAYOUT_LINEAR_CPU_CACHED_INTEL = 2;
+//        public const int GL_INTEL_parallel_arrays = 1;
+//        public const int GL_PARALLEL_ARRAYS_INTEL = 0x83F4;
+//        public const int GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F5;
+//        public const int GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F6;
+//        public const int GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F7;
+//        public const int GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F8;
+//        public const int GL_INTEL_performance_query = 1;
+//        public const int GL_PERFQUERY_SINGLE_CONTEXT_INTEL = 0x00000000;
+//        public const int GL_PERFQUERY_GLOBAL_CONTEXT_INTEL = 0x00000001;
+//        public const int GL_PERFQUERY_WAIT_INTEL = 0x83FB;
+//        public const int GL_PERFQUERY_FLUSH_INTEL = 0x83FA;
+//        public const int GL_PERFQUERY_DONOT_FLUSH_INTEL = 0x83F9;
+//        public const int GL_PERFQUERY_COUNTER_EVENT_INTEL = 0x94F0;
+//        public const int GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL = 0x94F1;
+//        public const int GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL = 0x94F2;
+//        public const int GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL = 0x94F3;
+//        public const int GL_PERFQUERY_COUNTER_RAW_INTEL = 0x94F4;
+//        public const int GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL = 0x94F5;
+//        public const int GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL = 0x94F8;
+//        public const int GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL = 0x94F9;
+//        public const int GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL = 0x94FA;
+//        public const int GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL = 0x94FB;
+//        public const int GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL = 0x94FC;
+//        public const int GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL = 0x94FD;
+//        public const int GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL = 0x94FE;
+//        public const int GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL = 0x94FF;
+//        public const int GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL = 0x9500;
+//        public const int GL_MESAX_texture_stack = 1;
+//        public const int GL_TEXTURE_1D_STACK_MESAX = 0x8759;
+//        public const int GL_TEXTURE_2D_STACK_MESAX = 0x875A;
+//        public const int GL_PROXY_TEXTURE_1D_STACK_MESAX = 0x875B;
+//        public const int GL_PROXY_TEXTURE_2D_STACK_MESAX = 0x875C;
+//        public const int GL_TEXTURE_1D_STACK_BINDING_MESAX = 0x875D;
+//        public const int GL_TEXTURE_2D_STACK_BINDING_MESAX = 0x875E;
+//        public const int GL_MESA_pack_invert = 1;
+//        public const int GL_PACK_INVERT_MESA = 0x8758;
+//        public const int GL_MESA_program_binary_formats = 1;
+//        public const int GL_PROGRAM_BINARY_FORMAT_MESA = 0x875F;
+//        public const int GL_MESA_resize_buffers = 1;
+//        public const int GL_MESA_shader_integer_functions = 1;
+//        public const int GL_MESA_tile_raster_order = 1;
+//        public const int GL_TILE_RASTER_ORDER_FIXED_MESA = 0x8BB8;
+//        public const int GL_TILE_RASTER_ORDER_INCREASING_X_MESA = 0x8BB9;
+//        public const int GL_TILE_RASTER_ORDER_INCREASING_Y_MESA = 0x8BBA;
+//        public const int GL_MESA_window_pos = 1;
+//        public const int GL_MESA_ycbcr_texture = 1;
+//        public const int GL_UNSIGNED_SHORT_8_8_MESA = 0x85BA;
+//        public const int GL_UNSIGNED_SHORT_8_8_REV_MESA = 0x85BB;
+//        public const int GL_YCBCR_MESA = 0x8757;
+//        public const int GL_NVX_blend_equation_advanced_multi_draw_buffers = 1;
+//        public const int GL_NVX_conditional_render = 1;
+//        public const int GL_NVX_gpu_memory_info = 1;
+//        public const int GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX = 0x9047;
+//        public const int GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX = 0x9048;
+//        public const int GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX = 0x9049;
+//        public const int GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX = 0x904A;
+//        public const int GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX = 0x904B;
+//        public const int GL_NVX_linked_gpu_multicast = 1;
+//        public const int GL_LGPU_SEPARATE_STORAGE_BIT_NVX = 0x0800;
+//        public const int GL_MAX_LGPU_GPUS_NVX = 0x92BA;
+//        public const int GL_NV_alpha_to_coverage_dither_control = 1;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV = 0x934D;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV = 0x934E;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV = 0x934F;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV = 0x92BF;
+//        public const int GL_NV_bindless_multi_draw_indirect = 1;
+//        public const int GL_NV_bindless_multi_draw_indirect_count = 1;
+//        public const int GL_NV_bindless_texture = 1;
+//        public const int GL_NV_blend_equation_advanced = 1;
+//        public const int GL_BLEND_OVERLAP_NV = 0x9281;
+//        public const int GL_BLEND_PREMULTIPLIED_SRC_NV = 0x9280;
+//        public const int GL_BLUE_NV = 0x1905;
+//        public const int GL_COLORBURN_NV = 0x929A;
+//        public const int GL_COLORDODGE_NV = 0x9299;
+//        public const int GL_CONJOINT_NV = 0x9284;
+//        public const int GL_CONTRAST_NV = 0x92A1;
+//        public const int GL_DARKEN_NV = 0x9297;
+//        public const int GL_DIFFERENCE_NV = 0x929E;
+//        public const int GL_DISJOINT_NV = 0x9283;
+//        public const int GL_DST_ATOP_NV = 0x928F;
+//        public const int GL_DST_IN_NV = 0x928B;
+//        public const int GL_DST_NV = 0x9287;
+//        public const int GL_DST_OUT_NV = 0x928D;
+//        public const int GL_DST_OVER_NV = 0x9289;
+//        public const int GL_EXCLUSION_NV = 0x92A0;
+//        public const int GL_GREEN_NV = 0x1904;
+//        public const int GL_HARDLIGHT_NV = 0x929B;
+//        public const int GL_HARDMIX_NV = 0x92A9;
+//        public const int GL_HSL_COLOR_NV = 0x92AF;
+//        public const int GL_HSL_HUE_NV = 0x92AD;
+//        public const int GL_HSL_LUMINOSITY_NV = 0x92B0;
+//        public const int GL_HSL_SATURATION_NV = 0x92AE;
+//        public const int GL_INVERT_OVG_NV = 0x92B4;
+//        public const int GL_INVERT_RGB_NV = 0x92A3;
+//        public const int GL_LIGHTEN_NV = 0x9298;
+//        public const int GL_LINEARBURN_NV = 0x92A5;
+//        public const int GL_LINEARDODGE_NV = 0x92A4;
+//        public const int GL_LINEARLIGHT_NV = 0x92A7;
+//        public const int GL_MINUS_CLAMPED_NV = 0x92B3;
+//        public const int GL_MINUS_NV = 0x929F;
+//        public const int GL_MULTIPLY_NV = 0x9294;
+//        public const int GL_OVERLAY_NV = 0x9296;
+//        public const int GL_PINLIGHT_NV = 0x92A8;
+//        public const int GL_PLUS_CLAMPED_ALPHA_NV = 0x92B2;
+//        public const int GL_PLUS_CLAMPED_NV = 0x92B1;
+//        public const int GL_PLUS_DARKER_NV = 0x9292;
+//        public const int GL_PLUS_NV = 0x9291;
+//        public const int GL_RED_NV = 0x1903;
+//        public const int GL_SCREEN_NV = 0x9295;
+//        public const int GL_SOFTLIGHT_NV = 0x929C;
+//        public const int GL_SRC_ATOP_NV = 0x928E;
+//        public const int GL_SRC_IN_NV = 0x928A;
+//        public const int GL_SRC_NV = 0x9286;
+//        public const int GL_SRC_OUT_NV = 0x928C;
+//        public const int GL_SRC_OVER_NV = 0x9288;
+//        public const int GL_UNCORRELATED_NV = 0x9282;
+//        public const int GL_VIVIDLIGHT_NV = 0x92A6;
+//        public const int GL_XOR_NV = 0x1506;
+//        public const int GL_NV_blend_equation_advanced_coherent = 1;
+//        public const int GL_BLEND_ADVANCED_COHERENT_NV = 0x9285;
+//        public const int GL_NV_blend_minmax_factor = 1;
+//        public const int GL_NV_blend_square = 1;
+//        public const int GL_NV_clip_space_w_scaling = 1;
+//        public const int GL_VIEWPORT_POSITION_W_SCALE_NV = 0x937C;
+//        public const int GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV = 0x937D;
+//        public const int GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV = 0x937E;
+//        public const int GL_NV_command_list = 1;
+//        public const int GL_TERMINATE_SEQUENCE_COMMAND_NV = 0x0000;
+//        public const int GL_NOP_COMMAND_NV = 0x0001;
+//        public const int GL_DRAW_ELEMENTS_COMMAND_NV = 0x0002;
+//        public const int GL_DRAW_ARRAYS_COMMAND_NV = 0x0003;
+//        public const int GL_DRAW_ELEMENTS_STRIP_COMMAND_NV = 0x0004;
+//        public const int GL_DRAW_ARRAYS_STRIP_COMMAND_NV = 0x0005;
+//        public const int GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV = 0x0006;
+//        public const int GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV = 0x0007;
+//        public const int GL_ELEMENT_ADDRESS_COMMAND_NV = 0x0008;
+//        public const int GL_ATTRIBUTE_ADDRESS_COMMAND_NV = 0x0009;
+//        public const int GL_UNIFORM_ADDRESS_COMMAND_NV = 0x000A;
+//        public const int GL_BLEND_COLOR_COMMAND_NV = 0x000B;
+//        public const int GL_STENCIL_REF_COMMAND_NV = 0x000C;
+//        public const int GL_LINE_WIDTH_COMMAND_NV = 0x000D;
+//        public const int GL_POLYGON_OFFSET_COMMAND_NV = 0x000E;
+//        public const int GL_ALPHA_REF_COMMAND_NV = 0x000F;
+//        public const int GL_VIEWPORT_COMMAND_NV = 0x0010;
+//        public const int GL_SCISSOR_COMMAND_NV = 0x0011;
+//        public const int GL_FRONT_FACE_COMMAND_NV = 0x0012;
+//        public const int GL_NV_compute_program5 = 1;
+//        public const int GL_COMPUTE_PROGRAM_NV = 0x90FB;
+//        public const int GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV = 0x90FC;
+//        public const int GL_NV_conditional_render = 1;
+//        public const int GL_QUERY_WAIT_NV = 0x8E13;
+//        public const int GL_QUERY_NO_WAIT_NV = 0x8E14;
+//        public const int GL_QUERY_BY_REGION_WAIT_NV = 0x8E15;
+//        public const int GL_QUERY_BY_REGION_NO_WAIT_NV = 0x8E16;
+//        public const int GL_NV_conservative_raster = 1;
+//        public const int GL_CONSERVATIVE_RASTERIZATION_NV = 0x9346;
+//        public const int GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV = 0x9347;
+//        public const int GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV = 0x9348;
+//        public const int GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV = 0x9349;
+//        public const int GL_NV_conservative_raster_dilate = 1;
+//        public const int GL_CONSERVATIVE_RASTER_DILATE_NV = 0x9379;
+//        public const int GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV = 0x937A;
+//        public const int GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV = 0x937B;
+//        public const int GL_NV_conservative_raster_pre_snap = 1;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV = 0x9550;
+//        public const int GL_NV_conservative_raster_pre_snap_triangles = 1;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_NV = 0x954D;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV = 0x954E;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV = 0x954F;
+//        public const int GL_NV_conservative_raster_underestimation = 1;
+//        public const int GL_NV_copy_depth_to_color = 1;
+//        public const int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E;
+//        public const int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F;
+//        public const int GL_NV_copy_image = 1;
+//        public const int GL_NV_deep_texture3D = 1;
+//        public const int GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV = 0x90D0;
+//        public const int GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV = 0x90D1;
+//        public const int GL_NV_depth_buffer_float = 1;
+//        public const int GL_DEPTH_COMPONENT32F_NV = 0x8DAB;
+//        public const int GL_DEPTH32F_STENCIL8_NV = 0x8DAC;
+//        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV = 0x8DAD;
+//        public const int GL_DEPTH_BUFFER_FLOAT_MODE_NV = 0x8DAF;
+//        public const int GL_NV_depth_clamp = 1;
+//        public const int GL_DEPTH_CLAMP_NV = 0x864F;
+//        public const int GL_NV_draw_texture = 1;
+//        public const int GL_NV_draw_vulkan_image = 1;
+//        public const int GL_NV_evaluators = 1;
+//        public const int GL_EVAL_2D_NV = 0x86C0;
+//        public const int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1;
+//        public const int GL_MAP_TESSELLATION_NV = 0x86C2;
+//        public const int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3;
+//        public const int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4;
+//        public const int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5;
+//        public const int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6;
+//        public const int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7;
+//        public const int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8;
+//        public const int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9;
+//        public const int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA;
+//        public const int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB;
+//        public const int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC;
+//        public const int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD;
+//        public const int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE;
+//        public const int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF;
+//        public const int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0;
+//        public const int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1;
+//        public const int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2;
+//        public const int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3;
+//        public const int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4;
+//        public const int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5;
+//        public const int GL_MAX_MAP_TESSELLATION_NV = 0x86D6;
+//        public const int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7;
+//        public const int GL_NV_explicit_multisample = 1;
+//        public const int GL_SAMPLE_POSITION_NV = 0x8E50;
+//        public const int GL_SAMPLE_MASK_NV = 0x8E51;
+//        public const int GL_SAMPLE_MASK_VALUE_NV = 0x8E52;
+//        public const int GL_TEXTURE_BINDING_RENDERBUFFER_NV = 0x8E53;
+//        public const int GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV = 0x8E54;
+//        public const int GL_TEXTURE_RENDERBUFFER_NV = 0x8E55;
+//        public const int GL_SAMPLER_RENDERBUFFER_NV = 0x8E56;
+//        public const int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
+//        public const int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
+//        public const int GL_MAX_SAMPLE_MASK_WORDS_NV = 0x8E59;
+//        public const int GL_NV_fence = 1;
+//        public const int GL_ALL_COMPLETED_NV = 0x84F2;
+//        public const int GL_FENCE_STATUS_NV = 0x84F3;
+//        public const int GL_FENCE_CONDITION_NV = 0x84F4;
+//        public const int GL_NV_fill_rectangle = 1;
+//        public const int GL_FILL_RECTANGLE_NV = 0x933C;
+//        public const int GL_NV_float_buffer = 1;
+//        public const int GL_FLOAT_R_NV = 0x8880;
+//        public const int GL_FLOAT_RG_NV = 0x8881;
+//        public const int GL_FLOAT_RGB_NV = 0x8882;
+//        public const int GL_FLOAT_RGBA_NV = 0x8883;
+//        public const int GL_FLOAT_R16_NV = 0x8884;
+//        public const int GL_FLOAT_R32_NV = 0x8885;
+//        public const int GL_FLOAT_RG16_NV = 0x8886;
+//        public const int GL_FLOAT_RG32_NV = 0x8887;
+//        public const int GL_FLOAT_RGB16_NV = 0x8888;
+//        public const int GL_FLOAT_RGB32_NV = 0x8889;
+//        public const int GL_FLOAT_RGBA16_NV = 0x888A;
+//        public const int GL_FLOAT_RGBA32_NV = 0x888B;
+//        public const int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C;
+//        public const int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D;
+//        public const int GL_FLOAT_RGBA_MODE_NV = 0x888E;
+//        public const int GL_NV_fog_distance = 1;
+//        public const int GL_FOG_DISTANCE_MODE_NV = 0x855A;
+//        public const int GL_EYE_RADIAL_NV = 0x855B;
+//        public const int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C;
+//        public const int GL_NV_fragment_coverage_to_color = 1;
+//        public const int GL_FRAGMENT_COVERAGE_TO_COLOR_NV = 0x92DD;
+//        public const int GL_FRAGMENT_COVERAGE_COLOR_NV = 0x92DE;
+//        public const int GL_NV_fragment_program = 1;
+//        public const int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868;
+//        public const int GL_FRAGMENT_PROGRAM_NV = 0x8870;
+//        public const int GL_MAX_TEXTURE_COORDS_NV = 0x8871;
+//        public const int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872;
+//        public const int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873;
+//        public const int GL_PROGRAM_ERROR_STRING_NV = 0x8874;
+//        public const int GL_NV_fragment_program2 = 1;
+//        public const int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4;
+//        public const int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5;
+//        public const int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88F6;
+//        public const int GL_MAX_PROGRAM_LOOP_DEPTH_NV = 0x88F7;
+//        public const int GL_MAX_PROGRAM_LOOP_COUNT_NV = 0x88F8;
+//        public const int GL_NV_fragment_program4 = 1;
+//        public const int GL_NV_fragment_program_option = 1;
+//        public const int GL_NV_fragment_shader_interlock = 1;
+//        public const int GL_NV_framebuffer_mixed_samples = 1;
+//        public const int GL_COVERAGE_MODULATION_TABLE_NV = 0x9331;
+//        public const int GL_COLOR_SAMPLES_NV = 0x8E20;
+//        public const int GL_DEPTH_SAMPLES_NV = 0x932D;
+//        public const int GL_STENCIL_SAMPLES_NV = 0x932E;
+//        public const int GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV = 0x932F;
+//        public const int GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV = 0x9330;
+//        public const int GL_COVERAGE_MODULATION_NV = 0x9332;
+//        public const int GL_COVERAGE_MODULATION_TABLE_SIZE_NV = 0x9333;
+//        public const int GL_NV_framebuffer_multisample_coverage = 1;
+//        public const int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = 0x8CAB;
+//        public const int GL_RENDERBUFFER_COLOR_SAMPLES_NV = 0x8E10;
+//        public const int GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E11;
+//        public const int GL_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E12;
+//        public const int GL_NV_geometry_program4 = 1;
+//        public const int GL_GEOMETRY_PROGRAM_NV = 0x8C26;
+//        public const int GL_MAX_PROGRAM_OUTPUT_VERTICES_NV = 0x8C27;
+//        public const int GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV = 0x8C28;
+//        public const int GL_NV_geometry_shader4 = 1;
+//        public const int GL_NV_geometry_shader_passthrough = 1;
+//        public const int GL_NV_gpu_multicast = 1;
+//        public const int GL_PER_GPU_STORAGE_BIT_NV = 0x0800;
+//        public const int GL_MULTICAST_GPUS_NV = 0x92BA;
+//        public const int GL_RENDER_GPU_MASK_NV = 0x9558;
+//        public const int GL_PER_GPU_STORAGE_NV = 0x9548;
+//        public const int GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9549;
+//        public const int GL_NV_gpu_program4 = 1;
+//        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_NV = 0x8904;
+//        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_NV = 0x8905;
+//        public const int GL_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8906;
+//        public const int GL_PROGRAM_RESULT_COMPONENTS_NV = 0x8907;
+//        public const int GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8908;
+//        public const int GL_MAX_PROGRAM_RESULT_COMPONENTS_NV = 0x8909;
+//        public const int GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV = 0x8DA5;
+//        public const int GL_MAX_PROGRAM_GENERIC_RESULTS_NV = 0x8DA6;
+//        public const int GL_NV_gpu_program5 = 1;
+//        public const int GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV = 0x8E5A;
+//        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5B;
+//        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5C;
+//        public const int GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV = 0x8E5D;
+//        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5E;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5F;
+//        public const int GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV = 0x8F44;
+//        public const int GL_MAX_PROGRAM_SUBROUTINE_NUM_NV = 0x8F45;
+//        public const int GL_NV_gpu_program5_mem_extended = 1;
+//        public const int GL_NV_gpu_shader5 = 1;
+//        public const int GL_NV_half_float = 1;
+//        public const int GL_HALF_FLOAT_NV = 0x140B;
+//        public const int GL_NV_internalformat_sample_query = 1;
+//        public const int GL_MULTISAMPLES_NV = 0x9371;
+//        public const int GL_SUPERSAMPLE_SCALE_X_NV = 0x9372;
+//        public const int GL_SUPERSAMPLE_SCALE_Y_NV = 0x9373;
+//        public const int GL_CONFORMANT_NV = 0x9374;
+//        public const int GL_NV_light_max_exponent = 1;
+//        public const int GL_MAX_SHININESS_NV = 0x8504;
+//        public const int GL_MAX_SPOT_EXPONENT_NV = 0x8505;
+//        public const int GL_NV_multisample_coverage = 1;
+//        public const int GL_NV_multisample_filter_hint = 1;
+//        public const int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534;
+//        public const int GL_NV_occlusion_query = 1;
+//        public const int GL_PIXEL_COUNTER_BITS_NV = 0x8864;
+//        public const int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865;
+//        public const int GL_PIXEL_COUNT_NV = 0x8866;
+//        public const int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867;
+//        public const int GL_NV_packed_depth_stencil = 1;
+//        public const int GL_DEPTH_STENCIL_NV = 0x84F9;
+//        public const int GL_UNSIGNED_INT_24_8_NV = 0x84FA;
+//        public const int GL_NV_parameter_buffer_object = 1;
+//        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV = 0x8DA0;
+//        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV = 0x8DA1;
+//        public const int GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA2;
+//        public const int GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA3;
+//        public const int GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA4;
+//        public const int GL_NV_parameter_buffer_object2 = 1;
+//        public const int GL_NV_path_rendering = 1;
+//        public const int GL_PATH_FORMAT_SVG_NV = 0x9070;
+//        public const int GL_PATH_FORMAT_PS_NV = 0x9071;
+//        public const int GL_STANDARD_FONT_NAME_NV = 0x9072;
+//        public const int GL_SYSTEM_FONT_NAME_NV = 0x9073;
+//        public const int GL_FILE_NAME_NV = 0x9074;
+//        public const int GL_PATH_STROKE_WIDTH_NV = 0x9075;
+//        public const int GL_PATH_END_CAPS_NV = 0x9076;
+//        public const int GL_PATH_INITIAL_END_CAP_NV = 0x9077;
+//        public const int GL_PATH_TERMINAL_END_CAP_NV = 0x9078;
+//        public const int GL_PATH_JOIN_STYLE_NV = 0x9079;
+//        public const int GL_PATH_MITER_LIMIT_NV = 0x907A;
+//        public const int GL_PATH_DASH_CAPS_NV = 0x907B;
+//        public const int GL_PATH_INITIAL_DASH_CAP_NV = 0x907C;
+//        public const int GL_PATH_TERMINAL_DASH_CAP_NV = 0x907D;
+//        public const int GL_PATH_DASH_OFFSET_NV = 0x907E;
+//        public const int GL_PATH_CLIENT_LENGTH_NV = 0x907F;
+//        public const int GL_PATH_FILL_MODE_NV = 0x9080;
+//        public const int GL_PATH_FILL_MASK_NV = 0x9081;
+//        public const int GL_PATH_FILL_COVER_MODE_NV = 0x9082;
+//        public const int GL_PATH_STROKE_COVER_MODE_NV = 0x9083;
+//        public const int GL_PATH_STROKE_MASK_NV = 0x9084;
+//        public const int GL_COUNT_UP_NV = 0x9088;
+//        public const int GL_COUNT_DOWN_NV = 0x9089;
+//        public const int GL_PATH_OBJECT_BOUNDING_BOX_NV = 0x908A;
+//        public const int GL_CONVEX_HULL_NV = 0x908B;
+//        public const int GL_BOUNDING_BOX_NV = 0x908D;
+//        public const int GL_TRANSLATE_X_NV = 0x908E;
+//        public const int GL_TRANSLATE_Y_NV = 0x908F;
+//        public const int GL_TRANSLATE_2D_NV = 0x9090;
+//        public const int GL_TRANSLATE_3D_NV = 0x9091;
+//        public const int GL_AFFINE_2D_NV = 0x9092;
+//        public const int GL_AFFINE_3D_NV = 0x9094;
+//        public const int GL_TRANSPOSE_AFFINE_2D_NV = 0x9096;
+//        public const int GL_TRANSPOSE_AFFINE_3D_NV = 0x9098;
+//        public const int GL_UTF8_NV = 0x909A;
+//        public const int GL_UTF16_NV = 0x909B;
+//        public const int GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = 0x909C;
+//        public const int GL_PATH_COMMAND_COUNT_NV = 0x909D;
+//        public const int GL_PATH_COORD_COUNT_NV = 0x909E;
+//        public const int GL_PATH_DASH_ARRAY_COUNT_NV = 0x909F;
+//        public const int GL_PATH_COMPUTED_LENGTH_NV = 0x90A0;
+//        public const int GL_PATH_FILL_BOUNDING_BOX_NV = 0x90A1;
+//        public const int GL_PATH_STROKE_BOUNDING_BOX_NV = 0x90A2;
+//        public const int GL_SQUARE_NV = 0x90A3;
+//        public const int GL_ROUND_NV = 0x90A4;
+//        public const int GL_TRIANGULAR_NV = 0x90A5;
+//        public const int GL_BEVEL_NV = 0x90A6;
+//        public const int GL_MITER_REVERT_NV = 0x90A7;
+//        public const int GL_MITER_TRUNCATE_NV = 0x90A8;
+//        public const int GL_SKIP_MISSING_GLYPH_NV = 0x90A9;
+//        public const int GL_USE_MISSING_GLYPH_NV = 0x90AA;
+//        public const int GL_PATH_ERROR_POSITION_NV = 0x90AB;
+//        public const int GL_ACCUM_ADJACENT_PAIRS_NV = 0x90AD;
+//        public const int GL_ADJACENT_PAIRS_NV = 0x90AE;
+//        public const int GL_FIRST_TO_REST_NV = 0x90AF;
+//        public const int GL_PATH_GEN_MODE_NV = 0x90B0;
+//        public const int GL_PATH_GEN_COEFF_NV = 0x90B1;
+//        public const int GL_PATH_GEN_COMPONENTS_NV = 0x90B3;
+//        public const int GL_PATH_STENCIL_FUNC_NV = 0x90B7;
+//        public const int GL_PATH_STENCIL_REF_NV = 0x90B8;
+//        public const int GL_PATH_STENCIL_VALUE_MASK_NV = 0x90B9;
+//        public const int GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV = 0x90BD;
+//        public const int GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV = 0x90BE;
+//        public const int GL_PATH_COVER_DEPTH_FUNC_NV = 0x90BF;
+//        public const int GL_PATH_DASH_OFFSET_RESET_NV = 0x90B4;
+//        public const int GL_MOVE_TO_RESETS_NV = 0x90B5;
+//        public const int GL_MOVE_TO_CONTINUES_NV = 0x90B6;
+//        public const int GL_CLOSE_PATH_NV = 0x00;
+//        public const int GL_MOVE_TO_NV = 0x02;
+//        public const int GL_RELATIVE_MOVE_TO_NV = 0x03;
+//        public const int GL_LINE_TO_NV = 0x04;
+//        public const int GL_RELATIVE_LINE_TO_NV = 0x05;
+//        public const int GL_HORIZONTAL_LINE_TO_NV = 0x06;
+//        public const int GL_RELATIVE_HORIZONTAL_LINE_TO_NV = 0x07;
+//        public const int GL_VERTICAL_LINE_TO_NV = 0x08;
+//        public const int GL_RELATIVE_VERTICAL_LINE_TO_NV = 0x09;
+//        public const int GL_QUADRATIC_CURVE_TO_NV = 0x0A;
+//        public const int GL_RELATIVE_QUADRATIC_CURVE_TO_NV = 0x0B;
+//        public const int GL_CUBIC_CURVE_TO_NV = 0x0C;
+//        public const int GL_RELATIVE_CUBIC_CURVE_TO_NV = 0x0D;
+//        public const int GL_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0E;
+//        public const int GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0F;
+//        public const int GL_SMOOTH_CUBIC_CURVE_TO_NV = 0x10;
+//        public const int GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV = 0x11;
+//        public const int GL_SMALL_CCW_ARC_TO_NV = 0x12;
+//        public const int GL_RELATIVE_SMALL_CCW_ARC_TO_NV = 0x13;
+//        public const int GL_SMALL_CW_ARC_TO_NV = 0x14;
+//        public const int GL_RELATIVE_SMALL_CW_ARC_TO_NV = 0x15;
+//        public const int GL_LARGE_CCW_ARC_TO_NV = 0x16;
+//        public const int GL_RELATIVE_LARGE_CCW_ARC_TO_NV = 0x17;
+//        public const int GL_LARGE_CW_ARC_TO_NV = 0x18;
+//        public const int GL_RELATIVE_LARGE_CW_ARC_TO_NV = 0x19;
+//        public const int GL_RESTART_PATH_NV = 0xF0;
+//        public const int GL_DUP_FIRST_CUBIC_CURVE_TO_NV = 0xF2;
+//        public const int GL_DUP_LAST_CUBIC_CURVE_TO_NV = 0xF4;
+//        public const int GL_RECT_NV = 0xF6;
+//        public const int GL_CIRCULAR_CCW_ARC_TO_NV = 0xF8;
+//        public const int GL_CIRCULAR_CW_ARC_TO_NV = 0xFA;
+//        public const int GL_CIRCULAR_TANGENT_ARC_TO_NV = 0xFC;
+//        public const int GL_ARC_TO_NV = 0xFE;
+//        public const int GL_RELATIVE_ARC_TO_NV = 0xFF;
+//        public const int GL_BOLD_BIT_NV = 0x01;
+//        public const int GL_ITALIC_BIT_NV = 0x02;
+//        public const int GL_GLYPH_WIDTH_BIT_NV = 0x01;
+//        public const int GL_GLYPH_HEIGHT_BIT_NV = 0x02;
+//        public const int GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = 0x04;
+//        public const int GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = 0x08;
+//        public const int GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = 0x10;
+//        public const int GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = 0x20;
+//        public const int GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = 0x40;
+//        public const int GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = 0x80;
+//        public const int GL_GLYPH_HAS_KERNING_BIT_NV = 0x100;
+//        public const int GL_FONT_X_MIN_BOUNDS_BIT_NV = 0x00010000;
+//        public const int GL_FONT_Y_MIN_BOUNDS_BIT_NV = 0x00020000;
+//        public const int GL_FONT_X_MAX_BOUNDS_BIT_NV = 0x00040000;
+//        public const int GL_FONT_Y_MAX_BOUNDS_BIT_NV = 0x00080000;
+//        public const int GL_FONT_UNITS_PER_EM_BIT_NV = 0x00100000;
+//        public const int GL_FONT_ASCENDER_BIT_NV = 0x00200000;
+//        public const int GL_FONT_DESCENDER_BIT_NV = 0x00400000;
+//        public const int GL_FONT_HEIGHT_BIT_NV = 0x00800000;
+//        public const int GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = 0x01000000;
+//        public const int GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = 0x02000000;
+//        public const int GL_FONT_UNDERLINE_POSITION_BIT_NV = 0x04000000;
+//        public const int GL_FONT_UNDERLINE_THICKNESS_BIT_NV = 0x08000000;
+//        public const int GL_FONT_HAS_KERNING_BIT_NV = 0x10000000;
+//        public const int GL_ROUNDED_RECT_NV = 0xE8;
+//        public const int GL_RELATIVE_ROUNDED_RECT_NV = 0xE9;
+//        public const int GL_ROUNDED_RECT2_NV = 0xEA;
+//        public const int GL_RELATIVE_ROUNDED_RECT2_NV = 0xEB;
+//        public const int GL_ROUNDED_RECT4_NV = 0xEC;
+//        public const int GL_RELATIVE_ROUNDED_RECT4_NV = 0xED;
+//        public const int GL_ROUNDED_RECT8_NV = 0xEE;
+//        public const int GL_RELATIVE_ROUNDED_RECT8_NV = 0xEF;
+//        public const int GL_RELATIVE_RECT_NV = 0xF7;
+//        public const int GL_FONT_GLYPHS_AVAILABLE_NV = 0x9368;
+//        public const int GL_FONT_TARGET_UNAVAILABLE_NV = 0x9369;
+//        public const int GL_FONT_UNAVAILABLE_NV = 0x936A;
+//        public const int GL_FONT_UNINTELLIGIBLE_NV = 0x936B;
+//        public const int GL_CONIC_CURVE_TO_NV = 0x1A;
+//        public const int GL_RELATIVE_CONIC_CURVE_TO_NV = 0x1B;
+//        public const int GL_FONT_NUM_GLYPH_INDICES_BIT_NV = 0x20000000;
+//        public const int GL_STANDARD_FONT_FORMAT_NV = 0x936C;
+//        public const int GL_2_BYTES_NV = 0x1407;
+//        public const int GL_3_BYTES_NV = 0x1408;
+//        public const int GL_4_BYTES_NV = 0x1409;
+//        public const int GL_EYE_LINEAR_NV = 0x2400;
+//        public const int GL_OBJECT_LINEAR_NV = 0x2401;
+//        public const int GL_CONSTANT_NV = 0x8576;
+//        public const int GL_PATH_FOG_GEN_MODE_NV = 0x90AC;
+//        public const int GL_PRIMARY_COLOR_NV = 0x852C;
+//        public const int GL_SECONDARY_COLOR_NV = 0x852D;
+//        public const int GL_PATH_GEN_COLOR_FORMAT_NV = 0x90B2;
+//        public const int GL_PATH_PROJECTION_NV = 0x1701;
+//        public const int GL_PATH_MODELVIEW_NV = 0x1700;
+//        public const int GL_PATH_MODELVIEW_STACK_DEPTH_NV = 0x0BA3;
+//        public const int GL_PATH_MODELVIEW_MATRIX_NV = 0x0BA6;
+//        public const int GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV = 0x0D36;
+//        public const int GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV = 0x84E3;
+//        public const int GL_PATH_PROJECTION_STACK_DEPTH_NV = 0x0BA4;
+//        public const int GL_PATH_PROJECTION_MATRIX_NV = 0x0BA7;
+//        public const int GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV = 0x0D38;
+//        public const int GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV = 0x84E4;
+//        public const int GL_FRAGMENT_INPUT_NV = 0x936D;
+//        public const int GL_NV_path_rendering_shared_edge = 1;
+//        public const int GL_SHARED_EDGE_NV = 0xC0;
+//        public const int GL_NV_pixel_data_range = 1;
+//        public const int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878;
+//        public const int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879;
+//        public const int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A;
+//        public const int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B;
+//        public const int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C;
+//        public const int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D;
+//        public const int GL_NV_point_sprite = 1;
+//        public const int GL_POINT_SPRITE_NV = 0x8861;
+//        public const int GL_COORD_REPLACE_NV = 0x8862;
+//        public const int GL_POINT_SPRITE_R_MODE_NV = 0x8863;
+//        public const int GL_NV_present_video = 1;
+//        public const int GL_FRAME_NV = 0x8E26;
+//        public const int GL_FIELDS_NV = 0x8E27;
+//        public const int GL_CURRENT_TIME_NV = 0x8E28;
+//        public const int GL_NUM_FILL_STREAMS_NV = 0x8E29;
+//        public const int GL_PRESENT_TIME_NV = 0x8E2A;
+//        public const int GL_PRESENT_DURATION_NV = 0x8E2B;
+//        public const int GL_NV_primitive_restart = 1;
+//        public const int GL_PRIMITIVE_RESTART_NV = 0x8558;
+//        public const int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559;
+//        public const int GL_NV_query_resource = 1;
+//        public const int GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV = 0x9540;
+//        public const int GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV = 0x9542;
+//        public const int GL_QUERY_RESOURCE_SYS_RESERVED_NV = 0x9544;
+//        public const int GL_QUERY_RESOURCE_TEXTURE_NV = 0x9545;
+//        public const int GL_QUERY_RESOURCE_RENDERBUFFER_NV = 0x9546;
+//        public const int GL_QUERY_RESOURCE_BUFFEROBJECT_NV = 0x9547;
+//        public const int GL_NV_query_resource_tag = 1;
+//        public const int GL_NV_register_combiners = 1;
+//        public const int GL_REGISTER_COMBINERS_NV = 0x8522;
+//        public const int GL_VARIABLE_A_NV = 0x8523;
+//        public const int GL_VARIABLE_B_NV = 0x8524;
+//        public const int GL_VARIABLE_C_NV = 0x8525;
+//        public const int GL_VARIABLE_D_NV = 0x8526;
+//        public const int GL_VARIABLE_E_NV = 0x8527;
+//        public const int GL_VARIABLE_F_NV = 0x8528;
+//        public const int GL_VARIABLE_G_NV = 0x8529;
+//        public const int GL_CONSTANT_COLOR0_NV = 0x852A;
+//        public const int GL_CONSTANT_COLOR1_NV = 0x852B;
+//        public const int GL_SPARE0_NV = 0x852E;
+//        public const int GL_SPARE1_NV = 0x852F;
+//        public const int GL_DISCARD_NV = 0x8530;
+//        public const int GL_E_TIMES_F_NV = 0x8531;
+//        public const int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532;
+//        public const int GL_UNSIGNED_IDENTITY_NV = 0x8536;
+//        public const int GL_UNSIGNED_INVERT_NV = 0x8537;
+//        public const int GL_EXPAND_NORMAL_NV = 0x8538;
+//        public const int GL_EXPAND_NEGATE_NV = 0x8539;
+//        public const int GL_HALF_BIAS_NORMAL_NV = 0x853A;
+//        public const int GL_HALF_BIAS_NEGATE_NV = 0x853B;
+//        public const int GL_SIGNED_IDENTITY_NV = 0x853C;
+//        public const int GL_SIGNED_NEGATE_NV = 0x853D;
+//        public const int GL_SCALE_BY_TWO_NV = 0x853E;
+//        public const int GL_SCALE_BY_FOUR_NV = 0x853F;
+//        public const int GL_SCALE_BY_ONE_HALF_NV = 0x8540;
+//        public const int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541;
+//        public const int GL_COMBINER_INPUT_NV = 0x8542;
+//        public const int GL_COMBINER_MAPPING_NV = 0x8543;
+//        public const int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544;
+//        public const int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545;
+//        public const int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546;
+//        public const int GL_COMBINER_MUX_SUM_NV = 0x8547;
+//        public const int GL_COMBINER_SCALE_NV = 0x8548;
+//        public const int GL_COMBINER_BIAS_NV = 0x8549;
+//        public const int GL_COMBINER_AB_OUTPUT_NV = 0x854A;
+//        public const int GL_COMBINER_CD_OUTPUT_NV = 0x854B;
+//        public const int GL_COMBINER_SUM_OUTPUT_NV = 0x854C;
+//        public const int GL_MAX_GENERAL_COMBINERS_NV = 0x854D;
+//        public const int GL_NUM_GENERAL_COMBINERS_NV = 0x854E;
+//        public const int GL_COLOR_SUM_CLAMP_NV = 0x854F;
+//        public const int GL_COMBINER0_NV = 0x8550;
+//        public const int GL_COMBINER1_NV = 0x8551;
+//        public const int GL_COMBINER2_NV = 0x8552;
+//        public const int GL_COMBINER3_NV = 0x8553;
+//        public const int GL_COMBINER4_NV = 0x8554;
+//        public const int GL_COMBINER5_NV = 0x8555;
+//        public const int GL_COMBINER6_NV = 0x8556;
+//        public const int GL_COMBINER7_NV = 0x8557;
+//        public const int GL_NV_register_combiners2 = 1;
+//        public const int GL_PER_STAGE_CONSTANTS_NV = 0x8535;
+//        public const int GL_NV_robustness_video_memory_purge = 1;
+//        public const int GL_PURGED_CONTEXT_RESET_NV = 0x92BB;
+//        public const int GL_NV_sample_locations = 1;
+//        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV = 0x933D;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV = 0x933E;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV = 0x933F;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV = 0x9340;
+//        public const int GL_SAMPLE_LOCATION_NV = 0x8E50;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9341;
+//        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV = 0x9342;
+//        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV = 0x9343;
+//        public const int GL_NV_sample_mask_override_coverage = 1;
+//        public const int GL_NV_shader_atomic_counters = 1;
+//        public const int GL_NV_shader_atomic_float = 1;
+//        public const int GL_NV_shader_atomic_float64 = 1;
+//        public const int GL_NV_shader_atomic_fp16_vector = 1;
+//        public const int GL_NV_shader_atomic_int64 = 1;
+//        public const int GL_NV_shader_buffer_load = 1;
+//        public const int GL_BUFFER_GPU_ADDRESS_NV = 0x8F1D;
+//        public const int GL_GPU_ADDRESS_NV = 0x8F34;
+//        public const int GL_MAX_SHADER_BUFFER_ADDRESS_NV = 0x8F35;
+//        public const int GL_NV_shader_buffer_store = 1;
+//        public const int GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV = 0x00000010;
+//        public const int GL_NV_shader_storage_buffer_object = 1;
+//        public const int GL_NV_shader_thread_group = 1;
+//        public const int GL_WARP_SIZE_NV = 0x9339;
+//        public const int GL_WARPS_PER_SM_NV = 0x933A;
+//        public const int GL_SM_COUNT_NV = 0x933B;
+//        public const int GL_NV_shader_thread_shuffle = 1;
+//        public const int GL_NV_stereo_view_rendering = 1;
+//        public const int GL_NV_tessellation_program5 = 1;
+//        public const int GL_MAX_PROGRAM_PATCH_ATTRIBS_NV = 0x86D8;
+//        public const int GL_TESS_CONTROL_PROGRAM_NV = 0x891E;
+//        public const int GL_TESS_EVALUATION_PROGRAM_NV = 0x891F;
+//        public const int GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV = 0x8C74;
+//        public const int GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV = 0x8C75;
+//        public const int GL_NV_texgen_emboss = 1;
+//        public const int GL_EMBOSS_LIGHT_NV = 0x855D;
+//        public const int GL_EMBOSS_CONSTANT_NV = 0x855E;
+//        public const int GL_EMBOSS_MAP_NV = 0x855F;
+//        public const int GL_NV_texgen_reflection = 1;
+//        public const int GL_NORMAL_MAP_NV = 0x8511;
+//        public const int GL_REFLECTION_MAP_NV = 0x8512;
+//        public const int GL_NV_texture_barrier = 1;
+//        public const int GL_NV_texture_compression_vtc = 1;
+//        public const int GL_NV_texture_env_combine4 = 1;
+//        public const int GL_COMBINE4_NV = 0x8503;
+//        public const int GL_SOURCE3_RGB_NV = 0x8583;
+//        public const int GL_SOURCE3_ALPHA_NV = 0x858B;
+//        public const int GL_OPERAND3_RGB_NV = 0x8593;
+//        public const int GL_OPERAND3_ALPHA_NV = 0x859B;
+//        public const int GL_NV_texture_expand_normal = 1;
+//        public const int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888F;
+//        public const int GL_NV_texture_multisample = 1;
+//        public const int GL_TEXTURE_COVERAGE_SAMPLES_NV = 0x9045;
+//        public const int GL_TEXTURE_COLOR_SAMPLES_NV = 0x9046;
+//        public const int GL_NV_texture_rectangle = 1;
+//        public const int GL_TEXTURE_RECTANGLE_NV = 0x84F5;
+//        public const int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6;
+//        public const int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7;
+//        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8;
+//        public const int GL_NV_texture_rectangle_compressed = 1;
+//        public const int GL_NV_texture_shader = 1;
+//        public const int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C;
+//        public const int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D;
+//        public const int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E;
+//        public const int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9;
+//        public const int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA;
+//        public const int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB;
+//        public const int GL_DSDT_MAG_INTENSITY_NV = 0x86DC;
+//        public const int GL_SHADER_CONSISTENT_NV = 0x86DD;
+//        public const int GL_TEXTURE_SHADER_NV = 0x86DE;
+//        public const int GL_SHADER_OPERATION_NV = 0x86DF;
+//        public const int GL_CULL_MODES_NV = 0x86E0;
+//        public const int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1;
+//        public const int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2;
+//        public const int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3;
+//        public const int GL_OFFSET_TEXTURE_2D_MATRIX_NV = 0x86E1;
+//        public const int GL_OFFSET_TEXTURE_2D_SCALE_NV = 0x86E2;
+//        public const int GL_OFFSET_TEXTURE_2D_BIAS_NV = 0x86E3;
+//        public const int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4;
+//        public const int GL_CONST_EYE_NV = 0x86E5;
+//        public const int GL_PASS_THROUGH_NV = 0x86E6;
+//        public const int GL_CULL_FRAGMENT_NV = 0x86E7;
+//        public const int GL_OFFSET_TEXTURE_2D_NV = 0x86E8;
+//        public const int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9;
+//        public const int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA;
+//        public const int GL_DOT_PRODUCT_NV = 0x86EC;
+//        public const int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED;
+//        public const int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE;
+//        public const int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0;
+//        public const int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1;
+//        public const int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2;
+//        public const int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3;
+//        public const int GL_HILO_NV = 0x86F4;
+//        public const int GL_DSDT_NV = 0x86F5;
+//        public const int GL_DSDT_MAG_NV = 0x86F6;
+//        public const int GL_DSDT_MAG_VIB_NV = 0x86F7;
+//        public const int GL_HILO16_NV = 0x86F8;
+//        public const int GL_SIGNED_HILO_NV = 0x86F9;
+//        public const int GL_SIGNED_HILO16_NV = 0x86FA;
+//        public const int GL_SIGNED_RGBA_NV = 0x86FB;
+//        public const int GL_SIGNED_RGBA8_NV = 0x86FC;
+//        public const int GL_SIGNED_RGB_NV = 0x86FE;
+//        public const int GL_SIGNED_RGB8_NV = 0x86FF;
+//        public const int GL_SIGNED_LUMINANCE_NV = 0x8701;
+//        public const int GL_SIGNED_LUMINANCE8_NV = 0x8702;
+//        public const int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703;
+//        public const int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704;
+//        public const int GL_SIGNED_ALPHA_NV = 0x8705;
+//        public const int GL_SIGNED_ALPHA8_NV = 0x8706;
+//        public const int GL_SIGNED_INTENSITY_NV = 0x8707;
+//        public const int GL_SIGNED_INTENSITY8_NV = 0x8708;
+//        public const int GL_DSDT8_NV = 0x8709;
+//        public const int GL_DSDT8_MAG8_NV = 0x870A;
+//        public const int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B;
+//        public const int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C;
+//        public const int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D;
+//        public const int GL_HI_SCALE_NV = 0x870E;
+//        public const int GL_LO_SCALE_NV = 0x870F;
+//        public const int GL_DS_SCALE_NV = 0x8710;
+//        public const int GL_DT_SCALE_NV = 0x8711;
+//        public const int GL_MAGNITUDE_SCALE_NV = 0x8712;
+//        public const int GL_VIBRANCE_SCALE_NV = 0x8713;
+//        public const int GL_HI_BIAS_NV = 0x8714;
+//        public const int GL_LO_BIAS_NV = 0x8715;
+//        public const int GL_DS_BIAS_NV = 0x8716;
+//        public const int GL_DT_BIAS_NV = 0x8717;
+//        public const int GL_MAGNITUDE_BIAS_NV = 0x8718;
+//        public const int GL_VIBRANCE_BIAS_NV = 0x8719;
+//        public const int GL_TEXTURE_BORDER_VALUES_NV = 0x871A;
+//        public const int GL_TEXTURE_HI_SIZE_NV = 0x871B;
+//        public const int GL_TEXTURE_LO_SIZE_NV = 0x871C;
+//        public const int GL_TEXTURE_DS_SIZE_NV = 0x871D;
+//        public const int GL_TEXTURE_DT_SIZE_NV = 0x871E;
+//        public const int GL_TEXTURE_MAG_SIZE_NV = 0x871F;
+//        public const int GL_NV_texture_shader2 = 1;
+//        public const int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF;
+//        public const int GL_NV_texture_shader3 = 1;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853;
+//        public const int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854;
+//        public const int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855;
+//        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856;
+//        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857;
+//        public const int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858;
+//        public const int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859;
+//        public const int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A;
+//        public const int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B;
+//        public const int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C;
+//        public const int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D;
+//        public const int GL_HILO8_NV = 0x885E;
+//        public const int GL_SIGNED_HILO8_NV = 0x885F;
+//        public const int GL_FORCE_BLUE_TO_ONE_NV = 0x8860;
+//        public const int GL_NV_transform_feedback = 1;
+//        public const int GL_BACK_PRIMARY_COLOR_NV = 0x8C77;
+//        public const int GL_BACK_SECONDARY_COLOR_NV = 0x8C78;
+//        public const int GL_TEXTURE_COORD_NV = 0x8C79;
+//        public const int GL_CLIP_DISTANCE_NV = 0x8C7A;
+//        public const int GL_VERTEX_ID_NV = 0x8C7B;
+//        public const int GL_PRIMITIVE_ID_NV = 0x8C7C;
+//        public const int GL_GENERIC_ATTRIB_NV = 0x8C7D;
+//        public const int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80;
+//        public const int GL_ACTIVE_VARYINGS_NV = 0x8C81;
+//        public const int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85;
+//        public const int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8C86;
+//        public const int GL_PRIMITIVES_GENERATED_NV = 0x8C87;
+//        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8C88;
+//        public const int GL_RASTERIZER_DISCARD_NV = 0x8C89;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B;
+//        public const int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C;
+//        public const int GL_SEPARATE_ATTRIBS_NV = 0x8C8D;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F;
+//        public const int GL_LAYER_NV = 0x8DAA;
+//        public const int GL_NEXT_BUFFER_NV = -2;
+//        public const int GL_SKIP_COMPONENTS4_NV = -3;
+//        public const int GL_SKIP_COMPONENTS3_NV = -4;
+//        public const int GL_SKIP_COMPONENTS2_NV = -5;
+//        public const int GL_SKIP_COMPONENTS1_NV = -6;
+//        public const int GL_NV_transform_feedback2 = 1;
+//        public const int GL_TRANSFORM_FEEDBACK_NV = 0x8E22;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV = 0x8E23;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV = 0x8E24;
+//        public const int GL_TRANSFORM_FEEDBACK_BINDING_NV = 0x8E25;
+//        public const int GL_NV_uniform_buffer_unified_memory = 1;
+//        public const int GL_UNIFORM_BUFFER_UNIFIED_NV = 0x936E;
+//        public const int GL_UNIFORM_BUFFER_ADDRESS_NV = 0x936F;
+//        public const int GL_UNIFORM_BUFFER_LENGTH_NV = 0x9370;
+//        public const int GL_NV_vdpau_interop = 1;
+//        public const int GL_SURFACE_STATE_NV = 0x86EB;
+//        public const int GL_SURFACE_REGISTERED_NV = 0x86FD;
+//        public const int GL_SURFACE_MAPPED_NV = 0x8700;
+//        public const int GL_WRITE_DISCARD_NV = 0x88BE;
+//        public const int GL_NV_vertex_array_range = 1;
+//        public const int GL_VERTEX_ARRAY_RANGE_NV = 0x851D;
+//        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E;
+//        public const int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F;
+//        public const int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520;
+//        public const int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521;
+//        public const int GL_NV_vertex_array_range2 = 1;
+//        public const int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533;
+//        public const int GL_NV_vertex_attrib_integer_64bit = 1;
+//        public const int GL_NV_vertex_buffer_unified_memory = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = 0x8F1E;
+//        public const int GL_ELEMENT_ARRAY_UNIFIED_NV = 0x8F1F;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV = 0x8F20;
+//        public const int GL_VERTEX_ARRAY_ADDRESS_NV = 0x8F21;
+//        public const int GL_NORMAL_ARRAY_ADDRESS_NV = 0x8F22;
+//        public const int GL_COLOR_ARRAY_ADDRESS_NV = 0x8F23;
+//        public const int GL_INDEX_ARRAY_ADDRESS_NV = 0x8F24;
+//        public const int GL_TEXTURE_COORD_ARRAY_ADDRESS_NV = 0x8F25;
+//        public const int GL_EDGE_FLAG_ARRAY_ADDRESS_NV = 0x8F26;
+//        public const int GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV = 0x8F27;
+//        public const int GL_FOG_COORD_ARRAY_ADDRESS_NV = 0x8F28;
+//        public const int GL_ELEMENT_ARRAY_ADDRESS_NV = 0x8F29;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV = 0x8F2A;
+//        public const int GL_VERTEX_ARRAY_LENGTH_NV = 0x8F2B;
+//        public const int GL_NORMAL_ARRAY_LENGTH_NV = 0x8F2C;
+//        public const int GL_COLOR_ARRAY_LENGTH_NV = 0x8F2D;
+//        public const int GL_INDEX_ARRAY_LENGTH_NV = 0x8F2E;
+//        public const int GL_TEXTURE_COORD_ARRAY_LENGTH_NV = 0x8F2F;
+//        public const int GL_EDGE_FLAG_ARRAY_LENGTH_NV = 0x8F30;
+//        public const int GL_SECONDARY_COLOR_ARRAY_LENGTH_NV = 0x8F31;
+//        public const int GL_FOG_COORD_ARRAY_LENGTH_NV = 0x8F32;
+//        public const int GL_ELEMENT_ARRAY_LENGTH_NV = 0x8F33;
+//        public const int GL_DRAW_INDIRECT_UNIFIED_NV = 0x8F40;
+//        public const int GL_DRAW_INDIRECT_ADDRESS_NV = 0x8F41;
+//        public const int GL_DRAW_INDIRECT_LENGTH_NV = 0x8F42;
+//        public const int GL_NV_vertex_program = 1;
+//        public const int GL_VERTEX_PROGRAM_NV = 0x8620;
+//        public const int GL_VERTEX_STATE_PROGRAM_NV = 0x8621;
+//        public const int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623;
+//        public const int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624;
+//        public const int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625;
+//        public const int GL_CURRENT_ATTRIB_NV = 0x8626;
+//        public const int GL_PROGRAM_LENGTH_NV = 0x8627;
+//        public const int GL_PROGRAM_STRING_NV = 0x8628;
+//        public const int GL_MODELVIEW_PROJECTION_NV = 0x8629;
+//        public const int GL_IDENTITY_NV = 0x862A;
+//        public const int GL_INVERSE_NV = 0x862B;
+//        public const int GL_TRANSPOSE_NV = 0x862C;
+//        public const int GL_INVERSE_TRANSPOSE_NV = 0x862D;
+//        public const int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E;
+//        public const int GL_MAX_TRACK_MATRICES_NV = 0x862F;
+//        public const int GL_MATRIX0_NV = 0x8630;
+//        public const int GL_MATRIX1_NV = 0x8631;
+//        public const int GL_MATRIX2_NV = 0x8632;
+//        public const int GL_MATRIX3_NV = 0x8633;
+//        public const int GL_MATRIX4_NV = 0x8634;
+//        public const int GL_MATRIX5_NV = 0x8635;
+//        public const int GL_MATRIX6_NV = 0x8636;
+//        public const int GL_MATRIX7_NV = 0x8637;
+//        public const int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640;
+//        public const int GL_CURRENT_MATRIX_NV = 0x8641;
+//        public const int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642;
+//        public const int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643;
+//        public const int GL_PROGRAM_PARAMETER_NV = 0x8644;
+//        public const int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645;
+//        public const int GL_PROGRAM_TARGET_NV = 0x8646;
+//        public const int GL_PROGRAM_RESIDENT_NV = 0x8647;
+//        public const int GL_TRACK_MATRIX_NV = 0x8648;
+//        public const int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649;
+//        public const int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A;
+//        public const int GL_PROGRAM_ERROR_POSITION_NV = 0x864B;
+//        public const int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650;
+//        public const int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651;
+//        public const int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652;
+//        public const int GL_VERTEX_ATTRIB_ARRAY3_NV = 0x8653;
+//        public const int GL_VERTEX_ATTRIB_ARRAY4_NV = 0x8654;
+//        public const int GL_VERTEX_ATTRIB_ARRAY5_NV = 0x8655;
+//        public const int GL_VERTEX_ATTRIB_ARRAY6_NV = 0x8656;
+//        public const int GL_VERTEX_ATTRIB_ARRAY7_NV = 0x8657;
+//        public const int GL_VERTEX_ATTRIB_ARRAY8_NV = 0x8658;
+//        public const int GL_VERTEX_ATTRIB_ARRAY9_NV = 0x8659;
+//        public const int GL_VERTEX_ATTRIB_ARRAY10_NV = 0x865A;
+//        public const int GL_VERTEX_ATTRIB_ARRAY11_NV = 0x865B;
+//        public const int GL_VERTEX_ATTRIB_ARRAY12_NV = 0x865C;
+//        public const int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865D;
+//        public const int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E;
+//        public const int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F;
+//        public const int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660;
+//        public const int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661;
+//        public const int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662;
+//        public const int GL_MAP1_VERTEX_ATTRIB3_4_NV = 0x8663;
+//        public const int GL_MAP1_VERTEX_ATTRIB4_4_NV = 0x8664;
+//        public const int GL_MAP1_VERTEX_ATTRIB5_4_NV = 0x8665;
+//        public const int GL_MAP1_VERTEX_ATTRIB6_4_NV = 0x8666;
+//        public const int GL_MAP1_VERTEX_ATTRIB7_4_NV = 0x8667;
+//        public const int GL_MAP1_VERTEX_ATTRIB8_4_NV = 0x8668;
+//        public const int GL_MAP1_VERTEX_ATTRIB9_4_NV = 0x8669;
+//        public const int GL_MAP1_VERTEX_ATTRIB10_4_NV = 0x866A;
+//        public const int GL_MAP1_VERTEX_ATTRIB11_4_NV = 0x866B;
+//        public const int GL_MAP1_VERTEX_ATTRIB12_4_NV = 0x866C;
+//        public const int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866D;
+//        public const int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E;
+//        public const int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F;
+//        public const int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670;
+//        public const int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671;
+//        public const int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672;
+//        public const int GL_MAP2_VERTEX_ATTRIB3_4_NV = 0x8673;
+//        public const int GL_MAP2_VERTEX_ATTRIB4_4_NV = 0x8674;
+//        public const int GL_MAP2_VERTEX_ATTRIB5_4_NV = 0x8675;
+//        public const int GL_MAP2_VERTEX_ATTRIB6_4_NV = 0x8676;
+//        public const int GL_MAP2_VERTEX_ATTRIB7_4_NV = 0x8677;
+//        public const int GL_MAP2_VERTEX_ATTRIB8_4_NV = 0x8678;
+//        public const int GL_MAP2_VERTEX_ATTRIB9_4_NV = 0x8679;
+//        public const int GL_MAP2_VERTEX_ATTRIB10_4_NV = 0x867A;
+//        public const int GL_MAP2_VERTEX_ATTRIB11_4_NV = 0x867B;
+//        public const int GL_MAP2_VERTEX_ATTRIB12_4_NV = 0x867C;
+//        public const int GL_MAP2_VERTEX_ATTRIB13_4_NV = 0x867D;
+//        public const int GL_MAP2_VERTEX_ATTRIB14_4_NV = 0x867E;
+//        public const int GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F;
+//        public const int GL_NV_vertex_program1_1 = 1;
+//        public const int GL_NV_vertex_program2 = 1;
+//        public const int GL_NV_vertex_program2_option = 1;
+//        public const int GL_NV_vertex_program3 = 1;
+//        public const int GL_NV_vertex_program4 = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV = 0x88FD;
+//        public const int GL_NV_video_capture = 1;
+//        public const int GL_VIDEO_BUFFER_NV = 0x9020;
+//        public const int GL_VIDEO_BUFFER_BINDING_NV = 0x9021;
+//        public const int GL_FIELD_UPPER_NV = 0x9022;
+//        public const int GL_FIELD_LOWER_NV = 0x9023;
+//        public const int GL_NUM_VIDEO_CAPTURE_STREAMS_NV = 0x9024;
+//        public const int GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV = 0x9025;
+//        public const int GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV = 0x9026;
+//        public const int GL_LAST_VIDEO_CAPTURE_STATUS_NV = 0x9027;
+//        public const int GL_VIDEO_BUFFER_PITCH_NV = 0x9028;
+//        public const int GL_VIDEO_COLOR_CONVERSION_MATRIX_NV = 0x9029;
+//        public const int GL_VIDEO_COLOR_CONVERSION_MAX_NV = 0x902A;
+//        public const int GL_VIDEO_COLOR_CONVERSION_MIN_NV = 0x902B;
+//        public const int GL_VIDEO_COLOR_CONVERSION_OFFSET_NV = 0x902C;
+//        public const int GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV = 0x902D;
+//        public const int GL_PARTIAL_SUCCESS_NV = 0x902E;
+//        public const int GL_SUCCESS_NV = 0x902F;
+//        public const int GL_FAILURE_NV = 0x9030;
+//        public const int GL_YCBYCR8_422_NV = 0x9031;
+//        public const int GL_YCBAYCR8A_4224_NV = 0x9032;
+//        public const int GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV = 0x9033;
+//        public const int GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV = 0x9034;
+//        public const int GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV = 0x9035;
+//        public const int GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV = 0x9036;
+//        public const int GL_Z4Y12Z4CB12Z4CR12_444_NV = 0x9037;
+//        public const int GL_VIDEO_CAPTURE_FRAME_WIDTH_NV = 0x9038;
+//        public const int GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV = 0x9039;
+//        public const int GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV = 0x903A;
+//        public const int GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV = 0x903B;
+//        public const int GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV = 0x903C;
+//        public const int GL_NV_viewport_array2 = 1;
+//        public const int GL_NV_viewport_swizzle = 1;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV = 0x9350;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV = 0x9351;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV = 0x9352;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV = 0x9353;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV = 0x9354;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV = 0x9355;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV = 0x9356;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV = 0x9357;
+//        public const int GL_VIEWPORT_SWIZZLE_X_NV = 0x9358;
+//        public const int GL_VIEWPORT_SWIZZLE_Y_NV = 0x9359;
+//        public const int GL_VIEWPORT_SWIZZLE_Z_NV = 0x935A;
+//        public const int GL_VIEWPORT_SWIZZLE_W_NV = 0x935B;
+//        public const int GL_OML_interlace = 1;
+//        public const int GL_INTERLACE_OML = 0x8980;
+//        public const int GL_INTERLACE_READ_OML = 0x8981;
+//        public const int GL_OML_resample = 1;
+//        public const int GL_PACK_RESAMPLE_OML = 0x8984;
+//        public const int GL_UNPACK_RESAMPLE_OML = 0x8985;
+//        public const int GL_RESAMPLE_REPLICATE_OML = 0x8986;
+//        public const int GL_RESAMPLE_ZERO_FILL_OML = 0x8987;
+//        public const int GL_RESAMPLE_AVERAGE_OML = 0x8988;
+//        public const int GL_RESAMPLE_DECIMATE_OML = 0x8989;
+//        public const int GL_OML_subsample = 1;
+//        public const int GL_FORMAT_SUBSAMPLE_24_24_OML = 0x8982;
+//        public const int GL_FORMAT_SUBSAMPLE_244_244_OML = 0x8983;
+//        public const int GL_OVR_multiview = 1;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR = 0x9630;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR = 0x9632;
+//        public const int GL_MAX_VIEWS_OVR = 0x9631;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR = 0x9633;
+//        public const int GL_OVR_multiview2 = 1;
+//        public const int GL_PGI_misc_hints = 1;
+//        public const int GL_PREFER_DOUBLEBUFFER_HINT_PGI = 0x1A1F8;
+//        public const int GL_CONSERVE_MEMORY_HINT_PGI = 0x1A1FD;
+//        public const int GL_RECLAIM_MEMORY_HINT_PGI = 0x1A1FE;
+//        public const int GL_NATIVE_GRAPHICS_HANDLE_PGI = 0x1A202;
+//        public const int GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI = 0x1A203;
+//        public const int GL_NATIVE_GRAPHICS_END_HINT_PGI = 0x1A204;
+//        public const int GL_ALWAYS_FAST_HINT_PGI = 0x1A20C;
+//        public const int GL_ALWAYS_SOFT_HINT_PGI = 0x1A20D;
+//        public const int GL_ALLOW_DRAW_OBJ_HINT_PGI = 0x1A20E;
+//        public const int GL_ALLOW_DRAW_WIN_HINT_PGI = 0x1A20F;
+//        public const int GL_ALLOW_DRAW_FRG_HINT_PGI = 0x1A210;
+//        public const int GL_ALLOW_DRAW_MEM_HINT_PGI = 0x1A211;
+//        public const int GL_STRICT_DEPTHFUNC_HINT_PGI = 0x1A216;
+//        public const int GL_STRICT_LIGHTING_HINT_PGI = 0x1A217;
+//        public const int GL_STRICT_SCISSOR_HINT_PGI = 0x1A218;
+//        public const int GL_FULL_STIPPLE_HINT_PGI = 0x1A219;
+//        public const int GL_CLIP_NEAR_HINT_PGI = 0x1A220;
+//        public const int GL_CLIP_FAR_HINT_PGI = 0x1A221;
+//        public const int GL_WIDE_LINE_HINT_PGI = 0x1A222;
+//        public const int GL_BACK_NORMALS_HINT_PGI = 0x1A223;
+//        public const int GL_PGI_vertex_hints = 1;
+//        public const int GL_VERTEX_DATA_HINT_PGI = 0x1A22A;
+//        public const int GL_VERTEX_CONSISTENT_HINT_PGI = 0x1A22B;
+//        public const int GL_MATERIAL_SIDE_HINT_PGI = 0x1A22C;
+//        public const int GL_MAX_VERTEX_HINT_PGI = 0x1A22D;
+//        public const int GL_COLOR3_BIT_PGI = 0x00010000;
+//        public const int GL_COLOR4_BIT_PGI = 0x00020000;
+//        public const int GL_EDGEFLAG_BIT_PGI = 0x00040000;
+//        public const int GL_INDEX_BIT_PGI = 0x00080000;
+//        public const int GL_MAT_AMBIENT_BIT_PGI = 0x00100000;
+//        public const int GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI = 0x00200000;
+//        public const int GL_MAT_DIFFUSE_BIT_PGI = 0x00400000;
+//        public const int GL_MAT_EMISSION_BIT_PGI = 0x00800000;
+//        public const int GL_MAT_COLOR_INDEXES_BIT_PGI = 0x01000000;
+//        public const int GL_MAT_SHININESS_BIT_PGI = 0x02000000;
+//        public const int GL_MAT_SPECULAR_BIT_PGI = 0x04000000;
+//        public const int GL_NORMAL_BIT_PGI = 0x08000000;
+//        public const int GL_TEXCOORD1_BIT_PGI = 0x10000000;
+//        public const int GL_TEXCOORD2_BIT_PGI = 0x20000000;
+//        public const int GL_TEXCOORD3_BIT_PGI = 0x40000000;
+//        public const int GL_TEXCOORD4_BIT_PGI = unchecked((int)0x80000000);
+//        public const int GL_VERTEX23_BIT_PGI = 0x00000004;
+//        public const int GL_VERTEX4_BIT_PGI = 0x00000008;
+//        public const int GL_REND_screen_coordinates = 1;
+//        public const int GL_SCREEN_COORDINATES_REND = 0x8490;
+//        public const int GL_INVERTED_SCREEN_W_REND = 0x8491;
+//        public const int GL_S3_s3tc = 1;
+//        public const int GL_RGB_S3TC = 0x83A0;
+//        public const int GL_RGB4_S3TC = 0x83A1;
+//        public const int GL_RGBA_S3TC = 0x83A2;
+//        public const int GL_RGBA4_S3TC = 0x83A3;
+//        public const int GL_RGBA_DXT5_S3TC = 0x83A4;
+//        public const int GL_RGBA4_DXT5_S3TC = 0x83A5;
+//        public const int GL_SGIS_detail_texture = 1;
+//        public const int GL_DETAIL_TEXTURE_2D_SGIS = 0x8095;
+//        public const int GL_DETAIL_TEXTURE_2D_BINDING_SGIS = 0x8096;
+//        public const int GL_LINEAR_DETAIL_SGIS = 0x8097;
+//        public const int GL_LINEAR_DETAIL_ALPHA_SGIS = 0x8098;
+//        public const int GL_LINEAR_DETAIL_COLOR_SGIS = 0x8099;
+//        public const int GL_DETAIL_TEXTURE_LEVEL_SGIS = 0x809A;
+//        public const int GL_DETAIL_TEXTURE_MODE_SGIS = 0x809B;
+//        public const int GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS = 0x809C;
+//        public const int GL_SGIS_fog_function = 1;
+//        public const int GL_FOG_FUNC_SGIS = 0x812A;
+//        public const int GL_FOG_FUNC_POINTS_SGIS = 0x812B;
+//        public const int GL_MAX_FOG_FUNC_POINTS_SGIS = 0x812C;
+//        public const int GL_SGIS_generate_mipmap = 1;
+//        public const int GL_GENERATE_MIPMAP_SGIS = 0x8191;
+//        public const int GL_GENERATE_MIPMAP_HINT_SGIS = 0x8192;
+//        public const int GL_SGIS_multisample = 1;
+//        public const int GL_MULTISAMPLE_SGIS = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_MASK_SGIS = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE_SGIS = 0x809F;
+//        public const int GL_SAMPLE_MASK_SGIS = 0x80A0;
+//        public const int GL_1PASS_SGIS = 0x80A1;
+//        public const int GL_2PASS_0_SGIS = 0x80A2;
+//        public const int GL_2PASS_1_SGIS = 0x80A3;
+//        public const int GL_4PASS_0_SGIS = 0x80A4;
+//        public const int GL_4PASS_1_SGIS = 0x80A5;
+//        public const int GL_4PASS_2_SGIS = 0x80A6;
+//        public const int GL_4PASS_3_SGIS = 0x80A7;
+//        public const int GL_SAMPLE_BUFFERS_SGIS = 0x80A8;
+//        public const int GL_SAMPLES_SGIS = 0x80A9;
+//        public const int GL_SAMPLE_MASK_VALUE_SGIS = 0x80AA;
+//        public const int GL_SAMPLE_MASK_INVERT_SGIS = 0x80AB;
+//        public const int GL_SAMPLE_PATTERN_SGIS = 0x80AC;
+//        public const int GL_SGIS_pixel_texture = 1;
+//        public const int GL_PIXEL_TEXTURE_SGIS = 0x8353;
+//        public const int GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS = 0x8354;
+//        public const int GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS = 0x8355;
+//        public const int GL_PIXEL_GROUP_COLOR_SGIS = 0x8356;
+//        public const int GL_SGIS_point_line_texgen = 1;
+//        public const int GL_EYE_DISTANCE_TO_POINT_SGIS = 0x81F0;
+//        public const int GL_OBJECT_DISTANCE_TO_POINT_SGIS = 0x81F1;
+//        public const int GL_EYE_DISTANCE_TO_LINE_SGIS = 0x81F2;
+//        public const int GL_OBJECT_DISTANCE_TO_LINE_SGIS = 0x81F3;
+//        public const int GL_EYE_POINT_SGIS = 0x81F4;
+//        public const int GL_OBJECT_POINT_SGIS = 0x81F5;
+//        public const int GL_EYE_LINE_SGIS = 0x81F6;
+//        public const int GL_OBJECT_LINE_SGIS = 0x81F7;
+//        public const int GL_SGIS_point_parameters = 1;
+//        public const int GL_POINT_SIZE_MIN_SGIS = 0x8126;
+//        public const int GL_POINT_SIZE_MAX_SGIS = 0x8127;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE_SGIS = 0x8128;
+//        public const int GL_DISTANCE_ATTENUATION_SGIS = 0x8129;
+//        public const int GL_SGIS_sharpen_texture = 1;
+//        public const int GL_LINEAR_SHARPEN_SGIS = 0x80AD;
+//        public const int GL_LINEAR_SHARPEN_ALPHA_SGIS = 0x80AE;
+//        public const int GL_LINEAR_SHARPEN_COLOR_SGIS = 0x80AF;
+//        public const int GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS = 0x80B0;
+//        public const int GL_SGIS_texture4D = 1;
+//        public const int GL_PACK_SKIP_VOLUMES_SGIS = 0x8130;
+//        public const int GL_PACK_IMAGE_DEPTH_SGIS = 0x8131;
+//        public const int GL_UNPACK_SKIP_VOLUMES_SGIS = 0x8132;
+//        public const int GL_UNPACK_IMAGE_DEPTH_SGIS = 0x8133;
+//        public const int GL_TEXTURE_4D_SGIS = 0x8134;
+//        public const int GL_PROXY_TEXTURE_4D_SGIS = 0x8135;
+//        public const int GL_TEXTURE_4DSIZE_SGIS = 0x8136;
+//        public const int GL_TEXTURE_WRAP_Q_SGIS = 0x8137;
+//        public const int GL_MAX_4D_TEXTURE_SIZE_SGIS = 0x8138;
+//        public const int GL_TEXTURE_4D_BINDING_SGIS = 0x814F;
+//        public const int GL_SGIS_texture_border_clamp = 1;
+//        public const int GL_CLAMP_TO_BORDER_SGIS = 0x812D;
+//        public const int GL_SGIS_texture_color_mask = 1;
+//        public const int GL_TEXTURE_COLOR_WRITEMASK_SGIS = 0x81EF;
+//        public const int GL_SGIS_texture_edge_clamp = 1;
+//        public const int GL_CLAMP_TO_EDGE_SGIS = 0x812F;
+//        public const int GL_SGIS_texture_filter4 = 1;
+//        public const int GL_FILTER4_SGIS = 0x8146;
+//        public const int GL_TEXTURE_FILTER4_SIZE_SGIS = 0x8147;
+//        public const int GL_SGIS_texture_lod = 1;
+//        public const int GL_TEXTURE_MIN_LOD_SGIS = 0x813A;
+//        public const int GL_TEXTURE_MAX_LOD_SGIS = 0x813B;
+//        public const int GL_TEXTURE_BASE_LEVEL_SGIS = 0x813C;
+//        public const int GL_TEXTURE_MAX_LEVEL_SGIS = 0x813D;
+//        public const int GL_SGIS_texture_select = 1;
+//        public const int GL_DUAL_ALPHA4_SGIS = 0x8110;
+//        public const int GL_DUAL_ALPHA8_SGIS = 0x8111;
+//        public const int GL_DUAL_ALPHA12_SGIS = 0x8112;
+//        public const int GL_DUAL_ALPHA16_SGIS = 0x8113;
+//        public const int GL_DUAL_LUMINANCE4_SGIS = 0x8114;
+//        public const int GL_DUAL_LUMINANCE8_SGIS = 0x8115;
+//        public const int GL_DUAL_LUMINANCE12_SGIS = 0x8116;
+//        public const int GL_DUAL_LUMINANCE16_SGIS = 0x8117;
+//        public const int GL_DUAL_INTENSITY4_SGIS = 0x8118;
+//        public const int GL_DUAL_INTENSITY8_SGIS = 0x8119;
+//        public const int GL_DUAL_INTENSITY12_SGIS = 0x811A;
+//        public const int GL_DUAL_INTENSITY16_SGIS = 0x811B;
+//        public const int GL_DUAL_LUMINANCE_ALPHA4_SGIS = 0x811C;
+//        public const int GL_DUAL_LUMINANCE_ALPHA8_SGIS = 0x811D;
+//        public const int GL_QUAD_ALPHA4_SGIS = 0x811E;
+//        public const int GL_QUAD_ALPHA8_SGIS = 0x811F;
+//        public const int GL_QUAD_LUMINANCE4_SGIS = 0x8120;
+//        public const int GL_QUAD_LUMINANCE8_SGIS = 0x8121;
+//        public const int GL_QUAD_INTENSITY4_SGIS = 0x8122;
+//        public const int GL_QUAD_INTENSITY8_SGIS = 0x8123;
+//        public const int GL_DUAL_TEXTURE_SELECT_SGIS = 0x8124;
+//        public const int GL_QUAD_TEXTURE_SELECT_SGIS = 0x8125;
+//        public const int GL_SGIX_async = 1;
+//        public const int GL_ASYNC_MARKER_SGIX = 0x8329;
+//        public const int GL_SGIX_async_histogram = 1;
+//        public const int GL_ASYNC_HISTOGRAM_SGIX = 0x832C;
+//        public const int GL_MAX_ASYNC_HISTOGRAM_SGIX = 0x832D;
+//        public const int GL_SGIX_async_pixel = 1;
+//        public const int GL_ASYNC_TEX_IMAGE_SGIX = 0x835C;
+//        public const int GL_ASYNC_DRAW_PIXELS_SGIX = 0x835D;
+//        public const int GL_ASYNC_READ_PIXELS_SGIX = 0x835E;
+//        public const int GL_MAX_ASYNC_TEX_IMAGE_SGIX = 0x835F;
+//        public const int GL_MAX_ASYNC_DRAW_PIXELS_SGIX = 0x8360;
+//        public const int GL_MAX_ASYNC_READ_PIXELS_SGIX = 0x8361;
+//        public const int GL_SGIX_blend_alpha_minmax = 1;
+//        public const int GL_ALPHA_MIN_SGIX = 0x8320;
+//        public const int GL_ALPHA_MAX_SGIX = 0x8321;
+//        public const int GL_SGIX_calligraphic_fragment = 1;
+//        public const int GL_CALLIGRAPHIC_FRAGMENT_SGIX = 0x8183;
+//        public const int GL_SGIX_clipmap = 1;
+//        public const int GL_LINEAR_CLIPMAP_LINEAR_SGIX = 0x8170;
+//        public const int GL_TEXTURE_CLIPMAP_CENTER_SGIX = 0x8171;
+//        public const int GL_TEXTURE_CLIPMAP_FRAME_SGIX = 0x8172;
+//        public const int GL_TEXTURE_CLIPMAP_OFFSET_SGIX = 0x8173;
+//        public const int GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8174;
+//        public const int GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX = 0x8175;
+//        public const int GL_TEXTURE_CLIPMAP_DEPTH_SGIX = 0x8176;
+//        public const int GL_MAX_CLIPMAP_DEPTH_SGIX = 0x8177;
+//        public const int GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8178;
+//        public const int GL_NEAREST_CLIPMAP_NEAREST_SGIX = 0x844D;
+//        public const int GL_NEAREST_CLIPMAP_LINEAR_SGIX = 0x844E;
+//        public const int GL_LINEAR_CLIPMAP_NEAREST_SGIX = 0x844F;
+//        public const int GL_SGIX_convolution_accuracy = 1;
+//        public const int GL_CONVOLUTION_HINT_SGIX = 0x8316;
+//        public const int GL_SGIX_depth_pass_instrument = 1;
+//        public const int GL_SGIX_depth_texture = 1;
+//        public const int GL_DEPTH_COMPONENT16_SGIX = 0x81A5;
+//        public const int GL_DEPTH_COMPONENT24_SGIX = 0x81A6;
+//        public const int GL_DEPTH_COMPONENT32_SGIX = 0x81A7;
+//        public const int GL_SGIX_flush_raster = 1;
+//        public const int GL_SGIX_fog_offset = 1;
+//        public const int GL_FOG_OFFSET_SGIX = 0x8198;
+//        public const int GL_FOG_OFFSET_VALUE_SGIX = 0x8199;
+//        public const int GL_SGIX_fragment_lighting = 1;
+//        public const int GL_FRAGMENT_LIGHTING_SGIX = 0x8400;
+//        public const int GL_FRAGMENT_COLOR_MATERIAL_SGIX = 0x8401;
+//        public const int GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX = 0x8402;
+//        public const int GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX = 0x8403;
+//        public const int GL_MAX_FRAGMENT_LIGHTS_SGIX = 0x8404;
+//        public const int GL_MAX_ACTIVE_LIGHTS_SGIX = 0x8405;
+//        public const int GL_CURRENT_RASTER_NORMAL_SGIX = 0x8406;
+//        public const int GL_LIGHT_ENV_MODE_SGIX = 0x8407;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX = 0x8408;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX = 0x8409;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX = 0x840A;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX = 0x840B;
+//        public const int GL_FRAGMENT_LIGHT0_SGIX = 0x840C;
+//        public const int GL_FRAGMENT_LIGHT1_SGIX = 0x840D;
+//        public const int GL_FRAGMENT_LIGHT2_SGIX = 0x840E;
+//        public const int GL_FRAGMENT_LIGHT3_SGIX = 0x840F;
+//        public const int GL_FRAGMENT_LIGHT4_SGIX = 0x8410;
+//        public const int GL_FRAGMENT_LIGHT5_SGIX = 0x8411;
+//        public const int GL_FRAGMENT_LIGHT6_SGIX = 0x8412;
+//        public const int GL_FRAGMENT_LIGHT7_SGIX = 0x8413;
+//        public const int GL_SGIX_framezoom = 1;
+//        public const int GL_FRAMEZOOM_SGIX = 0x818B;
+//        public const int GL_FRAMEZOOM_FACTOR_SGIX = 0x818C;
+//        public const int GL_MAX_FRAMEZOOM_FACTOR_SGIX = 0x818D;
+//        public const int GL_SGIX_igloo_interface = 1;
+//        public const int GL_SGIX_instruments = 1;
+//        public const int GL_INSTRUMENT_BUFFER_POINTER_SGIX = 0x8180;
+//        public const int GL_INSTRUMENT_MEASUREMENTS_SGIX = 0x8181;
+//        public const int GL_SGIX_interlace = 1;
+//        public const int GL_INTERLACE_SGIX = 0x8094;
+//        public const int GL_SGIX_ir_instrument1 = 1;
+//        public const int GL_IR_INSTRUMENT1_SGIX = 0x817F;
+//        public const int GL_SGIX_list_priority = 1;
+//        public const int GL_LIST_PRIORITY_SGIX = 0x8182;
+//        public const int GL_SGIX_pixel_texture = 1;
+//        public const int GL_PIXEL_TEX_GEN_SGIX = 0x8139;
+//        public const int GL_PIXEL_TEX_GEN_MODE_SGIX = 0x832B;
+//        public const int GL_SGIX_pixel_tiles = 1;
+//        public const int GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX = 0x813E;
+//        public const int GL_PIXEL_TILE_CACHE_INCREMENT_SGIX = 0x813F;
+//        public const int GL_PIXEL_TILE_WIDTH_SGIX = 0x8140;
+//        public const int GL_PIXEL_TILE_HEIGHT_SGIX = 0x8141;
+//        public const int GL_PIXEL_TILE_GRID_WIDTH_SGIX = 0x8142;
+//        public const int GL_PIXEL_TILE_GRID_HEIGHT_SGIX = 0x8143;
+//        public const int GL_PIXEL_TILE_GRID_DEPTH_SGIX = 0x8144;
+//        public const int GL_PIXEL_TILE_CACHE_SIZE_SGIX = 0x8145;
+//        public const int GL_SGIX_polynomial_ffd = 1;
+//        public const int GL_TEXTURE_DEFORMATION_BIT_SGIX = 0x00000001;
+//        public const int GL_GEOMETRY_DEFORMATION_BIT_SGIX = 0x00000002;
+//        public const int GL_GEOMETRY_DEFORMATION_SGIX = 0x8194;
+//        public const int GL_TEXTURE_DEFORMATION_SGIX = 0x8195;
+//        public const int GL_DEFORMATIONS_MASK_SGIX = 0x8196;
+//        public const int GL_MAX_DEFORMATION_ORDER_SGIX = 0x8197;
+//        public const int GL_SGIX_reference_plane = 1;
+//        public const int GL_REFERENCE_PLANE_SGIX = 0x817D;
+//        public const int GL_REFERENCE_PLANE_EQUATION_SGIX = 0x817E;
+//        public const int GL_SGIX_resample = 1;
+//        public const int GL_PACK_RESAMPLE_SGIX = 0x842E;
+//        public const int GL_UNPACK_RESAMPLE_SGIX = 0x842F;
+//        public const int GL_RESAMPLE_REPLICATE_SGIX = 0x8433;
+//        public const int GL_RESAMPLE_ZERO_FILL_SGIX = 0x8434;
+//        public const int GL_RESAMPLE_DECIMATE_SGIX = 0x8430;
+//        public const int GL_SGIX_scalebias_hint = 1;
+//        public const int GL_SCALEBIAS_HINT_SGIX = 0x8322;
+//        public const int GL_SGIX_shadow = 1;
+//        public const int GL_TEXTURE_COMPARE_SGIX = 0x819A;
+//        public const int GL_TEXTURE_COMPARE_OPERATOR_SGIX = 0x819B;
+//        public const int GL_TEXTURE_LEQUAL_R_SGIX = 0x819C;
+//        public const int GL_TEXTURE_GEQUAL_R_SGIX = 0x819D;
+//        public const int GL_SGIX_shadow_ambient = 1;
+//        public const int GL_SHADOW_AMBIENT_SGIX = 0x80BF;
+//        public const int GL_SGIX_sprite = 1;
+//        public const int GL_SPRITE_SGIX = 0x8148;
+//        public const int GL_SPRITE_MODE_SGIX = 0x8149;
+//        public const int GL_SPRITE_AXIS_SGIX = 0x814A;
+//        public const int GL_SPRITE_TRANSLATION_SGIX = 0x814B;
+//        public const int GL_SPRITE_AXIAL_SGIX = 0x814C;
+//        public const int GL_SPRITE_OBJECT_ALIGNED_SGIX = 0x814D;
+//        public const int GL_SPRITE_EYE_ALIGNED_SGIX = 0x814E;
+//        public const int GL_SGIX_subsample = 1;
+//        public const int GL_PACK_SUBSAMPLE_RATE_SGIX = 0x85A0;
+//        public const int GL_UNPACK_SUBSAMPLE_RATE_SGIX = 0x85A1;
+//        public const int GL_PIXEL_SUBSAMPLE_4444_SGIX = 0x85A2;
+//        public const int GL_PIXEL_SUBSAMPLE_2424_SGIX = 0x85A3;
+//        public const int GL_PIXEL_SUBSAMPLE_4242_SGIX = 0x85A4;
+//        public const int GL_SGIX_tag_sample_buffer = 1;
+//        public const int GL_SGIX_texture_add_env = 1;
+//        public const int GL_TEXTURE_ENV_BIAS_SGIX = 0x80BE;
+//        public const int GL_SGIX_texture_coordinate_clamp = 1;
+//        public const int GL_TEXTURE_MAX_CLAMP_S_SGIX = 0x8369;
+//        public const int GL_TEXTURE_MAX_CLAMP_T_SGIX = 0x836A;
+//        public const int GL_TEXTURE_MAX_CLAMP_R_SGIX = 0x836B;
+//        public const int GL_SGIX_texture_lod_bias = 1;
+//        public const int GL_TEXTURE_LOD_BIAS_S_SGIX = 0x818E;
+//        public const int GL_TEXTURE_LOD_BIAS_T_SGIX = 0x818F;
+//        public const int GL_TEXTURE_LOD_BIAS_R_SGIX = 0x8190;
+//        public const int GL_SGIX_texture_multi_buffer = 1;
+//        public const int GL_TEXTURE_MULTI_BUFFER_HINT_SGIX = 0x812E;
+//        public const int GL_SGIX_texture_scale_bias = 1;
+//        public const int GL_POST_TEXTURE_FILTER_BIAS_SGIX = 0x8179;
+//        public const int GL_POST_TEXTURE_FILTER_SCALE_SGIX = 0x817A;
+//        public const int GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX = 0x817B;
+//        public const int GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX = 0x817C;
+//        public const int GL_SGIX_vertex_preclip = 1;
+//        public const int GL_VERTEX_PRECLIP_SGIX = 0x83EE;
+//        public const int GL_VERTEX_PRECLIP_HINT_SGIX = 0x83EF;
+//        public const int GL_SGIX_ycrcb = 1;
+//        public const int GL_YCRCB_422_SGIX = 0x81BB;
+//        public const int GL_YCRCB_444_SGIX = 0x81BC;
+//        public const int GL_SGIX_ycrcb_subsample = 1;
+//        public const int GL_SGIX_ycrcba = 1;
+//        public const int GL_YCRCB_SGIX = 0x8318;
+//        public const int GL_YCRCBA_SGIX = 0x8319;
+//        public const int GL_SGI_color_matrix = 1;
+//        public const int GL_COLOR_MATRIX_SGI = 0x80B1;
+//        public const int GL_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B2;
+//        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B3;
+//        public const int GL_POST_COLOR_MATRIX_RED_SCALE_SGI = 0x80B4;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI = 0x80B5;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI = 0x80B6;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI = 0x80B7;
+//        public const int GL_POST_COLOR_MATRIX_RED_BIAS_SGI = 0x80B8;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI = 0x80B9;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI = 0x80BA;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI = 0x80BB;
+//        public const int GL_SGI_color_table = 1;
+//        public const int GL_COLOR_TABLE_SGI = 0x80D0;
+//        public const int GL_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D1;
+//        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D2;
+//        public const int GL_PROXY_COLOR_TABLE_SGI = 0x80D3;
+//        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D4;
+//        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D5;
+//        public const int GL_COLOR_TABLE_SCALE_SGI = 0x80D6;
+//        public const int GL_COLOR_TABLE_BIAS_SGI = 0x80D7;
+//        public const int GL_COLOR_TABLE_FORMAT_SGI = 0x80D8;
+//        public const int GL_COLOR_TABLE_WIDTH_SGI = 0x80D9;
+//        public const int GL_COLOR_TABLE_RED_SIZE_SGI = 0x80DA;
+//        public const int GL_COLOR_TABLE_GREEN_SIZE_SGI = 0x80DB;
+//        public const int GL_COLOR_TABLE_BLUE_SIZE_SGI = 0x80DC;
+//        public const int GL_COLOR_TABLE_ALPHA_SIZE_SGI = 0x80DD;
+//        public const int GL_COLOR_TABLE_LUMINANCE_SIZE_SGI = 0x80DE;
+//        public const int GL_COLOR_TABLE_INTENSITY_SIZE_SGI = 0x80DF;
+//        public const int GL_SGI_texture_color_table = 1;
+//        public const int GL_TEXTURE_COLOR_TABLE_SGI = 0x80BC;
+//        public const int GL_PROXY_TEXTURE_COLOR_TABLE_SGI = 0x80BD;
+//        public const int GL_SUNX_constant_data = 1;
+//        public const int GL_UNPACK_CONSTANT_DATA_SUNX = 0x81D5;
+//        public const int GL_TEXTURE_CONSTANT_DATA_SUNX = 0x81D6;
+//        public const int GL_SUN_convolution_border_modes = 1;
+//        public const int GL_WRAP_BORDER_SUN = 0x81D4;
+//        public const int GL_SUN_global_alpha = 1;
+//        public const int GL_GLOBAL_ALPHA_SUN = 0x81D9;
+//        public const int GL_GLOBAL_ALPHA_FACTOR_SUN = 0x81DA;
+//        public const int GL_SUN_mesh_array = 1;
+//        public const int GL_QUAD_MESH_SUN = 0x8614;
+//        public const int GL_TRIANGLE_MESH_SUN = 0x8615;
+//        public const int GL_SUN_slice_accum = 1;
+//        public const int GL_SLICE_ACCUM_SUN = 0x85CC;
+//        public const int GL_SUN_triangle_list = 1;
+//        public const int GL_RESTART_SUN = 0x0001;
+//        public const int GL_REPLACE_MIDDLE_SUN = 0x0002;
+//        public const int GL_REPLACE_OLDEST_SUN = 0x0003;
+//        public const int GL_TRIANGLE_LIST_SUN = 0x81D7;
+//        public const int GL_REPLACEMENT_CODE_SUN = 0x81D8;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_SUN = 0x85C0;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN = 0x85C1;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN = 0x85C2;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN = 0x85C3;
+//        public const int GL_R1UI_V3F_SUN = 0x85C4;
+//        public const int GL_R1UI_C4UB_V3F_SUN = 0x85C5;
+//        public const int GL_R1UI_C3F_V3F_SUN = 0x85C6;
+//        public const int GL_R1UI_N3F_V3F_SUN = 0x85C7;
+//        public const int GL_R1UI_C4F_N3F_V3F_SUN = 0x85C8;
+//        public const int GL_R1UI_T2F_V3F_SUN = 0x85C9;
+//        public const int GL_R1UI_T2F_N3F_V3F_SUN = 0x85CA;
+//        public const int GL_R1UI_T2F_C4F_N3F_V3F_SUN = 0x85CB;
+//        public const int GL_SUN_vertex = 1;
+//        public const int GL_WIN_phong_shading = 1;
+//        public const int GL_PHONG_WIN = 0x80EA;
+//        public const int GL_PHONG_HINT_WIN = 0x80EB;
+//        public const int GL_WIN_specular_fog = 1;
+//        public const int GL_FOG_SPECULAR_TEXTURE_WIN = 0x80EC;
     }
 }
diff --git a/src/Avalonia.OpenGL/GlEntryPointAttribute.cs b/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
index 2ffdaca8fe..3e31de6995 100644
--- a/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
+++ b/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
@@ -2,117 +2,54 @@ using System;
 
 namespace Avalonia.OpenGL
 {
-    public interface IGlEntryPointAttribute
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    class GlMinVersionEntryPoint : Attribute
     {
-        IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress);
-    }
-    
-    public interface IGlEntryPointAttribute<in TContext>
-    {
-        IntPtr GetProcAddress(TContext context, Func<string, IntPtr> getProcAddress);
-    }
-
-    [AttributeUsage(AttributeTargets.Property)]
-    public class GlOptionalEntryPoint : Attribute
-    {
-        
-    }
-    
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
-    public class GlEntryPointAttribute : Attribute, IGlEntryPointAttribute
-    {
-        public string[] EntryPoints { get; }
-
-        public GlEntryPointAttribute(string entryPoint)
-        {
-            EntryPoints = new []{entryPoint};
-        }
-/*
-        public GlEntryPointAttribute(params string[] entryPoints)
+        public GlMinVersionEntryPoint(string entry, int minVersionMajor, int minVersionMinor)
         {
-            EntryPoints = entryPoints;
-        }
-*/
-        public IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress)
-        {
-            foreach (var name in EntryPoints)
-            {
-                var rv = getProcAddress(name);
-                if (rv != IntPtr.Zero)
-                    return rv;
-            }
-            return IntPtr.Zero;
-        }
-    }
-    
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
-    public class GlMinVersionEntryPoint : Attribute, IGlEntryPointAttribute<GlInterface.GlContextInfo>
-    {
-        private readonly string _entry;
-        private readonly GlProfileType? _profile;
-        private readonly int _minVersionMajor;
-        private readonly int _minVersionMinor;
-
-        public GlMinVersionEntryPoint(string entry, GlProfileType profile, int minVersionMajor,
-            int minVersionMinor)
-        {
-            _entry = entry;
-            _profile = profile;
-            _minVersionMajor = minVersionMajor;
-            _minVersionMinor = minVersionMinor;
         }
         
-        public GlMinVersionEntryPoint(string entry, int minVersionMajor,
-            int minVersionMinor)
+        public GlMinVersionEntryPoint(string entry, int minVersionMajor, int minVersionMinor, GlProfileType profile)
         {
-            _entry = entry;
-            _minVersionMajor = minVersionMajor;
-            _minVersionMinor = minVersionMinor;
         }
+
         
-        public IntPtr GetProcAddress(GlInterface.GlContextInfo context, Func<string, IntPtr> getProcAddress)
+        public static IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress, GlInterface.GlContextInfo context,
+            string entry, int minVersionMajor, int minVersionMinor, GlProfileType? profile = null)
         {
-            if(_profile.HasValue && context.Version.Type != _profile)
+            if(profile.HasValue && context.Version.Type != profile)
                 return IntPtr.Zero;
-            if(context.Version.Major<_minVersionMajor)
+            if(context.Version.Major<minVersionMajor)
                 return IntPtr.Zero;
-            if (context.Version.Major == _minVersionMajor && context.Version.Minor < _minVersionMinor)
+            if (context.Version.Major == minVersionMajor && context.Version.Minor < minVersionMinor)
                 return IntPtr.Zero;
-            return getProcAddress(_entry);
+            return getProcAddress(entry);
         }
     }
     
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
-    public class GlExtensionEntryPoint : Attribute, IGlEntryPointAttribute<GlInterface.GlContextInfo>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    class GlExtensionEntryPoint : Attribute
     {
-        private readonly string _entry;
-        private readonly GlProfileType? _profile;
-        private readonly string _extension;
-
-        public GlExtensionEntryPoint(string entry, GlProfileType profile, string extension)
+        public GlExtensionEntryPoint(string entry, string extension)
         {
-            _entry = entry;
-            _profile = profile;
-            _extension = extension;
         }
         
-        public GlExtensionEntryPoint(string entry, string extension)
+        public GlExtensionEntryPoint(string entry, string extension, GlProfileType profile)
         {
-            _entry = entry;
-            _extension = extension;
         }
         
-        public IntPtr GetProcAddress(GlInterface.GlContextInfo context, Func<string, IntPtr> getProcAddress)
+        public static IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress, GlInterface.GlContextInfo context,
+            string entry, string extension, GlProfileType? profile = null)
         {
             // Ignore different profile type
-            if (_profile.HasValue && _profile != context.Version.Type)
+            if (profile.HasValue && profile != context.Version.Type)
                 return IntPtr.Zero;
 
             // Check if extension is supported by the current context
-            if (!context.Extensions.Contains(_extension))
+            if (!context.Extensions.Contains(extension))
                 return IntPtr.Zero;
 
-            return getProcAddress(_entry);
+            return getProcAddress(entry);
         }
     }
 }
diff --git a/src/Avalonia.OpenGL/GlInterface.cs b/src/Avalonia.OpenGL/GlInterface.cs
index cae245732f..a9dd882e3b 100644
--- a/src/Avalonia.OpenGL/GlInterface.cs
+++ b/src/Avalonia.OpenGL/GlInterface.cs
@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
 using static Avalonia.OpenGL.GlConsts;
 
 namespace Avalonia.OpenGL
 {
-    public delegate IntPtr GlGetProcAddressDelegate(string procName);
-    
-    public unsafe class GlInterface : GlBasicInfoInterface<GlInterface.GlContextInfo>
+    public unsafe partial class GlInterface : GlBasicInfoInterface
     {
+        private readonly Func<string, IntPtr> _getProcAddress;
         public string Version { get; }
         public string Vendor { get; }
         public string Renderer { get; }
@@ -35,12 +35,14 @@ namespace Avalonia.OpenGL
             }
         }
 
-        private GlInterface(GlContextInfo info, Func<string, IntPtr> getProcAddress) : base(getProcAddress, info)
+        private GlInterface(GlContextInfo info, Func<string, IntPtr> getProcAddress) : base(getProcAddress)
         {
+            _getProcAddress = getProcAddress;
             ContextInfo = info;
             Version = GetString(GlConsts.GL_VERSION);
             Renderer = GetString(GlConsts.GL_RENDERER);
-            Vendor = GetString(GlConsts.GL_VENDOR);   
+            Vendor = GetString(GlConsts.GL_VENDOR);
+            Initialize(getProcAddress, ContextInfo);
         }
 
         public GlInterface(GlVersion version, Func<string, IntPtr> getProcAddress) : this(
@@ -48,77 +50,58 @@ namespace Avalonia.OpenGL
         {
         }
 
-        public GlInterface(GlVersion version, Func<Utf8Buffer, IntPtr> n) : this(version, ConvertNative(n))
-        {
-            
-        }
+        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc);
+
+        [GetProcAddress("glGetError")]
+        public partial int GetError();
 
-        public static GlInterface FromNativeUtf8GetProcAddress(GlVersion version, Func<Utf8Buffer, IntPtr> getProcAddress) =>
-            new GlInterface(version, getProcAddress);
+        [GetProcAddress("glClearStencil")]
+        public partial void ClearStencil(int s);
 
-        
-        public T GetProcAddress<T>(string proc) => Marshal.GetDelegateForFunctionPointer<T>(GetProcAddress(proc));
+        [GetProcAddress("glClearColor")]
+        public partial void ClearColor(float r, float g, float b, float a);
 
-        // ReSharper disable UnassignedGetOnlyAutoProperty
-        public delegate int GlGetError();
-        [GlEntryPoint("glGetError")]
-        public GlGetError GetError { get; }
+        [GetProcAddress("glClear")]
+        public partial void Clear(int bits);
 
-        public delegate void GlClearStencil(int s);
-        [GlEntryPoint("glClearStencil")]
-        public GlClearStencil ClearStencil { get; }
+        [GetProcAddress("glViewport")]
+        public partial void Viewport(int x, int y, int width, int height);
 
-        public delegate void GlClearColor(float r, float g, float b, float a);
-        [GlEntryPoint("glClearColor")]
-        public GlClearColor ClearColor { get; }
+        [GetProcAddress("glFlush")]
+        public partial void Flush();
 
-        public delegate void GlClear(int bits);
-        [GlEntryPoint("glClear")]
-        public GlClear Clear { get; }
+        [GetProcAddress("glFinish")]
+        public partial void Finish();
 
-        public delegate void GlViewport(int x, int y, int width, int height);
-        [GlEntryPoint("glViewport")]
-        public GlViewport Viewport { get; }
-        
-        [GlEntryPoint("glFlush")]
-        public Action Flush { get; }
-        
-        [GlEntryPoint("glFinish")]
-        public Action Finish { get; }
+        [GetProcAddress("glGetIntegerv")]
+        public partial void GetIntegerv(int name, out int rv);
 
-        public delegate IntPtr GlGetString(int v);
-        [GlEntryPoint("glGetString")]
-        public GlGetString GetStringNative { get; }
+        [GetProcAddress("glGenFramebuffers")]
+        public partial void GenFramebuffers(int count, int* res);
 
-        public string GetString(int v)
+        public int GenFramebuffer()
         {
-            var ptr = GetStringNative(v);
-            if (ptr != IntPtr.Zero)
-                return Marshal.PtrToStringAnsi(ptr);
-            return null;
+            int rv = 0;
+            GenFramebuffers(1, &rv);
+            return rv;
         }
 
-        public delegate void GlGetIntegerv(int name, out int rv);
-        [GlEntryPoint("glGetIntegerv")]
-        public GlGetIntegerv GetIntegerv { get; }
-
-        public delegate void GlGenFramebuffers(int count, int[] res);
-        [GlEntryPoint("glGenFramebuffers")]
-        public GlGenFramebuffers GenFramebuffers { get; }
-        
-        public delegate void GlDeleteFramebuffers(int count, int[] framebuffers);
-        [GlEntryPoint("glDeleteFramebuffers")]
-        public GlDeleteFramebuffers DeleteFramebuffers { get; }
-        
-        public delegate void GlBindFramebuffer(int target, int fb);
-        [GlEntryPoint("glBindFramebuffer")]
-        public GlBindFramebuffer BindFramebuffer { get; }
-        
-        public delegate int GlCheckFramebufferStatus(int target);
-        [GlEntryPoint("glCheckFramebufferStatus")]
-        public GlCheckFramebufferStatus CheckFramebufferStatus { get; }
-
-        public delegate void GlBlitFramebuffer(int srcX0,
+        [GetProcAddress("glDeleteFramebuffers")]
+        public partial void DeleteFramebuffers(int count, int* framebuffers);
+
+        public void DeleteFramebuffer(int fb)
+        {
+            DeleteFramebuffers(1, &fb);
+        }
+
+        [GetProcAddress("glBindFramebuffer")]
+        public partial void BindFramebuffer(int target, int fb);
+
+        [GetProcAddress("glCheckFramebufferStatus")]
+        public partial int CheckFramebufferStatus(int target);
+
+        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0), GetProcAddress(true)]
+        public partial void BlitFramebuffer(int srcX0,
             int srcY0,
             int srcX1,
             int srcY1,
@@ -128,74 +111,78 @@ namespace Avalonia.OpenGL
             int dstY1,
             int mask,
             int filter);
-        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0), GlOptionalEntryPoint]
-        public GlBlitFramebuffer BlitFramebuffer { get; }
-        
-        public delegate void GlGenRenderbuffers(int count, int[] res);
-        [GlEntryPoint("glGenRenderbuffers")]
-        public GlGenRenderbuffers GenRenderbuffers { get; }
-        
-        public delegate void GlDeleteRenderbuffers(int count, int[] renderbuffers);
-        [GlEntryPoint("glDeleteRenderbuffers")]
-        public GlDeleteTextures DeleteRenderbuffers { get; }
-        
-        public delegate void GlBindRenderbuffer(int target, int fb);
-        [GlEntryPoint("glBindRenderbuffer")]
-        public GlBindRenderbuffer BindRenderbuffer { get; }
-        
-        public delegate void GlRenderbufferStorage(int target, int internalFormat, int width, int height);
-        [GlEntryPoint("glRenderbufferStorage")]
-        public GlRenderbufferStorage RenderbufferStorage { get; }
-
-        public delegate void GlFramebufferRenderbuffer(int target, int attachment,
+
+
+        [GetProcAddress("glGenRenderbuffers")]
+        public partial void GenRenderbuffers(int count, int* res);
+
+        public int GenRenderbuffer()
+        {
+            int rv = 0;
+            GenRenderbuffers(1, &rv);
+            return rv;
+        }
+
+        [GetProcAddress("glDeleteRenderbuffers")]
+        public partial void DeleteRenderbuffers(int count, int* renderbuffers);
+
+        public void DeleteRenderbuffer(int renderbuffer)
+        {
+            DeleteRenderbuffers(1, &renderbuffer);
+        }
+
+        [GetProcAddress("glBindRenderbuffer")]
+        public partial void BindRenderbuffer(int target, int fb);
+
+        [GetProcAddress("glRenderbufferStorage")]
+        public partial void RenderbufferStorage(int target, int internalFormat, int width, int height);
+
+        [GetProcAddress("glFramebufferRenderbuffer")]
+        public partial void FramebufferRenderbuffer(int target, int attachment,
             int renderbufferTarget, int renderbuffer);
-        [GlEntryPoint("glFramebufferRenderbuffer")]
-        public GlFramebufferRenderbuffer FramebufferRenderbuffer { get; }
-        
-        public delegate void GlGenTextures(int count, int[] res);
-        [GlEntryPoint("glGenTextures")]
-        public GlGenTextures GenTextures { get; }
-        
-        public delegate void GlBindTexture(int target, int fb);
-        [GlEntryPoint("glBindTexture")]
-        public GlBindTexture BindTexture { get; }
-        
-        public delegate void GlActiveTexture(int texture);
-        [GlEntryPoint("glActiveTexture")]
-        public GlActiveTexture ActiveTexture { get; }
-        
-        public delegate void GlDeleteTextures(int count, int[] textures);
-        [GlEntryPoint("glDeleteTextures")]
-        public GlDeleteTextures DeleteTextures { get; }
-
-
-        public delegate void GlTexImage2D(int target, int level, int internalFormat, int width, int height, int border,
+
+        [GetProcAddress("glGenTextures")]
+        public partial void GenTextures(int count, int* res);
+
+        public int GenTexture()
+        {
+            int rv = 0;
+            GenTextures(1, &rv);
+            return rv;
+        }
+
+        [GetProcAddress("glBindTexture")]
+        public partial void BindTexture(int target, int fb);
+
+        [GetProcAddress("glActiveTexture")]
+        public partial void ActiveTexture(int texture);
+
+        [GetProcAddress("glDeleteTextures")]
+        public partial void DeleteTextures(int count, int* textures);
+
+        public void DeleteTexture(int texture) => DeleteTextures(1, &texture);
+
+        [GetProcAddress("glTexImage2D")]
+        public partial void TexImage2D(int target, int level, int internalFormat, int width, int height, int border,
             int format, int type, IntPtr data);
-        [GlEntryPoint("glTexImage2D")]
-        public GlTexImage2D TexImage2D { get; }
 
-        public delegate void GlCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
+        [GetProcAddress("glCopyTexSubImage2D")]
+        public partial void CopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
             int width, int height);
-        
-        [GlEntryPoint("glCopyTexSubImage2D")]
-        public GlCopyTexSubImage2D CopyTexSubImage2D { get; }
 
-        public delegate void GlTexParameteri(int target, int name, int value);
-        [GlEntryPoint("glTexParameteri")]
-        public GlTexParameteri TexParameteri { get; }
+        [GetProcAddress("glTexParameteri")]
+        public partial void TexParameteri(int target, int name, int value);
+
 
-        public delegate void GlFramebufferTexture2D(int target, int attachment,
+        [GetProcAddress("glFramebufferTexture2D")]
+        public partial void FramebufferTexture2D(int target, int attachment,
             int texTarget, int texture, int level);
-        [GlEntryPoint("glFramebufferTexture2D")]
-        public GlFramebufferTexture2D FramebufferTexture2D { get; }
-        
-        public delegate int GlCreateShader(int shaderType);
-        [GlEntryPoint("glCreateShader")]
-        public GlCreateShader CreateShader { get; }
 
-        public delegate void GlShaderSource(int shader, int count, IntPtr strings, IntPtr lengths);
-        [GlEntryPoint("glShaderSource")]
-        public GlShaderSource ShaderSource { get; }
+        [GetProcAddress("glCreateShader")]
+        public partial int CreateShader(int shaderType);
+
+        [GetProcAddress("glShaderSource")]
+        public partial void ShaderSource(int shader, int count, IntPtr strings, IntPtr lengths);
 
         public void ShaderSourceString(int shader, string source)
         {
@@ -207,17 +194,14 @@ namespace Avalonia.OpenGL
             }
         }
 
-        public delegate void GlCompileShader(int shader);
-        [GlEntryPoint("glCompileShader")]
-        public GlCompileShader CompileShader { get; }
-        
-        public delegate void GlGetShaderiv(int shader, int name, int* parameters);
-        [GlEntryPoint("glGetShaderiv")]
-        public GlGetShaderiv GetShaderiv { get; }
+        [GetProcAddress("glCompileShader")]
+        public partial void CompileShader(int shader);
+
+        [GetProcAddress("glGetShaderiv")]
+        public partial void GetShaderiv(int shader, int name, int* parameters);
 
-        public delegate void GlGetShaderInfoLog(int shader, int maxLength, out int length, void*infoLog);
-        [GlEntryPoint("glGetShaderInfoLog")]
-        public GlGetShaderInfoLog GetShaderInfoLog { get; }
+        [GetProcAddress("glGetShaderInfoLog")]
+        public partial void GetShaderInfoLog(int shader, int maxLength, out int length, void* infoLog);
 
         public unsafe string CompileShaderAndGetError(int shader, string source)
         {
@@ -235,28 +219,24 @@ namespace Avalonia.OpenGL
             int len;
             fixed (void* ptr = logData)
                 GetShaderInfoLog(shader, logLength, out len, ptr);
-            return Encoding.UTF8.GetString(logData,0, len);
+            return Encoding.UTF8.GetString(logData, 0, len);
         }
-        
-        public delegate int GlCreateProgram();
-        [GlEntryPoint("glCreateProgram")]
-        public GlCreateProgram CreateProgram { get; }
-
-        public delegate void GlAttachShader(int program, int shader);
-        [GlEntryPoint("glAttachShader")]
-        public GlAttachShader AttachShader { get; }
-
-        public delegate void GlLinkProgram(int program);
-        [GlEntryPoint("glLinkProgram")]
-        public GlLinkProgram LinkProgram { get; }
-        
-        public delegate void GlGetProgramiv(int program, int name, int* parameters);
-        [GlEntryPoint("glGetProgramiv")]
-        public GlGetProgramiv GetProgramiv { get; }
-
-        public delegate void GlGetProgramInfoLog(int program, int maxLength, out int len, void* infoLog);
-        [GlEntryPoint("glGetProgramInfoLog")]
-        public GlGetProgramInfoLog GetProgramInfoLog { get; }
+
+
+        [GetProcAddress("glCreateProgram")]
+        public partial int CreateProgram();
+
+        [GetProcAddress("glAttachShader")]
+        public partial void AttachShader(int program, int shader);
+
+        [GetProcAddress("glLinkProgram")]
+        public partial void LinkProgram(int program);
+
+        [GetProcAddress("glGetProgramiv")]
+        public partial void GetProgramiv(int program, int name, int* parameters);
+
+        [GetProcAddress("glGetProgramInfoLog")]
+        public partial void GetProgramInfoLog(int program, int maxLength, out int len, void* infoLog);
 
         public unsafe string LinkProgramAndGetError(int program)
         {
@@ -271,41 +251,36 @@ namespace Avalonia.OpenGL
             int len;
             fixed (void* ptr = logData)
                 GetProgramInfoLog(program, logLength, out len, ptr);
-            return Encoding.UTF8.GetString(logData,0, len);
+            return Encoding.UTF8.GetString(logData, 0, len);
         }
 
-        public delegate void GlBindAttribLocation(int program, int index, IntPtr name);
-        [GlEntryPoint("glBindAttribLocation")]
-        public GlBindAttribLocation BindAttribLocation { get; }
+        [GetProcAddress("glBindAttribLocation")]
+        public partial void BindAttribLocation(int program, int index, IntPtr name);
 
         public void BindAttribLocationString(int program, int index, string name)
         {
             using (var b = new Utf8Buffer(name))
                 BindAttribLocation(program, index, b.DangerousGetHandle());
         }
-        
-        public delegate void GlGenBuffers(int len, int[] rv);
-        [GlEntryPoint("glGenBuffers")]
-        public GlGenBuffers GenBuffers { get; }
+
+        [GetProcAddress("glGenBuffers")]
+        public partial void GenBuffers(int len, int* rv);
 
         public int GenBuffer()
         {
-            var rv = new int[1];
-            GenBuffers(1, rv);
-            return rv[0];
+            int rv;
+            GenBuffers(1, &rv);
+            return rv;
         }
-        
-        public delegate void GlBindBuffer(int target, int buffer);
-        [GlEntryPoint("glBindBuffer")]
-        public GlBindBuffer BindBuffer { get; }
-
-        public delegate void GlBufferData(int target, IntPtr size, IntPtr data, int usage);
-        [GlEntryPoint("glBufferData")]
-        public GlBufferData BufferData { get; }
-        
-        public delegate int GlGetAttribLocation(int program, IntPtr name);
-        [GlEntryPoint("glGetAttribLocation")]
-        public GlGetAttribLocation GetAttribLocation { get; }
+
+        [GetProcAddress("glBindBuffer")]
+        public partial void BindBuffer(int target, int buffer);
+
+        [GetProcAddress("glBufferData")]
+        public partial void BufferData(int target, IntPtr size, IntPtr data, int usage);
+
+        [GetProcAddress("glGetAttribLocation")]
+        public partial int GetAttribLocation(int program, IntPtr name);
 
         public int GetAttribLocationString(int program, string name)
         {
@@ -313,61 +288,90 @@ namespace Avalonia.OpenGL
                 return GetAttribLocation(program, b.DangerousGetHandle());
         }
 
-        public delegate void GlVertexAttribPointer(int index, int size, int type,
+        [GetProcAddress("glVertexAttribPointer")]
+        public partial void VertexAttribPointer(int index, int size, int type,
             int normalized, int stride, IntPtr pointer);
-        [GlEntryPoint("glVertexAttribPointer")]
-        public GlVertexAttribPointer VertexAttribPointer { get; }
-        
-        public delegate void GlEnableVertexAttribArray(int index);
-        [GlEntryPoint("glEnableVertexAttribArray")]
-        public GlEnableVertexAttribArray EnableVertexAttribArray { get; }
-
-        public delegate void GlUseProgram(int program);
-        [GlEntryPoint("glUseProgram")]
-        public GlUseProgram UseProgram { get; }
-        
-        public delegate void GlDrawArrays(int mode, int first, IntPtr count);
-        [GlEntryPoint("glDrawArrays")]
-        public GlDrawArrays DrawArrays { get; }
-        
-        public delegate void GlDrawElements(int mode, int count, int type, IntPtr indices);
-        [GlEntryPoint("glDrawElements")]
-        public GlDrawElements DrawElements { get; }
-
-        public delegate int GlGetUniformLocation(int program, IntPtr name);
-        [GlEntryPoint("glGetUniformLocation")]
-        public GlGetUniformLocation GetUniformLocation { get; }
+
+        [GetProcAddress("glEnableVertexAttribArray")]
+        public partial void EnableVertexAttribArray(int index);
+
+        [GetProcAddress("glUseProgram")]
+        public partial void UseProgram(int program);
+
+        [GetProcAddress("glDrawArrays")]
+        public partial void DrawArrays(int mode, int first, IntPtr count);
+
+        [GetProcAddress("glDrawElements")]
+        public partial void DrawElements(int mode, int count, int type, IntPtr indices);
+
+        [GetProcAddress("glGetUniformLocation")]
+        public partial int GetUniformLocation(int program, IntPtr name);
 
         public int GetUniformLocationString(int program, string name)
         {
             using (var b = new Utf8Buffer(name))
                 return GetUniformLocation(program, b.DangerousGetHandle());
         }
-        
-        public delegate void GlUniform1f(int location, float falue);
-        [GlEntryPoint("glUniform1f")]
-        public GlUniform1f Uniform1f { get; }
-
-        
-        public delegate void GlUniformMatrix4fv(int location, int count, bool transpose, void* value);
-        [GlEntryPoint("glUniformMatrix4fv")]
-        public GlUniformMatrix4fv UniformMatrix4fv { get; }
-        
-        public delegate void GlEnable(int what);
-        [GlEntryPoint("glEnable")]
-        public GlEnable Enable { get; }
-
-        public delegate void GlDeleteBuffers(int count, int[] buffers);
-        [GlEntryPoint("glDeleteBuffers")]
-        public GlDeleteBuffers DeleteBuffers { get; }
-
-        public delegate void GlDeleteProgram(int program);
-        [GlEntryPoint("glDeleteProgram")]
-        public GlDeleteProgram DeleteProgram { get; }
-
-        public delegate void GlDeleteShader(int shader);
-        [GlEntryPoint("glDeleteShader")]
-        public GlDeleteShader DeleteShader { get; }
+
+        [GetProcAddress("glUniform1f")]
+        public partial void Uniform1f(int location, float falue);
+
+
+        [GetProcAddress("glUniformMatrix4fv")]
+        public partial void UniformMatrix4fv(int location, int count, bool transpose, void* value);
+
+        [GetProcAddress("glEnable")]
+        public partial void Enable(int what);
+
+        [GetProcAddress("glDeleteBuffers")]
+        public partial void DeleteBuffers(int count, int* buffers);
+
+        public void DeleteBuffer(int buffer) => DeleteBuffers(1, &buffer);
+
+        [GetProcAddress("glDeleteProgram")]
+        public partial void DeleteProgram(int program);
+
+        [GetProcAddress("glDeleteShader")]
+        public partial void DeleteShader(int shader);
+
+        [GetProcAddress("glGetRenderbufferParameteriv")]
+        public partial void GetRenderbufferParameteriv(int target, int name, out int value);
         // ReSharper restore UnassignedGetOnlyAutoProperty
+
+        [GetProcAddress(true)]
+        [GlMinVersionEntryPoint("glDeleteVertexArrays", 3, 0)]
+        [GlExtensionEntryPoint("glDeleteVertexArraysOES", "GL_OES_vertex_array_object")]
+        public partial void DeleteVertexArrays(int count, int* arrays);
+
+        public void DeleteVertexArray(int array) => DeleteVertexArrays(1, &array);
+
+        [GetProcAddress(true)]
+        [GlMinVersionEntryPoint("glBindVertexArray", 3, 0)]
+        [GlExtensionEntryPoint("glBindVertexArrayOES", "GL_OES_vertex_array_object")]
+        public partial void BindVertexArray(int array);
+
+
+        [GetProcAddress(true)]
+        [GlMinVersionEntryPoint("glGenVertexArrays", 3, 0)]
+        [GlExtensionEntryPoint("glGenVertexArraysOES", "GL_OES_vertex_array_object")]
+        public partial void GenVertexArrays(int n, int* rv);
+
+        public int GenVertexArray()
+        {
+            int rv = 0;
+            GenVertexArrays(1, &rv);
+            return rv;
+        }
+
+        public static GlInterface FromNativeUtf8GetProcAddress(GlVersion version, Func<IntPtr, IntPtr> getProcAddress)
+        {
+            return new GlInterface(version, s =>
+            {
+                var ptr = Marshal.StringToHGlobalAnsi(s);
+                var rv = getProcAddress(ptr);
+                Marshal.FreeHGlobal(ptr);
+                return rv;
+            });
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/GlInterfaceBase.cs b/src/Avalonia.OpenGL/GlInterfaceBase.cs
deleted file mode 100644
index e7dd440e36..0000000000
--- a/src/Avalonia.OpenGL/GlInterfaceBase.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Avalonia.Platform.Interop;
-
-namespace Avalonia.OpenGL
-{
-    public class GlInterfaceBase : GlInterfaceBase<object>
-    {
-        public GlInterfaceBase(Func<string, IntPtr> getProcAddress) : base(getProcAddress, null)
-        {
-        }
-
-        public GlInterfaceBase(Func<Utf8Buffer, IntPtr> nativeGetProcAddress) : base(nativeGetProcAddress, null)
-        {
-        }
-    }
-
-    public class GlInterfaceBase<TContext>
-    {
-        private readonly Func<string, IntPtr> _getProcAddress;
-        public GlInterfaceBase(Func<string, IntPtr> getProcAddress, TContext context)
-        {
-            _getProcAddress = getProcAddress;
-            foreach (var prop in this.GetType().GetProperties())
-            {
-                var attrs = prop.GetCustomAttributes()
-                    .Where(a =>
-                        a is IGlEntryPointAttribute || a is IGlEntryPointAttribute<TContext>)
-                    .ToList();
-                if(attrs.Count == 0)
-                    continue;
-                
-                var isOptional = prop.GetCustomAttribute<GlOptionalEntryPoint>() != null;
-                
-                var fieldName = $"<{prop.Name}>k__BackingField";
-                var field = prop.DeclaringType.GetField(fieldName,
-                    BindingFlags.Instance | BindingFlags.NonPublic);
-                if (field == null)
-                    throw new InvalidProgramException($"Expected property {prop.Name} to have {fieldName}");
-                
-                
-                IntPtr proc = IntPtr.Zero;
-                foreach (var attr in attrs)
-                {
-                    if (attr is IGlEntryPointAttribute<TContext> typed)
-                        proc = typed.GetProcAddress(context, getProcAddress);
-                    else if (attr is IGlEntryPointAttribute untyped)
-                        proc = untyped.GetProcAddress(getProcAddress);
-                    if (proc != IntPtr.Zero)
-                        break;
-                }
-                
-                if (proc != IntPtr.Zero)
-                    field.SetValue(this, Marshal.GetDelegateForFunctionPointer(proc, prop.PropertyType));
-                else if (!isOptional)
-                    throw new OpenGlException("Unable to find a suitable GL function for " + prop.Name);
-            }
-        }
-
-        protected static Func<string, IntPtr> ConvertNative(Func<Utf8Buffer, IntPtr> func) =>
-            (proc) =>
-            {
-                using (var u = new Utf8Buffer(proc))
-                {
-                    var rv = func(u);
-                    return rv;
-                }
-            };
-        
-        public GlInterfaceBase(Func<Utf8Buffer, IntPtr> nativeGetProcAddress, TContext context) : this(ConvertNative(nativeGetProcAddress), context)
-        {
-            
-        }
-        
-        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc);
-    }
-}
diff --git a/src/Avalonia.OpenGL/IGlContext.cs b/src/Avalonia.OpenGL/IGlContext.cs
index 50868db873..a52a6535da 100644
--- a/src/Avalonia.OpenGL/IGlContext.cs
+++ b/src/Avalonia.OpenGL/IGlContext.cs
@@ -1,8 +1,9 @@
 using System;
+using Avalonia.Platform;
 
 namespace Avalonia.OpenGL
 {
-    public interface IGlContext : IDisposable
+    public interface IGlContext : IPlatformGpuContext
     {
         GlVersion Version { get; }
         GlInterface GlInterface { get; }
diff --git a/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs b/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs
index 5ee5df1e85..4ff7997b03 100644
--- a/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs
+++ b/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs
@@ -1,8 +1,10 @@
+using Avalonia.Platform;
+
 namespace Avalonia.OpenGL
 {
-    public interface IPlatformOpenGlInterface
+    public interface IPlatformOpenGlInterface : IPlatformGpu
     {
-        IGlContext PrimaryContext { get; }
+        new IGlContext PrimaryContext { get; }
         IGlContext CreateSharedContext();
         bool CanShareContexts { get; }
         bool CanCreateContexts { get; }
diff --git a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
index aef4f601be..22f0cebf57 100644
--- a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
+++ b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
@@ -1,15 +1,17 @@
 using System;
-using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.OpenGL.Imaging
 {
+    [Unstable]
     public interface IOpenGlBitmapImpl : IBitmapImpl
     {
         IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context, Action presentCallback);
         bool SupportsContext(IGlContext context);
     }
 
+    [Unstable]
     public interface IOpenGlBitmapAttachment : IDisposable
     {
         void Present();
diff --git a/src/Avalonia.PlatformSupport/AssetLoader.cs b/src/Avalonia.PlatformSupport/AssetLoader.cs
deleted file mode 100644
index 7220694d7b..0000000000
--- a/src/Avalonia.PlatformSupport/AssetLoader.cs
+++ /dev/null
@@ -1,403 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.PlatformSupport
-{
-    /// <summary>
-    /// Loads assets compiled into the application binary.
-    /// </summary>
-    public class AssetLoader : IAssetLoader
-    {
-        private const string AvaloniaResourceName = "!AvaloniaResources";
-        private static readonly Dictionary<string, AssemblyDescriptor> AssemblyNameCache
-            = new Dictionary<string, AssemblyDescriptor>();
-
-        private AssemblyDescriptor? _defaultResmAssembly;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssetLoader"/> class.
-        /// </summary>
-        /// <param name="assembly">
-        /// The default assembly from which to load resm: assets for which no assembly is specified.
-        /// </param>
-        public AssetLoader(Assembly? assembly = null)
-        {
-            if (assembly == null)
-                assembly = Assembly.GetEntryAssembly();
-            if (assembly != null)
-                _defaultResmAssembly = new AssemblyDescriptor(assembly);
-        }
-
-        /// <summary>
-        /// Sets the default assembly from which to load assets for which no assembly is specified.
-        /// </summary>
-        /// <param name="assembly">The default assembly.</param>
-        public void SetDefaultAssembly(Assembly assembly)
-        {
-            _defaultResmAssembly = new AssemblyDescriptor(assembly);
-        }
-
-        /// <summary>
-        /// Checks if an asset with the specified URI exists.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">
-        /// A base URI to use if <paramref name="uri"/> is relative.
-        /// </param>
-        /// <returns>True if the asset could be found; otherwise false.</returns>
-        public bool Exists(Uri uri, Uri? baseUri = null)
-        {
-            return GetAsset(uri, baseUri) != null;
-        }
-
-        /// <summary>
-        /// Opens the asset with the requested URI.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">
-        /// A base URI to use if <paramref name="uri"/> is relative.
-        /// </param>
-        /// <returns>A stream containing the asset contents.</returns>
-        /// <exception cref="FileNotFoundException">
-        /// The asset could not be found.
-        /// </exception>
-        public Stream Open(Uri uri, Uri? baseUri = null) => OpenAndGetAssembly(uri, baseUri).Item1;
-
-        /// <summary>
-        /// Opens the asset with the requested URI and returns the asset stream and the
-        /// assembly containing the asset.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">
-        /// A base URI to use if <paramref name="uri"/> is relative.
-        /// </param>
-        /// <returns>
-        /// The stream containing the resource contents together with the assembly.
-        /// </returns>
-        /// <exception cref="FileNotFoundException">
-        /// The asset could not be found.
-        /// </exception>
-        public (Stream stream, Assembly assembly) OpenAndGetAssembly(Uri uri, Uri? baseUri = null)
-        {
-            var asset = GetAsset(uri, baseUri);
-
-            if (asset == null)
-            {
-                throw new FileNotFoundException($"The resource {uri} could not be found.");
-            }
-
-            return (asset.GetStream(), asset.Assembly);
-        }
-
-        public Assembly? GetAssembly(Uri uri, Uri? baseUri)
-        {
-            if (!uri.IsAbsoluteUri && baseUri != null)
-                uri = new Uri(baseUri, uri);
-            return GetAssembly(uri)?.Assembly;
-        }
-
-        /// <summary>
-        /// Gets all assets of a folder and subfolders that match specified uri.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">Base URI that is used if <paramref name="uri"/> is relative.</param>
-        /// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
-        public IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri)
-        {
-            if (uri.IsAbsoluteUri && uri.Scheme == "resm")
-            {
-                var assembly = GetAssembly(uri);
-
-                return assembly?.Resources?.Where(x => x.Key.Contains(uri.AbsolutePath))
-                           .Select(x =>new Uri($"resm:{x.Key}?assembly={assembly.Name}")) ??
-                       Enumerable.Empty<Uri>();
-            }
-
-            uri = EnsureAbsolute(uri, baseUri);
-            if (uri.Scheme == "avares")
-            {
-                var (asm, path) = GetResAsmAndPath(uri);
-                if (asm == null)
-                {
-                    throw new ArgumentException(
-                        "No default assembly, entry assembly or explicit assembly specified; " +
-                        "don't know where to look up for the resource, try specifying assembly explicitly.");
-                }
-
-                if (asm?.AvaloniaResources == null)
-                    return Enumerable.Empty<Uri>();
-                path = path.TrimEnd('/') + '/';
-                return asm.AvaloniaResources.Where(r => r.Key.StartsWith(path))
-                    .Select(x => new Uri($"avares://{asm.Name}{x.Key}"));
-            }
-
-            return Enumerable.Empty<Uri>();
-        }
-
-        private Uri EnsureAbsolute(Uri uri, Uri? baseUri)
-        {
-            if (uri.IsAbsoluteUri)
-                return uri;
-            if(baseUri == null)
-                throw new ArgumentException($"Relative uri {uri} without base url");
-            if (!baseUri.IsAbsoluteUri)
-                throw new ArgumentException($"Base uri {baseUri} is relative");
-            if (baseUri.Scheme == "resm")
-                throw new ArgumentException(
-                    $"Relative uris for 'resm' scheme aren't supported; {baseUri} uses resm");
-            return new Uri(baseUri, uri);
-        }
-        
-        private IAssetDescriptor? GetAsset(Uri uri, Uri? baseUri)
-        {           
-            if (uri.IsAbsoluteUri && uri.Scheme == "resm")
-            {
-                var asm = GetAssembly(uri) ?? GetAssembly(baseUri) ?? _defaultResmAssembly;
-
-                if (asm == null)
-                {
-                    throw new ArgumentException(
-                        "No default assembly, entry assembly or explicit assembly specified; " +
-                        "don't know where to look up for the resource, try specifying assembly explicitly.");
-                }
-
-                var resourceKey = uri.AbsolutePath;
-                IAssetDescriptor? rv = null;
-                asm.Resources?.TryGetValue(resourceKey, out rv);
-                return rv;
-            }
-
-            uri = EnsureAbsolute(uri, baseUri);
-
-            if (uri.Scheme == "avares")
-            {
-                var (asm, path) = GetResAsmAndPath(uri);
-                if (asm.AvaloniaResources == null)
-                    return null;
-                asm.AvaloniaResources.TryGetValue(path, out var desc);
-                return desc;
-            }
-
-            throw new ArgumentException($"Unsupported url type: " + uri.Scheme, nameof(uri));
-        }
-
-        private (AssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
-        {
-            var asm = GetAssembly(uri.Authority);
-            return (asm, uri.AbsolutePath);
-        }
-        
-        private AssemblyDescriptor? GetAssembly(Uri? uri)
-        {
-            if (uri != null)
-            {
-                if (!uri.IsAbsoluteUri)
-                    return null;
-                if (uri.Scheme == "avares")
-                    return GetResAsmAndPath(uri).asm;
-
-                if (uri.Scheme == "resm")
-                {
-                    var qs = ParseQueryString(uri);
-
-                    if (qs.TryGetValue("assembly", out var assemblyName))
-                    {
-                        return GetAssembly(assemblyName);
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private AssemblyDescriptor GetAssembly(string name)
-        {
-            if (name == null)
-                throw new ArgumentNullException(nameof(name));
-
-            if (!AssemblyNameCache.TryGetValue(name, out var rv))
-            {
-                var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-                var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
-                if (match != null)
-                {
-                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(match);
-                }
-                else
-                {
-                    // iOS does not support loading assemblies dynamically!
-#if NET6_0_OR_GREATER
-                    if (OperatingSystem.IsIOS())
-                    {
-                        throw new InvalidOperationException(
-                            $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
-                    }
-#endif
-                    name = Uri.UnescapeDataString(name);
-                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
-                }
-            }
-
-            return rv;
-        }
-
-        private Dictionary<string, string> ParseQueryString(Uri uri)
-        {
-            return uri.Query.TrimStart('?')
-                .Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(p => p.Split('='))
-                .ToDictionary(p => p[0], p => p[1]);
-        }
-
-        private interface IAssetDescriptor
-        {
-            Stream GetStream();
-            Assembly Assembly { get; }
-        }
-
-        private class AssemblyResourceDescriptor : IAssetDescriptor
-        {
-            private readonly Assembly _asm;
-            private readonly string _name;
-
-            public AssemblyResourceDescriptor(Assembly asm, string name)
-            {
-                _asm = asm;
-                _name = name;
-            }
-
-            public Stream GetStream()
-            {
-                var s = _asm.GetManifestResourceStream(_name);
-                return s ?? throw new InvalidOperationException($"Could not find manifest resource stream '{_name}',");
-            }
-
-            public Assembly Assembly => _asm;
-        }
-        
-        private class AvaloniaResourceDescriptor : IAssetDescriptor
-        {
-            private readonly int _offset;
-            private readonly int _length;
-            public Assembly Assembly { get; }
-
-            public AvaloniaResourceDescriptor(Assembly asm, int offset, int length)
-            {
-                _offset = offset;
-                _length = length;
-                Assembly = asm;
-            }
-            
-            public Stream GetStream()
-            {
-                var s = Assembly.GetManifestResourceStream(AvaloniaResourceName) ??
-                    throw new InvalidOperationException($"Could not find manifest resource stream '{AvaloniaResourceName}',");
-                return new SlicedStream(s, _offset, _length);
-            }
-        }
-        
-        class SlicedStream : Stream
-        {
-            private readonly Stream _baseStream;
-            private readonly int _from;
-
-            public SlicedStream(Stream baseStream, int from, int length)
-            {
-                Length = length;
-                _baseStream = baseStream;
-                _from = from;
-                _baseStream.Position = from;
-            }
-            public override void Flush()
-            {
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return _baseStream.Read(buffer, offset, (int)Math.Min(count, Length - Position));
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                if (origin == SeekOrigin.Begin)
-                    Position = offset;
-                if (origin == SeekOrigin.End)
-                    Position = _from + Length + offset;
-                if (origin == SeekOrigin.Current)
-                    Position = Position + offset;
-                return Position;
-            }
-
-            public override void SetLength(long value) => throw new NotSupportedException();
-
-            public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
-
-            public override bool CanRead => true;
-            public override bool CanSeek => _baseStream.CanRead;
-            public override bool CanWrite => false;
-            public override long Length { get; }
-            public override long Position
-            {
-                get => _baseStream.Position - _from;
-                set => _baseStream.Position = value + _from;
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                if (disposing)
-                    _baseStream.Dispose();
-            }
-
-            public override void Close() => _baseStream.Close();
-        }
-
-        private class AssemblyDescriptor
-        {
-            public AssemblyDescriptor(Assembly assembly)
-            {
-                Assembly = assembly;
-
-                if (assembly != null)
-                {
-                    Resources = assembly.GetManifestResourceNames()
-                        .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
-                    Name = assembly.GetName().Name;
-                    using (var resources = assembly.GetManifestResourceStream(AvaloniaResourceName))
-                    {
-                        if (resources != null)
-                        {
-                            Resources.Remove(AvaloniaResourceName);
-
-                            var indexLength = new BinaryReader(resources).ReadInt32();
-                            var index = AvaloniaResourcesIndexReaderWriter.Read(new SlicedStream(resources, 4, indexLength));
-                            var baseOffset = indexLength + 4;
-                            AvaloniaResources = index.ToDictionary(r => "/" + r.Path!.TrimStart('/'), r => (IAssetDescriptor)
-                                new AvaloniaResourceDescriptor(assembly, baseOffset + r.Offset, r.Size));
-                        }
-                    }
-                }
-            }
-
-            public Assembly Assembly { get; }
-            public Dictionary<string, IAssetDescriptor>? Resources { get; }
-            public Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
-            public string? Name { get; }
-        }
-        
-        public static void RegisterResUriParsers()
-        {
-            if (!UriParser.IsKnownScheme("avares"))
-                UriParser.Register(new GenericUriParser(
-                    GenericUriParserOptions.GenericAuthority |
-                    GenericUriParserOptions.NoUserInfo |
-                    GenericUriParserOptions.NoPort |
-                    GenericUriParserOptions.NoQuery |
-                    GenericUriParserOptions.NoFragment), "avares", -1);
-        }
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj b/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
deleted file mode 100644
index be73d87e2c..0000000000
--- a/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net461;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <ProjectReference Include="../Avalonia.Base/Avalonia.Base.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" />
-  </ItemGroup>
-
-  <Import Project="..\..\build\NetCore.props" />
-  <Import Project="..\..\build\NetFX.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.PlatformSupport/DynLoader.cs b/src/Avalonia.PlatformSupport/DynLoader.cs
deleted file mode 100644
index ad76ac4724..0000000000
--- a/src/Avalonia.PlatformSupport/DynLoader.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using Avalonia.Platform.Interop;
-
-// ReSharper disable InconsistentNaming
-namespace Avalonia.PlatformSupport
-{
-    class UnixLoader : IDynamicLibraryLoader
-    {
-        static class LinuxImports
-        {
-            [DllImport("libdl.so.2")]
-            private static extern IntPtr dlopen(string path, int flags);
-
-            [DllImport("libdl.so.2")]
-            private static extern IntPtr dlsym(IntPtr handle, string symbol);
-
-            [DllImport("libdl.so.2")]
-            private static extern IntPtr dlerror();
-
-            public static void Init()
-            {
-                DlOpen = dlopen;
-                DlSym = dlsym;
-                DlError = dlerror;
-            }
-        }
-
-        static class AndroidImports
-        {
-            [DllImport("libdl.so")]
-            private static extern IntPtr dlopen(string path, int flags);
-
-            [DllImport("libdl.so")]
-            private static extern IntPtr dlsym(IntPtr handle, string symbol);
-
-            [DllImport("libdl.so")]
-            private static extern IntPtr dlerror();
-
-            public static void Init()
-            {
-                DlOpen = dlopen;
-                DlSym = dlsym;
-                DlError = dlerror;
-            }
-        }
-
-        static class OsXImports
-        {
-            [DllImport("/usr/lib/libSystem.dylib")]
-            private static extern IntPtr dlopen(string path, int flags);
-
-            [DllImport("/usr/lib/libSystem.dylib")]
-            private static extern IntPtr dlsym(IntPtr handle, string symbol);
-
-            [DllImport("/usr/lib/libSystem.dylib")]
-            private static extern IntPtr dlerror();
-
-            public static void Init()
-            {
-                DlOpen = dlopen;
-                DlSym = dlsym;
-                DlError = dlerror;
-            }
-            
-        }
-        
-
-        [DllImport("libc")]
-        static extern int uname(IntPtr buf);
-
-        static UnixLoader()
-        {
-            var buffer = Marshal.AllocHGlobal(0x1000);
-            uname(buffer);
-            var unixName = Marshal.PtrToStringAnsi(buffer);
-            Marshal.FreeHGlobal(buffer);
-            if (unixName == "Darwin")
-                OsXImports.Init();
-#if NET6_0_OR_GREATER
-            else if (OperatingSystem.IsAndroid())
-                AndroidImports.Init();
-#endif
-            else
-                LinuxImports.Init();
-        }
-
-        private static Func<string, int, IntPtr>? DlOpen;
-        private static Func<IntPtr, string, IntPtr>? DlSym;
-        private static Func<IntPtr>? DlError;
-        // ReSharper restore InconsistentNaming
-
-        static string? DlErrorString() => Marshal.PtrToStringAnsi(DlError!.Invoke());
-
-        public IntPtr LoadLibrary(string dll)
-        {
-            var handle = DlOpen!.Invoke(dll, 1);
-            if (handle == IntPtr.Zero)
-                throw new DynamicLibraryLoaderException(DlErrorString()!);
-            return handle;
-        }
-
-        public IntPtr GetProcAddress(IntPtr dll, string proc, bool optional)
-        {
-            var ptr = DlSym!.Invoke(dll, proc);
-            if (ptr == IntPtr.Zero && !optional)
-                throw new DynamicLibraryLoaderException(DlErrorString()!);
-            return ptr;
-        }
-    }
-
-    internal class Win32Loader : IDynamicLibraryLoader
-    {
-        [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
-        private static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
-
-        [DllImport("kernel32", EntryPoint = "LoadLibraryW", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern IntPtr LoadLibrary(string lpszLib);
-
-        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
-        {
-            var handle = LoadLibrary(dll);
-            if (handle != IntPtr.Zero)
-                return handle;
-            var err = Marshal.GetLastWin32Error();
-
-            throw new DynamicLibraryLoaderException("Error loading " + dll + " error " + err);
-        }
-
-        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
-        {
-            var ptr = GetProcAddress(dll, proc);
-            if (ptr == IntPtr.Zero && !optional)
-                throw new DynamicLibraryLoaderException("Error " + Marshal.GetLastWin32Error());
-            return ptr;
-        }
-    }
-    
-    internal class NotSupportedLoader : IDynamicLibraryLoader
-    {
-        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
-        {
-            throw new PlatformNotSupportedException();
-        }
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs b/src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs
deleted file mode 100644
index 4eeb9232cf..0000000000
--- a/src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Avalonia.Platform;
-
-namespace Avalonia.PlatformSupport
-{
-    public class StandardRuntimePlatform : IRuntimePlatform
-    {
-        public IDisposable StartSystemTimer(TimeSpan interval, Action tick)
-        {
-            return new Timer(_ => tick(), null, interval, interval);
-        }
-
-        public IUnmanagedBlob AllocBlob(int size) => new UnmanagedBlob(this, size);
-
-        private class UnmanagedBlob : IUnmanagedBlob
-        {
-            private readonly StandardRuntimePlatform _plat;
-            private IntPtr _address;
-            private readonly object _lock = new object();
-#if DEBUG
-            private static readonly List<string> Backtraces = new List<string>();
-            private static Thread? GCThread;
-            private readonly string _backtrace;
-            private static readonly object _btlock = new object();
-
-            class GCThreadDetector
-            {
-                ~GCThreadDetector()
-                {
-                    GCThread = Thread.CurrentThread;
-                }
-            }
-
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            static void Spawn() => new GCThreadDetector();
-
-            static UnmanagedBlob()
-            {
-                Spawn();
-                GC.WaitForPendingFinalizers();
-            }
-#endif
-
-            public UnmanagedBlob(StandardRuntimePlatform plat, int size)
-            {
-                try
-                {
-                    if (size <= 0)
-                        throw new ArgumentException("Positive number required", nameof(size));
-                    _plat = plat;
-                    _address = plat.Alloc(size);
-                    GC.AddMemoryPressure(size);
-                    Size = size;
-                }
-                catch
-                {
-                    GC.SuppressFinalize(this);
-                    throw;
-                }
-#if DEBUG
-                _backtrace = Environment.StackTrace;
-                lock (_btlock)
-                    Backtraces.Add(_backtrace);
-#endif
-            }
-
-            void DoDispose()
-            {
-                lock (_lock)
-                {
-                    if (!IsDisposed)
-                    {
-#if DEBUG
-                        lock (_btlock)
-                            Backtraces.Remove(_backtrace);
-#endif
-                        _plat?.Free(_address, Size);
-                        GC.RemoveMemoryPressure(Size);
-                        IsDisposed = true;
-                        _address = IntPtr.Zero;
-                        Size = 0;
-                    }
-                }
-            }
-
-            public void Dispose()
-            {
-#if DEBUG
-                if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
-                {
-                    lock (_lock)
-                    {
-                        if (!IsDisposed)
-                        {
-                            Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
-                                                 + Environment.StackTrace
-                                                 + "\n\nBlob created by " + _backtrace);
-                        }
-                    }
-                }
-#endif
-                DoDispose();
-                GC.SuppressFinalize(this);
-            }
-
-            ~UnmanagedBlob()
-            {
-#if DEBUG
-                Console.Error.WriteLine("Undisposed native blob created by " + _backtrace);
-#endif
-                DoDispose();
-            }
-
-            public IntPtr Address => IsDisposed ? throw new ObjectDisposedException("UnmanagedBlob") : _address;
-            public int Size { get; private set; }
-            public bool IsDisposed { get; private set; }
-        }
-
-#if NET461 || NETCOREAPP2_0_OR_GREATER
-        [DllImport("libc", SetLastError = true)]
-        private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);
-        [DllImport("libc", SetLastError = true)]
-        private static extern int munmap(IntPtr addr, IntPtr length);
-        [DllImport("libc", SetLastError = true)]
-        private static extern long sysconf(int name);
-
-        private bool? _useMmap;
-        private bool UseMmap
-            => _useMmap ?? ((_useMmap = GetRuntimeInfo().OperatingSystem == OperatingSystemType.Linux)).Value;
-
-        IntPtr Alloc(int size)
-        {
-            if (UseMmap)
-            {
-                var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);
-                if (rv.ToInt64() == -1 || (ulong)rv.ToInt64() == 0xffffffff)
-                {
-                    var errno = Marshal.GetLastWin32Error();
-                    throw new Exception("Unable to allocate memory: " + errno);
-                }
-                return rv;
-            }
-            else
-                return Marshal.AllocHGlobal(size);
-        }
-
-        void Free(IntPtr ptr, int len)
-        {
-            if (UseMmap)
-            {
-                if (munmap(ptr, new IntPtr(len)) == -1)
-                {
-                    var errno = Marshal.GetLastWin32Error();
-                    throw new Exception("Unable to free memory: " + errno);
-                }
-            }
-            else
-                Marshal.FreeHGlobal(ptr);
-        }
-#else
-        IntPtr Alloc(int size) => Marshal.AllocHGlobal(size);
-        void Free(IntPtr ptr, int len) => Marshal.FreeHGlobal(ptr);
-#endif
-
-        private static readonly Lazy<RuntimePlatformInfo> Info = new Lazy<RuntimePlatformInfo>(() =>
-        {
-            OperatingSystemType os;
-
-#if NET5_0_OR_GREATER
-            if (OperatingSystem.IsWindows())
-                os = OperatingSystemType.WinNT;
-            else if (OperatingSystem.IsMacOS())
-                os = OperatingSystemType.OSX;
-            else if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
-                os = OperatingSystemType.Linux;
-            else if (OperatingSystem.IsAndroid())
-                os = OperatingSystemType.Android;
-            else if (OperatingSystem.IsIOS())
-                os = OperatingSystemType.iOS;
-            else if (OperatingSystem.IsBrowser())
-                os = OperatingSystemType.Browser;
-            else
-                throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription);
-#else
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                os = OperatingSystemType.OSX;
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                os = OperatingSystemType.Linux;
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                os = OperatingSystemType.WinNT;
-            else
-                throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription);
-#endif
-
-            return new RuntimePlatformInfo
-            {
-#if NETCOREAPP
-                IsCoreClr = true,
-#elif NETFRAMEWORK
-                IsDotNetFramework = true,
-#endif
-                IsDesktop = os == OperatingSystemType.Linux || os == OperatingSystemType.OSX || os == OperatingSystemType.WinNT,
-                IsMono = os == OperatingSystemType.Android || os == OperatingSystemType.iOS || os == OperatingSystemType.Browser,
-                IsMobile = os == OperatingSystemType.Android || os == OperatingSystemType.iOS,
-                IsUnix = os == OperatingSystemType.Linux || os == OperatingSystemType.OSX || os == OperatingSystemType.Android,
-                IsBrowser = os == OperatingSystemType.Browser,
-                OperatingSystem = os,
-            };
-        });
-
-
-        public virtual RuntimePlatformInfo GetRuntimeInfo() => Info.Value;
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs b/src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs
deleted file mode 100644
index ae7478feb9..0000000000
--- a/src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using Avalonia.Platform;
-using Avalonia.Platform.Interop;
-
-namespace Avalonia.PlatformSupport
-{
-    public static class StandardRuntimePlatformServices
-    {
-        public static void Register(Assembly? assembly = null)
-        {
-            var standardPlatform = new StandardRuntimePlatform();
-            var os = standardPlatform.GetRuntimeInfo().OperatingSystem;
-
-            AssetLoader.RegisterResUriParsers();
-            AvaloniaLocator.CurrentMutable
-                .Bind<IRuntimePlatform>().ToConstant(standardPlatform)
-                .Bind<IAssetLoader>().ToConstant(new AssetLoader(assembly))
-                .Bind<IDynamicLibraryLoader>().ToConstant(
-                    os switch
-                    {
-                        OperatingSystemType.WinNT => new Win32Loader(),
-                        OperatingSystemType.OSX => new UnixLoader(),
-                        OperatingSystemType.Linux => new UnixLoader(),
-                        OperatingSystemType.Android => new UnixLoader(),
-                        // iOS, WASM, ...
-                        _ => (IDynamicLibraryLoader)new NotSupportedLoader()
-                    }
-                );
-        }
-    }
-}
diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
index 5c713804e9..9f69b4ee6e 100644
--- a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
+++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
@@ -2,6 +2,7 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.VisualTree;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using ReactiveUI;
 
 namespace Avalonia.ReactiveUI
@@ -25,27 +26,28 @@ namespace Avalonia.ReactiveUI
         public IObservable<bool> GetActivationForView(IActivatableView view)
         {
             if (!(view is IVisual visual)) return Observable.Return(false);
-            if (view is WindowBase window) return GetActivationForWindowBase(window);
+            if (view is Control control) return GetActivationForControl(control);
             return GetActivationForVisual(visual);
         }
 
         /// <summary>
-        /// Listens to Opened and Closed events for Avalonia windows.
+        /// Listens to Loaded and Unloaded 
+        /// events for Avalonia Control.
         /// </summary>
-        private IObservable<bool> GetActivationForWindowBase(WindowBase window) 
+        private IObservable<bool> GetActivationForControl(Control control) 
         {
-            var windowLoaded = Observable
-                .FromEventPattern(
-                    x => window.Opened += x,
-                    x => window.Opened -= x)
+            var controlLoaded = Observable
+                .FromEventPattern<RoutedEventArgs>(
+                    x => control.Loaded += x,
+                    x => control.Loaded -= x)
                 .Select(args => true);
-            var windowUnloaded = Observable
-                .FromEventPattern(
-                    x => window.Closed += x,
-                    x => window.Closed -= x)
+            var controlUnloaded = Observable
+                .FromEventPattern<RoutedEventArgs>(
+                    x => control.Unloaded += x,
+                    x => control.Unloaded -= x)
                 .Select(args => false);
-            return windowLoaded
-                .Merge(windowUnloaded)
+            return controlLoaded
+                .Merge(controlUnloaded)
                 .DistinctUntilChanged();
         }
 
diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
index 4987349162..21cdef2634 100644
--- a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
+++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
@@ -48,6 +48,7 @@ namespace Avalonia.ReactiveUI
 
         protected override void OnDataContextChanged(EventArgs e)
         {
+            base.OnDataContextChanged(e);
             ViewModel = DataContext as TViewModel;
         }
 
diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index a475cf5eac..2d848d4cd7 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -50,7 +50,7 @@ namespace Avalonia.ReactiveUI
     /// ReactiveUI routing documentation website</see> for more info.
     /// </para>
     /// </remarks>
-    public class RoutedViewHost : TransitioningContentControl, IActivatableView, IEnableLogger
+    public class RoutedViewHost : TransitioningContentControl, IActivatableView, IEnableLogger, IStyleable
     {
         /// <summary>
         /// <see cref="AvaloniaProperty"/> for the <see cref="Router"/> property.
@@ -62,7 +62,13 @@ namespace Avalonia.ReactiveUI
         /// <see cref="AvaloniaProperty"/> for the <see cref="ViewContract"/> property.
         /// </summary>
         public static readonly StyledProperty<string?> ViewContractProperty =
-            AvaloniaProperty.Register<ViewModelViewHost, string?>(nameof(ViewContract));
+            AvaloniaProperty.Register<RoutedViewHost, string?>(nameof(ViewContract));
+
+        /// <summary>
+        /// <see cref="AvaloniaProperty"/> for the <see cref="DefaultContent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object?> DefaultContentProperty =
+            ViewModelViewHost.DefaultContentProperty.AddOwner<RoutedViewHost>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RoutedViewHost"/> class.
@@ -106,11 +112,22 @@ namespace Avalonia.ReactiveUI
             set => SetValue(ViewContractProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the content displayed whenever there is no page currently routed.
+        /// </summary>
+        public object? DefaultContent
+        {
+            get => GetValue(DefaultContentProperty);
+            set => SetValue(DefaultContentProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the ReactiveUI view locator used by this router.
         /// </summary>
         public IViewLocator? ViewLocator { get; set; }
 
+        Type IStyleable.StyleKey => typeof(TransitioningContentControl);
+        
         /// <summary>
         /// Invoked when ReactiveUI router navigates to a view model.
         /// </summary>
diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
deleted file mode 100644
index d26e90b2da..0000000000
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Threading;
-
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Styling;
-
-namespace Avalonia.ReactiveUI
-{
-    /// <summary>
-    /// A ContentControl that animates the transition when its content is changed.
-    /// </summary>
-    [Obsolete("Use TransitioningContentControl in Avalonia.Controls namespace")]
-    public class TransitioningContentControl : ContentControl, IStyleable
-    {
-        /// <summary>
-        /// <see cref="AvaloniaProperty"/> for the <see cref="PageTransition"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
-            AvaloniaProperty.Register<TransitioningContentControl, IPageTransition?>(nameof(PageTransition),
-                new CrossFade(TimeSpan.FromSeconds(0.5)));
-
-        /// <summary>
-        /// <see cref="AvaloniaProperty"/> for the <see cref="DefaultContent"/> property.
-        /// </summary>
-        public static readonly StyledProperty<object?> DefaultContentProperty =
-            AvaloniaProperty.Register<TransitioningContentControl, object?>(nameof(DefaultContent));
-
-        private CancellationTokenSource? _lastTransitionCts;
-
-        /// <summary>
-        /// Gets or sets the animation played when content appears and disappears.
-        /// </summary>
-        public IPageTransition? PageTransition
-        {
-            get => GetValue(PageTransitionProperty);
-            set => SetValue(PageTransitionProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the content displayed whenever there is no page currently routed.
-        /// </summary>
-        public object? DefaultContent
-        {
-            get => GetValue(DefaultContentProperty);
-            set => SetValue(DefaultContentProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the content with animation.
-        /// </summary>
-        public new object? Content
-        {
-            get => base.Content;
-            set => UpdateContentWithTransition(value);
-        }
-        
-        /// <summary>
-        /// TransitioningContentControl uses the default ContentControl 
-        /// template from Avalonia default theme.
-        /// </summary>
-        Type IStyleable.StyleKey => typeof(ContentControl);
-
-        /// <summary>
-        /// Updates the content with transitions.
-        /// </summary>
-        /// <param name="content">New content to set.</param>
-        private async void UpdateContentWithTransition(object? content)
-        {
-            _lastTransitionCts?.Cancel();
-            _lastTransitionCts = new CancellationTokenSource();
-
-            if (PageTransition != null)
-                await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
-            base.Content = content;
-            if (PageTransition != null)
-                await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
-        }
-    }
-}
diff --git a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
index 16dee00ebc..0750fef067 100644
--- a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
+++ b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Reactive.Disposables;
+
+using Avalonia.Controls;
+using Avalonia.Styling;
 using ReactiveUI;
 using Splat;
 
@@ -10,7 +13,7 @@ namespace Avalonia.ReactiveUI
     /// the ViewModel property and display it. This control is very useful
     /// inside a DataTemplate to display the View associated with a ViewModel.
     /// </summary>
-    public class ViewModelViewHost : TransitioningContentControl, IViewFor, IEnableLogger
+    public class ViewModelViewHost : TransitioningContentControl, IViewFor, IEnableLogger, IStyleable
     {
         /// <summary>
         /// <see cref="AvaloniaProperty"/> for the <see cref="ViewModel"/> property.
@@ -24,6 +27,12 @@ namespace Avalonia.ReactiveUI
         public static readonly StyledProperty<string?> ViewContractProperty =
             AvaloniaProperty.Register<ViewModelViewHost, string?>(nameof(ViewContract));
 
+        /// <summary>
+        /// <see cref="AvaloniaProperty"/> for the <see cref="DefaultContent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object?> DefaultContentProperty =
+            AvaloniaProperty.Register<ViewModelViewHost, object?>(nameof(DefaultContent));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelViewHost"/> class.
         /// </summary>
@@ -55,11 +64,22 @@ namespace Avalonia.ReactiveUI
             set => SetValue(ViewContractProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the content displayed whenever there is no page currently routed.
+        /// </summary>
+        public object? DefaultContent
+        {
+            get => GetValue(DefaultContentProperty);
+            set => SetValue(DefaultContentProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the view locator.
         /// </summary>
         public IViewLocator? ViewLocator { get; set; }
 
+        Type IStyleable.StyleKey => typeof(TransitioningContentControl);
+
         /// <summary>
         /// Invoked when ReactiveUI router navigates to a view model.
         /// </summary>
diff --git a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index 5a8301a2e9..d746c6db7e 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -7,7 +7,7 @@
     <PackageId>Avalonia.Remote.Protocol</PackageId>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Avalonia.Input\Key.cs" />
+    <Compile Include="..\Avalonia.Base\Input\Key.cs" />
   </ItemGroup>
   <Import Project="..\..\build\ApiDiff.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/MetsysBson.cs b/src/Avalonia.Remote.Protocol/MetsysBson.cs
index 524ec09ca9..6abece6bf3 100644
--- a/src/Avalonia.Remote.Protocol/MetsysBson.cs
+++ b/src/Avalonia.Remote.Protocol/MetsysBson.cs
@@ -1364,13 +1364,13 @@ namespace Metsys.Bson
             var optionsString = ReadName();
 
             var options = RegexOptions.None;
-            if (optionsString.Contains("e")) options = options | RegexOptions.ECMAScript;
-            if (optionsString.Contains("i")) options = options | RegexOptions.IgnoreCase;
-            if (optionsString.Contains("l")) options = options | RegexOptions.CultureInvariant;
-            if (optionsString.Contains("m")) options = options | RegexOptions.Multiline;
-            if (optionsString.Contains("s")) options = options | RegexOptions.Singleline;
-            if (optionsString.Contains("w")) options = options | RegexOptions.IgnorePatternWhitespace;
-            if (optionsString.Contains("x")) options = options | RegexOptions.ExplicitCapture;
+            if (optionsString.Contains('e')) options = options | RegexOptions.ECMAScript;
+            if (optionsString.Contains('i')) options = options | RegexOptions.IgnoreCase;
+            if (optionsString.Contains('l')) options = options | RegexOptions.CultureInvariant;
+            if (optionsString.Contains('m')) options = options | RegexOptions.Multiline;
+            if (optionsString.Contains('s')) options = options | RegexOptions.Singleline;
+            if (optionsString.Contains('w')) options = options | RegexOptions.IgnorePatternWhitespace;
+            if (optionsString.Contains('x')) options = options | RegexOptions.ExplicitCapture;
 
             return new Regex(pattern, options);
         }
diff --git a/src/Avalonia.Styling/ApiCompatBaseline.txt b/src/Avalonia.Styling/ApiCompatBaseline.txt
deleted file mode 100644
index 0eedc3e360..0000000000
--- a/src/Avalonia.Styling/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Compat issues with assembly Avalonia.Styling:
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Styling.IStyleInstance.IsActive' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Styling.IStyleInstance.IsActive.get()' is present in the implementation but not in the contract.
-Total Issues: 2
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
deleted file mode 100644
index 139ba1bd2e..0000000000
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <AssemblyName>Avalonia.Styling</AssemblyName>
-    <RootNamespace>Avalonia</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Styling/Controls/ChildNameScope.cs b/src/Avalonia.Styling/Controls/ChildNameScope.cs
deleted file mode 100644
index 58114a57fd..0000000000
--- a/src/Avalonia.Styling/Controls/ChildNameScope.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Utilities;
-
-namespace Avalonia.Controls
-{
-    public class ChildNameScope : INameScope
-    {
-        private readonly INameScope _parentScope;
-        private readonly NameScope _inner = new NameScope();
-
-        public ChildNameScope(INameScope parentScope)
-        {
-            _parentScope = parentScope;
-        }
-        
-        public void Register(string name, object element) => _inner.Register(name, element);
-
-        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
-        {
-            var found = Find(name);
-            if (found != null)
-                return new SynchronousCompletionAsyncResult<object?>(found);
-            // Not found and both current and parent scope are in completed state
-            if(IsCompleted)
-                return new SynchronousCompletionAsyncResult<object?>(null);
-            return DoFindAsync(name);
-        }
-
-        public SynchronousCompletionAsyncResult<object?> DoFindAsync(string name)
-        {
-            var src = new SynchronousCompletionAsyncResultSource<object?>();
-
-            void ParentSearch()
-            {
-                var parentSearch = _parentScope.FindAsync(name);
-                if (parentSearch.IsCompleted)
-                    src.SetResult(parentSearch.GetResult());
-                else
-                    parentSearch.OnCompleted(() => src.SetResult(parentSearch.GetResult()));
-            }
-            if (!_inner.IsCompleted)
-            {
-                // Guaranteed to be incomplete at this point
-                var innerSearch = _inner.FindAsync(name);
-                innerSearch.OnCompleted(() =>
-                {
-                    var value = innerSearch.GetResult();
-                    if (value != null)
-                        src.SetResult(value);
-                    else ParentSearch();
-                });
-            }
-            else
-                ParentSearch();
-
-            return src.AsyncResult;
-        }
-
-        public object? Find(string name)
-        {
-            var found = _inner.Find(name);
-            if (found != null)
-                return found;
-            if (_inner.IsCompleted)
-                return _parentScope.Find(name);
-            return null;
-        }
-
-        public void Complete() => _inner.Complete();
-
-        public bool IsCompleted => _inner.IsCompleted && _parentScope.IsCompleted;
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/Classes.cs b/src/Avalonia.Styling/Controls/Classes.cs
deleted file mode 100644
index 50605661fa..0000000000
--- a/src/Avalonia.Styling/Controls/Classes.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Collections;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Holds a collection of style classes for an <see cref="IStyledElement"/>.
-    /// </summary>
-    /// <remarks>
-    /// Similar to CSS, each control may have any number of styling classes applied.
-    /// </remarks>
-    public class Classes : AvaloniaList<string>, IPseudoClasses
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Classes"/> class.
-        /// </summary>
-        public Classes()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Classes"/> class.
-        /// </summary>
-        /// <param name="items">The initial items.</param>
-        public Classes(IEnumerable<string> items)
-            : base(items)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Classes"/> class.
-        /// </summary>
-        /// <param name="items">The initial items.</param>
-        public Classes(params string[] items)
-            : base(items)
-        {            
-        }
-
-        /// <summary>
-        /// Parses a classes string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="Classes"/>.</returns>
-        public static Classes Parse(string s) => new Classes(s.Split(' '));
-
-        /// <summary>
-        /// Adds a style class to the collection.
-        /// </summary>
-        /// <param name="name">The class name.</param>
-        /// <remarks>
-        /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override void Add(string name)
-        {
-            ThrowIfPseudoclass(name, "added");
-
-            if (!Contains(name))
-            {
-                base.Add(name);
-            }
-        }
-
-        /// <summary>
-        /// Adds a style classes to the collection.
-        /// </summary>
-        /// <param name="names">The class names.</param>
-        /// <remarks>
-        /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override void AddRange(IEnumerable<string> names)
-        {
-            var c = new List<string>();
-
-            foreach (var name in names)
-            {
-                ThrowIfPseudoclass(name, "added");
-
-                if (!Contains(name))
-                {
-                    c.Add(name);
-                }
-            }
-
-            base.AddRange(c);
-        }
-
-        /// <summary>
-        /// Removes all non-pseudoclasses from the collection.
-        /// </summary>
-        public override void Clear()
-        {
-            for (var i = Count - 1; i >= 0; --i)
-            {
-                if (!this[i].StartsWith(":"))
-                {
-                    RemoveAt(i);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Inserts a style class into the collection.
-        /// </summary>
-        /// <param name="index">The index to insert the class at.</param>
-        /// <param name="name">The class name.</param>
-        /// <remarks>
-        /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override void Insert(int index, string name)
-        {
-            ThrowIfPseudoclass(name, "added");
-
-            if (!Contains(name))
-            {
-                base.Insert(index, name);
-            }
-        }
-
-        /// <summary>
-        /// Inserts style classes into the collection.
-        /// </summary>
-        /// <param name="index">The index to insert the class at.</param>
-        /// <param name="names">The class names.</param>
-        /// <remarks>
-        /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override void InsertRange(int index, IEnumerable<string> names)
-        {
-            List<string>? toInsert = null;
-
-            foreach (var name in names)
-            {
-                ThrowIfPseudoclass(name, "added");
-
-                if (!Contains(name))
-                {
-                    toInsert ??= new List<string>();
-
-                    toInsert.Add(name);
-                }
-            }
-
-            if (toInsert != null)
-            {
-                base.InsertRange(index, toInsert);
-            }
-        }
-
-        /// <summary>
-        /// Removes a style class from the collection.
-        /// </summary>
-        /// <param name="name">The class name.</param>
-        /// <remarks>
-        /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override bool Remove(string name)
-        {
-            ThrowIfPseudoclass(name, "removed");
-            return base.Remove(name);
-        }
-
-        /// <summary>
-        /// Removes style classes from the collection.
-        /// </summary>
-        /// <param name="names">The class name.</param>
-        /// <remarks>
-        /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override void RemoveAll(IEnumerable<string> names)
-        {
-            List<string>? toRemove = null;
-
-            foreach (var name in names)
-            {
-                ThrowIfPseudoclass(name, "removed");
-
-                toRemove ??= new List<string>();
-
-                toRemove.Add(name);
-            }
-
-            if (toRemove != null)
-            {
-                base.RemoveAll(toRemove);
-            }
-        }
-
-        /// <summary>
-        /// Removes a style class from the collection.
-        /// </summary>
-        /// <param name="index">The index of the class in the collection.</param>
-        /// <remarks>
-        /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public override void RemoveAt(int index)
-        {
-            var name = this[index];
-            ThrowIfPseudoclass(name, "removed");
-            base.RemoveAt(index);
-        }
-
-        /// <summary>
-        /// Removes style classes from the collection.
-        /// </summary>
-        /// <param name="index">The first index to remove.</param>
-        /// <param name="count">The number of items to remove.</param>
-        public override void RemoveRange(int index, int count)
-        {
-            base.RemoveRange(index, count);
-        }
-
-        /// <summary>
-        /// Removes all non-pseudoclasses in the collection and adds a new set.
-        /// </summary>
-        /// <param name="source">The new contents of the collection.</param>
-        public void Replace(IList<string> source)
-        {
-            List<string>? toRemove = null;
-
-            foreach (var name in source)
-            {
-                ThrowIfPseudoclass(name, "added");
-            }
-
-            foreach (var name in this)
-            {
-                if (!name.StartsWith(":"))
-                {
-                    toRemove ??= new List<string>();
-
-                    toRemove.Add(name);
-                }
-            }
-
-            if (toRemove != null)
-            {
-                base.RemoveAll(toRemove);
-            }
-
-            base.AddRange(source);
-        }
-
-        /// <inheritdoc/>
-        void IPseudoClasses.Add(string name)
-        {
-            if (!Contains(name))
-            {
-                base.Add(name);
-            }
-        }
-
-        /// <inheritdoc/>
-        bool IPseudoClasses.Remove(string name)
-        {
-            return base.Remove(name);
-        }
-
-        private void ThrowIfPseudoclass(string name, string operation)
-        {
-            if (name.StartsWith(":"))
-            {
-                throw new ArgumentException(
-                    $"The pseudoclass '{name}' may only be {operation} by the control itself.");
-            }
-        }
-
-        /// <summary>
-        /// Adds a or removes a  style class to/from the collection.
-        /// </summary>
-        /// <param name="name">The class names.</param>
-        /// <param name="value">If true adds the class, if false, removes it.</param>
-        /// <remarks>
-        /// Only standard classes may be added or removed via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
-        /// property.
-        /// </remarks>
-        public void Set(string name, bool value)
-        {
-            if (value)
-            {
-                if (!Contains(name))
-                    Add(name);
-            }
-            else
-                Remove(name);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/INameScope.cs b/src/Avalonia.Styling/Controls/INameScope.cs
deleted file mode 100644
index 1ca7db2f37..0000000000
--- a/src/Avalonia.Styling/Controls/INameScope.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Utilities;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Defines a name scope.
-    /// </summary>
-    public interface INameScope
-    {
-        /// <summary>
-        /// Registers an element in the name scope.
-        /// </summary>
-        /// <param name="name">The element name.</param>
-        /// <param name="element">The element.</param>
-        void Register(string name, object element);
-
-        /// <summary>
-        /// Finds a named element in the name scope, waits for the scope to be completely populated before returning null
-        /// Returned task is configured to run any continuations synchronously.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>The element, or null if the name was not found.</returns>
-        SynchronousCompletionAsyncResult<object?> FindAsync(string name);
-        
-        /// <summary>
-        /// Finds a named element in the name scope, returns immediately, doesn't traverse the name scope stack
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>The element, or null if the name was not found.</returns>
-        object? Find(string name);
-
-        /// <summary>
-        /// Marks the name scope as completed, no further registrations will be allowed
-        /// </summary>
-        void Complete();
-        
-        /// <summary>
-        /// Returns whether further registrations are allowed on the scope
-        /// </summary>
-        bool IsCompleted { get; }
-
-
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/IPseudoClasses.cs b/src/Avalonia.Styling/Controls/IPseudoClasses.cs
deleted file mode 100644
index 27290716d0..0000000000
--- a/src/Avalonia.Styling/Controls/IPseudoClasses.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Exposes an interface for setting pseudoclasses on a <see cref="Classes"/> collection.
-    /// </summary>
-    public interface IPseudoClasses
-    {
-        /// <summary>
-        /// Adds a pseudoclass to the collection.
-        /// </summary>
-        /// <param name="name">The pseudoclass name.</param>
-        void Add(string name);
-
-        /// <summary>
-        /// Removes a pseudoclass from the collection.
-        /// </summary>
-        /// <param name="name">The pseudoclass name.</param>
-        bool Remove(string name);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/IResourceHost.cs b/src/Avalonia.Styling/Controls/IResourceHost.cs
deleted file mode 100644
index ea34a8b39a..0000000000
--- a/src/Avalonia.Styling/Controls/IResourceHost.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Represents an element which hosts resources.
-    /// </summary>
-    /// <remarks>
-    /// This interface is implemented by <see cref="StyledElement"/> and `Application`.
-    /// </remarks>
-    public interface IResourceHost : IResourceNode
-    {
-        /// <summary>
-        /// Raised when the resources change on the element or an ancestor of the element.
-        /// </summary>
-        event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
-
-        /// <summary>
-        /// Notifies the resource host that one or more of its hosted resources has changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself. It is called when the resources hosted by this element have
-        /// changed, and is usually called by a resource dictionary or style hosted by the element
-        /// in response to a resource being added or removed.
-        /// </remarks>
-        void NotifyHostedResourcesChanged(ResourcesChangedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/IResourceNode.cs b/src/Avalonia.Styling/Controls/IResourceNode.cs
deleted file mode 100644
index 73bfeaf161..0000000000
--- a/src/Avalonia.Styling/Controls/IResourceNode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Represents an object that can be queried for resources.
-    /// </summary>
-    /// <remarks>
-    /// The interface represents a common interface for both controls that host resources
-    /// (<see cref="IResourceHost"/>) and resource providers such as <see cref="ResourceDictionary"/>
-    /// (see <see cref="IResourceProvider"/>).
-    /// </remarks>
-    public interface IResourceNode
-    {
-        /// <summary>
-        /// Gets a value indicating whether the object has resources.
-        /// </summary>
-        bool HasResources { get; }
-
-        /// <summary>
-        /// Tries to find a resource within the object.
-        /// </summary>
-        /// <param name="key">The resource key.</param>
-        /// <param name="value">
-        /// When this method returns, contains the value associated with the specified key,
-        /// if the key is found; otherwise, null.
-        /// </param>
-        /// <returns>
-        /// True if the resource if found, otherwise false.
-        /// </returns>
-        bool TryGetResource(object key, out object? value);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
deleted file mode 100644
index dbf8c68892..0000000000
--- a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Defines an interface through which a <see cref="StyledElement"/>'s inheritance parent can be set.
-    /// </summary>
-    /// <remarks>
-    /// You should not usually need to use this interface - it is for advanced scenarios only.
-    /// Additionally, <see cref="ISetLogicalParent"/> also sets the inheritance parent; this
-    /// interface is only needed where the logical and inheritance parents differ.
-    /// </remarks>
-    public interface ISetInheritanceParent
-    {
-        /// <summary>
-        /// Sets the control's inheritance parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void SetParent(IAvaloniaObject? parent);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ISetLogicalParent.cs b/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
deleted file mode 100644
index 85bda05961..0000000000
--- a/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Avalonia.LogicalTree;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Defines an interface through which a <see cref="StyledElement"/>'s logical parent can be set.
-    /// </summary>
-    /// <remarks>
-    /// You should not usually need to use this interface - it is for advanced scenarios only.
-    /// </remarks>
-    public interface ISetLogicalParent
-    {
-        /// <summary>
-        /// Sets the control's parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void SetParent(ILogical? parent);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs b/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
deleted file mode 100644
index 0060767565..0000000000
--- a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-#nullable enable
-
-namespace Avalonia.Controls.Metadata
-{
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    public sealed class PseudoClassesAttribute : Attribute
-    {
-        public PseudoClassesAttribute(params string[] pseudoClasses)
-        {
-            PseudoClasses = pseudoClasses;
-        }
-
-        public IReadOnlyList<string> PseudoClasses { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/NameScope.cs b/src/Avalonia.Styling/Controls/NameScope.cs
deleted file mode 100644
index 77f98f85c4..0000000000
--- a/src/Avalonia.Styling/Controls/NameScope.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Avalonia.LogicalTree;
-using Avalonia.Utilities;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Implements a name scope.
-    /// </summary>
-    public class NameScope : INameScope
-    {
-        /// <summary>
-        /// Defines the NameScope attached property.
-        /// </summary>
-        public static readonly AttachedProperty<INameScope> NameScopeProperty =
-            AvaloniaProperty.RegisterAttached<NameScope, StyledElement, INameScope>("NameScope");
-
-        /// <inheritdoc/>
-        public bool IsCompleted { get; private set; }
-        
-        private readonly Dictionary<string, object> _inner = new Dictionary<string, object>();
-
-        private readonly Dictionary<string, SynchronousCompletionAsyncResultSource<object?>> _pendingSearches =
-            new Dictionary<string, SynchronousCompletionAsyncResultSource<object?>>();
-        
-        /// <summary>
-        /// Gets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
-        /// </summary>
-        /// <param name="styled">The styled element.</param>
-        /// <returns>The value of the NameScope attached property.</returns>
-        public static INameScope GetNameScope(StyledElement styled)
-        {
-            _ = styled ?? throw new ArgumentNullException(nameof(styled));
-
-            return styled.GetValue(NameScopeProperty);
-        }
-
-        /// <summary>
-        /// Sets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
-        /// </summary>
-        /// <param name="styled">The styled element.</param>
-        /// <param name="value">The value to set.</param>
-        public static void SetNameScope(StyledElement styled, INameScope value)
-        {
-            _ = styled ?? throw new ArgumentNullException(nameof(styled));
-
-            styled.SetValue(NameScopeProperty, value);
-        }
-
-        /// <inheritdoc />
-        public void Register(string name, object element)
-        {
-            if (IsCompleted)
-                throw new InvalidOperationException("NameScope is completed, no further registrations are allowed");
-
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-            _ = element ?? throw new ArgumentNullException(nameof(element));
-
-            if (_inner.TryGetValue(name, out var existing))
-            {
-                if (existing != element)
-                {
-                    throw new ArgumentException($"Control with the name '{name}' already registered.");
-                }
-            }
-            else
-            {
-                _inner.Add(name, element);
-                if (_pendingSearches.TryGetValue(name, out var tcs))
-                {
-                    _pendingSearches.Remove(name);
-                    tcs.SetResult(element);
-                }
-            }
-        }
-
-        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
-        {
-            var found = Find(name);
-            if (found != null)
-                return new SynchronousCompletionAsyncResult<object?>(found);
-            if (IsCompleted)
-                return new SynchronousCompletionAsyncResult<object?>(null);
-            if (!_pendingSearches.TryGetValue(name, out var tcs))
-                // We are intentionally running continuations synchronously here
-                _pendingSearches[name] = tcs = new SynchronousCompletionAsyncResultSource<object?>();
-
-            return tcs.AsyncResult;
-        }
-
-        /// <inheritdoc />
-        public object? Find(string name)
-        {
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-
-            _inner.TryGetValue(name, out var result);
-            return result;
-        }
-
-        public void Complete()
-        {
-            IsCompleted = true;
-            foreach (var kp in _pendingSearches)
-                kp.Value.TrySetResult(null);
-            _pendingSearches.Clear();
-        }
-
-        
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs b/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
deleted file mode 100644
index 3e9eaa6057..0000000000
--- a/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Avalonia.Controls
-{
-    public class NameScopeEventArgs : EventArgs
-    {
-        public NameScopeEventArgs(string name, object element)
-        {
-            Name = name;
-            Element = element;
-        }
-
-        public string Name { get; }
-        public object Element { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ResourceDictionary.cs b/src/Avalonia.Styling/Controls/ResourceDictionary.cs
deleted file mode 100644
index 3af14daa83..0000000000
--- a/src/Avalonia.Styling/Controls/ResourceDictionary.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Avalonia.Collections;
-using Avalonia.Metadata;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// An indexed dictionary of resources.
-    /// </summary>
-    public class ResourceDictionary : AvaloniaDictionary<object, object?>, IResourceDictionary
-    {
-        private IResourceHost? _owner;
-        private AvaloniaList<IResourceProvider>? _mergedDictionaries;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResourceDictionary"/> class.
-        /// </summary>
-        public ResourceDictionary()
-        {
-            CollectionChanged += OnCollectionChanged;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResourceDictionary"/> class.
-        /// </summary>
-        public ResourceDictionary(IResourceHost owner)
-            : this()
-        {
-            Owner = owner;
-        }
-
-        public IResourceHost? Owner
-        {
-            get => _owner;
-            private set
-            {
-                if (_owner != value)
-                {
-                    _owner = value;
-                    OwnerChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        public IList<IResourceProvider> MergedDictionaries
-        {
-            get
-            {
-                if (_mergedDictionaries == null)
-                {
-                    _mergedDictionaries = new AvaloniaList<IResourceProvider>();
-                    _mergedDictionaries.ResetBehavior = ResetBehavior.Remove;
-                    _mergedDictionaries.ForEachItem(
-                        x =>
-                        {
-                            if (Owner is object)
-                            {
-                                x.AddOwner(Owner);
-                            }
-                        },
-                        x =>
-                        {
-                            if (Owner is object)
-                            {
-                                x.RemoveOwner(Owner);
-                            }
-                        }, 
-                        () => throw new NotSupportedException("Dictionary reset not supported"));
-                }
-
-                return _mergedDictionaries;
-            }
-        }
-
-        bool IResourceNode.HasResources
-        {
-            get
-            {
-                if (Count > 0)
-                {
-                    return true;
-                }
-
-                if (_mergedDictionaries?.Count > 0)
-                {
-                    foreach (var i in _mergedDictionaries)
-                    {
-                        if (i.HasResources)
-                        {
-                            return true;
-                        }
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        public event EventHandler? OwnerChanged;
-
-        public bool TryGetResource(object key, out object? value)
-        {
-            if (TryGetValue(key, out value))
-            {
-                return true;
-            }
-
-            if (_mergedDictionaries != null)
-            {
-                for (var i = _mergedDictionaries.Count - 1; i >= 0; --i)
-                {
-                    if (_mergedDictionaries[i].TryGetResource(key, out value))
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        void IResourceProvider.AddOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner != null)
-            {
-                throw new InvalidOperationException("The ResourceDictionary already has a parent.");
-            }
-            
-            Owner = owner;
-
-            var hasResources = Count > 0;
-            
-            if (_mergedDictionaries is object)
-            {
-                foreach (var i in _mergedDictionaries)
-                {
-                    i.AddOwner(owner);
-                    hasResources |= i.HasResources;
-                }
-            }
-
-            if (hasResources)
-            {
-                owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
-            }
-        }
-
-        void IResourceProvider.RemoveOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner == owner)
-            {
-                Owner = null;
-
-                var hasResources = Count > 0;
-
-                if (_mergedDictionaries is object)
-                {
-                    foreach (var i in _mergedDictionaries)
-                    {
-                        i.RemoveOwner(owner);
-                        hasResources |= i.HasResources;
-                    }
-                }
-
-                if (hasResources)
-                {
-                    owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
-                }
-            }
-        }
-
-        private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
deleted file mode 100644
index 513b3f2424..0000000000
--- a/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using Avalonia.Data.Converters;
-using Avalonia.LogicalTree;
-using Avalonia.Reactive;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    public static class ResourceNodeExtensions
-    {
-        /// <summary>
-        /// Finds the specified resource by searching up the logical tree and then global styles.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="key">The resource key.</param>
-        /// <returns>The resource, or <see cref="AvaloniaProperty.UnsetValue"/> if not found.</returns>
-        public static object? FindResource(this IResourceHost control, object key)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            if (control.TryFindResource(key, out var value))
-            {
-                return value;
-            }
-
-            return AvaloniaProperty.UnsetValue;
-        }
-
-        /// <summary>
-        /// Tries to the specified resource by searching up the logical tree and then global styles.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="key">The resource key.</param>
-        /// <param name="value">On return, contains the resource if found, otherwise null.</param>
-        /// <returns>True if the resource was found; otherwise false.</returns>
-        public static bool TryFindResource(this IResourceHost control, object key, out object? value)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            IResourceHost? current = control;
-
-            while (current != null)
-            {
-                if (current is IResourceHost host)
-                {
-                    if (host.TryGetResource(key, out value))
-                    {
-                        return true;
-                    }
-                }
-
-                current = (current as IStyledElement)?.StylingParent as IResourceHost;
-            }
-
-            value = null;
-            return false;
-        }
-
-        public static IObservable<object?> GetResourceObservable(
-            this IResourceHost control,
-            object key,
-            Func<object?, object?>? converter = null)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            return new ResourceObservable(control, key, converter);
-        }
-
-        public static IObservable<object?> GetResourceObservable(
-            this IResourceProvider resourceProvider,
-            object key,
-            Func<object?, object?>? converter = null)
-        {
-            resourceProvider = resourceProvider ?? throw new ArgumentNullException(nameof(resourceProvider));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            return new FloatingResourceObservable(resourceProvider, key, converter);
-        }
-
-        private class ResourceObservable : LightweightObservableBase<object?>
-        {
-            private readonly IResourceHost _target;
-            private readonly object _key;
-            private readonly Func<object?, object?>? _converter;
-
-            public ResourceObservable(IResourceHost target, object key, Func<object?, object?>? converter)
-            {
-                _target = target;
-                _key = key;
-                _converter = converter;
-            }
-
-            protected override void Initialize()
-            {
-                _target.ResourcesChanged += ResourcesChanged;
-            }
-
-            protected override void Deinitialize()
-            {
-                _target.ResourcesChanged -= ResourcesChanged;
-            }
-
-            protected override void Subscribed(IObserver<object?> observer, bool first)
-            {
-                observer.OnNext(Convert(_target.FindResource(_key)));
-            }
-
-            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
-            {
-                PublishNext(Convert(_target.FindResource(_key)));
-            }
-
-            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
-        }
-
-        private class FloatingResourceObservable : LightweightObservableBase<object?>
-        {
-            private readonly IResourceProvider _target;
-            private readonly object _key;
-            private readonly Func<object?, object?>? _converter;
-            private IResourceHost? _owner;
-
-            public FloatingResourceObservable(IResourceProvider target, object key, Func<object?, object?>? converter)
-            {
-                _target = target;
-                _key = key;
-                _converter = converter;
-            }
-
-            protected override void Initialize()
-            {
-                _target.OwnerChanged += OwnerChanged;
-                _owner = _target.Owner;
-            }
-
-            protected override void Deinitialize()
-            {
-                _target.OwnerChanged -= OwnerChanged;
-                _owner = null;
-            }
-
-            protected override void Subscribed(IObserver<object?> observer, bool first)
-            {
-                if (_target.Owner is object)
-                {
-                    observer.OnNext(Convert(_target.Owner.FindResource(_key)));
-                }
-            }
-
-            private void PublishNext()
-            {
-                if (_target.Owner is object)
-                {
-                    PublishNext(Convert(_target.Owner.FindResource(_key)));
-                }
-            }
-
-            private void OwnerChanged(object? sender, EventArgs e)
-            {
-                if (_owner is object)
-                {
-                    _owner.ResourcesChanged -= ResourcesChanged;
-                }
-
-                _owner = _target.Owner;
-
-                if (_owner is object)
-                {
-                    _owner.ResourcesChanged += ResourcesChanged;
-                }
-
-                PublishNext();
-            }
-
-            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
-            {
-                PublishNext();
-            }
-
-            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/IDataContextProvider.cs b/src/Avalonia.Styling/IDataContextProvider.cs
deleted file mode 100644
index 1172adcaa4..0000000000
--- a/src/Avalonia.Styling/IDataContextProvider.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#nullable enable
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines an element with a data context that can be used for binding.
-    /// </summary>
-    public interface IDataContextProvider : IAvaloniaObject
-    {
-        /// <summary>
-        /// Gets or sets the element's data context.
-        /// </summary>
-        object? DataContext { get; set; }
-    }
-}
diff --git a/src/Avalonia.Styling/IStyledElement.cs b/src/Avalonia.Styling/IStyledElement.cs
deleted file mode 100644
index a068d4a5bf..0000000000
--- a/src/Avalonia.Styling/IStyledElement.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.ComponentModel;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Avalonia.Styling;
-
-#nullable enable
-
-namespace Avalonia
-{
-    public interface IStyledElement :
-        IStyleable,
-        IStyleHost,
-        ILogical,
-        IResourceHost,
-        IDataContextProvider,
-        ISupportInitialize
-    {
-        /// <summary>
-        /// Occurs when the control has finished initialization.
-        /// </summary>
-        event EventHandler? Initialized;
-
-        /// <summary>
-        /// Gets a value that indicates whether the element has finished initialization.
-        /// </summary>
-        bool IsInitialized { get; }
-
-        /// <summary>
-        /// Gets or sets the control's styling classes.
-        /// </summary>
-        new Classes Classes { get; set; }
-
-        /// <summary>
-        /// Gets the control's logical parent.
-        /// </summary>
-        IStyledElement? Parent { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/LogicalTree/ChildIndexChangedEventArgs.cs b/src/Avalonia.Styling/LogicalTree/ChildIndexChangedEventArgs.cs
deleted file mode 100644
index de41f5292c..0000000000
--- a/src/Avalonia.Styling/LogicalTree/ChildIndexChangedEventArgs.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-#nullable enable
-using System;
-
-namespace Avalonia.LogicalTree
-{
-    /// <summary>
-    /// Event args for <see cref="IChildIndexProvider.ChildIndexChanged"/> event.
-    /// </summary>
-    public class ChildIndexChangedEventArgs : EventArgs
-    {
-        public ChildIndexChangedEventArgs()
-        {
-        }
-
-        public ChildIndexChangedEventArgs(ILogical child)
-        {
-            Child = child;
-        }
-
-        /// <summary>
-        /// Logical child which index was changed.
-        /// If null, all children should be reset.
-        /// </summary>
-        public ILogical? Child { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/LogicalTree/ILogical.cs b/src/Avalonia.Styling/LogicalTree/ILogical.cs
deleted file mode 100644
index caff3d8150..0000000000
--- a/src/Avalonia.Styling/LogicalTree/ILogical.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using Avalonia.Collections;
-using Avalonia.Controls;
-
-namespace Avalonia.LogicalTree
-{
-    /// <summary>
-    /// Represents a node in the logical tree.
-    /// </summary>
-    public interface ILogical
-    {
-        /// <summary>
-        /// Raised when the control is attached to a rooted logical tree.
-        /// </summary>
-        event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted logical tree.
-        /// </summary>
-        event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
-
-        /// <summary>
-        /// Gets a value indicating whether the element is attached to a rooted logical tree.
-        /// </summary>
-        bool IsAttachedToLogicalTree { get; }
-
-        /// <summary>
-        /// Gets the logical parent.
-        /// </summary>
-        ILogical? LogicalParent { get; }
-
-        /// <summary>
-        /// Gets the logical children.
-        /// </summary>
-        IAvaloniaReadOnlyList<ILogical> LogicalChildren { get; }
-
-        /// <summary>
-        /// Notifies the control that it is being attached to a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself.
-        /// </remarks>
-        void NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e);
-
-        /// <summary>
-        /// Notifies the control that it is being detached from a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself.
-        /// </remarks>
-        void NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e);
-
-        /// <summary>
-        /// Notifies the control that a change has been made to resources that apply to it.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself.
-        /// </remarks>
-        void NotifyResourcesChanged(ResourcesChangedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs b/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs
deleted file mode 100644
index 4a61544a6f..0000000000
--- a/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Avalonia.LogicalTree
-{
-    /// <summary>
-    /// Represents a root of a logical tree.
-    /// </summary>
-    public interface ILogicalRoot : ILogical
-    {
-    }
-}
diff --git a/src/Avalonia.Styling/Properties/AssemblyInfo.cs b/src/Avalonia.Styling/Properties/AssemblyInfo.cs
deleted file mode 100644
index ab034740ed..0000000000
--- a/src/Avalonia.Styling/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Metadata;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.LogicalTree")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Styling")]
-
-[assembly: InternalsVisibleTo("Avalonia.Styling.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
deleted file mode 100644
index 5f498623e1..0000000000
--- a/src/Avalonia.Styling/StyledElement.cs
+++ /dev/null
@@ -1,888 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using Avalonia.Animation;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Diagnostics;
-using Avalonia.Logging;
-using Avalonia.LogicalTree;
-using Avalonia.Styling;
-
-#nullable enable
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Extends an <see cref="Animatable"/> with the following features:
-    /// 
-    /// - An inherited <see cref="DataContext"/>.
-    /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
-    /// - Implements <see cref="ILogical"/> to form part of a logical tree.
-    /// - A collection of class strings for custom styling.
-    /// </summary>
-    public class StyledElement : Animatable, IDataContextProvider, IStyledElement, ISetLogicalParent, ISetInheritanceParent
-    {
-        /// <summary>
-        /// Defines the <see cref="DataContext"/> property.
-        /// </summary>
-        public static readonly StyledProperty<object?> DataContextProperty =
-            AvaloniaProperty.Register<StyledElement, object?>(
-                nameof(DataContext),
-                inherits: true,
-                notifying: DataContextNotifying);
-
-        /// <summary>
-        /// Defines the <see cref="Name"/> property.
-        /// </summary>
-        public static readonly DirectProperty<StyledElement, string?> NameProperty =
-            AvaloniaProperty.RegisterDirect<StyledElement, string?>(nameof(Name), o => o.Name, (o, v) => o.Name = v);
-        
-        /// <summary>
-        /// Defines the <see cref="Parent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<StyledElement, IStyledElement?> ParentProperty =
-            AvaloniaProperty.RegisterDirect<StyledElement, IStyledElement?>(nameof(Parent), o => o.Parent);
-
-        /// <summary>
-        /// Defines the <see cref="TemplatedParent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<StyledElement, ITemplatedControl?> TemplatedParentProperty =
-            AvaloniaProperty.RegisterDirect<StyledElement, ITemplatedControl?>(
-                nameof(TemplatedParent),
-                o => o.TemplatedParent,
-                (o ,v) => o.TemplatedParent = v);
-
-        private int _initCount;
-        private string? _name;
-        private readonly Classes _classes = new Classes();
-        private ILogicalRoot? _logicalRoot;
-        private IAvaloniaList<ILogical>? _logicalChildren;
-        private IResourceDictionary? _resources;
-        private Styles? _styles;
-        private bool _styled;
-        private List<IStyleInstance>? _appliedStyles;
-        private ITemplatedControl? _templatedParent;
-        private bool _dataContextUpdating;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="StyledElement"/> class.
-        /// </summary>
-        static StyledElement()
-        {
-            DataContextProperty.Changed.AddClassHandler<StyledElement>((x,e) => x.OnDataContextChangedCore(e));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyledElement"/> class.
-        /// </summary>
-        public StyledElement()
-        {
-            _logicalRoot = this as ILogicalRoot;
-        }
-
-        /// <summary>
-        /// Raised when the styled element is attached to a rooted logical tree.
-        /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
-
-        /// <summary>
-        /// Raised when the styled element is detached from a rooted logical tree.
-        /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
-
-        /// <summary>
-        /// Occurs when the <see cref="DataContext"/> property changes.
-        /// </summary>
-        /// <remarks>
-        /// This event will be raised when the <see cref="DataContext"/> property has changed and
-        /// all subscribers to that change have been notified.
-        /// </remarks>
-        public event EventHandler? DataContextChanged;
-
-        /// <summary>
-        /// Occurs when the styled element has finished initialization.
-        /// </summary>
-        /// <remarks>
-        /// The Initialized event indicates that all property values on the styled element have been set.
-        /// When loading the styled element from markup, it occurs when 
-        /// <see cref="ISupportInitialize.EndInit"/> is called *and* the styled element
-        /// is attached to a rooted logical tree. When the styled element is created by code and
-        /// <see cref="ISupportInitialize"/> is not used, it is called when the styled element is attached
-        /// to the visual tree.
-        /// </remarks>
-        public event EventHandler? Initialized;
-
-        /// <summary>
-        /// Occurs when a resource in this styled element or a parent styled element has changed.
-        /// </summary>
-        public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
-
-        /// <summary>
-        /// Gets or sets the name of the styled element.
-        /// </summary>
-        /// <remarks>
-        /// An element's name is used to uniquely identify an element within the element's name
-        /// scope. Once the element is added to a logical tree, its name cannot be changed.
-        /// </remarks>
-        public string? Name
-        {
-            get => _name;
-
-            set
-            {
-                if (_styled)
-                {
-                    throw new InvalidOperationException("Cannot set Name : styled element already styled.");
-                }
-
-                _name = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the styled element's classes.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Classes can be used to apply user-defined styling to styled elements, or to allow styled elements
-        /// that share a common purpose to be easily selected.
-        /// </para>
-        /// <para>
-        /// Even though this property can be set, the setter is only intended for use in object
-        /// initializers. Assigning to this property does not change the underlying collection,
-        /// it simply clears the existing collection and adds the contents of the assigned
-        /// collection.
-        /// </para>
-        /// </remarks>
-        public Classes Classes
-        {
-            get
-            {
-                return _classes;
-            }
-
-            set
-            {
-                if (_classes != value)
-                {
-                    _classes.Replace(value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the control's data context.
-        /// </summary>
-        /// <remarks>
-        /// The data context is an inherited property that specifies the default object that will
-        /// be used for data binding.
-        /// </remarks>
-        public object? DataContext
-        {
-            get { return GetValue(DataContextProperty); }
-            set { SetValue(DataContextProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets a value that indicates whether the element has finished initialization.
-        /// </summary>
-        /// <remarks>
-        /// For more information about when IsInitialized is set, see the <see cref="Initialized"/>
-        /// event.
-        /// </remarks>
-        public bool IsInitialized { get; private set; }
-
-        /// <summary>
-        /// Gets the styles for the styled element.
-        /// </summary>
-        /// <remarks>
-        /// Styles for the entire application are added to the Application.Styles collection, but
-        /// each styled element may in addition define its own styles which are applied to the styled element
-        /// itself and its children.
-        /// </remarks>
-        public Styles Styles => _styles ??= new Styles(this);
-
-        /// <summary>
-        /// Gets or sets the styled element's resource dictionary.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ??= new ResourceDictionary(this);
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(value));
-                _resources?.RemoveOwner(this);
-                _resources = value;
-                _resources.AddOwner(this);
-            }
-        }
-
-        /// <summary>
-        /// Gets the styled element whose lookless template this styled element is part of.
-        /// </summary>
-        public ITemplatedControl? TemplatedParent
-        {
-            get => _templatedParent;
-            internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
-        }
-
-        /// <summary>
-        /// Gets the styled element's logical children.
-        /// </summary>
-        protected IAvaloniaList<ILogical> LogicalChildren
-        {
-            get
-            {
-                if (_logicalChildren == null)
-                {
-                    var list = new AvaloniaList<ILogical>
-                    {
-                        ResetBehavior = ResetBehavior.Remove,
-                        Validate = logical => ValidateLogicalChild(logical)
-                    };
-                    list.CollectionChanged += LogicalChildrenCollectionChanged;
-                    _logicalChildren = list;
-                }
-
-                return _logicalChildren;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Classes"/> collection in a form that allows adding and removing
-        /// pseudoclasses.
-        /// </summary>
-        protected IPseudoClasses PseudoClasses => Classes;
-
-        /// <summary>
-        /// Gets a value indicating whether the element is attached to a rooted logical tree.
-        /// </summary>
-        bool ILogical.IsAttachedToLogicalTree => _logicalRoot != null;
-
-        /// <summary>
-        /// Gets the styled element's logical parent.
-        /// </summary>
-        public IStyledElement? Parent { get; private set; }
-
-        /// <summary>
-        /// Gets the styled element's logical parent.
-        /// </summary>
-        ILogical? ILogical.LogicalParent => Parent;
-
-        /// <summary>
-        /// Gets the styled element's logical children.
-        /// </summary>
-        IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
-
-        /// <inheritdoc/>
-        bool IResourceNode.HasResources => (_resources?.HasResources ?? false) ||
-            (((IResourceNode?)_styles)?.HasResources ?? false);
-
-        /// <inheritdoc/>
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        /// <summary>
-        /// Gets the type by which the styled element is styled.
-        /// </summary>
-        /// <remarks>
-        /// Usually controls are styled by their own type, but there are instances where you want
-        /// a styled element to be styled by its base type, e.g. creating SpecialButton that
-        /// derives from Button and adds extra functionality but is still styled as a regular
-        /// Button.
-        /// </remarks>
-        Type IStyleable.StyleKey => GetType();
-
-        /// <inheritdoc/>
-        bool IStyleHost.IsStylesInitialized => _styles != null;
-
-        /// <inheritdoc/>
-        IStyleHost? IStyleHost.StylingParent => (IStyleHost?)InheritanceParent;
-
-        /// <inheritdoc/>
-        public virtual void BeginInit()
-        {
-            ++_initCount;
-        }
-
-        /// <inheritdoc/>
-        public virtual void EndInit()
-        {
-            if (_initCount == 0)
-            {
-                throw new InvalidOperationException("BeginInit was not called.");
-            }
-
-            if (--_initCount == 0 && _logicalRoot != null)
-            {
-                ApplyStyling();
-                InitializeIfNeeded();
-            }
-        }
-
-        /// <summary>
-        /// Applies styling to the control if the control is initialized and styling is not
-        /// already applied.
-        /// </summary>
-        /// <returns>
-        /// A value indicating whether styling is now applied to the control.
-        /// </returns>
-        protected bool ApplyStyling()
-        {
-            if (_initCount == 0 && !_styled)
-            {
-                try
-                {
-                    BeginBatchUpdate();
-                    AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
-                }
-                finally
-                {
-                    EndBatchUpdate();
-                }
-
-                _styled = true;
-            }
-
-            return _styled;
-        }
-
-        /// <summary>
-        /// Detaches all styles from the element and queues a restyle.
-        /// </summary>
-        protected virtual void InvalidateStyles() => DetachStyles();
-
-        protected void InitializeIfNeeded()
-        {
-            if (_initCount == 0 && !IsInitialized)
-            {
-                IsInitialized = true;
-                OnInitialized();
-                Initialized?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        internal StyleDiagnostics GetStyleDiagnosticsInternal()
-        {
-            IReadOnlyList<IStyleInstance>? appliedStyles = _appliedStyles;
-
-            if (appliedStyles is null)
-            {
-                appliedStyles = Array.Empty<IStyleInstance>();
-            }
-
-            return new StyleDiagnostics(appliedStyles);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            OnAttachedToLogicalTreeCore(e);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            OnDetachedFromLogicalTreeCore(e);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
-
-        /// <inheritdoc/>
-        void IResourceHost.NotifyHostedResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
-
-        /// <inheritdoc/>
-        bool IResourceNode.TryGetResource(object key, out object? value)
-        {
-            value = null;
-            return (_resources?.TryGetResource(key, out value) ?? false) ||
-                   (_styles?.TryGetResource(key, out value) ?? false);
-        }
-
-        /// <summary>
-        /// Sets the styled element's logical parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void ISetLogicalParent.SetParent(ILogical? parent)
-        {
-            var old = Parent;
-
-            if (parent != old)
-            {
-                if (old != null && parent != null)
-                {
-                    throw new InvalidOperationException("The Control already has a parent.");
-                }
-
-                if (InheritanceParent == null || parent == null)
-                {
-                    InheritanceParent = parent as AvaloniaObject;
-                }
-
-                Parent = (IStyledElement?)parent;
-
-                if (_logicalRoot != null)
-                {
-                    var e = new LogicalTreeAttachmentEventArgs(_logicalRoot, this, old!);
-                    OnDetachedFromLogicalTreeCore(e);
-                }
-
-                var newRoot = FindLogicalRoot(this);
-
-                if (newRoot is object)
-                {
-                    var e = new LogicalTreeAttachmentEventArgs(newRoot, this, parent!);
-                    OnAttachedToLogicalTreeCore(e);
-                }
-                else if (parent is null)
-                {
-                    // If we were attached to the logical tree, we piggyback on the tree traversal
-                    // there to raise resources changed notifications. If we're being removed from
-                    // the logical tree, then traverse the tree raising notifications now.
-                    //
-                    // We don't raise resources changed notifications if we're being attached to a 
-                    // non-rooted control beacuse it's unlikely that dynamic resources need to be 
-                    // correct until the control is added to the tree, and it causes a *lot* of
-                    // notifications.
-                    NotifyResourcesChanged();
-                }
-
-#nullable disable
-                RaisePropertyChanged(
-                    ParentProperty,
-                    new Optional<IStyledElement>(old),
-                    new BindingValue<IStyledElement>(Parent),
-                    BindingPriority.LocalValue);
-#nullable enable
-            }
-        }
-
-        /// <summary>
-        /// Sets the styled element's inheritance parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void ISetInheritanceParent.SetParent(IAvaloniaObject? parent)
-        {
-            InheritanceParent = parent;
-        }
-
-        void IStyleable.StyleApplied(IStyleInstance instance)
-        {
-            instance = instance ?? throw new ArgumentNullException(nameof(instance));
-
-            _appliedStyles ??= new List<IStyleInstance>();
-            _appliedStyles.Add(instance);
-        }
-
-        void IStyleable.DetachStyles() => DetachStyles();
-
-        void IStyleable.DetachStyles(IReadOnlyList<IStyle> styles) => DetachStyles(styles);
-
-        void IStyleable.InvalidateStyles() => InvalidateStyles();
-
-        void IStyleHost.StylesAdded(IReadOnlyList<IStyle> styles)
-        {
-            InvalidateStylesOnThisAndDescendents();
-        }
-
-        void IStyleHost.StylesRemoved(IReadOnlyList<IStyle> styles)
-        {
-            var allStyles = RecurseStyles(styles);
-            DetachStylesFromThisAndDescendents(allStyles);
-        }
-
-        protected virtual void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    SetLogicalParent(e.NewItems!);
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    ClearLogicalParent(e.OldItems!);
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    ClearLogicalParent(e.OldItems!);
-                    SetLogicalParent(e.NewItems!);
-                    break;
-
-                case NotifyCollectionChangedAction.Reset:
-                    throw new NotSupportedException("Reset should not be signaled on LogicalChildren collection");
-            }
-        }
-
-        /// <summary>
-        /// Notifies child controls that a change has been made to resources that apply to them.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void NotifyChildResourcesChanged(ResourcesChangedEventArgs e)
-        {
-            if (_logicalChildren is object)
-            {
-                var count = _logicalChildren.Count;
-
-                if (count > 0)
-                {
-                    e ??= ResourcesChangedEventArgs.Empty;
-
-                    for (var i = 0; i < count; ++i)
-                    {
-                        _logicalChildren[i].NotifyResourcesChanged(e);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Called when the styled element is added to a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the styled element is removed from a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> property changes.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDataContextChanged(EventArgs e)
-        {
-            DataContextChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> begins updating.
-        /// </summary>
-        protected virtual void OnDataContextBeginUpdate()
-        {
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> finishes updating.
-        /// </summary>
-        protected virtual void OnDataContextEndUpdate()
-        {
-        }
-
-        /// <summary>
-        /// Called when the control finishes initialization.
-        /// </summary>
-        protected virtual void OnInitialized()
-        {
-        }
-
-        private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
-        {
-            if (o is StyledElement element)
-            {
-                DataContextNotifying(element, updateStarted);
-            }
-        }
-
-        private static void DataContextNotifying(StyledElement element, bool updateStarted)
-        {
-            if (updateStarted)
-            {
-                if (!element._dataContextUpdating)
-                {
-                    element._dataContextUpdating = true;
-                    element.OnDataContextBeginUpdate();
-
-                    var logicalChildren = element.LogicalChildren;
-                    var logicalChildrenCount = logicalChildren.Count;
-
-                    for (var i = 0; i < logicalChildrenCount; i++)
-                    {
-                        if (element.LogicalChildren[i] is StyledElement s &&
-                            s.InheritanceParent == element &&
-                            !s.IsSet(DataContextProperty))
-                        {
-                            DataContextNotifying(s, updateStarted);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                if (element._dataContextUpdating)
-                {
-                    element.OnDataContextEndUpdate();
-                    element._dataContextUpdating = false;
-                }
-            }
-        }
-
-        private static ILogicalRoot? FindLogicalRoot(IStyleHost? e)
-        {
-            while (e != null)
-            {
-                if (e is ILogicalRoot root)
-                {
-                    return root;
-                }
-
-                e = e.StylingParent;
-            }
-
-            return null;
-        }
-
-        private static void ValidateLogicalChild(ILogical c)
-        {
-            if (c == null)
-            {
-                throw new ArgumentException("Cannot add null to LogicalChildren.");
-            }
-        }
-
-        private void OnAttachedToLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
-        {
-            if (this.GetLogicalParent() == null && !(this is ILogicalRoot))
-            {
-                throw new InvalidOperationException(
-                    $"AttachedToLogicalTreeCore called for '{GetType().Name}' but control has no logical parent.");
-            }
-
-            // This method can be called when a control is already attached to the logical tree
-            // in the following scenario:
-            // - ListBox gets assigned Items containing ListBoxItem
-            // - ListBox makes ListBoxItem a logical child
-            // - ListBox template gets applied; making its Panel get attached to logical tree
-            // - That AttachedToLogicalTree signal travels down to the ListBoxItem
-            if (_logicalRoot == null)
-            {
-                _logicalRoot = e.Root;
-
-                ApplyStyling();
-                NotifyResourcesChanged(propagate: false);
-
-                OnAttachedToLogicalTree(e);
-                AttachedToLogicalTree?.Invoke(this, e);
-            }
-
-            var logicalChildren = LogicalChildren;
-            var logicalChildrenCount = logicalChildren.Count;
-
-            for (var i = 0; i < logicalChildrenCount; i++)
-            {
-                if (logicalChildren[i] is StyledElement child)
-                {
-                    child.OnAttachedToLogicalTreeCore(e);
-                }
-            }
-        }
-
-        private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
-        {
-            if (_logicalRoot != null)
-            {
-                _logicalRoot = null;
-                DetachStyles();
-                OnDetachedFromLogicalTree(e);
-                DetachedFromLogicalTree?.Invoke(this, e);
-
-                var logicalChildren = LogicalChildren;
-                var logicalChildrenCount = logicalChildren.Count;
-
-                for (var i = 0; i < logicalChildrenCount; i++)
-                {
-                    if (logicalChildren[i] is StyledElement child)
-                    {
-                        child.OnDetachedFromLogicalTreeCore(e);
-                    }
-                }
-
-#if DEBUG
-                if (((INotifyCollectionChangedDebug)Classes).GetCollectionChangedSubscribers()?.Length > 0)
-                {
-                    Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
-                        this,
-                        "{Type} detached from logical tree but still has class listeners",
-                        GetType());
-                }
-#endif
-            }
-        }
-
-        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
-        {
-            OnDataContextChanged(EventArgs.Empty);
-        }
-
-        private void SetLogicalParent(IList children)
-        {
-            var count = children.Count;
-
-            for (var i = 0; i < count; i++)
-            {
-                var logical = (ILogical) children[i]!;
-                
-                if (logical.LogicalParent is null)
-                {
-                    ((ISetLogicalParent)logical).SetParent(this);
-                }
-            }
-        }
-
-        private void ClearLogicalParent(IList children)
-        {
-            var count = children.Count;
-
-            for (var i = 0; i < count; i++)
-            {
-                var logical = (ILogical) children[i]!;
-                
-                if (logical.LogicalParent == this)
-                {
-                    ((ISetLogicalParent)logical).SetParent(null);
-                }
-            }
-        }
-
-        private void DetachStyles()
-        {
-            if (_appliedStyles is object)
-            {
-                BeginBatchUpdate();
-
-                try
-                {
-                    foreach (var i in _appliedStyles)
-                    {
-                        i.Dispose();
-                    }
-
-                    _appliedStyles.Clear();
-                }
-                finally
-                {
-                    EndBatchUpdate();
-                }
-            }
-
-            _styled = false;
-        }
-
-        private void DetachStyles(IReadOnlyList<IStyle> styles)
-        {
-            styles = styles ?? throw new ArgumentNullException(nameof(styles));
-
-            if (_appliedStyles is null)
-            {
-                return;
-            }
-
-            var count = styles.Count;
-
-            for (var i = 0; i < count; ++i)
-            {
-                for (var j = _appliedStyles.Count - 1; j >= 0; --j)
-                {
-                    var applied = _appliedStyles[j];
-
-                    if (applied.Source == styles[i])
-                    {
-                        applied.Dispose();
-                        _appliedStyles.RemoveAt(j);
-                    }
-                }
-            }
-        }
-
-        private void InvalidateStylesOnThisAndDescendents()
-        {
-            InvalidateStyles();
-
-            if (_logicalChildren is object)
-            {
-                var childCount = _logicalChildren.Count;
-
-                for (var i = 0; i < childCount; ++i)
-                {
-                    (_logicalChildren[i] as StyledElement)?.InvalidateStylesOnThisAndDescendents();
-                }
-            }
-        }
-
-        private void DetachStylesFromThisAndDescendents(IReadOnlyList<IStyle> styles)
-        {
-            DetachStyles(styles);
-
-            if (_logicalChildren is object)
-            {
-                var childCount = _logicalChildren.Count;
-
-                for (var i = 0; i < childCount; ++i)
-                {
-                    (_logicalChildren[i] as StyledElement)?.DetachStylesFromThisAndDescendents(styles);
-                }
-            }
-        }
-
-        private void NotifyResourcesChanged(
-            ResourcesChangedEventArgs? e = null,
-            bool propagate = true)
-        {
-            if (ResourcesChanged is object)
-            {
-                e ??= ResourcesChangedEventArgs.Empty;
-                ResourcesChanged(this, e);
-            }
-
-            if (propagate)
-            {
-                e ??= ResourcesChangedEventArgs.Empty;
-                NotifyChildResourcesChanged(e);
-            }
-        }
-
-        private static IReadOnlyList<IStyle> RecurseStyles(IReadOnlyList<IStyle> styles)
-        {
-            var count = styles.Count;
-            List<IStyle>? result = null;
-
-            for (var i = 0; i < count; ++i)
-            {
-                var style = styles[i];
-
-                if (style.Children.Count > 0)
-                {
-                    if (result is null)
-                    {
-                        result = new List<IStyle>(styles);
-                    }
-
-                    RecurseStyles(style.Children, result);
-                }
-            }
-
-            return result ?? styles;
-        }
-
-        private static void RecurseStyles(IReadOnlyList<IStyle> styles, List<IStyle> result)
-        {
-            var count = styles.Count;
-
-            for (var i = 0; i < count; ++i)
-            {
-                var style = styles[i];
-                result.Add(style);
-                RecurseStyles(style.Children, result);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs
deleted file mode 100644
index 479100ed8a..0000000000
--- a/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#nullable enable
-
-using System;
-
-namespace Avalonia.Styling.Activators
-{
-    /// <summary>
-    /// Defines a style activator.
-    /// </summary>
-    /// <remarks>
-    /// A style activator is very similar to an `IObservable{bool}` but is optimized for the
-    /// particular use-case of activating a style according to a selector. It differs from
-    /// an observable in two major ways:
-    /// 
-    /// - Can only have a single subscription
-    /// - The subscription can have a tag associated with it, allowing a subscriber to index
-    ///   into a list of subscriptions without having to allocate additional objects.
-    /// </remarks>
-    public interface IStyleActivator : IDisposable
-    {
-        /// <summary>
-        /// Subscribes to the activator.
-        /// </summary>
-        /// <param name="sink">The listener.</param>
-        /// <param name="tag">An optional tag.</param>
-        void Subscribe(IStyleActivatorSink sink, int tag = 0);
-
-        /// <summary>
-        /// Unsubscribes from the activator.
-        /// </summary>
-        void Unsubscribe(IStyleActivatorSink sink);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs b/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs
deleted file mode 100644
index a1a6ef5c28..0000000000
--- a/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#nullable enable
-
-namespace Avalonia.Styling.Activators
-{
-    /// <summary>
-    /// Receives notifications from an <see cref="IStyleActivator"/>.
-    /// </summary>
-    public interface IStyleActivatorSink
-    {
-        /// <summary>
-        /// Called when the subscribed activator value changes.
-        /// </summary>
-        /// <param name="value">The new value.</param>
-        /// <param name="tag">The subscription tag.</param>
-        void OnNext(bool value, int tag);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs b/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs
deleted file mode 100644
index 98d3f16a0a..0000000000
--- a/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Avalonia.Collections;
-
-#nullable enable
-
-namespace Avalonia.Styling.Activators
-{
-    /// <summary>
-    /// An <see cref="IStyleActivator"/> which is active when a set of classes match those on a
-    /// control.
-    /// </summary>
-    internal sealed class StyleClassActivator : StyleActivatorBase
-    {
-        private readonly IList<string> _match;
-        private readonly IAvaloniaReadOnlyList<string> _classes;
-        private NotifyCollectionChangedEventHandler? _classesChangedHandler;
-
-        public StyleClassActivator(IAvaloniaReadOnlyList<string> classes, IList<string> match)
-        {
-            _classes = classes;
-            _match = match;
-        }
-
-        private NotifyCollectionChangedEventHandler ClassesChangedHandler =>
-            _classesChangedHandler ??= ClassesChanged;
-
-        public static bool AreClassesMatching(IReadOnlyList<string> classes, IList<string> toMatch)
-        {
-            int remainingMatches = toMatch.Count;
-            int classesCount = classes.Count;
-
-            // Early bail out - we can't match if control does not have enough classes.
-            if (classesCount < remainingMatches)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < classesCount; i++)
-            {
-                var c = classes[i];
-
-                if (toMatch.Contains(c))
-                {
-                    --remainingMatches;
-
-                    // Already matched so we can skip checking other classes.
-                    if (remainingMatches == 0)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return remainingMatches == 0;
-        }
-
-        protected override void Initialize()
-        {
-            PublishNext(IsMatching());
-            _classes.CollectionChanged += ClassesChangedHandler;
-        }
-
-        protected override void Deinitialize()
-        {
-            _classes.CollectionChanged -= ClassesChangedHandler;
-        }
-
-        private void ClassesChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (e.Action != NotifyCollectionChangedAction.Move)
-            {
-                PublishNext(IsMatching());
-            }
-        }
-
-        private bool IsMatching() => AreClassesMatching(_classes, _match);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ChildSelector.cs b/src/Avalonia.Styling/Styling/ChildSelector.cs
deleted file mode 100644
index 5c92182b80..0000000000
--- a/src/Avalonia.Styling/Styling/ChildSelector.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using Avalonia.LogicalTree;
-
-namespace Avalonia.Styling
-{
-    internal class ChildSelector : Selector
-    {
-        private readonly Selector _parent;
-        private string? _selectorString;
-
-        public ChildSelector(Selector parent)
-        {
-            if (parent == null)
-            {
-                throw new InvalidOperationException("Child selector must be preceeded by a selector.");
-            }
-
-            _parent = parent;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _parent.InTemplate;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => true;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => null;
-
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = _parent.ToString() + " > ";
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var controlParent = ((ILogical)control).LogicalParent;
-
-            if (controlParent != null)
-            {
-                var parentMatch = _parent.Match((IStyleable)controlParent, subscribe);
-
-                if (parentMatch.Result == SelectorMatchResult.Sometimes)
-                {
-                    return parentMatch;
-                }
-                else if (parentMatch.IsMatch)
-                {
-                    return SelectorMatch.AlwaysThisInstance;
-                }
-                else
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-            }
-            else
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-        }
-
-        protected override Selector? MovePrevious() => null;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/DescendentSelector.cs b/src/Avalonia.Styling/Styling/DescendentSelector.cs
deleted file mode 100644
index dde88b3436..0000000000
--- a/src/Avalonia.Styling/Styling/DescendentSelector.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using Avalonia.LogicalTree;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    internal class DescendantSelector : Selector
-    {
-        private readonly Selector _parent;
-        private string? _selectorString;
-
-        public DescendantSelector(Selector? parent)
-        {
-            _parent = parent ?? throw new InvalidOperationException("Descendant selector must be preceeded by a selector.");
-        }
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => true;
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _parent.InTemplate;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => null;
-
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = _parent.ToString() + ' ';
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var c = (ILogical)control;
-            var descendantMatches = new OrActivatorBuilder();
-
-            while (c != null)
-            {
-                c = c.LogicalParent;
-
-                if (c is IStyleable)
-                {
-                    var match = _parent.Match((IStyleable)c, subscribe);
-
-                    if (match.Result == SelectorMatchResult.Sometimes)
-                    {
-                        descendantMatches.Add(match.Activator);
-                    }
-                    else if (match.IsMatch)
-                    {
-                        return SelectorMatch.AlwaysThisInstance;
-                    }
-                }
-            }
-
-            if (descendantMatches.Count > 0)
-            {
-                return new SelectorMatch(descendantMatches.Get());
-            }
-            else
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-        }
-
-        protected override Selector? MovePrevious() => null;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IGlobalStyles.cs b/src/Avalonia.Styling/Styling/IGlobalStyles.cs
deleted file mode 100644
index ab24e3138c..0000000000
--- a/src/Avalonia.Styling/Styling/IGlobalStyles.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines the style host that provides styles global to the application.
-    /// </summary>
-    public interface IGlobalStyles : IStyleHost
-    {
-        /// <summary>
-        /// Raised when styles are added to <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        public event Action<IReadOnlyList<IStyle>>? GlobalStylesAdded;
-
-        /// <summary>
-        /// Raised when styles are removed from <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        public event Action<IReadOnlyList<IStyle>>? GlobalStylesRemoved;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ISetter.cs b/src/Avalonia.Styling/Styling/ISetter.cs
deleted file mode 100644
index d588817be8..0000000000
--- a/src/Avalonia.Styling/Styling/ISetter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a setter for a <see cref="Style"/>.
-    /// </summary>
-    public interface ISetter
-    {
-        /// <summary>
-        /// Instances a setter on a control.
-        /// </summary>
-        /// <param name="target">The control.</param>
-        /// <returns>An <see cref="ISetterInstance"/>.</returns>
-        /// <remarks>
-        /// This method should return an <see cref="ISetterInstance"/> which can be used to apply
-        /// the setter to the specified control. Note that it should not apply the setter value 
-        /// until <see cref="ISetterInstance.Start(bool)"/> is called.
-        /// </remarks>
-        ISetterInstance Instance(IStyleable target);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ISetterInstance.cs b/src/Avalonia.Styling/Styling/ISetterInstance.cs
deleted file mode 100644
index a299a87b64..0000000000
--- a/src/Avalonia.Styling/Styling/ISetterInstance.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#nullable enable
-
-using System;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a setter that has been instanced on a control.
-    /// </summary>
-    public interface ISetterInstance : IDisposable
-    {
-        /// <summary>
-        /// Starts the setter instance.
-        /// </summary>
-        /// <param name="hasActivator">Whether the parent style has an activator.</param>
-        /// <remarks>
-        /// If <paramref name="hasActivator"/> is false then the setter should be immediately
-        /// applied and <see cref="Activate"/> and <see cref="Deactivate"/> should not be called.
-        /// If true, then bindings etc should be initiated but not produce a value until
-        /// <see cref="Activate"/> called.
-        /// </remarks>
-        public void Start(bool hasActivator);
-
-        /// <summary>
-        /// Activates the setter.
-        /// </summary>
-        /// <remarks>
-        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
-        /// </remarks>
-        public void Activate();
-
-        /// <summary>
-        /// Deactivates the setter.
-        /// </summary>
-        /// <remarks>
-        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
-        /// </remarks>
-        public void Deactivate();
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyle.cs b/src/Avalonia.Styling/Styling/IStyle.cs
deleted file mode 100644
index 78fbe0f2b5..0000000000
--- a/src/Avalonia.Styling/Styling/IStyle.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines the interface for styles.
-    /// </summary>
-    public interface IStyle
-    {
-        /// <summary>
-        /// Gets a collection of child styles.
-        /// </summary>
-        IReadOnlyList<IStyle> Children { get; }
-
-        /// <summary>
-        /// Attaches the style and any child styles to a control if the style's selector matches.
-        /// </summary>
-        /// <param name="target">The control to attach to.</param>
-        /// <param name="host">The element that hosts the style.</param>
-        /// <returns>
-        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
-        /// </returns>
-        SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleHost.cs b/src/Avalonia.Styling/Styling/IStyleHost.cs
deleted file mode 100644
index 360b40d9a1..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleHost.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-
-using System.Collections.Generic;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines an element that has a <see cref="Styles"/> collection.
-    /// </summary>
-    public interface IStyleHost
-    {
-        /// <summary>
-        /// Gets a value indicating whether <see cref="Styles"/> is initialized.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="Styles"/> property may be lazily initialized, if so this property
-        /// indicates whether it has been initialized.
-        /// </remarks>
-        bool IsStylesInitialized { get; }
-
-        /// <summary>
-        /// Gets the styles for the element.
-        /// </summary>
-        Styles Styles { get; }
-
-        /// <summary>
-        /// Gets the parent style host element.
-        /// </summary>
-        IStyleHost? StylingParent { get; }
-
-        /// <summary>
-        /// Called when styles are added to <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        /// <param name="styles">The added styles.</param>
-        void StylesAdded(IReadOnlyList<IStyle> styles);
-
-        /// <summary>
-        /// Called when styles are removed from <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        /// <param name="styles">The removed styles.</param>
-        void StylesRemoved(IReadOnlyList<IStyle> styles);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleInstance.cs b/src/Avalonia.Styling/Styling/IStyleInstance.cs
deleted file mode 100644
index 8ddb989bc0..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleInstance.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a style that has been instanced on a control.
-    /// </summary>
-    public interface IStyleInstance : IDisposable
-    {
-        /// <summary>
-        /// Gets the source style.
-        /// </summary>
-        IStyle Source { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this style is active.
-        /// </summary>
-        bool IsActive { get; }
-
-        /// <summary>
-        /// Instructs the style to start acting upon the control.
-        /// </summary>
-        void Start();
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleable.cs b/src/Avalonia.Styling/Styling/IStyleable.cs
deleted file mode 100644
index a3df779057..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleable.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Collections;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Interface for styleable elements.
-    /// </summary>
-    public interface IStyleable : IAvaloniaObject, INamed
-    {
-        /// <summary>
-        /// Gets the list of classes for the control.
-        /// </summary>
-        IAvaloniaReadOnlyList<string> Classes { get; }
-
-        /// <summary>
-        /// Gets the type by which the control is styled.
-        /// </summary>
-        Type StyleKey { get; }
-
-        /// <summary>
-        /// Gets the template parent of this element if the control comes from a template.
-        /// </summary>
-        ITemplatedControl? TemplatedParent { get; }
-
-        /// <summary>
-        /// Notifies the element that a style has been applied.
-        /// </summary>
-        /// <param name="instance">The style instance.</param>
-        void StyleApplied(IStyleInstance instance);
-
-        /// <summary>
-        /// Detaches all styles applied to the element.
-        /// </summary>
-        void DetachStyles();
-
-        /// <summary>
-        /// Detaches a collection of styles, if applied to the element.
-        /// </summary>
-        void DetachStyles(IReadOnlyList<IStyle> styles);
-
-        /// <summary>
-        /// Detaches all styles from the element and queues a restyle.
-        /// </summary>
-        void InvalidateStyles();
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ITemplatedControl.cs b/src/Avalonia.Styling/Styling/ITemplatedControl.cs
deleted file mode 100644
index 5485babb62..0000000000
--- a/src/Avalonia.Styling/Styling/ITemplatedControl.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace Avalonia.Styling
-{
-    public interface ITemplatedControl : IAvaloniaObject
-    {
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/NotSelector.cs b/src/Avalonia.Styling/Styling/NotSelector.cs
deleted file mode 100644
index ab4e9d5d7f..0000000000
--- a/src/Avalonia.Styling/Styling/NotSelector.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// The `:not()` style selector.
-    /// </summary>
-    internal class NotSelector : Selector
-    {
-        private readonly Selector? _previous;
-        private readonly Selector _argument;
-        private string? _selectorString;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotSelector"/> class.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="argument">The selector to be not-ed.</param>
-        public NotSelector(Selector? previous, Selector argument)
-        {
-            _previous = previous;
-            _argument = argument ?? throw new InvalidOperationException("Not selector must have a selector argument.");
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _argument.InTemplate;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => _previous?.TargetType;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = $"{_previous?.ToString()}:not({_argument})";
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var innerResult = _argument.Match(control, subscribe);
-
-            switch (innerResult.Result)
-            {
-                case SelectorMatchResult.AlwaysThisInstance:
-                    return SelectorMatch.NeverThisInstance;
-                case SelectorMatchResult.AlwaysThisType:
-                    return SelectorMatch.NeverThisType;
-                case SelectorMatchResult.NeverThisInstance:
-                    return SelectorMatch.AlwaysThisInstance;
-                case SelectorMatchResult.NeverThisType:
-                    return SelectorMatch.AlwaysThisType;
-                case SelectorMatchResult.Sometimes:
-                    return new SelectorMatch(new NotActivator(innerResult.Activator!));
-                default:
-                    throw new InvalidOperationException("Invalid SelectorMatchResult.");
-            }
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/NthChildSelector.cs b/src/Avalonia.Styling/Styling/NthChildSelector.cs
deleted file mode 100644
index aff34ea17c..0000000000
--- a/src/Avalonia.Styling/Styling/NthChildSelector.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-#nullable enable
-using System;
-using System.Text;
-using Avalonia.LogicalTree;
-using Avalonia.Styling.Activators;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// The :nth-child() pseudo-class matches elements based on their position in a group of siblings.
-    /// </summary>
-    /// <remarks>
-    /// Element indices are 1-based.
-    /// </remarks>
-    public class NthChildSelector : Selector
-    {
-        private const string NthChildSelectorName = "nth-child";
-        private const string NthLastChildSelectorName = "nth-last-child";
-        private readonly Selector? _previous;
-        private readonly bool _reversed;
-
-        internal protected NthChildSelector(Selector? previous, int step, int offset, bool reversed)
-        {
-            _previous = previous;
-            Step = step;
-            Offset = offset;
-            _reversed = reversed;
-        }
-
-        /// <summary>
-        /// Creates an instance of <see cref="NthChildSelector"/>
-        /// </summary>
-        /// <param name="previous">Previous selector.</param>
-        /// <param name="step">Position step.</param>
-        /// <param name="offset">Initial index offset.</param>
-        public NthChildSelector(Selector? previous, int step, int offset)
-            : this(previous, step, offset, false)
-        {
-
-        }
-
-        public override bool InTemplate => _previous?.InTemplate ?? false;
-
-        public override bool IsCombinator => false;
-
-        public override Type? TargetType => _previous?.TargetType;
-
-        public int Step { get; }
-        public int Offset { get; }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            if (!(control is ILogical logical))
-            {
-                return SelectorMatch.NeverThisType;
-            }
-
-            var controlParent = logical.LogicalParent;
-
-            if (controlParent is IChildIndexProvider childIndexProvider)
-            {
-                return subscribe
-                    ? new SelectorMatch(new NthChildActivator(logical, childIndexProvider, Step, Offset, _reversed))
-                    : Evaluate(logical, childIndexProvider, Step, Offset, _reversed);
-            }
-            else
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-        }
-
-        internal static SelectorMatch Evaluate(
-            ILogical logical, IChildIndexProvider childIndexProvider,
-            int step, int offset, bool reversed)
-        {
-            var index = childIndexProvider.GetChildIndex(logical);
-            if (index < 0)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-
-            if (reversed)
-            {
-                if (childIndexProvider.TryGetTotalCount(out var totalCountValue))
-                {
-                    index = totalCountValue - index;
-                }
-                else
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-            }
-            else
-            {
-                // nth child index is 1-based
-                index += 1;
-            }
-
-            var n = Math.Sign(step);
-
-            var diff = index - offset;
-            var match = diff == 0 || (Math.Sign(diff) == n && diff % step == 0);
-
-            return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-
-        public override string ToString()
-        {
-            var expectedCapacity = NthLastChildSelectorName.Length + 8;
-            var stringBuilder = new StringBuilder(_previous?.ToString(), expectedCapacity);
-            
-            stringBuilder.Append(':');
-            stringBuilder.Append(_reversed ? NthLastChildSelectorName : NthChildSelectorName);
-            stringBuilder.Append('(');
-
-            var hasStep = false;
-            if (Step != 0)
-            {
-                hasStep = true;
-                stringBuilder.Append(Step);
-                stringBuilder.Append('n');
-            }
-
-            if (Offset > 0)
-            {
-                if (hasStep)
-                {
-                    stringBuilder.Append('+');
-                }
-                stringBuilder.Append(Offset);
-            }
-            else if (Offset < 0)
-            {
-                stringBuilder.Append('-');
-                stringBuilder.Append(-Offset);
-            }
-
-            stringBuilder.Append(')');
-
-            return stringBuilder.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/OrSelector.cs b/src/Avalonia.Styling/Styling/OrSelector.cs
deleted file mode 100644
index 3d6db9b01e..0000000000
--- a/src/Avalonia.Styling/Styling/OrSelector.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// The OR style selector.
-    /// </summary>
-    internal class OrSelector : Selector
-    {
-        private readonly IReadOnlyList<Selector> _selectors;
-        private string? _selectorString;
-        private Type? _targetType;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrSelector"/> class.
-        /// </summary>
-        /// <param name="selectors">The selectors to OR.</param>
-        public OrSelector(IReadOnlyList<Selector> selectors)
-        {
-            if (selectors is null)
-            {
-                throw new ArgumentNullException(nameof(selectors));
-            }
-
-            if (selectors.Count <= 1)
-            {
-                throw new ArgumentException("Need more than one selector to OR.");
-            }
-
-            _selectors = selectors;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => false;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <inheritdoc/>
-        public override Type? TargetType
-        {
-            get
-            {
-                if (_targetType == null)
-                {
-                    _targetType = EvaluateTargetType();
-                }
-
-                return _targetType;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = string.Join(", ", _selectors);
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var activators = new OrActivatorBuilder();
-            var neverThisInstance = false;
-
-            foreach (var selector in _selectors)
-            {
-                var match = selector.Match(control, subscribe);
-
-                switch (match.Result)
-                {
-                    case SelectorMatchResult.AlwaysThisType:
-                    case SelectorMatchResult.AlwaysThisInstance:
-                        return match;
-                    case SelectorMatchResult.NeverThisInstance:
-                        neverThisInstance = true;
-                        break;
-                    case SelectorMatchResult.Sometimes:
-                        activators.Add(match.Activator!);
-                        break;
-                }
-            }
-
-            if (activators.Count > 0)
-            {
-                return new SelectorMatch(activators.Get());
-            }
-            else if (neverThisInstance)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-            else
-            {
-                return SelectorMatch.NeverThisType;
-            }
-        }
-
-        protected override Selector? MovePrevious() => null;
-
-        private Type? EvaluateTargetType()
-        {
-            Type? result = null;
-
-            foreach (var selector in _selectors)
-            {
-                if (selector.TargetType == null)
-                {
-                    return null;
-                }
-                else if (result == null)
-                {
-                    result = selector.TargetType;
-                }
-                else
-                {
-                    while (result is not null && !result.IsAssignableFrom(selector.TargetType))
-                    {
-                        result = result.BaseType;
-                    }
-                }
-            }
-
-            return result;
-        }
-    }
-}
-
diff --git a/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
deleted file mode 100644
index 1cd1a650ef..0000000000
--- a/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Text;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A selector that matches the common case of a type and/or name followed by a collection of
-    /// style classes and pseudoclasses.
-    /// </summary>
-    internal class PropertyEqualsSelector : Selector
-    {
-        private readonly Selector? _previous;
-        private readonly AvaloniaProperty _property;
-        private readonly object? _value;
-        private string? _selectorString;
-
-        public PropertyEqualsSelector(Selector? previous, AvaloniaProperty property, object? value)
-        {
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            _previous = previous;
-            _property = property;
-            _value = value;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _previous?.InTemplate ?? false;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => _previous?.TargetType;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                var builder = new StringBuilder();
-
-                if (_previous != null)
-                {
-                    builder.Append(_previous.ToString());
-                }
-
-                builder.Append('[');
-
-                if (_property.IsAttached)
-                {
-                    builder.Append('(');
-                    builder.Append(_property.OwnerType.Name);
-                    builder.Append('.');
-                }
-
-                builder.Append(_property.Name);
-                if (_property.IsAttached)
-                {
-                    builder.Append(')');
-                }
-                builder.Append('=');
-                builder.Append(_value ?? string.Empty);
-                builder.Append(']');
-
-                _selectorString = builder.ToString();
-            }
-
-            return _selectorString;
-        }
-
-        /// <inheritdoc/>
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            if (subscribe)
-            {
-                return new SelectorMatch(new PropertyEqualsActivator(control, _property, _value));
-            }
-            else
-            {
-                return Compare(_property.PropertyType, control.GetValue(_property), _value)
-                    ? SelectorMatch.AlwaysThisInstance
-                    : SelectorMatch.NeverThisInstance;
-            }
-            
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-
-        internal static bool Compare(Type propertyType, object? propertyValue, object? value)
-        {
-            if (propertyType == typeof(object) &&
-                propertyValue?.GetType() is Type inferredType)
-            {
-                propertyType = inferredType;
-            }
-
-            var valueType = value?.GetType();
-
-            if (valueType is null || propertyType.IsAssignableFrom(valueType))
-            {
-                return Equals(propertyValue, value);
-            }
-
-            var converter = TypeDescriptor.GetConverter(propertyType);
-            if (converter?.CanConvertFrom(valueType) == true)
-            {
-                return Equals(propertyValue, converter.ConvertFrom(null, CultureInfo.InvariantCulture, value!));
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterInstance.cs b/src/Avalonia.Styling/Styling/PropertySetterInstance.cs
deleted file mode 100644
index 48f462d006..0000000000
--- a/src/Avalonia.Styling/Styling/PropertySetterInstance.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Reactive;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A <see cref="Setter"/> which has been instanced on a control.
-    /// </summary>
-    /// <typeparam name="T">The target property type.</typeparam>
-    internal class PropertySetterInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
-        ISetterInstance
-    {
-        private readonly IStyleable _target;
-        private readonly StyledPropertyBase<T>? _styledProperty;
-        private readonly DirectPropertyBase<T>? _directProperty;
-        private readonly T _value;
-        private IDisposable? _subscription;
-        private bool _isActive;
-
-        public PropertySetterInstance(
-            IStyleable target,
-            StyledPropertyBase<T> property,
-            T value)
-        {
-            _target = target;
-            _styledProperty = property;
-            _value = value;
-        }
-
-        public PropertySetterInstance(
-            IStyleable target,
-            DirectPropertyBase<T> property,
-            T value)
-        {
-            _target = target;
-            _directProperty = property;
-            _value = value;
-        }
-
-        public void Start(bool hasActivator)
-        {
-            if (hasActivator)
-            {
-                if (_styledProperty is object)
-                {
-                    _subscription = _target.Bind(_styledProperty, this, BindingPriority.StyleTrigger);
-                }
-                else
-                {
-                    _subscription = _target.Bind(_directProperty!, this);
-                }
-            }
-            else
-            {
-                if (_styledProperty is object)
-                {
-                    _subscription = _target.SetValue(_styledProperty!, _value, BindingPriority.Style);
-                }
-                else
-                {
-                    _target.SetValue(_directProperty!, _value);
-                }
-            }
-        }
-
-        public void Activate()
-        {
-            if (!_isActive)
-            {
-                _isActive = true;
-                PublishNext();
-            }
-        }
-
-        public void Deactivate()
-        {
-            if (_isActive)
-            {
-                _isActive = false;
-                PublishNext();
-            }
-        }
-
-        public override void Dispose()
-        {
-            if (_subscription is object)
-            {
-                var sub = _subscription;
-                _subscription = null;
-                sub.Dispose();
-            }
-            else if (_isActive)
-            {
-                if (_styledProperty is object)
-                {
-                    _target.ClearValue(_styledProperty);
-                }
-                else
-                {
-                    _target.ClearValue(_directProperty!);
-                }
-            }
-
-            base.Dispose();
-        }
-
-        protected override void Subscribed() => PublishNext();
-        protected override void Unsubscribed() { }
-
-        private void PublishNext()
-        {
-            PublishNext(_isActive ? new BindingValue<T>(_value) : default);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterLazyInstance.cs b/src/Avalonia.Styling/Styling/PropertySetterLazyInstance.cs
deleted file mode 100644
index 92653d0064..0000000000
--- a/src/Avalonia.Styling/Styling/PropertySetterLazyInstance.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Reactive;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A <see cref="Setter"/> which has been instanced on a control and whose value is lazily
-    /// evaluated.
-    /// </summary>
-    /// <typeparam name="T">The target property type.</typeparam>
-    internal class PropertySetterLazyInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
-        ISetterInstance
-    {
-        private readonly IStyleable _target;
-        private readonly StyledPropertyBase<T>? _styledProperty;
-        private readonly DirectPropertyBase<T>? _directProperty;
-        private readonly Func<T> _valueFactory;
-        private BindingValue<T> _value;
-        private IDisposable? _subscription;
-        private bool _isActive;
-
-        public PropertySetterLazyInstance(
-            IStyleable target,
-            StyledPropertyBase<T> property,
-            Func<T> valueFactory)
-        {
-            _target = target;
-            _styledProperty = property;
-            _valueFactory = valueFactory;
-        }
-
-        public PropertySetterLazyInstance(
-            IStyleable target,
-            DirectPropertyBase<T> property,
-            Func<T> valueFactory)
-        {
-            _target = target;
-            _directProperty = property;
-            _valueFactory = valueFactory;
-        }
-
-        public void Start(bool hasActivator)
-        {
-            _isActive = !hasActivator;
-
-            if (_styledProperty is object)
-            {
-                var priority = hasActivator ? BindingPriority.StyleTrigger : BindingPriority.Style;
-                _subscription = _target.Bind(_styledProperty, this, priority);
-            }
-            else
-            {
-                _subscription = _target.Bind(_directProperty!, this);
-            }
-        }
-
-        public void Activate()
-        {
-            if (!_isActive)
-            {
-                _isActive = true;
-                PublishNext();
-            }
-        }
-
-        public void Deactivate()
-        {
-            if (_isActive)
-            {
-                _isActive = false;
-                PublishNext();
-            }
-        }
-
-        public override void Dispose()
-        {
-            if (_subscription is object)
-            {
-                var sub = _subscription;
-                _subscription = null;
-                sub.Dispose();
-            }
-            else if (_isActive)
-            {
-                if (_styledProperty is object)
-                {
-                    _target.ClearValue(_styledProperty);
-                }
-                else
-                {
-                    _target.ClearValue(_directProperty!);
-                }
-            }
-
-            base.Dispose();
-        }
-
-        protected override void Subscribed() => PublishNext();
-        protected override void Unsubscribed() { }
-
-        private T GetValue()
-        {
-            if (_value.HasValue)
-            {
-                return _value.Value;
-            }
-
-            _value = _valueFactory();
-            return _value.Value;
-        }
-
-        private void PublishNext()
-        {
-            if (_isActive)
-            {
-                GetValue();
-                PublishNext(_value);
-            }
-            else
-            {
-                PublishNext(default);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Selector.cs b/src/Avalonia.Styling/Styling/Selector.cs
deleted file mode 100644
index 0740e0f891..0000000000
--- a/src/Avalonia.Styling/Styling/Selector.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A selector in a <see cref="Style"/>.
-    /// </summary>
-    public abstract class Selector
-    {
-        /// <summary>
-        /// Gets a value indicating whether either this selector or a previous selector has moved
-        /// into a template.
-        /// </summary>
-        public abstract bool InTemplate { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this selector is a combinator.
-        /// </summary>
-        /// <remarks>
-        /// A combinator is a selector such as Child or Descendent which links simple selectors.
-        /// </remarks>
-        public abstract bool IsCombinator { get; }
-
-        /// <summary>
-        /// Gets the target type of the selector, if available.
-        /// </summary>
-        public abstract Type? TargetType { get; }
-
-        /// <summary>
-        /// Tries to match the selector with a control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="subscribe">
-        /// Whether the match should subscribe to changes in order to track the match over time,
-        /// or simply return an immediate result.
-        /// </param>
-        /// <returns>A <see cref="SelectorMatch"/>.</returns>
-        public SelectorMatch Match(IStyleable control, bool subscribe = true)
-        {
-            // First match the selector until a combinator is found. Selectors are stored from 
-            // right-to-left, so MatchUntilCombinator reverses this order because the type selector
-            // will be on the left.
-            var match = MatchUntilCombinator(control, this, subscribe, out var combinator);
-            
-            // If the pre-combinator selector matches, we can now match the combinator, if any.
-            if (match.IsMatch && combinator is object)
-            {
-                match = match.And(combinator.Match(control, subscribe));
-
-                // If we have a combinator then we can never say that we always match a control of
-                // this type, because by definition the combinator matches on things outside of the
-                // control.
-                match = match.Result switch
-                {
-                    SelectorMatchResult.AlwaysThisType => SelectorMatch.AlwaysThisInstance,
-                    SelectorMatchResult.NeverThisType => SelectorMatch.NeverThisInstance,
-                    _ => match
-                };
-            }
-
-            return match;
-        }
-
-        /// <summary>
-        /// Evaluates the selector for a match.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="subscribe">
-        /// Whether the match should subscribe to changes in order to track the match over time,
-        /// or simply return an immediate result.
-        /// </param>
-        /// <returns>A <see cref="SelectorMatch"/>.</returns>
-        protected abstract SelectorMatch Evaluate(IStyleable control, bool subscribe);
-
-        /// <summary>
-        /// Moves to the previous selector.
-        /// </summary>
-        protected abstract Selector? MovePrevious();
-
-        private static SelectorMatch MatchUntilCombinator(
-            IStyleable control,
-            Selector start,
-            bool subscribe,
-            out Selector? combinator)
-        {
-            combinator = null;
-
-            var activators = new AndActivatorBuilder();
-            var result = Match(control, start, subscribe, ref activators, ref combinator);
-
-            return result == SelectorMatchResult.Sometimes ?
-                new SelectorMatch(activators.Get()) :
-                new SelectorMatch(result);
-        }
-
-        private static SelectorMatchResult Match(
-            IStyleable control,
-            Selector selector,
-            bool subscribe,
-            ref AndActivatorBuilder activators,
-            ref Selector? combinator)
-        {
-            var previous = selector.MovePrevious();
-
-            // Selectors are stored from right-to-left, so we recurse into the selector in order to
-            // reverse this order, because the type selector will be on the left and is our best
-            // opportunity to exit early.
-            if (previous != null && !previous.IsCombinator)
-            {
-                var previousMatch = Match(control, previous, subscribe, ref activators, ref combinator);
-
-                if (previousMatch < SelectorMatchResult.Sometimes)
-                {
-                    return previousMatch;
-                }
-            }
-
-            // Match this selector.
-            var match = selector.Evaluate(control, subscribe);
-
-            if (!match.IsMatch)
-            {
-                combinator = null;
-                return match.Result;
-            }
-            else if (match.Activator is object)
-            {
-                activators.Add(match.Activator!);
-            }
-
-            if (previous?.IsCombinator == true)
-            {
-                combinator = previous;
-            }
-
-            return match.Result;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Selectors.cs b/src/Avalonia.Styling/Styling/Selectors.cs
deleted file mode 100644
index 7c66469cf1..0000000000
--- a/src/Avalonia.Styling/Styling/Selectors.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Extension methods for <see cref="Selector"/>.
-    /// </summary>
-    public static class Selectors
-    {
-        /// <summary>
-        /// Returns a selector which matches a previous selector's child.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Child(this Selector previous)
-        {
-            return new ChildSelector(previous);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control's style class.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="name">The name of the style class.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Class(this Selector? previous, string name)
-        {
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw new ArgumentException("Name may not be empty", nameof(name));
-            }
-
-            var tac = previous as TypeNameAndClassSelector;
-
-            if (tac != null)
-            {
-                tac.Classes.Add(name);
-                return tac;
-            }
-            else
-            {
-                return TypeNameAndClassSelector.ForClass(previous, name);
-            }
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a descendant of a previous selector.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Descendant(this Selector? previous)
-        {
-            return new DescendantSelector(previous);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type or a derived type.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Is(this Selector? previous, Type type)
-        {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-
-            return TypeNameAndClassSelector.Is(previous, type);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type or a derived type.
-        /// </summary>
-        /// <typeparam name="T">The type.</typeparam>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Is<T>(this Selector? previous) where T : IStyleable
-        {
-            return previous.Is(typeof(T));
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control's Name.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="name">The name.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Name(this Selector? previous, string name)
-        {
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw new ArgumentException("Name may not be empty", nameof(name));
-            }
-
-            var tac = previous as TypeNameAndClassSelector;
-
-            if (tac != null)
-            {
-                tac.Name = name;
-                return tac;
-            }
-            else
-            {
-                return TypeNameAndClassSelector.ForName(previous, name);
-            }
-        }
-
-        /// <summary>
-        /// Returns a selector which inverts the results of selector argument.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="argument">The selector to be not-ed.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Not(this Selector? previous, Func<Selector?, Selector> argument)
-        {
-            return new NotSelector(previous, argument(null));
-        }
-        
-        /// <summary>
-        /// Returns a selector which inverts the results of selector argument.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="argument">The selector to be not-ed.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Not(this Selector? previous, Selector argument)
-        {
-            return new NotSelector(previous, argument);
-        }
-
-        /// <inheritdoc cref="NthChildSelector"/>
-        /// <inheritdoc cref="NthChildSelector(Selector?, int, int)"/>
-        /// <returns>The selector.</returns>
-        public static Selector NthChild(this Selector? previous, int step, int offset)
-        {
-            return new NthChildSelector(previous, step, offset);
-        }
-
-        /// <inheritdoc cref="NthLastChildSelector"/>
-        /// <inheritdoc cref="NthLastChildSelector(Selector?, int, int)"/>
-        /// <returns>The selector.</returns>
-        public static Selector NthLastChild(this Selector? previous, int step, int offset)
-        {
-            return new NthLastChildSelector(previous, step, offset);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>The selector.</returns>
-        public static Selector OfType(this Selector? previous, Type type)
-        {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-
-            return TypeNameAndClassSelector.OfType(previous, type);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type.
-        /// </summary>
-        /// <typeparam name="T">The type.</typeparam>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector OfType<T>(this Selector? previous) where T : IStyleable
-        {
-            return previous.OfType(typeof(T));
-        }
-
-        /// <summary>
-        /// Returns a selector which ORs selectors.
-        /// </summary>
-        /// <param name="selectors">The selectors to be OR'd.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Or(params Selector[] selectors)
-        {
-            return new OrSelector(selectors);
-        }
-
-        /// <summary>
-        /// Returns a selector which ORs selectors.
-        /// </summary>
-        /// <param name="selectors">The selectors to be OR'd.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Or(IReadOnlyList<Selector> selectors)
-        {
-            return new OrSelector(selectors);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control with the specified property value.
-        /// </summary>
-        /// <typeparam name="T">The property type.</typeparam>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The property value.</param>
-        /// <returns>The selector.</returns>
-        public static Selector PropertyEquals<T>(this Selector? previous, AvaloniaProperty<T> property, object? value)
-        {
-            _ = property ?? throw new ArgumentNullException(nameof(property));
-
-            return new PropertyEqualsSelector(previous, property, value);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control with the specified property value.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The property value.</param>
-        /// <returns>The selector.</returns>
-        public static Selector PropertyEquals(this Selector? previous, AvaloniaProperty property, object? value)
-        {
-            _ = property ?? throw new ArgumentNullException(nameof(property));
-
-            return new PropertyEqualsSelector(previous, property, value);
-        }
-
-        /// <summary>
-        /// Returns a selector which enters a lookless control's template.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Template(this Selector previous)
-        {
-            return new TemplateSelector(previous);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
deleted file mode 100644
index 168a882499..0000000000
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using Avalonia.Animation;
-using Avalonia.Data;
-using Avalonia.Data.Core;
-using Avalonia.Metadata;
-using Avalonia.Utilities;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A setter for a <see cref="Style"/>.
-    /// </summary>
-    /// <remarks>
-    /// A <see cref="Setter"/> is used to set a <see cref="AvaloniaProperty"/> value on a
-    /// <see cref="AvaloniaObject"/> depending on a condition.
-    /// </remarks>
-    public class Setter : ISetter, IAnimationSetter, IAvaloniaPropertyVisitor<Setter.SetterVisitorData>
-    {
-        private object? _value;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Setter"/> class.
-        /// </summary>
-        public Setter()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Setter"/> class.
-        /// </summary>
-        /// <param name="property">The property to set.</param>
-        /// <param name="value">The property value.</param>
-        public Setter(AvaloniaProperty property, object value)
-        {
-            Property = property;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the property to set.
-        /// </summary>
-        public AvaloniaProperty? Property { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value.
-        /// </summary>
-        [Content]
-        [AssignBinding]
-        [DependsOn(nameof(Property))]
-        public object? Value
-        {
-            get => _value;
-            set
-            {
-                (value as ISetterValue)?.Initialize(this);
-                _value = value;
-            }
-        }
-
-        public ISetterInstance Instance(IStyleable target)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Setter.Property must be set.");
-            }
-
-            var data = new SetterVisitorData
-            {
-                target = target,
-                value = Value,
-            };
-
-            Property.Accept(this, ref data);
-            return data.result!;
-        }
-
-        void IAvaloniaPropertyVisitor<SetterVisitorData>.Visit<T>(
-            StyledPropertyBase<T> property,
-            ref SetterVisitorData data)
-        {
-            if (data.value is IBinding binding)
-            {
-                data.result = new PropertySetterBindingInstance<T>(
-                    data.target,
-                    property,
-                    binding);
-            }
-            else if (data.value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(property.PropertyType))
-            {
-                data.result = new PropertySetterLazyInstance<T>(
-                    data.target,
-                    property,
-                    () => (T)template.Build());
-            }
-            else
-            {
-                data.result = new PropertySetterInstance<T>(
-                    data.target,
-                    property,
-                    (T)data.value!);
-            }
-        }
-
-        void IAvaloniaPropertyVisitor<SetterVisitorData>.Visit<T>(
-            DirectPropertyBase<T> property,
-            ref SetterVisitorData data)
-        {
-            if (data.value is IBinding binding)
-            {
-                data.result = new PropertySetterBindingInstance<T>(
-                    data.target,
-                    property,
-                    binding);
-            }
-            else if (data.value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(property.PropertyType))
-            {
-                data.result = new PropertySetterLazyInstance<T>(
-                    data.target,
-                    property,
-                    () => (T)template.Build());
-            }
-            else
-            {
-                data.result = new PropertySetterInstance<T>(
-                    data.target,
-                    property,
-                    (T)data.value!);
-            }
-        }
-
-        private struct SetterVisitorData
-        {
-            public IStyleable target;
-            public object? value;
-            public ISetterInstance? result;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Style.cs b/src/Avalonia.Styling/Styling/Style.cs
deleted file mode 100644
index 00819ef7be..0000000000
--- a/src/Avalonia.Styling/Styling/Style.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Metadata;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines a style.
-    /// </summary>
-    public class Style : AvaloniaObject, IStyle, IResourceProvider
-    {
-        private IResourceHost? _owner;
-        private IResourceDictionary? _resources;
-        private List<ISetter>? _setters;
-        private List<IAnimation>? _animations;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Style"/> class.
-        /// </summary>
-        public Style()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Style"/> class.
-        /// </summary>
-        /// <param name="selector">The style selector.</param>
-        public Style(Func<Selector?, Selector> selector)
-        {
-            Selector = selector(null);
-        }
-
-        public IResourceHost? Owner
-        {
-            get => _owner;
-            private set
-            {
-                if (_owner != value)
-                {
-                    _owner = value;
-                    OwnerChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a dictionary of style resources.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ?? (Resources = new ResourceDictionary());
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(value));
-
-                var hadResources = _resources?.HasResources ?? false;
-
-                _resources = value;
-
-                if (Owner is object)
-                {
-                    _resources.AddOwner(Owner);
-
-                    if (hadResources || _resources.HasResources)
-                    {
-                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the style's selector.
-        /// </summary>
-        public Selector? Selector { get; set; }
-
-        /// <summary>
-        /// Gets the style's setters.
-        /// </summary>
-        [Content]
-        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
-
-        /// <summary>
-        /// Gets the style's animations.
-        /// </summary>
-        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
-
-        bool IResourceNode.HasResources => _resources?.Count > 0;
-        IReadOnlyList<IStyle> IStyle.Children => Array.Empty<IStyle>();
-
-        public event EventHandler? OwnerChanged;
-
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            var match = Selector is object ? Selector.Match(target) :
-                target == host ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
-
-            if (match.IsMatch && (_setters is object || _animations is object))
-            {
-                var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
-                target.StyleApplied(instance);
-                instance.Start();
-            }
-
-            return match.Result;
-        }
-
-        public bool TryGetResource(object key, out object? result)
-        {
-            result = null;
-            return _resources?.TryGetResource(key, out result) ?? false;
-        }
-
-        /// <summary>
-        /// Returns a string representation of the style.
-        /// </summary>
-        /// <returns>A string representation of the style.</returns>
-        public override string ToString()
-        {
-            if (Selector != null)
-            {
-                return "Style: " + Selector.ToString();
-            }
-            else
-            {
-                return "Style";
-            }
-        }
-
-        void IResourceProvider.AddOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner != null)
-            {
-                throw new InvalidOperationException("The Style already has a parent.");
-            }
-
-            Owner = owner;
-            _resources?.AddOwner(owner);
-        }
-
-        void IResourceProvider.RemoveOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner == owner)
-            {
-                Owner = null;
-                _resources?.RemoveOwner(owner);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/StyleInstance.cs b/src/Avalonia.Styling/Styling/StyleInstance.cs
deleted file mode 100644
index 830cf49a0d..0000000000
--- a/src/Avalonia.Styling/Styling/StyleInstance.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Subjects;
-using Avalonia.Animation;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A <see cref="Style"/> which has been instanced on a control.
-    /// </summary>
-    internal class StyleInstance : IStyleInstance, IStyleActivatorSink
-    {
-        private readonly List<ISetterInstance>? _setters;
-        private readonly List<IDisposable>? _animations;
-        private readonly IStyleActivator? _activator;
-        private readonly Subject<bool>? _animationTrigger;
-
-        public StyleInstance(
-            IStyle source,
-            IStyleable target,
-            IReadOnlyList<ISetter>? setters,
-            IReadOnlyList<IAnimation>? animations,
-            IStyleActivator? activator = null)
-        {
-            Source = source ?? throw new ArgumentNullException(nameof(source));
-            Target = target ?? throw new ArgumentNullException(nameof(target));
-            _activator = activator;
-            IsActive = _activator is null;
-
-            if (setters is object)
-            {
-                var setterCount = setters.Count;
-
-                _setters = new List<ISetterInstance>(setterCount);
-
-                for (var i = 0; i < setterCount; ++i)
-                {
-                    _setters.Add(setters[i].Instance(Target));
-                }
-            }
-
-            if (animations is object && target is Animatable animatable)
-            {
-                var animationsCount = animations.Count;
-
-                _animations = new List<IDisposable>(animationsCount);
-                _animationTrigger = new Subject<bool>();
-
-                for (var i = 0; i < animationsCount; ++i)
-                {
-                    _animations.Add(animations[i].Apply(animatable, null, _animationTrigger));
-                }
-            }
-        }
-
-        public bool IsActive { get; private set; }
-        public IStyle Source { get; }
-        public IStyleable Target { get; }
-
-        public void Start()
-        {
-            var hasActivator = _activator is object;
-
-            if (_setters is object)
-            {
-                foreach (var setter in _setters)
-                {
-                    setter.Start(hasActivator);
-                }
-            }
-
-            if (hasActivator)
-            {
-                _activator!.Subscribe(this, 0);
-            }
-            else if (_animationTrigger != null)
-            {
-                _animationTrigger.OnNext(true);
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_setters is object)
-            {
-                foreach (var setter in _setters)
-                {
-                    setter.Dispose();
-                }
-            }
-
-            if (_animations is object)
-            {
-                foreach (var subscripion in _animations)
-                {
-                    subscripion.Dispose();
-                }
-            }
-
-            _activator?.Dispose();
-        }
-
-        private void ActivatorChanged(bool value)
-        {
-            if (IsActive != value)
-            {
-                IsActive = value;
-
-                _animationTrigger?.OnNext(value);
-
-                if (_setters is object)
-                {
-                    if (IsActive)
-                    {
-                        foreach (var setter in _setters)
-                        {
-                            setter.Activate();
-                        }
-                    }
-                    else
-                    {
-                        foreach (var setter in _setters)
-                        {
-                            setter.Deactivate();
-                        }
-                    }
-                }
-            }
-        }
-
-        void IStyleActivatorSink.OnNext(bool value, int tag) => ActivatorChanged(value);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Styler.cs b/src/Avalonia.Styling/Styling/Styler.cs
deleted file mode 100644
index 74cf77ea40..0000000000
--- a/src/Avalonia.Styling/Styling/Styler.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    public class Styler : IStyler
-    {
-        public void ApplyStyles(IStyleable target)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            if (target is IStyleHost styleHost)
-            {
-                ApplyStyles(target, styleHost);
-            }
-        }
-
-        private void ApplyStyles(IStyleable target, IStyleHost host)
-        {
-            var parent = host.StylingParent;
-
-            if (parent != null)
-            {
-                ApplyStyles(target, parent);
-            }
-
-            if (host.IsStylesInitialized)
-            {
-                host.Styles.TryAttach(target, host);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Styles.cs b/src/Avalonia.Styling/Styling/Styles.cs
deleted file mode 100644
index 81502f1570..0000000000
--- a/src/Avalonia.Styling/Styling/Styles.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Avalonia.Collections;
-using Avalonia.Controls;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A style that consists of a number of child styles.
-    /// </summary>
-    public class Styles : AvaloniaObject,
-        IAvaloniaList<IStyle>,
-        IStyle,
-        IResourceProvider
-    {
-        private readonly AvaloniaList<IStyle> _styles = new AvaloniaList<IStyle>();
-        private IResourceHost? _owner;
-        private IResourceDictionary? _resources;
-        private Dictionary<Type, List<IStyle>?>? _cache;
-
-        public Styles()
-        {
-            _styles.ResetBehavior = ResetBehavior.Remove;
-            _styles.CollectionChanged += OnCollectionChanged;
-        }
-
-        public Styles(IResourceHost owner)
-            : this()
-        {
-            Owner = owner;
-        }
-
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-        public event EventHandler? OwnerChanged;
-
-        public int Count => _styles.Count;
-
-        public IResourceHost? Owner
-        {
-            get => _owner;
-            private set
-            {
-                if (_owner != value)
-                {
-                    _owner = value;
-                    OwnerChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a dictionary of style resources.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ?? (Resources = new ResourceDictionary());
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(Resources));
-
-                if (Owner is object)
-                {
-                    _resources?.RemoveOwner(Owner);
-                }
-
-                _resources = value;
-
-                if (Owner is object)
-                {
-                    _resources.AddOwner(Owner);
-                }
-            }
-        }
-
-        bool ICollection<IStyle>.IsReadOnly => false;
-
-        bool IResourceNode.HasResources
-        {
-            get
-            {
-                if (_resources?.Count > 0)
-                {
-                    return true;
-                }
-
-                foreach (var i in this)
-                {
-                    if (i is IResourceProvider p && p.HasResources)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        IStyle IReadOnlyList<IStyle>.this[int index] => _styles[index];
-
-        IReadOnlyList<IStyle> IStyle.Children => this;
-
-        public IStyle this[int index]
-        {
-            get => _styles[index];
-            set => _styles[index] = value;
-        }
-
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
-        {
-            _cache ??= new Dictionary<Type, List<IStyle>?>();
-
-            if (_cache.TryGetValue(target.StyleKey, out var cached))
-            {
-                if (cached is object)
-                {
-                    foreach (var style in cached)
-                    {
-                        style.TryAttach(target, host);
-                    }
-
-                    return SelectorMatchResult.AlwaysThisType;
-                }
-                else
-                {
-                    return SelectorMatchResult.NeverThisType;
-                }
-            }
-            else
-            {
-                List<IStyle>? matches = null;
-
-                foreach (var child in this)
-                {
-                    if (child.TryAttach(target, host) != SelectorMatchResult.NeverThisType)
-                    {
-                        matches ??= new List<IStyle>();
-                        matches.Add(child);
-                    }
-                }
-
-                _cache.Add(target.StyleKey, matches);
-                
-                return matches is null ?
-                    SelectorMatchResult.NeverThisType :
-                    SelectorMatchResult.AlwaysThisType;
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetResource(object key, out object? value)
-        {
-            if (_resources != null && _resources.TryGetResource(key, out value))
-            {
-                return true;
-            }
-
-            for (var i = Count - 1; i >= 0; --i)
-            {
-                if (this[i] is IResourceProvider p && p.TryGetResource(key, out value))
-                {
-                    return true;
-                }
-            }
-
-            value = null;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public void AddRange(IEnumerable<IStyle> items) => _styles.AddRange(items);
-
-        /// <inheritdoc/>
-        public void InsertRange(int index, IEnumerable<IStyle> items) => _styles.InsertRange(index, items);
-
-        /// <inheritdoc/>
-        public void Move(int oldIndex, int newIndex) => _styles.Move(oldIndex, newIndex);
-
-        /// <inheritdoc/>
-        public void MoveRange(int oldIndex, int count, int newIndex) => _styles.MoveRange(oldIndex, count, newIndex);
-
-        /// <inheritdoc/>
-        public void RemoveAll(IEnumerable<IStyle> items) => _styles.RemoveAll(items);
-
-        /// <inheritdoc/>
-        public void RemoveRange(int index, int count) => _styles.RemoveRange(index, count);
-
-        /// <inheritdoc/>
-        public int IndexOf(IStyle item) => _styles.IndexOf(item);
-
-        /// <inheritdoc/>
-        public void Insert(int index, IStyle item) => _styles.Insert(index, item);
-
-        /// <inheritdoc/>
-        public void RemoveAt(int index) => _styles.RemoveAt(index);
-
-        /// <inheritdoc/>
-        public void Add(IStyle item) => _styles.Add(item);
-
-        /// <inheritdoc/>
-        public void Clear() => _styles.Clear();
-
-        /// <inheritdoc/>
-        public bool Contains(IStyle item) => _styles.Contains(item);
-
-        /// <inheritdoc/>
-        public void CopyTo(IStyle[] array, int arrayIndex) => _styles.CopyTo(array, arrayIndex);
-
-        /// <inheritdoc/>
-        public bool Remove(IStyle item) => _styles.Remove(item);
-
-        public AvaloniaList<IStyle>.Enumerator GetEnumerator() => _styles.GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator<IStyle> IEnumerable<IStyle>.GetEnumerator() => _styles.GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => _styles.GetEnumerator();
-
-        /// <inheritdoc/>
-        void IResourceProvider.AddOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner != null)
-            {
-                throw new InvalidOperationException("The Styles already has a owner.");
-            }
-
-            Owner = owner;
-            _resources?.AddOwner(owner);
-
-            foreach (var child in this)
-            {
-                if (child is IResourceProvider r)
-                {
-                    r.AddOwner(owner);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        void IResourceProvider.RemoveOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner == owner)
-            {
-                Owner = null;
-                _resources?.RemoveOwner(owner);
-
-                foreach (var child in this)
-                {
-                    if (child is IResourceProvider r)
-                    {
-                        r.RemoveOwner(owner);
-                    }
-                }
-            }
-        }
-
-        private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            static IReadOnlyList<T> ToReadOnlyList<T>(IList list)
-            {
-                if (list is IReadOnlyList<T>)
-                {
-                    return (IReadOnlyList<T>)list;
-                }
-                else
-                {
-                    var result = new T[list.Count];
-                    list.CopyTo(result, 0);
-                    return result;
-                }
-            }
-
-            void Add(IList items)
-            {
-                for (var i = 0; i < items.Count; ++i)
-                {
-                    var style = (IStyle)items[i]!;
-
-                    if (Owner is object && style is IResourceProvider resourceProvider)
-                    {
-                        resourceProvider.AddOwner(Owner);
-                    }
-
-                    _cache = null;
-                }
-
-                (Owner as IStyleHost)?.StylesAdded(ToReadOnlyList<IStyle>(items));
-            }
-
-            void Remove(IList items)
-            {
-                for (var i = 0; i < items.Count; ++i)
-                {
-                    var style = (IStyle)items[i]!;
-
-                    if (Owner is object && style is IResourceProvider resourceProvider)
-                    {
-                        resourceProvider.RemoveOwner(Owner);
-                    }
-
-                    _cache = null;
-                }
-
-                (Owner as IStyleHost)?.StylesRemoved(ToReadOnlyList<IStyle>(items));
-            }
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    Add(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    Remove(e.OldItems!);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    Remove(e.OldItems!);
-                    Add(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    throw new InvalidOperationException("Reset should not be called on Styles.");
-            }
-
-            CollectionChanged?.Invoke(this, e);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/TemplateSelector.cs b/src/Avalonia.Styling/Styling/TemplateSelector.cs
deleted file mode 100644
index e8051efa6d..0000000000
--- a/src/Avalonia.Styling/Styling/TemplateSelector.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-
-namespace Avalonia.Styling
-{
-    internal class TemplateSelector : Selector
-    {
-        private readonly Selector _parent;
-        private string? _selectorString;
-
-        public TemplateSelector(Selector parent)
-        {
-            if (parent == null)
-            {
-                throw new InvalidOperationException("Template selector must be preceeded by a selector.");
-            }
-
-            _parent = parent;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => true;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => true;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => null;
-
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = _parent.ToString() + " /template/ ";
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var templatedParent = control.TemplatedParent as IStyleable;
-
-            if (templatedParent == null)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-
-            return _parent.Match(templatedParent, subscribe);
-        }
-
-        protected override Selector? MovePrevious() => null;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
deleted file mode 100644
index ef48c4a8cd..0000000000
--- a/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A selector that matches the common case of a type and/or name followed by a collection of
-    /// style classes and pseudoclasses.
-    /// </summary>
-    internal class TypeNameAndClassSelector : Selector
-    {
-        private readonly Selector? _previous;
-        private readonly Lazy<List<string>> _classes = new Lazy<List<string>>(() => new List<string>());
-        private Type? _targetType;
-        private string? _selectorString;
-
-        public static TypeNameAndClassSelector OfType(Selector? previous, Type targetType)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result._targetType = targetType;
-            result.IsConcreteType = true;
-
-            return result;
-        }
-
-        public static TypeNameAndClassSelector Is(Selector? previous, Type targetType)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result._targetType = targetType;
-            result.IsConcreteType = false;
-
-            return result;
-        }
-
-        public static TypeNameAndClassSelector ForName(Selector? previous, string name)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result.Name = name;
-
-            return result;
-        }
-
-        public static TypeNameAndClassSelector ForClass(Selector? previous, string className)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result.Classes.Add(className);
-
-            return result;
-        }
-
-        protected TypeNameAndClassSelector(Selector? previous)
-        {
-            _previous = previous;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _previous?.InTemplate ?? false;
-
-        /// <summary>
-        /// Gets the name of the control to match.
-        /// </summary>
-        public string? Name { get; set; }
-
-        /// <inheritdoc/>
-        public override Type? TargetType => _targetType ?? _previous?.TargetType;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <summary>
-        /// Whether the selector matches the concrete <see cref="TargetType"/> or any object which
-        /// implements <see cref="TargetType"/>.
-        /// </summary>
-        public bool IsConcreteType { get; private set; }
-
-        /// <summary>
-        /// The style classes which the selector matches.
-        /// </summary>
-        public IList<string> Classes => _classes.Value;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = BuildSelectorString();
-            }
-
-            return _selectorString;
-        }
-
-        /// <inheritdoc/>
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            if (TargetType != null)
-            {
-                var controlType = control.StyleKey ?? control.GetType();
-
-                if (IsConcreteType)
-                {
-                    if (controlType != TargetType)
-                    {
-                        return SelectorMatch.NeverThisType;
-                    }
-                }
-                else
-                {
-                    if (!TargetType.IsAssignableFrom(controlType))
-                    {
-                        return SelectorMatch.NeverThisType;
-                    }
-                }
-            }
-
-            if (Name != null && control.Name != Name)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-
-            if (_classes.IsValueCreated && _classes.Value.Count > 0)
-            {
-                if (subscribe)
-                {
-                    var observable = new StyleClassActivator(control.Classes, _classes.Value);
-
-                    return new SelectorMatch(observable);
-                }
-
-                if (!StyleClassActivator.AreClassesMatching(control.Classes, Classes))
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-            }
-
-            return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-
-        private string BuildSelectorString()
-        {
-            var builder = new StringBuilder();
-
-            if (_previous != null)
-            {
-                builder.Append(_previous.ToString());
-            }
-
-            if (TargetType != null)
-            {
-                if (IsConcreteType)
-                {
-                    builder.Append(TargetType.Name);
-                }
-                else
-                {
-                    builder.Append(":is(");
-                    builder.Append(TargetType.Name);
-                    builder.Append(")");
-                }
-            }
-
-            if (Name != null)
-            {
-                builder.Append('#');
-                builder.Append(Name);
-            }
-
-            if (_classes.IsValueCreated && _classes.Value.Count > 0)
-            {
-                foreach (var c in Classes)
-                {
-                    if (!c.StartsWith(":"))
-                    {
-                        builder.Append('.');
-                    }
-
-                    builder.Append(c);
-                }
-            }
-
-            return builder.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
deleted file mode 100644
index ef200b5532..0000000000
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
-    <AvaloniaResource Include="**/*.xaml" />
-  </ItemGroup>
-  <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-</Project>
diff --git a/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
deleted file mode 100644
index fac8ca51f8..0000000000
--- a/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="AutoCompleteBox">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel>
-          <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
-                   BorderThickness="{TemplateBinding BorderThickness}"
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
-          
-          <Popup Name="PART_Popup"
-                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                 MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                 PlacementTarget="{TemplateBinding}"
-                 IsLightDismissEnabled="True">
-            <Border Background="{DynamicResource ThemeBackgroundBrush}"
-                    BorderBrush="{DynamicResource ThemeBorderMidBrush}"
-                    BorderThickness="1">
-              <ListBox Name="PART_SelectingItemsControl"
-                       BorderThickness="0"
-                       Background="{TemplateBinding Background}"
-                       Foreground="{TemplateBinding Foreground}"
-                       ItemTemplate="{TemplateBinding ItemTemplate}"
-                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                       ScrollViewer.VerticalScrollBarVisibility="Auto" />
-            </Border>
-          </Popup>
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/Button.xaml b/src/Avalonia.Themes.Default/Controls/Button.xaml
deleted file mode 100644
index da36abe7ec..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Button.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Button">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
-                          TextBlock.Foreground="{TemplateBinding Foreground}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Button:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="Button:pressed  /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
-  <Style Selector="Button:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
deleted file mode 100644
index 561ca8bedd..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ButtonSpinner">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Focusable" Value="True"/>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="Transparent"/>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Content">
-      <Template>
-        <Path Fill="{DynamicResource ThemeForegroundBrush}"
-              Width="8"
-              Height="4"
-              Stretch="Uniform"
-              HorizontalAlignment="Center"
-              VerticalAlignment="Center"
-              Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"/>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Content">
-      <Template>
-        <Path Fill="{DynamicResource ThemeForegroundBrush}"
-              Width="8"
-              Height="4"
-              Stretch="Uniform"
-              HorizontalAlignment="Center"
-              VerticalAlignment="Center"
-              Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"/>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner:right">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Margin="{TemplateBinding Padding}"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalAlignment}">
-          <Grid ColumnDefinitions="*,Auto">
-            <ContentPresenter Name="PART_ContentPresenter" Grid.Column="0"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}"/>
-            <Grid Grid.Column="1" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
-              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton"/>
-              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton"/>
-            </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner:left">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Margin="{TemplateBinding Padding}"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalAlignment}">
-          <Grid ColumnDefinitions="Auto,*">
-            <Grid Grid.Column="0" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
-              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton"/>
-              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton"/>
-            </Grid>
-            <ContentPresenter Name="PART_ContentPresenter" Grid.Column="1"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}"/>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="ButtonSpinner:focus /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="ButtonSpinner:error /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/Calendar.xaml b/src/Avalonia.Themes.Default/Controls/Calendar.xaml
deleted file mode 100644
index 4b67aa232b..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Calendar.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Calendar">
-    <!--<Setter Property="Focusable" Value="False" />-->
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="HeaderBackground" Value="{DynamicResource ThemeAccentBrush2}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <StackPanel Name="Root"
-                    HorizontalAlignment="Center"
-                    ClipToBounds="True">
-
-                    <CalendarItem Name="CalendarItem"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        HeaderBackground="{TemplateBinding HeaderBackground}"/>
-
-        </StackPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
deleted file mode 100644
index 3314534b3b..0000000000
--- a/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarButton">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderHighBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="MinWidth" Value="37" />
-    <Setter Property="MinHeight" Value="38" />
-    <Setter Property="Focusable" Value="False"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-
-          <Rectangle Name="SelectedBackground"
-                     Opacity="0.75"
-                     Fill="{TemplateBinding Background}"/>
-
-          <Rectangle Name="Background"
-                     Opacity="0.5"
-                     Fill="{TemplateBinding Background}"/>
-
-          <!--Focusable="False"-->
-          <ContentControl Name="Content"
-                          Foreground="{TemplateBinding Foreground}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                          FontSize="{TemplateBinding FontSize}"
-                          Margin="1,0,1,1"/>
-
-          <Rectangle Name="FocusVisual"
-                     StrokeThickness="1"
-                     Stroke="{DynamicResource HighlightBrush}"
-                     IsHitTestVisible="False"/>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="CalendarButton /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarButton:pointerover /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CalendarButton:pressed /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarButton /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarButton:selected /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarButton /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="CalendarButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-
-
-  <Style Selector="CalendarButton /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarButton:btnfocused /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
deleted file mode 100644
index 3e2e497d2c..0000000000
--- a/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Style Selector="CalendarDatePicker">
-
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
-    
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto">
-
-          <Grid.Styles>
-
-            <Style Selector="Button.CalendarDropDown">
-              <Setter Property="Template">
-                <ControlTemplate>
-                  <Grid Height="18"
-                        Width="19"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Margin="0"
-                        Background="{DynamicResource ThemeControlLowBrush}"
-                        ColumnDefinitions="*,*,*,*"
-                        RowDefinitions="23*,19*,19*,19*"
-                        ClipToBounds="False">
-
-                    <Border Name="Highlight"
-                            Margin="-1"
-                            Grid.ColumnSpan="4"
-                            Grid.Row="0"
-                            Grid.RowSpan="4"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource HighlightBrush}" />
-                    <Border Name="Background"
-                            Margin="0,-1,0,0"
-                            Grid.ColumnSpan="4"
-                            Grid.Row="1"
-                            Grid.RowSpan="3"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource ThemeBorderHighBrush}"
-                            CornerRadius=".5" />
-                    <Rectangle Grid.ColumnSpan="4"
-                               Grid.RowSpan="1"
-                               StrokeThickness="1"
-                               Stroke="{DynamicResource ThemeBorderHighBrush}"
-                               Fill="{DynamicResource ThemeAccentBrush}">
-                    </Rectangle>
-                    <TextBlock Margin="0,-1,0,0"
-                               VerticalAlignment="Center"
-                               HorizontalAlignment="Center"
-                               Grid.Column="0"
-                               Grid.Row="1"
-                               Grid.ColumnSpan="4"
-                               Grid.RowSpan="3"
-                               FontSize="{DynamicResource FontSizeSmall}"
-                               Foreground="{DynamicResource ThemeBorderHighBrush}"
-                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}"/>
-
-                    <Ellipse HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource ThemeControlLowBrush}" StrokeThickness="0" Grid.ColumnSpan="4" Width="3" Height="3"/>
-                  </Grid>
-                </ControlTemplate>
-              </Setter>
-            </Style>
-
-            <Style Selector="Button.CalendarDropDown /template/ Border#Highlight">
-              <Setter Property="IsVisible" Value="False"/>
-            </Style>
-            <Style Selector="Button.CalendarDropDown:pressed /template/ Border#Highlight">
-              <Setter Property="IsVisible" Value="True"/>
-            </Style>
-
-            <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
-              <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-            </Style>
-            
-          </Grid.Styles>
-          
-          <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
-                   BorderThickness="{TemplateBinding BorderThickness}"
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Grid.Column="0"/>
-
-          <Button Name="PART_Button"
-                  Grid.Column="1"
-                  Width="20"
-                  Classes="CalendarDropDown"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="Transparent"
-                  BorderThickness="0"
-                  Margin="2,0,2,0"
-                  Padding="0"
-                  ClipToBounds="False"
-                  Focusable="False"/>
-
-          <Popup Name="PART_Popup"
-                 PlacementTarget="{TemplateBinding}"
-                 StaysOpen="False">
-            <Calendar Name="PART_Calendar"
-                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                      SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
-                      DisplayDate="{TemplateBinding DisplayDate}"
-                      DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
-          </Popup>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="CalendarDatePicker:focus /template/ TextBox#PART_TextBox">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
deleted file mode 100644
index 2d79e62a75..0000000000
--- a/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarDayButton">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="MinWidth" Value="5" />
-    <Setter Property="MinHeight" Value="5" />
-    <Setter Property="Focusable" Value="False"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel Background="Transparent">
-
-          <Rectangle Name="TodayBackground"
-                     Fill="{DynamicResource HighlightBrush}"/>
-
-          <Rectangle Name="SelectedBackground"
-                     Opacity="0.75"
-                     Fill="{TemplateBinding Background}"/>
-
-          <Rectangle Name="Background"
-                     Opacity="0.5"
-                     Fill="{TemplateBinding Background}"/>
-
-          <ContentControl Name="Content"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                          FontSize="{TemplateBinding FontSize}"
-                          Margin="5,1,5,1"/>
-
-          <Path Name="BlackoutVisual"
-                Margin="3"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                RenderTransformOrigin="0.5,0.5"
-                Fill="{DynamicResource ThemeForegroundBrush}"
-                Stretch="Fill"
-                Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z" />
-          
-          <Rectangle Name="FocusVisual"
-                     StrokeThickness="1"
-                     Stroke="{DynamicResource HighlightBrush}"
-                     IsHitTestVisible="False"/>
-
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:pointerover /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CalendarDayButton:pressed /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ ContentControl#Content">
-    <Setter Property="Opacity" Value="1"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:disabled /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
-    <Setter Property="Opacity" Value="0.3"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:dayfocused /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#TodayBackground">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:today /template/ Rectangle#TodayBackground">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-
-  <Style Selector="CalendarDayButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeControlLowBrush}"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Path#BlackoutVisual">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-  <Style Selector="CalendarDayButton:blackout /template/ Path#BlackoutVisual">
-    <Setter Property="Opacity" Value="0.3"/>
-  </Style>  
-
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
deleted file mode 100644
index 5b7ae5061a..0000000000
--- a/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
+++ /dev/null
@@ -1,184 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CalendarItem">
-    <Setter Property="CornerRadius" Value="1" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel>
-          <Border BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  Background="{TemplateBinding Background}"
-                  Margin="0,2,0,2">
-
-            <Border CornerRadius="1"
-                    BorderBrush="{DynamicResource ThemeBackgroundBrush}"
-                    BorderThickness="2">
-              <Grid>
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.Styles>
-                  <Style Selector="Button.CalendarHeader">
-                    <Setter Property="Cursor" Value="Hand"/>
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="BorderThickness" Value="0"/>
-                  </Style>
-                    <Style Selector="Button.CalendarHeader:pressed  /template/ ContentPresenter">
-                    <Setter Property="Background" Value="Transparent"/>
-                  </Style>
-
-                  <Style Selector="Button.CalendarNavigation">
-                    <Setter Property="Height" Value="20"/>
-                    <Setter Property="Width" Value="28"/>
-                  </Style>
-                  <Style Selector="Button.CalendarNavigation > Path">
-                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}"/>
-                  </Style>
-                  <Style Selector="Button.CalendarNavigation:pointerover > Path">
-                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
-                  </Style>
-
-                  <Style Selector="Button#HeaderButton:pointerover">
-                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
-                  </Style>
-                </Grid.Styles>
-
-                <Rectangle Grid.ColumnSpan="3"
-                           Fill="{TemplateBinding HeaderBackground}"
-                           Stretch="Fill"
-                           VerticalAlignment="Top"
-                           Height="22"/>
-
-                <Button Name="PreviousButton"
-                        Classes="CalendarHeader CalendarNavigation"
-                        IsVisible="False"
-                        HorizontalAlignment="Left">
-
-                  <Path Margin="14,-6,0,0"
-                        Height="10"
-                        Width="6"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Left"
-                        Stretch="Fill"
-                        Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" />
-                  
-                </Button>
-                
-                <Button Name="HeaderButton"
-                        Classes="CalendarHeader"
-                        Grid.Column="1"
-                        FontWeight="Bold"
-                        FontSize="10.5"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center" 
-                        Padding="1,5,1,9"/>
-
-                <Button Name="NextButton"
-                        Classes="CalendarHeader CalendarNavigation"
-                        Grid.Column="2"
-                        IsVisible="False"
-                        HorizontalAlignment="Right" >
-
-                  <Path Margin="0,-6,14,0"
-                        Height="10"
-                        Width="6"
-                        Stretch="Fill"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Right"
-                        Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" />
-                  
-                </Button>
-
-                <Grid Name="MonthView"
-                      Grid.Row="1"
-                      Grid.ColumnSpan="3"
-                      IsVisible="False"
-                      Margin="6,-1,6,6">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-                </Grid>
-
-                <Grid Name="YearView"
-                      Grid.Row="1"
-                      Grid.ColumnSpan="3"
-                      IsVisible="False"
-                      Margin="6,-3,7,6">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-                </Grid>
-
-              </Grid>
-            </Border>
-          </Border>
-
-
-          <Rectangle Name="DisabledVisual"
-                     Stretch="Fill"
-                     Fill="{DynamicResource ThemeControlLowBrush}"
-                     Opacity="{DynamicResource ThemeDisabledOpacity}"
-                     Margin="0,2,0,2" />
-
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-    <Setter Property="DayTitleTemplate">
-      <Template>
-        <TextBlock FontWeight="Bold"
-                   FontSize="9.5"
-                   Margin="0,4,0,4"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Text="{Binding}" />
-      </Template>
-
-    </Setter>
-  </Style>
-
-  <Style Selector="CalendarItem /template/ Rectangle#DisabledVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarItem:calendardisabled /template/ Rectangle#DisabledVisual">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
deleted file mode 100644
index cf469eeac5..0000000000
--- a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CaptionButtons">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
-    <Setter Property="MaxHeight" Value="30" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextBlock.FontSize="10" Orientation="Horizontal">
-          <StackPanel.Styles>
-            <Style Selector="Panel">
-              <Setter Property="Width" Value="45" />
-              <Setter Property="Background" Value="Transparent" />
-            </Style>
-            <Style Selector="Panel:pointerover">
-              <Setter Property="Background" Value="#7F7f7f7f" />
-            </Style>
-            <Style Selector="Panel#PART_CloseButton:pointerover">
-              <Setter Property="Background" Value="#7FFF0000" />
-            </Style>
-            <Style Selector="Viewbox">
-              <Setter Property="Width" Value="11" />
-              <Setter Property="Margin" Value="2" />
-            </Style>
-          </StackPanel.Styles>
-          <Panel x:Name="PART_FullScreenButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" />
-            </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_MinimiseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 1229v-205h-2048v205h2048z" />
-            </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_RestoreButton">
-            <Viewbox>
-              <Viewbox.RenderTransform>
-                <RotateTransform Angle="-90" />
-              </Viewbox.RenderTransform>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}"/>
-            </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_CloseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
-            </Viewbox>
-          </Panel>
-        </StackPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z" />
-  </Style>
-  <Style Selector="CaptionButtons:maximized Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton Path">
-    <Setter Property="Data" Value="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_FullScreenButton Path">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_RestoreButton, CaptionButtons:fullscreen Panel#PART_MinimiseButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
- </Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/Carousel.xaml b/src/Avalonia.Themes.Default/Controls/Carousel.xaml
deleted file mode 100644
index baba0649aa..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Carousel.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Carousel">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
-                           Items="{TemplateBinding Items}"
-                           ItemsPanel="{TemplateBinding ItemsPanel}"
-                           Margin="{TemplateBinding Padding}"
-                           SelectedIndex="{TemplateBinding SelectedIndex}"
-                           PageTransition="{TemplateBinding PageTransition}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml b/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
deleted file mode 100644
index 75d6f853be..0000000000
--- a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CheckBox">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4,0,0,0"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="HorizontalContentAlignment" Value="Left"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="Auto,*">
-          <Border Name="border"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  Width="18"
-                  Height="18"
-                  VerticalAlignment="Center">
-            <Panel>
-              <Path Name="checkMark"
-                    Fill="{DynamicResource HighlightBrush}"
-                    Width="11"
-                    Height="10"
-                    Stretch="Uniform"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
-              <Rectangle Name="indeterminateMark"
-                         Fill="{DynamicResource HighlightBrush}"
-                         Width="10"
-                         Height="10"
-                         Stretch="Uniform"
-                         HorizontalAlignment="Center"
-                         VerticalAlignment="Center"/>
-            </Panel>
-          </Border>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            TextBlock.Foreground="{TemplateBinding Foreground}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
-                            Grid.Column="1"/>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="CheckBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="CheckBox /template/ Path#checkMark">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CheckBox /template/ Rectangle#indeterminateMark">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CheckBox:checked /template/ Path#checkMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CheckBox:indeterminate /template/ Rectangle#indeterminateMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CheckBox:disabled /template/ Border#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ComboBox.xaml b/src/Avalonia.Themes.Default/Controls/ComboBox.xaml
deleted file mode 100644
index 262f63e2d2..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ComboBox.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="10">
-        <ComboBox PlaceholderText="Select an item">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2</ComboBoxItem>
-        </ComboBox>
-        <ComboBox IsEnabled="False"
-                  Width="200"
-                  SelectedIndex="1"
-                  HorizontalContentAlignment="Center">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2</ComboBoxItem>
-        </ComboBox>
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="ComboBox">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="*,Auto">
-            <TextBlock Name="PlaceholderTextBlock"
-                       Grid.Column="0"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       Margin="{TemplateBinding Padding}"
-                       Text="{TemplateBinding PlaceholderText}"
-                       Foreground="{TemplateBinding PlaceholderForeground}"
-                       IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
-            <ContentControl Content="{TemplateBinding SelectionBoxItem}"
-                            ContentTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{TemplateBinding Padding}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
-            <ToggleButton Name="toggle"
-                          BorderThickness="0"
-                          Background="Transparent"
-                          ClickMode="Press"
-                          Focusable="False"
-                          IsChecked="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
-                          Grid.Column="1">
-              <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                    Width="8"
-                    Height="4"
-                    Stretch="Uniform"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z" />
-            </ToggleButton>
-            <Popup Name="PART_Popup"
-                   IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
-                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                   MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                   PlacementTarget="{TemplateBinding}"
-                   IsLightDismissEnabled="True">
-              <Border Background="{DynamicResource ThemeBackgroundBrush}"
-                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"                      
-                      BorderThickness="1">
-                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                  <ItemsPresenter Name="PART_ItemsPresenter"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}"
-                                  ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  VirtualizationMode="{TemplateBinding VirtualizationMode}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ComboBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
-  </Style>
-  <Style Selector="ComboBox:disabled /template/ Border#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
deleted file mode 100644
index a694143bec..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ComboBoxItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Padding" Value="2"/>
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="HorizontalContentAlignment" Value="Left"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Padding="{TemplateBinding Padding}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:selected:focus /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-
-  <Style Selector="ComboBoxItem:selected:focus:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ContentControl.xaml b/src/Avalonia.Themes.Default/Controls/ContentControl.xaml
deleted file mode 100644
index d32bc399b6..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ContentControl.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ContentControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
deleted file mode 100644
index 987b72aaa2..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ContextMenu">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="Padding" Value="4,2"/>
-    <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
-    <Setter Property="TextBlock.FontWeight" Value="Normal" />
-    <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-          <ScrollViewer Classes="menuscroller">
-              <ItemsPresenter Name="PART_ItemsPresenter"
-                              Items="{TemplateBinding Items}"
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}"
-                              KeyboardNavigation.TabNavigation="Continue"/>
-          </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
deleted file mode 100644
index a3a4cf4662..0000000000
--- a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" 
-       Selector="DataValidationErrors">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <DockPanel LastChildFill="True">
-        <ContentControl DockPanel.Dock="Right"
-                        ContentTemplate="{TemplateBinding ErrorTemplate}"
-                        DataContext="{TemplateBinding Owner}"
-                        Content="{Binding (DataValidationErrors.Errors)}"
-                        IsVisible="{Binding (DataValidationErrors.HasErrors)}"/>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"/>
-      </DockPanel>
-    </ControlTemplate>
-  </Setter>
-  <Setter Property="ErrorTemplate">
-    <DataTemplate>
-      <Canvas Width="14" Height="14" Margin="4 0 1 0" 
-              Background="Transparent">
-        <Canvas.Styles>
-          <Style Selector="ToolTip">
-            <Setter Property="Background" Value="{DynamicResource ErrorLowBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-          </Style>
-        </Canvas.Styles>
-        <ToolTip.Tip>
-          <ItemsControl Items="{Binding}"/>
-        </ToolTip.Tip>
-        <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" Stroke="{DynamicResource ErrorBrush}" StrokeThickness="2"/>
-      </Canvas>
-    </DataTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml b/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
deleted file mode 100644
index c6c117138d..0000000000
--- a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
+++ /dev/null
@@ -1,337 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
-    <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
-    <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
-  </Styles.Resources>
-
-  <!-- Styles for the items displayed in the selectors -->
-  <Style Selector="ListBoxItem.DateTimePickerItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected">
-    <Setter Property="IsHitTestVisible" Value="False"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ Rectangle#PressedBackground">
-    <Setter Property="Fill" Value="Transparent"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MonthItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-  </Style>
-
-
-  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlTransparentBrush}" />  
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
-          <ContentPresenter x:Name="ContentPresenter"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{DynamicResource ThemeControlTransparentBrush}"
-                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
-                  Content="{TemplateBinding Content}"
-                  TextBlock.Foreground="{DynamicResource ThemeForegroundBrush}"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Padding="{TemplateBinding Padding}"
-                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlTransparentBrush}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlTransparentBrush}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-
-  <Style Selector="RepeatButton.UpButton">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="RepeatButton.DownButton">
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
-
-  <Style Selector="DatePicker">    
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-          <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            Margin="{DynamicResource DatePickerTopHeaderMargin}"
-                            MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Top"/>
-
-          <Button Name="FlyoutButton" Grid.Row="1"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  IsEnabled="{TemplateBinding IsEnabled}"
-                  MinWidth="{DynamicResource DatePickerThemeMinWidth}"
-                  MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  HorizontalContentAlignment="Stretch"
-                  VerticalContentAlignment="Stretch"
-                  TemplatedControl.IsTemplateFocusTarget="True">
-            <Button.Template>
-              <ControlTemplate>
-                <ContentPresenter Name="ContentPresenter"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  Background="{TemplateBinding Background}"
-                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                  Content="{TemplateBinding Content}"
-                                  TextBlock.Foreground="{TemplateBinding Foreground}"
-                                  HorizontalContentAlignment="Stretch"
-                                  VerticalContentAlignment="Stretch"/>
-              </ControlTemplate>
-            </Button.Template>
-            <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
-              <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
-                         Padding="{DynamicResource DatePickerHostPadding}"
-                         FontFamily="{TemplateBinding FontFamily}"
-                         FontWeight="{TemplateBinding FontWeight}"
-                         FontSize="{TemplateBinding FontSize}"/>
-              <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
-                         Padding="{DynamicResource DatePickerHostMonthPadding}"
-                         FontFamily="{TemplateBinding FontFamily}"
-                         FontWeight="{TemplateBinding FontWeight}"
-                         FontSize="{TemplateBinding FontSize}"/>
-              <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
-                         Padding="{DynamicResource DatePickerHostPadding}"
-                         FontFamily="{TemplateBinding FontFamily}"
-                         FontWeight="{TemplateBinding FontWeight}"
-                         FontSize="{TemplateBinding FontSize}"/>
-              <Rectangle x:Name="FirstSpacer"
-                    Fill="{DynamicResource ThemeControlMidHighBrush}"
-                    HorizontalAlignment="Center"
-                    Width="1"
-                    Grid.Column="1" />
-              <Rectangle x:Name="SecondSpacer"
-                    Fill="{DynamicResource ThemeControlMidHighBrush}"
-                    HorizontalAlignment="Center"
-                    Width="1"
-                    Grid.Column="3" />
-            </Grid>
-          </Button>
-
-          <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                 StaysOpen="False" PlacementTarget="{TemplateBinding}"
-                 PlacementMode="Bottom">
-            <DatePickerPresenter Name="PickerPresenter" />
-          </Popup>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="DatePicker /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="DatePicker:disabled /template/ Rectangle">
-    <!--<Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>-->
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}"/>
-    <!--<Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>-->
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pressed /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}"/>
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource ThemeControlMidHighColor}" Opacity="0.6" />
-    </Setter>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:disabled /template/ ContentPresenter">
-    <!--<Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>-->
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-
-  <!-- Changes foreground for watermark text when SelectedDate is null-->
-  <Style Selector="DatePicker:hasnodate /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-
-  <!--WinUI: DatePickerFlyoutPresenter-->
-  <Style Selector="DatePickerPresenter">
-    <Setter Property="Width" Value="296" />
-    <Setter Property="MinWidth" Value="296" />
-    <Setter Property="MaxHeight" Value="398" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="Background" Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398">
-          <Grid Name="ContentRoot" RowDefinitions="*,Auto">
-            <Grid Name="PickerContainer">
-              <!--Column Definitions set in code, ignore here-->
-              <Panel Name="MonthHost">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="MonthSelector"
-                                      PanelType="Month"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
-                </ScrollViewer>
-                <RepeatButton Name="MonthUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="MonthDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-              </Panel>
-              <Panel Name="DayHost">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="DaySelector"
-                                      PanelType="Day"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
-                </ScrollViewer>
-                <RepeatButton Name="DayUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="DayDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-              </Panel>
-              <Panel Name="YearHost">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="YearSelector"
-                                      PanelType="Year"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="False" />
-                </ScrollViewer>
-                <RepeatButton Name="YearUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="YearDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-              </Panel>
-              <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
-                         Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
-                         Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
-                         Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
-              <Rectangle Name="FirstSpacer"
-                         Fill="{DynamicResource ThemeControlMidHighBrush}"
-                         HorizontalAlignment="Center"
-                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                         Grid.Column="1" />
-              <Rectangle Name="SecondSpacer"
-                         Fill="{DynamicResource ThemeControlMidHighBrush}"
-                         HorizontalAlignment="Center"
-                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                         Grid.Column="3" />
-            </Grid>
-            <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
-                         Fill="{DynamicResource ThemeControlMidHighBrush}"
-                         Grid.ColumnSpan="2"/>
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
-              </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
-              </Button>
-            </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DatePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="DatePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
deleted file mode 100644
index 9ffe51fae8..0000000000
--- a/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}">
-          <VisualLayerManager>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Margin="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Border>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/Expander.xaml b/src/Avalonia.Themes.Default/Controls/Expander.xaml
deleted file mode 100644
index e72ddea163..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Expander.xaml
+++ /dev/null
@@ -1,151 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="Expander">
-    <Setter Property="ContentTransition">
-      <Setter.Value>
-        <CrossFade Duration="00:00:00.25" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Down]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid RowDefinitions="Auto,*">
-            <ToggleButton Name="PART_toggle" Grid.Row="0" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Row="1"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Up]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid RowDefinitions="*,Auto">
-            <ToggleButton Name="PART_toggle" Grid.Row="1" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Row="0"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Right]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="Auto,*">
-            <ToggleButton Name="PART_toggle" Grid.Column="0" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Column="1"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Left]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="*,Auto">
-            <ToggleButton Name="PART_toggle" Grid.Column="1" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Column="0"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander /template/ ToggleButton#PART_toggle">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border BorderThickness="1" Background="Transparent">
-          <Grid ColumnDefinitions="Auto,Auto">
-            <Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
-              <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Data="M 0 2 L 4 6 L 0 10 Z" />
-            </Border>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Column="1" 
-                              Background="Transparent" 
-                              Content="{TemplateBinding Content}" 
-                              ContentTemplate="{Binding $parent[Expander].HeaderTemplate}"
-                              VerticalAlignment="Center" 
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}"/>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander /template/ ToggleButton#PART_toggle:pointerover /template/ Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
-  </Style>
-  <Style Selector="Expander:down:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="90" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:up:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="-90" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:left:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="180" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:right /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="180" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:right:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="0" />
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
deleted file mode 100644
index 3bc5e085ff..0000000000
--- a/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="FlyoutPresenter">
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="LayoutRoot"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-            <ContentPresenter Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Margin="{TemplateBinding Padding}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              HorizontalContentAlignment="Stretch"
-                              VerticalContentAlignment="Stretch" />
-          </ScrollViewer>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
deleted file mode 100644
index 2d5e369573..0000000000
--- a/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
-  <Setter Property="FocusAdorner">
-    <FocusAdornerTemplate>
-      <Rectangle Stroke="Black"
-                 StrokeThickness="1"
-                 StrokeDashArray="1,2"
-                 Margin="1"/>
-    </FocusAdornerTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
deleted file mode 100644
index 490ae01318..0000000000
--- a/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="GridSplitter">
-    <Setter Property="Focusable" Value="True" />
-    <Setter Property="MinWidth" Value="1" />
-    <Setter Property="MinHeight" Value="1" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
-    <Setter Property="PreviewContent">
-      <Template>
-        <Rectangle Fill="{DynamicResource HighlightBrush}" />
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border 
-          BorderBrush="{TemplateBinding BorderBrush}"
-          BorderThickness="{TemplateBinding BorderThickness}"
-          CornerRadius="{TemplateBinding CornerRadius}"
-          Background="{TemplateBinding Background}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
deleted file mode 100644
index 19d13b6399..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/Label.xaml b/src/Avalonia.Themes.Default/Controls/Label.xaml
deleted file mode 100644
index 1e04d05497..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Label.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Label">
-  <Setter Property="Padding" Value="3"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/ListBox.xaml b/src/Avalonia.Themes.Default/Controls/ListBox.xaml
deleted file mode 100644
index b1fcb830b3..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ListBox.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="ListBox">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-  <Setter Property="Padding" Value="4"/>
-  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Name="PART_ScrollViewer"
-                      Background="{TemplateBinding Background}"
-                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          ItemTemplate="{TemplateBinding ItemTemplate}"
-                          Margin="{TemplateBinding Padding}"
-                          VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-    </Style>
-    <Style Selector="ListBox:disabled /template/ Border#border">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
deleted file mode 100644
index c1360c5d98..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ListBoxItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="Transparent"/>
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="Padding" Value="2 1"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-    
-  <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-  </Style>
-    
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-  </Style>
-    
-  <Style Selector="ListBoxItem:selected:focus /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-    
-  <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-
-  <Style Selector="ListBoxItem:selected:focus:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
deleted file mode 100644
index f9f77bf455..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
+++ /dev/null
@@ -1,153 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
-  <Style Selector="dialogs|ManagedFileChooser">
-    <Style.Resources>
-        <ResourceDictionary>
-            <DrawingGroup x:Key="LevelUp">
-                <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
-                <GeometryDrawing Brush="#FFDCB679" Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
-                <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
-                <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
-            </DrawingGroup>
-            <dialogs:ResourceSelectorConverter x:Key="Icons">
-                <DrawingGroup x:Key="Icon_Folder">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M0,0L16,0 16,16 0,16z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M1.5,1L9.61,1 10.61,3 13.496,3C14.323,3,14.996,3.673,14.996,4.5L14.996,12.5C14.996,13.327,14.323,14,13.496,14L1.5,14C0.673,14,0,13.327,0,12.5L0,2.5C0,1.673,0.673,1,1.5,1" />
-                    <GeometryDrawing Brush="#FFDCB67A" Geometry="F1M2,3L8.374,3 8.874,4 2,4z M13.496,4L10,4 9.992,4 8.992,2 1.5,2C1.225,2,1,2.224,1,2.5L1,12.5C1,12.776,1.225,13,1.5,13L13.496,13C13.773,13,13.996,12.776,13.996,12.5L13.996,4.5C13.996,4.224,13.773,4,13.496,4" />
-                    <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M2,3L8.374,3 8.874,4 2,4z" />
-                </DrawingGroup>
-                <DrawingGroup x:Key="Icon_File">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M4,15C3.03,15,2,14.299,2,13L2,3C2,1.701,3.03,1,4,1L10.061,1 14,4.556 14,13C14,13.97,13.299,15,12,15z" />
-                    <GeometryDrawing Brush="#FF9B4E96" Geometry="F1M12,13L4,13 4,3 9,3 9,6 12,6z M9.641,2L3.964,2C3.964,2,3,2,3,3L3,13C3,14,3.964,14,3.964,14L11.965,14C12.965,14,13,13,13,13L13,5z" />
-                    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M4,3L9,3 9,6 12,6 12,13 4,13z" />
-                </DrawingGroup>
-                <DrawingGroup x:Key="Icon_Volume">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M0,12L0,6.5C0,5.122,1.122,4,2.5,4L13.5,4C14.879,4,16,5.122,16,6.5L16,12z" />
-                    <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M13,8L12,8 12,7 13,7z M11,8L10,8 10,7 11,7z M13.5,6L2.5,6C2.224,6,2,6.224,2,6.5L2,10 14,10 14,6.5C14,6.224,13.775,6,13.5,6" />
-                    <GeometryDrawing Brush="#FF424242" Geometry="F1M13,7L12,7 12,8 13,8z M11,7L10,7 10,8 11,8z M2,10L14,10 14,6.5C14,6.224,13.775,6,13.5,6L2.5,6C2.224,6,2,6.224,2,6.5z M15,11L1,11 1,6.5C1,5.673,1.673,5,2.5,5L13.5,5C14.327,5,15,5.673,15,6.5z" />
-                </DrawingGroup>
-            </dialogs:ResourceSelectorConverter>
-        </ResourceDictionary>
-    </Style.Resources>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DockPanel>
-          <DockPanel DockPanel.Dock="Top" Margin="0 0 0 5">
-              <dialogs:ChildFitter DockPanel.Dock="Right" Width="{Binding ElementName=Location, Path=Bounds.Height}">
-                  <Button Command="{Binding GoUp}">
-                      <DrawingPresenter Drawing="{StaticResource LevelUp}" Stretch="Fill"/>
-                  </Button>
-              </dialogs:ChildFitter>
-              <TextBox x:Name="Location" Text="{Binding Location}" Margin="0 0 5 0">
-                  <TextBox.KeyBindings>
-                      <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter"/>
-                  </TextBox.KeyBindings>
-              </TextBox>
-          </DockPanel>
-          <DockPanel Margin="0 5 0 0"  DockPanel.Dock="Bottom">
-              <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                  <CheckBox IsChecked="{Binding ShowHiddenFiles}">
-                      <TextBlock>Show hidden files</TextBlock>
-                  </CheckBox>
-              </StackPanel>
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10">
-                  <StackPanel.Styles>
-                      <Style Selector="Button">
-                          <Setter Property="Margin" Value="4"/>
-                      </Style>
-                  </StackPanel.Styles>
-                  <Button Command="{Binding Ok}">OK</Button>
-                  <Button Command="{Binding Cancel}">Cancel</Button>
-              </StackPanel>
-          </DockPanel>
-
-          <ComboBox DockPanel.Dock="Bottom" 
-                    IsVisible="{Binding ShowFilters}" 
-                    Items="{Binding Filters}"
-                    SelectedItem="{Binding SelectedFilter}"
-                    Margin="0 5 0 0" />
-
-          <TextBox Text="{Binding FileName}" Watermark="File name" DockPanel.Dock="Bottom" IsVisible="{Binding !SelectingFolder}" />
-
-          <ListBox Margin="0 0 5 5" BorderBrush="Transparent" x:Name="QuickLinks" Items="{Binding QuickLinks}"
-                  SelectedIndex="{Binding QuickLinksSelectedIndex}"
-                  DockPanel.Dock="Left" Focusable="False">
-              <ListBox.ItemTemplate>
-                  <DataTemplate>
-                      <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
-                          <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                          <TextBlock Text="{Binding DisplayName}"/>
-                      </StackPanel>
-                  </DataTemplate>
-              </ListBox.ItemTemplate>
-          </ListBox>
-          <DockPanel Grid.IsSharedSizeScope="True">
-              <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
-                  <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter"  />
-                      <ColumnDefinition Width="400" SharedSizeGroup="Name" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                      <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                      <ColumnDefinition Width="150" SharedSizeGroup="Type" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                      <ColumnDefinition Width="200" SharedSizeGroup="Size" />
-                  </Grid.ColumnDefinitions>
-                  <GridSplitter Grid.Column="1" />
-                  <TextBlock Grid.Column="2" Text="Name" />
-                  <GridSplitter Grid.Column="3" />
-                  <TextBlock Grid.Column="4" Text="Date Modified" />
-                  <GridSplitter Grid.Column="5" />
-                  <TextBlock Grid.Column="6" Text="Type" />
-                  <GridSplitter Grid.Column="7" />
-                  <TextBlock Grid.Column="8" Text="Size" />
-              </Grid>
-              <ListBox x:Name="Files"
-                  VirtualizationMode="Simple"
-                  Items="{Binding Items}"
-                  Margin="0 5"
-                  SelectionMode="{Binding SelectionMode}"
-                  SelectedItems="{Binding SelectedItems}"
-                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                  <ListBox.ItemTemplate>
-                      <DataTemplate>
-                          <Grid Background="Transparent">
-                              <Grid.ColumnDefinitions>
-                                  <ColumnDefinition SharedSizeGroup="Icon" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter"  />
-                                  <ColumnDefinition SharedSizeGroup="Name" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter" />
-                                  <ColumnDefinition SharedSizeGroup="Modified" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter" />
-                                  <ColumnDefinition SharedSizeGroup="Type" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter" />
-                                  <ColumnDefinition SharedSizeGroup="Size" />
-                              </Grid.ColumnDefinitions>
-                              <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                              <TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
-                              <TextBlock Grid.Column="4" Text="{Binding Modified}" />
-                              <TextBlock Grid.Column="6" Text="{Binding Type}" />
-                              <TextBlock Grid.Column="8">
-                                <TextBlock.Text>
-                                    <Binding Path="Size">
-                                        <Binding.Converter>
-                                            <dialogs:FileSizeStringConverter/>
-                                        </Binding.Converter>
-                                    </Binding>
-                                </TextBlock.Text>
-                              </TextBlock>
-                          </Grid>
-                      </DataTemplate>
-                  </ListBox.ItemTemplate>
-              </ListBox>
-          </DockPanel>
-        </DockPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/Controls/Menu.xaml b/src/Avalonia.Themes.Default/Controls/Menu.xaml
deleted file mode 100644
index 583add1017..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Menu.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Menu">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter" 
-                        Items="{TemplateBinding Items}" 
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                        KeyboardNavigation.TabNavigation="Continue"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
deleted file mode 100644
index d56b46b17c..0000000000
--- a/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="MenuFlyoutPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="LayoutRoot"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{TemplateBinding Padding}"
-                            KeyboardNavigation.TabNavigation="Continue"
-                            Grid.IsSharedSizeScope="True" />
-          </ScrollViewer>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/MenuItem.xaml b/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
deleted file mode 100644
index 05c286c1f5..0000000000
--- a/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
+++ /dev/null
@@ -1,150 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter"/>
-  </Styles.Resources>
-  <Style Selector="MenuItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="Padding" Value="6 0"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="root"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="20"/>
-              <ColumnDefinition Width="5"/>
-              <ColumnDefinition Width="*"/>
-              <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT"/>
-              <ColumnDefinition Width="20"/>
-            </Grid.ColumnDefinitions>
-            <ContentPresenter Name="icon"
-                              Content="{TemplateBinding Icon}"
-                              Width="16"
-                              Height="16"
-                              Margin="3"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"/>
-            <Path Name="check"
-                  Fill="{TemplateBinding Foreground}"
-                  Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"
-                  IsVisible="False"
-                  Margin="3"
-                  VerticalAlignment="Center"/>
-            <ContentPresenter Name="PART_HeaderPresenter"
-                              Content="{TemplateBinding Header}"
-                              Margin="{TemplateBinding Padding}"
-                              VerticalAlignment="Center"
-                              Grid.Column="2">
-              <ContentPresenter.DataTemplates>
-                <DataTemplate DataType="sys:String">
-                  <AccessText Text="{Binding}"/>
-                </DataTemplate>
-              </ContentPresenter.DataTemplates>
-            </ContentPresenter>
-            <TextBlock x:Name="PART_InputGestureText"
-                       Grid.Column="3"
-                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
-                       VerticalAlignment="Center"/>
-            <Path Name="rightArrow"
-                  Data="M0,0L4,3.5 0,7z"
-                  Fill="{DynamicResource ThemeForegroundBrush}"
-                  Margin="10,0,0,0"
-                  VerticalAlignment="Center"
-                  Grid.Column="4"/>
-            <Popup Name="PART_Popup"
-                   PlacementMode="Right"
-                   IsLightDismissEnabled="False"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-              <Border Background="{DynamicResource ThemeBackgroundBrush}"
-                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer Classes="menuscroller">                  
-                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                    Items="{TemplateBinding Items}"
-                                    ItemsPanel="{TemplateBinding ItemsPanel}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    Grid.IsSharedSizeScope="True"/>
-                </ScrollViewer>
-              </Border>
-            </Popup>
-            </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="MenuItem:separator">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Separator Background="{DynamicResource ThemeControlMidBrush}"
-                   Margin="20,1,0,1"
-                   Height="1"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="Menu > MenuItem">
-    <Setter Property="Padding" Value="6 0"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="root"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Panel>
-            <ContentPresenter Name="PART_HeaderPresenter"
-                              Content="{TemplateBinding Header}"
-                              Margin="{TemplateBinding Padding}">
-              <ContentPresenter.DataTemplates>
-                <DataTemplate DataType="sys:String">
-                  <AccessText Text="{Binding}"/>
-                </DataTemplate>
-              </ContentPresenter.DataTemplates>
-            </ContentPresenter>
-            <Popup Name="PART_Popup"
-                   IsLightDismissEnabled="True"
-                   OverlayInputPassThroughElement="{Binding $parent[Menu]}"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-              <Border Background="{DynamicResource ThemeBackgroundBrush}"
-                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer Classes="menuscroller">
-                  <ItemsPresenter Name="PART_ItemsPresenter"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}"
-                                  ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  Grid.IsSharedSizeScope="True"/>
-                </ScrollViewer>
-              </Border>
-            </Popup>
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="MenuItem /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="Margin" Value="2"/>
-  </Style>
-
-  <Style Selector="MenuItem:selected /template/ Border#root">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush}"/>
-  </Style>
-
-  <Style Selector="MenuItem:empty /template/ Path#rightArrow">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-
-  <Style Selector="MenuItem:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
deleted file mode 100644
index c5d7ad55d7..0000000000
--- a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:local="clr-namespace:Avalonia.Themes.Default"
-       Selector="NativeMenuBar">
-  <Style.Resources>
-    <local:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter" Default="True"/>
-  </Style.Resources>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Menu
-        IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter}}"
-        Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
-        <Menu.Styles>
-          <Style Selector="MenuItem">
-            <Setter Property="Header" Value="{Binding Header}"/>
-            <Setter Property="InputGesture" Value="{Binding Gesture}"/>
-            <Setter Property="Items" Value="{Binding Menu.Items}"/>
-            <Setter Property="Command" Value="{Binding Command}"/>
-            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
-            <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
-          </Style>
-        </Menu.Styles>
-      </Menu>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
deleted file mode 100644
index c411fede11..0000000000
--- a/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
+++ /dev/null
@@ -1,93 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="NotificationCard">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="Width" Value="350"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
-                    <Border Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Margin="8,8,0,0">
-                        <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
-                    </Border>
-                </LayoutTransformControl>
-            </ControlTemplate>
-        </Setter>
-
-        <Style.Animations>
-            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
-                <KeyFrame Cue="0%">
-                    <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.Y" Value="20"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.85"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.85"/>
-                </KeyFrame>
-                <KeyFrame Cue="30%">
-                    <Setter Property="TranslateTransform.Y" Value="-20"/>
-                </KeyFrame>
-                <KeyFrame Cue="100%">
-                    <Setter Property="Opacity" Value="1"/>
-                    <Setter Property="TranslateTransform.Y" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="1"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="NotificationCard/template/ ContentControl#PART_Content">
-        <Setter Property="MinHeight" Value="150" />
-    </Style>
-
-    <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
-        <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
-        <Style.Animations>
-            <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
-                <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.X" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-                <KeyFrame Cue="70%">
-                    <Setter Property="TranslateTransform.X" Value="800"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-                <KeyFrame Cue="100%">
-                    <Setter Property="ScaleTransform.ScaleY" Value="0"/>
-                    <Setter Property="TranslateTransform.X" Value="800"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="NotificationCard[IsClosing=true]">
-        <Style.Animations>
-            <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
-                <KeyFrame Cue="100%">
-                    <Setter Property="IsClosed" Value="True"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="NotificationCard">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}"/>
-    </Style>
-    <Style Selector="NotificationCard:information">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
-    </Style>
-    <Style Selector="NotificationCard:success">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
-    </Style>
-    <Style Selector="NotificationCard:warning">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
-    </Style>
-    <Style Selector="NotificationCard:error">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
deleted file mode 100644
index 6740be69bb..0000000000
--- a/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="NumericUpDown">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ButtonSpinner Name="PART_Spinner"
-                       Background="{TemplateBinding Background}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       CornerRadius="{TemplateBinding CornerRadius}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       HorizontalContentAlignment="Stretch"
-                       VerticalContentAlignment="Stretch"
-                       AllowSpin="{TemplateBinding AllowSpin}"
-                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
-          <TextBox Name="PART_TextBox"
-                   BorderThickness="0"
-                   Background="{TemplateBinding Background}" 
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   IsReadOnly="{TemplateBinding IsReadOnly}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Text="{TemplateBinding Text}"
-                   AcceptsReturn="False"
-                   TextWrapping="NoWrap">
-          </TextBox>
-        </ButtonSpinner>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="NumericUpDown /template/ TextBox#PART_TextBox">
-    <Setter Property="Margin" Value="4"/>
-    <Setter Property="MinWidth" Value="20"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
deleted file mode 100644
index 301e19d208..0000000000
--- a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" 
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="OverlayPopupHost">
-  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-  <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
-  <Setter Property="FontWeight" Value="400" />
-  <Setter Property="FontStyle" Value="Normal" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <!--  Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test  -->
-      <VisualLayerManager IsPopup="True">
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"/>
-      </VisualLayerManager>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/PathIcon.xaml b/src/Avalonia.Themes.Default/Controls/PathIcon.xaml
deleted file mode 100644
index 039f0ef10c..0000000000
--- a/src/Avalonia.Themes.Default/Controls/PathIcon.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
-    <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-      <Border Background="{TemplateBinding Background}">
-          <Viewbox Height="{TemplateBinding Height}"
-                   Width="{TemplateBinding Width}">
-            <Path Fill="{TemplateBinding Foreground}"
-                  Data="{TemplateBinding Data}"
-                  Stretch="Uniform" />
-          </Viewbox>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
deleted file mode 100644
index 9468cc5535..0000000000
--- a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="PopupRoot">
-  <Setter Property="Background" Value="{x:Null}"/>
-  <Setter Property="TransparencyLevelHint" Value="Transparent" />
-  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
-  <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
-  <Setter Property="FontWeight" Value="400" />
-  <Setter Property="FontStyle" Value="Normal" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <VisualLayerManager IsPopup="True">
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"/>
-        </VisualLayerManager>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
deleted file mode 100644
index fd847b5d65..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
+++ /dev/null
@@ -1,82 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="10">
-        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
-        <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
-        <ProgressBar VerticalAlignment="Center" Value="50" />
-        <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
-        <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="ProgressBar">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeAccentBrush}"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
-            <Panel>
-              <Border Name="PART_Indicator" Background="{TemplateBinding Foreground}" IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}"/>
-              <Border Name="PART_IndeterminateIndicator" Background="{TemplateBinding Foreground}" IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}"/>
-            </Panel>
-          </Border>
-          <LayoutTransformControl HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}" Name="PART_LayoutTransformControl">
-            <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}" Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
-          </LayoutTransformControl>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-    <Setter Property="VerticalAlignment" Value="Stretch"/>
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-  </Style>
-  <Style Selector="ProgressBar:horizontal">
-    <Setter Property="MinWidth" Value="200"/>
-    <Setter Property="MinHeight" Value="16"/>
-  </Style>
-  <Style Selector="ProgressBar:vertical">
-    <Setter Property="MinWidth" Value="16"/>
-    <Setter Property="MinHeight" Value="200"/>
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-    <Setter Property="LayoutTransform">
-      <Setter.Value>
-        <RotateTransform Angle="90"/>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#PART_IndeterminateIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:3" IterationCount="Infinite" Easing="LinearEasing">
-        <KeyFrame Cue="0%">
-          <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-    <Setter Property="Width" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#PART_IndeterminateIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:3" IterationCount="Infinite" Easing="LinearEasing">
-        <KeyFrame Cue="0%">
-          <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-    <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/RadioButton.xaml b/src/Avalonia.Themes.Default/Controls/RadioButton.xaml
deleted file mode 100644
index ae33946009..0000000000
--- a/src/Avalonia.Themes.Default/Controls/RadioButton.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="RadioButton">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="Auto,*" Background="{TemplateBinding Background}">
-          <Ellipse Name="border"
-                   Stroke="{TemplateBinding BorderBrush}"
-                   StrokeThickness="1"
-                   Width="18"
-                   Height="18"
-                   VerticalAlignment="Center"/>
-          <Ellipse Name="checkMark"
-                   Width="10"
-                   Height="10"
-                   Stretch="Uniform"
-                   UseLayoutRounding="False"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
-          <Ellipse Name="indeterminateMark"
-                   Fill="{DynamicResource ThemeAccentBrush}"
-                   Width="10"
-                   Height="10"
-                   Stretch="Uniform"
-                   UseLayoutRounding="False"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="4,0,0,0"
-                            RecognizesAccessKey="True"
-                            VerticalAlignment="Center"
-                            Grid.Column="1"/>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#border">
-    <Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="RadioButton /template/ Ellipse#checkMark">
-    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="RadioButton /template/ Ellipse#indeterminateMark">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="RadioButton:checked /template/ Ellipse#checkMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="RadioButton:indeterminate /template/ Ellipse#indeterminateMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="RadioButton:disabled /template/ Ellipse#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
deleted file mode 100644
index a9a03c8ed5..0000000000
--- a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-    <Style Selector="RepeatButton">
-        <Setter Property="Background"
-                Value="{DynamicResource ThemeControlMidBrush}" />
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource ThemeBorderLowBrush}" />
-        <Setter Property="BorderThickness"
-                Value="{DynamicResource ThemeBorderThickness}" />
-        <Setter Property="Foreground"
-                Value="{DynamicResource ThemeForegroundBrush}" />
-        <Setter Property="HorizontalContentAlignment"
-                Value="Center" />
-        <Setter Property="VerticalContentAlignment"
-                Value="Center" />
-        <Setter Property="Padding"
-                Value="4" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ContentPresenter Name="PART_ContentPresenter"
-                                  Background="{TemplateBinding Background}"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Content="{TemplateBinding Content}"
-                                  Padding="{TemplateBinding Padding}"
-                                  TextBlock.Foreground="{TemplateBinding Foreground}"
-                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="RepeatButton:pointerover /template/ ContentPresenter">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource ThemeBorderMidBrush}" />
-    </Style>
-    <Style Selector="RepeatButton:disabled">
-        <Setter Property="Opacity"
-                Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
deleted file mode 100644
index 0f8fa4986d..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
+++ /dev/null
@@ -1,142 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ScrollBar">
-    <Setter Property="Cursor" Value="Arrow" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{DynamicResource ThemeControlMidBrush}"
-                UseLayoutRounding="False">
-          <Grid RowDefinitions="Auto,*,Auto">
-            <RepeatButton Name="PART_LineUpButton" HorizontalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="0"
-                          Focusable="False"
-                          MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 4 L 8 4 L 4 0 Z" />
-            </RepeatButton>
-            <Track Grid.Row="1"
-                   Grid.Column="1"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   ViewportSize="{TemplateBinding ViewportSize}"
-                   Orientation="{TemplateBinding Orientation}"
-                   IsDirectionReversed="True">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_PageUpButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_PageDownButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.IncreaseButton>
-              <Thumb Name="thumb"/>
-            </Track>
-            <RepeatButton Name="PART_LineDownButton" HorizontalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="2"
-                          Grid.Column="2"
-                          Focusable="False"
-                          MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 0 L 4 4 L 8 0 Z" />
-            </RepeatButton>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollBar:horizontal">
-    <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{DynamicResource ThemeControlMidBrush}"
-                UseLayoutRounding="False">
-          <Grid ColumnDefinitions="Auto,*,Auto">
-            <RepeatButton Name="PART_LineUpButton" VerticalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="0"
-                          Grid.Column="0"
-                          Focusable="False"
-                          MinWidth="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 4 0 L 4 8 L 0 4 Z" />
-            </RepeatButton>
-            <Track Grid.Row="1"
-                   Grid.Column="1"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   ViewportSize="{TemplateBinding ViewportSize}"
-                   Orientation="{TemplateBinding Orientation}">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_PageUpButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_PageDownButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.IncreaseButton>
-              <Thumb Name="thumb"/>
-            </Track>
-            <RepeatButton Name="PART_LineDownButton" VerticalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="2"
-                          Grid.Column="2"
-                          Focusable="False"
-                          MinWidth="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 0 L 4 4 L 0 8 Z"  />
-            </RepeatButton>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollBar /template/ Thumb#thumb">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"/>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollBar /template/ Thumb#thumb:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
-  <Style Selector="ScrollBar /template/ Thumb#thumb:pressed">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlVeryHighBrush}"/>
-  </Style>
-  <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
-    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
-    <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
-  </Style>
-  <Style Selector="ScrollBar:vertical">
-    <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
-  </Style>
-  <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
-    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
-    <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
-  </Style>
-  <Style Selector="ScrollBar /template/ RepeatButton.repeat">
-    <Setter Property="Padding" Value="2" />
-    <Setter Property="BorderThickness" Value="0" />
-  </Style>
-  <Style Selector="ScrollBar /template/ RepeatButton.repeattrack">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton:pointerover > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
deleted file mode 100644
index b357446bfa..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-  <Style Selector="ScrollViewer">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
-          <ScrollContentPresenter Name="PART_ContentPresenter"
-                                  Background="{TemplateBinding Background}"
-                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-                                  Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
-                                  IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
-            <ScrollContentPresenter.GestureRecognizers>
-              <ScrollGestureRecognizer
-                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-            />
-            </ScrollContentPresenter.GestureRecognizers>
-          </ScrollContentPresenter>
-          <ScrollBar Name="horizontalScrollBar"
-                     Orientation="Horizontal"
-                     LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                     SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                     Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
-                     Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
-                     Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
-                     Grid.Row="1"
-                     Focusable="False"/>
-          <ScrollBar Name="verticalScrollBar"
-                     Orientation="Vertical"
-                     LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
-                     SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
-                     Maximum="{TemplateBinding VerticalScrollBarMaximum}"
-                     Value="{TemplateBinding VerticalScrollBarValue, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}"
-                     Visibility="{TemplateBinding VerticalScrollBarVisibility}"
-                     Grid.Column="1"
-                     Focusable="False"/>
-          <Panel Grid.Row="1" Grid.Column="1" Background="{DynamicResource ThemeControlMidBrush}"/>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollViewer.menuscroller">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DockPanel>
-          <RepeatButton DockPanel.Dock="Top"
-                        BorderThickness="0"
-                        Background="Transparent"
-                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
-            <RepeatButton.IsVisible>
-              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                            ConverterParameter="0">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
-              </MultiBinding>
-            </RepeatButton.IsVisible>
-            <Path Data="M 0 4 L 8 4 L 4 0 Z"/>
-          </RepeatButton>
-          <RepeatButton DockPanel.Dock="Bottom"
-                        BorderThickness="0"
-                        Background="Transparent"
-                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
-            <RepeatButton.IsVisible>
-              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                            ConverterParameter="100">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
-              </MultiBinding>
-            </RepeatButton.IsVisible>
-            <Path Data="M 0 0 L 4 4 L 8 0 Z"/>
-          </RepeatButton>
-          <ScrollContentPresenter Name="PART_ContentPresenter"
-                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-                                  Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"/>
-        </DockPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
-  </Style>
-
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton:pointerover > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/Separator.xaml b/src/Avalonia.Themes.Default/Controls/Separator.xaml
deleted file mode 100644
index 6a318d2e85..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Separator.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="Separator">
-    <Setter Property="Focusable" Value="False"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Background="{TemplateBinding Background}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="MenuItem > Separator, ContextMenu > Separator">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="Margin" Value="29,1,0,1"/>
-    <Setter Property="Height" Value="1"/>
-  </Style>
-
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/Slider.xaml b/src/Avalonia.Themes.Default/Controls/Slider.xaml
deleted file mode 100644
index bcb330f188..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Slider.xaml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Slider:horizontal">
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="grid">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" MinHeight="20"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Row="1" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Horizontal">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="MinWidth" Value="20"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto" MinWidth="26"/>
-            <ColumnDefinition Width="Auto"/>
-          </Grid.ColumnDefinitions>
-          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Column="1" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Vertical">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
-  </Style>
-  <Style Selector="Slider /template/ Border#TrackBackground">
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-  </Style>
-  <Style Selector="Slider /template/ RepeatButton.repeattrack">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Focusable" Value="False"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="Template">
-        <ControlTemplate>
-            <Border Background="{TemplateBinding Background}" />
-        </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Slider /template/ TickBar">
-    <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Grid#grid">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml b/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
deleted file mode 100644
index ce20a1a165..0000000000
--- a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
+++ /dev/null
@@ -1,271 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True"
-        xmlns:converters="using:Avalonia.Controls.Converters">
-
-  <!-- This style is heavily based on the Fluent v1 style.
-       The base resources are switched out along with a few minor changes such as Padding, CornerRadius. -->
-
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <SplitButton />
-    </Border>
-  </Design.PreviewWith>
-
-  <Styles.Resources>
-    <x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
-    <x:Double x:Key="SplitButtonSecondaryButtonSize">24</x:Double>
-    <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
-    <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
-
-    <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
-    <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
-
-    <SolidColorBrush x:Key="SplitButtonBackground" Color="{DynamicResource ThemeControlMidColor}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundPointerOver" Color="{DynamicResource ThemeControlMidColor}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundDisabled" Color="{DynamicResource ThemeControlMidColor}" Opacity="{DynamicResource ThemeDisabledOpacity}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundChecked" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="SplitButtonBackgroundCheckedDisabled" Color="{DynamicResource ThemeControlHighColor}" Opacity="{DynamicResource ThemeDisabledOpacity}" />
-
-    <SolidColorBrush x:Key="SplitButtonForeground" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundPointerOver" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundPressed" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundDisabled" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundChecked" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundCheckedPointerOver" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundCheckedPressed" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="SplitButtonForegroundCheckedDisabled" Color="{DynamicResource ThemeForegroundColor}" />
-
-    <SolidColorBrush x:Key="SplitButtonBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushPointerOver" Color="{DynamicResource ThemeBorderMidColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushPressed" Color="{DynamicResource ThemeBorderLowColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushDisabled" Color="{DynamicResource ThemeBorderLowColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushChecked" Color="{DynamicResource ThemeBorderMidColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedPointerOver" Color="{DynamicResource ThemeBorderMidColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedPressed" Color="{DynamicResource ThemeControlHighColor}" />
-    <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedDisabled" Color="{DynamicResource ThemeControlMidColor}" Opacity="{DynamicResource ThemeDisabledOpacity}" />
-  </Styles.Resources>
-
-  <Style Selector="SplitButton">
-    <Setter Property="Background" Value="{DynamicResource SplitButtonBackground}" />
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
-    <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-    <Setter Property="Focusable" Value="True" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="CornerRadius" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Button x:Name="PART_PrimaryButton"
-                    Grid.Column="0"
-                    MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    Command="{TemplateBinding Command}"
-                    CommandParameter="{TemplateBinding CommandParameter}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontSize="{TemplateBinding FontSize}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Padding="{TemplateBinding Padding}"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-
-            <Border x:Name="SeparatorBorder"
-                    Grid.Column="1"
-                    Background="Transparent"
-                    Width="{DynamicResource SplitButtonSeparatorWidth}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}" />
-
-            <Button x:Name="PART_SecondaryButton"
-                    Grid.Column="2"
-                    MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
-                    Padding="0"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- Default overridable styles -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-    <Setter Property="Content">
-      <Template>
-        <PathIcon Height="12"
-                  Width="12"
-                  Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-      </Template>
-    </Setter>
-  </Style>
-
-  <!-- Primary and Secondary buttons PointerOver State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Pressed State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- SplitButton Pressed State -->
-  <Style Selector="SplitButton:pressed /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Flyout Open State -->
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Disabled State -->
-  <Style Selector="SplitButton:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-
-  <!-- Checked State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-
-  <!-- Checked PointerOver State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-
-  <!-- Checked Pressed State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- SplitButton Checked Pressed State -->
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Checked Flyout Open State -->
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Disabled Checked State -->
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/SplitView.xaml b/src/Avalonia.Themes.Default/Controls/SplitView.xaml
deleted file mode 100644
index 10eda2d9cd..0000000000
--- a/src/Avalonia.Themes.Default/Controls/SplitView.xaml
+++ /dev/null
@@ -1,234 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="using:System">
-  <Design.PreviewWith>
-    <Border Width="400" Height="400">
-      <SplitView DisplayMode="Inline"
-                 IsPaneOpen="True">
-        <SplitView.Pane>
-          <Border Background="Green" />
-        </SplitView.Pane>
-        <SplitView.Content>
-          <Border Background="Blue" />
-        </SplitView.Content>
-      </SplitView>
-    </Border>
-  </Design.PreviewWith>
-
-  <Styles.Resources>
-    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
-    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
-    <SolidColorBrush x:Key="SplitViewLightDismissOverlayBackground" Color="{DynamicResource ThemeControlLowColor}" Opacity="0.6"/>
-    <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
-    <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
-    <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
-    <!-- Not used here (directly), but preserving for reference
-        <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>-->
-  </Styles.Resources>
-
-  <Style Selector="SplitView">
-    <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
-    <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
-    <Setter Property="PaneBackground" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
-  </Style>
-
-  <!-- Left -->
-  <Style Selector="SplitView:left">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <!-- why is this throwing a binding error? -->
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-            <ColumnDefinition Width="*"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Left"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}" />
-            <Rectangle Name="HCPaneBorder" Fill="{DynamicResource SystemControlForegroundTransparentBrush}" Width="1" HorizontalAlignment="Right"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-  </Style>
-  <Style Selector="SplitView:overlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#PART_PaneRoot">
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Right -->
-  <Style Selector="SplitView:right">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Right"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}"/>
-            <Rectangle Name="HCPaneBorder"
-                       Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
-                       Width="1" HorizontalAlignment="Left"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-  </Style>
-  <Style Selector="SplitView:overlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Open/Close Pane animation  -->
-  <Style Selector="SplitView:open /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
-  </Style>
-  <Style Selector="SplitView:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="1.0"/>
-  </Style>
-
-  <Style Selector="SplitView:closed /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:closed /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="0.0"/>
-  </Style>
-
-  <Style Selector="SplitView /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="Transparent" />
-  </Style>
-  <Style Selector="SplitView:lightdismiss /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
-  </Style>
-
-  <Style Selector="SplitView:overlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="SplitView:compactoverlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TabControl.xaml b/src/Avalonia.Themes.Default/Controls/TabControl.xaml
deleted file mode 100644
index afb5010baa..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TabControl.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="TabControl">        
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Background="{TemplateBinding Background}"
-                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                    VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                    <DockPanel>
-                        <ItemsPresenter
-                            Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}">
-                        </ItemsPresenter>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}">
-                        </ContentPresenter>
-                    </DockPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Top]">
-        <Setter Property="Padding" Value="0 4 0 0"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Top"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Bottom] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Bottom"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Bottom]">
-        <Setter Property="Padding" Value="0 0 0 4"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Left"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-        <Setter Property="Orientation" Value="Vertical"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Left]">
-        <Setter Property="Padding" Value="4 0 0 0"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Right"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-        <Setter Property="Orientation" Value="Vertical"/>
-    </Style>
-    <Style Selector="TabControl[TabStripPlacement=Right]">
-        <Setter Property="Padding" Value="0 0 4 0"/>
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TabItem.xaml b/src/Avalonia.Themes.Default/Controls/TabItem.xaml
deleted file mode 100644
index c7748299a0..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TabItem.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-    <Style Selector="TabItem">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
-        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="Padding" Value="8"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    ContentTemplate="{TemplateBinding HeaderTemplate}"
-                    Content="{TemplateBinding Header}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Padding="{TemplateBinding Padding}"/>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="TabItem:disabled">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-    </Style>
-    <Style Selector="TabItem:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    </Style>
-    <Style Selector="TabItem:selected">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    </Style>
-    <Style Selector="TabItem:selected:focus">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-    </Style>
-    <Style Selector="TabItem:selected:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-    </Style>
-    <Style Selector="TabItem:selected:focus:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-    </Style>
-    <Style Selector="TabItem[TabStripPlacement=Right]">
-        <Setter Property="HorizontalContentAlignment" Value="Right"/>
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TabStrip.xaml b/src/Avalonia.Themes.Default/Controls/TabStrip.xaml
deleted file mode 100644
index 29ca1e7c94..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TabStrip.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="TabStrip">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
-      </ControlTemplate>
-    </Setter>
-    <Setter Property="ItemsPanel">
-      <ItemsPanelTemplate>
-        <WrapPanel />
-      </ItemsPanelTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="TabStrip > TabStripItem">
-    <Setter Property="Margin" Value="16"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
deleted file mode 100644
index 61eecc0395..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="TabStripItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Padding="{TemplateBinding Padding}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="TabStripItem:selected">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TextBox.xaml b/src/Avalonia.Themes.Default/Controls/TextBox.xaml
deleted file mode 100644
index 6e3898a828..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TextBox.xaml
+++ /dev/null
@@ -1,202 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
-
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
-      <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </MenuFlyout>
-
-    <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
-      <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </ContextMenu>
-  </Styles.Resources>
-  <Style Selector="TextBox">
-    <Setter Property="CaretBrush" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}"/>
-    <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}"/>
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
-    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <DockPanel Margin="{TemplateBinding Padding}"
-                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-
-            <TextBlock Name="floatingWatermark"
-                       Foreground="{DynamicResource ThemeAccentBrush}"
-                       FontSize="{DynamicResource FontSizeSmall}"
-                       Text="{TemplateBinding Watermark}"
-                       DockPanel.Dock="Top">
-              <TextBlock.IsVisible>
-                <MultiBinding Converter="{x:Static BoolConverters.And}">
-                  <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                           Path="UseFloatingWatermark"/>
-                  <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                           Path="Text"
-                           Converter="{x:Static StringConverters.IsNotNullOrEmpty}"/>
-                </MultiBinding>
-              </TextBlock.IsVisible>
-            </TextBlock>
-
-            <DataValidationErrors>
-
-              <Grid ColumnDefinitions="Auto,*,Auto">
-                <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/>
-                <ScrollViewer Grid.Column="1" Grid.ColumnSpan="1"
-                              HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                              VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                              IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                              AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-                  <Panel>
-                    <TextBlock Name="watermark"
-                              Opacity="0.5"
-                              Text="{TemplateBinding Watermark}"
-                              TextAlignment="{TemplateBinding TextAlignment}"
-                              TextWrapping="{TemplateBinding TextWrapping}"
-                              IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
-                    <TextPresenter Name="PART_TextPresenter"
-                                    Text="{TemplateBinding Text, Mode=TwoWay}"
-                                    CaretIndex="{TemplateBinding CaretIndex}"
-                                    SelectionStart="{TemplateBinding SelectionStart}"
-                                    SelectionEnd="{TemplateBinding SelectionEnd}"
-                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}"
-                                    PasswordChar="{TemplateBinding PasswordChar}"
-                                    RevealPassword="{TemplateBinding RevealPassword}"
-                                    SelectionBrush="{TemplateBinding SelectionBrush}"
-                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                    CaretBrush="{TemplateBinding CaretBrush}" />
-                  </Panel>
-                </ScrollViewer>
-                <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>             
-              </Grid>
-            </DataValidationErrors>
-          </DockPanel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="TextBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="TextBox:focus /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="TextBox:error /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-  </Style>
-  <Style Selector="TextBox /template/ DockPanel">
-    <Setter Property="Cursor" Value="IBeam" />
-  </Style>
-  <Style Selector="TextBox:disabled /template/ Border#border">
-      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-  
-  <Style Selector="TextBox.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <Button Classes="textBoxClearButton"
-                Command="{Binding $parent[TextBox].Clear}" />
-      </Template>
-    </Setter>
-  </Style>
-  
-  <Style Selector="Button.textBoxClearButton">
-    <Setter Property="Cursor" Value="Arrow" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}" 
-                  Background="Transparent">
-            <Path x:Name="PART_GlyphElement"
-                  Fill="{DynamicResource ThemeForegroundColor}"
-                  Data="{StaticResource TextBoxClearButtonData}"
-                  Height="10"
-                  Width="10"
-                  Stretch="Uniform"
-                  VerticalAlignment="Center"
-                  HorizontalAlignment="Center"/>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  
-  <Style Selector="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <Panel Margin="4,0">
-          <Panel.Styles>
-            <Style Selector="ToggleButton[IsChecked=True]">
-              <Setter Property="(ToolTip.Tip)" Value="Hide Password" />
-            </Style>
-            <Style Selector="ToggleButton[IsChecked=False]">
-              <Setter Property="(ToolTip.Tip)" Value="Show Password" />
-            </Style>
-          </Panel.Styles>
-          <ToggleButton Classes="passwordBoxRevealButton" Background="Transparent" IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
-        </Panel>
-      </Template>
-    </Setter>
-  </Style>
-  
-  <Style Selector="ToggleButton.passwordBoxRevealButton">
-    <Setter Property="Cursor" Value="Arrow" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  Background="Transparent"
-                  Width="12">
-            <Panel>
-              <Path x:Name="PART_GlyphElement_Reveal"
-                    Fill="{DynamicResource ThemeForegroundColor}"
-                    Data="{DynamicResource PasswordBoxRevealButtonData}"
-                    Height="8"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
-              <Path x:Name="PART_GlyphElement_Hide"
-                    Fill="{DynamicResource ThemeForegroundColor}"
-                    Data="{DynamicResource PasswordBoxHideButtonData}"
-                    Height="12"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
-            </Panel>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  
-  <Style Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  
-  <Style Selector="ToggleButton.passwordBoxRevealButton:checked /template/ Path#PART_GlyphElement_Reveal">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="Button.textBoxClearButton, ToggleButton.passwordBoxRevealButton">    
-    <Setter Property="Focusable" Value="False" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml b/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
deleted file mode 100644
index a58fd62a99..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
+++ /dev/null
@@ -1,286 +0,0 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
-    <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
-    <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
-  </Styles.Resources>
-
-  <Style Selector="ListBoxItem.DateTimePickerItem.HourItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MinuteItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.TimePeriodItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-
-  <Style Selector="TimePicker">    
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}"/>
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-          <ContentPresenter x:Name="HeaderContentPresenter"
-                 Grid.Row="0"
-                 Content="{TemplateBinding Header}"
-                 ContentTemplate="{TemplateBinding HeaderTemplate}"
-                 Margin="{DynamicResource TimePickerTopHeaderMargin}"
-                 MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                 TextBlock.Foreground="{DynamicResource ThemeForegroundColor}"
-                 HorizontalAlignment="Stretch"
-                 VerticalAlignment="Top" />
-
-          <Button x:Name="FlyoutButton"
-                  Grid.Row="1"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  IsEnabled="{TemplateBinding IsEnabled}"
-                  MinWidth="{DynamicResource TimePickerThemeMinWidth}"
-                  MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                  HorizontalAlignment="Stretch"
-                  HorizontalContentAlignment="Stretch"
-                  VerticalAlignment="Top"
-                  VerticalContentAlignment="Stretch">
-            <Button.Template>
-              <ControlTemplate>
-                <ContentPresenter Name="ContentPresenter"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Content="{TemplateBinding Content}"
-                                TextBlock.Foreground="{TemplateBinding Foreground}"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Stretch" />
-              </ControlTemplate>
-            </Button.Template>
-
-            <Grid Name="FlyoutButtonContentGrid">
-              <!--Ignore col defs here, set in code-->
-              <Border x:Name="FirstPickerHost" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="HourTextBlock"
-                    HorizontalAlignment="Center"
-                    Padding="{DynamicResource TimePickerHostPadding}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    FontSize="{TemplateBinding FontSize}" />
-              </Border>
-
-              <Rectangle Name="FirstColumnDivider"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="1" />
-
-              <Border x:Name="SecondPickerHost" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="MinuteTextBlock"
-                    HorizontalAlignment="Center"
-                    Padding="{DynamicResource TimePickerHostPadding}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    FontSize="{TemplateBinding FontSize}"/>
-              </Border>
-
-              <Rectangle Name="SecondColumnDivider"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="3" />
-
-              <Border x:Name="ThirdPickerHost" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="PeriodTextBlock"
-                    HorizontalAlignment="Center"
-                    Padding="{DynamicResource TimePickerHostPadding}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    FontSize="{TemplateBinding FontSize}" />
-              </Border>
-            </Grid>
-          </Button>
-
-          <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                 StaysOpen="False" PlacementTarget="{TemplateBinding}"
-                 PlacementMode="Bottom">
-            <TimePickerPresenter Name="PickerPresenter" />
-          </Popup>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="TimePicker:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="TimePicker:disabled /template/ Rectangle">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <!--<Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}"/>-->
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button:pressed /template/ ContentPresenter">
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource ThemeControlMidHighColor}" Opacity="0.6" />
-    </Setter>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button:disabled /template/ ContentPresenter">
-    <!--<Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>-->
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-
-  <Style Selector="TimePicker:hasnotime /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-
-  <Style Selector="TimePickerPresenter">
-    <Setter Property="Width" Value="242" />
-    <Setter Property="MinWidth" Value="242" />
-    <Setter Property="MaxHeight" Value="398" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="Background"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398">
-          <Grid Name="ContentPanel" RowDefinitions="*,Auto">
-            <Grid Name="PickerContainer">
-              <!--Ignore col defs here, set in code-->
-              <Panel Name="HourHost" Grid.Column="0">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="HourSelector"
-                                          PanelType="Hour"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
-                </ScrollViewer>
-                <RepeatButton Name="HourUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="HourDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
-              </Panel>
-
-              <Panel Name="MinuteHost" Grid.Column="2">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="MinuteSelector"
-                                          PanelType="Minute"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
-                </ScrollViewer>
-                <RepeatButton Name="MinuteUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="MinuteDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
-              </Panel>
-
-              <Panel Name="PeriodHost" Grid.Column="4">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="PeriodSelector"
-                                          PanelType="TimePeriod"
-                                          ShouldLoop="False"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
-                </ScrollViewer>
-                <RepeatButton Name="PeriodUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="PeriodDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
-              </Panel>
-
-              <Rectangle x:Name="HighlightRect" ZIndex="-1"
-                      Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="5"
-                      VerticalAlignment="Center"
-                      Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
-
-              <Rectangle Name="FirstSpacer"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="1" />
-
-              <Rectangle Name="SecondSpacer"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="3" />
-            </Grid>
-
-            <Grid Grid.Row="1" Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissHostGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}"
-                      VerticalAlignment="Top"
-                      Fill="{DynamicResource ThemeControlMidHighBrush}"
-                      Grid.ColumnSpan="2" />
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
-              </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
-              </Button>
-            </Grid>
-
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TitleBar.xaml b/src/Avalonia.Themes.Default/Controls/TitleBar.xaml
deleted file mode 100644
index 7f8ed24076..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TitleBar.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border>
-      <TitleBar Background="SkyBlue" Height="30" Width="300" Foreground="Black" />
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="TitleBar">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
-          <Panel x:Name="PART_MouseTracker" Height="1" VerticalAlignment="Top" />
-          <Panel x:Name="PART_Container">
-            <Border x:Name="PART_Background" Background="{TemplateBinding Background}" />
-            <CaptionButtons x:Name="PART_CaptionButtons" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="{TemplateBinding Foreground}" />
-          </Panel>
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="TitleBar:fullscreen">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentColor}" />
-  </Style>
-
-  <Style Selector="TitleBar /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="False" />
-  </Style>
-
-  <Style Selector="TitleBar:fullscreen /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="True" />
-  </Style>
-
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_MouseTracker">
-    <Setter Property="Background" Value="Transparent" />
-  </Style>
-
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="translateY(-30px)" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.25" />
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <Style Selector="TitleBar:fullscreen:pointerover /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="none" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
deleted file mode 100644
index b14a239c35..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
-                          TextBlock.Foreground="{TemplateBinding Foreground}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ToggleButton:checked /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="ToggleButton:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="ToggleButton:pressed  /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
-  <Style Selector="ToggleButton:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
deleted file mode 100644
index 305f1b1814..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
+++ /dev/null
@@ -1,322 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
-    <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
-    <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
-    <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
-    <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
-    <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1</Thickness>
-    <SolidColorBrush x:Key="ToggleSwitchContentForeground" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContentForegroundDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchHeaderForeground" Color="{DynamicResource ThemeForegroundColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchHeaderForegroundDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundPointerOver" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundPressed" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundDisabled" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOff" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOffPointerOver" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOffPressed" Color="{DynamicResource ThemeControlMidHighColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOffDisabled" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOff" Color="{DynamicResource ThemeBorderMidColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOffPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOffPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOffDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOn" Color="{DynamicResource ThemeAccentColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOnPointerOver" Color="{DynamicResource ThemeAccentColor2}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOnPressed" Color="{DynamicResource ThemeAccentColor3}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOnDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOn" Color="{DynamicResource ThemeAccentColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOnPointerOver" Color="{DynamicResource ThemeAccentColor2}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOnPressed" Color="{DynamicResource ThemeAccentColor3}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOnDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOff" Color="{DynamicResource ThemeBorderMidColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOn" Color="{DynamicResource HighlightForegroundColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPointerOver" Color="{DynamicResource HighlightForegroundColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPressed" Color="{DynamicResource HighlightForegroundColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnDisabled" Color="{DynamicResource HighlightForegroundColor}" />
-  </Styles.Resources>
-  <Design.PreviewWith>
-    <StackPanel Margin="20" Width="250" Spacing="24" >
-      <StackPanel Spacing="12" >
-        <TextBlock
-          Text="Automatic updates"
-          Classes="h1"/>
-        <TextBlock
-          Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
-          TextWrapping="Wrap"/>
-        <ToggleSwitch HorizontalContentAlignment="Left"
-          Content="Enable automatic Updates?"
-          OffContent="Uit"
-          OnContent="Aan"
-          VerticalAlignment="Bottom"/>
-      </StackPanel>
-
-      <StackPanel Spacing="12">
-        <TextBlock
-          Text="Previewer"
-          Classes="h1"/>
-        <TextBlock
-          Text="The previewer Shows a preview off your code, this could slow down your system"
-          TextWrapping="Wrap"/>
-        <ToggleSwitch
-          Content="Previewer"
-          IsChecked="True" />
-      </StackPanel>
-    </StackPanel>
-  </Design.PreviewWith>
-
-  <Style Selector="ToggleSwitch">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Background="{TemplateBinding Background}"
-          RowDefinitions="Auto,*">
-
-          <ContentPresenter x:Name="PART_ContentPresenter"
-            Grid.Row="0"
-            Content="{TemplateBinding Content}"
-            ContentTemplate="{TemplateBinding ContentTemplate}"
-            RecognizesAccessKey="True"
-            VerticalAlignment="Top"/>
-
-          <Grid Grid.Row="1"
-            MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="12" MaxWidth="12" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Grid x:Name="SwitchAreaGrid"
-              Grid.RowSpan="3"
-              Grid.ColumnSpan="3"
-              TemplatedControl.IsTemplateFocusTarget="True"
-              Margin="0,5" />
-
-            <ContentPresenter x:Name="PART_OffContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OffContent}"
-              ContentTemplate="{TemplateBinding OffContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <ContentPresenter x:Name="PART_OnContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OnContent}"
-              ContentTemplate="{TemplateBinding OnContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <Border x:Name="OuterBorder"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
-
-            <Border x:Name="SwitchKnobBounds"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"/>
-
-            <Canvas x:Name="SwitchKnob" Grid.Row="1"
-               HorizontalAlignment="Left"
-               Width="20" Height="20">
-
-              <Grid x:Name="MovingKnobs"
-                Width="20" Height="20">
-
-                <Ellipse x:Name="SwitchKnobOn"
-                         Width="10" Height="10" />
-
-                <Ellipse x:Name="SwitchKnobOff"
-                         Width="10" Height="10" />
-              </Grid>
-            </Canvas>
-          </Grid>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
-  </Style>
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter:empty">
-    <Setter Property="Margin" Value="0" />
-  </Style>
-
-  <!-- NormalState -->
-  <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#OuterBorder">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Grid#MovingKnobs">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut"/>
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <!-- PointerOverState -->
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}"/>
-  </Style>
-
-  <!-- PressedState -->
-  <Style Selector="ToggleSwitch:pressed /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}"/>
-  </Style>
-
-  <!-- DisabledState -->
-  <Style Selector="ToggleSwitch:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
-  </Style>
-
-  <!-- CheckedState -->
-  <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <!--UncheckedState -->
-  <Style Selector="ToggleSwitch:unchecked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/ToolTip.xaml b/src/Avalonia.Themes.Default/Controls/ToolTip.xaml
deleted file mode 100644
index 35c1dceb8d..0000000000
--- a/src/Avalonia.Themes.Default/Controls/ToolTip.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ToolTip">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-  <Setter Property="Padding" Value="4,2"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}" 
-                        Padding="{TemplateBinding Padding}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml
deleted file mode 100644
index 6a4d56ccb7..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TransitioningContentControl">
-    <!-- Set Defaults -->
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding CurrentContent}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/TreeView.xaml b/src/Avalonia.Themes.Default/Controls/TreeView.xaml
deleted file mode 100644
index 67a683dad9..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TreeView.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="TreeView">
-  <Setter Property="Background" Value="Transparent"/>
-  <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-  <Setter Property="Padding" Value="4"/>
-  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Background="{TemplateBinding Background}"
-                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          Margin="{TemplateBinding Padding}"/>
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
deleted file mode 100644
index 1996756001..0000000000
--- a/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
+++ /dev/null
@@ -1,93 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-    <Style Selector="TreeViewItem">
-        <Style.Resources>
-            <converters:MarginMultiplierConverter Indent="16" Left="True" x:Key="LeftMarginConverter" />
-        </Style.Resources>
-        <Setter Property="Padding" Value="2"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <StackPanel>
-                    <Border Name="SelectionBorder"
-                            Focusable="True"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            TemplatedControl.IsTemplateFocusTarget="True">
-                        <Grid Name="PART_Header"
-                              ColumnDefinitions="16, *"
-                              Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource LeftMarginConverter}}" >
-                            <ToggleButton Name="expander"
-                                          Focusable="False"
-                                          IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"/>
-                            <ContentPresenter Name="PART_HeaderPresenter"
-                                              Focusable="False"
-                                              Content="{TemplateBinding Header}"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalAlignment}"
-                                              Padding="{TemplateBinding Padding}"
-                                              Grid.Column="1"/>
-                        </Grid>
-                    </Border>
-                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                    IsVisible="{TemplateBinding IsExpanded}"
-                                    Items="{TemplateBinding Items}"
-                                    ItemsPanel="{TemplateBinding ItemsPanel}"/>
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-
-    <Style Selector="TreeViewItem /template/ ToggleButton#expander">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Background="Transparent"
-                        Width="14"
-                        Height="12"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                    <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Data="M 0 2 L 4 6 L 0 10 Z"/>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-
-    <Style Selector="TreeViewItem /template/ ContentPresenter#PART_HeaderPresenter">
-        <Setter Property="Padding" Value="2"/>
-    </Style>
-
-    <Style Selector="TreeViewItem /template/ Border#SelectionBorder:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    </Style>
-
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    </Style>
-
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:focus">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-    </Style>
-
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-    </Style>
-
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:pointerover:focus">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-    </Style>
-
-    <Style Selector="TreeViewItem /template/ ToggleButton#expander:checked">
-        <Setter Property="RenderTransform">
-            <RotateTransform Angle="45"/>
-        </Setter>
-    </Style>
-
-    <Style Selector="TreeViewItem:empty /template/ ToggleButton#expander">
-        <Setter Property="IsVisible" Value="False"/>
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/UserControl.xaml b/src/Avalonia.Themes.Default/Controls/UserControl.xaml
deleted file mode 100644
index d6028daff8..0000000000
--- a/src/Avalonia.Themes.Default/Controls/UserControl.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(UserControl)">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/Window.xaml b/src/Avalonia.Themes.Default/Controls/Window.xaml
deleted file mode 100644
index 9c515ebe30..0000000000
--- a/src/Avalonia.Themes.Default/Controls/Window.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Window">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>  
-  <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource HighlightForegroundColor}" />
-  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>  
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
-        <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
-        <VisualLayerManager>
-          <VisualLayerManager.ChromeOverlayLayer>
-            <TitleBar />
-          </VisualLayerManager.ChromeOverlayLayer>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </VisualLayerManager>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
diff --git a/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
deleted file mode 100644
index 7c1efa2e82..0000000000
--- a/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="WindowNotificationManager">
-        <Setter Property="Margin" Value="0 0 8 8"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ReversibleStackPanel Name="PART_Items">
-                    <ReversibleStackPanel.DataTemplates>
-                        <DataTemplate DataType="INotification">
-                            <StackPanel Spacing="8" Margin="12">
-                                <TextBlock Text="{Binding Title}" FontWeight="Medium" />
-                                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
-                            </StackPanel>
-                        </DataTemplate>
-                        <DataTemplate DataType="x:String">
-                            <TextBlock Text="{Binding }" Margin="12" />
-                        </DataTemplate>
-                    </ReversibleStackPanel.DataTemplates>
-                </ReversibleStackPanel>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-
-    <Style Selector="WindowNotificationManager:topleft /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-    </Style>
-
-    <Style Selector="WindowNotificationManager:topright /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-    </Style>
-
-    <Style Selector="WindowNotificationManager:bottomleft /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="ReverseOrder" Value="True"/>
-        <Setter Property="VerticalAlignment" Value="Bottom"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-    </Style>
-
-    <Style Selector="WindowNotificationManager:bottomright /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="ReverseOrder" Value="True"/>
-        <Setter Property="VerticalAlignment" Value="Bottom"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-    </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
deleted file mode 100644
index 6d2af1de57..0000000000
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ /dev/null
@@ -1,68 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="Avalonia.Themes.Default.DefaultTheme">
-  <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml"/>
-
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FocusAdorner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Button.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CheckBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CaptionButtons.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Label.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/GridSplitter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ItemsControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ListBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ListBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Menu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PopupRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ProgressBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RadioButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RepeatButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Separator.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Slider.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollViewer.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabStrip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabStripItem.xaml"/>
-  <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TextBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Expander.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TitleBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TreeView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TreeViewItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/UserControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Window.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDayButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Calendar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ButtonSpinner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/NumericUpDown.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/NotificationCard.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/NativeMenuBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleSwitch.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/SplitButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/SplitView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DatePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TimePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml"/>
-</Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs b/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
deleted file mode 100644
index 598b418977..0000000000
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Styling;
-
-namespace Avalonia.Themes.Default
-{
-    /// <summary>
-    /// The default Avalonia theme.
-    /// </summary>
-    public class DefaultTheme : Styles
-    {
-    }
-}
diff --git a/src/Avalonia.Themes.Default/InverseBooleanValueConverter.cs b/src/Avalonia.Themes.Default/InverseBooleanValueConverter.cs
deleted file mode 100644
index 7befc81b8e..0000000000
--- a/src/Avalonia.Themes.Default/InverseBooleanValueConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Data.Converters;
-
-namespace Avalonia.Themes.Default
-{
-    class InverseBooleanValueConverter : IValueConverter
-    {
-        public bool Default { get; set; }
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value is bool b ? !b : Default;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value is bool b ? !b : !Default;
-        }
-    }
-}
diff --git a/src/Avalonia.Themes.Default/SimpleTheme.cs b/src/Avalonia.Themes.Default/SimpleTheme.cs
deleted file mode 100644
index 1d9f2d5f9d..0000000000
--- a/src/Avalonia.Themes.Default/SimpleTheme.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.Styling;
-using Avalonia.Styling;
-#nullable enable
-
-namespace Avalonia.Themes.Default
-{
-    public class SimpleTheme : AvaloniaObject, IStyle, IResourceProvider
-    {
-        public static readonly StyledProperty<SimpleThemeMode> ModeProperty =
-        AvaloniaProperty.Register<SimpleTheme, SimpleThemeMode>(nameof(Mode));
-
-        private readonly Uri _baseUri;
-        private bool _isLoading;
-        private IStyle? _loaded;
-        private Styles _sharedStyles = new();
-        private Styles _simpleDark = new();
-        private Styles _simpleLight = new();
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimpleTheme"/> class.
-        /// </summary>
-        /// <param name="baseUri">The base URL for the XAML context.</param>
-        public SimpleTheme(Uri baseUri)
-        {
-            _baseUri = baseUri;
-            InitStyles(_baseUri);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimpleTheme"/> class.
-        /// </summary>
-        /// <param name="serviceProvider">The XAML service provider.</param>
-        public SimpleTheme(IServiceProvider serviceProvider)
-        {
-            var service = serviceProvider.GetService(typeof(IUriContext));
-            if (service == null)
-            {
-                throw new Exception("There is no service object of type IUriContext!");
-            }
-            _baseUri = ((IUriContext)service).BaseUri;
-            InitStyles(_baseUri);
-        }
-
-        public event EventHandler OwnerChanged
-        {
-            add
-            {
-                if (Loaded is IResourceProvider rp)
-                {
-                    rp.OwnerChanged += value;
-                }
-            }
-            remove
-            {
-                if (Loaded is IResourceProvider rp)
-                {
-                    rp.OwnerChanged -= value;
-                }
-            }
-        }
-
-        IReadOnlyList<IStyle> IStyle.Children => _loaded?.Children ?? Array.Empty<IStyle>();
-
-        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
-
-        public IStyle Loaded
-        {
-            get
-            {
-                if (_loaded == null)
-                {
-                    _isLoading = true;
-
-                    if (Mode == SimpleThemeMode.Light)
-                    {
-                        _loaded = new Styles { _sharedStyles, _simpleLight };
-                    }
-                    else if (Mode == SimpleThemeMode.Dark)
-                    {
-                        _loaded = new Styles { _sharedStyles, _simpleDark };
-                    }
-                    _isLoading = false;
-                }
-
-                return _loaded!;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the mode of the fluent theme (light, dark).
-        /// </summary>
-        public SimpleThemeMode Mode
-        {
-            get => GetValue(ModeProperty);
-            set => SetValue(ModeProperty, value);
-        }
-        public IResourceHost? Owner => (Loaded as IResourceProvider)?.Owner;
-
-        void IResourceProvider.AddOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.AddOwner(owner);
-
-        void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
-
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
-
-        public bool TryGetResource(object key, out object? value)
-        {
-            if (!_isLoading && Loaded is IResourceProvider p)
-            {
-                return p.TryGetResource(key, out value);
-            }
-
-            value = null;
-            return false;
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-            if (change.Property == ModeProperty)
-            {
-                if (Mode == SimpleThemeMode.Dark)
-                {
-                    (Loaded as Styles)![1] = _simpleDark[0];
-                }
-                else
-                {
-                    (Loaded as Styles)![1] = _simpleLight[0];
-                }
-            }
-        }
-
-        private void InitStyles(Uri baseUri)
-        {
-            _sharedStyles = new Styles
-            {
-                new StyleInclude(baseUri)
-                {
-                    Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
-                },
-                new StyleInclude(baseUri)
-                {
-                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/Base.xaml")
-                }
-            };
-            _simpleLight = new Styles
-            {
-                new StyleInclude(baseUri)
-                {
-                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
-                }
-            };
-
-            _simpleDark = new Styles
-            {
-                new StyleInclude(baseUri)
-                {
-                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
-                }
-            };
-        }
-
-    }
-}
diff --git a/src/Avalonia.Themes.Default/SimpleThemeMode.cs b/src/Avalonia.Themes.Default/SimpleThemeMode.cs
deleted file mode 100644
index be33466327..0000000000
--- a/src/Avalonia.Themes.Default/SimpleThemeMode.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Avalonia.Themes.Default
-{
-    public enum SimpleThemeMode
-    {
-        Light,
-        Dark
-    }
-}
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index 5b86de02d5..7e3c8673f5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -87,12 +87,12 @@
     <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
     <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
     <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>    
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
     <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />    
+    <StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
@@ -100,14 +100,14 @@
     <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
     <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
     <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentLowBrush" />    
+    <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentLowBrush" />
     <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
     <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
-    <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />    
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />    
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
@@ -281,7 +281,6 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    
 
     <!-- Resources for Calendar.xaml, CalendarButton.xaml, CalendarDayButton.xaml, CalendarItem.xaml -->
     <StaticResource x:Key="CalendarViewSelectedHoverBorderBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
@@ -305,9 +304,42 @@
     <StaticResource x:Key="CalendarViewCalendarItemRevealBorderBrush" ResourceKey="SystemControlTransparentRevealBorderBrush" />
     <StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
-   
+
+    <!-- Resources for Expander.xaml -->
+    <!-- Expander:Header -->
+    <StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderBackgroundPressed" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderBackgroundDisabled" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundPressed" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPointerOver" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPressed" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+
+    <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent" />
+    <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPressed" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushDisabled" Color="Transparent" />
+
+    <!-- Expander:Content -->
+    <StaticResource x:Key="ExpanderContentBackground" ResourceKey="SystemChromeMediumLowColor" />
+    <StaticResource x:Key="ExpanderContentBorderBrush" ResourceKey="SystemBaseLowColor" />
+
     <!--Resources for NotificationCard.xaml -->
     <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" />
+    <StaticResource x:Key="NotificationCardForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
     <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/>
     <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/>
@@ -357,7 +389,6 @@
     <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
     <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
     <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
-    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
     <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -374,8 +405,6 @@
     <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
     <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
     <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
-    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
@@ -423,7 +452,6 @@
     <!-- Resources for DatePicker.xaml-->
     <StaticResource x:Key="DatePickerSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
     <StaticResource x:Key="DatePickerSpacerFillDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="DatePickerHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
     <StaticResource x:Key="DatePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
@@ -454,8 +482,6 @@
     <!-- Resources for TimePicker.xaml -->
     <StaticResource x:Key="TimePickerSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
     <StaticResource x:Key="TimePickerSpacerFillDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="TimePickerHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TimePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="TimePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="TimePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
     <StaticResource x:Key="TimePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
@@ -587,9 +613,23 @@
     <StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
   
     <!-- Resources for CalendarDatePicker.xaml -->
-    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
     <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
     <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
 
     <!-- Resources for FlyoutPresenter.xaml -->
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index eb68270354..7917315e19 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -81,12 +81,12 @@
     <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
     <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
-   
+
     <!-- Resources for ComboBox.xaml -->
-    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>    
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
     <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>    
-    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>    
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
     <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
     <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
@@ -278,7 +278,7 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
-      
+
     <!-- Resources for Calendar.xaml, CalendarButton.xaml, CalendarDayButton.xaml, CalendarItem.xaml -->
     <StaticResource x:Key="CalendarViewSelectedHoverBorderBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
     <StaticResource x:Key="CalendarViewSelectedPressedBorderBrush" ResourceKey="SystemControlHighlightListAccentHighBrush" />
@@ -301,9 +301,42 @@
     <StaticResource x:Key="CalendarViewCalendarItemRevealBorderBrush" ResourceKey="SystemControlTransparentRevealBorderBrush" />
     <StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
-    
+
+    <!-- Resources for Expander.xaml -->
+    <!-- Expander:Header -->
+    <StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderBackgroundPressed" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderBackgroundDisabled" ResourceKey="SystemAltMediumHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundPressed" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPointerOver" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPressed" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+
+    <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent" />
+    <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPressed" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushDisabled" Color="Transparent" />
+
+    <!-- Expander:Content -->
+    <StaticResource x:Key="ExpanderContentBackground" ResourceKey="SystemChromeMediumLowColor" />
+    <StaticResource x:Key="ExpanderContentBorderBrush" ResourceKey="SystemBaseLowColor" />
+
     <!--Resources for NotificationCard.xaml -->
     <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="White" />
+    <StaticResource x:Key="NotificationCardForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
     <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#0078D4" />
     <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#128B44" />
@@ -353,7 +386,6 @@
     <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
     <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
     <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
-    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
     <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -370,8 +402,6 @@
     <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
     <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
     <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
-    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
@@ -419,7 +449,6 @@
     <!-- Resources for DatePicker.xaml-->
     <StaticResource x:Key="DatePickerSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
     <StaticResource x:Key="DatePickerSpacerFillDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="DatePickerHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
     <StaticResource x:Key="DatePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
@@ -449,8 +478,6 @@
     <!-- Resources for TimePicker.xaml -->
     <StaticResource x:Key="TimePickerSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
     <StaticResource x:Key="TimePickerSpacerFillDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="TimePickerHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TimePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="TimePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="TimePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
     <StaticResource x:Key="TimePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
@@ -581,9 +608,23 @@
     <StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
   
     <!-- Resources for CalendarDatePicker.xaml -->
-    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
     <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
     <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
 
     <!-- Resources for FlyoutPresenter.xaml -->
diff --git a/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-Bold.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-Bold.ttf
index 847ffd191b..a372c5fcca 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-Bold.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-Bold.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-ExtraLight.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-ExtraLight.ttf
index 33267cd799..13ef261fff 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-ExtraLight.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-ExtraLight.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-Light.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-Light.ttf
index c22eafe9fb..9f75ff2780 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-Light.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-Light.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-Medium.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-Medium.ttf
index f782894eea..2c5e25453c 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-Medium.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-Medium.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-Regular.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-Regular.ttf
index 3b7e686e54..c28fe4d744 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-Regular.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-Regular.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-SemiBold.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-SemiBold.ttf
index 556e972f48..d085eb4994 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-SemiBold.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-SemiBold.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-Thin.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-Thin.ttf
index e49058e33d..016a13482b 100644
Binary files a/src/Avalonia.Themes.Fluent/Assets/Inter-Thin.ttf and b/src/Avalonia.Themes.Fluent/Assets/Inter-Thin.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 885661536c..35603fe216 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -3,16 +3,10 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />  
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <AvaloniaResource Include="**/*.xaml" />
     <AvaloniaResource Include="Assets\*" />  
   </ItemGroup>
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index 58295d024f..6004d42120 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -1,5 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <AutoCompleteBox Width="200">
@@ -16,56 +16,56 @@
       </AutoCompleteBox>
     </Border>
   </Design.PreviewWith>
-
-  <Style Selector="AutoCompleteBox">
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-    <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="PART_LayoutRoot">
-          <TextBox Name="PART_TextBox"
-                   Watermark="{TemplateBinding Watermark}"
-                   Width="{TemplateBinding Width}"
-                   Foreground="{TemplateBinding Foreground}"
-                   Background="{TemplateBinding Background}"
-                   BorderBrush="{TemplateBinding BorderBrush}"
-                   BorderThickness="{TemplateBinding BorderThickness}"
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   FontSize="{TemplateBinding FontSize}"
-                   FontFamily="{TemplateBinding FontFamily}"
-                   FontWeight="{TemplateBinding FontWeight}"
-                   Padding="{TemplateBinding Padding}"
-                   Margin="0"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
-          
-          <Popup Name="PART_Popup"
-                 WindowManagerAddShadowHint="False"
-                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                 MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                 IsLightDismissEnabled="True"
-                 PlacementTarget="{TemplateBinding}">            
-            <Border Name="PART_SuggestionsContainer"
-                    Padding="{DynamicResource AutoCompleteListMargin}"
-                    BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
-                    BorderBrush="{DynamicResource AutoCompleteBoxSuggestionsListBorderBrush}"
-                    Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
-                    CornerRadius="{DynamicResource OverlayCornerRadius}">
-              <ListBox Name="PART_SelectingItemsControl"
-                       BorderThickness="0"
-                       Background="Transparent"
-                       ItemTemplate="{TemplateBinding ItemTemplate}"
-                       Margin="{DynamicResource AutoCompleteListPadding}" />
-            </Border>
-          </Popup>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+  
+    <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+      <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+      <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="PART_LayoutRoot">
+            <TextBox Name="PART_TextBox"
+                     Watermark="{TemplateBinding Watermark}"
+                     Width="{TemplateBinding Width}"
+                     Foreground="{TemplateBinding Foreground}"
+                     Background="{TemplateBinding Background}"
+                     BorderBrush="{TemplateBinding BorderBrush}"
+                     BorderThickness="{TemplateBinding BorderThickness}"
+                     CornerRadius="{TemplateBinding CornerRadius}"
+                     FontSize="{TemplateBinding FontSize}"
+                     FontFamily="{TemplateBinding FontFamily}"
+                     FontWeight="{TemplateBinding FontWeight}"
+                     Padding="{TemplateBinding Padding}"
+                     Margin="0"
+                     DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
+            <Popup Name="PART_Popup" 
+                   WindowManagerAddShadowHint="False"
+                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" 
+                   MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                   IsLightDismissEnabled="True"
+                   PlacementTarget="{TemplateBinding}">
+              <Border Name="PART_SuggestionsContainer"
+                      Padding="{DynamicResource AutoCompleteListMargin}"
+                      BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
+                      BorderBrush="{DynamicResource AutoCompleteBoxSuggestionsListBorderBrush}"
+                      Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
+                      CornerRadius="{DynamicResource OverlayCornerRadius}">
+                <ListBox Name="PART_SelectingItemsControl"
+                         BorderThickness="0"
+                         Background="Transparent"
+                         ItemTemplate="{TemplateBinding ItemTemplate}"
+                         Margin="{DynamicResource AutoCompleteListPadding}" />
+              </Border>
+            </Popup>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index 533fabfb44..7828fd52ed 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -1,29 +1,32 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
         <Button Content="Click Me!" />
         <Button Classes="accent" Content="Click Me!" />
-      </StackPanel>      
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
-  </Styles.Resources>
-  <Style Selector="Button">
+  
+  <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+
+  <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
     <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
-    <!--<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />-->
     <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
+      </Transitions>
+    </Setter>
+
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
@@ -39,61 +42,53 @@
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <!-- PointerOverState -->  
-  <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
-  </Style>
-  
-  <Style Selector="Button:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
-  </Style>
-  
-  <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-  </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+    </Style>
 
-  <Style Selector="Button.accent /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForeground}" />
-  </Style>
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
 
-  <Style Selector="Button.accent:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
-  </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+    </Style>
 
-  <Style Selector="Button.accent:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
-  </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+    </Style>
 
-  <Style Selector="Button, RepeatButton, ToggleButton">
-    <Setter Property="RenderTransform" Value="none" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
-      </Transitions>
-    </Setter>
-  </Style>
+    <Style Selector="^.accent">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
+      </Style>
 
-  <Style Selector="Button:pressed, RepeatButton:pressed, ToggleButton:pressed">
-    <Setter Property="RenderTransform" Value="scale(0.98)" />    
-  </Style>
+      <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
+      </Style>
 
-  <Style Selector="Button.accent:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
-  </Style>
-</Styles>
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 836cc27db3..c6980bf97d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -1,58 +1,76 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
-    <Border Padding="20"
-            Background="Black">
+    <Border Padding="20">
       <StackPanel Spacing="20">
-        <ButtonSpinner ButtonSpinnerLocation="Right"
-                       Content="Right disabled inline spinner"
-                       AllowSpin="False">
-          <DataValidationErrors.Error>
-            <sys:Exception />
-          </DataValidationErrors.Error>
-        </ButtonSpinner>
+        <ButtonSpinner Content="Right spinner" />
         <ButtonSpinner ButtonSpinnerLocation="Left"
                        Content="Left spinner" />
+        <ButtonSpinner BorderThickness="2"
+                       BorderBrush="Blue"
+                       Content="Right Border" />
+        <ButtonSpinner ButtonSpinnerLocation="Left"
+                       BorderThickness="2"
+                       BorderBrush="Blue"
+                       Content="Left Border" />
+        <ButtonSpinner Content="Right disabled"
+                       AllowSpin="False"/>
+        <ButtonSpinner ButtonSpinnerLocation="Left"
+                       Content="Left disabled"
+                       AllowSpin="False"/>
         <ButtonSpinner ShowButtonSpinner="False"
                        Content="Hide spinner" />
+        <ButtonSpinner Content="Error">
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </ButtonSpinner>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <converters:MarginMultiplierConverter x:Key="ButtonSpinner_OnlyLeftThinknessConverter"
-                                          Indent="1"
-                                          Left="True" />
-    <converters:MarginMultiplierConverter x:Key="ButtonSpinner_OnlyRightThinknessConverter"
-                                          Indent="1"
-                                          Right="True" />
-
-    <StreamGeometry x:Key="ButtonSpinnerIncreaseButtonIcon">M0,9 L10,0 20,9 19,10 10,2 1,10 z</StreamGeometry>
-    <StreamGeometry x:Key="ButtonSpinnerDecreaseButtonIcon">M0,1 L10,10 20,1 19,0 10,8 1,0 z</StreamGeometry>
-  </Styles.Resources>
+  <converters:MarginMultiplierConverter x:Key="ButtonSpinnerLeftThickness" Indent="1" Left="True" />
+  <converters:MarginMultiplierConverter x:Key="ButtonSpinnerRightThickness" Indent="1" Right="True" />
+  <StreamGeometry x:Key="ButtonSpinnerIncreaseButtonIcon">M0,9 L10,0 20,9 19,10 10,2 1,10 z</StreamGeometry>
+  <StreamGeometry x:Key="ButtonSpinnerDecreaseButtonIcon">M0,1 L10,10 20,1 19,0 10,8 1,0 z</StreamGeometry>
 
-  <!--  RepeatButton.ButtonSpinnerRepeatButton  -->
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton">
+  <ControlTheme x:Key="FluentButtonSpinnerRepeatButton" TargetType="RepeatButton">
     <Setter Property="MinWidth" Value="34" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
+    </Style>
 
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton /template/ ContentPresenter">
-    <Setter Property="CornerRadius" Value="0" />
-    <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-  </Style>
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton:disabled">
-    <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-  </Style>
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton:disabled > Path">
-    <Setter Property="Fill" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
-  </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
 
-  <!--  ButtonSpinner  -->
-  <Style Selector="ButtonSpinner">
+  <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Padding" Value="10, 0" />
@@ -61,7 +79,7 @@
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
+    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -74,76 +92,65 @@
                   BorderThickness="{TemplateBinding BorderThickness}"
                   CornerRadius="{TemplateBinding CornerRadius}"
                   MinHeight="{TemplateBinding MinHeight}">
-            <Grid ColumnDefinitions="Auto,*,Auto">
-              <ContentPresenter Name="PART_ContentPresenter"
-                                Grid.Column="1"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Content="{TemplateBinding Content}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Padding="{TemplateBinding Padding}" />
-
+            <DockPanel>
               <StackPanel Name="PART_SpinnerPanel"
+                          DockPanel.Dock="Right"
                           Orientation="Horizontal"
                           IsVisible="{TemplateBinding ShowButtonSpinner}">
                 <RepeatButton Name="PART_IncreaseButton"
-                              Classes="ButtonSpinnerRepeatButton"
+                              Theme="{StaticResource FluentButtonSpinnerRepeatButton}"
+                              Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}"
+                              VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
                               Foreground="{TemplateBinding Foreground}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              FontSize="{TemplateBinding FontSize}">
-                  <Path Fill="{TemplateBinding Foreground}"
-                        Width="16"
-                        Height="8"
-                        Stretch="Uniform"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
+                              FontSize="{TemplateBinding FontSize}"
+                              MinWidth="34">
+                  <PathIcon Width="16"
+                            Height="8"
+                            Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
                 </RepeatButton>
 
                 <RepeatButton Name="PART_DecreaseButton"
-                              Classes="ButtonSpinnerRepeatButton"
-                              Foreground="{TemplateBinding Foreground}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
+                              Theme="{StaticResource FluentButtonSpinnerRepeatButton}"
                               Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}"
+                              VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
-                              FontSize="{TemplateBinding FontSize}">
-                  <Path Fill="{TemplateBinding Foreground}"
-                        Width="16"
-                        Height="8"
-                        Stretch="Uniform"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
+                              Foreground="{TemplateBinding Foreground}"
+                              FontSize="{TemplateBinding FontSize}"
+                              MinWidth="34">
+                  <PathIcon Width="16"
+                            Height="8"
+                            Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
                 </RepeatButton>
               </StackPanel>
-            </Grid>
+
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Padding="{TemplateBinding Padding}" />
+            </DockPanel>
           </Border>
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!--  ButtonSpinnerLocation=Right  -->
-  <Style Selector="ButtonSpinner:right /template/ StackPanel#PART_SpinnerPanel">
-    <Setter Property="Grid.Column" Value="2" />
-  </Style>
-  <Style Selector="ButtonSpinner:right /template/ RepeatButton.ButtonSpinnerRepeatButton">
-    <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
-  </Style>
-
-  <!--  ButtonSpinnerLocation=Left  -->
-  <Style Selector="ButtonSpinner:left /template/ StackPanel#PART_SpinnerPanel">
-    <Setter Property="Grid.Column" Value="0" />
-  </Style>
-  <Style Selector="ButtonSpinner:left /template/ RepeatButton.ButtonSpinnerRepeatButton">
-    <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
-  </Style>
-
-  <!--  Error state  -->
-  <Style Selector="ButtonSpinner:error">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
-  </Style>
+    <Style Selector="^:left">
+      <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
+        <Setter Property="DockPanel.Dock" Value="Left"/>
+      </Style>
+      <Style Selector="^ /template/ RepeatButton">
+        <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerRightThickness}}"/>
+      </Style>
+    </Style>
+    <Style Selector="^:error">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
+    </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
index 43e4a1fcea..9c66ea9b84 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
@@ -1,17 +1,19 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
+<!--
+    // (c) Copyright Microsoft Corporation.
+    // This source is subject to the Microsoft Public License (Ms-PL).
+    // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+    // All other rights reserved.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <Calendar />
     </Border>
   </Design.PreviewWith>
-  <Style Selector="Calendar">
+
+  <ControlTheme x:Key="{x:Type Calendar}" TargetType="Calendar">
     <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
     <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
@@ -20,19 +22,19 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Name="Root"
-                    HorizontalAlignment="Center"
-                    ClipToBounds="True">
-
-                    <CalendarItem Name="CalendarItem"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        HeaderBackground="{TemplateBinding HeaderBackground}"
-                        CornerRadius="{TemplateBinding CornerRadius}"/>
-
+        <StackPanel
+            Name="PART_Root"
+            HorizontalAlignment="Center"
+            ClipToBounds="True">
+          <CalendarItem
+              Name="PART_CalendarItem"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
+              HeaderBackground="{TemplateBinding HeaderBackground}" />
         </StackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 3a6af60983..06b6cf30c2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -1,121 +1,117 @@
-<!--
+<!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CalendarButton/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarButton">
-    <Setter Property="ClickMode" Value="Release"/>
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Margin" Value="1"/>
-    <Setter Property="Padding" Value="0,0,0,0"/>
+  <ControlTheme x:Key="{x:Type CalendarButton}" TargetType="CalendarButton">
+    <Setter Property="ClickMode" Value="Release" />
+    <Setter Property="MinWidth" Value="40" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Margin" Value="1" />
+    <Setter Property="Padding" Value="0,0,0,0" />
     <!--These are actually set on the CalendarView in WinUI-->
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/>
-    <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="FontSize" Value="20"/>
-    <Setter Property="ClipToBounds" Value="False"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}" />
+    <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
+    <Setter Property="BorderThickness" Value="2" />
+    <Setter Property="FontSize" Value="20" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
           <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
           <Border Name="Root" Background="{TemplateBinding Background}"
                   BorderThickness="0" ClipToBounds="True">
-
             <ContentControl Name="Content"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Content="{TemplateBinding Content}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                  FontSize="{TemplateBinding FontSize}"
-                  Margin="{TemplateBinding Padding}"/>
-
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Margin="{TemplateBinding Padding}" />
           </Border>
 
-          <!-- Drawn Border should render on top of background to preserve the 1px
-                        margin between items-->
+          <!-- Drawn Border should render on top of background to preserve the 1px margin between items -->
           <Border Name="Border"
                   BorderThickness="2"
-                  BorderBrush="{TemplateBinding BorderBrush}"/>
-
-          <!--Removed for now...WinUI doesn't have selection follow focus, and only uses 
-              focus visual w/ keyboard focus
-          <Border Name="FocusVisual" BorderThickness="2"
-                     BorderBrush="{DynamicResource SystemControlHighlightBaseHighBrush}"
-                     IsHitTestVisible="False"
-                     Margin="-2"  CornerRadius="{DynamicResource ControlCornerRadius}"/>-->
+                  BorderBrush="{TemplateBinding BorderBrush}" />
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <!--<Style Selector="CalendarButton /template/ Border#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>-->
 
-  <Style Selector="CalendarButton:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarButton:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}"/>
-  </Style>
+    <Style Selector="^:pointerover /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+    </Style>
 
-  <!-- Adjusted :selected to look like :today from DayItem -->
-  <Style Selector="CalendarButton:selected /template/ Border#Root">
-    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
-  </Style>
-  <Style Selector="CalendarButton:selected /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarButton:selected:pointerover /template/ Border#Root">
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColor}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarButton:selected:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark1}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarButton:selected:pressed /template/ Border#Root">
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColor}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarButton:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark2}"/>
-    </Setter>
-  </Style>
+    <Style Selector="^:pressed /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+    </Style>
+
+    <!-- Adjusted :selected to look like :today from DayItem -->
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#Root">
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
+      </Style>
+
+      <Style Selector="^ /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+      </Style>
+
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
+        </Style>
+        <Style Selector="^ /template/ Border#Root">
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+        </Style>
+      </Style>
 
-  <Style Selector="CalendarButton:selected /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}"/>
-    <Setter Property="FontWeight" Value="SemiBold"/>
-  </Style>
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+        </Style>
 
-  <!-- WinUI calls this OutOfFocus -->
-  <Style Selector="CalendarButton:inactive /template/ Border#Root">
-    <!-- These are probably set in code, but consistent -->
-    <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
-  </Style>
-  <Style Selector="CalendarButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
-  </Style>
+        <Style Selector="^ /template/ Border#Root">
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+        </Style>
+      </Style>
+    </Style>
 
-  <Style Selector="CalendarButton:blackout /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}"/>
-  </Style>
+    <!-- WinUI calls this OutOfFocus -->
+    <Style Selector="^:inactive">
+      <Style Selector="^ /template/ Border#Root">
+        <!-- These are probably set in code, but consistent -->
+        <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
+      </Style>
+      <Style Selector="^ /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
+      </Style>
+    </Style>
 
-  <!--<Style Selector="CalendarButton:dayfocused /template/ Border#FocusVisual">
-            <Setter Property="IsVisible" Value="True"/>
-      </Style>-->
+    <Style Selector="^:blackout /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+    </Style>
 
-  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:disabled /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index ffd3972b66..54f6a200b8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -1,148 +1,178 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Margin="20, 20, 20, 200">
-      <CalendarDatePicker Width="200"
-                          VerticalContentAlignment="Center"
-                          HorizontalContentAlignment="Center" />
+      <CalendarDatePicker Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <sys:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</sys:Double>
-  </Styles.Resources>
-  
-  <Style Selector="CalendarDatePicker">
+  <x:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</x:Double>
+  <x:Double x:Key="CalendarDatePickerMinHeight">32</x:Double>
+
+  <ControlTheme x:Key="FluentCalendarDatePickerButton" TargetType="Button">
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
+    <Setter Property="Margin" Value="2,0,4,0" />
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Height="24"
+              Width="20"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Margin="0"
+              ColumnDefinitions="*,*,*,*"
+              RowDefinitions="23*,19*,19*,19*"
+              ClipToBounds="False">
+          <Border Name="Background"
+                  Margin="0,-1,0,0"
+                  Grid.ColumnSpan="4"
+                  Grid.Row="1"
+                  Grid.RowSpan="3"
+                  BorderThickness="0.5,0,0.5,0.5"
+                  BorderBrush="{TemplateBinding Foreground}"
+                  CornerRadius="0,0,2,2" />
+          <Border Grid.ColumnSpan="4"
+                  Grid.RowSpan="1"
+                  BorderBrush="{TemplateBinding Foreground}"
+                  BorderThickness="0.5"
+                  CornerRadius="2,2,0,0" />
+          <TextBlock Margin="0,-1,0,0"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Center"
+                     Grid.Column="0"
+                     Grid.Row="1"
+                     Grid.ColumnSpan="4"
+                     Grid.RowSpan="3"
+                     Foreground="{TemplateBinding Foreground}"
+                     FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
+                     Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
+          <Ellipse HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Fill="{TemplateBinding Foreground}"
+                   StrokeThickness="0"
+                   Grid.ColumnSpan="4"
+                   Width="3"
+                   Height="3" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 
-    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}"/>
-    <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}"/>
+  <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
+    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerMinHeight}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Padding" Value="4"/>
-    
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-        <Grid ColumnDefinitions="*,Auto">
-
-          <Grid.Styles>
-
-            <Style Selector="Button.CalendarDropDown">
-              <Setter Property="Template">
-                <ControlTemplate>
-                  <Grid Height="24"
-                        Width="20"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Margin="0"
-                        ColumnDefinitions="*,*,*,*"
-                        RowDefinitions="23*,19*,19*,19*"
-                        ClipToBounds="False">
+          <Panel x:Name="LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Border x:Name="Background"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    Background="{TemplateBinding Background}" />
+            <Grid ColumnDefinitions="*,Auto">
+              <TextBox Name="PART_TextBox"
+                       Foreground="{TemplateBinding Foreground}"
+                       Background="Transparent"
+                       BorderBrush="Transparent"
+                       BorderThickness="0"
+                       CornerRadius="{TemplateBinding CornerRadius}"
+                       Margin="{TemplateBinding BorderThickness}"
+                       Padding="{TemplateBinding Padding}"
+                       Watermark="{TemplateBinding Watermark}"
+                       UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       Grid.Column="0">
+                <TextBox.Styles>
+                  <Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_BorderElement">
+                    <!-- By default the TextBox has its own focused state, override this to disable it here -->
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="BorderBrush" Value="Transparent"/>
+                    <Setter Property="BorderThickness" Value="0" />
+                  </Style>
+                  <Style Selector="TextBox#PART_TextBox:disabled">
+                    <Style Selector="^ /template/ Border#PART_BorderElement">
+                      <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
+                      <Setter Property="Background" Value="Transparent" />
+                      <Setter Property="BorderBrush" Value="Transparent" />
+                    </Style>
+                    <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
+                      <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
+                    </Style>
+                  </Style>
+                </TextBox.Styles>
+              </TextBox>
+              <Button Name="PART_Button"
+                      Theme="{StaticResource FluentCalendarDatePickerButton}"
+                      Grid.Column="1"
+                      Focusable="False" />
+              <Popup Name="PART_Popup"
+                     PlacementTarget="{TemplateBinding}"
+                     IsLightDismissEnabled="True">
+                <Calendar Name="PART_Calendar"
+                          FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                          IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                          SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
+                          DisplayDate="{TemplateBinding DisplayDate}"
+                          DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                          DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
+              </Popup>
+            </Grid>
+          </Panel>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
 
-                    <Border Name="Highlight"
-                            Margin="-1"
-                            Grid.ColumnSpan="4"
-                            Grid.Row="0"
-                            Grid.RowSpan="4"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource SystemAccentColor}" />
-                    <Border Name="Background"
-                            Margin="0,-1,0,0"
-                            Grid.ColumnSpan="4"
-                            Grid.Row="1"
-                            Grid.RowSpan="3"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumBrush}"
-                            CornerRadius=".5" />
-                    <Rectangle Grid.ColumnSpan="4"
-                               Grid.RowSpan="1"
-                               StrokeThickness="1"
-                               Stroke="{DynamicResource SystemControlForegroundBaseMediumBrush}"
-                               Fill="{DynamicResource SystemAccentColor}">
-                    </Rectangle>
-                    <TextBlock Margin="0,-1,0,0"
-                               VerticalAlignment="Center"
-                               HorizontalAlignment="Center"
-                               Grid.Column="0"
-                               Grid.Row="1"
-                               Grid.ColumnSpan="4"
-                               Grid.RowSpan="3"
-                               FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
-                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}"/>
+    <!-- Pressed State -->
+    <Style Selector="^:pressed /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
+    </Style>
 
-                    <Ellipse HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" StrokeThickness="0" Grid.ColumnSpan="4" Width="3" Height="3"/>
-                  </Grid>
-                </ControlTemplate>
-              </Setter>
-            </Style>
+    <!-- Pointer-over State -->
+    <Style Selector="^:pointerover /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
+    </Style>
 
-            <Style Selector="Button.CalendarDropDown /template/ Border#Highlight">
-              <Setter Property="IsVisible" Value="False"/>
-            </Style>
-            <Style Selector="Button.CalendarDropDown:pressed /template/ Border#Highlight">
-              <Setter Property="IsVisible" Value="True"/>
-            </Style>
+    <!-- Disabled State -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
+      </Style>
 
-            <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
-              <Setter Property="Background" Value="{DynamicResource SystemAccentColorDark2}"/>
-            </Style>
-            
-          </Grid.Styles>
-          
-          <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
-                   BorderThickness="{TemplateBinding BorderThickness}" 
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Grid.Column="0"/>
+      <Style Selector="^ /template/ Button#PART_Button">
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
+      </Style>
+    </Style>
 
-          <Button Name="PART_Button"
-                  Grid.Column="1"
-                  Width="20"
-                  Classes="CalendarDropDown"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="Transparent"
-                  BorderThickness="0"
-                  Margin="2,0,2,0"
-                  Padding="0"
-                  ClipToBounds="False"
-                  Focusable="False"/>
+    <!-- Focused State -->
+    <Style Selector="^:focus-within:not(CalendarDatePicker:focus) /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+    </Style>
 
-          <Popup Name="PART_Popup"
-                 PlacementTarget="{TemplateBinding}"
-                 IsLightDismissEnabled="True">
-            <Calendar Name="PART_Calendar"
-                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                      SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
-                      DisplayDate="{TemplateBinding DisplayDate}"
-                      DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
-          </Popup>
-        </Grid>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  
-  <Style Selector="CalendarDatePicker:error TextBox /template/ Border#PART_BorderElement">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-</Styles>
+    <!-- Error State -->
+    <Style Selector="^:error /template/ Border#Background">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index 9223c0dd71..6a57cfacd0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -1,26 +1,34 @@
-<!--
+<!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CalendarButton/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarDayButton">
-    <Setter Property="ClickMode" Value="Release"/>
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Margin" Value="1"/>
-    <Setter Property="Padding" Value="0,0,0,0"/>
+  <ControlTheme x:Key="{x:Type CalendarDayButton}" TargetType="CalendarDayButton">
+    <Setter Property="ClickMode" Value="Release" />
+    <Setter Property="MinWidth" Value="40" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Margin" Value="1" />
+    <Setter Property="Padding" Value="0,0,0,0" />
     <!--These are actually set on the CalendarView in WinUI-->
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/>
-    <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="FontSize" Value="20"/>
-    <Setter Property="ClipToBounds" Value="False"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}" />
+    <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
+    <Setter Property="BorderThickness" Value="2" />
+    <Setter Property="FontSize" Value="20" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
@@ -29,88 +37,76 @@
                   BorderThickness="0" ClipToBounds="True">
 
             <ContentControl Name="Content"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Content="{TemplateBinding Content}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                  FontSize="{TemplateBinding FontSize}"
-                  Margin="{TemplateBinding Padding}"/>
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Margin="{TemplateBinding Padding}" />
 
           </Border>
 
-          <!-- Drawn Border should render on top of background to preserve the 1px
-                        margin between items-->
+          <!-- Drawn Border should render on top of background to preserve the 1px margin between items-->
           <Border Name="Border"
                   BorderThickness="2"
-                  BorderBrush="{TemplateBinding BorderBrush}"/>
-
-          <!--Removed for now...WinUI doesn't have selection follow focus, and only uses 
-              focus visual w/ keyboard focus
-                <Border Name="FocusVisual" BorderThickness="2"
-                            BorderBrush="{DynamicResource SystemControlHighlightBaseHighBrush}"
-                            IsHitTestVisible="False"
-                            Margin="-2"  CornerRadius="2"/>-->
+                  BorderBrush="{TemplateBinding BorderBrush}" />
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <!--<Style Selector="CalendarDayButton /template/ Border#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>-->
 
-  <Style Selector="CalendarDayButton:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedHoverBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedPressedBorderBrush}"/>
-  </Style>
+    <Style Selector="^:pointerover /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+    </Style>
 
-  <Style Selector="CalendarDayButton:today /template/ Border#Root">
-    <!-- These are probably set in code, but consistent -->
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColor}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarDayButton:today:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark1}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarDayButton:today:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark2}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}"/>
-    <Setter Property="FontWeight" Value="SemiBold"/>
-  </Style>
+    <Style Selector="^:pressed /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}" />
+    </Style>
+
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
+      </Style>
+      <Style Selector="^:pointerover /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedHoverBorderBrush}" />
+      </Style>
+      <Style Selector="^:pressed /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedPressedBorderBrush}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:today">
+      <Style Selector="^ /template/ Border#Root">
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+      </Style>
+      <!-- These are probably set in code, but consistent -->
+      <Style Selector="^:pointerover /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
+      </Style>
+      <Style Selector="^:pressed /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+      </Style>
+      <Style Selector="^ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+      </Style>
+    </Style>
 
-  <!-- WinUI calls this OutOfFocus -->
-  <Style Selector="CalendarDayButton:inactive /template/ Border#Root">
-    <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
-  </Style>
+    <!-- WinUI calls this OutOfFocus -->
+    <Style Selector="^:inactive">
+      <Style Selector="^ /template/ Border#Root">
+        <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
+      </Style>
+      <Style Selector="^ /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
+      </Style>
+    </Style>
 
-  <Style Selector="CalendarDayButton:blackout /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}"/>
-  </Style>
+    <Style Selector="^:blackout /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+    </Style>
 
-  <!--<Style Selector="CalendarDayButton:dayfocused /template/ Border#FocusVisual">
-            <Setter Property="IsVisible" Value="True"/>
-      </Style>-->
-  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:disabled /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index a9c8281cf0..1d9ef6d5a9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -1,98 +1,119 @@
-<!--
+<!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
-
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True"
         x:DataType="CalendarItem">
   <Design.PreviewWith>
     <Border Padding="20">
-      <Calendar />
+      <Calendar DisplayDate="2000-01-01">
+        <Calendar.BlackoutDates>
+          <CalendarDateRange>
+            <x:Arguments>
+              <sys:DateTime>2000-01-01</sys:DateTime>
+              <sys:DateTime>2000-01-05</sys:DateTime>
+            </x:Arguments>
+          </CalendarDateRange>
+        </Calendar.BlackoutDates>
+      </Calendar>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="CalendarItem">
+
+  <ControlTheme x:Key="FluentCalendarButton" TargetType="Button">
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="FontSize" Value="20" />
+    <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!-- HCA was changed here to ensure nav arrows display correctly -->
+        <ContentPresenter Name="Text" Background="{TemplateBinding Background}"
+                          BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          Margin="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#Text">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
+    </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#Text">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="DayTitleTemplate">
       <Template>
         <TextBlock Text="{Binding}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
-                   FontSize="12"/>
+                   FontSize="12" />
       </Template>
     </Setter>
+
     <Setter Property="Template">
       <ControlTemplate>
         <Border BorderThickness="{TemplateBinding BorderThickness}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 CornerRadius="{TemplateBinding CornerRadius}">
-          <Border.Styles>
-            <Style Selector="Button.CalendarHeader">
-              <Setter Property="HorizontalAlignment" Value="Stretch" />
-              <Setter Property="VerticalAlignment" Value="Stretch" />
-              <Setter Property="VerticalContentAlignment" Value="Center" />
-              <Setter Property="FontSize" Value="20" />
-              <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/>
-              <Setter Property="Template">
-                <ControlTemplate>
-                  <!-- HCA was changed here to ensure nav arrows display correctly -->
-                  <ContentPresenter Name="Text" Background="{TemplateBinding Background}"
-                                    BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="{TemplateBinding Padding}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                </ControlTemplate>
-              </Setter>
-            </Style>
-            <Style Selector="Button.CalendarNavigation > Path">
-              <Setter Property="Stroke" Value="{DynamicResource CalendarViewForeground}"/>
-            </Style>
-            <Style Selector="Button.CalendarNavigation:pointerover > Path">
-              <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}"/>
-            </Style>
-            <Style Selector="Button.CalendarNavigation:pressed > Path">
-              <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}"/>
-            </Style>
-            <Style Selector="Button.CalendarHeader:pointerover /template/ ContentPresenter#Text">
-              <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
-              <Setter Property="TextBlock.Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}"/>
-              <!-- Prevent base button template:pointerover from overriding background here -->
-              <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/>
-            </Style>
-            <Style Selector="Button.CalendarHeader:pressed /template/ ContentPresenter#Text">
-              <Setter Property="TextBlock.Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}"/>
-              <!-- Prevent base button template:pointerover from overriding background here -->
-              <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/>
-            </Style>
-            <Style Selector="Button.CalendarHeader:disabled /template/ ContentPresenter">
-              <Setter Property="TextBlock.Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
-            </Style>
-          </Border.Styles>
-          <!--  To keep calendar from resizing when switching DisplayMode
-                In WinUI Min-Width from TemplateSettings
-                basically...MinWidth of DayItem = 40, 40 * 7 = 280 + margins/padding = ~294
-                Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
-                -->
+          <!-- To keep calendar from resizing when switching DisplayMode
+                 In WinUI Min-Width from TemplateSettings
+                 basically...MinWidth of DayItem = 40, 40 * 7 = 280 + margins/padding = ~294
+                 Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
+                 -->
           <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="40,*" MinWidth="294">
             <Grid ColumnDefinitions="5*,*,*">
-              <Button Name="HeaderButton" Classes="CalendarHeader" Foreground="{TemplateBinding Foreground}" Padding="12,0,0,0" HorizontalContentAlignment="Left" />
-              <Button Name="PreviousButton" Grid.Column="1" Classes="CalendarHeader CalendarNavigation" Foreground="{TemplateBinding Foreground}" Padding="1" HorizontalContentAlignment="Left">
+              <Button Name="PART_HeaderButton"
+                      Theme="{StaticResource FluentCalendarButton}"
+                      Foreground="{TemplateBinding Foreground}"
+                      Padding="12,0,0,0"
+                      HorizontalContentAlignment="Left" />
+              <Button Name="PART_PreviousButton"
+                      Grid.Column="1"
+                      Theme="{StaticResource FluentCalendarButton}"
+                      Foreground="{TemplateBinding Foreground}"
+                      Padding="1"
+                      HorizontalContentAlignment="Left">
                 <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                <Path StrokeThickness="1.5" Data="M 0,9 L 9,0 L 18,9"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <Path Stroke="{DynamicResource CalendarViewForeground}"
+                      StrokeThickness="1.5" 
+                      Data="M 0,9 L 9,0 L 18,9" 
+                      HorizontalAlignment="Center" 
+                      VerticalAlignment="Center" />
               </Button>
-              <Button Name="NextButton" Grid.Column="2" Classes="CalendarHeader CalendarNavigation" Foreground="{TemplateBinding Foreground}" Padding="1" HorizontalContentAlignment="Left">
+              <Button Name="PART_NextButton"
+                      Grid.Column="2"
+                      Theme="{StaticResource FluentCalendarButton}"
+                      Foreground="{TemplateBinding Foreground}"
+                      Padding="1"
+                      HorizontalContentAlignment="Left">
                 <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                <Path StrokeThickness="1.5" Data="M 0,0 L 9,9 L 18,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <Path Stroke="{DynamicResource CalendarViewForeground}"
+                      StrokeThickness="1.5" 
+                      Data="M 0,0 L 9,9 L 18,0" 
+                      HorizontalAlignment="Center" 
+                      VerticalAlignment="Center" />
               </Button>
             </Grid>
-            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Grid.Row="1" />
-            <Grid Name="MonthView" Grid.Row="1" IsVisible="False" MinHeight="290" >
+            <!--Border below is used only for MonthView but it can't be moved inside of Grid because CalendarItem expects it to be empty and it will cause side-effects-->
+            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Margin="0,38,0,0" IsVisible="{ReflectionBinding #MonthView.IsVisible}" Grid.Row="1" />
+            <Grid Name="PART_MonthView" Grid.Row="1" IsVisible="False" MinHeight="290">
               <Grid.RowDefinitions>
                 <!--This should always be the week day names??-->
                 <RowDefinition Height="38" />
@@ -113,8 +134,11 @@
                 <ColumnDefinition Width="Auto" />
               </Grid.ColumnDefinitions>
             </Grid>
-            <Grid Name="YearView" MinHeight="290"
-                    Grid.Row="1" IsVisible="False">
+            <Grid Name="PART_YearView"
+                  Background="{TemplateBinding BorderBrush}"
+                  MinHeight="290"
+                  Grid.Row="1"
+                  IsVisible="False">
               <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
@@ -127,17 +151,15 @@
                 <ColumnDefinition Width="*" />
               </Grid.ColumnDefinitions>
             </Grid>
-
           </Grid>
-
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- BackgroundLayer shouldn't show in the week day names row-->
-  <Style Selector="Calendar[DisplayMode=Month] CalendarItem /template/ Border#BackgroundLayer">
-    <Setter Property="Margin" Value="0,38,0,0"/>
-  </Style>
-  
-</Styles>
+    <Style Selector="^ /template/ Button:pointerover > Path">
+      <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
+    </Style>
+    <Style Selector="^ /template/ Button:pressed > Path">
+      <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
index 82cdc4135d..71ae012289 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -1,72 +1,97 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CaptionButtons">    
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CaptionButtons Height="30"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="FluentCaptionButton" TargetType="Button">
+    <Setter Property="Background" Value="#ffe5e5e5" />
+    <!-- Reusing BorderBrush to define pressed background color, as it's not used otherwise -->
+    <Setter Property="BorderBrush" Value="#ffcacaca" />
+    <Setter Property="Foreground" Value="Black"/>
+    <Setter Property="Width" Value="45"/>
+    <Setter Property="VerticalAlignment" Value="Stretch"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="Transparent"
+                          Content="{TemplateBinding Content}"/>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding Background}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding BorderBrush}" />
+    </Style>
+  </ControlTheme>
+  
+  <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextBlock.FontSize="10" Orientation="Horizontal">
-          <StackPanel.Styles>
-            <Style Selector="Panel">
-              <Setter Property="Width" Value="45" />
-              <Setter Property="Background" Value="Transparent" />
-            </Style>
-            <Style Selector="Panel:pointerover">
-              <Setter Property="Background" Value="#7F7f7f7f" />
-            </Style>
-            <Style Selector="Panel#PART_CloseButton:pointerover">
-              <Setter Property="Background" Value="#7FFF0000" />
-            </Style>
-            <Style Selector="Viewbox">
-              <Setter Property="Width" Value="11" />
-              <Setter Property="Margin" Value="2" />
-            </Style>
-          </StackPanel.Styles>
-          <Panel x:Name="PART_FullScreenButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" />
+        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
+          <Button x:Name="PART_FullScreenButton"
+                  Theme="{StaticResource FluentCaptionButton}"
+                  IsVisible="False">
+            <Viewbox Width="11" Margin="2">
+              <Path Name="FullScreenButtonPath"
+                    Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
             </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_MinimiseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 1229v-205h-2048v205h2048z" />
+          </Button>
+          <Button x:Name="PART_MinimiseButton"
+                  Theme="{StaticResource FluentCaptionButton}">
+            <Viewbox Width="11" Margin="2">
+              <Path Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M2048 1229v-205h-2048v205h2048z" />
             </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_RestoreButton">
-            <Viewbox>
+          </Button>
+          <Button x:Name="PART_RestoreButton"
+                  Theme="{StaticResource FluentCaptionButton}">
+            <Viewbox Width="11" Margin="2">
               <Viewbox.RenderTransform>
                 <RotateTransform Angle="-90" />
               </Viewbox.RenderTransform>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}"/>
+              <Path Name="RestoreButtonPath"
+                    Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"/>
             </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_CloseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
+          </Button>
+          <Button x:Name="PART_CloseButton"
+                  Background="#ffe81123"
+                  BorderBrush="#fff1707a"
+                  Theme="{StaticResource FluentCaptionButton}">
+            <Viewbox Width="11" Margin="2">
+              <Path Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
             </Viewbox>
-          </Panel>
+          </Button>
         </StackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z" />
-  </Style>
-  <Style Selector="CaptionButtons:maximized Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton Path">
-    <Setter Property="Data" Value="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_FullScreenButton Path">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_RestoreButton, CaptionButtons:fullscreen Panel#PART_MinimiseButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
- </Styles>
+    <Style Selector="^:maximized /template/ Path#RestoreButtonPath">
+      <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Path#FullScreenButtonPath">
+      <Setter Property="IsVisible" Value="True" />
+      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Button#PART_MinimiseButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
index baba0649aa..2cac701e1b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
@@ -1,17 +1,20 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Carousel">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
-                           Items="{TemplateBinding Items}"
-                           ItemsPanel="{TemplateBinding ItemsPanel}"
-                           Margin="{TemplateBinding Padding}"
-                           SelectedIndex="{TemplateBinding SelectedIndex}"
-                           PageTransition="{TemplateBinding PageTransition}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
+                             Items="{TemplateBinding Items}"
+                             ItemsPanel="{TemplateBinding ItemsPanel}"
+                             Margin="{TemplateBinding Padding}"
+                             SelectedIndex="{TemplateBinding SelectedIndex}"
+                             PageTransition="{TemplateBinding PageTransition}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index ef28593711..9abcf5d32b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -1,20 +1,28 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
-      <CheckBox IsThreeState="True" IsChecked="True" Content="Content" Foreground="Gold" />
+      <StackPanel Spacing="20">
+        <CheckBox>Unchecked</CheckBox>
+        <CheckBox IsChecked="True">Checked</CheckBox>
+        <CheckBox IsThreeState="True" IsChecked="{x:Null}">Indeterminate</CheckBox>
+        <CheckBox Width="120">Checkbox should wrap its text</CheckBox>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="CheckBox">
+
+  <ControlTheme x:Key="{x:Type CheckBox}" TargetType="CheckBox">
     <Setter Property="Padding" Value="8,0,0,0" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />    
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="32" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-7,-3,-7,-3" />-->
+    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
+    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
@@ -27,267 +35,264 @@
 
           <Grid VerticalAlignment="Top" Height="32">
             <Border x:Name="NormalRectangle"
-                BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                UseLayoutRounding="False"
-                Height="20"
-                Width="20" />
+                    BorderBrush="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
+                    Background="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
+                    BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    UseLayoutRounding="False"
+                    Height="20"
+                    Width="20" />
 
             <Viewbox UseLayoutRounding="False">
               <Panel>
                 <Panel Height="16" Width="16" />
-                <Path x:Name="CheckGlyph" Stretch="Uniform" VerticalAlignment="Center" />
+                <Path x:Name="CheckGlyph"
+                      Opacity="0"
+                      Fill="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}"
+                      Stretch="Uniform"
+                      VerticalAlignment="Center" />
               </Panel>
             </Viewbox>
           </Grid>
           <ContentPresenter x:Name="ContentPresenter"
-                         ContentTemplate="{TemplateBinding ContentTemplate}"
-                         Content="{TemplateBinding Content}"
-                         Margin="{TemplateBinding Padding}"
-                         RecognizesAccessKey="True"
-                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                         Grid.Column="1" />
-          <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Margin="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          TextWrapping="Wrap"
+                          Grid.Column="1" />
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <!-- Unchecked Normal State -->
-  <Style Selector="CheckBox">
-    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
-  </Style>
-
-  <Style Selector="CheckBox">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
-  </Style>
-
-  <Style Selector="CheckBox /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
-  </Style>
-
-  <Style Selector="CheckBox /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <!-- Unchecked PointerOver State -->
-  <Style Selector="CheckBox:pointerover /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:pointerover /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:pointerover /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:pointerover /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
-  </Style>
-
-  <!-- Unchecked Pressed State -->
-  <Style Selector="CheckBox:pressed /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:pressed /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:pressed /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:pressed /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
-  </Style>
-
-  <!-- Unchecked Disabled state -->
-  <Style Selector="CheckBox:disabled /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:disabled /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:disabled /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:disabled /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
-  </Style>
-
-
-  <!-- Checked Normal State -->
-  <Style Selector="CheckBox:checked">
-    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
-    <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
-    <Setter Property="Width" Value="9" />
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <!-- Checked PointerOver State -->
-  <Style Selector="CheckBox:checked:pointerover /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:pointerover /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:pointerover /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:pointerover /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
-  </Style>
-
-  <!-- Checked Pressed State -->
-  <Style Selector="CheckBox:checked:pressed /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:pressed /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:pressed /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:pressed /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Checked Disabled State -->
-  <Style Selector="CheckBox:checked:disabled /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:disabled /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:disabled /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:checked:disabled /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
-  </Style>
-
-
-  <!-- Indeterminate Normal State -->
-  <Style Selector="CheckBox:indeterminate">
-    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
-    <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
-    <Setter Property="Width" Value="7" />
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <!-- Indeterminate PointerOver State -->
-  <Style Selector="CheckBox:indeterminate:pointerover /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:pointerover /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:pointerover /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:pointerover /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
-  </Style>
-
-  <!-- Indeterminate Pressed State -->
-  <Style Selector="CheckBox:indeterminate:pressed /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:pressed /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:pressed /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:pressed /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
-  </Style>
-
-  <!-- Indeterminate Disabled State -->
-  <Style Selector="CheckBox:indeterminate:disabled /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:disabled /template/ Border#PART_Border">
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:disabled /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
-  </Style>
-
-  <Style Selector="CheckBox:indeterminate:disabled /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
-  </Style>
-</Styles>
+    <!-- Unchecked PointerOver State -->
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+      </Style>
+    </Style>
+
+    <!-- Unchecked Pressed State -->
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+      </Style>
+    </Style>
+
+    <!-- Unchecked Disabled state -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:checked">
+      <!-- Checked Normal State -->
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
+        <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
+        <Setter Property="Width" Value="9" />
+        <Setter Property="Opacity" Value="1" />
+        <Setter Property="FlowDirection" Value="LeftToRight" />
+      </Style>
+
+      <!-- Checked PointerOver State -->
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+        </Style>
+      </Style>
+
+      <!-- Checked Pressed State -->
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
+        </Style>
+      </Style>
+
+      <!-- Checked Disabled State -->
+      <Style Selector="^:disabled">
+        <Style Selector="^ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
+        </Style>
+      </Style>
+    </Style>
+
+    <Style Selector="^:indeterminate">
+      <!-- Indeterminate Normal State -->
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+        <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
+        <Setter Property="Width" Value="7" />
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+
+      <!-- Indeterminate PointerOver State -->
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
+        </Style>
+      </Style>
+
+      <!-- Indeterminate Pressed State -->
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
+        </Style>
+      </Style>
+
+      <!-- Indeterminate Disabled State -->
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
+        </Style>
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 857d70084c..4aa0ddc23a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -1,5 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
@@ -14,19 +15,28 @@
           <ComboBoxItem>Item 1</ComboBoxItem>
           <ComboBoxItem>Item 2</ComboBoxItem>
         </ComboBox>
+        <ComboBox PlaceholderText="Error">
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </ComboBox>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
-    <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
-    <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
-    <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
-    <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
-  </Styles.Resources>
-  <Style Selector="ComboBox">
+  <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
+  <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
+  <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
+
+  <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
+  <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
+  <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
+
+  <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
     <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
     <Setter Property="FocusAdorner" Value="{x:Null}" />
     <Setter Property="MaxDropDownHeight" Value="504" />
@@ -37,27 +47,18 @@
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />    
+    <Setter Property="VerticalAlignment" Value="Top" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-          <Grid RowDefinitions="Auto, *, Auto"
-                ColumnDefinitions="*,32">
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0"
-                              Grid.ColumnSpan="2"
-                              IsVisible="False"
-                              TextBlock.FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
-                              Margin="{DynamicResource ComboBoxTopHeaderMargin}"
-                              VerticalAlignment="Top" />
+          <Grid ColumnDefinitions="*,32">
             <Border x:Name="Background"
-                    Grid.Row="1"
                     Grid.Column="0"
                     Grid.ColumnSpan="2"
                     Background="{TemplateBinding Background}"
@@ -65,17 +66,15 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
-
             <Border x:Name="HighlightBackground"
-                    Grid.Row="1"
                     Grid.Column="0"
                     Grid.ColumnSpan="2"
                     Background="{DynamicResource ComboBoxBackgroundUnfocused}"
                     BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsVisible="False"/>
             <TextBlock x:Name="PlaceholderTextBlock"
-                       Grid.Row="1"
                        Grid.Column="0"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -86,14 +85,12 @@
             <ContentControl x:Name="ContentPresenter"
                             Content="{TemplateBinding SelectionBoxItem}"
                             ContentTemplate="{TemplateBinding ItemTemplate}"
-                            Grid.Row="1"
                             Grid.Column="0"
                             Margin="{TemplateBinding Padding}"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 
             <Border x:Name="DropDownOverlay"
-                    Grid.Row="1"
                     Grid.Column="1"
                     Background="Transparent"
                     Margin="0,1,1,1"
@@ -101,35 +98,30 @@
                     IsVisible="False"
                     HorizontalAlignment="Right" />
 
-            <Viewbox UseLayoutRounding="False"
-                     MinHeight="{DynamicResource ComboBoxMinHeight}"
-                     Grid.Row="1"
-                     Grid.Column="1"
-                     IsHitTestVisible="False"
-                     Margin="0,0,10,0"
-                     Height="12"
-                     Width="12"
-                     HorizontalAlignment="Right"
-                     VerticalAlignment="Center">
-              <Panel>
-                <Panel Height="12"
-                       Width="12" />
-                <Path x:Name="DropDownGlyph"
-                      VerticalAlignment="Center" />
-              </Panel>
-            </Viewbox>
+            <PathIcon x:Name="DropDownGlyph"
+                      Grid.Column="1"
+                      UseLayoutRounding="False"
+                      IsHitTestVisible="False"
+                      Height="12"
+                      Width="12"
+                      Margin="0,0,10,0"
+                      HorizontalAlignment="Right"
+                      VerticalAlignment="Center"
+                      Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"/>
+
             <Popup Name="PART_Popup"
                    WindowManagerAddShadowHint="False"
                    IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
                    MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
                    PlacementTarget="Background"
-                   IsLightDismissEnabled="True">
+                   IsLightDismissEnabled="True"
+                   InheritsTransform="True">
               <Border x:Name="PopupBorder"
                       Background="{DynamicResource ComboBoxDropDownBackground}"
                       BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
                       BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-                      Margin="0,-1,0,-1"
                       Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
                       HorizontalAlignment="Stretch"
                       CornerRadius="{DynamicResource OverlayCornerRadius}">
@@ -148,90 +140,70 @@
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!--  Normal State  -->
-  <Style Selector="ComboBox /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-  </Style>
-
-  <Style Selector="ComboBox /template/ Border#HighlightBackground">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="ComboBox /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-    <Setter Property="Stretch" Value="Uniform" />
-  </Style>
-
-  <!--  PointerOver State  -->
-  <Style Selector="ComboBox:pointerover /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
-  </Style>
-
-  <!--  Pressed State  -->
-  <Style Selector="ComboBox:pressed /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
-  </Style>
-
-  <!--  Disabled State  -->
-  <Style Selector="ComboBox:disabled /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ ContentControl#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
-  </Style>
-
-  <!--  Focused State  -->
-  <Style Selector="ComboBox:focus-visible /template/ Border#HighlightBackground">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
-  </Style>
-
-  <Style Selector="ComboBox:focus-visible /template/ ContentControl#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
-  </Style>
-
-  <Style Selector="ComboBox:focus-visible /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
-  </Style>
-
-  <Style Selector="ComboBox:focus-visible /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
-  </Style>
-
-  <!--  Focus Pressed State  -->
-  <Style Selector="ComboBox:focused:pressed /template/ ContentControl#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
-  </Style>
-
-  <Style Selector="ComboBox:focused:pressed /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
-  </Style>
 
-  <Style Selector="ComboBox:focused:pressed /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
-  </Style>
-  
-  <!-- Error State -->
-  <Style Selector="ComboBox:error /template/ Border#Background">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-</Styles>
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
+    </Style>
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
+    </Style>
+
+    <!-- Error State -->
+    <Style Selector="^:error /template/ Border#Background">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+    </Style>
+
+    <!--  Focus Pressed State  -->
+    <Style Selector="^:focused:pressed">
+      <Style Selector="^ /template/ ContentControl#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
+      </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
+      </Style>
+    </Style>
+
+    <!--  Focused State  -->
+    <Style Selector="^:focus-visible">
+      <Style Selector="^ /template/ Border#HighlightBackground">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
+      </Style>
+      <Style Selector="^ /template/ ContentControl#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+      </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
+      </Style>
+    </Style>
+
+    <!--  Disabled State  -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ ContentControl#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
index a958d785fa..581cbaf80a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
@@ -1,31 +1,28 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
-      <Border Background="{DynamicResource ComboBoxDropDownBackground}"
-              BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
-              BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-              Margin="0,-1,0,-1"
-              Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
-              CornerRadius="{DynamicResource OverlayCornerRadius}">
+      <Border Background="{DynamicResource ComboBoxDropDownBackground}" BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}" Margin="0,-1,0,-1" Padding="{DynamicResource ComboBoxDropdownBorderPadding}" CornerRadius="{DynamicResource OverlayCornerRadius}">
         <StackPanel HorizontalAlignment="Stretch">
           <ComboBoxItem>Item 1</ComboBoxItem>
           <ComboBoxItem>Item 2 long</ComboBoxItem>
           <ComboBoxItem IsSelected="True">Item 3</ComboBoxItem>
           <ComboBoxItem IsEnabled="False">Item 4</ComboBoxItem>
+          <ComboBoxItem IsSelected="True" IsEnabled="False">Item 5</ComboBoxItem>
         </StackPanel>
       </Border>
     </Border>
   </Design.PreviewWith>
 
-  <Style Selector="ComboBoxItem">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
+  <ControlTheme x:Key="{x:Type ComboBoxItem}" TargetType="ComboBoxItem">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
     <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
     <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
-                          TextBlock.Foreground="{TemplateBinding Foreground}"
+                          Foreground="{TemplateBinding Foreground}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
@@ -37,54 +34,53 @@
                           Padding="{TemplateBinding Padding}" />
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <!--  PointerOver state  -->
-  <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
-  </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
+    </Style>
 
-  <!--  Disabled state  -->
-  <Style Selector="ComboBoxItem:disabled /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
-  </Style>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
+    </Style>
 
-  <!--  Pressed state  -->
-  <Style Selector="ComboBoxItem:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
-  </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
+    </Style>
 
-  <!--  Selected state  -->
-  <Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
-  </Style>
-
-  <!--  Selected Disabled state  -->
-  <Style Selector="ComboBoxItem:selected:disabled /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
-  </Style>
-
-  <!--  Selected PointerOver state  -->
-  <Style Selector="ComboBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
-  </Style>
-
-  <!--  Selected Pressed state  -->
-  <Style Selector="ComboBoxItem:selected:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
-  </Style>
-</Styles>
+    <!--  Selected state  -->
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
+      </Style>
+      <!--  Selected Disabled state  -->
+      <Style Selector="^:disabled /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
+      </Style>
+      <!--  Selected PointerOver state  -->
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
+      </Style>
+      <!--  Selected Pressed state  -->
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Common.xaml b/src/Avalonia.Themes.Fluent/Controls/Common.xaml
deleted file mode 100644
index e09e39d7cb..0000000000
--- a/src/Avalonia.Themes.Fluent/Controls/Common.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TextBlock.CaptionTextBlockStyle">
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="FontWeight" Value="Normal" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
index d32bc399b6..4caf156366 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
@@ -1,16 +1,19 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ContentControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
index df800b4a06..fdd79ed736 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -1,6 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="ContextMenu">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Background="{DynamicResource SystemAccentColor}"
             Margin="16"
@@ -10,8 +9,7 @@
       <Border.ContextMenu>
         <ContextMenu>
           <MenuItem Header="Standard _Menu Item" />
-          <MenuItem Header="Disabled"
-                    IsEnabled="False" />
+          <MenuItem Header="Disabled" IsEnabled="False" />
           <Separator />
           <MenuItem Header="Menu with _Submenu">
             <MenuItem Header="Submenu _1" />
@@ -31,42 +29,42 @@
     </Border>
   </Design.PreviewWith>
 
-  <Style.Resources>
-    <!-- Added missing resource -->
-    <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
-  </Style.Resources>
+  <!--  Added missing resource  -->
+  <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
 
-  <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
-  <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-  <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
-  <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-  <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
-  <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
-  <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
-  <Setter Property="HorizontalAlignment" Value="Stretch" />
-  <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-  <Setter Property="TextBlock.FontWeight" Value="Normal" />
-  <Setter Property="WindowManagerAddShadowHint" Value="False" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}"
-              MaxWidth="{TemplateBinding MaxWidth}"
-              MinHeight="{TemplateBinding MinHeight}"
-              HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Classes="menuscroller">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          ItemTemplate="{TemplateBinding ItemTemplate}"
-                          Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                          KeyboardNavigation.TabNavigation="Continue"
-                          Grid.IsSharedSizeScope="True" />
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+  <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+    <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="TextBlock.FontWeight" Value="Normal" />
+    <Setter Property="WindowManagerAddShadowHint" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{TemplateBinding Padding}"
+                MaxWidth="{TemplateBinding MaxWidth}"
+                MinHeight="{TemplateBinding MinHeight}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                            KeyboardNavigation.TabNavigation="Continue"
+                            Grid.IsSharedSizeScope="True" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index 12e148d2f9..a4055519b6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -1,8 +1,8 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="using:System"
-        x:CompileBindings="True"
-        x:DataType="DataValidationErrors">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System"
+                    x:CompileBindings="True"
+                    x:DataType="DataValidationErrors">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
@@ -14,8 +14,7 @@
         <TextBox Text="Sample">
           <TextBox.Styles>
             <Style Selector="DataValidationErrors">
-              <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-              <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+              <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
             </Style>
           </TextBox.Styles>
           <DataValidationErrors.Error>
@@ -26,10 +25,33 @@
     </Border>
   </Design.PreviewWith>
 
-  <Style Selector="DataValidationErrors">
-    <Style.Resources>
-      <DataTemplate x:Key="InlineDataValidationErrorTemplate">
-        <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" TextBlock.Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
+  <ControlTheme x:Key="{x:Type DataValidationErrors}"
+                TargetType="DataValidationErrors">
+    <Setter Property="Template">
+      <ControlTemplate TargetType="DataValidationErrors">
+        <DockPanel LastChildFill="True">
+          <ContentControl x:Name="InlineDataValidationContentControl"
+                          Margin="0,4,0,0"
+                          Content="{Binding (DataValidationErrors.Errors)}"
+                          ContentTemplate="{TemplateBinding ErrorTemplate}"
+                          DataContext="{TemplateBinding Owner}"
+                          DockPanel.Dock="Bottom"
+                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="ErrorTemplate">
+      <DataTemplate>
+        <ItemsControl x:DataType="DataValidationErrors"
+                      Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
+                      Items="{Binding}">
           <ItemsControl.Styles>
             <Style Selector="TextBlock">
               <Setter Property="TextWrapping" Value="Wrap" />
@@ -37,27 +59,34 @@
           </ItemsControl.Styles>
         </ItemsControl>
       </DataTemplate>
-      <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="TooltipDataValidationErrors"
+                TargetType="DataValidationErrors">
+    <Setter Property="Template">
+      <ControlTemplate TargetType="DataValidationErrors">
         <DockPanel LastChildFill="True">
-          <ContentControl x:Name="InlineDataValidationContentControl"
-                          Margin="0,4,0,0"
-                          Content="{Binding (DataValidationErrors.Errors)}"
+          <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
                           ContentTemplate="{TemplateBinding ErrorTemplate}"
                           DataContext="{TemplateBinding Owner}"
-                          DockPanel.Dock="Bottom"
+                          DockPanel.Dock="Right"
                           IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
           <ContentPresenter Name="PART_ContentPresenter"
                             Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
         </DockPanel>
       </ControlTemplate>
-
-      <DataTemplate x:DataType="DataValidationErrors" x:Key="TooltipDataValidationErrorTemplate">
-        <Panel Name="PART_InlineErrorTemplatePanel" Background="Transparent">
+    </Setter>
+    <Setter Property="ErrorTemplate">
+      <DataTemplate>
+        <Panel Name="PART_InlineErrorTemplatePanel"
+               Background="Transparent">
           <Panel.Styles>
             <Style Selector="Panel#PART_InlineErrorTemplatePanel">
               <Setter Property="Margin" Value="8,0" />
@@ -70,7 +99,7 @@
             </Style>
           </Panel.Styles>
           <ToolTip.Tip>
-            <ItemsControl Items="{Binding}" />
+            <ItemsControl Items="{ReflectionBinding}" />
           </ToolTip.Tip>
           <Path Width="14"
                 Height="14"
@@ -79,26 +108,6 @@
                 StrokeThickness="2" />
         </Panel>
       </DataTemplate>
-      <ControlTemplate x:Key="TooltipDataValidationContentTemplate" TargetType="DataValidationErrors">
-        <DockPanel LastChildFill="True">
-          <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
-                          ContentTemplate="{TemplateBinding ErrorTemplate}"
-                          DataContext="{TemplateBinding Owner}"
-                          DockPanel.Dock="Right"
-                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
-        </DockPanel>
-      </ControlTemplate>
-    </Style.Resources>
-
-    <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
-    <Setter Property="ErrorTemplate" Value="{StaticResource InlineDataValidationErrorTemplate}" />
-  </Style>
-</Styles>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 7ef96ca17b..1585dada90 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -1,129 +1,77 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True">
   <Design.PreviewWith>
-    <Border Padding="20">
-      <DatePicker CornerRadius="10" />
+    <Border Padding="20" Height="500">
+      <StackPanel Spacing="20" VerticalAlignment="Center">
+        <DatePicker />
+        <DatePicker CornerRadius="10" />
+        <DatePicker IsEnabled="False" />
+        <DatePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </DatePicker>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
-  
-  <Styles.Resources>
-    <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
-    <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
-    <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
-  </Styles.Resources>
-
-  <!-- Styles for the items displayed in the selectors -->
-  <Style Selector="ListBoxItem.DateTimePickerItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected">
-    <Setter Property="IsHitTestVisible" Value="False"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ Rectangle#PressedBackground">
-    <Setter Property="Fill" Value="Transparent"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MonthItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-  </Style>
 
+  <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
+  <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
+  <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
 
-  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  <ControlTheme x:Key="FluentDatePickerFlyoutButton" TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
       <ControlTemplate>
-        <!-- 
-                The background is doubled here for the loopingselector up/down repeat buttons 
-                that appear opaque. Not sure how MS does it though I suspect this is it
-                but source isn't MIT yet, so this is my solution -->
-        <Border Background="{TemplateBinding Background}">
-          <ContentPresenter x:Name="ContentPresenter"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
-                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
-                  Content="{TemplateBinding Content}"
-                  TextBlock.Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Padding="{TemplateBinding Padding}"
-                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                  CornerRadius="{TemplateBinding CornerRadius}"/>
-        </Border>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          Foreground="{TemplateBinding Foreground}"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          CornerRadius="{TemplateBinding CornerRadius}"/>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
-  </Style>
-
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
-  </Style>
-
-
-  <Style Selector="RepeatButton.UpButton">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="RepeatButton.DownButton">
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
+    
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
+    
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
+    </Style>
 
-  <Style Selector="DatePicker">    
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
+      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
+    </Style>
+  </ControlTheme>
+  
+  <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
     <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
@@ -135,16 +83,9 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              Margin="{DynamicResource DatePickerTopHeaderMargin}"
-                              MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Top"/>
-
-            <Button Name="FlyoutButton" Grid.Row="1"
+          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}">
+            <Button Name="PART_FlyoutButton"
+                    Theme="{StaticResource FluentDatePickerFlyoutButton}"
                     Foreground="{TemplateBinding Foreground}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -155,44 +96,29 @@
                     MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
                     TemplatedControl.IsTemplateFocusTarget="True">
-              <Button.Template>
-                <ControlTemplate>
-                  <ContentPresenter Name="ContentPresenter"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    Background="{TemplateBinding Background}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    Content="{TemplateBinding Content}"
-                                    TextBlock.Foreground="{TemplateBinding Foreground}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    CornerRadius="{TemplateBinding CornerRadius}"/>
-                </ControlTemplate>
-              </Button.Template>
-              <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
-                <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
+              <Grid Name="PART_ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
+                <TextBlock Name="PART_DayTextBlock" Text="day" HorizontalAlignment="Center"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontWeight="{TemplateBinding FontWeight}"
                            FontSize="{TemplateBinding FontSize}"/>
-                <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
+                <TextBlock Name="PART_MonthTextBlock" Text="month" TextAlignment="Left"
                            Padding="{DynamicResource DatePickerHostMonthPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontWeight="{TemplateBinding FontWeight}"
                            FontSize="{TemplateBinding FontSize}"/>
-                <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
+                <TextBlock Name="PART_YearTextBlock" Text="year" HorizontalAlignment="Center"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontWeight="{TemplateBinding FontWeight}"
                            FontSize="{TemplateBinding FontSize}"/>
-                <Rectangle x:Name="FirstSpacer"
+                <Rectangle x:Name="PART_FirstSpacer"
                       Fill="{DynamicResource DatePickerSpacerFill}"
                       HorizontalAlignment="Center"
                       Width="1"
                       Grid.Column="1" />
-                <Rectangle x:Name="SecondSpacer"
+                <Rectangle x:Name="PART_SecondSpacer"
                       Fill="{DynamicResource DatePickerSpacerFill}"
                       HorizontalAlignment="Center"
                       Width="1"
@@ -200,57 +126,36 @@
               </Grid>
             </Button>
 
-            <Popup Name="Popup" WindowManagerAddShadowHint="False"
+            <Popup Name="PART_Popup" WindowManagerAddShadowHint="False"
                    IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
                    PlacementMode="Bottom">
-              <DatePickerPresenter Name="PickerPresenter" />
+              <DatePickerPresenter Name="PART_PickerPresenter" />
             </Popup>
 
           </Grid>
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="DatePicker /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DatePickerHeaderForeground}"/>
-  </Style>
-  <Style Selector="DatePicker:disabled /template/ Rectangle">
-    <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
-  </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
-  </Style>
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
+    </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pressed /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
-  </Style>
+    <!-- Changes foreground for watermark text when SelectedDate is null-->
+    <Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
+    </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:disabled /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
-  </Style>
-
-  <!-- Changes foreground for watermark text when SelectedDate is null-->
-  <Style Selector="DatePicker:hasnodate /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
-  </Style>
-  
-  <Style Selector="DatePicker:error /template/ Button#FlyoutButton /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-  
+    <Style Selector="^:error /template/ Button#PART_FlyoutButton">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+    </Style>
+  </ControlTheme>
 
   <!--WinUI: DatePickerFlyoutPresenter-->
-  <Style Selector="DatePickerPresenter">
+  <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
     <Setter Property="Width" Value="296" />
     <Setter Property="MinWidth" Value="296" />
-    <Setter Property="MaxHeight" Value="398" />    
+    <Setter Property="MaxHeight" Value="398" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
@@ -265,90 +170,103 @@
                 Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
                 MaxHeight="398" CornerRadius="{TemplateBinding CornerRadius}">
           <Grid Name="ContentRoot" RowDefinitions="*,Auto">
-            <Grid Name="PickerContainer">
+            <Grid Name="PART_PickerContainer">
+              <Grid.Styles>
+                <Style Selector="DateTimePickerPanel > ListBoxItem">
+                  <Setter Property="Theme" Value="{StaticResource FluentDateTimePickerItem}" />
+                </Style>
+              </Grid.Styles>
               <!--Column Definitions set in code, ignore here-->
-              <Panel Name="MonthHost">
+              <Panel Name="PART_MonthHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="MonthSelector"
-                                      PanelType="Month"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
+                  <DateTimePickerPanel Name="PART_MonthSelector"
+                                       PanelType="Month"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       ShouldLoop="True" />
                 </ScrollViewer>
-                <RepeatButton Name="MonthUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="MonthDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
+                <RepeatButton Name="PART_MonthUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PART_MonthDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
               </Panel>
-              <Panel Name="DayHost">
+              <Panel Name="PART_DayHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="DaySelector"
-                                      PanelType="Day"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
+                  <DateTimePickerPanel Name="PART_DaySelector"
+                                       PanelType="Day"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       ShouldLoop="True" />
                 </ScrollViewer>
-                <RepeatButton Name="DayUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="DayDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
+                <RepeatButton Name="PART_DayUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PART_DayDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
               </Panel>
-              <Panel Name="YearHost">
+              <Panel Name="PART_YearHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="YearSelector"
-                                      PanelType="Year"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="False" />
+                  <DateTimePickerPanel Name="PART_YearSelector"
+                                       PanelType="Year"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       ShouldLoop="False" />
                 </ScrollViewer>
-                <RepeatButton Name="YearUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="YearDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
+                <RepeatButton Name="PART_YearUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PART_YearDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
               </Panel>
               <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
                          Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
                          Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
                          Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
-              <Rectangle Name="FirstSpacer"
+              <Rectangle Name="PART_FirstSpacer"
                          Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
                          HorizontalAlignment="Center"
                          Width="{DynamicResource DatePickerSpacerThemeWidth}"
                          Grid.Column="1" />
-              <Rectangle Name="SecondSpacer"
+              <Rectangle Name="PART_SecondSpacer"
                          Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
                          HorizontalAlignment="Center"
                          Width="{DynamicResource DatePickerSpacerThemeWidth}"
                          Grid.Column="3" />
             </Grid>
-            <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
+
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" 
+                         VerticalAlignment="Top"
                          Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
                          Grid.ColumnSpan="2"/>
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+              <Button Name="PART_AcceptButton"
+                      Grid.Column="0"
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75"
+                      Data="M0.5,8.5 5,13.5 15.5,3" />
               </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+              <Button Name="PART_DismissButton"
+                      Grid.Column="1"
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch" 
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}" 
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" 
+                      Data="M2,2 14,14 M2,14 14 2" />
               </Button>
             </Grid>
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="DatePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+  </ControlTheme>
 
-  <Style Selector="DatePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
new file mode 100644
index 0000000000..7500ac7bca
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
@@ -0,0 +1,118 @@
+<!--
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:sys="clr-namespace:System;assembly=netstandard"
+        x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Padding="20" Width="200">
+      <StackPanel Spacing="20">
+        <ListBoxItem Theme="{DynamicResource FluentDateTimePickerItem}">Standard Item</ListBoxItem>
+        <ListBoxItem Theme="{DynamicResource FluentDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerButton}">Button</RepeatButton>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerUpButton}" IsVisible="True"/>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerDownButton}" IsVisible="True"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <!-- Theme for the items displayed in the selectors -->
+  <ControlTheme x:Key="FluentDateTimePickerItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+
+    <Style Selector="^:selected">
+      <Setter Property="IsHitTestVisible" Value="False"/>
+      <Style Selector="^/template/ Rectangle#PressedBackground">
+        <Setter Property="Fill" Value="Transparent"/>
+      </Style>
+      <Style Selector="^/template/ ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+      </Style>
+    </Style>
+    <Style Selector="^.MonthItem">
+      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+    </Style>
+  </ControlTheme>
+
+  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
+  <ControlTheme x:Key="FluentDateTimePickerButton" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!-- 
+                The background is doubled here for the loopingselector up/down repeat buttons 
+                that appear opaque. Not sure how MS does it though I suspect this is it
+                but source isn't MIT yet, so this is my solution -->
+        <Border Background="{TemplateBinding Background}">
+          <ContentPresenter x:Name="ContentPresenter"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
+                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
+                  Content="{TemplateBinding Content}"
+                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Padding="{TemplateBinding Padding}"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  CornerRadius="{TemplateBinding CornerRadius}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentDateTimePickerUpButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+    <Setter Property="VerticalAlignment" Value="Top"/>
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="IsVisible" Value="False"/>
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentDateTimePickerDownButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+    <Setter Property="VerticalAlignment" Value="Bottom"/>
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="IsVisible" Value="False"/>
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
new file mode 100644
index 0000000000..96fd575f4f
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -0,0 +1,97 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <DropDownButton Content="Click Me!" />
+          <DropDownButton Content="Disabled" IsEnabled="False" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
+    <x:Double x:Key="DropDownButtonMinHeight">32</x:Double>
+    
+    <ControlTheme x:Key="{x:Type DropDownButton}" TargetType="DropDownButton">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+      <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+      <Setter Property="MinHeight" Value="{DynamicResource DropDownButtonMinHeight}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate>
+            <Border x:Name="RootBorder" 
+                    Background="{TemplateBinding Background}" 
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}" 
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True">
+              <Grid x:Name="InnerGrid">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                
+                <ContentPresenter x:Name="PART_ContentPresenter" 
+                                  Grid.Column="0" 
+                                  Content="{TemplateBinding Content}" 
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Padding="{TemplateBinding Padding}" 
+                                  RecognizesAccessKey="True" 
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                
+                <PathIcon x:Name="DropDownGlyph"
+                          Grid.Column="1" 
+                          UseLayoutRounding="False"
+                          IsHitTestVisible="False" 
+                          Height="12" 
+                          Width="12"
+                          Margin="0,0,10,0"
+                          Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"
+                          HorizontalAlignment="Right"
+                          VerticalAlignment="Center"
+                          Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"/>
+              </Grid>
+            </Border>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+      
+      <!--  PointerOver State  -->
+      <Style Selector="^:pointerover /template/ Border#RootBorder">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+      </Style>
+
+      <!--  Pressed State  -->
+      <Style Selector="^:pressed">
+        <Setter Property="RenderTransform" Value="scale(0.98)" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Border#RootBorder">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+      </Style>
+
+      <!--  Disabled State  -->
+      <Style Selector="^:disabled /template/ Border#RootBorder">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+      </Style>
+      <Style Selector="^:disabled /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+      </Style>
+    </ControlTheme>
+  
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
index 79560be933..f8b4854553 100644
--- a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
@@ -1,19 +1,22 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}">
-          <VisualLayerManager>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Margin="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Border>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}">
+            <VisualLayerManager>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Margin="{TemplateBinding Padding}"/>
+            </VisualLayerManager>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index a32e0b580c..df9de331ee 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -1,25 +1,42 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+
   <Design.PreviewWith>
     <Border Padding="20">
-      <StackPanel Orientation="Vertical" Spacing="20" Width="350">
-        <Expander ExpandDirection="Up" Header="Expand Up" CornerRadius="25">
+      <StackPanel Orientation="Vertical" Spacing="20" Width="350" Height="600">
+        <Expander ExpandDirection="Up" Header="Expand Up">
+          <StackPanel>
+            <TextBlock>Expanded content</TextBlock>
+          </StackPanel>
+        </Expander>
+        <Expander ExpandDirection="Down" Header="Expand Down">
+          <StackPanel>
+            <TextBlock>Expanded content</TextBlock>
+          </StackPanel>
+        </Expander>
+        <Expander ExpandDirection="Left" Header="Expand Left">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Down" Header="Expand Down" CornerRadius="25">
+        <Expander ExpandDirection="Right" Header="Expand Right">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Left" Header="Expand Left" CornerRadius="25">
+        <Expander ExpandDirection="Up">
+          <Expander.Header>
+            <Grid ColumnDefinitions="*, Auto">
+              <TextBlock Grid.Column="0" Text="Control" />
+              <TextBlock Grid.Column="1" Text="Header" />
+            </Grid>
+          </Expander.Header>
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Right" Header="Expand Right" CornerRadius="25">
+        <Expander ExpandDirection="Up" Header="Rounded" CornerRadius="25">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
@@ -28,89 +45,59 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <Thickness x:Key="ExpanderHeaderPadding">16</Thickness>
-    <Thickness x:Key="ExpanderContentPadding">16</Thickness>
-
-    <Thickness x:Key="ExpanderBorderThickness">1</Thickness>
-
-    <Thickness x:Key="ExpanderDropdownLeftBorderThickness">1,1,0,1</Thickness>
-    <Thickness x:Key="ExpanderDropdownUpBorderThickness">1,1,1,0</Thickness>
-    <Thickness x:Key="ExpanderDropdownRightBorderThickness">0,1,1,1</Thickness>
-    <Thickness x:Key="ExpanderDropdownDownBorderThickness">1,0,1,1</Thickness>
-
-    <SolidColorBrush x:Key="ExpanderBackground" Color="{DynamicResource SystemAltMediumHighColor}" />
-    <SolidColorBrush x:Key="ExpanderBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
+  <!-- Shared header/content -->
+  <x:Double x:Key="ExpanderMinHeight">48</x:Double>
 
-    <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="{DynamicResource SystemChromeMediumLowColor}" />
-    <SolidColorBrush x:Key="ExpanderDropDownBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
+  <!-- Header -->
+  <HorizontalAlignment x:Key="ExpanderHeaderHorizontalContentAlignment">Stretch</HorizontalAlignment>
+  <VerticalAlignment x:Key="ExpanderHeaderVerticalContentAlignment">Center</VerticalAlignment>
+  <Thickness x:Key="ExpanderHeaderPadding">16,0,0,0</Thickness>
+  <Thickness x:Key="ExpanderHeaderBorderThickness">1</Thickness>
+  <Thickness x:Key="ExpanderChevronBorderThickness">0</Thickness>
+  <Thickness x:Key="ExpanderChevronMargin">20,0,8,0</Thickness>
+  <x:Double x:Key="ExpanderChevronButtonSize">32</x:Double>
 
-    <SolidColorBrush x:Key="ExpanderForeground" Color="{DynamicResource SystemBaseHighColor}" />
+  <!-- Content -->
+  <Thickness x:Key="ExpanderContentPadding">16</Thickness>
+  <Thickness x:Key="ExpanderContentLeftBorderThickness">1,1,0,1</Thickness>
+  <Thickness x:Key="ExpanderContentUpBorderThickness">1,1,1,0</Thickness>
+  <Thickness x:Key="ExpanderContentRightBorderThickness">0,1,1,1</Thickness>
+  <Thickness x:Key="ExpanderContentDownBorderThickness">1,0,1,1</Thickness>
 
-    <SolidColorBrush x:Key="ExpanderChevronForeground" Color="{DynamicResource SystemBaseHighColor}" />
-  </Styles.Resources>
-  <Style Selector="Expander">
-    <Setter Property="Background" Value="{DynamicResource ExpanderBackground}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderBorderThickness}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ExpanderBorderBrush}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Padding" Value="{DynamicResource ExpanderHeaderPadding}" />
+  <ControlTheme x:Key="FluentExpanderToggleButtonTheme" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderHeaderBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForeground}" />
+    <Setter Property="Padding" Value="{StaticResource ExpanderHeaderPadding}" />
     <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-  </Style>
-  <Style Selector="Expander">
+    <Setter Property="HorizontalContentAlignment" Value="{StaticResource ExpanderHeaderHorizontalContentAlignment}" />
+    <Setter Property="VerticalContentAlignment" Value="{StaticResource ExpanderHeaderVerticalContentAlignment}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <DockPanel>
-          <ToggleButton x:Name="ExpanderHeader"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Header}"
-                        ContentTemplate="{TemplateBinding HeaderTemplate}"
-                        IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
-                        IsEnabled="{TemplateBinding IsEnabled}" />
-          <Border x:Name="ExpanderContent"
-                  Padding="{DynamicResource ExpanderContentPadding}"
-                  Background="{DynamicResource ExpanderDropDownBackground}"
-                  BorderBrush="{DynamicResource ExpanderDropDownBorderBrush}"
-                  IsVisible="{TemplateBinding IsExpanded, Mode=TwoWay}">
+        <Border x:Name="ToggleButtonBackground"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <Grid x:Name="ToggleButtonGrid"
+                ColumnDefinitions="*,Auto">
             <ContentPresenter x:Name="PART_ContentPresenter"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-          </Border>
-        </DockPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="ToggleButtonBackground">
-          <Grid ColumnDefinitions="*,Auto">
-            <ContentPresenter x:Name="PART_ContentPresenter"
-                              Margin="{TemplateBinding Padding}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="Center"
-                              Background="Transparent"
-                              BorderBrush="Transparent"
-                              BorderThickness="0"
                               Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
-                              TextBlock.Foreground="{DynamicResource ExpanderForeground}" />
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Foreground="{TemplateBinding Foreground}"
+                              Margin="{TemplateBinding Padding}"/>
             <Border x:Name="ExpandCollapseChevronBorder"
                     Grid.Column="1"
-                    Width="32"
-                    Height="32"
-                    Margin="7"
-                    RenderTransformOrigin="50%,50%">
+                    Width="{DynamicResource ExpanderChevronButtonSize}"
+                    Height="{DynamicResource ExpanderChevronButtonSize}"
+                    Margin="{DynamicResource ExpanderChevronMargin}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    BorderBrush="{DynamicResource ExpanderChevronBorderBrush}"
+                    BorderThickness="{DynamicResource ExpanderChevronBorderThickness}"
+                    Background="{DynamicResource ExpanderChevronBackground}">
               <Path x:Name="ExpandCollapseChevron"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
@@ -126,110 +113,219 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Expander /template/ ToggleButton#ExpanderHeader:pressed">
-    <Setter Property="RenderTransform" Value="{x:Null}" />
-  </Style>
-
-  <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader, Expander:right /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
-
-
-  <Style Selector="Expander /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="Background" Value="{TemplateBinding Background}" />
-    <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-    <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness}" />
-  </Style>
-
-  <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius}" />
-  </Style>
-  <Style Selector="Expander:expanded:up /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:up /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:down /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:down /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:left /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:left /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:right /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:right /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-  </Style>
-
-  <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Right" />
-  </Style>
-  <Style Selector="Expander:up /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Bottom" />
-  </Style>
-  <Style Selector="Expander:right /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Left" />
-  </Style>
-  <Style Selector="Expander:down /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Top" />
-  </Style>
-
-
-  <Style Selector="Expander:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-    <Style.Animations>
-      <Animation FillMode="Both" Duration="0:0:0.0625">
-        <KeyFrame Cue="100%">
-          <Setter Property="RotateTransform.Angle" Value="180" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-    <Style.Animations>
-      <Animation FillMode="Both" Duration="0:0:0.0625">
-        <KeyFrame Cue="0%">
-          <Setter Property="RotateTransform.Angle" Value="180" />
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="RotateTransform.Angle" Value="0" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-
-  <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 7 0 L 0 7 L 7 14" />
-  </Style>
-  <Style Selector="Expander:up /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 0 7 L 7 0 L 14 7" />
-  </Style>
-  <Style Selector="Expander:right /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 0 0 L 7 7 L 0 14" />
-  </Style>
-  <Style Selector="Expander:down /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 0 0 L 7 7 L 14 0" />
-  </Style>
-
-
-  <Style Selector="Expander:left /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownLeftBorderThickness}" />
-  </Style>
-  <Style Selector="Expander:up /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownUpBorderThickness}" />
-  </Style>
-  <Style Selector="Expander:right /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownRightBorderThickness}" />
-  </Style>
-  <Style Selector="Expander:down /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownDownBorderThickness}" />
-  </Style>
-</Styles>
+
+    <Style Selector="^:checked /template/ Border#ExpandCollapseChevronBorder">
+      <Style.Animations>
+        <Animation FillMode="Both" Duration="0:0:0.0625">
+          <KeyFrame Cue="100%">
+            <Setter Property="RotateTransform.Angle" Value="180" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    
+    <Style Selector="^:not(:checked) /template/ Border#ExpandCollapseChevronBorder">
+      <Style.Animations>
+        <Animation FillMode="Both" Duration="0:0:0.0625">
+          <KeyFrame Cue="0%">
+            <Setter Property="RotateTransform.Angle" Value="180" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="RotateTransform.Angle" Value="0" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+
+    <!-- PointerOver -->
+    <Style Selector="^:pointerover /template/ Border#ToggleButtonBackground">
+      <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrushPointerOver}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForegroundPointerOver}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ Border#ExpandCollapseChevronBorder">
+      <Setter Property="Background" Value="{DynamicResource ExpanderChevronBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ExpanderChevronBorderBrushPointerOver}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Stroke" Value="{DynamicResource ExpanderChevronForegroundPointerOver}" />
+    </Style>
+
+    <!-- Pressed -->
+    <Style Selector="^:pressed /template/ Border#ToggleButtonBackground">
+      <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrushPressed}" />
+    </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForegroundPressed}" />
+    </Style>
+    <Style Selector="^:pressed /template/ Border#ExpandCollapseChevronBorder">
+      <Setter Property="Background" Value="{DynamicResource ExpanderChevronBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ExpanderChevronBorderBrushPressed}" />
+    </Style>
+    <Style Selector="^:pressed /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Stroke" Value="{DynamicResource ExpanderChevronForegroundPressed}" />
+    </Style>
+
+    <!-- Disabled -->
+    <Style Selector="^:disabled /template/ Border#ToggleButtonBackground">
+      <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrushDisabled}" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForegroundDisabled}" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#ExpandCollapseChevronBorder">
+      <Setter Property="Background" Value="{DynamicResource ExpanderChevronBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ExpanderChevronBorderBrushDisabled}" />
+    </Style>
+    <Style Selector="^:disabled /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Stroke" Value="{DynamicResource ExpanderChevronForegroundDisabled}" />
+    </Style>
+
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentExpanderToggleButtonUpTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 0 7 L 7 0 L 14 7" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentExpanderToggleButtonDownTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 0 0 L 7 7 L 14 0" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentExpanderToggleButtonLeftTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 7 0 L 0 7 L 7 14" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentExpanderToggleButtonRightTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 0 0 L 7 7 L 0 14" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Expander}" TargetType="Expander">
+    <Setter Property="IsTabStop" Value="False"/>
+    <Setter Property="MinWidth" Value="{DynamicResource FlyoutThemeMinWidth}" />
+    <Setter Property="MinHeight" Value="{StaticResource ExpanderMinHeight}" />
+    <Setter Property="Background" Value="{DynamicResource ExpanderContentBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ExpanderContentBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentDownBorderThickness}" />
+    <Setter Property="Padding" Value="{StaticResource ExpanderContentPadding}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel MinWidth="{TemplateBinding MinWidth}"
+                   MaxWidth="{TemplateBinding MaxWidth}">
+          <ToggleButton x:Name="ExpanderHeader"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        IsEnabled="{TemplateBinding IsEnabled}"
+                        Content="{TemplateBinding Header}"
+                        ContentTemplate="{TemplateBinding HeaderTemplate}"
+                        IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
+          <Border x:Name="ExpanderContent"
+                  IsVisible="{TemplateBinding IsExpanded, Mode=TwoWay}"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  MinHeight="{TemplateBinding MinHeight}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Padding="{TemplateBinding Padding}">
+            <ContentPresenter x:Name="PART_ContentPresenter"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Foreground="{TemplateBinding Foreground}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pressed">
+      <Setter Property="RenderTransform" Value="{x:Null}" />
+    </Style>
+
+    <Style Selector="^:left /template/ ToggleButton#ExpanderHeader, ^:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+
+    <Style Selector="^:not(:expanded) /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius}" />
+    </Style>
+    <Style Selector="^:expanded:up /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:up /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:down /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:down /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:left /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:left /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:right /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+    </Style>
+
+    <Style Selector="^:left /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Right" />
+    </Style>
+    <Style Selector="^:up /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Bottom" />
+    </Style>
+    <Style Selector="^:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+    <Style Selector="^:down /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Top" />
+    </Style>
+
+    <Style Selector="^:left /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonLeftTheme}" />
+    </Style>
+    <Style Selector="^:up /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonUpTheme}" />
+    </Style>
+    <Style Selector="^:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonRightTheme}" />
+    </Style>
+    <Style Selector="^:down /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonDownTheme}" />
+    </Style>
+
+    <Style Selector="^:left /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentLeftBorderThickness}" />
+    </Style>
+    <Style Selector="^:up /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentUpBorderThickness}" />
+    </Style>
+    <Style Selector="^:right /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentRightBorderThickness}" />
+    </Style>
+    <Style Selector="^:down /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentDownBorderThickness}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 16a6cc9c14..5383aa3180 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -1,68 +1,78 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="Avalonia.Themes.Fluent.Controls.FluentControls">
-  <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Label.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/GridSplitter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ItemsControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ProgressBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RadioButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RepeatButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStripItem.xaml"/>
-  <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Expander.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Calendar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NotificationCard.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml"/>
-  <!-- ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all-->
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml"/>
+<Styles
+    x:Class="Avalonia.Themes.Fluent.Controls.FluentControls"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/RadioButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Expander.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ProgressBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Calendar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/GridSplitter.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ItemsControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Label.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NotificationCard.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/RepeatButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStripItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeView.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DropDownButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml" />
+                <!--  ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all  -->
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
index 92f8177ead..2dca5b0770 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
@@ -1,9 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
-  </Styles.Resources>
-  
-  <Style Selector="FlyoutPresenter">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
+  <ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter">
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Stretch" />
     <Setter Property="Background" Value="{DynamicResource FlyoutPresenterBackground}" />
@@ -38,5 +36,5 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
index e6577497da..c3f489da80 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="SystemControlFocusVisualMargin">0</Thickness>
@@ -19,16 +19,4 @@
       </FocusAdornerTemplate>
     </Setter>
   </Style>
-
-  <!--  DottedLine FocusAdorner  -->
-  <Style Selector="Window.DottedLineFocusAdorner :is(Control)">
-    <Setter Property="FocusAdorner">
-      <FocusAdornerTemplate>
-        <Rectangle Stroke="{StaticResource SystemControlFocusVisualPrimaryBrush}"
-                   StrokeThickness="1"
-                   StrokeDashArray="1,2"
-                   Margin="1" />
-      </FocusAdornerTemplate>
-    </Setter>
-  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
index e3a7b04f33..ca57eccd13 100644
--- a/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
@@ -1,24 +1,22 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="GridSplitter">
-    <Setter Property="Focusable" Value="True" />
-    <Setter Property="MinWidth" Value="6" />
-    <Setter Property="MinHeight" Value="6" />
-    <Setter Property="Background" Value="{DynamicResource SystemAltMediumLowColor}" />
-    <Setter Property="PreviewContent">
-      <Template>
-        <Rectangle Fill="{DynamicResource SystemAccentColor}" />
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border 
-          BorderBrush="{TemplateBinding BorderBrush}"
-          BorderThickness="{TemplateBinding BorderThickness}"
-          CornerRadius="{TemplateBinding CornerRadius}"
-          Background="{TemplateBinding Background}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type GridSplitter}" TargetType="GridSplitter">
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="MinWidth" Value="6" />
+      <Setter Property="MinHeight" Value="6" />
+      <Setter Property="Background" Value="{DynamicResource SystemAltMediumLowColor}" />
+      <Setter Property="PreviewContent">
+        <Template>
+          <Rectangle Fill="{DynamicResource SystemAccentColor}" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Background="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
index 19d13b6399..fc85b7b9ff 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
@@ -1,16 +1,19 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ItemsControl}" TargetType="ItemsControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{TemplateBinding Padding}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
index d41e4e2166..ff6909ee87 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
@@ -1,18 +1,22 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Label">
-  <Setter Property="Padding" Value="3"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"                        
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
+    <Setter Property="Padding" Value="3"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index e41e1b5fde..c17dc65cca 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <ListBox>
@@ -9,15 +10,16 @@
       </ListBox>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="ListBox">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+
+  <ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
     <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />        
-    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />        
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />    
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
@@ -36,10 +38,10 @@
                             ItemsPanel="{TemplateBinding ItemsPanel}"
                             ItemTemplate="{TemplateBinding ItemTemplate}"
                             Margin="{TemplateBinding Padding}"
-                            VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}" />
           </ScrollViewer>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
index 14409dda59..fc1d0c5ff1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -1,5 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="0">
       <ListBox>
@@ -12,10 +12,8 @@
       </ListBox>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
-  </Styles.Resources>
-  <Style Selector="ListBoxItem">
+  <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
+  <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Padding" Value="{DynamicResource ListBoxItemPadding}" />
     <Setter Property="Template">
@@ -27,68 +25,55 @@
                           CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
+                          FontWeight="Normal"
+                          FontSize="{DynamicResource ControlContentThemeFontSize}"
                           Padding="{TemplateBinding Padding}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="ListBoxItem /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.FontWeight" Value="Normal" />
-    <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-  </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+    </Style>
 
-  <!--  Disabled State  -->
-  <Style Selector="ListBoxItem:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
-  </Style>
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    </Style>
 
-  <!--  PointerOver State  -->
-  <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    </Style>
 
-  <!--  Pressed State  -->
-  <Style Selector="ListBoxItem:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:pressed /template/ ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+    <!--  Selected State  -->
+    <Style Selector="^:selected">
 
-  <!--  Selected State  -->
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
 
-  <!--  Selected Unfocused State  -->
-  <Style Selector="ListBoxItem:selected:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+      <!--  Selected Unfocused State  -->
+      <Style Selector="^:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
 
-  <!--  Selected PointerOver State  -->
-  <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+      <!--  Selected PointerOver State  -->
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
 
-  <!--  Selected Pressed State  -->
-  <Style Selector="ListBoxItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
-</Styles>
+      <!--  Selected Pressed State  -->
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index 60e16fcff2..d0280b16a2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,324 +1,336 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
-    <Style Selector="dialogs|ManagedFileChooser">
-        <Style.Resources>
-            <ResourceDictionary>
-                <GradientStops x:Key="IconRes.FolderBackGradientStops">
-                </GradientStops>
-                <GradientStops x:Key="IconRes.FolderFrontGradientStops">
-                    <GradientStop Offset="0" Color="#FFFFDA6F"/>
-                    <GradientStop Offset="1" Color="#FFFEC326"/>
-                </GradientStops>
-                <DrawingGroup x:Key="LevelUp">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
-                    <GeometryDrawing Brush="#FFDCB679" Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
-                    <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
-                    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
-                </DrawingGroup>
-                <dialogs:ResourceSelectorConverter x:Key="Icons">
-                    <DrawingGroup x:Key="Icon_Folder">
-                        <GeometryDrawing Geometry="M 0 0 L 16 16"/>
-                        <GeometryDrawing Geometry="M 0 3 C 0,1 0,1 2,1 L 5 1 C 5.5,1 6,1 6.5,1.5 L 8 3 L 14 3 C 16,3 16,3 16,5
+  <Design.PreviewWith>
+    <Border Padding="20" Width="800" Height="500">
+      <dialogs:ManagedFileChooser/>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
+    <ControlTheme.Resources>
+      <ResourceDictionary>
+        <GradientStops x:Key="IconRes.FolderBackGradientStops">
+        </GradientStops>
+        <GradientStops x:Key="IconRes.FolderFrontGradientStops">
+          <GradientStop Offset="0" Color="#FFFFDA6F"/>
+          <GradientStop Offset="1" Color="#FFFEC326"/>
+        </GradientStops>
+        <DrawingGroup x:Key="LevelUp">
+          <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+          <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
+          <GeometryDrawing Brush="#FFDCB679" Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
+          <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
+          <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
+        </DrawingGroup>
+        <dialogs:ResourceSelectorConverter x:Key="Icons">
+          <DrawingGroup x:Key="Icon_Folder">
+            <GeometryDrawing Geometry="M 0 0 L 16 16"/>
+            <GeometryDrawing Geometry="M 0 3 C 0,1 0,1 2,1 L 5 1 C 5.5,1 6,1 6.5,1.5 L 8 3 L 14 3 C 16,3 16,3 16,5
                         L 16,12 C 16,14 16,14 14,14
                         L 2,14 C 0,14 0,14 0,12 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="1,4" EndPoint="23,20">
-                                    <GradientStop Offset="0" Color="#FFFFC018"/>
-                                    <GradientStop Offset="1" Color="#FFDFA32D"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 0 4.5 L 8 4.5 L 8 9 L 0 9 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="0,4.5" EndPoint="0,5">
-                                    <GradientStop Offset="0" Color="#00D7A018"/>
-                                    <GradientStop Offset="1" Color="#7FD7A018"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4 C 16,4 16,4 16,6
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="1,4" EndPoint="23,20">
+                  <GradientStop Offset="0" Color="#FFFFC018"/>
+                  <GradientStop Offset="1" Color="#FFDFA32D"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 0 4.5 L 8 4.5 L 8 9 L 0 9 Z">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="0,4.5" EndPoint="0,5">
+                  <GradientStop Offset="0" Color="#00D7A018"/>
+                  <GradientStop Offset="1" Color="#7FD7A018"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4 C 16,4 16,4 16,6
                                                     L 16,11 C 16,13 16,13 14,13
                                                     L 2,13 C 0,13 0,13 0,11 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="1,6" EndPoint="23,19">
-                                    <GradientStop Offset="0" Color="#FFFFE69D"/>
-                                    <GradientStop Offset="1" Color="#FFFFC937"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="1,6" EndPoint="23,19">
+                  <GradientStop Offset="0" Color="#FFFFE69D"/>
+                  <GradientStop Offset="1" Color="#FFFFC937"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4
                                                     L 8 4.25 C 6,5.25 5.5,5.25 5.125,5.25 L 2 5.25 C 0,5.25 0,5.25 0,9.25 z" Brush="#7FFFFFFF"/>
-                    </DrawingGroup>
-                    <DrawingGroup x:Key="Icon_File">
-                        <GeometryDrawing Geometry="M 0 0 L 16 16"/>
-                        <GeometryDrawing Geometry="M 2 0 L 10 0 L 14 4 L 14 16 L 2 16 Z" Brush="#FF797774"/>
-                        <GeometryDrawing Geometry="M 3 1 L 9.7 1 L 13 4.3 L 13 15 L 3 15 Z" Brush="#FFFAFAFA"/>
-                        <GeometryDrawing Geometry="L 9 1 L 9 5 L 14 5 L 14 4 L 10 4 L 10 1 Z" Brush="#FF797774"/>
-                    </DrawingGroup>
-                    <DrawingGroup x:Key="Icon_Volume">
-                        <GeometryDrawing Geometry="M 0 0 L 16 16"/>
-                        <GeometryDrawing Geometry="M 4 5 L 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 1 9 C 1,8 1,8 1.5 7.5 Z" Brush="#FFE1E3E6"/>
-                        <GeometryDrawing Geometry="M 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 10 9 L 10 5 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="12,5" EndPoint="11.5,5.5">
-                                    <GradientStop Offset="0" Color="#FFCDCFD1"/>
-                                    <GradientStop Offset="1" Color="#00CDCFD1"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 4 5 L 1.5 7.5 C 1,8 1,8 1,9 L 4 9 L 6 9 L 6 5 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="4,5" EndPoint="4.5,5.5">
-                                    <GradientStop Offset="0" Color="#FFCDCFD1"/>
-                                    <GradientStop Offset="1" Color="#00CDCFD1"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 1 9 C 1,8 1,8 2,8 L 14 8
+          </DrawingGroup>
+          <DrawingGroup x:Key="Icon_File">
+            <GeometryDrawing Geometry="M 0 0 L 16 16"/>
+            <GeometryDrawing Geometry="M 2 0 L 10 0 L 14 4 L 14 16 L 2 16 Z" Brush="#FF797774"/>
+            <GeometryDrawing Geometry="M 3 1 L 9.7 1 L 13 4.3 L 13 15 L 3 15 Z" Brush="#FFFAFAFA"/>
+            <GeometryDrawing Geometry="L 9 1 L 9 5 L 14 5 L 14 4 L 10 4 L 10 1 Z" Brush="#FF797774"/>
+          </DrawingGroup>
+          <DrawingGroup x:Key="Icon_Volume">
+            <GeometryDrawing Geometry="M 0 0 L 16 16"/>
+            <GeometryDrawing Geometry="M 4 5 L 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 1 9 C 1,8 1,8 1.5 7.5 Z" Brush="#FFE1E3E6"/>
+            <GeometryDrawing Geometry="M 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 10 9 L 10 5 Z">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="12,5" EndPoint="11.5,5.5">
+                  <GradientStop Offset="0" Color="#FFCDCFD1"/>
+                  <GradientStop Offset="1" Color="#00CDCFD1"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 4 5 L 1.5 7.5 C 1,8 1,8 1,9 L 4 9 L 6 9 L 6 5 Z">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="4,5" EndPoint="4.5,5.5">
+                  <GradientStop Offset="0" Color="#FFCDCFD1"/>
+                  <GradientStop Offset="1" Color="#00CDCFD1"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 1 9 C 1,8 1,8 2,8 L 14 8
                                                     C 15,8 15,8 15,9 L 15 11
                                                     C 15,12 15,12 14,12 L 2 12
                                                     C 1,12 1,12 1,11 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="0,8" EndPoint="0,12">
-                                    <GradientStop Offset="0" Color="#FF737374"/>
-                                    <GradientStop Offset="1" Color="#FFA8A8A8"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 2 9 C 2,8 2,8 3,8 L 13 8
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="0,8" EndPoint="0,12">
+                  <GradientStop Offset="0" Color="#FF737374"/>
+                  <GradientStop Offset="1" Color="#FFA8A8A8"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 2 9 C 2,8 2,8 3,8 L 13 8
                                                     C 14,8 14,8 14,9 L 14 10
                                                     C 14,11 14,11 13,11 L 3 11
                                                     C 2,11 2,11 2,10 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="0,8" EndPoint="0,11">
-                                    <GradientStop Offset="0" Color="#FF333333"/>
-                                    <GradientStop Offset="1" Color="#FF5A5A5A"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing>
-                            <GeometryDrawing.Geometry>
-                                <EllipseGeometry Rect="2.5,8.5,2,2"/>
-                            </GeometryDrawing.Geometry>
-                            <GeometryDrawing.Brush>
-                                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.5,9.5">
-                                    <GradientStop Offset="0.8" Color="#4001FF01"/>
-                                    <GradientStop Offset="1" Color="#0001FF01"/>
-                                </RadialGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing>
-                            <GeometryDrawing.Geometry>
-                                <EllipseGeometry Rect="3,9,1,1"/>
-                            </GeometryDrawing.Geometry>
-                            <GeometryDrawing.Brush>
-                                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.25,9.75">
-                                    <GradientStop Offset="0" Color="#FFB6FFB6"/>
-                                    <GradientStop Offset="1" Color="#FF01FF01"/>
-                                </RadialGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 3.23483495705 9.76516504295 A 0.375,0.375 180 1 0 3.76516504295,9.23483495705 A 0.4375,0.4375 135 0 1 3.23483495705,9.76516504295 Z" Brush="#FF00B300"/>
-                    </DrawingGroup>
-                </dialogs:ResourceSelectorConverter>
-            </ResourceDictionary>
-        </Style.Resources>
-        <Setter Property="Template">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="0,8" EndPoint="0,11">
+                  <GradientStop Offset="0" Color="#FF333333"/>
+                  <GradientStop Offset="1" Color="#FF5A5A5A"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Geometry>
+                <EllipseGeometry Rect="2.5,8.5,2,2"/>
+              </GeometryDrawing.Geometry>
+              <GeometryDrawing.Brush>
+                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.5,9.5">
+                  <GradientStop Offset="0.8" Color="#4001FF01"/>
+                  <GradientStop Offset="1" Color="#0001FF01"/>
+                </RadialGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Geometry>
+                <EllipseGeometry Rect="3,9,1,1"/>
+              </GeometryDrawing.Geometry>
+              <GeometryDrawing.Brush>
+                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.25,9.75">
+                  <GradientStop Offset="0" Color="#FFB6FFB6"/>
+                  <GradientStop Offset="1" Color="#FF01FF01"/>
+                </RadialGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 3.23483495705 9.76516504295 A 0.375,0.375 180 1 0 3.76516504295,9.23483495705 A 0.4375,0.4375 135 0 1 3.23483495705,9.76516504295 Z" Brush="#FF00B300"/>
+          </DrawingGroup>
+        </dialogs:ResourceSelectorConverter>
+      </ResourceDictionary>
+    </ControlTheme.Resources>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <ListBox x:Name="PART_QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
+                  <Image Width="16" Height="16">
+                    <Image.Source>
+                      <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
+                    </Image.Source>
+                  </Image>
+                  <TextBlock Text="{Binding DisplayName}"/>
+                </StackPanel>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
+          </ListBox>
+          <DockPanel x:Name="NavBar" DockPanel.Dock="Top" Margin="8,5,8,0" VerticalAlignment="Center">
+            <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,5,0,0" DockPanel.Dock="Bottom"/>
+            <DockPanel Margin="4,0">
+              <Button Command="{Binding GoUp}" DockPanel.Dock="Left">
+                <Path Data="M 0 7 L 7 0 L 14 7 M 7 0 L 7 16" Stroke="{CompiledBinding $parent[Button].Foreground}" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,1,0,-1"/>
+              </Button>
+              <TextBox x:Name="Location" Text="{Binding Location}">
+                <TextBox.KeyBindings>
+                  <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter"/>
+                </TextBox.KeyBindings>
+              </TextBox>
+            </DockPanel>
+          </DockPanel>
+          <DockPanel Margin="8,0,8,5" DockPanel.Dock="Bottom">
+            <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,0,0,5" DockPanel.Dock="Top"/>
+            <DockPanel Margin="4,0">
+              <DockPanel DockPanel.Dock="Top" Margin="0,0,0,4">
+                <ComboBox DockPanel.Dock="Right"
+                    IsVisible="{Binding ShowFilters}"
+                    Items="{Binding Filters}"
+                    SelectedItem="{Binding SelectedFilter}" />
+                <TextBox Text="{Binding FileName}" Watermark="File name" IsVisible="{Binding !SelectingFolder}" />
+              </DockPanel>
+              <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/>
+              <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
+                <Button Command="{Binding Ok}">OK</Button>
+                <Button Command="{Binding Cancel}">Cancel</Button>
+              </UniformGrid>
+            </DockPanel>
+          </DockPanel>
+
+          <DockPanel Grid.IsSharedSizeScope="True">
+            <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter"  />
+                <ColumnDefinition Width="275" SharedSizeGroup="Name" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="150" SharedSizeGroup="Type" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Size" />
+              </Grid.ColumnDefinitions>
+              <Grid.Styles>
+                <Style Selector="GridSplitter">
+                  <Setter Property="Background" Value="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}"/>
+                  <Setter Property="Template">
+                    <ControlTemplate>
+                      <Border VerticalAlignment="Stretch" BorderThickness="0" Background="#01000000">
+                        <Rectangle Width="1" VerticalAlignment="Stretch" Fill="{TemplateBinding Background}"/>
+                      </Border>
+                    </ControlTemplate>
+                  </Setter>
+                </Style>
+              </Grid.Styles>
+              <GridSplitter Grid.Column="1" />
+              <TextBlock Grid.Column="2" Text="Name" />
+              <GridSplitter Grid.Column="3" />
+              <TextBlock Grid.Column="4" Text="Date Modified" />
+              <GridSplitter Grid.Column="5" />
+              <TextBlock Grid.Column="6" Text="Type" />
+              <GridSplitter Grid.Column="7" />
+              <TextBlock Grid.Column="8" Text="Size" />
+            </Grid>
+            <ListBox x:Name="PART_Files"
+                VirtualizationMode="Simple"
+                Items="{Binding Items}"
+                Margin="0 5"
+                SelectionMode="{Binding SelectionMode}"
+                SelectedItems="{Binding SelectedItems}"
+                Background="Transparent"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+              <ListBox.ItemTemplate>
+                <DataTemplate>
+                  <Grid Background="Transparent">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition SharedSizeGroup="Icon" />
+                      <ColumnDefinition SharedSizeGroup="Splitter"  />
+                      <ColumnDefinition SharedSizeGroup="Name" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Modified" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Type" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Size" />
+                    </Grid.ColumnDefinitions>
+                    <Image Width="16" Height="16">
+                      <Image.Source>
+                        <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
+                      </Image.Source>
+                    </Image>
+                    <TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
+                    <TextBlock Grid.Column="4" Text="{Binding Modified}" />
+                    <TextBlock Grid.Column="6" Text="{Binding Type}" />
+                    <TextBlock Grid.Column="8">
+                      <TextBlock.Text>
+                        <Binding Path="Size">
+                          <Binding.Converter>
+                            <dialogs:FileSizeStringConverter/>
+                          </Binding.Converter>
+                        </Binding>
+                      </TextBlock.Text>
+                    </TextBlock>
+                  </Grid>
+                </DataTemplate>
+              </ListBox.ItemTemplate>
+            </ListBox>
+          </DockPanel>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^ /template/ ListBox#QuickLinks">
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumBrush}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Width" Value="240"/>
+      <Setter Property="Padding" Value="0,20"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="border" BoxShadow="inset -6 0 3 -3 #20000000" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <ScrollViewer Name="PART_ScrollViewer" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+              <ItemsPresenter Name="PART_ItemsPresenter"
+                              Items="{TemplateBinding Items}"
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              ItemTemplate="{TemplateBinding ItemTemplate}"
+                              Margin="{TemplateBinding Padding}"
+                              VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Setter Property="ItemContainerTheme">
+        <ControlTheme TargetType="ListBoxItem">
+          <Setter Property="Height" Value="32"/>
+          <Setter Property="Padding" Value="30,6"/>
+          <Setter Property="Template">
             <ControlTemplate>
-                <DockPanel>
-                    <ListBox x:Name="QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
-                                    <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                                    <TextBlock Text="{Binding DisplayName}"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                    <DockPanel x:Name="NavBar" DockPanel.Dock="Top" Margin="8,5,8,0" VerticalAlignment="Center">
-                        <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,5,0,0" DockPanel.Dock="Bottom"/>
-                        <DockPanel Margin="4,0">
-                            <Button Command="{Binding GoUp}" DockPanel.Dock="Left">
-                                <Path Data="M 0 7 L 7 0 L 14 7 M 7 0 L 7 16" Stroke="{CompiledBinding $parent[Button].Foreground}" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,1,0,-1"/>
-                            </Button>
-                            <TextBox x:Name="Location" Text="{Binding Location}">
-                                <TextBox.KeyBindings>
-                                    <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter"/>
-                                </TextBox.KeyBindings>
-                            </TextBox>
-                        </DockPanel>
-                    </DockPanel>
-                    <DockPanel Margin="8,0,8,5" DockPanel.Dock="Bottom">
-                        <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,0,0,5" DockPanel.Dock="Top"/>
-                        <DockPanel Margin="4,0">
-                            <DockPanel DockPanel.Dock="Top" Margin="0,0,0,4">
-                                <ComboBox DockPanel.Dock="Right"
-                                    IsVisible="{Binding ShowFilters}" 
-                                    Items="{Binding Filters}"
-                                    SelectedItem="{Binding SelectedFilter}" />
-                                <TextBox Text="{Binding FileName}" Watermark="File name" IsVisible="{Binding !SelectingFolder}" />
-                            </DockPanel>
-                            <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/>
-                            <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
-                                <Button Command="{Binding Ok}">OK</Button>
-                                <Button Command="{Binding Cancel}">Cancel</Button>
-                            </UniformGrid>
-                        </DockPanel>
-                    </DockPanel>
+              <Border x:Name="LayoutRoot" CornerRadius="2" Margin="10,0">
+                <Panel>
+                  <Border x:Name="SelectedLine" HorizontalAlignment="Left" Margin="2,6" CornerRadius="0.5" Width="3" Background="{DynamicResource SystemControlHighlightAccentBrush}" IsVisible="{TemplateBinding IsSelected}"/>
+                  <ContentPresenter Name="PART_ContentPresenter"
+                              Background="Transparent"
+                              BorderBrush="Transparent"
+                              BorderThickness="0"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
 
-                    <DockPanel Grid.IsSharedSizeScope="True">
-                        <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter"  />
-                                <ColumnDefinition Width="275" SharedSizeGroup="Name" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                                <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                                <ColumnDefinition Width="150" SharedSizeGroup="Type" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                                <ColumnDefinition Width="200" SharedSizeGroup="Size" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.Styles>
-                                <Style Selector="GridSplitter">
-                                    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}"/>
-                                    <Setter Property="Template">
-                                        <ControlTemplate>
-                                            <Border VerticalAlignment="Stretch" BorderThickness="0" Background="#01000000">
-                                                <Rectangle Width="1" VerticalAlignment="Stretch" Fill="{TemplateBinding Background}"/>
-                                            </Border>
-                                        </ControlTemplate>
-                                    </Setter>
-                                </Style>
-                            </Grid.Styles>
-                            <GridSplitter Grid.Column="1" />
-                            <TextBlock Grid.Column="2" Text="Name" />
-                            <GridSplitter Grid.Column="3" />
-                            <TextBlock Grid.Column="4" Text="Date Modified" />
-                            <GridSplitter Grid.Column="5" />
-                            <TextBlock Grid.Column="6" Text="Type" />
-                            <GridSplitter Grid.Column="7" />
-                            <TextBlock Grid.Column="8" Text="Size" />
-                        </Grid>
-                        <ListBox x:Name="Files"
-                            VirtualizationMode="Simple"
-                            Items="{Binding Items}"
-                            Margin="0 5"
-                            SelectionMode="{Binding SelectionMode}"
-                            SelectedItems="{Binding SelectedItems}"
-                            Background="Transparent"
-                            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                            <ListBox.ItemTemplate>
-                                <DataTemplate>
-                                    <Grid Background="Transparent">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition SharedSizeGroup="Icon" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter"  />
-                                            <ColumnDefinition SharedSizeGroup="Name" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter" />
-                                            <ColumnDefinition SharedSizeGroup="Modified" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter" />
-                                            <ColumnDefinition SharedSizeGroup="Type" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter" />
-                                            <ColumnDefinition SharedSizeGroup="Size" />
-                                        </Grid.ColumnDefinitions>
-                                        <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                                        <TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
-                                        <TextBlock Grid.Column="4" Text="{Binding Modified}" />
-                                        <TextBlock Grid.Column="6" Text="{Binding Type}" />
-                                        <TextBlock Grid.Column="8">
-                                            <TextBlock.Text>
-                                                <Binding Path="Size">
-                                                    <Binding.Converter>
-                                                        <dialogs:FileSizeStringConverter/>
-                                                    </Binding.Converter>
-                                                </Binding>
-                                            </TextBlock.Text>
-                                        </TextBlock>
-                                    </Grid>
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-                    </DockPanel>
-                </DockPanel>
+                </Panel>
+              </Border>
             </ControlTemplate>
-        </Setter>
-    </Style>
+          </Setter>
 
-
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks">
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumBrush}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Width" Value="240"/>
-        <Setter Property="Padding" Value="0,20"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Name="border" BoxShadow="inset -6 0 3 -3 #20000000" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                    <ScrollViewer Name="PART_ScrollViewer" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-                        <ItemsPresenter Name="PART_ItemsPresenter"
-                                        Items="{TemplateBinding Items}"
-                                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                                        Margin="{TemplateBinding Padding}"
-                                        VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
-                    </ScrollViewer>
-                </Border>
-            </ControlTemplate>
-        </Setter>
+          <Style Selector="^:pointerover /template/ Border#LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumBrush}"/>
+          </Style>
+          <Style Selector="^:selected /template/ Border#LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumHighBrush}"/>
+          </Style>
+        </ControlTheme>
+      </Setter>
     </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem">
-        <Setter Property="Height" Value="32"/>
-        <Setter Property="Padding" Value="30,6"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border x:Name="LayoutRoot" CornerRadius="2" Margin="10,0">
-                    <Panel>
-                        <Border x:Name="SelectedLine" HorizontalAlignment="Left" Margin="2,6" CornerRadius="0.5" Width="3" Background="{DynamicResource SystemControlHighlightAccentBrush}" IsVisible="{TemplateBinding IsSelected}"/>
-                        <ContentPresenter Name="PART_ContentPresenter"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    BorderThickness="0"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    Content="{TemplateBinding Content}"
-                                    Padding="{TemplateBinding Padding}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
 
-                    </Panel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:pointerover /template/ Border#LayoutRoot">
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumBrush}"/>
+    <Style Selector="^ /template/ DockPanel#NavBar Button, ^ /template/ DockPanel#NavBar TextBox">
+      <Setter Property="Height" Value="30"/>
     </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:selected /template/ Border#LayoutRoot">
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumHighBrush}"/>
+    <Style Selector="^ /template/ DockPanel#NavBar Button">
+      <Setter Property="VerticalAlignment" Value="Stretch"/>
+      <Setter Property="Width" Value="40"/>
+      <Setter Property="Margin" Value="0,0,8,0"/>
+      <Setter Property="BorderThickness" Value="0"/>
     </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button,
-                    dialogs|ManagedFileChooser /template/ DockPanel#NavBar TextBox">
-        <Setter Property="Height" Value="30"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button">
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="Width" Value="40"/>
-        <Setter Property="Margin" Value="0,0,8,0"/>
-        <Setter Property="BorderThickness" Value="0"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button:not(:pointerover):not(:pressed)">
-        <Setter Property="Background" Value="Transparent"/>
+    <Style Selector="^ /template/ DockPanel#NavBar Button:not(:pointerover):not(:pressed)">
+      <Setter Property="Background" Value="Transparent"/>
     </Style>
 
-    <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button">
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="Margin" Value="4,0,0,0"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+    <Style Selector="^ /template/ UniformGrid#Finalize > Button">
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+      <Setter Property="Margin" Value="4,0,0,0"/>
     </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index 4eb724a926..f5fd69a67f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -1,36 +1,113 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="Menu">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <Menu>
-        <MenuItem Header="New" />
-        <MenuItem Header="Open" />
+        <MenuItem Header="_Standard" />
+        <MenuItem Header="Selected" IsSelected="True" />
+        <MenuItem Header="Disabled" IsEnabled="False" />
       </Menu>
     </Border>
   </Design.PreviewWith>
 
-  <Style.Resources>
-    <x:Double x:Key="MenuBarHeight">32</x:Double>
-  </Style.Resources>
+  <x:Double x:Key="MenuBarHeight">32</x:Double>
 
-  <Setter Property="Background" Value="Transparent" />
-  <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              HorizontalAlignment="Stretch"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                        VerticalAlignment="Stretch"
-                        KeyboardNavigation.TabNavigation="Continue" />
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+  <ControlTheme x:Key="FluentTopLevelMenuItem" TargetType="MenuItem">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
+    <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuBarItemPadding}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Content="{TemplateBinding Header}"
+                              VerticalAlignment="Center"
+                              HorizontalAlignment="Stretch"
+                              RecognizesAccessKey="True"
+                              Margin="{TemplateBinding Padding}"/>
+            <Popup Name="PART_Popup"
+                   WindowManagerAddShadowHint="False"
+                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
+                   OverlayInputPassThroughElement="{Binding $parent[Menu]}">
+              <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
+                      BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
+                      BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}"
+                      Padding="{DynamicResource MenuFlyoutPresenterThemePadding}"
+                      MaxWidth="{DynamicResource FlyoutThemeMaxWidth}"
+                      MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
+                      HorizontalAlignment="Stretch"
+                      CornerRadius="{DynamicResource OverlayCornerRadius}">
+                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                  Grid.IsSharedSizeScope="True" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+      </Style>
+    </Style>
+
+    <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" />
+      <Style Selector="^ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Menu}" TargetType="Menu">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
+    <Setter Property="ItemContainerTheme" Value="{StaticResource FluentTopLevelMenuItem}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                HorizontalAlignment="Stretch"
+                Padding="{TemplateBinding Padding}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                          VerticalAlignment="Stretch"
+                          KeyboardNavigation.TabNavigation="Continue" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
index ff50acab5e..6bca00b219 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -1,6 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  
-  <Style Selector="MenuFlyoutPresenter">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
     <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
@@ -19,6 +19,7 @@
                 Padding="{DynamicResource FlyoutBorderThemePadding}"
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        Theme="{StaticResource FluentMenuScrollViewer}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"
                             Items="{TemplateBinding Items}"
@@ -31,5 +32,5 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 831537f578..ed29addbc2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -1,60 +1,67 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:DataType="MenuItem"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:DataType="MenuItem"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
-    <Border Padding="20"
-            Width="400"
-            Height="200">
-      <Menu VerticalAlignment="Top">
-        <MenuItem Header="File">
-          <MenuItem Header="Disabled"
-                    IsEnabled="False" />
-          <MenuItem Header="New"
-                    InputGesture="Ctrl+N">
-            <MenuItem Header="XML" />
-          </MenuItem>
-          <MenuItem Header="Open">
-            <MenuItem.Icon>
-              <CheckBox BorderThickness="0"
-                        IsHitTestVisible="False"
-                        IsChecked="True" />
-            </MenuItem.Icon>
-          </MenuItem>
-          <Separator />
-          <MenuItem Header="Exit"
-                    InputGesture="Alt+F4" />
+    <Border Padding="20" Width="320">
+      <StackPanel Spacing="20" HorizontalAlignment="Left">
+        <MenuItem Header="_Standard"/>
+        <MenuItem IsSelected="True" Header="Selected"/>
+        <MenuItem Header="With Icon">
+          <MenuItem.Icon>
+            <TextBlock>😊</TextBlock>
+          </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="Edit">
-          <MenuItem Header="Go To">
-            <MenuItem Header="Go To Line" />
-          </MenuItem>
+        <MenuItem Header="With CheckBox">
+          <MenuItem.Icon>
+            <CheckBox IsChecked="True"/>
+          </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="View">
-          <MenuItem Header="Designer"
-                    InputGesture="Shift+F7" />
+        <MenuItem Header="Input Gesture" InputGesture="Ctrl+G"/>
+        <MenuItem Header="Disabled" IsEnabled="False"/>
+        <MenuItem Header="-"/>
+        <MenuItem Header="Parent" IsSubMenuOpen="True">
+          <MenuItem Header="Child 1"/>
+          <MenuItem Header="Child 2"/>
+          <MenuItem Header="Child 3"/>
+          <Separator/>
+          <MenuItem Header="Child 4"/>
+          <MenuItem Header="Child 5"/>
+          <MenuItem Header="Child 6"/>
+          <MenuItem Header="Child 7"/>
+          <MenuItem Header="Child 8"/>
+          <MenuItem Header="Child 9"/>
+          <MenuItem Header="Child 10"/>
+          <MenuItem Header="Child 11"/>
+          <MenuItem Header="Child 12"/>
+          <MenuItem Header="Child 13"/>
+          <MenuItem Header="Child 14"/>
+          <MenuItem Header="Child 15"/>
+          <MenuItem Header="Child 16"/>
+          <MenuItem Header="Child 17"/>
+          <MenuItem Header="Child 18"/>
+          <MenuItem Header="Child 19"/>
         </MenuItem>
-        <MenuItem Header="Project">
-          <MenuItem Header="Add class" />
+        <MenuItem Header="Disabled Parent" IsEnabled="False">
+          <MenuItem Header="Child"/>
         </MenuItem>
-      </Menu>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
-    <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>    
-    <Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness>
-    <Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness>
-    <StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
-  </Styles.Resources>
+  <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
+  <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>
+  <Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness>
+  <Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness>
+  <StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
 
-  <Style Selector="MenuItem">
+  <ControlTheme x:Key="{x:Type MenuItem}" TargetType="MenuItem">
     <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
-    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePadding}" />
+    <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
@@ -75,35 +82,37 @@
                 <ColumnDefinition Width="Auto"
                                   SharedSizeGroup="MenuItemChevron" />
               </Grid.ColumnDefinitions>
-              <ContentPresenter Name="PART_IconPresenter"
-                                Content="{TemplateBinding Icon}"
-                                Margin="{DynamicResource MenuIconPresenterMargin}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center" />
+
+              <Viewbox Name="PART_IconPresenter"
+                       Margin="{DynamicResource MenuIconPresenterMargin}"
+                       StretchDirection="DownOnly"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       IsVisible="False"
+                       Width="16" Height="16">
+                <ContentPresenter Content="{TemplateBinding Icon}"/>
+              </Viewbox>
 
               <ContentPresenter Name="PART_HeaderPresenter"
                                 Content="{TemplateBinding Header}"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Stretch"
-                                Grid.Column="1">
-                <ContentPresenter.DataTemplates>
-                  <DataTemplate DataType="sys:String">
-                    <AccessText Text="{Binding}" />
-                  </DataTemplate>
-                </ContentPresenter.DataTemplates>
-              </ContentPresenter>
+                                RecognizesAccessKey="True"
+                                Grid.Column="1"/>
               <TextBlock x:Name="PART_InputGestureText"
                          Grid.Column="2"
                          Classes="CaptionTextBlockStyle"
                          Margin="{DynamicResource MenuInputGestureTextMargin}"
                          Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
                          HorizontalAlignment="Right"
-                         VerticalAlignment="Center" />
+                         VerticalAlignment="Center"
+                         Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
               <Path Name="PART_ChevronPath"
                     Stretch="Uniform"
                     Width="8"
                     Height="16"
                     Data="{StaticResource MenuItemChevronPathData}"
+                    Fill="{DynamicResource MenuFlyoutSubItemChevron}"
                     Margin="{DynamicResource MenuFlyoutItemChevronMargin}"
                     VerticalAlignment="Center"
                     Grid.Column="3" />
@@ -123,7 +132,7 @@
                     MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
                     HorizontalAlignment="Stretch"
                     CornerRadius="{DynamicResource OverlayCornerRadius}">
-              <ScrollViewer Classes="menuscroller">
+              <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
                 <ItemsPresenter Name="PART_ItemsPresenter"
                                 Items="{TemplateBinding Items}"
                                 ItemsPanel="{TemplateBinding ItemsPanel}"
@@ -136,144 +145,69 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="Menu > MenuItem">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Panel>
-            <ContentPresenter Name="PART_HeaderPresenter"
-                              Content="{TemplateBinding Header}"
-                              VerticalAlignment="Center"
-                              HorizontalAlignment="Stretch"
-                              Margin="{TemplateBinding Padding}">
-              <ContentPresenter.DataTemplates>
-                <DataTemplate DataType="sys:String">
-                  <AccessText Text="{Binding}" />
-                </DataTemplate>
-              </ContentPresenter.DataTemplates>
-            </ContentPresenter>
-            <Popup Name="PART_Popup"
-                   WindowManagerAddShadowHint="False"
-                   MinWidth="{ReflectionBinding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                   IsLightDismissEnabled="True"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
-                   OverlayInputPassThroughElement="{Binding $parent[Menu]}">
-              <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
-                      BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
-                      BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}"
-                      Padding="{DynamicResource MenuFlyoutPresenterThemePadding}"
-                      MaxWidth="{DynamicResource FlyoutThemeMaxWidth}"
-                      MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
-                      HorizontalAlignment="Stretch"
-                      CornerRadius="{DynamicResource OverlayCornerRadius}">
-                <ScrollViewer Classes="menuscroller">
-                  <ItemsPresenter Name="PART_ItemsPresenter"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}"
-                                  ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                                  Grid.IsSharedSizeScope="True" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="MenuItem">
-    <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
-    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
-  </Style>
-
-  <Style Selector="Menu > MenuItem">
-    <!--  Custom padding for Menu > MenuItem  -->
-    <Setter Property="Padding" Value="{DynamicResource MenuBarItemPadding}" />
-  </Style>
-
-  <Style Selector="MenuItem /template/ ContentPresenter#PART_IconPresenter">
-    <Setter Property="Width" Value="16" />
-    <Setter Property="Height" Value="16" />
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="MenuItem:icon /template/ ContentPresenter#PART_IconPresenter">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="MenuItem /template/ TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
-  </Style>
-  <Style Selector="MenuItem /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevron}" />
-  </Style>
 
-  <Style Selector="MenuItem:selected /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="MenuItem:selected /template/ ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
-  </Style>
-  <Style Selector="MenuItem:selected /template/ TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
-  </Style>
-  <Style Selector="MenuItem:selected /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
-  </Style>
+    <Style Selector="^:icon /template/ Viewbox#PART_IconPresenter">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" />
-  </Style>
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
-  </Style>
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
-  </Style>
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" />
-  </Style>
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+      </Style>
+    </Style>
 
-  <Style Selector="MenuItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
-  </Style>
-  <Style Selector="MenuItem:disabled /template/ ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
-  </Style>
-  <Style Selector="MenuItem:disabled /template/ TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
-  </Style>
-  <Style Selector="MenuItem:disabled /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronDisabled}" />
-  </Style>
+    <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" />
+      <Style Selector="^ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
+      </Style>
+      <Style Selector="^ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
+      </Style>
+      <Style Selector="^ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" />
+      </Style>
+    </Style>
 
-  <Style Selector="MenuItem:open /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronSubMenuOpened}" />
-  </Style>
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronDisabled}" />
+      </Style>
+    </Style>
 
-  <Style Selector="MenuItem:empty /template/ Path#PART_ChevronPath">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+    <Style Selector="^:open /template/ Path#PART_ChevronPath">
+      <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronSubMenuOpened}" />
+    </Style>
 
-  <Style Selector="MenuItem:separator">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Separator />
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
 
-  <Style Selector="MenuItem > Separator, ContextMenu > Separator">
-    <Setter Property="Background" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Margin" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
-    <Setter Property="Height" Value="{DynamicResource MenuFlyoutSeparatorThemeHeight}" />
-  </Style>
-</Styles>
+    <Style Selector="^:separator">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Separator/>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
new file mode 100644
index 0000000000..bc71d88a0d
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
@@ -0,0 +1,98 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+
+  <Design.PreviewWith>
+    <ScrollViewer Theme="{DynamicResource FluentMenuScrollViewer}" Width="200" Height="200">
+      <StackPanel Spacing="20">
+        <TextBlock>Item 1</TextBlock>
+        <TextBlock>Item 2</TextBlock>
+        <TextBlock>Item 3</TextBlock>
+        <TextBlock>Item 4</TextBlock>
+        <TextBlock>Item 5</TextBlock>
+        <TextBlock>Item 6</TextBlock>
+        <TextBlock>Item 7</TextBlock>
+        <TextBlock>Item 8</TextBlock>
+        <TextBlock>Item 9</TextBlock>
+      </StackPanel>
+    </ScrollViewer>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="FluentMenuScrollViewer" TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <RepeatButton DockPanel.Dock="Top"
+                        BorderThickness="0"
+                        Background="Transparent"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        RenderTransform="{x:Null}"
+                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
+            <RepeatButton.IsVisible>
+              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            ConverterParameter="0">
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
+              </MultiBinding>
+            </RepeatButton.IsVisible>
+            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
+              <Path VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
+                    Fill="{DynamicResource ScrollBarButtonArrowForeground}"
+                    Width="20"
+                    Height="20" />
+            </Viewbox>
+          </RepeatButton>
+          <RepeatButton DockPanel.Dock="Bottom"
+                        BorderThickness="0"
+                        Background="Transparent"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        RenderTransform="{x:Null}"
+                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
+            <RepeatButton.IsVisible>
+              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            ConverterParameter="100">
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
+              </MultiBinding>
+            </RepeatButton.IsVisible>
+            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
+              <Path VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
+                    Fill="{DynamicResource ScrollBarButtonArrowForeground}"
+                    Width="20"
+                    Height="20" />
+            </Viewbox>
+          </RepeatButton>
+          <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                  Content="{TemplateBinding Content}"
+                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
+                                  Margin="{TemplateBinding Padding}"
+                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
+                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}">
+            <ScrollContentPresenter.GestureRecognizers>
+              <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+            </ScrollContentPresenter.GestureRecognizers>
+          </ScrollContentPresenter>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^ /template/ RepeatButton:pointerover > Viewbox > Path">
+      <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
index 243095c004..d3eaeafd01 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -1,27 +1,30 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:local="clr-namespace:Avalonia.Themes.Fluent"
-       x:CompileBindings="True"
-       Selector="NativeMenuBar">
-  <Style.Resources>
-    <local:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter" Default="True"/>
-  </Style.Resources>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Menu
-        IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter}}"
-        Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
-        <Menu.Styles>
-          <Style x:DataType="NativeMenuItem" Selector="MenuItem">
-            <Setter Property="Header" Value="{Binding Header}"/>
-            <Setter Property="InputGesture" Value="{Binding Gesture}"/>
-            <Setter Property="Items" Value="{Binding Menu.Items}"/>
-            <Setter Property="Command" Value="{Binding Command}"/>
-            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
-            <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
-          </Style>
-        </Menu.Styles>
-      </Menu>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Avalonia.Themes.Fluent"
+                    x:CompileBindings="True">
+  <local:InverseBooleanValueConverter x:Key="AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter" Default="True"/>
+  <local:IBitmapToImageConverter x:Key="AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter"/>
+  <ControlTheme x:Key="{x:Type NativeMenuBar}" TargetType="NativeMenuBar">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Menu
+          IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter}}"
+          Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
+          <Menu.Styles>
+            <Style x:CompileBindings="False" Selector="MenuItem">
+              <Setter Property="Header" Value="{Binding Header}"/>
+              <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
+              <Setter Property="InputGesture" Value="{Binding Gesture}"/>
+              <Setter Property="Items" Value="{Binding Menu.Items}"/>
+              <Setter Property="Command" Value="{Binding Command}"/>
+              <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+              <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
+              <!--NativeMenuItem is IBitmap and MenuItem is Image-->
+              <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter}}"/>
+            </Style>
+          </Menu.Styles>
+        </Menu>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
index 924d977eb5..51dcdd42e3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
@@ -1,15 +1,15 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="0" Background="White">
       <NotificationCard Content="Testing" />
     </Border>
   </Design.PreviewWith>
-  <Style Selector="NotificationCard">
+  <ControlTheme x:Key="{x:Type NotificationCard}" TargetType="NotificationCard">
     <Setter Property="UseLayoutRounding" Value="True"/>
     <Setter Property="Width" Value="350"/>
     <Setter Property="FontSize" Value="14"/>
-    <Setter Property="Foreground" Value="White"/>
+    <Setter Property="Foreground" Value="{DynamicResource NotificationCardForegroundBrush}"/>
     <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
     <Setter Property="BorderThickness" Value="0" />
     <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />
@@ -24,8 +24,8 @@
                     CornerRadius="{TemplateBinding CornerRadius}"
                     ClipToBounds="True">
               <DockPanel>
-                <Panel x:Name="PART_HeaderBar" Height="4" DockPanel.Dock="Top" />
-                <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
+                <Panel x:Name="PART_HeaderBar" Height="4" Background="{DynamicResource NotificationCardProgressBackgroundBrush}" DockPanel.Dock="Top" />
+                <ContentControl Name="PART_Content" MinHeight="64" Content="{TemplateBinding Content}" />
               </DockPanel>
             </Border>
           </Border>
@@ -33,7 +33,7 @@
       </ControlTemplate>
     </Setter>
 
-    <Style.Animations>
+    <ControlTheme.Animations>
       <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
         <KeyFrame Cue="0%">
           <Setter Property="Opacity" Value="0"/>
@@ -51,56 +51,49 @@
           <Setter Property="ScaleTransform.ScaleY" Value="1"/>
         </KeyFrame>
       </Animation>
-    </Style.Animations>
-  </Style>
+    </ControlTheme.Animations>
 
-  <Style Selector="NotificationCard/template/ ContentControl#PART_Content">
-    <Setter Property="MinHeight" Value="64" />
-  </Style>
+    <Style Selector="^[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
+      <Style.Animations>
+        <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.X" Value="0"/>
+            <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+          </KeyFrame>
+          <KeyFrame Cue="70%">
+            <Setter Property="TranslateTransform.X" Value="800"/>
+            <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="ScaleTransform.ScaleY" Value="0"/>
+            <Setter Property="TranslateTransform.X" Value="800"/>
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
 
-  <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
-    <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
-    <Style.Animations>
-      <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
-        <KeyFrame Cue="0%">
-          <Setter Property="TranslateTransform.X" Value="0"/>
-          <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-        </KeyFrame>
-        <KeyFrame Cue="70%">
-          <Setter Property="TranslateTransform.X" Value="800"/>
-          <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="ScaleTransform.ScaleY" Value="0"/>
-          <Setter Property="TranslateTransform.X" Value="800"/>
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-
-  <Style Selector="NotificationCard[IsClosing=true]">
-    <Style.Animations>
-      <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
-        <KeyFrame Cue="100%">
-          <Setter Property="IsClosed" Value="True"/>
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
+    <Style Selector="^[IsClosing=true]">
+      <Style.Animations>
+        <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
+          <KeyFrame Cue="100%">
+            <Setter Property="IsClosed" Value="True"/>
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
 
-  <Style Selector="NotificationCard /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardProgressBackgroundBrush}"/>
-  </Style>
-  <Style Selector="NotificationCard:information /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
-  </Style>
-  <Style Selector="NotificationCard:success /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
-  </Style>
-  <Style Selector="NotificationCard:warning /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
-  </Style>
-  <Style Selector="NotificationCard:error /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:information /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
+    </Style>
+    <Style Selector="^:success /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
+    </Style>
+    <Style Selector="^:warning /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
+    </Style>
+    <Style Selector="^:error /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index 36ab07e3e3..872367c6da 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -1,17 +1,15 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
         <NumericUpDown Minimum="0"
                        Maximum="10"
                        Increment="0.5"
-                       Width="150"
                        Watermark="Enter text" />
         <NumericUpDown Minimum="0"
                        Maximum="10"
                        Increment="0.5"
-                       Width="150"
                        VerticalContentAlignment="Center"
                        HorizontalContentAlignment="Center"
                        ButtonSpinnerLocation="Left"
@@ -20,13 +18,13 @@
     </Border>
   </Design.PreviewWith>
 
-  <Style Selector="NumericUpDown">
+  <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
+    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -63,6 +61,5 @@
         </ButtonSpinner>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 5d9d04d218..28d8fb508c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -1,18 +1,23 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
-  <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-  <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-  <Setter Property="FontWeight" Value="400" />
-  <Setter Property="FontStyle" Value="Normal" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <VisualLayerManager IsPopup="True">
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"/>
-      </VisualLayerManager>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type OverlayPopupHost}" TargetType="OverlayPopupHost">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <VisualLayerManager IsPopup="True">
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Background="{TemplateBinding Background}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"/>
+          </VisualLayerManager>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
index d4952b3571..5584eb3ab9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
@@ -1,5 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <StackPanel>
       <StackPanel.Resources>
@@ -8,22 +8,18 @@
       <PathIcon Data="{StaticResource settings_regular}" />
     </StackPanel>
   </Design.PreviewWith>
-  <Style Selector="PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+  <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
     <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Background="{TemplateBinding Background}">
-          <Viewbox Height="{TemplateBinding Height}"
-                   Width="{TemplateBinding Width}">
-            <Path Fill="{TemplateBinding Foreground}"
-                  Data="{TemplateBinding Data}"
-                  Stretch="Uniform" />
+          <Viewbox Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+            <Path Fill="{TemplateBinding Foreground}" Data="{TemplateBinding Data}" Stretch="Uniform" />
           </Viewbox>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 1e573913b9..5a924830b1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -1,26 +1,28 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="PopupRoot">
-    <Setter Property="Background" Value="{x:Null}"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type PopupRoot}" TargetType="PopupRoot">
+    <Setter Property="Background" Value="{x:Null}" />
     <Setter Property="TransparencyLevelHint" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
     <Setter Property="FontWeight" Value="400" />
     <Setter Property="FontStyle" Value="Normal" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Panel>
-          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-          <VisualLayerManager IsPopup="True">
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Background="{TemplateBinding Background}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Padding="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Panel>
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <Panel>
+            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Background="{TemplateBinding Background}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Padding="{TemplateBinding Padding}" />
+            </VisualLayerManager>
+          </Panel>
+        </LayoutTransformControl>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index a463334a76..dc591ede12 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -1,18 +1,31 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
-      <StackPanel Spacing="10">
-        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
-        <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
-        <ProgressBar VerticalAlignment="Center" Value="50" />
-        <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
-        <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
+      <StackPanel Orientation="Horizontal" Spacing="10">
+        <StackPanel Spacing="10">
+          <ProgressBar Value="5" Maximum="10" />
+          <ProgressBar Value="50" />
+          <ProgressBar Value="50" Minimum="25" Maximum="75" />
+          <ProgressBar IsIndeterminate="True" />
+          <ProgressBar ShowProgressText="True" Value="50"/>
+          <ProgressBar ShowProgressText="True" 
+                       ProgressTextFormat="\{1\} percent"
+                       Minimum="50" 
+                       Maximum="100" 
+                       Value="70"/>
+        </StackPanel>
+        <ProgressBar IsIndeterminate="True" Orientation="Vertical" />
+        <ProgressBar ShowProgressText="True" Value="50" Orientation="Vertical"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="ProgressBar">
+
+  <converters:StringFormatConverter x:Key="StringFormatConverter"/>
+
+  <ControlTheme x:Key="{x:Type ProgressBar}" TargetType="ProgressBar">
     <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
     <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
@@ -21,144 +34,165 @@
     <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="ProgressBarRoot" ClipToBounds="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">          
-            <Panel>
-              <Panel x:Name="DeterminateRoot">
-                <Border CornerRadius="{TemplateBinding CornerRadius}" x:Name="PART_Indicator" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
-              </Panel>
-              <Panel x:Name="IndeterminateRoot">
-                <Border x:Name="IndeterminateProgressBarIndicator" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
-                <Border x:Name="IndeterminateProgressBarIndicator2" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
-              </Panel>
-              <LayoutTransformControl x:Name="PART_LayoutTransformControl" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{TemplateBinding ShowProgressText}">
-                <TextBlock Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" Text="{ReflectionBinding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
-              </LayoutTransformControl>
+      <ControlTemplate TargetType="ProgressBar">
+        <Border
+            x:Name="ProgressBarRoot"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            ClipToBounds="True"
+            CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <Panel x:Name="DeterminateRoot" Opacity="1">
+              <Panel.Transitions>
+                <Transitions>
+                  <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                </Transitions>
+              </Panel.Transitions>
+              <Border
+                  x:Name="PART_Indicator"
+                  Margin="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Foreground}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
             </Panel>
+            <Panel x:Name="IndeterminateRoot" Opacity="0">
+              <Panel.Transitions>
+                <Transitions>
+                  <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                </Transitions>
+              </Panel.Transitions>
+              <Border
+                  x:Name="IndeterminateProgressBarIndicator"
+                  Margin="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Foreground}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+              <Border
+                  x:Name="IndeterminateProgressBarIndicator2"
+                  Margin="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Foreground}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+            </Panel>
+            <LayoutTransformControl
+                x:Name="PART_LayoutTransformControl"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                IsVisible="{TemplateBinding ShowProgressText}">
+              <TextBlock Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
+                  <TextBlock.Text>
+                    <MultiBinding Converter="{StaticResource StringFormatConverter}">
+                      <TemplateBinding Property="ProgressTextFormat"/>
+                      <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}"/>
+                      <TemplateBinding Property="Percentage"/>
+                      <TemplateBinding Property="Minimum"/>
+                      <TemplateBinding Property="Maximum"/>
+                    </MultiBinding>
+                  </TextBlock.Text>
+                </TextBlock>
+            </LayoutTransformControl>
+          </Panel>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-  </Style>
-  <Style Selector="ProgressBar:horizontal">
-    <Setter Property="MinWidth" Value="200" />
-    <Setter Property="MinHeight" Value="4" />
-  </Style>
-  <Style Selector="ProgressBar:vertical">
-    <Setter Property="MinWidth" Value="4" />
-    <Setter Property="MinHeight" Value="200" />
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-    <Setter Property="LayoutTransform">
-      <Setter.Value>
-        <RotateTransform Angle="90" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <!-- FadeInAnimation mockup-->
-  <Style Selector="ProgressBar /template/ Panel#DeterminateRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
-      </Transitions>
-    </Setter>
-  </Style>
-  <Style Selector="ProgressBar /template/ Panel#IndeterminateRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
-      </Transitions>
-    </Setter>
-  </Style>
-  <Style Selector="ProgressBar /template/ Panel#DeterminateRoot">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-  <Style Selector="ProgressBar /template/ Panel#IndeterminateRoot">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="ProgressBar:indeterminate /template/ Panel#DeterminateRoot">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="ProgressBar:indeterminate /template/ Panel#IndeterminateRoot">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:1.5" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:0.75" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:1.5" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:0.75" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#IndeterminateProgressBarIndicator">
-    <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />    
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
-    <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />    
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#IndeterminateProgressBarIndicator">
-    <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />    
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#IndeterminateProgressBarIndicator2">
-    <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />    
-  </Style>
-</Styles>
+    <Style Selector="^:horizontal /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+    </Style>
+    <Style Selector="^:horizontal">
+      <Setter Property="MinWidth" Value="200" />
+      <Setter Property="MinHeight" Value="4" />
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="MinWidth" Value="4" />
+      <Setter Property="MinHeight" Value="200" />
+    </Style>
+    <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="LayoutTransform">
+        <Setter.Value>
+          <RotateTransform Angle="90" />
+        </Setter.Value>
+      </Setter>
+    </Style>
+    <Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+    <Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+    <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
+      <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+    </Style>
+    <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
+      <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
+      <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
+      <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
index 776519a0c7..a1c4ba4f2d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
@@ -9,7 +9,8 @@
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="RadioButton">
+  
+  <ControlTheme x:Key="{x:Type RadioButton}" TargetType="RadioButton">
     <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
@@ -18,155 +19,152 @@
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />    
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate TargetType="RadioButton">
-        <Border Name="RootBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
+        <Border
+            Name="RootBorder"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}">
           <Grid ColumnDefinitions="20,*">
-            <Grid VerticalAlignment="Top"
-              Height="32">
-
-              <Ellipse Name="OuterEllipse"
-                       Width="20" Height="20"
-                       UseLayoutRounding="False"
-                       StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" />
-
-              <Ellipse Name="CheckOuterEllipse"
-                       Width="20" Height="20"
-                       UseLayoutRounding="False"
-                       StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" />
-
-              <Ellipse Name="CheckGlyph"
-                       Width="8" Height="8"
-                       UseLayoutRounding="False" />
+            <Grid Height="32" VerticalAlignment="Top">
+
+              <Ellipse
+                  Name="OuterEllipse"
+                  Width="20"
+                  Height="20"
+                  Fill="{DynamicResource RadioButtonOuterEllipseFill}"
+                  Stroke="{DynamicResource RadioButtonOuterEllipseStroke}"
+                  StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                  UseLayoutRounding="False" />
+
+              <Ellipse
+                  Name="CheckOuterEllipse"
+                  Width="20"
+                  Height="20"
+                  Fill="{DynamicResource RadioButtonOuterEllipseCheckedFill}"
+                  Opacity="0"
+                  Stroke="{DynamicResource RadioButtonOuterEllipseCheckedStroke}"
+                  StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                  UseLayoutRounding="False" />
+
+              <Ellipse
+                  Name="CheckGlyph"
+                  Width="8"
+                  Height="8"
+                  Fill="{DynamicResource RadioButtonCheckGlyphFill}"
+                  Opacity="0"
+                  Stroke="{DynamicResource RadioButtonCheckGlyphStroke}"
+                  UseLayoutRounding="False" />
             </Grid>
 
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              TextBlock.Foreground="{TemplateBinding Foreground}"
-                              Margin="{TemplateBinding Padding}"
-                              RecognizesAccessKey="True"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Grid.Column="1" />
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                Grid.Column="1"
+                Margin="{TemplateBinding Padding}"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Content}"
+                ContentTemplate="{TemplateBinding ContentTemplate}"
+                Foreground="{TemplateBinding Foreground}"
+                RecognizesAccessKey="True" />
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Normal State -->
-  <Style Selector="RadioButton /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStroke}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFill}" />
-  </Style>
-
-  <Style Selector="RadioButton /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStroke}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFill}" />
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="RadioButton /template/ Ellipse#CheckGlyph">
-    <Setter Property="Opacity" Value="0" />
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" />
-  </Style>
-
-  <!-- PointerOver State -->
-  <Style Selector="RadioButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePointerOver}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#CheckGlyph">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
-  </Style>
-
-
-  <!-- Pressed State -->
-  <Style Selector="RadioButton:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Ellipse#CheckGlyph">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
-  </Style>
-
-
-  <!-- Disabled State -->
-  <Style Selector="RadioButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Ellipse#CheckGlyph">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" />
-  </Style>
-
-
-  <!-- Checked State -->
-  <Style Selector="RadioButton:checked /template/ Ellipse#CheckGlyph">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="RadioButton:checked /template/ Ellipse#OuterEllipse">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="RadioButton:checked /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-</Styles>
+
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#OuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#CheckGlyph">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
+    </Style>
+
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#OuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#CheckGlyph">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
+    </Style>
+
+
+    <!--  Disabled State  -->
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#OuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#CheckGlyph">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" />
+    </Style>
+
+
+    <!--  Checked State  -->
+    <Style Selector="^:checked /template/ Ellipse#CheckGlyph">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#OuterEllipse">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index 6f96a1eb42..a54187104b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -1,28 +1,29 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
         <RepeatButton Content="Click Me!" />
+        <RepeatButton Content="Disabled" IsEnabled="False" />
+        <RepeatButton Content="Rounded" CornerRadius="16"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
-  </Styles.Resources>
-  <Style Selector="RepeatButton">
+
+  <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+
+  <ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
     <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
-    <!--<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />-->
     <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />    
+    <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
+    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
@@ -37,27 +38,27 @@
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="RepeatButton /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
+    </Style>
 
-  <Style Selector="RepeatButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
-  </Style>
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
 
-  <Style Selector="RepeatButton:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
-  </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
+    </Style>
 
-  <Style Selector="RepeatButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
-  </Style>
-</Styles>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
index 4727ff72b9..4544fbe339 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
@@ -1,302 +1,283 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-  <Style Selector="ScrollBar">
-    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarSize}" />
-    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarSize}" />
-    <Setter Property="Background" Value="{DynamicResource ScrollBarBackground}" />
-    <Setter Property="Foreground" Value="{DynamicResource ScrollBarForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarBorderBrush}" />
-  </Style>
-
-  <Style Selector="ScrollBar:vertical">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="Root">
-
-          <Border x:Name="VerticalRoot"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid RowDefinitions="Auto,*,Auto">
-
-              <Rectangle x:Name="TrackRect" Grid.RowSpan="3" Margin="0" />
-
-              <RepeatButton Name="PART_LineUpButton"
-                            HorizontalAlignment="Center"
-                            Classes="line up"
-                            Grid.Row="0"
-                            Focusable="False"
-                            MinWidth="{DynamicResource ScrollBarSize}"
-                            Height="{DynamicResource ScrollBarSize}" />
-
-              <Track Grid.Row="1"
-                     Minimum="{TemplateBinding Minimum}"
-                     Maximum="{TemplateBinding Maximum}"
-                     Value="{TemplateBinding Value, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding ViewportSize}"
-                     Orientation="{TemplateBinding Orientation}"
-                     IsDirectionReversed="True">
-                <Track.DecreaseButton>
-                  <RepeatButton Name="PART_PageUpButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.DecreaseButton>
-                <Track.IncreaseButton>
-                  <RepeatButton Name="PART_PageDownButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.IncreaseButton>
-                <Thumb Classes="thumb"
-                       Opacity="1"
-                       Width="{DynamicResource ScrollBarSize}"
-                       MinHeight="{DynamicResource ScrollBarSize}"
-                       RenderTransformOrigin="100%,50%" />
-              </Track>
-
-              <RepeatButton Name="PART_LineDownButton"
-                            HorizontalAlignment="Center"
-                            Classes="line down"
-                            Grid.Row="2"
-                            Focusable="False"
-                            MinWidth="{DynamicResource ScrollBarSize}"
-                            Height="{DynamicResource ScrollBarSize}" />
-
-            </Grid>
-          </Border>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="Root">
-
-          <Border x:Name="HorizontalRoot"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid ColumnDefinitions="Auto,*,Auto">
-
-              <Rectangle x:Name="TrackRect" Grid.ColumnSpan="3" Margin="0" />
-
-              <RepeatButton Name="PART_LineUpButton"
-                            VerticalAlignment="Center"
-                            Classes="line up"
-                            Grid.Column="0"
-                            Focusable="False"
-                            MinHeight="{DynamicResource ScrollBarSize}"
-                            Width="{DynamicResource ScrollBarSize}" />
-
-              <Track Grid.Column="1"
-                     Minimum="{TemplateBinding Minimum}"
-                     Maximum="{TemplateBinding Maximum}"
-                     Value="{TemplateBinding Value, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding ViewportSize}"
-                     Orientation="{TemplateBinding Orientation}">
-                <Track.DecreaseButton>
-                  <RepeatButton Name="PART_PageUpButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.DecreaseButton>
-                <Track.IncreaseButton>
-                  <RepeatButton Name="PART_PageDownButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.IncreaseButton>
-                <Thumb Classes="thumb"
-                       Opacity="1"
-                       Height="{DynamicResource ScrollBarSize}"
-                       MinWidth="{DynamicResource ScrollBarSize}"
-                       RenderTransformOrigin="50%,100%" />
-              </Track>
-
-              <RepeatButton Name="PART_LineDownButton"
-                            VerticalAlignment="Center"
-                            Classes="line down"
-                            Grid.Column="2"
-                            Focusable="False"
-                            MinHeight="{DynamicResource ScrollBarSize}"
-                            Width="{DynamicResource ScrollBarSize}" />
-
-            </Grid>
-          </Border>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Grid#Root">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarBackgroundPointerOver}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarPanningThumbBackground}" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Orientation="Horizontal" Spacing="20">
+        <StackPanel Spacing="20">
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="100"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="100" IsEnabled="False"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="100"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="100" IsEnabled="False"/>
+        </StackPanel>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="100"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="100" IsEnabled="False"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="100"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="100" IsEnabled="False"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="FluentScrollBarThumb" TargetType="Thumb">
+    <Setter Property="Background" Value="{DynamicResource ScrollBarPanningThumbBackground}"/>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
-          <Border x:Name="ThumbVisual" Background="{TemplateBinding Background}" />
+          <Border Background="{TemplateBinding Background}"
+                  CornerRadius="{TemplateBinding CornerRadius}"/>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
     <Setter Property="Transitions">
       <Transitions>
+        <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" />
         <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />
       </Transitions>
     </Setter>
-  </Style>
 
-  <Style Selector="ScrollBar:vertical /template/ Thumb.thumb">
-    <Setter Property="RenderTransform" Value="{DynamicResource VerticalSmallScrollThumbScaleTransform}" />
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal /template/ Thumb.thumb">
-    <Setter Property="RenderTransform" Value="{DynamicResource HorizontalSmallScrollThumbScaleTransform}" />
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Thumb.thumb">
-    <Setter Property="RenderTransform" Value="none" />
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbBackgroundColor}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb /template/ Border#ThumbVisual">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" />
-      </Transitions>
+    <Style Selector="^:pointerover /template/ Border">
+      <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPointerOver}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ Border">
+      <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPressed}" />
+    </Style>
+    <Style Selector="^:disabled  /template/ Border">
+      <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillDisabled}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentScrollBarPageButton" TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Opacity" Value="0" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}" />
+      </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Thumb.thumb /template/ Border#ThumbVisual">
-    <Setter Property="CornerRadius" Value="0" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPointerOver}" />
-  </Style>
+  </ControlTheme>
 
-  <Style Selector="ScrollBar /template/ Thumb.thumb:pressed">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPressed}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb:disabled">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillDisabled}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton.line">
+  <ControlTheme x:Key="FluentScrollBarLineButton" TargetType="RepeatButton">
+    <Setter Property="Opacity" Value="0" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border x:Name="Root">
-          <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
-                   Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-            <Path x:Name="Arrow"
-              VerticalAlignment="Center"
-              HorizontalAlignment="Center"
-              Width="20" Height="20" />
-          </Viewbox>
-        </Border>
+        <ContentPresenter Background="{DynamicResource ScrollBarButtonBackground}"
+                          BorderBrush="{DynamicResource ScrollBarButtonBorderBrush}"
+                          Content="{TemplateBinding Content}"/>
       </ControlTemplate>
     </Setter>
-    <Setter Property="Opacity" Value="0" />
     <Setter Property="Transitions">
       <Transitions>
         <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
       </Transitions>
     </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton.line /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrush}" />
-  </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pointerover /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPointerOver}" />
-  </Style>
+    <Style Selector="^:pointerover">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}"/>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pressed /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPressed}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter" >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPointerOver}" />
+      </Style>
+    </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:disabled /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushDisabled}" />
-  </Style>
+    <Style Selector="^:pressed">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}"/>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter" >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPressed}" />
+      </Style>
+    </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pointerover /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
-  </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundDisabled}"/>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pressed /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter" >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:disabled /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ RepeatButton.line">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="ScrollBar:vertical /template/ RepeatButton.line.up /template/ Path">
-    <Setter Property="Data"
-            Value="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar:vertical /template/ RepeatButton.line.down /template/ Path">
-    <Setter Property="Data"
-            Value="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal /template/ RepeatButton.line.up /template/ Path">
-    <Setter Property="Data" Value="M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal /template/ RepeatButton.line.down /template/ Path">
-    <Setter Property="Data" Value="M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Rectangle#TrackRect">
-    <Setter Property="StrokeThickness" Value="{DynamicResource ScrollBarTrackBorderThemeThickness}" />
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarTrackFill}" />
-    <Setter Property="Stroke" Value="{DynamicResource ScrollBarTrackStroke}" />
-    <Setter Property="Opacity" Value="0" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Rectangle#TrackRect">
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarTrackFillPointerOver}" />
-    <Setter Property="Stroke" Value="{DynamicResource ScrollBarTrackStrokePointerOver}" />
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton.largeIncrease">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}" />
-      </ControlTemplate>
-    </Setter>
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Opacity" Value="0" />
-  </Style>
+  <ControlTheme x:Key="{x:Type ScrollBar}" TargetType="ScrollBar">
+    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarSize}" />
+    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarSize}" />
+    <Setter Property="Background" Value="{DynamicResource ScrollBarBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ScrollBarForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarBorderBrush}" />
 
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ RepeatButton.largeIncrease">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="Root">
+            <Border x:Name="VerticalRoot"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid RowDefinitions="Auto,*,Auto">
+                <Rectangle x:Name="TrackRect"
+                           Fill="{DynamicResource ScrollBarTrackFill}"
+                           Stroke="{DynamicResource ScrollBarTrackStroke}"
+                           StrokeThickness="{DynamicResource ScrollBarTrackBorderThemeThickness}"
+                           Opacity="0"
+                           Grid.RowSpan="3">
+                  <Rectangle.Transitions>
+                    <Transitions>
+                      <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+                    </Transitions>
+                  </Rectangle.Transitions>
+                </Rectangle>
+
+                <RepeatButton Name="PART_LineUpButton"
+                              HorizontalAlignment="Center"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              Grid.Row="0"
+                              Focusable="False"
+                              MinWidth="{DynamicResource ScrollBarSize}"
+                              Height="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+
+                <Track Grid.Row="1"
+                       Minimum="{TemplateBinding Minimum}"
+                       Maximum="{TemplateBinding Maximum}"
+                       Value="{TemplateBinding Value, Mode=TwoWay}"
+                       ViewportSize="{TemplateBinding ViewportSize}"
+                       Orientation="{TemplateBinding Orientation}"
+                       IsDirectionReversed="True">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_PageUpButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_PageDownButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.IncreaseButton>
+                  <Thumb Theme="{StaticResource FluentScrollBarThumb}"
+                         Width="{DynamicResource ScrollBarSize}"
+                         MinHeight="{DynamicResource ScrollBarSize}"
+                         RenderTransform="{DynamicResource VerticalSmallScrollThumbScaleTransform}"
+                         RenderTransformOrigin="100%,50%" />
+                </Track>
+
+                <RepeatButton Name="PART_LineDownButton"
+                              HorizontalAlignment="Center"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              Grid.Row="2"
+                              Focusable="False"
+                              MinWidth="{DynamicResource ScrollBarSize}"
+                              Height="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
 
-</Styles>
+    <Style Selector="^:horizontal">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="Root">
+            <Border x:Name="HorizontalRoot"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid ColumnDefinitions="Auto,*,Auto">
+                <Rectangle x:Name="TrackRect"
+                           Fill="{DynamicResource ScrollBarTrackFill}"
+                           Stroke="{DynamicResource ScrollBarTrackStroke}"
+                           StrokeThickness="{DynamicResource ScrollBarTrackBorderThemeThickness}"
+                           Opacity="0"
+                           Grid.ColumnSpan="3">
+                  <Rectangle.Transitions>
+                    <Transitions>
+                      <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+                    </Transitions>
+                  </Rectangle.Transitions>
+                </Rectangle>
+
+                <RepeatButton Name="PART_LineUpButton"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              VerticalAlignment="Center"
+                              Grid.Column="0"
+                              Focusable="False"
+                              MinHeight="{DynamicResource ScrollBarSize}"
+                              Width="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+
+                <Track Grid.Column="1"
+                       Minimum="{TemplateBinding Minimum}"
+                       Maximum="{TemplateBinding Maximum}"
+                       Value="{TemplateBinding Value, Mode=TwoWay}"
+                       ViewportSize="{TemplateBinding ViewportSize}"
+                       Orientation="{TemplateBinding Orientation}">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_PageUpButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_PageDownButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.IncreaseButton>
+                  <Thumb Theme="{StaticResource FluentScrollBarThumb}"
+                         Height="{DynamicResource ScrollBarSize}"
+                         MinWidth="{DynamicResource ScrollBarSize}"
+                         RenderTransform="{DynamicResource HorizontalSmallScrollThumbScaleTransform}"
+                         RenderTransformOrigin="50%,100%" />
+                </Track>
+
+                <RepeatButton Name="PART_LineDownButton"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              VerticalAlignment="Center"
+                              Grid.Column="2"
+                              Focusable="False"
+                              MinHeight="{DynamicResource ScrollBarSize}"
+                              Width="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^[IsExpanded=true]">
+      <Style Selector="^ /template/ Grid#Root">
+        <Setter Property="Background" Value="{DynamicResource ScrollBarBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ Rectangle#TrackRect">
+        <Setter Property="Fill" Value="{DynamicResource ScrollBarTrackFillPointerOver}" />
+        <Setter Property="Stroke" Value="{DynamicResource ScrollBarTrackStrokePointerOver}" />
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbBackgroundColor}" />
+        <Setter Property="RenderTransform" Value="none" />
+      </Style>
+      <Style Selector="^ /template/ RepeatButton">
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index 53a1b721d1..2c727b4435 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -1,24 +1,26 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-
+<ResourceDictionary
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
   <Design.PreviewWith>
-    <Grid ColumnDefinitions="*,20,*"
-          Height="300"
-          Width="200"
-          Margin="20">
-      <ScrollViewer>
-        <Border Height="1000" Background="#ccc"/>
-      </ScrollViewer>
-      <ScrollViewer Grid.Column="2" Classes="menuscroller">
-        <Border Height="1000" Background="#ccc"/>
-      </ScrollViewer>
-    </Grid>
+    <ScrollViewer Width="200" Height="200"
+                  HorizontalScrollBarVisibility="Auto">
+      <StackPanel Spacing="20" Width="210">
+        <TextBlock>Item 1</TextBlock>
+        <TextBlock>Item 2</TextBlock>
+        <TextBlock>Item 3</TextBlock>
+        <TextBlock>Item 4</TextBlock>
+        <TextBlock>Item 5</TextBlock>
+        <TextBlock>Item 6</TextBlock>
+        <TextBlock>Item 7</TextBlock>
+        <TextBlock>Item 8</TextBlock>
+        <TextBlock>Item 9</TextBlock>
+      </StackPanel>
+    </ScrollViewer>
   </Design.PreviewWith>
-  
-  <Style Selector="ScrollViewer">
-    <Setter Property="Background"
-            Value="Transparent" />
+
+  <ControlTheme x:Key="{x:Type ScrollViewer}" TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
     <Setter Property="Template">
       <ControlTemplate>
         <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
@@ -32,14 +34,13 @@
                                   CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
                                   Content="{TemplateBinding Content}"
                                   Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
+                                  Padding="{TemplateBinding Padding}"
                                   Offset="{TemplateBinding Offset, Mode=TwoWay}"
                                   Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
                                   IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
             <ScrollContentPresenter.GestureRecognizers>
-              <ScrollGestureRecognizer
-                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+              <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
             </ScrollContentPresenter.GestureRecognizers>
           </ScrollContentPresenter>
           <ScrollBar Name="PART_HorizontalScrollBar"
@@ -64,97 +65,22 @@
                      Visibility="{TemplateBinding VerticalScrollBarVisibility}"
                      Grid.Column="1"
                      Focusable="False" />
-          <Panel x:Name="PART_ScrollBarsSeparator" Grid.Row="1" Grid.Column="1" Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
+          <Panel x:Name="PART_ScrollBarsSeparator"
+                 Grid.Row="1"
+                 Grid.Column="1"
+                 Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}"
+                 Opacity="0">
+            <Panel.Transitions>
+              <Transitions>
+                <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+              </Transitions>
+            </Panel.Transitions>
+          </Panel>
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="ScrollViewer /template/ Panel#PART_ScrollBarsSeparator">
-    <Setter Property="Opacity" Value="0" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollViewer[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="ScrollViewer.menuscroller">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DockPanel>
-          <RepeatButton DockPanel.Dock="Top"
-                        BorderThickness="0"
-                        Background="Transparent"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Center"
-                        RenderTransform="{x:Null}"
-                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
-            <RepeatButton.IsVisible>
-              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                            ConverterParameter="0">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
-              </MultiBinding>
-            </RepeatButton.IsVisible>
-            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
-                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-              <Path VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-                    Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
-                    Width="20"
-                    Height="20" />
-            </Viewbox>
-          </RepeatButton>
-          <RepeatButton DockPanel.Dock="Bottom"
-                        BorderThickness="0"
-                        Background="Transparent"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Center"
-                        RenderTransform="{x:Null}"
-                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
-            <RepeatButton.IsVisible>
-              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                            ConverterParameter="100">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
-              </MultiBinding>
-            </RepeatButton.IsVisible>
-            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
-                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-              <Path VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-                    Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
-                    Width="20"
-                    Height="20" />
-            </Viewbox>
-          </RepeatButton>
-          <ScrollContentPresenter Name="PART_ContentPresenter"
-                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-                                  Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"/>
-        </DockPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton > Viewbox > Path">
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-  </Style>
-
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton:pointerover > Viewbox > Path">
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
-  </Style>
-
-</Styles>
+    <Style Selector="^[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml b/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml
new file mode 100644
index 0000000000..f630969ae6
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <SelectableTextBlock Text="Preview" />
+  </Design.PreviewWith>
+
+  <MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
+    <MenuItem x:Name="SelectableTextBlockContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[SelectableTextBlock].Copy}"
+              IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+  </MenuFlyout>
+
+  <ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock">
+    <Style Selector="^[IsEnabled=True]">
+      <Setter Property="Cursor" Value="IBeam" />
+      <Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
index 5d95ccc404..d13bffe5e1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
@@ -1,7 +1,11 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="Separator">
-    <Setter Property="Focusable" Value="False"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Separator}" TargetType="Separator">
+    <Setter Property="Background" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Height" Value="{DynamicResource MenuFlyoutSeparatorThemeHeight}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Margin" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Padding="{TemplateBinding Margin}"
@@ -11,9 +15,8 @@
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}"
-                Background="{TemplateBinding Background}"/>
+                Background="{TemplateBinding Background}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index 5ee2dc527f..f2351dd5be 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -1,275 +1,373 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Design.PreviewWith>
-    <Border Margin="20" Width="200" Height="200">
+    <Border Margin="20" Width="400" Height="600">
       <DockPanel LastChildFill="True">
         <StackPanel Spacing="10" DockPanel.Dock="Top">
           <Slider Value="50" />
+          <Slider IsDirectionReversed="True" Value="50" />
+          <Slider Value="50" TickPlacement="TopLeft" TickFrequency="10"/>
+          <Slider Value="50" TickPlacement="BottomRight" TickFrequency="10"/>
+          <Slider Value="50" TickPlacement="Outside" TickFrequency="10"/>
           <Slider IsEnabled="False" Value="50" />
+          <Slider Value="50">
+            <DataValidationErrors.Error>
+              <sys:Exception>
+                <x:Arguments>
+                  <x:String>Error</x:String>
+                </x:Arguments>
+              </sys:Exception>
+            </DataValidationErrors.Error>
+          </Slider>
         </StackPanel>
         <StackPanel Spacing="10" Orientation="Horizontal">
           <Slider Value="50" Orientation="Vertical" />
+          <Slider IsDirectionReversed="True" Value="50" Orientation="Vertical" />
           <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+          <Slider Value="50" TickPlacement="TopLeft" TickFrequency="10" Orientation="Vertical" />
+          <Slider Value="50" TickPlacement="BottomRight" TickFrequency="10" Orientation="Vertical" />
+          <Slider Value="50" TickPlacement="Outside" TickFrequency="10" Orientation="Vertical" />
         </StackPanel>
       </DockPanel>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-    <GridLength x:Key="SliderPreContentMargin">15</GridLength>
-    <GridLength x:Key="SliderPostContentMargin">15</GridLength>
-    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
-    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
-    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
-  </Styles.Resources>
-  <Style Selector="Thumb.SliderThumbStyle">
-    <Setter Property="BorderThickness" Value="0" />
+  
+  <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+  <GridLength x:Key="SliderPreContentMargin">15</GridLength>
+  <GridLength x:Key="SliderPostContentMargin">15</GridLength>
+  <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
+  <x:Double x:Key="SliderVerticalWidth">32</x:Double>
+  <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
+  <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
+  <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
+  <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
+  <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
+
+  <ControlTheme x:Key="FluentSliderHorizontalRepeatButton" TargetType="RepeatButton">
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
-        </ControlTemplate>
-      </Setter.Value>
+      <ControlTemplate>
+        <Grid>
+          <Border Name="FocusTarget" Margin="0,-10" Background="Transparent" />
+          <Border Name="TrackBackground"
+                  Background="{TemplateBinding Background}"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  Height="{DynamicResource SliderTrackThemeHeight}"
+                  VerticalAlignment="Center"/>
+        </Grid>
+      </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Slider:horizontal">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentSliderVerticalRepeatButton" TargetType="RepeatButton">
     <Setter Property="Template">
       <ControlTemplate>
-        <DataValidationErrors>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
-              Margin="{DynamicResource SliderTopHeaderMargin}" />
-              <Grid x:Name="SliderContainer" Grid.Row="1">
-                <Grid.Styles>
-                  <Style Selector="TickBar">
-                    <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
-                  </Style>
-                </Grid.Styles>
-                <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.RowDefinitions>
-                  <TickBar Name="TopTickBar" Placement="Top" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                  <!-- <TickBar Name="HorizontalInlineTickBar" Placement="Top" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" /> -->
-                  <TickBar Name="BottomTickBar" Placement="Bottom" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                  <Track Name="PART_Track" Grid.Row="1" Grid.ColumnSpan="3" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Horizontal">
-                    <Track.DecreaseButton>
-                      <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center" />
-                            </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.DecreaseButton>
-                    <Track.IncreaseButton>
-                      <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}" Focusable="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center" />
-                            </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.IncreaseButton>
-                    <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" />
-                  </Track>
-                </Grid>
-              </Grid>
-            </Grid>
-          </Border>
-        </DataValidationErrors>
+        <Grid>
+          <Border Name="FocusTarget" Margin="0,-10" Background="Transparent" />
+          <Border Name="TrackBackground"
+                  Background="{TemplateBinding Background}"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  Width="{DynamicResource SliderTrackThemeHeight}"
+                  HorizontalAlignment="Center"/>
+        </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentSliderThumbTheme" TargetType="Thumb">
     <Setter Property="Template">
       <ControlTemplate>
-        <DataValidationErrors>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
-              Margin="{DynamicResource SliderTopHeaderMargin}" />
-              <Grid x:Name="SliderContainer" Grid.Row="1">
-                <Grid.Styles>
-                  <Style Selector="TickBar">
-                    <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
-                  </Style>
-                </Grid.Styles>
-                <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.ColumnDefinitions>
-                  <TickBar Name="LeftTickBar" Placement="Left" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                  <!-- <TickBar Name="VerticalInlineTickBar" Placement="Inline" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" /> -->
-                  <TickBar Name="RightTickBar" Placement="Right" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
-                  <Track Name="PART_Track" Grid.Column="1" Grid.ColumnSpan="1" Grid.RowSpan="3" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Vertical">
-                    <Track.DecreaseButton>
-                      <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}" Focusable="False" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center" />
-                            </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.DecreaseButton>
-                    <Track.IncreaseButton>
-                      <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}" Focusable="False" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center" />
-                            </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.IncreaseButton>
-                    <Thumb Classes="SliderThumbStyle" Name="SliderThumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderVerticalThumbHeight}" Width="{DynamicResource SliderVerticalThumbWidth}" />
-                  </Track>
-                </Grid>
-              </Grid>
-            </Grid>
-          </Border>
-        </DataValidationErrors>
+        <Border
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}" />
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}" />
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}" />
-  </Style>
-  <Style Selector="Slider /template/ TickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-    <Setter Property="TickFrequency" Value="{TemplateBinding Slider.TickFrequency}" />
-    <Setter Property="Orientation" Value="{TemplateBinding Slider.Orientation}" />
-    <Setter Property="Minimum" Value="{TemplateBinding Slider.Minimum}" />
-    <Setter Property="Maximum" Value="{TemplateBinding Slider.Maximum}" />
-  </Style>
-  
-  <!-- Normal State -->
-  
-  <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-  </Style>
+  </ControlTheme>
 
-  <Style Selector="Slider /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-  </Style>
+  <ControlTheme x:Key="{x:Type Slider}" TargetType="Slider">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Style Selector="^:horizontal">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Border
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+                <Grid x:Name="SliderContainer"
+                      Margin="{TemplateBinding Padding}"
+                      Background="{DynamicResource SliderContainerBackground}">
+                  <Grid.Styles>
+                    <Style Selector="TickBar">
+                      <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                    </Style>
+                  </Grid.Styles>
+                  <Grid
+                      x:Name="HorizontalTemplate"
+                      MinHeight="{DynamicResource SliderHorizontalHeight}"
+                      ColumnDefinitions="Auto,Auto,*">
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                    </Grid.RowDefinitions>
+                    <TickBar
+                        Name="TopTickBar"
+                        Grid.ColumnSpan="3"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="0,0,0,4"
+                        VerticalAlignment="Bottom"
+                        Placement="Top" 
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}"/>
+                    <TickBar
+                        Name="BottomTickBar"
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="0,4,0,0"
+                        VerticalAlignment="Top"
+                        Placement="Bottom"
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}" />
+                    <Track
+                        Name="PART_Track"
+                        Grid.Row="1"
+                        Grid.ColumnSpan="3"
+                        Minimum="{TemplateBinding Minimum}"
+                        Maximum="{TemplateBinding Maximum}"
+                        Value="{TemplateBinding Value, Mode=TwoWay}"
+                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                        Orientation="Horizontal">
+                      <Track.DecreaseButton>
+                        <RepeatButton
+                            Name="PART_DecreaseButton"
+                            Theme="{StaticResource FluentSliderHorizontalRepeatButton}"
+                            Background="{TemplateBinding Foreground}"
+                            Focusable="False"/>
+                      </Track.DecreaseButton>
+                      <Track.IncreaseButton>
+                        <RepeatButton
+                            Name="PART_IncreaseButton"
+                            Theme="{StaticResource FluentSliderHorizontalRepeatButton}"
+                            Background="{TemplateBinding Background}"
+                            Focusable="False"/>
+                      </Track.IncreaseButton>
+                      <Thumb
+                          Name="thumb"
+                          Width="{DynamicResource SliderHorizontalThumbWidth}"
+                          Height="{DynamicResource SliderHorizontalThumbHeight}"
+                          Margin="0"
+                          Padding="0"
+                          Background="{DynamicResource SliderThumbBackground}"
+                          BorderThickness="0"
+                          Theme="{StaticResource FluentSliderThumbTheme}"
+                          DataContext="{TemplateBinding Value}"/>
+                    </Track>
+                  </Grid>
+                </Grid>
+            </Border>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Border
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+                <Grid x:Name="SliderContainer"
+                      Grid.Row="1"
+                      Background="{DynamicResource SliderContainerBackground}"
+                      Margin="{TemplateBinding Padding}">
+                  <Grid.Styles>
+                    <Style Selector="TickBar">
+                      <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                    </Style>
+                  </Grid.Styles>
+                  <Grid
+                      x:Name="VerticalTemplate"
+                      MinWidth="{DynamicResource SliderVerticalWidth}"
+                      RowDefinitions="*,Auto,Auto">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                    </Grid.ColumnDefinitions>
+                    <TickBar
+                        Name="LeftTickBar"
+                        Grid.RowSpan="3"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="0,0,4,0"
+                        HorizontalAlignment="Right"
+                        Placement="Left"
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}"/>
+                    <TickBar
+                        Name="RightTickBar"
+                        Grid.RowSpan="3"
+                        Grid.Column="2"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="4,0,0,0"
+                        HorizontalAlignment="Left"
+                        Placement="Right" 
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}"/>
+                    <Track
+                        Name="PART_Track"
+                        Grid.RowSpan="3"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="1"
+                        Minimum="{TemplateBinding Minimum}"
+                        Maximum="{TemplateBinding Maximum}"
+                        Value="{TemplateBinding Value, Mode=TwoWay}"
+                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                        Orientation="Vertical">
+                      <Track.DecreaseButton>
+                        <RepeatButton
+                            Name="PART_DecreaseButton"
+                            Theme="{StaticResource FluentSliderVerticalRepeatButton}"
+                            Background="{TemplateBinding Foreground}"
+                            Focusable="False"/>
+                      </Track.DecreaseButton>
+                      <Track.IncreaseButton>
+                        <RepeatButton
+                            Name="PART_IncreaseButton"
+                            Background="{TemplateBinding Background}"
+                            Theme="{StaticResource FluentSliderVerticalRepeatButton}"
+                            Focusable="False"/>
+                      </Track.IncreaseButton>
+                      <Thumb
+                          Name="SliderThumb"
+                          Width="{DynamicResource SliderVerticalThumbWidth}"
+                          Height="{DynamicResource SliderVerticalThumbHeight}"
+                          Margin="0"
+                          Padding="0"
+                          Background="{DynamicResource SliderThumbBackground}"
+                          BorderThickness="0"
+                          Theme="{StaticResource FluentSliderThumbTheme}"
+                          DataContext="{TemplateBinding Value}" />
+                    </Track>
+                  </Grid>
+                </Grid>
+            </Border>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
+    </Style>
 
-  <Style Selector="Slider /template/ TickBar">
-    <Setter Property="IsVisible" Value="False" />
-    <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
-  </Style>
+    <!--  TickBar Placement States  -->
 
-  <!-- TickBar Placement States -->
+    <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, ^[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="Slider[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, Slider[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <Style Selector="Slider[TickPlacement=TopLeft] /template/ TickBar#TopTickBar, Slider[TickPlacement=Outside] /template/ TickBar#TopTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <Style Selector="Slider[TickPlacement=BottomRight] /template/ TickBar#BottomTickBar, Slider[TickPlacement=Outside] /template/ TickBar#BottomTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <Style Selector="Slider[TickPlacement=BottomRight] /template/ TickBar#RightTickBar, Slider[TickPlacement=Outside] /template/ TickBar#RightTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <!-- Disabled State -->
+    <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#TopTickBar, ^[TickPlacement=Outside] /template/ TickBar#TopTickBar">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ TickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-  </Style>
+    <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#BottomTickBar, ^[TickPlacement=Outside] /template/ TickBar#BottomTickBar">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- PointerOver State -->
-  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-  </Style>
+    <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#RightTickBar, ^[TickPlacement=Outside] /template/ TickBar#RightTickBar">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- Pressed State -->
-  <Style Selector="Slider:pressed /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
+    <!--  Disabled State  -->
 
-  <Style Selector="Slider:pressed /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
-  </Style>
-  
-  <Style Selector="Slider:error /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-  </Style>
-  
-  <Style Selector="Slider:error">
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ TickBar">
+        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
+      </Style>
+    </Style>
+
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ Grid#SliderContainer">
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Grid#SliderContainer">
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+      </Style>
+
+    </Style>
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ Grid#SliderContainer">
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+      </Style>
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
+      </Style>
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:error">
       <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-  </Style>
-</Styles>
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+      </Style>
+    </Style>
+
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index e0dd0180b3..9a93b2625b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -1,247 +1,206 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True"
         xmlns:converters="using:Avalonia.Controls.Converters">
-
   <Design.PreviewWith>
     <Border Padding="60">
-      <StackPanel>
-        <SplitButton Content="Hello World">
+      <StackPanel Spacing="20">
+        <SplitButton Content="SplitButton">
+          <SplitButton.Flyout>
+            <Flyout>Hello</Flyout>
+          </SplitButton.Flyout>
+        </SplitButton>
+        <SplitButton CornerRadius="16" Content="Rounded">
           <SplitButton.Flyout>
             <Flyout>Hello</Flyout>
           </SplitButton.Flyout>
         </SplitButton>
-        <ToggleSplitButton Content="Hello World">
+        <SplitButton IsEnabled="False">Disabled</SplitButton>
+        <ToggleSplitButton Content="ToggleSplitButton">
+          <ToggleSplitButton.Flyout>
+            <Flyout>Hello</Flyout>
+          </ToggleSplitButton.Flyout>
+        </ToggleSplitButton>
+        <ToggleSplitButton Content="Checked" IsChecked="True">
           <ToggleSplitButton.Flyout>
             <Flyout>Hello</Flyout>
           </ToggleSplitButton.Flyout>
         </ToggleSplitButton>
+        <ToggleSplitButton Content="Checked Disabled" IsChecked="True" IsEnabled="False"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="SplitButtonPrimaryButtonSize">32</x:Double>
-    <x:Double x:Key="SplitButtonSecondaryButtonSize">32</x:Double>
-    <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+  <x:Double x:Key="SplitButtonPrimaryButtonSize">32</x:Double>
+  <x:Double x:Key="SplitButtonSecondaryButtonSize">32</x:Double>
+  <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+  <x:Double x:Key="SplitButtonMinHeight">32</x:Double>
+
+  <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
 
-    <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
-  </Styles.Resources>
+  <ControlTheme x:Key="FluentSplitButtonComponent" TargetType="Button">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
 
-  <Style Selector="SplitButton">
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^[Tag=flyout-open] /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^[Tag=checked]">
+      <Style Selector="^ /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^:disabled /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^[Tag=checked-flyout-open] /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
     <Setter Property="Background" Value="{DynamicResource SplitButtonBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
+    <Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
     <Setter Property="Focusable" Value="True" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Button x:Name="PART_PrimaryButton"
-                    Grid.Column="0"
-                    MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    Command="{TemplateBinding Command}"
-                    CommandParameter="{TemplateBinding CommandParameter}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontSize="{TemplateBinding FontSize}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Padding="{TemplateBinding Padding}"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-
-            <Border x:Name="SeparatorBorder"
-                    Grid.Column="1"
-                    Background="Transparent"
-                    Width="{DynamicResource SplitButtonSeparatorWidth}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}" />
-
-            <Button x:Name="PART_SecondaryButton"
-                    Grid.Column="2"
-                    MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
-                    Padding="0"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Button x:Name="PART_PrimaryButton"
+                  Grid.Column="0"
+                  Theme="{StaticResource FluentSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Content="{TemplateBinding Content}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Command="{TemplateBinding Command}"
+                  CommandParameter="{TemplateBinding CommandParameter}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                  FontFamily="{TemplateBinding FontFamily}"
+                  FontSize="{TemplateBinding FontSize}"
+                  FontWeight="{TemplateBinding FontWeight}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  Padding="{TemplateBinding Padding}"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False" />
+
+          <Border x:Name="SeparatorBorder"
+                  Grid.Column="1"
+                  Background="Transparent"
+                  Width="{DynamicResource SplitButtonSeparatorWidth}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}" />
+
+          <Button x:Name="PART_SecondaryButton"
+                  Grid.Column="2"
+                  Theme="{StaticResource FluentSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                  Padding="0"
+                  HorizontalContentAlignment="Center"
+                  VerticalContentAlignment="Center"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False">
+            <PathIcon Height="12" Width="12"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+          </Button>
+        </Grid>
+      </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Default overridable styles -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-    <Setter Property="Content">
-      <Template>
-        <PathIcon Height="12"
-                  Width="12"
-                  Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-      </Template>
-    </Setter>
-  </Style>
-
-  <!-- Primary and Secondary buttons PointerOver State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Pressed State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- SplitButton Pressed State -->
-  <Style Selector="SplitButton:pressed /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Flyout Open State -->
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Disabled State -->
-  <Style Selector="SplitButton:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-
-  <!-- Checked State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-
-  <!-- Checked PointerOver State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-
-  <!-- Checked Pressed State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- SplitButton Checked Pressed State -->
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Checked Flyout Open State -->
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Disabled Checked State -->
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-</Styles>
+
+    <Style Selector="^:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="flyout-open" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Button">
+      <Setter Property="Tag" Value="checked" />
+    </Style>
+
+    <Style Selector="^:checked:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="checked-flyout-open" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
index 55d46e32a1..9feb6c7fc6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="using:System">
   <Design.PreviewWith>
@@ -15,219 +15,235 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
-    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
-    <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
-    <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
-    <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
-    <!-- Not used here (directly), but preserving for reference
-        <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>-->
-  </Styles.Resources>
-
-  <Style Selector="SplitView">
+  <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+  <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+  <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
+  <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
+  <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
+
+  <ControlTheme x:Key="{x:Type SplitView}" TargetType="SplitView">
     <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
     <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
     <Setter Property="PaneBackground" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}" />
-  </Style>
-
-  <!-- Left -->
-  <Style Selector="SplitView:left">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <!-- why is this throwing a binding error? -->
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-            <ColumnDefinition Width="*"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Left"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}" />
-            <Rectangle Name="HCPaneBorder" Fill="{DynamicResource SystemControlForegroundTransparentBrush}" Width="1" HorizontalAlignment="Right"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-  </Style>
-  <Style Selector="SplitView:overlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#PART_PaneRoot">
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Right -->
-  <Style Selector="SplitView:right">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Right"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}"/>
-            <Rectangle Name="HCPaneBorder"
-                       Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
-                       Width="1" HorizontalAlignment="Left"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-  </Style>
-  <Style Selector="SplitView:overlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Open/Close Pane animation  -->
-  <Style Selector="SplitView:open /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
-  </Style>
-  <Style Selector="SplitView:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="1.0"/>
-  </Style>
-
-  <Style Selector="SplitView:closed /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:closed /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="0.0"/>
-  </Style>
-
-  <Style Selector="SplitView /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="Transparent" />
-  </Style>
-  <Style Selector="SplitView:lightdismiss /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
-  </Style>
-
-  <Style Selector="SplitView:overlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="SplitView:compactoverlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-</Styles>
+
+    <Style Selector="^:left">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="Container" Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <!-- why is this throwing a binding error? -->
+              <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
+              <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot"
+                   Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Left"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter"
+                                Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}" />
+              <Rectangle Name="HCPaneBorder"
+                         Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
+                         Width="1"
+                         HorizontalAlignment="Right"  />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer"
+                         Fill="Transparent"
+                         IsVisible="False"/>
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:overlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactinline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactoverlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <!-- ColumnSpan should be 2 -->
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:inline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+    </Style>
+
+    <Style Selector="^:right">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="Container" Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*"/>
+              <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Right"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter"
+                                Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}"/>
+              <Rectangle Name="HCPaneBorder"
+                         Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
+                         Width="1" HorizontalAlignment="Left"  />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer"/>
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:overlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+          <Setter Property="Grid.Column" Value="1"/>
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactinline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactoverlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:inline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+    </Style>
+
+    <Style Selector="^:open">
+      <Style Selector="^ /template/ Panel#PART_PaneRoot">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Width"
+                              Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                              Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
+      </Style>
+      <Style Selector="^ /template/ Rectangle#LightDismissLayer">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Opacity"
+                              Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                              Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Opacity" Value="1.0"/>
+      </Style>
+    </Style>
+
+    <Style Selector="^:closed">
+      <Style Selector="^ /template/ Panel#PART_PaneRoot">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+      </Style>
+      <Style Selector="^ /template/ Rectangle#LightDismissLayer">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Opacity" Value="0.0"/>
+      </Style>
+    </Style>
+
+    <Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
+    </Style>
+    <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True"/>
+    </Style>
+    <Style Selector="^:compactoverlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True"/>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
index 322f6ce89e..17d179e0cd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
@@ -1,29 +1,24 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Width="400">
       <TabControl>
         <TabItem Header="Arch">
-          <Border Background="AntiqueWhite"
-                  Height="100">
+          <Border Background="AntiqueWhite" Height="100">
             <TextBlock Text="Content" Foreground="Black" FontSize="20"/>
           </Border>
         </TabItem>
         <TabItem Header="Leaf">
-          <Border Background="Green"
-                  Height="100" />
+          <Border Background="Green" Height="100" />
         </TabItem>
-        <TabItem Header="Disabled"
-                 IsEnabled="False" />
+        <TabItem Header="Disabled" IsEnabled="False" />
       </TabControl>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <Thickness x:Key="TabControlTopPlacementItemMargin">0 0 0 2</Thickness>
-  </Styles.Resources>
-  
-  <Style Selector="TabControl">
+  <Thickness x:Key="TabControlTopPlacementItemMargin">0 0 0 2</Thickness>
+
+  <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
     <Setter Property="Margin" Value="0" />
     <Setter Property="Padding" Value="{DynamicResource TabItemMargin}" />
     <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
@@ -40,7 +35,7 @@
                             Items="{TemplateBinding Items}"
                             ItemsPanel="{TemplateBinding ItemsPanel}"
                             ItemTemplate="{TemplateBinding ItemTemplate}"
-                            DockPanel.Dock="{TemplateBinding TabStripPlacement}"/>
+                            DockPanel.Dock="{TemplateBinding TabStripPlacement}" />
             <ContentPresenter Name="PART_SelectedContentHost"
                               Margin="{TemplateBinding Padding}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -51,15 +46,15 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-    <Setter Property="Orientation" Value="Vertical" />
-  </Style>
-  <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-    <Setter Property="Orientation" Value="Vertical" />
-  </Style>
-  <Style Selector="TabControl[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
-  </Style>
-</Styles>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index 83411b425b..c8376480d0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -1,21 +1,22 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
         <TabItem Header="Leaf" />
         <TabItem Header="Arch" IsSelected="True" />
+        <TabItem Header="Background" Background="Yellow"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <x:Double x:Key="TabItemMinHeight">48</x:Double>
-    <x:Double x:Key="TabItemVerticalPipeHeight">24</x:Double>
-    <x:Double x:Key="TabItemPipeThickness">2</x:Double>
-  </Styles.Resources>
 
-  <Style Selector="TabItem">
+  <x:Double x:Key="TabItemMinHeight">48</x:Double>
+  <x:Double x:Key="TabItemVerticalPipeHeight">24</x:Double>
+  <x:Double x:Key="TabItemPipeThickness">2</x:Double>
+
+  <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
     <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
     <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
@@ -26,107 +27,103 @@
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{TemplateBinding Padding}">
+        <Border
+            Name="PART_LayoutRoot"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}"
+            Padding="{TemplateBinding Padding}">
           <Panel>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              Content="{TemplateBinding Header}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                              TextBlock.FontSize="{TemplateBinding FontSize}"
-                              TextBlock.FontWeight="{TemplateBinding FontWeight}" />
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Header}"
+                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                FontFamily="{TemplateBinding FontFamily}"
+                FontSize="{TemplateBinding FontSize}"
+                FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    IsVisible="False"/>
           </Panel>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Nornal state -->
-  <Style Selector="TabItem /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{Binding $parent[TabItem].Background}" />
-  </Style>
-  <Style Selector="TabItem /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="False" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
 
-  <!-- Selected state -->
-  <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
-  <Style Selector="TabItem:selected">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
-  </Style>
-  <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+    <!--  Selected state  -->
+    <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+      <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- PointerOver state -->
-  <Style Selector="TabItem:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-  </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
 
-  <!-- Selected PointerOver state -->
-  <Style Selector="TabItem:selected:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
-  </Style>
+    <!--  Selected PointerOver state  -->
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    </Style>
 
-  <!-- Pressed state -->
-  <Style Selector="TabItem:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-  </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
 
-  <!-- Selected Pressed state -->
-  <Style Selector="TabItem:selected:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
-  </Style>
+    <!--  Selected Pressed state  -->
+    <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    </Style>
 
-  <!-- Disabled state -->
-  <Style Selector="TabItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
-  </Style>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+    </Style>
 
-  <!-- TabStripPlacement States Group -->
-  <Style Selector="TabItem[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
-    <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
-    <Setter Property="Margin" Value="0,0,2,0" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-  <Style Selector="TabItem[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="8,0,0,0" />
-  </Style>
+    <!--  TabStripPlacement States Group  -->
+    <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
+      <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
+      <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
+      <Setter Property="Margin" Value="0,0,2,0" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Margin" Value="8,0,0,0" />
+    </Style>
 
-  <Style Selector="TabItem[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, TabItem[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Height" Value="{DynamicResource TabItemPipeThickness}" />
-    <Setter Property="Margin" Value="0,0,0,2" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-  </Style>
+    <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, ^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
+      <Setter Property="Height" Value="{DynamicResource TabItemPipeThickness}" />
+      <Setter Property="Margin" Value="0,0,0,2" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+    </Style>
 
-  <Style Selector="TabItem[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
-    <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
-    <Setter Property="Margin" Value="2,0,0,0" />
-    <Setter Property="HorizontalAlignment" Value="Right" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-  <Style Selector="TabItem[TabStripPlacement=Right] /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="0,0,8,0" />
-  </Style>
-  <Style Selector="TabItem[TabStripPlacement=Right]">
-    <Setter Property="HorizontalContentAlignment" Value="Right" />
-  </Style>
-</Styles>
+    <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
+      <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
+      <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
+      <Setter Property="Margin" Value="2,0,0,0" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Margin" Value="0,0,8,0" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right]">
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
index 681ac48850..59cb7f6752 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <TabStrip>
@@ -8,7 +9,8 @@
       </TabStrip>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="TabStrip">
+
+  <ControlTheme x:Key="{x:Type TabStrip}" TargetType="TabStrip">
     <Setter Property="Template">
       <ControlTemplate>
         <Border Background="{TemplateBinding Background}"
@@ -28,5 +30,5 @@
         <WrapPanel />
       </ItemsPanelTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index 694e9ef579..fab8ba87aa 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -1,20 +1,21 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
         <TabStripItem>Leaf</TabStripItem>
         <TabStripItem IsSelected="True">Arch</TabStripItem>
+        <TabStripItem Background="Yellow">Background</TabStripItem>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Styles.Resources>
-    <x:Double x:Key="TabStripItemMinHeight">48</x:Double>
-    <x:Double x:Key="TabStripItemPipeThickness">2</x:Double>
-  </Styles.Resources>
 
-  <Style Selector="TabStripItem">
+  <x:Double x:Key="TabStripItemMinHeight">48</x:Double>
+  <x:Double x:Key="TabStripItemPipeThickness">2</x:Double>
+
+  <ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem">
     <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
     <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
@@ -25,83 +26,73 @@
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{TemplateBinding Padding}">
+        <Border
+            Name="PART_LayoutRoot"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}"
+            Padding="{TemplateBinding Padding}">
           <Panel>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                              TextBlock.FontSize="{TemplateBinding FontSize}"
-                              TextBlock.FontWeight="{TemplateBinding FontWeight}" />
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Content}"
+                ContentTemplate="{TemplateBinding ContentTemplate}"
+                FontFamily="{TemplateBinding FontFamily}"
+                FontSize="{TemplateBinding FontSize}"
+                FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    Height="{DynamicResource TabStripItemPipeThickness}"
+                    IsVisible="False"
+                    Margin="0,0,0,2"
+                    VerticalAlignment="Bottom"/>
           </Panel>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
-
-  <!--  Nornal state  -->
-  <Style Selector="TabStripItem /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{Binding $parent[TabStripItem].Background}" />
-  </Style>
-  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe, TabItem[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Height" Value="{DynamicResource TabStripItemPipeThickness}" />
-    <Setter Property="Margin" Value="0,0,0,2" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-  </Style>
 
-  <!--  Selected state  -->
-  <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
-  <Style Selector="TabStripItem:selected">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
-  </Style>
-  <Style Selector="TabStripItem:selected /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+    <!--  Selected state  -->
+    <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+      <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!--  PointerOver state  -->
-  <Style Selector="TabStripItem:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-  </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
 
-  <!--  Selected PointerOver state  -->
-  <Style Selector="TabStripItem:selected:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
-  </Style>
+    <!--  Selected PointerOver state  -->
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    </Style>
 
-  <!--  Pressed state  -->
-  <Style Selector="TabStripItem:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-  </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
 
-  <!--  Selected Pressed state  -->
-  <Style Selector="TabStripItem:selected:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
-  </Style>
+    <!--  Selected Pressed state  -->
+    <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    </Style>
 
-  <!--  Disabled state  -->
-  <Style Selector="TabStripItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
-  </Style>
-</Styles>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index e5b524beeb..224264b51d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -1,40 +1,106 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
-      <TextBox Text="Sample"
-               FontSize="20"
-               Width="100"
-               Classes="clearButton"
-               TextAlignment="Center"/>
+      <StackPanel Spacing="20">
+        <TextBox>Left</TextBox>
+        <TextBox TextAlignment="Center">Center</TextBox>
+        <TextBox Classes="clearButton">Clear</TextBox>
+        <TextBox PasswordChar="*" Classes="revealPasswordButton">Reveal Password</TextBox>
+        <TextBox PasswordChar="*" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
+        <TextBox Watermark="Watermark"/>
+        <TextBox Watermark="Floating Watermark" UseFloatingWatermark="True"/>
+        <TextBox Watermark="Floating Watermark" UseFloatingWatermark="True">Content</TextBox>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
-  
-  <Styles.Resources>
-    <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
-    <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
-      <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </MenuFlyout>
+  <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
+  <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-    <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
-      <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </ContextMenu>
-  </Styles.Resources>
+  <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+    <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+    <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+  </MenuFlyout>
 
-  <Style Selector="TextBox">
+  <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
+    <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+    <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+  </ContextMenu>
+
+  <ControlTheme x:Key="FluentTextBoxButton" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" />
+    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="MinWidth" Value="34" />
+    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+    <Setter Property="Width" Value="{Binding $self.Bounds.Height}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TextControlButtonForeground}"/>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}">
+          </ContentPresenter>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentTextBoxToggleButton"
+                TargetType="ToggleButton"
+                BasedOn="{StaticResource FluentTextBoxButton}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}">
+          </ContentPresenter>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^:checked /template/ ContentPresenter, ^:indeterminate /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />    
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
@@ -60,42 +126,51 @@
             <Border
               Margin="{TemplateBinding BorderThickness}">
               <Grid ColumnDefinitions="Auto,*,Auto" >
-                <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/>
-                <DockPanel x:Name="PART_InnerDockPanel" Grid.Column="1" Grid.ColumnSpan="1" Margin="{TemplateBinding Padding}">
+                <ContentPresenter Grid.Column="0"
+                                  Grid.ColumnSpan="1"
+                                  Content="{TemplateBinding InnerLeftContent}"/>
+                <DockPanel x:Name="PART_InnerDockPanel"
+                           Grid.Column="1"
+                           Grid.ColumnSpan="1"
+                           Cursor="IBeam"
+                           Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
                              Foreground="{DynamicResource SystemAccentColor}"
                              FontSize="{TemplateBinding FontSize}"
+                             IsVisible="False"
                              Text="{TemplateBinding Watermark}"
                              DockPanel.Dock="Top" />
                   <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                 VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
                                 IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
                                 AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-                      <Panel>
-                        <TextBlock Name="PART_Watermark"
-                                Opacity="0.5"
-                                Text="{TemplateBinding Watermark}"
-                                TextAlignment="{TemplateBinding TextAlignment}"
-                                TextWrapping="{TemplateBinding TextWrapping}"
-                                IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        <TextPresenter Name="PART_TextPresenter"
-                                      Text="{TemplateBinding Text, Mode=TwoWay}"
-                                      CaretIndex="{TemplateBinding CaretIndex}"
-                                      SelectionStart="{TemplateBinding SelectionStart}"
-                                      SelectionEnd="{TemplateBinding SelectionEnd}"
-                                      TextAlignment="{TemplateBinding TextAlignment}"
-                                      TextWrapping="{TemplateBinding TextWrapping}"
-                                      PasswordChar="{TemplateBinding PasswordChar}"
-                                      RevealPassword="{TemplateBinding RevealPassword}"
-                                      SelectionBrush="{TemplateBinding SelectionBrush}"
-                                      SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                      CaretBrush="{TemplateBinding CaretBrush}"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> 
-                      </Panel>
-                    </ScrollViewer>
+                    <Panel>
+                      <TextBlock Name="PART_Watermark"
+                              Opacity="0.5"
+                              Text="{TemplateBinding Watermark}"
+                              TextAlignment="{TemplateBinding TextAlignment}"
+                              TextWrapping="{TemplateBinding TextWrapping}"
+                              IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                      <TextPresenter Name="PART_TextPresenter"
+                                    Text="{TemplateBinding Text, Mode=TwoWay}"
+                                    CaretIndex="{TemplateBinding CaretIndex}"
+                                    SelectionStart="{TemplateBinding SelectionStart}"
+                                    SelectionEnd="{TemplateBinding SelectionEnd}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    LineHeight="{TemplateBinding LineHeight}"
+                                    LetterSpacing="{TemplateBinding LetterSpacing}"
+                                    PasswordChar="{TemplateBinding PasswordChar}"
+                                    RevealPassword="{TemplateBinding RevealPassword}"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Panel>
+                  </ScrollViewer>
                 </DockPanel>
                 <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>
               </Grid>
@@ -104,187 +179,87 @@
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Disabled State -->
-  <Style Selector="TextBox:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-  </Style>
 
-  <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-  </Style>
+    <!-- Disabled State -->
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
 
-  <Style Selector="TextBox:disabled /template/ TextBlock#PART_Watermark, TextBox:disabled /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
-  </Style>
+      <Style Selector="^ /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
+      </Style>
 
-  <!-- PointerOver State-->
-  <Style Selector="TextBox:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
-  </Style>
+      <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ /template/ TextBlock#PART_FloatingWatermark">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
+      </Style>
+    </Style>
 
-  <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
-  </Style>
+    <!-- PointerOver State-->
+    <Style Selector="^:pointerover">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
 
-  <Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:pointerover /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
-  </Style>
+      <Style Selector="^ /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+      </Style>
 
-  <!-- Focused State -->
-  <Style Selector="TextBox:focus">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
-  </Style>
+      <Style Selector="^ /template/ TextBlock#PART_Watermark">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
+      </Style>
+    </Style>
 
-  <Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
-  </Style>
+    <!-- Focused State -->
+    <Style Selector="^:focus">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
 
-  <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
-  </Style>
+      <Style Selector="^ /template/ TextBlock#PART_Watermark">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
+      </Style>
 
-  <Style Selector="TextBox:error /template/ Border#PART_BorderElement">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
+      <Style Selector="^ /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
+        <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+      </Style>
+    </Style>
 
-  <Style Selector="TextBox /template/ DockPanel#PART_InnerDockPanel">
-    <Setter Property="Cursor" Value="IBeam" />
-  </Style>
-  
-  <Style Selector="TextBox /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TextBox[UseFloatingWatermark=true]:not(TextBox:empty) /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+    <Style Selector="^:error /template/ Border#PART_BorderElement">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+    </Style>
 
-  <Style Selector="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <ToggleButton Classes="passwordBoxRevealButton"
-                      IsChecked="{CompiledBinding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
-      </Template>
-    </Setter>
-  </Style>
+    <Style Selector="^[UseFloatingWatermark=true]:not(:empty) /template/ TextBlock#PART_FloatingWatermark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="TextBox.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <Button Classes="textBoxClearButton"
-                Command="{Binding $parent[TextBox].Clear}" />
-      </Template>
-    </Setter>
-  </Style>
-
-  <Style Selector="ToggleButton.passwordBoxRevealButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}">
+    <Style Selector="^.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <ToggleButton Theme="{StaticResource FluentTextBoxToggleButton}"
+                        IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
+                        ClipToBounds="True">
             <Panel>
-              <Path x:Name="PART_GlyphElement_Reveal"
-                    Data="{StaticResource PasswordBoxRevealButtonData}"
-                    Height="8"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
-              <Path x:Name="PART_GlyphElement_Hide"
-                    Data="{StaticResource PasswordBoxHideButtonData}"
-                    Height="12"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
+              <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
+                        Height="8" Width="12"
+                        IsVisible="{Binding $parent[ToggleButton].!IsChecked}"/>
+              <PathIcon Data="{StaticResource PasswordBoxHideButtonData}"
+                        Height="12" Width="12"
+                        IsVisible="{Binding $parent[ToggleButton].IsChecked}"/>
             </Panel>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="Button.textBoxClearButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Path x:Name="PART_GlyphElement"
-                  Data="{StaticResource TextBoxClearButtonData}"
-                  Height="10"
-                  Width="10"
-                  Stretch="Uniform"
-                  VerticalAlignment="Center"
-                  HorizontalAlignment="Center"/>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- TextBox.Button Normal State -->
-  <Style Selector="Button.textBoxClearButton, ToggleButton.passwordBoxRevealButton">
-    <Setter Property="MinWidth" Value="34" />
-    <Setter Property="Width" Value="{Binding $self.Bounds.Height}"/>
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />    
-  </Style>
-  <Style Selector="Button.textBoxClearButton /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton /template/ Path#PART_GlyphElement,
-                   ToggleButton.passwordBoxRevealButton /template/ Path#PART_GlyphElement_Reveal,
-                   ToggleButton.passwordBoxRevealButton /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="Fill" Value="{DynamicResource TextControlButtonForeground}" />
-  </Style>
-
-  <!-- TextBox.Button PointerOver State -->
-  <Style Selector="Button.textBoxClearButton:pointerover /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:pointerover /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton:pointerover /template/ Path#PART_GlyphElement,
-                   ToggleButton.passwordBoxRevealButton:pointerover /template/ Path#PART_GlyphElement_Reveal,
-                   ToggleButton.passwordBoxRevealButton:pointerover /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="Fill" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
-  </Style>
-
-  <!-- TextBox.Button Pressed State -->
-  <Style Selector="Button.textBoxClearButton:pressed /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:pressed /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:checked /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:indeterminate /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton:pressed /template/ Path#PART_GlyphElement,
-                   ToggleButton.passwordBoxRevealButton:pressed /template/ Path#PART_GlyphElement_Reveal,
-                   ToggleButton.passwordBoxRevealButton:checked /template/ Path#PART_GlyphElement_Hide,
-                   ToggleButton.passwordBoxRevealButton:indeterminate /template/ Path#PART_GlyphElement_Reveal">
-    <Setter Property="Fill" Value="{DynamicResource TextControlButtonForegroundPressed}" />
-  </Style>
-
-  <!-- TextBox.Button Disabled State -->
-  <Style Selector="Button.textBoxClearButton:disabled /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:disabled /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="ToggleButton.passwordBoxRevealButton:checked /template/ Path#PART_GlyphElement_Reveal">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+          </ToggleButton>
+        </Template>
+      </Setter>
+    </Style>
 
-</Styles>
+    <Style Selector="^.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <Button Theme="{StaticResource FluentTextBoxButton}"
+                  Command="{Binding $parent[TextBox].Clear}"
+                  ClipToBounds="True">
+            <PathIcon Data="{StaticResource TextBoxClearButtonData}" Height="10" Width="10"/>
+          </Button>
+        </Template>
+      </Setter>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 9aa73fc52e..2414ce096e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -1,38 +1,76 @@
-<!--
+<!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True">
-  <Styles.Resources>
-    <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
-    <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
-    <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
-  </Styles.Resources>
+  <Design.PreviewWith>
+    <Border Padding="20" Height="500">
+      <StackPanel Spacing="20" VerticalAlignment="Center">
+        <TimePicker />
+        <TimePicker CornerRadius="10" />
+        <TimePicker IsEnabled="False"/>
+        <TimePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </TimePicker>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-  <Style Selector="ListBoxItem.DateTimePickerItem.HourItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MinuteItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.TimePeriodItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
+  <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
+  <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
+  <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
+  <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
 
-  <Style Selector="TimePicker">    
+  <ControlTheme x:Key="FluentTimePickerFlyoutButton" TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          Foreground="{TemplateBinding Foreground}"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          CornerRadius="{TemplateBinding CornerRadius}"/>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}"/>
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
+      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
     <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
@@ -44,19 +82,9 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                   Grid.Row="0"
-                   Content="{TemplateBinding Header}"
-                   ContentTemplate="{TemplateBinding HeaderTemplate}"
-                   Margin="{DynamicResource TimePickerTopHeaderMargin}"
-                   MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                   TextBlock.Foreground="{DynamicResource TimePickerHeaderForeground}"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Top" />
-
-            <Button x:Name="FlyoutButton"
-                    Grid.Row="1"
+          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}">
+            <Button x:Name="PART_FlyoutButton"
+                    Theme="{StaticResource FluentTimePickerFlyoutButton}"
                     Foreground="{TemplateBinding Foreground}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -66,27 +94,15 @@
                     MinWidth="{DynamicResource TimePickerThemeMinWidth}"
                     MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
                     HorizontalAlignment="Stretch"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    VerticalContentAlignment="Stretch">
-              <Button.Template>
-                <ControlTemplate>
-                  <ContentPresenter Name="ContentPresenter"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  Background="{TemplateBinding Background}"
-                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                  Content="{TemplateBinding Content}"
-                                  TextBlock.Foreground="{TemplateBinding Foreground}"
-                                  HorizontalContentAlignment="Stretch"
-                                  VerticalContentAlignment="Stretch" />
-                </ControlTemplate>
-              </Button.Template>
+                    VerticalAlignment="Top">
 
-              <Grid Name="FlyoutButtonContentGrid">
+              <Grid Name="PART_FlyoutButtonContentGrid">
                 <!--Ignore col defs here, set in code-->
-                <Border x:Name="FirstPickerHost" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <TextBlock x:Name="HourTextBlock"
+                <Border x:Name="PART_FirstPickerHost"
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PART_HourTextBlock"
                       HorizontalAlignment="Center"
                       Padding="{DynamicResource TimePickerHostPadding}"
                       FontFamily="{TemplateBinding FontFamily}"
@@ -94,87 +110,74 @@
                       FontSize="{TemplateBinding FontSize}" />
                 </Border>
 
-                <Rectangle Name="FirstColumnDivider"
-                    Fill="{DynamicResource TimePickerSpacerFill}"
-                    HorizontalAlignment="Center"
-                    Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                    Grid.Column="1" />
+                <Rectangle Name="PART_FirstColumnDivider"
+                           Fill="{DynamicResource TimePickerSpacerFill}"
+                           HorizontalAlignment="Center"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           Grid.Column="1" />
 
-                <Border x:Name="SecondPickerHost" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <TextBlock x:Name="MinuteTextBlock"
-                      HorizontalAlignment="Center"
-                      Padding="{DynamicResource TimePickerHostPadding}"
-                      FontFamily="{TemplateBinding FontFamily}"
-                      FontWeight="{TemplateBinding FontWeight}"
-                      FontSize="{TemplateBinding FontSize}"/>
+                <Border x:Name="PART_SecondPickerHost"
+                        Grid.Column="2"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PART_MinuteTextBlock"
+                             HorizontalAlignment="Center"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}"/>
                 </Border>
 
-                <Rectangle Name="SecondColumnDivider"
-                    Fill="{DynamicResource TimePickerSpacerFill}"
-                    HorizontalAlignment="Center"
-                    Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                    Grid.Column="3" />
+                <Rectangle Name="PART_SecondColumnDivider"
+                           Fill="{DynamicResource TimePickerSpacerFill}"
+                           HorizontalAlignment="Center"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           Grid.Column="3" />
 
-                <Border x:Name="ThirdPickerHost" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <TextBlock x:Name="PeriodTextBlock"
-                      HorizontalAlignment="Center"
-                      Padding="{DynamicResource TimePickerHostPadding}"
-                      FontFamily="{TemplateBinding FontFamily}"
-                      FontWeight="{TemplateBinding FontWeight}"
-                      FontSize="{TemplateBinding FontSize}" />
+                <Border x:Name="PART_ThirdPickerHost"
+                        Grid.Column="4"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PART_PeriodTextBlock"
+                             HorizontalAlignment="Center"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}" />
                 </Border>
               </Grid>
             </Button>
 
-            <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                   IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
+            <Popup Name="PART_Popup"
+                   WindowManagerAddShadowHint="False"
+                   IsLightDismissEnabled="True"
+                   PlacementTarget="{TemplateBinding}"
                    PlacementMode="Bottom">
-              <TimePickerPresenter Name="PickerPresenter" />
+              <TimePickerPresenter Name="PART_PickerPresenter" />
             </Popup>
 
           </Grid>
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="TimePicker:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}"/>
-  </Style>
-  <Style Selector="TimePicker:disabled /template/ Rectangle">
-    <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPointerOver}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}"/>
-  </Style>
+    
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}"/>
+    </Style>
 
-  <Style Selector="TimePicker /template/ Button:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}"/>
-  </Style>
+    <Style Selector="^:hasnotime /template/ Button#PART_FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
+    </Style>
 
-  <Style Selector="TimePicker /template/ Button:disabled /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>
-  </Style>
+    <Style Selector="^:error /template/ Button#PART_FlyoutButton">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+    </Style>
+  </ControlTheme>
 
-  <Style Selector="TimePicker:hasnotime /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
-  </Style>
-  
-  <Style Selector="TimePicker:error /template/ Button#FlyoutButton /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="TimePickerPresenter">
+  <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
     <Setter Property="Width" Value="242" />
     <Setter Property="MinWidth" Value="242" />
-    <Setter Property="MaxHeight" Value="398" />    
+    <Setter Property="MaxHeight" Value="398" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
@@ -190,103 +193,101 @@
                 Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
                 MaxHeight="398">
           <Grid Name="ContentPanel" RowDefinitions="*,Auto">
-            <Grid Name="PickerContainer">
+            <Grid Name="PART_PickerContainer">
               <!--Ignore col defs here, set in code-->
-              <Panel Name="HourHost" Grid.Column="0">
+              <Panel Name="PART_HourHost" Grid.Column="0">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="HourSelector"
-                                          PanelType="Hour"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                  <DateTimePickerPanel Name="PART_HourSelector"
+                                       PanelType="Hour"
+                                       ShouldLoop="True"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
                 </ScrollViewer>
-                <RepeatButton Name="HourUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="HourDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
+                <RepeatButton Name="PART_HourUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PART_HourDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
               </Panel>
 
-              <Panel Name="MinuteHost" Grid.Column="2">
+              <Panel Name="PART_MinuteHost" Grid.Column="2">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="MinuteSelector"
-                                          PanelType="Minute"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                  <DateTimePickerPanel Name="PART_MinuteSelector"
+                                       PanelType="Minute"
+                                       ShouldLoop="True"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
                 </ScrollViewer>
-                <RepeatButton Name="MinuteUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="MinuteDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
+                <RepeatButton Name="PART_MinuteUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PART_MinuteDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
               </Panel>
 
-              <Panel Name="PeriodHost" Grid.Column="4">
+              <Panel Name="PART_PeriodHost" Grid.Column="4">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="PeriodSelector"
-                                          PanelType="TimePeriod"
-                                          ShouldLoop="False"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                  <DateTimePickerPanel Name="PART_PeriodSelector"
+                                       PanelType="TimePeriod"
+                                       ShouldLoop="False"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
                 </ScrollViewer>
-                <RepeatButton Name="PeriodUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="PeriodDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
+                <RepeatButton Name="PART_PeriodUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PART_PeriodDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
               </Panel>
 
               <Rectangle x:Name="HighlightRect" ZIndex="-1"
-                      Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="5"
-                      VerticalAlignment="Center"
-                      Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
-
-              <Rectangle Name="FirstSpacer"
-                  Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="1" />
-
-              <Rectangle Name="SecondSpacer"
-                  Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="3" />
+                         Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}"
+                         Grid.Column="0"
+                         Grid.ColumnSpan="5"
+                         VerticalAlignment="Center"
+                         Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
+              <Rectangle Name="PART_FirstSpacer"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         Grid.Column="1" />
+              <Rectangle Name="PART_SecondSpacer"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         Grid.Column="3" />
             </Grid>
 
-            <Grid Grid.Row="1" Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissHostGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}"
-                      VerticalAlignment="Top"
-                      Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
-                      Grid.ColumnSpan="2" />
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}" 
+                         VerticalAlignment="Top"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
+                         Grid.ColumnSpan="2"/>
+              <Button Name="PART_AcceptButton"
+                      Grid.Column="0"
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75"
+                      Data="M0.5,8.5 5,13.5 15.5,3" />
               </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+              <Button Name="PART_DismissButton"
+                      Grid.Column="1"
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      FontSize="16" 
+                      HorizontalAlignment="Stretch" 
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}" 
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" 
+                      Data="M2,2 14,14 M2,14 14 2" />
               </Button>
             </Grid>
-
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
+    
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
index 4dba5b4ba4..5730b19e78 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
@@ -1,53 +1,59 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border>
-      <TitleBar Background="SkyBlue" Height="30" Width="300" Foreground="Black" />
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="TitleBar">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>    
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
-          <Panel x:Name="PART_MouseTracker" Height="1" VerticalAlignment="Top" />
-          <Panel x:Name="PART_Container">
-            <Border x:Name="PART_Background" Background="{TemplateBinding Background}" />
-            <CaptionButtons x:Name="PART_CaptionButtons" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="{TemplateBinding Foreground}" />
-          </Panel>
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Height="30" Width="300">
+        <TitleBar Background="SkyBlue" Foreground="Black" />
+      </Border>
+    </Design.PreviewWith>
 
-  <Style Selector="TitleBar:fullscreen">
-    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
-  </Style>
+    <ControlTheme x:Key="{x:Type TitleBar}" TargetType="TitleBar">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" 
+                 VerticalAlignment="Stretch">
+            <Panel x:Name="PART_MouseTracker" 
+                   Height="1" 
+                   VerticalAlignment="Top" />
+            <Panel x:Name="PART_Container">
+              <Border x:Name="PART_Background"
+                      Background="{TemplateBinding Background}"
+                      IsHitTestVisible="False"/>
+              <CaptionButtons x:Name="PART_CaptionButtons"
+                              VerticalAlignment="Top" 
+                              HorizontalAlignment="Right"
+                              Foreground="{TemplateBinding Foreground}" />
+            </Panel>
+          </Panel>
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="TitleBar /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="False" />
-  </Style>
+      <Style Selector="^:fullscreen">
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="True" />
-  </Style>
+      <Style Selector="^:fullscreen /template/ Border#PART_Background">
+        <Setter Property="IsHitTestVisible" Value="True" />
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_MouseTracker">
-    <Setter Property="Background" Value="Transparent" />
-  </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_MouseTracker">
+        <Setter Property="Background" Value="Transparent" />
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="translateY(-30px)" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.25" />
-      </Transitions>
-    </Setter>
-  </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_Container">
+        <Setter Property="RenderTransform" Value="translateY(-30px)" />
+        <Setter Property="Transitions">
+          <Transitions>
+            <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.25" />
+          </Transitions>
+        </Setter>
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen:pointerover /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="none" />
-  </Style>
-</Styles>
+      <Style Selector="^:fullscreen:pointerover /template/ Panel#PART_Container">
+        <Setter Property="RenderTransform" Value="none" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index 5ad2b3a6a7..7a46f21534 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -1,5 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
@@ -10,10 +10,9 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
-  </Styles.Resources>
-  <Style Selector="ToggleButton">
+  <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+
+  <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
@@ -21,9 +20,16 @@
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />    
+    <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
+      </Transitions>
+    </Setter>
+
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
@@ -39,75 +45,79 @@
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  
-  <Style Selector="ToggleButton /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
 
-  <Style Selector="ToggleButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
-  </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
 
-  <Style Selector="ToggleButton:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
-  </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
+    </Style>
 
-  <Style Selector="ToggleButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
-  </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
+    </Style>
 
-  <Style Selector="ToggleButton:checked /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
-  </Style>
+    <Style Selector="^:indeterminate">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminate}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminate}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminate}" />
+      </Style>
 
-  <Style Selector="ToggleButton:checked:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
-  </Style>
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePointerOver}" />
+      </Style>
 
-  <Style Selector="ToggleButton:checked:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
-  </Style>
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePressed}" />
+      </Style>
 
-  <Style Selector="ToggleButton:checked:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
-  </Style>
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminateDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminateDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
+      </Style>
+    </Style>
 
-  <Style Selector="ToggleButton:indeterminate /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminate}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminate}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminate}" />
-  </Style>
+    <Style Selector="^:checked">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
+      </Style>
 
-  <Style Selector="ToggleButton:indeterminate:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePointerOver}" />
-  </Style>
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
+      </Style>
 
-  <Style Selector="ToggleButton:indeterminate:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePressed}" />
-  </Style>
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
+      </Style>
 
-  <Style Selector="ToggleButton:indeterminate:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminateDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminateDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
-  </Style>
-</Styles>
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index a9e6569158..90993fcc64 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -1,43 +1,27 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
-    <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
-    <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
-    <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
-  </Styles.Resources>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Design.PreviewWith>
-    <StackPanel Margin="20" Width="250" Spacing="24" >
+    <StackPanel Margin="20" Width="250" Spacing="24">
       <StackPanel Spacing="12" >
-        <TextBlock
-          Text="Automatic updates"
-          Classes="h1"/>
-        <TextBlock
-          Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
-          TextWrapping="Wrap"/>
+        <ToggleSwitch/>
+        <ToggleSwitch IsChecked="True" />
         <ToggleSwitch HorizontalContentAlignment="Left"
-          Content="Enable automatic Updates?"
-          OffContent="Uit"
-          OnContent="Aan"
-          VerticalAlignment="Bottom"/>
-      </StackPanel>
-
-      <StackPanel Spacing="12">
-        <TextBlock
-          Text="Previewer"
-          Classes="h1"/>
-        <TextBlock
-          Text="The previewer Shows a preview off your code, this could slow down your system"
-          TextWrapping="Wrap"/>
-        <ToggleSwitch
-          Background="Green"
-          IsChecked="True" />
+                      Content="Header"
+                      OffContent="Off"
+                      OnContent="On"/>
+        <ToggleSwitch Background="Yellow"/>
       </StackPanel>
     </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="ToggleSwitch">
+  <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
+  <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
+  <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
+  <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
+
+  <ControlTheme x:Key="{x:Type ToggleSwitch}" TargetType="ToggleSwitch">
     <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
@@ -46,20 +30,22 @@
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid Background="{TemplateBinding Background}"
-          RowDefinitions="Auto,*">
-
-          <ContentPresenter x:Name="PART_ContentPresenter"
-            Grid.Row="0"
-            Content="{TemplateBinding Content}"
-            ContentTemplate="{TemplateBinding ContentTemplate}"
-            RecognizesAccessKey="True"
-            VerticalAlignment="Top"/>
-
-          <Grid Grid.Row="1"
-            MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top">
+        <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto,*">
+
+          <ContentPresenter
+              x:Name="PART_ContentPresenter"
+              Grid.Row="0"
+              VerticalAlignment="Top"
+              Content="{TemplateBinding Content}"
+              ContentTemplate="{TemplateBinding ContentTemplate}"
+              Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
+              RecognizesAccessKey="True" />
+
+          <Grid
+              Grid.Row="1"
+              MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
+              HorizontalAlignment="Left"
+              VerticalAlignment="Top">
 
             <Grid.RowDefinitions>
               <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
@@ -73,216 +59,210 @@
               <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <Grid x:Name="SwitchAreaGrid"
-              Grid.RowSpan="3"
-              Grid.ColumnSpan="3"
-              TemplatedControl.IsTemplateFocusTarget="True"
-              Margin="0,5" />
-
-            <ContentPresenter x:Name="PART_OffContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OffContent}"
-              ContentTemplate="{TemplateBinding OffContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <ContentPresenter x:Name="PART_OnContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OnContent}"
-              ContentTemplate="{TemplateBinding OnContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <Border x:Name="OuterBorder"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
-
-            <Border x:Name="SwitchKnobBounds"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"/>
-
-            <Canvas x:Name="SwitchKnob" Grid.Row="1"
-               HorizontalAlignment="Left"
-               Width="20" Height="20">
-
-              <Grid x:Name="MovingKnobs"
-                Width="20" Height="20">
-
-                <Ellipse x:Name="SwitchKnobOn"
-                         Width="10" Height="10" />
-
-                <Ellipse x:Name="SwitchKnobOff"
-                         Width="10" Height="10" />
+            <Grid
+                x:Name="SwitchAreaGrid"
+                Grid.RowSpan="3"
+                Grid.ColumnSpan="3"
+                Background="{DynamicResource ToggleSwitchContainerBackground}"
+                Margin="0,5"
+                TemplatedControl.IsTemplateFocusTarget="True" />
+
+            <ContentPresenter
+                x:Name="PART_OffContentPresenter"
+                Grid.RowSpan="3"
+                Grid.Column="2"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding OffContent}"
+                ContentTemplate="{TemplateBinding OffContentTemplate}" />
+
+            <ContentPresenter
+                x:Name="PART_OnContentPresenter"
+                Grid.RowSpan="3"
+                Grid.Column="2"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding OnContent}"
+                ContentTemplate="{TemplateBinding OnContentTemplate}" />
+
+            <Border
+                x:Name="OuterBorder"
+                Grid.Row="1"
+                Width="40"
+                Height="20"
+                Background="{DynamicResource ToggleSwitchFillOff}"
+                BorderBrush="{DynamicResource ToggleSwitchStrokeOff}"
+                BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}"
+                CornerRadius="10" />
+
+            <Border
+                x:Name="SwitchKnobBounds"
+                Grid.Row="1"
+                Width="40"
+                Height="20"
+                Background="{DynamicResource ToggleSwitchFillOn}"
+                BorderBrush="{DynamicResource ToggleSwitchStrokeOn}"
+                BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"
+                CornerRadius="10" />
+
+            <Canvas
+                x:Name="PART_SwitchKnob"
+                Grid.Row="1"
+                Width="20"
+                Height="20"
+                HorizontalAlignment="Left">
+
+              <Grid x:Name="PART_MovingKnobs" Width="20" Height="20">
+                <Ellipse
+                  x:Name="SwitchKnobOn"
+                  Fill="{DynamicResource ToggleSwitchKnobFillOn}"
+                  Width="10"
+                  Height="10" />
+                <Ellipse
+                  x:Name="SwitchKnobOff"
+                  Fill="{DynamicResource ToggleSwitchKnobFillOff}"
+                  Width="10"
+                  Height="10" />
               </Grid>
             </Canvas>
           </Grid>
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
-  </Style>
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter:empty">
-    <Setter Property="Margin" Value="0" />
-  </Style>
-
-  <!-- NormalState -->
-  <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#OuterBorder">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:not(:dragging) /template/ Grid#MovingKnobs">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut"/>
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <!-- PointerOverState -->
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}"/>
-  </Style>
-
-  <!-- PressedState -->
-  <Style Selector="ToggleSwitch:pressed /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}"/>
-  </Style>
-
-  <!-- DisabledState -->
-  <Style Selector="ToggleSwitch:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
-  </Style>
-
-  <!-- CheckedState -->
-  <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <!--UncheckedState -->
-  <Style Selector="ToggleSwitch:unchecked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-</Styles>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
+      <Setter Property="Margin" Value="0" />
+    </Style>
+
+    <!--  NormalState  -->
+    <Style Selector="^:not(:dragging) /template/ Grid#PART_MovingKnobs">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition
+              Easing="CubicEaseOut"
+              Property="Canvas.Left"
+              Duration="0:0:0.2" />
+        </Transitions>
+      </Setter>
+    </Style>
+
+    <!--  PointerOverState  -->
+    <Style Selector="^:pointerover /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
+    </Style>
+
+    <!--  PressedState  -->
+    <Style Selector="^:pressed /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
+    </Style>
+
+    <!--  DisabledState  -->
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
+    </Style>
+
+    <!--  CheckedState  -->
+    <Style Selector="^:checked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <!--  UncheckedState  -->
+    <Style Selector="^:unchecked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
index 2d18be91cb..bc9dceb545 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
@@ -1,56 +1,34 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"       
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
-    <Grid RowDefinitions="Auto,Auto"
-          ColumnDefinitions="Auto,Auto"
-          HorizontalAlignment="Center">
-      <Border Grid.Column="0"
-              Grid.Row="1"
-              Background="{DynamicResource SystemControlBackgroundAccentBrush}"
-              Margin="5"
-              Padding="50"
-              ToolTip.Tip="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.">
-        <TextBlock>Hover Here</TextBlock>
-      </Border>
-      <CheckBox Grid.Column="1"
-                Margin="5"
-                Grid.Row="0"
-                IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}"
-                Content="ToolTip Open" />
-      <Border Name="Border"
-              Grid.Column="1"
-              Grid.Row="1"
-              Background="{DynamicResource SystemControlBackgroundAccentBrush}"
-              Margin="5"
-              Padding="50"
-              ToolTip.Placement="Bottom">
-        <ToolTip.Tip>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <ToolTip Opacity="1">Text Content</ToolTip>
+        <ToolTip Opacity="1">Very long text content which should exceed the maximum with of the tooltip and wrap.</ToolTip>
+        <ToolTip Opacity="1">
           <StackPanel>
-            <TextBlock Classes="h1">ToolTip</TextBlock>
-            <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
+            <TextBlock>Multi-line</TextBlock>
+            <TextBlock>Control Content</TextBlock>
           </StackPanel>
-        </ToolTip.Tip>
-        <TextBlock>ToolTip bottom placement</TextBlock>
-      </Border>
-    </Grid>
+        </ToolTip>
+      </StackPanel>
+    </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <sys:Double x:Key="ToolTipContentMaxWidth">320</sys:Double>
-  </Styles.Resources>
+  <sys:Double x:Key="ToolTipContentMaxWidth">320</sys:Double>
 
-  <Style Selector="ToolTip">
+  <ControlTheme x:Key="{x:Type ToolTip}" TargetType="ToolTip">
     <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
     <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />    
+    <Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />
     <Setter Property="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
     <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
     <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="Opacity" Value="0" />
     <Setter Property="Transitions">
       <Transitions>
         <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
@@ -67,21 +45,14 @@
           <ContentPresenter Name="PART_ContentPresenter"
                             MaxWidth="{TemplateBinding MaxWidth}"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            TextBlock.TextWrapping="Wrap"/>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="ToolTip > TextBlock">
-    <Setter Property="TextWrapping" Value="Wrap" />
-  </Style>
-
-  <Style Selector="ToolTip">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
 
-  <Style Selector="ToolTip:open">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-</Styles>
+    <Style Selector="^:open">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
index 6a4d56ccb7..f1971fe236 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
@@ -1,7 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TransitioningContentControl">
-    <!-- Set Defaults -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TransitioningContentControl}" TargetType="TransitioningContentControl">
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
@@ -13,8 +12,8 @@
                           Content="{TemplateBinding CurrentContent}"
                           Padding="{TemplateBinding Padding}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
index 656b72e07b..c340599000 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
@@ -1,28 +1,43 @@
-<Style xmlns="https://github.com/avaloniaui"
-       Selector="TreeView">
-  <Setter Property="Background" Value="Transparent" />
-  <Setter Property="BorderBrush" Value="Transparent" />
-  <Setter Property="BorderThickness" Value="0" />
-  <Setter Property="Padding" Value="0" />
-  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-  <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Background="{TemplateBinding Background}"
-                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          Margin="{TemplateBinding Padding}" />
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TreeView>
+          <TreeViewItem Header="Root" IsExpanded="True">
+            <TreeViewItem Header="Child1"/>
+            <TreeViewItem Header="Child2"/>
+          </TreeViewItem>
+        </TreeView>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type TreeView}" TargetType="TreeView">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Background="{TemplateBinding Background}"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            Margin="{TemplateBinding Padding}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index e66392113f..83abe7848c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
 
@@ -6,32 +6,29 @@
     <Border Padding="20"
             MinWidth="300">
       <TreeView>
-        <TreeViewItem Header="Level 1">
-          <TreeViewItem Header="Level 2.1">
+        <TreeViewItem Header="Level 1" IsExpanded="True">
+          <TreeViewItem Header="Level 2.1" IsSelected="True" IsExpanded="True">
             <TreeViewItem Header="Level 3.1" />
-            <TreeViewItem Header="Level 3.2">
+            <TreeViewItem Header="Level 3.2" IsSelected="True">
               <TreeViewItem Header="Level 4" />
             </TreeViewItem>
           </TreeViewItem>
-          <TreeViewItem Header="Level 2.2"
-                        IsEnabled="False" />
+          <TreeViewItem Header="Level 2.2" IsEnabled="False" />
         </TreeViewItem>
       </TreeView>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="TreeViewItemIndent">16</x:Double>
-    <x:Double x:Key="TreeViewItemExpandCollapseChevronSize">12</x:Double>
-    <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
-    <StreamGeometry x:Key="TreeViewItemCollapsedChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
-    <StreamGeometry x:Key="TreeViewItemExpandedChevronPathData">M0,1 L10,10 20,1 19,0 10,8 1,0 Z</StreamGeometry>
-    <converters:MarginMultiplierConverter Indent="{StaticResource TreeViewItemIndent}"
-                                          Left="True"
-                                          x:Key="TreeViewItemLeftMarginConverter" />
-  </Styles.Resources>
+  <x:Double x:Key="TreeViewItemIndent">16</x:Double>
+  <x:Double x:Key="TreeViewItemExpandCollapseChevronSize">12</x:Double>
+  <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
+  <StreamGeometry x:Key="TreeViewItemCollapsedChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
+  <StreamGeometry x:Key="TreeViewItemExpandedChevronPathData">M0,1 L10,10 20,1 19,0 10,8 1,0 Z</StreamGeometry>
+  <converters:MarginMultiplierConverter Indent="{StaticResource TreeViewItemIndent}"
+                                        Left="True"
+                                        x:Key="TreeViewItemLeftMarginConverter" />
 
-  <Style Selector="ToggleButton.ExpandCollapseChevron">
+  <ControlTheme x:Key="FluentTreeViewExpandCollapseChevron" TargetType="ToggleButton">
     <Setter Property="Margin" Value="0" />
     <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
     <Setter Property="Height" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
@@ -43,6 +40,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
           <Path x:Name="ChevronPath"
+                Data="{StaticResource TreeViewItemCollapsedChevronPathData}"
                 Fill="{DynamicResource TreeViewItemForeground}"
                 Stretch="Uniform"
                 HorizontalAlignment="Center"
@@ -50,10 +48,13 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="TreeViewItem">
-    <Style.Resources />
+    <Style Selector="^:checked /template/ Path#ChevronPath">
+      <Setter Property="Data" Value="{StaticResource TreeViewItemExpandedChevronPathData}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TreeViewItem}" TargetType="TreeViewItem">
     <Setter Property="Padding" Value="0" />
     <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
@@ -79,7 +80,7 @@
               <Panel Name="PART_ExpandCollapseChevronContainer"
                      Margin="{StaticResource TreeViewItemExpandCollapseChevronMargin}">
                 <ToggleButton Name="PART_ExpandCollapseChevron"
-                              Classes="ExpandCollapseChevron"
+                              Theme="{StaticResource FluentTreeViewExpandCollapseChevron}"
                               Focusable="False"
                               IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
               </Panel>
@@ -99,83 +100,75 @@
         </StackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!--  PointerOver state  -->
-  <Style Selector="TreeViewItem /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPointerOver}" />
-  </Style>
-  <Style Selector="TreeViewItem /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundPointerOver}" />
-  </Style>
 
-  <!--  Pressed state  -->
-  <Style Selector="TreeViewItem:pressed /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPressed}" />
-  </Style>
-  <Style Selector="TreeViewItem:pressed /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundPressed}" />
-  </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPointerOver}" />
+    </Style>
+    <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPointerOver}" />
+    </Style>
 
-  <!--  Disabled state  -->
-  <Style Selector="TreeViewItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
-  </Style>
-  <Style Selector="TreeViewItem:disabled /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
-  </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPressed}" />
+    </Style>
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPressed}" />
+    </Style>
 
-  <!--  Selected state  -->
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelected}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelected}" />
-  </Style>
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundSelected}" />
-  </Style>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
+    </Style>
 
-  <!--  Selected PointerOver state  -->
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPointerOver}" />
-  </Style>
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPointerOver}" />
-  </Style>
+    <!--  Selected state  -->
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelected}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelected}" />
+    </Style>
 
-  <!--  Selected Pressed state  -->
-  <Style Selector="TreeViewItem:pressed:selected /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPressed}" />
-  </Style>
-  <Style Selector="TreeViewItem:pressed:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPressed}" />
-  </Style>
+    <!--  Selected PointerOver state  -->
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPointerOver}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPointerOver}" />
+    </Style>
 
-  <!--  Disabled Selected state  -->
-  <Style Selector="TreeViewItem:disabled:selected /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedDisabled}" />
-  </Style>
-  <Style Selector="TreeViewItem:disabled:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedDisabled}" />
-  </Style>
+    <!--  Selected Pressed state  -->
+    <Style Selector="^:pressed:selected /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPressed}" />
+    </Style>
+    <Style Selector="^:pressed:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPressed}" />
+    </Style>
 
-  <!--  ExpandCollapseChevron Group states  -->
-  <Style Selector="ToggleButton.ExpandCollapseChevron /template/ Path#ChevronPath">
-    <Setter Property="Data" Value="{StaticResource TreeViewItemCollapsedChevronPathData}" />
-  </Style>
-  <Style Selector="ToggleButton.ExpandCollapseChevron:checked /template/ Path#ChevronPath">
-    <Setter Property="Data" Value="{StaticResource TreeViewItemExpandedChevronPathData}" />
-  </Style>
-  <Style Selector="TreeViewItem:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TreeViewItem:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
-    <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
-  </Style>
+    <!--  Disabled Selected state  -->
+    <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedDisabled}" />
+    </Style>
+    <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedDisabled}" />
+    </Style>
 
-</Styles>
+    <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
+      <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
index d6028daff8..7dc23f652a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
@@ -1,16 +1,24 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(UserControl)">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector=":is(UserControl)">
+  <Style.Resources>
+    <ControlTheme x:Key="FluentUserControl" TargetType="UserControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  </Style.Resources>
+  
+  <Setter Property="Theme" Value="{StaticResource FluentUserControl}" />
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
index 90963c606c..35cc81663f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
@@ -1,27 +1,30 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Window">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>  
-  <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
-  <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>  
-  <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
-        <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
-        <VisualLayerManager>
-          <VisualLayerManager.ChromeOverlayLayer>
-            <TitleBar />
-          </VisualLayerManager.ChromeOverlayLayer>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </VisualLayerManager>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Window}" TargetType="Window">
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+    <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+          <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
+          <VisualLayerManager>
+            <VisualLayerManager.ChromeOverlayLayer>
+              <TitleBar />
+            </VisualLayerManager.ChromeOverlayLayer>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+          </VisualLayerManager>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
index 2ff5284d0d..77f49941f0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
@@ -1,47 +1,57 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:DataType="WindowNotificationManager"
-        x:CompileBindings="True">
-  <Style Selector="WindowNotificationManager">
-    <Setter Property="Margin" Value="0 0"/>    
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True"
+                    x:DataType="WindowNotificationManager">
+  <ControlTheme x:Key="{x:Type WindowNotificationManager}" TargetType="WindowNotificationManager">
+    <Setter Property="Margin" Value="0 0" />
     <Setter Property="Template">
       <ControlTemplate>
         <ReversibleStackPanel Name="PART_Items">
           <ReversibleStackPanel.DataTemplates>
             <DataTemplate DataType="INotification">
-              <StackPanel Spacing="8" Margin="12" TextBlock.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
-                <TextBlock Text="{Binding Title}" FontWeight="Medium" />
-                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
+              <StackPanel
+                  Margin="12"
+                  Spacing="8"
+                  TextElement.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
+                <TextBlock FontWeight="Medium" Text="{Binding Title}" />
+                <TextBlock
+                    MaxHeight="80"
+                    Margin="0,0,12,0"
+                    Text="{Binding Message}"
+                    TextWrapping="Wrap" />
               </StackPanel>
             </DataTemplate>
             <DataTemplate DataType="x:String">
-              <TextBlock Text="{Binding }" Margin="12" Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+              <TextBlock
+                  Margin="12"
+                  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
+                  Text="{Binding}" />
             </DataTemplate>
           </ReversibleStackPanel.DataTemplates>
         </ReversibleStackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="WindowNotificationManager:topleft /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-  </Style>
+    <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
 
-  <Style Selector="WindowNotificationManager:topright /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="HorizontalAlignment" Value="Right"/>
-  </Style>
+    <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
 
-  <Style Selector="WindowNotificationManager:bottomleft /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="ReverseOrder" Value="True"/>
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-  </Style>
+    <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
 
-  <Style Selector="WindowNotificationManager:bottomright /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="ReverseOrder" Value="True"/>
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="HorizontalAlignment" Value="Right"/>
-  </Style>
-</Styles>
+    <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml b/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
index f0f3e5ea16..3b9c5038e6 100644
--- a/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
+++ b/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
@@ -15,7 +15,7 @@
             <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
             <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
             <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
-            <Thickness x:Key="ComboBoxMinHeight">24</Thickness>
+            <x:Double x:Key="ComboBoxMinHeight">24</x:Double>
             <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
             <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
         </Style.Resources>
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.cs b/src/Avalonia.Themes.Fluent/FluentTheme.cs
index d1136d44a4..79dd81a068 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.cs
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.cs
@@ -50,7 +50,9 @@ namespace Avalonia.Themes.Fluent
         /// <param name="serviceProvider">The XAML service provider.</param>
         public FluentTheme(IServiceProvider serviceProvider)
         {
-            _baseUri = ((IUriContext)serviceProvider.GetService(typeof(IUriContext))).BaseUri;
+            var ctx  = serviceProvider.GetService(typeof(IUriContext)) as IUriContext
+                 ?? throw new NullReferenceException("Unable retrive UriContext");
+            _baseUri = ctx.BaseUri;
             InitStyles(_baseUri);
         }
 
@@ -78,9 +80,17 @@ namespace Avalonia.Themes.Fluent
             set => SetValue(DensityStyleProperty, value);
         }
         
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
+            
+            if (_loaded is null)
+            {
+                // If style wasn't yet loaded, no need to change children styles,
+                // it will be applied later in Loaded getter.
+                return;
+            }
+            
             if (change.Property == ModeProperty)
             {
                 if (Mode == FluentThemeMode.Dark)
@@ -146,7 +156,7 @@ namespace Avalonia.Themes.Fluent
 
         IReadOnlyList<IStyle> IStyle.Children => _loaded?.Children ?? Array.Empty<IStyle>();
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add
             {
@@ -164,7 +174,7 @@ namespace Avalonia.Themes.Fluent
             }
         }
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
+        public SelectorMatchResult TryAttach(IStyleable target, object? host) => Loaded.TryAttach(target, host);
 
         public bool TryGetResource(object key, out object? value)
         {
diff --git a/src/Avalonia.Themes.Fluent/IBitmapToImageConverter.cs b/src/Avalonia.Themes.Fluent/IBitmapToImageConverter.cs
new file mode 100644
index 0000000000..34670882f8
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/IBitmapToImageConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Themes.Fluent
+{
+    internal class IBitmapToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is IBitmap bm)
+                return new Image { Source=bm };
+                
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/Accents/Base.xaml b/src/Avalonia.Themes.Simple/Accents/Base.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Accents/Base.xaml
rename to src/Avalonia.Themes.Simple/Accents/Base.xaml
diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Simple/Accents/BaseDark.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Accents/BaseDark.xaml
rename to src/Avalonia.Themes.Simple/Accents/BaseDark.xaml
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Simple/Accents/BaseLight.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Accents/BaseLight.xaml
rename to src/Avalonia.Themes.Simple/Accents/BaseLight.xaml
diff --git a/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt b/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
new file mode 100644
index 0000000000..40ed4a0f87
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <AvaloniaResource Include="**/*.xaml" />
+  </ItemGroup>
+  <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
+</Project>
diff --git a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
new file mode 100644
index 0000000000..65dfaf982b
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type AutoCompleteBox}"
+                TargetType="AutoCompleteBox">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <TextBox Name="PART_TextBox"
+                   Padding="{TemplateBinding Padding}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   Watermark="{TemplateBinding Watermark}" />
+
+          <Popup Name="PART_Popup"
+                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                 MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                 IsLightDismissEnabled="True"
+                 PlacementTarget="{TemplateBinding}">
+            <Border Background="{DynamicResource ThemeBackgroundBrush}"
+                    BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                    BorderThickness="1">
+              <ListBox Name="PART_SelectingItemsControl"
+                       Background="{TemplateBinding Background}"
+                       BorderThickness="0"
+                       Foreground="{TemplateBinding Foreground}"
+                       ItemTemplate="{TemplateBinding ItemTemplate}"
+                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                       ScrollViewer.VerticalScrollBarVisibility="Auto" />
+            </Border>
+          </Popup>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Button.xaml b/src/Avalonia.Themes.Simple/Controls/Button.xaml
new file mode 100644
index 0000000000..9018677ab6
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Button.xaml
@@ -0,0 +1,38 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Button}"
+                TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          RecognizesAccessKey="True"
+                          TextElement.Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
new file mode 100644
index 0000000000..9798e5290b
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
@@ -0,0 +1,89 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+
+  <ControlTheme x:Key="SimpleButtonSpinnerRepeatButton"
+                BasedOn="{StaticResource {x:Type RepeatButton}}"
+                TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Style Selector="^ /template/ RepeatButton:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type ButtonSpinner}"
+                TargetType="ButtonSpinner">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Border Name="border"
+                  Margin="{TemplateBinding Padding}"
+                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DockPanel>
+              <UniformGrid Name="PART_SpinnerPanel"
+                           DockPanel.Dock="Right"
+                           IsVisible="{TemplateBinding ShowButtonSpinner}"
+                           Rows="2">
+                <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource SimpleButtonSpinnerRepeatButton}">
+                  <Path Width="8"
+                        Height="4"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"
+                        Fill="{DynamicResource ThemeForegroundBrush}"
+                        Stretch="Uniform" />
+                </RepeatButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource SimpleButtonSpinnerRepeatButton}">
+                  <Path Width="8"
+                        Height="4"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"
+                        Fill="{DynamicResource ThemeForegroundBrush}"
+                        Stretch="Uniform" />
+                </RepeatButton>
+              </UniformGrid>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </DockPanel>
+          </Border>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:left">
+      <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
+        <Setter Property="DockPanel.Dock" Value="Left" />
+      </Style>
+    </Style>
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:focus /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:error /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+    </Style>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Calendar.xaml b/src/Avalonia.Themes.Simple/Controls/Calendar.xaml
new file mode 100644
index 0000000000..08305319e1
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Calendar.xaml
@@ -0,0 +1,32 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Calendar}"
+                TargetType="Calendar">
+    <!--<Setter Property="Focusable" Value="False" />-->
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="HeaderBackground" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel Name="PART_Root"
+                    HorizontalAlignment="Center"
+                    ClipToBounds="True">
+          <CalendarItem Name="PART_CalendarItem"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        HeaderBackground="{TemplateBinding HeaderBackground}" />
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
new file mode 100644
index 0000000000..59fb24663f
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
@@ -0,0 +1,73 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CalendarButton}"
+                TargetType="CalendarButton">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="MinWidth" Value="37" />
+    <Setter Property="MinHeight" Value="38" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+
+          <Rectangle Name="SelectedBackground"
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.75" />
+
+          <Rectangle Name="Background"
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.5" />
+
+          <!--  Focusable="False"  -->
+          <ContentControl Name="Content"
+                          Margin="1,0,1,1"
+                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          FontSize="{TemplateBinding FontSize}"
+                          Foreground="{TemplateBinding Foreground}" />
+
+          <Rectangle Name="FocusVisual"
+                     IsHitTestVisible="False"
+                     IsVisible="False"
+                     Stroke="{DynamicResource HighlightBrush}"
+                     StrokeThickness="1" />
+
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:pressed /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Rectangle#SelectedBackground">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:inactive /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+
+    <Style Selector="^:btnfocused /template/ Rectangle#FocusVisual">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
new file mode 100644
index 0000000000..724c317beb
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -0,0 +1,139 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System"
+                    x:CompileBindings="True">
+  <ControlTheme x:Key="{x:Type CalendarDatePicker}"
+                TargetType="CalendarDatePicker">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="*,Auto">
+
+          <Grid.Styles>
+
+            <Style Selector="Button.CalendarDropDown">
+              <Setter Property="Template">
+                <ControlTemplate>
+                  <Grid Width="19"
+                        Height="18"
+                        Margin="0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="{DynamicResource ThemeControlLowBrush}"
+                        ClipToBounds="False"
+                        ColumnDefinitions="*,*,*,*"
+                        RowDefinitions="23*,19*,19*,19*">
+
+                    <Border Name="Highlight"
+                            Grid.Row="0"
+                            Grid.RowSpan="4"
+                            Grid.ColumnSpan="4"
+                            Margin="-1"
+                            BorderBrush="{DynamicResource HighlightBrush}"
+                            BorderThickness="1" />
+                    <Border Name="Background"
+                            Grid.Row="1"
+                            Grid.RowSpan="3"
+                            Grid.ColumnSpan="4"
+                            Margin="0,-1,0,0"
+                            BorderBrush="{DynamicResource ThemeBorderHighBrush}"
+                            BorderThickness="1"
+                            CornerRadius=".5" />
+                    <Rectangle Grid.RowSpan="1"
+                               Grid.ColumnSpan="4"
+                               Fill="{DynamicResource ThemeAccentBrush}"
+                               Stroke="{DynamicResource ThemeBorderHighBrush}"
+                               StrokeThickness="1" />
+                    <TextBlock Grid.Row="1"
+                               Grid.RowSpan="3"
+                               Grid.Column="0"
+                               Grid.ColumnSpan="4"
+                               Margin="0,-1,0,0"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               FontSize="{DynamicResource FontSizeSmall}"
+                               Foreground="{DynamicResource ThemeBorderHighBrush}"
+                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
+
+                    <Ellipse Grid.ColumnSpan="4"
+                             Width="3"
+                             Height="3"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             Fill="{DynamicResource ThemeControlLowBrush}"
+                             StrokeThickness="0" />
+                  </Grid>
+                </ControlTemplate>
+              </Setter>
+            </Style>
+
+            <Style Selector="Button.CalendarDropDown /template/ Border#Highlight">
+              <Setter Property="IsVisible" Value="False" />
+            </Style>
+            <Style Selector="Button.CalendarDropDown:pressed /template/ Border#Highlight">
+              <Setter Property="IsVisible" Value="True" />
+            </Style>
+
+            <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
+              <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+            </Style>
+
+          </Grid.Styles>
+
+          <TextBox Name="PART_TextBox"
+                   Grid.Column="0"
+                   Padding="{TemplateBinding Padding}"
+                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                   Watermark="{TemplateBinding Watermark}" />
+
+          <Button Name="PART_Button"
+                  Grid.Column="1"
+                  Width="20"
+                  Margin="2,0,2,0"
+                  Padding="0"
+                  Background="Transparent"
+                  BorderThickness="0"
+                  Classes="CalendarDropDown"
+                  ClipToBounds="False"
+                  Focusable="False"
+                  Foreground="{TemplateBinding Foreground}" />
+
+          <Popup Name="PART_Popup"
+                 PlacementTarget="{TemplateBinding}"
+                 IsLightDismissEnabled="False">
+            <Calendar Name="PART_Calendar"
+                      DisplayDate="{TemplateBinding DisplayDate}"
+                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
+                      DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                      SelectedDate="{TemplateBinding SelectedDate,
+                                                     Mode=TwoWay}" />
+          </Popup>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:focus /template/ TextBox#PART_TextBox">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
new file mode 100644
index 0000000000..0973a3b752
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
@@ -0,0 +1,105 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CalendarDayButton}"
+                TargetType="CalendarDayButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="MinWidth" Value="5" />
+    <Setter Property="MinHeight" Value="5" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel Background="Transparent">
+
+          <Rectangle Name="TodayBackground"
+                     Fill="{DynamicResource HighlightBrush}"
+                     IsVisible="False" />
+
+          <Rectangle Name="SelectedBackground"
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.75" />
+
+          <Rectangle Name="Background"
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.5" />
+
+          <ContentControl Name="Content"
+                          Margin="5,1,5,1"
+                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          FontSize="{TemplateBinding FontSize}"
+                          Foreground="{TemplateBinding Foreground}"
+                          Opacity="1" />
+
+          <Path Name="BlackoutVisual"
+                Margin="3"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"
+                Fill="{DynamicResource ThemeForegroundBrush}"
+                IsVisible="False"
+                RenderTransformOrigin="0.5,0.5"
+                Stretch="Fill" />
+
+          <Rectangle Name="FocusVisual"
+                     IsHitTestVisible="False"
+                     IsVisible="False"
+                     Stroke="{DynamicResource HighlightBrush}"
+                     StrokeThickness="1" />
+
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:pressed /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Rectangle#SelectedBackground">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentControl#Content">
+      <Setter Property="Opacity" Value="0.3" />
+    </Style>
+
+    <Style Selector="^:dayfocused /template/ Rectangle#FocusVisual">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:today /template/ Rectangle#TodayBackground">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:inactive /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+    <Style Selector="^:today /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeControlLowBrush}" />
+    </Style>
+
+    <Style Selector="^:blackout /template/ Path#BlackoutVisual">
+      <Setter Property="Opacity" Value="0.3" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
new file mode 100644
index 0000000000..2a9ae7cf8d
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
@@ -0,0 +1,179 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CalendarItem}"
+                TargetType="CalendarItem">
+    <Setter Property="CornerRadius" Value="1" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Margin="0,2,0,2"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+
+            <Border BorderBrush="{DynamicResource ThemeBackgroundBrush}"
+                    BorderThickness="2"
+                    CornerRadius="1">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.Styles>
+                  <Style Selector="Button.CalendarHeader">
+                    <Setter Property="Cursor" Value="Hand" />
+                    <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="BorderThickness" Value="0" />
+                  </Style>
+                  <Style Selector="Button.CalendarHeader:pressed  /template/ ContentPresenter">
+                    <Setter Property="Background" Value="Transparent" />
+                  </Style>
+
+                  <Style Selector="Button.CalendarNavigation">
+                    <Setter Property="Height" Value="20" />
+                    <Setter Property="Width" Value="28" />
+                  </Style>
+                  <Style Selector="Button.CalendarNavigation > Path">
+                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}" />
+                  </Style>
+                  <Style Selector="Button.CalendarNavigation:pointerover > Path">
+                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
+                  </Style>
+
+                  <Style Selector="Button#HeaderButton:pointerover">
+                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}" />
+                  </Style>
+                </Grid.Styles>
+
+                <Rectangle Grid.ColumnSpan="3"
+                           Height="22"
+                           VerticalAlignment="Top"
+                           Fill="{TemplateBinding HeaderBackground}"
+                           Stretch="Fill" />
+
+                <Button Name="PART_PreviousButton"
+                        HorizontalAlignment="Left"
+                        Classes="CalendarHeader CalendarNavigation"
+                        IsVisible="False">
+
+                  <Path Width="6"
+                        Height="10"
+                        Margin="14,-6,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Data="M288.75,232.25 L288.75,240.625 L283,236.625 z"
+                        Stretch="Fill" />
+
+                </Button>
+
+                <Button Name="PART_HeaderButton"
+                        Grid.Column="1"
+                        Padding="1,5,1,9"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Classes="CalendarHeader"
+                        FontSize="10.5"
+                        FontWeight="Bold" />
+
+                <Button Name="PART_NextButton"
+                        Grid.Column="2"
+                        HorizontalAlignment="Right"
+                        Classes="CalendarHeader CalendarNavigation"
+                        IsVisible="False">
+
+                  <Path Width="6"
+                        Height="10"
+                        Margin="0,-6,14,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Data="M282.875,231.875 L282.875,240.375 L288.625,236 z"
+                        Stretch="Fill" />
+
+                </Button>
+
+                <Grid Name="PART_MonthView"
+                      Grid.Row="1"
+                      Grid.ColumnSpan="3"
+                      Margin="6,-1,6,6"
+                      IsVisible="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                </Grid>
+
+                <Grid Name="PART_YearView"
+                      Grid.Row="1"
+                      Grid.ColumnSpan="3"
+                      Margin="6,-3,7,6"
+                      IsVisible="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                </Grid>
+              </Grid>
+            </Border>
+          </Border>
+
+          <Rectangle Name="DisabledVisual"
+                     Margin="0,2,0,2"
+                     Fill="{DynamicResource ThemeControlLowBrush}"
+                     IsVisible="False"
+                     Opacity="{DynamicResource ThemeDisabledOpacity}"
+                     Stretch="Fill" />
+
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="DayTitleTemplate">
+      <Template>
+        <TextBlock Margin="0,4,0,4"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   FontSize="9.5"
+                   FontWeight="Bold"
+                   Text="{Binding}" />
+      </Template>
+    </Setter>
+
+    <Style Selector="^:calendardisabled /template/ Rectangle#DisabledVisual">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
new file mode 100644
index 0000000000..4522ffac87
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
@@ -0,0 +1,106 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CaptionButtons Height="30" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="SimpleCaptionButton"
+                TargetType="Button">
+    <Setter Property="Background" Value="#ffe5e5e5" />
+    <!--  Reusing BorderBrush to define pressed background color, as it's not used otherwise  -->
+    <Setter Property="BorderBrush" Value="#ffcacaca" />
+    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Width" Value="45" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="Transparent"
+                          Content="{TemplateBinding Content}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding Background}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding BorderBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type CaptionButtons}"
+                TargetType="CaptionButtons">
+    <Setter Property="MaxHeight" Value="30" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel VerticalAlignment="Stretch"
+                    Orientation="Horizontal"
+                    Spacing="2"
+                    TextElement.FontSize="10">
+          <Button x:Name="PART_FullScreenButton"
+                  IsVisible="False"
+                  Theme="{StaticResource SimpleCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Path Name="FullScreenButtonPath"
+                    Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
+            </Viewbox>
+          </Button>
+          <Button x:Name="PART_MinimiseButton"
+                  Theme="{StaticResource SimpleCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Path Data="M2048 1229v-205h-2048v205h2048z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
+            </Viewbox>
+          </Button>
+          <Button x:Name="PART_RestoreButton"
+                  Theme="{StaticResource SimpleCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Viewbox.RenderTransform>
+                <RotateTransform Angle="-90" />
+              </Viewbox.RenderTransform>
+              <Path Name="RestoreButtonPath"
+                    Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
+            </Viewbox>
+          </Button>
+          <Button x:Name="PART_CloseButton"
+                  Background="#ffe81123"
+                  BorderBrush="#fff1707a"
+                  Theme="{StaticResource SimpleCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Path Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
+            </Viewbox>
+          </Button>
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:maximized /template/ Path#RestoreButtonPath">
+      <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Path#FullScreenButtonPath">
+      <Setter Property="IsVisible" Value="True" />
+      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Button#PART_MinimiseButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Carousel.xaml b/src/Avalonia.Themes.Simple/Controls/Carousel.xaml
new file mode 100644
index 0000000000..e79e3942c9
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Carousel.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Carousel}"
+                TargetType="Carousel">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <CarouselPresenter Margin="{TemplateBinding Padding}"
+                             IsVirtualized="{TemplateBinding IsVirtualized}"
+                             Items="{TemplateBinding Items}"
+                             ItemsPanel="{TemplateBinding ItemsPanel}"
+                             PageTransition="{TemplateBinding PageTransition}"
+                             SelectedIndex="{TemplateBinding SelectedIndex}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml b/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
new file mode 100644
index 0000000000..10e0b883d5
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
@@ -0,0 +1,75 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CheckBox}"
+                TargetType="CheckBox">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4,0,0,0" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="Auto,*">
+          <Border Name="border"
+                  Width="18"
+                  Height="18"
+                  VerticalAlignment="Center"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Panel>
+              <Path Name="checkMark"
+                    Width="11"
+                    Height="10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"
+                    Fill="{DynamicResource HighlightBrush}"
+                    FlowDirection="LeftToRight"
+                    Stretch="Uniform" />
+              <Rectangle Name="indeterminateMark"
+                         Width="10"
+                         Height="10"
+                         HorizontalAlignment="Center"
+                         VerticalAlignment="Center"
+                         Fill="{DynamicResource HighlightBrush}"
+                         Stretch="Uniform" />
+            </Panel>
+          </Border>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Grid.Column="1"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            IsVisible="{TemplateBinding Content,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}"
+                            RecognizesAccessKey="True"
+                            TextElement.Foreground="{TemplateBinding Foreground}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Path#checkMark">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^ /template/ Rectangle#indeterminateMark">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:checked /template/ Path#checkMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:indeterminate /template/ Rectangle#indeterminateMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
new file mode 100644
index 0000000000..d7dabae516
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
@@ -0,0 +1,83 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ComboBox}"
+                TargetType="ComboBox">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid ColumnDefinitions="*,Auto">
+            <TextBlock Name="PlaceholderTextBlock"
+                       Grid.Column="0"
+                       Margin="{TemplateBinding Padding}"
+                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                       Foreground="{TemplateBinding PlaceholderForeground}"
+                       IsVisible="{TemplateBinding SelectionBoxItem,
+                                                   Converter={x:Static ObjectConverters.IsNull}}"
+                       Text="{TemplateBinding PlaceholderText}" />
+            <ContentControl Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding SelectionBoxItem}"
+                            ContentTemplate="{TemplateBinding ItemTemplate}" />
+            <ToggleButton Name="toggle"
+                          Grid.Column="1"
+                          Background="Transparent"
+                          BorderThickness="0"
+                          ClickMode="Press"
+                          Focusable="False"
+                          IsChecked="{TemplateBinding IsDropDownOpen,
+                                                      Mode=TwoWay}">
+              <Path Width="8"
+                    Height="4"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z"
+                    Fill="{DynamicResource ThemeForegroundBrush}"
+                    Stretch="Uniform" />
+            </ToggleButton>
+            <Popup Name="PART_Popup"
+                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                   MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsDropDownOpen,
+                                            Mode=TwoWay}"
+                   PlacementTarget="{TemplateBinding}">
+              <Border Background="{DynamicResource ThemeBackgroundBrush}"
+                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                      BorderThickness="1">
+                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml
new file mode 100644
index 0000000000..c3d8b6f900
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml
@@ -0,0 +1,39 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ComboBoxItem}"
+                TargetType="ComboBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="2" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+    <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+    <Style Selector="^:selected:focus /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ContentControl.xaml b/src/Avalonia.Themes.Simple/Controls/ContentControl.xaml
new file mode 100644
index 0000000000..415b1dc721
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ContentControl.xaml
@@ -0,0 +1,20 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ContentControl}"
+                TargetType="ContentControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
new file mode 100644
index 0000000000..e99f1c5ac0
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
@@ -0,0 +1,29 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ContextMenu}"
+                TargetType="ContextMenu">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="4,2" />
+    <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="TextBlock.FontWeight" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Theme="{StaticResource SimpleMenuScrollViewer}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            KeyboardNavigation.TabNavigation="Continue" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
new file mode 100644
index 0000000000..da8ec03cd4
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
@@ -0,0 +1,48 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type DataValidationErrors}"
+                TargetType="DataValidationErrors">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel LastChildFill="True">
+          <ContentControl x:DataType="DataValidationErrors"
+                          Content="{Binding (DataValidationErrors.Errors)}"
+                          ContentTemplate="{TemplateBinding ErrorTemplate}"
+                          DataContext="{TemplateBinding Owner}"
+                          DockPanel.Dock="Right"
+                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="ErrorTemplate">
+      <DataTemplate>
+        <Canvas Width="14"
+                Height="14"
+                Margin="4,0,1,0"
+                Background="Transparent">
+          <Canvas.Styles>
+            <Style Selector="ToolTip">
+              <Setter Property="Background" Value="{DynamicResource ErrorLowBrush}" />
+              <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+            </Style>
+          </Canvas.Styles>
+          <ToolTip.Tip>
+            <ItemsControl x:DataType="DataValidationErrors"
+                          Items="{Binding}" />
+          </ToolTip.Tip>
+          <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2"
+                Stroke="{DynamicResource ErrorBrush}"
+                StrokeThickness="2" />
+        </Canvas>
+      </DataTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
new file mode 100644
index 0000000000..30b7dc9ffa
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
@@ -0,0 +1,302 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Height="500"
+            Padding="20">
+      <StackPanel VerticalAlignment="Center"
+                  Spacing="20">
+        <DatePicker />
+        <DatePicker CornerRadius="10" />
+        <DatePicker IsEnabled="False" />
+        <DatePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </DatePicker>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
+  <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
+  <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
+
+  <ControlTheme x:Key="SimpleDatePickerFlyoutButton"
+                TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
+      <Setter Property="Background">
+        <SolidColorBrush Opacity="0.6"
+                         Color="{DynamicResource ThemeControlMidHighColor}" />
+      </Setter>
+      <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type DatePicker}"
+                TargetType="DatePicker">
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Grid Name="LayoutRoot"
+                Margin="{TemplateBinding Padding}">
+
+            <Button Name="PART_FlyoutButton"
+                    MinWidth="{DynamicResource DatePickerThemeMinWidth}"
+                    MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Foreground="{TemplateBinding Foreground}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    TemplatedControl.IsTemplateFocusTarget="True"
+                    Theme="{StaticResource SimpleDatePickerFlyoutButton}">
+              <Grid Name="PART_ButtonContentGrid"
+                    ColumnDefinitions="78*,Auto,132*,Auto,78*">
+                <TextBlock Name="PART_DayTextBlock"
+                           Padding="{DynamicResource DatePickerHostPadding}"
+                           HorizontalAlignment="Center"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Text="day" />
+                <TextBlock Name="PART_MonthTextBlock"
+                           Padding="{DynamicResource DatePickerHostMonthPadding}"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Text="month"
+                           TextAlignment="Left" />
+                <TextBlock Name="PART_YearTextBlock"
+                           Padding="{DynamicResource DatePickerHostPadding}"
+                           HorizontalAlignment="Center"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Text="year" />
+                <Rectangle x:Name="PART_FirstSpacer"
+                           Grid.Column="1"
+                           Width="1"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource DatePickerSpacerFill}" />
+                <Rectangle x:Name="PART_SecondSpacer"
+                           Grid.Column="3"
+                           Width="1"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource DatePickerSpacerFill}" />
+              </Grid>
+            </Button>
+
+            <Popup Name="PART_Popup"
+                   IsLightDismissEnabled="True"
+                   PlacementMode="Bottom"
+                   PlacementTarget="{TemplateBinding}"
+                   WindowManagerAddShadowHint="False">
+              <DatePickerPresenter Name="PART_PickerPresenter" />
+            </Popup>
+
+          </Grid>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+
+    <!--  Changes foreground for watermark text when SelectedDate is null  -->
+    <Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <!--  WinUI: DatePickerFlyoutPresenter  -->
+  <ControlTheme x:Key="{x:Type DatePickerPresenter}"
+                TargetType="DatePickerPresenter">
+    <Setter Property="Width" Value="296" />
+    <Setter Property="MinWidth" Value="296" />
+    <Setter Property="MaxHeight" Value="398" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="Background"
+                MaxHeight="398"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="ContentRoot"
+                RowDefinitions="*,Auto">
+            <Grid Name="PART_PickerContainer">
+              <Grid.Styles>
+                <Style Selector="DateTimePickerPanel > ListBoxItem">
+                  <Setter Property="Theme" Value="{StaticResource SimpleDateTimePickerItem}" />
+                </Style>
+              </Grid.Styles>
+              <!--  Column Definitions set in code, ignore here  -->
+              <Panel Name="PART_MonthHost">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PART_MonthSelector"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Month"
+                                       ShouldLoop="True" />
+                </ScrollViewer>
+                <RepeatButton Name="PART_MonthUpButton"
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
+                <RepeatButton Name="PART_MonthDownButton"
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
+              </Panel>
+              <Panel Name="PART_DayHost">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PART_DaySelector"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Day"
+                                       ShouldLoop="True" />
+                </ScrollViewer>
+                <RepeatButton Name="PART_DayUpButton"
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
+                <RepeatButton Name="PART_DayDownButton"
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
+              </Panel>
+              <Panel Name="PART_YearHost">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PART_YearSelector"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Year"
+                                       ShouldLoop="False" />
+                </ScrollViewer>
+                <RepeatButton Name="PART_YearUpButton"
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
+                <RepeatButton Name="PART_YearDownButton"
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
+              </Panel>
+              <Rectangle Name="HighlightRect"
+                         Grid.Column="0"
+                         Grid.ColumnSpan="5"
+                         Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}"
+                         VerticalAlignment="Center"
+                         IsHitTestVisible="False"
+                         ZIndex="-1">
+                <Rectangle.Fill>
+                  <SolidColorBrush Opacity="0.6"
+                                   Color="{DynamicResource ThemeAccentColor}" />
+                </Rectangle.Fill>
+              </Rectangle>
+              <Rectangle Name="PART_FirstSpacer"
+                         Grid.Column="1"
+                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Rectangle Name="PART_SecondSpacer"
+                         Grid.Column="3"
+                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+            </Grid>
+
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Grid.ColumnSpan="2"
+                         Height="{DynamicResource DatePickerSpacerThemeWidth}"
+                         VerticalAlignment="Top"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Button Name="PART_AcceptButton"
+                      Grid.Column="0"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
+                <Path Data="M0.5,8.5 5,13.5 15.5,3"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
+              </Button>
+              <Button Name="PART_DismissButton"
+                      Grid.Column="1"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
+                <Path Data="M2,2 14,14 M2,14 14 2"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
+              </Button>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
new file mode 100644
index 0000000000..8639a2baa2
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
@@ -0,0 +1,139 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Width="200"
+            Padding="20">
+      <StackPanel Spacing="20">
+        <ListBoxItem Theme="{DynamicResource SimpleDateTimePickerItem}">Standard Item</ListBoxItem>
+        <ListBoxItem Theme="{DynamicResource SimpleDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
+        <RepeatButton Theme="{DynamicResource SimpleDateTimePickerButton}">Button</RepeatButton>
+        <RepeatButton Theme="{DynamicResource SimpleDateTimePickerUpButton}" IsVisible="True"/>
+        <RepeatButton Theme="{DynamicResource SimpleDateTimePickerDownButton}" IsVisible="True"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <!--  Theme for the items displayed in the selectors  -->
+  <ControlTheme x:Key="SimpleDateTimePickerItem"
+                BasedOn="{StaticResource {x:Type ListBoxItem}}"
+                TargetType="ListBoxItem">
+    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+
+    <Style Selector="^:selected">
+      <Setter Property="IsHitTestVisible" Value="False" />
+      <Style Selector="^/template/ Rectangle#PressedBackground">
+        <Setter Property="Fill" Value="Transparent" />
+      </Style>
+      <Style Selector="^/template/ ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+      </Style>
+    </Style>
+    <Style Selector="^.MonthItem">
+      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+    </Style>
+  </ControlTheme>
+
+  <!--  This is used for both the accept/dismiss & repeatbuttons in the presenter  -->
+  <ControlTheme x:Key="SimpleDateTimePickerButton"
+                TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlTransparentBrush}" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!--
+          The background is doubled here for the loopingselector up/down repeat buttons
+          that appear opaque. Not sure how MS does it though I suspect this is it
+          but source isn't MIT yet, so this is my solution
+        -->
+        <Border Background="{TemplateBinding Background}">
+          <ContentPresenter x:Name="ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{DynamicResource ThemeControlTransparentBrush}"
+                            BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Foreground="{DynamicResource ThemeForegroundBrush}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background">
+        <SolidColorBrush Opacity="0.6"
+                         Color="{DynamicResource ThemeControlMidHighColor}" />
+      </Setter>
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="SimpleDateTimePickerUpButton"
+                BasedOn="{StaticResource SimpleDateTimePickerButton}"
+                TargetType="RepeatButton">
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
+    <Setter Property="IsVisible" Value="False" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Width="10"
+                 Height="10"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center">
+          <Path Data="M 0,9 L 9,0 L 18,9"
+                Stroke="{Binding $parent[RepeatButton].Foreground}"
+                StrokeThickness="1" />
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="SimpleDateTimePickerDownButton"
+                BasedOn="{StaticResource SimpleDateTimePickerButton}"
+                TargetType="RepeatButton">
+    <Setter Property="VerticalAlignment" Value="Bottom" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
+    <Setter Property="IsVisible" Value="False" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Width="10"
+                 Height="10"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center">
+          <Path Data="M 0,0 L 9,9 L 18,0"
+                Stroke="{Binding $parent[RepeatButton].Foreground}"
+                StrokeThickness="1" />
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
new file mode 100644
index 0000000000..6a50cd6e36
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
@@ -0,0 +1,69 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type DropDownButton}"
+                TargetType="DropDownButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Name="RootBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  ClipToBounds="True"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Name="InnerGrid">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="0"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                RecognizesAccessKey="True" />
+
+              <PathIcon Name="DropDownGlyph"
+                        Grid.Column="1"
+                        Width="12"
+                        Height="12"
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        IsHitTestVisible="False"
+                        UseLayoutRounding="False" />
+
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+      <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#RootBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed  /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
new file mode 100644
index 0000000000..79d6c6d917
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
@@ -0,0 +1,24 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type EmbeddableControlRoot}"
+                TargetType="EmbeddableControlRoot">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback"
+                  IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}">
+            <VisualLayerManager>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </VisualLayerManager>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Expander.xaml b/src/Avalonia.Themes.Simple/Controls/Expander.xaml
new file mode 100644
index 0000000000..9920c9445a
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Expander.xaml
@@ -0,0 +1,256 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Width="350"
+                  Orientation="Vertical"
+                  Spacing="20">
+        <Expander CornerRadius="25"
+                  ExpandDirection="Up">
+          <Expander.Header>
+            <Grid ColumnDefinitions="*, Auto">
+              <TextBlock Grid.Column="0"
+                         Text="Expand" />
+              <TextBlock Grid.Column="1"
+                         Text="Up" />
+            </Grid>
+          </Expander.Header>
+          <StackPanel>
+            <TextBlock Text="Expanded content" />
+          </StackPanel>
+        </Expander>
+        <Expander CornerRadius="25"
+                  ExpandDirection="Down"
+                  Header="Expand Down">
+          <StackPanel>
+            <TextBlock Text="Expanded content" />
+          </StackPanel>
+        </Expander>
+        <Expander CornerRadius="25"
+                  ExpandDirection="Left"
+                  Header="Expand Left">
+          <StackPanel>
+            <TextBlock Text="Expanded content" />
+          </StackPanel>
+        </Expander>
+        <Expander CornerRadius="25"
+                  ExpandDirection="Right"
+                  Header="Expand Right">
+          <StackPanel>
+            <TextBlock Text="Expanded content" />
+          </StackPanel>
+        </Expander>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="SimpleExpanderToggleButtonTheme"
+                TargetType="ToggleButton">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderThickness="1">
+          <Grid ColumnDefinitions="Auto,*">
+            <Border Grid.Column="0"
+                    Width="20"
+                    Height="20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+              <Path HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="M 0 2 L 4 6 L 0 10 Z"
+                    Fill="{DynamicResource ThemeForegroundBrush}" />
+            </Border>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Grid.Column="1"
+                              Padding="{TemplateBinding Padding}"
+                              VerticalAlignment="Center"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Background="Transparent"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{Binding $parent[Expander].HeaderTemplate}" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="SimpleExpanderToggleButtonUpTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="-90" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="SimpleExpanderToggleButtonDownTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="90" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="SimpleExpanderToggleButtonLeftTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="180" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="SimpleExpanderToggleButtonRightTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="0" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Expander}"
+                TargetType="Expander">
+    <Setter Property="ContentTransition">
+      <Setter.Value>
+        <CrossFade Duration="00:00:00.25" />
+      </Setter.Value>
+    </Setter>
+    <Style Selector="^[ExpandDirection=Down]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid RowDefinitions="Auto,*">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Row="0"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Row="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonDownTheme}" />
+      </Style>
+    </Style>
+    <Style Selector="^[ExpandDirection=Up]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid RowDefinitions="*,Auto">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Row="1"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Row="0"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonUpTheme}" />
+      </Style>
+    </Style>
+    <Style Selector="^[ExpandDirection=Right]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Column="0"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource SimpleExpanderToggleButtonLeftTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
+      </Style>
+    </Style>
+    <Style Selector="^[ExpandDirection=Left]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="*,Auto">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Column="1"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="0"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonLeftTheme}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml
new file mode 100644
index 0000000000..08959cfbbe
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type FlyoutPresenter}"
+                TargetType="FlyoutPresenter">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ContentPresenter Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              HorizontalContentAlignment="Stretch"
+                              VerticalContentAlignment="Stretch"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Simple/Controls/FocusAdorner.xaml
new file mode 100644
index 0000000000..f1d5f5f2ac
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/FocusAdorner.xaml
@@ -0,0 +1,11 @@
+<Style xmlns="https://github.com/avaloniaui"
+       Selector=":is(Control)">
+  <Setter Property="FocusAdorner">
+    <FocusAdornerTemplate>
+      <Rectangle Margin="1"
+                 Stroke="Black"
+                 StrokeDashArray="1,2"
+                 StrokeThickness="1" />
+    </FocusAdornerTemplate>
+  </Setter>
+</Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Simple/Controls/GridSplitter.xaml
new file mode 100644
index 0000000000..f2a3f01397
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/GridSplitter.xaml
@@ -0,0 +1,23 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type GridSplitter}"
+                TargetType="GridSplitter">
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="MinWidth" Value="1" />
+    <Setter Property="MinHeight" Value="1" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="PreviewContent">
+      <Template>
+        <Rectangle Fill="{DynamicResource HighlightBrush}" />
+      </Template>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
new file mode 100644
index 0000000000..d8cdf96abd
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
@@ -0,0 +1,20 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ItemsControl}"
+                TargetType="ItemsControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Label.xaml b/src/Avalonia.Themes.Simple/Controls/Label.xaml
new file mode 100644
index 0000000000..0faa4852f2
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Label.xaml
@@ -0,0 +1,22 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Label}"
+                TargetType="Label">
+    <Setter Property="Padding" Value="3" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          RecognizesAccessKey="True" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ListBox.xaml b/src/Avalonia.Themes.Simple/Controls/ListBox.xaml
new file mode 100644
index 0000000000..7308738681
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ListBox.xaml
@@ -0,0 +1,38 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ListBox}"
+                TargetType="ListBox">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Name="PART_ScrollViewer"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                        Background="{TemplateBinding Background}"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Simple/Controls/ListBoxItem.xaml
new file mode 100644
index 0000000000..4d918326c8
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ListBoxItem.xaml
@@ -0,0 +1,44 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ListBoxItem}"
+                TargetType="ListBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Padding" Value="2 1" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+
+    <Style Selector="^:selected /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+
+    <Style Selector="^:selected:focus /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+    <Style Selector="^:selected:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+    <Style Selector="^:selected:focus:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
new file mode 100644
index 0000000000..3416b5406e
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
@@ -0,0 +1,196 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
+  <DrawingGroup x:Key="LevelUp">
+    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+    <GeometryDrawing Brush="#FFF6F6F6"
+                     Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
+    <GeometryDrawing Brush="#FFDCB679"
+                     Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
+    <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
+  </DrawingGroup>
+  <dialogs:ResourceSelectorConverter x:Key="Icons">
+    <DrawingGroup x:Key="Icon_Folder">
+      <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M0,0L16,0 16,16 0,16z" />
+      <GeometryDrawing Brush="#FFF6F6F6"
+                       Geometry="F1M1.5,1L9.61,1 10.61,3 13.496,3C14.323,3,14.996,3.673,14.996,4.5L14.996,12.5C14.996,13.327,14.323,14,13.496,14L1.5,14C0.673,14,0,13.327,0,12.5L0,2.5C0,1.673,0.673,1,1.5,1" />
+      <GeometryDrawing Brush="#FFDCB67A"
+                       Geometry="F1M2,3L8.374,3 8.874,4 2,4z M13.496,4L10,4 9.992,4 8.992,2 1.5,2C1.225,2,1,2.224,1,2.5L1,12.5C1,12.776,1.225,13,1.5,13L13.496,13C13.773,13,13.996,12.776,13.996,12.5L13.996,4.5C13.996,4.224,13.773,4,13.496,4" />
+      <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M2,3L8.374,3 8.874,4 2,4z" />
+    </DrawingGroup>
+    <DrawingGroup x:Key="Icon_File">
+      <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+      <GeometryDrawing Brush="#FFF6F6F6"
+                       Geometry="F1M4,15C3.03,15,2,14.299,2,13L2,3C2,1.701,3.03,1,4,1L10.061,1 14,4.556 14,13C14,13.97,13.299,15,12,15z" />
+      <GeometryDrawing Brush="#FF9B4E96"
+                       Geometry="F1M12,13L4,13 4,3 9,3 9,6 12,6z M9.641,2L3.964,2C3.964,2,3,2,3,3L3,13C3,14,3.964,14,3.964,14L11.965,14C12.965,14,13,13,13,13L13,5z" />
+      <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M4,3L9,3 9,6 12,6 12,13 4,13z" />
+    </DrawingGroup>
+    <DrawingGroup x:Key="Icon_Volume">
+      <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+      <GeometryDrawing Brush="#FFF6F6F6"
+                       Geometry="F1M0,12L0,6.5C0,5.122,1.122,4,2.5,4L13.5,4C14.879,4,16,5.122,16,6.5L16,12z" />
+      <GeometryDrawing Brush="#FFEFEFF0"
+                       Geometry="F1M13,8L12,8 12,7 13,7z M11,8L10,8 10,7 11,7z M13.5,6L2.5,6C2.224,6,2,6.224,2,6.5L2,10 14,10 14,6.5C14,6.224,13.775,6,13.5,6" />
+      <GeometryDrawing Brush="#FF424242"
+                       Geometry="F1M13,7L12,7 12,8 13,8z M11,7L10,7 10,8 11,8z M2,10L14,10 14,6.5C14,6.224,13.775,6,13.5,6L2.5,6C2.224,6,2,6.224,2,6.5z M15,11L1,11 1,6.5C1,5.673,1.673,5,2.5,5L13.5,5C14.327,5,15,5.673,15,6.5z" />
+    </DrawingGroup>
+  </dialogs:ResourceSelectorConverter>
+
+  <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}"
+                TargetType="dialogs:ManagedFileChooser">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <DockPanel Margin="0,0,0,5"
+                     DockPanel.Dock="Top">
+            <dialogs:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
+                                 DockPanel.Dock="Right">
+              <Button Command="{Binding GoUp}">
+                <Image Stretch="Fill">
+                  <DrawingImage Drawing="{StaticResource LevelUp}" />
+                </Image>
+              </Button>
+            </dialogs:ChildFitter>
+            <TextBox x:Name="Location"
+                     Margin="0,0,5,0"
+                     Text="{Binding Location}">
+              <TextBox.KeyBindings>
+                <KeyBinding Command="{Binding EnterPressed}"
+                            Gesture="Enter" />
+              </TextBox.KeyBindings>
+            </TextBox>
+          </DockPanel>
+          <DockPanel Margin="0,5,0,0"
+                     DockPanel.Dock="Bottom">
+            <StackPanel DockPanel.Dock="Left"
+                        Orientation="Horizontal">
+              <CheckBox IsChecked="{Binding ShowHiddenFiles}">
+                <TextBlock>Show hidden files</TextBlock>
+              </CheckBox>
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Right"
+                        Orientation="Horizontal"
+                        Spacing="10">
+              <StackPanel.Styles>
+                <Style Selector="Button">
+                  <Setter Property="Margin" Value="4" />
+                </Style>
+              </StackPanel.Styles>
+              <Button Command="{Binding Ok}">OK</Button>
+              <Button Command="{Binding Cancel}">Cancel</Button>
+            </StackPanel>
+          </DockPanel>
+
+          <ComboBox Margin="0,5,0,0"
+                    DockPanel.Dock="Bottom"
+                    IsVisible="{Binding ShowFilters}"
+                    Items="{Binding Filters}"
+                    SelectedItem="{Binding SelectedFilter}" />
+
+          <TextBox DockPanel.Dock="Bottom"
+                   IsVisible="{Binding !SelectingFolder}"
+                   Text="{Binding FileName}"
+                   Watermark="File name" />
+
+          <ListBox x:Name="PART_QuickLinks"
+                   Margin="0,0,5,5"
+                   BorderBrush="Transparent"
+                   DockPanel.Dock="Left"
+                   Focusable="False"
+                   Items="{Binding QuickLinks}"
+                   SelectedIndex="{Binding QuickLinksSelectedIndex}">
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Background="Transparent"
+                            Orientation="Horizontal"
+                            Spacing="4">
+                  <Image Width="16"
+                         Height="16">
+                    <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}" />
+                  </Image>
+                  <TextBlock Text="{Binding DisplayName}" />
+                </StackPanel>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
+          </ListBox>
+          <DockPanel Grid.IsSharedSizeScope="True">
+            <Grid Margin="15,5,0,0"
+                  HorizontalAlignment="Stretch"
+                  DockPanel.Dock="Top">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="400" SharedSizeGroup="Name" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="150" SharedSizeGroup="Type" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Size" />
+              </Grid.ColumnDefinitions>
+              <GridSplitter Grid.Column="1" />
+              <TextBlock Grid.Column="2"
+                         Text="Name" />
+              <GridSplitter Grid.Column="3" />
+              <TextBlock Grid.Column="4"
+                         Text="Date Modified" />
+              <GridSplitter Grid.Column="5" />
+              <TextBlock Grid.Column="6"
+                         Text="Type" />
+              <GridSplitter Grid.Column="7" />
+              <TextBlock Grid.Column="8"
+                         Text="Size" />
+            </Grid>
+            <ListBox x:Name="PART_Files"
+                     Margin="0,5"
+                     Items="{Binding Items}"
+                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                     SelectedItems="{Binding SelectedItems}"
+                     SelectionMode="{Binding SelectionMode}"
+                     VirtualizationMode="Simple">
+              <ListBox.ItemTemplate>
+                <DataTemplate>
+                  <Grid Background="Transparent">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition SharedSizeGroup="Icon" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Name" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Modified" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Type" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Size" />
+                    </Grid.ColumnDefinitions>
+                    <Image Grid.Column="0"
+                           Width="16"
+                           Height="16">
+                      <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}" />
+                    </Image>
+                    <TextBlock Grid.Column="2"
+                               Text="{Binding DisplayName}" />
+                    <TextBlock Grid.Column="4"
+                               Text="{Binding Modified}" />
+                    <TextBlock Grid.Column="6"
+                               Text="{Binding Type}" />
+                    <TextBlock Grid.Column="8">
+                      <TextBlock.Text>
+                        <Binding Path="Size">
+                          <Binding.Converter>
+                            <dialogs:FileSizeStringConverter />
+                          </Binding.Converter>
+                        </Binding>
+                      </TextBlock.Text>
+                    </TextBlock>
+                  </Grid>
+                </DataTemplate>
+              </ListBox.ItemTemplate>
+            </ListBox>
+          </DockPanel>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Menu.xaml b/src/Avalonia.Themes.Simple/Controls/Menu.xaml
new file mode 100644
index 0000000000..95b259bfa6
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Menu.xaml
@@ -0,0 +1,83 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System">
+
+  <ControlTheme x:Key="SimpleTopLevelMenuItem"
+                TargetType="MenuItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="6 0" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="root"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Margin="{TemplateBinding Padding}"
+                              Content="{TemplateBinding Header}">
+              <ContentPresenter.DataTemplates>
+                <DataTemplate DataType="sys:String">
+                  <AccessText Text="{Binding}" />
+                </DataTemplate>
+              </ContentPresenter.DataTemplates>
+            </ContentPresenter>
+            <Popup Name="PART_Popup"
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsSubMenuOpen,
+                                            Mode=TwoWay}"
+                   OverlayInputPassThroughElement="{Binding $parent[Menu]}">
+              <Border Background="{DynamicResource ThemeBackgroundBrush}"
+                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}">
+                <ScrollViewer Theme="{StaticResource SimpleMenuScrollViewer}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Margin="2"
+                                  Grid.IsSharedSizeScope="True"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected /template/ Border#root">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+
+    <Style Selector="^:empty /template/ Path#rightArrow">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Menu}"
+                TargetType="Menu">
+    <Setter Property="ItemContainerTheme" Value="{StaticResource SimpleTopLevelMenuItem}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          KeyboardNavigation.TabNavigation="Continue" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml
new file mode 100644
index 0000000000..d974c36d31
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml
@@ -0,0 +1,32 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}"
+                TargetType="MenuFlyoutPresenter">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        Theme="{StaticResource SimpleMenuScrollViewer}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            Grid.IsSharedSizeScope="True"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            KeyboardNavigation.TabNavigation="Continue" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml b/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
new file mode 100644
index 0000000000..ec22ee413d
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
@@ -0,0 +1,107 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:conv="using:Avalonia.Controls.Converters"
+                    xmlns:sys="using:System">
+  <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
+
+  <ControlTheme x:Key="{x:Type MenuItem}"
+                TargetType="MenuItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="6 0" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="root"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="20" />
+              <ColumnDefinition Width="5" />
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition Width="Auto"
+                                SharedSizeGroup="MenuItemIGT" />
+              <ColumnDefinition Width="20" />
+            </Grid.ColumnDefinitions>
+            <ContentPresenter Name="icon"
+                              Width="16"
+                              Height="16"
+                              Margin="3"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Icon}" />
+            <Path Name="check"
+                  Margin="3"
+                  VerticalAlignment="Center"
+                  Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"
+                  Fill="{TemplateBinding Foreground}"
+                  IsVisible="False" />
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Grid.Column="2"
+                              Margin="{TemplateBinding Padding}"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Header}">
+              <ContentPresenter.DataTemplates>
+                <DataTemplate DataType="sys:String">
+                  <AccessText Text="{Binding}" />
+                </DataTemplate>
+              </ContentPresenter.DataTemplates>
+            </ContentPresenter>
+            <TextBlock x:Name="PART_InputGestureText"
+                       Grid.Column="3"
+                       VerticalAlignment="Center"
+                       Text="{TemplateBinding InputGesture,
+                                              Converter={StaticResource KeyGestureConverter}}" />
+            <Path Name="rightArrow"
+                  Grid.Column="4"
+                  Margin="10,0,0,0"
+                  VerticalAlignment="Center"
+                  Data="M0,0L4,3.5 0,7z"
+                  Fill="{DynamicResource ThemeForegroundBrush}" />
+            <Popup Name="PART_Popup"
+                   IsLightDismissEnabled="False"
+                   IsOpen="{TemplateBinding IsSubMenuOpen,
+                                            Mode=TwoWay}"
+                   PlacementMode="Right">
+              <Border Background="{DynamicResource ThemeBackgroundBrush}"
+                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}">
+                <ScrollViewer Theme="{StaticResource SimpleMenuScrollViewer}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Margin="2"
+                                  Grid.IsSharedSizeScope="True"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:separator">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Separator />
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:selected /template/ Border#root">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+
+    <Style Selector="^:empty /template/ Path#rightArrow">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
new file mode 100644
index 0000000000..8c51ec8609
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
@@ -0,0 +1,30 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:default="clr-namespace:Avalonia.Themes.Simple">
+  <default:InverseBooleanValueConverter x:Key="AvaloniaThemesSimpleNativeMenuBarInverseBooleanValueConverter"
+                                        Default="True" />
+  <default:IBitmapToImageConverter x:Key="AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter" />
+  <ControlTheme x:Key="{x:Type NativeMenuBar}"
+                TargetType="NativeMenuBar">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Menu IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarInverseBooleanValueConverter}}"
+              Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
+          <Menu.Styles>
+            <Style Selector="MenuItem">
+              <Setter Property="Header" Value="{Binding Header}" />
+              <Setter Property="IsEnabled" Value="{Binding IsEnabled}" />
+              <Setter Property="InputGesture" Value="{Binding Gesture}" />
+              <Setter Property="Items" Value="{Binding Menu.Items}" />
+              <Setter Property="Command" Value="{Binding Command}" />
+              <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
+              <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True" />
+              <!--  NativeMenuItem is IBitmap and MenuItem is Image  -->
+              <Setter Property="Icon" Value="{Binding Icon, Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter}}" />
+            </Style>
+          </Menu.Styles>
+        </Menu>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
new file mode 100644
index 0000000000..524f964afc
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
@@ -0,0 +1,98 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type NotificationCard}"
+                TargetType="NotificationCard">
+    <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="Width" Value="350" />
+    <Setter Property="FontSize" Value="14" />
+    <Setter Property="Foreground" Value="White" />
+    <Setter Property="RenderTransformOrigin" Value="50%,75%" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl Name="PART_LayoutTransformControl"
+                                UseRenderTransform="True">
+          <Border Margin="8,8,0,0"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <ContentControl Name="PART_Content"
+                            MinHeight="150"
+                            Content="{TemplateBinding Content}" />
+          </Border>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^">
+      <Style.Animations>
+        <Animation Easing="QuadraticEaseIn"
+                   FillMode="Forward"
+                   Duration="0:0:0.45">
+          <KeyFrame Cue="0%">
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="TranslateTransform.Y" Value="20" />
+            <Setter Property="ScaleTransform.ScaleX" Value="0.85" />
+            <Setter Property="ScaleTransform.ScaleY" Value="0.85" />
+          </KeyFrame>
+          <KeyFrame Cue="30%">
+            <Setter Property="TranslateTransform.Y" Value="-20" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="Opacity" Value="1" />
+            <Setter Property="TranslateTransform.Y" Value="0" />
+            <Setter Property="ScaleTransform.ScaleX" Value="1" />
+            <Setter Property="ScaleTransform.ScaleY" Value="1" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+
+    <Style Selector="^[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="RenderTransformOrigin" Value="50%,0%" />
+      <Style.Animations>
+        <Animation Easing="QuadraticEaseOut"
+                   FillMode="Forward"
+                   Duration="0:0:0.75">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.X" Value="0" />
+            <Setter Property="ScaleTransform.ScaleY" Value="1" />
+          </KeyFrame>
+          <KeyFrame Cue="70%">
+            <Setter Property="TranslateTransform.X" Value="800" />
+            <Setter Property="ScaleTransform.ScaleY" Value="1" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="ScaleTransform.ScaleY" Value="0" />
+            <Setter Property="TranslateTransform.X" Value="800" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+
+    <Style Selector="^[IsClosing=true]">
+      <Style.Animations>
+        <Animation Easing="QuadraticEaseOut"
+                   FillMode="Forward"
+                   Duration="0:0:1.25">
+          <KeyFrame Cue="100%">
+            <Setter Property="IsClosed" Value="True" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+
+    <Style Selector="^:information">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}" />
+    </Style>
+    <Style Selector="^:success">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}" />
+    </Style>
+    <Style Selector="^:warning">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}" />
+    </Style>
+    <Style Selector="^:error">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
new file mode 100644
index 0000000000..d3adfb31e0
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
@@ -0,0 +1,39 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type NumericUpDown}"
+                TargetType="NumericUpDown">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ButtonSpinner Name="PART_Spinner"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch"
+                       AllowSpin="{TemplateBinding AllowSpin}"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
+                       CornerRadius="{TemplateBinding CornerRadius}"
+                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+          <TextBox Name="PART_TextBox"
+                   MinWidth="20"
+                   Margin="4"
+                   Padding="{TemplateBinding Padding}"
+                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                   AcceptsReturn="False"
+                   Background="{TemplateBinding Background}"
+                   BorderThickness="0"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   IsReadOnly="{TemplateBinding IsReadOnly}"
+                   Text="{TemplateBinding Text}"
+                   TextWrapping="NoWrap"
+                   Watermark="{TemplateBinding Watermark}" />
+        </ButtonSpinner>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
new file mode 100644
index 0000000000..d1f5585c02
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type OverlayPopupHost}"
+                TargetType="OverlayPopupHost">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!--  Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test  -->
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <VisualLayerManager IsPopup="True">
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}"
+                              Background="{TemplateBinding Background}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </VisualLayerManager>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/PathIcon.xaml b/src/Avalonia.Themes.Simple/Controls/PathIcon.xaml
new file mode 100644
index 0000000000..4116b5784e
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/PathIcon.xaml
@@ -0,0 +1,22 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type PathIcon}"
+                TargetType="PathIcon">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+    <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}">
+          <Viewbox Width="{TemplateBinding Width}"
+                   Height="{TemplateBinding Height}">
+            <Path Data="{TemplateBinding Data}"
+                  Fill="{TemplateBinding Foreground}"
+                  Stretch="Uniform" />
+          </Viewbox>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
new file mode 100644
index 0000000000..a5593e3a68
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
@@ -0,0 +1,30 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type PopupRoot}"
+                TargetType="PopupRoot">
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="TransparencyLevelHint" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <Panel>
+            <Border Name="PART_TransparencyFallback"
+                    IsHitTestVisible="False" />
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </VisualLayerManager>
+          </Panel>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
new file mode 100644
index 0000000000..5adb5bde7e
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
@@ -0,0 +1,114 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="10">
+        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
+        <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
+        <ProgressBar VerticalAlignment="Center" Value="50" />
+        <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
+        <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <converters:StringFormatConverter x:Key="StringFormatConverter" />
+
+  <ControlTheme x:Key="{x:Type ProgressBar}"
+                TargetType="ProgressBar">
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeAccentBrush}" />
+    <Setter Property="Template">
+      <ControlTemplate TargetType="ProgressBar">
+        <Grid>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Panel>
+              <Border Name="PART_Indicator"
+                      Background="{TemplateBinding Foreground}"
+                      IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Border Name="PART_IndeterminateIndicator"
+                      Background="{TemplateBinding Foreground}"
+                      IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Panel>
+          </Border>
+          <LayoutTransformControl Name="PART_LayoutTransformControl"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}">
+            <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}">
+              <TextBlock.Text>
+                <MultiBinding Converter="{StaticResource StringFormatConverter}">
+                  <TemplateBinding Property="ProgressTextFormat" />
+                  <Binding Path="Value"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                  <TemplateBinding Property="Percentage" />
+                  <TemplateBinding Property="Minimum" />
+                  <TemplateBinding Property="Maximum" />
+                </MultiBinding>
+              </TextBlock.Text>
+            </TextBlock>
+          </LayoutTransformControl>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:horizontal /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+    </Style>
+    <Style Selector="^:horizontal">
+      <Setter Property="MinWidth" Value="200" />
+      <Setter Property="MinHeight" Value="16" />
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="MinWidth" Value="16" />
+      <Setter Property="MinHeight" Value="200" />
+    </Style>
+    <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="LayoutTransform">
+        <Setter.Value>
+          <RotateTransform Angle="90" />
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:horizontal:indeterminate /template/ Border#PART_IndeterminateIndicator">
+      <Style.Animations>
+        <Animation Easing="LinearEasing"
+                   IterationCount="Infinite"
+                   Duration="0:0:3">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+      <Setter Property="Width" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+    </Style>
+    <Style Selector="^:vertical:indeterminate /template/ Border#PART_IndeterminateIndicator">
+      <Style.Animations>
+        <Animation Easing="LinearEasing"
+                   IterationCount="Infinite"
+                   Duration="0:0:3">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+      <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml b/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
new file mode 100644
index 0000000000..c837b44402
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
@@ -0,0 +1,64 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type RadioButton}"
+                TargetType="RadioButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Background="{TemplateBinding Background}"
+              ColumnDefinitions="Auto,*">
+          <Ellipse Name="border"
+                   Width="18"
+                   Height="18"
+                   VerticalAlignment="Center"
+                   Stroke="{TemplateBinding BorderBrush}"
+                   StrokeThickness="1" />
+          <Ellipse Name="checkMark"
+                   Width="10"
+                   Height="10"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Stretch="Uniform"
+                   UseLayoutRounding="False" />
+          <Ellipse Name="indeterminateMark"
+                   Width="10"
+                   Height="10"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Fill="{DynamicResource ThemeAccentBrush}"
+                   Stretch="Uniform"
+                   UseLayoutRounding="False" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Grid.Column="1"
+                            Margin="4,0,0,0"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            RecognizesAccessKey="True" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ Ellipse#border">
+      <Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#checkMark">
+      <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#indeterminateMark">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:checked /template/ Ellipse#checkMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:indeterminate /template/ Ellipse#indeterminateMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:disabled /template/ Ellipse#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Simple/Controls/RepeatButton.xaml
new file mode 100644
index 0000000000..73cfd4d810
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/RepeatButton.xaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type RepeatButton}"
+                TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          TextElement.Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml
new file mode 100644
index 0000000000..d28ba66f6d
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml
@@ -0,0 +1,151 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ScrollBar}"
+                TargetType="ScrollBar">
+    <Setter Property="Cursor" Value="Arrow" />
+
+    <Style Selector="^:horizontal">
+      <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{DynamicResource ThemeControlMidBrush}"
+                  UseLayoutRounding="False">
+            <Grid ColumnDefinitions="Auto,*,Auto">
+              <RepeatButton Name="PART_LineUpButton"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            MinWidth="{DynamicResource ScrollBarThickness}"
+                            VerticalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 4 0 L 4 8 L 0 4 Z" />
+              </RepeatButton>
+              <Track Grid.Row="1"
+                     Grid.Column="1"
+                     Maximum="{TemplateBinding Maximum}"
+                     Minimum="{TemplateBinding Minimum}"
+                     Orientation="{TemplateBinding Orientation}"
+                     ViewportSize="{TemplateBinding ViewportSize}"
+                     Value="{TemplateBinding Value,
+                                             Mode=TwoWay}">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_PageUpButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_PageDownButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.IncreaseButton>
+                <Thumb Name="thumb" />
+              </Track>
+              <RepeatButton Name="PART_LineDownButton"
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            MinWidth="{DynamicResource ScrollBarThickness}"
+                            VerticalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 0 0 L 4 4 L 0 8 Z" />
+              </RepeatButton>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{DynamicResource ThemeControlMidBrush}"
+                  UseLayoutRounding="False">
+            <Grid RowDefinitions="Auto,*,Auto">
+              <RepeatButton Name="PART_LineUpButton"
+                            Grid.Row="0"
+                            MinHeight="{DynamicResource ScrollBarThickness}"
+                            HorizontalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 0 4 L 8 4 L 4 0 Z" />
+              </RepeatButton>
+              <Track Grid.Row="1"
+                     Grid.Column="1"
+                     IsDirectionReversed="True"
+                     Maximum="{TemplateBinding Maximum}"
+                     Minimum="{TemplateBinding Minimum}"
+                     Orientation="{TemplateBinding Orientation}"
+                     ViewportSize="{TemplateBinding ViewportSize}"
+                     Value="{TemplateBinding Value,
+                                             Mode=TwoWay}">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_PageUpButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_PageDownButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.IncreaseButton>
+                <Thumb Name="thumb" />
+              </Track>
+              <RepeatButton Name="PART_LineDownButton"
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            MinHeight="{DynamicResource ScrollBarThickness}"
+                            HorizontalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 0 0 L 4 4 L 8 0 Z" />
+              </RepeatButton>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="^ /template/ Thumb#thumb">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate>
+            <Border Background="{TemplateBinding Background}" />
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+    <Style Selector="^ /template/ Thumb#thumb:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Thumb#thumb:pressed">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlVeryHighBrush}" />
+    </Style>
+    <Style Selector="^:horizontal /template/ Thumb#thumb">
+      <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
+    </Style>
+    <Style Selector="^:vertical /template/ Thumb#thumb">
+      <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
+    </Style>
+    <Style Selector="^ /template/ RepeatButton.repeat">
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="BorderThickness" Value="0" />
+    </Style>
+    <Style Selector="^ /template/ RepeatButton.repeattrack">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^ /template/ RepeatButton > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+
+    <Style Selector="^ /template/ RepeatButton:pointerover > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
new file mode 100644
index 0000000000..e11fbb6f15
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
@@ -0,0 +1,125 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="using:Avalonia.Controls.Converters">
+  <ControlTheme x:Key="{x:Type ScrollViewer}"
+                TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="*,Auto"
+              RowDefinitions="*,Auto">
+          <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  Padding="{TemplateBinding Padding}"
+                                  Background="{TemplateBinding Background}"
+                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                  Content="{TemplateBinding Content}"
+                                  Extent="{TemplateBinding Extent,
+                                                           Mode=TwoWay}"
+                                  IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}"
+                                  Viewport="{TemplateBinding Viewport,
+                                                             Mode=TwoWay}"
+                                  Offset="{TemplateBinding Offset,
+                                                           Mode=TwoWay}">
+            <ScrollContentPresenter.GestureRecognizers>
+              <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+            </ScrollContentPresenter.GestureRecognizers>
+          </ScrollContentPresenter>
+          <ScrollBar Name="horizontalScrollBar"
+                     Grid.Row="1"
+                     Focusable="False"
+                     LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                     Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
+                     Orientation="Horizontal"
+                     SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                     ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
+                     Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
+                     Value="{TemplateBinding HorizontalScrollBarValue,
+                                             Mode=TwoWay}" />
+          <ScrollBar Name="verticalScrollBar"
+                     Grid.Column="1"
+                     Focusable="False"
+                     LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
+                     Maximum="{TemplateBinding VerticalScrollBarMaximum}"
+                     Orientation="Vertical"
+                     SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
+                     ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}"
+                     Visibility="{TemplateBinding VerticalScrollBarVisibility}"
+                     Value="{TemplateBinding VerticalScrollBarValue,
+                                             Mode=TwoWay}" />
+          <Panel Grid.Row="1"
+                 Grid.Column="1"
+                 Background="{DynamicResource ThemeControlMidBrush}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="SimpleMenuScrollViewer"
+                TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <RepeatButton Background="Transparent"
+                        BorderThickness="0"
+                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
+                        DockPanel.Dock="Top">
+            <RepeatButton.IsVisible>
+              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            ConverterParameter="0">
+                <Binding Path="VerticalScrollBarVisibility"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Offset.Y"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Extent.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Viewport.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+              </MultiBinding>
+            </RepeatButton.IsVisible>
+            <Path Data="M 0 4 L 8 4 L 4 0 Z" />
+          </RepeatButton>
+          <RepeatButton Background="Transparent"
+                        BorderThickness="0"
+                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
+                        DockPanel.Dock="Bottom">
+            <RepeatButton.IsVisible>
+              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            ConverterParameter="100">
+                <Binding Path="VerticalScrollBarVisibility"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Offset.Y"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Extent.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Viewport.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+              </MultiBinding>
+            </RepeatButton.IsVisible>
+            <Path Data="M 0 0 L 4 4 L 8 0 Z" />
+          </RepeatButton>
+          <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  Margin="{TemplateBinding Padding}"
+                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                  Content="{TemplateBinding Content}"
+                                  Extent="{TemplateBinding Extent,
+                                                           Mode=TwoWay}"
+                                  Viewport="{TemplateBinding Viewport,
+                                                             Mode=TwoWay}"
+                                  Offset="{TemplateBinding Offset,
+                                                           Mode=TwoWay}" />
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^ /template/ RepeatButton > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+
+    <Style Selector="^ /template/ RepeatButton:pointerover > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml b/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml
new file mode 100644
index 0000000000..aaa6448aea
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <SelectableTextBlock Text="Preview" />
+  </Design.PreviewWith>
+
+  <MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
+    <MenuItem x:Name="SelectableTextBlockContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[SelectableTextBlock].Copy}"
+              IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+  </MenuFlyout>
+
+  <ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock">
+    <Style Selector="^[IsEnabled=True]">
+      <Setter Property="Cursor" Value="IBeam" />
+      <Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/Separator.xaml b/src/Avalonia.Themes.Simple/Controls/Separator.xaml
new file mode 100644
index 0000000000..e142cf29ad
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Separator.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Separator}"
+                TargetType="Separator">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="Margin" Value="29,1,0,1" />
+    <Setter Property="Height" Value="1" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
new file mode 100644
index 0000000000..4aefa0136c
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
@@ -0,0 +1,74 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Button.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/RadioButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Expander.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/RepeatButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ToggleButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DropDownButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/PathIcon.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CheckBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ToolTip.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Label.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ComboBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Window.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Carousel.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CaptionButtons.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TitleBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TextBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ContentControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/GridSplitter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ItemsControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ListBoxItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ListBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ScrollBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ScrollViewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabStrip.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabStripItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/PopupRoot.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TreeView.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TreeViewItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ProgressBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Separator.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Menu.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/MenuItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ContextMenu.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Calendar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Slider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NotificationCard.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NumericUpDown.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DatePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TimePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/SplitView.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/SplitButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
+
+  <StyleInclude Source="avares://Avalonia.Themes.Simple/Controls/FocusAdorner.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Simple/Controls/UserControl.xaml" />
+</Styles>
diff --git a/src/Avalonia.Themes.Simple/Controls/Slider.xaml b/src/Avalonia.Themes.Simple/Controls/Slider.xaml
new file mode 100644
index 0000000000..851ee1b78a
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Slider.xaml
@@ -0,0 +1,128 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="SliderRepeatTrackTheme"
+                TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Slider}"
+                TargetType="Slider">
+    <Style Selector="^:horizontal">
+      <Setter Property="MinWidth" Value="40" />
+      <Setter Property="MinHeight" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="grid">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto"
+                             MinHeight="20" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Border Name="TrackBackground"
+                    Grid.Row="1"
+                    Height="4"
+                    Margin="6,0"
+                    VerticalAlignment="Center" />
+            <Track Name="PART_Track"
+                   Grid.Row="1"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Horizontal">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.IncreaseButton>
+              <Thumb Name="thumb"
+                     MinWidth="20"
+                     MinHeight="20">
+                <Thumb.Template>
+                  <ControlTemplate>
+                    <Grid>
+                      <Ellipse Width="12"
+                               Height="12"
+                               Fill="{DynamicResource ThemeAccentBrush}" />
+                    </Grid>
+                  </ControlTemplate>
+                </Thumb.Template>
+              </Thumb>
+            </Track>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="MinWidth" Value="20" />
+      <Setter Property="MinHeight" Value="40" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="Auto"
+                                MinWidth="26" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Border Name="TrackBackground"
+                    Grid.Column="1"
+                    Width="4"
+                    Margin="0,6"
+                    HorizontalAlignment="Center" />
+            <Track Name="PART_Track"
+                   Grid.Column="1"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Vertical">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.IncreaseButton>
+              <Thumb Name="thumb"
+                     MinWidth="20"
+                     MinHeight="20">
+                <Thumb.Template>
+                  <ControlTemplate>
+                    <Grid>
+                      <Ellipse Width="12"
+                               Height="12"
+                               Fill="{DynamicResource ThemeAccentBrush}" />
+                    </Grid>
+                  </ControlTemplate>
+                </Thumb.Template>
+              </Thumb>
+            </Track>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^ /template/ Track#PART_Track">
+      <Setter Property="Minimum" Value="{TemplateBinding Minimum}" />
+      <Setter Property="Maximum" Value="{TemplateBinding Maximum}" />
+      <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}" />
+    </Style>
+    <Style Selector="^ /template/ Border#TrackBackground">
+      <Setter Property="BorderThickness" Value="2" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    </Style>
+    <Style Selector="^ /template/ TickBar">
+      <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
+    </Style>
+    <Style Selector="^:disabled /template/ Grid#grid">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
new file mode 100644
index 0000000000..f0d22aac97
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
@@ -0,0 +1,223 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True"
+                    xmlns:converters="using:Avalonia.Controls.Converters">
+
+  <!-- This style is heavily based on the Fluent v1 style.
+       The base resources are switched out along with a few minor changes such as Padding, CornerRadius. -->
+
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <SplitButton />
+    </Border>
+  </Design.PreviewWith>
+
+  <x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
+  <x:Double x:Key="SplitButtonSecondaryButtonSize">24</x:Double>
+  <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+  <x:Double x:Key="SplitButtonMinHeight">24</x:Double>
+  <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
+
+  <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True"
+                                        Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True"
+                                        Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
+  <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight" />
+  <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight" />
+  <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight" />
+  <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft" />
+
+  <SolidColorBrush x:Key="SplitButtonBackground" Color="{DynamicResource ThemeControlMidColor}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundPointerOver" Color="{DynamicResource ThemeControlMidColor}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundPressed" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundDisabled" Color="{DynamicResource ThemeControlMidColor}"
+                   Opacity="{DynamicResource ThemeDisabledOpacity}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundChecked" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPressed" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="SplitButtonBackgroundCheckedDisabled" Color="{DynamicResource ThemeControlHighColor}"
+                   Opacity="{DynamicResource ThemeDisabledOpacity}" />
+
+  <SolidColorBrush x:Key="SplitButtonForeground" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundPointerOver" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundPressed" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundDisabled" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundChecked" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundCheckedPointerOver" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundCheckedPressed" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="SplitButtonForegroundCheckedDisabled" Color="{DynamicResource ThemeForegroundColor}" />
+
+  <SolidColorBrush x:Key="SplitButtonBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushPointerOver" Color="{DynamicResource ThemeBorderMidColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushPressed" Color="{DynamicResource ThemeBorderLowColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushDisabled" Color="{DynamicResource ThemeBorderLowColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushChecked" Color="{DynamicResource ThemeBorderMidColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedPointerOver" Color="{DynamicResource ThemeBorderMidColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedPressed" Color="{DynamicResource ThemeControlHighColor}" />
+  <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedDisabled" Color="{DynamicResource ThemeControlMidColor}"
+                   Opacity="{DynamicResource ThemeDisabledOpacity}" />
+
+  <ControlTheme x:Key="SimpleSplitButtonComponent" TargetType="Button">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^[Tag=flyout-open] /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^[Tag=checked]">
+      <Style Selector="^ /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^:disabled /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^[Tag=checked-flyout-open] /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
+    <Setter Property="Background" Value="{DynamicResource SplitButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
+    <Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Button x:Name="PART_PrimaryButton"
+                  Grid.Column="0"
+                  Theme="{StaticResource SimpleSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Content="{TemplateBinding Content}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Command="{TemplateBinding Command}"
+                  CommandParameter="{TemplateBinding CommandParameter}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                  FontFamily="{TemplateBinding FontFamily}"
+                  FontSize="{TemplateBinding FontSize}"
+                  FontWeight="{TemplateBinding FontWeight}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  Padding="{TemplateBinding Padding}"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False" />
+
+          <Border x:Name="SeparatorBorder"
+                  Grid.Column="1"
+                  Background="Transparent"
+                  Width="{DynamicResource SplitButtonSeparatorWidth}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}" />
+
+          <Button x:Name="PART_SecondaryButton"
+                  Grid.Column="2"
+                  Theme="{StaticResource SimpleSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                  Padding="0"
+                  HorizontalContentAlignment="Center"
+                  VerticalContentAlignment="Center"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False">
+            <PathIcon Height="12" Width="12"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+          </Button>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="flyout-open" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Button">
+      <Setter Property="Tag" Value="checked" />
+    </Style>
+
+    <Style Selector="^:checked:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="checked-flyout-open" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/SplitView.xaml b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
new file mode 100644
index 0000000000..b0e4d0b096
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
@@ -0,0 +1,255 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System">
+  <Design.PreviewWith>
+    <Border Width="400" Height="400">
+      <SplitView DisplayMode="Inline"
+                 IsPaneOpen="True">
+        <SplitView.Pane>
+          <Border Background="Green" />
+        </SplitView.Pane>
+        <SplitView.Content>
+          <Border Background="Blue" />
+        </SplitView.Content>
+      </SplitView>
+    </Border>
+  </Design.PreviewWith>
+
+  <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+  <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+  <SolidColorBrush x:Key="SplitViewLightDismissOverlayBackground" Color="{DynamicResource ThemeControlLowColor}"
+                   Opacity="0.6" />
+  <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
+  <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
+  <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
+  <!-- Not used here (directly), but preserving for reference
+        <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>-->
+
+  <ControlTheme x:Key="{x:Type SplitView}"
+                TargetType="SplitView">
+    <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
+    <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
+    <Setter Property="PaneBackground" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
+
+    <!-- Left -->
+    <Style Selector="^:left">
+      <Setter Property="Template">
+        <ControlTemplate x:CompileBindings="True"
+                         TargetType="SplitView">
+          <Grid Name="Container"
+                Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition
+                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}" />
+              <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Left"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}" />
+              <Rectangle Name="HCPaneBorder" Fill="Transparent" Width="1"
+                         HorizontalAlignment="Right" />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer" />
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Overlay -->
+    <Style Selector="^:overlay:left /template/ Panel#PART_PaneRoot">
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+      <!-- ColumnSpan should be 2 -->
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+    </Style>
+    <Style Selector="^:overlay:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+    </Style>
+
+    <!-- CompactInline -->
+    <Style Selector="^:compactinline:left /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactinline:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- CompactOverlay -->
+    <Style Selector="^:compactoverlay:left /template/ Panel#PART_PaneRoot">
+      <!-- ColumnSpan should be 2 -->
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactoverlay:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Inline -->
+    <Style Selector="^:inline:left /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:inline:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Right -->
+    <Style Selector="^:right">
+      <Setter Property="Template">
+        <ControlTemplate TargetType="SplitView"
+                         x:CompileBindings="True">
+          <Grid Name="Container" Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition
+                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}" />
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Right"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}" />
+              <Rectangle Name="HCPaneBorder"
+                         Fill="Transparent"
+                         Width="1" HorizontalAlignment="Left" />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer" />
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Overlay -->
+    <Style Selector="^:overlay:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+      <Setter Property="Grid.Column" Value="1" />
+    </Style>
+    <Style Selector="^:overlay:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+    </Style>
+
+    <!-- CompactInline -->
+    <Style Selector="^:compactinline:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactinline:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- CompactOverlay -->
+    <Style Selector="^:compactoverlay:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactoverlay:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Inline -->
+    <Style Selector="^:inline:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:inline:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Open/Close Pane animation  -->
+    <Style Selector="^:open /template/ Panel#PART_PaneRoot">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
+    </Style>
+    <Style Selector="^:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Opacity" Value="1.0" />
+    </Style>
+
+    <Style Selector="^:closed /template/ Panel#PART_PaneRoot">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:closed /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Opacity" Value="0.0" />
+    </Style>
+
+    <Style Selector="^ /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="False" />
+      <Setter Property="Fill" Value="Transparent" />
+    </Style>
+    <Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
+    </Style>
+
+    <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:compactoverlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TabControl.xaml b/src/Avalonia.Themes.Simple/Controls/TabControl.xaml
new file mode 100644
index 0000000000..4d1fcc0336
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TabControl.xaml
@@ -0,0 +1,61 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabControl}"
+                TargetType="TabControl">
+    <Setter Property="Padding" Value="8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DockPanel>
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+            <ContentPresenter Name="PART_SelectedContentHost"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding SelectedContent}"
+                              ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+          </DockPanel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^[TabStripPlacement=Top]">
+      <Setter Property="Padding" Value="0 4 0 0" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Top" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Bottom] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Bottom" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Bottom]">
+      <Setter Property="Padding" Value="0 0 0 4" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Left]">
+      <Setter Property="Padding" Value="4 0 0 0" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Right" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right]">
+      <Setter Property="Padding" Value="0 0 4 0" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TabItem.xaml b/src/Avalonia.Themes.Simple/Controls/TabItem.xaml
new file mode 100644
index 0000000000..7b6a1d1116
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TabItem.xaml
@@ -0,0 +1,46 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabItem}"
+                TargetType="TabItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="Padding" Value="8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Header}"
+                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+    <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+    <Style Selector="^:selected:focus /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right]">
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TabStrip.xaml b/src/Avalonia.Themes.Simple/Controls/TabStrip.xaml
new file mode 100644
index 0000000000..3960c1d275
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TabStrip.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabStrip}"
+                TargetType="TabStrip">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ItemsPresenter Name="PART_ItemsPresenter"
+                        ItemTemplate="{TemplateBinding ItemTemplate}"
+                        Items="{TemplateBinding Items}"
+                        ItemsPanel="{TemplateBinding ItemsPanel}" />
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="ItemsPanel">
+      <ItemsPanelTemplate>
+        <WrapPanel />
+      </ItemsPanelTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Simple/Controls/TabStripItem.xaml
new file mode 100644
index 0000000000..b4d7218ec3
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TabStripItem.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabStripItem}"
+                TargetType="TabStripItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Margin" Value="16" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
new file mode 100644
index 0000000000..8428e3aae7
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -0,0 +1,223 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
+
+  <MenuFlyout x:Key="SimpleTextBoxContextFlyout" Placement="Bottom">
+    <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}"
+              IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}"
+              IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+    <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}"
+              IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
+  </MenuFlyout>
+
+  <ContextMenu x:Key="SimpleTextBoxContextMenu" x:Name="TextBoxContextMenu">
+    <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}"
+              IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}"
+              IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+    <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}"
+              IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
+  </ContextMenu>
+
+  <ControlTheme x:Key="SimpleTextBoxClearButtonTheme"
+                BasedOn="{StaticResource {x:Type Button}}"
+                TargetType="Button">
+    <Setter Property="Cursor" Value="Arrow" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border x:Name="PART_ButtonLayoutBorder"
+                  Background="Transparent"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Path x:Name="PART_GlyphElement"
+                  Width="10"
+                  Height="10"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="{StaticResource TextBoxClearButtonData}"
+                  Fill="{DynamicResource ThemeForegroundColor}"
+                  Stretch="Uniform" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="SimplePasswordBoxRevealButtonTheme"
+                BasedOn="{StaticResource {x:Type Button}}"
+                TargetType="ToggleButton">
+    <Setter Property="Cursor" Value="Arrow" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="PART_ButtonLayoutBorder"
+                  Width="12"
+                  Background="Transparent">
+            <Panel>
+              <Path x:Name="PART_GlyphElement_Reveal"
+                    Width="12"
+                    Height="8"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="{DynamicResource PasswordBoxRevealButtonData}"
+                    Fill="{DynamicResource ThemeForegroundColor}"
+                    Stretch="Uniform" />
+              <Path x:Name="PART_GlyphElement_Hide"
+                    Width="12"
+                    Height="12"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="{DynamicResource PasswordBoxHideButtonData}"
+                    Fill="{DynamicResource ThemeForegroundColor}"
+                    Stretch="Uniform" />
+            </Panel>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^:unchecked /template/ Path#PART_GlyphElement_Hide">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:checked /template/ Path#PART_GlyphElement_Reveal">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TextBox}"
+                TargetType="TextBox">
+    <Setter Property="CaretBrush" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
+    <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="ContextFlyout" Value="{StaticResource SimpleTextBoxContextFlyout}" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DockPanel Margin="{TemplateBinding Padding}"
+                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+
+            <TextBlock Name="floatingWatermark"
+                       DockPanel.Dock="Top"
+                       FontSize="{DynamicResource FontSizeSmall}"
+                       Foreground="{DynamicResource ThemeAccentBrush}"
+                       Text="{TemplateBinding Watermark}">
+              <TextBlock.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                  <Binding Path="UseFloatingWatermark"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                  <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
+                           Path="Text"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                </MultiBinding>
+              </TextBlock.IsVisible>
+            </TextBlock>
+
+            <DataValidationErrors>
+
+              <Grid ColumnDefinitions="Auto,*,Auto">
+                <ContentPresenter Grid.Column="0"
+                                  Grid.ColumnSpan="1"
+                                  Content="{TemplateBinding InnerLeftContent}" />
+                <ScrollViewer Grid.Column="1"
+                              Grid.ColumnSpan="1"
+                              AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                              HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                              IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                              VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                  <Panel>
+                    <TextBlock Name="watermark"
+                               IsVisible="{TemplateBinding Text,
+                                                           Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                               Opacity="0.5"
+                               Text="{TemplateBinding Watermark}"
+                               TextAlignment="{TemplateBinding TextAlignment}"
+                               TextWrapping="{TemplateBinding TextWrapping}" />
+                    <TextPresenter Name="PART_TextPresenter"
+                                   CaretBrush="{TemplateBinding CaretBrush}"
+                                   CaretIndex="{TemplateBinding CaretIndex}"
+                                   LineHeight="{TemplateBinding LineHeight}"
+                                   LetterSpacing="{TemplateBinding LetterSpacing}"
+                                   PasswordChar="{TemplateBinding PasswordChar}"
+                                   RevealPassword="{TemplateBinding RevealPassword}"
+                                   SelectionBrush="{TemplateBinding SelectionBrush}"
+                                   SelectionEnd="{TemplateBinding SelectionEnd}"
+                                   SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                   SelectionStart="{TemplateBinding SelectionStart}"
+                                   Text="{TemplateBinding Text,Mode=TwoWay}"
+                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                   TextWrapping="{TemplateBinding TextWrapping}" />
+                  </Panel>
+                </ScrollViewer>
+                <ContentPresenter Grid.Column="2"
+                                  Grid.ColumnSpan="1"
+                                  Content="{TemplateBinding InnerRightContent}" />
+              </Grid>
+            </DataValidationErrors>
+          </DockPanel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:focus /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:error /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+    </Style>
+    <Style Selector="^ /template/ DockPanel">
+      <Setter Property="Cursor" Value="IBeam" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+
+    <Style Selector="^.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <Button Command="{Binding $parent[TextBox].Clear}"
+                  Focusable="False"
+                  Theme="{StaticResource SimpleTextBoxClearButtonTheme}" 
+                  ClipToBounds="True" />
+        </Template>
+      </Setter>
+    </Style>
+
+    <Style Selector="^.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <Panel Margin="4,0">
+            <Panel.Styles>
+              <Style Selector="ToggleButton[IsChecked=True]">
+                <Setter Property="(ToolTip.Tip)" Value="Hide Password" />
+              </Style>
+              <Style Selector="ToggleButton[IsChecked=False]">
+                <Setter Property="(ToolTip.Tip)" Value="Show Password" />
+              </Style>
+            </Panel.Styles>
+            <ToggleButton Background="Transparent"
+                          Focusable="False"
+                          IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
+                          Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}"
+                          ClipToBounds="True" />
+          </Panel>
+        </Template>
+      </Setter>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
new file mode 100644
index 0000000000..ef37230a1f
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -0,0 +1,312 @@
+<!--
+  // (c) Copyright Microsoft Corporation.
+  // This source is subject to the Microsoft Public License (Ms-PL).
+  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // All other rights reserved.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Height="500"
+            Padding="20">
+      <StackPanel VerticalAlignment="Center"
+                  Spacing="20">
+        <TimePicker />
+        <TimePicker CornerRadius="10" />
+        <TimePicker IsEnabled="False" />
+        <TimePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </TimePicker>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
+  <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
+  <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
+  <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
+
+  <ControlTheme x:Key="SimpleTimePickerFlyoutButton"
+                TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background">
+        <SolidColorBrush Opacity="0.6"
+                         Color="{DynamicResource ThemeControlMidHighColor}" />
+      </Setter>
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TimePicker}"
+                TargetType="TimePicker">
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Grid Name="LayoutRoot"
+                Margin="{TemplateBinding Padding}">
+            <Button x:Name="PART_FlyoutButton"
+                    MinWidth="{DynamicResource TimePickerThemeMinWidth}"
+                    MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Foreground="{TemplateBinding Foreground}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    Theme="{StaticResource SimpleTimePickerFlyoutButton}">
+
+              <Grid Name="PART_FlyoutButtonContentGrid">
+                <!--  Ignore col defs here, set in code  -->
+                <Border x:Name="PART_FirstPickerHost"
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PART_HourTextBlock"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             HorizontalAlignment="Center"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontSize="{TemplateBinding FontSize}"
+                             FontWeight="{TemplateBinding FontWeight}" />
+                </Border>
+
+                <Rectangle Name="PART_FirstColumnDivider"
+                           Grid.Column="1"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource TimePickerSpacerFill}" />
+
+                <Border x:Name="PART_SecondPickerHost"
+                        Grid.Column="2"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PART_MinuteTextBlock"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             HorizontalAlignment="Center"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontSize="{TemplateBinding FontSize}"
+                             FontWeight="{TemplateBinding FontWeight}" />
+                </Border>
+
+                <Rectangle Name="PART_SecondColumnDivider"
+                           Grid.Column="3"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource TimePickerSpacerFill}" />
+
+                <Border x:Name="PART_ThirdPickerHost"
+                        Grid.Column="4"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PART_PeriodTextBlock"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             HorizontalAlignment="Center"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontSize="{TemplateBinding FontSize}"
+                             FontWeight="{TemplateBinding FontWeight}" />
+                </Border>
+              </Grid>
+            </Button>
+
+            <Popup Name="PART_Popup"
+                   IsLightDismissEnabled="True"
+                   PlacementMode="Bottom"
+                   PlacementTarget="{TemplateBinding}"
+                   WindowManagerAddShadowHint="False">
+              <TimePickerPresenter Name="PART_PickerPresenter" />
+            </Popup>
+
+          </Grid>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+
+    <Style Selector="^:hasnotime /template/ Button#PART_FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TimePickerPresenter}"
+                TargetType="TimePickerPresenter">
+    <Setter Property="Width" Value="242" />
+    <Setter Property="MinWidth" Value="242" />
+    <Setter Property="MaxHeight" Value="398" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="Background"
+                MaxHeight="398"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="ContentPanel"
+                RowDefinitions="*,Auto">
+            <Grid Name="PART_PickerContainer">
+              <!--  Ignore col defs here, set in code  -->
+              <Panel Name="PART_HourHost"
+                     Grid.Column="0">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PART_HourSelector"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Hour"
+                                       ShouldLoop="True" />
+                </ScrollViewer>
+                <RepeatButton Name="PART_HourUpButton"
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
+                <RepeatButton Name="PART_HourDownButton"
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
+              </Panel>
+
+              <Panel Name="PART_MinuteHost"
+                     Grid.Column="2">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PART_MinuteSelector"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Minute"
+                                       ShouldLoop="True" />
+                </ScrollViewer>
+                <RepeatButton Name="PART_MinuteUpButton"
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
+                <RepeatButton Name="PART_MinuteDownButton"
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
+              </Panel>
+
+              <Panel Name="PART_PeriodHost"
+                     Grid.Column="4">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PART_PeriodSelector"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"
+                                       PanelType="TimePeriod"
+                                       ShouldLoop="False" />
+                </ScrollViewer>
+                <RepeatButton Name="PART_PeriodUpButton"
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
+                <RepeatButton Name="PART_PeriodDownButton"
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
+              </Panel>
+
+              <Rectangle x:Name="HighlightRect"
+                         Grid.Column="0"
+                         Grid.ColumnSpan="5"
+                         Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}"
+                         VerticalAlignment="Center"
+                         ZIndex="-1">
+                <Rectangle.Fill>
+                  <SolidColorBrush Opacity="0.6"
+                                   Color="{DynamicResource ThemeAccentColor}" />
+                </Rectangle.Fill>
+              </Rectangle>
+              <Rectangle Name="PART_FirstSpacer"
+                         Grid.Column="1"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Rectangle Name="PART_SecondSpacer"
+                         Grid.Column="3"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+            </Grid>
+
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Grid.ColumnSpan="2"
+                         Height="{DynamicResource TimePickerSpacerThemeWidth}"
+                         VerticalAlignment="Top"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Button Name="PART_AcceptButton"
+                      Grid.Column="0"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
+                <Path Data="M0.5,8.5 5,13.5 15.5,3"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
+              </Button>
+              <Button Name="PART_DismissButton"
+                      Grid.Column="1"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      FontSize="16"
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
+                <Path Data="M2,2 14,14 M2,14 14 2"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
+              </Button>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TitleBar.xaml b/src/Avalonia.Themes.Simple/Controls/TitleBar.xaml
new file mode 100644
index 0000000000..a06dfbb834
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TitleBar.xaml
@@ -0,0 +1,65 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border>
+      <TitleBar Width="300"
+                Height="30"
+                Background="SkyBlue"
+                Foreground="Black" />
+    </Border>
+  </Design.PreviewWith>
+  <ControlTheme x:Key="{x:Type TitleBar}"
+                TargetType="TitleBar">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+               VerticalAlignment="Stretch">
+          <Panel x:Name="PART_MouseTracker"
+                 Height="1"
+                 VerticalAlignment="Top" />
+          <Panel x:Name="PART_Container">
+            <Border x:Name="PART_Background"
+                    Background="{TemplateBinding Background}" />
+            <CaptionButtons x:Name="PART_CaptionButtons"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Foreground="{TemplateBinding Foreground}" />
+          </Panel>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:fullscreen">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentColor}" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#PART_Background">
+      <Setter Property="IsHitTestVisible" Value="False" />
+    </Style>
+
+    <Style Selector="^:fullscreen /template/ Border#PART_Background">
+      <Setter Property="IsHitTestVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:fullscreen /template/ Panel#PART_MouseTracker">
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style Selector="^:fullscreen /template/ Panel#PART_Container">
+      <Setter Property="RenderTransform" Value="translateY(-30px)" />
+      <Setter Property="Transitions">
+        <Transitions>
+          <TransformOperationsTransition Property="RenderTransform"
+                                         Duration="0:0:.25" />
+        </Transitions>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:fullscreen:pointerover /template/ Panel#PART_Container">
+      <Setter Property="RenderTransform" Value="none" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
new file mode 100644
index 0000000000..2cfbcf6b7a
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ToggleButton}"
+                TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          RecognizesAccessKey="True"
+                          TextElement.Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
new file mode 100644
index 0000000000..0815f487f8
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
@@ -0,0 +1,301 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <StackPanel Margin="20" Width="250" Spacing="24">
+      <StackPanel Spacing="12">
+        <TextBlock
+          Text="Automatic updates"
+          Classes="h1" />
+        <TextBlock
+          Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
+          TextWrapping="Wrap" />
+        <ToggleSwitch HorizontalContentAlignment="Left"
+                      Content="Enable automatic Updates?"
+                      OffContent="Uit"
+                      OnContent="Aan"
+                      VerticalAlignment="Bottom" />
+      </StackPanel>
+
+      <StackPanel Spacing="12">
+        <TextBlock
+          Text="Previewer"
+          Classes="h1" />
+        <TextBlock
+          Text="The previewer Shows a preview off your code, this could slow down your system"
+          TextWrapping="Wrap" />
+        <ToggleSwitch
+          Content="Previewer"
+          IsChecked="True" />
+      </StackPanel>
+    </StackPanel>
+  </Design.PreviewWith>
+
+  <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
+  <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
+  <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
+  <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
+  <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
+  <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1</Thickness>
+  <SolidColorBrush x:Key="ToggleSwitchContentForeground" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchContentForegroundDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchHeaderForeground" Color="{DynamicResource ThemeForegroundColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchHeaderForegroundDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchContainerBackground" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundPointerOver" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundPressed" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundDisabled" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOff" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOffPointerOver" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOffPressed" Color="{DynamicResource ThemeControlMidHighColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOffDisabled" Color="Transparent" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOff" Color="{DynamicResource ThemeBorderMidColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOffPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOffPressed" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOffDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOn" Color="{DynamicResource ThemeAccentColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOnPointerOver" Color="{DynamicResource ThemeAccentColor2}" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOnPressed" Color="{DynamicResource ThemeAccentColor3}" />
+  <SolidColorBrush x:Key="ToggleSwitchFillOnDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOn" Color="{DynamicResource ThemeAccentColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOnPointerOver" Color="{DynamicResource ThemeAccentColor2}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOnPressed" Color="{DynamicResource ThemeAccentColor3}" />
+  <SolidColorBrush x:Key="ToggleSwitchStrokeOnDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOff" Color="{DynamicResource ThemeBorderMidColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPressed" Color="{DynamicResource ThemeBorderHighColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOffDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOn" Color="{DynamicResource HighlightForegroundColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPointerOver" Color="{DynamicResource HighlightForegroundColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPressed" Color="{DynamicResource HighlightForegroundColor}" />
+  <SolidColorBrush x:Key="ToggleSwitchKnobFillOnDisabled" Color="{DynamicResource HighlightForegroundColor}" />
+
+
+  <ControlTheme x:Key="{x:Type ToggleSwitch}"
+                TargetType="ToggleSwitch">
+    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Background="{TemplateBinding Background}"
+              RowDefinitions="Auto,*">
+
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Grid.Row="0"
+                            Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            RecognizesAccessKey="True"
+                            VerticalAlignment="Top" />
+
+          <Grid Grid.Row="1"
+                MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top">
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
+            </Grid.RowDefinitions>
+
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="12" MaxWidth="12" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Grid x:Name="SwitchAreaGrid"
+                  Grid.RowSpan="3"
+                  Grid.ColumnSpan="3"
+                  Background="{DynamicResource ToggleSwitchContainerBackground}"
+                  TemplatedControl.IsTemplateFocusTarget="True"
+                  Margin="0,5" />
+
+            <ContentPresenter x:Name="PART_OffContentPresenter"
+                              Grid.RowSpan="3"
+                              Grid.Column="2"
+                              Content="{TemplateBinding OffContent}"
+                              ContentTemplate="{TemplateBinding OffContentTemplate}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+            <ContentPresenter x:Name="PART_OnContentPresenter"
+                              Grid.RowSpan="3"
+                              Grid.Column="2"
+                              Content="{TemplateBinding OnContent}"
+                              ContentTemplate="{TemplateBinding OnContentTemplate}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+            <Border x:Name="OuterBorder"
+                    Grid.Row="1"
+                    Height="20"
+                    Width="40"
+                    CornerRadius="10"
+                    Background="{DynamicResource ToggleSwitchFillOff}"
+                    BorderBrush="{DynamicResource ToggleSwitchStrokeOff}"
+                    BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
+
+            <Border x:Name="SwitchKnobBounds"
+                    Grid.Row="1"
+                    Height="20"
+                    Width="40"
+                    CornerRadius="10"
+                    Background="{DynamicResource ToggleSwitchFillOn}"
+                    BorderBrush="{DynamicResource ToggleSwitchStrokeOn}"
+                    BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}" />
+
+            <Canvas x:Name="PART_SwitchKnob" Grid.Row="1"
+                    HorizontalAlignment="Left"
+                    Width="20" Height="20">
+
+              <Grid x:Name="PART_MovingKnobs"
+                    Width="20" Height="20">
+                <Grid.Transitions>
+                  <Transitions>
+                    <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                  </Transitions>
+                </Grid.Transitions>
+
+                <Ellipse x:Name="SwitchKnobOn"
+                         Fill="{DynamicResource ToggleSwitchKnobFillOn}"
+                         Width="10" Height="10" />
+
+                <Ellipse x:Name="SwitchKnobOff"
+                         Fill="{DynamicResource ToggleSwitchKnobFillOff}"
+                         Width="10" Height="10" />
+              </Grid>
+            </Canvas>
+          </Grid>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
+      <Setter Property="Margin" Value="0" />
+    </Style>
+
+    <!-- PointerOverState -->
+    <Style Selector="^:pointerover /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
+    </Style>
+
+    <!-- PressedState -->
+    <Style Selector="^:pressed /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
+    </Style>
+
+    <!-- DisabledState -->
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
+    </Style>
+
+    <!-- CheckedState -->
+    <Style Selector="^:checked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <!--UncheckedState -->
+    <Style Selector="^:unchecked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/ToolTip.xaml b/src/Avalonia.Themes.Simple/Controls/ToolTip.xaml
new file mode 100644
index 0000000000..c4fddd8c4c
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ToolTip.xaml
@@ -0,0 +1,22 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ToolTip}"
+                TargetType="ToolTip">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4,2" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml
new file mode 100644
index 0000000000..63185e11e6
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TransitioningContentControl}"
+                TargetType="TransitioningContentControl">
+    <!--  Set Defaults  -->
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding CurrentContent}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TreeView.xaml b/src/Avalonia.Themes.Simple/Controls/TreeView.xaml
new file mode 100644
index 0000000000..2bc38a0673
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TreeView.xaml
@@ -0,0 +1,31 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TreeView}"
+                TargetType="TreeView">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                        Background="{TemplateBinding Background}"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
new file mode 100644
index 0000000000..8b3452244c
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
@@ -0,0 +1,100 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+  <converters:MarginMultiplierConverter x:Key="LeftMarginConverter"
+                                        Indent="16"
+                                        Left="True" />
+
+  <ControlTheme x:Key="SimpleTreeViewItemToggleButtonTheme"
+                TargetType="ToggleButton">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Width="14"
+                Height="12"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="Transparent">
+          <Path HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 0 2 L 4 6 L 0 10 Z"
+                Fill="{DynamicResource ThemeForegroundBrush}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:checked">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="45" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TreeViewItem}"
+                TargetType="TreeViewItem">
+    <Setter Property="Padding" Value="2" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel>
+          <Border Name="SelectionBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Focusable="True"
+                  TemplatedControl.IsTemplateFocusTarget="True">
+            <Grid Name="PART_Header"
+                  Margin="{TemplateBinding Level,
+                                           Mode=OneWay,
+                                           Converter={StaticResource LeftMarginConverter}}"
+                  ColumnDefinitions="16, *">
+              <ToggleButton Name="PART_ExpandCollapseChevron"
+                            Focusable="False"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource SimpleTreeViewItemToggleButtonTheme}" />
+              <ContentPresenter Name="PART_HeaderPresenter"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalAlignment}"
+                                Content="{TemplateBinding Header}"
+                                Focusable="False" />
+            </Grid>
+          </Border>
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          IsVisible="{TemplateBinding IsExpanded}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Padding" Value="2" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#SelectionBorder:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Border#SelectionBorder">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Border#SelectionBorder:focus">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Border#SelectionBorder:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Border#SelectionBorder:pointerover:focus">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+
+    <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/UserControl.xaml b/src/Avalonia.Themes.Simple/Controls/UserControl.xaml
new file mode 100644
index 0000000000..3316b0298c
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/UserControl.xaml
@@ -0,0 +1,25 @@
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector=":is(UserControl)">
+  <Style.Resources>
+    <ControlTheme x:Key="SimpleUserControl"
+                  TargetType="UserControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  </Style.Resources>
+
+  <Setter Property="Theme" Value="{StaticResource SimpleUserControl}" />
+</Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/Window.xaml b/src/Avalonia.Themes.Simple/Controls/Window.xaml
new file mode 100644
index 0000000000..00b108343e
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/Window.xaml
@@ -0,0 +1,33 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Window}"
+                TargetType="Window">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource HighlightForegroundColor}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback"
+                  IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}"
+                  IsHitTestVisible="False" />
+          <Panel Margin="{TemplateBinding WindowDecorationMargin}"
+                 Background="Transparent" />
+          <VisualLayerManager>
+            <VisualLayerManager.ChromeOverlayLayer>
+              <TitleBar />
+            </VisualLayerManager.ChromeOverlayLayer>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </VisualLayerManager>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml
new file mode 100644
index 0000000000..6dacf63be5
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml
@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type WindowNotificationManager}"
+                TargetType="WindowNotificationManager">
+    <Setter Property="Margin" Value="0 0 8 8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ReversibleStackPanel Name="PART_Items">
+          <ReversibleStackPanel.DataTemplates>
+            <DataTemplate DataType="INotification">
+              <StackPanel Margin="12"
+                          Spacing="8">
+                <TextBlock FontWeight="Medium"
+                           Text="{Binding Title}" />
+                <TextBlock MaxHeight="80"
+                           Margin="0,0,12,0"
+                           Text="{Binding Message}"
+                           TextWrapping="Wrap" />
+              </StackPanel>
+            </DataTemplate>
+            <DataTemplate DataType="x:String">
+              <TextBlock Margin="12"
+                         Text="{Binding}" />
+            </DataTemplate>
+          </ReversibleStackPanel.DataTemplates>
+        </ReversibleStackPanel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+
+    <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+
+    <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/IBitmapToImageConverter.cs b/src/Avalonia.Themes.Simple/IBitmapToImageConverter.cs
new file mode 100644
index 0000000000..fade026b51
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/IBitmapToImageConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Themes.Simple
+{
+    internal class IBitmapToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is IBitmap bm)
+                return new Image { Source=bm };
+                
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Simple/InverseBooleanValueConverter.cs b/src/Avalonia.Themes.Simple/InverseBooleanValueConverter.cs
new file mode 100644
index 0000000000..15cc5b4a80
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/InverseBooleanValueConverter.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Themes.Simple
+{
+    class InverseBooleanValueConverter : IValueConverter
+    {
+        public bool Default { get; set; }
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is bool b ? !b : Default;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is bool b ? !b : !Default;
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs b/src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f00510816a
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Themes.Simple")]
diff --git a/src/Avalonia.Themes.Simple/SimpleTheme.cs b/src/Avalonia.Themes.Simple/SimpleTheme.cs
new file mode 100644
index 0000000000..f225cb4c4d
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/SimpleTheme.cs
@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
+using Avalonia.Styling;
+#nullable enable
+
+namespace Avalonia.Themes.Simple
+{
+    public class SimpleTheme : AvaloniaObject, IStyle, IResourceProvider
+    {
+        public static readonly StyledProperty<SimpleThemeMode> ModeProperty =
+        AvaloniaProperty.Register<SimpleTheme, SimpleThemeMode>(nameof(Mode));
+
+        private readonly Uri _baseUri;
+        private bool _isLoading;
+        private IStyle? _loaded;
+        private Styles _sharedStyles = new();
+        private Styles _simpleDark = new();
+        private Styles _simpleLight = new();
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleTheme"/> class.
+        /// </summary>
+        /// <param name="baseUri">The base URL for the XAML context.</param>
+        public SimpleTheme(Uri? baseUri = null)
+        {
+            _baseUri = baseUri ?? new Uri("avares://Avalonia.Themes.Simple/");
+            InitStyles(_baseUri);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleTheme"/> class.
+        /// </summary>
+        /// <param name="serviceProvider">The XAML service provider.</param>
+        public SimpleTheme(IServiceProvider serviceProvider)
+        {
+            var service = serviceProvider.GetService(typeof(IUriContext));
+            if (service == null)
+            {
+                throw new Exception("There is no service object of type IUriContext!");
+            }
+            _baseUri = ((IUriContext)service).BaseUri;
+            InitStyles(_baseUri);
+        }
+
+        public event EventHandler? OwnerChanged
+        {
+            add
+            {
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged += value;
+                }
+            }
+            remove
+            {
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged -= value;
+                }
+            }
+        }
+
+        IReadOnlyList<IStyle> IStyle.Children => _loaded?.Children ?? Array.Empty<IStyle>();
+
+        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
+
+        public IStyle Loaded
+        {
+            get
+            {
+                if (_loaded == null)
+                {
+                    _isLoading = true;
+
+                    if (Mode == SimpleThemeMode.Light)
+                    {
+                        _loaded = new Styles { _sharedStyles, _simpleLight };
+                    }
+                    else if (Mode == SimpleThemeMode.Dark)
+                    {
+                        _loaded = new Styles { _sharedStyles, _simpleDark };
+                    }
+                    _isLoading = false;
+                }
+
+                return _loaded!;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mode of the fluent theme (light, dark).
+        /// </summary>
+        public SimpleThemeMode Mode
+        {
+            get => GetValue(ModeProperty);
+            set => SetValue(ModeProperty, value);
+        }
+        public IResourceHost? Owner => (Loaded as IResourceProvider)?.Owner;
+
+        void IResourceProvider.AddOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.AddOwner(owner);
+
+        void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
+
+        public SelectorMatchResult TryAttach(IStyleable target, object? host) => Loaded.TryAttach(target, host);
+
+        public bool TryGetResource(object key, out object? value)
+        {
+            if (!_isLoading && Loaded is IResourceProvider p)
+            {
+                return p.TryGetResource(key, out value);
+            }
+
+            value = null;
+            return false;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == ModeProperty)
+            {
+                if (Mode == SimpleThemeMode.Dark)
+                {
+                    (Loaded as Styles)![1] = _simpleDark[0];
+                }
+                else
+                {
+                    (Loaded as Styles)![1] = _simpleLight[0];
+                }
+            }
+        }
+
+        private void InitStyles(Uri baseUri)
+        {
+            _sharedStyles = new Styles
+            {
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Controls/SimpleControls.xaml")
+                },
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Accents/Base.xaml")
+                }
+            };
+            _simpleLight = new Styles
+            {
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml")
+                }
+            };
+
+            _simpleDark = new Styles
+            {
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Accents/BaseDark.xaml")
+                }
+            };
+        }
+
+    }
+}
diff --git a/src/Avalonia.Themes.Simple/SimpleThemeMode.cs b/src/Avalonia.Themes.Simple/SimpleThemeMode.cs
new file mode 100644
index 0000000000..683c751f10
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/SimpleThemeMode.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.Themes.Simple
+{
+    public enum SimpleThemeMode
+    {
+        Light,
+        Dark
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
deleted file mode 100644
index 5f22254fb5..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-using Avalonia.Logging;
-using Avalonia.Media;
-
-#nullable enable
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that handles all animations on properties
-    /// with <see cref="IBrush"/> as their type and
-    /// redirect them to the properly registered
-    /// animators in this class.
-    /// </summary>
-    public class BaseBrushAnimator : Animator<IBrush?>
-    {
-        private static readonly List<(Func<Type, bool> Match, Type AnimatorType)> _brushAnimators =
-            new List<(Func<Type, bool> Match, Type AnimatorType)>();
-
-        /// <summary>
-        /// Register an <see cref="Animator{T}"/> that handles a specific
-        /// <see cref="IBrush"/>'s descendant value type.
-        /// </summary>
-        /// <param name="condition">
-        /// The condition to which the <see cref="Animator{T}"/>
-        /// is to be activated and used.
-        /// </param>
-        /// <typeparam name="TAnimator">
-        /// The type of the animator to instantiate.
-        /// </typeparam>
-        public static void RegisterBrushAnimator<TAnimator>(Func<Type, bool> condition)
-            where TAnimator : IAnimator, new()
-        {
-            _brushAnimators.Insert(0, (condition, typeof(TAnimator)));
-        }
-
-        /// <inheritdoc/>
-        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
-            IObservable<bool> match, Action? onComplete)
-        {
-            if (TryCreateCustomRegisteredAnimator(out var animator)
-                || TryCreateGradientAnimator(out animator)
-                || TryCreateSolidColorBrushAnimator(out animator))
-            {
-                return animator.Apply(animation, control, clock, match, onComplete);
-            }
-
-            Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
-                this,
-                "The animation's keyframe value types set is not supported.");
-
-            return base.Apply(animation, control, clock, match, onComplete);
-        }
-
-        /// <summary>
-        /// Fallback implementation of <see cref="IBrush"/> animation.
-        /// </summary>
-        public override IBrush? Interpolate(double progress, IBrush? oldValue, IBrush? newValue) => progress >= 0.5 ? newValue : oldValue;
-
-        private bool TryCreateGradientAnimator([NotNullWhen(true)] out IAnimator? animator)
-        {
-            IGradientBrush? firstGradient = null;
-            foreach (var keyframe in this)
-            {
-                if (keyframe.Value is IGradientBrush gradientBrush)
-                {
-                    firstGradient = gradientBrush;
-                    break;
-                }
-            }
-
-            if (firstGradient is null)
-            {
-                animator = null;
-                return false;
-            }
-
-            var gradientAnimator = new GradientBrushAnimator();
-            gradientAnimator.Property = Property;
-
-            foreach (var keyframe in this)
-            {
-                if (keyframe.Value is ISolidColorBrush solidColorBrush)
-                {
-                    gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), keyframe.Cue, keyframe.KeySpline)
-                    {
-                        Value = GradientBrushAnimator.ConvertSolidColorBrushToGradient(firstGradient, solidColorBrush)
-                    });
-                }
-                else if (keyframe.Value is IGradientBrush)
-                {
-                    gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), keyframe.Cue, keyframe.KeySpline)
-                    {
-                        Value = keyframe.Value
-                    });
-                }
-                else
-                {
-                    animator = null;
-                    return false;
-                }
-            }
-
-            animator = gradientAnimator;
-            return true;
-        }
-
-        private bool TryCreateSolidColorBrushAnimator([NotNullWhen(true)] out IAnimator? animator)
-        {
-            var solidColorBrushAnimator = new ISolidColorBrushAnimator();
-            solidColorBrushAnimator.Property = Property;
-
-            foreach (var keyframe in this)
-            {
-                if (keyframe.Value is ISolidColorBrush)
-                {
-                    solidColorBrushAnimator.Add(new AnimatorKeyFrame(typeof(ISolidColorBrushAnimator), keyframe.Cue, keyframe.KeySpline)
-                    {
-                        Value = keyframe.Value
-                    });
-                }
-                else
-                {
-                    animator = null;
-                    return false;
-                }
-            }
-
-            animator = solidColorBrushAnimator;
-            return true;
-        }
-
-        private bool TryCreateCustomRegisteredAnimator([NotNullWhen(true)] out IAnimator? animator)
-        {
-            if (_brushAnimators.Count > 0 && this[0].Value?.GetType() is Type firstKeyType)
-            {
-                foreach (var (match, animatorType) in _brushAnimators)
-                {
-                    if (!match(firstKeyType))
-                        continue;
-
-                    animator = (IAnimator?)Activator.CreateInstance(animatorType);
-                    if (animator != null)
-                    {
-                        animator.Property = Property;
-                        foreach (var keyframe in this)
-                        {
-                            animator.Add(new AnimatorKeyFrame(animatorType, keyframe.Cue, keyframe.KeySpline)
-                            {
-                                Value = keyframe.Value
-                            });
-                        }
-
-                        return true;
-                    }
-                }
-            }
-
-            animator = null;
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/Animators/ColorAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/ColorAnimator.cs
deleted file mode 100644
index 1686cafeb9..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/ColorAnimator.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Original color interpolation code was written by Romain Guy and Francois Blavoet 
-// and adopted from LottieSharp Project (https://github.com/ascora/LottieSharp).
-
-using System;
-using System.Reactive.Disposables;
-using Avalonia.Logging;
-using Avalonia.Media;
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that interpolates <see cref="Color"/> through 
-    /// gamma sRGB color space for better visual result.
-    /// </summary>
-    public class ColorAnimator : Animator<Color>
-    {
-        // Opto-electronic conversion function for the sRGB color space
-        // Takes a gamma-encoded sRGB value and converts it to a linear sRGB value
-        private static double OECF_sRGB(double linear)
-        {
-            // IEC 61966-2-1:1999
-            return linear <= 0.0031308d ? linear * 12.92d : (double)(Math.Pow(linear, 1.0d / 2.4d) * 1.055d - 0.055d);
-        }
-
-        // Electro-optical conversion function for the sRGB color space
-        // Takes a linear sRGB value and converts it to a gamma-encoded sRGB value
-        private static double EOCF_sRGB(double srgb)
-        {
-            // IEC 61966-2-1:1999
-            return srgb <= 0.04045d ? srgb / 12.92d : (double)Math.Pow((srgb + 0.055d) / 1.055d, 2.4d);
-        }
-
-        public override Color Interpolate(double progress, Color oldValue, Color newValue)
-        {
-            return InterpolateCore(progress, oldValue, newValue);
-        }
-
-        internal static Color InterpolateCore(double progress, Color oldValue, Color newValue)
-        {
-            // normalize sRGB values.
-            var oldA = oldValue.A / 255d;
-            var oldR = oldValue.R / 255d;
-            var oldG = oldValue.G / 255d;
-            var oldB = oldValue.B / 255d;
-
-            var newA = newValue.A / 255d;
-            var newR = newValue.R / 255d;
-            var newG = newValue.G / 255d;
-            var newB = newValue.B / 255d;
-
-            // convert from sRGB to linear
-            oldR = EOCF_sRGB(oldR);
-            oldG = EOCF_sRGB(oldG);
-            oldB = EOCF_sRGB(oldB);
-
-            newR = EOCF_sRGB(newR);
-            newG = EOCF_sRGB(newG);
-            newB = EOCF_sRGB(newB);
-
-            // compute the interpolated color in linear space
-            var a = oldA + progress * (newA - oldA);
-            var r = oldR + progress * (newR - oldR);
-            var g = oldG + progress * (newG - oldG);
-            var b = oldB + progress * (newB - oldB);
-
-            // convert back to sRGB in the [0..255] range
-            a *= 255d;
-            r = OECF_sRGB(r) * 255d;
-            g = OECF_sRGB(g) * 255d;
-            b = OECF_sRGB(b) * 255d;
-
-            return new Color((byte)Math.Round(a), (byte)Math.Round(r), (byte)Math.Round(g), (byte)Math.Round(b));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
deleted file mode 100644
index 0979de16d0..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-
-#nullable enable
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that handles <see cref="SolidColorBrush"/> values. 
-    /// </summary>
-    public class GradientBrushAnimator : Animator<IGradientBrush?>
-    {
-        private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator();
-        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
-
-        public override IGradientBrush? Interpolate(double progress, IGradientBrush? oldValue, IGradientBrush? newValue)
-        {
-            if (oldValue is null || newValue is null)
-            {
-                return progress >= 0.5 ? newValue : oldValue;
-            }
-
-            switch (oldValue)
-            {
-                case IRadialGradientBrush oldRadial when newValue is IRadialGradientBrush newRadial:
-                    return new ImmutableRadialGradientBrush(
-                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
-                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.SpreadMethod,
-                        s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
-                        s_relativePointAnimator.Interpolate(progress, oldRadial.GradientOrigin, newRadial.GradientOrigin),
-                        s_doubleAnimator.Interpolate(progress, oldRadial.Radius, newRadial.Radius));
-
-                case IConicGradientBrush oldConic when newValue is IConicGradientBrush newConic:
-                    return new ImmutableConicGradientBrush(
-                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
-                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.SpreadMethod,
-                        s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
-                        s_doubleAnimator.Interpolate(progress, oldConic.Angle, newConic.Angle));
-
-                case ILinearGradientBrush oldLinear when newValue is ILinearGradientBrush newLinear:
-                    return new ImmutableLinearGradientBrush(
-                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
-                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.SpreadMethod,
-                        s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
-                        s_relativePointAnimator.Interpolate(progress, oldLinear.EndPoint, newLinear.EndPoint));
-
-                default:
-                    return progress >= 0.5 ? newValue : oldValue;
-            }
-        }
-
-        public override IDisposable BindAnimation(Animatable control, IObservable<IGradientBrush?> instance)
-        {
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Animator has no property specified.");
-            }
-
-            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
-        }
-
-        private IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
-        {
-            var resultCount = Math.Max(oldValue.Count, newValue.Count);
-            var stops = new ImmutableGradientStop[resultCount];
-
-            for (int index = 0, oldIndex = 0, newIndex = 0; index < resultCount; index++)
-            {
-                stops[index] = new ImmutableGradientStop(
-                    s_doubleAnimator.Interpolate(progress, oldValue[oldIndex].Offset, newValue[newIndex].Offset),
-                    ColorAnimator.InterpolateCore(progress, oldValue[oldIndex].Color, newValue[newIndex].Color));
-
-                if (oldIndex < oldValue.Count - 1)
-                {
-                    oldIndex++;
-                }
-
-                if (newIndex < newValue.Count - 1)
-                {
-                    newIndex++;
-                }
-            }
-            
-            return stops;
-        }
-
-        internal static IGradientBrush ConvertSolidColorBrushToGradient(IGradientBrush gradientBrush, ISolidColorBrush solidColorBrush)
-        {
-            switch (gradientBrush)
-            {
-                case IRadialGradientBrush oldRadial:
-                    return new ImmutableRadialGradientBrush(
-                        CreateStopsFromSolidColorBrush(solidColorBrush, oldRadial.GradientStops), solidColorBrush.Opacity,
-                        oldRadial.SpreadMethod, oldRadial.Center, oldRadial.GradientOrigin, oldRadial.Radius);
-
-                case IConicGradientBrush oldConic:
-                    return new ImmutableConicGradientBrush(
-                        CreateStopsFromSolidColorBrush(solidColorBrush, oldConic.GradientStops), solidColorBrush.Opacity,
-                        oldConic.SpreadMethod, oldConic.Center, oldConic.Angle);
-
-                case ILinearGradientBrush oldLinear:
-                    return new ImmutableLinearGradientBrush(
-                        CreateStopsFromSolidColorBrush(solidColorBrush, oldLinear.GradientStops), solidColorBrush.Opacity,
-                        oldLinear.SpreadMethod, oldLinear.StartPoint, oldLinear.EndPoint);
-
-                default:
-                    throw new NotSupportedException($"Gradient of type {gradientBrush?.GetType()} is not supported");
-            }
-
-            static IReadOnlyList<ImmutableGradientStop> CreateStopsFromSolidColorBrush(ISolidColorBrush solidColorBrush, IReadOnlyList<IGradientStop> baseStops)
-            {
-                var stops = new ImmutableGradientStop[baseStops.Count];
-                for (int index = 0; index < baseStops.Count; index++)
-                {
-                    stops[index] = new ImmutableGradientStop(baseStops[index].Offset, solidColorBrush.Color);
-                }
-                return stops;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
deleted file mode 100644
index 57f9f3c1a5..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-
-#nullable enable
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that handles <see cref="SolidColorBrush"/> values. 
-    /// </summary>
-    public class ISolidColorBrushAnimator : Animator<ISolidColorBrush?>
-    {
-        public override ISolidColorBrush? Interpolate(double progress, ISolidColorBrush? oldValue, ISolidColorBrush? newValue)
-        {
-            if (oldValue is null || newValue is null)
-            {
-                return progress >= 0.5 ? newValue : oldValue;
-            }
-
-            return new ImmutableSolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
-        }
-
-        public override IDisposable BindAnimation(Animatable control, IObservable<ISolidColorBrush?> instance)
-        {
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Animator has no property specified.");
-            }
-
-            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
-        }
-    }
-    
-    [Obsolete("Use ISolidColorBrushAnimator instead")]
-    public class SolidColorBrushAnimator : Animator<SolidColorBrush?>
-    {    
-        public override SolidColorBrush? Interpolate(double progress, SolidColorBrush? oldValue, SolidColorBrush? newValue)
-        {
-            if (oldValue is null || newValue is null)
-            {
-                return progress >= 0.5 ? newValue : oldValue;
-            }
-
-            return new SolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
deleted file mode 100644
index 34ec8ac503..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-using Avalonia.Logging;
-using Avalonia.Media;
-using Avalonia.Media.Transformation;
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that handles <see cref="Transform"/> properties.
-    /// </summary>
-    public class TransformAnimator : Animator<double>
-    {
-        DoubleAnimator? _doubleAnimator;
-
-        /// <inheritdoc/>
-        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> obsMatch, Action? onComplete)
-        {
-            var ctrl = (Visual)control;
-
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Animator has no property specified.");
-            }
-
-            // Check if the Target Property is Transform derived.
-            if (typeof(Transform).IsAssignableFrom(Property.OwnerType))
-            {
-                if (ctrl.RenderTransform is TransformOperations)
-                {
-                    // HACK: This animator cannot reasonably animate CSS transforms at the moment.
-                    return Disposable.Empty;
-                }
-
-                if (ctrl.RenderTransform == null)
-                {
-                    var normalTransform = new TransformGroup();
-
-                    // Add the transforms according to MS Expression Blend's 
-                    // default RenderTransform order.
-
-                    normalTransform.Children.Add(new ScaleTransform());
-                    normalTransform.Children.Add(new SkewTransform());
-                    normalTransform.Children.Add(new RotateTransform());
-                    normalTransform.Children.Add(new TranslateTransform());
-
-                    ctrl.RenderTransform = normalTransform;
-                }
-
-                var renderTransformType = ctrl.RenderTransform.GetType();
-
-                if (_doubleAnimator == null)
-                {
-                    _doubleAnimator = new DoubleAnimator();
-
-                    foreach (AnimatorKeyFrame keyframe in this)
-                    {
-                        _doubleAnimator.Add(keyframe);
-                    }
-
-                    _doubleAnimator.Property = Property;
-                }
-
-                // It's a transform object so let's target that.
-                if (renderTransformType == Property.OwnerType)
-                {
-                    return _doubleAnimator.Apply(animation, (Transform) ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
-                }
-                // It's a TransformGroup and try finding the target there.
-                else if (renderTransformType == typeof(TransformGroup))
-                {
-                    foreach (Transform transform in ((TransformGroup)ctrl.RenderTransform).Children)
-                    {
-                        if (transform.GetType() == Property.OwnerType)
-                        {
-                            return _doubleAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
-                        }
-                    }
-                }
-
-                Logger.TryGet(LogEventLevel.Warning, LogArea.Animations)?.Log(
-                    control,
-                    $"Cannot find the appropriate transform: \"{Property.OwnerType}\" in {control}.");
-            }
-            else
-            {
-                Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
-                    control,
-                    $"Cannot apply animation: Target property owner {Property.OwnerType} is not a Transform object.");
-            }
-            return null;
-        }
-
-        /// <inheritdocs/> 
-        public override double Interpolate(double p, double o, double n) => 0;
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/CompositePageTransition.cs b/src/Avalonia.Visuals/Animation/CompositePageTransition.cs
deleted file mode 100644
index 2a6eae3e38..0000000000
--- a/src/Avalonia.Visuals/Animation/CompositePageTransition.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia.Metadata;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Defines a composite page transition that can be used to combine multiple transitions.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Instantiate the <see cref="CompositePageTransition" /> in XAML and initialize the
-    /// <see cref="Transitions" /> property in order to have many animations triggered at once.
-    /// For example, you can combine <see cref="CrossFade"/> and <see cref="PageSlide"/>.
-    /// <code>
-    /// <![CDATA[
-    /// <reactiveUi:RoutedViewHost Router="{Binding Router}">
-    ///   <reactiveUi:RoutedViewHost.PageTransition>
-    ///     <CompositePageTransition>
-    ///       <PageSlide Duration="0.5" />
-    ///       <CrossFade Duration="0.5" />
-    ///     </CompositePageTransition>
-    ///   </reactiveUi:RoutedViewHost.PageTransition>
-    /// </reactiveUi:RoutedViewHost>
-    /// ]]>
-    /// </code>
-    /// </para>
-    /// </remarks>
-    public class CompositePageTransition : IPageTransition
-    {
-        /// <summary>
-        /// Gets or sets the transitions to be executed. Can be defined from XAML.
-        /// </summary>
-        [Content]
-        public List<IPageTransition> PageTransitions { get; set; } = new List<IPageTransition>();
-
-        /// <inheritdoc />
-        public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
-        {
-            var transitionTasks = PageTransitions
-                .Select(transition => transition.Start(from, to, forward, cancellationToken))
-                .ToList();
-            return Task.WhenAll(transitionTasks);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/PageSlide.cs b/src/Avalonia.Visuals/Animation/PageSlide.cs
deleted file mode 100644
index 6f5d12d824..0000000000
--- a/src/Avalonia.Visuals/Animation/PageSlide.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia.Animation.Easings;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Transitions between two pages by sliding them horizontally.
-    /// </summary>
-    public class PageSlide : IPageTransition
-    {
-        /// <summary>
-        /// The axis on which the PageSlide should occur
-        /// </summary>
-        public enum SlideAxis
-        {
-            Horizontal,
-            Vertical
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PageSlide"/> class.
-        /// </summary>
-        public PageSlide()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PageSlide"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        /// <param name="orientation">The axis on which the animation should occur</param>
-        public PageSlide(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal)
-        {
-            Duration = duration;
-            Orientation = orientation;
-        }
-
-        /// <summary>
-        /// Gets the duration of the animation.
-        /// </summary>
-        public TimeSpan Duration { get; set; }
-
-        /// <summary>
-        /// Gets the duration of the animation.
-        /// </summary>
-        public SlideAxis Orientation { get; set; }
-        
-        /// <summary>
-        /// Gets or sets element entrance easing.
-        /// </summary>
-        public Easing SlideInEasing { get; set; } = new LinearEasing();
-        
-        /// <summary>
-        /// Gets or sets element exit easing.
-        /// </summary>
-        public Easing SlideOutEasing { get; set; } = new LinearEasing();
-
-        /// <inheritdoc />
-        public async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return;
-            }
-
-            var tasks = new List<Task>();
-            var parent = GetVisualParent(from, to);
-            var distance = Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
-            var translateProperty = Orientation == SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
-
-            if (from != null)
-            {
-                var animation = new Animation
-                {
-                    Easing = SlideOutEasing,
-                    FillMode = FillMode.Forward,
-                    Children =
-                    {
-                        new KeyFrame
-                        {
-                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
-                            Cue = new Cue(0d)
-                        },
-                        new KeyFrame
-                        {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                    Value = forward ? -distance : distance
-                                }
-                            },
-                            Cue = new Cue(1d)
-                        }
-                    },
-                    Duration = Duration
-                };
-                tasks.Add(animation.RunAsync(from, null, cancellationToken));
-            }
-
-            if (to != null)
-            {
-                to.IsVisible = true;
-                var animation = new Animation
-                {
-                    FillMode = FillMode.Forward,
-                    Easing = SlideInEasing,
-                    Children =
-                    {
-                        new KeyFrame
-                        {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                    Value = forward ? distance : -distance
-                                }
-                            },
-                            Cue = new Cue(0d)
-                        },
-                        new KeyFrame
-                        {
-                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
-                            Cue = new Cue(1d)
-                        }
-                    },
-                    Duration = Duration
-                };
-                tasks.Add(animation.RunAsync(to, null, cancellationToken));
-            }
-
-            await Task.WhenAll(tasks);
-
-            if (from != null && !cancellationToken.IsCancellationRequested)
-            {
-                from.IsVisible = false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the common visual parent of the two control.
-        /// </summary>
-        /// <param name="from">The from control.</param>
-        /// <param name="to">The to control.</param>
-        /// <returns>The common parent.</returns>
-        /// <exception cref="ArgumentException">
-        /// The two controls do not share a common parent.
-        /// </exception>
-        /// <remarks>
-        /// Any one of the parameters may be null, but not both.
-        /// </remarks>
-        private static IVisual GetVisualParent(IVisual? from, IVisual? to)
-        {
-            var p1 = (from ?? to)!.VisualParent;
-            var p2 = (to ?? from)!.VisualParent;
-
-            if (p1 != null && p2 != null && p1 != p2)
-            {
-                throw new ArgumentException("Controls for PageSlide must have same parent.");
-            }
-
-            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt
deleted file mode 100644
index 828ea1f184..0000000000
--- a/src/Avalonia.Visuals/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-Compat issues with assembly Avalonia.Visuals:
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.CompositePageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.CrossFade.Start(Avalonia.Visual, Avalonia.Visual)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.PageSlide.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.DrawingContext.DrawText(Avalonia.Media.IBrush, Avalonia.Point, Avalonia.Media.FormattedText)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText..ctor(Avalonia.Platform.IPlatformRenderInterface)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText..ctor(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Rect Avalonia.Media.FormattedText.Bounds.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Size Avalonia.Media.FormattedText.Constraint.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Constraint.set(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Media.FormattedText.FontSize.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.FontSize.set(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Collections.Generic.IEnumerable<Avalonia.Media.FormattedTextLine> Avalonia.Media.FormattedText.GetLines()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextHitTestResult Avalonia.Media.FormattedText.HitTestPoint(Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Rect Avalonia.Media.FormattedText.HitTestTextPosition(System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Collections.Generic.IEnumerable<Avalonia.Rect> Avalonia.Media.FormattedText.HitTestTextRange(System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Platform.IFormattedTextImpl Avalonia.Media.FormattedText.PlatformImpl.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan> Avalonia.Media.FormattedText.Spans.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Spans.set(System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.String Avalonia.Media.FormattedText.Text.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Text.set(System.String)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextWrapping Avalonia.Media.FormattedText.TextWrapping.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.TextWrapping.set(Avalonia.Media.TextWrapping)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.Typeface Avalonia.Media.FormattedText.Typeface.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Typeface.set(Avalonia.Media.Typeface)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.FormattedTextLine' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.FormattedTextStyleSpan' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun..ctor(Avalonia.Media.GlyphTypeface, System.Double, Avalonia.Utilities.ReadOnlySlice<System.UInt16>, Avalonia.Utilities.ReadOnlySlice<System.Double>, Avalonia.Utilities.ReadOnlySlice<Avalonia.Vector>, Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Utilities.ReadOnlySlice<System.UInt16>, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<System.Double> Avalonia.Media.GlyphRun.GlyphAdvances.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphAdvances.set(Avalonia.Utilities.ReadOnlySlice<System.Double>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<System.UInt16> Avalonia.Media.GlyphRun.GlyphClusters.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphClusters.set(Avalonia.Utilities.ReadOnlySlice<System.UInt16>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<System.UInt16> Avalonia.Media.GlyphRun.GlyphIndices.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphIndices.set(Avalonia.Utilities.ReadOnlySlice<System.UInt16>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<Avalonia.Vector> Avalonia.Media.GlyphRun.GlyphOffsets.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphOffsets.set(Avalonia.Utilities.ReadOnlySlice<Avalonia.Vector>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphTypeface.set(Avalonia.Media.GlyphTypeface)' does not exist in the implementation but it does exist in the contract.
-CannotSealType : Type 'Avalonia.Media.Pen' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
-MembersMustExist : Member 'protected void Avalonia.Media.Pen.AffectsRender<T>(Avalonia.AvaloniaProperty[])' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Media.Pen.RaiseInvalidated(System.EventArgs)' does not exist in the implementation but it does exist in the contract.
-CannotSealType : Type 'Avalonia.Media.TextHitTestResult' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
-TypeCannotChangeClassification : Type 'Avalonia.Media.TextHitTestResult' is a 'struct' in the implementation but is a 'class' in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult.IsInside.set(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult.IsTrailing.set(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult.TextPosition.set(System.Int32)' does not exist in the implementation but it does exist in the contract.
-TypeCannotChangeClassification : Type 'Avalonia.Media.Immutable.ImmutableSolidColorBrush' is a 'class' in the implementation but is a 'struct' in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
-CannotSealType : Type 'Avalonia.Media.TextFormatting.GenericTextParagraphProperties' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextFormatting.TextRunProperties Avalonia.Media.TextFormatting.GenericTextParagraphProperties.DefaultTextRunProperties' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public System.Double Avalonia.Media.TextFormatting.GenericTextParagraphProperties.LineHeight' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextAlignment Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextAlignment' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextWrapping Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextWrapping' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextFormatting.TextRunProperties Avalonia.Media.TextFormatting.GenericTextParagraphProperties.DefaultTextRunProperties.get()' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public System.Double Avalonia.Media.TextFormatting.GenericTextParagraphProperties.LineHeight.get()' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextAlignment Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextAlignment.get()' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextWrapping Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextWrapping.get()' is non-virtual in the implementation but is virtual in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.GenericTextRunProperties..ctor(Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextDecorationCollection, Avalonia.Media.IBrush, Avalonia.Media.IBrush, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.ShapeableTextCharacters..ctor(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.TextFormatting.TextRunProperties)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.ShapedTextCharacters..ctor(Avalonia.Media.GlyphRun, Avalonia.Media.TextFormatting.TextRunProperties)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.ShapedTextCharacters.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.ShapedTextCharacters.SplitTextCharactersResult Avalonia.Media.TextFormatting.ShapedTextCharacters.Split(System.Int32)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.TextFormatting.ShapedTextCharacters.SplitTextCharactersResult' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected System.Boolean Avalonia.Media.TextFormatting.TextCharacters.TryGetRunProperties(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, Avalonia.Media.Typeface, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextEndOfLine..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLayout..ctor(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.IBrush, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Media.TextTrimming, Avalonia.Media.TextDecorationCollection, System.Double, System.Double, System.Double, System.Int32, System.Collections.Generic.IReadOnlyList<Avalonia.Utilities.ValueSpan<Avalonia.Media.TextFormatting.TextRunProperties>>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLayout.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Baseline' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Extent' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextLine.HasOverflowed' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Height' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.NewLineLength' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangAfter' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangLeading' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangTrailing' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Start' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.TrailingWhitespaceLength' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Width' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.WidthIncludingTrailingWhitespace' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Baseline.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLine.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.TextLine.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Extent.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextLine.HasOverflowed.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Height.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.TextLineMetrics Avalonia.Media.TextFormatting.TextLine.LineMetrics.get()' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.NewLineLength.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangAfter.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangLeading.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangTrailing.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Start.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.TrailingWhitespaceLength.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Width.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.WidthIncludingTrailingWhitespace.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLineBreak..ctor(System.Collections.Generic.IReadOnlyList<Avalonia.Media.TextFormatting.ShapedTextCharacters>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLineMetrics..ctor(Avalonia.Size, System.Double, Avalonia.Media.TextFormatting.TextRange, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.TextLineMetrics Avalonia.Media.TextFormatting.TextLineMetrics.Create(System.Collections.Generic.IEnumerable<Avalonia.Media.TextFormatting.TextRun>, Avalonia.Media.TextFormatting.TextRange, System.Double, Avalonia.Media.TextFormatting.TextParagraphProperties)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Size Avalonia.Media.TextFormatting.TextLineMetrics.Size.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.TextRange Avalonia.Media.TextFormatting.TextLineMetrics.TextRange.get()' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextParagraphProperties.FirstLineInParagraph' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.FlowDirection Avalonia.Media.TextFormatting.TextParagraphProperties.FlowDirection' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextParagraphProperties.Indent' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextParagraphProperties.FirstLineInParagraph.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.FlowDirection Avalonia.Media.TextFormatting.TextParagraphProperties.FlowDirection.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextParagraphProperties.Indent.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.BaselineAlignment Avalonia.Media.TextFormatting.TextRunProperties.BaselineAlignment' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.BaselineAlignment Avalonia.Media.TextFormatting.TextRunProperties.BaselineAlignment.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public Avalonia.Media.GlyphRun Avalonia.Media.TextFormatting.TextShaper.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.TextFormatting.Unicode.BiDiClass' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.Unicode.BiDiClass Avalonia.Media.TextFormatting.Unicode.Codepoint.BiDiClass.get()' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.DrawEllipse(Avalonia.Media.IBrush, Avalonia.Media.IPen, Avalonia.Rect)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.DrawText(Avalonia.Media.IBrush, Avalonia.Point, Avalonia.Platform.IFormattedTextImpl)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public void Avalonia.Platform.IDrawingContextImpl.DrawText(Avalonia.Media.IBrush, Avalonia.Point, Avalonia.Platform.IFormattedTextImpl)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.PopBitmapBlendMode()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.PushBitmapBlendMode(Avalonia.Visuals.Media.Imaging.BitmapBlendingMode)' is present in the implementation but not in the contract.
-TypesMustExist : Type 'Avalonia.Platform.IFormattedTextImpl' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.IGeometryImpl.ContourLength' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.IGeometryImpl.ContourLength.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IGeometryImpl.TryGetPointAndTangentAtDistance(System.Double, Avalonia.Point, Avalonia.Point)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IGeometryImpl.TryGetPointAtDistance(System.Double, Avalonia.Point)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IGeometryImpl.TryGetSegment(System.Double, System.Double, System.Boolean, Avalonia.Platform.IGeometryImpl)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGeometryImpl Avalonia.Platform.IPlatformRenderInterface.CreateCombinedGeometry(Avalonia.Media.GeometryCombineMode, Avalonia.Media.Geometry, Avalonia.Media.Geometry)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IFormattedTextImpl Avalonia.Platform.IPlatformRenderInterface.CreateFormattedText(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Size, System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan>)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public Avalonia.Platform.IFormattedTextImpl Avalonia.Platform.IPlatformRenderInterface.CreateFormattedText(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Size, System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan>)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGeometryImpl Avalonia.Platform.IPlatformRenderInterface.CreateGeometryGroup(Avalonia.Media.FillRule, System.Collections.Generic.IReadOnlyList<Avalonia.Media.Geometry>)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun, System.Double)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun, System.Double)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.IO.Stream)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.String)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToHeight(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToWidth(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.TextFormatting.ShapedBuffer Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.GlyphTypeface, System.Double, System.Globalization.CultureInfo, System.SByte)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.GlyphRun Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public Avalonia.Media.GlyphRun Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Rendering.RendererBase.RenderFps(Avalonia.Platform.IDrawingContextImpl, Avalonia.Rect, System.Nullable<System.Int32>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Utilities.ReadOnlySlice<T>..ctor(System.ReadOnlyMemory<T>, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 146
diff --git a/src/Avalonia.Visuals/Assets/BiDi.trie b/src/Avalonia.Visuals/Assets/BiDi.trie
deleted file mode 100644
index 1c6122e2f1..0000000000
Binary files a/src/Avalonia.Visuals/Assets/BiDi.trie and /dev/null differ
diff --git a/src/Avalonia.Visuals/Assets/GraphemeBreak.trie b/src/Avalonia.Visuals/Assets/GraphemeBreak.trie
deleted file mode 100644
index 482bf9b44d..0000000000
Binary files a/src/Avalonia.Visuals/Assets/GraphemeBreak.trie and /dev/null differ
diff --git a/src/Avalonia.Visuals/Assets/UnicodeData.trie b/src/Avalonia.Visuals/Assets/UnicodeData.trie
deleted file mode 100644
index 46175ea644..0000000000
Binary files a/src/Avalonia.Visuals/Assets/UnicodeData.trie and /dev/null differ
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
deleted file mode 100644
index 6c978e970e..0000000000
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <RootNamespace>Avalonia</RootNamespace>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\*.trie" />
-  </ItemGroup>
-  <ItemGroup> 
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\System.Memory.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs
deleted file mode 100644
index b08a0eb98a..0000000000
--- a/src/Avalonia.Visuals/Matrix.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// A 2x3 matrix.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Matrix : IEquatable<Matrix>
-    {
-        private readonly double _m11;
-        private readonly double _m12;
-        private readonly double _m21;
-        private readonly double _m22;
-        private readonly double _m31;
-        private readonly double _m32;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Matrix"/> struct.
-        /// </summary>
-        /// <param name="m11">The first element of the first row.</param>
-        /// <param name="m12">The second element of the first row.</param>
-        /// <param name="m21">The first element of the second row.</param>
-        /// <param name="m22">The second element of the second row.</param>
-        /// <param name="offsetX">The first element of the third row.</param>
-        /// <param name="offsetY">The second element of the third row.</param>
-        public Matrix(
-            double m11,
-            double m12,
-            double m21,
-            double m22,
-            double offsetX,
-            double offsetY)
-        {
-            _m11 = m11;
-            _m12 = m12;
-            _m21 = m21;
-            _m22 = m22;
-            _m31 = offsetX;
-            _m32 = offsetY;
-        }
-
-        /// <summary>
-        /// Returns the multiplicative identity matrix.
-        /// </summary>
-        public static Matrix Identity { get; } = new Matrix(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
-
-        /// <summary>
-        /// Returns whether the matrix is the identity matrix.
-        /// </summary>
-        public bool IsIdentity => Equals(Identity);
-
-        /// <summary>
-        /// HasInverse Property - returns true if this matrix is invertible, false otherwise.
-        /// </summary>
-        public bool HasInverse => !MathUtilities.IsZero(GetDeterminant());
-
-        /// <summary>
-        /// The first element of the first row
-        /// </summary>
-        public double M11 => _m11;
-
-        /// <summary>
-        /// The second element of the first row
-        /// </summary>
-        public double M12 => _m12;
-
-        /// <summary>
-        /// The first element of the second row
-        /// </summary>
-        public double M21 => _m21;
-
-        /// <summary>
-        /// The second element of the second row
-        /// </summary>
-        public double M22 => _m22;
-
-        /// <summary>
-        /// The first element of the third row
-        /// </summary>
-        public double M31 => _m31;
-
-        /// <summary>
-        /// The second element of the third row
-        /// </summary>
-        public double M32 => _m32;
-
-        /// <summary>
-        /// Multiplies two matrices together and returns the resulting matrix.
-        /// </summary>
-        /// <param name="value1">The first source matrix.</param>
-        /// <param name="value2">The second source matrix.</param>
-        /// <returns>The product matrix.</returns>
-        public static Matrix operator *(Matrix value1, Matrix value2)
-        {
-            return new Matrix(
-                (value1.M11 * value2.M11) + (value1.M12 * value2.M21),
-                (value1.M11 * value2.M12) + (value1.M12 * value2.M22),
-                (value1.M21 * value2.M11) + (value1.M22 * value2.M21),
-                (value1.M21 * value2.M12) + (value1.M22 * value2.M22),
-                (value1._m31 * value2.M11) + (value1._m32 * value2.M21) + value2._m31,
-                (value1._m31 * value2.M12) + (value1._m32 * value2.M22) + value2._m32);
-        }
-
-        /// <summary>
-        /// Negates the given matrix by multiplying all values by -1.
-        /// </summary>
-        /// <param name="value">The source matrix.</param>
-        /// <returns>The negated matrix.</returns>
-        public static Matrix operator -(Matrix value)
-        {
-            return value.Invert();
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given matrices are equal.
-        /// </summary>
-        /// <param name="value1">The first source matrix.</param>
-        /// <param name="value2">The second source matrix.</param>
-        /// <returns>True if the matrices are equal; False otherwise.</returns>
-        public static bool operator ==(Matrix value1, Matrix value2)
-        {
-            return value1.Equals(value2);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given matrices are not equal.
-        /// </summary>
-        /// <param name="value1">The first source matrix.</param>
-        /// <param name="value2">The second source matrix.</param>
-        /// <returns>True if the matrices are not equal; False if they are equal.</returns>
-        public static bool operator !=(Matrix value1, Matrix value2)
-        {
-            return !value1.Equals(value2);
-        }
-
-        /// <summary>
-        /// Creates a rotation matrix using the given rotation in radians.
-        /// </summary>
-        /// <param name="radians">The amount of rotation, in radians.</param>
-        /// <returns>A rotation matrix.</returns>
-        public static Matrix CreateRotation(double radians)
-        {
-            double cos = Math.Cos(radians);
-            double sin = Math.Sin(radians);
-            return new Matrix(cos, sin, -sin, cos, 0, 0);
-        }
-
-        /// <summary>
-        /// Creates a skew matrix from the given axis skew angles in radians.
-        /// </summary>
-        /// <param name="xAngle">The amount of skew along the X-axis, in radians.</param>
-        /// <param name="yAngle">The amount of skew along the Y-axis, in radians.</param>
-        /// <returns>A rotation matrix.</returns>
-        public static Matrix CreateSkew(double xAngle, double yAngle)
-        {
-            double tanX = Math.Tan(xAngle);
-            double tanY = Math.Tan(yAngle);
-            return new Matrix(1.0, tanY, tanX, 1.0, 0.0, 0.0);
-        }
-
-        /// <summary>
-        /// Creates a scale matrix from the given X and Y components.
-        /// </summary>
-        /// <param name="xScale">Value to scale by on the X-axis.</param>
-        /// <param name="yScale">Value to scale by on the Y-axis.</param>
-        /// <returns>A scaling matrix.</returns>
-        public static Matrix CreateScale(double xScale, double yScale)
-        {
-            return CreateScale(new Vector(xScale, yScale));
-        }
-
-        /// <summary>
-        /// Creates a scale matrix from the given vector scale.
-        /// </summary>
-        /// <param name="scales">The scale to use.</param>
-        /// <returns>A scaling matrix.</returns>
-        public static Matrix CreateScale(Vector scales)
-        {
-            return new Matrix(scales.X, 0, 0, scales.Y, 0, 0);
-        }
-
-        /// <summary>
-        /// Creates a translation matrix from the given vector.
-        /// </summary>
-        /// <param name="position">The translation position.</param>
-        /// <returns>A translation matrix.</returns>
-        public static Matrix CreateTranslation(Vector position)
-        {
-            return CreateTranslation(position.X, position.Y);
-        }
-
-        /// <summary>
-        /// Creates a translation matrix from the given X and Y components.
-        /// </summary>
-        /// <param name="xPosition">The X position.</param>
-        /// <param name="yPosition">The Y position.</param>
-        /// <returns>A translation matrix.</returns>
-        public static Matrix CreateTranslation(double xPosition, double yPosition)
-        {
-            return new Matrix(1.0, 0.0, 0.0, 1.0, xPosition, yPosition);
-        }
-
-        /// <summary>
-        /// Converts an angle in degrees to radians.
-        /// </summary>
-        /// <param name="angle">The angle in degrees.</param>
-        /// <returns>The angle in radians.</returns>
-        public static double ToRadians(double angle)
-        {
-            return angle * 0.0174532925;
-        }
-
-        /// <summary>
-        /// Appends another matrix as post-multiplication operation.
-        /// Equivalent to this * value;
-        /// </summary>
-        /// <param name="value">A matrix.</param>
-        /// <returns>Post-multiplied matrix.</returns>
-        public Matrix Append(Matrix value)
-        {
-            return this * value;
-        }
-
-        /// <summary>
-        /// Prpends another matrix as pre-multiplication operation.
-        /// Equivalent to value * this;
-        /// </summary>
-        /// <param name="value">A matrix.</param>
-        /// <returns>Pre-multiplied matrix.</returns>
-        public Matrix Prepend(Matrix value)
-        {
-            return value * this;
-        }
-
-        /// <summary>
-        /// Calculates the determinant for this matrix.
-        /// </summary>
-        /// <returns>The determinant.</returns>
-        /// <remarks>
-        /// The determinant is calculated by expanding the matrix with a third column whose
-        /// values are (0,0,1).
-        /// </remarks>
-        public double GetDeterminant()
-        {
-            return (_m11 * _m22) - (_m12 * _m21);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the matrix is equal to the other given matrix.
-        /// </summary>
-        /// <param name="other">The other matrix to test equality against.</param>
-        /// <returns>True if this matrix is equal to other; False otherwise.</returns>
-        public bool Equals(Matrix other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _m11 == other.M11 &&
-                   _m12 == other.M12 &&
-                   _m21 == other.M21 &&
-                   _m22 == other.M22 &&
-                   _m31 == other.M31 &&
-                   _m32 == other.M32;
-            // ReSharper restore CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given Object is equal to this matrix instance.
-        /// </summary>
-        /// <param name="obj">The Object to compare against.</param>
-        /// <returns>True if the Object is equal to this matrix; False otherwise.</returns>
-        public override bool Equals(object? obj) => obj is Matrix other && Equals(other);
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return M11.GetHashCode() + M12.GetHashCode() +
-                   M21.GetHashCode() + M22.GetHashCode() +
-                   M31.GetHashCode() + M32.GetHashCode();
-        }
-
-        /// <summary>
-        /// Returns a String representing this matrix instance.
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            CultureInfo ci = CultureInfo.CurrentCulture;
-            return string.Format(
-                ci,
-                "{{ {{M11:{0} M12:{1}}} {{M21:{2} M22:{3}}} {{M31:{4} M32:{5}}} }}",
-                M11.ToString(ci),
-                M12.ToString(ci),
-                M21.ToString(ci),
-                M22.ToString(ci),
-                M31.ToString(ci),
-                M32.ToString(ci));
-        }
-
-        /// <summary>
-        /// Attempts to invert the Matrix.
-        /// </summary>
-        /// <returns>The inverted matrix or <see langword="null"/> when matrix is not invertible.</returns>
-        public bool TryInvert(out Matrix inverted)
-        {
-            double d = GetDeterminant();
-
-            if (MathUtilities.IsZero(d))
-            {
-                inverted = default;
-                
-                return false;
-            }
-
-            inverted = new Matrix(
-                _m22 / d,
-                -_m12 / d,
-                -_m21 / d,
-                _m11 / d,
-                ((_m21 * _m32) - (_m22 * _m31)) / d,
-                ((_m12 * _m31) - (_m11 * _m32)) / d);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Inverts the Matrix.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Matrix is not invertible.</exception>
-        /// <returns>The inverted matrix.</returns>
-        public Matrix Invert()
-        {
-            if (!TryInvert(out Matrix inverted))
-            {
-                throw new InvalidOperationException("Transform is not invertible.");
-            }
-
-            return inverted;
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Matrix"/> string.
-        /// </summary>
-        /// <param name="s">Six comma-delimited double values (m11, m12, m21, m22, offsetX, offsetY) that describe the new <see cref="Matrix"/></param>
-        /// <returns>The <see cref="Matrix"/>.</returns>
-        public static Matrix Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Matrix."))
-            {
-                return new Matrix(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble()
-                );
-            }
-        }
-
-        /// <summary>
-        /// Decomposes given matrix into transform operations.
-        /// </summary>
-        /// <param name="matrix">Matrix to decompose.</param>
-        /// <param name="decomposed">Decomposed matrix.</param>
-        /// <returns>The status of the operation.</returns>
-        public static bool TryDecomposeTransform(Matrix matrix, out Decomposed decomposed)
-        {
-            decomposed = default;
-
-            var determinant = matrix.GetDeterminant();
-            
-            if (MathUtilities.IsZero(determinant))
-            {
-                return false;
-            }
-
-            var m11 = matrix.M11;
-            var m21 = matrix.M21;
-            var m12 = matrix.M12;
-            var m22 = matrix.M22;
-
-            // Translation.
-            decomposed.Translate = new Vector(matrix.M31, matrix.M32);
-
-            // Scale sign.
-            var scaleX = 1d;
-            var scaleY = 1d;
-
-            if (determinant < 0)
-            {
-                if (m11 < m22)
-                {
-                    scaleX *= -1d;
-                }
-                else
-                {
-                    scaleY *= -1d;
-                }
-            }
-
-            // X Scale.
-            scaleX *= Math.Sqrt(m11 * m11 + m12 * m12);
-
-            m11 /= scaleX;
-            m12 /= scaleX;
-
-            // XY Shear.
-            double scaledShear = m11 * m21 + m12 * m22;
-
-            m21 -= m11 * scaledShear;
-            m22 -= m12 * scaledShear;
-
-            // Y Scale.
-            scaleY *= Math.Sqrt(m21 * m21 + m22 * m22);
-
-            decomposed.Scale = new Vector(scaleX, scaleY);
-            decomposed.Skew = new Vector(scaledShear / scaleY, 0d);
-            decomposed.Angle = Math.Atan2(m12, m11);
-
-            return true;
-        }
-
-        public struct Decomposed
-        {
-            public Vector Translate;
-            public Vector Scale;
-            public Vector Skew;
-            public double Angle;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/BoxShadow.cs b/src/Avalonia.Visuals/Media/BoxShadow.cs
deleted file mode 100644
index b01f59f5f8..0000000000
--- a/src/Avalonia.Visuals/Media/BoxShadow.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using Avalonia.Animation.Animators;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    public struct BoxShadow
-    {
-        public double OffsetX { get; set; }
-        public double OffsetY { get; set; }
-        public double Blur { get; set; }
-        public double Spread { get; set; }
-        public Color Color { get; set; }
-        public bool IsInset { get; set; }
-
-        static BoxShadow()
-        {
-            Animation.Animation.RegisterAnimator<BoxShadowAnimator>(prop =>
-                typeof(BoxShadow).IsAssignableFrom(prop.PropertyType));
-        }
-        
-        public bool Equals(in BoxShadow other)
-        {
-            return OffsetX.Equals(other.OffsetX) && OffsetY.Equals(other.OffsetY) && Blur.Equals(other.Blur) && Spread.Equals(other.Spread) && Color.Equals(other.Color);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is BoxShadow other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = OffsetX.GetHashCode();
-                hashCode = (hashCode * 397) ^ OffsetY.GetHashCode();
-                hashCode = (hashCode * 397) ^ Blur.GetHashCode();
-                hashCode = (hashCode * 397) ^ Spread.GetHashCode();
-                hashCode = (hashCode * 397) ^ Color.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        public bool IsEmpty => OffsetX == 0 && OffsetY == 0 && Blur == 0 && Spread == 0;
-
-        private readonly static char[] s_Separator = new char[] { ' ', '\t' };
-
-        struct ArrayReader
-        {
-            private int _index;
-            private string[] _arr;
-
-            public ArrayReader(string[] arr)
-            {
-                _arr = arr;
-                _index = 0;
-            }
-
-            public bool TryReadString([MaybeNullWhen(false)] out string s)
-            {
-                s = null;
-                if (_index >= _arr.Length)
-                    return false;
-                s = _arr[_index];
-                _index++;
-                return true;
-            }
-
-            public string ReadString()
-            {
-                if(!TryReadString(out var rv))
-                    throw new FormatException();
-                return rv;
-            }
-        }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-
-            if (IsEmpty)
-            {
-                return "none";
-            }
-
-            if (IsInset)
-            {
-                sb.Append("inset");
-            }
-
-            if (OffsetX != 0.0)
-            {
-                sb.AppendFormat(" {0}", OffsetX.ToString());
-            }
-
-            if (OffsetY != 0.0)
-            {
-                sb.AppendFormat(" {0}", OffsetY.ToString());
-            }
-            
-            if (Blur != 0.0)
-            {
-                sb.AppendFormat(" {0}", Blur.ToString());
-            }
-
-            if (Spread != 0.0)
-            {
-                sb.AppendFormat(" {0}", Spread.ToString());
-            }
-
-            sb.AppendFormat(" {0}", Color.ToString());
-
-            return sb.ToString();
-        }
-
-        public static unsafe BoxShadow Parse(string s)
-        {
-            if(s == null)
-                throw new ArgumentNullException();
-            if (s.Length == 0)
-                throw new FormatException();
-
-            var p = s.Split(s_Separator, StringSplitOptions.RemoveEmptyEntries);
-            if (p.Length == 1 && p[0] == "none")
-                return default;
-            
-            if (p.Length < 3 || p.Length > 6)
-                throw new FormatException();
-            
-            bool inset = false;
-
-            var tokenizer = new ArrayReader(p);
-
-            string firstToken = tokenizer.ReadString();
-            if (firstToken == "inset")
-            {
-                inset = true;
-                firstToken = tokenizer.ReadString();
-            }
-
-            var offsetX = double.Parse(firstToken, CultureInfo.InvariantCulture);
-            var offsetY = double.Parse(tokenizer.ReadString(), CultureInfo.InvariantCulture);
-            double blur = 0;
-            double spread = 0;
-            
-
-            tokenizer.TryReadString(out var token3);
-            tokenizer.TryReadString(out var token4);
-            tokenizer.TryReadString(out var token5);
-
-            if (token4 != null) 
-                blur = double.Parse(token3!, CultureInfo.InvariantCulture);
-            if (token5 != null)
-                spread = double.Parse(token4!, CultureInfo.InvariantCulture);
-
-            var color = Color.Parse(token5 ?? token4 ?? token3!);
-            return new BoxShadow
-            {
-                IsInset = inset,
-                OffsetX = offsetX,
-                OffsetY = offsetY,
-                Blur = blur,
-                Spread = spread,
-                Color = color
-            };
-        }
-
-        public Rect TransformBounds(in Rect rect)
-            => IsInset ? rect : rect.Translate(new Vector(OffsetX, OffsetY)).Inflate(Spread + Blur);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/BoxShadows.cs b/src/Avalonia.Visuals/Media/BoxShadows.cs
deleted file mode 100644
index 4614ea4e3c..0000000000
--- a/src/Avalonia.Visuals/Media/BoxShadows.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Text;
-using Avalonia.Animation.Animators;
-
-namespace Avalonia.Media
-{
-    public struct BoxShadows
-    {
-        private readonly BoxShadow _first;
-        private readonly BoxShadow[]? _list;
-        public int Count { get; }
-
-        static BoxShadows()
-        {
-            Animation.Animation.RegisterAnimator<BoxShadowsAnimator>(prop =>
-                typeof(BoxShadows).IsAssignableFrom(prop.PropertyType));
-        }
-        
-        public BoxShadows(BoxShadow shadow)
-        {
-            _first = shadow;
-            _list = null;
-            Count = _first.IsEmpty ? 0 : 1;
-        }
-
-        public BoxShadows(BoxShadow first, BoxShadow[] rest)
-        {
-            _first = first;
-            _list = rest;
-            Count = 1 + (rest?.Length ?? 0);
-        }
-
-        public BoxShadow this[int c]
-        {
-            get
-            {
-                if (c< 0 || c >= Count)
-                    throw new IndexOutOfRangeException();
-                if (c == 0)
-                    return _first;
-                return _list![c - 1];
-            }
-        }
-
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-
-            if (Count == 0)
-            {
-                return "none";
-            }
-
-            foreach (var boxShadow in this)
-            {
-                sb.AppendFormat("{0} ", boxShadow.ToString());
-            }
-
-            return sb.ToString();
-
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public struct BoxShadowsEnumerator
-        {
-            private int _index;
-            private BoxShadows _shadows;
-
-            public BoxShadowsEnumerator(BoxShadows shadows)
-            {
-                _shadows = shadows;
-                _index = -1;
-            }
-
-            public BoxShadow Current => _shadows[_index];
-
-            public bool MoveNext()
-            {
-                _index++;
-                return _index < _shadows.Count;
-            }
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public BoxShadowsEnumerator GetEnumerator() => new BoxShadowsEnumerator(this);
-
-        private static readonly char[] s_Separators = new[] { ',' };
-        public static BoxShadows Parse(string s)
-        {
-            var sp = s.Split(s_Separators, StringSplitOptions.RemoveEmptyEntries);
-            if (sp.Length == 0
-                || (sp.Length == 1 &&
-                    (string.IsNullOrWhiteSpace(sp[0])
-                     || sp[0] == "none")))
-                return new BoxShadows();
-
-            var first = BoxShadow.Parse(sp[0]);
-            if (sp.Length == 1)
-                return new BoxShadows(first);
-
-            var rest = new BoxShadow[sp.Length - 1];
-            for (var c = 0; c < rest.Length; c++)
-                rest[c] = BoxShadow.Parse(sp[c + 1]);
-            return new BoxShadows(first, rest);
-        }
-
-        public Rect TransformBounds(in Rect rect)
-        {
-            var final = rect;
-            foreach (var shadow in this)
-                final = final.Union(shadow.TransformBounds(rect));
-            return final;
-        }
-        
-        public bool HasInsetShadows
-        {
-            get
-            {
-                foreach(var boxShadow in this)
-                    if (!boxShadow.IsEmpty && boxShadow.IsInset)
-                        return true;
-                return false;
-            }
-        }
-        
-        public bool Equals(BoxShadows other)
-        {
-            if (other.Count != Count)
-                return false;
-            for(var c=0; c<Count ; c++)
-                if (!this[c].Equals(other[c]))
-                    return false;
-            return true;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is BoxShadows other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = 0;
-                foreach (var s in this)
-                    hashCode = (hashCode * 397) ^ s.GetHashCode();
-                return hashCode;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Brush.cs b/src/Avalonia.Visuals/Media/Brush.cs
deleted file mode 100644
index 11fbe9393a..0000000000
--- a/src/Avalonia.Visuals/Media/Brush.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.ComponentModel;
-using Avalonia.Animation;
-using Avalonia.Animation.Animators;
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how an area is painted.
-    /// </summary>
-    [TypeConverter(typeof(BrushConverter))]
-    public abstract class Brush : Animatable, IMutableBrush
-    {
-        /// <summary>
-        /// Defines the <see cref="Opacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> OpacityProperty =
-            AvaloniaProperty.Register<Brush, double>(nameof(Opacity), 1.0);
-
-        /// <inheritdoc/>
-        public event EventHandler? Invalidated;
-
-        static Brush()
-        {
-            Animation.Animation.RegisterAnimator<BaseBrushAnimator>(prop => typeof(IBrush).IsAssignableFrom(prop.PropertyType));
-            AffectsRender<Brush>(OpacityProperty);
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity of the brush.
-        /// </summary>
-        public double Opacity
-        {
-            get { return GetValue(OpacityProperty); }
-            set { SetValue(OpacityProperty, value); }
-        }
-
-        /// <summary>
-        /// Parses a brush string.
-        /// </summary>
-        /// <param name="s">The brush string.</param>
-        /// <returns>The <see cref="Color"/>.</returns>
-        public static IBrush Parse(string s)
-        {
-            _ = s ?? throw new ArgumentNullException(nameof(s));
-
-            if (s.Length > 0)
-            {
-                if (s[0] == '#')
-                {
-                    return new ImmutableSolidColorBrush(Color.Parse(s));
-                }
-
-                var brush = KnownColors.GetKnownBrush(s);
-                if (brush != null)
-                {
-                    return brush;
-                }
-            }
-
-            throw new FormatException($"Invalid brush string: '{s}'.");
-        }
-
-        /// <inheritdoc/>
-        public abstract IBrush ToImmutable();
-
-        /// <summary>
-        /// Marks a property as affecting the brush's visual representation.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a brush's static constructor, any change to the
-        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : Brush
-        {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(e => Invalidate(e));
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
deleted file mode 100644
index 083c15cd13..0000000000
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-using System;
-using System.Globalization;
-#if !BUILDTASK
-using Avalonia.Animation.Animators;
-#endif
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// An ARGB color.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Color : IEquatable<Color>
-    {
-        static Color()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<ColorAnimator>(prop => typeof(Color).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
-        /// <summary>
-        /// Gets the Alpha component of the color.
-        /// </summary>
-        public byte A { get; }
-
-        /// <summary>
-        /// Gets the Red component of the color.
-        /// </summary>
-        public byte R { get; }
-
-        /// <summary>
-        /// Gets the Green component of the color.
-        /// </summary>
-        public byte G { get; }
-
-        /// <summary>
-        /// Gets the Blue component of the color.
-        /// </summary>
-        public byte B { get; }
-
-        public Color(byte a, byte r, byte g, byte b)
-        {
-            A = a;
-            R = r;
-            G = g;
-            B = b;
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Color"/> from alpha, red, green and blue components.
-        /// </summary>
-        /// <param name="a">The alpha component.</param>
-        /// <param name="r">The red component.</param>
-        /// <param name="g">The green component.</param>
-        /// <param name="b">The blue component.</param>
-        /// <returns>The color.</returns>
-        public static Color FromArgb(byte a, byte r, byte g, byte b)
-        {
-            return new Color(a, r, g, b);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Color"/> from red, green and blue components.
-        /// </summary>
-        /// <param name="r">The red component.</param>
-        /// <param name="g">The green component.</param>
-        /// <param name="b">The blue component.</param>
-        /// <returns>The color.</returns>
-        public static Color FromRgb(byte r, byte g, byte b)
-        {
-            return new Color(0xff, r, g, b);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Color"/> from an integer.
-        /// </summary>
-        /// <param name="value">The integer value.</param>
-        /// <returns>The color.</returns>
-        public static Color FromUInt32(uint value)
-        {
-            return new Color(
-                (byte)((value >> 24) & 0xff),
-                (byte)((value >> 16) & 0xff),
-                (byte)((value >> 8) & 0xff),
-                (byte)(value & 0xff)
-            );
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <returns>The <see cref="Color"/>.</returns>
-        public static Color Parse(string s)
-        {
-            if (s is null)
-            {
-                throw new ArgumentNullException(nameof(s));
-            }
-
-            if (TryParse(s, out Color color))
-            {
-                return color;
-            }
-
-            throw new FormatException($"Invalid color string: '{s}'.");
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <returns>The <see cref="Color"/>.</returns>
-        public static Color Parse(ReadOnlySpan<char> s)
-        {
-            if (TryParse(s, out Color color))
-            {
-                return color;
-            }
-
-            throw new FormatException($"Invalid color string: '{s.ToString()}'.");
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <param name="color">The parsed color</param>
-        /// <returns>The status of the operation.</returns>
-        public static bool TryParse(string s, out Color color)
-        {
-            color = default;
-
-            if (s is null)
-            {
-                return false;
-            }
-
-            if (s.Length == 0)
-            {
-                return false;
-            }
-
-            if (s[0] == '#' && TryParseInternal(s.AsSpan(), out color))
-            {
-                return true;
-            }
-
-            var knownColor = KnownColors.GetKnownColor(s);
-
-            if (knownColor != KnownColor.None)
-            {
-                color = knownColor.ToColor();
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <param name="color">The parsed color</param>
-        /// <returns>The status of the operation.</returns>
-        public static bool TryParse(ReadOnlySpan<char> s, out Color color)
-        {
-            if (s.Length == 0)
-            {
-                color = default;
-
-                return false;
-            }
-
-            if (s[0] == '#')
-            {
-                return TryParseInternal(s, out color);
-            }
-
-            var knownColor = KnownColors.GetKnownColor(s.ToString());
-
-            if (knownColor != KnownColor.None)
-            {
-                color = knownColor.ToColor();
-
-                return true;
-            }
-
-            color = default;
-
-            return false;
-        }
-
-        private static bool TryParseInternal(ReadOnlySpan<char> s, out Color color)
-        {
-            static bool TryParseCore(ReadOnlySpan<char> input, ref Color color)
-            {
-                var alphaComponent = 0u;
-
-                if (input.Length == 6)
-                {
-                    alphaComponent = 0xff000000;
-                }
-                else if (input.Length != 8)
-                {
-                    return false;
-                }
-
-                // TODO: (netstandard 2.1) Can use allocation free parsing.
-                if (!uint.TryParse(input.ToString(), NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                    out var parsed))
-                {
-                    return false;
-                }
-
-                color = FromUInt32(parsed | alphaComponent);
-
-                return true;
-            }
-
-            color = default;
-
-            ReadOnlySpan<char> input = s.Slice(1);
-
-            // Handle shorthand cases like #FFF (RGB) or #FFFF (ARGB).
-            if (input.Length == 3 || input.Length == 4)
-            {
-                var extendedLength = 2 * input.Length;
-                
-#if !BUILDTASK
-                Span<char> extended = stackalloc char[extendedLength];
-#else
-                char[] extended = new char[extendedLength];
-#endif
-
-                for (int i = 0; i < input.Length; i++)
-                {
-                    extended[2 * i + 0] = input[i];
-                    extended[2 * i + 1] = input[i];
-                }
-
-                return TryParseCore(extended, ref color);
-            }
-
-            return TryParseCore(input, ref color);
-        }
-
-        /// <summary>
-        /// Returns the string representation of the color.
-        /// </summary>
-        /// <returns>
-        /// The string representation of the color.
-        /// </returns>
-        public override string ToString()
-        {
-            uint rgb = ToUint32();
-            return KnownColors.GetKnownColorName(rgb) ?? $"#{rgb:x8}";
-        }
-
-        /// <summary>
-        /// Returns the integer representation of the color.
-        /// </summary>
-        /// <returns>
-        /// The integer representation of the color.
-        /// </returns>
-        public uint ToUint32()
-        {
-            return ((uint)A << 24) | ((uint)R << 16) | ((uint)G << 8) | (uint)B;
-        }
-
-        /// <summary>
-        /// Check if two colors are equal.
-        /// </summary>
-        public bool Equals(Color other)
-        {
-            return A == other.A && R == other.R && G == other.G && B == other.B;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is Color other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = A.GetHashCode();
-                hashCode = (hashCode * 397) ^ R.GetHashCode();
-                hashCode = (hashCode * 397) ^ G.GetHashCode();
-                hashCode = (hashCode * 397) ^ B.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        public static bool operator ==(Color left, Color right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(Color left, Color right)
-        {
-            return !left.Equals(right);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/ConicGradientBrush.cs b/src/Avalonia.Visuals/Media/ConicGradientBrush.cs
deleted file mode 100644
index 7c1266fa17..0000000000
--- a/src/Avalonia.Visuals/Media/ConicGradientBrush.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with a swept circular gradient.
-    /// </summary>
-    public sealed class ConicGradientBrush : GradientBrush, IConicGradientBrush
-    {
-        /// <summary>
-        /// Defines the <see cref="Center"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativePoint> CenterProperty =
-            AvaloniaProperty.Register<RadialGradientBrush, RelativePoint>(
-                nameof(Center),
-                RelativePoint.Center);
-
-        /// <summary>
-        /// Defines the <see cref="Angle"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> AngleProperty =
-            AvaloniaProperty.Register<RadialGradientBrush, double>(
-                nameof(Angle),
-                0);
-        
-        static ConicGradientBrush()
-        {
-            AffectsRender<ConicGradientBrush>(CenterProperty, AngleProperty);
-        }
-
-        /// <summary>
-        /// Gets or sets the center point of the gradient.
-        /// </summary>
-        public RelativePoint Center
-        {
-            get { return GetValue(CenterProperty); }
-            set { SetValue(CenterProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the angle of the start and end of the sweep, measured from above the center point.
-        /// </summary>
-        public double Angle
-        {
-            get { return GetValue(AngleProperty); }
-            set { SetValue(AngleProperty, value); }
-        }
-
-        /// <inheritdoc/>
-        public override IBrush ToImmutable()
-        {
-            return new ImmutableConicGradientBrush(this);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DashStyle.cs b/src/Avalonia.Visuals/Media/DashStyle.cs
deleted file mode 100644
index 2ec9436ede..0000000000
--- a/src/Avalonia.Visuals/Media/DashStyle.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Avalonia.Animation;
-using Avalonia.Collections;
-using Avalonia.Media.Immutable;
-
-#nullable enable
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
-    /// </summary>
-    public class DashStyle : Animatable, IDashStyle, IAffectsRender
-    {
-        /// <summary>
-        /// Defines the <see cref="Dashes"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AvaloniaList<double>> DashesProperty =
-            AvaloniaProperty.Register<DashStyle, AvaloniaList<double>>(nameof(Dashes));
-
-        /// <summary>
-        /// Defines the <see cref="Offset"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> OffsetProperty =
-            AvaloniaProperty.Register<DashStyle, double>(nameof(Offset));
-
-        private static ImmutableDashStyle? s_dash;
-        private static ImmutableDashStyle? s_dot;
-        private static ImmutableDashStyle? s_dashDot;
-        private static ImmutableDashStyle? s_dashDotDot;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DashStyle"/> class.
-        /// </summary>
-        public DashStyle()
-            : this(null, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DashStyle"/> class.
-        /// </summary>
-        /// <param name="dashes">The dashes collection.</param>
-        /// <param name="offset">The dash sequence offset.</param>
-        public DashStyle(IEnumerable<double>? dashes, double offset)
-        {
-            Dashes = (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>());
-            Offset = offset;
-        }
-
-        static DashStyle()
-        {
-            void RaiseInvalidated(AvaloniaPropertyChangedEventArgs e)
-            {
-                ((DashStyle)e.Sender).Invalidated?.Invoke(e.Sender, EventArgs.Empty);
-            }
-
-            DashesProperty.Changed.Subscribe(RaiseInvalidated);
-            OffsetProperty.Changed.Subscribe(RaiseInvalidated);
-        }
-
-        /// <summary>
-        /// Represents a dashed <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle Dash => s_dash ??= new ImmutableDashStyle(new double[] { 2, 2 }, 1);
-
-        /// <summary>
-        /// Represents a dotted <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle Dot => s_dot ??= new ImmutableDashStyle(new double[] { 0, 2 }, 0);
-
-        /// <summary>
-        /// Represents a dashed dotted <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle DashDot => s_dashDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2 }, 1);
-
-        /// <summary>
-        /// Represents a dashed double dotted <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle DashDotDot => s_dashDotDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2, 0, 2 }, 1);
-
-        /// <summary>
-        /// Gets or sets the length of alternating dashes and gaps.
-        /// </summary>
-        public AvaloniaList<double> Dashes
-        {
-            get => GetValue(DashesProperty);
-            set => SetValue(DashesProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets how far in the dash sequence the stroke will start.
-        /// </summary>
-        public double Offset
-        {
-            get => GetValue(OffsetProperty);
-            set => SetValue(OffsetProperty, value);
-        }
-
-        IReadOnlyList<double> IDashStyle.Dashes => Dashes;
-
-        /// <summary>
-        /// Raised when the dash style changes.
-        /// </summary>
-        public event EventHandler? Invalidated;
-
-        /// <summary>
-        /// Returns an immutable clone of the <see cref="DashStyle"/>.
-        /// </summary>
-        /// <returns></returns>
-        public ImmutableDashStyle ToImmutable() => new ImmutableDashStyle(Dashes, Offset);
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == DashesProperty)
-            {
-                var oldValue = change.OldValue.GetValueOrDefault<AvaloniaList<double>>();
-                var newValue = change.NewValue.GetValueOrDefault<AvaloniaList<double>>();
-
-                if (oldValue is object)
-                {
-                    oldValue.CollectionChanged -= DashesChanged;
-                }
-
-                if (newValue is object)
-                {
-                    newValue.CollectionChanged += DashesChanged;
-                }
-            }
-        }
-
-        private void DashesChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            Invalidated?.Invoke(this, e);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs
deleted file mode 100644
index d0a73ca9a8..0000000000
--- a/src/Avalonia.Visuals/Media/DrawingContext.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Threading;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    public sealed class DrawingContext : IDisposable
-    {
-        private readonly bool _ownsImpl;
-        private int _currentLevel;
-
-
-        private static ThreadSafeObjectPool<Stack<PushedState>> StateStackPool { get; } =
-            ThreadSafeObjectPool<Stack<PushedState>>.Default;
-
-        private static ThreadSafeObjectPool<Stack<TransformContainer>> TransformStackPool { get; } =
-            ThreadSafeObjectPool<Stack<TransformContainer>>.Default;
-
-        private Stack<PushedState>? _states = StateStackPool.Get();
-
-        private Stack<TransformContainer>? _transformContainers = TransformStackPool.Get();
-
-        readonly struct TransformContainer
-        {
-            public readonly Matrix LocalTransform;
-            public readonly Matrix ContainerTransform;
-
-            public TransformContainer(Matrix localTransform, Matrix containerTransform)
-            {
-                LocalTransform = localTransform;
-                ContainerTransform = containerTransform;
-            }
-        }
-
-        public DrawingContext(IDrawingContextImpl impl)
-        {
-            PlatformImpl = impl;
-            _ownsImpl = true;
-        }
-        
-        public DrawingContext(IDrawingContextImpl impl, bool ownsImpl)
-        {
-            _ownsImpl = ownsImpl;
-            PlatformImpl = impl;
-        }
-
-        public IDrawingContextImpl PlatformImpl { get; }
-
-        private Matrix _currentTransform = Matrix.Identity;
-
-        private Matrix _currentContainerTransform = Matrix.Identity;
-
-        /// <summary>
-        /// Gets the current transform of the drawing context.
-        /// </summary>
-        public Matrix CurrentTransform
-        {
-            get { return _currentTransform; }
-            private set
-            {
-                _currentTransform = value;
-                var transform = _currentTransform * _currentContainerTransform;
-                PlatformImpl.Transform = transform;
-            }
-        }
-
-        //HACK: This is a temporary hack that is used in the render loop 
-        //to update TransformedBounds property
-        [Obsolete("HACK for render loop, don't use")]
-        public Matrix CurrentContainerTransform => _currentContainerTransform;
-
-        /// <summary>
-        /// Draws an image.
-        /// </summary>
-        /// <param name="source">The image.</param>
-        /// <param name="rect">The rect in the output to draw to.</param>
-        public void DrawImage(IImage source, Rect rect)
-        {
-            _ = source ?? throw new ArgumentNullException(nameof(source));
-
-            DrawImage(source, new Rect(source.Size), rect);
-        }
-
-        /// <summary>
-        /// Draws an image.
-        /// </summary>
-        /// <param name="source">The image.</param>
-        /// <param name="sourceRect">The rect in the image to draw.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        public void DrawImage(IImage source, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = default)
-        {
-            _ = source ?? throw new ArgumentNullException(nameof(source));
-
-            source.Draw(this, sourceRect, destRect, bitmapInterpolationMode);
-        }
-
-        /// <summary>
-        /// Draws a line.
-        /// </summary>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="p1">The first point of the line.</param>
-        /// <param name="p2">The second point of the line.</param>
-        public void DrawLine(IPen pen, Point p1, Point p2)
-        {
-            if (PenIsVisible(pen))
-            {
-                PlatformImpl.DrawLine(pen, p1, p2);
-            }
-        }
-
-        /// <summary>
-        /// Draws a geometry.
-        /// </summary>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        public void DrawGeometry(IBrush? brush, IPen? pen, Geometry geometry)
-        {
-            if (geometry.PlatformImpl is not null)
-                DrawGeometry(brush, pen, geometry.PlatformImpl);
-        }
-
-        /// <summary>
-        /// Draws a geometry.
-        /// </summary>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
-        {
-            _ = geometry ?? throw new ArgumentNullException(nameof(geometry));
-
-            if (brush != null || PenIsVisible(pen))
-            {
-                PlatformImpl.DrawGeometry(brush, pen, geometry);
-            }
-        }
-
-        /// <summary>
-        /// Draws a rectangle with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="radiusX">The radius in the X dimension of the rounded corners.
-        ///     This value will be clamped to the range of 0 to Width/2
-        /// </param>
-        /// <param name="radiusY">The radius in the Y dimension of the rounded corners.
-        ///     This value will be clamped to the range of 0 to Height/2
-        /// </param>
-        /// <param name="boxShadows">Box shadow effect parameters</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        public void DrawRectangle(IBrush? brush, IPen? pen, Rect rect, double radiusX = 0, double radiusY = 0,
-            BoxShadows boxShadows = default)
-        {
-            if (brush == null && !PenIsVisible(pen))
-            {
-                return;
-            }
-
-            if (!MathUtilities.IsZero(radiusX))
-            {
-                radiusX = Math.Min(radiusX, rect.Width / 2);
-            }
-
-            if (!MathUtilities.IsZero(radiusY))
-            {
-                radiusY = Math.Min(radiusY, rect.Height / 2);
-            }
-
-            PlatformImpl.DrawRectangle(brush, pen, new RoundedRect(rect, radiusX, radiusY), boxShadows);
-        }
-
-        /// <summary>
-        /// Draws the outline of a rectangle.
-        /// </summary>
-        /// <param name="pen">The pen.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="cornerRadius">The corner radius.</param>
-        public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0.0f)
-        {
-            DrawRectangle(null, pen, rect, cornerRadius, cornerRadius);
-        }
-
-        /// <summary>
-        /// Draws an ellipse with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
-        /// <param name="center">The location of the center of the ellipse.</param>
-        /// <param name="radiusX">The horizontal radius of the ellipse.</param>
-        /// <param name="radiusY">The vertical radius of the ellipse.</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        public void DrawEllipse(IBrush? brush, IPen? pen, Point center, double radiusX, double radiusY)
-        {
-            if (brush == null && !PenIsVisible(pen))
-            {
-                return;
-            }
-
-            var originX = center.X - radiusX;
-            var originY = center.Y - radiusY;
-            var width = radiusX * 2;
-            var height = radiusY * 2;
-
-            PlatformImpl.DrawEllipse(brush, pen, new Rect(originX, originY, width, height));
-        }
-
-        /// <summary>
-        /// Draws a custom drawing operation
-        /// </summary>
-        /// <param name="custom">custom operation</param>
-        public void Custom(ICustomDrawOperation custom) => PlatformImpl.Custom(custom);
-
-        /// <summary>
-        /// Draws text.
-        /// </summary>
-        /// <param name="origin">The upper-left corner of the text.</param>
-        /// <param name="text">The text.</param>
-        public void DrawText(FormattedText text, Point origin)
-        {
-            _ = text ?? throw new ArgumentNullException(nameof(text));
-         
-           text.Draw(this, origin);            
-        }
-
-        /// <summary>
-        /// Draws a glyph run.
-        /// </summary>
-        /// <param name="foreground">The foreground brush.</param>
-        /// <param name="glyphRun">The glyph run.</param>
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
-        {
-            _ = glyphRun ?? throw new ArgumentNullException(nameof(glyphRun));
-
-            if (foreground != null)
-            {
-                PlatformImpl.DrawGlyphRun(foreground, glyphRun);
-            }
-        }
-
-        /// <summary>
-        /// Draws a filled rectangle.
-        /// </summary>
-        /// <param name="brush">The brush.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="cornerRadius">The corner radius.</param>
-        public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f)
-        {
-            DrawRectangle(brush, null, rect, cornerRadius, cornerRadius);
-        }
-
-        public readonly struct PushedState : IDisposable
-        {
-            private readonly int _level;
-            private readonly DrawingContext _context;
-            private readonly Matrix _matrix;
-            private readonly PushedStateType _type;
-
-            public enum PushedStateType
-            {
-                None,
-                Matrix,
-                Opacity,
-                Clip,
-                MatrixContainer,
-                GeometryClip,
-                OpacityMask,
-            }
-
-            public PushedState(DrawingContext context, PushedStateType type, Matrix matrix = default(Matrix))
-            {
-                if (context._states is null)
-                    throw new ObjectDisposedException(nameof(DrawingContext));
-
-                _context = context;
-                _type = type;
-                _matrix = matrix;
-                _level = context._currentLevel += 1;
-                context._states.Push(this);
-            }
-
-            public void Dispose()
-            {
-                if (_type == PushedStateType.None)
-                    return;
-                if (_context._states is null || _context._transformContainers is null)
-                    throw new ObjectDisposedException(nameof(DrawingContext));
-                if (_context._currentLevel != _level)
-                    throw new InvalidOperationException("Wrong Push/Pop state order");
-                _context._currentLevel--;
-                _context._states.Pop();
-                if (_type == PushedStateType.Matrix)
-                    _context.CurrentTransform = _matrix;
-                else if (_type == PushedStateType.Clip)
-                    _context.PlatformImpl.PopClip();
-                else if (_type == PushedStateType.Opacity)
-                    _context.PlatformImpl.PopOpacity();
-                else if (_type == PushedStateType.GeometryClip)
-                    _context.PlatformImpl.PopGeometryClip();
-                else if (_type == PushedStateType.OpacityMask)
-                    _context.PlatformImpl.PopOpacityMask();
-                else if (_type == PushedStateType.MatrixContainer)
-                {
-                    var cont = _context._transformContainers.Pop();
-                    _context._currentContainerTransform = cont.ContainerTransform;
-                    _context.CurrentTransform = cont.LocalTransform;
-                }
-            }
-        }
-
-
-        public PushedState PushClip(RoundedRect clip)
-        {
-            PlatformImpl.PushClip(clip);
-            return new PushedState(this, PushedState.PushedStateType.Clip);
-        }
-
-        /// <summary>
-        /// Pushes a clip rectangle.
-        /// </summary>
-        /// <param name="clip">The clip rectangle.</param>
-        /// <returns>A disposable used to undo the clip rectangle.</returns>
-        public PushedState PushClip(Rect clip)
-        {
-            PlatformImpl.PushClip(clip);
-            return new PushedState(this, PushedState.PushedStateType.Clip);
-        }
-
-        /// <summary>
-        /// Pushes a clip geometry.
-        /// </summary>
-        /// <param name="clip">The clip geometry.</param>
-        /// <returns>A disposable used to undo the clip geometry.</returns>
-        public PushedState PushGeometryClip(Geometry clip)
-        {
-            _ = clip ?? throw new ArgumentNullException(nameof(clip));
-
-            // HACK: This check was added when nullable annotations pointed out that we're potentially
-            // pushing a null value for the clip here. Ideally we'd return an empty PushedState here but
-            // I don't want to make that change as part of adding nullable annotations.
-            if (clip.PlatformImpl is null)
-                throw new InvalidOperationException("Cannot push empty geometry clip.");
-
-            PlatformImpl.PushGeometryClip(clip.PlatformImpl);
-            return new PushedState(this, PushedState.PushedStateType.GeometryClip);
-        }
-
-        /// <summary>
-        /// Pushes an opacity value.
-        /// </summary>
-        /// <param name="opacity">The opacity.</param>
-        /// <returns>A disposable used to undo the opacity.</returns>
-        public PushedState PushOpacity(double opacity)
-        //TODO: Eliminate platform-specific push opacity call
-        {
-            PlatformImpl.PushOpacity(opacity);
-            return new PushedState(this, PushedState.PushedStateType.Opacity);
-        }
-
-        /// <summary>
-        /// Pushes an opacity mask.
-        /// </summary>
-        /// <param name="mask">The opacity mask.</param>
-        /// <param name="bounds">
-        /// The size of the brush's target area. TODO: Are we sure this is needed?
-        /// </param>
-        /// <returns>A disposable to undo the opacity mask.</returns>
-        public PushedState PushOpacityMask(IBrush mask, Rect bounds)
-        {
-            PlatformImpl.PushOpacityMask(mask, bounds);
-            return new PushedState(this, PushedState.PushedStateType.OpacityMask);
-        }
-
-        /// <summary>
-        /// Pushes a matrix post-transformation.
-        /// </summary>
-        /// <param name="matrix">The matrix</param>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushPostTransform(Matrix matrix) => PushSetTransform(CurrentTransform * matrix);
-
-        /// <summary>
-        /// Pushes a matrix pre-transformation.
-        /// </summary>
-        /// <param name="matrix">The matrix</param>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushPreTransform(Matrix matrix) => PushSetTransform(matrix * CurrentTransform);
-
-        /// <summary>
-        /// Sets the current matrix transformation.
-        /// </summary>
-        /// <param name="matrix">The matrix</param>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushSetTransform(Matrix matrix)
-        {
-            var oldMatrix = CurrentTransform;
-            CurrentTransform = matrix;
-
-            return new PushedState(this, PushedState.PushedStateType.Matrix, oldMatrix);
-        }
-
-        /// <summary>
-        /// Pushes a new transform context.
-        /// </summary>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushTransformContainer()
-        {
-            if (_transformContainers is null)
-                throw new ObjectDisposedException(nameof(DrawingContext));
-            _transformContainers.Push(new TransformContainer(CurrentTransform, _currentContainerTransform));
-            _currentContainerTransform = CurrentTransform * _currentContainerTransform;
-            _currentTransform = Matrix.Identity;
-            return new PushedState(this, PushedState.PushedStateType.MatrixContainer);
-        }
-
-        /// <summary>
-        /// Disposes of any resources held by the <see cref="DrawingContext"/>.
-        /// </summary>
-        public void Dispose()
-        {
-            if (_states is null || _transformContainers is null)
-                throw new ObjectDisposedException(nameof(DrawingContext));
-            while (_states.Count != 0)
-                _states.Peek().Dispose();
-            StateStackPool.Return(_states);
-            _states = null;
-            if (_transformContainers.Count != 0)
-                throw new InvalidOperationException("Transform container stack is non-empty");
-            TransformStackPool.Return(_transformContainers);
-            _transformContainers = null;
-            if (_ownsImpl)
-                PlatformImpl.Dispose();
-        }
-
-        private static bool PenIsVisible(IPen? pen)
-        {
-            return pen?.Brush != null && pen.Thickness > 0;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DrawingGroup.cs b/src/Avalonia.Visuals/Media/DrawingGroup.cs
deleted file mode 100644
index eeb6318ebd..0000000000
--- a/src/Avalonia.Visuals/Media/DrawingGroup.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Metadata;
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    public class DrawingGroup : Drawing
-    {
-        public static readonly StyledProperty<double> OpacityProperty =
-            AvaloniaProperty.Register<DrawingGroup, double>(nameof(Opacity), 1);
-
-        public static readonly StyledProperty<Transform> TransformProperty =
-            AvaloniaProperty.Register<DrawingGroup, Transform>(nameof(Transform));
-
-        public static readonly StyledProperty<Geometry> ClipGeometryProperty =
-            AvaloniaProperty.Register<DrawingGroup, Geometry>(nameof(ClipGeometry));
-
-        public static readonly StyledProperty<IBrush> OpacityMaskProperty =
-            AvaloniaProperty.Register<DrawingGroup, IBrush>(nameof(OpacityMask));
-
-        public double Opacity
-        {
-            get => GetValue(OpacityProperty);
-            set => SetValue(OpacityProperty, value);
-        }
-
-        public Transform Transform
-        {
-            get => GetValue(TransformProperty);
-            set => SetValue(TransformProperty, value);
-        }
-
-        public Geometry ClipGeometry
-        {
-            get => GetValue(ClipGeometryProperty);
-            set => SetValue(ClipGeometryProperty, value);
-        }
-
-        public IBrush OpacityMask
-        {
-            get => GetValue(OpacityMaskProperty);
-            set => SetValue(OpacityMaskProperty, value);
-        }
-
-        [Content]
-        public AvaloniaList<Drawing> Children { get; } = new AvaloniaList<Drawing>();
-
-        public override void Draw(DrawingContext context)
-        {
-            using (context.PushPreTransform(Transform?.Value ?? Matrix.Identity))
-            using (context.PushOpacity(Opacity))
-            using (ClipGeometry != null ? context.PushGeometryClip(ClipGeometry) : default(DrawingContext.PushedState))
-            using (OpacityMask != null ? context.PushOpacityMask(OpacityMask, GetBounds()) : default(DrawingContext.PushedState))
-            {
-                foreach (var drawing in Children)
-                {
-                    drawing.Draw(context);
-                }
-            }
-        }
-
-        public override Rect GetBounds()
-        {
-            var rect = new Rect();
-
-            foreach (var drawing in Children)
-            {
-                rect = rect.Union(drawing.GetBounds());
-            }
-
-            if (Transform != null)
-            {
-                rect = rect.TransformToAABB(Transform.Value);
-            }
-
-            return rect;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DrawingImage.cs b/src/Avalonia.Visuals/Media/DrawingImage.cs
deleted file mode 100644
index 488822b693..0000000000
--- a/src/Avalonia.Visuals/Media/DrawingImage.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Metadata;
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// An <see cref="IImage"/> that uses a <see cref="Drawing"/> for content.
-    /// </summary>
-    public class DrawingImage : AvaloniaObject, IImage, IAffectsRender
-    {
-        public DrawingImage() 
-        { 
-        }
-
-        public DrawingImage(Drawing drawing)
-        {
-            Drawing = drawing;
-        }
-        /// <summary>
-        /// Defines the <see cref="Drawing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Drawing> DrawingProperty =
-            AvaloniaProperty.Register<DrawingImage, Drawing>(nameof(Drawing));
-
-        /// <inheritdoc/>
-        public event EventHandler? Invalidated;
-
-        /// <summary>
-        /// Gets or sets the drawing content.
-        /// </summary>
-        [Content]
-        public Drawing Drawing
-        {
-            get => GetValue(DrawingProperty);
-            set => SetValue(DrawingProperty, value);
-        }
-
-        /// <inheritdoc/>
-        public Size Size => Drawing?.GetBounds().Size ?? default;
-
-        /// <inheritdoc/>
-        void IImage.Draw(
-            DrawingContext context,
-            Rect sourceRect,
-            Rect destRect,
-            BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            var drawing = Drawing;
-
-            if (drawing == null)
-            {
-                return;
-            }
-
-            var bounds = drawing.GetBounds();
-            var scale = Matrix.CreateScale(
-                destRect.Width / sourceRect.Width,
-                destRect.Height / sourceRect.Height);
-            var translate = Matrix.CreateTranslation(
-                -sourceRect.X + destRect.X - bounds.X,
-                -sourceRect.Y + destRect.Y - bounds.Y);
-
-            using (context.PushClip(destRect))
-            using (context.PushPreTransform(translate * scale))
-            {
-                Drawing?.Draw(context);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == DrawingProperty)
-            {
-                RaiseInvalidated(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs
deleted file mode 100644
index cdea5f5fa3..0000000000
--- a/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-using System;
-
-namespace Avalonia.Media
-{
-    public class ExperimentalAcrylicMaterial : AvaloniaObject, IMutableExperimentalAcrylicMaterial
-    {
-        private Color _effectiveTintColor;
-        private Color _effectiveLuminosityColor;
-
-        static ExperimentalAcrylicMaterial()
-        {
-            AffectsRender<ExperimentalAcrylicMaterial>(
-                TintColorProperty,
-                BackgroundSourceProperty,
-                TintOpacityProperty,
-                MaterialOpacityProperty,
-                PlatformTransparencyCompensationLevelProperty);
-
-            TintColorProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-
-            TintOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-
-            MaterialOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-
-            PlatformTransparencyCompensationLevelProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-        }
-
-        /// <summary>
-        /// Defines the <see cref="TintColor"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Color> TintColorProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(TintColor));
-
-        /// <summary>
-        /// Defines the <see cref="BackgroundSource"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AcrylicBackgroundSource> BackgroundSourceProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, AcrylicBackgroundSource>(nameof(BackgroundSource));
-
-        /// <summary>
-        /// Defines the <see cref="TintOpacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> TintOpacityProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(TintOpacity), 0.8);
-
-        /// <summary>
-        /// Defines the <see cref="MaterialOpacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MaterialOpacityProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(MaterialOpacity), 0.5);
-
-        /// <summary>
-        /// Defines the <see cref="PlatformTransparencyCompensationLevel"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> PlatformTransparencyCompensationLevelProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(PlatformTransparencyCompensationLevel), 0.0);
-
-        /// <summary>
-        /// Defines the <see cref="FallbackColor"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Color> FallbackColorProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(FallbackColor));
-
-        /// <inheritdoc/>
-        public event EventHandler? Invalidated;
-
-        /// <summary>
-        /// Gets or Sets the BackgroundSource <seealso cref="AcrylicBackgroundSource"/>.
-        /// </summary>
-        public AcrylicBackgroundSource BackgroundSource
-        {
-            get => GetValue(BackgroundSourceProperty);
-            set => SetValue(BackgroundSourceProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the TintColor.
-        /// </summary>
-        public Color TintColor
-        {
-            get => GetValue(TintColorProperty);
-            set => SetValue(TintColorProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the Tint Opacity.
-        /// </summary>
-        public double TintOpacity
-        {
-            get => GetValue(TintOpacityProperty);
-            set => SetValue(TintOpacityProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the Fallback Color.
-        /// This is used on rendering plaforms that dont support acrylic.
-        /// </summary>
-        public Color FallbackColor
-        {
-            get => GetValue(FallbackColorProperty);
-            set => SetValue(FallbackColorProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the MaterialOpacity.
-        /// This makes the material more or less opaque.
-        /// </summary>
-        public double MaterialOpacity
-        {
-            get => GetValue(MaterialOpacityProperty);
-            set => SetValue(MaterialOpacityProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the PlatformTransparencyCompensationLevel.
-        /// This value defines the minimum <see cref="MaterialOpacity"/> that can be used.
-        /// It means material opacity is re-scaled from this value to 1.
-        /// </summary>
-        public double PlatformTransparencyCompensationLevel
-        {
-            get => GetValue(PlatformTransparencyCompensationLevelProperty);
-            set => SetValue(PlatformTransparencyCompensationLevelProperty, value);
-        }
-
-        Color IExperimentalAcrylicMaterial.MaterialColor => _effectiveLuminosityColor;
-
-        Color IExperimentalAcrylicMaterial.TintColor => _effectiveTintColor;
-
-        private struct HsvColor
-        {
-            public float Hue { get; set; }
-            public float Saturation { get; set; }
-            public float Value { get; set; }
-        }
-
-        private static HsvColor RgbToHsv(Color color)
-        {
-            var r = color.R / 255.0f;
-            var g = color.G / 255.0f;
-            var b = color.B / 255.0f;
-            var max = Math.Max(r, Math.Max(g, b));
-            var min = Math.Min(r, Math.Min(g, b));
-
-            float h, s, v;
-            h = v = max;
-
-            var d = max - min;
-            s = max == 0 ? 0 : d / max;
-
-            if (max == min)
-            {
-                h = 0; // achromatic
-            }
-            else
-            {
-                if (max == r)
-                {
-                    h = (g - b) / d + (g < b ? 6 : 0);
-                }
-                else if (max == g)
-                {
-                    h = (b - r) / d + 2;
-                }
-                else if (max == b)
-                {
-                    h = (r - g) / d + 4;
-                }
-
-                h /= 6;
-            }
-
-            return new HsvColor { Hue = h, Saturation = s, Value = v };
-        }
-
-        private static Color GetEffectiveTintColor(Color tintColor, double tintOpacity)
-        {
-            // Update tintColor's alpha with the combined opacity value
-            double tintOpacityModifier = GetTintOpacityModifier(tintColor);
-
-            return new Color((byte)(255 * ((255.0 / tintColor.A) * tintOpacity) * tintOpacityModifier), tintColor.R, tintColor.G, tintColor.B);
-        }
-
-        private static double GetTintOpacityModifier(Color tintColor)
-        {
-            // This method supresses the maximum allowable tint opacity depending on the luminosity and saturation of a color by 
-            // compressing the range of allowable values - for example, a user-defined value of 100% will be mapped to 45% for pure 
-            // white (100% luminosity), 85% for pure black (0% luminosity), and 90% for pure gray (50% luminosity).  The intensity of 
-            // the effect increases linearly as luminosity deviates from 50%.  After this effect is calculated, we cancel it out
-            // linearly as saturation increases from zero.
-
-            const double midPoint = 0.5; // Mid point of HsvV range that these calculations are based on. This is here for easy tuning.
-
-            const double whiteMaxOpacity = 0.2; // 100% luminosity
-            const double midPointMaxOpacity = 0.45; // 50% luminosity
-            const double blackMaxOpacity = 0.45; // 0% luminosity
-
-            var hsv = RgbToHsv(tintColor);
-
-            double opacityModifier = midPointMaxOpacity;
-
-            if (hsv.Value != midPoint)
-            {
-                // Determine maximum suppression amount
-                double lowestMaxOpacity = midPointMaxOpacity;
-                double maxDeviation = midPoint;
-
-                if (hsv.Value > midPoint)
-                {
-                    lowestMaxOpacity = whiteMaxOpacity; // At white (100% hsvV)
-                    maxDeviation = 1 - maxDeviation;
-                }
-                else if (hsv.Value < midPoint)
-                {
-                    lowestMaxOpacity = blackMaxOpacity; // At black (0% hsvV)
-                }
-
-                double maxOpacitySuppression = midPointMaxOpacity - lowestMaxOpacity;
-
-                // Determine normalized deviation from the midpoint
-                double deviation = Math.Abs(hsv.Value - midPoint);
-                double normalizedDeviation = deviation / maxDeviation;
-
-                // If we have saturation, reduce opacity suppression to allow that color to come through more
-                if (hsv.Saturation > 0)
-                {
-                    // Dampen opacity suppression based on how much saturation there is
-                    maxOpacitySuppression *= Math.Max(1 - (hsv.Saturation * 2), 0.0);
-                }
-
-                double opacitySuppression = maxOpacitySuppression * normalizedDeviation;
-
-                opacityModifier = midPointMaxOpacity - opacitySuppression;
-            }
-
-            return opacityModifier;
-        }
-
-        private Color GetEffectiveLuminosityColor()
-        {
-            double? luminosityOpacity = MaterialOpacity;
-
-            return GetLuminosityColor(luminosityOpacity);
-        }
-
-        private static byte Trim(double value)
-        {
-            value = Math.Min(Math.Floor(value * 256), 255);
-
-            if (value < 0)
-            {
-                return 0;
-            }
-            else if (value > 255)
-            {
-                return 255;
-            }
-
-            return (byte)value;
-        }
-
-        private static float RGBMax(Color color)
-        {
-            if (color.R > color.G)
-                return (color.R > color.B) ? color.R : color.B;
-            else
-                return (color.G > color.B) ? color.G : color.B;
-        }
-
-        private static float RGBMin(Color color)
-        {
-            if (color.R < color.G)
-                return (color.R < color.B) ? color.R : color.B;
-            else
-                return (color.G < color.B) ? color.G : color.B;
-        }
-
-        // The tintColor passed into this method should be the original, unmodified color created using user values for TintColor + TintOpacity
-        private Color GetLuminosityColor(double? luminosityOpacity)
-        {
-            // Calculate the HSL lightness value of the color.
-            var max = (float)RGBMax(TintColor) / 255.0f;
-            var min = (float)RGBMin(TintColor) / 255.0f;
-
-            var lightness = (max + min) / 2.0;
-
-            lightness = 1 - ((1 - lightness) * (luminosityOpacity ?? 1));
-
-            lightness = 0.13 + (lightness * 0.74);
-
-            var luminosityColor = new Color(255, Trim(lightness), Trim(lightness), Trim(lightness));
-
-            var compensationMultiplier = 1 - PlatformTransparencyCompensationLevel;
-            return new Color((byte)(255 * Math.Max(Math.Min(PlatformTransparencyCompensationLevel + ((luminosityOpacity ?? 1) * compensationMultiplier), 1.0), 0.0)), luminosityColor.R, luminosityColor.G, luminosityColor.B);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the brush's visual representation.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a brush's static constructor, any change to the
-        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : ExperimentalAcrylicMaterial
-        {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(e => Invalidate(e));
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-
-        public IExperimentalAcrylicMaterial ToImmutable()
-        {
-            return new ImmutableExperimentalAcrylicMaterial(this);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/FontFamily.cs b/src/Avalonia.Visuals/Media/FontFamily.cs
deleted file mode 100644
index c4ebc1e0d4..0000000000
--- a/src/Avalonia.Visuals/Media/FontFamily.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using System;
-using Avalonia.Media.Fonts;
-
-namespace Avalonia.Media
-{
-    public sealed class FontFamily
-    {
-        public const string DefaultFontFamilyName = "$Default";
-
-        static FontFamily()
-        {
-            Default = new FontFamily(DefaultFontFamilyName);
-        }
-
-        /// <inheritdoc />
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:Avalonia.Media.FontFamily" /> class.
-        /// </summary>
-        /// <param name="name">The name of the <see cref="T:Avalonia.Media.FontFamily" />.</param>
-        public FontFamily(string name) : this(null, name)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:Avalonia.Media.FontFamily" /> class.
-        /// </summary>
-        /// <param name="baseUri">Specifies the base uri that is used to resolve font family assets.</param>
-        /// <param name="name">The name of the <see cref="T:Avalonia.Media.FontFamily" />.</param>
-        /// <exception cref="T:System.ArgumentException">Base uri must be an absolute uri.</exception>
-        public FontFamily(Uri? baseUri, string name)
-        {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
-
-            var fontFamilySegment = GetFontFamilyIdentifier(name);
-
-            if (fontFamilySegment.Source != null)
-            {
-                if (baseUri != null && !baseUri.IsAbsoluteUri)
-                {
-                    throw new ArgumentException("Base uri must be an absolute uri.", nameof(baseUri));
-                }
-
-                Key = new FontFamilyKey(fontFamilySegment.Source, baseUri);
-            }
-
-            FamilyNames = new FamilyNameCollection(fontFamilySegment.Name);
-        }
-
-        /// <summary>
-        /// Represents the default font family
-        /// </summary>
-        public static FontFamily Default { get; }
-
-        /// <summary>
-        /// Gets the primary family name of the font family.
-        /// </summary>
-        /// <value>
-        /// The primary name of the font family.
-        /// </value>
-        public string Name => FamilyNames.PrimaryFamilyName;
-
-        /// <summary>
-        /// Gets the family names.
-        /// </summary>
-        /// <value>
-        /// The family familyNames.
-        /// </value>
-        public FamilyNameCollection FamilyNames { get; }
-
-        /// <summary>
-        /// Gets the key for associated assets.
-        /// </summary>
-        /// <value>
-        /// The family key.
-        /// </value>
-        /// <remarks>Key is only used for custom fonts.</remarks>
-        public FontFamilyKey? Key { get; }
-
-        /// <summary>
-        /// Returns <c>True</c> if this instance is the system's default.
-        /// </summary>
-        public bool IsDefault => Name.Equals(DefaultFontFamilyName);
-
-        /// <summary>
-        /// Implicit conversion of string to FontFamily
-        /// </summary>
-        /// <param name="s"></param>
-        public static implicit operator FontFamily(string s)
-        {
-            return new FontFamily(s);
-        }
-
-        private struct FontFamilyIdentifier
-        {
-            public FontFamilyIdentifier(string name, Uri? source)
-            {
-                Name = name;
-                Source = source;
-            }
-
-            public string Name { get; }
-
-            public Uri? Source { get; }
-        }
-
-        private static FontFamilyIdentifier GetFontFamilyIdentifier(string name)
-        {
-            var segments = name.Split('#');
-
-            switch (segments.Length)
-            {
-                case 1:
-                    {
-                        return new FontFamilyIdentifier(segments[0], null);
-                    }
-
-                case 2:
-                    {
-                        var source = segments[0].StartsWith("/")
-                            ? new Uri(segments[0], UriKind.Relative)
-                            : new Uri(segments[0], UriKind.RelativeOrAbsolute);
-
-                        return new FontFamilyIdentifier(segments[1], source);
-                    }
-
-                default:
-                    {
-                        throw new ArgumentException("Specified family is not supported.");
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Parses a <see cref="T:Avalonia.Media.FontFamily"/> string.
-        /// </summary>
-        /// <param name="s">The <see cref="T:Avalonia.Media.FontFamily"/> string.</param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentException">
-        /// Specified family is not supported.
-        /// </exception>
-        public static FontFamily Parse(string s) => Parse(s, null);
-
-        /// <summary>
-        /// Parses a <see cref="T:Avalonia.Media.FontFamily"/> string.
-        /// </summary>
-        /// <param name="s">The <see cref="T:Avalonia.Media.FontFamily"/> string.</param>
-        /// <param name="baseUri">Specifies the base uri that is used to resolve font family assets.</param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentException">
-        /// Specified family is not supported.
-        /// </exception>
-        public static FontFamily Parse(string s, Uri? baseUri)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                throw new ArgumentException("Specified family is not supported.", nameof(s));
-            }
-
-            return new FontFamily(baseUri, s);
-        }
-
-        /// <summary>
-        /// Returns a <see cref="string" /> that represents this instance.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="string" /> that represents this instance.
-        /// </returns>
-        public override string ToString()
-        {
-            if (Key != null)
-            {
-                return Key + "#" + FamilyNames;
-            }
-
-            return FamilyNames.ToString();
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return ((FamilyNames != null ? FamilyNames.GetHashCode() : 0) * 397) ^ (Key != null ? Key.GetHashCode() : 0);
-            }
-        }
-
-        public static bool operator !=(FontFamily? a, FontFamily? b)
-        {
-            return !(a == b);
-        }
-
-        public static bool operator ==(FontFamily? a, FontFamily? b)
-        {
-            if (ReferenceEquals(a, b))
-            {
-                return true;
-            }
-
-            return !(a is null) && a.Equals(b);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (!(obj is FontFamily other))
-            {
-                return false;
-            }
-
-            if (!Equals(Key, other.Key))
-            {
-                return false;
-            }
-
-            return other.FamilyNames.Equals(FamilyNames);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/FontManager.cs b/src/Avalonia.Visuals/Media/FontManager.cs
deleted file mode 100644
index 72c1c8dcac..0000000000
--- a/src/Avalonia.Visuals/Media/FontManager.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using Avalonia.Media.Fonts;
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    ///     The font manager is used to query the system's installed fonts and is responsible for caching loaded fonts.
-    ///     It is also responsible for the font fallback.
-    /// </summary>
-    public sealed class FontManager
-    {
-        private readonly ConcurrentDictionary<Typeface, GlyphTypeface> _glyphTypefaceCache =
-            new ConcurrentDictionary<Typeface, GlyphTypeface>();
-        private readonly FontFamily _defaultFontFamily;
-        private readonly IReadOnlyList<FontFallback>? _fontFallbacks;
-
-        public FontManager(IFontManagerImpl platformImpl)
-        {
-            PlatformImpl = platformImpl;
-
-            var options = AvaloniaLocator.Current.GetService<FontManagerOptions>();
-
-            _fontFallbacks = options?.FontFallbacks;
-
-            DefaultFontFamilyName = options?.DefaultFamilyName ?? PlatformImpl.GetDefaultFontFamilyName();
-
-            if (string.IsNullOrEmpty(DefaultFontFamilyName))
-            {
-                throw new InvalidOperationException("Default font family name can't be null or empty.");
-            }
-
-            _defaultFontFamily = new FontFamily(DefaultFontFamilyName);
-        }
-
-        public static FontManager Current
-        {
-            get
-            {
-                var current = AvaloniaLocator.Current.GetService<FontManager>();
-
-                if (current != null)
-                {
-                    return current;
-                }
-
-                var fontManagerImpl = AvaloniaLocator.Current.GetService<IFontManagerImpl>();
-
-                if (fontManagerImpl == null)
-                    throw new InvalidOperationException("No font manager implementation was registered.");
-
-                current = new FontManager(fontManagerImpl);
-
-                AvaloniaLocator.CurrentMutable.Bind<FontManager>().ToConstant(current);
-
-                return current;
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public IFontManagerImpl PlatformImpl { get; }
-
-        /// <summary>
-        ///     Gets the system's default font family's name.
-        /// </summary>
-        public string DefaultFontFamilyName
-        {
-            get;
-        }
-
-        /// <summary>
-        ///     Get all installed font family names.
-        /// </summary>
-        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
-        public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false) =>
-            PlatformImpl.GetInstalledFontFamilyNames(checkForUpdates);
-
-        /// <summary>
-        ///     Returns a new <see cref="GlyphTypeface"/>, or an existing one if a matching <see cref="GlyphTypeface"/> exists.
-        /// </summary>
-        /// <param name="typeface">The typeface.</param>
-        /// <returns>
-        ///     The <see cref="GlyphTypeface"/>.
-        /// </returns>
-        public GlyphTypeface GetOrAddGlyphTypeface(Typeface typeface)
-        {
-            while (true)
-            {
-                if (_glyphTypefaceCache.TryGetValue(typeface, out var glyphTypeface))
-                {
-                    return glyphTypeface;
-                }
-
-                glyphTypeface = new GlyphTypeface(typeface);
-
-                if (_glyphTypefaceCache.TryAdd(typeface, glyphTypeface))
-                {
-                    return glyphTypeface;
-                }
-
-                if (typeface.FontFamily == _defaultFontFamily)
-                {
-                   throw new InvalidOperationException($"Could not create glyph typeface for: {typeface.FontFamily.Name}.");
-                }
-
-                typeface = new Typeface(_defaultFontFamily, typeface.Style, typeface.Weight);
-            }
-        }
-
-        /// <summary>
-        ///     Tries to match a specified character to a <see cref="Typeface"/> that supports specified font properties.
-        /// </summary>
-        /// <param name="codepoint">The codepoint to match against.</param>
-        /// <param name="fontStyle">The font style.</param>
-        /// <param name="fontWeight">The font weight.</param>
-        /// <param name="fontFamily">The font family. This is optional and used for fallback lookup.</param>
-        /// <param name="culture">The culture.</param>
-        /// <param name="typeface">The matching <see cref="Typeface"/>.</param>
-        /// <returns>
-        ///     <c>True</c>, if the <see cref="FontManager"/> could match the character to specified parameters, <c>False</c> otherwise.
-        /// </returns>
-        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
-            FontWeight fontWeight,
-            FontFamily? fontFamily, CultureInfo? culture, out Typeface typeface)
-        {
-            if(_fontFallbacks != null)
-            {
-                foreach (var fallback in _fontFallbacks)
-                {
-                    if(fallback is null)
-                    {
-                        continue;
-                    }
-
-                    typeface = new Typeface(fallback.FontFamily, fontStyle, fontWeight);
-
-                    var glyphTypeface = typeface.GlyphTypeface;
-
-                    if(glyphTypeface.TryGetGlyph((uint)codepoint, out _)){
-                        return true;
-                    }
-                }
-            }
-
-            return PlatformImpl.TryMatchCharacter(codepoint, fontStyle, fontWeight, fontFamily, culture, out typeface);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs b/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
deleted file mode 100644
index 99daaf2143..0000000000
--- a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.Fonts
-{
-    public sealed class FamilyNameCollection : IReadOnlyList<string>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FamilyNameCollection"/> class.
-        /// </summary>
-        /// <param name="familyNames">The family names.</param>
-        /// <exception cref="ArgumentException">familyNames</exception>
-        public FamilyNameCollection(string familyNames)
-        {
-            if (familyNames == null)
-            {
-                throw new ArgumentNullException(nameof(familyNames));
-            }
-
-            Names = Array.ConvertAll(familyNames.Split(','), p => p.Trim());
-
-            PrimaryFamilyName = Names[0];
-
-            HasFallbacks = Names.Count > 1;
-        }
-
-        /// <summary>
-        /// Gets the primary family name.
-        /// </summary>
-        /// <value>
-        /// The primary family name.
-        /// </value>
-        public string PrimaryFamilyName { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether fallbacks are defined.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if fallbacks are defined; otherwise, <c>false</c>.
-        /// </value>
-        public bool HasFallbacks { get; }
-
-        /// <summary>
-        /// Gets the internal collection of names.
-        /// </summary>
-        /// <value>
-        /// The names.
-        /// </value>
-        internal IReadOnlyList<string> Names { get; }
-
-        /// <summary>
-        /// Returns an enumerator for the name collection.
-        /// </summary>
-        public ImmutableReadOnlyListStructEnumerator<string> GetEnumerator()
-        {
-            return new ImmutableReadOnlyListStructEnumerator<string>(this);
-        }
-
-        IEnumerator<string> IEnumerable<string>.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns a <see cref="string" /> that represents this instance.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="string" /> that represents this instance.
-        /// </returns>
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-
-            for (var index = 0; index < Names.Count; index++)
-            {
-                builder.Append(Names[index]);
-
-                if (index == Names.Count - 1)
-                {
-                    break;
-                }
-
-                builder.Append(", ");
-            }
-
-            return builder.ToString();
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            if (Count == 0)
-            {
-                return 0;
-            }
-
-            unchecked
-            {
-                int hash = 17;
-
-                for (var i = 0; i < Names.Count; i++)
-                {
-                    string name = Names[i];
-
-                    hash = hash * 23 + name.GetHashCode();
-                }
-
-                return hash;
-            }
-        }
-
-        public static bool operator !=(FamilyNameCollection? a, FamilyNameCollection? b)
-        {
-            return !(a == b);
-        }
-
-        public static bool operator ==(FamilyNameCollection? a, FamilyNameCollection? b)
-        {
-            if (ReferenceEquals(a, b))
-            {
-                return true;
-            }
-
-            return !(a is null) && a.Equals(b);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="object" />, is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="object" /> to compare with this instance.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <see cref="object" /> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object? obj)
-        {
-            if (!(obj is FamilyNameCollection other))
-            {
-                return false;
-            }
-
-            if (other.Count != Count)
-            {
-                return false;
-            }
-
-            for (int i = 0; i < Count; i++)
-            {
-                if (Names[i] != other.Names[i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        public int Count => Names.Count;
-
-        public string this[int index] => Names[index];
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs b/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
deleted file mode 100644
index a54dad7623..0000000000
--- a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Platform;
-
-namespace Avalonia.Media.Fonts
-{
-    public static class FontFamilyLoader
-    {
-        /// <summary>
-        /// Loads all font assets that belong to the specified <see cref="FontFamilyKey"/>
-        /// </summary>
-        /// <param name="fontFamilyKey"></param>
-        /// <returns></returns>
-        public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey)
-        {
-            var sourceWithoutArguments = fontFamilyKey.Source.OriginalString.Split('?').First();
-
-            if (sourceWithoutArguments.EndsWith(".ttf")
-                || sourceWithoutArguments.EndsWith(".otf"))
-            {
-                return GetFontAssetsByExpression(fontFamilyKey);
-            }
-
-            return GetFontAssetsBySource(fontFamilyKey);
-        }
-
-        /// <summary>
-        /// Searches for font assets at a given location and returns a quantity of found assets
-        /// </summary>
-        /// <param name="fontFamilyKey"></param>
-        /// <returns></returns>
-        private static IEnumerable<Uri> GetFontAssetsBySource(FontFamilyKey fontFamilyKey)
-        {
-            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
-            var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
-
-            var matchingAssets =
-                availableAssets.Where(x => x.AbsolutePath.EndsWith(".ttf") || x.AbsolutePath.EndsWith(".otf"));
-
-            return matchingAssets;
-        }
-
-        /// <summary>
-        /// Searches for font assets at a given location and only accepts assets that fit to a given filename expression.
-        /// <para>File names can target multiple files with * wildcard. For example "FontFile*.ttf"</para>
-        /// </summary>
-        /// <param name="fontFamilyKey"></param>
-        /// <returns></returns>
-        private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
-        {
-            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
-
-            var fileName = GetFileName(fontFamilyKey, out var fileExtension, out var location);
-
-            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
-
-            string compareTo;
-
-            if (fontFamilyKey.Source.IsAbsoluteUri)
-            {
-                if (fontFamilyKey.Source.Scheme == "resm")
-                {
-                    compareTo = location.AbsolutePath + "." + fileName.Split('*').First();
-                }
-                else
-                {
-                    compareTo = location.AbsolutePath + fileName.Split('*').First();
-                }
-            }
-            else
-            {
-                compareTo = location.AbsolutePath + fileName.Split('*').First();
-            }
-
-            var matchingResources = availableResources.Where(
-                x => x.AbsolutePath.Contains(compareTo)
-                     && x.AbsolutePath.EndsWith(fileExtension));
-
-            return matchingResources;
-        }
-
-        private static string GetFileName(FontFamilyKey fontFamilyKey, out string fileExtension, out Uri location)
-        {
-            if (fontFamilyKey.Source.IsAbsoluteUri && fontFamilyKey.Source.Scheme == "resm")
-            {
-                fileExtension = "." + fontFamilyKey.Source.AbsolutePath.Split('.').LastOrDefault();
-
-                var fileName = fontFamilyKey.Source.LocalPath.Replace(fileExtension, string.Empty).Split('.').Last();
-
-                location = new Uri(fontFamilyKey.Source.AbsoluteUri.Replace("." + fileName + fileExtension, string.Empty), UriKind.RelativeOrAbsolute);
-
-                return fileName;
-            }
-
-            var pathSegments = fontFamilyKey.Source.OriginalString.Split('/');
-
-            var fileNameWithExtension = pathSegments.Last();
-
-            var fileNameSegments = fileNameWithExtension.Split('.');
-
-            fileExtension = "." + fileNameSegments.Last();
-
-            if (fontFamilyKey.BaseUri != null)
-            {
-                var relativePath = fontFamilyKey.Source.OriginalString
-                    .Replace(fileNameWithExtension, string.Empty);
-
-                location = new Uri(fontFamilyKey.BaseUri, relativePath);
-            }
-            else
-            {
-                location = new Uri(fontFamilyKey.Source.AbsolutePath.Replace(fileNameWithExtension, string.Empty));
-            }
-
-            return fileNameSegments.First();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/FormattedText.cs b/src/Avalonia.Visuals/Media/FormattedText.cs
deleted file mode 100644
index 12c40e4d59..0000000000
--- a/src/Avalonia.Visuals/Media/FormattedText.cs
+++ /dev/null
@@ -1,1415 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using Avalonia.Media.TextFormatting;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// The FormattedText class is targeted at programmers needing to add some simple text to a MIL visual.
-    /// </summary>
-    public class FormattedText
-    {
-        public const double DefaultRealToIdeal = 28800.0 / 96;
-        public const double DefaultIdealToReal = 1 / DefaultRealToIdeal;
-        public const int IdealInfiniteWidth = 0x3FFFFFFE;
-        public const double RealInfiniteWidth = IdealInfiniteWidth * DefaultIdealToReal;
-
-        public const double GreatestMultiplierOfEm = 100;
-
-        private const double MaxFontEmSize = RealInfiniteWidth / GreatestMultiplierOfEm;
-
-        // properties and format runs
-        private ReadOnlySlice<char> _text;
-        private readonly SpanVector _formatRuns = new SpanVector(null);
-        private SpanPosition _latestPosition;
-
-        private GenericTextParagraphProperties _defaultParaProps;
-
-        private double _maxTextWidth = double.PositiveInfinity;
-        private double[]? _maxTextWidths;
-        private double _maxTextHeight = double.PositiveInfinity;
-        private int _maxLineCount = int.MaxValue;
-        private TextTrimming _trimming = TextTrimming.WordEllipsis;
-
-        // text source callbacks
-        private TextSourceImplementation? _textSourceImpl;
-
-        // cached metrics
-        private CachedMetrics? _metrics;
-
-        /// <summary>
-        /// Construct a FormattedText object.
-        /// </summary>
-        /// <param name="textToFormat">String of text to be displayed.</param>
-        /// <param name="culture">Culture of text.</param>
-        /// <param name="flowDirection">Flow direction of text.</param>
-        /// <param name="typeface">Type face used to display text.</param>
-        /// <param name="emSize">Font em size in visual units (1/96 of an inch).</param>
-        /// <param name="foreground">Foreground brush used to render text.</param>
-        public FormattedText(
-            string textToFormat,
-            CultureInfo culture,
-            FlowDirection flowDirection,
-            Typeface typeface,
-            double emSize,
-            IBrush foreground)
-        {
-            if (culture is null)
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-            ValidateFlowDirection(flowDirection, nameof(flowDirection));
-
-            ValidateFontSize(emSize);
-
-            _text = textToFormat != null ?
-                new ReadOnlySlice<char>(textToFormat.AsMemory()) :
-                throw new ArgumentNullException(nameof(textToFormat));
-
-            var runProps = new GenericTextRunProperties(
-                typeface,
-                emSize,
-                null, // decorations
-                foreground,
-                null, // highlight background
-                BaselineAlignment.Baseline,
-                culture
-            );
-
-            _latestPosition = _formatRuns.SetValue(0, _text.Length, runProps, _latestPosition);
-
-            _defaultParaProps = new GenericTextParagraphProperties(
-                flowDirection,
-                TextAlignment.Left,
-                false,
-                false,
-                runProps,
-                TextWrapping.WrapWithOverflow,
-                0, // line height not specified
-                0 // indentation not specified
-            );
-
-            InvalidateMetrics();
-        }
-
-        private static void ValidateFontSize(double emSize)
-        {
-            if (emSize <= 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be greater than zero.");
-            }
-
-            if (emSize > MaxFontEmSize)
-            {
-                throw new ArgumentOutOfRangeException(nameof(emSize), $"The parameter value cannot be greater than '{MaxFontEmSize}'");
-            }
-
-            if (double.IsNaN(emSize))
-            {
-                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be a number.");
-            }
-        }
-
-        private static void ValidateFlowDirection(FlowDirection flowDirection, string parameterName)
-        {
-            if ((int)flowDirection < 0 || (int)flowDirection > (int)FlowDirection.RightToLeft)
-            {
-                throw new InvalidEnumArgumentException(parameterName, (int)flowDirection, typeof(FlowDirection));
-            }
-        }
-
-        private int ValidateRange(int startIndex, int count)
-        {
-            if (startIndex < 0 || startIndex > _text.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(startIndex));
-            }
-
-            var limit = startIndex + count;
-
-            if (count < 0 || limit < startIndex || limit > _text.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count));
-            }
-
-            return limit;
-        }
-
-        private void InvalidateMetrics()
-        {
-            _metrics = null;
-        }
-
-        /// <summary>
-        /// Sets foreground brush used for drawing text
-        /// </summary>
-        /// <param name="foregroundBrush">Foreground brush</param>
-        public void SetForegroundBrush(IBrush foregroundBrush)
-        {
-            SetForegroundBrush(foregroundBrush, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets foreground brush used for drawing text
-        /// </summary>
-        /// <param name="foregroundBrush">Foreground brush</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetForegroundBrush(IBrush foregroundBrush, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.ForegroundBrush == foregroundBrush)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    foregroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                );
-
-#pragma warning restore 6506
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family name</param>
-        public void SetFontFamily(string fontFamily)
-        {
-            SetFontFamily(fontFamily, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family name</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontFamily(string fontFamily, int startIndex, int count)
-        {
-            if (fontFamily == null)
-            {
-                throw new ArgumentNullException(nameof(fontFamily));
-            }
-
-            SetFontFamily(new FontFamily(fontFamily), startIndex, count);
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family</param>
-        public void SetFontFamily(FontFamily fontFamily)
-        {
-            SetFontFamily(fontFamily, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontFamily(FontFamily fontFamily, int startIndex, int count)
-        {
-            if (fontFamily == null)
-            {
-                throw new ArgumentNullException(nameof(fontFamily));
-            }
-
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                var oldTypeface = runProps.Typeface;
-
-                if (fontFamily.Equals(oldTypeface.FontFamily))
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    new Typeface(fontFamily, oldTypeface.Style, oldTypeface.Weight),
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-
-#pragma warning restore 6506
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-
-        /// <summary>
-        /// Sets or changes the font em size measured in MIL units
-        /// </summary>
-        /// <param name="emSize">Font em size</param>
-        public void SetFontSize(double emSize)
-        {
-            SetFontSize(emSize, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font em size measured in MIL units
-        /// </summary>
-        /// <param name="emSize">Font em size</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontSize(double emSize, int startIndex, int count)
-        {
-            ValidateFontSize(emSize);
-
-            var limit = ValidateRange(startIndex, count);
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.FontRenderingEmSize == emSize)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    emSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                );
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-#pragma warning restore 6506
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the culture for the text object.
-        /// </summary>
-        /// <param name="culture">The new culture for the text object.</param>
-        public void SetCulture(CultureInfo culture)
-        {
-            SetCulture(culture, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the culture for the text object.
-        /// </summary>
-        /// <param name="culture">The new culture for the text object.</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetCulture(CultureInfo culture, int startIndex, int count)
-        {
-            if (culture is null)
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.CultureInfo == culture)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    culture
-                );
-
-#pragma warning restore 6506
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the font weight
-        /// </summary>
-        /// <param name="weight">Font weight</param>
-        public void SetFontWeight(FontWeight weight)
-        {
-            SetFontWeight(weight, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font weight
-        /// </summary>
-        /// <param name="weight">Font weight</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontWeight(FontWeight weight, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                var oldTypeface = runProps.Typeface;
-
-                if (oldTypeface.Weight == weight)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    new Typeface(oldTypeface.FontFamily, oldTypeface.Style, weight),
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506 
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the font style
-        /// </summary>
-        /// <param name="style">Font style</param>
-        public void SetFontStyle(FontStyle style)
-        {
-            SetFontStyle(style, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font style
-        /// </summary>
-        /// <param name="style">Font style</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontStyle(FontStyle style, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                var oldTypeface = runProps.Typeface;
-
-                if (oldTypeface.Style == style)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    new Typeface(oldTypeface.FontFamily, style, oldTypeface.Weight),
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics(); // invalidate cached metrics
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the type face
-        /// </summary>
-        /// <param name="typeface">Typeface</param>
-        public void SetFontTypeface(Typeface typeface)
-        {
-            SetFontTypeface(typeface, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the type face
-        /// </summary>
-        /// <param name="typeface">Typeface</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontTypeface(Typeface typeface, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.Typeface == typeface)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    typeface,
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the text decorations
-        /// </summary>
-        /// <param name="textDecorations">Text decorations</param>
-        public void SetTextDecorations(TextDecorationCollection textDecorations)
-        {
-            SetTextDecorations(textDecorations, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the text decorations
-        /// </summary>
-        /// <param name="textDecorations">Text decorations</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetTextDecorations(TextDecorationCollection textDecorations, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.TextDecorations == textDecorations)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    runProps.FontRenderingEmSize,
-                    textDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-            }
-        }
-
-        /// Note: enumeration is temporarily made private
-        /// because of PS #828532
-        /// 
-        /// <summary>
-        /// Strongly typed enumerator used for enumerating text lines
-        /// </summary>
-        private struct LineEnumerator : IEnumerator, IDisposable
-        {
-            private int _lineCount;
-            private double _totalHeight;
-            private TextLine? _nextLine;
-            private readonly TextFormatter _formatter;
-            private readonly FormattedText _that;
-            private readonly ITextSource _textSource;
-
-            // these are needed because _currentLine can be disposed before the next MoveNext() call
-            private double _previousHeight;
-
-            // line break before _currentLine, needed in case we have to reformat it with collapsing symbol
-            private TextLineBreak? _previousLineBreak;
-
-            internal LineEnumerator(FormattedText text)
-            {
-                _previousHeight = 0;
-                Length = 0;
-                _previousLineBreak = null;
-
-                Position = 0;
-                _lineCount = 0;
-                _totalHeight = 0;
-                Current = null;
-                _nextLine = null;
-                _formatter = TextFormatter.Current;
-                _that = text;
-                _textSource = _that._textSourceImpl ??= new TextSourceImplementation(_that);
-            }
-
-            public void Dispose()
-            {
-                Current = null;
-
-                _nextLine = null;
-            }
-
-            private int Position { get; set; }
-
-            private int Length { get; set; }
-
-            /// <summary>
-            /// Gets the current text line in the collection
-            /// </summary>
-            public TextLine? Current { get; private set; }
-
-            /// <summary>
-            /// Gets the current text line in the collection
-            /// </summary>
-            object? IEnumerator.Current => Current;
-
-            /// <summary>
-            /// Gets the paragraph width used to format the current text line
-            /// </summary>
-            internal double CurrentParagraphWidth
-            {
-                get
-                {
-                    return MaxLineLength(_lineCount);
-                }
-            }
-
-            private double MaxLineLength(int line)
-            {
-                if (_that._maxTextWidths == null)
-                    return _that._maxTextWidth;
-                return _that._maxTextWidths[Math.Min(line, _that._maxTextWidths.Length - 1)];
-            }
-
-            /// <summary>
-            /// Advances the enumerator to the next text line of the collection
-            /// </summary>
-            /// <returns>true if the enumerator was successfully advanced to the next element;
-            /// false if the enumerator has passed the end of the collection</returns>
-            public bool MoveNext()
-            {
-                if (Current == null)
-                {   // this is the first line
-                    if (_that._text.Length == 0)
-                    {
-                        return false;
-                    }
-
-                    Current = FormatLine(
-                        _textSource,
-                        Position,
-                        MaxLineLength(_lineCount),
-                        _that._defaultParaProps!,
-                        null // no previous line break
-                        );
-
-                    // check if this line fits the text height
-                    if (_totalHeight + Current.Height > _that._maxTextHeight)
-                    {
-                        Current = null;
-
-                        return false;
-                    }
-                    Debug.Assert(_nextLine == null);
-                }
-                else
-                {
-                    // there is no next line or it didn't fit
-                    // either way we're finished
-                    if (_nextLine == null)
-                    {
-                        return false;
-                    }
-
-                    _totalHeight += _previousHeight;
-                    Position += Length;
-                    ++_lineCount;
-
-                    Current = _nextLine;
-                    _nextLine = null;
-                }
-
-                var currentLineBreak = Current.TextLineBreak;
-
-                // this line is guaranteed to fit the text height
-                Debug.Assert(_totalHeight + Current.Height <= _that._maxTextHeight);
-
-                // now, check if the next line fits, we need to do this on this iteration
-                // because we might need to add ellipsis to the current line
-                // as a result of the next line measurement
-
-                // maybe there is no next line at all
-                if (Position + Current.TextRange.Length < _that._text.Length)
-                {
-                    bool nextLineFits;
-
-                    if (_lineCount + 1 >= _that._maxLineCount)
-                    {
-                        nextLineFits = false;
-                    }
-                    else
-                    {
-                        _nextLine = FormatLine(
-                            _textSource,
-                            Position + Current.TextRange.Length,
-                            MaxLineLength(_lineCount + 1),
-                            _that._defaultParaProps,
-                            currentLineBreak
-                            );
-
-                        nextLineFits = (_totalHeight + Current.Height + _nextLine.Height <= _that._maxTextHeight);
-                    }
-
-                    if (!nextLineFits)
-                    {
-                        _nextLine = null;
-
-                        if (_that._trimming != TextTrimming.None && !Current.HasCollapsed)
-                        {
-                            // recreate the current line with ellipsis added
-                            // Note: Paragraph ellipsis is not supported today. We'll workaround
-                            // it here by faking a non-wrap text on finite column width.
-                            var currentWrap = _that._defaultParaProps!.TextWrapping;
-
-                            _that._defaultParaProps.SetTextWrapping(TextWrapping.NoWrap);
-
-                            Current = FormatLine(
-                                _that._textSourceImpl!,
-                                Position,
-                                MaxLineLength(_lineCount),
-                                _that._defaultParaProps,
-                                _previousLineBreak
-                                );
-
-                            currentLineBreak = Current.TextLineBreak;
-
-                            _that._defaultParaProps.SetTextWrapping(currentWrap);
-                        }
-                    }
-                }
-
-                _previousHeight = Current.Height;
-
-                Length = Current.TextRange.Length;
-
-                _previousLineBreak = currentLineBreak;
-
-                return true;
-            }
-
-            /// <summary>
-            /// Wrapper of TextFormatter.FormatLine that auto-collapses the line if needed.
-            /// </summary>
-            private TextLine FormatLine(ITextSource textSource, int textSourcePosition, double maxLineLength, TextParagraphProperties paraProps, TextLineBreak? lineBreak)
-            {
-                var line = _formatter.FormatLine(
-                    textSource,
-                    textSourcePosition,
-                    maxLineLength,
-                    paraProps,
-                    lineBreak
-                    );
-
-                if (_that._trimming != TextTrimming.None && line.HasOverflowed && line.TextRange.Length > 0)
-                {
-                    // what I really need here is the last displayed text run of the line
-                    // textSourcePosition + line.Length - 1 works except the end of paragraph case,
-                    // where line length includes the fake paragraph break run
-                    Debug.Assert(_that._text.Length > 0 && textSourcePosition + line.TextRange.Length <= _that._text.Length + 1);
-
-                    var thatFormatRider = new SpanRider(
-                        _that._formatRuns,
-                        _that._latestPosition,
-                        Math.Min(textSourcePosition + line.TextRange.Length - 1, _that._text.Length - 1)
-                        );
-
-                    var lastRunProps = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
-
-                    TextCollapsingProperties trailingEllipsis;
-
-                    if (_that._trimming == TextTrimming.CharacterEllipsis)
-                    {
-                        trailingEllipsis = new TextTrailingCharacterEllipsis(maxLineLength, lastRunProps);
-                    }
-                    else
-                    {
-                        Debug.Assert(_that._trimming == TextTrimming.WordEllipsis);
-                        trailingEllipsis = new TextTrailingWordEllipsis(maxLineLength, lastRunProps);
-                    }
-
-                    var collapsedLine = line.Collapse(trailingEllipsis);
-
-                    line = collapsedLine;
-                }
-                return line;
-            }
-
-
-            /// <summary>
-            /// Sets the enumerator to its initial position,
-            /// which is before the first element in the collection
-            /// </summary>
-            public void Reset()
-            {
-                Position = 0;
-                _lineCount = 0;
-                _totalHeight = 0;
-                Current = null;
-                _nextLine = null;
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator that can iterate through the text line collection
-        /// </summary>
-        private LineEnumerator GetEnumerator()
-        {
-            return new LineEnumerator(this);
-        }
-#if NEVER
-        /// <summary>
-        /// Returns an enumerator that can iterate through the text line collection
-        /// </summary>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-#endif
-
-        private void AdvanceLineOrigin(ref Point lineOrigin, TextLine currentLine)
-        {
-            var height = currentLine.Height;
-
-            // advance line origin according to the flow direction
-            switch (_defaultParaProps.FlowDirection)
-            {
-                case FlowDirection.LeftToRight:
-                case FlowDirection.RightToLeft:
-                    lineOrigin = lineOrigin.WithY(lineOrigin.Y + height);
-                    break;
-            }
-        }
-
-        private class CachedMetrics
-        {
-            // vertical
-            public double Height;
-            public double Baseline;
-
-            // horizontal
-            public double Width;
-            public double WidthIncludingTrailingWhitespace;
-
-            // vertical bounding box metrics
-            public double Extent;
-            public double OverhangAfter;
-
-            // horizontal bounding box metrics
-            public double OverhangLeading;
-            public double OverhangTrailing;
-        }
-
-        /// <summary>
-        /// Defines the flow direction
-        /// </summary>
-        public FlowDirection FlowDirection
-        {
-            set
-            {
-                ValidateFlowDirection(value, "value");
-                _defaultParaProps.SetFlowDirection(value);
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _defaultParaProps.FlowDirection;
-            }
-        }
-
-        /// <summary>
-        /// Defines the alignment of text within the column
-        /// </summary>
-        public TextAlignment TextAlignment
-        {
-            set
-            {
-                _defaultParaProps.SetTextAlignment(value);
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _defaultParaProps.TextAlignment;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of, or the spacing between, each line where
-        /// zero represents the default line height.
-        /// </summary>
-        public double LineHeight
-        {
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
-                }
-
-                _defaultParaProps.SetLineHeight(value);
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _defaultParaProps.LineHeight;
-            }
-        }
-
-        /// <summary>
-        /// The MaxTextWidth property defines the alignment edges for the FormattedText.
-        /// For example, left aligned text is wrapped such that the leftmost glyph alignment point
-        /// on each line falls exactly on the left edge of the rectangle.
-        /// Note that for many fonts, especially in italic style, some glyph strokes may extend beyond the edges of the alignment rectangle.
-        /// For this reason, it is recommended that clients draw text with at least 1/6 em (i.e of the font size) unused margin space either side.
-        /// Zero value of MaxTextWidth is equivalent to the maximum possible paragraph width.
-        /// </summary>
-        public double MaxTextWidth
-        {
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
-                }
-
-                _maxTextWidth = value;
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _maxTextWidth;
-            }
-        }
-
-        /// <summary>
-        /// Sets the array of lengths,
-        /// which will be applied to each line of text in turn.
-        /// If the text covers more lines than there are entries in the length array,
-        /// the last entry is reused as many times as required.
-        /// The maxTextWidths array overrides the MaxTextWidth property.
-        /// </summary>
-        /// <param name="maxTextWidths">The max text width array</param>
-        public void SetMaxTextWidths(double[] maxTextWidths)
-        {
-            if (maxTextWidths == null || maxTextWidths.Length <= 0)
-            {
-                throw new ArgumentNullException(nameof(maxTextWidths));
-            }
-
-            _maxTextWidths = maxTextWidths;
-
-            InvalidateMetrics();
-        }
-
-        /// <summary>
-        /// Obtains a copy of the array of lengths,
-        /// which will be applied to each line of text in turn.
-        /// If the text covers more lines than there are entries in the length array,
-        /// the last entry is reused as many times as required.
-        /// The maxTextWidths array overrides the MaxTextWidth property.
-        /// </summary>
-        /// <returns>The copy of max text width array</returns>
-        public double[] GetMaxTextWidths()
-        {
-            return _maxTextWidths != null ? (double[])_maxTextWidths.Clone() : Array.Empty<double>();
-        }
-
-        /// <summary>
-        /// Sets the maximum length of a column of text.
-        /// The last line of text displayed is the last whole line that will fit within this limit,
-        /// or the nth line as specified by MaxLineCount, whichever occurs first.
-        /// Use the Trimming property to control how the omission of text is indicated.
-        /// </summary>
-        public double MaxTextHeight
-        {
-            set
-            {
-                if (value <= 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value must be greater than zero.");
-                }
-
-                if (double.IsNaN(value))
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value cannot be NaN.");
-                }
-
-                _maxTextHeight = value;
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _maxTextHeight;
-            }
-        }
-
-        /// <summary>
-        /// Defines the maximum number of lines to display.
-        /// The last line of text displayed is the lineCount-1'th line,
-        /// or the last whole line that will fit within the count set by MaxTextHeight,
-        /// whichever occurs first.
-        /// Use the Trimming property to control how the omission of text is indicated
-        /// </summary>
-        public int MaxLineCount
-        {
-            set
-            {
-                if (value <= 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "The parameter value must be greater than zero.");
-                }
-
-                _maxLineCount = value;
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _maxLineCount;
-            }
-        }
-
-        /// <summary>
-        /// Defines how omission of text is indicated.
-        /// CharacterEllipsis trimming allows partial words to be displayed,
-        /// while WordEllipsis removes whole words to fit.
-        /// Both guarantee to include an ellipsis ('...') at the end of the lines
-        /// where text has been trimmed as a result of line and column limits.
-        /// </summary>
-        public TextTrimming Trimming
-        {
-            set
-            {
-                if ((int)value < 0 || (int)value > (int)TextTrimming.WordEllipsis)
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(TextTrimming));
-                }
-
-                _trimming = value;
-
-                _defaultParaProps.SetTextWrapping(_trimming == TextTrimming.None ?
-                    TextWrapping.Wrap :
-                    TextWrapping.WrapWithOverflow);
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _trimming;
-            }
-        }
-
-        /// <summary>
-        /// Lazily initializes the cached metrics EXCEPT for black box metrics and
-        /// returns the CachedMetrics structure.
-        /// </summary>
-        private CachedMetrics Metrics
-        {
-            get
-            {
-                return _metrics ??= DrawAndCalculateMetrics(
-                    null, // drawing context
-                    new Point(), // drawing offset
-                    false);
-            }
-        }
-
-        /// <summary>
-        /// Lazily initializes the cached metrics INCLUDING black box metrics and
-        /// returns the CachedMetrics structure.
-        /// </summary>
-        private CachedMetrics BlackBoxMetrics
-        {
-            get
-            {
-                if (_metrics == null || double.IsNaN(_metrics.Extent))
-                {
-                    // We need to obtain the metrics, including black box metrics.
-
-                    _metrics = DrawAndCalculateMetrics(
-                        null,           // drawing context
-                        new Point(),    // drawing offset
-                        true);          // calculate black box metrics
-                }
-                return _metrics;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the top of the first line to the bottom of the last line.
-        /// </summary>
-        public double Height
-        {
-            get
-            {
-                return Metrics.Height;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the topmost black pixel of the first line
-        /// to the bottommost black pixel of the last line. 
-        /// </summary>
-        public double Extent
-        {
-            get
-            {
-                return BlackBoxMetrics.Extent;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the top of the first line to the baseline of the first line.
-        /// </summary>
-        public double Baseline
-        {
-            get
-            {
-                return Metrics.Baseline;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the bottom of the last line to the extent bottom.
-        /// </summary>
-        public double OverhangAfter
-        {
-            get
-            {
-                return BlackBoxMetrics.OverhangAfter;
-            }
-        }
-
-        /// <summary>
-        /// The maximum distance from the leading black pixel to the leading alignment point of a line.
-        /// </summary>
-        public double OverhangLeading
-        {
-            get
-            {
-                return BlackBoxMetrics.OverhangLeading;
-            }
-        }
-
-        /// <summary>
-        /// The maximum distance from the trailing black pixel to the trailing alignment point of a line.
-        /// </summary>
-        public double OverhangTrailing
-        {
-            get
-        {
-                return BlackBoxMetrics.OverhangTrailing;
-            }
-        }
-
-        /// <summary>
-        /// The maximum advance width between the leading and trailing alignment points of a line,
-        /// excluding the width of whitespace characters at the end of the line.
-        /// </summary>
-        public double Width
-        {
-            get
-            {
-                return Metrics.Width;
-            }
-        }
-
-        /// <summary>
-        /// The maximum advance width between the leading and trailing alignment points of a line,
-        /// including the width of whitespace characters at the end of the line.
-        /// </summary>
-        public double WidthIncludingTrailingWhitespace
-        {
-            get
-            {
-                return Metrics.WidthIncludingTrailingWhitespace;
-            }
-        }
-
-        /// <summary>
-        /// Draws the text object
-        /// </summary>
-        internal void Draw(DrawingContext drawingContext, Point origin)
-        {
-            var lineOrigin = origin;
-
-            if (_metrics != null && !double.IsNaN(_metrics.Extent))
-            {
-                // we can't use foreach because it requires GetEnumerator and associated classes to be public
-                // foreach (TextLine currentLine in this)
-                using (var enumerator = GetEnumerator())
-                {
-                    while (enumerator.MoveNext())
-                    {
-                        var currentLine = enumerator.Current!;
-
-                        currentLine.Draw(drawingContext, lineOrigin);
-
-                        AdvanceLineOrigin(ref lineOrigin, currentLine);
-                    }
-                }
-            }
-            else
-            {
-                // Calculate metrics as we draw to avoid formatting again if we need metrics later; we compute
-                // black box metrics too because these are already known as a side-effect of drawing
-
-                _metrics = DrawAndCalculateMetrics(drawingContext, origin, true);
-            }
-        }
-
-        private CachedMetrics DrawAndCalculateMetrics(DrawingContext? drawingContext, Point drawingOffset, bool getBlackBoxMetrics)
-        {
-            var metrics = new CachedMetrics();
-
-            if (_text.Length == 0)
-            {
-                return metrics;
-            }
-
-            // we can't use foreach because it requires GetEnumerator and associated classes to be public
-            // foreach (TextLine currentLine in this)
-
-            using (var enumerator = GetEnumerator())
-            {
-                var first = true;
-
-                double accBlackBoxLeft, accBlackBoxTop, accBlackBoxRight, accBlackBoxBottom;
-                accBlackBoxLeft = accBlackBoxTop = double.MaxValue;
-                accBlackBoxRight = accBlackBoxBottom = double.MinValue;
-
-                var origin = new Point(0, 0);
-
-                // Holds the TextLine.Start of the longest line. Thus it will hold the minimum value 
-                // of TextLine.Start among all the lines that forms the text. The overhangs (leading and trailing) 
-                // are calculated with an offset as a result of the same issue with TextLine.Start. 
-                // So, we compute this offset and remove it later from the values of the overhangs.
-                var lineStartOfLongestLine = double.MaxValue;
-
-                while (enumerator.MoveNext())
-                {
-                    // enumerator will dispose the currentLine
-                    var currentLine = enumerator.Current!;
-
-                    // if we're drawing, do it first as this will compute black box metrics as a side-effect
-                    if (drawingContext != null)
-                    {
-                        currentLine.Draw(drawingContext,
-                            new Point(origin.X + drawingOffset.X, origin.Y + drawingOffset.Y));
-                    }
-
-                    if (getBlackBoxMetrics)
-                    {
-                        var blackBoxLeft = origin.X + currentLine.Start + currentLine.OverhangLeading;
-                        var blackBoxRight = origin.X + currentLine.Start + currentLine.Width - currentLine.OverhangTrailing;
-                        var blackBoxBottom = origin.Y + currentLine.Height + currentLine.OverhangAfter;
-                        var blackBoxTop = blackBoxBottom - currentLine.Extent;
-
-                        accBlackBoxLeft = Math.Min(accBlackBoxLeft, blackBoxLeft);
-                        accBlackBoxRight = Math.Max(accBlackBoxRight, blackBoxRight);
-                        accBlackBoxBottom = Math.Max(accBlackBoxBottom, blackBoxBottom);
-                        accBlackBoxTop = Math.Min(accBlackBoxTop, blackBoxTop);
-
-                        metrics.OverhangAfter = currentLine.OverhangAfter;
-                    }
-
-                    metrics.Height += currentLine.Height;
-                    metrics.Width = Math.Max(metrics.Width, currentLine.Width);
-                    metrics.WidthIncludingTrailingWhitespace = Math.Max(metrics.WidthIncludingTrailingWhitespace, currentLine.WidthIncludingTrailingWhitespace);
-                    lineStartOfLongestLine = Math.Min(lineStartOfLongestLine, currentLine.Start);
-
-                    if (first)
-                    {
-                        metrics.Baseline = currentLine.Baseline;
-                        first = false;
-                    }
-
-                    AdvanceLineOrigin(ref origin, currentLine);
-                }
-
-                if (getBlackBoxMetrics)
-                {
-                    metrics.Extent = accBlackBoxBottom - accBlackBoxTop;
-                    metrics.OverhangLeading = accBlackBoxLeft - lineStartOfLongestLine;
-                    metrics.OverhangTrailing = metrics.Width - (accBlackBoxRight - lineStartOfLongestLine);
-                }
-                else
-                {
-                    // indicate that black box metrics are not known
-                    metrics.Extent = double.NaN;
-                }
-            }
-
-            return metrics;
-        }
-
-        private class TextSourceImplementation : ITextSource
-        {
-            private readonly FormattedText _that;
-
-            public TextSourceImplementation(FormattedText text)
-            {
-                _that = text;
-            }
-
-            /// <inheritdoc/>
-            public TextRun? GetTextRun(int textSourceCharacterIndex)
-            {
-                if (textSourceCharacterIndex >= _that._text.Length)
-                {
-                    return null;
-                }
-
-                var thatFormatRider = new SpanRider(_that._formatRuns, _that._latestPosition, textSourceCharacterIndex);
-
-                TextRunProperties properties = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
-
-                var textCharacters = new TextCharacters(_that._text, textSourceCharacterIndex, thatFormatRider.Length,
-                    properties);
-
-                return textCharacters;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs
deleted file mode 100644
index 76c67a5cf4..0000000000
--- a/src/Avalonia.Visuals/Media/Geometry.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Defines a geometric shape.
-    /// </summary>    
-    public abstract class Geometry : AvaloniaObject
-    {
-        /// <summary>
-        /// Defines the <see cref="Transform"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Transform?> TransformProperty =
-            AvaloniaProperty.Register<Geometry, Transform?>(nameof(Transform));
-
-        private bool _isDirty = true;
-        private IGeometryImpl? _platformImpl;
-
-        static Geometry()
-        {
-            TransformProperty.Changed.AddClassHandler<Geometry>((x,e) => x.TransformChanged(e));
-        }
-
-        /// <summary>
-        /// Raised when the geometry changes.
-        /// </summary>
-        public event EventHandler? Changed;
-
-        /// <summary>
-        /// Gets the geometry's bounding rectangle.
-        /// </summary>
-        public Rect Bounds => PlatformImpl?.Bounds ?? Rect.Empty;
-
-        /// <summary>
-        /// Gets the platform-specific implementation of the geometry.
-        /// </summary>
-        public IGeometryImpl? PlatformImpl
-        {
-            get
-            {
-                if (_isDirty)
-                {
-                    var geometry = CreateDefiningGeometry();
-                    var transform = Transform;
-
-                    if (geometry != null && transform != null && transform.Value != Matrix.Identity)
-                    {
-                        geometry = geometry.WithTransform(transform.Value);
-                    }
-
-                    _platformImpl = geometry;
-                    _isDirty = false;
-                }
-
-                return _platformImpl;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a transform to apply to the geometry.
-        /// </summary>
-        public Transform? Transform
-        {
-            get { return GetValue(TransformProperty); }
-            set { SetValue(TransformProperty, value); }
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Geometry"/> from a string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>A <see cref="StreamGeometry"/>.</returns>
-        public static Geometry Parse(string s) => StreamGeometry.Parse(s);
-
-        /// <summary>
-        /// Clones the geometry.
-        /// </summary>
-        /// <returns>A cloned geometry.</returns>
-        public abstract Geometry Clone();
-
-        /// <summary>
-        /// Gets the geometry's bounding rectangle with the specified pen.
-        /// </summary>
-        /// <param name="pen">The stroke thickness.</param>
-        /// <returns>The bounding rectangle.</returns>
-        public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
-
-        /// <summary>
-        /// Indicates whether the geometry's fill contains the specified point.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        public bool FillContains(Point point)
-        {
-            return PlatformImpl?.FillContains(point) == true;
-        }
-
-        /// <summary>
-        /// Indicates whether the geometry's stroke contains the specified point.
-        /// </summary>
-        /// <param name="pen">The pen to use.</param>
-        /// <param name="point">The point.</param>
-        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        public bool StrokeContains(IPen pen, Point point)
-        {
-            return PlatformImpl?.StrokeContains(pen, point) == true;
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the geometry's <see cref="PlatformImpl"/>.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateGeometry"/> to be called on the element.
-        /// </remarks>
-        protected static void AffectsGeometry(params AvaloniaProperty[] properties)
-        {
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(AffectsGeometryInvalidate);
-            }
-        }
-
-        /// <summary>
-        /// Creates the platform implementation of the geometry, without the transform applied.
-        /// </summary>
-        /// <returns></returns>
-        protected abstract IGeometryImpl? CreateDefiningGeometry();
-
-        /// <summary>
-        /// Invalidates the platform implementation of the geometry.
-        /// </summary>
-        protected void InvalidateGeometry()
-        {
-            _isDirty = true;
-            _platformImpl = null;
-            Changed?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void TransformChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var oldValue = (Transform?)e.OldValue;
-            var newValue = (Transform?)e.NewValue;
-
-            if (oldValue != null)
-            {
-                oldValue.Changed -= TransformChanged;
-            }
-
-            if (newValue != null)
-            {
-                newValue.Changed += TransformChanged;
-            }
-
-            TransformChanged(newValue, EventArgs.Empty);
-        }
-
-        private void TransformChanged(object? sender, EventArgs e)
-        {
-            var transform = ((Transform?)sender)?.Value;
-
-            if (_platformImpl is ITransformedGeometryImpl t)
-            {
-                if (transform == null || transform == Matrix.Identity)
-                {
-                    _platformImpl = t.SourceGeometry;
-                }
-                else if (transform != t.Transform)
-                {
-                    _platformImpl = t.SourceGeometry.WithTransform(transform.Value);
-                }
-            }
-            else if (_platformImpl != null && transform != null && transform != Matrix.Identity)
-            {
-                _platformImpl = _platformImpl.WithTransform(transform.Value);
-            }
-
-            Changed?.Invoke(this, EventArgs.Empty);
-        }
-
-        private static void AffectsGeometryInvalidate(AvaloniaPropertyChangedEventArgs e)
-        {
-            var control = e.Sender as Geometry;
-            control?.InvalidateGeometry();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GeometryCollection.cs b/src/Avalonia.Visuals/Media/GeometryCollection.cs
deleted file mode 100644
index 0bd02d5438..0000000000
--- a/src/Avalonia.Visuals/Media/GeometryCollection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using Avalonia.Animation;
-
-#nullable enable
-
-namespace Avalonia.Media
-{
-    public class GeometryCollection : Animatable, IList<Geometry>, IReadOnlyList<Geometry>
-    {
-        private List<Geometry> _inner;
-
-        public GeometryCollection() => _inner = new List<Geometry>();
-        public GeometryCollection(IEnumerable<Geometry> collection) => _inner = new List<Geometry>(collection);
-        public GeometryCollection(int capacity) => _inner = new List<Geometry>(capacity);
-
-        public Geometry this[int index] 
-        { 
-            get => _inner[index];
-            set => _inner[index] = value; 
-        }
-
-        public int Count => _inner.Count;
-        public bool IsReadOnly => false;
-
-        public void Add(Geometry item) => _inner.Add(item);
-        public void Clear() => _inner.Clear();
-        public bool Contains(Geometry item) => _inner.Contains(item);
-        public void CopyTo(Geometry[] array, int arrayIndex) => _inner.CopyTo(array, arrayIndex);
-        public IEnumerator<Geometry> GetEnumerator() => _inner.GetEnumerator();
-        public int IndexOf(Geometry item) => _inner.IndexOf(item);
-        public void Insert(int index, Geometry item) => _inner.Insert(index, item);
-        public bool Remove(Geometry item) => _inner.Remove(item);
-        public void RemoveAt(int index) => _inner.RemoveAt(index);
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GeometryDrawing.cs b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
deleted file mode 100644
index e46e3a7d5f..0000000000
--- a/src/Avalonia.Visuals/Media/GeometryDrawing.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using Avalonia.Media.Immutable;
-using Avalonia.Metadata;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a drawing operation that combines 
-    /// a geometry with and brush and/or pen to produce rendered content.
-    /// </summary>
-    public class GeometryDrawing : Drawing
-    {
-        // Adding the Pen's stroke thickness here could yield wrong results due to transforms.
-        private static readonly IPen s_boundsPen = new ImmutablePen(Colors.Black.ToUint32(), 0);
-
-        /// <summary>
-        /// Defines the <see cref="Geometry"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Geometry> GeometryProperty =
-            AvaloniaProperty.Register<GeometryDrawing, Geometry>(nameof(Geometry));
-
-        /// <summary>
-        /// Defines the <see cref="Brush"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush> BrushProperty =
-            AvaloniaProperty.Register<GeometryDrawing, IBrush>(nameof(Brush), Brushes.Transparent);
-
-        /// <summary>
-        /// Defines the <see cref="Pen"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Pen> PenProperty =
-            AvaloniaProperty.Register<GeometryDrawing, Pen>(nameof(Pen));
-
-        /// <summary>
-        /// Gets or sets the <see cref="Avalonia.Media.Geometry"/> that describes the shape of this <see cref="GeometryDrawing"/>.
-        /// </summary>
-        [Content]
-        public Geometry Geometry
-        {
-            get => GetValue(GeometryProperty);
-            set => SetValue(GeometryProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Avalonia.Media.IBrush"/> used to fill the interior of the shape described by this <see cref="GeometryDrawing"/>.
-        /// </summary>
-        public IBrush Brush
-        {
-            get => GetValue(BrushProperty);
-            set => SetValue(BrushProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Avalonia.Media.IPen"/> used to stroke this <see cref="GeometryDrawing"/>.
-        /// </summary>
-        public IPen Pen
-        {
-            get => GetValue(PenProperty);
-            set => SetValue(PenProperty, value);
-        }
-
-        public override void Draw(DrawingContext context)
-        {
-            if (Geometry != null)
-            {
-                context.DrawGeometry(Brush, Pen, Geometry);
-            }
-        }
-
-        public override Rect GetBounds()
-        {
-            return Geometry?.GetRenderBounds(s_boundsPen) ?? Rect.Empty;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GeometryGroup.cs b/src/Avalonia.Visuals/Media/GeometryGroup.cs
deleted file mode 100644
index c6b666b2eb..0000000000
--- a/src/Avalonia.Visuals/Media/GeometryGroup.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Metadata;
-using Avalonia.Platform;
-
-#nullable enable
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a composite geometry, composed of other <see cref="Geometry"/> objects.
-    /// </summary>
-    public class GeometryGroup : Geometry
-    {
-        public static readonly DirectProperty<GeometryGroup, GeometryCollection?> ChildrenProperty =
-            AvaloniaProperty.RegisterDirect<GeometryGroup, GeometryCollection?> (
-                nameof(Children),
-                o => o.Children,
-                (o, v) => o.Children = v);
-
-        public static readonly StyledProperty<FillRule> FillRuleProperty =
-            AvaloniaProperty.Register<GeometryGroup, FillRule>(nameof(FillRule));
-
-        private GeometryCollection? _children;
-        private bool _childrenSet;
-
-        /// <summary>
-        /// Gets or sets the collection that contains the child geometries.
-        /// </summary>
-        [Content]
-        public GeometryCollection? Children
-        {
-            get => _children ??= (!_childrenSet ? new GeometryCollection() : null);
-            set
-            {
-                SetAndRaise(ChildrenProperty, ref _children, value);
-                _childrenSet = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets how the intersecting areas of the objects contained in this
-        /// <see cref="GeometryGroup"/> are combined. The default is <see cref="FillRule.EvenOdd"/>.
-        /// </summary>
-        public FillRule FillRule
-        {
-            get => GetValue(FillRuleProperty);
-            set => SetValue(FillRuleProperty, value);
-        }
-
-        public override Geometry Clone()
-        {
-            var result = new GeometryGroup { FillRule = FillRule, Transform = Transform };
-            if (_children?.Count > 0)
-                result.Children = new GeometryCollection(_children);
-            return result;
-        }
-
-        protected override IGeometryImpl? CreateDefiningGeometry()
-        {
-            if (_children?.Count > 0)
-            {
-                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                return factory.CreateGeometryGroup(FillRule, _children);
-            }
-
-            return null;
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == ChildrenProperty || change.Property == FillRuleProperty)
-            {
-                InvalidateGeometry();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
deleted file mode 100644
index ef5ffb8d78..0000000000
--- a/src/Avalonia.Visuals/Media/GlyphRun.cs
+++ /dev/null
@@ -1,756 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    ///     Represents a sequence of glyphs from a single face of a single font at a single size, and with a single rendering style.
-    /// </summary>
-    public sealed class GlyphRun : IDisposable
-    {
-        private static readonly IComparer<int> s_ascendingComparer = Comparer<int>.Default;
-        private static readonly IComparer<int> s_descendingComparer = new ReverseComparer<int>();
-
-        private IGlyphRunImpl? _glyphRunImpl;
-        private GlyphTypeface _glyphTypeface;
-        private double _fontRenderingEmSize;
-        private int _biDiLevel;
-        private Point? _baselineOrigin;
-        private GlyphRunMetrics? _glyphRunMetrics;
-
-        private ReadOnlySlice<char> _characters;
-
-        private IReadOnlyList<ushort> _glyphIndices;
-        private IReadOnlyList<double>? _glyphAdvances;
-        private IReadOnlyList<Vector>? _glyphOffsets;
-        private IReadOnlyList<int>? _glyphClusters;
-
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
-        /// </summary>
-        /// <param name="glyphTypeface">The glyph typeface.</param>
-        /// <param name="fontRenderingEmSize">The rendering em size.</param>
-        /// <param name="glyphIndices">The glyph indices.</param>
-        /// <param name="glyphAdvances">The glyph advances.</param>
-        /// <param name="glyphOffsets">The glyph offsets.</param>
-        /// <param name="characters">The characters.</param>
-        /// <param name="glyphClusters">The glyph clusters.</param>
-        /// <param name="biDiLevel">The bidi level.</param>
-        public GlyphRun(
-            GlyphTypeface glyphTypeface,
-            double fontRenderingEmSize,
-            ReadOnlySlice<char> characters,
-            IReadOnlyList<ushort> glyphIndices,
-            IReadOnlyList<double>? glyphAdvances = null,
-            IReadOnlyList<Vector>? glyphOffsets = null,
-            IReadOnlyList<int>? glyphClusters = null,
-            int biDiLevel = 0)
-        {
-            _glyphTypeface = glyphTypeface;  
-
-            FontRenderingEmSize = fontRenderingEmSize;
-
-            Characters = characters;
-
-            _glyphIndices = glyphIndices;
-
-            GlyphAdvances = glyphAdvances;
-
-            GlyphOffsets = glyphOffsets;
-
-            GlyphClusters = glyphClusters;
-
-            BiDiLevel = biDiLevel;
-        }
-
-        /// <summary>
-        ///     Gets the <see cref="Media.GlyphTypeface"/> for the <see cref="GlyphRun"/>.
-        /// </summary>
-        public GlyphTypeface GlyphTypeface => _glyphTypeface;
-
-        /// <summary>
-        ///     Gets or sets the em size used for rendering the <see cref="GlyphRun"/>.
-        /// </summary>
-        public double FontRenderingEmSize
-        {
-            get => _fontRenderingEmSize;
-            set => Set(ref _fontRenderingEmSize, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets the conservative bounding box of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public Size Size => new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public GlyphRunMetrics Metrics
-        {
-            get
-            {
-                _glyphRunMetrics ??= CreateGlyphRunMetrics();
-
-                return _glyphRunMetrics.Value;
-            }
-        }
-
-        /// <summary>
-        ///     Gets or sets the baseline origin of the<see cref="GlyphRun"/>.
-        /// </summary>
-        public Point BaselineOrigin
-        {
-            get
-            {
-                _baselineOrigin ??= CalculateBaselineOrigin();
-
-                return _baselineOrigin.Value;
-            }
-            set => Set(ref _baselineOrigin, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="ushort"/> values that represent the glyph indices in the rendering physical font.
-        /// </summary>
-        public IReadOnlyList<ushort> GlyphIndices
-        {
-            get => _glyphIndices;
-            set => Set(ref _glyphIndices, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="double"/> values that represent the advances corresponding to the glyph indices.
-        /// </summary>
-        public IReadOnlyList<double>? GlyphAdvances
-        {
-            get => _glyphAdvances;
-            set => Set(ref _glyphAdvances, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="Vector"/> values representing the offsets of the glyphs in the <see cref="GlyphRun"/>.
-        /// </summary>
-        public IReadOnlyList<Vector>? GlyphOffsets
-        {
-            get => _glyphOffsets;
-            set => Set(ref _glyphOffsets, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets the list of UTF16 code points that represent the Unicode content of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public ReadOnlySlice<char> Characters
-        {
-            get => _characters;
-            set => Set(ref _characters, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets a list of <see cref="int"/> values representing a mapping from character index to glyph index.
-        /// </summary>
-        public IReadOnlyList<int>? GlyphClusters
-        {
-            get => _glyphClusters;
-            set => Set(ref _glyphClusters, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets the bidirectional nesting level of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public int BiDiLevel
-        {
-            get => _biDiLevel;
-            set => Set(ref _biDiLevel, value);
-        }
-
-        /// <summary>
-        /// Gets the scale of the current <see cref="Media.GlyphTypeface"/>
-        /// </summary>
-        internal double Scale => FontRenderingEmSize / GlyphTypeface.DesignEmHeight;
-
-        /// <summary>
-        /// Returns <c>true</c> if the text direction is left-to-right. Otherwise, returns <c>false</c>.
-        /// </summary>
-        public bool IsLeftToRight => ((BiDiLevel & 1) == 0);
-
-        /// <summary>
-        /// The platform implementation of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public IGlyphRunImpl GlyphRunImpl
-        {
-            get
-            {
-                if (_glyphRunImpl == null)
-                {
-                    Initialize();
-                }
-
-                return _glyphRunImpl!;
-            }
-        }
-
-        /// <summary>
-        /// Retrieves the offset from the leading edge of the <see cref="GlyphRun"/>
-        /// to the leading or trailing edge of a caret stop containing the specified character hit.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the offset.</param>
-        /// <returns>
-        /// A <see cref="double"/> that represents the offset from the leading edge of the <see cref="GlyphRun"/>
-        /// to the leading or trailing edge of a caret stop containing the character hit.
-        /// </returns>
-        public double GetDistanceFromCharacterHit(CharacterHit characterHit)
-        {
-            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-           
-            var distance = 0.0;
-
-            if (IsLeftToRight)
-            {
-                if (GlyphClusters != null)
-                {
-                    if (characterIndex < GlyphClusters[0])
-                    {
-                        return 0;
-                    }
-
-                    if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
-                    {
-                        return Metrics.WidthIncludingTrailingWhitespace;
-                    }
-                }
-
-                var glyphIndex = FindGlyphIndex(characterIndex);
-                
-                if (GlyphClusters != null)
-                {
-                    var currentCluster = GlyphClusters[glyphIndex];
-
-                    //Move to the end of the glyph cluster
-                    if (characterHit.TrailingLength > 0)
-                    {
-                        while (glyphIndex + 1 < GlyphClusters.Count && GlyphClusters[glyphIndex + 1] == currentCluster)
-                        {
-                            glyphIndex++;
-                        }
-                    }
-                }
-
-                for (var i = 0; i < glyphIndex; i++)
-                {
-                    distance += GetGlyphAdvance(i, out _);
-                }
-
-                return distance;
-            }
-            else
-            {
-                //RightToLeft
-                var glyphIndex = FindGlyphIndex(characterIndex);
-                
-                if (GlyphClusters != null)
-                {
-                    if (characterIndex > GlyphClusters[0])
-                    {
-                        return 0;
-                    }
-
-                    if (characterIndex <= GlyphClusters[GlyphClusters.Count - 1])
-                    {
-                        return Size.Width;
-                    }
-                }
-
-                for (var i = glyphIndex + 1; i < GlyphIndices.Count; i++)
-                {
-                    distance += GetGlyphAdvance(i, out _);
-                }
-
-                return Size.Width - distance;
-            }
-        }
-
-        /// <summary>
-        /// Retrieves the <see cref="CharacterHit"/> value that represents the character hit of the caret of the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <param name="distance">Offset to use for computing the caret character hit.</param>
-        /// <param name="isInside">Determines whether the character hit is inside the <see cref="GlyphRun"/>.</param>
-        /// <returns>
-        /// A <see cref="CharacterHit"/> value that represents the character hit that is closest to the distance value.
-        /// The out parameter <c>isInside</c> returns <c>true</c> if the character hit is inside the <see cref="GlyphRun"/>; otherwise, <c>false</c>.
-        /// </returns>
-        public CharacterHit GetCharacterHitFromDistance(double distance, out bool isInside)
-        {
-            var characterIndex = 0;
-            
-            // Before
-            if (distance <= 0)
-            {
-                isInside = false;
-
-                if(GlyphClusters != null)
-                {
-                    characterIndex = GlyphClusters[characterIndex];
-                }
-
-                var firstCharacterHit = FindNearestCharacterHit(characterIndex, out _);
-
-                return IsLeftToRight ? new CharacterHit(firstCharacterHit.FirstCharacterIndex) : firstCharacterHit;
-            }
-
-            //After
-            if (distance >= Size.Width)
-            {
-                isInside = false;
-
-                characterIndex = GlyphIndices.Count - 1;
-
-                if(GlyphClusters != null)
-                {
-                    characterIndex = GlyphClusters[characterIndex];
-                }
-                
-                var lastCharacterHit = FindNearestCharacterHit(characterIndex, out _);
-
-                return IsLeftToRight ? lastCharacterHit : new CharacterHit(lastCharacterHit.FirstCharacterIndex);
-            }
-
-            //Within
-            var currentX = 0d;
-
-            if (IsLeftToRight)
-            {
-                for (var index = 0; index < GlyphIndices.Count; index++)
-                {
-                    var advance = GetGlyphAdvance(index, out var cluster);
-
-                    characterIndex = cluster;
-                    
-                    if (distance > currentX && distance <= currentX + advance)
-                    {
-                        break;
-                    }
-
-                    currentX += advance;
-                }
-            }
-            else
-            {
-                currentX = Size.Width;
-
-                for (var index = GlyphIndices.Count - 1; index >= 0; index--)
-                {
-                    var advance = GetGlyphAdvance(index, out var cluster);
-
-                    characterIndex = cluster;
-                    
-                    if (currentX - advance < distance)
-                    {
-                        break;
-                    }
-
-                    currentX -= advance;
-                }
-            }
-
-            isInside = true;
-
-            var characterHit = FindNearestCharacterHit(characterIndex, out var width);
-
-            var delta = width / 2;
-            var offset = IsLeftToRight ? distance - currentX : currentX - distance;
-
-            var isTrailing = offset > delta;
-
-            return isTrailing ? characterHit : new CharacterHit(characterHit.FirstCharacterIndex);
-        }
-
-        /// <summary>
-        /// Retrieves the next valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the next hit value.</param>
-        /// <returns>
-        /// A <see cref="CharacterHit"/> that represents the next valid caret character hit in the logical direction.
-        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
-        /// </returns>
-        public CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (characterHit.TrailingLength == 0)
-            {
-                characterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex, out _);
-
-                var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-                return textPosition > _characters.End ?
-                    characterHit :
-                    new CharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength);
-            }
-
-            var nextCharacterHit =
-                FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
-
-            return nextCharacterHit == characterHit ?
-                characterHit :
-                new CharacterHit(nextCharacterHit.FirstCharacterIndex);
-        }
-
-        /// <summary>
-        /// Retrieves the previous valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the previous hit value.</param>
-        /// <returns>
-        /// A cref="CharacterHit"/> that represents the previous valid caret character hit in the logical direction.
-        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
-        /// </returns>
-        public CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (characterHit.TrailingLength != 0)
-            {
-                return new CharacterHit(characterHit.FirstCharacterIndex);
-            }
-
-            var previousCharacterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
-
-            return new CharacterHit(previousCharacterHit.FirstCharacterIndex);
-        }
-
-        /// <summary>
-        /// Finds a glyph index for given character index.
-        /// </summary>
-        /// <param name="characterIndex">The character index.</param>
-        /// <returns>
-        /// The glyph index.
-        /// </returns>
-        public int FindGlyphIndex(int characterIndex)
-        {
-            if (GlyphClusters == null)
-            {
-                return characterIndex;
-            }
-
-            if (IsLeftToRight)
-            {
-                if (characterIndex < GlyphClusters[0])
-                {
-                    return 0;
-                }
-
-                if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
-                {
-                    return GlyphClusters.Count - 1;
-                }
-            }
-            else
-            {
-                if (characterIndex < GlyphClusters[GlyphClusters.Count - 1])
-                {
-                    return GlyphClusters.Count - 1;
-                }
-
-                if (characterIndex > GlyphClusters[0])
-                {
-                    return 0;
-                }
-            }
-
-            var comparer = IsLeftToRight ? s_ascendingComparer : s_descendingComparer;
-
-            var clusters = GlyphClusters;
-
-            // Find the start of the cluster at the character index.
-            var start = clusters.BinarySearch(characterIndex, comparer);
-
-            // No cluster found.
-            if (start < 0)
-            {
-                while (characterIndex > 0 && start < 0)
-                {
-                    characterIndex--;
-
-                    start = clusters.BinarySearch(characterIndex, comparer);
-                }
-
-                if (start < 0)
-                {
-                    return -1;
-                }
-            }
-
-            if (IsLeftToRight)
-            {
-                while (start > 0 && clusters[start - 1] == clusters[start])
-                {
-                    start--;
-                }
-            }
-            else
-            {
-                while (start + 1 < clusters.Count && clusters[start + 1] == clusters[start])
-                {
-                    start++;
-                }
-            }
-
-            return start;
-        }
-
-        /// <summary>
-        /// Finds the nearest <see cref="CharacterHit"/> at given index.
-        /// </summary>
-        /// <param name="index">The index.</param>
-        /// <param name="width">The width of found cluster.</param>
-        /// <returns>
-        /// The nearest <see cref="CharacterHit"/>.
-        /// </returns>
-        public CharacterHit FindNearestCharacterHit(int index, out double width)
-        {
-            width = 0.0;
-
-            var start = FindGlyphIndex(index);
-
-            if (GlyphClusters == null)
-            {
-                width = GetGlyphAdvance(index, out _);
-
-                return new CharacterHit(start, 1);
-            }
-
-            var cluster = GlyphClusters[start];
-
-            var nextCluster = cluster;
-
-            var currentIndex = start;
-
-            while (nextCluster == cluster)
-            {
-                width += GetGlyphAdvance(currentIndex, out _);
-
-                if (IsLeftToRight)
-                {
-                    currentIndex++;
-
-                    if (currentIndex == GlyphClusters.Count)
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    currentIndex--;
-
-                    if (currentIndex < 0)
-                    {
-                        break;
-                    }
-                }
-
-                nextCluster = GlyphClusters[currentIndex];
-            }
-
-            int trailingLength;
-
-            if (nextCluster == cluster)
-            {
-                trailingLength = Characters.Start + Characters.Length - cluster;
-            }
-            else
-            {
-                trailingLength = nextCluster - cluster;
-            }
-
-            return new CharacterHit(cluster, trailingLength);
-        }
-
-        /// <summary>
-        /// Gets a glyph's width.
-        /// </summary>
-        /// <param name="index">The glyph index.</param>
-        /// <param name="cluster">The current cluster.</param>
-        /// <returns>The glyph's width.</returns>
-        private double GetGlyphAdvance(int index, out int cluster)
-        {
-            cluster = GlyphClusters != null ? GlyphClusters[index] : index;
-            
-            if (GlyphAdvances != null)
-            {
-                return GlyphAdvances[index];
-            }
-
-            var glyph = GlyphIndices[index];
-
-            return GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
-        }
-
-        /// <summary>
-        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <returns>The baseline origin.</returns>
-        private Point CalculateBaselineOrigin()
-        {
-            return new Point(0, -GlyphTypeface.Ascent * Scale);
-        }
-
-        private GlyphRunMetrics CreateGlyphRunMetrics()
-        {
-            var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
-            var widthIncludingTrailingWhitespace = 0d;
-
-            var trailingWhitespaceLength = GetTrailingWhitespaceLength(out var newLineLength, out var glyphCount);
-            
-            for (var index = 0; index < GlyphIndices.Count; index++)
-            {
-                var advance = GetGlyphAdvance(index, out _);
-
-                widthIncludingTrailingWhitespace += advance;
-            }
-
-            var width = widthIncludingTrailingWhitespace;
-
-            if (IsLeftToRight)
-            {
-                for (var index = GlyphIndices.Count - glyphCount; index <GlyphIndices.Count; index++)
-                {
-                    width -= GetGlyphAdvance(index, out _);
-                }
-            }
-            else
-            {
-                for (var index = 0; index < glyphCount; index++)
-                {
-                    width -= GetGlyphAdvance(index, out _);
-                }
-            }
-
-            return new GlyphRunMetrics(width, widthIncludingTrailingWhitespace, trailingWhitespaceLength, newLineLength,
-                height);
-        }
-
-        private int GetTrailingWhitespaceLength(out int newLineLength, out int glyphCount)
-        {
-            glyphCount = 0;
-            newLineLength = 0;
-
-            if (Characters.IsEmpty)
-            {
-                return 0;
-            }
-
-            var trailingWhitespaceLength = 0;
-
-            if (GlyphClusters == null)
-            {
-                for (var i = _characters.Length - 1; i >= 0;)
-                {
-                    var codepoint = Codepoint.ReadAt(_characters, i, out var count);
-
-                    if (!codepoint.IsWhiteSpace)
-                    {
-                        break;
-                    }
-
-                    if (codepoint.IsBreakChar)
-                    {
-                        newLineLength++;
-                    }
-
-                    trailingWhitespaceLength++;
-
-                    i -= count;
-                    glyphCount++;
-                }
-            }
-            else
-            {
-                for (var i = GlyphClusters.Count - 1; i >= 0; i--)
-                {
-                    var cluster = GlyphClusters[i];
-
-                    var codepointIndex = IsLeftToRight ? cluster - _characters.Start : _characters.End - cluster;
-
-                    if (codepointIndex < 0)
-                    {
-                        trailingWhitespaceLength = _characters.Length;
-                        
-                        glyphCount = GlyphClusters.Count;
-                        
-                        break;
-                    }
-                    
-                    var codepoint = Codepoint.ReadAt(_characters, codepointIndex, out _);
-
-                    if (!codepoint.IsWhiteSpace)
-                    {
-                        break;
-                    }
-
-                    if (codepoint.IsBreakChar)
-                    {
-                        newLineLength++;
-                    }
-
-                    trailingWhitespaceLength++;
-                    
-                    glyphCount++;
-                }
-            }
-
-            return trailingWhitespaceLength;
-        }
-
-        private void Set<T>(ref T field, T value)
-        {
-            if (_glyphRunImpl != null)
-            {
-                throw new InvalidOperationException("GlyphRun can't be changed after it has been initialized.'");
-            }
-
-            _glyphRunMetrics = null;
-
-            _baselineOrigin = null;
-
-            field = value;
-        }
-
-        /// <summary>
-        /// Initializes the <see cref="GlyphRun"/>.
-        /// </summary>
-        private void Initialize()
-        {
-            if (GlyphIndices == null)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var glyphCount = GlyphIndices.Count;
-
-            if (GlyphAdvances != null && GlyphAdvances.Count > 0 && GlyphAdvances.Count != glyphCount)
-            {
-                throw new InvalidOperationException();
-            }
-
-            if (GlyphOffsets != null && GlyphOffsets.Count > 0 && GlyphOffsets.Count != glyphCount)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-
-            _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this);
-        }
-
-        void IDisposable.Dispose()
-        {
-            _glyphRunImpl?.Dispose();
-        }
-
-        private class ReverseComparer<T> : IComparer<T>
-        {
-            public int Compare(T? x, T? y)
-            {
-                return Comparer<T>.Default.Compare(y, x);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GlyphTypeface.cs b/src/Avalonia.Visuals/Media/GlyphTypeface.cs
deleted file mode 100644
index 45ef04e77f..0000000000
--- a/src/Avalonia.Visuals/Media/GlyphTypeface.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    public sealed class GlyphTypeface : IDisposable
-    {
-        public GlyphTypeface(Typeface typeface) 
-            : this(FontManager.Current.PlatformImpl.CreateGlyphTypeface(typeface)) 
-        {
-        }
-
-        public GlyphTypeface(IGlyphTypefaceImpl platformImpl)
-        {
-            PlatformImpl = platformImpl;
-        }
-
-        public IGlyphTypefaceImpl PlatformImpl { get; }
-
-        /// <summary>
-        ///     Gets the font design units per em.
-        /// </summary>
-        public short DesignEmHeight => PlatformImpl.DesignEmHeight;
-
-        /// <summary>
-        ///     Gets the recommended distance above the baseline in design em size. 
-        /// </summary>
-        public int Ascent => PlatformImpl.Ascent;
-
-        /// <summary>
-        ///     Gets the recommended distance under the baseline in design em size. 
-        /// </summary>
-        public int Descent => PlatformImpl.Descent;
-
-        /// <summary>
-        ///      Gets the recommended additional space between two lines of text in design em size. 
-        /// </summary>
-        public int LineGap => PlatformImpl.LineGap;
-
-        /// <summary>
-        ///     Gets the recommended line height.
-        /// </summary>
-        public int LineHeight => Descent - Ascent + LineGap;
-
-        /// <summary>
-        ///     Gets a value that indicates the distance of the underline from the baseline in design em size.
-        /// </summary>
-        public int UnderlinePosition => PlatformImpl.UnderlinePosition;
-
-        /// <summary>
-        ///     Gets a value that indicates the thickness of the underline in design em size.
-        /// </summary>
-        public int UnderlineThickness => PlatformImpl.UnderlineThickness;
-
-        /// <summary>
-        ///     Gets a value that indicates the distance of the strikethrough from the baseline in design em size.
-        /// </summary>
-        public int StrikethroughPosition => PlatformImpl.StrikethroughPosition;
-
-        /// <summary>
-        ///     Gets a value that indicates the thickness of the underline in design em size.
-        /// </summary>
-        public int StrikethroughThickness => PlatformImpl.StrikethroughThickness;
-
-        /// <summary>
-        ///     A <see cref="bool"/> value indicating whether all glyphs in the font have the same advancement. 
-        /// </summary>
-        public bool IsFixedPitch => PlatformImpl.IsFixedPitch;
-
-        /// <summary>
-        ///     Returns an glyph index for the specified codepoint.
-        /// </summary>
-        /// <remarks>
-        ///     Returns a replacement glyph if a glyph isn't found.
-        /// </remarks>
-        /// <param name="codepoint">The codepoint.</param>
-        /// <returns>
-        ///     A glyph index.
-        /// </returns>
-        public ushort GetGlyph(uint codepoint) => PlatformImpl.GetGlyph(codepoint);
-
-        /// <summary>
-        ///     Tries to get an glyph index for specified codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint.</param>
-        /// <param name="glyph">A glyph index.</param>
-        /// <returns>
-        ///     <c>true</c> if an glyph index was found, <c>false</c> otherwise.
-        /// </returns>
-        public bool TryGetGlyph(uint codepoint, out ushort glyph)
-        {
-            glyph = PlatformImpl.GetGlyph(codepoint);
-
-            return glyph != 0;
-        }
-
-        /// <summary>
-        ///     Returns an array of glyph indices. Codepoints that are not represented by the font are returned as <code>0</code>.
-        /// </summary>
-        /// <param name="codepoints">The codepoints to map.</param>
-        /// <returns></returns>
-        public ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints) => PlatformImpl.GetGlyphs(codepoints);
-
-        /// <summary>
-        ///     Returns the glyph advance for the specified glyph.
-        /// </summary>
-        /// <param name="glyph">The glyph.</param>
-        /// <returns>
-        ///     The advance.
-        /// </returns>
-        public int GetGlyphAdvance(ushort glyph) => PlatformImpl.GetGlyphAdvance(glyph);
-
-        /// <summary>
-        ///     Returns an array of glyph advances in design em size.
-        /// </summary>
-        /// <param name="glyphs">The glyph indices.</param>
-        /// <returns></returns>
-        public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs) => PlatformImpl.GetGlyphAdvances(glyphs);
-
-        void IDisposable.Dispose()
-        {
-            PlatformImpl?.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GradientStops.cs b/src/Avalonia.Visuals/Media/GradientStops.cs
deleted file mode 100644
index efc11bacd6..0000000000
--- a/src/Avalonia.Visuals/Media/GradientStops.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Collections;
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A collection of <see cref="GradientStop"/>s.
-    /// </summary>
-    public class GradientStops : AvaloniaList<GradientStop>
-    {
-        public GradientStops()
-        {
-            ResetBehavior = ResetBehavior.Remove;
-        }
-
-        public IReadOnlyList<ImmutableGradientStop> ToImmutable()
-        {
-            return this.Select(x => new ImmutableGradientStop(x.Offset, x.Color)).ToList();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IBrush.cs b/src/Avalonia.Visuals/Media/IBrush.cs
deleted file mode 100644
index 15b7681be4..0000000000
--- a/src/Avalonia.Visuals/Media/IBrush.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.ComponentModel;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how an area is painted.
-    /// </summary>
-    [TypeConverter(typeof(BrushConverter))]
-    public interface IBrush
-    {
-        /// <summary>
-        /// Gets the opacity of the brush.
-        /// </summary>
-        double Opacity { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IConicGradientBrush.cs b/src/Avalonia.Visuals/Media/IConicGradientBrush.cs
deleted file mode 100644
index 5368dd1851..0000000000
--- a/src/Avalonia.Visuals/Media/IConicGradientBrush.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with a conic gradient.
-    /// </summary>
-    public interface IConicGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Gets the center point for the gradient.
-        /// </summary>
-        RelativePoint Center { get; }
-
-        /// <summary>
-        /// Gets the starting angle for the gradient in degrees, measured from
-        /// the point above the center point.
-        /// </summary>
-        double Angle { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IDashStyle.cs b/src/Avalonia.Visuals/Media/IDashStyle.cs
deleted file mode 100644
index 7835c7a1e9..0000000000
--- a/src/Avalonia.Visuals/Media/IDashStyle.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
-    /// </summary>
-    public interface IDashStyle
-    {
-        /// <summary>
-        /// Gets or sets the length of alternating dashes and gaps.
-        /// </summary>
-        IReadOnlyList<double> Dashes { get; }
-
-        /// <summary>
-        /// Gets or sets how far in the dash sequence the stroke will start.
-        /// </summary>
-        double Offset { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs
deleted file mode 100644
index e71584258a..0000000000
--- a/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Experimental Interface for producing Acrylic-like materials.
-    /// </summary>
-    public interface IExperimentalAcrylicMaterial
-    {
-        /// <summary>
-        /// Gets the <see cref="AcrylicBackgroundSource"/> of the material.
-        /// </summary>
-        AcrylicBackgroundSource BackgroundSource { get; }
-
-        /// <summary>
-        /// Gets the TintColor of the material.
-        /// </summary>
-        Color TintColor { get; }
-
-        /// <summary>
-        /// Gets the TintOpacity of the material.
-        /// </summary>
-        double TintOpacity { get; }
-
-        /// <summary>
-        /// Gets the effective material color.
-        /// </summary>
-        Color MaterialColor { get; }        
-
-        /// <summary>
-        /// Gets the fallback color.
-        /// </summary>
-        Color FallbackColor { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IGradientBrush.cs b/src/Avalonia.Visuals/Media/IGradientBrush.cs
deleted file mode 100644
index 18db0af660..0000000000
--- a/src/Avalonia.Visuals/Media/IGradientBrush.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A brush that draws with a gradient.
-    /// </summary>
-    public interface IGradientBrush : IBrush
-    {
-        /// <summary>
-        /// Gets the brush's gradient stops.
-        /// </summary>
-        IReadOnlyList<IGradientStop> GradientStops { get; }
-
-        /// <summary>
-        /// Gets the brush's spread method that defines how to draw a gradient that doesn't fill
-        /// the bounds of the destination control.
-        /// </summary>
-        GradientSpreadMethod SpreadMethod { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IGradientStop.cs b/src/Avalonia.Visuals/Media/IGradientStop.cs
deleted file mode 100644
index 22eb9df60d..0000000000
--- a/src/Avalonia.Visuals/Media/IGradientStop.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes the location and color of a transition point in a gradient.
-    /// </summary>
-    public interface IGradientStop
-    {
-        /// <summary>
-        /// Gets the gradient stop color.
-        /// </summary>
-        Color Color { get; }
-
-        /// <summary>
-        /// Gets the gradient stop offset.
-        /// </summary>
-        double Offset { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IImage.cs b/src/Avalonia.Visuals/Media/IImage.cs
deleted file mode 100644
index aff2a9ddf9..0000000000
--- a/src/Avalonia.Visuals/Media/IImage.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a raster or vector image.
-    /// </summary>
-    public interface IImage
-    {
-        /// <summary>
-        /// Gets the size of the image, in device independent pixels.
-        /// </summary>
-        Size Size { get; }
-
-        /// <summary>
-        /// Draws the image to a <see cref="DrawingContext"/>.
-        /// </summary>
-        /// <param name="context">The drawing context.</param>
-        /// <param name="sourceRect">The rect in the image to draw.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        void Draw(
-            DrawingContext context,
-            Rect sourceRect,
-            Rect destRect,
-            BitmapInterpolationMode bitmapInterpolationMode);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IImageBrush.cs b/src/Avalonia.Visuals/Media/IImageBrush.cs
deleted file mode 100644
index aaa481bd28..0000000000
--- a/src/Avalonia.Visuals/Media/IImageBrush.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IBitmap"/>.
-    /// </summary>
-    public interface IImageBrush : ITileBrush
-    {
-        /// <summary>
-        /// Gets the image to draw.
-        /// </summary>
-        IBitmap Source { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ILinearGradientBrush.cs b/src/Avalonia.Visuals/Media/ILinearGradientBrush.cs
deleted file mode 100644
index 3e2a5a0e22..0000000000
--- a/src/Avalonia.Visuals/Media/ILinearGradientBrush.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A brush that draws with a linear gradient.
-    /// </summary>
-    public interface ILinearGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Gets or sets the start point for the gradient.
-        /// </summary>
-        RelativePoint StartPoint { get; }
-
-        /// <summary>
-        /// Gets or sets the end point for the gradient.
-        /// </summary>
-        RelativePoint EndPoint { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/IMutableBrush.cs b/src/Avalonia.Visuals/Media/IMutableBrush.cs
deleted file mode 100644
index 415db61d68..0000000000
--- a/src/Avalonia.Visuals/Media/IMutableBrush.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a mutable brush which can return an immutable clone of itself.
-    /// </summary>
-    public interface IMutableBrush : IBrush, IAffectsRender
-    {
-        /// <summary>
-        /// Creates an immutable clone of the brush.
-        /// </summary>
-        /// <returns>The immutable clone.</returns>
-        IBrush ToImmutable();
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs
deleted file mode 100644
index fcfe4631a6..0000000000
--- a/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a mutable brush which can return an immutable clone of itself.
-    /// </summary>
-    public interface IMutableExperimentalAcrylicMaterial : IExperimentalAcrylicMaterial, IAffectsRender
-    {
-        /// <summary>
-        /// Creates an immutable clone of the brush.
-        /// </summary>
-        /// <returns>The immutable clone.</returns>
-        IExperimentalAcrylicMaterial ToImmutable();
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IMutableTransform.cs b/src/Avalonia.Visuals/Media/IMutableTransform.cs
deleted file mode 100644
index 2033c434c0..0000000000
--- a/src/Avalonia.Visuals/Media/IMutableTransform.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Avalonia.Media
-{
-    public interface IMutableTransform : ITransform
-    {
-        /// <summary>
-        /// Raised when the transform changes.
-        /// </summary>
-        event EventHandler Changed;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IPen.cs b/src/Avalonia.Visuals/Media/IPen.cs
deleted file mode 100644
index 1cad9948b4..0000000000
--- a/src/Avalonia.Visuals/Media/IPen.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how a stroke is drawn.
-    /// </summary>
-    public interface IPen
-    {
-        /// <summary>
-        /// Gets the brush used to draw the stroke.
-        /// </summary>
-        IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the style of dashed lines drawn with a <see cref="Pen"/> object.
-        /// </summary>
-        IDashStyle? DashStyle { get; }
-
-        /// <summary>
-        /// Gets the type of shape to use on both ends of a line.
-        /// </summary>
-        PenLineCap LineCap { get; }
-
-        /// <summary>
-        /// Gets a value describing how to join consecutive line or curve segments in a 
-        /// <see cref="PathFigure"/> contained in a <see cref="PathGeometry"/> object.
-        /// </summary>
-        PenLineJoin LineJoin { get; }
-
-        /// <summary>
-        /// Gets the limit of the thickness of the join on a mitered corner.
-        /// </summary>
-        double MiterLimit { get; }
-
-        /// <summary>
-        /// Gets the stroke thickness.
-        /// </summary>
-        double Thickness { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IRadialGradientBrush.cs b/src/Avalonia.Visuals/Media/IRadialGradientBrush.cs
deleted file mode 100644
index cadf53cc18..0000000000
--- a/src/Avalonia.Visuals/Media/IRadialGradientBrush.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with a radial gradient.
-    /// </summary>
-    public interface IRadialGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Gets the start point for the gradient.
-        /// </summary>
-        RelativePoint Center { get; }
-
-        /// <summary>
-        /// Gets the location of the two-dimensional focal point that defines the beginning of the
-        /// gradient.
-        /// </summary>
-        RelativePoint GradientOrigin { get; }
-
-        /// <summary>
-        /// Gets the horizontal and vertical radius of the outermost circle of the radial gradient.
-        /// </summary>
-        double Radius { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ISolidColorBrush.cs b/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
deleted file mode 100644
index d0ab00599b..0000000000
--- a/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Fills an area with a solid color.
-    /// </summary>
-    public interface ISolidColorBrush : IBrush
-    {
-        /// <summary>
-        /// Gets the color of the brush.
-        /// </summary>
-        Color Color { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ITileBrush.cs b/src/Avalonia.Visuals/Media/ITileBrush.cs
deleted file mode 100644
index 12fb221a89..0000000000
--- a/src/Avalonia.Visuals/Media/ITileBrush.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{  
-    /// <summary>
-    /// A brush which displays a repeating image.
-    /// </summary>
-    public interface ITileBrush : IBrush
-    {
-        /// <summary>
-        /// Gets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        AlignmentX AlignmentX { get; }
-
-        /// <summary>
-        /// Gets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        AlignmentY AlignmentY { get; }
-
-        /// <summary>
-        /// Gets the rectangle on the destination in which to paint a tile.
-        /// </summary>
-        RelativeRect DestinationRect { get; }
-
-        /// <summary>
-        /// Gets the rectangle of the source image that will be displayed.
-        /// </summary>
-        RelativeRect SourceRect { get; }
-
-        /// <summary>
-        /// Gets a value indicating how the source rectangle will be stretched to fill the
-        /// destination rect.
-        /// </summary>
-        Stretch Stretch { get; }
-
-        /// <summary>
-        /// Gets the brush's tile mode.
-        /// </summary>
-        TileMode TileMode { get; }
-
-        /// <summary>
-        /// Gets the bitmap interpolation mode.
-        /// </summary>
-        /// <value>
-        /// The bitmap interpolation mode.
-        /// </value>
-        BitmapInterpolationMode BitmapInterpolationMode { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IVisualBrush.cs b/src/Avalonia.Visuals/Media/IVisualBrush.cs
deleted file mode 100644
index e74892b218..0000000000
--- a/src/Avalonia.Visuals/Media/IVisualBrush.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.VisualTree;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IVisual"/>.
-    /// </summary>
-    public interface IVisualBrush : ITileBrush
-    {
-        /// <summary>
-        /// Gets the visual to draw.
-        /// </summary>
-        IVisual Visual { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
deleted file mode 100644
index 647ce13528..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using System;
-using System.IO;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Holds a bitmap image.
-    /// </summary>
-    public class Bitmap : IBitmap
-    {
-        /// <summary>
-        /// Loads a Bitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
-        public static Bitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            return new Bitmap(GetFactory().LoadBitmapToWidth(stream, width, interpolationMode));
-        }
-
-        /// <summary>
-        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
-        public static Bitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            return new Bitmap(GetFactory().LoadBitmapToHeight(stream, height, interpolationMode));
-        }
-
-        /// <summary>
-        /// Creates a Bitmap scaled to a specified size from the current bitmap.
-        /// </summary>        
-        /// <param name="destinationSize">The destination size.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
-        public Bitmap CreateScaledBitmap(PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            return new Bitmap(GetFactory().ResizeBitmap(PlatformImpl.Item, destinationSize, interpolationMode));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="fileName">The filename of the bitmap.</param>
-        public Bitmap(string fileName)
-        {
-            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(fileName));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param>
-        public Bitmap(Stream stream)
-        {
-            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(stream));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="impl">A platform-specific bitmap implementation.</param>
-        public Bitmap(IRef<IBitmapImpl> impl)
-        {
-            PlatformImpl = impl.Clone();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="impl">A platform-specific bitmap implementation. Bitmap class takes the ownership.</param>
-        protected Bitmap(IBitmapImpl impl)
-        {
-            PlatformImpl = RefCountable.Create(impl);
-        }
-
-        /// <inheritdoc/>
-        public virtual void Dispose()
-        {
-            PlatformImpl.Dispose();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="format">The pixel format.</param>
-        /// <param name="data">The pointer to the source bytes.</param>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="stride">The number of bytes per row.</param>
-        [Obsolete("Use overload taking an AlphaFormat.")]
-        public Bitmap(PixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
-        {
-            var ri = GetFactory();
-            PlatformImpl = RefCountable.Create(ri
-                .LoadBitmap(format, ri.DefaultAlphaFormat, data, size, dpi, stride));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="format">The pixel format.</param>
-        /// <param name="alphaFormat">The alpha format.</param>
-        /// <param name="data">The pointer to the source bytes.</param>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="stride">The number of bytes per row.</param>
-        public Bitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
-        {
-            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(format, alphaFormat, data, size, dpi, stride));
-        }
-
-        /// <inheritdoc/>
-        public Vector Dpi => PlatformImpl.Item.Dpi;
-
-        /// <inheritdoc/>
-        public Size Size => PlatformImpl.Item.PixelSize.ToSizeWithDpi(Dpi);
-
-        /// <inheritdoc/>
-        public PixelSize PixelSize => PlatformImpl.Item.PixelSize;
-
-        /// <summary>
-        /// Gets the platform-specific bitmap implementation.
-        /// </summary>
-        public IRef<IBitmapImpl> PlatformImpl { get; }
-
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        public void Save(string fileName)
-        {
-            PlatformImpl.Item.Save(fileName);
-        }
-
-        /// <summary>
-        /// Saves the bitmap to a stream.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        public void Save(Stream stream)
-        {
-            PlatformImpl.Item.Save(stream);
-        }
-
-        /// <inheritdoc/>
-        void IImage.Draw(
-            DrawingContext context,
-            Rect sourceRect,
-            Rect destRect,
-            BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            context.PlatformImpl.DrawBitmap(
-                PlatformImpl,
-                1,
-                sourceRect,
-                destRect,
-                bitmapInterpolationMode);
-        }
-
-        private static IPlatformRenderInterface GetFactory()
-        {
-            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/BitmapBlendingMode.cs b/src/Avalonia.Visuals/Media/Imaging/BitmapBlendingMode.cs
deleted file mode 100644
index 473b43dab3..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/BitmapBlendingMode.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace Avalonia.Visuals.Media.Imaging
-{
-    /// <summary>
-    /// Controls the way the bitmaps are drawn together.
-    /// </summary>
-    public enum BitmapBlendingMode
-    {
-        /// <summary>
-        /// Source is placed over the destination.
-        /// </summary>
-        SourceOver,
-        /// <summary>
-        /// Only the source will be present.
-        /// </summary>
-        Source,
-        /// <summary>
-        /// Only the destination will be present.
-        /// </summary>
-        Destination,
-        /// <summary>
-        /// Destination is placed over the source.
-        /// </summary>
-        DestinationOver,
-        /// <summary>
-        /// The source that overlaps the destination, replaces the destination.
-        /// </summary>
-        SourceIn,
-        /// <summary>
-        /// Destination which overlaps the source, replaces the source.
-        /// </summary>
-        DestinationIn,
-        /// <summary>
-        /// Source is placed, where it falls outside of the destination.
-        /// </summary>
-        SourceOut,
-        /// <summary>
-        /// Destination is placed, where it falls outside of the source.
-        /// </summary>
-        DestinationOut,
-        /// <summary>
-        /// Source which overlaps the destination, replaces the destination.
-        /// </summary>
-        SourceAtop,
-        /// <summary>
-        /// Destination which overlaps the source replaces the source.
-        /// </summary>
-        DestinationAtop,
-        /// <summary>
-        /// The non-overlapping regions of source and destination are combined.
-        /// </summary>
-        Xor,
-        /// <summary>
-        /// Display the sum of the source image and destination image.
-        /// </summary>
-        Plus,
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs b/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
deleted file mode 100644
index 5fa48a5ec8..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Avalonia.Visuals.Media.Imaging
-{
-    /// <summary>
-    /// Controls the performance and quality of bitmap scaling.
-    /// </summary>
-    public enum BitmapInterpolationMode
-    {
-        /// <summary>
-        /// Uses the default behavior of the underling render backend.
-        /// </summary>
-        Default,
-
-        /// <summary>
-        /// The best performance but worst image quality.
-        /// </summary>
-        LowQuality,
-
-        /// <summary>
-        /// Good performance and decent image quality.
-        /// </summary>
-        MediumQuality,      
-
-        /// <summary>
-        /// Highest quality but worst performance.
-        /// </summary>
-        HighQuality
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs
deleted file mode 100644
index be1f6db561..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Crops a Bitmap.
-    /// </summary>
-    public class CroppedBitmap : AvaloniaObject, IImage, IAffectsRender, IDisposable
-    {
-        /// <summary>
-        /// Defines the <see cref="Source"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IImage?> SourceProperty =
-            AvaloniaProperty.Register<CroppedBitmap, IImage?>(nameof(Source));
-
-        /// <summary>
-        /// Defines the <see cref="SourceRect"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PixelRect> SourceRectProperty =
-            AvaloniaProperty.Register<CroppedBitmap, PixelRect>(nameof(SourceRect));
-
-        public event EventHandler? Invalidated;
-
-        static CroppedBitmap()
-        {
-            SourceRectProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceRectChanged(e));
-            SourceProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceChanged(e));
-        }
-
-        /// <summary>
-        /// Gets or sets the source for the bitmap.
-        /// </summary>
-        public IImage? Source
-        {
-            get => GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the rectangular area that the bitmap is cropped to.
-        /// </summary>
-        public PixelRect SourceRect
-        {
-            get => GetValue(SourceRectProperty);
-            set => SetValue(SourceRectProperty, value);
-        }
-
-        public CroppedBitmap()
-        {
-            Source = null;
-            SourceRect = default;
-        }
-
-        public CroppedBitmap(IImage source, PixelRect sourceRect)
-        {
-            Source = source;
-            SourceRect = sourceRect;
-        }
-
-        private void SourceChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.NewValue == null)
-                return;
-            if (!(e.NewValue is IBitmap))
-                throw new ArgumentException("Only IBitmap supported as source");
-            Invalidated?.Invoke(this, e);
-        }
-
-        private void SourceRectChanged(AvaloniaPropertyChangedEventArgs e) => Invalidated?.Invoke(this, e);
-
-        public virtual void Dispose()
-        {
-            (Source as IBitmap)?.Dispose();
-        }
-
-        public Size Size {
-            get
-            {
-                if (Source is not IBitmap bmp)
-                    return Size.Empty;
-                if (SourceRect.IsEmpty)
-                    return Source.Size;
-                return SourceRect.Size.ToSizeWithDpi(bmp.Dpi);
-            }
-        }
-
-        public void Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            if (Source is not IBitmap bmp)
-                return;
-            var topLeft = SourceRect.TopLeft.ToPointWithDpi(bmp.Dpi);
-            Source.Draw(context, sourceRect.Translate(new Vector(topLeft.X, topLeft.Y)), destRect, bitmapInterpolationMode);           
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
deleted file mode 100644
index 134bebc002..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.IO;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Represents a bitmap image.
-    /// </summary>
-    public interface IBitmap : IImage, IDisposable
-    {
-        /// <summary>
-        /// Gets the dots per inch (DPI) of the image.
-        /// </summary>
-        /// <remarks>
-        /// Note that Skia does not currently support reading the DPI of an image so this value
-        /// will always be 96dpi on Skia.
-        /// </remarks>
-        Vector Dpi { get; }
-
-        /// <summary>
-        /// Gets the size of the bitmap, in device pixels.
-        /// </summary>
-        PixelSize PixelSize { get; }
-
-        /// <summary>
-        /// Gets the platform-specific bitmap implementation.
-        /// </summary>
-        IRef<IBitmapImpl> PlatformImpl { get; }
-
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        void Save(string fileName);
-
-        /// <summary>
-        /// Saves the bitmap to a stream in png format.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        void Save(Stream stream);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
deleted file mode 100644
index 40a24db338..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Holds a writeable bitmap image.
-    /// </summary>
-    public class WriteableBitmap : Bitmap
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="format">The pixel format (optional).</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        [Obsolete("Use overload taking an AlphaFormat.")]
-        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null)
-            : base(CreatePlatformImpl(size, dpi, format, null))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="format">The pixel format (optional).</param>
-        /// <param name="alphaFormat">The alpha format (optional).</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat) 
-            : base(CreatePlatformImpl(size, dpi, format, alphaFormat))
-        {
-        }
-
-        private WriteableBitmap(IWriteableBitmapImpl impl) : base(impl)
-        {
-            
-        }
-
-        public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
-
-        public static WriteableBitmap Decode(Stream stream)
-        {
-            var ri = GetFactory();
-
-            return new WriteableBitmap(ri.LoadWriteableBitmap(stream));
-        }
-        
-        /// <summary>
-        /// Loads a WriteableBitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
-        public new static WriteableBitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            var ri = GetFactory();
-
-            return new WriteableBitmap(ri.LoadWriteableBitmapToWidth(stream, width, interpolationMode));
-        }
-
-        /// <summary>
-        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
-        public new static WriteableBitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            var ri = GetFactory();
-
-            return new WriteableBitmap(ri.LoadWriteableBitmapToHeight(stream, height, interpolationMode));
-        }
-
-        private static IBitmapImpl CreatePlatformImpl(PixelSize size, in Vector dpi, PixelFormat? format, AlphaFormat? alphaFormat)
-        {
-            var ri = GetFactory();
-
-            PixelFormat finalFormat = format ?? ri.DefaultPixelFormat;
-            AlphaFormat finalAlphaFormat = alphaFormat ?? ri.DefaultAlphaFormat;
-
-            return ri.CreateWriteableBitmap(size, dpi, finalFormat, finalAlphaFormat);
-        }
-
-        private static IPlatformRenderInterface GetFactory()
-        {
-            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs
deleted file mode 100644
index d3c80dfcad..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a sweep gradient.
-    /// </summary>
-    public class ImmutableConicGradientBrush : ImmutableGradientBrush, IConicGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        /// <param name="center">The center point for the gradient.</param>
-        /// <param name="angle">The starting angle for the gradient.</param>
-        public ImmutableConicGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity = 1,
-            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
-            RelativePoint? center = null,
-            double angle = 0)
-            : base(gradientStops, opacity, spreadMethod)
-        {
-            Center = center ?? RelativePoint.Center;
-            Angle = angle;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableConicGradientBrush(ConicGradientBrush source)
-            : base(source)
-        {
-            Center = source.Center;
-            Angle = source.Angle;
-        }
-
-        /// <inheritdoc/>
-        public RelativePoint Center { get; }
-
-        /// <inheritdoc/>
-        public double Angle { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
deleted file mode 100644
index 1f6e3bbcfd..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a gradient.
-    /// </summary>
-    public abstract class ImmutableGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        protected ImmutableGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity,
-            GradientSpreadMethod spreadMethod)
-        {
-            GradientStops = gradientStops;
-            Opacity = opacity;
-            SpreadMethod = spreadMethod;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        protected ImmutableGradientBrush(GradientBrush source)
-            : this(source.GradientStops.ToImmutable(), source.Opacity, source.SpreadMethod)
-        {
-
-        }
-
-        /// <inheritdoc/>
-        public IReadOnlyList<IGradientStop> GradientStops { get; }
-
-        /// <inheritdoc/>
-        public double Opacity { get; }
-
-        /// <inheritdoc/>
-        public GradientSpreadMethod SpreadMethod { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs
deleted file mode 100644
index 15da8f8b43..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Avalonia.Media.Imaging;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IBitmap"/>.
-    /// </summary>
-    internal class ImmutableImageBrush : ImmutableTileBrush, IImageBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
-        /// </summary>
-        /// <param name="source">The image to draw.</param>
-        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
-        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
-        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
-        /// <param name="stretch">
-        /// How the source rectangle will be stretched to fill the destination rect.
-        /// </param>
-        /// <param name="tileMode">The tile mode.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        public ImmutableImageBrush(
-            IBitmap source,
-            AlignmentX alignmentX = AlignmentX.Center,
-            AlignmentY alignmentY = AlignmentY.Center,
-            RelativeRect? destinationRect = null,
-            double opacity = 1,
-            RelativeRect? sourceRect = null,
-            Stretch stretch = Stretch.Uniform,
-            TileMode tileMode = TileMode.None,
-            BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
-            : base(
-                  alignmentX,
-                  alignmentY,
-                  destinationRect ?? RelativeRect.Fill,
-                  opacity,
-                  sourceRect ?? RelativeRect.Fill,
-                  stretch,
-                  tileMode,
-                  bitmapInterpolationMode)
-        {
-            Source = source;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableImageBrush(IImageBrush source)
-            : base(source)
-        {
-            Source = source.Source;
-        }
-
-        /// <inheritdoc/>
-        public IBitmap Source { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
deleted file mode 100644
index 912d77d763..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a linear gradient.
-    /// </summary>
-    public class ImmutableLinearGradientBrush : ImmutableGradientBrush, ILinearGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        /// <param name="startPoint">The start point for the gradient.</param>
-        /// <param name="endPoint">The end point for the gradient.</param>
-        public ImmutableLinearGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity = 1,
-            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
-            RelativePoint? startPoint = null,
-            RelativePoint? endPoint = null)
-            : base(gradientStops, opacity, spreadMethod)
-        {
-            StartPoint = startPoint ?? RelativePoint.TopLeft;
-            EndPoint = endPoint ?? RelativePoint.BottomRight;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableLinearGradientBrush(LinearGradientBrush source)
-            : base(source)
-        {
-            StartPoint = source.StartPoint;
-            EndPoint = source.EndPoint;
-        }
-
-        /// <inheritdoc/>
-        public RelativePoint StartPoint { get; }
-
-        /// <inheritdoc/>
-        public RelativePoint EndPoint { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
deleted file mode 100644
index e26fbab5f5..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a radial gradient.
-    /// </summary>
-    public class ImmutableRadialGradientBrush : ImmutableGradientBrush, IRadialGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        /// <param name="center">The start point for the gradient.</param>
-        /// <param name="gradientOrigin">
-        /// The location of the two-dimensional focal point that defines the beginning of the gradient.
-        /// </param>
-        /// <param name="radius">
-        /// The horizontal and vertical radius of the outermost circle of the radial gradient.
-        /// </param>
-        public ImmutableRadialGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity = 1,
-            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
-            RelativePoint? center = null,
-            RelativePoint? gradientOrigin = null,
-            double radius = 0.5)
-            : base(gradientStops, opacity, spreadMethod)
-        {
-            Center = center ?? RelativePoint.Center;
-            GradientOrigin = gradientOrigin ?? RelativePoint.Center;
-            Radius = radius;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableRadialGradientBrush(RadialGradientBrush source)
-            : base(source)
-        {
-            Center = source.Center;
-            GradientOrigin = source.GradientOrigin;
-            Radius = source.Radius;
-        }
-
-        /// <inheritdoc/>
-        public RelativePoint Center { get; }
-
-        /// <inheritdoc/>
-        public RelativePoint GradientOrigin { get; }
-
-        /// <inheritdoc/>
-        public double Radius { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
deleted file mode 100644
index 46e1df4054..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// Fills an area with a solid color.
-    /// </summary>
-    public class ImmutableSolidColorBrush : ISolidColorBrush, IEquatable<ImmutableSolidColorBrush>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
-        /// </summary>
-        /// <param name="color">The color to use.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        public ImmutableSolidColorBrush(Color color, double opacity = 1)
-        {
-            Color = color;
-            Opacity = opacity;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
-        /// </summary>
-        /// <param name="color">The color to use.</param>
-        public ImmutableSolidColorBrush(uint color)
-            : this(Color.FromUInt32(color))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableSolidColorBrush(ISolidColorBrush source)
-            : this(source.Color, source.Opacity)
-        {
-        }
-
-        /// <summary>
-        /// Gets the color of the brush.
-        /// </summary>
-        public Color Color { get; }
-
-        /// <summary>
-        /// Gets the opacity of the brush.
-        /// </summary>
-        public double Opacity { get; }
-
-        public bool Equals(ImmutableSolidColorBrush? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-            return Color.Equals(other.Color) && Opacity.Equals(other.Opacity);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ImmutableSolidColorBrush other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (Color.GetHashCode() * 397) ^ Opacity.GetHashCode();
-            }
-        }
-
-        public static bool operator ==(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
-        {
-            return !Equals(left, right);
-        }
-
-        /// <summary>
-        /// Returns a string representation of the brush.
-        /// </summary>
-        /// <returns>A string representation of the brush.</returns>
-        public override string ToString()
-        {
-            return Color.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
deleted file mode 100644
index fd4d921516..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush which displays a repeating image.
-    /// </summary>
-    public abstract class ImmutableTileBrush : ITileBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
-        /// </summary>
-        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
-        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
-        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
-        /// <param name="stretch">
-        /// How the source rectangle will be stretched to fill the destination rect.
-        /// </param>
-        /// <param name="tileMode">The tile mode.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        protected ImmutableTileBrush(
-            AlignmentX alignmentX,
-            AlignmentY alignmentY,
-            RelativeRect destinationRect,
-            double opacity,
-            RelativeRect sourceRect,
-            Stretch stretch,
-            TileMode tileMode,
-            BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            AlignmentX = alignmentX;
-            AlignmentY = alignmentY;
-            DestinationRect = destinationRect;
-            Opacity = opacity;
-            SourceRect = sourceRect;
-            Stretch = stretch;
-            TileMode = tileMode;
-            BitmapInterpolationMode = bitmapInterpolationMode;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        protected ImmutableTileBrush(ITileBrush source)
-            : this(
-                  source.AlignmentX,
-                  source.AlignmentY,
-                  source.DestinationRect,
-                  source.Opacity,
-                  source.SourceRect,
-                  source.Stretch,
-                  source.TileMode,
-                  source.BitmapInterpolationMode)
-        {
-        }
-
-        /// <inheritdoc/>
-        public AlignmentX AlignmentX { get; }
-
-        /// <inheritdoc/>
-        public AlignmentY AlignmentY { get; }
-
-        /// <inheritdoc/>
-        public RelativeRect DestinationRect { get; }
-
-        /// <inheritdoc/>
-        public double Opacity { get; }
-
-        /// <inheritdoc/>
-        public RelativeRect SourceRect { get; }
-
-        /// <inheritdoc/>
-        public Stretch Stretch { get; }
-
-        /// <inheritdoc/>
-        public TileMode TileMode { get; }
-
-        /// <inheritdoc/>
-        public BitmapInterpolationMode BitmapInterpolationMode { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
deleted file mode 100644
index 4c6aae08ab..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IVisual"/>.
-    /// </summary>
-    internal class ImmutableVisualBrush : ImmutableTileBrush, IVisualBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
-        /// </summary>
-        /// <param name="visual">The visual to draw.</param>
-        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
-        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
-        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
-        /// <param name="stretch">
-        /// How the source rectangle will be stretched to fill the destination rect.
-        /// </param>
-        /// <param name="tileMode">The tile mode.</param>
-        /// <param name="bitmapInterpolationMode">Controls the quality of interpolation.</param>
-        public ImmutableVisualBrush(
-            IVisual visual,
-            AlignmentX alignmentX = AlignmentX.Center,
-            AlignmentY alignmentY = AlignmentY.Center,
-            RelativeRect? destinationRect = null,
-            double opacity = 1,
-            RelativeRect? sourceRect = null,
-            Stretch stretch = Stretch.Uniform,
-            TileMode tileMode = TileMode.None,
-            BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
-            : base(
-                  alignmentX,
-                  alignmentY,
-                  destinationRect ?? RelativeRect.Fill,
-                  opacity,
-                  sourceRect ?? RelativeRect.Fill,
-                  stretch,
-                  tileMode,
-                  bitmapInterpolationMode)
-        {
-            Visual = visual;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableVisualBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableVisualBrush(IVisualBrush source)
-            : base(source)
-        {
-            Visual = source.Visual;
-        }
-
-        /// <inheritdoc/>
-        public IVisual Visual { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/KnownColors.cs b/src/Avalonia.Visuals/Media/KnownColors.cs
deleted file mode 100644
index 8f07b5f8ac..0000000000
--- a/src/Avalonia.Visuals/Media/KnownColors.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-
-namespace Avalonia.Media
-{
-    internal static class KnownColors
-    {
-        private static readonly IReadOnlyDictionary<string, KnownColor> _knownColorNames;
-        private static readonly IReadOnlyDictionary<uint, string> _knownColors;
-#if !BUILDTASK
-        private static readonly Dictionary<KnownColor, ISolidColorBrush> _knownBrushes;
-#endif
-
-        static KnownColors()
-        {
-            var knownColorNames = new Dictionary<string, KnownColor>(StringComparer.OrdinalIgnoreCase);
-            var knownColors = new Dictionary<uint, string>();
-
-            foreach (var field in typeof(KnownColor).GetRuntimeFields())
-            {
-                if (field.FieldType != typeof(KnownColor)) continue;
-                var knownColor = (KnownColor)field.GetValue(null)!;
-                if (knownColor == KnownColor.None) continue;
-
-                knownColorNames.Add(field.Name, knownColor);
-
-                // some known colors have the same value, so use the first
-                if (!knownColors.ContainsKey((uint)knownColor))
-                {
-                    knownColors.Add((uint)knownColor, field.Name);
-                }
-            }
-
-            _knownColorNames = knownColorNames;
-            _knownColors = knownColors;
-            
-#if !BUILDTASK
-            _knownBrushes = new Dictionary<KnownColor, ISolidColorBrush>();
-#endif
-        }
-
-#if !BUILDTASK
-        public static ISolidColorBrush? GetKnownBrush(string s)
-        {
-            var color = GetKnownColor(s);
-            return color != KnownColor.None ? color.ToBrush() : null;
-        }
-#endif
-
-        public static KnownColor GetKnownColor(string s)
-        {
-            if (_knownColorNames.TryGetValue(s, out var color))
-            {
-                return color;
-            }
-
-            return KnownColor.None;
-        }
-
-        public static string? GetKnownColorName(uint rgb)
-        {
-            return _knownColors.TryGetValue(rgb, out var name) ? name : null;
-        }
-
-        public static Color ToColor(this KnownColor color)
-        {
-            return Color.FromUInt32((uint)color);
-        }
-
-#if !BUILDTASK
-        public static ISolidColorBrush ToBrush(this KnownColor color)
-        {
-            lock (_knownBrushes)
-            {
-                if (!_knownBrushes.TryGetValue(color, out var brush))
-                {
-                    brush = new Immutable.ImmutableSolidColorBrush(color.ToColor());
-                    _knownBrushes.Add(color, brush);
-                }
-
-                return brush;
-            }
-        }
-#endif
-    }
-
-    internal enum KnownColor : uint
-    {
-        None,
-        AliceBlue = 0xfff0f8ff,
-        AntiqueWhite = 0xfffaebd7,
-        Aqua = 0xff00ffff,
-        Aquamarine = 0xff7fffd4,
-        Azure = 0xfff0ffff,
-        Beige = 0xfff5f5dc,
-        Bisque = 0xffffe4c4,
-        Black = 0xff000000,
-        BlanchedAlmond = 0xffffebcd,
-        Blue = 0xff0000ff,
-        BlueViolet = 0xff8a2be2,
-        Brown = 0xffa52a2a,
-        BurlyWood = 0xffdeb887,
-        CadetBlue = 0xff5f9ea0,
-        Chartreuse = 0xff7fff00,
-        Chocolate = 0xffd2691e,
-        Coral = 0xffff7f50,
-        CornflowerBlue = 0xff6495ed,
-        Cornsilk = 0xfffff8dc,
-        Crimson = 0xffdc143c,
-        Cyan = 0xff00ffff,
-        DarkBlue = 0xff00008b,
-        DarkCyan = 0xff008b8b,
-        DarkGoldenrod = 0xffb8860b,
-        DarkGray = 0xffa9a9a9,
-        DarkGreen = 0xff006400,
-        DarkKhaki = 0xffbdb76b,
-        DarkMagenta = 0xff8b008b,
-        DarkOliveGreen = 0xff556b2f,
-        DarkOrange = 0xffff8c00,
-        DarkOrchid = 0xff9932cc,
-        DarkRed = 0xff8b0000,
-        DarkSalmon = 0xffe9967a,
-        DarkSeaGreen = 0xff8fbc8f,
-        DarkSlateBlue = 0xff483d8b,
-        DarkSlateGray = 0xff2f4f4f,
-        DarkTurquoise = 0xff00ced1,
-        DarkViolet = 0xff9400d3,
-        DeepPink = 0xffff1493,
-        DeepSkyBlue = 0xff00bfff,
-        DimGray = 0xff696969,
-        DodgerBlue = 0xff1e90ff,
-        Firebrick = 0xffb22222,
-        FloralWhite = 0xfffffaf0,
-        ForestGreen = 0xff228b22,
-        Fuchsia = 0xffff00ff,
-        Gainsboro = 0xffdcdcdc,
-        GhostWhite = 0xfff8f8ff,
-        Gold = 0xffffd700,
-        Goldenrod = 0xffdaa520,
-        Gray = 0xff808080,
-        Green = 0xff008000,
-        GreenYellow = 0xffadff2f,
-        Honeydew = 0xfff0fff0,
-        HotPink = 0xffff69b4,
-        IndianRed = 0xffcd5c5c,
-        Indigo = 0xff4b0082,
-        Ivory = 0xfffffff0,
-        Khaki = 0xfff0e68c,
-        Lavender = 0xffe6e6fa,
-        LavenderBlush = 0xfffff0f5,
-        LawnGreen = 0xff7cfc00,
-        LemonChiffon = 0xfffffacd,
-        LightBlue = 0xffadd8e6,
-        LightCoral = 0xfff08080,
-        LightCyan = 0xffe0ffff,
-        LightGoldenrodYellow = 0xfffafad2,
-        LightGreen = 0xff90ee90,
-        LightGray = 0xffd3d3d3,
-        LightPink = 0xffffb6c1,
-        LightSalmon = 0xffffa07a,
-        LightSeaGreen = 0xff20b2aa,
-        LightSkyBlue = 0xff87cefa,
-        LightSlateGray = 0xff778899,
-        LightSteelBlue = 0xffb0c4de,
-        LightYellow = 0xffffffe0,
-        Lime = 0xff00ff00,
-        LimeGreen = 0xff32cd32,
-        Linen = 0xfffaf0e6,
-        Magenta = 0xffff00ff,
-        Maroon = 0xff800000,
-        MediumAquamarine = 0xff66cdaa,
-        MediumBlue = 0xff0000cd,
-        MediumOrchid = 0xffba55d3,
-        MediumPurple = 0xff9370db,
-        MediumSeaGreen = 0xff3cb371,
-        MediumSlateBlue = 0xff7b68ee,
-        MediumSpringGreen = 0xff00fa9a,
-        MediumTurquoise = 0xff48d1cc,
-        MediumVioletRed = 0xffc71585,
-        MidnightBlue = 0xff191970,
-        MintCream = 0xfff5fffa,
-        MistyRose = 0xffffe4e1,
-        Moccasin = 0xffffe4b5,
-        NavajoWhite = 0xffffdead,
-        Navy = 0xff000080,
-        OldLace = 0xfffdf5e6,
-        Olive = 0xff808000,
-        OliveDrab = 0xff6b8e23,
-        Orange = 0xffffa500,
-        OrangeRed = 0xffff4500,
-        Orchid = 0xffda70d6,
-        PaleGoldenrod = 0xffeee8aa,
-        PaleGreen = 0xff98fb98,
-        PaleTurquoise = 0xffafeeee,
-        PaleVioletRed = 0xffdb7093,
-        PapayaWhip = 0xffffefd5,
-        PeachPuff = 0xffffdab9,
-        Peru = 0xffcd853f,
-        Pink = 0xffffc0cb,
-        Plum = 0xffdda0dd,
-        PowderBlue = 0xffb0e0e6,
-        Purple = 0xff800080,
-        Red = 0xffff0000,
-        RosyBrown = 0xffbc8f8f,
-        RoyalBlue = 0xff4169e1,
-        SaddleBrown = 0xff8b4513,
-        Salmon = 0xfffa8072,
-        SandyBrown = 0xfff4a460,
-        SeaGreen = 0xff2e8b57,
-        SeaShell = 0xfffff5ee,
-        Sienna = 0xffa0522d,
-        Silver = 0xffc0c0c0,
-        SkyBlue = 0xff87ceeb,
-        SlateBlue = 0xff6a5acd,
-        SlateGray = 0xff708090,
-        Snow = 0xfffffafa,
-        SpringGreen = 0xff00ff7f,
-        SteelBlue = 0xff4682b4,
-        Tan = 0xffd2b48c,
-        Teal = 0xff008080,
-        Thistle = 0xffd8bfd8,
-        Tomato = 0xffff6347,
-        Transparent = 0x00ffffff,
-        Turquoise = 0xff40e0d0,
-        Violet = 0xffee82ee,
-        Wheat = 0xfff5deb3,
-        White = 0xffffffff,
-        WhiteSmoke = 0xfff5f5f5,
-        Yellow = 0xffffff00,
-        YellowGreen = 0xff9acd32
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
deleted file mode 100644
index 30c5206125..0000000000
--- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs
+++ /dev/null
@@ -1,606 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.IO;
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Parses a path markup string.
-    /// </summary>
-    public class PathMarkupParser : IDisposable
-    {
-        private static readonly Dictionary<char, Command> s_commands =
-            new Dictionary<char, Command>
-                {
-                    { 'F', Command.FillRule },
-                    { 'M', Command.Move },
-                    { 'L', Command.Line },
-                    { 'H', Command.HorizontalLine },
-                    { 'V', Command.VerticalLine },
-                    { 'Q', Command.QuadraticBezierCurve },
-                    { 'T', Command.SmoothQuadraticBezierCurve },
-                    { 'C', Command.CubicBezierCurve },
-                    { 'S', Command.SmoothCubicBezierCurve },
-                    { 'A', Command.Arc },
-                    { 'Z', Command.Close },
-                };
-
-        private IGeometryContext? _geometryContext;
-        private Point _currentPoint;
-        private Point? _beginFigurePoint;
-        private Point? _previousControlPoint;
-        private bool _isOpen;
-        private bool _isDisposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PathMarkupParser"/> class.
-        /// </summary>
-        /// <param name="geometryContext">The geometry context.</param>
-        /// <exception cref="ArgumentNullException">geometryContext</exception>
-        public PathMarkupParser(IGeometryContext geometryContext)
-        {
-            if (geometryContext == null)
-            {
-                throw new ArgumentNullException(nameof(geometryContext));
-            }
-
-            _geometryContext = geometryContext;
-        }
-
-        private enum Command
-        {
-            None,
-            FillRule,
-            Move,
-            Line,
-            HorizontalLine,
-            VerticalLine,
-            CubicBezierCurve,
-            QuadraticBezierCurve,
-            SmoothCubicBezierCurve,
-            SmoothQuadraticBezierCurve,
-            Arc,
-            Close
-        }
-
-        void IDisposable.Dispose()
-        {
-            Dispose(true);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_isDisposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                _geometryContext = null;
-            }
-
-            _isDisposed = true;
-        }
-
-        private static Point MirrorControlPoint(Point controlPoint, Point center)
-        {
-            var dir = controlPoint - center;
-
-            return center + -dir;
-        }
-
-        /// <summary>
-        /// Parses the specified path data and writes the result to the geometryContext of this instance.
-        /// </summary>
-        /// <param name="pathData">The path data.</param>
-        public void Parse(string pathData)
-        {
-            ThrowIfDisposed();
-
-            var span = pathData.AsSpan();
-            _currentPoint = new Point();
-
-            while(!span.IsEmpty)
-            {
-                if(!ReadCommand(ref span, out var command, out var relative))
-                {
-                    break;
-                }
-
-                bool initialCommand = true;
-                
-                do
-                {
-                    if (!initialCommand)
-                    {
-                        span = ReadSeparator(span);
-                    }
-
-                    switch (command)
-                    {
-                        case Command.None:
-                            break;
-                        case Command.FillRule:
-                            SetFillRule(ref span);
-                            break;
-                        case Command.Move:
-                            AddMove(ref span, relative);
-                            break;
-                        case Command.Line:
-                            AddLine(ref span, relative);
-                            break;
-                        case Command.HorizontalLine:
-                            AddHorizontalLine(ref span, relative);
-                            break;
-                        case Command.VerticalLine:
-                            AddVerticalLine(ref span, relative);
-                            break;
-                        case Command.CubicBezierCurve:
-                            AddCubicBezierCurve(ref span, relative);
-                            break;
-                        case Command.QuadraticBezierCurve:
-                            AddQuadraticBezierCurve(ref span, relative);
-                            break;
-                        case Command.SmoothCubicBezierCurve:
-                            AddSmoothCubicBezierCurve(ref span, relative);
-                            break;
-                        case Command.SmoothQuadraticBezierCurve:
-                            AddSmoothQuadraticBezierCurve(ref span, relative);
-                            break;
-                        case Command.Arc:
-                            AddArc(ref span, relative);
-                            break;
-                        case Command.Close:
-                            CloseFigure();
-                            break;
-                        default:
-                            throw new NotSupportedException("Unsupported command");
-                    }
-
-                    initialCommand = false;
-                } while (PeekArgument(span));
-                
-            }
-
-            if (_isOpen)
-            {
-                _geometryContext.EndFigure(false);
-            }
-        }
-
-        private void CreateFigure()
-        {
-            ThrowIfDisposed();
-
-            if (_isOpen)
-            {
-                _geometryContext.EndFigure(false);
-            }
-
-            _geometryContext.BeginFigure(_currentPoint);
-
-            _beginFigurePoint = _currentPoint;
-
-            _isOpen = true;
-        }
-
-        private void SetFillRule(ref ReadOnlySpan<char> span)
-        {
-            ThrowIfDisposed();
-
-            if (!ReadArgument(ref span, out var fillRule) || fillRule.Length != 1)
-            {
-                throw new InvalidDataException("Invalid fill rule.");
-            }
-
-            FillRule rule;
-
-            switch (fillRule[0])
-            {
-                case '0':
-                    rule = FillRule.EvenOdd;
-                    break;
-                case '1':
-                    rule = FillRule.NonZero;
-                    break;
-                default:
-                    throw new InvalidDataException("Invalid fill rule");
-            }
-
-            _geometryContext.SetFillRule(rule);
-        }
-
-        private void CloseFigure()
-        {
-            ThrowIfDisposed();
-
-            if (_isOpen)
-            {
-                _geometryContext.EndFigure(true);
-
-                if (_beginFigurePoint != null)
-                {
-                    _currentPoint = _beginFigurePoint.Value;
-                    _beginFigurePoint = null;
-                }
-            }
-
-            _previousControlPoint = null;
-
-            _isOpen = false;
-        }
-
-        private void AddMove(ref ReadOnlySpan<char> span, bool relative)
-        {
-            var currentPoint = relative
-                                ? ReadRelativePoint(ref span, _currentPoint)
-                                : ReadPoint(ref span);
-
-            _currentPoint = currentPoint;
-
-            CreateFigure();
-
-            while (PeekArgument(span))
-            {
-                span = ReadSeparator(span);
-                AddLine(ref span, relative);
-            }
-        }
-
-        private void AddLine(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            _currentPoint = relative
-                                ? ReadRelativePoint(ref span, _currentPoint)
-                                : ReadPoint(ref span);
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.LineTo(_currentPoint);
-        }
-
-        private void AddHorizontalLine(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            _currentPoint = relative
-                                ? new Point(_currentPoint.X + ReadDouble(ref span), _currentPoint.Y)
-                                : _currentPoint.WithX(ReadDouble(ref span));
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.LineTo(_currentPoint);
-        }
-
-        private void AddVerticalLine(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            _currentPoint = relative
-                                ? new Point(_currentPoint.X, _currentPoint.Y + ReadDouble(ref span))
-                                : _currentPoint.WithY(ReadDouble(ref span));
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.LineTo(_currentPoint);
-        }
-
-        private void AddCubicBezierCurve(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            var point1 = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            span = ReadSeparator(span);
-
-            var point2 = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            _previousControlPoint = point2;
-
-            span = ReadSeparator(span);
-
-            var point3 = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.CubicBezierTo(point1, point2, point3);
-
-            _currentPoint = point3;
-        }
-
-        private void AddQuadraticBezierCurve(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            var start = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            _previousControlPoint = start;
-
-            span = ReadSeparator(span);
-
-            var end = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.QuadraticBezierTo(start, end);
-
-            _currentPoint = end;
-        }
-
-        private void AddSmoothCubicBezierCurve(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            var point2 = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            span = ReadSeparator(span);
-
-            var end = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            if (_previousControlPoint != null)
-            {
-                _previousControlPoint = MirrorControlPoint((Point)_previousControlPoint, _currentPoint);
-            }
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.CubicBezierTo(_previousControlPoint ?? _currentPoint, point2, end);
-
-            _previousControlPoint = point2;
-
-            _currentPoint = end;
-        }
-
-        private void AddSmoothQuadraticBezierCurve(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            var end = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            if (_previousControlPoint != null)
-            {
-                _previousControlPoint = MirrorControlPoint((Point)_previousControlPoint, _currentPoint);
-            }
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.QuadraticBezierTo(_previousControlPoint ?? _currentPoint, end);
-
-            _currentPoint = end;
-        }
-
-        private void AddArc(ref ReadOnlySpan<char> span, bool relative)
-        {
-            ThrowIfDisposed();
-
-            var size = ReadSize(ref span);
-
-            span = ReadSeparator(span);
-
-            var rotationAngle = ReadDouble(ref span);
-            span = ReadSeparator(span);
-            var isLargeArc = ReadBool(ref span);
-
-            span = ReadSeparator(span);
-
-            var sweepDirection = ReadBool(ref span) ? SweepDirection.Clockwise : SweepDirection.CounterClockwise;
-            
-            span = ReadSeparator(span);
-
-            var end = relative
-                    ? ReadRelativePoint(ref span, _currentPoint)
-                    : ReadPoint(ref span);
-
-            if (!_isOpen)
-            {
-                CreateFigure();
-            }
-
-            _geometryContext.ArcTo(end, size, rotationAngle, isLargeArc, sweepDirection);
-
-            _currentPoint = end;
-
-            _previousControlPoint = null;
-        }
-
-        private static bool PeekArgument(ReadOnlySpan<char> span)
-        {
-            span = SkipWhitespace(span);
-
-            return !span.IsEmpty && (span[0] == ',' || span[0] == '-' || span[0] == '.' || char.IsDigit(span[0]));
-        }
-
-        private static bool ReadArgument(ref ReadOnlySpan<char> remaining, out ReadOnlySpan<char> argument)
-        {
-            remaining = SkipWhitespace(remaining);
-            if (remaining.IsEmpty)
-            {
-                argument = ReadOnlySpan<char>.Empty;
-                return false;
-            }
-
-            var valid = false;
-            int i = 0;
-            if (remaining[i] == '-')
-            {
-                i++;
-            }
-            for (; i < remaining.Length && char.IsNumber(remaining[i]); i++) valid = true;
-
-            if (i < remaining.Length && remaining[i] == '.')
-            {
-                valid = false;
-                i++;
-            }
-            for (; i < remaining.Length && char.IsNumber(remaining[i]); i++) valid = true;
-
-            if (i < remaining.Length)
-            {
-                // scientific notation
-                if (remaining[i] == 'E' || remaining[i] == 'e')
-                {
-                    valid = false;
-                    i++;
-                    if (remaining[i] == '-' || remaining[i] == '+')
-                    {
-                        i++;
-                        for (; i < remaining.Length && char.IsNumber(remaining[i]); i++) valid = true;
-                    }                  
-                }               
-            }          
-
-            if (!valid)
-            {
-                argument = ReadOnlySpan<char>.Empty;
-                return false;
-            }
-            argument = remaining.Slice(0, i);
-            remaining = remaining.Slice(i);
-            return true;
-        }
-
-
-        private static ReadOnlySpan<char> ReadSeparator(ReadOnlySpan<char> span)
-        {
-            span = SkipWhitespace(span);
-            if (!span.IsEmpty && span[0] == ',')
-            {
-                span = span.Slice(1);
-            }
-            return span;
-        }
-
-        private static ReadOnlySpan<char> SkipWhitespace(ReadOnlySpan<char> span)
-        {
-            int i = 0;
-            for (; i < span.Length && char.IsWhiteSpace(span[i]); i++) ;
-            return span.Slice(i);
-        }
-
-        private bool ReadBool(ref ReadOnlySpan<char> span)
-        {
-            span = SkipWhitespace(span);
-            
-            if (span.IsEmpty)
-            {
-                throw new InvalidDataException("Invalid bool rule.");
-            }
-            
-            var c = span[0];
-            
-            span = span.Slice(1);
-            
-            switch (c)
-            {
-                case '0':
-                    return false;
-                case '1':
-                    return true;
-                default:
-                    throw new InvalidDataException("Invalid bool rule");
-            }
-        }
-
-        private double ReadDouble(ref ReadOnlySpan<char> span)
-        {
-            if (!ReadArgument(ref span, out var doubleValue))
-            {
-                throw new InvalidDataException("Invalid double value");
-            }
-
-            return double.Parse(doubleValue.ToString(), CultureInfo.InvariantCulture);
-        }
-
-        private Size ReadSize(ref ReadOnlySpan<char> span)
-        {
-            var width = ReadDouble(ref span);
-            span = ReadSeparator(span);
-            var height = ReadDouble(ref span);
-            return new Size(width, height);
-        }
-
-        private Point ReadPoint(ref ReadOnlySpan<char> span)
-        {
-            var x = ReadDouble(ref span);
-            span = ReadSeparator(span);
-            var y = ReadDouble(ref span);
-            return new Point(x, y);
-        }
-
-        private Point ReadRelativePoint(ref ReadOnlySpan<char> span, Point origin)
-        {
-            var x = ReadDouble(ref span);
-            span = ReadSeparator(span);
-            var y = ReadDouble(ref span);
-            return new Point(origin.X + x, origin.Y + y);
-        }
-
-        private bool ReadCommand(ref ReadOnlySpan<char> span, out Command command, out bool relative)
-        {
-            span = SkipWhitespace(span);
-            if (span.IsEmpty)
-            {
-                command = default;
-                relative = false;
-                return false;
-            }
-            var c = span[0];
-            if (!s_commands.TryGetValue(char.ToUpperInvariant(c), out command))
-            {
-                throw new InvalidDataException("Unexpected path command '" + c + "'.");
-            }
-            relative = char.IsLower(c);
-            span = span.Slice(1);
-            return true;
-        }
-
-        [MemberNotNull(nameof(_geometryContext))]
-        private void ThrowIfDisposed()
-        {
-            if (_isDisposed || _geometryContext is null)
-                throw new ObjectDisposedException(nameof(PathMarkupParser));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs
deleted file mode 100644
index 65ba851100..0000000000
--- a/src/Avalonia.Visuals/Media/Pen.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-using Avalonia.Media.Immutable;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how a stroke is drawn.
-    /// </summary>
-    public sealed class Pen : AvaloniaObject, IPen, IWeakEventSubscriber<EventArgs>
-    {
-        /// <summary>
-        /// Defines the <see cref="Brush"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush?> BrushProperty =
-            AvaloniaProperty.Register<Pen, IBrush?>(nameof(Brush));
-
-        /// <summary>
-        /// Defines the <see cref="Thickness"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> ThicknessProperty =
-            AvaloniaProperty.Register<Pen, double>(nameof(Thickness), 1.0);
-
-        /// <summary>
-        /// Defines the <see cref="DashStyle"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IDashStyle?> DashStyleProperty =
-            AvaloniaProperty.Register<Pen, IDashStyle?>(nameof(DashStyle));
-
-        /// <summary>
-        /// Defines the <see cref="LineCap"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PenLineCap> LineCapProperty =
-            AvaloniaProperty.Register<Pen, PenLineCap>(nameof(LineCap));
-
-        /// <summary>
-        /// Defines the <see cref="LineJoin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PenLineJoin> LineJoinProperty =
-            AvaloniaProperty.Register<Pen, PenLineJoin>(nameof(LineJoin));
-
-        /// <summary>
-        /// Defines the <see cref="MiterLimit"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MiterLimitProperty =
-            AvaloniaProperty.Register<Pen, double>(nameof(MiterLimit), 10.0);
-
-        private EventHandler? _invalidated;
-        private IAffectsRender? _subscribedToBrush;
-        private IAffectsRender? _subscribedToDashes;
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
-        /// </summary>
-        public Pen()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
-        /// </summary>
-        /// <param name="color">The stroke color.</param>
-        /// <param name="thickness">The stroke thickness.</param>
-        /// <param name="dashStyle">The dash style.</param>
-        /// <param name="lineCap">Specifies the type of graphic shape to use on both ends of a line.</param>
-        /// <param name="lineJoin">The line join.</param>
-        /// <param name="miterLimit">The miter limit.</param>
-        public Pen(
-            uint color,
-            double thickness = 1.0,
-            IDashStyle? dashStyle = null,
-            PenLineCap lineCap = PenLineCap.Flat,
-            PenLineJoin lineJoin = PenLineJoin.Miter,
-            double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
-        /// </summary>
-        /// <param name="brush">The brush used to draw.</param>
-        /// <param name="thickness">The stroke thickness.</param>
-        /// <param name="dashStyle">The dash style.</param>
-        /// <param name="lineCap">The line cap.</param>
-        /// <param name="lineJoin">The line join.</param>
-        /// <param name="miterLimit">The miter limit.</param>
-        public Pen(
-            IBrush? brush,
-            double thickness = 1.0,
-            IDashStyle? dashStyle = null,
-            PenLineCap lineCap = PenLineCap.Flat,
-            PenLineJoin lineJoin = PenLineJoin.Miter,
-            double miterLimit = 10.0)
-        {
-            Brush = brush;
-            Thickness = thickness;
-            LineCap = lineCap;
-            LineJoin = lineJoin;
-            MiterLimit = miterLimit;
-            DashStyle = dashStyle;
-        }
-
-        /// <summary>
-        /// Gets or sets the brush used to draw the stroke.
-        /// </summary>
-        public IBrush? Brush
-        {
-            get => GetValue(BrushProperty);
-            set => SetValue(BrushProperty, value);
-        }
-
-        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
-            WeakEvent.Register<IAffectsRender>(
-                (s, h) => s.Invalidated += h,
-                (s, h) => s.Invalidated -= h);
-
-        /// <summary>
-        /// Gets or sets the stroke thickness.
-        /// </summary>
-        public double Thickness
-        {
-            get => GetValue(ThicknessProperty);
-            set => SetValue(ThicknessProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the style of dashed lines drawn with a <see cref="Pen"/> object.
-        /// </summary>
-        public IDashStyle? DashStyle
-        {
-            get => GetValue(DashStyleProperty);
-            set => SetValue(DashStyleProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the type of shape to use on both ends of a line.
-        /// </summary>
-        public PenLineCap LineCap
-        {
-            get => GetValue(LineCapProperty);
-            set => SetValue(LineCapProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the join style for the ends of two consecutive lines drawn with this
-        /// <see cref="Pen"/>.
-        /// </summary>
-        public PenLineJoin LineJoin
-        {
-            get => GetValue(LineJoinProperty);
-            set => SetValue(LineJoinProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the limit of the thickness of the join on a mitered corner.
-        /// </summary>
-        public double MiterLimit
-        {
-            get => GetValue(MiterLimitProperty);
-            set => SetValue(MiterLimitProperty, value);
-        }
-
-        /// <summary>
-        /// Raised when the pen changes.
-        /// </summary>
-        public event EventHandler? Invalidated
-        {
-            add
-            {
-                _invalidated += value;
-                UpdateSubscriptions();
-            }
-            remove
-            {
-                _invalidated -= value; 
-                UpdateSubscriptions();
-            }
-        }
-
-        /// <summary>
-        /// Creates an immutable clone of the brush.
-        /// </summary>
-        /// <returns>The immutable clone.</returns>
-        public ImmutablePen ToImmutable()
-        {
-            return new ImmutablePen(
-                Brush?.ToImmutable(),
-                Thickness,
-                DashStyle?.ToImmutable(),
-                LineCap,
-                LineJoin,
-                MiterLimit);
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            _invalidated?.Invoke(this, EventArgs.Empty);
-            if(change.Property == BrushProperty)
-                UpdateSubscription(ref _subscribedToBrush, Brush);
-            if(change.Property == DashStyleProperty)
-                UpdateSubscription(ref _subscribedToDashes, DashStyle);
-            base.OnPropertyChanged(change);
-        }
-
-        
-        void UpdateSubscription(ref IAffectsRender? field, object? value)
-        {
-            if ((_invalidated == null || field != value) && field != null)
-            {
-                InvalidatedWeakEvent.Unsubscribe(field, this);
-                field = null;
-            }
-
-            if (_invalidated != null && field != value && value is IAffectsRender affectsRender)
-            {
-                InvalidatedWeakEvent.Subscribe(affectsRender, this);
-                field = affectsRender;
-            }
-        }
-
-        void UpdateSubscriptions()
-        {
-            UpdateSubscription(ref _subscribedToBrush, Brush);
-            UpdateSubscription(ref _subscribedToDashes, DashStyle);
-        }
-        
-        void IWeakEventSubscriber<EventArgs>.OnEvent(object? sender, WeakEvent ev, EventArgs e)
-        {
-            if (ev == InvalidatedWeakEvent) 
-                _invalidated?.Invoke(this, EventArgs.Empty);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/PixelRect.cs b/src/Avalonia.Visuals/Media/PixelRect.cs
deleted file mode 100644
index 0059a4b483..0000000000
--- a/src/Avalonia.Visuals/Media/PixelRect.cs
+++ /dev/null
@@ -1,452 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Represents a rectangle in device pixels.
-    /// </summary>
-    public readonly struct PixelRect : IEquatable<PixelRect>
-    {
-        /// <summary>
-        /// An empty rectangle.
-        /// </summary>
-        public static readonly PixelRect Empty = default;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="x">The X position.</param>
-        /// <param name="y">The Y position.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public PixelRect(int x, int y, int width, int height)
-        {
-            X = x;
-            Y = y;
-            Width = width;
-            Height = height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="size">The size of the rectangle.</param>
-        public PixelRect(PixelSize size)
-        {
-            X = 0;
-            Y = 0;
-            Width = size.Width;
-            Height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="position">The position of the rectangle.</param>
-        /// <param name="size">The size of the rectangle.</param>
-        public PixelRect(PixelPoint position, PixelSize size)
-        {
-            X = position.X;
-            Y = position.Y;
-            Width = size.Width;
-            Height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="topLeft">The top left position of the rectangle.</param>
-        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
-        public PixelRect(PixelPoint topLeft, PixelPoint bottomRight)
-        {
-            X = topLeft.X;
-            Y = topLeft.Y;
-            Width = bottomRight.X - topLeft.X;
-            Height = bottomRight.Y - topLeft.Y;
-        }
-
-        /// <summary>
-        /// Gets the X position.
-        /// </summary>
-        public int X { get; }
-
-        /// <summary>
-        /// Gets the Y position.
-        /// </summary>
-        public int Y { get; }
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public int Width { get; }
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public int Height { get; }
-
-        /// <summary>
-        /// Gets the position of the rectangle.
-        /// </summary>
-        public PixelPoint Position => new PixelPoint(X, Y);
-
-        /// <summary>
-        /// Gets the size of the rectangle.
-        /// </summary>
-        public PixelSize Size => new PixelSize(Width, Height);
-
-        /// <summary>
-        /// Gets the right position of the rectangle.
-        /// </summary>
-        public int Right => X + Width;
-
-        /// <summary>
-        /// Gets the bottom position of the rectangle.
-        /// </summary>
-        public int Bottom => Y + Height;
-
-        /// <summary>
-        /// Gets the top left point of the rectangle.
-        /// </summary>
-        public PixelPoint TopLeft => new PixelPoint(X, Y);
-
-        /// <summary>
-        /// Gets the top right point of the rectangle.
-        /// </summary>
-        public PixelPoint TopRight => new PixelPoint(Right, Y);
-
-        /// <summary>
-        /// Gets the bottom left point of the rectangle.
-        /// </summary>
-        public PixelPoint BottomLeft => new PixelPoint(X, Bottom);
-
-        /// <summary>
-        /// Gets the bottom right point of the rectangle.
-        /// </summary>
-        public PixelPoint BottomRight => new PixelPoint(Right, Bottom);
-
-        /// <summary>
-        /// Gets the center point of the rectangle.
-        /// </summary>
-        public PixelPoint Center => new PixelPoint(X + (Width / 2), Y + (Height / 2));
-
-        /// <summary>
-        /// Gets a value that indicates whether the rectangle is empty.
-        /// </summary>
-        public bool IsEmpty => Width == 0 && Height == 0;
-
-        /// <summary>
-        /// Checks for equality between two <see cref="PixelRect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are equal; otherwise false.</returns>
-        public static bool operator ==(PixelRect left, PixelRect right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="PixelRect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are unequal; otherwise false.</returns>
-        public static bool operator !=(PixelRect left, PixelRect right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Determines whether a point in in the bounds of the rectangle.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
-        public bool Contains(PixelPoint p)
-        {
-            return p.X >= X && p.X <= Right && p.Y >= Y && p.Y <= Bottom;
-        }
-
-        /// <summary>
-        /// Determines whether the rectangle fully contains another rectangle.
-        /// </summary>
-        /// <param name="r">The rectangle.</param>
-        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
-        public bool Contains(PixelRect r)
-        {
-            return Contains(r.TopLeft) && Contains(r.BottomRight);
-        }
-
-        /// <summary>
-        /// Centers another rectangle in this rectangle.
-        /// </summary>
-        /// <param name="rect">The rectangle to center.</param>
-        /// <returns>The centered rectangle.</returns>
-        public PixelRect CenterRect(PixelRect rect)
-        {
-            return new PixelRect(
-                X + ((Width - rect.Width) / 2),
-                Y + ((Height - rect.Height) / 2),
-                rect.Width,
-                rect.Height);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the rect is equal to the other given rect.
-        /// </summary>
-        /// <param name="other">The other rect to test equality against.</param>
-        /// <returns>True if this rect is equal to other; False otherwise.</returns>
-        public bool Equals(PixelRect other)
-        {
-            return Position == other.Position && Size == other.Size;
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given object is equal to this rectangle.
-        /// </summary>
-        /// <param name="obj">The object to compare against.</param>
-        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
-        public override bool Equals(object? obj) => obj is PixelRect other && Equals(other);
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + X.GetHashCode();
-                hash = (hash * 23) + Y.GetHashCode();
-                hash = (hash * 23) + Width.GetHashCode();
-                hash = (hash * 23) + Height.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Gets the intersection of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The intersection.</returns>
-        public PixelRect Intersect(PixelRect rect)
-        {
-            var newLeft = (rect.X > X) ? rect.X : X;
-            var newTop = (rect.Y > Y) ? rect.Y : Y;
-            var newRight = (rect.Right < Right) ? rect.Right : Right;
-            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
-
-            if ((newRight > newLeft) && (newBottom > newTop))
-            {
-                return new PixelRect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
-            }
-            else
-            {
-                return Empty;
-            }
-        }
-
-        /// <summary>
-        /// Determines whether a rectangle intersects with this rectangle.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>
-        /// True if the specified rectangle intersects with this one; otherwise false.
-        /// </returns>
-        public bool Intersects(PixelRect rect)
-        {
-            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
-        }
-        
-        /// <summary>
-        /// Translates the rectangle by an offset.
-        /// </summary>
-        /// <param name="offset">The offset.</param>
-        /// <returns>The translated rectangle.</returns>
-        public PixelRect Translate(PixelVector offset)
-        {
-            return new PixelRect(Position + offset, Size);
-        }
-
-        /// <summary>
-        /// Gets the union of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The union.</returns>
-        public PixelRect Union(PixelRect rect)
-        {
-            if (IsEmpty)
-            {
-                return rect;
-            }
-            else if (rect.IsEmpty)
-            {
-                return this;
-            }
-            else
-            {
-                var x1 = Math.Min(X, rect.X);
-                var x2 = Math.Max(Right, rect.Right);
-                var y1 = Math.Min(Y, rect.Y);
-                var y2 = Math.Max(Bottom, rect.Bottom);
-
-                return new PixelRect(new PixelPoint(x1, y1), new PixelPoint(x2, y2));
-            }
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified X position.
-        /// </summary>
-        /// <param name="x">The x position.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithX(int x)
-        {
-            return new PixelRect(x, Y, Width, Height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified Y position.
-        /// </summary>
-        /// <param name="y">The y position.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithY(int y)
-        {
-            return new PixelRect(X, y, Width, Height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified width.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithWidth(int width)
-        {
-            return new PixelRect(X, Y, width, Height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified height.
-        /// </summary>
-        /// <param name="height">The height.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithHeight(int height)
-        {
-            return new PixelRect(X, Y, Width, Height);
-        }
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified scaling factor.
-        /// </summary>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRect(double scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified scaling factor.
-        /// </summary>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRect(Vector scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRectWithDpi(double dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRectWithDpi(Vector dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent rect.</returns>
-        public static PixelRect FromRect(Rect rect, double scale) => new PixelRect(
-            PixelPoint.FromPoint(rect.Position, scale),
-            FromPointCeiling(rect.BottomRight, new Vector(scale, scale)));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent point.</returns>
-        public static PixelRect FromRect(Rect rect, Vector scale) => new PixelRect(
-            PixelPoint.FromPoint(rect.Position, scale),
-            FromPointCeiling(rect.BottomRight, scale));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent point.</returns>
-        public static PixelRect FromRectWithDpi(Rect rect, double dpi) => new PixelRect(
-            PixelPoint.FromPointWithDpi(rect.Position, dpi),
-            FromPointCeiling(rect.BottomRight, new Vector(dpi / 96, dpi / 96)));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent point.</returns>
-        public static PixelRect FromRectWithDpi(Rect rect, Vector dpi) => new PixelRect(
-            PixelPoint.FromPointWithDpi(rect.Position, dpi),
-            FromPointCeiling(rect.BottomRight, dpi / 96));
-
-        /// <summary>
-        /// Returns the string representation of the rectangle.
-        /// </summary>
-        /// <returns>The string representation of the rectangle.</returns>
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}, {1}, {2}, {3}",
-                X,
-                Y,
-                Width,
-                Height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="PixelRect"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The parsed <see cref="PixelRect"/>.</returns>
-        public static PixelRect Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid PixelRect."))
-            {
-                return new PixelRect(
-                    tokenizer.ReadInt32(),
-                    tokenizer.ReadInt32(),
-                    tokenizer.ReadInt32(),
-                    tokenizer.ReadInt32()
-                );
-            }
-        }
-
-        private static PixelPoint FromPointCeiling(Point point, Vector scale)
-        {
-            return new PixelPoint(
-                (int)Math.Ceiling(point.X * scale.X),
-                (int)Math.Ceiling(point.Y * scale.Y));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/PreciseEllipticArcHelper.cs b/src/Avalonia.Visuals/Media/PreciseEllipticArcHelper.cs
deleted file mode 100644
index 5dd647e8ca..0000000000
--- a/src/Avalonia.Visuals/Media/PreciseEllipticArcHelper.cs
+++ /dev/null
@@ -1,1165 +0,0 @@
-// Copyright © 2003-2004, Luc Maisonobe
-// 2015 - Alexey Rozanov <thehdotx@gmail.com> - Adaptations for Avalonia and oval center computations
-// 2022 - Alexey Rozanov <thehdotx@gmail.com> - Fix for arcs sometimes drawn in inverted order.
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with
-// or without modification, are permitted provided that
-// the following conditions are met:
-// 
-//    Redistributions of source code must retain the
-//    above copyright notice, this list of conditions and
-//    the following disclaimer. 
-//    Redistributions in binary form must reproduce the
-//    above copyright notice, this list of conditions and
-//    the following disclaimer in the documentation
-//    and/or other materials provided with the
-//    distribution. 
-//    Neither the names of spaceroots.org, spaceroots.com
-//    nor the names of their contributors may be used to
-//    endorse or promote products derived from this
-//    software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// C#/WPF/Avalonia adaptation by Alexey Rozanov <thehdotx@gmail.com>, 2015.
-// I do not mind if anyone would find this adaptation useful, but
-// please retain the above disclaimer made by the original class 
-// author Luc Maisonobe. He worked really hard on this subject, so
-// please respect him by at least keeping the above disclaimer intact
-// if you use his code.
-//
-// Commented out some unused values calculations.
-// These are not supposed to be removed from the source code,
-// as these may be helpful for debugging.
-//
-// Adapted from http://www.spaceroots.org/documents/ellipse/EllipticalArc.java
-
-using System;
-
-namespace Avalonia.Media
-{
-    static class PreciseEllipticArcHelper
-    {
-        /// <summary>
-        /// This class represents an elliptical arc on a 2D plane.
-        /// 
-        /// This class is adapted for use with WPF StreamGeometryContext, and needs to be created explicitly
-        /// for each particular arc.
-        /// 
-        /// Some helpers
-        /// 
-        /// It can handle ellipses which are not aligned with the x and y reference axes of the plane,
-        /// as well as their parts.
-        /// 
-        /// Another improvement is that this class can handle degenerated cases like for example very 
-        /// flat ellipses(semi-minor axis much smaller than semi-major axis) and drawing of very small 
-        /// parts of such ellipses at very high magnification scales.This imply monitoring the drawing 
-        /// approximation error for extremely small values.Such cases occur for example while drawing 
-        /// orbits of comets near the perihelion.
-        /// 
-        /// When the arc does not cover the complete ellipse, the lines joining the center of the 
-        /// ellipse to the endpoints can optionally be included or not in the outline, hence allowing 
-        /// to use it for pie-charts rendering. If these lines are not included, the curve is not 
-        /// naturally closed.
-        /// </summary>
-        public sealed class EllipticalArc
-        {
-
-            private const double TwoPi = 2 * Math.PI;
-
-            /// <summary>
-            /// Coefficients for error estimation while using quadratic Bezier curves for approximation,
-            /// 0 ≤ b/a ≤ 0.25
-            /// </summary>
-            private static readonly double[][][] Coeffs2Low = {
-            new[]
-            {
-                new[] {3.92478, -13.5822, -0.233377, 0.0128206},
-                new[] {-1.08814, 0.859987, 3.62265E-4, 2.29036E-4},
-                new[] {-0.942512, 0.390456, 0.0080909, 0.00723895},
-                new[] {-0.736228, 0.20998, 0.0129867, 0.0103456}
-            },
-            new[]
-            {
-                new[] {-0.395018, 6.82464, 0.0995293, 0.0122198},
-                new[] {-0.545608, 0.0774863, 0.0267327, 0.0132482},
-                new[] {0.0534754, -0.0884167, 0.012595, 0.0343396},
-                new[] {0.209052, -0.0599987, -0.00723897, 0.00789976}
-            }
-        };
-
-            /// <summary>
-            /// Coefficients for error estimation while using quadratic Bezier curves for approximation,
-            /// 0.25 ≤ b/a ≤ 1
-            /// </summary>
-            private static readonly double[][][] Coeffs2High = {
-            new[]
-            {
-                new[] {0.0863805, -11.5595, -2.68765, 0.181224},
-                new[] {0.242856, -1.81073, 1.56876, 1.68544},
-                new[] {0.233337, -0.455621, 0.222856, 0.403469},
-                new[] {0.0612978, -0.104879, 0.0446799, 0.00867312}
-            },
-            new[]
-            {
-                new[] {0.028973, 6.68407, 0.171472, 0.0211706},
-                new[] {0.0307674, -0.0517815, 0.0216803, -0.0749348},
-                new[] {-0.0471179, 0.1288, -0.0781702, 2.0},
-                new[] {-0.0309683, 0.0531557, -0.0227191, 0.0434511}
-            }
-        };
-
-            /// <summary>
-            /// Safety factor to convert the "best" error approximation into a "max bound" error
-            /// </summary>
-            private static readonly double[] Safety2 = { 0.02, 2.83, 0.125, 0.01 };
-
-            /// <summary>
-            /// Coefficients for error estimation while using cubic Bezier curves for approximation,
-            /// 0.25 ≤ b/a ≤ 1
-            /// </summary>
-            private static readonly double[][][] Coeffs3Low = {
-            new[]
-            {
-                new[] {3.85268, -21.229, -0.330434, 0.0127842},
-                new[] {-1.61486, 0.706564, 0.225945, 0.263682},
-                new[] {-0.910164, 0.388383, 0.00551445, 0.00671814},
-                new[] {-0.630184, 0.192402, 0.0098871, 0.0102527}
-            },
-            new[]
-            {
-                new[] {-0.162211, 9.94329, 0.13723, 0.0124084},
-                new[] {-0.253135, 0.00187735, 0.0230286, 0.01264},
-                new[] {-0.0695069, -0.0437594, 0.0120636, 0.0163087},
-                new[] {-0.0328856, -0.00926032, -0.00173573, 0.00527385}
-            }
-        };
-
-            /// <summary>
-            /// Coefficients for error estimation while using cubic Bezier curves for approximation,
-            /// 0.25 ≤ b/a ≤ 1
-            /// </summary>
-            private static readonly double[][][] Coeffs3High = {
-            new[]
-            {
-                new[] {0.0899116, -19.2349, -4.11711, 0.183362},
-                new[] {0.138148, -1.45804, 1.32044, 1.38474},
-                new[] {0.230903, -0.450262, 0.219963, 0.414038},
-                new[] {0.0590565, -0.101062, 0.0430592, 0.0204699}
-            },
-            new[]
-            {
-                new[] {0.0164649, 9.89394, 0.0919496, 0.00760802},
-                new[] {0.0191603, -0.0322058, 0.0134667, -0.0825018},
-                new[] {0.0156192, -0.017535, 0.00326508, -0.228157},
-                new[] {-0.0236752, 0.0405821, -0.0173086, 0.176187}
-            }
-        };
-            /// <summary>
-            /// Safety factor to convert the "best" error approximation into a "max bound" error
-            /// </summary>
-            private static readonly double[] Safety3 = { 0.0010, 4.98, 0.207, 0.0067 };
-
-            /// <summary>
-            /// Abscissa of the center of the ellipse
-            /// </summary>
-            internal double Cx;
-            /// <summary>
-            /// Ordinate of the center of the ellipse
-            /// </summary>
-            internal double Cy;
-            /// <summary>
-            /// Semi-major axis
-            /// </summary>
-            internal double A;
-            /// <summary>
-            /// Semi-minor axis
-            /// </summary>
-            internal double B;
-            /// <summary>
-            /// Orientation of the major axis with respect to the x axis
-            /// </summary>
-            internal double Theta;
-            /// <summary>
-            /// Pre-calculated cosine value for the major-axis-to-X orientation (Theta)
-            /// </summary>
-            private readonly double _cosTheta;
-            /// <summary>
-            /// Pre-calculated sine value for the major-axis-to-X orientation (Theta)
-            /// </summary>
-            private readonly double _sinTheta;
-            /// <summary>
-            /// Start angle of the arc
-            /// </summary>
-            internal double Eta1;
-            /// <summary>
-            /// End angle of the arc
-            /// </summary>
-            internal double Eta2;
-            /// <summary>
-            /// Abscissa of the start point
-            /// </summary>
-            internal double X1;
-            /// <summary>
-            /// Ordinate of the start point
-            /// </summary>
-            internal double Y1;
-            /// <summary>
-            /// Abscissa of the end point
-            /// </summary>
-            internal double X2;
-            /// <summary>
-            /// Ordinate of the end point
-            /// </summary>
-            internal double Y2;
-            /// <summary>
-            /// Abscissa of the first focus
-            /// </summary>
-            internal double FirstFocusX;
-            /// <summary>
-            /// Ordinate of the first focus
-            /// </summary>
-            internal double FirstFocusY;
-            /// <summary>
-            /// Abscissa of the second focus
-            /// </summary>
-            internal double SecondFocusX;
-            /// <summary>
-            /// Ordinate of the second focus
-            /// </summary>
-            internal double SecondFocusY;
-            /// <summary>
-            /// Abscissa of the leftmost point of the arc
-            /// </summary>
-            private double _xLeft;
-            /// <summary>
-            /// Ordinate of the highest point of the arc
-            /// </summary>
-            private double _yUp;
-            /// <summary>
-            /// Horizontal width of the arc
-            /// </summary>
-            private double _width;
-            /// <summary>
-            /// Vertical height of the arc
-            /// </summary>
-            private double _height;
-            /// <summary>
-            /// Indicator for center to endpoints line inclusion
-            /// </summary>
-            internal bool IsPieSlice;
-            /// <summary>
-            /// Maximal degree for Bezier curve approximation
-            /// </summary>
-            private int _maxDegree;
-            /// <summary>
-            /// Default flatness for Bezier curve approximation
-            /// </summary>
-            private double _defaultFlatness;
-
-            /// <summary>
-            /// Indicator for semi-major axis significance (compared to semi-minor one).
-            /// Computed by dividing the (A-B) difference by the value of A.
-            /// This indicator is used for an early escape in intersection test
-            /// </summary>
-            internal double F;
-            /// <summary>
-            /// Indicator used for an early escape in intersection test
-            /// </summary>
-            internal double E2;
-            /// <summary>
-            /// Indicator used for an early escape in intersection test
-            /// </summary>
-            internal double G;
-            /// <summary>
-            /// Indicator used for an early escape in intersection test
-            /// </summary>
-            internal double G2;
-
-            public bool DrawInOppositeDirection { get; set; }
-
-            /// <summary>
-            /// Builds an elliptical arc composed of the full unit circle around (0,0)
-            /// </summary>
-            public EllipticalArc()
-            {
-                Cx = 0;
-                Cy = 0;
-                A = 1;
-                B = 1;
-                Theta = 0;
-                Eta1 = 0;
-                Eta2 = TwoPi;
-                _cosTheta = 1;
-                _sinTheta = 0;
-                IsPieSlice = false;
-                _maxDegree = 3;
-                _defaultFlatness = 0.5;
-                ComputeFocii();
-                ComputeEndPoints();
-                ComputeBounds();
-                ComputeDerivedFlatnessParameters();
-            }
-
-            /// <summary>
-            /// Builds an elliptical arc from its canonical geometrical elements
-            /// </summary>
-            /// <param name="center">Center of the ellipse</param>
-            /// <param name="a">Semi-major axis</param>
-            /// <param name="b">Semi-minor axis</param>
-            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
-            /// <param name="lambda1">Start angle of the arc</param>
-            /// <param name="lambda2">End angle of the arc</param>
-            /// <param name="isPieSlice">If true, the lines between the center of the ellipse
-            ///  and the endpoints are part of the shape (it is pie slice like)</param>
-            public EllipticalArc(Point center, double a, double b, double theta, double lambda1, double lambda2,
-                bool isPieSlice) : this(center.X, center.Y, a, b, theta, lambda1,
-                    lambda2, isPieSlice)
-            {
-            }
-            /// <summary>
-            /// Builds an elliptical arc from its canonical geometrical elements
-            /// </summary>
-            /// <param name="cx">Abscissa of the center of the ellipse</param>
-            /// <param name="cy">Ordinate of the center of the ellipse</param>
-            /// <param name="a">Semi-major axis</param>
-            /// <param name="b">Semi-minor axis</param>
-            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
-            /// <param name="lambda1">Start angle of the arc</param>
-            /// <param name="lambda2">End angle of the arc</param>
-            /// <param name="isPieSlice">If true, the lines between the center of the ellipse
-            ///  and the endpoints are part of the shape (it is pie slice like)</param>
-            public EllipticalArc(double cx, double cy, double a, double b, double theta, double lambda1, double lambda2,
-                bool isPieSlice)
-            {
-                Cx = cx;
-                Cy = cy;
-                A = a;
-                B = b;
-                Theta = theta;
-                IsPieSlice = isPieSlice;
-                Eta1 = Math.Atan2(Math.Sin(lambda1) / b, Math.Cos(lambda1) / a);
-                Eta2 = Math.Atan2(Math.Sin(lambda2) / b, Math.Cos(lambda2) / a);
-                _cosTheta = Math.Cos(theta);
-                _sinTheta = Math.Sin(theta);
-                _maxDegree = 3;
-                _defaultFlatness = 0.5; // half a pixel
-                Eta2 -= TwoPi * Math.Floor((Eta2 - Eta1) / TwoPi); //make sure we have eta1 <= eta2 <= eta1 + 2 PI
-                                                                   // the preceding correction fails if we have exactly eta2-eta1 == 2*PI
-                                                                   // it reduces the interval to zero length
-                if (lambda2 - lambda1 > Math.PI && Eta2 - Eta1 < Math.PI)
-                {
-                    Eta2 += TwoPi;
-                }
-                ComputeFocii();
-                ComputeEndPoints();
-                ComputeBounds();
-                ComputeDerivedFlatnessParameters();
-            }
-            /// <summary>
-            /// Build a full ellipse from its canonical geometrical elements
-            /// </summary>
-            /// <param name="center">Center of the ellipse</param>
-            /// <param name="a">Semi-major axis</param>
-            /// <param name="b">Semi-minor axis</param>
-            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
-            public EllipticalArc(Point center, double a, double b, double theta) : this(center.X, center.Y, a, b, theta)
-            {
-            }
-
-            /// <summary>
-            /// Build a full ellipse from its canonical geometrical elements
-            /// </summary>
-            /// <param name="cx">Abscissa of the center of the ellipse</param>
-            /// <param name="cy">Ordinate of the center of the ellipse</param>
-            /// <param name="a">Semi-major axis</param>
-            /// <param name="b">Semi-minor axis</param>
-            /// <param name="theta">Orientation of the major axis with respect to the x axis</param>
-            public EllipticalArc(double cx, double cy, double a, double b, double theta)
-            {
-                Cx = cx;
-                Cy = cy;
-                A = a;
-                B = b;
-                Theta = theta;
-                IsPieSlice = false;
-                Eta1 = 0;
-                Eta2 = TwoPi;
-                _cosTheta = Math.Cos(theta);
-                _sinTheta = Math.Sin(theta);
-                _maxDegree = 3;
-                _defaultFlatness = 0.5; //half a pixel
-                ComputeFocii();
-                ComputeEndPoints();
-                ComputeBounds();
-                ComputeDerivedFlatnessParameters();
-            }
-
-            /// <summary>
-            /// Sets the maximal degree allowed for Bezier curve approximation.
-            /// </summary>
-            /// <param name="maxDegree">Maximal allowed degree (must be between 1 and 3)</param>
-            /// <exception cref="ArgumentException">Thrown if maxDegree is not between 1 and 3</exception>
-            public void SetMaxDegree(int maxDegree)
-            {
-                if (maxDegree < 1 || maxDegree > 3)
-                {
-                    throw new ArgumentException(@"maxDegree must be between 1 and 3", nameof(maxDegree));
-                }
-                _maxDegree = maxDegree;
-            }
-
-            /// <summary>
-            /// Sets the default flatness for Bezier curve approximation
-            /// </summary>
-            /// <param name="defaultFlatness">default flatness (must be greater than 1e-10)</param>
-            /// <exception cref="ArgumentException">Thrown if defaultFlatness is lower than 1e-10</exception>
-            public void SetDefaultFlatness(double defaultFlatness)
-            {
-                if (defaultFlatness < 1.0E-10)
-                {
-                    throw new ArgumentException(@"defaultFlatness must be greater than 1.0e-10", nameof(defaultFlatness));
-                }
-                _defaultFlatness = defaultFlatness;
-            }
-
-            /// <summary>
-            /// Computes the locations of the focii
-            /// </summary>
-            private void ComputeFocii()
-            {
-                double d = Math.Sqrt(A * A - B * B);
-                double dx = d * _cosTheta;
-                double dy = d * _sinTheta;
-                FirstFocusX = Cx - dx;
-                FirstFocusY = Cy - dy;
-                SecondFocusX = Cx + dx;
-                SecondFocusY = Cy + dy;
-            }
-
-            /// <summary>
-            /// Computes the locations of the endpoints
-            /// </summary>
-            private void ComputeEndPoints()
-            {
-                double aCosEta1 = A * Math.Cos(Eta1);
-                double bSinEta1 = B * Math.Sin(Eta1);
-                X1 = Cx + aCosEta1 * _cosTheta - bSinEta1 * _sinTheta;
-                Y1 = Cy + aCosEta1 * _sinTheta + bSinEta1 * _cosTheta;
-                double aCosEta2 = A * Math.Cos(Eta2);
-                double bSinEta2 = B * Math.Sin(Eta2);
-                X2 = Cx + aCosEta2 * _cosTheta - bSinEta2 * _sinTheta;
-                Y2 = Cy + aCosEta2 * _sinTheta + bSinEta2 * _cosTheta;
-            }
-
-            /// <summary>
-            /// Computes the bounding box
-            /// </summary>
-            private void ComputeBounds()
-            {
-                double bOnA = B / A;
-                double etaXMin;
-                double etaXMax;
-                double etaYMin;
-                double etaYMax;
-                if (Math.Abs(_sinTheta) < 0.1)
-                {
-                    double tanTheta = _sinTheta / _cosTheta;
-                    if (_cosTheta < 0)
-                    {
-                        etaXMin = -Math.Atan(tanTheta * bOnA);
-                        etaXMax = etaXMin + Math.PI;
-                        etaYMin = 0.5 * Math.PI - Math.Atan(tanTheta / bOnA);
-                        etaYMax = etaYMin + Math.PI;
-                    }
-                    else
-                    {
-                        etaXMax = -Math.Atan(tanTheta * bOnA);
-                        etaXMin = etaXMax - Math.PI;
-                        etaYMax = 0.5 * Math.PI - Math.Atan(tanTheta / bOnA);
-                        etaYMin = etaYMax - Math.PI;
-                    }
-                }
-                else
-                {
-                    double invTanTheta = _cosTheta / _sinTheta;
-                    if (_sinTheta < 0)
-                    {
-                        etaXMax = 0.5 * Math.PI + Math.Atan(invTanTheta / bOnA);
-                        etaXMin = etaXMax - Math.PI;
-                        etaYMin = Math.Atan(invTanTheta * bOnA);
-                        etaYMax = etaYMin + Math.PI;
-                    }
-                    else
-                    {
-                        etaXMin = 0.5 * Math.PI + Math.Atan(invTanTheta / bOnA);
-                        etaXMax = etaXMin + Math.PI;
-                        etaYMax = Math.Atan(invTanTheta * bOnA);
-                        etaYMin = etaYMax - Math.PI;
-                    }
-                }
-                etaXMin -= TwoPi * Math.Floor((etaXMin - Eta1) / TwoPi);
-                etaYMin -= TwoPi * Math.Floor((etaYMin - Eta1) / TwoPi);
-                etaXMax -= TwoPi * Math.Floor((etaXMax - Eta1) / TwoPi);
-                etaYMax -= TwoPi * Math.Floor((etaYMax - Eta1) / TwoPi);
-                _xLeft = etaXMin <= Eta2
-                    ? Cx + A * Math.Cos(etaXMin) * _cosTheta - B * Math.Sin(etaXMin) * _sinTheta
-                    : Math.Min(X1, X2);
-                _yUp = etaYMin <= Eta2 ? Cy + A * Math.Cos(etaYMin) * _sinTheta + B * Math.Sin(etaYMin) * _cosTheta : Math.Min(Y1, Y2);
-                _width = (etaXMax <= Eta2
-                    ? Cx + A * Math.Cos(etaXMax) * _cosTheta - B * Math.Sin(etaXMax) * _sinTheta
-                    : Math.Max(X1, X2)) - _xLeft;
-                _height = (etaYMax <= Eta2
-                    ? Cy + A * Math.Cos(etaYMax) * _sinTheta + B * Math.Sin(etaYMax) * _cosTheta
-                    : Math.Max(Y1, Y2)) - _yUp;
-            }
-
-            /// <summary>
-            /// Computes the flatness parameters used in intersection tests
-            /// </summary>
-            private void ComputeDerivedFlatnessParameters()
-            {
-                F = (A - B) / A;
-                E2 = F * (2.0 - F);
-                G = 1.0 - F;
-                G2 = G * G;
-            }
-
-            /// <summary>
-            /// Computes the value of a rational function.
-            /// This method handles rational functions where the numerator is quadratic
-            /// and the denominator is linear
-            /// </summary>
-            /// <param name="x">Abscissa for which the value should be computed</param>
-            /// <param name="c">Coefficients array of the rational function</param>
-            /// <returns></returns>
-            private static double RationalFunction(double x, double[] c)
-            {
-                return (x * (x * c[0] + c[1]) + c[2]) / (x + c[3]);
-            }
-
-            /// <summary>
-            /// Estimate the approximation error for a sub-arc of the instance
-            /// </summary>
-            /// <param name="degree">Degree of the Bezier curve to use (1, 2 or 3)</param>
-            /// <param name="etaA">Start angle of the sub-arc</param>
-            /// <param name="etaB">End angle of the sub-arc</param>
-            /// <returns>Upper bound of the approximation error between the Bezier curve and the real ellipse</returns>
-            public double EstimateError(int degree, double etaA, double etaB)
-            {
-                if (degree < 1 || degree > _maxDegree)
-                    throw new ArgumentException($"degree should be between {1} and {_maxDegree}", nameof(degree));
-                double eta = 0.5 * (etaA + etaB);
-                if (degree < 2)
-                {
-                    //start point
-                    double aCosEtaA = A * Math.Cos(etaA);
-                    double bSinEtaA = B * Math.Sin(etaA);
-                    double xA = Cx + aCosEtaA * _cosTheta - bSinEtaA * _sinTheta;
-                    double yA = Cy + aCosEtaA * _sinTheta + bSinEtaA * _cosTheta;
-
-                    //end point
-                    double aCosEtaB = A * Math.Cos(etaB);
-                    double bSinEtaB = B * Math.Sin(etaB);
-                    double xB = Cx + aCosEtaB * _cosTheta - bSinEtaB * _sinTheta;
-                    double yB = Cy + aCosEtaB * _sinTheta + bSinEtaB * _cosTheta;
-
-                    //maximal error point
-                    double aCosEta = A * Math.Cos(eta);
-                    double bSinEta = B * Math.Sin(eta);
-                    double x = Cx + aCosEta * _cosTheta - bSinEta * _sinTheta;
-                    double y = Cy + aCosEta * _sinTheta + bSinEta * _cosTheta;
-
-                    double dx = xB - xA;
-                    double dy = yB - yA;
-
-                    return Math.Abs(x * dy - y * dx + xB * yA - xA * yB) / Math.Sqrt(dx * dx + dy * dy);
-                }
-                else
-                {
-                    double x = B / A;
-                    double dEta = etaB - etaA;
-                    double cos2 = Math.Cos(2 * eta);
-                    double cos4 = Math.Cos(4 * eta);
-                    double cos6 = Math.Cos(6 * eta);
-
-                    // select the right coefficients set according to degree and b/a
-                    double[][][] coeffs;
-                    double[] safety;
-                    if (degree == 2)
-                    {
-                        coeffs = x < 0.25 ? Coeffs2Low : Coeffs2High;
-                        safety = Safety2;
-                    }
-                    else
-                    {
-                        coeffs = x < 0.25 ? Coeffs3Low : Coeffs3High;
-                        safety = Safety3;
-                    }
-                    double c0 = RationalFunction(x, coeffs[0][0]) + cos2 * RationalFunction(x, coeffs[0][1]) +
-                                cos4 * RationalFunction(x, coeffs[0][2]) + cos6 * RationalFunction(x,
-                                    coeffs[0][3]);
-                    double c1 = RationalFunction(x, coeffs[1][0]) + cos2 * RationalFunction(x, coeffs[1][1]) +
-                                cos4 * RationalFunction(x, coeffs[1][2]) + cos6 * RationalFunction(x,
-                                    coeffs[1][3]);
-                    return RationalFunction(x, safety) * A * Math.Exp(c0 + c1 * dEta);
-                }
-            }
-
-            /// <summary>
-            /// Get the elliptical arc point for a given angular parameter
-            /// </summary>
-            /// <param name="lambda">Angular parameter for which point is desired</param> 
-            /// <returns>The desired elliptical arc point location</returns>
-            public Point PointAt(double lambda)
-            {
-                double eta = Math.Atan2(Math.Sin(lambda) / B, Math.Cos(lambda) / A);
-                double aCosEta = A * Math.Cos(eta);
-                double bSinEta = B * Math.Sin(eta);
-                Point p = new Point(Cx + aCosEta * _cosTheta - bSinEta * _sinTheta, Cy + aCosEta * _sinTheta + bSinEta * _cosTheta);
-                return p;
-            }
-
-            /// <summary>
-            /// Tests if the specified coordinates are inside the closed shape formed by this arc.
-            /// If this is not a pie, then a shape derived by adding a closing chord is considered.
-            /// </summary>
-            /// <param name="x">Abscissa of the test point</param>
-            /// <param name="y">Ordinate of the test point</param>
-            /// <returns>True if the specified coordinates are inside the closed shape of this arc</returns>
-            public bool Contains(double x, double y)
-            {
-                // position relative to the focii
-                double dx1 = x - FirstFocusX;
-                double dy1 = y - FirstFocusY;
-                double dx2 = x - SecondFocusX;
-                double dy2 = y - SecondFocusY;
-                if (dx1 * dx1 + dy1 * dy1 + dx2 * dx2 + dy2 * dy2 > 4 * A * A)
-                {
-                    // the point is outside of the ellipse
-                    return false;
-                }
-                if (IsPieSlice)
-                {
-                    // check the location of the test point with respect to the
-                    // angular sector counted from the center of the ellipse
-                    double dxC = x - Cx;
-                    double dyC = y - Cy;
-                    double u = dxC * _cosTheta + dyC * _sinTheta;
-                    double v = dyC * _cosTheta - dxC * _sinTheta;
-                    double eta = Math.Atan2(v / B, u / A);
-                    eta -= TwoPi * Math.Floor((eta - Eta1) / TwoPi);
-                    return eta <= Eta2;
-                }
-                // check the location of the test point with respect to the
-                // chord joining the start and end points
-                double dx = X2 - X1;
-                double dy = Y2 - Y1;
-                return x * dy - y * dx + X2 * Y1 - X1 * Y2 >= 0;
-            }
-
-            /// <summary>
-            /// Tests if a line segment intersects the arc
-            /// </summary>
-            /// <param name="xA">abscissa of the first point of the line segment</param>
-            /// <param name="yA">ordinate of the first point of the line segment</param>
-            /// <param name="xB">abscissa of the second point of the line segment</param>
-            /// <param name="yB">ordinate of the second point of the line segment</param>
-            /// <returns>true if the two line segments intersect</returns>
-            private bool IntersectArc(double xA, double yA, double xB, double yB)
-            {
-                double dx = xA - xB;
-                double dy = yA - yB;
-                double l = Math.Sqrt(dx * dx + dy * dy);
-                if (l < 1.0E-10 * A)
-                {
-                    // too small line segment, we consider it doesn't intersect anything
-                    return false;
-                }
-                double cz = (dx * _cosTheta + dy * _sinTheta) / l;
-                double sz = (dy * _cosTheta - dx * _sinTheta) / l;
-
-                // express position of the first point in canonical frame
-                dx = xA - Cx;
-                dy = yA - Cy;
-                double u = dx * _cosTheta + dy * _sinTheta;
-                double v = dy * _cosTheta - dx * _sinTheta;
-                double u2 = u * u;
-                double v2 = v * v;
-                double g2U2Ma2 = G2 * (u2 - A * A);
-                //double g2U2Ma2Mv2 = g2U2Ma2 - v2;
-                double g2U2Ma2Pv2 = g2U2Ma2 + v2;
-
-                // compute intersections with the ellipse along the line
-                // as the roots of a 2nd degree polynom : c0 k^2 - 2 c1 k + c2 = 0
-                double c0 = 1.0 - E2 * cz * cz;
-                double c1 = G2 * u * cz + v * sz;
-                double c2 = g2U2Ma2Pv2;
-                double c12 = c1 * c1;
-                double c0C2 = c0 * c2;
-                if (c12 < c0C2)
-                {
-                    // the line does not intersect the ellipse at all
-                    return false;
-                }
-                double k = c1 >= 0 ? (c1 + Math.Sqrt(c12 - c0C2)) / c0 : c2 / (c1 - Math.Sqrt(c12 - c0C2));
-                if (k >= 0 && k <= l)
-                {
-                    double uIntersect = u - k * cz;
-                    double vIntersect = v - k * sz;
-                    double eta = Math.Atan2(vIntersect / B, uIntersect / A);
-                    eta -= TwoPi * Math.Floor((eta - Eta1) / TwoPi);
-                    if (eta <= Eta2)
-                    {
-                        return true;
-                    }
-                }
-                k = c2 / (k * c0);
-                if (k >= 0 && k <= l)
-                {
-                    double uIntersect = u - k * cz;
-                    double vIntersect = v - k * sz;
-                    double eta = Math.Atan2(vIntersect / B, uIntersect / A);
-                    eta -= TwoPi * Math.Floor((eta - Eta1) / TwoPi);
-                    if (eta <= Eta2)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            /// <summary>
-            /// Tests if two line segments intersect
-            /// </summary>
-            /// <param name="x1">Abscissa of the first point of the first line segment</param>
-            /// <param name="y1">Ordinate of the first point of the first line segment</param>
-            /// <param name="x2">Abscissa of the second point of the first line segment</param>
-            /// <param name="y2">Ordinate of the second point of the first line segment</param>
-            /// <param name="xA">Abscissa of the first point of the second line segment</param>
-            /// <param name="yA">Ordinate of the first point of the second line segment</param>
-            /// <param name="xB">Abscissa of the second point of the second line segment</param>
-            /// <param name="yB">Ordinate of the second point of the second line segment</param>
-            /// <returns>true if the two line segments intersect</returns>
-            private static bool Intersect(double x1, double y1, double x2, double y2, double xA, double yA, double xB,
-                double yB)
-            {
-                // elements of the equation of the (1, 2) line segment
-                double dx12 = x2 - x1;
-                double dy12 = y2 - y1;
-                double k12 = x2 * y1 - x1 * y2;
-                // elements of the equation of the (A, B) line segment
-                double dxAb = xB - xA;
-                double dyAb = yB - yA;
-                double kAb = xB * yA - xA * yB;
-                // compute relative positions of endpoints versus line segments
-                double pAvs12 = xA * dy12 - yA * dx12 + k12;
-                double pBvs12 = xB * dy12 - yB * dx12 + k12;
-                double p1VsAb = x1 * dyAb - y1 * dxAb + kAb;
-                double p2VsAb = x2 * dyAb - y2 * dxAb + kAb;
-
-                return pAvs12 * pBvs12 <= 0 && p1VsAb * p2VsAb <= 0;
-            }
-
-            /// <summary>
-            /// Tests if a line segment intersects the outline
-            /// </summary>
-            /// <param name="xA">Abscissa of the first point of the line segment</param>
-            /// <param name="yA">Ordinate of the first point of the line segment</param>
-            /// <param name="xB">Abscissa of the second point of the line segment</param>
-            /// <param name="yB">Ordinate of the second point of the line segment</param>
-            /// <returns>true if the two line segments intersect</returns>
-            private bool IntersectOutline(double xA, double yA, double xB, double yB)
-            {
-                if (IntersectArc(xA, yA, xB, yB))
-                {
-                    return true;
-                }
-                if (IsPieSlice)
-                {
-                    return Intersect(Cx, Cy, X1, Y1, xA, yA, xB, yB) || Intersect(Cx, Cy, X2, Y2, xA, yA, xB, yB);
-                }
-                return Intersect(X1, Y1, X2, Y2, xA, yA, xB, yB);
-            }
-
-            /// <summary>
-            /// Tests if the interior of a closed path derived from this arc entirely contains the specified rectangular area.
-            /// The closed path is derived with respect to the IsPieSlice value.
-            /// </summary>
-            /// <param name="x">Abscissa of the upper-left corner of the test rectangle</param>
-            /// <param name="y">Ordinate of the upper-left corner of the test rectangle</param>
-            /// <param name="w">Width of the test rectangle</param>
-            /// <param name="h">Height of the test rectangle</param>
-            /// <returns>true if the interior of a closed path derived from this arc entirely contains the specified rectangular area; false otherwise</returns>
-            public bool Contains(double x, double y, double w, double h)
-            {
-                double xPlusW = x + w;
-                double yPlusH = y + h;
-                return Contains(x, y) && Contains(xPlusW, y) && Contains(x, yPlusH) && Contains(xPlusW, yPlusH) &&
-                       !IntersectOutline(x, y, xPlusW, y) && !IntersectOutline(xPlusW,
-                           y, xPlusW, yPlusH) && !IntersectOutline(xPlusW, yPlusH, x, yPlusH) &&
-                       !IntersectOutline(x, yPlusH, x, y);
-            }
-
-            /// <summary>
-            /// Tests if a specified Point2D is inside the boundary of a closed path derived from this arc.
-            /// The closed path is derived with respect to the IsPieSlice value.
-            /// </summary>
-            /// <param name="p">Test point</param>
-            /// <returns>true if the specified point is inside a closed path derived from this arc</returns>
-            public bool Contains(Point p)
-            {
-                return Contains(p.X, p.Y);
-            }
-
-            /// <summary>
-            /// Tests if the interior of a closed path derived from this arc entirely contains the specified Rectangle2D.
-            /// The closed path is derived with respect to the IsPieSlice value.
-            /// </summary>
-            /// <param name="r">Test rectangle</param>
-            /// <returns>True if the interior of a closed path derived from this arc entirely contains the specified Rectangle2D; false otherwise</returns>
-            public bool Contains(Rect r)
-            {
-                return Contains(r.X, r.Y, r.Width, r.Height);
-            }
-
-            /// <summary>
-            /// Returns an integer Rectangle that completely encloses the closed path derived from this arc.
-            /// The closed path is derived with respect to the IsPieSlice value.
-            /// </summary> 
-            public Rect GetBounds()
-            {
-                return new Rect(_xLeft, _yUp, _width, _height);
-            }
-
-            /// <summary>
-            /// Builds the arc outline using given StreamGeometryContext and default (max) Bezier curve degree and acceptable error of half a pixel (0.5)
-            /// </summary>
-            /// <param name="path">A StreamGeometryContext to output the path commands to</param>
-            public void BuildArc(StreamGeometryContext path)
-            {
-                BuildArc(path, _maxDegree, _defaultFlatness, true);
-            }
-
-            /// <summary>
-            /// Builds the arc outline using given StreamGeometryContext
-            /// </summary>
-            /// <param name="path">A StreamGeometryContext to output the path commands to</param>
-            /// <param name="degree">degree of the Bezier curve to use</param>
-            /// <param name="threshold">acceptable error</param>
-            /// <param name="openNewFigure">if true, a new figure will be started in the specified StreamGeometryContext</param>
-            public void BuildArc(StreamGeometryContext path, int degree, double threshold, bool openNewFigure)
-            {
-                if (degree < 1 || degree > _maxDegree)
-                    throw new ArgumentException($"degree should be between {1} and {_maxDegree}", nameof(degree));
-
-                // find the number of Bezier curves needed
-                bool found = false;
-                int n = 1;
-                double dEta;
-                double etaB;
-                while (!found && n < 1024)
-                {
-                    dEta = (Eta2 - Eta1) / n;
-                    if (dEta <= 0.5 * Math.PI)
-                    {
-                        etaB = Eta1;
-                        found = true;
-                        for (int i = 0; found && i < n; ++i)
-                        {
-                            double etaA = etaB;
-                            etaB += dEta;
-                            found = EstimateError(degree, etaA, etaB) <= threshold;
-                        }
-                    }
-                    n = n << 1;
-                }
-                if (!DrawInOppositeDirection)
-                {
-                    dEta = (Eta2 - Eta1) / n;
-                    etaB = Eta1;
-                }
-                else
-                {
-                    dEta = (Eta1 - Eta2) / n;
-                    etaB = Eta2;
-                }
-
-
-                double cosEtaB = Math.Cos(etaB);
-                double sinEtaB = Math.Sin(etaB);
-                double aCosEtaB = A * cosEtaB;
-                double bSinEtaB = B * sinEtaB;
-                double aSinEtaB = A * sinEtaB;
-                double bCosEtaB = B * cosEtaB;
-                double xB = Cx + aCosEtaB * _cosTheta - bSinEtaB * _sinTheta;
-                double yB = Cy + aCosEtaB * _sinTheta + bSinEtaB * _cosTheta;
-                double xBDot = -aSinEtaB * _cosTheta - bCosEtaB * _sinTheta;
-                double yBDot = -aSinEtaB * _sinTheta + bCosEtaB * _cosTheta;
-
-                /*
-                  This controls the drawing in case of pies
-                if (openNewFigure)
-                {
-                    if (IsPieSlice)
-                    {
-                        path.BeginFigure(new Point(Cx, Cy), false, false);
-                        path.LineTo(new Point(xB, yB), true, true);
-                    }
-                    else
-                    {
-                        path.BeginFigure(new Point(xB, yB), false, false);
-                    }
-                }
-                else
-                {
-                    //path.LineTo(new Point(xB, yB), true, true);
-                }
-                */
-
-                //otherwise we're supposed to be already at the (xB,yB)
-                 
-
-                double t = Math.Tan(0.5 * dEta);
-                double alpha = Math.Sin(dEta) * (Math.Sqrt(4 + 3 * t * t) - 1) / 3;
-                for (int i = 0; i < n; ++i)
-                {
-                    //double etaA = etaB;
-                    double xA = xB;
-                    double yA = yB;
-                    double xADot = xBDot;
-                    double yADot = yBDot;
-                    etaB += dEta;
-                    cosEtaB = Math.Cos(etaB);
-                    sinEtaB = Math.Sin(etaB);
-                    aCosEtaB = A * cosEtaB;
-                    bSinEtaB = B * sinEtaB;
-                    aSinEtaB = A * sinEtaB;
-                    bCosEtaB = B * cosEtaB;
-                    xB = Cx + aCosEtaB * _cosTheta - bSinEtaB * _sinTheta;
-                    yB = Cy + aCosEtaB * _sinTheta + bSinEtaB * _cosTheta;
-                    xBDot = -aSinEtaB * _cosTheta - bCosEtaB * _sinTheta;
-                    yBDot = -aSinEtaB * _sinTheta + bCosEtaB * _cosTheta;
-                    if (degree == 1)
-                    {
-                        path.LineTo(new Point(xB, yB));
-                    }
-                    else if (degree == 2)
-                    {
-                        double k = (yBDot * (xB - xA) - xBDot * (yB - yA)) / (xADot * yBDot - yADot * xBDot);
-                        path.QuadraticBezierTo(new Point(xA + k * xADot, yA + k * yADot), new Point(xB, yB));
-                    }
-                    else
-                    {
-                        path.CubicBezierTo(
-                            new Point(xA + alpha * xADot, yA + alpha * yADot),
-                            new Point(xB - alpha * xBDot, yB - alpha * yBDot),
-                            new Point(xB, yB)
-                            );
-                    }
-                }
-                if (IsPieSlice)
-                {
-                    path.LineTo(new Point(Cx, Cy));
-                }
-            }
-
-            /// <summary>
-            /// Calculates the angle between two vectors
-            /// </summary>
-            /// <param name="v1">Vector V1</param>
-            /// <param name="v2">Vector V2</param>
-            /// <returns>The signed angle between v2 and v1</returns>
-            static double GetAngle(Vector v1, Vector v2)
-            {
-                var scalar = v1 * v2;
-                return Math.Atan2(v1.X * v2.Y - v2.X * v1.Y, scalar);
-            }
-
-            /// <summary>
-            /// Simple matrix used for rotate transforms. 
-            /// At some point I did not trust the WPF Matrix struct, and wrote my own simple one -_-
-            /// This is supposed to be replaced with proper WPF Matrices everywhere
-            /// </summary>
-            private readonly struct SimpleMatrix
-            {
-                private readonly double _a, _b, _c, _d;
-
-                public SimpleMatrix(double a, double b, double c, double d)
-                {
-                    _a = a;
-                    _b = b;
-                    _c = c;
-                    _d = d;
-                }
-
-                public static Point operator *(SimpleMatrix m, Point p)
-                {
-                    return new Point(m._a * p.X + m._b * p.Y, m._c * p.X + m._d * p.Y);
-                }
-            }
-
-            /// <summary>
-            /// ArcTo Helper for StreamGeometryContext
-            /// </summary>
-            /// <param name="path">Target path</param>
-            /// <param name="p1">Start point</param>
-            /// <param name="p2">End point</param>
-            /// <param name="size">Ellipse radii</param>
-            /// <param name="theta">Ellipse theta (angle measured from the abscissa)</param>
-            /// <param name="isLargeArc">Large Arc Indicator</param>
-            /// <param name="clockwise">Clockwise direction flag</param>
-            public static void BuildArc(StreamGeometryContext path, Point p1, Point p2, Size size, double theta, bool isLargeArc, bool clockwise)
-            {
-
-                // var orthogonalizer = new RotateTransform(-theta);
-                var orth = new SimpleMatrix(Math.Cos(theta), Math.Sin(theta), -Math.Sin(theta), Math.Cos(theta));
-                var rest = new SimpleMatrix(Math.Cos(theta), -Math.Sin(theta), Math.Sin(theta), Math.Cos(theta));
-
-                // var restorer = orthogonalizer.Inverse;
-                // if(restorer == null) throw new InvalidOperationException("Can't get a restorer!");
-
-                Point p1S = orth * (new Point((p1.X - p2.X) / 2, (p1.Y - p2.Y) / 2));
-
-                double rx = size.Width;
-                double ry = size.Height;
-                double rx2 = rx * rx;
-                double ry2 = ry * ry;
-                double y1S2 = p1S.Y * p1S.Y;
-                double x1S2 = p1S.X * p1S.X;
-
-                double numerator = rx2*ry2 - rx2*y1S2 - ry2*x1S2;
-                double denominator = rx2*y1S2 + ry2*x1S2;
-
-                if (Math.Abs(denominator) < 1e-8)
-                {
-                    path.LineTo(p2);
-                    return;
-                }
-                if ((numerator / denominator) < 0)
-                {
-                    double lambda = x1S2/rx2 + y1S2/ry2;
-                    double lambdaSqrt = Math.Sqrt(lambda);
-                    if (lambda > 1)
-                    {
-                        rx *= lambdaSqrt;
-                        ry *= lambdaSqrt;
-                        rx2 = rx*rx;
-                        ry2 = ry*ry;
-                        numerator = rx2 * ry2 - rx2 * y1S2 - ry2 * x1S2;
-                        if (numerator < 0)
-                            numerator = 0;
-
-                        denominator = rx2 * y1S2 + ry2 * x1S2;
-                    }
-
-                }
-
-                double multiplier = Math.Sqrt(Math.Abs(numerator / denominator));
-                Point mulVec = new Point(rx * p1S.Y / ry, -ry * p1S.X / rx);
-
-                int sign = (clockwise != isLargeArc) ? 1 : -1;
-
-                Point cs = new Point(mulVec.X * multiplier * sign, mulVec.Y * multiplier * sign);
-
-                Vector translation = new Vector((p1.X + p2.X) / 2, (p1.Y + p2.Y) / 2);
-
-                Point c = rest * (cs) + translation;
-
-                // See "http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter" to understand
-                // how the ellipse center is calculated 
-
-
-                // from here, W3C recommendations from the above link make less sense than Darth Vader pouring
-                // some sea water in a water filter while standing in the water confused 
-
-                // Therefore, we are on our own with our task of finding out lambda1 and lambda2
-                // matching our points p1 and p2.
-
-                // Fortunately it is not so difficult now, when we already know the ellipse centre.
-
-                // We eliminate the offset, making our ellipse zero-centered, then we eliminate the theta,
-                // making its Y and X axes the same as global axes. Then we can easily get our angles using
-                // good old school formula for angles between vectors.
-
-                // We should remember that this class expects true angles, and not the t-values for ellipse equation.
-                // To understand how t-values are obtained, one should see Etas calculation in the constructor code.
-
-                var p1NoOffset = orth * (p1-c);
-                var p2NoOffset = orth * (p2-c);
-
-                // if the arc is drawn clockwise, we swap start and end points
-                var revisedP1 = clockwise ? p1NoOffset : p2NoOffset;
-                var revisedP2 = clockwise ? p2NoOffset : p1NoOffset;
-
-
-                var thetaStart = GetAngle(new Vector(1, 0), revisedP1);
-                var thetaEnd = GetAngle(new Vector(1, 0), revisedP2);
-
-
-                // Uncomment this to draw a pie
-                // path.LineTo(c, true, true);
-                // path.LineTo(clockwise ? p1 : p2, true,true);
-
-                var arc = new EllipticalArc(c.X, c.Y, rx, ry, theta, thetaStart, thetaEnd, false);
-
-                double ManhattanDistance(Point p1, Point p2) => Math.Abs(p1.X - p2.X) + Math.Abs(p1.Y - p2.Y);
-                if (ManhattanDistance(p2, new Point(arc.X2, arc.Y2)) > ManhattanDistance(p2, new Point(arc.X1, arc.Y1)))
-                {
-                    arc.DrawInOppositeDirection = true;
-                }
-
-                arc.BuildArc(path, arc._maxDegree, arc._defaultFlatness, false);
-                //path.LineTo(p2);
-
-                //uncomment this to draw a pie
-                //path.LineTo(c, true, true);
-            }
-
-            /// <summary>
-            /// Tests if the interior of the closed path derived from this arc intersects the interior of a specified rectangular area.
-            /// The closed path is derived with respect to the IsPieSlice value.
-            /// </summary>
-            public bool Intersects(double x, double y, double w, double h)
-            {
-                double xPlusW = x + w;
-                double yPlusH = y + h;
-                return Contains(x, y) || Contains(xPlusW, y) || Contains(x, yPlusH) || Contains(xPlusW, yPlusH) ||
-                       IntersectOutline(x, y, xPlusW, y) || IntersectOutline(xPlusW,
-                           y, xPlusW, yPlusH) || IntersectOutline(xPlusW, yPlusH, x, yPlusH) ||
-                       IntersectOutline(x, yPlusH, x, y);
-            }
-
-            /// <summary>
-            /// Tests if the interior of the closed path derived from this arc intersects the interior of a specified rectangular area.
-            /// The closed path is derived with respect to the IsPieSlice value.
-            /// </summary>
-            public bool Intersects(Rect r)
-            {
-                return Intersects(r.X, r.Y, r.Width, r.Height);
-            }
-        }
-
-        public static void ArcTo(StreamGeometryContext streamGeometryContextImpl, Point currentPoint, Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-        {
-            EllipticalArc.BuildArc(streamGeometryContextImpl, currentPoint, point, size, rotationAngle*(Math.PI/180),
-                isLargeArc,
-                sweepDirection == SweepDirection.Clockwise);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/RenderOptions.cs b/src/Avalonia.Visuals/Media/RenderOptions.cs
deleted file mode 100644
index 7abbc8a656..0000000000
--- a/src/Avalonia.Visuals/Media/RenderOptions.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{ 
-    public class RenderOptions
-    {
-        /// <summary>
-        /// Defines the <see cref="BitmapInterpolationMode"/> property.
-        /// </summary>
-        public static readonly StyledProperty<BitmapInterpolationMode> BitmapInterpolationModeProperty =
-            AvaloniaProperty.RegisterAttached<RenderOptions, AvaloniaObject, BitmapInterpolationMode>(
-                "BitmapInterpolationMode", 
-                BitmapInterpolationMode.MediumQuality,
-                inherits: true);
-
-        /// <summary>
-        /// Gets the value of the BitmapInterpolationMode attached property for a control.
-        /// </summary>
-        /// <param name="element">The control.</param>
-        /// <returns>The control's left coordinate.</returns>
-        public static BitmapInterpolationMode GetBitmapInterpolationMode(AvaloniaObject element)
-        {
-            return element.GetValue(BitmapInterpolationModeProperty);
-        }
-
-        /// <summary>
-        /// Sets the value of the BitmapInterpolationMode attached property for a control.
-        /// </summary>
-        /// <param name="element">The control.</param>
-        /// <param name="value">The left value.</param>
-        public static void SetBitmapInterpolationMode(AvaloniaObject element, BitmapInterpolationMode value)
-        {
-            element.SetValue(BitmapInterpolationModeProperty, value);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/StreamGeometryContext.cs b/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
deleted file mode 100644
index 88aba8365e..0000000000
--- a/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes a geometry using drawing commands.
-    /// </summary>
-    /// <remarks>
-    /// This class is used to define the geometry of a <see cref="StreamGeometry"/>. An instance
-    /// of <see cref="StreamGeometryContext"/> is obtained by calling
-    /// <see cref="StreamGeometry.Open"/>.
-    /// </remarks>
-    /// TODO: This class is just a wrapper around IStreamGeometryContextImpl: is it needed?
-    public class StreamGeometryContext : IGeometryContext
-    {
-        private readonly IStreamGeometryContextImpl _impl;
-
-        private Point _currentPoint;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StreamGeometryContext"/> class.
-        /// </summary>
-        /// <param name="impl">The platform-specific implementation.</param>
-        public StreamGeometryContext(IStreamGeometryContextImpl impl)
-        {
-            _impl = impl;
-        }
-
-        /// <summary>
-        /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. If you wonder why, ask Direct2D guys about their design decisions.
-        /// </summary>
-        /// <param name="fillRule"></param>
-
-        public void SetFillRule(FillRule fillRule)
-        {
-            _impl.SetFillRule(fillRule);
-        }
-
-        /// <summary>
-        /// Draws an arc to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
-        public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-        {
-            _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection);
-            _currentPoint = point;
-        }
-
-
-        /// <summary>
-        /// Draws an arc to the specified point using polylines, quadratic or cubic Bezier curves
-        /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios.        
-        /// </summary>         
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
-        public void PreciseArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-        {
-            PreciseEllipticArcHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection);
-        }
-
-        /// <summary>
-        /// Begins a new figure.
-        /// </summary>
-        /// <param name="startPoint">The starting point for the figure.</param>
-        /// <param name="isFilled">Whether the figure is filled.</param>
-        public void BeginFigure(Point startPoint, bool isFilled)
-        {
-            _impl.BeginFigure(startPoint, isFilled);
-            _currentPoint = startPoint;
-        }
-
-        /// <summary>
-        /// Draws a Bezier curve to the specified point.
-        /// </summary>
-        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
-        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
-        /// <param name="point3">The destination point for the end of the curve.</param>
-        public void CubicBezierTo(Point point1, Point point2, Point point3)
-        {
-            _impl.CubicBezierTo(point1, point2, point3);
-            _currentPoint = point3;
-        }
-
-        /// <summary>
-        /// Draws a quadratic Bezier curve to the specified point
-        /// </summary>
-        /// <param name="control">The control point used to specify the shape of the curve.</param>
-        /// <param name="endPoint">The destination point for the end of the curve.</param>
-        public void QuadraticBezierTo(Point control, Point endPoint)
-        {
-            _impl.QuadraticBezierTo(control, endPoint);
-            _currentPoint = endPoint;
-        }
-
-        /// <summary>
-        /// Draws a line to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        public void LineTo(Point point)
-        {
-            _impl.LineTo(point);
-            _currentPoint = point;
-        }
-
-        /// <summary>
-        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
-        /// </summary>
-        /// <param name="isClosed">Whether the figure is closed.</param>
-        public void EndFigure(bool isClosed)
-        {
-            _impl.EndFigure(isClosed);
-        }
-
-        /// <summary>
-        /// Finishes the drawing session.
-        /// </summary>
-        public void Dispose()
-        {
-            _impl.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextAlignment.cs b/src/Avalonia.Visuals/Media/TextAlignment.cs
deleted file mode 100644
index b1a394e157..0000000000
--- a/src/Avalonia.Visuals/Media/TextAlignment.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Defines how text is aligned.
-    /// </summary>
-    public enum TextAlignment
-    {
-        /// <summary>
-        /// The text is left-aligned.
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// The text is centered.
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// The text is right-aligned.
-        /// </summary>
-        Right,
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextDecoration.cs b/src/Avalonia.Visuals/Media/TextDecoration.cs
deleted file mode 100644
index 8eeb86c555..0000000000
--- a/src/Avalonia.Visuals/Media/TextDecoration.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Media.TextFormatting;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a text decoration, which is a visual ornamentation that is added to text (such as an underline).
-    /// </summary>
-    public class TextDecoration : AvaloniaObject
-    {
-        /// <summary>
-        /// Defines the <see cref="Location"/> property.
-        /// </summary>
-        public static readonly StyledProperty<TextDecorationLocation> LocationProperty =
-            AvaloniaProperty.Register<TextDecoration, TextDecorationLocation>(nameof(Location));
-
-        /// <summary>
-        /// Defines the <see cref="Stroke"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush> StrokeProperty =
-            AvaloniaProperty.Register<TextDecoration, IBrush>(nameof(Stroke));
-
-        /// <summary>
-        /// Defines the <see cref="StrokeThicknessUnit"/> property.
-        /// </summary>
-        public static readonly StyledProperty<TextDecorationUnit> StrokeThicknessUnitProperty =
-            AvaloniaProperty.Register<TextDecoration, TextDecorationUnit>(nameof(StrokeThicknessUnit));
-
-        /// <summary>
-        /// Defines the <see cref="StrokeDashArray"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AvaloniaList<double>> StrokeDashArrayProperty =
-            AvaloniaProperty.Register<TextDecoration, AvaloniaList<double>>(nameof(StrokeDashArray));
-
-        /// <summary>
-        /// Defines the <see cref="StrokeDashOffset"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> StrokeDashOffsetProperty =
-            AvaloniaProperty.Register<TextDecoration, double>(nameof(StrokeDashOffset));
-
-        /// <summary>
-        /// Defines the <see cref="StrokeThickness"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> StrokeThicknessProperty =
-            AvaloniaProperty.Register<TextDecoration, double>(nameof(StrokeThickness), 1);
-
-        /// <summary>
-        /// Defines the <see cref="StrokeLineCap"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PenLineCap> StrokeLineCapProperty =
-            AvaloniaProperty.Register<TextDecoration, PenLineCap>(nameof(StrokeLineCap));
-
-        /// <summary>
-        /// Defines the <see cref="StrokeOffset"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> StrokeOffsetProperty =
-            AvaloniaProperty.Register<TextDecoration, double>(nameof(StrokeOffset));
-
-        /// <summary>
-        /// Defines the <see cref="StrokeOffsetUnit"/> property.
-        /// </summary>
-        public static readonly StyledProperty<TextDecorationUnit> StrokeOffsetUnitProperty =
-            AvaloniaProperty.Register<TextDecoration, TextDecorationUnit>(nameof(StrokeOffsetUnit));
-
-        /// <summary>
-        /// Gets or sets the location.
-        /// </summary>
-        /// <value>
-        /// The location.
-        /// </value>
-        public TextDecorationLocation Location
-        {
-            get => GetValue(LocationProperty);
-            set => SetValue(LocationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IBrush"/> that specifies how the <see cref="TextDecoration"/> is painted.
-        /// </summary>
-        public IBrush Stroke
-        {
-            get { return GetValue(StrokeProperty); }
-            set { SetValue(StrokeProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the units in which the thickness of the <see cref="TextDecoration"/> is expressed.
-        /// </summary>
-        public TextDecorationUnit StrokeThicknessUnit
-        {
-            get => GetValue(StrokeThicknessUnitProperty);
-            set => SetValue(StrokeThicknessUnitProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a collection of <see cref="double"/> values that indicate the pattern of dashes and gaps
-        /// that is used to draw the <see cref="TextDecoration"/>.
-        /// </summary>
-        public AvaloniaList<double> StrokeDashArray
-        {
-            get { return GetValue(StrokeDashArrayProperty); }
-            set { SetValue(StrokeDashArrayProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value that specifies the distance within the dash pattern where a dash begins.
-        /// </summary>
-        public double StrokeDashOffset
-        {
-            get { return GetValue(StrokeDashOffsetProperty); }
-            set { SetValue(StrokeDashOffsetProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the thickness of the <see cref="TextDecoration"/>.
-        /// </summary>
-        public double StrokeThickness
-        {
-            get { return GetValue(StrokeThicknessProperty); }
-            set { SetValue(StrokeThicknessProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a <see cref="PenLineCap"/> enumeration value that describes the shape at the ends of a line.
-        /// </summary>
-        public PenLineCap StrokeLineCap
-        {
-            get { return GetValue(StrokeLineCapProperty); }
-            set { SetValue(StrokeLineCapProperty, value); }
-        }
-
-        /// <summary>
-        /// The stroke's offset.
-        /// </summary>
-        /// <value>
-        /// The pen offset.
-        /// </value>
-        public double StrokeOffset
-        {
-            get => GetValue(StrokeOffsetProperty);
-            set => SetValue(StrokeOffsetProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the units in which the <see cref="StrokeOffset"/> value is expressed.
-        /// </summary>
-        public TextDecorationUnit StrokeOffsetUnit
-        {
-            get => GetValue(StrokeOffsetUnitProperty);
-            set => SetValue(StrokeOffsetUnitProperty, value);
-        }
-
-        /// <summary>
-        /// Draws the <see cref="TextDecoration"/> at given origin.
-        /// </summary>
-        /// <param name="drawingContext">The drawing context.</param>
-        /// <param name="glyphRun">The decorated run.</param>
-        /// <param name="fontMetrics">The font metrics of the decorated run.</param>
-        /// <param name="defaultBrush">The default brush that is used to draw the decoration.</param>
-        internal void Draw(DrawingContext drawingContext, GlyphRun glyphRun, FontMetrics fontMetrics, IBrush defaultBrush)
-        {
-            var baselineOrigin = glyphRun.BaselineOrigin;
-            var thickness = StrokeThickness;
-
-            switch (StrokeThicknessUnit)
-            {
-                case TextDecorationUnit.FontRecommended:
-                    switch (Location)
-                    {
-                        case TextDecorationLocation.Underline:
-                            thickness = fontMetrics.UnderlineThickness;
-                            break;
-                        case TextDecorationLocation.Strikethrough:
-                            thickness = fontMetrics.StrikethroughThickness;
-                            break;
-                    }
-
-                    break;
-                case TextDecorationUnit.FontRenderingEmSize:
-                    thickness = fontMetrics.FontRenderingEmSize * thickness;
-                    break;
-            }
-
-            var origin = new Point();
-
-            switch (Location)
-            {
-                case TextDecorationLocation.Baseline:
-                    origin += glyphRun.BaselineOrigin;
-                    break;
-                case TextDecorationLocation.Strikethrough:
-                    origin += new Point(baselineOrigin.X, baselineOrigin.Y + fontMetrics.StrikethroughPosition);
-                    break;
-                case TextDecorationLocation.Underline:
-                    origin += new Point(baselineOrigin.X, baselineOrigin.Y + fontMetrics.UnderlinePosition);
-                    break;
-            }
-
-            switch (StrokeOffsetUnit)
-            {
-                case TextDecorationUnit.FontRenderingEmSize:
-                    origin += new Point(0, StrokeOffset * fontMetrics.FontRenderingEmSize);
-                    break;
-                case TextDecorationUnit.Pixel:
-                    origin += new Point(0, StrokeOffset);
-                    break;
-            }
-
-            var pen = new Pen(Stroke ?? defaultBrush, thickness,
-                new DashStyle(StrokeDashArray, StrokeDashOffset), StrokeLineCap);
-
-            drawingContext.DrawLine(pen, origin, origin + new Point(glyphRun.Size.Width, 0));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextDecorationCollection.cs b/src/Avalonia.Visuals/Media/TextDecorationCollection.cs
deleted file mode 100644
index 2dced2252e..0000000000
--- a/src/Avalonia.Visuals/Media/TextDecorationCollection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Collections;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A collection that holds <see cref="TextDecoration"/> objects.
-    /// </summary>
-    public class TextDecorationCollection : AvaloniaList<TextDecoration>
-    {
-        /// <summary>
-        /// Parses a <see cref="TextDecorationCollection"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="TextDecorationCollection"/>.</returns>
-        public static TextDecorationCollection Parse(string s)
-        {
-            var locations = new List<TextDecorationLocation>();
-
-            using (var tokenizer = new StringTokenizer(s, ',', "Invalid text decoration."))
-            {
-                while (tokenizer.TryReadString(out var name))
-                {
-                    var location = GetTextDecorationLocation(name);
-
-                    if (locations.Contains(location))
-                    {
-                        throw new ArgumentException("Text decoration already specified.", nameof(s));
-                    }
-
-                    locations.Add(location);
-                }
-            }
-
-            var textDecorations = new TextDecorationCollection();
-
-            foreach (var textDecorationLocation in locations)
-            {
-                textDecorations.Add(new TextDecoration { Location = textDecorationLocation });
-            }
-
-            return textDecorations;
-        }
-
-        /// <summary>
-        /// Parses a <see cref="TextDecorationLocation"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="TextDecorationLocation"/>.</returns>
-        private static TextDecorationLocation GetTextDecorationLocation(string s)
-        {
-            if (Enum.TryParse<TextDecorationLocation>(s,true, out var location))
-            {
-                return location;
-            }
-
-            throw new ArgumentException("Could not parse text decoration.", nameof(s));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs b/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs
deleted file mode 100644
index 3757a4506a..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A text run that supports drawing content.
-    /// </summary>
-    public abstract class DrawableTextRun : TextRun
-    {
-        /// <summary>
-        /// Gets the size.
-        /// </summary>
-        public abstract Size Size { get; }
-
-        /// <summary>
-        /// Draws the <see cref="DrawableTextRun"/> at the given origin.
-        /// </summary>
-        /// <param name="drawingContext">The drawing context.</param>
-        /// <param name="origin">The origin.</param>
-        public abstract void Draw(DrawingContext drawingContext, Point origin);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs b/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs
deleted file mode 100644
index e01bba00a4..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A metric that holds information about font specific measurements.
-    /// </summary>
-    public readonly struct FontMetrics
-    {
-        public FontMetrics(Typeface typeface, double fontRenderingEmSize)
-        {
-            var glyphTypeface = typeface.GlyphTypeface;
-
-            var scale = fontRenderingEmSize / glyphTypeface.DesignEmHeight;
-
-            FontRenderingEmSize = fontRenderingEmSize;
-
-            Ascent = glyphTypeface.Ascent * scale;
-
-            Descent = glyphTypeface.Descent * scale;
-
-            LineGap = glyphTypeface.LineGap * scale;
-
-            LineHeight = Descent - Ascent + LineGap;
-
-            UnderlineThickness = glyphTypeface.UnderlineThickness * scale;
-
-            UnderlinePosition = glyphTypeface.UnderlinePosition * scale;
-
-            StrikethroughThickness = glyphTypeface.StrikethroughThickness * scale;
-
-            StrikethroughPosition = glyphTypeface.StrikethroughPosition * scale;
-        }
-
-        /// <summary>
-        /// Em size of font used to format and display text
-        /// </summary>
-        public double FontRenderingEmSize { get; }
-
-        /// <summary>
-        /// Gets the recommended distance above the baseline.
-        /// </summary>
-        public double Ascent { get; }
-
-        /// <summary>
-        /// Gets the recommended distance under the baseline.
-        /// </summary>
-        public double Descent { get; }
-
-        /// <summary>
-        /// Gets the recommended additional space between two lines of text.
-        /// </summary>
-        public double LineGap { get; }
-
-        /// <summary>
-        /// Gets the estimated line height.
-        /// </summary>
-        public double LineHeight { get; }
-
-        /// <summary>
-        /// Gets a value that indicates the thickness of the underline.
-        /// </summary>
-        public double UnderlineThickness { get; }
-
-        /// <summary>
-        /// Gets a value that indicates the distance of the underline from the baseline.
-        /// </summary>
-        public double UnderlinePosition { get; }
-
-        /// <summary>
-        /// Gets a value that indicates the thickness of the underline.
-        /// </summary>
-        public double StrikethroughThickness { get; }
-
-        /// <summary>
-        /// Gets a value that indicates the distance of the strikethrough from the baseline.
-        /// </summary>
-        public double StrikethroughPosition { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/FormattedTextSource.cs b/src/Avalonia.Visuals/Media/TextFormatting/FormattedTextSource.cs
deleted file mode 100644
index 98344141f1..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/FormattedTextSource.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    internal readonly struct FormattedTextSource : ITextSource
-    {
-        private readonly ReadOnlySlice<char> _text;
-        private readonly TextRunProperties _defaultProperties;
-        private readonly IReadOnlyList<ValueSpan<TextRunProperties>>? _textModifier;
-
-        public FormattedTextSource(ReadOnlySlice<char> text, TextRunProperties defaultProperties,
-            IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
-        {
-            _text = text;
-            _defaultProperties = defaultProperties;
-            _textModifier = textModifier;
-        }
-
-        public TextRun? GetTextRun(int textSourceIndex)
-        {
-            if (textSourceIndex > _text.Length)
-            {
-                return null;
-            }
-
-            var runText = _text.Skip(textSourceIndex);
-
-            if (runText.IsEmpty)
-            {
-                return new TextEndOfParagraph();
-            }
-
-            var textStyleRun = CreateTextStyleRun(runText, _defaultProperties, _textModifier);
-
-            return new TextCharacters(runText.Take(textStyleRun.Length), textStyleRun.Value);
-        }
-
-        /// <summary>
-        /// Creates a span of text run properties that has modifier applied.
-        /// </summary>
-        /// <param name="text">The text to create the properties for.</param>
-        /// <param name="defaultProperties">The default text properties.</param>
-        /// <param name="textModifier">The text properties modifier.</param>
-        /// <returns>
-        /// The created text style run.
-        /// </returns>
-        private static ValueSpan<TextRunProperties> CreateTextStyleRun(ReadOnlySlice<char> text,
-            TextRunProperties defaultProperties, IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
-        {
-            if (textModifier == null || textModifier.Count == 0)
-            {
-                return new ValueSpan<TextRunProperties>(text.Start, text.Length, defaultProperties);
-            }
-
-            var currentProperties = defaultProperties;
-
-            var hasOverride = false;
-
-            var i = 0;
-
-            var length = 0;
-
-            for (; i < textModifier.Count; i++)
-            {
-                var propertiesOverride = textModifier[i];
-
-                var textRange = new TextRange(propertiesOverride.Start, propertiesOverride.Length);
-
-                if (textRange.Start + textRange.Length < text.Start)
-                {
-                    continue;
-                }
-
-                if (textRange.Start > text.End)
-                {
-                    length = text.Length;
-                    break;
-                }
-
-                if (textRange.Start > text.Start)
-                {
-                    if (propertiesOverride.Value != currentProperties)
-                    {
-                        length = Math.Min(Math.Abs(textRange.Start - text.Start), text.Length);
-
-                        break;
-                    }
-                }
-
-                length += Math.Max(0, textRange.Start + textRange.Length - text.Start);
-
-                if (hasOverride)
-                {
-                    continue;
-                }
-
-                hasOverride = true;
-
-                currentProperties = propertiesOverride.Value;
-            }
-
-            if (length < text.Length && i == textModifier.Count)
-            {
-                if (currentProperties == defaultProperties)
-                {
-                    length = text.Length;
-                }
-            }
-
-            if (length == 0 && currentProperties != defaultProperties)
-            {
-                currentProperties = defaultProperties;
-                length = text.Length;
-            }
-
-            if (length != text.Length)
-            {
-                text = text.Take(length);
-            }
-
-            return new ValueSpan<TextRunProperties>(text.Start, length, currentProperties);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs
deleted file mode 100644
index dccad1e647..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Generic implementation of TextParagraphProperties
-    /// </summary>
-    public sealed class GenericTextParagraphProperties : TextParagraphProperties
-    {
-        private FlowDirection _flowDirection;
-        private TextAlignment _textAlignment;
-        private TextWrapping _textWrap;
-        private double _lineHeight;
-
-        /// <summary>
-        /// Constructing TextParagraphProperties
-        /// </summary>
-        /// <param name="defaultTextRunProperties">default paragraph's default run properties</param>
-        /// <param name="textAlignment">logical horizontal alignment</param>
-        /// <param name="textWrap">text wrap option</param>
-        /// <param name="lineHeight">Paragraph line height</param>
-        public GenericTextParagraphProperties(TextRunProperties defaultTextRunProperties,
-            TextAlignment textAlignment = TextAlignment.Left,
-            TextWrapping textWrap = TextWrapping.NoWrap,
-            double lineHeight = 0)
-        {
-            DefaultTextRunProperties = defaultTextRunProperties;
-            _textAlignment = textAlignment;
-            _textWrap = textWrap;
-            _lineHeight = lineHeight;
-        }
-
-        /// <summary>
-        /// Constructing TextParagraphProperties
-        /// </summary>
-        /// <param name="flowDirection">text flow direction</param>
-        /// <param name="textAlignment">logical horizontal alignment</param>
-        /// <param name="firstLineInParagraph">true if the paragraph is the first line in the paragraph</param>
-        /// <param name="alwaysCollapsible">true if the line is always collapsible</param>
-        /// <param name="defaultTextRunProperties">default paragraph's default run properties</param>
-        /// <param name="textWrap">text wrap option</param>
-        /// <param name="lineHeight">Paragraph line height</param>
-        /// <param name="indent">line indentation</param>
-        public GenericTextParagraphProperties(
-            FlowDirection flowDirection,
-            TextAlignment textAlignment,
-            bool firstLineInParagraph,
-            bool alwaysCollapsible,
-            TextRunProperties defaultTextRunProperties,
-            TextWrapping textWrap,
-            double lineHeight,
-            double indent
-            )
-        {
-            _flowDirection = flowDirection;
-            _textAlignment = textAlignment;
-            FirstLineInParagraph = firstLineInParagraph;
-            AlwaysCollapsible = alwaysCollapsible;
-            DefaultTextRunProperties = defaultTextRunProperties;
-            _textWrap = textWrap;
-            _lineHeight = lineHeight;
-            Indent = indent;
-        }
-
-        /// <summary>
-        /// Constructing TextParagraphProperties from another one
-        /// </summary>
-        /// <param name="textParagraphProperties">source line props</param>
-        public GenericTextParagraphProperties(TextParagraphProperties textParagraphProperties)
-            : this(textParagraphProperties.FlowDirection, 
-                textParagraphProperties.TextAlignment,
-                textParagraphProperties.FirstLineInParagraph, 
-                textParagraphProperties.AlwaysCollapsible,
-                textParagraphProperties.DefaultTextRunProperties, 
-                textParagraphProperties.TextWrapping,
-                textParagraphProperties.LineHeight,
-                textParagraphProperties.Indent)
-        {
-        }
-
-        /// <summary>
-        /// This property specifies whether the primary text advance
-        /// direction shall be left-to-right, right-to-left, or top-to-bottom.
-        /// </summary>
-        public override FlowDirection FlowDirection
-        {
-            get { return _flowDirection; }
-        }
-
-        /// <summary>
-        /// This property describes how inline content of a block is aligned.
-        /// </summary>
-        public override TextAlignment TextAlignment
-        {
-            get { return _textAlignment; }
-        }
-
-        /// <summary>
-        /// Paragraph's line height
-        /// </summary>
-        public override double LineHeight
-        {
-            get { return _lineHeight; }
-        }
-
-        /// <summary>
-        /// Indicates the first line of the paragraph.
-        /// </summary>
-        public override bool FirstLineInParagraph { get; }
-
-        /// <summary>
-        /// If true, the formatted line may always be collapsed. If false (the default),
-        /// only lines that overflow the paragraph width are collapsed.
-        /// </summary>
-        public override bool AlwaysCollapsible { get; }
-
-        /// <summary>
-        /// Paragraph's default run properties
-        /// </summary>
-        public override TextRunProperties DefaultTextRunProperties { get; }
-
-        /// <summary>
-        /// This property controls whether or not text wraps when it reaches the flow edge
-        /// of its containing block box
-        /// </summary>
-        public override TextWrapping TextWrapping
-        {
-            get { return _textWrap; }
-        }
-
-        /// <summary>
-        /// Line indentation
-        /// </summary>
-        public override double Indent { get; }
-
-        /// <summary>
-        /// Set text flow direction
-        /// </summary>
-        internal void SetFlowDirection(FlowDirection flowDirection)
-        {
-            _flowDirection = flowDirection;
-        }
-
-
-        /// <summary>
-        /// Set text alignment
-        /// </summary>
-        internal void SetTextAlignment(TextAlignment textAlignment)
-        {
-            _textAlignment = textAlignment;
-        }
-
-
-        /// <summary>
-        /// Set line height
-        /// </summary>
-        internal void SetLineHeight(double lineHeight)
-        {
-            _lineHeight = lineHeight;
-        }
-
-        /// <summary>
-        /// Set text wrap
-        /// </summary>
-        internal void SetTextWrapping(TextWrapping textWrap)
-        {
-            _textWrap = textWrap;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs b/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs
deleted file mode 100644
index 32012ab8e9..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Produces <see cref="TextRun"/> objects that are used by the <see cref="TextFormatter"/>.
-    /// </summary>
-    public interface ITextSource
-    {
-        /// <summary>
-        /// Gets a <see cref="TextRun"/> for specified text source index.
-        /// </summary>
-        /// <param name="textSourceIndex">The text source index.</param>
-        /// <returns>The text run.</returns>
-        TextRun? GetTextRun(int textSourceIndex);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapeableTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapeableTextCharacters.cs
deleted file mode 100644
index 9d648af8fb..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapeableTextCharacters.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A group of characters that can be shaped.
-    /// </summary>
-    public sealed class ShapeableTextCharacters : TextRun
-    {
-        public ShapeableTextCharacters(ReadOnlySlice<char> text, TextRunProperties properties, sbyte biDiLevel)
-        {
-            TextSourceLength = text.Length;
-            Text = text;
-            Properties = properties;
-            BidiLevel = biDiLevel;
-        }
-
-        public override int TextSourceLength { get; }
-
-        public override ReadOnlySlice<char> Text { get; }
-
-        public override TextRunProperties Properties { get; }
-        
-        public sbyte BidiLevel { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedBuffer.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedBuffer.cs
deleted file mode 100644
index ee38cf39e0..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedBuffer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    public sealed class ShapedBuffer : IList<GlyphInfo>
-    {
-        private static readonly IComparer<GlyphInfo> s_clusterComparer = new CompareClusters();
-
-        public ShapedBuffer(ReadOnlySlice<char> text, int length, GlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel)
-            : this(text, new GlyphInfo[length], glyphTypeface, fontRenderingEmSize, bidiLevel)
-        {
-
-        }
-
-        internal ShapedBuffer(ReadOnlySlice<char> text, ArraySlice<GlyphInfo> glyphInfos, GlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel)
-        {
-            Text = text;
-            GlyphInfos = glyphInfos;
-            GlyphTypeface = glyphTypeface;
-            FontRenderingEmSize = fontRenderingEmSize;
-            BidiLevel = bidiLevel;
-        }
-
-        internal ArraySlice<GlyphInfo> GlyphInfos { get; }
-
-        public ReadOnlySlice<char> Text { get; }
-
-        public int Length => GlyphInfos.Length;
-
-        public GlyphTypeface GlyphTypeface { get; }
-
-        public double FontRenderingEmSize { get; }
-
-        public sbyte BidiLevel { get; }
-
-        public bool IsLeftToRight => (BidiLevel & 1) == 0;
-        
-        public IReadOnlyList<ushort> GlyphIndices => new GlyphIndexList(GlyphInfos);
-
-        public IReadOnlyList<int> GlyphClusters => new GlyphClusterList(GlyphInfos);
-
-        public IReadOnlyList<double> GlyphAdvances => new GlyphAdvanceList(GlyphInfos);
-
-        public IReadOnlyList<Vector> GlyphOffsets => new GlyphOffsetList(GlyphInfos);
-
-        /// <summary>
-        /// Finds a glyph index for given character index.
-        /// </summary>
-        /// <param name="characterIndex">The character index.</param>
-        /// <returns>
-        /// The glyph index.
-        /// </returns>
-        private int FindGlyphIndex(int characterIndex)
-        {
-            if (characterIndex < GlyphInfos[0].GlyphCluster)
-            {
-                return 0;
-            }
-
-            if (characterIndex > GlyphInfos[GlyphInfos.Length - 1].GlyphCluster)
-            {
-                return GlyphInfos.Length - 1;
-            }
-
-
-            var comparer = s_clusterComparer;
-
-            var clusters = GlyphInfos.Span;
-
-            var searchValue = new GlyphInfo(0, characterIndex);
-
-            var start = clusters.BinarySearch(searchValue, comparer);
-
-            if (start < 0)
-            {
-                while (characterIndex > 0 && start < 0)
-                {
-                    characterIndex--;
-
-                    searchValue = new GlyphInfo(0, characterIndex);
-
-                    start = clusters.BinarySearch(searchValue, comparer);
-                }
-
-                if (start < 0)
-                {
-                    return -1;
-                }
-            }
-
-            while (start > 0 && clusters[start - 1].GlyphCluster == clusters[start].GlyphCluster)
-            {
-                start--;
-            }
-
-            return start;
-        }
-
-        /// <summary>
-        /// Splits the <see cref="TextRun"/> at specified length.
-        /// </summary>
-        /// <param name="length">The length.</param>
-        /// <returns>The split result.</returns>
-        internal SplitResult<ShapedBuffer> Split(int length)
-        {
-            var glyphCount = FindGlyphIndex(Text.Start + length);
-
-            if (Text.Length == length)
-            {
-                return new SplitResult<ShapedBuffer>(this, null);
-            }
-
-            if (Text.Length == glyphCount)
-            {
-                return new SplitResult<ShapedBuffer>(this, null);
-            }
-
-            var first = new ShapedBuffer(Text.Take(length), GlyphInfos.Take(glyphCount), GlyphTypeface, FontRenderingEmSize, BidiLevel);
-
-            var second = new ShapedBuffer(Text.Skip(length), GlyphInfos.Skip(glyphCount), GlyphTypeface, FontRenderingEmSize, BidiLevel);
-
-            return new SplitResult<ShapedBuffer>(first, second);
-        }
-
-        int ICollection<GlyphInfo>.Count => throw new NotImplementedException();
-
-        bool ICollection<GlyphInfo>.IsReadOnly => true;
-
-        public GlyphInfo this[int index]
-        {
-            get => GlyphInfos[index];
-            set => GlyphInfos[index] = value;
-        }
-
-        int IList<GlyphInfo>.IndexOf(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void IList<GlyphInfo>.Insert(int index, GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void IList<GlyphInfo>.RemoveAt(int index)
-        {
-            throw new NotImplementedException();
-        }
-
-        void ICollection<GlyphInfo>.Add(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void ICollection<GlyphInfo>.Clear()
-        {
-            throw new NotImplementedException();
-        }
-
-        bool ICollection<GlyphInfo>.Contains(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void ICollection<GlyphInfo>.CopyTo(GlyphInfo[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        bool ICollection<GlyphInfo>.Remove(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-        public IEnumerator<GlyphInfo> GetEnumerator() => GlyphInfos.GetEnumerator();
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-
-        private class CompareClusters : IComparer<GlyphInfo>
-        {
-            private static readonly Comparer<int> s_intClusterComparer = Comparer<int>.Default;
-
-            public int Compare(GlyphInfo x, GlyphInfo y)
-            {
-                return s_intClusterComparer.Compare(x.GlyphCluster, y.GlyphCluster);
-            }
-        }
-
-        private readonly struct GlyphAdvanceList : IReadOnlyList<double>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphAdvanceList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public double this[int index] => _glyphInfos[index].GlyphAdvance;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<double> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<double>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-
-        private readonly struct GlyphIndexList : IReadOnlyList<ushort>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphIndexList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public ushort this[int index] => _glyphInfos[index].GlyphIndex;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<ushort> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<ushort>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-
-        private readonly struct GlyphClusterList : IReadOnlyList<int>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphClusterList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public int this[int index] => _glyphInfos[index].GlyphCluster;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<int> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<int>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-
-        private readonly struct GlyphOffsetList : IReadOnlyList<Vector>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphOffsetList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public Vector this[int index] => _glyphInfos[index].GlyphOffset;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<Vector> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<Vector>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-    }
-
-    public readonly struct GlyphInfo
-    {
-        public GlyphInfo(ushort glyphIndex, int glyphCluster, double glyphAdvance = 0, Vector glyphOffset = default)
-        {
-            GlyphIndex = glyphIndex;
-            GlyphAdvance = glyphAdvance;
-            GlyphCluster = glyphCluster;
-            GlyphOffset = glyphOffset;
-        }
-
-        /// <summary>
-        /// Get the glyph index.
-        /// </summary>
-        public ushort GlyphIndex { get; }
-
-        /// <summary>
-        /// Get the glyph cluster.
-        /// </summary>
-        public int GlyphCluster { get; }
-
-        /// <summary>
-        /// Get the glyph advance.
-        /// </summary>
-        public double GlyphAdvance { get; }
-
-        /// <summary>
-        /// Get the glyph offset.
-        /// </summary>
-        public Vector GlyphOffset { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
deleted file mode 100644
index 96b3857098..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A text run that holds shaped characters.
-    /// </summary>
-    public sealed class ShapedTextCharacters : DrawableTextRun
-    {
-        private GlyphRun? _glyphRun;
-
-        public ShapedTextCharacters(ShapedBuffer shapedBuffer, TextRunProperties properties)
-        {
-            ShapedBuffer = shapedBuffer;
-            Text = shapedBuffer.Text;
-            Properties = properties;
-            TextSourceLength = Text.Length;
-            FontMetrics = new FontMetrics(properties.Typeface, properties.FontRenderingEmSize);
-        }
-
-        public bool IsReversed { get; private set; }
-
-        public sbyte BidiLevel => ShapedBuffer.BidiLevel;
-
-        public ShapedBuffer ShapedBuffer { get; }
-
-        /// <inheritdoc/>
-        public override ReadOnlySlice<char> Text { get; }
-
-        /// <inheritdoc/>
-        public override TextRunProperties Properties { get; }
-
-        /// <inheritdoc/>
-        public override int TextSourceLength { get; }
-
-        public FontMetrics FontMetrics { get; }
-
-        public override Size Size => GlyphRun.Size;
-
-        public GlyphRun GlyphRun
-        {
-            get
-            {
-                if(_glyphRun is null)
-                {
-                    _glyphRun = CreateGlyphRun();
-                }
-
-                return _glyphRun;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Draw(DrawingContext drawingContext, Point origin)
-        {
-            using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
-            {
-                if (GlyphRun.GlyphIndices.Count == 0)
-                {
-                    return;
-                }
-
-                if (Properties.Typeface == default)
-                {
-                    return;
-                }
-
-                if (Properties.ForegroundBrush == null)
-                {
-                    return;
-                }
-
-                if (Properties.BackgroundBrush != null)
-                {
-                    drawingContext.DrawRectangle(Properties.BackgroundBrush, null, new Rect(Size));
-                }
-
-                drawingContext.DrawGlyphRun(Properties.ForegroundBrush, GlyphRun);
-
-                if (Properties.TextDecorations == null)
-                {
-                    return;
-                }
-
-                foreach (var textDecoration in Properties.TextDecorations)
-                {
-                    textDecoration.Draw(drawingContext, GlyphRun, FontMetrics, Properties.ForegroundBrush);
-                }
-            }
-        }
-
-        internal void Reverse()
-        {
-            _glyphRun = null;
-
-            ShapedBuffer.GlyphInfos.Span.Reverse();
-
-            IsReversed = !IsReversed;
-        }
-
-        /// <summary>
-        /// Measures the number of characters that fit into available width.
-        /// </summary>
-        /// <param name="availableWidth">The available width.</param>
-        /// <param name="length">The count of fitting characters.</param>
-        /// <returns>
-        /// <c>true</c> if characters fit into the available width; otherwise, <c>false</c>.
-        /// </returns>
-        internal bool TryMeasureCharacters(double availableWidth, out int length)
-        {
-            length = 0;
-            var currentWidth = 0.0;
-
-            for (var i = 0; i < ShapedBuffer.Length; i++)
-            {
-                var advance = ShapedBuffer.GlyphAdvances[i];
-
-                if (currentWidth + advance > availableWidth)
-                {
-                    break;
-                }
-
-                Codepoint.ReadAt(GlyphRun.Characters, length, out var count);
-
-                length += count;
-                currentWidth += advance;
-            }
-
-            return length > 0;
-        }
-
-        internal SplitResult<ShapedTextCharacters> Split(int length)
-        {
-            if (IsReversed)
-            {
-                Reverse();
-            }
-
-            if(length == 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length), "length must be greater than zero.");
-            }
-
-            if(length == ShapedBuffer.Length)
-            {
-                return new SplitResult<ShapedTextCharacters>(this, null);
-            }
-
-            var splitBuffer = ShapedBuffer.Split(length);
-
-            var first = new ShapedTextCharacters(splitBuffer.First, Properties);
-
-            #if DEBUG
-
-            if (first.Text.Length != length)
-            {
-                throw new InvalidOperationException("Split length mismatch.");
-            }
-            
-            #endif
-
-            var second = new ShapedTextCharacters(splitBuffer.Second!, Properties);
-
-            return new SplitResult<ShapedTextCharacters>(first, second);
-        }
-
-        internal GlyphRun CreateGlyphRun()
-        {
-            return new GlyphRun(
-                ShapedBuffer.GlyphTypeface,
-                ShapedBuffer.FontRenderingEmSize,
-                Text,
-                ShapedBuffer.GlyphIndices,
-                ShapedBuffer.GlyphAdvances,
-                ShapedBuffer.GlyphOffsets,
-                ShapedBuffer.GlyphClusters,
-                BidiLevel);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
deleted file mode 100644
index faa73719c8..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A text run that holds text characters.
-    /// </summary>
-    public class TextCharacters : TextRun
-    {
-        public TextCharacters(ReadOnlySlice<char> text, TextRunProperties properties)
-        {
-            TextSourceLength = text.Length;
-            Text = text;
-            Properties = properties;
-        }
-
-        public TextCharacters(ReadOnlySlice<char> text, int offsetToFirstCharacter, int length,
-            TextRunProperties properties)
-        {
-            Text = text.Skip(offsetToFirstCharacter).Take(length);
-            TextSourceLength = length;
-            Properties = properties;
-        }
-
-        /// <inheritdoc />
-        public override int TextSourceLength { get; }
-
-        /// <inheritdoc />
-        public override ReadOnlySlice<char> Text { get; }
-
-        /// <inheritdoc />
-        public override TextRunProperties Properties { get; }
-
-        /// <summary>
-        /// Gets a list of <see cref="ShapeableTextCharacters"/>.
-        /// </summary>
-        /// <returns>The shapeable text characters.</returns>
-        internal IList<ShapeableTextCharacters> GetShapeableCharacters(ReadOnlySlice<char> runText, sbyte biDiLevel, 
-            ref TextRunProperties? previousProperties)
-        {
-            var shapeableCharacters = new List<ShapeableTextCharacters>(2);
-
-            while (!runText.IsEmpty)
-            {
-                var shapeableRun = CreateShapeableRun(runText, Properties, biDiLevel, ref previousProperties);
-
-                shapeableCharacters.Add(shapeableRun);
-
-                runText = runText.Skip(shapeableRun.Text.Length);
-
-                previousProperties = shapeableRun.Properties;
-            }
-
-            return shapeableCharacters;
-        }
-
-        /// <summary>
-        /// Creates a shapeable text run with unique properties.
-        /// </summary>
-        /// <param name="text">The text to create text runs from.</param>
-        /// <param name="defaultProperties">The default text run properties.</param>
-        /// <param name="biDiLevel">The bidi level of the run.</param>
-        /// <param name="previousProperties"></param>
-        /// <returns>A list of shapeable text runs.</returns>
-        private static ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text, 
-            TextRunProperties defaultProperties, sbyte biDiLevel, ref TextRunProperties? previousProperties)
-        {
-            var defaultTypeface = defaultProperties.Typeface;
-            var currentTypeface = defaultTypeface;
-            var previousTypeface = previousProperties?.Typeface;
-
-            if (TryGetShapeableLength(text, currentTypeface, out var count, out var script))
-            {
-                if (script == Script.Common && previousTypeface is not null)
-                {
-                    if(TryGetShapeableLength(text, previousTypeface.Value, out var fallbackCount, out _))
-                    {
-                        return new ShapeableTextCharacters(text.Take(fallbackCount),
-                            new GenericTextRunProperties(previousTypeface.Value, defaultProperties.FontRenderingEmSize,
-                                defaultProperties.TextDecorations, defaultProperties.ForegroundBrush), biDiLevel);
-                    }
-                }
-
-                return new ShapeableTextCharacters(text.Take(count),
-                    new GenericTextRunProperties(currentTypeface, defaultProperties.FontRenderingEmSize,
-                        defaultProperties.TextDecorations, defaultProperties.ForegroundBrush), biDiLevel);
-            }
-            
-            if (previousTypeface is not null)
-            {
-                if(TryGetShapeableLength(text, previousTypeface.Value, out count, out _))
-                {
-                    return new ShapeableTextCharacters(text.Take(count),
-                        new GenericTextRunProperties(previousTypeface.Value, defaultProperties.FontRenderingEmSize,
-                            defaultProperties.TextDecorations, defaultProperties.ForegroundBrush), biDiLevel);
-                }
-            }
-
-            var codepoint = Codepoint.ReplacementCodepoint;
-
-            var codepointEnumerator = new CodepointEnumerator(text.Skip(count));
-
-            while (codepointEnumerator.MoveNext())
-            {
-                if (codepointEnumerator.Current.IsWhiteSpace)
-                {
-                    continue;
-                }
-                
-                codepoint = codepointEnumerator.Current;
-                    
-                break;
-            }
-            
-            //ToDo: Fix FontFamily fallback
-            var matchFound =
-                FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
-                    defaultTypeface.FontFamily, defaultProperties.CultureInfo, out currentTypeface);
-
-            if (matchFound && TryGetShapeableLength(text, currentTypeface, out count, out _))
-            {
-                //Fallback found
-                return new ShapeableTextCharacters(text.Take(count),
-                    new GenericTextRunProperties(currentTypeface, defaultProperties.FontRenderingEmSize,
-                    defaultProperties.TextDecorations, defaultProperties.ForegroundBrush), biDiLevel);
-            }
-
-            // no fallback found
-            currentTypeface = defaultTypeface;
-
-            var glyphTypeface = currentTypeface.GlyphTypeface;
-
-            var enumerator = new GraphemeEnumerator(text);
-
-            while (enumerator.MoveNext())
-            {
-                var grapheme = enumerator.Current;
-
-                if (!grapheme.FirstCodepoint.IsWhiteSpace && glyphTypeface.TryGetGlyph(grapheme.FirstCodepoint, out _))
-                {
-                    break;
-                }
-
-                count += grapheme.Text.Length;
-            }
-
-            return new ShapeableTextCharacters(text.Take(count),
-                new GenericTextRunProperties(currentTypeface, defaultProperties.FontRenderingEmSize,
-                    defaultProperties.TextDecorations, defaultProperties.ForegroundBrush), biDiLevel);
-        }
-
-        /// <summary>
-        /// Tries to get a shapeable length that is supported by the specified typeface.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="typeface">The typeface that is used to find matching characters.</param>
-        /// <param name="length">The shapeable length.</param>
-        /// <param name="script"></param>
-        /// <returns></returns>
-        protected static bool TryGetShapeableLength(ReadOnlySlice<char> text, Typeface typeface, out int length,
-            out Script script)
-        {
-            length = 0;
-            script = Script.Unknown;
-
-            if (text.Length == 0)
-            {
-                return false;
-            }
-
-            var font = typeface.GlyphTypeface;
-
-            var enumerator = new GraphemeEnumerator(text);
-
-            while (enumerator.MoveNext())
-            {
-                var currentGrapheme = enumerator.Current;
-
-                var currentScript = currentGrapheme.FirstCodepoint.Script;
-
-                if (currentScript != script)
-                {
-                    if (script is Script.Unknown || currentScript != Script.Common &&
-                        script is Script.Common or Script.Inherited)
-                    {
-                        script = currentScript;
-                    }
-                    else
-                    {
-                        if (currentScript != Script.Inherited && currentScript != Script.Common)
-                        {
-                            break;
-                        }
-                    }
-                }
-
-                //Stop at the first missing glyph
-                if (!currentGrapheme.FirstCodepoint.IsBreakChar && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
-                {
-                    break;
-                }
-
-                length += currentGrapheme.Text.Length;
-            }
-
-            return length > 0;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs
deleted file mode 100644
index ffd65423a3..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Properties of text collapsing
-    /// </summary>
-    public abstract class TextCollapsingProperties
-    {
-        /// <summary>
-        /// Gets the width in which the collapsible range is constrained to
-        /// </summary>
-        public abstract double Width { get; }
-
-        /// <summary>
-        /// Gets the text run that is used as collapsing symbol
-        /// </summary>
-        public abstract TextRun Symbol { get; }
-
-        /// <summary>
-        /// Gets the style of collapsing
-        /// </summary>
-        public abstract TextCollapsingStyle Style { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs
deleted file mode 100644
index 1523cc4d9a..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Text collapsing style
-    /// </summary>
-    public enum TextCollapsingStyle
-    {
-        /// <summary>
-        /// Collapse trailing characters
-        /// </summary>
-        TrailingCharacter,
-
-        /// <summary>
-        /// Collapse trailing words
-        /// </summary>
-        TrailingWord,
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs
deleted file mode 100644
index d521077a43..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Avalonia.Media.TextFormatting.Unicode;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Represents a base class for text formatting.
-    /// </summary>
-    public abstract class TextFormatter
-    {
-        /// <summary>
-        /// Gets the current <see cref="TextFormatter"/> that is used for non complex text formatting.
-        /// </summary>
-        public static TextFormatter Current
-        {
-            get
-            {
-                var current = AvaloniaLocator.Current.GetService<TextFormatter>();
-
-                if (current != null)
-                {
-                    return current;
-                }
-
-                current = new TextFormatterImpl();
-
-                AvaloniaLocator.CurrentMutable.Bind<TextFormatter>().ToConstant(current);
-
-                return current;
-            }
-        }
-
-        /// <summary>
-        /// Formats a text line.
-        /// </summary>
-        /// <param name="textSource">The text source.</param>
-        /// <param name="firstTextSourceIndex">The first character index to start the text line from.</param>
-        /// <param name="paragraphWidth">A <see cref="double"/> value that specifies the width of the paragraph that the line fills.</param>
-        /// <param name="paragraphProperties">A <see cref="TextParagraphProperties"/> value that represents paragraph properties,
-        /// such as TextWrapping, TextAlignment, or TextStyle.</param>
-        /// <param name="previousLineBreak">A <see cref="TextLineBreak"/> value that specifies the text formatter state,
-        /// in terms of where the previous line in the paragraph was broken by the text formatting process.</param>
-        /// <returns>The formatted line.</returns>
-        public abstract TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
-            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
deleted file mode 100644
index 101f273798..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
+++ /dev/null
@@ -1,595 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    internal class TextFormatterImpl : TextFormatter
-    {
-        /// <inheritdoc cref="TextFormatter.FormatLine"/>
-        public override TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
-            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null)
-        {
-            var textWrapping = paragraphProperties.TextWrapping;
-            FlowDirection flowDirection;
-            TextLineBreak? nextLineBreak = null;
-            List<ShapedTextCharacters> shapedRuns;
-
-            var textRuns = FetchTextRuns(textSource, firstTextSourceIndex,
-                out var textEndOfLine, out var textRange);
-
-            if (previousLineBreak?.RemainingCharacters != null)
-            {
-                flowDirection = previousLineBreak.FlowDirection;
-                shapedRuns = previousLineBreak.RemainingCharacters.ToList();
-                nextLineBreak = previousLineBreak;
-            }
-            else
-            {
-                shapedRuns = ShapeTextRuns(textRuns, paragraphProperties.FlowDirection,out flowDirection);
-
-                if(nextLineBreak == null && textEndOfLine != null)
-                {
-                    nextLineBreak = new TextLineBreak(textEndOfLine, flowDirection);
-                }
-            }
-
-            TextLineImpl textLine;
-
-            switch (textWrapping)
-            {
-                case TextWrapping.NoWrap:
-                    {
-                        TextLineImpl.SortRuns(shapedRuns);
-
-                        textLine = new TextLineImpl(shapedRuns, textRange, paragraphWidth, paragraphProperties,
-                        flowDirection, nextLineBreak);
-
-                        textLine.FinalizeLine();
-
-                        break;
-                    }
-                case TextWrapping.WrapWithOverflow:
-                case TextWrapping.Wrap:
-                    {
-                        textLine = PerformTextWrapping(shapedRuns, textRange, paragraphWidth, paragraphProperties,
-                            flowDirection, nextLineBreak);
-                        break;
-                    }
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(textWrapping));
-            }
-
-            return textLine;
-        }
-
-        /// <summary>
-        /// Split a sequence of runs into two segments at specified length.
-        /// </summary>
-        /// <param name="textRuns">The text run's.</param>
-        /// <param name="length">The length to split at.</param>
-        /// <returns>The split text runs.</returns>
-        internal static SplitResult<List<ShapedTextCharacters>> SplitShapedRuns(List<ShapedTextCharacters> textRuns, int length)
-        {
-            var currentLength = 0;
-
-            for (var i = 0; i < textRuns.Count; i++)
-            {
-                var currentRun = textRuns[i];
-
-                if (currentLength + currentRun.Text.Length < length)
-                {
-                    currentLength += currentRun.Text.Length;
-                    continue;
-                }
-
-                var firstCount = currentRun.Text.Length >= 1 ? i + 1 : i;
-
-                var first = new List<ShapedTextCharacters>(firstCount);
-
-                if (firstCount > 1)
-                {
-                    for (var j = 0; j < i; j++)
-                    {
-                        first.Add(textRuns[j]);
-                    }
-                }
-
-                var secondCount = textRuns.Count - firstCount;
-
-                if (currentLength + currentRun.Text.Length == length)
-                {
-                    var second = secondCount > 0 ? new List<ShapedTextCharacters>(secondCount) : null;
-
-                    if (second != null)
-                    {
-                        var offset = currentRun.Text.Length >= 1 ? 1 : 0;
-
-                        for (var j = 0; j < secondCount; j++)
-                        {
-                            second.Add(textRuns[i + j + offset]);
-                        }
-                    }
-
-                    first.Add(currentRun);
-
-                    return new SplitResult<List<ShapedTextCharacters>>(first, second);
-                }
-                else
-                {
-                    secondCount++;
-
-                    var second = new List<ShapedTextCharacters>(secondCount);
-
-                    var split = currentRun.Split(length - currentLength);
-
-                    first.Add(split.First);
-
-                    second.Add(split.Second!);
-
-                    for (var j = 1; j < secondCount; j++)
-                    {
-                        second.Add(textRuns[i + j]);
-                    }
-
-                    return new SplitResult<List<ShapedTextCharacters>>(first, second);
-                }
-            }
-
-            return new SplitResult<List<ShapedTextCharacters>>(textRuns, null);
-        }
-
-        /// <summary>
-        /// Shape specified text runs with specified paragraph embedding.
-        /// </summary>
-        /// <param name="textRuns">The text runs to shape.</param>
-        /// <param name="flowDirection">The paragraph embedding level.</param>
-        /// <param name="resolvedFlowDirection">The resolved flow direction.</param>
-        /// <returns>
-        /// A list of shaped text characters.
-        /// </returns>
-        private static List<ShapedTextCharacters> ShapeTextRuns(List<TextCharacters> textRuns,
-            FlowDirection flowDirection, out FlowDirection resolvedFlowDirection)
-        {
-            var shapedTextCharacters = new List<ShapedTextCharacters>();
-
-            var biDiData = new BidiData((sbyte)flowDirection);
-
-            foreach (var textRun in textRuns)
-            {
-                biDiData.Append(textRun.Text);
-            }
-
-            var biDi = BidiAlgorithm.Instance.Value!;
-
-            biDi.Process(biDiData);
-
-            var resolvedEmbeddingLevel = biDi.ResolveEmbeddingLevel(biDiData.Classes);
-
-            resolvedFlowDirection =
-                (resolvedEmbeddingLevel & 1) == 0 ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
-
-            foreach (var shapeableRuns in CoalesceLevels(textRuns, biDi.ResolvedLevels))
-            {
-                for (var index = 0; index < shapeableRuns.Count; index++)
-                {
-                    var currentRun = shapeableRuns[index];
-
-                    var shapedBuffer = TextShaper.Current.ShapeText(currentRun.Text, currentRun.Properties.Typeface.GlyphTypeface,
-                        currentRun.Properties.FontRenderingEmSize, currentRun.Properties.CultureInfo, currentRun.BidiLevel);
-
-                    var shapedCharacters = new ShapedTextCharacters(shapedBuffer, currentRun.Properties);
-
-
-                    shapedTextCharacters.Add(shapedCharacters);
-                }
-            }
-
-            return shapedTextCharacters;
-        }
-
-        /// <summary>
-        /// Coalesces ranges of the same bidi level to form <see cref="ShapeableTextCharacters"/>
-        /// </summary>
-        /// <param name="textCharacters">The text characters to form <see cref="ShapeableTextCharacters"/> from.</param>
-        /// <param name="levels">The bidi levels.</param>
-        /// <returns></returns>
-        private static IEnumerable<IList<ShapeableTextCharacters>> CoalesceLevels(
-            IReadOnlyList<TextCharacters> textCharacters,
-            ReadOnlySlice<sbyte> levels)
-        {
-            if (levels.Length == 0)
-            {
-                yield break;
-            }
-
-            var levelIndex = 0;
-            var runLevel = levels[0];
-
-            TextRunProperties? previousProperties = null;
-            TextCharacters? currentRun = null;
-            var runText = ReadOnlySlice<char>.Empty;
-
-            for (var i = 0; i < textCharacters.Count; i++)
-            {
-                var j = 0;
-                currentRun = textCharacters[i];
-                runText = currentRun.Text;
-
-                for (; j < runText.Length;)
-                {
-                    Codepoint.ReadAt(runText, j, out var count);
-
-                    if (levelIndex + 1 == levels.Length)
-                    {
-                        break;
-                    }
-
-                    levelIndex++;
-                    j += count;
-
-                    if (j == runText.Length)
-                    {
-                        yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
-
-                        runLevel = levels[levelIndex];
-
-                        continue;
-                    }
-
-                    if (levels[levelIndex] == runLevel)
-                    {
-                        continue;
-                    }
-
-                    // End of this run
-                    yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
-
-                    runText = runText.Skip(j);
-
-                    j = 0;
-
-                    // Move to next run
-                    runLevel = levels[levelIndex];
-                }
-            }
-
-            if (currentRun is null || runText.IsEmpty)
-            {
-                yield break;
-            }
-
-            yield return currentRun.GetShapeableCharacters(runText, runLevel, ref previousProperties);
-        }
-
-        /// <summary>
-        /// Fetches text runs.
-        /// </summary>
-        /// <param name="textSource">The text source.</param>
-        /// <param name="firstTextSourceIndex">The first text source index.</param>
-        /// <param name="endOfLine"></param>
-        /// <param name="textRange"></param>
-        /// <returns>
-        /// The formatted text runs.
-        /// </returns>
-        private static List<TextCharacters> FetchTextRuns(ITextSource textSource, int firstTextSourceIndex,
-            out TextEndOfLine? endOfLine, out TextRange textRange)
-        {
-            var length = 0;
-
-            endOfLine = null;
-
-            var textRuns = new List<TextCharacters>();
-
-            var textRunEnumerator = new TextRunEnumerator(textSource, firstTextSourceIndex);
-
-            while (textRunEnumerator.MoveNext())
-            {
-                var textRun = textRunEnumerator.Current;
-
-                if(textRun == null)
-                {
-                    break;
-                }
-
-                switch (textRun)
-                {
-                    case TextCharacters textCharacters:
-                        {
-                            if (TryGetLineBreak(textCharacters, out var runLineBreak))
-                            {
-                                var splitResult = new TextCharacters(textCharacters.Text.Take(runLineBreak.PositionWrap),
-                                    textCharacters.Properties);
-
-                                textRuns.Add(splitResult);
-
-                                length += runLineBreak.PositionWrap;
-
-                                textRange = new TextRange(firstTextSourceIndex, length);
-
-                                return textRuns;
-                            }
-
-                            textRuns.Add(textCharacters);
-
-                            break;
-                        }
-                    case TextEndOfLine textEndOfLine:
-                        endOfLine = textEndOfLine;
-                        break;
-                }
-
-                length += textRun.Text.Length;
-            }
-
-            textRange = new TextRange(firstTextSourceIndex, length);
-
-            return textRuns;
-        }
-
-        private static bool TryGetLineBreak(TextRun textRun, out LineBreak lineBreak)
-        {
-            lineBreak = default;
-
-            if (textRun.Text.IsEmpty)
-            {
-                return false;
-            }
-
-            var lineBreakEnumerator = new LineBreakEnumerator(textRun.Text);
-
-            while (lineBreakEnumerator.MoveNext())
-            {
-                if (!lineBreakEnumerator.Current.Required)
-                {
-                    continue;
-                }
-
-                lineBreak = lineBreakEnumerator.Current;
-
-                return lineBreak.PositionWrap >= textRun.Text.Length || true;
-            }
-
-            return false;
-        }
-
-        private static int MeasureLength(IReadOnlyList<ShapedTextCharacters> textRuns, TextRange textRange,
-            double paragraphWidth)
-        {
-            var currentWidth = 0.0;
-            var lastCluster = textRange.Start;
-
-            foreach (var currentRun in textRuns)
-            {
-                for (var i = 0; i < currentRun.ShapedBuffer.Length; i++)
-                {
-                    var glyphInfo = currentRun.ShapedBuffer[i];
-
-                    if (currentWidth + glyphInfo.GlyphAdvance > paragraphWidth)
-                    {
-                        return lastCluster - textRange.Start;
-                    }
-
-                    lastCluster = glyphInfo.GlyphCluster;
-                    currentWidth += glyphInfo.GlyphAdvance;
-                }
-            }
-
-            return textRange.Length;
-        }
-
-        /// <summary>
-        /// Performs text wrapping returns a list of text lines.
-        /// </summary>
-        /// <param name="textRuns"></param>
-        /// <param name="textRange">The text range that is covered by the text runs.</param>
-        /// <param name="paragraphWidth">The paragraph width.</param>
-        /// <param name="paragraphProperties">The text paragraph properties.</param>
-        /// <param name="flowDirection"></param>
-        /// <param name="currentLineBreak">The current line break if the line was explicitly broken.</param>
-        /// <returns>The wrapped text line.</returns>
-        private static TextLineImpl PerformTextWrapping(List<ShapedTextCharacters> textRuns, TextRange textRange,
-            double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection flowDirection,
-            TextLineBreak? currentLineBreak)
-        {
-            var measuredLength = MeasureLength(textRuns, textRange, paragraphWidth);        
-
-            var currentLength = 0;
-
-            var lastWrapPosition = 0;
-
-            var currentPosition = 0;
-
-            for (var index = 0; index < textRuns.Count; index++)
-            {
-                var currentRun = textRuns[index];
-
-                var lineBreaker = new LineBreakEnumerator(currentRun.Text);
-
-                var breakFound = false;
-
-                while (lineBreaker.MoveNext())
-                {
-                    if (lineBreaker.Current.Required &&
-                        currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
-                    {
-                        //Explicit break found
-                        breakFound = true;
-
-                        currentPosition = currentLength + lineBreaker.Current.PositionWrap;
-
-                        break;
-                    }
-
-                    if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength)
-                    {
-                        if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
-                        {
-                            if (lastWrapPosition > 0)
-                            {
-                                currentPosition = lastWrapPosition;
-
-                                breakFound = true;
-
-                                break;
-                            }
-
-                            //Find next possible wrap position (overflow)
-                            if (index < textRuns.Count - 1)
-                            {
-                                if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
-                                {
-                                    //We already found the next possible wrap position.
-                                    breakFound = true;
-
-                                    currentPosition = currentLength + lineBreaker.Current.PositionWrap;
-
-                                    break;
-                                }
-
-                                while (lineBreaker.MoveNext() && index < textRuns.Count)
-                                {
-                                    currentPosition += lineBreaker.Current.PositionWrap;
-
-                                    if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
-                                    {
-                                        break;
-                                    }
-
-                                    index++;
-
-                                    if (index >= textRuns.Count)
-                                    {
-                                        break;
-                                    }
-
-                                    currentRun = textRuns[index];
-
-                                    lineBreaker = new LineBreakEnumerator(currentRun.Text);
-                                }
-                            }
-                            else
-                            {
-                                currentPosition = currentLength + lineBreaker.Current.PositionWrap;
-                            }
-
-                            breakFound = true;
-
-                            break;
-                        }
-
-                        //We overflowed so we use the last available wrap position.
-                        currentPosition = lastWrapPosition == 0 ? measuredLength : lastWrapPosition;
-
-                        breakFound = true;
-
-                        break;
-                    }
-
-                    if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
-                    {
-                        lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
-                    }
-                }
-
-                if (!breakFound)
-                {
-                    currentLength += currentRun.Text.Length;
-
-                    continue;
-                }
-
-                measuredLength = currentPosition;
-
-                break;
-            }
-
-            if (measuredLength == 0)
-            {
-                measuredLength = 1;
-            }
-
-            var splitResult = SplitShapedRuns(textRuns, measuredLength);
-
-            textRange = new TextRange(textRange.Start, measuredLength);
-
-            var remainingCharacters = splitResult.Second;
-
-            var lineBreak = remainingCharacters?.Count > 0 ?
-                new TextLineBreak(currentLineBreak?.TextEndOfLine, flowDirection, remainingCharacters) :
-                null;
-
-            if (lineBreak is null && currentLineBreak?.TextEndOfLine != null)
-            {
-                lineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, flowDirection);
-            }
-
-            TextLineImpl.SortRuns(splitResult.First);
-
-            var textLine = new TextLineImpl(splitResult.First, textRange, paragraphWidth, paragraphProperties, flowDirection,
-                lineBreak);
-
-            return textLine.FinalizeLine();
-        }
-
-        private struct TextRunEnumerator
-        {
-            private readonly ITextSource _textSource;
-            private int _pos;
-
-            public TextRunEnumerator(ITextSource textSource, int firstTextSourceIndex)
-            {
-                _textSource = textSource;
-                _pos = firstTextSourceIndex;
-                Current = null;
-            }
-
-            // ReSharper disable once MemberHidesStaticFromOuterClass
-            public TextRun? Current { get; private set; }
-
-            public bool MoveNext()
-            {
-                Current = _textSource.GetTextRun(_pos);
-
-                if (Current is null)
-                {
-                    return false;
-                }
-
-                if (Current.TextSourceLength == 0)
-                {
-                    return false;
-                }
-
-                _pos += Current.TextSourceLength;
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Creates a shaped symbol.
-        /// </summary>
-        /// <param name="textRun">The symbol run to shape.</param>
-        /// <param name="flowDirection">The flow direction.</param>
-        /// <returns>
-        /// The shaped symbol.
-        /// </returns>
-        internal static ShapedTextCharacters CreateSymbol(TextRun textRun, FlowDirection flowDirection)
-        {
-            var textShaper = TextShaper.Current;
-
-            var glyphTypeface = textRun.Properties!.Typeface.GlyphTypeface;
-
-            var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
-
-            var cultureInfo = textRun.Properties.CultureInfo;
-
-            var shapedBuffer = textShaper.ShapeText(textRun.Text, glyphTypeface, fontRenderingEmSize, cultureInfo, (sbyte)flowDirection);
-
-            return new ShapedTextCharacters(shapedBuffer, textRun.Properties);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
deleted file mode 100644
index 64f0eaab53..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
+++ /dev/null
@@ -1,638 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Represents a multi line text layout.
-    /// </summary>
-    public class TextLayout
-    {
-        private static readonly char[] s_empty = { ' ' };
-
-        private readonly ReadOnlySlice<char> _text;
-        private readonly TextParagraphProperties _paragraphProperties;
-        private readonly IReadOnlyList<ValueSpan<TextRunProperties>>? _textStyleOverrides;
-        private readonly TextTrimming _textTrimming;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextLayout" /> class.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="typeface">The typeface.</param>
-        /// <param name="fontSize">Size of the font.</param>
-        /// <param name="foreground">The foreground.</param>
-        /// <param name="textAlignment">The text alignment.</param>
-        /// <param name="textWrapping">The text wrapping.</param>
-        /// <param name="textTrimming">The text trimming.</param>
-        /// <param name="textDecorations">The text decorations.</param>
-        /// <param name="flowDirection">The text flow direction.</param>
-        /// <param name="maxWidth">The maximum width.</param>
-        /// <param name="maxHeight">The maximum height.</param>
-        /// <param name="lineHeight">The height of each line of text.</param>
-        /// <param name="maxLines">The maximum number of text lines.</param>
-        /// <param name="textStyleOverrides">The text style overrides.</param>
-        public TextLayout(
-            string? text,
-            Typeface typeface,
-            double fontSize,
-            IBrush? foreground,
-            TextAlignment textAlignment = TextAlignment.Left,
-            TextWrapping textWrapping = TextWrapping.NoWrap,
-            TextTrimming textTrimming = TextTrimming.None,
-            TextDecorationCollection? textDecorations = null,
-            FlowDirection flowDirection = FlowDirection.LeftToRight,
-            double maxWidth = double.PositiveInfinity,
-            double maxHeight = double.PositiveInfinity,
-            double lineHeight = double.NaN,
-            int maxLines = 0,
-            IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null)
-        {
-            _text = string.IsNullOrEmpty(text) ?
-                new ReadOnlySlice<char>() :
-                new ReadOnlySlice<char>(text.AsMemory());
-
-            _paragraphProperties =
-                CreateTextParagraphProperties(typeface, fontSize, foreground, textAlignment, textWrapping,
-                    textDecorations, flowDirection, lineHeight);
-
-            _textTrimming = textTrimming;
-
-            _textStyleOverrides = textStyleOverrides;
-
-            LineHeight = lineHeight;
-
-            MaxWidth = maxWidth;
-
-            MaxHeight = maxHeight;
-
-            MaxLines = maxLines;
-
-            TextLines = CreateTextLines();
-        }
-
-        /// <summary>
-        /// Gets or sets the height of each line of text.
-        /// </summary>
-        /// <remarks>
-        /// A value of NaN (equivalent to an attribute value of "Auto") indicates that the line height
-        /// is determined automatically from the current font characteristics. The default is NaN.
-        /// </remarks>
-        public double LineHeight { get; }
-
-        /// <summary>
-        /// Gets the maximum width.
-        /// </summary>
-        public double MaxWidth { get; }
-
-        /// <summary>
-        /// Gets the maximum height.
-        /// </summary>
-        public double MaxHeight { get; }
-
-        /// <summary>
-        /// Gets the maximum number of text lines.
-        /// </summary>
-        public int MaxLines { get; }
-
-        /// <summary>
-        /// Gets the text lines.
-        /// </summary>
-        /// <value>
-        /// The text lines.
-        /// </value>
-        public IReadOnlyList<TextLine> TextLines { get; private set; }
-
-        /// <summary>
-        /// Gets the size of the layout.
-        /// </summary>
-        /// <value>
-        /// The bounds.
-        /// </value>
-        public Size Size { get; private set; }
-
-        /// <summary>
-        /// Draws the text layout.
-        /// </summary>
-        /// <param name="context">The drawing context.</param>
-        /// <param name="origin">The origin.</param>
-        public void Draw(DrawingContext context, Point origin)
-        {
-            if (!TextLines.Any())
-            {
-                return;
-            }
-
-            var (currentX, currentY) = origin;
-
-            foreach (var textLine in TextLines)
-            {
-                textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
-
-                currentY += textLine.Height;
-            }
-        }
-
-        /// <summary>
-        /// Get the pixel location relative to the top-left of the layout box given the text position.
-        /// </summary>
-        /// <param name="textPosition">The text position.</param>
-        /// <returns></returns>
-        public Rect HitTestTextPosition(int textPosition)
-        {
-            if (TextLines.Count == 0)
-            {
-                return new Rect();
-            }
-
-            if (textPosition < 0 || textPosition >= _text.Length)
-            {
-                var lastLine = TextLines[TextLines.Count - 1];
-
-                var lineX = lastLine.Width;
-
-                var lineY = Size.Height - lastLine.Height;
-
-                return new Rect(lineX, lineY, 0, lastLine.Height);
-            }
-
-            var currentY = 0.0;
-
-            foreach (var textLine in TextLines)
-            {
-                if (textLine.TextRange.End < textPosition)
-                {
-                    currentY += textLine.Height;
-
-                    continue;
-                }
-
-                var characterHit = new CharacterHit(textPosition);
-
-                var startX = textLine.GetDistanceFromCharacterHit(characterHit);
-
-                var nextCharacterHit = textLine.GetNextCaretCharacterHit(characterHit);
-
-                var endX = textLine.GetDistanceFromCharacterHit(nextCharacterHit);
-
-                return new Rect(startX, currentY, endX - startX, textLine.Height);
-            }
-
-            return new Rect();
-        }
-
-        public IEnumerable<Rect> HitTestTextRange(int start, int length)
-        {
-            if (start + length <= 0)
-            {
-                return Array.Empty<Rect>();
-            }
-
-            var result = new List<Rect>(TextLines.Count);
-            
-            var currentY = 0d;
-            var currentPosition = 0;
-            var currentRect = Rect.Empty;
-
-            foreach (var textLine in TextLines)
-            {
-                //Current line isn't covered.
-                if (currentPosition + textLine.TextRange.Length <= start)
-                {
-                    currentY += textLine.Height;
-                    currentPosition += textLine.TextRange.Length;
-
-                    continue;
-                }
-
-                //The whole line is covered.
-                if (currentPosition >= start && start + length > currentPosition + textLine.TextRange.Length)
-                {
-                    currentRect = new Rect(textLine.Start, currentY, textLine.WidthIncludingTrailingWhitespace,
-                        textLine.Height);
-                    
-                    result.Add(currentRect);
-                    
-                    currentY += textLine.Height;
-                    currentPosition += textLine.TextRange.Length;
-                    
-                    continue;
-                }
-                
-                var startX = textLine.Start;
-                
-                //A portion of the line is covered.
-                for (var index = 0; index < textLine.TextRuns.Count; index++)
-                {
-                    var currentRun = (ShapedTextCharacters)textLine.TextRuns[index];
-                    ShapedTextCharacters? nextRun = null;
-
-                    if (index + 1 < textLine.TextRuns.Count)
-                    {
-                        nextRun = (ShapedTextCharacters)textLine.TextRuns[index + 1];
-                    }
-
-                    if (nextRun != null)
-                    {
-                        if (nextRun.Text.Start < currentRun.Text.Start && start + length < currentRun.Text.End)
-                        {
-                            goto skip;
-                        }
-
-                        if (currentRun.Text.Start >= start + length)
-                        {
-                            goto skip;
-                        }
-
-                        if (currentRun.Text.Start > nextRun.Text.Start && currentRun.Text.Start < start)
-                        {
-                            goto skip;
-                        }
-
-                        if (currentRun.Text.End < start)
-                        {
-                            goto skip;
-                        }
-                        
-                        goto noop;
-                        
-                        skip:
-                        {
-                            startX += currentRun.Size.Width;
-
-                            currentPosition = currentRun.Text.Start;
-                        }
-                        
-                        continue;
-                        
-                        noop:{ }
-                    }
-
-                    var endOffset = currentRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(start + length) :
-                            new CharacterHit(start));
-
-                    var endX = startX + endOffset;
-                    
-                    var startOffset = currentRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(start) :
-                            new CharacterHit(start + length));
-
-                    startX += startOffset;
-
-                    var characterHit = currentRun.GlyphRun.IsLeftToRight ?
-                        currentRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _) :
-                        currentRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
-                    
-                    currentPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-                    if(nextRun != null)
-                    {
-                        if (currentRun.ShapedBuffer.IsLeftToRight == nextRun.ShapedBuffer.IsLeftToRight)
-                        {
-                            endOffset = nextRun.GlyphRun.GetDistanceFromCharacterHit(
-                                nextRun.ShapedBuffer.IsLeftToRight ?
-                                    new CharacterHit(start + length) :
-                                    new CharacterHit(start));
-                            
-                            index++;
-
-                            endX += endOffset;
-
-                            currentRun = nextRun;
-
-                            if (currentRun.ShapedBuffer.IsLeftToRight)
-                            {
-                                characterHit = nextRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
-
-                                currentPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-                            }
-                        }
-                    }
-
-                    if (endX < startX)
-                    {
-                        (endX, startX) = (startX, endX);
-                    }
-
-                    var width = endX - startX;
-
-                    if (result.Count > 0 && MathUtilities.AreClose(currentRect.Top, currentY) &&
-                        MathUtilities.AreClose(currentRect.Right, startX))
-                    {
-                        result[result.Count - 1] = currentRect.WithWidth(currentRect.Width + width);
-                    }
-                    else
-                    {
-                        currentRect = new Rect(startX, currentY, width, textLine.Height);
-                        
-                        result.Add(currentRect);
-                    }
-                    
-                    if (currentRun.ShapedBuffer.IsLeftToRight)
-                    {
-                        if (nextRun != null)
-                        {
-                            if (nextRun.Text.Start > currentRun.Text.Start && nextRun.Text.Start >= start + length)
-                            {
-                                break;
-                            }
-                          
-                            currentPosition = nextRun.Text.End;
-                        }
-                        else
-                        {
-                            if (currentPosition >= start + length)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (currentPosition <= start)
-                        {
-                            break;
-                        }
-                    }
-
-                    if (!currentRun.ShapedBuffer.IsLeftToRight && currentPosition != currentRun.Text.Start)
-                    {
-                        endX += currentRun.GlyphRun.Size.Width - endOffset;
-                    }
-
-                    startX = endX;
-                }
-
-                if (currentPosition == start || currentPosition == start + length)
-                {
-                    break;
-                }
-                
-                if (textLine.TextRange.Start + textLine.TextRange.Length >= start + length)
-                {
-                    break;
-                }
-
-                currentY += textLine.Height;
-            }
-
-            return result;
-        }
-
-        public TextHitTestResult HitTestPoint(in Point point)
-        {
-            var currentY = 0d;
-
-            var lineIndex = 0;
-            TextLine? currentLine = null;
-            CharacterHit characterHit;
-
-            for (; lineIndex < TextLines.Count; lineIndex++)
-            {
-                currentLine = TextLines[lineIndex];
-
-                if (currentY + currentLine.Height > point.Y)
-                {
-                    characterHit = currentLine.GetCharacterHitFromDistance(point.X);
-
-                    return GetHitTestResult(currentLine, characterHit, point);
-                }
-
-                currentY += currentLine.Height;
-            }
-
-            if (currentLine is null)
-            {
-                return new TextHitTestResult();
-            }
-
-            characterHit = currentLine.GetCharacterHitFromDistance(point.X);
-
-            return GetHitTestResult(currentLine, characterHit, point);
-        }
-
-        
-        public int GetLineIndexFromCharacterIndex(int charIndex, bool trailingEdge)
-        {
-            if (charIndex < 0)
-            {
-                return 0;
-            }
-
-            if (charIndex > _text.Length)
-            {
-                return TextLines.Count - 1;
-            }
-
-            for (var index = 0; index < TextLines.Count; index++)
-            {
-                var textLine = TextLines[index];
-
-                if (textLine.TextRange.Start + textLine.TextRange.Length < charIndex)
-                {
-                    continue;
-                }
-
-                if (charIndex >= textLine.TextRange.Start && charIndex <= textLine.TextRange.End + (trailingEdge ? 1 : 0))
-                {
-                    return index;
-                }
-            }
-
-            return TextLines.Count - 1;
-        }
-
-        private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit characterHit, Point point)
-        {
-            var (x, y) = point;
-
-            var lastTrailingIndex = textLine.TextRange.Start + textLine.TextRange.Length;
-
-            var isInside = x >= 0 && x <= textLine.Width && y >= 0 && y <= textLine.Height;
-
-            if (x >= textLine.Width && textLine.TextRange.Length > 0 && textLine.NewLineLength > 0)
-            {
-                lastTrailingIndex -= textLine.NewLineLength;
-            }
-
-            var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-            var isTrailing = lastTrailingIndex == textPosition && characterHit.TrailingLength > 0 ||
-                             y > Size.Height;
-
-            if (textPosition == textLine.TextRange.Start + textLine.TextRange.Length)
-            {
-                textPosition -= textLine.NewLineLength;
-            }
-
-            if (textLine.NewLineLength > 0 && textPosition + textLine.NewLineLength ==
-                characterHit.FirstCharacterIndex + characterHit.TrailingLength)
-            {
-                characterHit = new CharacterHit(characterHit.FirstCharacterIndex);
-            }
-
-            return new TextHitTestResult(characterHit, textPosition, isInside, isTrailing);
-        }
-
-        /// <summary>
-        /// Creates the default <see cref="TextParagraphProperties"/> that are used by the <see cref="TextFormatter"/>.
-        /// </summary>
-        /// <param name="typeface">The typeface.</param>
-        /// <param name="fontSize">The font size.</param>
-        /// <param name="foreground">The foreground.</param>
-        /// <param name="textAlignment">The text alignment.</param>
-        /// <param name="textWrapping">The text wrapping.</param>
-        /// <param name="textDecorations">The text decorations.</param>
-        /// <param name="flowDirection">The text flow direction.</param>
-        /// <param name="lineHeight">The height of each line of text.</param>
-        /// <returns></returns>
-        private static TextParagraphProperties CreateTextParagraphProperties(Typeface typeface, double fontSize,
-            IBrush? foreground, TextAlignment textAlignment, TextWrapping textWrapping,
-            TextDecorationCollection? textDecorations, FlowDirection flowDirection, double lineHeight)
-        {
-            var textRunStyle = new GenericTextRunProperties(typeface, fontSize, textDecorations, foreground);
-
-            return new GenericTextParagraphProperties(flowDirection, textAlignment, true, false,
-                textRunStyle, textWrapping, lineHeight, 0);
-        }
-
-        /// <summary>
-        /// Updates the current bounds.
-        /// </summary>
-        /// <param name="textLine">The text line.</param>
-        /// <param name="width">The current width.</param>
-        /// <param name="height">The current height.</param>
-        private static void UpdateBounds(TextLine textLine, ref double width, ref double height)
-        {
-            var lineWidth = textLine.WidthIncludingTrailingWhitespace + textLine.Start * 2;
-
-            if (width < lineWidth)
-            {
-                width = lineWidth;
-            }
-
-            height += textLine.Height;
-        }
-
-        /// <summary>
-        /// Creates an empty text line.
-        /// </summary>
-        /// <returns>The empty text line.</returns>
-        private TextLine CreateEmptyTextLine(int startingIndex)
-        {
-            var flowDirection = _paragraphProperties.FlowDirection;
-            var properties = _paragraphProperties.DefaultTextRunProperties;
-            var glyphTypeface = properties.Typeface.GlyphTypeface;
-            var text = new ReadOnlySlice<char>(s_empty, startingIndex, 1);
-            var glyph = glyphTypeface.GetGlyph(s_empty[0]);
-            var glyphInfos = new[] { new GlyphInfo(glyph, startingIndex) };
-
-            var shapedBuffer = new ShapedBuffer(text, glyphInfos, glyphTypeface, properties.FontRenderingEmSize,
-                (sbyte)flowDirection);
-
-            var textRuns = new List<ShapedTextCharacters> { new ShapedTextCharacters(shapedBuffer, properties) };
-
-            var textRange = new TextRange(startingIndex, 1);
-
-            return new TextLineImpl(textRuns, textRange, MaxWidth, _paragraphProperties, flowDirection).FinalizeLine();
-        }
-
-        private IReadOnlyList<TextLine> CreateTextLines()
-        {
-            if (_text.IsEmpty || MathUtilities.IsZero(MaxWidth) || MathUtilities.IsZero(MaxHeight))
-            {
-                var textLine = CreateEmptyTextLine(0);
-
-                Size = new Size(0, textLine.Height);
-
-                return new List<TextLine> { textLine };
-            }
-
-            var textLines = new List<TextLine>();
-
-            double width = 0.0, height = 0.0;
-
-            var currentPosition = 0;
-
-            var textSource = new FormattedTextSource(_text,
-                _paragraphProperties.DefaultTextRunProperties, _textStyleOverrides);
-
-            TextLine? previousLine = null;
-
-            while (currentPosition < _text.Length)
-            {
-                var textLine = TextFormatter.Current.FormatLine(textSource, currentPosition, MaxWidth,
-                    _paragraphProperties, previousLine?.TextLineBreak);
-
-                currentPosition += textLine.TextRange.Length;
-
-                if (textLines.Count > 0)
-                {
-                    if (textLines.Count == MaxLines || !double.IsPositiveInfinity(MaxHeight) &&
-                        height + textLine.Height > MaxHeight)
-                    {
-                        if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
-                        {
-                            var collapsedLine =
-                                previousLine.Collapse(GetCollapsingProperties(MaxWidth));
-
-                            textLines[textLines.Count - 1] = collapsedLine;
-                        }
-
-                        break;
-                    }
-                }
-
-                var hasOverflowed = textLine.HasOverflowed;
-
-                if (hasOverflowed && _textTrimming != TextTrimming.None)
-                {
-                    textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
-                }
-
-                textLines.Add(textLine);
-
-                UpdateBounds(textLine, ref width, ref height);
-
-                previousLine = textLine;
-
-                if (currentPosition != _text.Length || textLine.NewLineLength <= 0)
-                {
-                    continue;
-                }
-
-                var emptyTextLine = CreateEmptyTextLine(currentPosition);
-
-                textLines.Add(emptyTextLine);
-
-                UpdateBounds(emptyTextLine, ref width, ref height);
-            }
-
-            Size = new Size(width, height);
-
-            return textLines;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="TextCollapsingProperties"/> for current text trimming mode.
-        /// </summary>
-        /// <param name="width">The collapsing width.</param>
-        /// <returns>The <see cref="TextCollapsingProperties"/>.</returns>
-        private TextCollapsingProperties GetCollapsingProperties(double width)
-        {
-            return _textTrimming switch
-            {
-                TextTrimming.CharacterEllipsis => new TextTrailingCharacterEllipsis(width,
-                    _paragraphProperties.DefaultTextRunProperties),
-                TextTrimming.WordEllipsis => new TextTrailingWordEllipsis(width,
-                    _paragraphProperties.DefaultTextRunProperties),
-                _ => throw new ArgumentOutOfRangeException(),
-            };
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs
deleted file mode 100644
index 130d0e9c39..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Represents a line of text that is used for text rendering.
-    /// </summary>
-    public abstract class TextLine
-    {
-        /// <summary>
-        /// Gets the text runs that are contained within a line.
-        /// </summary>
-        /// <value>
-        /// The contained text runs.
-        /// </value>
-        public abstract IReadOnlyList<TextRun> TextRuns { get; }
-        
-        /// <summary>
-        /// Gets the text range that is covered by the line.
-        /// </summary>
-        /// <value>
-        /// The text range that is covered by the line.
-        /// </value>
-        public abstract TextRange TextRange { get; }
-
-        /// <summary>
-        /// Gets the state of the line when broken by line breaking process.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="TextLineBreak"/> value that represents the line break.
-        /// </returns>
-        public abstract TextLineBreak? TextLineBreak { get; }
-
-        /// <summary>
-        /// Gets the distance from the top to the baseline of the current TextLine object.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="double"/> that represents the baseline distance.
-        /// </returns>
-        public abstract double Baseline { get; }
-
-        /// <summary>
-        /// Gets the distance from the top-most to bottom-most black pixel in a line.
-        /// </summary>
-        /// <returns>
-        /// A value that represents the extent distance.
-        /// </returns>
-        public abstract double Extent { get; }
-
-        /// <summary>
-        /// Gets a value that indicates whether the line is collapsed.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c>, if the line is collapsed; otherwise, <c>false</c>.
-        /// </returns>
-        public abstract bool HasCollapsed { get; }
-
-        /// <summary>
-        /// Gets a value that indicates whether content of the line overflows the specified paragraph width.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c>, it the line overflows the specified paragraph width; otherwise, <c>false</c>.
-        /// </returns>
-        public abstract bool HasOverflowed { get; }
-
-        /// <summary>
-        /// Gets the height of a line of text.
-        /// </summary>
-        /// <returns>
-        /// The text line height.
-        /// </returns>
-        public abstract double Height { get; }
-
-        /// <summary>
-        /// Gets the number of newline characters at the end of a line.
-        /// </summary>
-        /// <returns>
-        /// The number of newline characters.
-        /// </returns>
-        public abstract int NewLineLength { get; }
-        
-        /// <summary>
-        /// Gets the distance that black pixels extend beyond the bottom alignment edge of a line.
-        /// </summary>
-        /// <returns>
-        /// The overhang after distance.
-        /// </returns>
-        public abstract double OverhangAfter { get; }
-
-        /// <summary>
-        /// Gets the distance that black pixels extend prior to the left leading alignment edge of the line.
-        /// </summary>
-        /// <returns>
-        /// The overhang leading distance.
-        /// </returns>
-        public abstract double OverhangLeading { get; }
-
-        /// <summary>
-        /// Gets the distance that black pixels extend following the right trailing alignment edge of the line.
-        /// </summary>
-        /// <returns>
-        /// The overhang trailing distance.
-        /// </returns>
-        public abstract double OverhangTrailing { get; }
-
-        /// <summary>
-        /// Gets the distance from the start of a paragraph to the starting point of a line.
-        /// </summary>
-        /// <returns>
-        /// The distance from the start of a paragraph to the starting point of a line.
-        /// </returns>
-        public abstract double Start { get; }
-
-        /// <summary>
-        /// Gets the number of whitespace code points beyond the last non-blank character in a line.
-        /// </summary>
-        /// <returns>
-        /// The number of whitespace code points beyond the last non-blank character in a line.
-        /// </returns>
-        public abstract int TrailingWhitespaceLength { get; }
-
-        /// <summary>
-        /// Gets the width of a line of text, excluding trailing whitespace characters.
-        /// </summary>
-        /// <returns>
-        /// The text line width, excluding trailing whitespace characters.
-        /// </returns>
-        public abstract double Width { get; }
-
-        /// <summary>
-        /// Gets the width of a line of text, including trailing whitespace characters.
-        /// </summary>
-        /// <returns>
-        /// The text line width, including trailing whitespace characters.
-        /// </returns>
-        public abstract double WidthIncludingTrailingWhitespace { get; }
-
-        /// <summary>
-        /// Draws the <see cref="TextLine"/> at the given origin.
-        /// </summary>
-        /// <param name="drawingContext">The drawing context.</param>
-        /// <param name="lineOrigin"></param>
-        public abstract void Draw(DrawingContext drawingContext, Point lineOrigin);
-
-        /// <summary>
-        /// Create a collapsed line based on collapsed text properties.
-        /// </summary>
-        /// <param name="collapsingPropertiesList">A list of <see cref="TextCollapsingProperties"/>
-        /// objects that represent the collapsed text properties.</param>
-        /// <returns>
-        /// A <see cref="TextLine"/> value that represents a collapsed line that can be displayed.
-        /// </returns>
-        public abstract TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList);
-
-        /// <summary>
-        /// Gets the character hit corresponding to the specified distance from the beginning of the line.
-        /// </summary>
-        /// <param name="distance">A <see cref="double"/> value that represents the distance from the beginning of the line.</param>
-        /// <returns>The <see cref="CharacterHit"/> object at the specified distance from the beginning of the line.</returns>
-        public abstract CharacterHit GetCharacterHitFromDistance(double distance);
-
-        /// <summary>
-        /// Gets the distance from the beginning of the line to the specified character hit.
-        /// <see cref="CharacterHit"/>.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> object whose distance you want to query.</param>
-        /// <returns>A <see cref="double"/> that represents the distance from the beginning of the line.</returns>
-        public abstract double GetDistanceFromCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the next character hit for caret navigation.
-        /// </summary>
-        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
-        /// <returns>The next <see cref="CharacterHit"/>.</returns>
-        public abstract CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the previous character hit for caret navigation.
-        /// </summary>
-        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
-        /// <returns>The previous <see cref="CharacterHit"/>.</returns>
-        public abstract CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the previous character hit after backspacing.
-        /// </summary>
-        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
-        /// <returns>The <see cref="CharacterHit"/> after backspacing.</returns>
-        public abstract CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the text line offset x.
-        /// </summary>
-        /// <param name="width">The line width.</param>
-        /// <param name="widthIncludingTrailingWhitespace">The paragraph width including whitespace.</param>
-        /// <param name="paragraphWidth">The paragraph width.</param>
-        /// <param name="textAlignment">The text alignment.</param>
-        /// <param name="flowDirection">The flow direction of the line.</param>
-        /// <returns>The paragraph offset.</returns>
-        internal static double GetParagraphOffsetX(double width, double widthIncludingTrailingWhitespace,
-            double paragraphWidth, TextAlignment textAlignment, FlowDirection flowDirection)
-        {
-            if (double.IsPositiveInfinity(paragraphWidth))
-            {
-                return 0;
-            }
-
-            if (flowDirection == FlowDirection.LeftToRight)
-            {
-                switch (textAlignment)
-                {
-                    case TextAlignment.Center:
-                        return Math.Max(0, (paragraphWidth - width) / 2);
-
-                    case TextAlignment.Right:
-                        return Math.Max(0, paragraphWidth - widthIncludingTrailingWhitespace);
-
-                    default:
-                        return 0;
-                }
-            }
-
-            switch (textAlignment)
-            {
-                case TextAlignment.Center:
-                    return Math.Max(0, (paragraphWidth - width) / 2);
-
-                case TextAlignment.Right:
-                    return 0;
-
-                default:
-                    return Math.Max(0, paragraphWidth - widthIncludingTrailingWhitespace);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs
deleted file mode 100644
index be9661c2bf..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting
-{
-    public class TextLineBreak
-    {
-        public TextLineBreak(TextEndOfLine? textEndOfLine = null, FlowDirection flowDirection = FlowDirection.LeftToRight, 
-            IReadOnlyList<ShapedTextCharacters>? remainingCharacters = null)
-        {
-            TextEndOfLine = textEndOfLine;
-            FlowDirection = flowDirection;
-            RemainingCharacters = remainingCharacters;
-        }
-
-        /// <summary>
-        /// Get the end of line run.
-        /// </summary>
-        public TextEndOfLine? TextEndOfLine { get; }
-
-        /// <summary>
-        /// Get the flow direction for remaining characters.
-        /// </summary>
-        public FlowDirection FlowDirection { get; }
-        
-        /// <summary>
-        /// Get the remaining shaped characters that were split up by the <see cref="TextFormatter"/> during the formatting process.
-        /// </summary>
-        public IReadOnlyList<ShapedTextCharacters>? RemainingCharacters { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
deleted file mode 100644
index 53e44de779..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
+++ /dev/null
@@ -1,838 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    internal class TextLineImpl : TextLine
-    {
-        private static readonly Comparer<int> s_compareStart = Comparer<int>.Default;
-
-        private static readonly Comparison<ShapedTextCharacters> s_compareLogicalOrder =
-            (a, b) => s_compareStart.Compare(a.Text.Start, b.Text.Start);
-
-        private readonly List<ShapedTextCharacters> _textRuns;
-        private readonly double _paragraphWidth;
-        private readonly TextParagraphProperties _paragraphProperties;
-        private TextLineMetrics _textLineMetrics;
-        private readonly FlowDirection _flowDirection;
-
-        public TextLineImpl(List<ShapedTextCharacters> textRuns, TextRange textRange, double paragraphWidth,
-            TextParagraphProperties paragraphProperties, FlowDirection flowDirection = FlowDirection.LeftToRight, 
-            TextLineBreak? lineBreak = null, bool hasCollapsed = false)
-        {
-            TextRange = textRange;
-            TextLineBreak = lineBreak;
-            HasCollapsed = hasCollapsed;
-
-            _textRuns =  textRuns;
-            _paragraphWidth = paragraphWidth;
-            _paragraphProperties = paragraphProperties;
-
-            _flowDirection = flowDirection;
-        }
-
-        /// <inheritdoc/>
-        public override IReadOnlyList<TextRun> TextRuns => _textRuns;
-
-        /// <inheritdoc/>
-        public override TextRange TextRange { get; }
-
-        /// <inheritdoc/>
-        public override TextLineBreak? TextLineBreak { get; }
-
-        /// <inheritdoc/>
-        public override bool HasCollapsed { get; }
-
-        /// <inheritdoc/>
-        public override bool HasOverflowed => _textLineMetrics.HasOverflowed;
-
-        /// <inheritdoc/>
-        public override double Baseline => _textLineMetrics.TextBaseline;
-
-        /// <inheritdoc/>
-        public override double Extent => _textLineMetrics.Height;
-
-        /// <inheritdoc/>
-        public override double Height => _textLineMetrics.Height;
-
-        /// <inheritdoc/>
-        public override int NewLineLength => _textLineMetrics.NewLineLength;
-
-        /// <inheritdoc/>
-        public override double OverhangAfter => 0;
-
-        /// <inheritdoc/>
-        public override double OverhangLeading => 0;
-
-        /// <inheritdoc/>
-        public override double OverhangTrailing => 0;
-
-        /// <inheritdoc/>
-        public override int TrailingWhitespaceLength => _textLineMetrics.TrailingWhitespaceLength;
-
-        /// <inheritdoc/>
-        public override double Start => _textLineMetrics.Start;
-
-        /// <inheritdoc/>
-        public override double Width => _textLineMetrics.Width;
-
-        /// <inheritdoc/>
-        public override double WidthIncludingTrailingWhitespace => _textLineMetrics.WidthIncludingTrailingWhitespace;
-
-        /// <inheritdoc/>
-        public override void Draw(DrawingContext drawingContext, Point lineOrigin)
-        {
-            var (currentX, currentY) = lineOrigin;
-
-            foreach (var textRun in _textRuns)
-            {
-                var offsetY = Baseline - textRun.GlyphRun.BaselineOrigin.Y;
-
-                textRun.Draw(drawingContext, new Point(currentX, currentY + offsetY));
-
-                currentX += textRun.Size.Width;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList)
-        {
-            if (collapsingPropertiesList.Length == 0)
-            {
-                return this;
-            }
-
-            var collapsingProperties = collapsingPropertiesList[0];
-
-            var runIndex = 0;
-            var currentWidth = 0.0;
-            var textRange = TextRange;
-            var collapsedLength = 0;
-
-            var shapedSymbol = TextFormatterImpl.CreateSymbol(collapsingProperties.Symbol, _paragraphProperties.FlowDirection);
-
-            var availableWidth = collapsingProperties.Width - shapedSymbol.GlyphRun.Size.Width;
-
-            while (runIndex < _textRuns.Count)
-            {
-                var currentRun = _textRuns[runIndex];
-
-                currentWidth += currentRun.Size.Width;
-
-                if (currentWidth > availableWidth)
-                {
-                    if (currentRun.TryMeasureCharacters(availableWidth, out var measuredLength))
-                    {
-                        if (collapsingProperties.Style == TextCollapsingStyle.TrailingWord &&
-                            measuredLength < textRange.End)
-                        {
-                            var currentBreakPosition = 0;
-
-                            var lineBreaker = new LineBreakEnumerator(currentRun.Text);
-
-                            while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
-                            {
-                                var nextBreakPosition = lineBreaker.Current.PositionMeasure;
-
-                                if (nextBreakPosition == 0)
-                                {
-                                    break;
-                                }
-
-                                if (nextBreakPosition >= measuredLength)
-                                {
-                                    break;
-                                }
-
-                                currentBreakPosition = nextBreakPosition;
-                            }
-
-                            measuredLength = currentBreakPosition;
-                        }
-                    }
-
-                    collapsedLength += measuredLength;
-
-                    var splitResult = TextFormatterImpl.SplitShapedRuns(_textRuns, collapsedLength);
-
-                    var shapedTextCharacters = new List<ShapedTextCharacters>(splitResult.First.Count + 1);
-
-                    shapedTextCharacters.AddRange(splitResult.First);
-
-                    SortRuns(shapedTextCharacters);
-
-                    shapedTextCharacters.Add(shapedSymbol);
-
-                    textRange = new TextRange(textRange.Start, collapsedLength);
-
-                    var textLine = new TextLineImpl(shapedTextCharacters, textRange, _paragraphWidth, _paragraphProperties,
-                        _flowDirection, TextLineBreak, true);
-
-                    return textLine.FinalizeLine();
-                }
-
-                availableWidth -= currentRun.Size.Width;
-
-                collapsedLength += currentRun.GlyphRun.Characters.Length;
-
-                runIndex++;
-            }
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetCharacterHitFromDistance(double distance)
-        {
-            distance -= Start;
-            
-            if (distance <= 0)
-            {
-                // hit happens before the line, return the first position
-                var firstRun = _textRuns[0];
-
-                return firstRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
-            }
-
-            // process hit that happens within the line
-            var characterHit = new CharacterHit();
-
-            foreach (var run in _textRuns)
-            {
-                characterHit = run.GlyphRun.GetCharacterHitFromDistance(distance, out _);
-
-                if (distance <= run.Size.Width)
-                {
-                    break;
-                }
-
-                distance -= run.Size.Width;
-            }
-
-            return characterHit;
-        }
-
-        /// <inheritdoc/>
-        public override double GetDistanceFromCharacterHit(CharacterHit characterHit)
-        {
-            var characterIndex = characterHit.FirstCharacterIndex + (characterHit.TrailingLength != 0 ? 1 : 0);
-
-            var currentDistance = Start;
-
-            GlyphRun? lastRun = null;
-
-            for (var index = 0; index < _textRuns.Count; index++)
-            {
-                var textRun = _textRuns[index];
-                var currentRun = textRun.GlyphRun;
-
-                if (lastRun != null)
-                {
-                    if (!lastRun.IsLeftToRight && currentRun.IsLeftToRight &&
-                        currentRun.Characters.Start == characterHit.FirstCharacterIndex &&
-                        characterHit.TrailingLength == 0)
-                    {
-                        return currentDistance;
-                    }
-                }
-
-                //Look for a hit in within the current run
-                if (characterIndex >= textRun.Text.Start && characterIndex <= textRun.Text.End)
-                {
-                    var distance = currentRun.GetDistanceFromCharacterHit(characterHit);
-
-                    return currentDistance + distance;
-                }
-
-                //Look at the left and right edge of the current run
-                if (currentRun.IsLeftToRight)
-                {
-                    if (lastRun == null || lastRun.IsLeftToRight)
-                    {
-                        if (characterIndex <= textRun.Text.Start)
-                        {
-                            return currentDistance;
-                        }
-                    }
-                    else
-                    {
-                        if (characterIndex == textRun.Text.Start)
-                        {
-                            return currentDistance;
-                        }
-                    }
-
-                    if (characterIndex == textRun.Text.Start + textRun.Text.Length && characterHit.TrailingLength > 0)
-                    {
-                        return currentDistance + currentRun.Size.Width;
-                    }
-                }
-                else
-                {
-                    if (characterIndex == textRun.Text.Start)
-                    {
-                        return currentDistance + currentRun.Size.Width;
-                    }
-
-                    var nextRun = index + 1 < _textRuns.Count ? _textRuns[index + 1] : null;
-
-                    if (nextRun != null)
-                    {
-                        if (characterHit.FirstCharacterIndex == textRun.Text.End && nextRun.ShapedBuffer.IsLeftToRight)
-                        {
-                            return currentDistance;
-                        }
-
-                        if (characterIndex > textRun.Text.End && nextRun.Text.End < textRun.Text.End)
-                        {
-                            return currentDistance;
-                        }
-                    }
-                    else
-                    {
-                        if (characterIndex > textRun.Text.End)
-                        {
-                            return currentDistance;
-                        }
-                    }
-                }
-
-                //No hit hit found so we add the full width
-                currentDistance += currentRun.Size.Width;
-
-                lastRun = currentRun;
-            }
-
-            return currentDistance;
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (TryFindNextCharacterHit(characterHit, out var nextCharacterHit))
-            {
-                return nextCharacterHit;
-            }
-
-            // Can't move, we're after the last character
-            var runIndex = GetRunIndexAtCharacterIndex(TextRange.End, LogicalDirection.Forward);
-
-            var textRun = _textRuns[runIndex];
-
-            characterHit = textRun.GlyphRun.GetNextCaretCharacterHit(characterHit);
-
-            return characterHit; 
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (TryFindPreviousCharacterHit(characterHit, out var previousCharacterHit))
-            {
-                return previousCharacterHit;
-            }
-
-            if (characterHit.FirstCharacterIndex <= TextRange.Start)
-            {
-                characterHit = new CharacterHit(TextRange.Start);
-            }
-
-            return characterHit; // Can't move, we're before the first character
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit)
-        {
-            // same operation as move-to-previous
-            return GetPreviousCaretCharacterHit(characterHit);
-        }
-
-        public static void SortRuns(List<ShapedTextCharacters> textRuns)
-        {
-            textRuns.Sort(s_compareLogicalOrder);
-        }
-
-        public TextLineImpl FinalizeLine()
-        {
-            BidiReorder();
-
-            _textLineMetrics = CreateLineMetrics();
-
-            return this;
-        }
-
-        private void BidiReorder()
-        {
-            // Build up the collection of ordered runs.
-            var run = _textRuns[0];
-            OrderedBidiRun orderedRun = new(run);
-            var current = orderedRun;
-
-            for (var i = 1; i < _textRuns.Count; i++)
-            {
-                run = _textRuns[i];
-
-                current.Next = new OrderedBidiRun(run);
-
-                current = current.Next;
-            }
-
-            // Reorder them into visual order.
-            orderedRun = LinearReOrder(orderedRun);
-
-            // Now perform a recursive reversal of each run.
-            // From the highest level found in the text to the lowest odd level on each line, including intermediate levels
-            // not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-            // https://unicode.org/reports/tr9/#L2
-            sbyte max = 0;
-            var min = sbyte.MaxValue;
-
-            for (var i = 0; i < _textRuns.Count; i++)
-            {
-                var level = _textRuns[i].BidiLevel;
-
-                if (level > max)
-                {
-                    max = level;
-                }
-
-                if ((level & 1) != 0 && level < min)
-                {
-                    min = level;
-                }
-            }
-
-            if (min > max)
-            {
-                min = max;
-            }
-
-            if (max == 0 || (min == max && (max & 1) == 0))
-            {
-                // Nothing to reverse.
-                return;
-            }
-
-            // Now apply the reversal and replace the original contents.
-            var minLevelToReverse = max;
-
-            while (minLevelToReverse >= min)
-            {
-                current = orderedRun;
-
-                while (current != null)
-                {
-                    if (current.Level >= minLevelToReverse && current.Level % 2 != 0)
-                    {
-                        if (!current.Run.IsReversed)
-                        {
-                            current.Run.Reverse();
-                        }
-                    }
-
-                    current = current.Next;
-                }
-
-                minLevelToReverse--;
-            }
-
-            _textRuns.Clear();
-
-            current = orderedRun;
-
-            while (current != null)
-            {
-                _textRuns.Add(current.Run);
-
-                current = current.Next;
-            }
-        }
-
-        /// <summary>
-        /// Reorders a series of runs from logical to visual order, returning the left most run.
-        /// <see href="https://github.com/fribidi/linear-reorder/blob/f2f872257d4d8b8e137fcf831f254d6d4db79d3c/linear-reorder.c"/>
-        /// </summary>
-        /// <param name="run">The ordered bidi run.</param>
-        /// <returns>The <see cref="OrderedBidiRun"/>.</returns>
-        private static OrderedBidiRun LinearReOrder(OrderedBidiRun? run)
-        {
-            BidiRange? range = null;
-
-            while (run != null)
-            {
-                var next = run.Next;
-
-                while (range != null && range.Level > run.Level
-                    && range.Previous != null && range.Previous.Level >= run.Level)
-                {
-                    range = BidiRange.MergeWithPrevious(range);
-                }
-
-                if (range != null && range.Level >= run.Level)
-                {
-                    // Attach run to the range.
-                    if ((run.Level & 1) != 0)
-                    {
-                        // Odd, range goes to the right of run.
-                        run.Next = range.Left;
-                        range.Left = run;
-                    }
-                    else
-                    {
-                        // Even, range goes to the left of run.
-                        range.Right!.Next = run;
-                        range.Right = run;
-                    }
-
-                    range.Level = run.Level;
-                }
-                else
-                {
-                    var r = new BidiRange();
-
-                    r.Left = r.Right = run;
-                    r.Level = run.Level;
-                    r.Previous = range;
-
-                    range = r;
-                }
-
-                run = next;
-            }
-
-            while (range?.Previous != null)
-            {
-                range = BidiRange.MergeWithPrevious(range);
-            }
-
-            // Terminate.
-            range!.Right!.Next = null;
-
-            return range.Left!;
-        }
-
-        /// <summary>
-        /// Tries to find the next character hit.
-        /// </summary>
-        /// <param name="characterHit">The current character hit.</param>
-        /// <param name="nextCharacterHit">The next character hit.</param>
-        /// <returns></returns>
-        private bool TryFindNextCharacterHit(CharacterHit characterHit, out CharacterHit nextCharacterHit)
-        {
-            nextCharacterHit = characterHit;
-
-            var codepointIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-            if (codepointIndex >= TextRange.End)
-            {
-                return false; // Cannot go forward anymore
-            }
-
-            if (codepointIndex < TextRange.Start)
-            {
-                codepointIndex = TextRange.Start;
-            }
-
-            var runIndex = GetRunIndexAtCharacterIndex(codepointIndex, LogicalDirection.Forward);
-
-            while (runIndex < _textRuns.Count)
-            {
-                var run = _textRuns[runIndex];
-
-                var foundCharacterHit =
-                    run.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength,
-                        out _);
-
-                var isAtEnd = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength ==
-                              TextRange.Length;
-
-                if (isAtEnd && !run.GlyphRun.IsLeftToRight)
-                {
-                    nextCharacterHit = foundCharacterHit;
-
-                    return true;
-                }
-
-                var characterIndex = codepointIndex - run.Text.Start;
-
-                if (characterIndex < 0 && run.ShapedBuffer.IsLeftToRight)
-                {
-                    foundCharacterHit = new CharacterHit(foundCharacterHit.FirstCharacterIndex);
-                }
-
-                nextCharacterHit = isAtEnd || characterHit.TrailingLength != 0 ?
-                    foundCharacterHit :
-                    new CharacterHit(foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength);
-
-                if (isAtEnd || nextCharacterHit.FirstCharacterIndex > characterHit.FirstCharacterIndex)
-                {
-                    return true;
-                }
-
-                runIndex++;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Tries to find the previous character hit.
-        /// </summary>
-        /// <param name="characterHit">The current character hit.</param>
-        /// <param name="previousCharacterHit">The previous character hit.</param>
-        /// <returns></returns>
-        private bool TryFindPreviousCharacterHit(CharacterHit characterHit, out CharacterHit previousCharacterHit)
-        {
-            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-            if (characterIndex == TextRange.Start)
-            {
-                previousCharacterHit = new CharacterHit(TextRange.Start);
-
-                return true;
-            }
-
-            previousCharacterHit = characterHit;
-
-            if (characterIndex < TextRange.Start)
-            {
-                return false; // Cannot go backward anymore.
-            }
-
-            var runIndex = GetRunIndexAtCharacterIndex(characterIndex, LogicalDirection.Backward);
-
-            while (runIndex >= 0)
-            {
-                var run = _textRuns[runIndex];
-
-                var foundCharacterHit =
-                    run.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
-
-                if (foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength < characterIndex)
-                {
-                    previousCharacterHit = foundCharacterHit;
-                    
-                    return true;
-                }
-                
-                previousCharacterHit = characterHit.TrailingLength != 0 ?
-                    foundCharacterHit :
-                    new CharacterHit(foundCharacterHit.FirstCharacterIndex);
-
-                if (previousCharacterHit != characterHit)
-                {
-                    return true;
-                }
-
-                runIndex--;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the run index of the specified codepoint index.
-        /// </summary>
-        /// <param name="codepointIndex">The codepoint index.</param>
-        /// <param name="direction">The logical direction.</param>
-        /// <returns>The text run index.</returns>
-        private int GetRunIndexAtCharacterIndex(int codepointIndex, LogicalDirection direction)
-        {
-            var runIndex = 0;
-            ShapedTextCharacters? previousRun = null;
-
-            while (runIndex < _textRuns.Count)
-            {
-                var currentRun = _textRuns[runIndex];
-
-                if (previousRun != null && !previousRun.ShapedBuffer.IsLeftToRight)
-                {
-                    if (currentRun.ShapedBuffer.IsLeftToRight)
-                    {
-                        if (currentRun.Text.Start >= codepointIndex)
-                        {
-                            return --runIndex;
-                        }
-                    }
-                    else
-                    {
-                        if (codepointIndex > currentRun.Text.Start + currentRun.Text.Length)
-                        {
-                            return --runIndex; 
-                        }
-                    }
-                }
-
-                if (direction == LogicalDirection.Forward)
-                {
-                    if (codepointIndex >= currentRun.Text.Start && codepointIndex <= currentRun.Text.End)
-                    {
-                        return runIndex;
-                    }
-                }
-                else
-                {
-                    if (codepointIndex > currentRun.Text.Start &&
-                        codepointIndex <= currentRun.Text.Start + currentRun.Text.Length)
-                    {
-                        return runIndex;
-                    }
-                }
-
-                if (runIndex + 1 < _textRuns.Count)
-                {
-                    runIndex++;
-                    previousRun = currentRun;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            return runIndex;
-        }
-
-        private TextLineMetrics CreateLineMetrics()
-        {
-            var width = 0d;
-            var widthIncludingWhitespace = 0d;
-            var trailingWhitespaceLength = 0;
-            var newLineLength = 0;
-            var ascent = 0d;
-            var descent = 0d;
-            var lineGap = 0d;
-            var fontRenderingEmSize = 0d;
-
-            for (var index = 0; index < _textRuns.Count; index++)
-            {
-                var textRun = _textRuns[index];
-
-                var fontMetrics =
-                    new FontMetrics(textRun.Properties.Typeface, textRun.Properties.FontRenderingEmSize);
-
-                if (fontRenderingEmSize < textRun.Properties.FontRenderingEmSize)
-                {
-                    fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
-                    
-                    if (ascent > fontMetrics.Ascent)
-                    {
-                        ascent = fontMetrics.Ascent;
-                    }
-
-                    if (descent < fontMetrics.Descent)
-                    {
-                        descent = fontMetrics.Descent;
-                    }
-
-                    if (lineGap < fontMetrics.LineGap)
-                    {
-                        lineGap = fontMetrics.LineGap;
-                    }
-                }
-
-                switch (_paragraphProperties.FlowDirection)
-                {
-                    case FlowDirection.LeftToRight:
-                        {
-                            if (index == _textRuns.Count - 1)
-                            {
-                                width = widthIncludingWhitespace + textRun.GlyphRun.Metrics.Width;
-                                trailingWhitespaceLength = textRun.GlyphRun.Metrics.TrailingWhitespaceLength;
-                                newLineLength = textRun.GlyphRun.Metrics.NewlineLength;
-                            }
-
-                            break;
-                        }
-
-                    case FlowDirection.RightToLeft:
-                        {
-                            if (index == _textRuns.Count - 1)
-                            {
-                                var firstRun = _textRuns[0];
-
-                                var offset = firstRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace -
-                                             firstRun.GlyphRun.Metrics.Width;
-
-                                width = widthIncludingWhitespace +
-                                    textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace - offset;
-
-                                trailingWhitespaceLength = firstRun.GlyphRun.Metrics.TrailingWhitespaceLength;
-                                newLineLength = firstRun.GlyphRun.Metrics.NewlineLength;
-                            }
-
-                            break;
-                        }
-                }
-
-                widthIncludingWhitespace += textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace;
-            }
-
-            var start = GetParagraphOffsetX(width, widthIncludingWhitespace, _paragraphWidth, 
-                _paragraphProperties.TextAlignment, _paragraphProperties.FlowDirection);
-
-            var lineHeight = _paragraphProperties.LineHeight;
-
-            var height = double.IsNaN(lineHeight) || MathUtilities.IsZero(lineHeight) ?
-                descent - ascent + lineGap :
-                lineHeight;
-
-            return new TextLineMetrics(widthIncludingWhitespace > _paragraphWidth, height, newLineLength, start,
-                -ascent, trailingWhitespaceLength, width, widthIncludingWhitespace);
-        }
-
-        private sealed class OrderedBidiRun
-        {
-            public OrderedBidiRun(ShapedTextCharacters run) => Run = run;
-
-            public sbyte Level => Run.BidiLevel;
-
-            public ShapedTextCharacters Run { get; }
-
-            public OrderedBidiRun? Next { get; set; }
-
-            public void Reverse() => Run.ShapedBuffer.GlyphInfos.Span.Reverse();
-        }
-
-        private sealed class BidiRange
-        {
-            public int Level { get; set; }
-
-            public OrderedBidiRun? Left { get; set; }
-
-            public OrderedBidiRun? Right { get; set; }
-
-            public BidiRange? Previous { get; set; }
-
-            public static BidiRange MergeWithPrevious(BidiRange range)
-            {
-                var previous = range.Previous;
-
-                BidiRange left;
-                BidiRange right;
-
-                if ((previous!.Level & 1) != 0)
-                {
-                    // Odd, previous goes to the right of range.
-                    left = range;
-                    right = previous;
-                }
-                else
-                {
-                    // Even, previous goes to the left of range.
-                    left = previous;
-                    right = range;
-                }
-
-                // Stitch them
-                left.Right!.Next = right.Left;
-                previous.Left = left.Left;
-                previous.Right = right.Right;
-
-                return previous;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs
deleted file mode 100644
index b799567a60..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Provides a set of properties that are used during the paragraph layout.
-    /// </summary>
-    public abstract class TextParagraphProperties
-    {
-        /// <summary>
-        /// This property specifies whether the primary text advance 
-        /// direction shall be left-to-right, right-to-left.
-        /// </summary>
-        public abstract FlowDirection FlowDirection { get; }
-
-        /// <summary>
-        /// Gets the text alignment.
-        /// </summary>
-        public abstract TextAlignment TextAlignment { get; }
-
-        /// <summary>
-        /// Paragraph's line height
-        /// </summary>
-        public abstract double LineHeight { get; }
-
-        /// <summary>
-        /// Indicates the first line of the paragraph.
-        /// </summary>
-        public abstract bool FirstLineInParagraph { get; }
-
-        /// <summary>
-        /// If true, the formatted line may always be collapsed. If false (the default),
-        /// only lines that overflow the paragraph width are collapsed.
-        /// </summary>
-        public virtual bool AlwaysCollapsible
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets the default text style.
-        /// </summary>
-        public abstract TextRunProperties DefaultTextRunProperties { get; }
-
-        /// <summary>
-        /// If not null, text decorations to apply to all runs in the line. This is in addition
-        /// to any text decorations specified by the TextRunProperties for individual text runs.
-        /// </summary>
-        public virtual TextDecorationCollection? TextDecorations => null;
-
-        /// <summary>
-        /// Gets the text wrapping.
-        /// </summary>
-        public abstract TextWrapping TextWrapping { get; }
-
-        /// <summary>
-        /// Line indentation
-        /// </summary>
-        public abstract double Indent { get; }
-
-        /// <summary>
-        /// Paragraph indentation
-        /// </summary>
-        public virtual double ParagraphIndent
-        {
-            get { return 0; }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs
deleted file mode 100644
index 513778b596..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Globalization;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Provides a set of properties, such as typeface or foreground brush, that can be applied to a TextRun object. This is an abstract class.
-    /// </summary>
-    /// <remarks>
-    /// The text layout client provides a concrete implementation of this abstract class.
-    /// This enables the client to implement text run properties in a way that corresponds with the associated formatting store.
-    /// </remarks>
-    public abstract class TextRunProperties : IEquatable<TextRunProperties>
-    {
-        /// <summary>
-        /// Run typeface
-        /// </summary>
-        public abstract Typeface Typeface { get; }
-
-        /// <summary>
-        /// Em size of font used to format and display text
-        /// </summary>
-        public abstract double FontRenderingEmSize { get; }
-
-        ///<summary>
-        /// Run TextDecorations. 
-        ///</summary>
-        public abstract TextDecorationCollection? TextDecorations { get; }
-
-        /// <summary>
-        /// Brush used to fill text.
-        /// </summary>
-        public abstract IBrush? ForegroundBrush { get; }
-
-        /// <summary>
-        /// Brush used to paint background of run.
-        /// </summary>
-        public abstract IBrush? BackgroundBrush { get; }
-
-        /// <summary>
-        /// Run text culture.
-        /// </summary>
-        public abstract CultureInfo? CultureInfo { get; }
-
-        /// <summary>
-        /// Run vertical box alignment
-        /// </summary>
-        public abstract BaselineAlignment BaselineAlignment { get; }
-
-        public bool Equals(TextRunProperties? other)
-        {
-            if (ReferenceEquals(null, other))
-                return false;
-            if (ReferenceEquals(this, other))
-                return true;
-
-            return Typeface.Equals(other.Typeface) &&
-                   FontRenderingEmSize.Equals(other.FontRenderingEmSize)
-                   && Equals(TextDecorations, other.TextDecorations) &&
-                   Equals(ForegroundBrush, other.ForegroundBrush) &&
-                   Equals(BackgroundBrush, other.BackgroundBrush) &&
-                   Equals(CultureInfo, other.CultureInfo);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return ReferenceEquals(this, obj) || obj is TextRunProperties other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Typeface.GetHashCode();
-                hashCode = (hashCode * 397) ^ FontRenderingEmSize.GetHashCode();
-                hashCode = (hashCode * 397) ^ (TextDecorations != null ? TextDecorations.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (ForegroundBrush != null ? ForegroundBrush.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (BackgroundBrush != null ? BackgroundBrush.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (CultureInfo != null ? CultureInfo.GetHashCode() : 0);
-                return hashCode;
-            }
-        }
-
-        public static bool operator ==(TextRunProperties left, TextRunProperties right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(TextRunProperties left, TextRunProperties right)
-        {
-            return !Equals(left, right);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs
deleted file mode 100644
index c982a435c3..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A class that is responsible for text shaping.
-    /// </summary>
-    public class TextShaper
-    {
-        private readonly ITextShaperImpl _platformImpl;
-
-        public TextShaper(ITextShaperImpl platformImpl)
-        {
-            _platformImpl = platformImpl;
-        }
-
-        /// <summary>
-        /// Gets the current text shaper.
-        /// </summary>
-        public static TextShaper Current
-        {
-            get
-            {
-                var current = AvaloniaLocator.Current.GetService<TextShaper>();
-
-                if (current != null)
-                {
-                    return current;
-                }
-
-                var textShaperImpl = AvaloniaLocator.Current.GetService<ITextShaperImpl>();
-
-                if (textShaperImpl == null)
-                    throw new InvalidOperationException("No text shaper implementation was registered.");
-
-                current = new TextShaper(textShaperImpl);
-
-                AvaloniaLocator.CurrentMutable.Bind<TextShaper>().ToConstant(current);
-
-                return current;
-            }
-        }
-
-        /// <inheritdoc cref="ITextShaperImpl.ShapeText"/>
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo? culture, sbyte bidiLevel)
-        {
-            return _platformImpl.ShapeText(text, typeface, fontRenderingEmSize, culture, bidiLevel);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
deleted file mode 100644
index 4bd46e8c75..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// a collapsing properties to collapse whole line toward the end
-    /// at character granularity and with ellipsis being the collapsing symbol
-    /// </summary>
-    public class TextTrailingCharacterEllipsis : TextCollapsingProperties
-    {
-        private static readonly ReadOnlySlice<char> s_ellipsis = new ReadOnlySlice<char>(new[] { '\u2026' });
-
-        /// <summary>
-        /// Construct a text trailing character ellipsis collapsing properties
-        /// </summary>
-        /// <param name="width">width in which collapsing is constrained to</param>
-        /// <param name="textRunProperties">text run properties of ellispis symbol</param>
-        public TextTrailingCharacterEllipsis(double width, TextRunProperties textRunProperties)
-        {
-            Width = width;
-            Symbol = new TextCharacters(s_ellipsis, textRunProperties);
-        }
-
-        /// <inheritdoc/>
-        public sealed override double Width { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextRun Symbol { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextCollapsingStyle Style { get; } = TextCollapsingStyle.TrailingCharacter;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs
deleted file mode 100644
index 9dffddd207..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// a collapsing properties to collapse whole line toward the end
-    /// at word granularity and with ellipsis being the collapsing symbol
-    /// </summary>
-    public class TextTrailingWordEllipsis : TextCollapsingProperties
-    {
-        private static readonly ReadOnlySlice<char> s_ellipsis = new ReadOnlySlice<char>(new[] { '\u2026' });
-
-        /// <summary>
-        /// Construct a text trailing word ellipsis collapsing properties
-        /// </summary>
-        /// <param name="width">width in which collapsing is constrained to</param>
-        /// <param name="textRunProperties">text run properties of ellispis symbol</param>
-        public TextTrailingWordEllipsis(
-            double width,
-            TextRunProperties textRunProperties
-        )
-        {
-            Width = width;
-            Symbol = new TextCharacters(s_ellipsis, textRunProperties);
-        }
-
-
-        /// <inheritdoc/>
-        public sealed override double Width { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextRun Symbol { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextCollapsingStyle Style { get; } = TextCollapsingStyle.TrailingWord;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiAlgorithm.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
deleted file mode 100644
index 404956d1e1..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
+++ /dev/null
@@ -1,1717 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-// Ported from: https://github.com/SixLabors/Fonts/
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    /// <summary>
-    /// Implementation of Unicode bidirectional algorithm (UAX #9)
-    /// https://unicode.org/reports/tr9/
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// The Bidi algorithm uses a number of memory arrays for resolved
-    /// types, level information, bracket types, x9 removal maps and
-    /// more...
-    /// </para>
-    /// <para>
-    /// This implementation of the BiDi algorithm has been designed
-    /// to reduce memory pressure on the GC by re-using the same
-    /// work buffers, so instances of this class should be re-used
-    /// as much as possible.
-    /// </para>
-    /// </remarks>
-    internal sealed class BidiAlgorithm
-    {
-        /// <summary>
-        /// The original BiDiClass classes as provided by the caller
-        /// </summary>
-        private ArraySlice<BidiClass> _originalClasses;
-
-        /// <summary>
-        /// Paired bracket types as provided by caller
-        /// </summary>
-        private ArraySlice<BidiPairedBracketType> _pairedBracketTypes;
-
-        /// <summary>
-        /// Paired bracket values as provided by caller
-        /// </summary>
-        private ArraySlice<int> _pairedBracketValues;
-
-        /// <summary>
-        /// Try if the incoming data is known to contain brackets
-        /// </summary>
-        private bool _hasBrackets;
-
-        /// <summary>
-        /// True if the incoming data is known to contain embedding runs
-        /// </summary>
-        private bool _hasEmbeddings;
-
-        /// <summary>
-        /// True if the incoming data is known to contain isolating runs
-        /// </summary>
-        private bool _hasIsolates;
-
-        /// <summary>
-        /// Two directional mapping of isolate start/end pairs
-        /// </summary>
-        /// <remarks>
-        /// The forward mapping maps the start index to the end index.
-        /// The reverse mapping maps the end index to the start index.
-        /// </remarks>
-        private readonly Dictionary<int, int> _isolatePairs = new Dictionary<int, int>();
-
-        /// <summary>
-        /// The working BiDi classes
-        /// </summary>
-        private ArraySlice<BidiClass> _workingClasses;
-
-        /// <summary>
-        /// The working classes buffer
-        /// </summary>
-        private ArrayBuilder<BidiClass> _workingClassesBuffer;
-
-        /// <summary>
-        /// A slice of the resolved levels
-        /// </summary>
-        private ArraySlice<sbyte> _resolvedLevels;
-
-        /// <summary>
-        /// The buffer underlying resolvedLevels
-        /// </summary>
-        private ArrayBuilder<sbyte> _resolvedLevelsBuffer;
-
-        /// <summary>
-        /// The resolve paragraph embedding level
-        /// </summary>
-        private sbyte _paragraphEmbeddingLevel;
-
-        /// <summary>
-        /// The status stack used during resolution of explicit
-        /// embedding and isolating runs
-        /// </summary>
-        private readonly Stack<Status> _statusStack = new Stack<Status>();
-
-        /// <summary>
-        /// Mapping used to virtually remove characters for rule X9
-        /// </summary>
-        private ArrayBuilder<int> _x9Map;
-
-        /// <summary>
-        /// Re-usable list of level runs
-        /// </summary>
-        private readonly List<LevelRun> _levelRuns = new List<LevelRun>();
-
-        /// <summary>
-        /// Mapping for the current isolating sequence, built
-        /// by joining level runs from the x9 map.
-        /// </summary>
-        private ArrayBuilder<int> _isolatedRunMapping;
-
-        /// <summary>
-        /// A stack of pending isolate openings used by FindIsolatePairs()
-        /// </summary>
-        private readonly Stack<int> _pendingIsolateOpenings = new Stack<int>();
-
-        /// <summary>
-        /// The level of the isolating run currently being processed
-        /// </summary>
-        private int _runLevel;
-
-        /// <summary>
-        /// The direction of the isolating run currently being processed
-        /// </summary>
-        private BidiClass _runDirection;
-
-        /// <summary>
-        /// The length of the isolating run currently being processed
-        /// </summary>
-        private int _runLength;
-
-        /// <summary>
-        /// A mapped slice of the resolved types for the isolating run currently
-        /// being processed
-        /// </summary>
-        private MappedArraySlice<BidiClass> _runResolvedClasses;
-
-        /// <summary>
-        /// A mapped slice of the original types for the isolating run currently
-        /// being processed
-        /// </summary>
-        private MappedArraySlice<BidiClass> _runOriginalClasses;
-
-        /// <summary>
-        /// A mapped slice of the run levels for the isolating run currently
-        /// being processed
-        /// </summary>
-        private MappedArraySlice<sbyte> _runLevels;
-
-        /// <summary>
-        /// A mapped slice of the paired bracket types of the isolating
-        /// run currently being processed
-        /// </summary>
-        private MappedArraySlice<BidiPairedBracketType> _runBiDiPairedBracketTypes;
-
-        /// <summary>
-        /// A mapped slice of the paired bracket values of the isolating
-        /// run currently being processed
-        /// </summary>
-        private MappedArraySlice<int> _runPairedBracketValues;
-
-        /// <summary>
-        /// Maximum pairing depth for paired brackets
-        /// </summary>
-        private const int MaxPairedBracketDepth = 63;
-
-        /// <summary>
-        /// Reusable list of pending opening brackets used by the
-        /// LocatePairedBrackets method
-        /// </summary>
-        private readonly List<int> _pendingOpeningBrackets = new List<int>();
-
-        /// <summary>
-        /// Resolved list of paired brackets
-        /// </summary>
-        private readonly List<BracketPair> _pairedBrackets = new List<BracketPair>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BidiAlgorithm"/> class.
-        /// </summary>
-        internal BidiAlgorithm()
-        {
-        }
-
-        /// <summary>
-        /// Gets a per-thread instance that can be re-used as often
-        /// as necessary.
-        /// </summary>
-        public static ThreadLocal<BidiAlgorithm> Instance { get; } = new ThreadLocal<BidiAlgorithm>(() => new BidiAlgorithm());
-
-        /// <summary>
-        /// Gets the resolved levels.
-        /// </summary>
-        public ArraySlice<sbyte> ResolvedLevels => _resolvedLevels;
-
-        /// <summary>
-        /// Gets the resolved paragraph embedding level
-        /// </summary>
-        public int ResolvedParagraphEmbeddingLevel => _paragraphEmbeddingLevel;
-
-        /// <summary>
-        /// Process data from a BiDiData instance
-        /// </summary>
-        /// <param name="data">The BiDi Unicode data.</param>
-        public void Process(BidiData data)
-            => Process(
-                data.Classes,
-                data.PairedBracketTypes,
-                data.PairedBracketValues,
-                data.ParagraphEmbeddingLevel,
-                data.HasBrackets,
-                data.HasEmbeddings,
-                data.HasIsolates,
-                null);
-
-        /// <summary>
-        /// Processes Bidi Data
-        /// </summary>
-        public void Process(
-            ArraySlice<BidiClass> types,
-            ArraySlice<BidiPairedBracketType> pairedBracketTypes,
-            ArraySlice<int> pairedBracketValues,
-            sbyte paragraphEmbeddingLevel,
-            bool? hasBrackets,
-            bool? hasEmbeddings,
-            bool? hasIsolates,
-            ArraySlice<sbyte>? outLevels)
-        {
-            // Reset state
-            _isolatePairs.Clear();
-            _workingClassesBuffer.Clear();
-            _levelRuns.Clear();
-            _resolvedLevelsBuffer.Clear();
-
-            // Setup original types and working types
-            _originalClasses = types;
-            _workingClasses = _workingClassesBuffer.Add(types);
-
-            // Capture paired bracket values and types
-            _pairedBracketTypes = pairedBracketTypes;
-            _pairedBracketValues = pairedBracketValues;
-
-            // Store things we know
-            _hasBrackets = hasBrackets ?? _pairedBracketTypes.Length == _originalClasses.Length;
-            _hasEmbeddings = hasEmbeddings ?? true;
-            _hasIsolates = hasIsolates ?? true;
-
-            // Find all isolate pairs
-            FindIsolatePairs();
-
-            // Resolve the paragraph embedding level
-            if (paragraphEmbeddingLevel == 2)
-            {
-                _paragraphEmbeddingLevel = ResolveEmbeddingLevel(_originalClasses);
-            }
-            else
-            {
-                _paragraphEmbeddingLevel = paragraphEmbeddingLevel;
-            }
-
-            // Create resolved levels buffer
-            if (outLevels.HasValue)
-            {
-                if (outLevels.Value.Length != _originalClasses.Length)
-                {
-                    throw new ArgumentException("Out levels must be the same length as the input data");
-                }
-
-                _resolvedLevels = outLevels.Value;
-            }
-            else
-            {
-                _resolvedLevels = _resolvedLevelsBuffer.Add(_originalClasses.Length);
-                _resolvedLevels.Fill(_paragraphEmbeddingLevel);
-            }
-
-            // Resolve explicit embedding levels (Rules X1-X8)
-            ResolveExplicitEmbeddingLevels();
-
-            // Build the rule X9 map
-            BuildX9RemovalMap();
-
-            // Process all isolated run sequences
-            ProcessIsolatedRunSequences();
-
-            // Reset whitespace levels
-            ResetWhitespaceLevels();
-
-            // Clean up
-            AssignLevelsToCodePointsRemovedByX9();
-        }
-
-        /// <summary>
-        /// Resolve the paragraph embedding level if not explicitly passed
-        /// by the caller. Also used by rule X5c for FSI isolating sequences.
-        /// </summary>
-        /// <param name="data">The data to be evaluated</param>
-        /// <returns>The resolved embedding level</returns>
-        public sbyte ResolveEmbeddingLevel(ReadOnlySlice<BidiClass> data)
-        {
-            // P2
-            for (var i = 0; i < data.Length; ++i)
-            {
-                switch (data[i])
-                {
-                    case BidiClass.LeftToRight:
-                        // P3
-                        return 0;
-
-                    case BidiClass.ArabicLetter:
-                    case BidiClass.RightToLeft:
-                        // P3
-                        return 1;
-
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                        // Skip isolate pairs
-                        // (Because we're working with a slice, we need to adjust the indices
-                        //  we're using for the isolatePairs map)
-                        if (_isolatePairs.TryGetValue(data.Start + i, out i))
-                        {
-                            i -= data.Start;
-                        }
-                        else
-                        {
-                            i = data.Length;
-                        }
-
-                        break;
-                }
-            }
-
-            // P3
-            return 0;
-        }
-
-        /// <summary>
-        /// Build a list of matching isolates for a directionality slice
-        /// Implements BD9
-        /// </summary>
-        private void FindIsolatePairs()
-        {
-            // Redundant?
-            if (!_hasIsolates)
-            {
-                return;
-            }
-
-            // Lets double check this as we go and clear the flag
-            // if there actually aren't any isolate pairs as this might
-            // mean we can skip some later steps
-            _hasIsolates = false;
-
-            // BD9...
-            _pendingIsolateOpenings.Clear();
-            
-            for (var i = 0; i < _originalClasses.Length; i++)
-            {
-                var t = _originalClasses[i];
-
-                switch (t)
-                {
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    {
-                        _pendingIsolateOpenings.Push(i);
-                        _hasIsolates = true;
-                        break;
-                    }
-                    case BidiClass.PopDirectionalIsolate:
-                    {
-                        if (_pendingIsolateOpenings.Count > 0)
-                        {
-                            _isolatePairs.Add(_pendingIsolateOpenings.Pop(), i);
-                        }
-
-                        _hasIsolates = true;
-                        
-                        break;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Resolve the explicit embedding levels from the original
-        /// data.  Implements rules X1 to X8.
-        /// </summary>
-        private void ResolveExplicitEmbeddingLevels()
-        {
-            // Redundant?
-            if (!_hasIsolates && !_hasEmbeddings)
-            {
-                return;
-            }
-
-            // Work variables
-            _statusStack.Clear();
-            var overflowIsolateCount = 0;
-            var overflowEmbeddingCount = 0;
-            var validIsolateCount = 0;
-
-            // Constants
-            const int maxStackDepth = 125;
-
-            // Rule X1 - setup initial state
-            _statusStack.Clear();
-
-            // Neutral
-            _statusStack.Push(new Status(_paragraphEmbeddingLevel, BidiClass.OtherNeutral, false));
-
-            // Process all characters
-            for (var i = 0; i < _originalClasses.Length; i++)
-            {
-                switch (_originalClasses[i])
-                {
-                    case BidiClass.RightToLeftEmbedding:
-                    {
-                        // Rule X2
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.LeftToRightEmbedding:
-                    {
-                        // Rule X3
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
-                        if (newLevel < maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.RightToLeftOverride:
-                    {
-                        // Rule X4
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.RightToLeft, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.LeftToRightOverride:
-                    {
-                        // Rule X5
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.LeftToRight, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    {
-                        // Rule X5a, X5b and X5c
-                        var resolvedIsolate = _originalClasses[i];
-
-                        if (resolvedIsolate == BidiClass.FirstStrongIsolate)
-                        {
-                            if (!_isolatePairs.TryGetValue(i, out var endOfIsolate))
-                            {
-                                endOfIsolate = _originalClasses.Length;
-                            }
-
-                            // Rule X5c
-                            if (ResolveEmbeddingLevel(_originalClasses.Slice(i + 1,endOfIsolate - (i + 1))) == 1)
-                            {
-                                resolvedIsolate = BidiClass.RightToLeftIsolate;
-                            }
-                            else
-                            {
-                                resolvedIsolate = BidiClass.LeftToRightIsolate;
-                            }
-                        }
-
-                        // Replace RLI's level with current embedding level
-                        var tos = _statusStack.Peek();
-                        _resolvedLevels[i] = tos.EmbeddingLevel;
-
-                        // Apply override
-                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
-                        {
-                            _workingClasses[i] = tos.OverrideStatus;
-                        }
-
-                        // Work out new level
-                        sbyte newLevel;
-                        if (resolvedIsolate == BidiClass.RightToLeftIsolate)
-                        {
-                            newLevel = (sbyte)((tos.EmbeddingLevel + 1) | 1);
-                        }
-                        else
-                        {
-                            newLevel = (sbyte)((tos.EmbeddingLevel + 2) & ~1);
-                        }
-
-                        // Valid?
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            validIsolateCount++;
-                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, true));
-                        }
-                        else
-                        {
-                            overflowIsolateCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.BoundaryNeutral:
-                    {
-                        // Mentioned in rule X6 - "for all types besides ..., BN, ..."
-                        // no-op
-                        break;
-                    }
-
-                    default:
-                    {
-                        // Rule X6
-                        var tos = _statusStack.Peek();
-                        _resolvedLevels[i] = tos.EmbeddingLevel;
-                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
-                        {
-                            _workingClasses[i] = tos.OverrideStatus;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.PopDirectionalIsolate:
-                    {
-                        // Rule X6a
-                        if (overflowIsolateCount > 0)
-                        {
-                            overflowIsolateCount--;
-                        }
-                        else if (validIsolateCount != 0)
-                        {
-                            overflowEmbeddingCount = 0;
-                            while (!_statusStack.Peek().IsolateStatus)
-                            {
-                                _statusStack.Pop();
-                            }
-
-                            _statusStack.Pop();
-                            validIsolateCount--;
-                        }
-
-                        var tos = _statusStack.Peek();
-                        _resolvedLevels[i] = tos.EmbeddingLevel;
-                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
-                        {
-                            _workingClasses[i] = tos.OverrideStatus;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.PopDirectionalFormat:
-                    {
-                        // Rule X7
-                        if (overflowIsolateCount == 0)
-                        {
-                            if (overflowEmbeddingCount > 0)
-                            {
-                                overflowEmbeddingCount--;
-                            }
-                            else if (!_statusStack.Peek().IsolateStatus && _statusStack.Count >= 2)
-                            {
-                                _statusStack.Pop();
-                            }
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.ParagraphSeparator:
-                    {
-                        // Rule X8
-                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
-                        break;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Build a map to the original data positions that excludes all
-        /// the types defined by rule X9
-        /// </summary>
-        private void BuildX9RemovalMap()
-        {
-            // Reserve room for the x9 map
-            _x9Map.Length = _originalClasses.Length;
-
-            if (_hasEmbeddings || _hasIsolates)
-            {
-                // Build a map the removes all x9 characters
-                var j = 0;
-                for (var i = 0; i < _originalClasses.Length; i++)
-                {
-                    if (!IsRemovedByX9(_originalClasses[i]))
-                    {
-                        _x9Map[j++] = i;
-                    }
-                }
-
-                // Set the final length
-                _x9Map.Length = j;
-            }
-            else
-            {
-                for (int i = 0, count = _originalClasses.Length; i < count; i++)
-                {
-                    _x9Map[i] = i;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Find the original character index for an entry in the X9 map
-        /// </summary>
-        /// <param name="index">Index in the x9 removal map</param>
-        /// <returns>Index to the original data</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private int MapX9(int index) => _x9Map[index];
-
-        /// <summary>
-        /// Add a new level run
-        /// </summary>
-        /// <remarks>
-        /// This method resolves the sos and eos values for the run
-        /// and adds the run to the list
-        /// /// </remarks>
-        /// <param name="start">The index of the start of the run (in x9 removed units)</param>
-        /// <param name="length">The length of the run (in x9 removed units)</param>
-        /// <param name="level">The level of the run</param>
-        private void AddLevelRun(int start, int length, int level)
-        {
-            // Get original indices to first and last character in this run
-            var firstCharIndex = MapX9(start);
-            var lastCharIndex = MapX9(start + length - 1);
-
-            // Work out sos
-            var i = firstCharIndex - 1;
-            
-            while (i >= 0 && IsRemovedByX9(_originalClasses[i]))
-            {
-                i--;
-            }
-
-            var prevLevel = i < 0 ? _paragraphEmbeddingLevel : _resolvedLevels[i];
-            var sos = DirectionFromLevel(Math.Max(prevLevel, level));
-
-            // Work out eos
-            var lastType = _workingClasses[lastCharIndex];
-            int nextLevel;
-
-            switch (lastType)
-            {
-                case BidiClass.LeftToRightIsolate:
-                case BidiClass.RightToLeftIsolate:
-                case BidiClass.FirstStrongIsolate:
-                {
-                    nextLevel = _paragraphEmbeddingLevel;
-                    
-                    break;
-                }
-                default:
-                {
-                    i = lastCharIndex + 1;
-                    while (i < _originalClasses.Length && IsRemovedByX9(_originalClasses[i]))
-                    {
-                        i++;
-                    }
-
-                    nextLevel = i >= _originalClasses.Length ? _paragraphEmbeddingLevel : _resolvedLevels[i];
-                    
-                    break;
-                }
-            }
-
-            var eos = DirectionFromLevel(Math.Max(nextLevel, level));
-
-            // Add the run
-            _levelRuns.Add(new LevelRun(start, length, level, sos, eos));
-        }
-
-        /// <summary>
-        /// Find all runs of the same level, populating the _levelRuns
-        /// collection
-        /// </summary>
-        private void FindLevelRuns()
-        {
-            var currentLevel = -1;
-            var runStart = 0;
-            
-            for (var i = 0; i < _x9Map.Length; ++i)
-            {
-                int level = _resolvedLevels[MapX9(i)];
-
-                if (level == currentLevel)
-                {
-                    continue;
-                }
-
-                if (currentLevel != -1)
-                {
-                    AddLevelRun(runStart, i - runStart, currentLevel);
-                }
-
-                currentLevel = level;
-                runStart = i;
-            }
-
-            // Don't forget the final level run
-            if (currentLevel != -1)
-            {
-                AddLevelRun(runStart, _x9Map.Length - runStart, currentLevel);
-            }
-        }
-
-        /// <summary>
-        /// Given a character index, find the level run that starts at that position
-        /// </summary>
-        /// <param name="index">The index into the original (unmapped) data</param>
-        /// <returns>The index of the run that starts at that index</returns>
-        private int FindRunForIndex(int index)
-        {
-            for (var i = 0; i < _levelRuns.Count; i++)
-            {
-                // Passed index is for the original non-x9 filtered data, however
-                // the level run ranges are for the x9 filtered data.  Convert before
-                // comparing
-                if (MapX9(_levelRuns[i].Start) == index)
-                {
-                    return i;
-                }
-            }
-
-            throw new InvalidOperationException("Internal error");
-        }
-
-        /// <summary>
-        /// Determine and the process all isolated run sequences
-        /// </summary>
-        private void ProcessIsolatedRunSequences()
-        {
-            // Find all runs with the same level
-            FindLevelRuns();
-
-            // Process them one at a time by first building
-            // a mapping using slices from the x9 map for each
-            // run section that needs to be joined together to
-            // form an complete run.  That full run mapping
-            // will be placed in _isolatedRunMapping and then
-            // processed by ProcessIsolatedRunSequence().
-            while (_levelRuns.Count > 0)
-            {
-                // Clear the mapping
-                _isolatedRunMapping.Clear();
-
-                // Combine mappings from this run and all runs that continue on from it
-                var runIndex = 0;
-                BidiClass eos;
-                var sos = _levelRuns[0].Sos;
-                var level = _levelRuns[0].Level;
-                
-                while (true)
-                {
-                    // Get the run
-                    var r = _levelRuns[runIndex];
-
-                    // The eos of the isolating run is the eos of the
-                    // last level run that comprises it.
-                    eos = r.Eos;
-
-                    // Remove this run as we've now processed it
-                    _levelRuns.RemoveAt(runIndex);
-
-                    // Add the x9 map indices for the run range to the mapping
-                    // for this isolated run
-                    _isolatedRunMapping.Add(_x9Map.AsSlice(r.Start, r.Length));
-
-                    // Get the last character and see if it's an isolating run with a matching
-                    // PDI and concatenate that run to this one
-                    var lastCharacterIndex = _isolatedRunMapping[_isolatedRunMapping.Length - 1];
-                    var lastType = _originalClasses[lastCharacterIndex];
-                    if ((lastType == BidiClass.LeftToRightIsolate || lastType == BidiClass.RightToLeftIsolate || lastType == BidiClass.FirstStrongIsolate) &&
-                            _isolatePairs.TryGetValue(lastCharacterIndex, out var nextRunIndex))
-                    {
-                        // Find the continuing run index
-                        runIndex = FindRunForIndex(nextRunIndex);
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-
-                // Process this isolated run
-                ProcessIsolatedRunSequence(sos, eos, level);
-            }
-        }
-
-        /// <summary>
-        /// Process a single isolated run sequence, where the character sequence
-        /// mapping is currently held in _isolatedRunMapping.
-        /// </summary>
-        private void ProcessIsolatedRunSequence(BidiClass sos, BidiClass eos, int runLevel)
-        {
-            // Create mappings onto the underlying data
-            _runResolvedClasses = new MappedArraySlice<BidiClass>(_workingClasses, _isolatedRunMapping.AsSlice());
-            _runOriginalClasses = new MappedArraySlice<BidiClass>(_originalClasses, _isolatedRunMapping.AsSlice());
-            _runLevels = new MappedArraySlice<sbyte>(_resolvedLevels, _isolatedRunMapping.AsSlice());
-            if (_hasBrackets)
-            {
-                _runBiDiPairedBracketTypes = new MappedArraySlice<BidiPairedBracketType>(_pairedBracketTypes, _isolatedRunMapping.AsSlice());
-                _runPairedBracketValues = new MappedArraySlice<int>(_pairedBracketValues, _isolatedRunMapping.AsSlice());
-            }
-
-            _runLevel = runLevel;
-            _runDirection = DirectionFromLevel(runLevel);
-            _runLength = _runResolvedClasses.Length;
-
-            // By tracking the types of characters known to be in the current run, we can
-            // skip some of the rules that we know won't apply.  The flags will be
-            // initialized while we're processing rule W1 below.
-            var hasEN = false;
-            var hasAL = false;
-            var hasES = false;
-            var hasCS = false;
-            var hasAN = false;
-            var hasET = false;
-
-            // Rule W1
-            // Also, set hasXX flags
-            int i;
-            var previousClass = sos;
-            
-            for (i = 0; i < _runLength; i++)
-            {
-                var resolvedClass = _runResolvedClasses[i];
-                
-                switch (resolvedClass)
-                {
-                    case BidiClass.NonspacingMark:
-                        _runResolvedClasses[i] = previousClass;
-                        break;
-
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                        previousClass = BidiClass.OtherNeutral;
-                        break;
-
-                    case BidiClass.EuropeanNumber:
-                        hasEN = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.ArabicLetter:
-                        hasAL = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.EuropeanSeparator:
-                        hasES = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.CommonSeparator:
-                        hasCS = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.ArabicNumber:
-                        hasAN = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.EuropeanTerminator:
-                        hasET = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    default:
-                        previousClass = resolvedClass;
-                        break;
-                }
-            }
-
-            // Rule W2
-            if (hasEN)
-            {
-                for (i = 0; i < _runLength; i++)
-                {
-                    if (_runResolvedClasses[i] != BidiClass.EuropeanNumber)
-                    {
-                        continue;
-                    }
-
-                    for (var j = i - 1; j >= 0; j--)
-                    {
-                        var resolvedClass = _runResolvedClasses[j];
-
-                        switch (resolvedClass)
-                        {
-                            case BidiClass.LeftToRight:
-                            case BidiClass.RightToLeft:
-                            case BidiClass.ArabicLetter:
-                            {
-                                if (resolvedClass == BidiClass.ArabicLetter)
-                                {
-                                    _runResolvedClasses[i] = BidiClass.ArabicNumber;
-                                    hasAN = true;
-                                }
-
-                                j = -1;
-                                    
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Rule W3
-            if (hasAL)
-            {
-                for (i = 0; i < _runLength; i++)
-                {
-                    if (_runResolvedClasses[i] == BidiClass.ArabicLetter)
-                    {
-                        _runResolvedClasses[i] = BidiClass.RightToLeft;
-                    }
-                }
-            }
-
-            // Rule W4
-            if ((hasES || hasCS) && (hasEN || hasAN))
-            {
-                for (i = 1; i < _runLength - 1; ++i)
-                {
-                    ref var resolvedClass = ref _runResolvedClasses[i];
-                    
-                    if (resolvedClass == BidiClass.EuropeanSeparator)
-                    {
-                        var previousSeparatorClass = _runResolvedClasses[i - 1];
-                        var nextSeparatorClass = _runResolvedClasses[i + 1];
-
-                        if (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber)
-                        {
-                            // ES between EN and EN
-                            resolvedClass = BidiClass.EuropeanNumber;
-                        }
-                    }
-                    else if (resolvedClass == BidiClass.CommonSeparator)
-                    {
-                        var previousSeparatorClass = _runResolvedClasses[i - 1];
-                        var nextSeparatorClass = _runResolvedClasses[i + 1];
-
-                        if ((previousSeparatorClass == BidiClass.ArabicNumber && nextSeparatorClass == BidiClass.ArabicNumber) ||
-                             (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber))
-                        {
-                            // CS between (AN and AN) or (EN and EN)
-                            resolvedClass = previousSeparatorClass;
-                        }
-                    }
-                }
-            }
-
-            // Rule W5
-            if (hasET && hasEN)
-            {
-                for (i = 0; i < _runLength; ++i)
-                {
-                    if (_runResolvedClasses[i] != BidiClass.EuropeanTerminator)
-                    {
-                        continue;
-                    }
-                    
-                    // Locate end of sequence
-                    var sequenceStart = i;
-                    var sequenceEnd = i;
-                    
-                    while (sequenceEnd < _runLength && _runResolvedClasses[sequenceEnd] == BidiClass.EuropeanTerminator)
-                    {
-                        sequenceEnd++;
-                    }
-
-                    // Preceded by, or followed by EN?
-                    if ((sequenceStart == 0 ? sos : _runResolvedClasses[sequenceStart - 1]) == BidiClass.EuropeanNumber
-                        || (sequenceEnd == _runLength ? eos : _runResolvedClasses[sequenceEnd]) == BidiClass.EuropeanNumber)
-                    {
-                        // Change the entire range
-                        for (var j = sequenceStart; i < sequenceEnd; ++i)
-                        {
-                            _runResolvedClasses[i] = BidiClass.EuropeanNumber;
-                        }
-                    }
-
-                    // continue at end of sequence
-                    i = sequenceEnd;
-                }
-            }
-
-            // Rule W6
-            if (hasES || hasET || hasCS)
-            {
-                for (i = 0; i < _runLength; ++i)
-                {
-                    ref var resolvedClass = ref _runResolvedClasses[i];
-
-                    switch (resolvedClass)
-                    {
-                        case BidiClass.EuropeanSeparator:
-                        case BidiClass.EuropeanTerminator:
-                        case BidiClass.CommonSeparator:
-                        {
-                            resolvedClass = BidiClass.OtherNeutral;
-                            
-                            break;
-                        }
-                    }
-                }
-            }
-
-            // Rule W7.
-            if (hasEN)
-            {
-                var previousStrongClass = sos;
-                
-                for (i = 0; i < _runLength; ++i)
-                {
-                    ref var resolvedClass = ref _runResolvedClasses[i];
-
-                    switch (resolvedClass)
-                    {
-                        case BidiClass.EuropeanNumber:
-                        {
-                            // If prev strong type was an L change this to L too
-                            if (previousStrongClass == BidiClass.LeftToRight)
-                            {
-                                _runResolvedClasses[i] = BidiClass.LeftToRight;
-                            }
-                            
-                            break;
-                        }
-                       
-                        case BidiClass.LeftToRight:
-                        case BidiClass.RightToLeft:
-                        {
-                            // Remember previous strong type (NB: AL should already be changed to R)
-                            previousStrongClass = resolvedClass;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            // Rule N0 - process bracket pairs
-            if (_hasBrackets)
-            {
-                int count;
-                var pairedBrackets = LocatePairedBrackets();
-                
-                for (i = 0, count = pairedBrackets.Count; i < count; i++)
-                {
-                    var pairedBracket = pairedBrackets[i];
-                    
-                    var strongDirection = InspectPairedBracket(pairedBracket);
-
-                    // Case "d" - no strong types in the brackets, ignore
-                    if (strongDirection == BidiClass.OtherNeutral)
-                    {
-                        continue;
-                    }
-
-                    // Case "b" - strong type found that matches the embedding direction
-                    if ((strongDirection == BidiClass.LeftToRight || strongDirection == BidiClass.RightToLeft) && strongDirection == _runDirection)
-                    {
-                        SetPairedBracketDirection(pairedBracket, strongDirection);
-                        continue;
-                    }
-
-                    // Case "c" - found opposite strong type found, look before to establish context
-                    strongDirection = InspectBeforePairedBracket(pairedBracket, sos);
-                    
-                    if (strongDirection == _runDirection || strongDirection == BidiClass.OtherNeutral)
-                    {
-                        strongDirection = _runDirection;
-                    }
-
-                    SetPairedBracketDirection(pairedBracket, strongDirection);
-                }
-            }
-
-            // Rules N1 and N2 - resolve neutral types
-            for (i = 0; i < _runLength; ++i)
-            {
-                var resolvedClass = _runResolvedClasses[i];
-                
-                if (IsNeutralClass(resolvedClass))
-                {
-                    // Locate end of sequence
-                    var seqStart = i;
-                    var seqEnd = i;
-                    
-                    while (seqEnd < _runLength && IsNeutralClass(_runResolvedClasses[seqEnd]))
-                    {
-                        seqEnd++;
-                    }
-
-                    // Work out the preceding class
-                    BidiClass classBefore;
-                    
-                    if (seqStart == 0)
-                    {
-                        classBefore = sos;
-                    }
-                    else
-                    {
-                        classBefore = _runResolvedClasses[seqStart - 1];
-                        
-                        switch (classBefore)
-                        {
-                            case BidiClass.ArabicNumber:
-                            case BidiClass.EuropeanNumber:
-                            {
-                                classBefore = BidiClass.RightToLeft;
-                                
-                                break;
-                            }
-                        }
-                    }
-
-                    // Work out the following class
-                    BidiClass classAfter;
-                    
-                    if (seqEnd == _runLength)
-                    {
-                        classAfter = eos;
-                    }
-                    else
-                    {
-                        classAfter = _runResolvedClasses[seqEnd];
-
-                        switch (classAfter)
-                        {
-                            case BidiClass.ArabicNumber:
-                            case BidiClass.EuropeanNumber:
-                            {
-                                classAfter = BidiClass.RightToLeft;
-                                
-                                break;
-                            }
-                        }
-                    }
-
-                    // Work out the final resolved type
-                    BidiClass finalResolveClass;
-                    
-                    if (classBefore == classAfter)
-                    {
-                        // Rule N1
-                        finalResolveClass = classBefore;
-                    }
-                    else
-                    {
-                        // Rule N2
-                        finalResolveClass = _runDirection;
-                    }
-
-                    // Apply changes
-                    for (var j = seqStart; j < seqEnd; j++)
-                    {
-                        _runResolvedClasses[j] = finalResolveClass;
-                    }
-
-                    // continue after this run
-                    i = seqEnd;
-                }
-            }
-
-            // Rules I1 and I2 - resolve implicit types
-            if ((_runLevel & 0x01) == 0)
-            {
-                // Rule I1 - even
-                for (i = 0; i < _runLength; i++)
-                {
-                    var resolvedClass = _runResolvedClasses[i];
-                    ref var currentRunLevel = ref _runLevels[i];
-
-                    switch (resolvedClass)
-                    {
-                        case BidiClass.RightToLeft:
-                        {
-                            currentRunLevel++;
-                            break;
-                        }
-                        case BidiClass.ArabicNumber:
-                        case BidiClass.EuropeanNumber:
-                        {
-                            currentRunLevel += 2;
-                            
-                            break;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                // Rule I2 - odd
-                for (i = 0; i < _runLength; i++)
-                {
-                    var resolvedClass = _runResolvedClasses[i];
-                    ref var currentRunLevel = ref _runLevels[i];
-                    
-                    if (resolvedClass != BidiClass.RightToLeft)
-                    {
-                        currentRunLevel++;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Locate all pair brackets in the current isolating run
-        /// </summary>
-        /// <returns>A sorted list of BracketPairs</returns>
-        private List<BracketPair> LocatePairedBrackets()
-        {
-            // Clear work collections
-            _pendingOpeningBrackets.Clear();
-            _pairedBrackets.Clear();
-
-            // Since List.Sort is expensive on memory if called often (it internally
-            // allocates an ArraySorted object) and since we will rarely have many
-            // items in this list (most paragraphs will only have a handful of bracket
-            // pairs - if that), we use a simple linear lookup and insert most of the
-            // time.  If there are more that `sortLimit` paired brackets we abort th
-            // linear searching/inserting and using List.Sort at the end.
-            const int sortLimit = 8;
-
-            // Process all characters in the run, looking for paired brackets
-            for (int i = 0, length = _runLength; i < length; i++)
-            {
-                // Ignore non-neutral characters
-                if (_runResolvedClasses[i] != BidiClass.OtherNeutral)
-                {
-                    continue;
-                }
-
-                switch (_runBiDiPairedBracketTypes[i])
-                {
-                    case BidiPairedBracketType.Open:
-                        if (_pendingOpeningBrackets.Count == MaxPairedBracketDepth)
-                        {
-                            goto exit;
-                        }
-
-                        _pendingOpeningBrackets.Insert(0, i);
-                        break;
-
-                    case BidiPairedBracketType.Close:
-                        // see if there is a match
-                        for (var j = 0; j < _pendingOpeningBrackets.Count; j++)
-                        {
-                            if (_runPairedBracketValues[i] != _runPairedBracketValues[_pendingOpeningBrackets[j]])
-                            {
-                                continue;
-                            }
-                            
-                            // Add this paired bracket set
-                            var opener = _pendingOpeningBrackets[j];
-                            
-                            if (_pairedBrackets.Count < sortLimit)
-                            {
-                                var ppi = 0;
-                                while (ppi < _pairedBrackets.Count && _pairedBrackets[ppi].OpeningIndex < opener)
-                                {
-                                    ppi++;
-                                }
-
-                                _pairedBrackets.Insert(ppi, new BracketPair(opener, i));
-                            }
-                            else
-                            {
-                                _pairedBrackets.Add(new BracketPair(opener, i));
-                            }
-
-                            // remove up to and including matched opener
-                            _pendingOpeningBrackets.RemoveRange(0, j + 1);
-                            break;
-                        }
-
-                        break;
-                }
-            }
-
-            exit:
-
-            // Is a sort pending?
-            if (_pairedBrackets.Count > sortLimit)
-            {
-                _pairedBrackets.Sort();
-            }
-
-            return _pairedBrackets;
-        }
-
-        /// <summary>
-        /// Inspect a paired bracket set and determine its strong direction
-        /// </summary>
-        /// <param name="bracketPair">The paired bracket to be inspected</param>
-        /// <returns>The direction of the bracket set content</returns>
-        private BidiClass InspectPairedBracket(in BracketPair bracketPair)
-        {
-            var directionFromLevel = DirectionFromLevel(_runLevel);
-            var directionOpposite = BidiClass.OtherNeutral;
-            
-            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
-            {
-                var dir = GetStrongClassN0(_runResolvedClasses[i]);
-                
-                if (dir == BidiClass.OtherNeutral)
-                {
-                    continue;
-                }
-
-                if (dir == directionFromLevel)
-                {
-                    return dir;
-                }
-
-                directionOpposite = dir;
-            }
-
-            return directionOpposite;
-        }
-
-        /// <summary>
-        /// Look for a strong type before a paired bracket
-        /// </summary>
-        /// <param name="bracketPair">The paired bracket set to be inspected</param>
-        /// <param name="sos">The sos in case nothing found before the bracket</param>
-        /// <returns>The strong direction before the brackets</returns>
-        private BidiClass InspectBeforePairedBracket(in BracketPair bracketPair, BidiClass sos)
-        {
-            for (var i = bracketPair.OpeningIndex - 1; i >= 0; --i)
-            {
-                var direction = GetStrongClassN0(_runResolvedClasses[i]);
-                
-                if (direction != BidiClass.OtherNeutral)
-                {
-                    return direction;
-                }
-            }
-
-            return sos;
-        }
-
-        /// <summary>
-        /// Sets the direction of a bracket pair, including setting the direction of
-        /// NSM's inside the brackets and following.
-        /// </summary>
-        /// <param name="bracketPair">The paired brackets</param>
-        /// <param name="direction">The resolved direction for the bracket pair</param>
-        private void SetPairedBracketDirection(in BracketPair bracketPair, BidiClass direction)
-        {
-            // Set the direction of the brackets
-            _runResolvedClasses[bracketPair.OpeningIndex] = direction;
-            _runResolvedClasses[bracketPair.ClosingIndex] = direction;
-
-            // Set the directionality of NSM's inside the brackets
-            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
-            {
-                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
-                {
-                    _runOriginalClasses[i] = direction;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            // Set the directionality of NSM's following the brackets
-            for (var i = bracketPair.ClosingIndex + 1; i < _runLength; i++)
-            {
-                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
-                {
-                    _runResolvedClasses[i] = direction;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Resets whitespace levels. Implements rule L1
-        /// </summary>
-        private void ResetWhitespaceLevels()
-        {
-            for (var i = 0; i < _resolvedLevels.Length; i++)
-            {
-                var originalClass = _originalClasses[i];
-
-                switch (originalClass)
-                {
-                    case BidiClass.ParagraphSeparator:
-                    case BidiClass.SegmentSeparator:
-                    {
-                        // Rule L1, clauses one and two.
-                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
-
-                        // Rule L1, clause three.
-                        for (var j = i - 1; j >= 0; --j)
-                        {
-                            if (IsWhitespace(_originalClasses[j]))
-                            {
-                                // including format codes
-                                _resolvedLevels[j] = _paragraphEmbeddingLevel;
-                            }
-                            else
-                            {
-                                break;
-                            }
-                        }
-                        
-                        break;
-                    }
-                }
-            }
-
-            // Rule L1, clause four.
-            for (var j = _resolvedLevels.Length - 1; j >= 0; j--)
-            {
-                if (IsWhitespace(_originalClasses[j]))
-                { // including format codes
-                    _resolvedLevels[j] = _paragraphEmbeddingLevel;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Assign levels to any characters that would be have been
-        /// removed by rule X9.  The idea is to keep level runs together
-        /// that would otherwise be broken by an interfering isolate/embedding
-        /// control character.
-        /// </summary>
-        private void AssignLevelsToCodePointsRemovedByX9()
-        {
-            // Redundant?
-            if (!_hasIsolates && !_hasEmbeddings)
-            {
-                return;
-            }
-
-            // No-op?
-            if (_workingClasses.Length == 0)
-            {
-                return;
-            }
-
-            // Fix up first character
-            if (_resolvedLevels[0] < 0)
-            {
-                _resolvedLevels[0] = _paragraphEmbeddingLevel;
-            }
-
-            if (IsRemovedByX9(_originalClasses[0]))
-            {
-                _workingClasses[0] = _originalClasses[0];
-            }
-
-            for (int i = 1, length = _workingClasses.Length; i < length; i++)
-            {
-                var originalClass = _originalClasses[i];
-                
-                if (IsRemovedByX9(originalClass))
-                {
-                    _workingClasses[i] = originalClass;
-                    _resolvedLevels[i] = _resolvedLevels[i - 1];
-                }
-            }
-        }
-
-        /// <summary>
-        /// Check if a directionality type represents whitespace
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsWhitespace(BidiClass biDiClass)
-        {
-            switch (biDiClass)
-            {
-                    case BidiClass.LeftToRightEmbedding:
-                    case BidiClass.RightToLeftEmbedding:
-                    case BidiClass.LeftToRightOverride:
-                    case BidiClass.RightToLeftOverride:
-                    case BidiClass.PopDirectionalFormat:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                    case BidiClass.BoundaryNeutral:
-                    case BidiClass.WhiteSpace:
-                        return true;
-                default:
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Convert a level to a direction where odd is RTL and
-        /// even is LTR
-        /// </summary>
-        /// <param name="level">The level to convert</param>
-        /// <returns>A directionality</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static BidiClass DirectionFromLevel(int level)
-            => ((level & 0x1) == 0) ? BidiClass.LeftToRight : BidiClass.RightToLeft;
-
-        /// <summary>
-        /// Helper to check if a directionality is removed by rule X9
-        /// </summary>
-        /// <param name="biDiClass">The bidi type to check</param>
-        /// <returns>True if rule X9 would remove this character; otherwise false</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsRemovedByX9(BidiClass biDiClass)
-        {
-            switch (biDiClass)
-            {
-                    case BidiClass.LeftToRightEmbedding:
-                    case  BidiClass.RightToLeftEmbedding:
-                    case  BidiClass.LeftToRightOverride:
-                    case  BidiClass.RightToLeftOverride:
-                    case  BidiClass.PopDirectionalFormat:
-                    case  BidiClass.BoundaryNeutral:
-                        return true;
-                default:
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Check if a a directionality is neutral for rules N1 and N2
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsNeutralClass(BidiClass direction)
-        {
-            switch (direction)
-            {
-                    case BidiClass.ParagraphSeparator:
-                    case BidiClass.SegmentSeparator:
-                    case BidiClass.WhiteSpace:
-                    case BidiClass.OtherNeutral:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                        return true;
-                        default:
-                            return false;
-            }
-        }
-
-        /// <summary>
-        /// Maps a direction to a strong class for rule N0
-        /// </summary>
-        /// <param name="direction">The direction to map</param>
-        /// <returns>A strong direction - R, L or ON</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static BidiClass GetStrongClassN0(BidiClass direction)
-        {
-            switch (direction)
-            {
-                    case BidiClass.EuropeanNumber:
-                    case BidiClass.ArabicNumber:
-                    case BidiClass.ArabicLetter:
-                    case BidiClass.RightToLeft:
-                        return BidiClass.RightToLeft;
-                    case BidiClass.LeftToRight:
-                        return BidiClass.LeftToRight;
-                    default:
-                        return BidiClass.OtherNeutral;
-            }
-        }
-
-        /// <summary>
-        /// Hold the start and end index of a pair of brackets
-        /// </summary>
-        private readonly struct BracketPair : IComparable<BracketPair>
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="BracketPair"/> struct.
-            /// </summary>
-            /// <param name="openingIndex">Index of the opening bracket</param>
-            /// <param name="closingIndex">Index of the closing bracket</param>
-            public BracketPair(int openingIndex, int closingIndex)
-            {
-                OpeningIndex = openingIndex;
-                ClosingIndex = closingIndex;
-            }
-
-            /// <summary>
-            /// Gets the index of the opening bracket
-            /// </summary>
-            public int OpeningIndex { get; }
-
-            /// <summary>
-            /// Gets the index of the closing bracket
-            /// </summary>
-            public int ClosingIndex { get; }
-
-            public int CompareTo(BracketPair other)
-                => OpeningIndex.CompareTo(other.OpeningIndex);
-        }
-
-        /// <summary>
-        /// Status stack entry used while resolving explicit
-        /// embedding levels
-        /// </summary>
-        private readonly struct Status
-        {
-            public Status(sbyte embeddingLevel, BidiClass overrideStatus, bool isolateStatus)
-            {
-                EmbeddingLevel = embeddingLevel;
-                OverrideStatus = overrideStatus;
-                IsolateStatus = isolateStatus;
-            }
-
-            public sbyte EmbeddingLevel { get; }
-
-            public BidiClass OverrideStatus { get; }
-
-            public bool IsolateStatus { get; }
-        }
-
-        /// <summary>
-        /// Provides information about a level run - a continuous
-        /// sequence of equal levels.
-        /// </summary>
-        private readonly struct LevelRun
-        {
-            public LevelRun(int start, int length, int level, BidiClass sos, BidiClass eos)
-            {
-                Start = start;
-                Length = length;
-                Level = level;
-                Sos = sos;
-                Eos = eos;
-            }
-
-            public int Start { get; }
-
-            public int Length { get; }
-
-            public int Level { get; }
-
-            public BidiClass Sos { get; }
-
-            public BidiClass Eos { get; }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiData.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiData.cs
deleted file mode 100644
index 9d76d56376..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiData.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-// Ported from: https://github.com/SixLabors/Fonts/
-
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    /// <summary>
-    /// Represents a unicode string and all associated attributes
-    /// for each character required for the bidirectional Unicode algorithm
-    /// </summary>
-    internal class BidiData
-    {
-        private ArrayBuilder<BidiClass> _classes;
-        private ArrayBuilder<BidiPairedBracketType> _pairedBracketTypes;
-        private ArrayBuilder<int> _pairedBracketValues;
-        private ArrayBuilder<BidiClass> _savedClasses;
-        private ArrayBuilder<BidiPairedBracketType> _savedPairedBracketTypes;
-        private ArrayBuilder<sbyte> _tempLevelBuffer;
-        
-        public BidiData(sbyte paragraphEmbeddingLevel = 0)
-        {
-            ParagraphEmbeddingLevel = paragraphEmbeddingLevel;
-        }
-
-        public BidiData(ReadOnlySlice<char> text, sbyte paragraphEmbeddingLevel = 0) : this(paragraphEmbeddingLevel)
-        {
-            Append(text);
-        }
-        
-        public sbyte ParagraphEmbeddingLevel { get; private set; }
-
-        public bool HasBrackets { get; private set; }
-
-        public bool HasEmbeddings { get; private set; }
-
-        public bool HasIsolates { get; private set; }
-
-        /// <summary>
-        /// Gets the length of the data held by the BidiData
-        /// </summary>
-        public int Length{get; private set; }
-
-        /// <summary>
-        /// Gets the bidi character type of each code point
-        /// </summary>
-        public ArraySlice<BidiClass> Classes { get; private set; }
-
-        /// <summary>
-        /// Gets the paired bracket type for each code point
-        /// </summary>
-        public ArraySlice<BidiPairedBracketType> PairedBracketTypes { get; private set; }
-
-        /// <summary>
-        /// Gets the paired bracket value for code point
-        /// </summary>
-        /// <remarks>
-        /// The paired bracket values are the code points
-        /// of each character where the opening code point
-        /// is replaced with the closing code point for easier
-        /// matching.  Also, bracket code points are mapped
-        /// to their canonical equivalents
-        /// </remarks>
-        public ArraySlice<int> PairedBracketValues { get; private set; }
-
-        public void Append(ReadOnlySlice<char> text)
-        {
-            _classes.Add(text.Length);
-            _pairedBracketTypes.Add(text.Length);
-            _pairedBracketValues.Add(text.Length);
-
-            var i = Length;
-             
-            var codePointEnumerator = new CodepointEnumerator(text);
-            
-            while (codePointEnumerator.MoveNext())
-            {
-                var codepoint = codePointEnumerator.Current;
-
-                // Look up BiDiClass
-                var dir = codepoint.BiDiClass;
-                
-                _classes[i] = dir;
-
-                switch (dir)
-                {
-                    case BidiClass.LeftToRightEmbedding:
-                    case BidiClass.LeftToRightOverride:
-                    case BidiClass.RightToLeftEmbedding:
-                    case BidiClass.RightToLeftOverride:
-                    case BidiClass.PopDirectionalFormat:
-                    {
-                        HasEmbeddings = true;
-                        break;
-                    }
-
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                    {
-                        HasIsolates = true;
-                        break;
-                    }
-                }
-
-                // Lookup paired bracket types
-                var pbt = codepoint.PairedBracketType;
-                
-                _pairedBracketTypes[i] = pbt;
-
-                if (pbt == BidiPairedBracketType.Open)
-                {
-                    // Opening bracket types can never have a null pairing.
-                    codepoint.TryGetPairedBracket(out var paired);
-                    
-                    _pairedBracketValues[i] = Codepoint.GetCanonicalType(paired).Value;
-
-                    HasBrackets = true;
-                }
-                else if (pbt == BidiPairedBracketType.Close)
-                {
-                    _pairedBracketValues[i] = Codepoint.GetCanonicalType(codepoint).Value;
-                    
-                    HasBrackets = true;
-                }
-
-                i++;
-            }
-
-            Length = i;
-            
-            Classes = _classes.AsSlice(0, Length);
-            PairedBracketTypes = _pairedBracketTypes.AsSlice(0, Length);
-            PairedBracketValues = _pairedBracketValues.AsSlice(0, Length);
-        }
-
-        /// <summary>
-        /// Save the Types and PairedBracketTypes of this BiDiData
-        /// </summary>
-        /// <remarks>
-        /// This is used when processing embedded style runs with
-        /// BiDiClass overrides. Text layout process saves the data,
-        /// overrides the style runs to neutral, processes the bidi
-        /// data for the entire paragraph and then restores this data
-        /// before processing the embedded runs.
-        /// </remarks>
-        public void SaveTypes()
-        {
-            // Capture the types data
-            _savedClasses.Clear();
-            _savedClasses.Add(_classes.AsSlice());
-            _savedPairedBracketTypes.Clear();
-            _savedPairedBracketTypes.Add(_pairedBracketTypes.AsSlice());
-        }
-
-        /// <summary>
-        /// Restore the data saved by SaveTypes
-        /// </summary>
-        public void RestoreTypes()
-        {
-            _classes.Clear();
-            _classes.Add(_savedClasses.AsSlice());
-            _pairedBracketTypes.Clear();
-            _pairedBracketTypes.Add(_savedPairedBracketTypes.AsSlice());
-        }
-
-        /// <summary>
-        /// Gets a temporary level buffer. Used by the text layout process when
-        /// resolving style runs with different BiDiClass.
-        /// </summary>
-        /// <param name="length">Length of the required ExpandableBuffer</param>
-        /// <returns>An uninitialized level ExpandableBuffer</returns>
-        public ArraySlice<sbyte> GetTempLevelBuffer(int length)
-        {
-            _tempLevelBuffer.Clear();
-            
-            return _tempLevelBuffer.Add(length, false);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
deleted file mode 100644
index 412007c6e0..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// RichTextKit
-// Copyright © 2019 Topten Software. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may 
-// not use this product except in compliance with the License. You may obtain 
-// a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
-// License for the specific language governing permissions and limitations 
-// under the License.
-// Copied from: https://github.com/toptensoftware/RichTextKit
-
-using System;
-using System.IO;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    internal static class BinaryReaderExtensions
-    {
-        public static int ReadInt32BE(this BinaryReader reader)
-        {
-            var bytes = reader.ReadBytes(4);
-
-            if (BitConverter.IsLittleEndian)
-            {
-                Array.Reverse(bytes);
-            }
-
-            return BitConverter.ToInt32(bytes, 0);
-        }
-
-        public static uint ReadUInt32BE(this BinaryReader reader)
-        {
-            var bytes = reader.ReadBytes(4);
-
-            if (BitConverter.IsLittleEndian)
-            {
-                Array.Reverse(bytes);
-            }
-
-            return BitConverter.ToUInt32(bytes, 0);
-        }
-
-        public static void WriteBE(this BinaryWriter writer, int value)
-        {
-            var bytes = BitConverter.GetBytes(value);
-
-            if (BitConverter.IsLittleEndian)
-            {
-                Array.Reverse(bytes);
-            }
-
-            writer.Write(bytes);
-        }
-
-        public static void WriteBE(this BinaryWriter writer, uint value)
-        {
-            var bytes = BitConverter.GetBytes(value);
-
-            if (BitConverter.IsLittleEndian)
-            {
-                Array.Reverse(bytes);
-            }
-
-            writer.Write(bytes);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs
deleted file mode 100644
index 39440f6fcf..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    public readonly struct Codepoint
-    {
-        /// <summary>
-        /// The replacement codepoint that is used for non supported values.
-        /// </summary>
-        public static readonly Codepoint ReplacementCodepoint = new Codepoint('\uFFFD');
-
-        public Codepoint(int value)
-        {
-            Value = value;
-        }
-
-        /// <summary>
-        /// Get the codepoint's value.
-        /// </summary>
-        public int Value { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Unicode.GeneralCategory"/>.
-        /// </summary>
-        public GeneralCategory GeneralCategory => UnicodeData.GetGeneralCategory(Value);
-
-        /// <summary>
-        /// Gets the <see cref="Unicode.Script"/>.
-        /// </summary>
-        public Script Script => UnicodeData.GetScript(Value);
-
-        /// <summary>
-        /// Gets the <see cref="Unicode.BidiClass"/>.
-        /// </summary>
-        public BidiClass BiDiClass => UnicodeData.GetBiDiClass(Value);
-
-        /// <summary>
-        /// Gets the <see cref="Unicode.BidiPairedBracketType"/>.
-        /// </summary>
-        public BidiPairedBracketType PairedBracketType => UnicodeData.GetBiDiPairedBracketType(Value);
-        
-        /// <summary>
-        /// Gets the <see cref="Unicode.LineBreakClass"/>.
-        /// </summary>
-        public LineBreakClass LineBreakClass => UnicodeData.GetLineBreakClass(Value);
-
-        /// <summary>
-        /// Gets the <see cref="GraphemeBreakClass"/>.
-        /// </summary>
-        public GraphemeBreakClass GraphemeBreakClass => UnicodeData.GetGraphemeClusterBreak(Value);
-
-        /// <summary>
-        /// Determines whether this <see cref="Codepoint"/> is a break char.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c> if [is break character]; otherwise, <c>false</c>.
-        /// </returns>
-        public bool IsBreakChar
-        {
-            get
-            {
-                switch (Value)
-                {
-                    case '\u000A':
-                    case '\u000B':
-                    case '\u000C':
-                    case '\u000D':
-                    case '\u0085':
-                    case '\u2028':
-                    case '\u2029':
-                        return true;
-                    default:
-                        return false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether this <see cref="Codepoint"/> is white space.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c> if [is whitespace]; otherwise, <c>false</c>.
-        /// </returns>
-        public bool IsWhiteSpace
-        {
-            get
-            {
-                switch (GeneralCategory)
-                {
-                    case GeneralCategory.Control:
-                    case GeneralCategory.NonspacingMark:
-                    case GeneralCategory.Format:
-                    case GeneralCategory.SpaceSeparator:
-                    case GeneralCategory.SpacingMark:
-                        return true;
-                }
-
-                return false;
-            }
-        }
-        
-        /// <summary>
-        /// Gets the canonical representation of a given codepoint.
-        /// <see href="http://www.unicode.org/L2/L2013/13123-norm-and-bpa.pdf"/>
-        /// </summary>
-        /// <param name="codePoint">The code point to be mapped.</param>
-        /// <returns>The mapped canonical code point, or the passed <paramref name="codePoint"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static Codepoint GetCanonicalType(Codepoint codePoint)
-        {
-            if (codePoint.Value == 0x3008)
-            {
-                return new Codepoint(0x2329);
-            }
-
-            if (codePoint.Value == 0x3009)
-            {
-                return new Codepoint(0x232A);
-            }
-
-            return codePoint;
-        }
-        
-        /// <summary>
-        /// Gets the codepoint representing the bracket pairing for this instance.
-        /// </summary>
-        /// <param name="codepoint">
-        /// When this method returns, contains the codepoint representing the bracket pairing for this instance;
-        /// otherwise, the default value for the type of the <paramref name="codepoint"/> parameter.
-        /// This parameter is passed uninitialized.
-        /// .</param>
-        /// <returns><see langword="true"/> if this instance has a bracket pairing; otherwise, <see langword="false"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool TryGetPairedBracket(out Codepoint codepoint)
-        {
-            if (PairedBracketType == BidiPairedBracketType.None)
-            {
-                codepoint = default;
-                
-                return false;
-            }
-
-            codepoint = UnicodeData.GetBiDiPairedBracket(Value);
-
-            return true;
-        }
-
-        public static implicit operator int(Codepoint codepoint)
-        {
-            return codepoint.Value;
-        }
-
-        public static implicit operator uint(Codepoint codepoint)
-        {
-            return (uint)codepoint.Value;
-        }
-
-        /// <summary>
-        /// Reads the <see cref="Codepoint"/> at specified position.
-        /// </summary>
-        /// <param name="text">The buffer to read from.</param>
-        /// <param name="index">The index to read at.</param>
-        /// <param name="count">The count of character that were read.</param>
-        /// <returns></returns>
-        public static Codepoint ReadAt(ReadOnlySlice<char> text, int index, out int count)
-        {
-            count = 1;
-
-            if (index >= text.Length)
-            {
-                return ReplacementCodepoint;
-            }
-
-            var code = text[index];
-
-            ushort hi, low;
-
-            //# High surrogate
-            if (0xD800 <= code && code <= 0xDBFF)
-            {
-                hi = code;
-
-                if (index + 1 == text.Length)
-                {
-                    return ReplacementCodepoint;
-                }
-
-                low = text[index + 1];
-
-                if (0xDC00 <= low && low <= 0xDFFF)
-                {
-                    count = 2;
-                    return new Codepoint((hi - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000);
-                }
-
-                return ReplacementCodepoint;
-            }
-
-            //# Low surrogate
-            if (0xDC00 <= code && code <= 0xDFFF)
-            {
-                if (index == 0)
-                {
-                    return ReplacementCodepoint;
-                }
-
-                hi = text[index - 1];
-
-                low = code;
-
-                if (0xD800 <= hi && hi <= 0xDBFF)
-                {
-                    count = 2;
-                    return new Codepoint((hi - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000);
-                }
-
-                return ReplacementCodepoint;
-            }
-
-            return new Codepoint(code);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
deleted file mode 100644
index 71e4bce106..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    public enum GraphemeBreakClass
-    {
-        Other,
-        CR,
-        LF,
-        Control,
-        Extend,
-        ZWJ,
-        RegionalIndicator,
-        Prepend,
-        SpacingMark,
-        L,
-        V,
-        T,
-        LV,
-        LVT,
-        ExtendedPictographic,
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs
deleted file mode 100644
index 34b14f008f..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// RichTextKit
-// Copyright © 2019 Topten Software. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may 
-// not use this product except in compliance with the License. You may obtain 
-// a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
-// License for the specific language governing permissions and limitations 
-// under the License.
-//
-// Ported from: https://github.com/foliojs/linebreak
-// Copied from: https://github.com/toptensoftware/RichTextKit
-
-using System.Diagnostics;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    /// <summary>
-    /// Information about a potential line break position
-    /// </summary>
-    [DebuggerDisplay("{PositionMeasure}/{PositionWrap} @ {Required}")]
-    public readonly struct LineBreak
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="positionMeasure">The code point index to measure to</param>
-        /// <param name="positionWrap">The code point index to actually break the line at</param>
-        /// <param name="required">True if this is a required line break; otherwise false</param>
-        public LineBreak(int positionMeasure, int positionWrap, bool required = false)
-        {
-            PositionMeasure = positionMeasure;
-            PositionWrap = positionWrap;
-            Required = required;
-        }
-
-        /// <summary>
-        /// The break position, before any trailing whitespace
-        /// </summary>
-        /// <remarks>
-        /// This doesn't include trailing whitespace
-        /// </remarks>
-        public int PositionMeasure { get; }
-
-        /// <summary>
-        /// The break position, after any trailing whitespace
-        /// </summary>
-        /// <remarks>
-        /// This includes trailing whitespace
-        /// </remarks>
-        public int PositionWrap { get; }
-
-        /// <summary>
-        /// True if there should be a forced line break here
-        /// </summary>
-        public bool Required { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakClass.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakClass.cs
deleted file mode 100644
index 8b2e3f41e3..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakClass.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    public enum LineBreakClass
-    {
-        OpenPunctuation, //OP
-        ClosePunctuation, //CL
-        CloseParenthesis, //CP
-        Quotation, //QU
-        Glue, //GL
-        Nonstarter, //NS
-        Exclamation, //EX
-        BreakSymbols, //SY
-        InfixNumeric, //IS
-        PrefixNumeric, //PR
-        PostfixNumeric, //PO
-        Numeric, //NU
-        Alphabetic, //AL
-        HebrewLetter, //HL
-        Ideographic, //ID
-        Inseparable, //IN
-        Hyphen, //HY
-        BreakAfter, //BA
-        BreakBefore, //BB
-        BreakBoth, //B2
-        ZWSpace, //ZW
-        CombiningMark, //CM
-        WordJoiner, //WJ
-        H2, //H2
-        H3, //H3
-        JL, //JL
-        JV, //JV
-        JT, //JT
-        RegionalIndicator, //RI
-        EBase, //EB
-        EModifier, //EM
-        ZWJ, //ZWJ
-        ContingentBreak, //CB
-
-        Unknown, //XX
-        Ambiguous, //AI
-        MandatoryBreak, //BK
-        ConditionalJapaneseStarter, //CJ
-        CarriageReturn, //CR
-        LineFeed, //LF
-        NextLine, //NL
-        ComplexContext, //SA
-        Surrogate, //SG
-        Space, //SP
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
deleted file mode 100644
index 0f6b81975a..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
+++ /dev/null
@@ -1,492 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-// Ported from: https://github.com/SixLabors/Fonts/
-
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    /// <summary>
-    /// Implementation of the Unicode Line Break Algorithm. UAX:14
-    /// <see href="https://www.unicode.org/reports/tr14/tr14-37.html"/>
-    /// </summary>
-    public ref struct LineBreakEnumerator
-    {
-        private readonly ReadOnlySlice<char> _text;
-        private int _position;
-        private int _lastPosition;
-        private LineBreakClass _currentClass;
-        private LineBreakClass _nextClass;
-        private bool _first;
-        private int _alphaNumericCount;
-        private bool _lb8a;
-        private bool _lb21a;
-        private bool _lb22ex;
-        private bool _lb24ex;
-        private bool _lb25ex;
-        private bool _lb30;
-        private int _lb30a;
-        private bool _lb31;
-
-        public LineBreakEnumerator(ReadOnlySlice<char> text)
-            : this()
-        {
-            _text = text;
-            _position = 0;
-            _currentClass = LineBreakClass.Unknown;
-            _nextClass = LineBreakClass.Unknown;
-            _first = true;
-            _lb8a = false;
-            _lb21a = false;
-            _lb22ex = false;
-            _lb24ex = false;
-            _lb25ex = false;
-            _alphaNumericCount = 0;
-            _lb31 = false;
-            _lb30 = false;
-            _lb30a = 0;
-        }
-        
-        public LineBreak Current { get; private set; }
-        
-        public bool MoveNext()
-        {
-            // Get the first char if we're at the beginning of the string.
-            if (_first)
-            {
-                var firstClass = NextCharClass();
-                _first = false;
-                _currentClass = MapFirst(firstClass);
-                _nextClass = firstClass;
-                _lb8a = firstClass == LineBreakClass.ZWJ;
-                _lb30a = 0;
-            }
-
-            while (_position < _text.Length)
-            {
-                _lastPosition = _position;
-                var lastClass = _nextClass;
-                _nextClass = NextCharClass();
-
-                // Explicit newline
-                switch (_currentClass)
-                {
-                    case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.CarriageReturn when _nextClass != LineBreakClass.LineFeed:
-                    {
-                        _currentClass = MapFirst(_nextClass);
-                        Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, true);
-                        return true;
-                    }
-                }
-
-                var shouldBreak = GetSimpleBreak() ?? GetPairTableBreak(lastClass);
-
-                // Rule LB8a
-                _lb8a = _nextClass == LineBreakClass.ZWJ;
-
-                if (shouldBreak)
-                {
-                    Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
-                    return true;
-                }
-            }
-
-            if (_position >= _text.Length)
-            {
-                if (_lastPosition < _text.Length)
-                {
-                    _lastPosition = _text.Length;
-
-                    var required = false;
-
-                    switch (_currentClass)
-                    {
-                        case LineBreakClass.MandatoryBreak:
-                        case LineBreakClass.CarriageReturn when _nextClass != LineBreakClass.LineFeed:
-                            required = true;
-                            break;
-                    }
-
-                    Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, required);
-                    return true;
-                }
-            }
-
-            Current = default;
-            
-            return false;
-        }
-
-        private static LineBreakClass MapClass(Codepoint cp)
-        {
-            if (cp.Value == 327685)
-            {
-                return LineBreakClass.Alphabetic;
-            }
-            
-            // LB 1
-            // ==========================================
-            // Resolved Original    General_Category
-            // ==========================================
-            // AL       AI, SG, XX  Any
-            // CM       SA          Only Mn or Mc
-            // AL       SA          Any except Mn and Mc
-            // NS       CJ          Any
-            switch (cp.LineBreakClass)
-            {
-                case LineBreakClass.Ambiguous:
-                case LineBreakClass.Surrogate:
-                case LineBreakClass.Unknown:
-                    return LineBreakClass.Alphabetic;
-
-                case LineBreakClass.ComplexContext:
-                    return cp.GeneralCategory == GeneralCategory.NonspacingMark || cp.GeneralCategory == GeneralCategory.SpacingMark
-                        ? LineBreakClass.CombiningMark
-                        : LineBreakClass.Alphabetic;
-
-                case LineBreakClass.ConditionalJapaneseStarter:
-                    return LineBreakClass.Nonstarter;
-
-                default:
-                    return cp.LineBreakClass;
-            }
-        }
-
-        private static LineBreakClass MapFirst(LineBreakClass c)
-        {
-            switch (c)
-            {
-                case LineBreakClass.LineFeed:
-                case LineBreakClass.NextLine:
-                    return LineBreakClass.MandatoryBreak;
-
-                case LineBreakClass.Space:
-                    return LineBreakClass.WordJoiner;
-
-                default:
-                    return c;
-            }
-        }
-
-        private static bool IsAlphaNumeric(LineBreakClass cls)
-            => cls == LineBreakClass.Alphabetic
-            || cls == LineBreakClass.HebrewLetter
-            || cls == LineBreakClass.Numeric;
-
-        private LineBreakClass PeekNextCharClass()
-        {
-            var cp = Codepoint.ReadAt(_text, _position, out _);
-            
-            return MapClass(cp);
-        }
-
-        // Get the next character class
-        private LineBreakClass NextCharClass()
-        {
-            var cp = Codepoint.ReadAt(_text, _position, out var count);
-            var cls = MapClass(cp);
-            _position += count;
-
-            // Keep track of alphanumeric + any combining marks.
-            // This is used for LB22 and LB30.
-            if (IsAlphaNumeric(_currentClass) || _alphaNumericCount > 0 && cls == LineBreakClass.CombiningMark)
-            {
-                _alphaNumericCount++;
-            }
-
-            // Track combining mark exceptions. LB22
-            if (cls == LineBreakClass.CombiningMark)
-            {
-                switch (_currentClass)
-                {
-                    case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.ContingentBreak:
-                    case LineBreakClass.Exclamation:
-                    case LineBreakClass.LineFeed:
-                    case LineBreakClass.NextLine:
-                    case LineBreakClass.Space:
-                    case LineBreakClass.ZWSpace:
-                    case LineBreakClass.CarriageReturn:
-                        _lb22ex = true;
-                        break;
-                }
-            }
-
-            // Track combining mark exceptions. LB31
-            if (_first && cls == LineBreakClass.CombiningMark)
-            {
-                _lb31 = true;
-            }
-
-            if (cls == LineBreakClass.CombiningMark)
-            {
-                switch (_currentClass)
-                {
-                    case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.ContingentBreak:
-                    case LineBreakClass.Exclamation:
-                    case LineBreakClass.LineFeed:
-                    case LineBreakClass.NextLine:
-                    case LineBreakClass.Space:
-                    case LineBreakClass.ZWSpace:
-                    case LineBreakClass.CarriageReturn:
-                    case LineBreakClass.ZWJ:
-                        _lb31 = true;
-                        break;
-                }
-            }
-
-            if (_first
-                && (cls == LineBreakClass.PostfixNumeric || cls == LineBreakClass.PrefixNumeric || cls == LineBreakClass.Space))
-            {
-                _lb31 = true;
-            }
-
-            if (_currentClass == LineBreakClass.Alphabetic && 
-                (cls == LineBreakClass.PostfixNumeric || cls == LineBreakClass.PrefixNumeric || cls == LineBreakClass.Space))
-            {
-                _lb31 = true;
-            }
-
-            // Reset LB31 if next is U+0028 (Left Opening Parenthesis)
-            if (_lb31
-                && _currentClass != LineBreakClass.PostfixNumeric
-                && _currentClass != LineBreakClass.PrefixNumeric
-                && cls == LineBreakClass.OpenPunctuation && cp.Value == 0x0028)
-            {
-                _lb31 = false;
-            }
-
-            // Rule LB24
-            if (_first && (cls == LineBreakClass.ClosePunctuation || cls == LineBreakClass.CloseParenthesis))
-            {
-                _lb24ex = true;
-            }
-
-            // Rule LB25
-            if (_first
-                && (cls == LineBreakClass.ClosePunctuation || cls == LineBreakClass.InfixNumeric || cls == LineBreakClass.BreakSymbols))
-            {
-                _lb25ex = true;
-            }
-
-            if (cls == LineBreakClass.Space || cls == LineBreakClass.WordJoiner || cls == LineBreakClass.Alphabetic)
-            {
-                var next = PeekNextCharClass();
-                if (next == LineBreakClass.ClosePunctuation || next == LineBreakClass.InfixNumeric || next == LineBreakClass.BreakSymbols)
-                {
-                    _lb25ex = true;
-                }
-            }
-
-            // AlphaNumeric + and combining marks can break for OP except.
-            // - U+0028 (Left Opening Parenthesis)
-            // - U+005B (Opening Square Bracket)
-            // - U+007B (Left Curly Bracket)
-            // See custom columns|rules in the text pair table.
-            // https://www.unicode.org/Public/13.0.0/ucd/auxiliary/LineBreakTest.html
-            _lb30 = _alphaNumericCount > 0
-                && cls == LineBreakClass.OpenPunctuation
-                && cp.Value != 0x0028
-                && cp.Value != 0x005B
-                && cp.Value != 0x007B;
-
-            return cls;
-        }
-
-        private bool? GetSimpleBreak()
-        {
-            // handle classes not handled by the pair table
-            switch (_nextClass)
-            {
-                case LineBreakClass.Space:
-                    return false;
-
-                case LineBreakClass.MandatoryBreak:
-                case LineBreakClass.LineFeed:
-                case LineBreakClass.NextLine:
-                    _currentClass = LineBreakClass.MandatoryBreak;
-                    return false;
-
-                case LineBreakClass.CarriageReturn:
-                    _currentClass = LineBreakClass.CarriageReturn;
-                    return false;
-            }
-
-            return null;
-        }
-
-        private bool GetPairTableBreak(LineBreakClass lastClass)
-        {
-            // If not handled already, use the pair table
-            bool shouldBreak = false;
-            switch (LineBreakPairTable.Table[(int)_currentClass][(int)_nextClass])
-            {
-                case LineBreakPairTable.DIBRK: // Direct break
-                    shouldBreak = true;
-                    break;
-
-                // TODO: Rewrite this so that it defaults to true and rules are set as exceptions.
-                case LineBreakPairTable.INBRK: // Possible indirect break
-
-                    // LB31
-                    if (_lb31 && _nextClass == LineBreakClass.OpenPunctuation)
-                    {
-                        shouldBreak = true;
-                        _lb31 = false;
-                        break;
-                    }
-
-                    // LB30
-                    if (_lb30)
-                    {
-                        shouldBreak = true;
-                        _lb30 = false;
-                        _alphaNumericCount = 0;
-                        break;
-                    }
-
-                    // LB25
-                    if (_lb25ex && (_nextClass == LineBreakClass.PrefixNumeric || _nextClass == LineBreakClass.Numeric))
-                    {
-                        shouldBreak = true;
-                        _lb25ex = false;
-                        break;
-                    }
-
-                    // LB24
-                    if (_lb24ex && (_nextClass == LineBreakClass.PostfixNumeric || _nextClass == LineBreakClass.PrefixNumeric))
-                    {
-                        shouldBreak = true;
-                        _lb24ex = false;
-                        break;
-                    }
-
-                    // LB18
-                    shouldBreak = lastClass == LineBreakClass.Space;
-                    break;
-
-                case LineBreakPairTable.CIBRK:
-                    shouldBreak = lastClass == LineBreakClass.Space;
-                    if (!shouldBreak)
-                    {
-                        return false;
-                    }
-
-                    break;
-
-                case LineBreakPairTable.CPBRK: // prohibited for combining marks
-                    if (lastClass != LineBreakClass.Space)
-                    {
-                        return false;
-                    }
-
-                    break;
-
-                case LineBreakPairTable.PRBRK:
-                    break;
-            }
-
-            // Rule LB22
-            if (_nextClass == LineBreakClass.Inseparable)
-            {
-                switch (lastClass)
-                {
-                    case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.ContingentBreak:
-                    case LineBreakClass.Exclamation:
-                    case LineBreakClass.LineFeed:
-                    case LineBreakClass.NextLine:
-                    case LineBreakClass.Space:
-                    case LineBreakClass.ZWSpace:
-
-                        // Allow break
-                        break;
-                    case LineBreakClass.CombiningMark:
-                        if (_lb22ex)
-                        {
-                            // Allow break
-                            _lb22ex = false;
-                            break;
-                        }
-
-                        shouldBreak = false;
-                        break;
-                    default:
-                        shouldBreak = false;
-                        break;
-                }
-            }
-
-            if (_lb8a)
-            {
-                shouldBreak = false;
-            }
-
-            // Rule LB21a
-            if (_lb21a && (_currentClass == LineBreakClass.Hyphen || _currentClass == LineBreakClass.BreakAfter))
-            {
-                shouldBreak = false;
-                _lb21a = false;
-            }
-            else
-            {
-                _lb21a = _currentClass == LineBreakClass.HebrewLetter;
-            }
-
-            // Rule LB30a
-            if (_currentClass == LineBreakClass.RegionalIndicator)
-            {
-                _lb30a++;
-                if (_lb30a == 2 && _nextClass == LineBreakClass.RegionalIndicator)
-                {
-                    shouldBreak = true;
-                    _lb30a = 0;
-                }
-            }
-            else
-            {
-                _lb30a = 0;
-            }
-
-            _currentClass = _nextClass;
-
-            return shouldBreak;
-        }
-        
-        private int FindPriorNonWhitespace(int from)
-        {
-            if (from > 0)
-            {
-                var cp = Codepoint.ReadAt(_text, from - 1, out var count);
-
-                var cls = cp.LineBreakClass;
-
-                if (cls == LineBreakClass.MandatoryBreak || cls == LineBreakClass.LineFeed ||
-                    cls == LineBreakClass.CarriageReturn)
-                {
-                    from -= count;
-                }
-            }
-
-            while (from > 0)
-            {
-                var cp = Codepoint.ReadAt(_text, from - 1, out var count);
-
-                var cls = cp.LineBreakClass;
-
-                if (cls == LineBreakClass.Space)
-                {
-                    from -= count;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            return from;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
deleted file mode 100644
index af5d9ff752..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
+++ /dev/null
@@ -1,509 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    internal static class PropertyValueAliasHelper
-    {
-        private static readonly Dictionary<Script, string> s_scriptToTag = 
-            new Dictionary<Script, string>{
-                { Script.Unknown, "Zzzz"},
-                { Script.Common, "Zyyy"},
-                { Script.Inherited, "Zinh"},
-                { Script.Adlam, "Adlm"},
-                { Script.CaucasianAlbanian, "Aghb"},
-                { Script.Ahom, "Ahom"},
-                { Script.Arabic, "Arab"},
-                { Script.ImperialAramaic, "Armi"},
-                { Script.Armenian, "Armn"},
-                { Script.Avestan, "Avst"},
-                { Script.Balinese, "Bali"},
-                { Script.Bamum, "Bamu"},
-                { Script.BassaVah, "Bass"},
-                { Script.Batak, "Batk"},
-                { Script.Bengali, "Beng"},
-                { Script.Bhaiksuki, "Bhks"},
-                { Script.Bopomofo, "Bopo"},
-                { Script.Brahmi, "Brah"},
-                { Script.Braille, "Brai"},
-                { Script.Buginese, "Bugi"},
-                { Script.Buhid, "Buhd"},
-                { Script.Chakma, "Cakm"},
-                { Script.CanadianAboriginal, "Cans"},
-                { Script.Carian, "Cari"},
-                { Script.Cham, "Cham"},
-                { Script.Cherokee, "Cher"},
-                { Script.Chorasmian, "Chrs"},
-                { Script.Coptic, "Copt"},
-                { Script.Cypriot, "Cprt"},
-                { Script.Cyrillic, "Cyrl"},
-                { Script.Devanagari, "Deva"},
-                { Script.DivesAkuru, "Diak"},
-                { Script.Dogra, "Dogr"},
-                { Script.Deseret, "Dsrt"},
-                { Script.Duployan, "Dupl"},
-                { Script.EgyptianHieroglyphs, "Egyp"},
-                { Script.Elbasan, "Elba"},
-                { Script.Elymaic, "Elym"},
-                { Script.Ethiopic, "Ethi"},
-                { Script.Georgian, "Geor"},
-                { Script.Glagolitic, "Glag"},
-                { Script.GunjalaGondi, "Gong"},
-                { Script.MasaramGondi, "Gonm"},
-                { Script.Gothic, "Goth"},
-                { Script.Grantha, "Gran"},
-                { Script.Greek, "Grek"},
-                { Script.Gujarati, "Gujr"},
-                { Script.Gurmukhi, "Guru"},
-                { Script.Hangul, "Hang"},
-                { Script.Han, "Hani"},
-                { Script.Hanunoo, "Hano"},
-                { Script.Hatran, "Hatr"},
-                { Script.Hebrew, "Hebr"},
-                { Script.Hiragana, "Hira"},
-                { Script.AnatolianHieroglyphs, "Hluw"},
-                { Script.PahawhHmong, "Hmng"},
-                { Script.NyiakengPuachueHmong, "Hmnp"},
-                { Script.KatakanaOrHiragana, "Hrkt"},
-                { Script.OldHungarian, "Hung"},
-                { Script.OldItalic, "Ital"},
-                { Script.Javanese, "Java"},
-                { Script.KayahLi, "Kali"},
-                { Script.Katakana, "Kana"},
-                { Script.Kharoshthi, "Khar"},
-                { Script.Khmer, "Khmr"},
-                { Script.Khojki, "Khoj"},
-                { Script.KhitanSmallScript, "Kits"},
-                { Script.Kannada, "Knda"},
-                { Script.Kaithi, "Kthi"},
-                { Script.TaiTham, "Lana"},
-                { Script.Lao, "Laoo"},
-                { Script.Latin, "Latn"},
-                { Script.Lepcha, "Lepc"},
-                { Script.Limbu, "Limb"},
-                { Script.LinearA, "Lina"},
-                { Script.LinearB, "Linb"},
-                { Script.Lisu, "Lisu"},
-                { Script.Lycian, "Lyci"},
-                { Script.Lydian, "Lydi"},
-                { Script.Mahajani, "Mahj"},
-                { Script.Makasar, "Maka"},
-                { Script.Mandaic, "Mand"},
-                { Script.Manichaean, "Mani"},
-                { Script.Marchen, "Marc"},
-                { Script.Medefaidrin, "Medf"},
-                { Script.MendeKikakui, "Mend"},
-                { Script.MeroiticCursive, "Merc"},
-                { Script.MeroiticHieroglyphs, "Mero"},
-                { Script.Malayalam, "Mlym"},
-                { Script.Modi, "Modi"},
-                { Script.Mongolian, "Mong"},
-                { Script.Mro, "Mroo"},
-                { Script.MeeteiMayek, "Mtei"},
-                { Script.Multani, "Mult"},
-                { Script.Myanmar, "Mymr"},
-                { Script.Nandinagari, "Nand"},
-                { Script.OldNorthArabian, "Narb"},
-                { Script.Nabataean, "Nbat"},
-                { Script.Newa, "Newa"},
-                { Script.Nko, "Nkoo"},
-                { Script.Nushu, "Nshu"},
-                { Script.Ogham, "Ogam"},
-                { Script.OlChiki, "Olck"},
-                { Script.OldTurkic, "Orkh"},
-                { Script.Oriya, "Orya"},
-                { Script.Osage, "Osge"},
-                { Script.Osmanya, "Osma"},
-                { Script.Palmyrene, "Palm"},
-                { Script.PauCinHau, "Pauc"},
-                { Script.OldPermic, "Perm"},
-                { Script.PhagsPa, "Phag"},
-                { Script.InscriptionalPahlavi, "Phli"},
-                { Script.PsalterPahlavi, "Phlp"},
-                { Script.Phoenician, "Phnx"},
-                { Script.Miao, "Plrd"},
-                { Script.InscriptionalParthian, "Prti"},
-                { Script.Rejang, "Rjng"},
-                { Script.HanifiRohingya, "Rohg"},
-                { Script.Runic, "Runr"},
-                { Script.Samaritan, "Samr"},
-                { Script.OldSouthArabian, "Sarb"},
-                { Script.Saurashtra, "Saur"},
-                { Script.SignWriting, "Sgnw"},
-                { Script.Shavian, "Shaw"},
-                { Script.Sharada, "Shrd"},
-                { Script.Siddham, "Sidd"},
-                { Script.Khudawadi, "Sind"},
-                { Script.Sinhala, "Sinh"},
-                { Script.Sogdian, "Sogd"},
-                { Script.OldSogdian, "Sogo"},
-                { Script.SoraSompeng, "Sora"},
-                { Script.Soyombo, "Soyo"},
-                { Script.Sundanese, "Sund"},
-                { Script.SylotiNagri, "Sylo"},
-                { Script.Syriac, "Syrc"},
-                { Script.Tagbanwa, "Tagb"},
-                { Script.Takri, "Takr"},
-                { Script.TaiLe, "Tale"},
-                { Script.NewTaiLue, "Talu"},
-                { Script.Tamil, "Taml"},
-                { Script.Tangut, "Tang"},
-                { Script.TaiViet, "Tavt"},
-                { Script.Telugu, "Telu"},
-                { Script.Tifinagh, "Tfng"},
-                { Script.Tagalog, "Tglg"},
-                { Script.Thaana, "Thaa"},
-                { Script.Thai, "Thai"},
-                { Script.Tibetan, "Tibt"},
-                { Script.Tirhuta, "Tirh"},
-                { Script.Ugaritic, "Ugar"},
-                { Script.Vai, "Vaii"},
-                { Script.WarangCiti, "Wara"},
-                { Script.Wancho, "Wcho"},
-                { Script.OldPersian, "Xpeo"},
-                { Script.Cuneiform, "Xsux"},
-                { Script.Yezidi, "Yezi"},
-                { Script.Yi, "Yiii"},
-                { Script.ZanabazarSquare, "Zanb"},
-        };
-
-        public static string GetTag(Script script)
-        {
-            if(!s_scriptToTag.ContainsKey(script))
-            {
-                return "Zzzz";
-            }
-            return s_scriptToTag[script];
-        }
-
-        private static readonly Dictionary<string, Script> s_tagToScript = 
-            new Dictionary<string,Script>{
-                { "Zzzz", Script.Unknown},
-                { "Zyyy", Script.Common},
-                { "Zinh", Script.Inherited},
-                { "Adlm", Script.Adlam},
-                { "Aghb", Script.CaucasianAlbanian},
-                { "Ahom", Script.Ahom},
-                { "Arab", Script.Arabic},
-                { "Armi", Script.ImperialAramaic},
-                { "Armn", Script.Armenian},
-                { "Avst", Script.Avestan},
-                { "Bali", Script.Balinese},
-                { "Bamu", Script.Bamum},
-                { "Bass", Script.BassaVah},
-                { "Batk", Script.Batak},
-                { "Beng", Script.Bengali},
-                { "Bhks", Script.Bhaiksuki},
-                { "Bopo", Script.Bopomofo},
-                { "Brah", Script.Brahmi},
-                { "Brai", Script.Braille},
-                { "Bugi", Script.Buginese},
-                { "Buhd", Script.Buhid},
-                { "Cakm", Script.Chakma},
-                { "Cans", Script.CanadianAboriginal},
-                { "Cari", Script.Carian},
-                { "Cham", Script.Cham},
-                { "Cher", Script.Cherokee},
-                { "Chrs", Script.Chorasmian},
-                { "Copt", Script.Coptic},
-                { "Cprt", Script.Cypriot},
-                { "Cyrl", Script.Cyrillic},
-                { "Deva", Script.Devanagari},
-                { "Diak", Script.DivesAkuru},
-                { "Dogr", Script.Dogra},
-                { "Dsrt", Script.Deseret},
-                { "Dupl", Script.Duployan},
-                { "Egyp", Script.EgyptianHieroglyphs},
-                { "Elba", Script.Elbasan},
-                { "Elym", Script.Elymaic},
-                { "Ethi", Script.Ethiopic},
-                { "Geor", Script.Georgian},
-                { "Glag", Script.Glagolitic},
-                { "Gong", Script.GunjalaGondi},
-                { "Gonm", Script.MasaramGondi},
-                { "Goth", Script.Gothic},
-                { "Gran", Script.Grantha},
-                { "Grek", Script.Greek},
-                { "Gujr", Script.Gujarati},
-                { "Guru", Script.Gurmukhi},
-                { "Hang", Script.Hangul},
-                { "Hani", Script.Han},
-                { "Hano", Script.Hanunoo},
-                { "Hatr", Script.Hatran},
-                { "Hebr", Script.Hebrew},
-                { "Hira", Script.Hiragana},
-                { "Hluw", Script.AnatolianHieroglyphs},
-                { "Hmng", Script.PahawhHmong},
-                { "Hmnp", Script.NyiakengPuachueHmong},
-                { "Hrkt", Script.KatakanaOrHiragana},
-                { "Hung", Script.OldHungarian},
-                { "Ital", Script.OldItalic},
-                { "Java", Script.Javanese},
-                { "Kali", Script.KayahLi},
-                { "Kana", Script.Katakana},
-                { "Khar", Script.Kharoshthi},
-                { "Khmr", Script.Khmer},
-                { "Khoj", Script.Khojki},
-                { "Kits", Script.KhitanSmallScript},
-                { "Knda", Script.Kannada},
-                { "Kthi", Script.Kaithi},
-                { "Lana", Script.TaiTham},
-                { "Laoo", Script.Lao},
-                { "Latn", Script.Latin},
-                { "Lepc", Script.Lepcha},
-                { "Limb", Script.Limbu},
-                { "Lina", Script.LinearA},
-                { "Linb", Script.LinearB},
-                { "Lisu", Script.Lisu},
-                { "Lyci", Script.Lycian},
-                { "Lydi", Script.Lydian},
-                { "Mahj", Script.Mahajani},
-                { "Maka", Script.Makasar},
-                { "Mand", Script.Mandaic},
-                { "Mani", Script.Manichaean},
-                { "Marc", Script.Marchen},
-                { "Medf", Script.Medefaidrin},
-                { "Mend", Script.MendeKikakui},
-                { "Merc", Script.MeroiticCursive},
-                { "Mero", Script.MeroiticHieroglyphs},
-                { "Mlym", Script.Malayalam},
-                { "Modi", Script.Modi},
-                { "Mong", Script.Mongolian},
-                { "Mroo", Script.Mro},
-                { "Mtei", Script.MeeteiMayek},
-                { "Mult", Script.Multani},
-                { "Mymr", Script.Myanmar},
-                { "Nand", Script.Nandinagari},
-                { "Narb", Script.OldNorthArabian},
-                { "Nbat", Script.Nabataean},
-                { "Newa", Script.Newa},
-                { "Nkoo", Script.Nko},
-                { "Nshu", Script.Nushu},
-                { "Ogam", Script.Ogham},
-                { "Olck", Script.OlChiki},
-                { "Orkh", Script.OldTurkic},
-                { "Orya", Script.Oriya},
-                { "Osge", Script.Osage},
-                { "Osma", Script.Osmanya},
-                { "Palm", Script.Palmyrene},
-                { "Pauc", Script.PauCinHau},
-                { "Perm", Script.OldPermic},
-                { "Phag", Script.PhagsPa},
-                { "Phli", Script.InscriptionalPahlavi},
-                { "Phlp", Script.PsalterPahlavi},
-                { "Phnx", Script.Phoenician},
-                { "Plrd", Script.Miao},
-                { "Prti", Script.InscriptionalParthian},
-                { "Rjng", Script.Rejang},
-                { "Rohg", Script.HanifiRohingya},
-                { "Runr", Script.Runic},
-                { "Samr", Script.Samaritan},
-                { "Sarb", Script.OldSouthArabian},
-                { "Saur", Script.Saurashtra},
-                { "Sgnw", Script.SignWriting},
-                { "Shaw", Script.Shavian},
-                { "Shrd", Script.Sharada},
-                { "Sidd", Script.Siddham},
-                { "Sind", Script.Khudawadi},
-                { "Sinh", Script.Sinhala},
-                { "Sogd", Script.Sogdian},
-                { "Sogo", Script.OldSogdian},
-                { "Sora", Script.SoraSompeng},
-                { "Soyo", Script.Soyombo},
-                { "Sund", Script.Sundanese},
-                { "Sylo", Script.SylotiNagri},
-                { "Syrc", Script.Syriac},
-                { "Tagb", Script.Tagbanwa},
-                { "Takr", Script.Takri},
-                { "Tale", Script.TaiLe},
-                { "Talu", Script.NewTaiLue},
-                { "Taml", Script.Tamil},
-                { "Tang", Script.Tangut},
-                { "Tavt", Script.TaiViet},
-                { "Telu", Script.Telugu},
-                { "Tfng", Script.Tifinagh},
-                { "Tglg", Script.Tagalog},
-                { "Thaa", Script.Thaana},
-                { "Thai", Script.Thai},
-                { "Tibt", Script.Tibetan},
-                { "Tirh", Script.Tirhuta},
-                { "Ugar", Script.Ugaritic},
-                { "Vaii", Script.Vai},
-                { "Wara", Script.WarangCiti},
-                { "Wcho", Script.Wancho},
-                { "Xpeo", Script.OldPersian},
-                { "Xsux", Script.Cuneiform},
-                { "Yezi", Script.Yezidi},
-                { "Yiii", Script.Yi},
-                { "Zanb", Script.ZanabazarSquare},
-        };
-
-        public static Script GetScript(string tag)
-        {
-            if(!s_tagToScript.ContainsKey(tag))
-            {
-                return Script.Unknown;
-            }
-            return s_tagToScript[tag];
-        }
-
-        private static readonly Dictionary<string, GeneralCategory> s_tagToGeneralCategory = 
-            new Dictionary<string,GeneralCategory>{
-                { "C", GeneralCategory.Other},
-                { "Cc", GeneralCategory.Control},
-                { "Cf", GeneralCategory.Format},
-                { "Cn", GeneralCategory.Unassigned},
-                { "Co", GeneralCategory.PrivateUse},
-                { "Cs", GeneralCategory.Surrogate},
-                { "L", GeneralCategory.Letter},
-                { "LC", GeneralCategory.CasedLetter},
-                { "Ll", GeneralCategory.LowercaseLetter},
-                { "Lm", GeneralCategory.ModifierLetter},
-                { "Lo", GeneralCategory.OtherLetter},
-                { "Lt", GeneralCategory.TitlecaseLetter},
-                { "Lu", GeneralCategory.UppercaseLetter},
-                { "M", GeneralCategory.Mark},
-                { "Mc", GeneralCategory.SpacingMark},
-                { "Me", GeneralCategory.EnclosingMark},
-                { "Mn", GeneralCategory.NonspacingMark},
-                { "N", GeneralCategory.Number},
-                { "Nd", GeneralCategory.DecimalNumber},
-                { "Nl", GeneralCategory.LetterNumber},
-                { "No", GeneralCategory.OtherNumber},
-                { "P", GeneralCategory.Punctuation},
-                { "Pc", GeneralCategory.ConnectorPunctuation},
-                { "Pd", GeneralCategory.DashPunctuation},
-                { "Pe", GeneralCategory.ClosePunctuation},
-                { "Pf", GeneralCategory.FinalPunctuation},
-                { "Pi", GeneralCategory.InitialPunctuation},
-                { "Po", GeneralCategory.OtherPunctuation},
-                { "Ps", GeneralCategory.OpenPunctuation},
-                { "S", GeneralCategory.Symbol},
-                { "Sc", GeneralCategory.CurrencySymbol},
-                { "Sk", GeneralCategory.ModifierSymbol},
-                { "Sm", GeneralCategory.MathSymbol},
-                { "So", GeneralCategory.OtherSymbol},
-                { "Z", GeneralCategory.Separator},
-                { "Zl", GeneralCategory.LineSeparator},
-                { "Zp", GeneralCategory.ParagraphSeparator},
-                { "Zs", GeneralCategory.SpaceSeparator},
-        };
-
-        public static GeneralCategory GetGeneralCategory(string tag)
-        {
-            if(!s_tagToGeneralCategory.ContainsKey(tag))
-            {
-                return GeneralCategory.Other;
-            }
-            return s_tagToGeneralCategory[tag];
-        }
-
-        private static readonly Dictionary<string, LineBreakClass> s_tagToLineBreakClass = 
-            new Dictionary<string,LineBreakClass>{
-                { "OP", LineBreakClass.OpenPunctuation},
-                { "CL", LineBreakClass.ClosePunctuation},
-                { "CP", LineBreakClass.CloseParenthesis},
-                { "QU", LineBreakClass.Quotation},
-                { "GL", LineBreakClass.Glue},
-                { "NS", LineBreakClass.Nonstarter},
-                { "EX", LineBreakClass.Exclamation},
-                { "SY", LineBreakClass.BreakSymbols},
-                { "IS", LineBreakClass.InfixNumeric},
-                { "PR", LineBreakClass.PrefixNumeric},
-                { "PO", LineBreakClass.PostfixNumeric},
-                { "NU", LineBreakClass.Numeric},
-                { "AL", LineBreakClass.Alphabetic},
-                { "HL", LineBreakClass.HebrewLetter},
-                { "ID", LineBreakClass.Ideographic},
-                { "IN", LineBreakClass.Inseparable},
-                { "HY", LineBreakClass.Hyphen},
-                { "BA", LineBreakClass.BreakAfter},
-                { "BB", LineBreakClass.BreakBefore},
-                { "B2", LineBreakClass.BreakBoth},
-                { "ZW", LineBreakClass.ZWSpace},
-                { "CM", LineBreakClass.CombiningMark},
-                { "WJ", LineBreakClass.WordJoiner},
-                { "H2", LineBreakClass.H2},
-                { "H3", LineBreakClass.H3},
-                { "JL", LineBreakClass.JL},
-                { "JV", LineBreakClass.JV},
-                { "JT", LineBreakClass.JT},
-                { "RI", LineBreakClass.RegionalIndicator},
-                { "EB", LineBreakClass.EBase},
-                { "EM", LineBreakClass.EModifier},
-                { "ZWJ", LineBreakClass.ZWJ},
-                { "CB", LineBreakClass.ContingentBreak},
-                { "XX", LineBreakClass.Unknown},
-                { "AI", LineBreakClass.Ambiguous},
-                { "BK", LineBreakClass.MandatoryBreak},
-                { "CJ", LineBreakClass.ConditionalJapaneseStarter},
-                { "CR", LineBreakClass.CarriageReturn},
-                { "LF", LineBreakClass.LineFeed},
-                { "NL", LineBreakClass.NextLine},
-                { "SA", LineBreakClass.ComplexContext},
-                { "SG", LineBreakClass.Surrogate},
-                { "SP", LineBreakClass.Space},
-        };
-
-        public static LineBreakClass GetLineBreakClass(string tag)
-        {
-            if(!s_tagToLineBreakClass.ContainsKey(tag))
-            {
-                return LineBreakClass.Unknown;
-            }
-            return s_tagToLineBreakClass[tag];
-        }
-
-        private static readonly Dictionary<string, BidiPairedBracketType> s_tagToBiDiPairedBracketType = 
-            new Dictionary<string,BidiPairedBracketType>{
-                { "n", BidiPairedBracketType.None},
-                { "c", BidiPairedBracketType.Close},
-                { "o", BidiPairedBracketType.Open},
-        };
-
-        public static BidiPairedBracketType GetBiDiPairedBracketType(string tag)
-        {
-            if(!s_tagToBiDiPairedBracketType.ContainsKey(tag))
-            {
-                return BidiPairedBracketType.None;
-            }
-            return s_tagToBiDiPairedBracketType[tag];
-        }
-
-        private static readonly Dictionary<string, BidiClass> s_tagToBiDiClass = 
-            new Dictionary<string,BidiClass>{
-                { "L", BidiClass.LeftToRight},
-                { "AL", BidiClass.ArabicLetter},
-                { "AN", BidiClass.ArabicNumber},
-                { "B", BidiClass.ParagraphSeparator},
-                { "BN", BidiClass.BoundaryNeutral},
-                { "CS", BidiClass.CommonSeparator},
-                { "EN", BidiClass.EuropeanNumber},
-                { "ES", BidiClass.EuropeanSeparator},
-                { "ET", BidiClass.EuropeanTerminator},
-                { "FSI", BidiClass.FirstStrongIsolate},
-                { "LRE", BidiClass.LeftToRightEmbedding},
-                { "LRI", BidiClass.LeftToRightIsolate},
-                { "LRO", BidiClass.LeftToRightOverride},
-                { "NSM", BidiClass.NonspacingMark},
-                { "ON", BidiClass.OtherNeutral},
-                { "PDF", BidiClass.PopDirectionalFormat},
-                { "PDI", BidiClass.PopDirectionalIsolate},
-                { "R", BidiClass.RightToLeft},
-                { "RLE", BidiClass.RightToLeftEmbedding},
-                { "RLI", BidiClass.RightToLeftIsolate},
-                { "RLO", BidiClass.RightToLeftOverride},
-                { "S", BidiClass.SegmentSeparator},
-                { "WS", BidiClass.WhiteSpace},
-        };
-
-        public static BidiClass GetBiDiClass(string tag)
-        {
-            if(!s_tagToBiDiClass.ContainsKey(tag))
-            {
-                return BidiClass.LeftToRight;
-            }
-            return s_tagToBiDiClass[tag];
-        }
-
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs
deleted file mode 100644
index 2593a77848..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    public enum Script
-    {
-        Unknown, //Zzzz
-        Common, //Zyyy
-        Inherited, //Zinh
-        Adlam, //Adlm
-        CaucasianAlbanian, //Aghb
-        Ahom, //Ahom
-        Arabic, //Arab
-        ImperialAramaic, //Armi
-        Armenian, //Armn
-        Avestan, //Avst
-        Balinese, //Bali
-        Bamum, //Bamu
-        BassaVah, //Bass
-        Batak, //Batk
-        Bengali, //Beng
-        Bhaiksuki, //Bhks
-        Bopomofo, //Bopo
-        Brahmi, //Brah
-        Braille, //Brai
-        Buginese, //Bugi
-        Buhid, //Buhd
-        Chakma, //Cakm
-        CanadianAboriginal, //Cans
-        Carian, //Cari
-        Cham, //Cham
-        Cherokee, //Cher
-        Chorasmian, //Chrs
-        Coptic, //Copt
-        Cypriot, //Cprt
-        Cyrillic, //Cyrl
-        Devanagari, //Deva
-        DivesAkuru, //Diak
-        Dogra, //Dogr
-        Deseret, //Dsrt
-        Duployan, //Dupl
-        EgyptianHieroglyphs, //Egyp
-        Elbasan, //Elba
-        Elymaic, //Elym
-        Ethiopic, //Ethi
-        Georgian, //Geor
-        Glagolitic, //Glag
-        GunjalaGondi, //Gong
-        MasaramGondi, //Gonm
-        Gothic, //Goth
-        Grantha, //Gran
-        Greek, //Grek
-        Gujarati, //Gujr
-        Gurmukhi, //Guru
-        Hangul, //Hang
-        Han, //Hani
-        Hanunoo, //Hano
-        Hatran, //Hatr
-        Hebrew, //Hebr
-        Hiragana, //Hira
-        AnatolianHieroglyphs, //Hluw
-        PahawhHmong, //Hmng
-        NyiakengPuachueHmong, //Hmnp
-        KatakanaOrHiragana, //Hrkt
-        OldHungarian, //Hung
-        OldItalic, //Ital
-        Javanese, //Java
-        KayahLi, //Kali
-        Katakana, //Kana
-        Kharoshthi, //Khar
-        Khmer, //Khmr
-        Khojki, //Khoj
-        KhitanSmallScript, //Kits
-        Kannada, //Knda
-        Kaithi, //Kthi
-        TaiTham, //Lana
-        Lao, //Laoo
-        Latin, //Latn
-        Lepcha, //Lepc
-        Limbu, //Limb
-        LinearA, //Lina
-        LinearB, //Linb
-        Lisu, //Lisu
-        Lycian, //Lyci
-        Lydian, //Lydi
-        Mahajani, //Mahj
-        Makasar, //Maka
-        Mandaic, //Mand
-        Manichaean, //Mani
-        Marchen, //Marc
-        Medefaidrin, //Medf
-        MendeKikakui, //Mend
-        MeroiticCursive, //Merc
-        MeroiticHieroglyphs, //Mero
-        Malayalam, //Mlym
-        Modi, //Modi
-        Mongolian, //Mong
-        Mro, //Mroo
-        MeeteiMayek, //Mtei
-        Multani, //Mult
-        Myanmar, //Mymr
-        Nandinagari, //Nand
-        OldNorthArabian, //Narb
-        Nabataean, //Nbat
-        Newa, //Newa
-        Nko, //Nkoo
-        Nushu, //Nshu
-        Ogham, //Ogam
-        OlChiki, //Olck
-        OldTurkic, //Orkh
-        Oriya, //Orya
-        Osage, //Osge
-        Osmanya, //Osma
-        Palmyrene, //Palm
-        PauCinHau, //Pauc
-        OldPermic, //Perm
-        PhagsPa, //Phag
-        InscriptionalPahlavi, //Phli
-        PsalterPahlavi, //Phlp
-        Phoenician, //Phnx
-        Miao, //Plrd
-        InscriptionalParthian, //Prti
-        Rejang, //Rjng
-        HanifiRohingya, //Rohg
-        Runic, //Runr
-        Samaritan, //Samr
-        OldSouthArabian, //Sarb
-        Saurashtra, //Saur
-        SignWriting, //Sgnw
-        Shavian, //Shaw
-        Sharada, //Shrd
-        Siddham, //Sidd
-        Khudawadi, //Sind
-        Sinhala, //Sinh
-        Sogdian, //Sogd
-        OldSogdian, //Sogo
-        SoraSompeng, //Sora
-        Soyombo, //Soyo
-        Sundanese, //Sund
-        SylotiNagri, //Sylo
-        Syriac, //Syrc
-        Tagbanwa, //Tagb
-        Takri, //Takr
-        TaiLe, //Tale
-        NewTaiLue, //Talu
-        Tamil, //Taml
-        Tangut, //Tang
-        TaiViet, //Tavt
-        Telugu, //Telu
-        Tifinagh, //Tfng
-        Tagalog, //Tglg
-        Thaana, //Thaa
-        Thai, //Thai
-        Tibetan, //Tibt
-        Tirhuta, //Tirh
-        Ugaritic, //Ugar
-        Vai, //Vaii
-        WarangCiti, //Wara
-        Wancho, //Wcho
-        OldPersian, //Xpeo
-        Cuneiform, //Xsux
-        Yezidi, //Yezi
-        Yi, //Yiii
-        ZanabazarSquare, //Zanb
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeData.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeData.cs
deleted file mode 100644
index 471cb52bea..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeData.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System.Runtime.CompilerServices;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    /// <summary>
-    ///     Helper for looking up unicode character class information
-    /// </summary>
-    internal static class UnicodeData
-    {
-        internal const int CATEGORY_BITS = 6;
-        internal const int SCRIPT_BITS = 8;
-        internal const int LINEBREAK_BITS = 6;
-
-        internal const int BIDIPAIREDBRACKED_BITS = 16;
-        internal const int BIDIPAIREDBRACKEDTYPE_BITS = 2;
-        internal const int BIDICLASS_BITS = 5;
-
-        internal const int SCRIPT_SHIFT = CATEGORY_BITS;
-        internal const int LINEBREAK_SHIFT = CATEGORY_BITS + SCRIPT_BITS;
-        
-        internal const int BIDIPAIREDBRACKEDTYPE_SHIFT = BIDIPAIREDBRACKED_BITS;
-        internal const int BIDICLASS_SHIFT = BIDIPAIREDBRACKED_BITS + BIDIPAIREDBRACKEDTYPE_BITS;
-        
-        internal const int CATEGORY_MASK = (1 << CATEGORY_BITS) - 1;
-        internal const int SCRIPT_MASK = (1 << SCRIPT_BITS) - 1;
-        internal const int LINEBREAK_MASK = (1 << LINEBREAK_BITS) - 1;
-        
-        internal const int BIDIPAIREDBRACKED_MASK = (1 << BIDIPAIREDBRACKED_BITS) - 1;
-        internal const int BIDIPAIREDBRACKEDTYPE_MASK = (1 << BIDIPAIREDBRACKEDTYPE_BITS) - 1;
-        internal const int BIDICLASS_MASK = (1 << BIDICLASS_BITS) - 1;
-
-        private static readonly UnicodeTrie s_unicodeDataTrie;
-        private static readonly UnicodeTrie s_graphemeBreakTrie;
-        private static readonly UnicodeTrie s_biDiTrie;
-
-        static UnicodeData()
-        {
-            s_unicodeDataTrie = new UnicodeTrie(typeof(UnicodeData).Assembly.GetManifestResourceStream("Avalonia.Assets.UnicodeData.trie")!);
-            s_graphemeBreakTrie = new UnicodeTrie(typeof(UnicodeData).Assembly.GetManifestResourceStream("Avalonia.Assets.GraphemeBreak.trie")!);
-            s_biDiTrie = new UnicodeTrie(typeof(UnicodeData).Assembly.GetManifestResourceStream("Avalonia.Assets.BiDi.trie")!);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="GeneralCategory"/> for a Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's general category.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static GeneralCategory GetGeneralCategory(int codepoint)
-        {
-            return (GeneralCategory)(s_unicodeDataTrie.Get(codepoint) & CATEGORY_MASK);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Script"/> for a Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's script.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Script GetScript(int codepoint)
-        {
-            return (Script)((s_unicodeDataTrie.Get(codepoint) >> SCRIPT_SHIFT) & SCRIPT_MASK);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="BidiClass"/> for a Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's biDi class.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BidiClass GetBiDiClass(int codepoint)
-        {
-            return (BidiClass)((s_biDiTrie.Get(codepoint) >> BIDICLASS_SHIFT) & BIDICLASS_MASK);
-        }
-        
-        /// <summary>
-        /// Gets the <see cref="BidiPairedBracketType"/> for a Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's paired bracket type.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BidiPairedBracketType GetBiDiPairedBracketType(int codepoint)
-        {
-            return (BidiPairedBracketType)((s_biDiTrie.Get(codepoint) >> BIDIPAIREDBRACKEDTYPE_SHIFT) & BIDIPAIREDBRACKEDTYPE_MASK);
-        }
-        
-        /// <summary>
-        /// Gets the paired bracket for a Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's paired bracket.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Codepoint GetBiDiPairedBracket(int codepoint)
-        {
-            return new Codepoint((int)(s_biDiTrie.Get(codepoint) & BIDIPAIREDBRACKED_MASK));
-        }
-
-        /// <summary>
-        /// Gets the line break class for a Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's line break class.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static LineBreakClass GetLineBreakClass(int codepoint)
-        {
-            return (LineBreakClass)((s_unicodeDataTrie.Get(codepoint) >> LINEBREAK_SHIFT) & LINEBREAK_MASK);
-        }
-
-        /// <summary>
-        /// Gets the grapheme break type for the Unicode codepoint.
-        /// </summary>
-        /// <param name="codepoint">The codepoint in question.</param>
-        /// <returns>The code point's grapheme break type.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static GraphemeBreakClass GetGraphemeClusterBreak(int codepoint)
-        {
-            return (GraphemeBreakClass)s_graphemeBreakTrie.Get(codepoint);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrie.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrie.cs
deleted file mode 100644
index 08b019ed33..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrie.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-// RichTextKit
-// Copyright © 2019 Topten Software. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may 
-// not use this product except in compliance with the License. You may obtain 
-// a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
-// License for the specific language governing permissions and limitations 
-// under the License.
-// Ported from: https://github.com/foliojs/unicode-trie
-// Copied from: https://github.com/toptensoftware/RichTextKit
-
-using System.IO;
-using System.IO.Compression;
-using System.Text;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    internal class UnicodeTrie
-    {
-        private readonly int[] _data;
-        private readonly int _highStart;
-        private readonly uint _errorValue;
-
-        public UnicodeTrie(Stream stream)
-        {
-            int dataLength;
-            using (var bw = new BinaryReader(stream, Encoding.UTF8, true))
-            {
-                _highStart = bw.ReadInt32BE();
-                _errorValue = bw.ReadUInt32BE();
-                dataLength = bw.ReadInt32BE() / 4;
-            }
-
-            using (var infl1 = new DeflateStream(stream, CompressionMode.Decompress, true))
-            using (var infl2 = new DeflateStream(infl1, CompressionMode.Decompress, true))
-            using (var bw = new BinaryReader(infl2, Encoding.UTF8, true))
-            {
-                _data = new int[dataLength];
-                for (int i = 0; i < _data.Length; i++)
-                {
-                    _data[i] = bw.ReadInt32();
-                }
-            }
-        }
-
-        public UnicodeTrie(byte[] buf) : this(new MemoryStream(buf))
-        {
-
-        }
-
-        internal UnicodeTrie(int[] data, int highStart, uint errorValue)
-        {
-            _data = data;
-            _highStart = highStart;
-            _errorValue = errorValue;
-        }
-
-        internal void Save(Stream stream)
-        {
-            // Write the header info
-            using (var bw = new BinaryWriter(stream, Encoding.UTF8, true))
-            {
-                bw.WriteBE(_highStart);
-                bw.WriteBE(_errorValue);
-                bw.WriteBE(_data.Length * 4);
-            }
-
-            // Double compress the data
-            using (var def1 = new DeflateStream(stream, CompressionLevel.Optimal, true))
-            using (var def2 = new DeflateStream(def1, CompressionLevel.Optimal, true))
-            using (var bw = new BinaryWriter(def2, Encoding.UTF8, true))
-            {
-                foreach (var v in _data)
-                {
-                    bw.Write(v);
-                }
-                bw.Flush();
-                def2.Flush();
-                def1.Flush();
-            }
-        }
-
-        public uint Get(int codePoint)
-        {
-            int index;
-            if ((codePoint < 0) || (codePoint > 0x10ffff))
-            {
-                return _errorValue;
-            }
-
-            if ((codePoint < 0xd800) || ((codePoint > 0xdbff) && (codePoint <= 0xffff)))
-            {
-                // Ordinary BMP code point, excluding leading surrogates.
-                // BMP uses a single level lookup.  BMP index starts at offset 0 in the index.
-                // data is stored in the index array itself.
-                index = (_data[codePoint >> UnicodeTrieBuilder.SHIFT_2] << UnicodeTrieBuilder.INDEX_SHIFT) + (codePoint & UnicodeTrieBuilder.DATA_MASK);
-                return (uint)_data[index];
-            }
-
-            if (codePoint <= 0xffff)
-            {
-                // Lead Surrogate Code Point.  A Separate index section is stored for
-                // lead surrogate code units and code points.
-                //   The main index has the code unit data.
-                //   For this function, we need the code point data.
-                index = (_data[UnicodeTrieBuilder.LSCP_INDEX_2_OFFSET + ((codePoint - 0xd800) >> UnicodeTrieBuilder.SHIFT_2)] << UnicodeTrieBuilder.INDEX_SHIFT) + (codePoint & UnicodeTrieBuilder.DATA_MASK);
-                return (uint)_data[index];
-            }
-
-            if (codePoint < _highStart)
-            {
-                // Supplemental code point, use two-level lookup.
-                index = _data[(UnicodeTrieBuilder.INDEX_1_OFFSET - UnicodeTrieBuilder.OMITTED_BMP_INDEX_1_LENGTH) + (codePoint >> UnicodeTrieBuilder.SHIFT_1)];
-                index = _data[index + ((codePoint >> UnicodeTrieBuilder.SHIFT_2) & UnicodeTrieBuilder.INDEX_2_MASK)];
-                index = (index << UnicodeTrieBuilder.INDEX_SHIFT) + (codePoint & UnicodeTrieBuilder.DATA_MASK);
-                return (uint)_data[index];
-            }
-
-            return (uint)_data[_data.Length - UnicodeTrieBuilder.DATA_GRANULARITY];
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
deleted file mode 100644
index 29ee45acc2..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// RichTextKit
-// Copyright © 2019 Topten Software. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may 
-// not use this product except in compliance with the License. You may obtain 
-// a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
-// License for the specific language governing permissions and limitations 
-// under the License.
-// Ported from: https://github.com/foliojs/unicode-trie
-// Copied from: https://github.com/toptensoftware/RichTextKit
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    internal partial class UnicodeTrieBuilder
-    {
-        // Shift size for getting the index-1 table offset.
-        internal const int SHIFT_1 = 6 + 5;
-
-        // Shift size for getting the index-2 table offset.
-        internal const int SHIFT_2 = 5;
-
-        // Difference between the two shift sizes,
-        // for getting an index-1 offset from an index-2 offset. 6=11-5
-        const int SHIFT_1_2 = SHIFT_1 - SHIFT_2;
-
-        // Number of index-1 entries for the BMP. 32=0x20
-        // This part of the index-1 table is omitted from the serialized form.
-        internal const int OMITTED_BMP_INDEX_1_LENGTH = 0x10000 >> SHIFT_1;
-
-        // Number of code points per index-1 table entry. 2048=0x800
-        const int CP_PER_INDEX_1_ENTRY = 1 << SHIFT_1;
-
-        // Number of entries in an index-2 block. 64=0x40
-        const int INDEX_2_BLOCK_LENGTH = 1 << SHIFT_1_2;
-
-        // Mask for getting the lower bits for the in-index-2-block offset. */
-        internal const int INDEX_2_MASK = INDEX_2_BLOCK_LENGTH - 1;
-
-        // Number of entries in a data block. 32=0x20
-        const int DATA_BLOCK_LENGTH = 1 << SHIFT_2;
-
-        // Mask for getting the lower bits for the in-data-block offset.
-        internal const int DATA_MASK = DATA_BLOCK_LENGTH - 1;
-
-        // Shift size for shifting left the index array values.
-        // Increases possible data size with 16-bit index values at the cost
-        // of compactability.
-        // This requires data blocks to be aligned by DATA_GRANULARITY.
-        internal const int INDEX_SHIFT = 2;
-
-        // The alignment size of a data block. Also the granularity for compaction.
-        internal const int DATA_GRANULARITY = 1 << INDEX_SHIFT;
-
-        // The BMP part of the index-2 table is fixed and linear and starts at offset 0.
-        // Length=2048=0x800=0x10000>>SHIFT_2.
-        const int INDEX_2_OFFSET = 0;
-
-        // The part of the index-2 table for U+D800..U+DBFF stores values for
-        // lead surrogate code _units_ not code _points_.
-        // Values for lead surrogate code _points_ are indexed with this portion of the table.
-        // Length=32=0x20=0x400>>SHIFT_2. (There are 1024=0x400 lead surrogates.)
-        internal const int LSCP_INDEX_2_OFFSET = 0x10000 >> SHIFT_2;
-        const int LSCP_INDEX_2_LENGTH = 0x400 >> SHIFT_2;
-
-        // Count the lengths of both BMP pieces. 2080=0x820
-        const int INDEX_2_BMP_LENGTH = LSCP_INDEX_2_OFFSET + LSCP_INDEX_2_LENGTH;
-
-        // The 2-byte UTF-8 version of the index-2 table follows at offset 2080=0x820.
-        // Length 32=0x20 for lead bytes C0..DF, regardless of SHIFT_2.
-        const int UTF8_2B_INDEX_2_OFFSET = INDEX_2_BMP_LENGTH;
-        const int UTF8_2B_INDEX_2_LENGTH = 0x800 >> 6;  // U+0800 is the first code point after 2-byte UTF-8
-
-        // The index-1 table, only used for supplementary code points, at offset 2112=0x840.
-        // Variable length, for code points up to highStart, where the last single-value range starts.
-        // Maximum length 512=0x200=0x100000>>SHIFT_1.
-        // (For 0x100000 supplementary code points U+10000..U+10ffff.)
-        //
-        // The part of the index-2 table for supplementary code points starts
-        // after this index-1 table.
-        //
-        // Both the index-1 table and the following part of the index-2 table
-        // are omitted completely if there is only BMP data.
-        internal const int INDEX_1_OFFSET = UTF8_2B_INDEX_2_OFFSET + UTF8_2B_INDEX_2_LENGTH;
-        const int MAX_INDEX_1_LENGTH = 0x100000 >> SHIFT_1;
-
-        // The illegal-UTF-8 data block follows the ASCII block, at offset 128=0x80.
-        // Used with linear access for single bytes 0..0xbf for simple error handling.
-        // Length 64=0x40, not DATA_BLOCK_LENGTH.
-        const int BAD_UTF8_DATA_OFFSET = 0x80;
-
-        // The start of non-linear-ASCII data blocks, at offset 192=0xc0.
-        // !!!!
-        const int DATA_START_OFFSET = 0xc0;
-
-        // The null data block.
-        // Length 64=0x40 even if DATA_BLOCK_LENGTH is smaller,
-        // to work with 6-bit trail bytes from 2-byte UTF-8.
-        const int DATA_NULL_OFFSET = DATA_START_OFFSET;
-
-        // The start of allocated data blocks.
-        const int NEW_DATA_START_OFFSET = DATA_NULL_OFFSET + 0x40;
-
-        // The start of data blocks for U+0800 and above.
-        // Below, compaction uses a block length of 64 for 2-byte UTF-8.
-        // From here on, compaction uses DATA_BLOCK_LENGTH.
-        // Data values for 0x780 code points beyond ASCII.
-        const int DATA_0800_OFFSET = NEW_DATA_START_OFFSET + 0x780;
-
-        // Start with allocation of 16k data entries. */
-        const int INITIAL_DATA_LENGTH = 1 << 14;
-
-        // Grow about 8x each time.
-        const int MEDIUM_DATA_LENGTH = 1 << 17;
-
-        // Maximum length of the runtime data array.
-        // Limited by 16-bit index values that are left-shifted by INDEX_SHIFT,
-        // and by uint16_t UTrie2Header.shiftedDataLength.
-        const int MAX_DATA_LENGTH_RUNTIME = 0xffff << INDEX_SHIFT;
-
-        const int INDEX_1_LENGTH = 0x110000 >> SHIFT_1;
-
-        // Maximum length of the build-time data array.
-        // One entry per 0x110000 code points, plus the illegal-UTF-8 block and the null block,
-        // plus values for the 0x400 surrogate code units.
-        const int MAX_DATA_LENGTH_BUILDTIME = 0x110000 + 0x40 + 0x40 + 0x400;
-
-        // At build time, leave a gap in the index-2 table,
-        // at least as long as the maximum lengths of the 2-byte UTF-8 index-2 table
-        // and the supplementary index-1 table.
-        // Round up to INDEX_2_BLOCK_LENGTH for proper compacting.
-        const int INDEX_GAP_OFFSET = INDEX_2_BMP_LENGTH;
-        const int INDEX_GAP_LENGTH = ((UTF8_2B_INDEX_2_LENGTH + MAX_INDEX_1_LENGTH) + INDEX_2_MASK) & ~INDEX_2_MASK;
-
-        // Maximum length of the build-time index-2 array.
-        // Maximum number of Unicode code points (0x110000) shifted right by SHIFT_2,
-        // plus the part of the index-2 table for lead surrogate code points,
-        // plus the build-time index gap,
-        // plus the null index-2 block.)
-        const int MAX_INDEX_2_LENGTH = (0x110000 >> SHIFT_2) + LSCP_INDEX_2_LENGTH + INDEX_GAP_LENGTH + INDEX_2_BLOCK_LENGTH;
-
-        // The null index-2 block, following the gap in the index-2 table.
-        const int INDEX_2_NULL_OFFSET = INDEX_GAP_OFFSET + INDEX_GAP_LENGTH;
-
-        // The start of allocated index-2 blocks.
-        const int INDEX_2_START_OFFSET = INDEX_2_NULL_OFFSET + INDEX_2_BLOCK_LENGTH;
-
-        // Maximum length of the runtime index array.
-        // Limited by its own 16-bit index values, and by uint16_t UTrie2Header.indexLength.
-        // (The actual maximum length is lower,
-        // (0x110000>>SHIFT_2)+UTF8_2B_INDEX_2_LENGTH+MAX_INDEX_1_LENGTH.)
-        const int MAX_INDEX_LENGTH = 0xffff;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
deleted file mode 100644
index a60bac4ce4..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
+++ /dev/null
@@ -1,984 +0,0 @@
-// RichTextKit
-// Copyright © 2019 Topten Software. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may 
-// not use this product except in compliance with the License. You may obtain 
-// a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
-// License for the specific language governing permissions and limitations 
-// under the License.
-// Ported from: https://github.com/foliojs/unicode-trie
-// Copied from: https://github.com/toptensoftware/RichTextKit
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    internal partial class UnicodeTrieBuilder
-    {
-        private readonly uint _initialValue;
-        private readonly uint _errorValue;
-        private readonly int[] _index1;
-        private readonly int[] _index2;
-        private int _highStart;
-        private uint[] _data;
-        private int _dataCapacity;
-        private int _firstFreeBlock;
-        private bool _isCompacted;
-        private readonly int[] _map;
-        private int _dataNullOffset;
-        private int _dataLength;
-        private int _index2NullOffset;
-        private int _index2Length;
-
-        public UnicodeTrieBuilder(uint initialValue = 0, uint errorValue = 0)
-        {
-            _initialValue = initialValue;
-            _errorValue = errorValue;
-            _index1 = new int[INDEX_1_LENGTH];
-            _index2 = new int[MAX_INDEX_2_LENGTH];
-            _highStart = 0x110000;
-
-            _data = new uint[INITIAL_DATA_LENGTH];
-            _dataCapacity = INITIAL_DATA_LENGTH;
-
-            _firstFreeBlock = 0;
-            _isCompacted = false;
-
-            // Multi-purpose per-data-block table.
-            //
-            // Before compacting:
-            //
-            // Per-data-block reference counters/free-block list.
-            //  0: unused
-            // >0: reference counter (number of index-2 entries pointing here)
-            // <0: next free data block in free-block list
-            //
-            // While compacting:
-            //
-            // Map of adjusted indexes, used in compactData() and compactIndex2().
-            // Maps from original indexes to new ones.
-            _map = new int[MAX_DATA_LENGTH_BUILDTIME >> SHIFT_2];
-
-            int i;
-            for (i = 0; i < 0x80; i++)
-            {
-                _data[i] = _initialValue;
-            }
-
-            for (; i < 0xc0; i++)
-            {
-                _data[i] = _errorValue;
-            }
-
-            for (i = DATA_NULL_OFFSET; i < NEW_DATA_START_OFFSET; i++)
-            {
-                _data[i] = _initialValue;
-            }
-
-            _dataNullOffset = DATA_NULL_OFFSET;
-            _dataLength = NEW_DATA_START_OFFSET;
-
-            // set the index-2 indexes for the 2=0x80>>SHIFT_2 ASCII data blocks
-            int j;
-            i = 0;
-            for (j = 0; j < 0x80; j += DATA_BLOCK_LENGTH) {
-                _index2[i] = j;
-                _map[i++] = 1;
-            }
-
-            // reference counts for the bad-UTF-8-data block
-            for (; j < 0xc0; j += DATA_BLOCK_LENGTH) {
-                _map[i++] = 0;
-            }
-
-            // Reference counts for the null data block: all blocks except for the ASCII blocks.
-            // Plus 1 so that we don't drop this block during compaction.
-            // Plus as many as needed for lead surrogate code points.
-            // i==newTrie->dataNullOffset
-            _map[i++] = ((0x110000 >> SHIFT_2) - (0x80 >> SHIFT_2)) + 1 + LSCP_INDEX_2_LENGTH;
-            j += DATA_BLOCK_LENGTH;
-            for (; j < NEW_DATA_START_OFFSET; j += DATA_BLOCK_LENGTH) {
-                _map[i++] = 0;
-            }
-
-            // set the remaining indexes in the BMP index-2 block
-            // to the null data block
-            for (i = 0x80 >> SHIFT_2; i < INDEX_2_BMP_LENGTH; i++) {
-                _index2[i] = DATA_NULL_OFFSET;
-            }
-
-            // Fill the index gap with impossible values so that compaction
-            // does not overlap other index-2 blocks with the gap.
-            for (i = 0; i < INDEX_GAP_LENGTH; i++) {
-                _index2[INDEX_GAP_OFFSET + i] = -1;
-            }
-
-            // set the indexes in the null index-2 block
-            for (i = 0; i < INDEX_2_BLOCK_LENGTH; i++) {
-                _index2[INDEX_2_NULL_OFFSET + i] = DATA_NULL_OFFSET;
-            }
-
-            _index2NullOffset = INDEX_2_NULL_OFFSET;
-            _index2Length = INDEX_2_START_OFFSET;
-
-            // set the index-1 indexes for the linear index-2 block
-            j = 0;
-            for (i = 0; i < OMITTED_BMP_INDEX_1_LENGTH; i++) {
-                _index1[i] = j;
-                j += INDEX_2_BLOCK_LENGTH;
-            }
-
-            // set the remaining index-1 indexes to the null index-2 block
-            for (; i < INDEX_1_LENGTH; i++) {
-                _index1[i] = INDEX_2_NULL_OFFSET;
-            }
-
-            // Preallocate and reset data for U+0080..U+07ff,
-            // for 2-byte UTF-8 which will be compacted in 64-blocks
-            // even if DATA_BLOCK_LENGTH is smaller.
-            for (i = 0x80; i < 0x800; i += DATA_BLOCK_LENGTH) {
-                Set(i, _initialValue);
-            }
-
-        }
-
-        public UnicodeTrieBuilder Set(int codePoint, uint value)
-        {
-            if ((codePoint < 0) || (codePoint > 0x10ffff))
-            {
-                throw new InvalidOperationException("Invalid code point");
-            }
-
-            if (_isCompacted)
-            {
-                throw new InvalidOperationException("Already compacted");
-            }
-
-            var block = GetDataBlock(codePoint, true);
-            _data[block + (codePoint & DATA_MASK)] = value;
-            return this;
-        }
-
-        public UnicodeTrieBuilder SetRange(int start, int end, uint value, bool overwrite = true)
-        {
-
-            if ((start > 0x10ffff) || (end > 0x10ffff) || (start > end))
-            {
-                throw new InvalidOperationException("Invalid code point");
-            }
-
-            if (_isCompacted)
-            {
-                throw new InvalidOperationException("Already compacted");
-            }
-
-            if (!overwrite && (value == _initialValue))
-            {
-                return this; // nothing to do
-            }
-
-            var limit = end + 1;
-            if ((start & DATA_MASK) != 0)
-            {
-                // set partial block at [start..following block boundary
-                var block = GetDataBlock(start, true);
-
-                var nextStart = (start + DATA_BLOCK_LENGTH) & ~DATA_MASK;
-                if (nextStart <= limit)
-                {
-                    FillBlock(block, start & DATA_MASK, DATA_BLOCK_LENGTH, value, _initialValue, overwrite);
-                    start = nextStart;
-                }
-                else
-                {
-                    FillBlock(block, start & DATA_MASK, limit & DATA_MASK, value, _initialValue, overwrite);
-                    return this;
-                }
-            }
-
-            // number of positions in the last, partial block
-            var rest = limit & DATA_MASK;
-
-            // round down limit to a block boundary
-            limit &= ~DATA_MASK;
-
-            // iterate over all-value blocks
-            int repeatBlock;
-            if (value == _initialValue)
-            {
-                repeatBlock = _dataNullOffset;
-            }
-            else
-            {
-                repeatBlock = -1;
-            }
-
-            while (start < limit)
-            {
-                var setRepeatBlock = false;
-
-                if ((value == _initialValue) && IsInNullBlock(start, true))
-                {
-                    start += DATA_BLOCK_LENGTH; // nothing to do
-                    continue;
-                }
-
-                // get index value
-                var i2 = GetIndex2Block(start, true);
-                i2 += (start >> SHIFT_2) & INDEX_2_MASK;
-
-                var block = _index2[i2];
-                if (IsWritableBlock(block))
-                {
-                    // already allocated
-                    if (overwrite && (block >= DATA_0800_OFFSET))
-                    {
-                        // We overwrite all values, and it's not a
-                        // protected (ASCII-linear or 2-byte UTF-8) block:
-                        // replace with the repeatBlock.
-                        setRepeatBlock = true;
-                    }
-                    else
-                    {
-                        // protected block: just write the values into this block
-                        FillBlock(block, 0, DATA_BLOCK_LENGTH, value, _initialValue, overwrite);
-                    }
-
-                }
-                else if ((_data[block] != value) && (overwrite || (block == _dataNullOffset)))
-                {
-                    // Set the repeatBlock instead of the null block or previous repeat block:
-                    //
-                    // If !isWritableBlock() then all entries in the block have the same value
-                    // because it's the null block or a range block (the repeatBlock from a previous
-                    // call to utrie2_setRange32()).
-                    // No other blocks are used multiple times before compacting.
-                    //
-                    // The null block is the only non-writable block with the initialValue because
-                    // of the repeatBlock initialization above. (If value==initialValue, then
-                    // the repeatBlock will be the null data block.)
-                    //
-                    // We set our repeatBlock if the desired value differs from the block's value,
-                    // and if we overwrite any data or if the data is all initial values
-                    // (which is the same as the block being the null block, see above).
-                    setRepeatBlock = true;
-                }
-
-                if (setRepeatBlock)
-                {
-                    if (repeatBlock >= 0)
-                    {
-                        SetIndex2Entry(i2, repeatBlock);
-                    }
-                    else
-                    {
-                        // create and set and fill the repeatBlock
-                        repeatBlock = GetDataBlock(start, true);
-                        WriteBlock(repeatBlock, value);
-                    }
-                }
-
-                start += DATA_BLOCK_LENGTH;
-            }
-
-            if (rest > 0)
-            {
-                // set partial block at [last block boundary..limit
-                var block = GetDataBlock(start, true);
-                FillBlock(block, 0, rest, value, _initialValue, overwrite);
-            }
-
-            return this;
-        }
-
-        public uint Get(int c, bool fromLSCP = true)
-        {
-            if ((c < 0) || (c > 0x10ffff))
-            {
-                return _errorValue;
-            }
-
-            if ((c >= _highStart) && (!((c >= 0xd800) && (c < 0xdc00)) || fromLSCP))
-            {
-                return _data[_dataLength - DATA_GRANULARITY];
-            }
-
-            int i2;
-            if (((c >= 0xd800) && (c < 0xdc00)) && fromLSCP)
-            {
-                i2 = (LSCP_INDEX_2_OFFSET - (0xd800 >> SHIFT_2)) + (c >> SHIFT_2);
-            }
-            else
-            {
-                i2 = _index1[c >> SHIFT_1] + ((c >> SHIFT_2) & INDEX_2_MASK);
-            }
-
-            var block = _index2[i2];
-            return _data[block + (c & DATA_MASK)];
-        }
-
-        public byte[] ToBuffer()
-        {
-            var mem = new MemoryStream();
-            Save(mem);
-            return mem.GetBuffer();
-        }
-
-        public void Save(Stream stream)
-        {
-            var trie = this.Freeze();
-            trie.Save(stream);
-        }
-
-        public UnicodeTrie Freeze()
-        {
-            int allIndexesLength, i;
-            if (!_isCompacted)
-            {
-                Compact();
-            }
-
-            if (_highStart <= 0x10000)
-            {
-                allIndexesLength = INDEX_1_OFFSET;
-            }
-            else
-            {
-                allIndexesLength = _index2Length;
-            }
-
-            var dataMove = allIndexesLength;
-
-            // are indexLength and dataLength within limits?
-            if ((allIndexesLength > MAX_INDEX_LENGTH) || // for unshifted indexLength
-              ((dataMove + _dataNullOffset) > 0xffff) || // for unshifted dataNullOffset
-              ((dataMove + DATA_0800_OFFSET) > 0xffff) || // for unshifted 2-byte UTF-8 index-2 values
-              ((dataMove + _dataLength) > MAX_DATA_LENGTH_RUNTIME))
-            { // for shiftedDataLength
-                throw new InvalidOperationException("Trie data is too large.");
-            }
-
-            // calculate the sizes of, and allocate, the index and data arrays
-            var indexLength = allIndexesLength + _dataLength;
-            var data = new int[indexLength];
-
-            // write the index-2 array values shifted right by INDEX_SHIFT, after adding dataMove
-            var destIdx = 0;
-            for (i = 0; i < INDEX_2_BMP_LENGTH; i++)
-            {
-                data[destIdx++] = ((_index2[i] + dataMove) >> INDEX_SHIFT);
-            }
-
-            // write UTF-8 2-byte index-2 values, not right-shifted
-            for (i = 0; i < 0xc2 - 0xc0; i++)
-            { // C0..C1
-                data[destIdx++] = (dataMove + BAD_UTF8_DATA_OFFSET);
-            }
-
-            for (; i < 0xe0 - 0xc0; i++)
-            { // C2..DF
-                data[destIdx++] = (dataMove + _index2[i << (6 - SHIFT_2)]);
-            }
-
-            if (_highStart > 0x10000)
-            {
-                var index1Length = (_highStart - 0x10000) >> SHIFT_1;
-                var index2Offset = INDEX_2_BMP_LENGTH + UTF8_2B_INDEX_2_LENGTH + index1Length;
-
-                // write 16-bit index-1 values for supplementary code points
-                for (i = 0; i < index1Length; i++)
-                {
-                    data[destIdx++] = (INDEX_2_OFFSET + _index1[i + OMITTED_BMP_INDEX_1_LENGTH]);
-                }
-
-                // write the index-2 array values for supplementary code points,
-                // shifted right by INDEX_SHIFT, after adding dataMove
-                for (i = 0; i < _index2Length - index2Offset; i++)
-                {
-                    data[destIdx++] = ((dataMove + _index2[index2Offset + i]) >> INDEX_SHIFT);
-                }
-            }
-
-            // write 16-bit data values
-            for (i = 0; i < _dataLength; i++)
-            {
-                data[destIdx++] = (int)_data[i];
-            }
-
-            return new UnicodeTrie(data, _highStart, _errorValue);
-        }
-
-        private bool IsInNullBlock(int c, bool forLSCP)
-        {
-            int i2;
-            if (((c & 0xfffffc00) == 0xd800) && forLSCP)
-            {
-                i2 = (LSCP_INDEX_2_OFFSET - (0xd800 >> SHIFT_2)) + (c >> SHIFT_2);
-            }
-            else
-            {
-                i2 = _index1[c >> SHIFT_1] + ((c >> SHIFT_2) & INDEX_2_MASK);
-            }
-
-            var block = _index2[i2];
-            return block == _dataNullOffset;
-        }
-
-        private int AllocIndex2Block()
-        {
-            var newBlock = _index2Length;
-            var newTop = newBlock + INDEX_2_BLOCK_LENGTH;
-            if (newTop > _index2.Length)
-            {
-                // Should never occur.
-                // Either MAX_BUILD_TIME_INDEX_LENGTH is incorrect,
-                // or the code writes more values than should be possible.
-                throw new InvalidOperationException("Internal error in Trie2 creation.");
-            }
-
-            _index2Length = newTop;
-            Array.Copy(_index2, _index2NullOffset, _index2, newBlock, INDEX_2_BLOCK_LENGTH);
-
-            return newBlock;
-        }
-
-        private int GetIndex2Block(int c, bool forLSCP)
-        {
-            if ((c >= 0xd800) && (c < 0xdc00) && forLSCP)
-            {
-                return LSCP_INDEX_2_OFFSET;
-            }
-
-            var i1 = c >> SHIFT_1;
-            var i2 = _index1[i1];
-            if (i2 == _index2NullOffset)
-            {
-                i2 = AllocIndex2Block();
-                _index1[i1] = i2;
-            }
-
-            return i2;
-        }
-
-        private bool IsWritableBlock(int block)
-        {
-            return (block != _dataNullOffset) && (_map[block >> SHIFT_2] == 1);
-        }
-
-        private int AllocDataBlock(int copyBlock)
-        {
-            int newBlock;
-            if (_firstFreeBlock != 0)
-            {
-                // get the first free block
-                newBlock = _firstFreeBlock;
-                _firstFreeBlock = -_map[newBlock >> SHIFT_2];
-            }
-            else
-            {
-                // get a new block from the high end
-                newBlock = _dataLength;
-                var newTop = newBlock + DATA_BLOCK_LENGTH;
-                if (newTop > _dataCapacity)
-                {
-                    // out of memory in the data array
-                    int capacity;
-                    if (_dataCapacity < MEDIUM_DATA_LENGTH)
-                    {
-                        capacity = MEDIUM_DATA_LENGTH;
-                    }
-                    else if (_dataCapacity < MAX_DATA_LENGTH_BUILDTIME)
-                    {
-                        capacity = MAX_DATA_LENGTH_BUILDTIME;
-                    }
-                    else
-                    {
-                        // Should never occur.
-                        // Either MAX_DATA_LENGTH_BUILDTIME is incorrect,
-                        // or the code writes more values than should be possible.
-                        throw new InvalidOperationException("Internal error in Trie2 creation.");
-                    }
-
-                    var newData = new UInt32[capacity];
-                    Array.Copy(_data, newData, _dataLength);
-                    _data = newData;
-                    _dataCapacity = capacity;
-                }
-
-                _dataLength = newTop;
-            }
-
-            Array.Copy(_data, copyBlock, _data, newBlock, DATA_BLOCK_LENGTH);
-            //_data.set(_data.subarray(copyBlock, copyBlock + DATA_BLOCK_LENGTH), newBlock);
-            _map[newBlock >> SHIFT_2] = 0;
-            return newBlock;
-        }
-
-        private void ReleaseDataBlock(int block)
-        {
-            // put this block at the front of the free-block chain
-            _map[block >> SHIFT_2] = -_firstFreeBlock;
-            _firstFreeBlock = block;
-        }
-
-        private void SetIndex2Entry(int i2, int block)
-        {
-            ++_map[block >> SHIFT_2];  // increment first, in case block == oldBlock!
-            var oldBlock = _index2[i2];
-            if (--_map[oldBlock >> SHIFT_2] == 0)
-            {
-                ReleaseDataBlock(oldBlock);
-            }
-
-            _index2[i2] = block;
-        }
-
-        private int GetDataBlock(int c, bool forLSCP)
-        {
-            var i2 = GetIndex2Block(c, forLSCP);
-            i2 += (c >> SHIFT_2) & INDEX_2_MASK;
-
-            var oldBlock = _index2[i2];
-            if (IsWritableBlock(oldBlock))
-            {
-                return oldBlock;
-            }
-
-            // allocate a new data block
-            var newBlock = AllocDataBlock(oldBlock);
-            SetIndex2Entry(i2, newBlock);
-            return newBlock;
-        }
-
-        private void FillBlock(int block, int start, int limit, uint value, uint initialValue, bool overwrite)
-        {
-            int i;
-            if (overwrite)
-            {
-                for (i = block + start; i < block + limit; i++)
-                {
-                    _data[i] = value;
-                }
-            }
-            else
-            {
-                for (i = block + start; i < block + limit; i++)
-                {
-                    if (_data[i] == initialValue)
-                    {
-                        _data[i] = value;
-                    }
-                }
-            }
-        }
-
-        private void WriteBlock(int block, uint value)
-        {
-            var limit = block + DATA_BLOCK_LENGTH;
-            while (block < limit)
-            {
-                _data[block++] = value;
-            }
-        }
-
-        private int FindHighStart(uint highValue)
-        {
-            int prevBlock, prevI2Block;
-            
-            // set variables for previous range
-            if (highValue == _initialValue)
-            {
-                prevI2Block = _index2NullOffset;
-                prevBlock = _dataNullOffset;
-            }
-            else
-            {
-                prevI2Block = -1;
-                prevBlock = -1;
-            }
-
-            int prev = 0x110000;
-
-            // enumerate index-2 blocks
-            var i1 = INDEX_1_LENGTH;
-            var c = prev;
-            while (c > 0)
-            {
-                var i2Block = _index1[--i1];
-                if (i2Block == prevI2Block)
-                {
-                    // the index-2 block is the same as the previous one, and filled with highValue
-                    c -= CP_PER_INDEX_1_ENTRY;
-                    continue;
-                }
-
-                prevI2Block = i2Block;
-                if (i2Block == _index2NullOffset)
-                {
-                    // this is the null index-2 block
-                    if (highValue != _initialValue)
-                    {
-                        return c;
-                    }
-                    c -= CP_PER_INDEX_1_ENTRY;
-                }
-                else
-                {
-                    // enumerate data blocks for one index-2 block
-                    var i2 = INDEX_2_BLOCK_LENGTH;
-                    while (i2 > 0)
-                    {
-                        var block = _index2[i2Block + --i2];
-                        if (block == prevBlock)
-                        {
-                            // the block is the same as the previous one, and filled with highValue
-                            c -= DATA_BLOCK_LENGTH;
-                            continue;
-                        }
-
-                        prevBlock = block;
-                        if (block == _dataNullOffset)
-                        {
-                            // this is the null data block
-                            if (highValue != _initialValue)
-                            {
-                                return c;
-                            }
-                            c -= DATA_BLOCK_LENGTH;
-                        }
-                        else
-                        {
-                            var j = DATA_BLOCK_LENGTH;
-                            while (j > 0)
-                            {
-                                var value = _data[block + --j];
-                                if (value != highValue)
-                                {
-                                    return c;
-                                }
-                                --c;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // deliver last range
-            return 0;
-        }
-
-        private int FindSameDataBlock(int dataLength, int otherBlock, int blockLength)
-        {
-            // ensure that we do not even partially get past dataLength
-            dataLength -= blockLength;
-            var block = 0;
-            while (block <= dataLength)
-            {
-                if (EqualSequence(_data, block, otherBlock, blockLength))
-                {
-                    return block;
-                }
-                block += DATA_GRANULARITY;
-            }
-
-            return -1;
-        }
-
-        private int FindSameIndex2Block(int index2Length, int otherBlock) {
-            // ensure that we do not even partially get past index2Length
-            index2Length -= INDEX_2_BLOCK_LENGTH;
-            for (var block = 0; block <= index2Length; block++)
-            {
-                if (EqualSequence(_index2, block, otherBlock, INDEX_2_BLOCK_LENGTH))
-                {
-                    return block;
-                }
-            }
-
-            return -1;
-        }
-
-        private void CompactData()
-        {
-            // do not compact linear-ASCII data
-            var newStart = DATA_START_OFFSET;
-            var start = 0;
-            var i = 0;
-
-            while (start < newStart)
-            {
-                _map[i++] = start;
-                start += DATA_BLOCK_LENGTH;
-            }
-
-            // Start with a block length of 64 for 2-byte UTF-8,
-            // then switch to DATA_BLOCK_LENGTH.
-            var blockLength = 64;
-            var blockCount = blockLength >> SHIFT_2;
-            start = newStart;
-            while (start < _dataLength)
-            {
-                // start: index of first entry of current block
-                // newStart: index where the current block is to be moved
-                //           (right after current end of already-compacted data)
-                int mapIndex, movedStart;
-                if (start == DATA_0800_OFFSET)
-                {
-                    blockLength = DATA_BLOCK_LENGTH;
-                    blockCount = 1;
-                }
-
-                // skip blocks that are not used
-                if (_map[start >> SHIFT_2] <= 0)
-                {
-                    // advance start to the next block
-                    start += blockLength;
-
-                    // leave newStart with the previous block!
-                    continue;
-                }
-
-                // search for an identical block
-                if ((movedStart = FindSameDataBlock(newStart, start, blockLength)) >= 0)
-                {
-                    // found an identical block, set the other block's index value for the current block
-                    mapIndex = start >> SHIFT_2;
-                    for (i = blockCount; i > 0; i--)
-                    {
-                        _map[mapIndex++] = movedStart;
-                        movedStart += DATA_BLOCK_LENGTH;
-                    }
-
-                    // advance start to the next block
-                    start += blockLength;
-
-                    // leave newStart with the previous block!
-                    continue;
-                }
-
-                // see if the beginning of this block can be overlapped with the end of the previous block
-                // look for maximum overlap (modulo granularity) with the previous, adjacent block
-                var overlap = blockLength - DATA_GRANULARITY;
-                while ((overlap > 0) && !EqualSequence(_data, (newStart - overlap), start, overlap))
-                {
-                    overlap -= DATA_GRANULARITY;
-                }
-
-                if ((overlap > 0) || (newStart < start))
-                {
-                    // some overlap, or just move the whole block
-                    movedStart = newStart - overlap;
-                    mapIndex = start >> SHIFT_2;
-
-                    for (i = blockCount; i > 0; i--)
-                    {
-                        _map[mapIndex++] = movedStart;
-                        movedStart += DATA_BLOCK_LENGTH;
-                    }
-
-                    // move the non-overlapping indexes to their new positions
-                    start += overlap;
-                    for (i = blockLength - overlap; i > 0; i--)
-                    {
-                        _data[newStart++] = _data[start++];
-                    }
-
-                }
-                else
-                { // no overlap && newStart==start
-                    mapIndex = start >> SHIFT_2;
-                    for (i = blockCount; i > 0; i--)
-                    {
-                        _map[mapIndex++] = start;
-                        start += DATA_BLOCK_LENGTH;
-                    }
-
-                    newStart = start;
-                }
-            }
-
-            // now adjust the index-2 table
-            i = 0;
-            while (i < _index2Length)
-            {
-                // Gap indexes are invalid (-1). Skip over the gap.
-                if (i == INDEX_GAP_OFFSET)
-                {
-                    i += INDEX_GAP_LENGTH;
-                }
-                _index2[i] = _map[_index2[i] >> SHIFT_2];
-                ++i;
-            }
-
-            _dataNullOffset = _map[_dataNullOffset >> SHIFT_2];
-
-            // ensure dataLength alignment
-            while ((newStart & (DATA_GRANULARITY - 1)) != 0)
-            {
-                _data[newStart++] = _initialValue;
-            }
-            _dataLength = newStart;
-        }
-
-        private void CompactIndex2()
-        {
-            // do not compact linear-BMP index-2 blocks
-            var newStart = INDEX_2_BMP_LENGTH;
-            var start = 0;
-            var i = 0;
-
-            while (start < newStart)
-            {
-                _map[i++] = start;
-                start += INDEX_2_BLOCK_LENGTH;
-            }
-
-            // Reduce the index table gap to what will be needed at runtime.
-            newStart += UTF8_2B_INDEX_2_LENGTH + ((_highStart - 0x10000) >> SHIFT_1);
-            start = INDEX_2_NULL_OFFSET;
-            while (start < _index2Length)
-            {
-                // start: index of first entry of current block
-                // newStart: index where the current block is to be moved
-                //           (right after current end of already-compacted data)
-
-                // search for an identical block
-                int movedStart;
-                if ((movedStart = FindSameIndex2Block(newStart, start)) >= 0)
-                {
-                    // found an identical block, set the other block's index value for the current block
-                    _map[start >> SHIFT_1_2] = movedStart;
-
-                    // advance start to the next block
-                    start += INDEX_2_BLOCK_LENGTH;
-
-                    // leave newStart with the previous block!
-                    continue;
-                }
-
-                // see if the beginning of this block can be overlapped with the end of the previous block
-                // look for maximum overlap with the previous, adjacent block
-                var overlap = INDEX_2_BLOCK_LENGTH - 1;
-                while ((overlap > 0) && !EqualSequence(_index2, (newStart - overlap), start, overlap))
-                {
-                    --overlap;
-                }
-
-                if ((overlap > 0) || (newStart < start))
-                {
-                    // some overlap, or just move the whole block
-                    _map[start >> SHIFT_1_2] = newStart - overlap;
-
-                    // move the non-overlapping indexes to their new positions
-                    start += overlap;
-                    for (i = INDEX_2_BLOCK_LENGTH - overlap; i > 0; i--)
-                    {
-                        _index2[newStart++] = _index2[start++];
-                    }
-
-                }
-                else
-                { // no overlap && newStart==start
-                    _map[start >> SHIFT_1_2] = start;
-                    start += INDEX_2_BLOCK_LENGTH;
-                    newStart = start;
-                }
-            }
-
-            // now adjust the index-1 table
-            for (i = 0; i < INDEX_1_LENGTH; i++)
-            {
-                _index1[i] = _map[_index1[i] >> SHIFT_1_2];
-            }
-
-            _index2NullOffset = _map[_index2NullOffset >> SHIFT_1_2];
-
-            // Ensure data table alignment:
-            // Needs to be granularity-aligned for 16-bit trie
-            // (so that dataMove will be down-shiftable),
-            // and 2-aligned for uint32_t data.
-
-            // Arbitrary value: 0x3fffc not possible for real data.
-            while ((newStart & ((DATA_GRANULARITY - 1) | 1)) != 0)
-            {
-                _index2[newStart++] = 0x0000ffff << INDEX_SHIFT;
-            }
-
-            _index2Length = newStart;
-        }
-
-        private void Compact()
-        {
-            // find highStart and round it up
-            var highValue = Get(0x10ffff);
-            var highStart = FindHighStart(highValue);
-            highStart = (highStart + (CP_PER_INDEX_1_ENTRY - 1)) & ~(CP_PER_INDEX_1_ENTRY - 1);
-            if (highStart == 0x110000)
-            {
-                highValue = _errorValue;
-            }
-
-            // Set trie->highStart only after utrie2_get32(trie, highStart).
-            // Otherwise utrie2_get32(trie, highStart) would try to read the highValue.
-            _highStart = highStart;
-            if (_highStart < 0x110000)
-            {
-                // Blank out [highStart..10ffff] to release associated data blocks.
-                var suppHighStart = _highStart <= 0x10000 ? 0x10000 : _highStart;
-                SetRange(suppHighStart, 0x10ffff, _initialValue);
-            }
-
-            CompactData();
-
-            if (_highStart > 0x10000)
-            {
-                CompactIndex2();
-            }
-
-            // Store the highValue in the data array and round up the dataLength.
-            // Must be done after compactData() because that assumes that dataLength
-            // is a multiple of DATA_BLOCK_LENGTH.
-            _data[_dataLength++] = highValue;
-            while ((_dataLength & (DATA_GRANULARITY - 1)) != 0)
-            {
-                _data[_dataLength++] = _initialValue;
-            }
-
-            _isCompacted = true;
-        }
-
-        private static bool EqualSequence(IReadOnlyList<uint> a, int s, int t, int length)
-        {
-            for (var i = 0; i < length; i++)
-            {
-                if (a[s + i] != a[t + i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool EqualSequence(IReadOnlyList<int> a, int s, int t, int length)
-        {
-            for (var i = 0; i < length; i++)
-            {
-                if (a[s + i] != a[t + i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextTrimming.cs b/src/Avalonia.Visuals/Media/TextTrimming.cs
deleted file mode 100644
index f8a63dfede..0000000000
--- a/src/Avalonia.Visuals/Media/TextTrimming.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how text is trimmed when it overflows.
-    /// </summary>
-    public enum TextTrimming
-    {
-        /// <summary>
-        /// Text is not trimmed.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Text is trimmed at a character boundary. An ellipsis (...) is drawn in place of remaining text.
-        /// </summary>
-        CharacterEllipsis,
-
-        /// <summary>
-        /// Text is trimmed at a word boundary. An ellipsis (...) is drawn in place of remaining text.
-        /// </summary>
-        WordEllipsis
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs
deleted file mode 100644
index 0a4bc0e56d..0000000000
--- a/src/Avalonia.Visuals/Media/TileBrush.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how a <see cref="TileBrush"/> is tiled.
-    /// </summary>
-    public enum TileMode
-    {
-        /// <summary>
-        /// A single repeat of the content will be displayed.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// The content will be repeated horizontally, with alternate tiles mirrored.
-        /// </summary>
-        FlipX,
-
-        /// <summary>
-        /// The content will be repeated vertically, with alternate tiles mirrored.
-        /// </summary>
-        FlipY,
-
-        /// <summary>
-        /// The content will be repeated horizontally and vertically, with alternate tiles mirrored.
-        /// </summary>
-        FlipXY,
-
-        /// <summary>
-        /// The content will be repeated.
-        /// </summary>
-        Tile
-    }
-
-    /// <summary>
-    /// Base class for brushes which display repeating images.
-    /// </summary>
-    public abstract class TileBrush : Brush, ITileBrush
-    {
-        /// <summary>
-        /// Defines the <see cref="AlignmentX"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AlignmentX> AlignmentXProperty =
-            AvaloniaProperty.Register<TileBrush, AlignmentX>(nameof(AlignmentX), AlignmentX.Center);
-
-        /// <summary>
-        /// Defines the <see cref="AlignmentY"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AlignmentY> AlignmentYProperty =
-            AvaloniaProperty.Register<TileBrush, AlignmentY>(nameof(AlignmentY), AlignmentY.Center);
-
-        /// <summary>
-        /// Defines the <see cref="DestinationRect"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativeRect> DestinationRectProperty =
-            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(DestinationRect), RelativeRect.Fill);
-
-        /// <summary>
-        /// Defines the <see cref="SourceRect"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativeRect> SourceRectProperty =
-            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(SourceRect), RelativeRect.Fill);
-
-        /// <summary>
-        /// Defines the <see cref="Stretch"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Stretch> StretchProperty =
-            AvaloniaProperty.Register<TileBrush, Stretch>(nameof(Stretch), Stretch.Uniform);
-
-        /// <summary>
-        /// Defines the <see cref="TileMode"/> property.
-        /// </summary>
-        public static readonly StyledProperty<TileMode> TileModeProperty =
-            AvaloniaProperty.Register<TileBrush, TileMode>(nameof(TileMode));
-
-        static TileBrush()
-        {
-            AffectsRender<TileBrush>(
-                AlignmentXProperty,
-                AlignmentYProperty,
-                DestinationRectProperty,
-                SourceRectProperty,
-                StretchProperty,
-                TileModeProperty);
-            RenderOptions.BitmapInterpolationModeProperty.OverrideDefaultValue<TileBrush>(BitmapInterpolationMode.Default);
-        }
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        public AlignmentX AlignmentX
-        {
-            get { return GetValue(AlignmentXProperty); }
-            set { SetValue(AlignmentXProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        public AlignmentY AlignmentY
-        {
-            get { return GetValue(AlignmentYProperty); }
-            set { SetValue(AlignmentYProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the rectangle on the destination in which to paint a tile.
-        /// </summary>
-        public RelativeRect DestinationRect
-        {
-            get { return GetValue(DestinationRectProperty); }
-            set { SetValue(DestinationRectProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the rectangle of the source image that will be displayed.
-        /// </summary>
-        public RelativeRect SourceRect
-        {
-            get { return GetValue(SourceRectProperty); }
-            set { SetValue(SourceRectProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value controlling how the source rectangle will be stretched to fill
-        /// the destination rect.
-        /// </summary>
-        public Stretch Stretch
-        {
-            get { return (Stretch)GetValue(StretchProperty); }
-            set { SetValue(StretchProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the brush's tile mode.
-        /// </summary>
-        public TileMode TileMode
-        {
-            get { return (TileMode)GetValue(TileModeProperty); }
-            set { SetValue(TileModeProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the bitmap interpolation mode.
-        /// </summary>
-        /// <value>
-        /// The bitmap interpolation mode.
-        /// </value>
-        public BitmapInterpolationMode BitmapInterpolationMode
-        {
-            get { return RenderOptions.GetBitmapInterpolationMode(this); }
-            set { RenderOptions.SetBitmapInterpolationMode(this, value); }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Transform.cs b/src/Avalonia.Visuals/Media/Transform.cs
deleted file mode 100644
index 60701ecfaf..0000000000
--- a/src/Avalonia.Visuals/Media/Transform.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using Avalonia.Animation;
-using Avalonia.Animation.Animators;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a transform on an <see cref="IVisual"/>.
-    /// </summary>
-    public abstract class Transform : Animatable, IMutableTransform
-    {
-        static Transform()
-        {
-            Animation.Animation.RegisterAnimator<TransformAnimator>(prop =>
-                typeof(ITransform).IsAssignableFrom(prop.OwnerType));
-        }
-
-        /// <summary>
-        /// Raised when the transform changes.
-        /// </summary>
-        public event EventHandler? Changed;
-
-        /// <summary>
-        /// Gets the transform's <see cref="Matrix"/>.
-        /// </summary>
-        public abstract Matrix Value { get; }
-
-        /// <summary>
-        /// Parses a <see cref="Transform"/> string.
-        /// </summary>
-        /// <param name="s">Six comma-delimited double values that describe the new <see cref="Transform"/>. For details check <see cref="Matrix.Parse(string)"/> </param>
-        /// <returns>The <see cref="Transform"/>.</returns>
-        public static Transform Parse(string s)
-        {
-            return new MatrixTransform(Matrix.Parse(s));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Changed"/> event.
-        /// </summary>
-        protected void RaiseChanged()
-        {
-            Changed?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Returns a String representing this transform matrix instance.
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return Value.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Typeface.cs b/src/Avalonia.Visuals/Media/Typeface.cs
deleted file mode 100644
index 45540a5812..0000000000
--- a/src/Avalonia.Visuals/Media/Typeface.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Diagnostics;
-using JetBrains.Annotations;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a typeface.
-    /// </summary>
-    [DebuggerDisplay("Name = {FontFamily.Name}, Weight = {Weight}, Style = {Style}")]
-    public readonly struct Typeface : IEquatable<Typeface>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Typeface"/> class.
-        /// </summary>
-        /// <param name="fontFamily">The font family.</param>
-        /// <param name="style">The font style.</param>
-        /// <param name="weight">The font weight.</param>
-        public Typeface([NotNull] FontFamily fontFamily,
-            FontStyle style = FontStyle.Normal,
-            FontWeight weight = FontWeight.Normal)
-        {
-            if (weight <= 0)
-            {
-                throw new ArgumentException("Font weight must be > 0.");
-            }
-
-            FontFamily = fontFamily;
-            Style = style;
-            Weight = weight;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Typeface"/> class.
-        /// </summary>
-        /// <param name="fontFamilyName">The name of the font family.</param>
-        /// <param name="style">The font style.</param>
-        /// <param name="weight">The font weight.</param>
-        public Typeface(string fontFamilyName,
-            FontStyle style = FontStyle.Normal,
-            FontWeight weight = FontWeight.Normal)
-            : this(new FontFamily(fontFamilyName), style, weight)
-        {
-        }
-
-        public static Typeface Default { get; } = new Typeface(FontFamily.Default);
-
-        /// <summary>
-        /// Gets the font family.
-        /// </summary>
-        public FontFamily FontFamily { get; }
-
-        /// <summary>
-        /// Gets the font style.
-        /// </summary>
-        public FontStyle Style { get; }
-
-        /// <summary>
-        /// Gets the font weight.
-        /// </summary>
-        public FontWeight Weight { get; }
-
-        /// <summary>
-        /// Gets the glyph typeface.
-        /// </summary>
-        /// <value>
-        /// The glyph typeface.
-        /// </value>
-        public GlyphTypeface GlyphTypeface => FontManager.Current.GetOrAddGlyphTypeface(this);
-
-        public static bool operator !=(Typeface a, Typeface b)
-        {
-            return !(a == b);
-        }
-
-        public static bool operator ==(Typeface a, Typeface b)
-        {
-            return  a.Equals(b);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is Typeface typeface && Equals(typeface);
-        }
-
-        public bool Equals(Typeface other)
-        {
-            return FontFamily == other.FontFamily && Style == other.Style && Weight == other.Weight;
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = (FontFamily != null ? FontFamily.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (int)Style;
-                hashCode = (hashCode * 397) ^ (int)Weight;
-                return hashCode;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/UnicodeRange.cs b/src/Avalonia.Visuals/Media/UnicodeRange.cs
deleted file mode 100644
index 0077dd64ac..0000000000
--- a/src/Avalonia.Visuals/Media/UnicodeRange.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// The <see cref="UnicodeRange"/> descripes a set of Unicode characters.
-    /// </summary>
-    public readonly struct UnicodeRange
-    {
-        public static UnicodeRange Default = Parse("0-10FFFD");
-
-        private readonly UnicodeRangeSegment _single;
-        private readonly IReadOnlyList<UnicodeRangeSegment>? _segments = null;
-
-        public UnicodeRange(int start, int end)
-        {
-            _single = new UnicodeRangeSegment(start, end);
-        }
-
-        public UnicodeRange(UnicodeRangeSegment single)
-        {
-            _single = single;
-        }
-
-        public UnicodeRange(IReadOnlyList<UnicodeRangeSegment> segments)
-        {
-            if(segments is null || segments.Count == 0)
-            {
-                throw new ArgumentException(nameof(segments));
-            }
-
-            _single = segments[0];
-            _segments = segments;
-        }
-
-        internal UnicodeRangeSegment Single => _single;
-
-        internal IReadOnlyList<UnicodeRangeSegment>? Segments => _segments;
-
-        /// <summary>
-        /// Determines if given value is inside the range.
-        /// </summary>
-        /// <param name="value">The value to verify.</param>
-        /// <returns>
-        /// <c>true</c> If given value is inside the range, <c>false</c> otherwise.
-        /// </returns>
-        public bool IsInRange(int value)
-        {
-            if(_segments is null)
-            {
-                return _single.IsInRange(value);
-            }
-
-            foreach(var segment in _segments)
-            {
-                if (segment.IsInRange(value))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Parses a <see cref="UnicodeRange"/>.
-        /// </summary>
-        /// <param name="s">The string to parse.</param>
-        /// <returns>The parsed <see cref="UnicodeRange"/>.</returns>
-        /// <exception cref="FormatException"></exception>
-        public static UnicodeRange Parse(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                throw new FormatException("Could not parse specified Unicode range.");
-            }
-
-            var parts = s.Split(',');
-
-            var length = parts.Length;
-
-            if(length == 0)
-            {
-                throw new FormatException("Could not parse specified Unicode range.");
-            }
-
-            if(length == 1)
-            {
-                return new UnicodeRange(UnicodeRangeSegment.Parse(parts[0]));
-            }
-
-            var segments = new UnicodeRangeSegment[length];
-
-            for (int i = 0; i < length; i++)
-            {
-                segments[i] = UnicodeRangeSegment.Parse(parts[i].Trim());
-            }
-
-            return new UnicodeRange(segments);
-        }
-    }
-
-    public readonly struct UnicodeRangeSegment
-    {
-        private static Regex s_regex = new Regex(@"^(?:[uU]\+)?(?:([0-9a-fA-F](?:[0-9a-fA-F?]{1,5})?))$");
-
-        public UnicodeRangeSegment(int start, int end)
-        {
-            Start = start;
-            End = end;
-        }
-
-        /// <summary>
-        /// Get the start of the segment.
-        /// </summary>
-        public int Start { get; }
-
-        /// <summary>
-        /// Get the end of the segment.
-        /// </summary>
-        public int End { get; }
-
-        /// <summary>
-        /// Determines if given value is inside the range segment.
-        /// </summary>
-        /// <param name="value">The value to verify.</param>
-        /// <returns>
-        /// <c>true</c> If given value is inside the range segment, <c>false</c> otherwise.
-        /// </returns>
-        public bool IsInRange(int value)
-        {
-            return value - Start <= End - Start;
-        }
-
-        /// <summary>
-        /// Parses a <see cref="UnicodeRangeSegment"/>.
-        /// </summary>
-        /// <param name="s">The string to parse.</param>
-        /// <returns>The parsed <see cref="UnicodeRangeSegment"/>.</returns>
-        /// <exception cref="FormatException"></exception>
-        public static UnicodeRangeSegment Parse(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                throw new FormatException("Could not parse specified Unicode range segment.");
-            }
-
-            var parts = s.Split('-');
-
-            int start, end;
-
-            switch (parts.Length)
-            {
-                case 1:
-                    {
-                        //e.g. U+20, U+3F U+30??
-                        var single = s_regex.Match(parts[0]);
-
-                        if (!single.Success)
-                        {
-                            throw new FormatException("Could not parse specified Unicode range segment.");
-                        }
-
-                        if (!single.Value.Contains("?"))
-                        {
-                            start = int.Parse(single.Groups[1].Value, System.Globalization.NumberStyles.HexNumber);
-                            end = start;
-                        }
-                        else
-                        {
-                            start = int.Parse(single.Groups[1].Value.Replace('?', '0'), System.Globalization.NumberStyles.HexNumber);
-                            end = int.Parse(single.Groups[1].Value.Replace('?', 'F'), System.Globalization.NumberStyles.HexNumber);
-                        }
-                        break;
-                    }
-                case 2:
-                    {
-                        var first = s_regex.Match(parts[0]);
-                        var second = s_regex.Match(parts[1]);
-
-                        if (!first.Success || !second.Success)
-                        {
-                            throw new FormatException("Could not parse specified Unicode range segment.");
-                        }
-
-                        start = int.Parse(first.Groups[1].Value, System.Globalization.NumberStyles.HexNumber);
-                        end = int.Parse(second.Groups[1].Value, System.Globalization.NumberStyles.HexNumber);
-                        break;
-                    }
-                default:
-                    throw new FormatException("Could not parse specified Unicode range segment.");
-            }
-
-            return new UnicodeRangeSegment(start, end);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/ExportRenderingSubsystemAttribute.cs b/src/Avalonia.Visuals/Platform/ExportRenderingSubsystemAttribute.cs
deleted file mode 100644
index db157304f4..0000000000
--- a/src/Avalonia.Visuals/Platform/ExportRenderingSubsystemAttribute.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-    public class ExportRenderingSubsystemAttribute : Attribute
-    {
-        public ExportRenderingSubsystemAttribute(OperatingSystemType requiredOS, int priority, string name, Type initializationType, string initializationMethod,
-            Type? environmentChecker = null)
-        {
-            Name = name;
-            InitializationType = initializationType;
-            InitializationMethod = initializationMethod;
-            EnvironmentChecker = environmentChecker;
-            RequiredOS = requiredOS;
-            Priority = priority;
-        }
-
-        public string InitializationMethod { get; private set; }
-        public Type? EnvironmentChecker { get; }
-        public Type InitializationType { get; private set; }
-        public string Name { get; private set; }
-        public int Priority { get; private set; }
-        public OperatingSystemType RequiredOS { get; private set; }
-        public string? RequiresWindowingSubsystem { get; set; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
deleted file mode 100644
index 1e68bc477d..0000000000
--- a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.IO;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
-    /// </summary>
-    public interface IBitmapImpl : IDisposable
-    {
-        /// <summary>
-        /// Gets the dots per inch (DPI) of the image.
-        /// </summary>
-        Vector Dpi { get; }
-
-        /// <summary>
-        /// Gets the size of the bitmap, in device pixels.
-        /// </summary>
-        PixelSize PixelSize { get; }
-        
-        /// <summary>
-        /// Version of the pixel data
-        /// </summary>
-        int Version { get; }
-
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        void Save(string fileName);
-
-        /// <summary>
-        /// Saves the bitmap to a stream in png format.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        void Save(Stream stream);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
deleted file mode 100644
index 82af6ff0b6..0000000000
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the interface through which drawing occurs.
-    /// </summary>
-    public interface IDrawingContextImpl : IDisposable
-    {
-        /// <summary>
-        /// Gets or sets the current transform of the drawing context.
-        /// </summary>
-        Matrix Transform { get; set; }
-
-        /// <summary>
-        /// Clears the render target to the specified color.
-        /// </summary>
-        /// <param name="color">The color.</param>
-        void Clear(Color color);
-
-        /// <summary>
-        /// Draws a bitmap image.
-        /// </summary>
-        /// <param name="source">The bitmap image.</param>
-        /// <param name="opacity">The opacity to draw with.</param>
-        /// <param name="sourceRect">The rect in the image to draw.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default);
-
-        /// <summary>
-        /// Draws a bitmap image.
-        /// </summary>
-        /// <param name="source">The bitmap image.</param>
-        /// <param name="opacityMask">The opacity mask to draw with.</param>
-        /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
-
-        /// <summary>
-        /// Draws a line.
-        /// </summary>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="p1">The first point of the line.</param>
-        /// <param name="p2">The second point of the line.</param>
-        void DrawLine(IPen pen, Point p1, Point p2);
-
-        /// <summary>
-        /// Draws a geometry.
-        /// </summary>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry);
-
-        /// <summary>
-        /// Draws a rectangle with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="boxShadows">Box shadow effect parameters</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
-            BoxShadows boxShadows = default);
-
-        /// <summary>
-        /// Draws an ellipse with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
-        /// <param name="rect">The ellipse bounds.</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        void DrawEllipse(IBrush? brush, IPen? pen, Rect rect);
-
-
-        /// <summary>
-        /// Draws a glyph run.
-        /// </summary>
-        /// <param name="foreground">The foreground.</param>
-        /// <param name="glyphRun">The glyph run.</param>
-        void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun);
-
-        /// <summary>
-        /// Creates a new <see cref="IRenderTargetBitmapImpl"/> that can be used as a render layer
-        /// for the current render target.
-        /// </summary>
-        /// <param name="size">The size of the layer in DIPs.</param>
-        /// <returns>An <see cref="IRenderTargetBitmapImpl"/></returns>
-        /// <remarks>
-        /// Depending on the rendering backend used, a layer created via this method may be more
-        /// performant than a standard render target bitmap. In particular the Direct2D backend
-        /// has to do a format conversion each time a standard render target bitmap is rendered,
-        /// but a layer created via this method has no such overhead.
-        /// </remarks>
-        IDrawingContextLayerImpl CreateLayer(Size size);
-
-        /// <summary>
-        /// Pushes a clip rectangle.
-        /// </summary>
-        /// <param name="clip">The clip rectangle.</param>
-        void PushClip(Rect clip);
-
-        /// <summary>
-        /// Pushes a clip rounded rectangle.
-        /// </summary>
-        /// <param name="clip">The clip rounded rectangle</param>
-        void PushClip(RoundedRect clip);
-
-        /// <summary>
-        /// Pops the latest pushed clip rectangle.
-        /// </summary>
-        void PopClip();
-
-        /// <summary>
-        /// Pushes an opacity value.
-        /// </summary>
-        /// <param name="opacity">The opacity.</param>
-        void PushOpacity(double opacity);
-
-        /// <summary>
-        /// Pops the latest pushed opacity value.
-        /// </summary>
-        void PopOpacity();
-
-        /// <summary>
-        /// Pushes an opacity mask
-        /// </summary>
-        void PushOpacityMask(IBrush mask, Rect bounds);
-
-        /// <summary>
-        /// Pops the latest pushed opacity mask.
-        /// </summary>
-        void PopOpacityMask();
-
-        /// <summary>
-        /// Pushes a clip geometry.
-        /// </summary>
-        /// <param name="clip">The clip geometry.</param>
-        void PushGeometryClip(IGeometryImpl clip);
-
-        /// <summary>
-        /// Pops the latest pushed geometry clip.
-        /// </summary>
-        void PopGeometryClip();
-        
-        /// <summary>
-        /// Pushes a bitmap blending value.
-        /// </summary>
-        /// <param name="blendingMode">The bitmap blending mode.</param>
-        void PushBitmapBlendMode(BitmapBlendingMode blendingMode);
-
-        /// <summary>
-        /// Pops the latest pushed bitmap blending value.
-        /// </summary>
-        void PopBitmapBlendMode();
-
-        /// <summary>
-        /// Adds a custom draw operation
-        /// </summary>
-        /// <param name="custom">Custom draw operation</param>
-        void Custom(ICustomDrawOperation custom);
-    }
-
-    public interface IDrawingContextLayerImpl : IRenderTargetBitmapImpl
-    {
-        /// <summary>
-        /// Does optimized blit with Src blend mode
-        /// </summary>
-        /// <param name="context"></param>
-        void Blit(IDrawingContextImpl context);
-        
-        /// <summary>
-        /// Returns true if layer supports optimized blit
-        /// </summary>
-        bool CanBlit { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs b/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
deleted file mode 100644
index 113c72d373..0000000000
--- a/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-using System.Globalization;
-using Avalonia.Media;
-
-namespace Avalonia.Platform
-{
-    public interface IFontManagerImpl
-    {
-        /// <summary>
-        ///     Gets the system's default font family's name.
-        /// </summary>
-        string GetDefaultFontFamilyName();
-
-        /// <summary>
-        ///     Get all installed fonts in the system.
-        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
-        /// </summary>
-        IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false);
-
-        /// <summary>
-        ///     Tries to match a specified character to a typeface that supports specified font properties.
-        /// </summary>
-        /// <param name="codepoint">The codepoint to match against.</param>
-        /// <param name="fontStyle">The font style.</param>
-        /// <param name="fontWeight">The font weight.</param>
-        /// <param name="fontFamily">The font family. This is optional and used for fallback lookup.</param>
-        /// <param name="culture">The culture.</param>
-        /// <param name="typeface">The matching typeface.</param>
-        /// <returns>
-        ///     <c>True</c>, if the <see cref="IFontManagerImpl"/> could match the character to specified parameters, <c>False</c> otherwise.
-        /// </returns>
-        bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
-            FontWeight fontWeight,
-            FontFamily? fontFamily, CultureInfo? culture, out Typeface typeface);
-
-        /// <summary>
-        ///     Creates a glyph typeface.
-        /// </summary>
-        /// <param name="typeface">The typeface.</param>
-        /// <returns>0
-        ///     The created glyph typeface. Can be <c>Null</c> if it was not possible to create a glyph typeface.
-        /// </returns>
-        IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IGeometryContext.cs b/src/Avalonia.Visuals/Platform/IGeometryContext.cs
deleted file mode 100644
index 3f7273b53b..0000000000
--- a/src/Avalonia.Visuals/Platform/IGeometryContext.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using Avalonia.Media;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Describes a geometry using drawing commands.
-    /// </summary>
-    public interface IGeometryContext : IDisposable
-    {
-        /// <summary>
-        /// Draws an arc to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
-        void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection);
-
-        /// <summary>
-        /// Begins a new figure.
-        /// </summary>
-        /// <param name="startPoint">The starting point for the figure.</param>
-        /// <param name="isFilled">Whether the figure is filled.</param>
-        void BeginFigure(Point startPoint, bool isFilled = true);
-
-        /// <summary>
-        /// Draws a Bezier curve to the specified point.
-        /// </summary>
-        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
-        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
-        /// <param name="point3">The destination point for the end of the curve.</param>
-        void CubicBezierTo(Point point1, Point point2, Point point3);
-
-        /// <summary>
-        /// Draws a quadratic Bezier curve to the specified point
-        /// </summary>
-        /// <param name="control">Control point</param>
-        /// <param name="endPoint">DestinationPoint</param>
-        void QuadraticBezierTo(Point control, Point endPoint);
-
-        /// <summary>
-        /// Draws a line to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        void LineTo(Point point);
-
-        /// <summary>
-        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
-        /// </summary>
-        /// <param name="isClosed">Whether the figure is closed.</param>
-        void EndFigure(bool isClosed);
-
-        /// <summary>
-        /// Sets the fill rule.
-        /// </summary>
-        /// <param name="fillRule">The fill rule.</param>
-        void SetFillRule(FillRule fillRule);
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
deleted file mode 100644
index ed6de1b5c7..0000000000
--- a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Avalonia.Media;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Geometry"/>.
-    /// </summary>
-    public interface IGeometryImpl
-    {
-        /// <summary>
-        /// Gets the geometry's bounding rectangle.
-        /// </summary>
-        Rect Bounds { get; }
-        
-        /// <summary>
-        /// Gets the geometry's total length as if all its contours are placed
-        /// in a straight line.
-        /// </summary>
-        double ContourLength { get; }
-
-        /// <summary>
-        /// Gets the geometry's bounding rectangle with the specified pen.
-        /// </summary>
-        /// <param name="pen">The pen to use. May be null.</param>
-        /// <returns>The bounding rectangle.</returns>
-        Rect GetRenderBounds(IPen? pen);
-
-        /// <summary>
-        /// Indicates whether the geometry's fill contains the specified point.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        bool FillContains(Point point);
-
-        /// <summary>
-        /// Intersects the geometry with another geometry.
-        /// </summary>
-        /// <param name="geometry">The other geometry.</param>
-        /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection.</returns>
-        IGeometryImpl Intersect(IGeometryImpl geometry);
-
-        /// <summary>
-        /// Indicates whether the geometry's stroke contains the specified point.
-        /// </summary>
-        /// <param name="pen">The stroke to use.</param>
-        /// <param name="point">The point.</param>
-        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        bool StrokeContains(IPen pen, Point point);
-
-        /// <summary>
-        /// Makes a clone of the geometry with the specified transform.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <returns>The cloned geometry.</returns>
-        ITransformedGeometryImpl WithTransform(Matrix transform);
-
-        /// <summary>
-        /// Attempts to get the corresponding point at the
-        /// specified distance
-        /// </summary>
-        /// <param name="distance">The contour distance to get from.</param>
-        /// <param name="point">The point in the specified distance.</param>
-        /// <returns>If there's valid point at the specified distance.</returns>
-        bool TryGetPointAtDistance(double distance, out Point point);
-
-        /// <summary>
-        /// Attempts to get the corresponding point and
-        /// tangent from the specified distance along the
-        /// contour of the geometry.
-        /// </summary>
-        /// <param name="distance">The contour distance to get from.</param>
-        /// <param name="point">The point in the specified distance.</param>
-        /// <param name="tangent">The tangent in the specified distance.</param>
-        /// <returns>If there's valid point and tangent at the specified distance.</returns>
-        bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent);
-        
-        /// <summary>
-        /// Attempts to get the corresponding path segment
-        /// given by the two distances specified.
-        /// Imagine it like snipping a part of the current
-        /// geometry.
-        /// </summary>
-        /// <param name="startDistance">The contour distance to start snipping from.</param>
-        /// <param name="stopDistance">The contour distance to stop snipping to.</param>
-        /// <param name="startOnBeginFigure">If ture, the resulting snipped path will start with a BeginFigure call.</param>
-        /// <param name="segmentGeometry">The resulting snipped path.</param>
-        /// <returns>If the snipping operation is successful.</returns>
-        bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs b/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs
deleted file mode 100644
index 08786d9689..0000000000
--- a/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    ///     Actual implementation of a glyph run that stores platform dependent resources.
-    /// </summary>
-    public interface IGlyphRunImpl : IDisposable { }
-}
diff --git a/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs b/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs
deleted file mode 100644
index 6afd79d29c..0000000000
--- a/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    public interface IGlyphTypefaceImpl : IDisposable
-    {
-        /// <summary>
-        ///     Gets the font design units per em.
-        /// </summary>
-        short DesignEmHeight { get; }
-
-        /// <summary>
-        ///     Gets the recommended distance above the baseline in design em size. 
-        /// </summary>
-        int Ascent { get; }
-
-        /// <summary>
-        ///     Gets the recommended distance under the baseline in design em size. 
-        /// </summary>
-        int Descent { get; }
-
-        /// <summary>
-        ///      Gets the recommended additional space between two lines of text in design em size. 
-        /// </summary>
-        int LineGap { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the distance of the underline from the baseline in design em size.
-        /// </summary>
-        int UnderlinePosition { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the thickness of the underline in design em size.
-        /// </summary>
-        int UnderlineThickness { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the distance of the strikethrough from the baseline in design em size.
-        /// </summary>
-        int StrikethroughPosition { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the thickness of the underline in design em size.
-        /// </summary>
-        int StrikethroughThickness { get; }
-
-        /// <summary>
-        ///     A <see cref="bool"/> value indicating whether all glyphs in the font have the same advancement. 
-        /// </summary>
-        bool IsFixedPitch { get; }
-
-        /// <summary>
-        ///     Returns an glyph index for the specified codepoint.
-        /// </summary>
-        /// <remarks>
-        ///     Returns <c>0</c> if a glyph isn't found.
-        /// </remarks>
-        /// <param name="codepoint">The codepoint.</param>
-        /// <returns>
-        ///     A glyph index.
-        /// </returns>
-        ushort GetGlyph(uint codepoint);
-
-        /// <summary>
-        ///     Returns an array of glyph indices. Codepoints that are not represented by the font are returned as <code>0</code>.
-        /// </summary>
-        /// <param name="codepoints">The codepoints to map.</param>
-        /// <returns>
-        ///     An array of glyph indices.
-        /// </returns>
-        ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints);
-
-        /// <summary>
-        ///     Returns the glyph advance for the specified glyph.
-        /// </summary>
-        /// <param name="glyph">The glyph.</param>
-        /// <returns>
-        ///     The advance.
-        /// </returns>
-        int GetGlyphAdvance(ushort glyph);
-
-        /// <summary>
-        ///     Returns an array of glyph advances in design em size.
-        /// </summary>
-        /// <param name="glyphs">The glyph indices.</param>
-        /// <returns>
-        ///     An array of glyph advances.
-        /// </returns>
-        int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
deleted file mode 100644
index a295a8cdc9..0000000000
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia.Media;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the main platform-specific interface for the rendering subsystem.
-    /// </summary>
-    public interface IPlatformRenderInterface
-    {
-        /// Creates an ellipse geometry implementation.
-        /// </summary>
-        /// <param name="rect">The bounds of the ellipse.</param>
-        /// <returns>An ellipse geometry..</returns>
-        IGeometryImpl CreateEllipseGeometry(Rect rect);
-
-        /// <summary>
-        /// Creates a line geometry implementation.
-        /// </summary>
-        /// <param name="p1">The start of the line.</param>
-        /// <param name="p2">The end of the line.</param>
-        /// <returns>A line geometry.</returns>
-        IGeometryImpl CreateLineGeometry(Point p1, Point p2);
-
-        /// <summary>
-        /// Creates a rectangle geometry implementation.
-        /// </summary>
-        /// <param name="rect">The bounds of the rectangle.</param>
-        /// <returns>A rectangle.</returns>
-        IGeometryImpl CreateRectangleGeometry(Rect rect);
-
-        /// <summary>
-        /// Creates a stream geometry implementation.
-        /// </summary>
-        /// <returns>An <see cref="IStreamGeometryImpl"/>.</returns>
-        IStreamGeometryImpl CreateStreamGeometry();
-
-        /// <summary>
-        /// Creates a geometry group implementation.
-        /// </summary>
-        /// <param name="fillRule">The fill rule.</param>
-        /// <param name="children">The geometries to group.</param>
-        /// <returns>A combined geometry.</returns>
-        IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children);
-
-        /// <summary>
-        /// Creates a geometry group implementation.
-        /// </summary>
-        /// <param name="combineMode">The combine mode</param>
-        /// <param name="g1">The first geometry.</param>
-        /// <param name="g2">The second geometry.</param>
-        /// <returns>A combined geometry.</returns>
-        IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2);
-
-        /// <summary>
-        /// Creates a renderer.
-        /// </summary>
-        /// <param name="surfaces">
-        /// The list of native platform surfaces that can be used for output.
-        /// </param>
-        /// <returns>An <see cref="IRenderTarget"/>.</returns>
-        IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces);
-
-        /// <summary>
-        /// Creates a render target bitmap implementation.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <returns>An <see cref="IRenderTargetBitmapImpl"/>.</returns>
-        IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi);
-
-        /// <summary>
-        /// Creates a writeable bitmap implementation.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="format">Pixel format.</param>
-        /// <param name="alphaFormat">Alpha format .</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a file..
-        /// </summary>
-        /// <param name="fileName">The filename of the bitmap.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmap(string fileName);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a file..
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmap(Stream stream);
-
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a stream to a specified width maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a stream to a specified height maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-        
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a file.
-        /// </summary>
-        /// <param name="fileName">The filename of the bitmap.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmap(string fileName);
-
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a file.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmap(Stream stream);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a stream to a specified width maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a stream to a specified height maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a pixels in memory.
-        /// </summary>
-        /// <param name="format">The pixel format.</param>
-        /// <param name="alphaFormat">The alpha format.</param>
-        /// <param name="data">The pointer to source bytes.</param>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="stride">The number of bytes per row.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride);
-
-        /// <summary>
-        /// Creates a platform implementation of a glyph run.
-        /// </summary>
-        /// <param name="glyphRun">The glyph run.</param>
-        /// <returns></returns>
-        IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun);
-
-        bool SupportsIndividualRoundRects { get; }
-
-        /// <summary>
-        /// Default <see cref="AlphaFormat"/> used on this platform.
-        /// </summary>
-        public AlphaFormat DefaultAlphaFormat { get; }
-
-        /// <summary>
-        /// Default <see cref="PixelFormat"/> used on this platform.
-        /// </summary>
-        public PixelFormat DefaultPixelFormat { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
deleted file mode 100644
index e4b28e6575..0000000000
--- a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    public interface IPlatformSettings
-    {
-        Size DoubleClickSize { get; }
-
-        TimeSpan DoubleClickTime { get; }
-
-        /// <summary>
-        /// Determines the size of the area within that you should click twice in order for a double click to be counted.
-        /// </summary>
-        Size TouchDoubleClickSize { get; }
-
-        /// <summary>
-        /// Determines the time span that what will be used to determine the double-click.
-        /// </summary>
-        TimeSpan TouchDoubleClickTime { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
deleted file mode 100644
index 9add07afe3..0000000000
--- a/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a
-    /// <see cref="Avalonia.Media.Imaging.RenderTargetBitmap"/>.
-    /// </summary>
-    public interface IRenderTargetBitmapImpl : IBitmapImpl, IRenderTarget
-    {
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
deleted file mode 100644
index 4587979308..0000000000
--- a/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Describes a geometry using drawing commands.
-    /// </summary>
-    public interface IStreamGeometryContextImpl : IGeometryContext
-    {      
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
deleted file mode 100644
index 5b070fde02..0000000000
--- a/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.StreamGeometry"/>.
-    /// </summary>
-    public interface IStreamGeometryImpl : IGeometryImpl
-    {
-        /// <summary>
-        /// Clones the geometry.
-        /// </summary>
-        /// <returns>A cloned geometry.</returns>
-        IStreamGeometryImpl Clone();
-
-        /// <summary>
-        /// Opens the geometry to start defining it.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="IStreamGeometryContextImpl"/> which can be used to define the geometry.
-        /// </returns>
-        IStreamGeometryContextImpl Open();
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs b/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs
deleted file mode 100644
index aced05c9d8..0000000000
--- a/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Globalization;
-using Avalonia.Media;
-using Avalonia.Media.TextFormatting;
-using Avalonia.Utilities;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// An abstraction that is used produce shaped text.
-    /// </summary>
-    public interface ITextShaperImpl
-    {
-        /// <summary>
-        /// Shapes the specified region within the text and returns a shaped buffer.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="typeface">The typeface.</param>
-        /// <param name="fontRenderingEmSize">The font rendering em size.</param>
-        /// <param name="culture">The culture.</param>
-        /// <param name="bidiLevel">The bidi level.</param>
-        /// <returns>A shaped glyph run.</returns>
-        ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize, CultureInfo? culture, sbyte bidiLevel);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs b/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
deleted file mode 100644
index 1ed025b571..0000000000
--- a/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Represents a geometry with a transform applied.
-    /// </summary>
-    /// <remarks>
-    /// An <see cref="ITransformedGeometryImpl"/> transforms a geometry without transforming its
-    /// stroke thickness.
-    /// </remarks>
-    public interface ITransformedGeometryImpl : IGeometryImpl
-    {
-        /// <summary>
-        /// Gets the source geometry that the <see cref="Transform"/> is applied to.
-        /// </summary>
-        IGeometryImpl SourceGeometry { get; }
-
-        /// <summary>
-        /// Gets the applied transform.
-        /// </summary>
-        Matrix Transform { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
deleted file mode 100644
index c4e2e4915f..0000000000
--- a/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.WriteableBitmap"/>.
-    /// </summary>
-    public interface IWriteableBitmapImpl : IBitmapImpl
-    {
-        ILockedFramebuffer Lock();
-    }
-}
diff --git a/src/Avalonia.Visuals/Point.cs b/src/Avalonia.Visuals/Point.cs
deleted file mode 100644
index 67e7d71fbc..0000000000
--- a/src/Avalonia.Visuals/Point.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-using System;
-using System.Globalization;
-#if !BUILDTASK
-using Avalonia.Animation.Animators;
-#endif
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines a point.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Point : IEquatable<Point>
-    {
-        static Point()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<PointAnimator>(prop => typeof(Point).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
-        /// <summary>
-        /// The X position.
-        /// </summary>
-        private readonly double _x;
-
-        /// <summary>
-        /// The Y position.
-        /// </summary>
-        private readonly double _y;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Point"/> structure.
-        /// </summary>
-        /// <param name="x">The X position.</param>
-        /// <param name="y">The Y position.</param>
-        public Point(double x, double y)
-        {
-            _x = x;
-            _y = y;
-        }
-
-        /// <summary>
-        /// Gets the X position.
-        /// </summary>
-        public double X => _x;
-
-        /// <summary>
-        /// Gets the Y position.
-        /// </summary>
-        public double Y => _y;
-
-        /// <summary>
-        /// Converts the <see cref="Point"/> to a <see cref="Vector"/>.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        public static implicit operator Vector(Point p)
-        {
-            return new Vector(p._x, p._y);
-        }
-
-        /// <summary>
-        /// Negates a point.
-        /// </summary>
-        /// <param name="a">The point.</param>
-        /// <returns>The negated point.</returns>
-        public static Point operator -(Point a)
-        {
-            return new Point(-a._x, -a._y);
-        }
-
-        /// <summary>
-        /// Checks for equality between two <see cref="Point"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are equal; otherwise false.</returns>
-        public static bool operator ==(Point left, Point right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="Point"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are unequal; otherwise false.</returns>
-        public static bool operator !=(Point left, Point right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Adds two points.
-        /// </summary>
-        /// <param name="a">The first point.</param>
-        /// <param name="b">The second point.</param>
-        /// <returns>A point that is the result of the addition.</returns>
-        public static Point operator +(Point a, Point b)
-        {
-            return new Point(a._x + b._x, a._y + b._y);
-        }
-
-        /// <summary>
-        /// Adds a vector to a point.
-        /// </summary>
-        /// <param name="a">The point.</param>
-        /// <param name="b">The vector.</param>
-        /// <returns>A point that is the result of the addition.</returns>
-        public static Point operator +(Point a, Vector b)
-        {
-            return new Point(a._x + b.X, a._y + b.Y);
-        }
-
-        /// <summary>
-        /// Subtracts two points.
-        /// </summary>
-        /// <param name="a">The first point.</param>
-        /// <param name="b">The second point.</param>
-        /// <returns>A point that is the result of the subtraction.</returns>
-        public static Point operator -(Point a, Point b)
-        {
-            return new Point(a._x - b._x, a._y - b._y);
-        }
-
-        /// <summary>
-        /// Subtracts a vector from a point.
-        /// </summary>
-        /// <param name="a">The point.</param>
-        /// <param name="b">The vector.</param>
-        /// <returns>A point that is the result of the subtraction.</returns>
-        public static Point operator -(Point a, Vector b)
-        {
-            return new Point(a._x - b.X, a._y - b.Y);
-        }
-
-        /// <summary>
-        /// Multiplies a point by a factor coordinate-wise
-        /// </summary>
-        /// <param name="p">Point to multiply</param>
-        /// <param name="k">Factor</param>
-        /// <returns>Points having its coordinates multiplied</returns>
-        public static Point operator *(Point p, double k) => new Point(p.X * k, p.Y * k);
-
-        /// <summary>
-        /// Multiplies a point by a factor coordinate-wise
-        /// </summary>
-        /// <param name="p">Point to multiply</param>
-        /// <param name="k">Factor</param>
-        /// <returns>Points having its coordinates multiplied</returns>
-        public static Point operator *(double k, Point p) => new Point(p.X * k, p.Y * k);
-
-        /// <summary>
-        /// Divides a point by a factor coordinate-wise
-        /// </summary>
-        /// <param name="p">Point to divide by</param>
-        /// <param name="k">Factor</param>
-        /// <returns>Points having its coordinates divided</returns>
-        public static Point operator /(Point p, double k) => new Point(p.X / k, p.Y / k);
-
-        /// <summary>
-        /// Applies a matrix to a point.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="matrix">The matrix.</param>
-        /// <returns>The resulting point.</returns>
-        public static Point operator *(Point point, Matrix matrix)
-        {
-            return new Point(
-                (point.X * matrix.M11) + (point.Y * matrix.M21) + matrix.M31,
-                (point.X * matrix.M12) + (point.Y * matrix.M22) + matrix.M32);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Point"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="Point"/>.</returns>
-        public static Point Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point."))
-            {
-                return new Point(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble()
-                );
-            }
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the point is equal to the other given point.
-        /// </summary>
-        /// <param name="other">The other point to test equality against.</param>
-        /// <returns>True if this point is equal to other; False otherwise.</returns>
-        public bool Equals(Point other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _x == other._x &&
-                   _y == other._y;
-            // ReSharper enable CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Checks for equality between a point and an object.
-        /// </summary>
-        /// <param name="obj">The object.</param>
-        /// <returns>
-        /// True if <paramref name="obj"/> is a point that equals the current point.
-        /// </returns>
-        public override bool Equals(object? obj) => obj is Point other && Equals(other);
-
-        /// <summary>
-        /// Returns a hash code for a <see cref="Point"/>.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + _x.GetHashCode();
-                hash = (hash * 23) + _y.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Returns the string representation of the point.
-        /// </summary>
-        /// <returns>The string representation of the point.</returns>
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _x, _y);
-        }
-
-        /// <summary>
-        /// Transforms the point by a matrix.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <returns>The transformed point.</returns>
-        public Point Transform(Matrix transform)
-        {
-            var x = X;
-            var y = Y;
-            var xadd = y * transform.M21 + transform.M31;
-            var yadd = x * transform.M12 + transform.M32;
-            x *= transform.M11;
-            x += xadd;
-            y *= transform.M22;
-            y += yadd;
-            return new Point(x, y);
-        }
-
-        /// <summary>
-        /// Returns a new point with the specified X coordinate.
-        /// </summary>
-        /// <param name="x">The X coordinate.</param>
-        /// <returns>The new point.</returns>
-        public Point WithX(double x)
-        {
-            return new Point(x, _y);
-        }
-
-        /// <summary>
-        /// Returns a new point with the specified Y coordinate.
-        /// </summary>
-        /// <param name="y">The Y coordinate.</param>
-        /// <returns>The new point.</returns>
-        public Point WithY(double y)
-        {
-            return new Point(_x, y);
-        }
-
-        /// <summary>
-        /// Deconstructs the point into its X and Y coordinates.
-        /// </summary>
-        /// <param name="x">The X coordinate.</param>
-        /// <param name="y">The Y coordinate.</param>
-        public void Deconstruct(out double x, out double y)
-        {
-            x = this._x;
-            y = this._y;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the X and Y coordinates are zero.
-        /// </summary>
-        public bool IsDefault
-        {
-            get { return (_x == 0) && (_y == 0); }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
deleted file mode 100644
index ebff097199..0000000000
--- a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Metadata;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Imaging")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Transformation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
-
-[assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Web.Blazor,  PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Avalonia.Visuals/Rect.cs b/src/Avalonia.Visuals/Rect.cs
deleted file mode 100644
index 6d7d6c2e54..0000000000
--- a/src/Avalonia.Visuals/Rect.cs
+++ /dev/null
@@ -1,576 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Animation.Animators;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines a rectangle.
-    /// </summary>
-    public readonly struct Rect : IEquatable<Rect>
-    {
-        static Rect()
-        {
-            Animation.Animation.RegisterAnimator<RectAnimator>(prop => typeof(Rect).IsAssignableFrom(prop.PropertyType));
-        }
-
-        /// <summary>
-        /// An empty rectangle.
-        /// </summary>
-        public static readonly Rect Empty = default(Rect);
-
-        /// <summary>
-        /// The X position.
-        /// </summary>
-        private readonly double _x;
-
-        /// <summary>
-        /// The Y position.
-        /// </summary>
-        private readonly double _y;
-
-        /// <summary>
-        /// The width.
-        /// </summary>
-        private readonly double _width;
-
-        /// <summary>
-        /// The height.
-        /// </summary>
-        private readonly double _height;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="x">The X position.</param>
-        /// <param name="y">The Y position.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public Rect(double x, double y, double width, double height)
-        {
-            _x = x;
-            _y = y;
-            _width = width;
-            _height = height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="size">The size of the rectangle.</param>
-        public Rect(Size size)
-        {
-            _x = 0;
-            _y = 0;
-            _width = size.Width;
-            _height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="position">The position of the rectangle.</param>
-        /// <param name="size">The size of the rectangle.</param>
-        public Rect(Point position, Size size)
-        {
-            _x = position.X;
-            _y = position.Y;
-            _width = size.Width;
-            _height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="topLeft">The top left position of the rectangle.</param>
-        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
-        public Rect(Point topLeft, Point bottomRight)
-        {
-            _x = topLeft.X;
-            _y = topLeft.Y;
-            _width = bottomRight.X - topLeft.X;
-            _height = bottomRight.Y - topLeft.Y;
-        }
-
-        /// <summary>
-        /// Gets the X position.
-        /// </summary>
-        public double X => _x;
-
-        /// <summary>
-        /// Gets the Y position.
-        /// </summary>
-        public double Y => _y;
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public double Width => _width;
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public double Height => _height;
-
-        /// <summary>
-        /// Gets the position of the rectangle.
-        /// </summary>
-        public Point Position => new Point(_x, _y);
-
-        /// <summary>
-        /// Gets the size of the rectangle.
-        /// </summary>
-        public Size Size => new Size(_width, _height);
-
-        /// <summary>
-        /// Gets the right position of the rectangle.
-        /// </summary>
-        public double Right => _x + _width;
-
-        /// <summary>
-        /// Gets the bottom position of the rectangle.
-        /// </summary>
-        public double Bottom => _y + _height;
-        
-        /// <summary>
-        /// Gets the left position.
-        /// </summary>
-        public double Left => _x;
-
-        /// <summary>
-        /// Gets the top position.
-        /// </summary>
-        public double Top => _y;
-
-        /// <summary>
-        /// Gets the top left point of the rectangle.
-        /// </summary>
-        public Point TopLeft => new Point(_x, _y);
-
-        /// <summary>
-        /// Gets the top right point of the rectangle.
-        /// </summary>
-        public Point TopRight => new Point(Right, _y);
-
-        /// <summary>
-        /// Gets the bottom left point of the rectangle.
-        /// </summary>
-        public Point BottomLeft => new Point(_x, Bottom);
-
-        /// <summary>
-        /// Gets the bottom right point of the rectangle.
-        /// </summary>
-        public Point BottomRight => new Point(Right, Bottom);
-
-        /// <summary>
-        /// Gets the center point of the rectangle.
-        /// </summary>
-        public Point Center => new Point(_x + (_width / 2), _y + (_height / 2));
-
-        /// <summary>
-        /// Gets a value that indicates whether the rectangle is empty.
-        /// </summary>
-        // ReSharper disable CompareOfFloatsByEqualityOperator
-        public bool IsEmpty => _width == 0 && _height == 0;
-        // ReSharper restore CompareOfFloatsByEqualityOperator
-
-        /// <summary>
-        /// Checks for equality between two <see cref="Rect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are equal; otherwise false.</returns>
-        public static bool operator ==(Rect left, Rect right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="Rect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are unequal; otherwise false.</returns>
-        public static bool operator !=(Rect left, Rect right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Multiplies a rectangle by a scaling vector.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        /// <param name="scale">The vector scale.</param>
-        /// <returns>The scaled rectangle.</returns>
-        public static Rect operator *(Rect rect, Vector scale)
-        {
-            return new Rect(
-                rect.X * scale.X,
-                rect.Y * scale.Y,
-                rect.Width * scale.X,
-                rect.Height * scale.Y);
-        }
-        
-        /// <summary>
-        /// Multiplies a rectangle by a scale.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        /// <param name="scale">The scale.</param>
-        /// <returns>The scaled rectangle.</returns>
-        public static Rect operator *(Rect rect, double scale)
-        {
-            return new Rect(
-                rect.X * scale,
-                rect.Y * scale,
-                rect.Width * scale,
-                rect.Height * scale);
-        }
-
-        /// <summary>
-        /// Divides a rectangle by a vector.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        /// <param name="scale">The vector scale.</param>
-        /// <returns>The scaled rectangle.</returns>
-        public static Rect operator /(Rect rect, Vector scale)
-        {
-            return new Rect(
-                rect.X / scale.X, 
-                rect.Y / scale.Y, 
-                rect.Width / scale.X, 
-                rect.Height / scale.Y);
-        }
-
-        /// <summary>
-        /// Determines whether a point in in the bounds of the rectangle.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
-        public bool Contains(Point p)
-        {
-            return p.X >= _x && p.X <= _x + _width &&
-                   p.Y >= _y && p.Y <= _y + _height;
-        }
-
-        /// <summary>
-        /// Determines whether the rectangle fully contains another rectangle.
-        /// </summary>
-        /// <param name="r">The rectangle.</param>
-        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
-        public bool Contains(Rect r)
-        {
-            return Contains(r.TopLeft) && Contains(r.BottomRight);
-        }
-
-        /// <summary>
-        /// Centers another rectangle in this rectangle.
-        /// </summary>
-        /// <param name="rect">The rectangle to center.</param>
-        /// <returns>The centered rectangle.</returns>
-        public Rect CenterRect(Rect rect)
-        {
-            return new Rect(
-                _x + ((_width - rect._width) / 2),
-                _y + ((_height - rect._height) / 2),
-                rect._width,
-                rect._height);
-        }
-
-        /// <summary>
-        /// Inflates the rectangle.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The inflated rectangle.</returns>
-        public Rect Inflate(double thickness)
-        {
-            return Inflate(new Thickness(thickness));
-        }
-
-        /// <summary>
-        /// Inflates the rectangle.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The inflated rectangle.</returns>
-        public Rect Inflate(Thickness thickness)
-        {
-            return new Rect(
-                new Point(_x - thickness.Left, _y - thickness.Top),
-                Size.Inflate(thickness));
-        }
-
-        /// <summary>
-        /// Deflates the rectangle.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The deflated rectangle.</returns>
-        public Rect Deflate(double thickness)
-        {
-            return Deflate(new Thickness(thickness));
-        }
-
-        /// <summary>
-        /// Deflates the rectangle by a <see cref="Thickness"/>.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The deflated rectangle.</returns>
-        public Rect Deflate(Thickness thickness)
-        {
-            return new Rect(
-                new Point(_x + thickness.Left, _y + thickness.Top),
-                Size.Deflate(thickness));
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the rect is equal to the other given rect.
-        /// </summary>
-        /// <param name="other">The other rect to test equality against.</param>
-        /// <returns>True if this rect is equal to other; False otherwise.</returns>
-        public bool Equals(Rect other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _x == other._x &&
-                   _y == other._y &&
-                   _width == other._width &&
-                   _height == other._height;
-            // ReSharper enable CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given object is equal to this rectangle.
-        /// </summary>
-        /// <param name="obj">The object to compare against.</param>
-        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
-        public override bool Equals(object? obj) => obj is Rect other && Equals(other);
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + X.GetHashCode();
-                hash = (hash * 23) + Y.GetHashCode();
-                hash = (hash * 23) + Width.GetHashCode();
-                hash = (hash * 23) + Height.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Gets the intersection of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The intersection.</returns>
-        public Rect Intersect(Rect rect)
-        {
-            var newLeft = (rect.X > X) ? rect.X : X;
-            var newTop = (rect.Y > Y) ? rect.Y : Y;
-            var newRight = (rect.Right < Right) ? rect.Right : Right;
-            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
-
-            if ((newRight > newLeft) && (newBottom > newTop))
-            {
-                return new Rect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
-            }
-            else
-            {
-                return Empty;
-            }
-        }
-
-        /// <summary>
-        /// Determines whether a rectangle intersects with this rectangle.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>
-        /// True if the specified rectangle intersects with this one; otherwise false.
-        /// </returns>
-        public bool Intersects(Rect rect)
-        {
-            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
-        }
-
-        /// <summary>
-        /// Returns the axis-aligned bounding box of a transformed rectangle.
-        /// </summary>
-        /// <param name="matrix">The transform.</param>
-        /// <returns>The bounding box</returns>
-        public Rect TransformToAABB(Matrix matrix)
-        {
-            ReadOnlySpan<Point> points = stackalloc Point[4]
-            {
-                TopLeft.Transform(matrix),
-                TopRight.Transform(matrix),
-                BottomRight.Transform(matrix),
-                BottomLeft.Transform(matrix)
-            };
-
-            var left = double.MaxValue;
-            var right = double.MinValue;
-            var top = double.MaxValue;
-            var bottom = double.MinValue;
-
-            foreach (var p in points)
-            {
-                if (p.X < left) left = p.X;
-                if (p.X > right) right = p.X;
-                if (p.Y < top) top = p.Y;
-                if (p.Y > bottom) bottom = p.Y;
-            }
-
-            return new Rect(new Point(left, top), new Point(right, bottom));
-        }
-
-        /// <summary>
-        /// Translates the rectangle by an offset.
-        /// </summary>
-        /// <param name="offset">The offset.</param>
-        /// <returns>The translated rectangle.</returns>
-        public Rect Translate(Vector offset)
-        {
-            return new Rect(Position + offset, Size);
-        }
-
-        /// <summary>
-		/// Normalizes the rectangle so both the <see cref="Width"/> and <see 
-        /// cref="Height"/> are positive, without changing the location of the rectangle
-		/// </summary>
-        /// <returns>Normalized Rect</returns>
-		/// <remarks>
-		/// Empty rect will be return when Rect contains invalid values. Like NaN.
-		/// </remarks>
-		public Rect Normalize()
-        {
-            Rect rect = this;            
-
-            if(double.IsNaN(rect.Right) || double.IsNaN(rect.Bottom) || 
-                double.IsNaN(rect.X) || double.IsNaN(rect.Y) || 
-                double.IsNaN(Height) || double.IsNaN(Width))
-            {
-                return Rect.Empty;
-            }
-
-            if (rect.Width < 0)
-            {
-                var x = X + Width;
-                var width = X - x;
-
-                rect = rect.WithX(x).WithWidth(width);
-            }
-
-            if (rect.Height < 0)
-            {
-                var y = Y + Height;
-                var height = Y - y;
-
-                rect = rect.WithY(y).WithHeight(height);
-            }
-
-            return rect;
-        }
-
-
-            /// <summary>
-            /// Gets the union of two rectangles.
-            /// </summary>
-            /// <param name="rect">The other rectangle.</param>
-            /// <returns>The union.</returns>
-            public Rect Union(Rect rect)
-        {
-            if (IsEmpty)
-            {
-                return rect;
-            }
-            else if (rect.IsEmpty)
-            {
-                return this;
-            }
-            else
-            {
-                var x1 = Math.Min(X, rect.X);
-                var x2 = Math.Max(Right, rect.Right);
-                var y1 = Math.Min(Y, rect.Y);
-                var y2 = Math.Max(Bottom, rect.Bottom);
-
-                return new Rect(new Point(x1, y1), new Point(x2, y2));
-            }
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified X position.
-        /// </summary>
-        /// <param name="x">The x position.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithX(double x)
-        {
-            return new Rect(x, _y, _width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified Y position.
-        /// </summary>
-        /// <param name="y">The y position.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithY(double y)
-        {
-            return new Rect(_x, y, _width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified width.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithWidth(double width)
-        {
-            return new Rect(_x, _y, width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified height.
-        /// </summary>
-        /// <param name="height">The height.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithHeight(double height)
-        {
-            return new Rect(_x, _y, _width, height);
-        }
-
-        /// <summary>
-        /// Returns the string representation of the rectangle.
-        /// </summary>
-        /// <returns>The string representation of the rectangle.</returns>
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}, {1}, {2}, {3}",
-                _x,
-                _y,
-                _width,
-                _height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Rect"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The parsed <see cref="Rect"/>.</returns>
-        public static Rect Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect."))
-            {
-                return new Rect(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble()
-                );
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/RelativePoint.cs b/src/Avalonia.Visuals/RelativePoint.cs
deleted file mode 100644
index 4550dbd54b..0000000000
--- a/src/Avalonia.Visuals/RelativePoint.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using System.Globalization;
-
-using Avalonia.Animation.Animators;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines the reference point units of an <see cref="RelativePoint"/> or 
-    /// <see cref="RelativeRect"/>.
-    /// </summary>
-    public enum RelativeUnit
-    {
-        /// <summary>
-        /// The point is expressed as a fraction of the containing element's size.
-        /// </summary>
-        Relative,
-
-        /// <summary>
-        /// The point is absolute (i.e. in pixels).
-        /// </summary>
-        Absolute,
-    }
-
-    /// <summary>
-    /// Defines a point that may be defined relative to a containing element.
-    /// </summary>
-    public readonly struct RelativePoint : IEquatable<RelativePoint>
-    {
-        /// <summary>
-        /// A point at the top left of the containing element.
-        /// </summary>
-        public static readonly RelativePoint TopLeft = new RelativePoint(0, 0, RelativeUnit.Relative);
-
-        /// <summary>
-        /// A point at the center of the containing element.
-        /// </summary>
-        public static readonly RelativePoint Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
-
-        /// <summary>
-        /// A point at the bottom right of the containing element.
-        /// </summary>
-        public static readonly RelativePoint BottomRight = new RelativePoint(1, 1, RelativeUnit.Relative);
-
-        private readonly Point _point;
-
-        private readonly RelativeUnit _unit;
-
-        static RelativePoint()
-        {
-            Animation.Animation.RegisterAnimator<RelativePointAnimator>(prop => typeof(RelativePoint).IsAssignableFrom(prop.PropertyType));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
-        /// </summary>
-        /// <param name="x">The X point.</param>
-        /// <param name="y">The Y point</param>
-        /// <param name="unit">The unit.</param>
-        public RelativePoint(double x, double y, RelativeUnit unit)
-            : this(new Point(x, y), unit)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="unit">The unit.</param>
-        public RelativePoint(Point point, RelativeUnit unit)
-        {
-            _point = point;
-            _unit = unit;
-        }
-
-        /// <summary>
-        /// Gets the point.
-        /// </summary>
-        public Point Point => _point;
-
-        /// <summary>
-        /// Gets the unit.
-        /// </summary>
-        public RelativeUnit Unit => _unit;
-
-        /// <summary>
-        /// Checks for equality between two <see cref="RelativePoint"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are equal; otherwise false.</returns>
-        public static bool operator ==(RelativePoint left, RelativePoint right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="RelativePoint"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are unequal; otherwise false.</returns>
-        public static bool operator !=(RelativePoint left, RelativePoint right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks if the <see cref="RelativePoint"/> equals another object.
-        /// </summary>
-        /// <param name="obj">The other object.</param>
-        /// <returns>True if the objects are equal, otherwise false.</returns>
-        public override bool Equals(object? obj) => obj is RelativePoint other && Equals(other);
-
-        /// <summary>
-        /// Checks if the <see cref="RelativePoint"/> equals another point.
-        /// </summary>
-        /// <param name="p">The other point.</param>
-        /// <returns>True if the objects are equal, otherwise false.</returns>
-        public bool Equals(RelativePoint p)
-        {
-            return Unit == p.Unit && Point == p.Point;
-        }
-
-        /// <summary>
-        /// Gets a hashcode for a <see cref="RelativePoint"/>.
-        /// </summary>
-        /// <returns>A hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (_point.GetHashCode() * 397) ^ (int)_unit;
-            }
-        }
-
-        /// <summary>
-        /// Converts a <see cref="RelativePoint"/> into pixels.
-        /// </summary>
-        /// <param name="size">The size of the visual.</param>
-        /// <returns>The origin point in pixels.</returns>
-        public Point ToPixels(Size size)
-        {
-            return _unit == RelativeUnit.Absolute ?
-                _point :
-                new Point(_point.X * size.Width, _point.Y * size.Height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="RelativePoint"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The parsed <see cref="RelativePoint"/>.</returns>
-        public static RelativePoint Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid RelativePoint."))
-            {
-                var x = tokenizer.ReadString();
-                var y = tokenizer.ReadString();
-
-                var unit = RelativeUnit.Absolute;
-                var scale = 1.0;
-
-                if (x.EndsWith("%"))
-                {
-                    if (!y.EndsWith("%"))
-                    {
-                        throw new FormatException("If one coordinate is relative, both must be.");
-                    }
-
-                    x = x.TrimEnd('%');
-                    y = y.TrimEnd('%');
-                    unit = RelativeUnit.Relative;
-                    scale = 0.01;
-                }
-
-                return new RelativePoint(
-                    double.Parse(x, CultureInfo.InvariantCulture) * scale,
-                    double.Parse(y, CultureInfo.InvariantCulture) * scale,
-                    unit);
-            }
-        }
-
-        /// <summary>
-        /// Returns a String representing this RelativePoint instance.
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return _unit == RelativeUnit.Absolute ?
-                _point.ToString() :
-                 string.Format(CultureInfo.InvariantCulture, "{0}%, {1}%", _point.X * 100, _point.Y * 100);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs b/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
deleted file mode 100644
index 82d3892975..0000000000
--- a/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Avalonia.Platform;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Defines a default render timer that uses a standard timer.
-    /// </summary>
-    /// <remarks>
-    /// This class may be overridden by platform implementations to use a specialized timer
-    /// implementation.
-    /// </remarks>
-    public class DefaultRenderTimer : IRenderTimer
-    {
-        private IRuntimePlatform? _runtime;
-        private int _subscriberCount;
-        private Action<TimeSpan>? _tick;
-        private IDisposable? _subscription;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultRenderTimer"/> class.
-        /// </summary>
-        /// <param name="framesPerSecond">
-        /// The number of frames per second at which the loop should run.
-        /// </param>
-        public DefaultRenderTimer(int framesPerSecond)
-        {
-            FramesPerSecond = framesPerSecond;
-        }
-
-        /// <summary>
-        /// Gets the number of frames per second at which the loop runs.
-        /// </summary>
-        public int FramesPerSecond { get; }
-
-        /// <inheritdoc/>
-        public event Action<TimeSpan> Tick
-        {
-            add
-            {
-                _tick += value;
-
-                if (_subscriberCount++ == 0)
-                {
-                    Start();
-                }
-            }
-
-            remove
-            {
-                if (--_subscriberCount == 0)
-                {
-                    Stop();
-                }
-
-                _tick -= value;
-            }
-        }
-
-        /// <summary>
-        /// Starts the timer.
-        /// </summary>
-        protected void Start()
-        {
-            _subscription = StartCore(InternalTick);
-        }
-
-        /// <summary>
-        /// Provides the implementation of starting the timer.
-        /// </summary>
-        /// <param name="tick">The method to call on each tick.</param>
-        /// <remarks>
-        /// This can be overridden by platform implementations to use a specialized timer
-        /// implementation.
-        /// </remarks>
-        protected virtual IDisposable StartCore(Action<TimeSpan> tick)
-        {
-            _runtime ??= AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
-
-            return _runtime.StartSystemTimer(
-                TimeSpan.FromSeconds(1.0 / FramesPerSecond),
-                () => tick(TimeSpan.FromMilliseconds(Environment.TickCount)));
-        }
-
-        /// <summary>
-        /// Stops the timer.
-        /// </summary>
-        protected void Stop()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
-        }
-
-        private void InternalTick(TimeSpan tickCount)
-        {
-            _tick?.Invoke(tickCount);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
deleted file mode 100644
index 82be0a1a0f..0000000000
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ /dev/null
@@ -1,731 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using Avalonia.Logging;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Threading;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// A renderer which renders the state of the visual tree to an intermediate scene graph
-    /// representation which is then rendered on a rendering thread.
-    /// </summary>
-    public class DeferredRenderer : RendererBase, IRenderer, IRenderLoopTask, IVisualBrushRenderer
-    {
-        private readonly IDispatcher? _dispatcher;
-        private readonly IRenderLoop? _renderLoop;
-        private readonly IVisual _root;
-        private readonly ISceneBuilder _sceneBuilder;
-
-        private bool _running;
-        private bool _disposed;
-        private volatile IRef<Scene>? _scene;
-        private DirtyVisuals? _dirty;
-        private HashSet<IVisual>? _recalculateChildren;
-        private IRef<IRenderTargetBitmapImpl>? _overlay;
-        private int _lastSceneId = -1;
-        private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
-        private IRef<IDrawOperation>? _currentDraw;
-        private readonly IDeferredRendererLock _lock;
-        private readonly object _sceneLock = new object();
-        private readonly object _startStopLock = new object();
-        private readonly object _renderLoopIsRenderingLock = new object();
-        private readonly Action _updateSceneIfNeededDelegate;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
-        /// </summary>
-        /// <param name="root">The control to render.</param>
-        /// <param name="renderLoop">The render loop.</param>
-        /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
-        /// <param name="dispatcher">The dispatcher to use. Optional.</param>
-        /// <param name="rendererLock">Lock object used before trying to access render target</param>
-        public DeferredRenderer(
-            IRenderRoot root,
-            IRenderLoop renderLoop,
-            ISceneBuilder? sceneBuilder = null,
-            IDispatcher? dispatcher = null,
-            IDeferredRendererLock? rendererLock = null) : base(true)
-        {
-            _dispatcher = dispatcher ?? Dispatcher.UIThread;
-            _root = root ?? throw new ArgumentNullException(nameof(root));
-            _sceneBuilder = sceneBuilder ?? new SceneBuilder();
-            Layers = new RenderLayers();
-            _renderLoop = renderLoop;
-            _lock = rendererLock ?? new ManagedDeferredRendererLock();
-            _updateSceneIfNeededDelegate = UpdateSceneIfNeeded;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
-        /// </summary>
-        /// <param name="root">The control to render.</param>
-        /// <param name="renderTarget">The render target.</param>
-        /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
-        /// <remarks>
-        /// This constructor is intended to be used for unit testing.
-        /// </remarks>
-        public DeferredRenderer(
-            IVisual root,
-            IRenderTarget renderTarget,
-            ISceneBuilder? sceneBuilder = null) : base(true)
-        {
-            _root = root ?? throw new ArgumentNullException(nameof(root));
-            RenderTarget = renderTarget ?? throw new ArgumentNullException(nameof(renderTarget));
-            _sceneBuilder = sceneBuilder ?? new SceneBuilder();
-            Layers = new RenderLayers();
-            _lock = new ManagedDeferredRendererLock();
-            _updateSceneIfNeededDelegate = UpdateSceneIfNeeded;
-        }
-
-        /// <inheritdoc/>
-        public bool DrawFps { get; set; }
-
-        /// <inheritdoc/>
-        public bool DrawDirtyRects { get; set; }
-
-        /// <summary>
-        /// Gets or sets a path to which rendered frame should be rendered for debugging.
-        /// </summary>
-        public string? DebugFramesPath { get; set; }
-
-        /// <summary>
-        /// Forces the renderer to only draw frames on the render thread. Makes Paint to wait until frame is rendered
-        /// </summary>
-        public bool RenderOnlyOnRenderThread { get; set; }
-
-        /// <inheritdoc/>
-        public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
-
-        /// <summary>
-        /// Gets the render layers.
-        /// </summary>
-        internal RenderLayers Layers { get; }
-
-        /// <summary>
-        /// Gets the current render target.
-        /// </summary>
-        internal IRenderTarget? RenderTarget { get; private set; }
-
-        /// <inheritdoc/>
-        public void AddDirty(IVisual visual)
-        {
-            _dirty?.Add(visual);
-        }
-
-        /// <summary>
-        /// Disposes of the renderer and detaches from the render loop.
-        /// </summary>
-        public void Dispose()
-        {
-            lock (_sceneLock)
-            {
-                if (_disposed)
-                    return;
-                _disposed = true;
-                var scene = _scene;
-                _scene = null;
-                scene?.Dispose();
-            }
-
-            Stop();
-            // Wait for any in-progress rendering to complete
-            lock(_renderLoopIsRenderingLock){}
-            DisposeRenderTarget();
-        }
-
-        public void RecalculateChildren(IVisual visual) => _recalculateChildren?.Add(visual);
-
-        void DisposeRenderTarget()
-        {
-            using (var l = _lock.TryLock())
-            {
-                if(l == null)
-                {
-                    // We are still trying to render on the render thread, try again a bit later
-                    DispatcherTimer.RunOnce(DisposeRenderTarget, TimeSpan.FromMilliseconds(50),
-                        DispatcherPriority.Background);
-                    return;
-                }
-
-                Layers.Clear();
-                RenderTarget?.Dispose();
-                RenderTarget = null;
-            }
-        }
-
-        /// <inheritdoc/>
-        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool>? filter)
-        {
-            EnsureCanHitTest();
-
-            //It's safe to access _scene here without a lock since
-            //it's only changed from UI thread which we are currently on
-            return _scene?.Item.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
-        }
-
-        /// <inheritdoc/>
-        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool>? filter)
-        {
-            EnsureCanHitTest();
-
-            //It's safe to access _scene here without a lock since
-            //it's only changed from UI thread which we are currently on
-            return _scene?.Item.HitTestFirst(p, root, filter);
-        }
-
-        /// <inheritdoc/>
-        public void Paint(Rect rect)
-        {
-            if (RenderOnlyOnRenderThread)
-            {
-                // Renderer is stopped and doesn't tick on the render thread
-                // This indicates a bug somewhere in our code
-                // (currently happens when a window gets minimized with Show desktop on Windows 10)
-                if(!_running)
-                    return;
-                
-                while (true)
-                {
-                    Scene? scene;
-                    bool? updated;
-                    lock (_sceneLock)
-                    {
-                        updated = UpdateScene();
-                        scene = _scene?.Item;
-                    }
-                    
-                    // Renderer is in invalid state, skip drawing
-                    if(updated == null)
-                        return;
-
-                    // Wait for the scene to be rendered or disposed
-                    scene?.Rendered.Wait();
-                    
-                    // That was an up-to-date scene, we can return immediately
-                    if (updated == true)
-                        return;
-                }
-            }
-            else
-            {
-                var t = (IRenderLoopTask)this;
-                if (t.NeedsUpdate)
-                    UpdateScene();
-                if (_scene?.Item != null)
-                    Render(true);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Resized(Size size)
-        {
-        }
-
-        /// <inheritdoc/>
-        public void Start()
-        {
-            lock (_startStopLock)
-            {
-                if (!_running && _renderLoop != null)
-                {
-                    _renderLoop.Add(this);
-                    _running = true;
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Stop()
-        {
-            lock (_startStopLock)
-            {
-                if (_running && _renderLoop != null)
-                {
-                    _renderLoop.Remove(this);
-                    _running = false;
-                }
-            }
-        }
-
-        bool NeedsUpdate => _dirty == null || _dirty.Count > 0;
-        bool IRenderLoopTask.NeedsUpdate => NeedsUpdate;
-
-        void IRenderLoopTask.Update(TimeSpan time) => UpdateScene();
-
-        void IRenderLoopTask.Render()
-        {
-            lock (_renderLoopIsRenderingLock)
-            {
-                lock(_startStopLock)
-                    if(!_running)
-                        return;
-                Render(false);
-            }
-        }
-
-        /// <inheritdoc/>
-        Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
-        {
-            return (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
-        }
-
-        /// <inheritdoc/>
-        void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
-        {
-            var childScene = (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual];
-
-            if (childScene != null)
-            {
-                Render(context, (VisualNode)childScene.Root, null, new Rect(childScene.Size));
-            }
-        }
-
-        internal void UnitTestUpdateScene() => UpdateScene();
-
-        internal void UnitTestRender() => Render(false);
-
-        internal Scene? UnitTestScene() => _scene?.Item;
-
-        private void EnsureCanHitTest()
-        {
-            if (_renderLoop == null && (_dirty == null || _dirty.Count > 0))
-            {
-                // When unit testing the renderLoop may be null, so update the scene manually.
-                UpdateScene();
-            }
-        }
-
-        internal void Render(bool forceComposite)
-        {
-            using (var l = _lock.TryLock())
-            {
-                if (l == null)
-                    return;
-
-                IDrawingContextImpl? context = null;
-                try
-                {
-                    try
-                    {
-                        var (scene, updated) = UpdateRenderLayersAndConsumeSceneIfNeeded(ref context);
-                        if (updated)
-                            FpsTick();
-                        using (scene)
-                        {
-                            if (scene?.Item != null)
-                            {
-                                try
-                                {
-                                    var overlay = DrawDirtyRects || DrawFps;
-                                    if (DrawDirtyRects)
-                                        _dirtyRectsDisplay.Tick();
-                                    if (overlay)
-                                        RenderOverlay(scene.Item, ref context);
-                                    if (updated || forceComposite || overlay)
-                                        RenderComposite(scene.Item, ref context);
-                                }
-                                finally
-                                {
-                                    scene.Item.MarkAsRendered();
-                                }
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        context?.Dispose();
-                    }
-                }
-                catch (RenderTargetCorruptedException ex)
-                {
-                    Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
-                    RenderTarget?.Dispose();
-                    RenderTarget = null;
-                }
-            }
-        }
-
-        private (IRef<Scene>? scene, bool updated) UpdateRenderLayersAndConsumeSceneIfNeeded(ref IDrawingContextImpl? context,
-            bool recursiveCall = false)
-        {
-            IRef<Scene>? sceneRef;
-            lock (_sceneLock)
-                sceneRef = _scene?.Clone();
-            if (sceneRef == null)
-                return (null, false);
-            using (sceneRef)
-            {
-                var scene = sceneRef.Item;
-                if (scene.Generation != _lastSceneId)
-                {
-                    EnsureDrawingContext(ref context);
-
-                    Layers.Update(scene, context);
-
-                    RenderToLayers(scene);
-
-                    if (DebugFramesPath != null)
-                    {
-                        SaveDebugFrames(scene.Generation);
-                    }
-
-                    lock (_sceneLock)
-                        _lastSceneId = scene.Generation;
-
-
-                    var isUiThread = Dispatcher.UIThread.CheckAccess();
-                    // We have consumed the previously available scene, but there might be some dirty 
-                    // rects since the last update. *If* we are on UI thread, we can force immediate scene
-                    // rebuild before rendering anything on-screen
-                    // We are calling the same method recursively here 
-                    if (!recursiveCall && isUiThread && NeedsUpdate)
-                    {
-                        UpdateScene();
-                        var (rs, _) = UpdateRenderLayersAndConsumeSceneIfNeeded(ref context, true);
-                        return (rs, true);
-                    }
-
-                    // We are rendering a new scene version, so it's highly likely
-                    // that there is already a pending update for animations
-                    // So we are scheduling an update call so UI thread could prepare a scene before
-                    // the next render timer tick
-                    if (!recursiveCall && !isUiThread)
-                        Dispatcher.UIThread.Post(_updateSceneIfNeededDelegate, DispatcherPriority.Render);
-
-                    // Indicate that we have updated the layers
-                    return (sceneRef.Clone(), true);
-                }
-
-                // Just return scene, layers weren't updated
-                return (sceneRef.Clone(), false);
-            }
-
-        }
-
-
-        private void Render(IDrawingContextImpl context, VisualNode node, IVisual? layer, Rect clipBounds)
-        {
-            if (layer == null || node.LayerRoot == layer)
-            {
-                clipBounds = node.ClipBounds.Intersect(clipBounds);
-
-                if (!clipBounds.IsEmpty && node.Opacity > 0)
-                {
-                    var isLayerRoot = node.Visual == layer;
-
-                    node.BeginRender(context, isLayerRoot);
-
-                    var drawOperations = node.DrawOperations;
-                    var drawOperationsCount = drawOperations.Count;
-                    for (int i = 0; i < drawOperationsCount; i++)
-                    {
-                        var operation = drawOperations[i];
-                        _currentDraw = operation;
-                        operation.Item.Render(context);
-                        _currentDraw = null;
-                    }
-
-                    var children = node.Children;
-                    var childrenCount = children.Count;
-                    for (int i = 0; i < childrenCount; i++)
-                    {
-                        var child = children[i];
-                        Render(context, (VisualNode)child, layer, clipBounds);
-                    }
-
-                    node.EndRender(context, isLayerRoot);
-                }
-            }
-        }
-
-        private void RenderToLayers(Scene scene)
-        {
-            foreach (var layer in scene.Layers)
-            {
-                var renderLayer = Layers[layer.LayerRoot];
-                if (layer.Dirty.IsEmpty && !renderLayer.IsEmpty)
-                    continue;
-                var renderTarget = renderLayer.Bitmap;
-                var node = (VisualNode?)scene.FindNode(layer.LayerRoot);
-
-                if (node != null)
-                {
-                    using (var context = renderTarget.Item.CreateDrawingContext(this))
-                    {
-                        if (renderLayer.IsEmpty)
-                        {
-                            // Render entire layer root node
-                            context.Clear(Colors.Transparent);
-                            context.Transform = Matrix.Identity;
-                            context.PushClip(node.ClipBounds);
-                            Render(context, node, layer.LayerRoot, node.ClipBounds);
-                            context.PopClip();
-                            if (DrawDirtyRects)
-                            {
-                                _dirtyRectsDisplay.Add(node.ClipBounds);
-                            }
-
-                            renderLayer.IsEmpty = false;
-                        }
-                        else
-                        {
-                            var scale = scene.Scaling;
-
-                            foreach (var rect in layer.Dirty)
-                            {
-                                var snappedRect = SnapToDevicePixels(rect, scale);
-                                context.Transform = Matrix.Identity;
-                                context.PushClip(snappedRect);
-                                context.Clear(Colors.Transparent);
-                                Render(context, node, layer.LayerRoot, snappedRect);
-                                context.PopClip();
-
-                                if (DrawDirtyRects)
-                                {
-                                    _dirtyRectsDisplay.Add(snappedRect);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static Rect SnapToDevicePixels(Rect rect, double scale)
-        {
-            return new Rect(
-                new Point(
-                    Math.Floor(rect.X * scale) / scale,
-                    Math.Floor(rect.Y * scale) / scale),
-                new Point(
-                    Math.Ceiling(rect.Right * scale) / scale,
-                    Math.Ceiling(rect.Bottom * scale) / scale));
-        }
-
-        private void RenderOverlay(Scene scene, ref IDrawingContextImpl? parentContent)
-        {
-            EnsureDrawingContext(ref parentContent);
-
-            if (DrawDirtyRects)
-            {
-                var overlay = GetOverlay(parentContent, scene.Size, scene.Scaling);
-
-                using (var context = overlay.Item.CreateDrawingContext(this))
-                {
-                    context.Clear(Colors.Transparent);
-                    RenderDirtyRects(context);
-                }
-            }
-            else
-            {
-                _overlay?.Dispose();
-                _overlay = null;
-            }
-        }
-
-        private void RenderDirtyRects(IDrawingContextImpl context)
-        {
-            foreach (var r in _dirtyRectsDisplay)
-            {
-                var brush = new ImmutableSolidColorBrush(Colors.Magenta, r.Opacity);
-                context.DrawRectangle(brush,null, r.Rect);
-            }
-        }
-
-        private void RenderComposite(Scene scene, ref IDrawingContextImpl? context)
-        {
-            EnsureDrawingContext(ref context);
-
-            context.Clear(Colors.Transparent);
-
-            var clientRect = new Rect(scene.Size);
-
-            var firstLayer = true;
-            foreach (var layer in scene.Layers)
-            {
-                var bitmap = Layers[layer.LayerRoot].Bitmap;
-                var sourceRect = new Rect(0, 0, bitmap.Item.PixelSize.Width, bitmap.Item.PixelSize.Height);
-
-                if (layer.GeometryClip != null)
-                {
-                    context.PushGeometryClip(layer.GeometryClip);
-                }
-
-                if (layer.OpacityMask == null)
-                {
-                    if (firstLayer && bitmap.Item.CanBlit)
-                        bitmap.Item.Blit(context);
-                    else
-                        context.DrawBitmap(bitmap, layer.Opacity, sourceRect, clientRect);
-                }
-                else
-                {
-                    context.DrawBitmap(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect);
-                }
-
-                if (layer.GeometryClip != null)
-                {
-                    context.PopGeometryClip();
-                }
-
-                firstLayer = false;
-            }
-
-            if (_overlay != null)
-            {
-                var sourceRect = new Rect(0, 0, _overlay.Item.PixelSize.Width, _overlay.Item.PixelSize.Height);
-                context.DrawBitmap(_overlay, 0.5, sourceRect, clientRect);
-            }
-
-            if (DrawFps)
-            {
-                using (var c = new DrawingContext(context, false))
-                {
-                    RenderFps(c, clientRect, scene.Layers.Count);
-                }
-            }
-        }
-
-        private void EnsureDrawingContext([NotNull] ref IDrawingContextImpl? context)
-        {
-            if (context != null)
-            {
-                return;
-            }
-
-            if ((RenderTarget as IRenderTargetWithCorruptionInfo)?.IsCorrupted == true)
-            {
-                RenderTarget!.Dispose();
-                RenderTarget = null;
-            }
-
-            if (RenderTarget == null)
-            {
-                RenderTarget = ((IRenderRoot)_root).CreateRenderTarget();
-            }
-
-            context = RenderTarget.CreateDrawingContext(this);
-        }
-
-        private void UpdateSceneIfNeeded()
-        {
-            if(NeedsUpdate)
-                UpdateScene();
-        }
-        
-        private bool? UpdateScene()
-        {
-            Dispatcher.UIThread.VerifyAccess();
-            using var noPump = NonPumpingLockHelper.Use();
-            lock (_sceneLock)
-            {
-                if (_disposed)
-                    return null;
-                if (_scene?.Item.Generation > _lastSceneId)
-                    return false;
-            }
-            if (_root.IsVisible)
-            {
-                var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
-                var scene = sceneRef.Item;
-
-                if (_dirty == null)
-                {
-                    _dirty = new DirtyVisuals();
-                    _recalculateChildren = new HashSet<IVisual>();
-                    _sceneBuilder.UpdateAll(scene);
-                }
-                else
-                {
-                    foreach (var visual in _recalculateChildren!)
-                    {
-                        var node = scene.FindNode(visual);
-                        ((VisualNode?)node)?.SortChildren(scene);
-                    }
-
-                    _recalculateChildren.Clear();
-
-                    foreach (var visual in _dirty)
-                    {
-                        _sceneBuilder.Update(scene, visual);
-                    }
-                }
-
-                lock (_sceneLock)
-                {
-                    var oldScene = _scene;
-                    _scene = sceneRef;
-                    oldScene?.Dispose();
-                }
-
-                _dirty.Clear();
-
-                if (SceneInvalidated != null)
-                {
-                    var rect = new Rect();
-
-                    foreach (var layer in scene.Layers)
-                    {
-                        foreach (var dirty in layer.Dirty)
-                        {
-                            rect = rect.Union(dirty);
-                        }
-                    }
-
-                    SceneInvalidated(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
-                }
-
-                return true;
-            }
-            else
-            {
-                lock (_sceneLock)
-                {
-                    var oldScene = _scene;
-                    _scene = null;
-                    oldScene?.Dispose();
-                }
-
-                return null;
-            }
-        }
-
-        private IRef<IRenderTargetBitmapImpl> GetOverlay(
-            IDrawingContextImpl parentContext,
-            Size size,
-            double scaling)
-        {
-            var pixelSize = size * scaling;
-
-            if (_overlay == null ||
-                _overlay.Item.PixelSize.Width != pixelSize.Width ||
-                _overlay.Item.PixelSize.Height != pixelSize.Height)
-            {
-                _overlay?.Dispose();
-                _overlay = RefCountable.Create(parentContext.CreateLayer(size));
-            }
-
-            return _overlay;
-        }
-
-        private void SaveDebugFrames(int id)
-        {
-            var index = 0;
-
-            foreach (var layer in Layers)
-            {
-                var fileName = Path.Combine(DebugFramesPath ?? string.Empty, $"frame-{id}-layer-{index++}.png");
-                layer.Bitmap.Item.Save(fileName);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/DirtyVisuals.cs b/src/Avalonia.Visuals/Rendering/DirtyVisuals.cs
deleted file mode 100644
index 00bc236b9c..0000000000
--- a/src/Avalonia.Visuals/Rendering/DirtyVisuals.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Stores a list of dirty visuals for an <see cref="IRenderer"/>.
-    /// </summary>
-    /// <remarks>
-    /// This class stores the dirty visuals for a scene, ordered by their distance to the root
-    /// visual. TODO: We probably want to put an upper limit on the number of visuals that can be
-    /// stored and if we reach that limit, assume all visuals are dirty.
-    /// </remarks>
-    internal class DirtyVisuals : IEnumerable<IVisual>
-    {
-        private SortedDictionary<int, List<IVisual>> _inner = new SortedDictionary<int, List<IVisual>>();
-        private Dictionary<IVisual, int> _index = new Dictionary<IVisual, int>();
-        private List<IVisual> _deferredChanges = new List<IVisual>();
-        private int _deferring;
-
-        /// <summary>
-        /// Gets the number of dirty visuals.
-        /// </summary>
-        public int Count => _index.Count;
-
-        /// <summary>
-        /// Adds a visual to the dirty list.
-        /// </summary>
-        /// <param name="visual">The dirty visual.</param>
-        public void Add(IVisual visual)
-        {
-            if (_deferring > 0)
-            {
-                _deferredChanges.Add(visual);
-                return;
-            }
-
-            var distance = visual.CalculateDistanceFromAncestor(visual.VisualRoot);
-
-            if (_index.TryGetValue(visual, out var existingDistance))
-            {
-                if (distance == existingDistance)
-                {
-                    return;
-                }
-
-                _inner[existingDistance].Remove(visual);
-                _index.Remove(visual);
-            }
-
-            if (!_inner.TryGetValue(distance, out var list))
-            {
-                list = new List<IVisual>();
-                _inner.Add(distance, list);
-            }
-
-            list.Add(visual);
-            _index.Add(visual, distance);
-        }
-
-        /// <summary>
-        /// Clears the list.
-        /// </summary>
-        public void Clear()
-        {
-            if (_deferring > 0)
-            {
-                throw new InvalidOperationException("Cannot clear while enumerating");
-            }
-
-            _inner.Clear();
-            _index.Clear();
-        }
-
-        /// <summary>
-        /// Gets the dirty visuals, in ascending order of distance to their root.
-        /// </summary>
-        /// <returns>A collection of visuals.</returns>
-        public IEnumerator<IVisual> GetEnumerator()
-        {
-            BeginDefer();
-            try
-            {
-                foreach (var i in _inner)
-                {
-                    foreach (var j in i.Value)
-                    {
-                        yield return j;
-                    }
-                }
-            }
-            finally
-            {
-                EndDefer();
-            }
-        }
-
-        private void BeginDefer()
-        {
-            ++_deferring;
-        }
-
-        private void EndDefer()
-        {
-            if (--_deferring > 0) return;
-
-            foreach (var visual in _deferredChanges)
-            {
-                Add(visual);
-            }
-
-            _deferredChanges.Clear();
-        }
-
-        /// <summary>
-        /// Gets the dirty visuals, in ascending order of distance to their root.
-        /// </summary>
-        /// <returns>A collection of visuals.</returns>
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs b/src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs
deleted file mode 100644
index eab3dca58e..0000000000
--- a/src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Avalonia.Rendering
-{
-    public interface IDeferredRendererLock
-    {
-        IDisposable? TryLock();
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLoop.cs b/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
deleted file mode 100644
index dd7442e7f8..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// The application render loop.
-    /// </summary>
-    /// <remarks>
-    /// The render loop is responsible for advancing the animation timer and updating the scene
-    /// graph for visible windows.
-    /// </remarks>
-    public interface IRenderLoop
-    {
-        /// <summary>
-        /// Adds an update task.
-        /// </summary>
-        /// <param name="i">The update task.</param>
-        /// <remarks>
-        /// Registered update tasks will be polled on each tick of the render loop after the
-        /// animation timer has been pulsed.
-        /// </remarks>
-        void Add(IRenderLoopTask i);
-
-        /// <summary>
-        /// Removes an update task.
-        /// </summary>
-        /// <param name="i">The update task.</param>
-        void Remove(IRenderLoopTask i);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderRoot.cs b/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
deleted file mode 100644
index 54e58bf39c..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Represents the root of a renderable tree.
-    /// </summary>
-    public interface IRenderRoot : IVisual
-    {
-        /// <summary>
-        /// Gets the client size of the window.
-        /// </summary>
-        Size ClientSize { get; }
-
-        /// <summary>
-        /// Gets the renderer for the window.
-        /// </summary>
-        IRenderer Renderer { get; }
-
-        /// <summary>
-        /// The scaling factor to use in rendering.
-        /// </summary>
-        double RenderScaling { get; }
-
-        /// <summary>
-        /// Creates a render target for the window.
-        /// </summary>
-        /// <returns>An <see cref="IRenderTarget"/>.</returns>
-        IRenderTarget CreateRenderTarget();
-
-        /// <summary>
-        /// Adds a rectangle to the window's dirty region.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        void Invalidate(Rect rect);
-
-        /// <summary>
-        /// Converts a point from screen to client coordinates.
-        /// </summary>
-        /// <param name="point">The point in screen device coordinates.</param>
-        /// <returns>The point in client coordinates.</returns>
-        Point PointToClient(PixelPoint point);
-
-        /// <summary>
-        /// Converts a point from client to screen coordinates.
-        /// </summary>
-        /// <param name="point">The point in client coordinates.</param>
-        /// <returns>The point in screen device coordinates.</returns>
-        PixelPoint PointToScreen(Point point);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderTimer.cs b/src/Avalonia.Visuals/Rendering/IRenderTimer.cs
deleted file mode 100644
index d333e928a0..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderTimer.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Defines the interface implemented by an application render timer.
-    /// </summary>
-    public interface IRenderTimer
-    {
-        /// <summary>
-        /// Raised when the render timer ticks to signal a new frame should be drawn.
-        /// </summary>
-        /// <remarks>
-        /// This event can be raised on any thread; it is the responsibility of the subscriber to
-        /// switch execution to the right thread.
-        /// </remarks>
-        event Action<TimeSpan> Tick;
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderer.cs b/src/Avalonia.Visuals/Rendering/IRenderer.cs
deleted file mode 100644
index e998f78d5c..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderer.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-using System.Collections.Generic;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Defines the interface for a renderer.
-    /// </summary>
-    public interface IRenderer : IDisposable
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the renderer should draw an FPS counter.
-        /// </summary>
-        bool DrawFps { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the renderer should draw a visual representation
-        /// of its dirty rectangles.
-        /// </summary>
-        bool DrawDirtyRects { get; set; }
-
-        /// <summary>
-        /// Raised when a portion of the scene has been invalidated.
-        /// </summary>
-        /// <remarks>
-        /// Indicates that the underlying low-level scene information has been updated. Used to
-        /// signal that an update to the current pointer-over state may be required.
-        /// </remarks>
-        event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
-
-        /// <summary>
-        /// Mark a visual as dirty and needing re-rendering.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        void AddDirty(IVisual visual);
-
-        /// <summary>
-        /// Hit tests a location to find the visuals at the specified point.
-        /// </summary>
-        /// <param name="p">The point, in client coordinates.</param>
-        /// <param name="root">The root of the subtree to search.</param>
-        /// <param name="filter">
-        /// A filter predicate. If the predicate returns false then the visual and all its
-        /// children will be excluded from the results.
-        /// </param>
-        /// <returns>The visuals at the specified point, topmost first.</returns>
-        IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter);
-
-        /// <summary>
-        /// Hit tests a location to find first visual at the specified point.
-        /// </summary>
-        /// <param name="p">The point, in client coordinates.</param>
-        /// <param name="root">The root of the subtree to search.</param>
-        /// <param name="filter">
-        /// A filter predicate. If the predicate returns false then the visual and all its
-        /// children will be excluded from the results.
-        /// </param>
-        /// <returns>The visual at the specified point, topmost first.</returns>
-        IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter);
-
-        /// <summary>
-        /// Informs the renderer that the z-ordering of a visual's children has changed.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        void RecalculateChildren(IVisual visual);
-
-        /// <summary>
-        /// Called when a resize notification is received by the control being rendered.
-        /// </summary>
-        /// <param name="size">The new size of the window.</param>
-        void Resized(Size size);
-
-        /// <summary>
-        /// Called when a paint notification is received by the control being rendered.
-        /// </summary>
-        /// <param name="rect">The dirty rectangle.</param>
-        void Paint(Rect rect);
-
-        /// <summary>
-        /// Starts the renderer.
-        /// </summary>
-        void Start();
-
-        /// <summary>
-        /// Stops the renderer.
-        /// </summary>
-        void Stop();
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs b/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
deleted file mode 100644
index 00449c5344..0000000000
--- a/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Avalonia.Media;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Internal interface for initializing controls that are to be used as the visual in a
-    /// <see cref="VisualBrush"/>.
-    /// </summary>
-    public interface IVisualBrushInitialize
-    {
-        /// <summary>
-        /// Ensures that the control is ready to use as the visual in a visual brush.
-        /// </summary>
-        void EnsureInitialized();
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs b/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
deleted file mode 100644
index 1cd6515635..0000000000
--- a/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Avalonia.Media;
-using Avalonia.Platform;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Defines a renderer used to render a visual brush to a bitmap.
-    /// </summary>
-    public interface IVisualBrushRenderer
-    {
-        /// <summary>
-        /// Gets the size of the intermediate render target to which the visual brush should be
-        /// drawn.
-        /// </summary>
-        /// <param name="brush">The visual brush.</param>
-        /// <returns>The size of the intermediate render target to create.</returns>
-        Size GetRenderTargetSize(IVisualBrush brush);
-
-        /// <summary>
-        /// Renders a visual brush to a bitmap.
-        /// </summary>
-        /// <param name="context">The drawing context to render to.</param>
-        /// <param name="brush">The visual brush.</param>
-        /// <returns>A bitmap containing the rendered brush.</returns>
-        void RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
deleted file mode 100644
index 23016de148..0000000000
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Logging;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// A renderer which renders the state of the visual tree without an intermediate scene graph
-    /// representation.
-    /// </summary>
-    /// <remarks>
-    /// The immediate renderer supports only clip-bound-based hit testing; a control's geometry is
-    /// not taken into account.
-    /// </remarks>
-    public class ImmediateRenderer : RendererBase, IRenderer, IVisualBrushRenderer
-    {
-        private readonly IVisual _root;
-        private readonly IRenderRoot? _renderRoot;
-        private bool _updateTransformedBounds = true;
-        private IRenderTarget? _renderTarget;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmediateRenderer"/> class.
-        /// </summary>
-        /// <param name="root">The control to render.</param>
-        public ImmediateRenderer(IVisual root)
-        {
-            _root = root ?? throw new ArgumentNullException(nameof(root));
-            _renderRoot = root as IRenderRoot;
-        }
-
-        private ImmediateRenderer(IVisual root, bool updateTransformedBounds)
-        {
-            _root = root ?? throw new ArgumentNullException(nameof(root));
-            _renderRoot = root as IRenderRoot;
-            _updateTransformedBounds = updateTransformedBounds;
-        }
-
-        /// <inheritdoc/>
-        public bool DrawFps { get; set; }
-
-        /// <inheritdoc/>
-        public bool DrawDirtyRects { get; set; }
-
-        /// <inheritdoc/>
-        public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
-
-        /// <inheritdoc/>
-        public void Paint(Rect rect)
-        {
-            if (_renderTarget == null)
-            {
-                _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
-            }
-
-            try
-            {
-                using (var context = new DrawingContext(_renderTarget.CreateDrawingContext(this)))
-                {
-                    context.PlatformImpl.Clear(Colors.Transparent);
-
-                    using (context.PushTransformContainer())
-                    {
-                        Render(context, _root, _root.Bounds);
-                    }
-
-                    if (DrawDirtyRects)
-                    {
-                        var color = (uint)new Random().Next(0xffffff) | 0x44000000;
-                        context.FillRectangle(
-                            new SolidColorBrush(color),
-                            rect);
-                    }
-
-                    if (DrawFps)
-                    {
-                        RenderFps(context, _root.Bounds, null);
-                    }
-                }
-            }
-            catch (RenderTargetCorruptedException ex)
-            {
-                Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
-                _renderTarget.Dispose();
-                _renderTarget = null;
-            }
-
-            SceneInvalidated?.Invoke(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
-        }
-
-        /// <inheritdoc/>
-        public void Resized(Size size)
-        {
-        }
-
-        /// <summary>
-        /// Renders a visual to a render target.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="target">The render target.</param>
-        public static void Render(IVisual visual, IRenderTarget target)
-        {
-            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
-            using (var context = new DrawingContext(target.CreateDrawingContext(renderer)))
-            {
-                renderer.Render(context, visual, visual.Bounds);
-            }
-        }
-
-        /// <summary>
-        /// Renders a visual to a drawing context.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="context">The drawing context.</param>
-        public static void Render(IVisual visual, DrawingContext context)
-        {
-            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
-            {
-                renderer.Render(context, visual, visual.Bounds);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void AddDirty(IVisual visual)
-        {
-            if (visual.Bounds != Rect.Empty)
-            {
-                var m = visual.TransformToVisual(_root);
-
-                if (m.HasValue)
-                {
-                    var bounds = new Rect(visual.Bounds.Size).TransformToAABB(m.Value);
-
-                    //use transformedbounds as previous render state of the visual bounds
-                    //so we can invalidate old and new bounds of a control in case it moved/shrinked
-                    if (visual.TransformedBounds.HasValue)
-                    {
-                        var trb = visual.TransformedBounds.Value;
-                        var trBounds = trb.Bounds.TransformToAABB(trb.Transform);
-
-                        if (trBounds != bounds)
-                        {
-                            _renderRoot?.Invalidate(trBounds);
-                        }
-                    }
-
-                    _renderRoot?.Invalidate(bounds);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Ends the operation of the renderer.
-        /// </summary>
-        public void Dispose()
-        {
-            _renderTarget?.Dispose();
-        }
-
-        /// <inheritdoc/>
-        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
-        {
-            return HitTest(root, p, filter);
-        }
-
-        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter)
-        {
-            return HitTest(root, p, filter).FirstOrDefault();
-        }
-
-        /// <inheritdoc/>
-        public void RecalculateChildren(IVisual visual) => AddDirty(visual);
-
-        /// <inheritdoc/>
-        public void Start()
-        {
-        }
-
-        /// <inheritdoc/>
-        public void Stop()
-        {
-        }
-
-        /// <inheritdoc/>
-        Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
-        {
-            (brush.Visual as IVisualBrushInitialize)?.EnsureInitialized();
-            return brush.Visual?.Bounds.Size ?? Size.Empty;
-        }
-
-        /// <inheritdoc/>
-        void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
-        {
-            var visual = brush.Visual;
-            Render(new DrawingContext(context), visual, visual.Bounds);
-        }
-
-        internal static void Render(IVisual visual, DrawingContext context, bool updateTransformedBounds)
-        {
-            using var renderer = new ImmediateRenderer(visual, updateTransformedBounds);
-            renderer.Render(context, visual, visual.Bounds);
-        }
-
-        private static void ClearTransformedBounds(IVisual visual)
-        {
-            foreach (var e in visual.GetSelfAndVisualDescendants())
-            {
-                visual.TransformedBounds = null;
-            }
-        }
-
-        private static Rect GetTransformedBounds(IVisual visual)
-        {
-            if (visual.RenderTransform == null)
-            {
-                return visual.Bounds;
-            }
-            else
-            {
-                var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
-                var offset = Matrix.CreateTranslation(visual.Bounds.Position + origin);
-                var m = (-offset) * visual.RenderTransform.Value * (offset);
-                return visual.Bounds.TransformToAABB(m);
-            }
-        }
-
-        private static IEnumerable<IVisual> HitTest(
-           IVisual visual,
-           Point p,
-           Func<IVisual, bool>? filter)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            if (filter?.Invoke(visual) != false)
-            {
-                bool containsPoint;
-
-                if (visual is ICustomSimpleHitTest custom)
-                {
-                    containsPoint = custom.HitTest(p);
-                }
-                else
-                {
-                    containsPoint = visual.TransformedBounds?.Contains(p) == true;
-                }
-
-                if ((containsPoint || !visual.ClipToBounds) && visual.VisualChildren.Count > 0)
-                {
-                    foreach (var child in visual.VisualChildren.SortByZIndex())
-                    {
-                        foreach (var result in HitTest(child, p, filter))
-                        {
-                            yield return result;
-                        }
-                    }
-                }
-
-                if (containsPoint)
-                {
-                    yield return visual;
-                }
-            }
-        }
-
-        private void Render(DrawingContext context, IVisual visual, Rect clipRect)
-        {
-            var opacity = visual.Opacity;
-            var clipToBounds = visual.ClipToBounds;
-            var bounds = new Rect(visual.Bounds.Size);
-
-            if (visual.IsVisible && opacity > 0)
-            {
-                var m = Matrix.CreateTranslation(visual.Bounds.Position);
-
-                var renderTransform = Matrix.Identity;
-
-                if (visual.RenderTransform != null)
-                {
-                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
-                    var offset = Matrix.CreateTranslation(origin);
-                    renderTransform = (-offset) * visual.RenderTransform.Value * (offset);
-                }
-
-                m = renderTransform * m;
-
-                if (clipToBounds)
-                {
-                    if (visual.RenderTransform != null)
-                    {
-                        clipRect = new Rect(visual.Bounds.Size);
-                    }
-                    else
-                    {
-                        clipRect = clipRect.Intersect(new Rect(visual.Bounds.Size));
-                    }
-                }
-
-                using (context.PushPostTransform(m))
-                using (context.PushOpacity(opacity))
-                using (clipToBounds
-#pragma warning disable CS0618 // Type or member is obsolete
-                    ? visual is IVisualWithRoundRectClip roundClipVisual
-                        ? context.PushClip(new RoundedRect(bounds, roundClipVisual.ClipToBoundsRadius))
-                        : context.PushClip(bounds) 
-                    : default(DrawingContext.PushedState))
-#pragma warning restore CS0618 // Type or member is obsolete
-
-                using (visual.Clip != null ? context.PushGeometryClip(visual.Clip) : default(DrawingContext.PushedState))
-                using (visual.OpacityMask != null ? context.PushOpacityMask(visual.OpacityMask, bounds) : default(DrawingContext.PushedState))
-                using (context.PushTransformContainer())
-                {
-                    visual.Render(context);
-
-#pragma warning disable 0618
-                    var transformed =
-                        new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
-#pragma warning restore 0618
-
-                    if (_updateTransformedBounds)
-                        visual.TransformedBounds = transformed;
-
-                    foreach (var child in visual.VisualChildren.OrderBy(x => x, ZIndexComparer.Instance))
-                    {
-                        var childBounds = GetTransformedBounds(child);
-
-                        if (!child.ClipToBounds || clipRect.Intersects(childBounds))
-                        {
-                            var childClipRect = child.RenderTransform == null
-                                ? clipRect.Translate(-childBounds.Position)
-                                : clipRect;
-                            Render(context, child, childClipRect);
-                        }
-                        else if (_updateTransformedBounds)
-                        {
-                            ClearTransformedBounds(child);
-                        }
-                    }
-                }
-            }
-
-            if (!visual.IsVisible && _updateTransformedBounds)
-            {
-                ClearTransformedBounds(visual);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/RenderLoop.cs b/src/Avalonia.Visuals/Rendering/RenderLoop.cs
deleted file mode 100644
index a5d7e15f93..0000000000
--- a/src/Avalonia.Visuals/Rendering/RenderLoop.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Avalonia.Logging;
-using Avalonia.Threading;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// The application render loop.
-    /// </summary>
-    /// <remarks>
-    /// The render loop is responsible for advancing the animation timer and updating the scene
-    /// graph for visible windows.
-    /// </remarks>
-    public class RenderLoop : IRenderLoop
-    {
-        private readonly IDispatcher _dispatcher;
-        private List<IRenderLoopTask> _items = new List<IRenderLoopTask>();
-        private List<IRenderLoopTask> _itemsCopy = new List<IRenderLoopTask>();
-        private IRenderTimer? _timer;
-        private int _inTick;
-        private int _inUpdate;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RenderLoop"/> class.
-        /// </summary>
-        public RenderLoop()
-        {
-            _dispatcher = Dispatcher.UIThread;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RenderLoop"/> class.
-        /// </summary>
-        /// <param name="timer">The render timer.</param>
-        /// <param name="dispatcher">The UI thread dispatcher.</param>
-        public RenderLoop(IRenderTimer timer, IDispatcher dispatcher)
-        {
-            _timer = timer;
-            _dispatcher = dispatcher;
-        }
-
-        /// <summary>
-        /// Gets the render timer.
-        /// </summary>
-        protected IRenderTimer Timer
-        {
-            get
-            {
-                return _timer ??= AvaloniaLocator.Current.GetService<IRenderTimer>() ??
-                    throw new InvalidOperationException("Cannot locate IRenderTimer.");
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Add(IRenderLoopTask i)
-        {
-            _ = i ?? throw new ArgumentNullException(nameof(i));
-            Dispatcher.UIThread.VerifyAccess();
-
-            lock (_items)
-            {
-                _items.Add(i);
-
-                if (_items.Count == 1)
-                {
-                    Timer.Tick += TimerTick;
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Remove(IRenderLoopTask i)
-        {
-            _ = i ?? throw new ArgumentNullException(nameof(i));
-            Dispatcher.UIThread.VerifyAccess();
-            lock (_items)
-            {
-                _items.Remove(i);
-
-                if (_items.Count == 0)
-                {
-                    Timer.Tick -= TimerTick;
-                }
-            }
-        }
-
-        private void TimerTick(TimeSpan time)
-        {
-            if (Interlocked.CompareExchange(ref _inTick, 1, 0) == 0)
-            {
-                try
-                {
-                    bool needsUpdate = false;
-
-                    foreach (IRenderLoopTask item in _items)
-                    {
-                        if (item.NeedsUpdate)
-                        {
-                            needsUpdate = true;
-
-                            break;
-                        }
-                    }
-
-                    if (needsUpdate &&
-                        Interlocked.CompareExchange(ref _inUpdate, 1, 0) == 0)
-                    {
-                        _dispatcher.Post(() =>
-                        {
-                            for (var i = 0; i < _items.Count; ++i)
-                            {
-                                var item = _items[i];
-
-                                if (item.NeedsUpdate)
-                                {
-                                    try
-                                    {
-                                        item.Update(time);
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception in render update: {Error}", ex);
-                                    }
-                                }
-                            }
-
-                            Interlocked.Exchange(ref _inUpdate, 0);
-                        }, DispatcherPriority.Render);
-                    }
-
-                    lock (_items)
-                    {
-                        _itemsCopy.Clear();
-                        foreach (var i in _items)
-                            _itemsCopy.Add(i);
-                    }
-
-                    for (int i = 0; i < _itemsCopy.Count; i++)
-                    {
-                        _itemsCopy[i].Render();
-                    }
-                    
-                    _itemsCopy.Clear();
-
-                }
-                catch (Exception ex)
-                {
-                    Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception in render loop: {Error}", ex);
-                }
-                finally
-                {
-                    Interlocked.Exchange(ref _inTick, 0);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs
deleted file mode 100644
index 45b62b843b..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an bitmap blending mode push or pop.
-    /// </summary>
-    internal class BitmapBlendModeNode : IDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
-        /// <see cref="BitmapBlendingMode"/> push.
-        /// </summary>
-        /// <param name="bitmapBlend">The <see cref="BitmapBlendingMode"/> to push.</param>
-        public BitmapBlendModeNode(BitmapBlendingMode bitmapBlend)
-        {
-            BlendingMode = bitmapBlend;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
-        /// <see cref="BitmapBlendingMode"/> pop.
-        /// </summary>
-        public BitmapBlendModeNode()
-        {
-        }
-
-        /// <inheritdoc/>
-        public Rect Bounds => Rect.Empty;
-
-        /// <summary>
-        /// Gets the BitmapBlend to be pushed or null if the operation represents a pop.
-        /// </summary>
-        public BitmapBlendingMode? BlendingMode { get; }
-
-        /// <inheritdoc/>
-        public bool HitTest(Point p) => false;
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="blendingMode">the <see cref="BitmapBlendModeNode"/> how to compare</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(BitmapBlendingMode? blendingMode) => BlendingMode == blendingMode;
-
-        /// <inheritdoc/>
-        public void Render(IDrawingContextImpl context)
-        {
-            if (BlendingMode.HasValue)
-            {
-                context.PushBitmapBlendMode(BlendingMode.Value);
-            }
-            else
-            {
-                context.PopBitmapBlendMode();
-            }
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
deleted file mode 100644
index cd3dac699a..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// Base class for draw operations that can use a brush.
-    /// </summary>
-    internal abstract class BrushDrawOperation : DrawOperation
-    {
-        public BrushDrawOperation(Rect bounds, Matrix transform)
-            : base(bounds, transform)
-        {
-        }
-
-        /// <summary>
-        /// Gets a collection of child scenes that are needed to draw visual brushes.
-        /// </summary>
-        public abstract IDictionary<IVisual, Scene>? ChildScenes { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
deleted file mode 100644
index 9710ca6c3c..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A drawing context which builds a scene graph.
-    /// </summary>
-    internal class DeferredDrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
-    {
-        private readonly ISceneBuilder _sceneBuilder;
-        private VisualNode? _node;
-        private int _childIndex;
-        private int _drawOperationindex;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeferredDrawingContextImpl"/> class.
-        /// </summary>
-        /// <param name="sceneBuilder">
-        /// A scene builder used for constructing child scenes for visual brushes.
-        /// </param>
-        /// <param name="layers">The scene layers.</param>
-        public DeferredDrawingContextImpl(ISceneBuilder sceneBuilder, SceneLayers layers)
-        {
-            _sceneBuilder = sceneBuilder;
-            Layers = layers;
-        }
-
-        /// <inheritdoc/>
-        public Matrix Transform { get; set; } = Matrix.Identity;
-
-        /// <summary>
-        /// Gets the layers in the scene being built.
-        /// </summary>
-        public SceneLayers Layers { get; }
-
-        /// <summary>
-        /// Informs the drawing context of the visual node that is about to be rendered.
-        /// </summary>
-        /// <param name="node">The visual node.</param>
-        /// <returns>
-        /// An object which when disposed will commit the changes to visual node.
-        /// </returns>
-        public UpdateState BeginUpdate(VisualNode node)
-        {
-            _ = node ?? throw new ArgumentNullException(nameof(node));
-
-            if (_node != null)
-            {
-                if (_childIndex < _node.Children.Count)
-                {
-                    _node.ReplaceChild(_childIndex, node);
-                }
-                else
-                {
-                    _node.AddChild(node);
-                }
-
-                ++_childIndex;
-            }
-
-            var state = new UpdateState(this, _node, _childIndex, _drawOperationindex);
-            _node = node;
-            _childIndex = _drawOperationindex = 0;
-            return state;
-        }
-
-        /// <inheritdoc/>
-        public void Clear(Color color)
-        {
-            // Cannot clear a deferred scene.
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            // Nothing to do here since we allocate no unmanaged resources.
-        }
-
-        /// <summary>
-        /// Removes any remaining drawing operations from the visual node.
-        /// </summary>
-        /// <remarks>
-        /// Drawing operations are updated in place, overwriting existing drawing operations if
-        /// they are different. Once drawing has completed for the current visual node, it is
-        /// possible that there are stale drawing operations at the end of the list. This method
-        /// trims these stale drawing operations.
-        /// </remarks>
-        public void TrimChildren()
-        {
-            _node!.TrimChildren(_childIndex);
-        }
-
-        /// <inheritdoc/>
-        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
-        {
-            var next = NextDrawAs<GeometryNode>();
-
-            if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
-            {
-                Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            var next = NextDrawAs<ImageNode>();
-
-            if (next == null || !next.Item.Equals(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode))
-            {
-                Add(new ImageNode(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
-        {
-            // This method is currently only used to composite layers so shouldn't be called here.
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public void DrawLine(IPen pen, Point p1, Point p2)
-        {
-            var next = NextDrawAs<LineNode>();
-
-            if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
-            {
-                Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
-            BoxShadows boxShadows = default)
-        {
-            var next = NextDrawAs<RectangleNode>();
-
-            if (next == null || !next.Item.Equals(Transform, brush, pen, rect, boxShadows))
-            {
-                Add(new RectangleNode(Transform, brush, pen, rect, boxShadows, CreateChildScene(brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
-        {
-            var next = NextDrawAs<ExperimentalAcrylicNode>();
-
-            if (next == null || !next.Item.Equals(Transform, material, rect))
-            {
-                Add(new ExperimentalAcrylicNode(Transform, material, rect));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
-        {
-            var next = NextDrawAs<EllipseNode>();
-
-            if (next == null || !next.Item.Equals(Transform, brush, pen, rect))
-            {
-                Add(new EllipseNode(Transform, brush, pen, rect, CreateChildScene(brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        public void Custom(ICustomDrawOperation custom)
-        {
-            var next = NextDrawAs<CustomDrawOperation>();
-            if (next == null || !next.Item.Equals(Transform, custom))
-                Add(new CustomDrawOperation(custom, Transform));
-            else
-                ++_drawOperationindex;
-        }
-
-        /// <inheritdoc/>
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
-        {
-            var next = NextDrawAs<GlyphRunNode>();
-
-            if (next == null || !next.Item.Equals(Transform, foreground, glyphRun))
-            {
-                Add(new GlyphRunNode(Transform, foreground, glyphRun, CreateChildScene(foreground)));
-            }
-
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-        public IDrawingContextLayerImpl CreateLayer(Size size)
-        {
-            throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
-        }
-
-        /// <inheritdoc/>
-        public void PopClip()
-        {
-            var next = NextDrawAs<ClipNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new ClipNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PopGeometryClip()
-        {
-            var next = NextDrawAs<GeometryClipNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new GeometryClipNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PopBitmapBlendMode()
-        {
-            var next = NextDrawAs<BitmapBlendModeNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new BitmapBlendModeNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-        
-        /// <inheritdoc/>
-        public void PopOpacity()
-        {
-            var next = NextDrawAs<OpacityNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new OpacityNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PopOpacityMask()
-        {
-            var next = NextDrawAs<OpacityMaskNode>();
-
-            if (next == null || !next.Item.Equals(null, null))
-            {
-                Add(new OpacityMaskNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushClip(Rect clip)
-        {
-            var next = NextDrawAs<ClipNode>();
-
-            if (next == null || !next.Item.Equals(Transform, clip))
-            {
-                Add(new ClipNode(Transform, clip));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc />
-        public void PushClip(RoundedRect clip)
-        {
-            var next = NextDrawAs<ClipNode>();
-
-            if (next == null || !next.Item.Equals(Transform, clip))
-            {
-                Add(new ClipNode(Transform, clip));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushGeometryClip(IGeometryImpl? clip)
-        {
-            if (clip is null)
-                return;
-
-            var next = NextDrawAs<GeometryClipNode>();
-
-            if (next == null || !next.Item.Equals(Transform, clip))
-            {
-                Add(new GeometryClipNode(Transform, clip));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushOpacity(double opacity)
-        {
-            var next = NextDrawAs<OpacityNode>();
-
-            if (next == null || !next.Item.Equals(opacity))
-            {
-                Add(new OpacityNode(opacity));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushOpacityMask(IBrush mask, Rect bounds)
-        {
-            var next = NextDrawAs<OpacityMaskNode>();
-
-            if (next == null || !next.Item.Equals(mask, bounds))
-            {
-                Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
-        {
-            var next = NextDrawAs<BitmapBlendModeNode>();
-
-            if (next == null || !next.Item.Equals(blendingMode))
-            {
-                Add(new BitmapBlendModeNode(blendingMode));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-        
-        public readonly struct UpdateState : IDisposable
-        {
-            public UpdateState(
-                DeferredDrawingContextImpl owner,
-                VisualNode? node,
-                int childIndex,
-                int drawOperationIndex)
-            {
-                Owner = owner;
-                Node = node;
-                ChildIndex = childIndex;
-                DrawOperationIndex = drawOperationIndex;
-            }
-
-            public void Dispose()
-            {
-                Owner._node!.TrimDrawOperations(Owner._drawOperationindex);
-
-                var dirty = Owner.Layers.GetOrAdd(Owner._node.LayerRoot!).Dirty;
-
-                var drawOperations = Owner._node.DrawOperations;
-                var drawOperationsCount = drawOperations.Count;
-
-                for (var i = 0; i < drawOperationsCount; i++)
-                {
-                    dirty.Add(drawOperations[i].Item.Bounds);
-                }
-
-                Owner._node = Node;
-                Owner._childIndex = ChildIndex;
-                Owner._drawOperationindex = DrawOperationIndex;
-            }
-
-            public DeferredDrawingContextImpl Owner { get; }
-            public VisualNode? Node { get; }
-            public int ChildIndex { get; }
-            public int DrawOperationIndex { get; }
-        }
-
-        private void Add<T>(T node) where T : class, IDrawOperation
-        {
-            using (var refCounted = RefCountable.Create(node))
-            {
-                Add(refCounted);
-            }
-        }
-
-        private void Add(IRef<IDrawOperation> node)
-        {
-            if (_drawOperationindex < _node!.DrawOperations.Count)
-            {
-                _node.ReplaceDrawOperation(_drawOperationindex, node);
-            }
-            else
-            {
-                _node.AddDrawOperation(node);
-            }
-
-            ++_drawOperationindex;
-        }
-
-        private IRef<T>? NextDrawAs<T>() where T : class, IDrawOperation
-        {
-            return _drawOperationindex < _node!.DrawOperations.Count ? _node.DrawOperations[_drawOperationindex] as IRef<T> : null;
-        }
-
-        private IDictionary<IVisual, Scene>? CreateChildScene(IBrush? brush)
-        {
-            var visualBrush = brush as VisualBrush;
-
-            if (visualBrush != null)
-            {
-                var visual = visualBrush.Visual;
-
-                if (visual != null)
-                {
-                    (visual as IVisualBrushInitialize)?.EnsureInitialized();
-                    var scene = new Scene(visual);
-                    _sceneBuilder.UpdateAll(scene);
-                    return new Dictionary<IVisual, Scene> { { visualBrush.Visual, scene } };
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/EllipseNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/EllipseNode.cs
deleted file mode 100644
index 504256b932..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/EllipseNode.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an ellipse draw.
-    /// </summary>
-    internal class EllipseNode : BrushDrawOperation
-    {
-        public EllipseNode(
-            Matrix transform, 
-            IBrush? brush, 
-            IPen? pen, 
-            Rect rect, 
-            IDictionary<IVisual, Scene>? childScenes = null) 
-            : base(rect.Inflate(pen?.Thickness ?? 0), transform)
-        {
-            Transform = transform;
-            Brush = brush?.ToImmutable();
-            Pen = pen?.ToImmutable();
-            Rect = rect;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Gets the fill brush.
-        /// </summary>
-        public IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the stroke pen.
-        /// </summary>
-        public ImmutablePen? Pen { get; }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the rect of the ellipse to draw.
-        /// </summary>
-        public Rect Rect { get; }
-
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, Rect rect)
-        {
-            return transform == Transform &&
-                   Equals(brush, Brush) &&
-                   Equals(Pen, pen) &&
-                   rect.Equals(Rect);
-        }
-
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.DrawEllipse(Brush, Pen, Rect);
-        }
-
-        public override bool HitTest(Point p)
-        {
-            if (!Transform.TryInvert(out Matrix inverted))
-            {
-                return false;
-            }
-
-            p *= inverted;
-
-            var center = Rect.Center;
-
-            var strokeThickness = Pen?.Thickness ?? 0;
-
-            var rx = Rect.Width / 2 + strokeThickness / 2;
-            var ry = Rect.Height / 2 + strokeThickness / 2;
-
-            var dx = p.X - center.X;
-            var dy = p.Y - center.Y;
-
-            if (Math.Abs(dx) > rx || Math.Abs(dy) > ry)
-            {
-                return false;
-            }
-
-            if (Brush != null)
-            {
-                return Contains(rx, ry);
-            }
-            else if (strokeThickness > 0)
-            {
-                bool inStroke = Contains(rx, ry);
-
-                rx = Rect.Width / 2 - strokeThickness / 2;
-                ry = Rect.Height / 2 - strokeThickness / 2;
-
-                bool inInner = Contains(rx, ry);
-
-                return inStroke && !inInner;
-            }
-
-            bool Contains(double radiusX, double radiusY)
-            {
-                var rx2 = radiusX * radiusX;
-                var ry2 = radiusY * radiusY;
-
-                var distance = ry2 * dx * dx + rx2 * dy * dy;
-
-                return distance <= rx2 * ry2;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
deleted file mode 100644
index 59ebcf5109..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents a rectangle draw.
-    /// </summary>
-    internal class ExperimentalAcrylicNode : DrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RectangleNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="material"></param>        
-        /// <param name="rect">The rectangle to draw.</param>
-        public ExperimentalAcrylicNode(
-            Matrix transform,
-            IExperimentalAcrylicMaterial material,
-            RoundedRect rect)
-            : base(rect.Rect, transform)
-        {
-            Transform = transform;
-            Material = material.ToImmutable();
-            Rect = rect;
-        }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        public IExperimentalAcrylicMaterial Material { get; }        
-
-        /// <summary>
-        /// Gets the rectangle to draw.
-        /// </summary>
-        public RoundedRect Rect { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="material">The fill of the other draw operation.</param>
-        /// <param name="rect">The rectangle of the other draw operation.</param>        
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IExperimentalAcrylicMaterial material, RoundedRect rect)
-        {
-            return transform == Transform &&
-                   Equals(material, Material) &&
-                   rect.Equals(Rect);
-        }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-
-            if(context is IDrawingContextWithAcrylicLikeSupport idc)
-            {
-                idc.DrawRectangle(Material, Rect);
-            }
-            else
-            {
-                context.DrawRectangle(new ImmutableSolidColorBrush(Material.FallbackColor), null, Rect);
-            }            
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p)
-        {
-            // TODO: This doesn't respect CornerRadius yet.
-            if (Transform.HasInverse)
-            {
-                p *= Transform.Invert();
-
-                if (Material != null)
-                {
-                    var rect = Rect.Rect;
-                    return rect.Contains(p);
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
deleted file mode 100644
index 7de1035441..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents a geometry draw.
-    /// </summary>
-    internal class GeometryNode : BrushDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GeometryNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
-        public GeometryNode(Matrix transform,
-            IBrush? brush,
-            IPen? pen,
-            IGeometryImpl geometry,
-            IDictionary<IVisual, Scene>? childScenes = null)
-            : base(geometry.GetRenderBounds(pen), transform)
-        {
-            Transform = transform;
-            Brush = brush?.ToImmutable();
-            Pen = pen?.ToImmutable();
-            Geometry = geometry;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the fill brush.
-        /// </summary>
-        public IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the stroke pen.
-        /// </summary>
-        public ImmutablePen? Pen { get; }
-
-        /// <summary>
-        /// Gets the geometry to draw.
-        /// </summary>
-        public IGeometryImpl Geometry { get; }
-
-        /// <inheritdoc/>
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="brush">The fill of the other draw operation.</param>
-        /// <param name="pen">The stroke of the other draw operation.</param>
-        /// <param name="geometry">The geometry of the other draw operation.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, IGeometryImpl geometry)
-        {
-            return transform == Transform &&
-                   Equals(brush, Brush) &&
-                   Equals(Pen, pen) &&
-                   Equals(geometry, Geometry);
-        }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-            context.DrawGeometry(Brush, Pen, Geometry);
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p)
-        {
-            if (Transform.HasInverse)
-            {
-                p *= Transform.Invert();
-                return (Brush != null && Geometry.FillContains(p)) ||
-                    (Pen != null && Geometry.StrokeContains(Pen, p));
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
deleted file mode 100644
index d6da087120..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents a glyph run draw.
-    /// </summary>
-    internal class GlyphRunNode : BrushDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GlyphRunNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="foreground">The foreground brush.</param>
-        /// <param name="glyphRun">The glyph run to draw.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
-        public GlyphRunNode(
-            Matrix transform,
-            IBrush foreground,
-            GlyphRun glyphRun,
-            IDictionary<IVisual, Scene>? childScenes = null)
-            : base(new Rect(glyphRun.Size), transform)
-        {
-            Transform = transform;
-            Foreground = foreground.ToImmutable();
-            GlyphRun = glyphRun;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the foreground brush.
-        /// </summary>
-        public IBrush Foreground { get; }
-
-        /// <summary>
-        /// Gets the glyph run to draw.
-        /// </summary>
-        public GlyphRun GlyphRun { get; }
-
-        /// <inheritdoc/>
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-            context.DrawGlyphRun(Foreground, GlyphRun);
-        }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="foreground">The foreground of the other draw operation.</param>
-        /// <param name="glyphRun">The glyph run of the other draw operation.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        internal bool Equals(Matrix transform, IBrush foreground, GlyphRun glyphRun)
-        {
-            return transform == Transform &&
-                   Equals(foreground, Foreground) &&
-                   Equals(glyphRun, GlyphRun);
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p) => Bounds.Contains(p);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
deleted file mode 100644
index d3da19d8c9..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an image draw.
-    /// </summary>
-    internal class ImageNode : DrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="source">The image to draw.</param>
-        /// <param name="opacity">The draw opacity.</param>
-        /// <param name="sourceRect">The source rect.</param>
-        /// <param name="destRect">The destination rect.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        public ImageNode(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-            : base(destRect, transform)
-        {
-            Transform = transform;
-            Source = source.Clone();
-            Opacity = opacity;
-            SourceRect = sourceRect;
-            DestRect = destRect;
-            BitmapInterpolationMode = bitmapInterpolationMode;
-            SourceVersion = Source.Item.Version;
-        }        
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the image to draw.
-        /// </summary>
-        public IRef<IBitmapImpl> Source { get; }
-
-        /// <summary>
-        /// Source bitmap Version
-        /// </summary>
-        public int SourceVersion { get; }
-
-        /// <summary>
-        /// Gets the draw opacity.
-        /// </summary>
-        public double Opacity { get; }
-
-        /// <summary>
-        /// Gets the source rect.
-        /// </summary>
-        public Rect SourceRect { get; }
-
-        /// <summary>
-        /// Gets the destination rect.
-        /// </summary>
-        public Rect DestRect { get; }
-
-        /// <summary>
-        /// Gets the bitmap interpolation mode.
-        /// </summary>
-        /// <value>
-        /// The scaling mode.
-        /// </value>
-        public BitmapInterpolationMode BitmapInterpolationMode { get; }
-        
-        /// <summary>
-        /// The bitmap blending mode.
-        /// </summary>
-        /// <value>
-        /// The blending mode.
-        /// </value>
-        public BitmapBlendingMode BitmapBlendingMode { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="source">The image of the other draw operation.</param>
-        /// <param name="opacity">The opacity of the other draw operation.</param>
-        /// <param name="sourceRect">The source rect of the other draw operation.</param>
-        /// <param name="destRect">The dest rect of the other draw operation.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            return transform == Transform &&
-                   Equals(source.Item, Source.Item) &&
-                   source.Item.Version == SourceVersion &&
-                   opacity == Opacity &&
-                   sourceRect == SourceRect &&
-                   destRect == DestRect &&
-                   bitmapInterpolationMode == BitmapInterpolationMode;
-        }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-            context.DrawBitmap(Source, Opacity, SourceRect, DestRect, BitmapInterpolationMode);
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p) => Bounds.Contains(p);
-
-        public override void Dispose()
-        {
-            Source?.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
deleted file mode 100644
index a9e1ce8ed7..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents a line draw.
-    /// </summary>
-    internal class LineNode : BrushDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GeometryNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="p1">The start point of the line.</param>
-        /// <param name="p2">The end point of the line.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
-        public LineNode(
-            Matrix transform,
-            IPen pen,
-            Point p1,
-            Point p2,
-            IDictionary<IVisual, Scene>? childScenes = null)
-            : base(LineBoundsHelper.CalculateBounds(p1, p2, pen), transform)
-        {
-            Transform = transform;
-            Pen = pen.ToImmutable();
-            P1 = p1;
-            P2 = p2;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the stroke pen.
-        /// </summary>
-        public ImmutablePen Pen { get; }
-
-        /// <summary>
-        /// Gets the start point of the line.
-        /// </summary>
-        public Point P1 { get; }
-
-        /// <summary>
-        /// Gets the end point of the line.
-        /// </summary>
-        public Point P2 { get; }
-
-        /// <inheritdoc/>
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="pen">The stroke of the other draw operation.</param>
-        /// <param name="p1">The start point of the other draw operation.</param>
-        /// <param name="p2">The end point of the other draw operation.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IPen pen, Point p1, Point p2)
-        {
-            return transform == Transform && Equals(Pen, pen) && p1 == P1 && p2 == P2;
-        }
-
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-            context.DrawLine(Pen, P1, P2);
-        }
-
-        public override bool HitTest(Point p)
-        {
-            if (!Transform.HasInverse)
-                return false;
-
-            p *= Transform.Invert();
-
-            var halfThickness = Pen.Thickness / 2;
-            var minX = Math.Min(P1.X, P2.X) - halfThickness;
-            var maxX = Math.Max(P1.X, P2.X) + halfThickness;
-            var minY = Math.Min(P1.Y, P2.Y) - halfThickness;
-            var maxY = Math.Max(P1.Y, P2.Y) + halfThickness;
-
-            if (p.X < minX || p.X > maxX || p.Y < minY || p.Y > maxY)
-                return false;
-
-            var a = P1;
-            var b = P2;
-
-            //If dot1 or dot2 is negative, then the angle between the perpendicular and the segment is obtuse.
-            //The distance from a point to a straight line is defined as the
-            //length of the vector formed by the point and the closest point of the segment
-
-            Vector ap = p - a;
-            var dot1 = Vector.Dot(b - a, ap);
-
-            if (dot1 < 0)
-                return ap.Length <= Pen.Thickness / 2;
-
-            Vector bp = p - b;
-            var dot2 = Vector.Dot(a - b, bp);
-
-            if (dot2 < 0)
-                return bp.Length <= halfThickness;
-
-            var bXaX = b.X - a.X;
-            var bYaY = b.Y - a.Y;
-
-            var distance = (bXaX * (p.Y - a.Y) - bYaY * (p.X - a.X)) /
-                           (Math.Sqrt(bXaX * bXaX + bYaY * bYaY));
-
-            return Math.Abs(distance) <= halfThickness;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
deleted file mode 100644
index 4b6e7d2254..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an opacity mask push or pop.
-    /// </summary>
-    internal class OpacityMaskNode : BrushDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpacityMaskNode"/> class that represents an
-        /// opacity mask push.
-        /// </summary>
-        /// <param name="mask">The opacity mask to push.</param>
-        /// <param name="bounds">The bounds of the mask.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
-        public OpacityMaskNode(IBrush mask, Rect bounds, IDictionary<IVisual, Scene>? childScenes = null)
-            : base(Rect.Empty, Matrix.Identity)
-        {
-            Mask = mask.ToImmutable();
-            MaskBounds = bounds;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpacityMaskNode"/> class that represents an
-        /// opacity mask pop.
-        /// </summary>
-        public OpacityMaskNode()
-            : base(Rect.Empty, Matrix.Identity)
-        {
-        }
-
-        /// <summary>
-        /// Gets the mask to be pushed or null if the operation represents a pop.
-        /// </summary>
-        public IBrush? Mask { get; }
-
-        /// <summary>
-        /// Gets the bounds of the opacity mask or null if the operation represents a pop.
-        /// </summary>
-        public Rect? MaskBounds { get; }
-
-        /// <inheritdoc/>
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p) => false;
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="mask">The opacity mask of the other draw operation.</param>
-        /// <param name="bounds">The opacity mask bounds of the other draw operation.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(IBrush? mask, Rect? bounds) => Mask == mask && MaskBounds == bounds;
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            if (Mask != null)
-            {
-                context.PushOpacityMask(Mask, MaskBounds!.Value);
-            }
-            else
-            {
-                context.PopOpacityMask();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
deleted file mode 100644
index 3279c3a549..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents a rectangle draw.
-    /// </summary>
-    internal class RectangleNode : BrushDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RectangleNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="rect">The rectangle to draw.</param>
-        /// <param name="boxShadows">The box shadow parameters</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
-        public RectangleNode(
-            Matrix transform,
-            IBrush? brush,
-            IPen? pen,
-            RoundedRect rect,
-            BoxShadows boxShadows,
-            IDictionary<IVisual, Scene>? childScenes = null)
-            : base(boxShadows.TransformBounds(rect.Rect).Inflate((pen?.Thickness ?? 0) / 2), transform)
-        {
-            Transform = transform;
-            Brush = brush?.ToImmutable();
-            Pen = pen?.ToImmutable();
-            Rect = rect;
-            ChildScenes = childScenes;
-            BoxShadows = boxShadows;
-        }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the fill brush.
-        /// </summary>
-        public IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the stroke pen.
-        /// </summary>
-        public ImmutablePen? Pen { get; }
-
-        /// <summary>
-        /// Gets the rectangle to draw.
-        /// </summary>
-        public RoundedRect Rect { get; }
-        
-        /// <summary>
-        /// The parameters for the box-shadow effect
-        /// </summary>
-        public BoxShadows BoxShadows { get; }
-
-        /// <inheritdoc/>
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="brush">The fill of the other draw operation.</param>
-        /// <param name="pen">The stroke of the other draw operation.</param>
-        /// <param name="rect">The rectangle of the other draw operation.</param>
-        /// <param name="boxShadows">The box shadow parameters of the other draw operation</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, RoundedRect rect, BoxShadows boxShadows)
-        {
-            return transform == Transform &&
-                   Equals(brush, Brush) &&
-                   Equals(Pen, pen) &&
-                   BoxShadows.Equals(boxShadows) &&
-                   rect.Equals(Rect);
-        }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-
-            context.DrawRectangle(Brush, Pen, Rect, BoxShadows);
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p)
-        {
-            // TODO: This doesn't respect CornerRadius yet.
-            if (Transform.HasInverse)
-            {
-                p *= Transform.Invert();
-
-                if (Brush != null)
-                {
-                    var rect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
-                    return rect.Contains(p);
-                }
-                else
-                {
-                    var borderRect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
-                    var emptyRect = Rect.Rect.Deflate((Pen?.Thickness / 2) ?? 0);
-                    return borderRect.Contains(p) && !emptyRect.Contains(p);
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
deleted file mode 100644
index 20c23d7bee..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Collections.Pooled;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// Represents a scene graph used by the <see cref="DeferredRenderer"/>.
-    /// </summary>
-    public class Scene : IDisposable
-    {
-        private readonly Dictionary<IVisual, IVisualNode> _index;
-        private readonly TaskCompletionSource<bool> _rendered = new TaskCompletionSource<bool>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scene"/> class.
-        /// </summary>
-        /// <param name="rootVisual">The root visual to draw.</param>
-        public Scene(IVisual rootVisual)
-            : this(
-                new VisualNode(rootVisual, null),
-                new Dictionary<IVisual, IVisualNode>(),
-                new SceneLayers(rootVisual),
-                0)
-        {
-            _index.Add(rootVisual, Root);
-        }
-
-        private Scene(VisualNode root, Dictionary<IVisual, IVisualNode> index, SceneLayers layers, int generation)
-        {
-            _ = root ?? throw new ArgumentNullException(nameof(root));
-
-            var renderRoot = root.Visual as IRenderRoot;
-
-            _index = index;
-            Root = root;
-            Layers = layers;
-            Generation = generation;
-            root.LayerRoot = root.Visual;
-        }
-
-        public Task Rendered => _rendered.Task;
-
-        /// <summary>
-        /// Gets a value identifying the scene's generation. This is incremented each time the scene is cloned.
-        /// </summary>
-        public int Generation { get; }
-
-        /// <summary>
-        /// Gets the layers for the scene.
-        /// </summary>
-        public SceneLayers Layers { get; }
-
-        /// <summary>
-        /// Gets the root node of the scene graph.
-        /// </summary>
-        public IVisualNode Root { get; }
-
-        /// <summary>
-        /// Gets or sets the size of the scene in device independent pixels.
-        /// </summary>
-        public Size Size { get; set; }
-
-        /// <summary>
-        /// Gets or sets the scene scaling.
-        /// </summary>
-        public double Scaling { get; set; } = 1;
-
-        /// <summary>
-        /// Adds a node to the scene index.
-        /// </summary>
-        /// <param name="node">The node.</param>
-        public void Add(IVisualNode node)
-        {
-            _ = node ?? throw new ArgumentNullException(nameof(node));
-
-            _index.Add(node.Visual, node);
-        }
-
-        /// <summary>
-        /// Clones the scene.
-        /// </summary>
-        /// <returns>The cloned scene.</returns>
-        public Scene CloneScene()
-        {
-            var index = new Dictionary<IVisual, IVisualNode>(_index.Count);
-            var root = Clone((VisualNode)Root, null, index);
-
-            var result = new Scene(root, index, Layers.Clone(), Generation + 1)
-            {
-                Size = Size,
-                Scaling = Scaling,
-            };
-
-            return result;
-        }
-
-        public void Dispose()
-        {
-            _rendered.TrySetResult(false);
-            foreach (var node in _index.Values)
-            {
-                node.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Tries to find a node in the scene graph representing the specified visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>
-        /// The node representing the visual or null if it could not be found.
-        /// </returns>
-        public IVisualNode? FindNode(IVisual visual)
-        {
-            _index.TryGetValue(visual, out var node);
-            return node;
-        }
-
-        /// <summary>
-        /// Gets the visuals at a point in the scene.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        /// <param name="root">The root of the subtree to search.</param>
-        /// <param name="filter">A filter. May be null.</param>
-        /// <returns>The visuals at the specified point.</returns>
-        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool>? filter)
-        {
-            var node = FindNode(root);
-            return (node != null) ? new HitTestEnumerable(node, filter, p, Root) : Enumerable.Empty<IVisual>();
-        }
-
-        /// <summary>
-        /// Gets the visual at a point in the scene.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        /// <param name="root">The root of the subtree to search.</param>
-        /// <param name="filter">A filter. May be null.</param>
-        /// <returns>The visual at the specified point.</returns>
-        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool>? filter)
-        {
-            var node = FindNode(root);
-            return (node != null) ? HitTestFirst(node, p, filter) : null;
-        }
-
-        /// <summary>
-        /// Removes a node from the scene index.
-        /// </summary>
-        /// <param name="node">The node.</param>
-        public void Remove(IVisualNode node)
-        {
-            _ = node ?? throw new ArgumentNullException(nameof(node));
-
-            _index.Remove(node.Visual);
-
-            node.Dispose();
-        }
-
-        private VisualNode Clone(VisualNode source, IVisualNode? parent, Dictionary<IVisual, IVisualNode> index)
-        {
-            var result = source.Clone(parent);
-
-            index.Add(result.Visual, result);
-
-            var children = source.Children;
-            var childrenCount = children.Count;
-
-            if (childrenCount > 0)
-            {
-                result.TryPreallocateChildren(childrenCount);
-
-                for (var i = 0; i < childrenCount; i++)
-                {
-                    var child = children[i];
-
-                    result.AddChild(Clone((VisualNode)child, result, index));
-                }
-            }
-
-            return result;
-        }
-
-        private IVisual HitTestFirst(IVisualNode root, Point p, Func<IVisual, bool>? filter)
-        {
-            using var enumerator = new HitTestEnumerator(root, filter, p, Root);
-
-            enumerator.MoveNext();
-
-            return enumerator.Current;
-        }
-
-        private class HitTestEnumerable : IEnumerable<IVisual>
-        {
-            private readonly IVisualNode _root;
-            private readonly Func<IVisual, bool>? _filter;
-            private readonly IVisualNode _sceneRoot;
-            private readonly Point _point;
-            
-            public HitTestEnumerable(IVisualNode root, Func<IVisual, bool>? filter, Point point, IVisualNode sceneRoot)
-            {
-                _root = root;
-                _filter = filter;
-                _point = point;
-                _sceneRoot = sceneRoot;
-            }
-
-            public IEnumerator<IVisual> GetEnumerator()
-            {
-                return new HitTestEnumerator(_root, _filter, _point, _sceneRoot);
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-        }
-
-        private struct HitTestEnumerator : IEnumerator<IVisual>
-        {
-            private readonly PooledStack<Entry> _nodeStack;
-            private readonly Func<IVisual, bool>? _filter;
-            private readonly IVisualNode _sceneRoot;
-            private IVisual? _current;
-            private readonly Point _point;
-
-            public HitTestEnumerator(IVisualNode root, Func<IVisual, bool>? filter, Point point, IVisualNode sceneRoot)
-            {
-                _nodeStack = new PooledStack<Entry>();
-                _nodeStack.Push(new Entry(root, false, null, true));
-
-                _filter = filter;
-                _point = point;
-                _sceneRoot = sceneRoot;
-
-                _current = null;
-            }
-
-            public bool MoveNext()
-            {
-                while (_nodeStack.Count > 0)
-                {
-                    (var wasVisited, var isRoot, IVisualNode node, Rect? clip) = _nodeStack.Pop();
-
-                    if (wasVisited && isRoot)
-                    {
-                        break;
-                    }
-
-                    var children = node.Children;
-                    int childCount = children.Count;
-
-                    if (childCount == 0 || wasVisited)
-                    {
-                        if ((wasVisited || FilterAndClip(node, ref clip)) &&
-                            (node.Visual is ICustomHitTest custom ? custom.HitTest(_point) : node.HitTest(_point)))
-                        {
-                            _current = node.Visual;
-
-                            return true;
-                        }
-                    }
-                    else if (FilterAndClip(node, ref clip))
-                    {
-                        _nodeStack.Push(new Entry(node, true, null));
-
-                        for (var i = 0; i < childCount; i++)
-                        {
-                            _nodeStack.Push(new Entry(children[i], false, clip));
-                        }
-                    }
-                }
-
-                return false;
-            }
-
-            public void Reset()
-            {
-                throw new NotSupportedException();
-            }
-
-            public IVisual Current => _current!;
-
-            object IEnumerator.Current => Current;
-
-            public void Dispose()
-            {
-                _nodeStack.Dispose();
-            }
-
-            private bool FilterAndClip(IVisualNode node, ref Rect? clip)
-            {
-                if (_filter?.Invoke(node.Visual) != false && node.Visual.IsAttachedToVisualTree)
-                {
-                    var clipped = false;
-
-                    if (node.ClipToBounds)
-                    {
-                        clip = clip == null ? node.ClipBounds : clip.Value.Intersect(node.ClipBounds);
-                        clipped = !clip.Value.Contains(_point);
-                    }
-
-                    if (node.GeometryClip != null)
-                    {
-                        var controlPoint = _sceneRoot.Visual.TranslatePoint(_point, node.Visual);
-                        clipped = !node.GeometryClip.FillContains(controlPoint!.Value);
-                    }
-
-                    if (!clipped && node.Visual is ICustomHitTest custom)
-                    {
-                        clipped = !custom.HitTest(_point);
-                    }
-
-                    return !clipped;
-                }
-
-                return false;
-            }
-
-            private readonly struct Entry
-            {
-                public readonly bool WasVisited;
-                public readonly bool IsRoot;
-                public readonly IVisualNode Node;
-                public readonly Rect? Clip;
-
-                public Entry(IVisualNode node, bool wasVisited, Rect? clip, bool isRoot = false)
-                {
-                    Node = node;
-                    WasVisited = wasVisited;
-                    IsRoot = isRoot;
-                    Clip = clip;
-                }
-
-                public void Deconstruct(out bool wasVisited, out bool isRoot, out IVisualNode node, out Rect? clip)
-                {
-                    wasVisited = WasVisited;
-                    isRoot = IsRoot;
-                    node = Node;
-                    clip = Clip;
-                }
-            }
-        }
-
-        public void MarkAsRendered() => _rendered.TrySetResult(true);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
deleted file mode 100644
index 63c22efc3f..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ /dev/null
@@ -1,466 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// Builds a scene graph from a visual tree.
-    /// </summary>
-    public class SceneBuilder : ISceneBuilder
-    {
-        /// <inheritdoc/>
-        public void UpdateAll(Scene scene)
-        {
-            _ = scene ?? throw new ArgumentNullException(nameof(scene));
-            Dispatcher.UIThread.VerifyAccess();
-
-            UpdateSize(scene);
-            scene.Layers.GetOrAdd(scene.Root.Visual);
-
-            using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
-            using (var context = new DrawingContext(impl))
-            {
-                var clip = new Rect(scene.Root.Visual.Bounds.Size);
-                Update(context, scene, (VisualNode)scene.Root, clip, true);
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool Update(Scene scene, IVisual visual)
-        {
-            _ = scene ?? throw new ArgumentNullException(nameof(scene));
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (!scene.Root.Visual.IsVisible)
-            {
-                throw new AvaloniaInternalException("Cannot update the scene for an invisible root visual.");
-            }
-
-            var node = (VisualNode?)scene.FindNode(visual);
-
-            if (visual == scene.Root.Visual)
-            {
-                UpdateSize(scene);
-            }
-
-            if (visual.VisualRoot == scene.Root.Visual)
-            {
-                if (node?.Parent != null &&
-                    visual.VisualParent != null &&
-                    node.Parent.Visual != visual.VisualParent)
-                {
-                    // The control has changed parents. Remove the node and recurse into the new parent node.
-                    ((VisualNode)node.Parent).RemoveChild(node);
-                    Deindex(scene, node);
-                    node = (VisualNode?)scene.FindNode(visual.VisualParent);
-                }
-
-                if (visual.IsVisible)
-                {
-                    // If the node isn't yet part of the scene, find the nearest ancestor that is.
-                    node = node ?? FindExistingAncestor(scene, visual);
-
-                    // We don't need to do anything if this part of the tree has already been fully
-                    // updated.
-                    if (node != null && !node.SubTreeUpdated)
-                    {
-                        // If the control we've been asked to update isn't part of the scene then
-                        // we're carrying out an add operation, so recurse and add all the
-                        // descendents too.
-                        var recurse = node.Visual != visual;
-
-                        using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
-                        using (var context = new DrawingContext(impl))
-                        {
-                            var clip = new Rect(scene.Root.Visual.Bounds.Size);
-
-                            if (node.Parent != null)
-                            {
-                                context.PushPostTransform(node.Parent.Transform);
-                                clip = node.Parent.ClipBounds;
-                            }
-
-                            using (context.PushTransformContainer())
-                            {
-                                Update(context, scene, node, clip, recurse);
-                            }
-                        }
-
-                        return true;
-                    }
-                }
-                else
-                {
-                    if (node != null)
-                    {
-                        // The control has been hidden so remove it from its parent and deindex the
-                        // node and its descendents.
-                        ((VisualNode?)node.Parent)?.RemoveChild(node);
-                        Deindex(scene, node);
-                        return true;
-                    }
-                }
-            }
-            else if (node != null)
-            {
-                // The control has been removed so remove it from its parent and deindex the
-                // node and its descendents.
-                var trim = FindFirstDeadAncestor(scene, node);
-                ((VisualNode)trim.Parent!).RemoveChild(trim);
-                Deindex(scene, trim);
-                return true;
-            }
-
-            return false;
-        }
-
-        private static VisualNode? FindExistingAncestor(Scene scene, IVisual visual)
-        {
-            var node = scene.FindNode(visual);
-
-            while (node == null && visual.IsVisible)
-            {
-                var parent = visual.VisualParent;
-
-                if (parent is null)
-                    return null;
-
-                visual = parent;
-                node = scene.FindNode(visual);
-            }
-
-            return visual.IsVisible ? (VisualNode?)node : null;
-        }
-
-        private static VisualNode FindFirstDeadAncestor(Scene scene, IVisualNode node)
-        {
-            var parent = node.Parent;
-
-            while (parent!.Visual.VisualRoot == null)
-            {
-                node = parent;
-                parent = node.Parent;
-            }
-
-            return (VisualNode)node;
-        }
-
-        private static object GetOrCreateChildNode(Scene scene, IVisual child, VisualNode parent)
-        {
-            var result = (VisualNode?)scene.FindNode(child);
-
-            if (result != null && result.Parent != parent)
-            {
-                Deindex(scene, result);
-                result = null;
-            }
-
-            return result ?? CreateNode(scene, child, parent);
-        }
-
-        private static void Update(DrawingContext context, Scene scene, VisualNode node, Rect clip, bool forceRecurse)
-        {
-            var visual = node.Visual;
-            var opacity = visual.Opacity;
-            var clipToBounds = visual.ClipToBounds;
-#pragma warning disable CS0618 // Type or member is obsolete
-            var clipToBoundsRadius = visual is IVisualWithRoundRectClip roundRectClip ?
-                roundRectClip.ClipToBoundsRadius :
-                default;
-#pragma warning restore CS0618 // Type or member is obsolete
-
-            var bounds = new Rect(visual.Bounds.Size);
-            var contextImpl = (DeferredDrawingContextImpl)context.PlatformImpl;
-
-            contextImpl.Layers.Find(node.LayerRoot!)?.Dirty.Add(node.Bounds);
-
-            if (visual.IsVisible)
-            {
-                var m = node != scene.Root ? 
-                    Matrix.CreateTranslation(visual.Bounds.Position) :
-                    Matrix.Identity;
-
-                var renderTransform = Matrix.Identity;
-
-                if (visual.RenderTransform != null)
-                {
-                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
-                    var offset = Matrix.CreateTranslation(origin);
-                    renderTransform = (-offset) * visual.RenderTransform.Value * (offset);
-                }
-
-                m = renderTransform * m;
-
-                using (contextImpl.BeginUpdate(node))
-                using (context.PushPostTransform(m))
-                using (context.PushTransformContainer())
-                {
-                    var globalBounds = bounds.TransformToAABB(contextImpl.Transform);
-                    var clipBounds = clipToBounds ?
-                        globalBounds.Intersect(clip) :
-                        clip;
-
-                    forceRecurse = forceRecurse ||
-                        node.ClipBounds != clipBounds ||
-                        node.Opacity != opacity ||
-                        node.Transform != contextImpl.Transform;
-
-                    node.Transform = contextImpl.Transform;
-                    node.ClipBounds = clipBounds;
-                    node.ClipToBounds = clipToBounds;
-                    node.LayoutBounds = globalBounds;
-                    node.ClipToBoundsRadius = clipToBoundsRadius;
-                    node.GeometryClip = visual.Clip?.PlatformImpl;
-                    node.Opacity = opacity;
-
-                    // TODO: Check equality between node.OpacityMask and visual.OpacityMask before assigning.
-                    node.OpacityMask = visual.OpacityMask?.ToImmutable();
-
-                    if (ShouldStartLayer(visual))
-                    {
-                        if (node.LayerRoot != visual)
-                        {
-                            MakeLayer(scene, node);
-                        }
-                        else
-                        {
-                            UpdateLayer(node, scene.Layers[node.LayerRoot]);
-                        }
-                    }
-                    else if (node.LayerRoot == node.Visual && node.Parent != null)
-                    {
-                        ClearLayer(scene, node);
-                    }
-
-                    if (node.ClipToBounds)
-                    {
-                        clip = clip.Intersect(node.ClipBounds);
-                    }
-
-                    try
-                    {
-                        visual.Render(context);
-                    }
-                    catch { }
-
-                    var transformed = new TransformedBounds(new Rect(visual.Bounds.Size), clip, node.Transform);
-                    visual.TransformedBounds = transformed;
-
-                    if (forceRecurse)
-                    {
-                        var visualChildren = (IList<IVisual>) visual.VisualChildren;
-
-                        node.TryPreallocateChildren(visualChildren.Count);
-
-                        if (visualChildren.Count == 1)
-                        {
-                            var childNode = GetOrCreateChildNode(scene, visualChildren[0], node);
-                            Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
-                        }
-                        else if (visualChildren.Count > 1)
-                        {
-                            var count = visualChildren.Count;
-                            var sortedChildren = new (IVisual visual, int index)[count];
-
-                            for (var i = 0; i < count; i++)
-                            {
-                                sortedChildren[i] = (visualChildren[i], i);
-                            }
-
-                            // Regular Array.Sort is unstable, we need to provide indices as well to avoid reshuffling elements.
-                            Array.Sort(sortedChildren, (lhs, rhs) =>
-                            {
-                                var result = ZIndexComparer.Instance.Compare(lhs.visual, rhs.visual);
-
-                                return result == 0 ? lhs.index.CompareTo(rhs.index) : result;
-                            });
-
-                            foreach (var child in sortedChildren)
-                            {
-                                var childNode = GetOrCreateChildNode(scene, child.Item1, node);
-                                Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
-                            }
-                        }
-
-                        node.SubTreeUpdated = true;
-                        contextImpl.TrimChildren();
-                    }
-                }
-            }
-            else
-            {
-                contextImpl.BeginUpdate(node).Dispose();
-            }
-        }
-
-        private void UpdateSize(Scene scene)
-        {
-            var renderRoot = scene.Root.Visual as IRenderRoot;
-            var newSize = renderRoot?.ClientSize ?? scene.Root.Visual.Bounds.Size;
-
-            scene.Scaling = renderRoot?.RenderScaling ?? 1;
-
-            if (scene.Size != newSize)
-            {
-                var oldSize = scene.Size;
-
-                scene.Size = newSize;
-
-                Rect horizontalDirtyRect = Rect.Empty;
-                Rect verticalDirtyRect = Rect.Empty;
-
-                if (newSize.Width > oldSize.Width)
-                {
-                    horizontalDirtyRect = new Rect(oldSize.Width, 0, newSize.Width - oldSize.Width, oldSize.Height);
-                }
-
-                if (newSize.Height > oldSize.Height)
-                {
-                    verticalDirtyRect = new Rect(0, oldSize.Height, newSize.Width, newSize.Height - oldSize.Height);
-                }
-
-                foreach (var layer in scene.Layers)
-                {
-                    layer.Dirty.Add(horizontalDirtyRect);
-                    layer.Dirty.Add(verticalDirtyRect);
-                }
-            }
-        }
-
-        private static VisualNode CreateNode(Scene scene, IVisual visual, VisualNode parent)
-        {
-            var node = new VisualNode(visual, parent);
-            node.LayerRoot = parent.LayerRoot;
-            scene.Add(node);
-            return node;
-        }
-
-        private static void Deindex(Scene scene, VisualNode node)
-        {
-            var nodeChildren = node.Children;
-            var nodeChildrenCount = nodeChildren.Count;
-
-            for (var i = 0; i < nodeChildrenCount; i++)
-            {
-                if (nodeChildren[i] is VisualNode visual)
-                {
-                    Deindex(scene, visual);
-                }
-            }
-
-            scene.Remove(node);
-
-            node.SubTreeUpdated = true;
-
-            scene.Layers[node.LayerRoot!].Dirty.Add(node.Bounds);
-
-            node.Visual.TransformedBounds = null;
-
-            if (node.LayerRoot == node.Visual && node.Visual != scene.Root.Visual)
-            {
-                scene.Layers.Remove(node.LayerRoot);
-            }
-        }
-
-        private static void ClearLayer(Scene scene, VisualNode node)
-        {
-            var parent = (VisualNode)node.Parent!;
-            var oldLayerRoot = node.LayerRoot;
-            var newLayerRoot = parent.LayerRoot!;
-            var existingDirtyRects = scene.Layers[node.LayerRoot!].Dirty;
-            var newDirtyRects = scene.Layers[newLayerRoot].Dirty;
-
-            existingDirtyRects.Coalesce();
-
-            foreach (var r in existingDirtyRects)
-            {
-                newDirtyRects.Add(r);
-            }
-
-            var oldLayer = scene.Layers[oldLayerRoot!];
-            PropagateLayer(node, scene.Layers[newLayerRoot], oldLayer);
-            scene.Layers.Remove(oldLayer);
-        }
-
-        private static void MakeLayer(Scene scene, VisualNode node)
-        {
-            var oldLayerRoot = node.LayerRoot!;
-            var layer = scene.Layers.Add(node.Visual);
-            var oldLayer = scene.Layers[oldLayerRoot!];
-
-            UpdateLayer(node, layer);
-            PropagateLayer(node, layer, scene.Layers[oldLayerRoot]);
-        }
-
-        private static void UpdateLayer(VisualNode node, SceneLayer layer)
-        {
-            layer.Opacity = node.Visual.Opacity;
-
-            if (node.Visual.OpacityMask != null)
-            {
-                layer.OpacityMask = node.Visual.OpacityMask?.ToImmutable();
-                layer.OpacityMaskRect = node.ClipBounds;
-            }
-            else
-            {
-                layer.OpacityMask = null;
-                layer.OpacityMaskRect = Rect.Empty;
-            }
-
-            layer.GeometryClip = node.HasAncestorGeometryClip ?
-                CreateLayerGeometryClip(node) :
-                null;
-        }
-
-        private static void PropagateLayer(VisualNode node, SceneLayer layer, SceneLayer oldLayer)
-        {
-            node.LayerRoot = layer.LayerRoot;
-
-            layer.Dirty.Add(node.Bounds);
-            oldLayer.Dirty.Add(node.Bounds);
-
-            foreach (VisualNode child in node.Children)
-            {
-                // If the child is not the start of a new layer, recurse.
-                if (child.LayerRoot != child.Visual)
-                {
-                    PropagateLayer(child, layer, oldLayer);
-                }
-            }
-        }
-
-        // HACK: Disabled layers because they're broken in current renderer. See #2244.
-        private static bool ShouldStartLayer(IVisual visual) => false;
-
-        private static IGeometryImpl? CreateLayerGeometryClip(VisualNode node)
-        {
-            IGeometryImpl? result = null;
-            VisualNode? n = node;
-
-            for (;;)
-            {
-                n = (VisualNode?)n!.Parent;
-
-                if (n == null || (n.GeometryClip == null && !n.HasAncestorGeometryClip))
-                {
-                    break;
-                }
-
-                if (n?.GeometryClip != null)
-                {
-                    var transformed = n.GeometryClip.WithTransform(n.Transform);
-
-                    result = result == null ? transformed : result.Intersect(transformed);
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs b/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs
deleted file mode 100644
index cac4d1693a..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Provides data for the <see cref="IRenderer.SceneInvalidated"/> event.
-    /// </summary>
-    public class SceneInvalidatedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SceneInvalidatedEventArgs"/> class.
-        /// </summary>
-        /// <param name="root">The render root that has been updated.</param>
-        /// <param name="dirtyRect">The updated area.</param>
-        public SceneInvalidatedEventArgs(
-            IRenderRoot root,
-            Rect dirtyRect)
-        {
-            RenderRoot = root;
-            DirtyRect = dirtyRect;
-        }
-
-        /// <summary>
-        /// Gets the invalidated area.
-        /// </summary>
-        public Rect DirtyRect { get; }
-
-        /// <summary>
-        /// Gets the render root that has been invalidated.
-        /// </summary>
-        public IRenderRoot RenderRoot { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs b/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs
deleted file mode 100644
index 86595754e9..0000000000
--- a/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-
-namespace Avalonia.Rendering
-{
-    public class SleepLoopRenderTimer : IRenderTimer
-    {
-        private Action<TimeSpan>? _tick;
-        private int _count;
-        private readonly object _lock = new object();
-        private bool _running;
-        private readonly Stopwatch _st = Stopwatch.StartNew();
-        private readonly TimeSpan _timeBetweenTicks;
-
-        public SleepLoopRenderTimer(int fps)
-        {
-            _timeBetweenTicks = TimeSpan.FromSeconds(1d / fps);
-        }
-        
-        public event Action<TimeSpan> Tick
-        {
-            add
-            {
-                lock (_lock)
-                {
-                    _tick += value;
-                    _count++;
-                    if (_running)
-                        return;
-                    _running = true;
-                    new Thread(LoopProc) { IsBackground = true }.Start();
-                }
-
-            }
-            remove
-            {
-                lock (_lock)
-                {
-                    _tick -= value;
-                    _count--;
-                }
-            }
-        }
-
-        void LoopProc()
-        {
-            var lastTick = _st.Elapsed;
-            while (true)
-            {
-                var now = _st.Elapsed;
-                var timeTillNextTick = lastTick + _timeBetweenTicks - now;
-                if (timeTillNextTick.TotalMilliseconds > 1) Thread.Sleep(timeTillNextTick);
-                lastTick = now;
-                lock (_lock)
-                {
-                    if (_count == 0)
-                    {
-                        _running = false;
-                        return;
-                    }
-                }
-
-                _tick?.Invoke(now);
-                
-            }
-        }
-
-
-    }
-}
diff --git a/src/Avalonia.Visuals/Size.cs b/src/Avalonia.Visuals/Size.cs
deleted file mode 100644
index 69c3ae7319..0000000000
--- a/src/Avalonia.Visuals/Size.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-using System;
-using System.Globalization;
-#if !BUILDTASK
-using Avalonia.Animation.Animators;
-#endif
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines a size.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Size : IEquatable<Size>
-    {
-        static Size()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<SizeAnimator>(prop => typeof(Size).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
-        /// <summary>
-        /// A size representing infinity.
-        /// </summary>
-        public static readonly Size Infinity = new Size(double.PositiveInfinity, double.PositiveInfinity);
-
-        /// <summary>
-        /// A size representing zero
-        /// </summary>
-        public static readonly Size Empty = new Size(0, 0);
-
-        /// <summary>
-        /// The width.
-        /// </summary>
-        private readonly double _width;
-
-        /// <summary>
-        /// The height.
-        /// </summary>
-        private readonly double _height;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Size"/> structure.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public Size(double width, double height)
-        {
-            _width = width;
-            _height = height;
-        }
-
-        /// <summary>
-        /// Gets the aspect ratio of the size.
-        /// </summary>
-        public double AspectRatio => _width / _height;
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public double Width => _width;
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public double Height => _height;
-
-        /// <summary>
-        /// Checks for equality between two <see cref="Size"/>s.
-        /// </summary>
-        /// <param name="left">The first size.</param>
-        /// <param name="right">The second size.</param>
-        /// <returns>True if the sizes are equal; otherwise false.</returns>
-        public static bool operator ==(Size left, Size right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="Size"/>s.
-        /// </summary>
-        /// <param name="left">The first size.</param>
-        /// <param name="right">The second size.</param>
-        /// <returns>True if the sizes are unequal; otherwise false.</returns>
-        public static bool operator !=(Size left, Size right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Scales a size.
-        /// </summary>
-        /// <param name="size">The size</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The scaled size.</returns>
-        public static Size operator *(Size size, Vector scale)
-        {
-            return new Size(size._width * scale.X, size._height * scale.Y);
-        }
-
-        /// <summary>
-        /// Scales a size.
-        /// </summary>
-        /// <param name="size">The size</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The scaled size.</returns>
-        public static Size operator /(Size size, Vector scale)
-        {
-            return new Size(size._width / scale.X, size._height / scale.Y);
-        }
-
-        /// <summary>
-        /// Divides a size by another size to produce a scaling factor.
-        /// </summary>
-        /// <param name="left">The first size</param>
-        /// <param name="right">The second size.</param>
-        /// <returns>The scaled size.</returns>
-        public static Vector operator /(Size left, Size right)
-        {
-            return new Vector(left._width / right._width, left._height / right._height);
-        }
-
-        /// <summary>
-        /// Scales a size.
-        /// </summary>
-        /// <param name="size">The size</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The scaled size.</returns>
-        public static Size operator *(Size size, double scale)
-        {
-            return new Size(size._width * scale, size._height * scale);
-        }
-
-        /// <summary>
-        /// Scales a size.
-        /// </summary>
-        /// <param name="size">The size</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The scaled size.</returns>
-        public static Size operator /(Size size, double scale)
-        {
-            return new Size(size._width / scale, size._height / scale);
-        }
-
-        public static Size operator +(Size size, Size toAdd)
-        {
-            return new Size(size._width + toAdd._width, size._height + toAdd._height);
-        }
-
-        public static Size operator -(Size size, Size toSubtract)
-        {
-            return new Size(size._width - toSubtract._width, size._height - toSubtract._height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Size"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="Size"/>.</returns>
-        public static Size Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Size."))
-            {
-                return new Size(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble());
-            }
-        }
-
-        /// <summary>
-        /// Constrains the size.
-        /// </summary>
-        /// <param name="constraint">The size to constrain to.</param>
-        /// <returns>The constrained size.</returns>
-        public Size Constrain(Size constraint)
-        {
-            return new Size(
-                Math.Min(_width, constraint._width),
-                Math.Min(_height, constraint._height));
-        }
-
-        /// <summary>
-        /// Deflates the size by a <see cref="Thickness"/>.
-        /// </summary>
-        /// <param name="thickness">The thickness.</param>
-        /// <returns>The deflated size.</returns>
-        /// <remarks>The deflated size cannot be less than 0.</remarks>
-        public Size Deflate(Thickness thickness)
-        {
-            return new Size(
-                Math.Max(0, _width - thickness.Left - thickness.Right),
-                Math.Max(0, _height - thickness.Top - thickness.Bottom));
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the size is equal to the other given size (bitwise).
-        /// </summary>
-        /// <param name="other">The other size to test equality against.</param>
-        /// <returns>True if this size is equal to other; False otherwise.</returns>
-        public bool Equals(Size other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _width == other._width &&
-                   _height == other._height;
-            // ReSharper enable CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the size is equal to the other given size (numerically).
-        /// </summary>
-        /// <param name="other">The other size to test equality against.</param>
-        /// <returns>True if this size is equal to other; False otherwise.</returns>
-        public bool NearlyEquals(Size other)
-        {
-            return MathUtilities.AreClose(_width, other._width) && 
-                   MathUtilities.AreClose(_height, other._height);
-        }
-
-        /// <summary>
-        /// Checks for equality between a size and an object.
-        /// </summary>
-        /// <param name="obj">The object.</param>
-        /// <returns>
-        /// True if <paramref name="obj"/> is a size that equals the current size.
-        /// </returns>
-        public override bool Equals(object? obj) => obj is Size other && Equals(other);
-
-        /// <summary>
-        /// Returns a hash code for a <see cref="Size"/>.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + Width.GetHashCode();
-                hash = (hash * 23) + Height.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Inflates the size by a <see cref="Thickness"/>.
-        /// </summary>
-        /// <param name="thickness">The thickness.</param>
-        /// <returns>The inflated size.</returns>
-        public Size Inflate(Thickness thickness)
-        {
-            return new Size(
-                _width + thickness.Left + thickness.Right,
-                _height + thickness.Top + thickness.Bottom);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Size"/> with the same height and the specified width.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <returns>The new <see cref="Size"/>.</returns>
-        public Size WithWidth(double width)
-        {
-            return new Size(width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Size"/> with the same width and the specified height.
-        /// </summary>
-        /// <param name="height">The height.</param>
-        /// <returns>The new <see cref="Size"/>.</returns>
-        public Size WithHeight(double height)
-        {
-            return new Size(_width, height);
-        }
-
-        /// <summary>
-        /// Returns the string representation of the size.
-        /// </summary>
-        /// <returns>The string representation of the size.</returns>
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _width, _height);
-        }
-
-        /// <summary>
-        /// Deconstructs the size into its Width and Height values.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public void Deconstruct(out double width, out double height)
-        {
-            width = this._width;
-            height = this._height;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the Width and Height values are zero.
-        /// </summary>
-        public bool IsDefault
-        {
-            get { return (_width == 0) && (_height == 0); }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Utilities/ArrayBuilder.cs b/src/Avalonia.Visuals/Utilities/ArrayBuilder.cs
deleted file mode 100644
index 7048659431..0000000000
--- a/src/Avalonia.Visuals/Utilities/ArrayBuilder.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-// Ported from: https://github.com/SixLabors/Fonts/
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// A helper type for avoiding allocations while building arrays.
-    /// </summary>
-    /// <typeparam name="T">The type of item contained in the array.</typeparam>
-    internal struct ArrayBuilder<T>
-        where T : struct
-    {
-        private const int DefaultCapacity = 4;
-        private const int MaxCoreClrArrayLength = 0x7FeFFFFF;
-
-        // Starts out null, initialized on first Add.
-        private T[] _data;
-        private int _size;
-
-        /// <summary>
-        /// Gets or sets the number of items in the array.
-        /// </summary>
-        public int Length
-        {
-            get => _size;
-
-            set
-            {
-                if (value == _size)
-                {
-                    return;
-                }
-
-                if (value > 0)
-                {
-                    EnsureCapacity(value);
-
-                    _size = value;
-                }
-                else
-                {
-                    _size = 0;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns a reference to specified element of the array.
-        /// </summary>
-        /// <param name="index">The index of the element to return.</param>
-        /// <returns>The <typeparamref name="T"/>.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when index less than 0 or index greater than or equal to <see cref="Length"/>.
-        /// </exception>
-        public ref T this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if DEBUG
-                if (index.CompareTo(0) < 0 || index.CompareTo(_size) > 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-#endif
-
-                return ref _data![index];
-            }
-        }
-
-        /// <summary>
-        /// Appends a given number of empty items to the array returning
-        /// the items as a slice.
-        /// </summary>
-        /// <param name="length">The number of items in the slice.</param>
-        /// <param name="clear">Whether to clear the new slice, Defaults to <see langword="true"/>.</param>
-        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
-        public ArraySlice<T> Add(int length, bool clear = true)
-        {
-            var position = _size;
-
-            // Expand the array.
-            Length += length;
-
-            var slice = AsSlice(position, Length - position);
-
-            if (clear)
-            {
-                slice.Span.Clear();
-            }
-
-            return slice;
-        }
-
-        /// <summary>
-        /// Appends the slice to the array copying the data across.
-        /// </summary>
-        /// <param name="value">The array slice.</param>
-        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
-        public ArraySlice<T> Add(in ReadOnlySlice<T> value)
-        {
-            var position = _size;
-
-            // Expand the array.
-            Length += value.Length;
-
-            var slice = AsSlice(position, Length - position);
-
-            value.Span.CopyTo(slice.Span);
-
-            return slice;
-        }
-
-        /// <summary>
-        /// Clears the array.
-        /// Allocated memory is left intact for future usage.
-        /// </summary>
-        public void Clear()
-        {
-            // No need to actually clear since we're not allowing reference types.
-            _size = 0;
-        }
-
-        private void EnsureCapacity(int min)
-        {
-            var length = _data?.Length ?? 0;
-
-            if (length >= min)
-            {
-                return;
-            }
-
-            // Same expansion algorithm as List<T>.
-            var newCapacity = length == 0 ? DefaultCapacity : (uint)length * 2u;
-
-            if (newCapacity > MaxCoreClrArrayLength)
-            {
-                newCapacity = MaxCoreClrArrayLength;
-            }
-
-            if (newCapacity < min)
-            {
-                newCapacity = (uint)min;
-            }
-
-            var array = new T[newCapacity];
-
-            if (_size > 0)
-            {
-                Array.Copy(_data!, array, _size);
-            }
-
-            _data = array;
-        }
-
-        /// <summary>
-        /// Returns the current state of the array as a slice.
-        /// </summary>
-        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ArraySlice<T> AsSlice() => AsSlice(Length);
-
-        /// <summary>
-        /// Returns the current state of the array as a slice.
-        /// </summary>
-        /// <param name="length">The number of items in the slice.</param>
-        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ArraySlice<T> AsSlice(int length) => new ArraySlice<T>(_data!, 0, length);
-
-        /// <summary>
-        /// Returns the current state of the array as a slice.
-        /// </summary>
-        /// <param name="start">The index at which to begin the slice.</param>
-        /// <param name="length">The number of items in the slice.</param>
-        /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ArraySlice<T> AsSlice(int start, int length) => new ArraySlice<T>(_data!, start, length);
-    }
-}
diff --git a/src/Avalonia.Visuals/Utilities/ArraySlice.cs b/src/Avalonia.Visuals/Utilities/ArraySlice.cs
deleted file mode 100644
index f5a9d3a98d..0000000000
--- a/src/Avalonia.Visuals/Utilities/ArraySlice.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-// Ported from: https://github.com/SixLabors/Fonts/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// ArraySlice represents a contiguous region of arbitrary memory similar
-    /// to <see cref="Memory{T}"/> and <see cref="Span{T}"/> though constrained
-    /// to arrays.
-    /// Unlike <see cref="Span{T}"/>, it is not a byref-like type.
-    /// </summary>
-    /// <typeparam name="T">The type of item contained in the slice.</typeparam>
-    internal readonly struct ArraySlice<T> : IReadOnlyList<T>
-        where T : struct
-    {
-        /// <summary>
-        /// Gets an empty <see cref="ArraySlice{T}"/>
-        /// </summary>
-        public static ArraySlice<T> Empty => new ArraySlice<T>(Array.Empty<T>());
-
-        private readonly T[] _data;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArraySlice{T}"/> struct.
-        /// </summary>
-        /// <param name="data">The underlying data buffer.</param>
-        public ArraySlice(T[] data)
-            : this(data, 0, data.Length)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArraySlice{T}"/> struct.
-        /// </summary>
-        /// <param name="data">The underlying data buffer.</param>
-        /// <param name="start">The offset position in the underlying buffer this slice was created from.</param>
-        /// <param name="length">The number of items in the slice.</param>
-        public ArraySlice(T[] data, int start, int length)
-        {
-#if DEBUG
-            if (start.CompareTo(0) < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(start));
-            }
-
-            if (length.CompareTo(data.Length) > 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length));
-            }
-
-            if ((start + length).CompareTo(data.Length) > 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(data));
-            }
-#endif
-
-            _data = data;
-            Start = start;
-            Length = length;
-        }
-
-
-        /// <summary>
-        ///     Gets a value that indicates whether this instance of <see cref="ArraySlice{T}"/> is Empty.
-        /// </summary>
-        public bool IsEmpty => Length == 0;
-
-        /// <summary>
-        /// Gets the offset position in the underlying buffer this slice was created from.
-        /// </summary>
-        public int Start { get; }
-
-        /// <summary>
-        /// Gets the number of items in the slice.
-        /// </summary>
-        public int Length { get; }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> representing this slice.
-        /// </summary>
-        public Span<T> Span => new Span<T>(_data, Start, Length);
-
-        /// <summary>
-        /// Returns a reference to specified element of the slice.
-        /// </summary>
-        /// <param name="index">The index of the element to return.</param>
-        /// <returns>The <typeparamref name="T"/>.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when index less than 0 or index greater than or equal to <see cref="Length"/>.
-        /// </exception>
-        public ref T this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if DEBUG
-                if (index.CompareTo(0) < 0 || index.CompareTo(Length) > 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-#endif
-                var i = index + Start;
-
-                return ref _data[i];
-            }
-        }
-
-        /// <summary>
-        /// Defines an implicit conversion of a <see cref="ArraySlice{T}"/> to a <see cref="ReadOnlySlice{T}"/>
-        /// </summary>
-        public static implicit operator ReadOnlySlice<T>(ArraySlice<T> slice)
-        {
-            return new ReadOnlySlice<T>(slice._data).AsSlice(slice.Start, slice.Length);
-        }
-
-        /// <summary>
-        /// Defines an implicit conversion of an array to a <see cref="ArraySlice{T}"/>
-        /// </summary>
-        public static implicit operator ArraySlice<T>(T[] array) => new ArraySlice<T>(array, 0, array.Length);
-
-        /// <summary>
-        /// Fills the contents of this slice with the given value.
-        /// </summary>
-        public void Fill(T value) => Span.Fill(value);
-
-        /// <summary>
-        /// Forms a slice out of the given slice, beginning at 'start', of given length
-        /// </summary>
-        /// <param name="start">The index at which to begin this slice.</param>
-        /// <param name="length">The desired length for the slice (exclusive).</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when the specified <paramref name="start"/> or end index is not in range (&lt;0 or &gt;Length).
-        /// </exception>
-        public ArraySlice<T> Slice(int start, int length) => new ArraySlice<T>(_data, start, length);
-
-        /// <summary>
-        ///     Returns a specified number of contiguous elements from the start of the slice.
-        /// </summary>
-        /// <param name="length">The number of elements to return.</param>
-        /// <returns>A <see cref="ArraySlice{T}"/> that contains the specified number of elements from the start of this slice.</returns>
-        public ArraySlice<T> Take(int length)
-        {
-            if (IsEmpty)
-            {
-                return this;
-            }
-
-            if (length > Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length));
-            }
-
-            return new ArraySlice<T>(_data, Start, length);
-        }
-
-        /// <summary>
-        ///     Bypasses a specified number of elements in the slice and then returns the remaining elements.
-        /// </summary>
-        /// <param name="length">The number of elements to skip before returning the remaining elements.</param>
-        /// <returns>A <see cref="ArraySlice{T}"/> that contains the elements that occur after the specified index in this slice.</returns>
-        public ArraySlice<T> Skip(int length)
-        {
-            if (IsEmpty)
-            {
-                return this;
-            }
-
-            if (length > Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length));
-            }
-
-            return new ArraySlice<T>(_data, Start + length, Length - length);
-        }
-
-        public ImmutableReadOnlyListStructEnumerator<T> GetEnumerator() =>
-            new ImmutableReadOnlyListStructEnumerator<T>(this);
-
-        /// <inheritdoc/>
-        IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        /// <inheritdoc/>
-        T IReadOnlyList<T>.this[int index] => this[index];
-
-        /// <inheritdoc/>
-        int IReadOnlyCollection<T>.Count => Length;
-    }
-}
diff --git a/src/Avalonia.Visuals/Utilities/BinarySearchExtension.cs b/src/Avalonia.Visuals/Utilities/BinarySearchExtension.cs
deleted file mode 100644
index a4f6ae89c1..0000000000
--- a/src/Avalonia.Visuals/Utilities/BinarySearchExtension.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// RichTextKit
-// Copyright © 2019-2020 Topten Software. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may 
-// not use this product except in compliance with the License. You may obtain 
-// a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
-// License for the specific language governing permissions and limitations 
-// under the License.
-// Copied from: https://github.com/toptensoftware/RichTextKit
-
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// Extension methods for binary searching an IReadOnlyList collection
-    /// </summary>
-    internal static class BinarySearchExtension
-    {
-        private static int GetMedian(int low, int hi)
-        {
-            System.Diagnostics.Debug.Assert(low <= hi);
-            System.Diagnostics.Debug.Assert(hi - low >= 0, "Length overflow!");
-            return low + (hi - low >> 1);
-        }
-
-        /// <summary>
-        /// Performs a binary search on the entire contents of an IReadOnlyList
-        /// </summary>
-        /// <typeparam name="T">The list element type</typeparam>
-        /// <param name="list">The list to be searched</param>
-        /// <param name="value">The value to search for</param>
-        /// <param name="comparer">The comparer</param>
-        /// <returns>The index of the found item; otherwise the bitwise complement of the index of the next larger item</returns>
-        public static int BinarySearch<T>(this IReadOnlyList<T> list, T value, IComparer<T> comparer) where T : IComparable
-        {
-            return list.BinarySearch(0, list.Count, value, comparer);
-        }
-
-        /// <summary>
-        /// Performs a binary search on a a subset of an IReadOnlyList
-        /// </summary>
-        /// <typeparam name="T">The list element type</typeparam>
-        /// <param name="list">The list to be searched</param>
-        /// <param name="index">The start of the range to be searched</param>
-        /// <param name="length">The length of the range to be searched</param>
-        /// <param name="value">The value to search for</param>
-        /// <param name="comparer">A comparer</param>
-        /// <returns>The index of the found item; otherwise the bitwise complement of the index of the next larger item</returns>
-        public static int BinarySearch<T>(this IReadOnlyList<T> list, int index, int length, T value, IComparer<T> comparer)
-        {
-            // Based on this: https://referencesource.microsoft.com/#mscorlib/system/array.cs,957
-            var lo = index;
-            var hi = index + length - 1;
-            while (lo <= hi)
-            {
-                var i = GetMedian(lo, hi);
-                var c = comparer.Compare(list[i], value);
-                if (c == 0)
-                    return i;
-                if (c < 0)
-                {
-                    lo = i + 1;
-                }
-                else
-                {
-                    hi = i - 1;
-                }
-            }
-            return ~lo;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs b/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs
deleted file mode 100644
index ee85d1e876..0000000000
--- a/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    ///     ReadOnlySlice enables the ability to work with a sequence within a region of memory and retains the position in within that region.
-    /// </summary>
-    /// <typeparam name="T">The type of elements in the slice.</typeparam>
-    [DebuggerTypeProxy(typeof(ReadOnlySlice<>.ReadOnlySliceDebugView))]
-    public readonly struct ReadOnlySlice<T> : IReadOnlyList<T> where T : struct
-    {
-        private readonly int _offset;
-        
-        /// <summary>
-        /// Gets an empty <see cref="ReadOnlySlice{T}"/>
-        /// </summary>
-        public static ReadOnlySlice<T> Empty => new ReadOnlySlice<T>(Array.Empty<T>());
-        
-        private readonly ReadOnlyMemory<T> _buffer;
-
-        public ReadOnlySlice(ReadOnlyMemory<T> buffer) : this(buffer, 0, buffer.Length) { }
-
-        public ReadOnlySlice(ReadOnlyMemory<T> buffer, int start, int length, int offset = 0)
-        {
-#if DEBUG
-            if (start.CompareTo(0) < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof (start));
-            }
-
-            if (length.CompareTo(buffer.Length) > 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof (length));
-            }
-#endif
-            
-            _buffer = buffer;
-            Start = start;
-            Length = length;
-            _offset = offset;
-        }
-
-        /// <summary>
-        ///     Gets the start.
-        /// </summary>
-        /// <value>
-        ///     The start.
-        /// </value>
-        public int Start { get; }
-
-        /// <summary>
-        ///     Gets the end.
-        /// </summary>
-        /// <value>
-        ///     The end.
-        /// </value>
-        public int End => Start + Length - 1;
-
-        /// <summary>
-        ///     Gets the length.
-        /// </summary>
-        /// <value>
-        ///     The length.
-        /// </value>
-        public int Length { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates whether this instance of <see cref="ReadOnlySlice{T}"/> is Empty.
-        /// </summary>
-        public bool IsEmpty => Length == 0;
-
-        /// <summary>
-        ///     The underlying span.
-        /// </summary>
-        public ReadOnlySpan<T> Span => _buffer.Span.Slice(_offset, Length);
-
-        /// <summary>
-        ///     The underlying buffer.
-        /// </summary>
-        public ReadOnlyMemory<T> Buffer => _buffer;
-
-        /// <summary>
-        /// Returns a value to specified element of the slice.
-        /// </summary>
-        /// <param name="index">The index of the element to return.</param>
-        /// <returns>The <typeparamref name="T"/>.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when index less than 0 or index greater than or equal to <see cref="Length"/>.
-        /// </exception>
-        public T this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if DEBUG
-                if (index.CompareTo(0) < 0 || index.CompareTo(Length) > 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof (index));
-                }
-#endif
-                return Span[index];
-            }
-        }
-        
-        /// <summary>
-        ///     Returns a sub slice of elements that start at the specified index and has the specified number of elements.
-        /// </summary>
-        /// <param name="start">The start of the sub slice.</param>
-        /// <param name="length">The length of the sub slice.</param>
-        /// <returns>A <see cref="ReadOnlySlice{T}"/> that contains the specified number of elements from the specified start.</returns>
-        public ReadOnlySlice<T> AsSlice(int start, int length)
-        {
-            if (IsEmpty)
-            {
-                return this;
-            }
-
-            if (length == 0)
-            {
-                return Empty;
-            }
-
-            if (start < 0 || _offset + start > _buffer.Length - 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(start));
-            }
-
-            if (_offset + start + length > _buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length));
-            }
-
-            return new ReadOnlySlice<T>(_buffer, start, length, _offset);
-        }
-
-        /// <summary>
-        ///     Returns a specified number of contiguous elements from the start of the slice.
-        /// </summary>
-        /// <param name="length">The number of elements to return.</param>
-        /// <returns>A <see cref="ReadOnlySlice{T}"/> that contains the specified number of elements from the start of this slice.</returns>
-        public ReadOnlySlice<T> Take(int length)
-        {
-            if (IsEmpty)
-            {
-                return this;
-            }
-
-            if (length > Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length));
-            }
-
-            return new ReadOnlySlice<T>(_buffer, Start, length, _offset);
-        }
-
-        /// <summary>
-        ///     Bypasses a specified number of elements in the slice and then returns the remaining elements.
-        /// </summary>
-        /// <param name="length">The number of elements to skip before returning the remaining elements.</param>
-        /// <returns>A <see cref="ReadOnlySlice{T}"/> that contains the elements that occur after the specified index in this slice.</returns>
-        public ReadOnlySlice<T> Skip(int length)
-        {
-            if (IsEmpty)
-            {
-                return this;
-            }
-
-            if (length > Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length));
-            }
-
-            return new ReadOnlySlice<T>(_buffer, Start + length, Length - length, _offset + length);
-        }
-
-        /// <summary>
-        /// Returns an enumerator for the slice.
-        /// </summary>
-        public ImmutableReadOnlyListStructEnumerator<T> GetEnumerator()
-        {
-            return new ImmutableReadOnlyListStructEnumerator<T>(this);
-        }
-
-        IEnumerator<T> IEnumerable<T>.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        int IReadOnlyCollection<T>.Count => Length;
-
-        T IReadOnlyList<T>.this[int index] => this[index];
-
-        public static implicit operator ReadOnlySlice<T>(T[] array)
-        {
-            return new ReadOnlySlice<T>(array);
-        }
-
-        public static implicit operator ReadOnlySlice<T>(ReadOnlyMemory<T> memory)
-        {
-            return new ReadOnlySlice<T>(memory);
-        }
-
-        internal class ReadOnlySliceDebugView
-        {
-            private readonly ReadOnlySlice<T> _readOnlySlice;
-
-            public ReadOnlySliceDebugView(ReadOnlySlice<T> readOnlySlice)
-            {
-                _readOnlySlice = readOnlySlice;
-            }
-
-            public int Start => _readOnlySlice.Start;
-
-            public int End => _readOnlySlice.End;
-
-            public int Length => _readOnlySlice.Length;
-
-            public bool IsEmpty => _readOnlySlice.IsEmpty;
-
-            public ReadOnlySpan<T> Items => _readOnlySlice.Span;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
deleted file mode 100644
index 324b253a0f..0000000000
--- a/src/Avalonia.Visuals/Visual.cs
+++ /dev/null
@@ -1,649 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using Avalonia.Collections;
-using Avalonia.Data;
-using Avalonia.Logging;
-using Avalonia.LogicalTree;
-using Avalonia.Media;
-using Avalonia.Metadata;
-using Avalonia.Rendering;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Base class for controls that provides rendering and related visual properties.
-    /// </summary>
-    /// <remarks>
-    /// The <see cref="Visual"/> class represents elements that have a visual on-screen
-    /// representation and stores all the information needed for an 
-    /// <see cref="IRenderer"/> to render the control. To traverse the visual tree, use the
-    /// extension methods defined in <see cref="VisualExtensions"/>.
-    /// </remarks>
-    [UsableDuringInitialization]
-    public class Visual : StyledElement, IVisual
-    {
-        /// <summary>
-        /// Defines the <see cref="Bounds"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Visual, Rect> BoundsProperty =
-            AvaloniaProperty.RegisterDirect<Visual, Rect>(nameof(Bounds), o => o.Bounds);
-
-        public static readonly DirectProperty<Visual, TransformedBounds?> TransformedBoundsProperty =
-            AvaloniaProperty.RegisterDirect<Visual, TransformedBounds?>(
-                nameof(TransformedBounds),
-                o => o.TransformedBounds);
-
-        /// <summary>
-        /// Defines the <see cref="ClipToBounds"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> ClipToBoundsProperty =
-            AvaloniaProperty.Register<Visual, bool>(nameof(ClipToBounds));
-
-        /// <summary>
-        /// Defines the <see cref="Clip"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Geometry?> ClipProperty =
-            AvaloniaProperty.Register<Visual, Geometry?>(nameof(Clip));
-
-        /// <summary>
-        /// Defines the <see cref="IsVisibleProperty"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsVisibleProperty =
-            AvaloniaProperty.Register<Visual, bool>(nameof(IsVisible), true);
-
-        /// <summary>
-        /// Defines the <see cref="Opacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> OpacityProperty =
-            AvaloniaProperty.Register<Visual, double>(nameof(Opacity), 1);
-
-        /// <summary>
-        /// Defines the <see cref="OpacityMask"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush?> OpacityMaskProperty =
-            AvaloniaProperty.Register<Visual, IBrush?>(nameof(OpacityMask));
-
-        /// <summary>
-        /// Defines the <see cref="RenderTransform"/> property.
-        /// </summary>
-        public static readonly StyledProperty<ITransform?> RenderTransformProperty =
-            AvaloniaProperty.Register<Visual, ITransform?>(nameof(RenderTransform));
-
-        /// <summary>
-        /// Defines the <see cref="RenderTransformOrigin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativePoint> RenderTransformOriginProperty =
-            AvaloniaProperty.Register<Visual, RelativePoint>(nameof(RenderTransformOrigin), defaultValue: RelativePoint.Center);
-
-        /// <summary>
-        /// Defines the <see cref="IVisual.VisualParent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Visual, IVisual?> VisualParentProperty =
-            AvaloniaProperty.RegisterDirect<Visual, IVisual?>(nameof(IVisual.VisualParent), o => o._visualParent);
-
-        /// <summary>
-        /// Defines the <see cref="ZIndex"/> property.
-        /// </summary>
-        public static readonly StyledProperty<int> ZIndexProperty =
-            AvaloniaProperty.Register<Visual, int>(nameof(ZIndex));
-
-        private Rect _bounds;
-        private TransformedBounds? _transformedBounds;
-        private IRenderRoot? _visualRoot;
-        private IVisual? _visualParent;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="Visual"/> class.
-        /// </summary>
-        static Visual()
-        {
-            AffectsRender<Visual>(
-                BoundsProperty,
-                ClipProperty,
-                ClipToBoundsProperty,
-                IsVisibleProperty,
-                OpacityProperty);
-            RenderTransformProperty.Changed.Subscribe(RenderTransformChanged);
-            ZIndexProperty.Changed.Subscribe(ZIndexChanged);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Visual"/> class.
-        /// </summary>
-        public Visual()
-        {
-            // Disable transitions until we're added to the visual tree.
-            DisableTransitions();
-
-            var visualChildren = new AvaloniaList<IVisual>();
-            visualChildren.ResetBehavior = ResetBehavior.Remove;
-            visualChildren.Validate = visual => ValidateVisualChild(visual);
-            visualChildren.CollectionChanged += VisualChildrenChanged;
-            VisualChildren = visualChildren;
-        }
-
-        /// <summary>
-        /// Raised when the control is attached to a rooted visual tree.
-        /// </summary>
-        public event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted visual tree.
-        /// </summary>
-        public event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
-
-        /// <summary>
-        /// Gets the bounds of the control relative to its parent.
-        /// </summary>
-        public Rect Bounds
-        {
-            get { return _bounds; }
-            protected set { SetAndRaise(BoundsProperty, ref _bounds, value); }
-        }
-
-        /// <summary>
-        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
-        /// </summary>
-        public TransformedBounds? TransformedBounds => _transformedBounds;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control should be clipped to its bounds.
-        /// </summary>
-        public bool ClipToBounds
-        {
-            get { return GetValue(ClipToBoundsProperty); }
-            set { SetValue(ClipToBoundsProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the geometry clip for this visual.
-        /// </summary>
-        public Geometry? Clip
-        {
-            get { return GetValue(ClipProperty); }
-            set { SetValue(ClipProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this control and all its parents are visible.
-        /// </summary>
-        public bool IsEffectivelyVisible
-        {
-            get
-            {
-                IVisual? node = this;
-
-                while (node != null)
-                {
-                    if (!node.IsVisible)
-                    {
-                        return false;
-                    }
-
-                    node = node.VisualParent;
-                }
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this control is visible.
-        /// </summary>
-        public bool IsVisible
-        {
-            get { return GetValue(IsVisibleProperty); }
-            set { SetValue(IsVisibleProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity of the control.
-        /// </summary>
-        public double Opacity
-        {
-            get { return GetValue(OpacityProperty); }
-            set { SetValue(OpacityProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity mask of the control.
-        /// </summary>
-        public IBrush? OpacityMask
-        {
-            get { return GetValue(OpacityMaskProperty); }
-            set { SetValue(OpacityMaskProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the render transform of the control.
-        /// </summary>
-        public ITransform? RenderTransform
-        {
-            get { return GetValue(RenderTransformProperty); }
-            set { SetValue(RenderTransformProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the transform origin of the control.
-        /// </summary>
-        public RelativePoint RenderTransformOrigin
-        {
-            get { return GetValue(RenderTransformOriginProperty); }
-            set { SetValue(RenderTransformOriginProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z index of the control.
-        /// </summary>
-        /// <remarks>
-        /// Controls with a higher <see cref="ZIndex"/> will appear in front of controls with
-        /// a lower ZIndex. If two controls have the same ZIndex then the control that appears
-        /// later in the containing element's children collection will appear on top.
-        /// </remarks>
-        public int ZIndex
-        {
-            get { return GetValue(ZIndexProperty); }
-            set { SetValue(ZIndexProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the control's child visuals.
-        /// </summary>
-        protected IAvaloniaList<IVisual> VisualChildren
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the root of the visual tree, if the control is attached to a visual tree.
-        /// </summary>
-        protected IRenderRoot? VisualRoot => _visualRoot ?? (this as IRenderRoot);
-
-        /// <summary>
-        /// Gets a value indicating whether this control is attached to a visual root.
-        /// </summary>
-        bool IVisual.IsAttachedToVisualTree => VisualRoot != null;
-
-        /// <summary>
-        /// Gets the control's child controls.
-        /// </summary>
-        IAvaloniaReadOnlyList<IVisual> IVisual.VisualChildren => VisualChildren;
-
-        /// <summary>
-        /// Gets the control's parent visual.
-        /// </summary>
-        IVisual? IVisual.VisualParent => _visualParent;
-
-        /// <summary>
-        /// Gets the root of the visual tree, if the control is attached to a visual tree.
-        /// </summary>
-        IRenderRoot? IVisual.VisualRoot => VisualRoot;
-        
-        TransformedBounds? IVisual.TransformedBounds
-        {
-            get { return _transformedBounds; }
-            set { SetAndRaise(TransformedBoundsProperty, ref _transformedBounds, value); }
-        }
-
-        /// <summary>
-        /// Invalidates the visual and queues a repaint.
-        /// </summary>
-        public void InvalidateVisual()
-        {
-            VisualRoot?.Renderer?.AddDirty(this);
-        }
-
-        /// <summary>
-        /// Renders the visual to a <see cref="DrawingContext"/>.
-        /// </summary>
-        /// <param name="context">The drawing context.</param>
-        public virtual void Render(DrawingContext context)
-        {
-            Contract.Requires<ArgumentNullException>(context != null);
-        }
-
-        /// <summary>
-        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
-        /// called.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// This method should be called in a control's static constructor with each property
-        /// on the control which when changed should cause a redraw. This is similar to WPF's
-        /// FrameworkPropertyMetadata.AffectsRender flag.
-        /// </remarks>
-        [Obsolete("Use AffectsRender<T> and specify the control type.")]
-        protected static void AffectsRender(params AvaloniaProperty[] properties)
-        {
-            AffectsRender<Visual>(properties);
-        }
-
-        /// <summary>
-        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
-        /// called.
-        /// </summary>
-        /// <typeparam name="T">The control which the property affects.</typeparam>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// This method should be called in a control's static constructor with each property
-        /// on the control which when changed should cause a redraw. This is similar to WPF's
-        /// FrameworkPropertyMetadata.AffectsRender flag.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : Visual
-        {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                if (e.Sender is T sender)
-                {
-                    sender.InvalidateVisual();
-                }
-            }
-
-            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
-            {
-                if (e.Sender is T sender)
-                {
-                    if (e.OldValue is IAffectsRender oldValue)
-                    {
-                        WeakEventHandlerManager.Unsubscribe<EventArgs, T>(oldValue, nameof(oldValue.Invalidated), sender.AffectsRenderInvalidated);
-                    }
-
-                    if (e.NewValue is IAffectsRender newValue)
-                    {
-                        WeakEventHandlerManager.Subscribe<IAffectsRender, EventArgs, T>(newValue, nameof(newValue.Invalidated), sender.AffectsRenderInvalidated);
-                    }
-
-                    sender.InvalidateVisual();
-                }
-            }
-
-            foreach (var property in properties)
-            {
-                if (property.CanValueAffectRender())
-                {
-                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
-                }
-                else
-                {
-                    property.Changed.Subscribe(e => Invalidate(e));
-                }
-            }
-        }
-
-        protected override void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            base.LogicalChildrenCollectionChanged(sender, e);
-            VisualRoot?.Renderer?.RecalculateChildren(this);
-        }
-
-        /// <summary>
-        /// Calls the <see cref="OnAttachedToVisualTree(VisualTreeAttachmentEventArgs)"/> method 
-        /// for this control and all of its visual descendants.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Attached to visual tree");
-
-            _visualRoot = e.Root;
-
-            if (RenderTransform is IMutableTransform mutableTransform)
-            {
-                mutableTransform.Changed += RenderTransformChanged;
-            }
-
-            EnableTransitions();
-            OnAttachedToVisualTree(e);
-            AttachedToVisualTree?.Invoke(this, e);
-            InvalidateVisual();
-
-            var visualChildren = VisualChildren;
-
-            if (visualChildren != null)
-            {
-                var visualChildrenCount = visualChildren.Count;
-
-                for (var i = 0; i < visualChildrenCount; i++)
-                {
-                    if (visualChildren[i] is Visual child)
-                    {
-                        child.OnAttachedToVisualTreeCore(e);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Calls the <see cref="OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs)"/> method 
-        /// for this control and all of its visual descendants.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Detached from visual tree");
-
-            _visualRoot = null;
-
-            if (RenderTransform is IMutableTransform mutableTransform)
-            {
-                mutableTransform.Changed -= RenderTransformChanged;
-            }
-
-            DisableTransitions();
-            OnDetachedFromVisualTree(e);
-            DetachedFromVisualTree?.Invoke(this, e);
-            e.Root?.Renderer?.AddDirty(this);
-
-            var visualChildren = VisualChildren;
-
-            if (visualChildren != null)
-            {
-                var visualChildrenCount = visualChildren.Count;
-
-                for (var i = 0; i < visualChildrenCount; i++)
-                {
-                    if (visualChildren[i] is Visual child)
-                    {
-                        child.OnDetachedFromVisualTreeCore(e);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Called when the control is added to a rooted visual tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the control is removed from a rooted visual tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the control's visual parent changes.
-        /// </summary>
-        /// <param name="oldParent">The old visual parent.</param>
-        /// <param name="newParent">The new visual parent.</param>
-        protected virtual void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
-        {
-            RaisePropertyChanged(
-                VisualParentProperty,
-                new Optional<IVisual?>(oldParent),
-                new BindingValue<IVisual?>(newParent),
-                BindingPriority.LocalValue);
-        }
-
-        protected internal sealed override void LogBindingError(AvaloniaProperty property, Exception e)
-        {
-            // Don't log a binding error unless the control is attached to a logical tree.
-            if (((ILogical)this).IsAttachedToLogicalTree)
-            {
-                if (e is BindingChainException b &&
-                    string.IsNullOrEmpty(b.ExpressionErrorPoint) &&
-                    DataContext == null)
-                {
-                    // The error occurred at the root of the binding chain and DataContext is null;
-                    // don't log this - the DataContext probably hasn't been set up yet.
-                    return;
-                }
-
-                Logger.TryGet(LogEventLevel.Warning, LogArea.Binding)?.Log(
-                    this,
-                    "Error in binding to {Target}.{Property}: {Message}",
-                    this,
-                    property,
-                    e.Message);
-            }
-        }
-
-        /// <summary>
-        /// Called when a visual's <see cref="RenderTransform"/> changes.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void RenderTransformChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var sender = e.Sender as Visual;
-
-            if (sender?.VisualRoot != null)
-            {
-                var oldValue = e.OldValue as Transform;
-                var newValue = e.NewValue as Transform;
-
-                if (oldValue != null)
-                {
-                    oldValue.Changed -= sender.RenderTransformChanged;
-                }
-
-                if (newValue != null)
-                {
-                    newValue.Changed += sender.RenderTransformChanged;
-                }
-
-                sender.InvalidateVisual();
-            }
-        }
-
-        /// <summary>
-        /// Ensures a visual child is not null and not already parented.
-        /// </summary>
-        /// <param name="c">The visual child.</param>
-        private static void ValidateVisualChild(IVisual c)
-        {
-            if (c == null)
-            {
-                throw new ArgumentNullException(nameof(c), "Cannot add null to VisualChildren.");
-            }
-
-            if (c.VisualParent != null)
-            {
-                throw new InvalidOperationException("The control already has a visual parent.");
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="ZIndex"/> property changes on any control.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void ZIndexChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var sender = e.Sender as IVisual;
-            var parent = sender?.VisualParent;
-            sender?.InvalidateVisual();
-            parent?.VisualRoot?.Renderer?.RecalculateChildren(parent);
-        }
-
-        /// <summary>
-        /// Called when the <see cref="RenderTransform"/>'s <see cref="Transform.Changed"/> event
-        /// is fired.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event args.</param>
-        private void RenderTransformChanged(object? sender, EventArgs e)
-        {
-            InvalidateVisual();
-        }
-
-        /// <summary>
-        /// Sets the visual parent of the Visual.
-        /// </summary>
-        /// <param name="value">The visual parent.</param>
-        private void SetVisualParent(Visual? value)
-        {
-            if (_visualParent == value)
-            {
-                return;
-            }
-
-            var old = _visualParent;
-            _visualParent = value;
-
-            if (_visualRoot != null)
-            {
-                var e = new VisualTreeAttachmentEventArgs(old!, _visualRoot);
-                OnDetachedFromVisualTreeCore(e);
-            }
-
-            if (_visualParent is IRenderRoot || _visualParent?.IsAttachedToVisualTree == true)
-            {
-                var root = this.FindAncestorOfType<IRenderRoot>() ??
-                    throw new AvaloniaInternalException("Visual is atached to visual tree but root could not be found.");
-                var e = new VisualTreeAttachmentEventArgs(_visualParent, root);
-                OnAttachedToVisualTreeCore(e);
-            }
-
-            OnVisualParentChanged(old, value);
-        }
-
-        private void AffectsRenderInvalidated(object? sender, EventArgs e) => InvalidateVisual();
-
-        /// <summary>
-        /// Called when the <see cref="VisualChildren"/> collection changes.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event args.</param>
-        private void VisualChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    SetVisualParent(e.NewItems!, this);
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    SetVisualParent(e.OldItems!, null);
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    SetVisualParent(e.OldItems!, null);
-                    SetVisualParent(e.NewItems!, this);
-                    break;
-            }
-        }
-        
-        private static void SetVisualParent(IList children, Visual? parent)
-        {
-            var count = children.Count;
-
-            for (var i = 0; i < count; i++)
-            {
-                var visual = (Visual) children[i]!;
-                
-                visual.SetVisualParent(parent);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualExtensions.cs b/src/Avalonia.Visuals/VisualExtensions.cs
deleted file mode 100644
index ff8a515db3..0000000000
--- a/src/Avalonia.Visuals/VisualExtensions.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Extension methods for <see cref="IVisual"/>.
-    /// </summary>
-    public static class VisualExtensions
-    {
-        /// <summary>
-        /// Converts a point from screen to client coordinates.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="point">The point in screen coordinates.</param>
-        /// <returns>The point in client coordinates.</returns>
-        public static Point PointToClient(this IVisual visual, PixelPoint point)
-        {
-            var root = visual.VisualRoot ??
-                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
-            var rootPoint = root.PointToClient(point);
-            return root.TranslatePoint(rootPoint, visual)!.Value;
-        }
-
-        /// <summary>
-        /// Converts a point from client to screen coordinates.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="point">The point in client coordinates.</param>
-        /// <returns>The point in screen coordinates.</returns>
-        public static PixelPoint PointToScreen(this IVisual visual, Point point)
-        {
-            var root = visual.VisualRoot ??
-                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
-            var p = visual.TranslatePoint(point, root);
-            return visual.VisualRoot.PointToScreen(p!.Value);
-        }
-
-        /// <summary>
-        /// Returns a transform that transforms the visual's coordinates into the coordinates
-        /// of the specified <paramref name="to"/>.
-        /// </summary>
-        /// <param name="from">The visual whose coordinates are to be transformed.</param>
-        /// <param name="to">The visual to translate the coordinates to.</param>
-        /// <returns>
-        /// A <see cref="Matrix"/> containing the transform or null if the visuals don't share a
-        /// common ancestor.
-        /// </returns>
-        public static Matrix? TransformToVisual(this IVisual from, IVisual to)
-        {
-            var common = from.FindCommonVisualAncestor(to);
-
-            if (common != null)
-            {
-                var thisOffset = GetOffsetFrom(common, from);
-                var thatOffset = GetOffsetFrom(common, to);
-
-                if (!thatOffset.TryInvert(out var thatOffsetInverted))
-                {
-                    return null;
-                }
-
-                return thatOffsetInverted * thisOffset;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Translates a point relative to this visual to coordinates that are relative to the specified visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="point">The point value, as relative to this visual.</param>
-        /// <param name="relativeTo">The visual to translate the given point into.</param>
-        /// <returns>
-        /// A point value, now relative to the target visual rather than this source element, or null if the
-        /// two elements have no common ancestor.
-        /// </returns>
-        public static Point? TranslatePoint(this IVisual visual, Point point, IVisual relativeTo)
-        {
-            var transform = visual.TransformToVisual(relativeTo);
-
-            if (transform.HasValue)
-            {
-                return point.Transform(transform.Value);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets a transform from an ancestor to a descendent.
-        /// </summary>
-        /// <param name="ancestor">The ancestor visual.</param>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The transform.</returns>
-        private static Matrix GetOffsetFrom(IVisual ancestor, IVisual visual)
-        {
-            var result = Matrix.Identity;
-            IVisual? v = visual;
-
-            while (v != ancestor)
-            {
-                if (v.RenderTransform?.Value != null)
-                {
-                    var origin = v.RenderTransformOrigin.ToPixels(v.Bounds.Size);
-                    var offset = Matrix.CreateTranslation(origin);
-                    var renderTransform = (-offset) * v.RenderTransform.Value * (offset);
-
-                    result *= renderTransform;
-                }
-
-                var topLeft = v.Bounds.TopLeft;
-
-                if (topLeft != default)
-                {
-                    result *= Matrix.CreateTranslation(topLeft);
-                }
-
-                v = v.VisualParent;
-
-                if (v == null)
-                {
-                    throw new ArgumentException("'visual' is not a descendant of 'ancestor'.");
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs
deleted file mode 100644
index 97c4554de6..0000000000
--- a/src/Avalonia.Visuals/VisualTree/IVisual.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using Avalonia.Collections;
-using Avalonia.Media;
-using Avalonia.Rendering;
-
-#nullable enable
-
-namespace Avalonia.VisualTree
-{
-    /// <summary>
-    /// Represents control that has a visual on-screen representation.
-    /// </summary>
-    /// <remarks>
-    /// The <see cref="IVisual"/> interface defines the interface required for a renderer to
-    /// render a control. You should not usually need to reference this interface unless
-    /// you are writing a renderer; instead use the extension methods defined in
-    /// <see cref="VisualExtensions"/> to traverse the visual tree. This interface is
-    /// implemented by <see cref="Visual"/>. It should not be necessary to implement it
-    /// anywhere else.
-    /// </remarks>
-    public interface IVisual
-    {
-        /// <summary>
-        /// Raised when the control is attached to a rooted visual tree.
-        /// </summary>
-        event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted visual tree.
-        /// </summary>
-        event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
-
-        /// <summary>
-        /// Gets the bounds of the control relative to its parent.
-        /// </summary>
-        Rect Bounds { get; }
-
-        /// <summary>
-        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
-        /// </summary>
-        TransformedBounds? TransformedBounds { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control should be clipped to its bounds.
-        /// </summary>
-        bool ClipToBounds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the geometry clip for this visual.
-        /// </summary>
-        Geometry? Clip { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this control is attached to a visual root.
-        /// </summary>
-        bool IsAttachedToVisualTree { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this control and all its parents are visible.
-        /// </summary>
-        bool IsEffectivelyVisible { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this control is visible.
-        /// </summary>
-        bool IsVisible { get; set; }
-
-        /// <summary>
-        /// Gets or sets the opacity of the control.
-        /// </summary>
-        double Opacity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the opacity mask for the control.
-        /// </summary>
-        IBrush? OpacityMask { get; set; }
-
-        /// <summary>
-        /// Gets or sets the render transform of the control.
-        /// </summary>
-        ITransform? RenderTransform { get; set; }
-
-        /// <summary>
-        /// Gets or sets the render transform origin of the control.
-        /// </summary>
-        RelativePoint RenderTransformOrigin { get; set; }
-
-        /// <summary>
-        /// Gets the control's child visuals.
-        /// </summary>
-        IAvaloniaReadOnlyList<IVisual> VisualChildren { get; }
-
-        /// <summary>
-        /// Gets the control's parent visual.
-        /// </summary>
-        IVisual? VisualParent { get; }
-
-        /// <summary>
-        /// Gets the root of the visual tree, if the control is attached to a visual tree.
-        /// </summary>
-        IRenderRoot? VisualRoot { get; }
-
-        /// <summary>
-        /// Gets or sets the Z index of the node.
-        /// </summary>
-        int ZIndex { get; set; }
-
-        /// <summary>
-        /// Invalidates the visual and queues a repaint.
-        /// </summary>
-        void InvalidateVisual();
-
-        /// <summary>
-        /// Renders the control to a <see cref="DrawingContext"/>.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        void Render(DrawingContext context);
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs b/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
deleted file mode 100644
index e47377063f..0000000000
--- a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace Avalonia.VisualTree
-{
-    /// <summary>
-    /// Interface for controls that host their own separate visual tree, such as popups.
-    /// </summary>
-    [Obsolete]
-    public interface IVisualTreeHost
-    {
-        /// <summary>
-        /// Gets the root of the hosted visual tree.
-        /// </summary>
-        /// <value>
-        /// The root of the hosted visual tree.
-        /// </value>
-        IVisual? Root { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
deleted file mode 100644
index 128a39c082..0000000000
--- a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Rendering;
-
-namespace Avalonia.VisualTree
-{
-    /// <summary>
-    /// Provides extension methods for working with the visual tree.
-    /// </summary>
-    public static class VisualExtensions
-    {
-        /// <summary>
-        /// Calculates the distance from a visual's ancestor.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="ancestor">The ancestor visual.</param>
-        /// <returns>
-        /// The number of steps from the visual to the ancestor or -1 if
-        /// <paramref name="visual"/> is not a descendent of <paramref name="ancestor"/>.
-        /// </returns>
-        public static int CalculateDistanceFromAncestor(this IVisual visual, IVisual? ancestor)
-        {
-            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
-            var result = 0;
-
-            while (v != null && v != ancestor)
-            {
-                v = v.VisualParent;
-
-                result++;
-            }
-
-            return v != null ? result : -1;
-        }
-
-        /// <summary>
-        /// Calculates the distance from a visual's root.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>
-        /// The number of steps from the visual to the root.
-        /// </returns>
-        public static int CalculateDistanceFromRoot(IVisual visual)
-        {
-            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
-            var result = 0;
-
-            v = v?.VisualParent;
-
-            while (v != null)
-            {
-                v = v.VisualParent;
-
-                result++;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Tries to get the first common ancestor of two visuals.
-        /// </summary>
-        /// <param name="visual">The first visual.</param>
-        /// <param name="target">The second visual.</param>
-        /// <returns>The common ancestor, or null if not found.</returns>
-        public static IVisual? FindCommonVisualAncestor(this IVisual visual, IVisual target)
-        {
-            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            if (target is null)
-            {
-                return null;
-            }
-
-            IVisual? t = target;
-
-            void GoUpwards(ref IVisual? node, int count)
-            {
-                for (int i = 0; i < count; ++i)
-                {
-                    node = node?.VisualParent;
-                }
-            }
-
-            // We want to find lowest node first, then make sure that both nodes are at the same height.
-            // By doing that we can sometimes find out that other node is our lowest common ancestor.
-            var firstHeight = CalculateDistanceFromRoot(v);
-            var secondHeight = CalculateDistanceFromRoot(t);
-
-            if (firstHeight > secondHeight)
-            {
-                GoUpwards(ref v, firstHeight - secondHeight);
-            }
-            else
-            {
-                GoUpwards(ref t, secondHeight - firstHeight);
-            }
-
-            if (v == t)
-            {
-                return v;
-            }
-
-            while (v != null && t != null)
-            {
-                IVisual? firstParent = v.VisualParent;
-                IVisual? secondParent = t.VisualParent;
-
-                if (firstParent == secondParent)
-                {
-                    return firstParent;
-                }
-
-                v = v.VisualParent;
-                t = t.VisualParent;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Enumerates the ancestors of an <see cref="IVisual"/> in the visual tree.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The visual's ancestors.</returns>
-        public static IEnumerable<IVisual> GetVisualAncestors(this IVisual visual)
-        {
-            IVisual? v = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            v = v.VisualParent;
-
-            while (v != null)
-            {
-                yield return v;
-                v = v.VisualParent;
-            }
-        }
-
-        /// <summary>
-        /// Finds first ancestor of given type.
-        /// </summary>
-        /// <typeparam name="T">Ancestor type.</typeparam>
-        /// <param name="visual">The visual.</param>
-        /// <param name="includeSelf">If given visual should be included in search.</param>
-        /// <returns>First ancestor of given type.</returns>
-        public static T? FindAncestorOfType<T>(this IVisual visual, bool includeSelf = false) where T : class
-        {
-            if (visual is null)
-            {
-                return null;
-            }
-
-            IVisual? parent = includeSelf ? visual : visual.VisualParent;
-
-            while (parent != null)
-            {
-                if (parent is T result)
-                {
-                    return result;
-                }
-
-                parent = parent.VisualParent;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Finds first descendant of given type.
-        /// </summary>
-        /// <typeparam name="T">Descendant type.</typeparam>
-        /// <param name="visual">The visual.</param>
-        /// <param name="includeSelf">If given visual should be included in search.</param>
-        /// <returns>First descendant of given type.</returns>
-        public static T? FindDescendantOfType<T>(this IVisual visual, bool includeSelf = false) where T : class
-        {
-            if (visual is null)
-            {
-                return null;
-            }
-
-            if (includeSelf && visual is T result)
-            {
-                return result;
-            }
-
-            return FindDescendantOfTypeCore<T>(visual);
-        }
-
-        /// <summary>
-        /// Enumerates an <see cref="IVisual"/> and its ancestors in the visual tree.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The visual and its ancestors.</returns>
-        public static IEnumerable<IVisual> GetSelfAndVisualAncestors(this IVisual visual)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            yield return visual;
-
-            foreach (var ancestor in visual.GetVisualAncestors())
-            {
-                yield return ancestor;
-            }
-        }
-
-        /// <summary>
-        /// Gets the first visual in the visual tree whose bounds contain a point.
-        /// </summary>
-        /// <param name="visual">The root visual to test.</param>
-        /// <param name="p">The point.</param>
-        /// <returns>The visual at the requested point.</returns>
-        public static IVisual? GetVisualAt(this IVisual visual, Point p)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            return visual.GetVisualAt(p, x => x.IsVisible);
-        }
-
-        /// <summary>
-        /// Gets the first visual in the visual tree whose bounds contain a point.
-        /// </summary>
-        /// <param name="visual">The root visual to test.</param>
-        /// <param name="p">The point.</param>
-        /// <param name="filter">
-        /// A filter predicate. If the predicate returns false then the visual and all its
-        /// children will be excluded from the results.
-        /// </param>
-        /// <returns>The visual at the requested point.</returns>
-        public static IVisual? GetVisualAt(this IVisual visual, Point p, Func<IVisual, bool> filter)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            var root = visual.GetVisualRoot();
-
-            if (root is null)
-            {
-                return null;
-            }
-
-            var rootPoint = visual.TranslatePoint(p, root);
-
-            if (rootPoint.HasValue)
-            {
-                return root.Renderer.HitTestFirst(rootPoint.Value, visual, filter);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Enumerates the visible visuals in the visual tree whose bounds contain a point.
-        /// </summary>
-        /// <param name="visual">The root visual to test.</param>
-        /// <param name="p">The point.</param>
-        /// <returns>The visuals at the requested point.</returns>
-        public static IEnumerable<IVisual> GetVisualsAt(
-            this IVisual visual,
-            Point p)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            return visual.GetVisualsAt(p, x => x.IsVisible);
-        }
-
-        /// <summary>
-        /// Enumerates the visuals in the visual tree whose bounds contain a point.
-        /// </summary>
-        /// <param name="visual">The root visual to test.</param>
-        /// <param name="p">The point.</param>
-        /// <param name="filter">
-        /// A filter predicate. If the predicate returns false then the visual and all its
-        /// children will be excluded from the results.
-        /// </param>
-        /// <returns>The visuals at the requested point.</returns>
-        public static IEnumerable<IVisual> GetVisualsAt(
-            this IVisual visual,
-            Point p,
-            Func<IVisual, bool> filter)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            var root = visual.GetVisualRoot();
-
-            if (root is null)
-            {
-                return Array.Empty<IVisual>();
-            }
-
-            var rootPoint = visual.TranslatePoint(p, root);
-
-            if (rootPoint.HasValue)
-            {
-                return root.Renderer.HitTest(rootPoint.Value, visual, filter);
-            }
-
-            return Enumerable.Empty<IVisual>();
-        }
-
-        /// <summary>
-        /// Enumerates the children of an <see cref="IVisual"/> in the visual tree.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The visual children.</returns>
-        public static IEnumerable<IVisual> GetVisualChildren(this IVisual visual)
-        {
-            return visual.VisualChildren;
-        }
-
-        /// <summary>
-        /// Enumerates the descendants of an <see cref="IVisual"/> in the visual tree.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The visual's ancestors.</returns>
-        public static IEnumerable<IVisual> GetVisualDescendants(this IVisual visual)
-        {
-            foreach (IVisual child in visual.VisualChildren)
-            {
-                yield return child;
-
-                foreach (IVisual descendant in child.GetVisualDescendants())
-                {
-                    yield return descendant;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Enumerates an <see cref="IVisual"/> and its descendants in the visual tree.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The visual and its ancestors.</returns>
-        public static IEnumerable<IVisual> GetSelfAndVisualDescendants(this IVisual visual)
-        {
-            yield return visual;
-
-            foreach (var ancestor in visual.GetVisualDescendants())
-            {
-                yield return ancestor;
-            }
-        }
-
-        /// <summary>
-        /// Gets the visual parent of an <see cref="IVisual"/>.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The parent, or null if the visual is unparented.</returns>
-        public static IVisual? GetVisualParent(this IVisual visual)
-        {
-            return visual.VisualParent;
-        }
-
-        /// <summary>
-        /// Gets the visual parent of an <see cref="IVisual"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of the visual parent.</typeparam>
-        /// <param name="visual">The visual.</param>
-        /// <returns>
-        /// The parent, or null if the visual is unparented or its parent is not of type <typeparamref name="T"/>.
-        /// </returns>
-        public static T? GetVisualParent<T>(this IVisual visual) where T : class
-        {
-            return visual.VisualParent as T;
-        }
-
-        /// <summary>
-        /// Gets the root visual for an <see cref="IVisual"/>.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>
-        /// The root visual or null if the visual is not rooted.
-        /// </returns>
-        public static IRenderRoot? GetVisualRoot(this IVisual visual)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            return visual as IRenderRoot ?? visual.VisualRoot;
-        }
-
-        /// <summary>
-        /// Tests whether an <see cref="IVisual"/> is an ancestor of another visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="target">The potential descendant.</param>
-        /// <returns>
-        /// True if <paramref name="visual"/> is an ancestor of <paramref name="target"/>;
-        /// otherwise false.
-        /// </returns>
-        public static bool IsVisualAncestorOf(this IVisual visual, IVisual target)
-        {
-            IVisual? current = target?.VisualParent;
-
-            while (current != null)
-            {
-                if (current == visual)
-                {
-                    return true;
-                }
-
-                current = current.VisualParent;
-            }
-
-            return false;
-        }
-
-        public static IEnumerable<IVisual> SortByZIndex(this IEnumerable<IVisual> elements)
-        {
-            return elements
-                .Select((element, index) => new ZOrderElement
-                {
-                    Element = element,
-                    Index = index,
-                    ZIndex = element.ZIndex,
-                })
-                .OrderBy(x => x, null)
-                .Select(x => x.Element!);
-        }
-
-        private static T? FindDescendantOfTypeCore<T>(IVisual visual) where T : class
-        {
-            var visualChildren = visual.VisualChildren;
-            var visualChildrenCount = visualChildren.Count;
-
-            for (var i = 0; i < visualChildrenCount; i++)
-            {
-                IVisual child = visualChildren[i];
-
-                if (child is T result)
-                {
-                    return result;
-                }
-
-                var childResult = FindDescendantOfTypeCore<T>(child);
-
-                if (!(childResult is null))
-                {
-                    return childResult;
-                }
-            }
-
-            return null;
-        }
-
-        private class ZOrderElement : IComparable<ZOrderElement>
-        {
-            public IVisual? Element { get; set; }
-            public int Index { get; set; }
-            public int ZIndex { get; set; }
-
-            public int CompareTo(ZOrderElement? other)
-            {
-                if (other is null)
-                    return 1;
-
-                var z = other.ZIndex - ZIndex;
-
-                if (z != 0)
-                {
-                    return z;
-                }
-                else
-                {
-                    return other.Index - Index;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.X11/Avalonia.X11.csproj
index 45a76bc3d6..621e6fabd7 100644
--- a/src/Avalonia.X11/Avalonia.X11.csproj
+++ b/src/Avalonia.X11/Avalonia.X11.csproj
@@ -11,5 +11,5 @@
         <ProjectReference Include="..\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj" />
         <Compile Include="..\Shared\RawEventGrouping.cs" />
     </ItemGroup>
-
+    <Import Project="..\..\build\SourceGenerators.props" />
 </Project>
diff --git a/src/Avalonia.X11/Glx/Glx.cs b/src/Avalonia.X11/Glx/Glx.cs
index 37ca7f5603..1a26d7d5f5 100644
--- a/src/Avalonia.X11/Glx/Glx.cs
+++ b/src/Avalonia.X11/Glx/Glx.cs
@@ -4,111 +4,97 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.OpenGL;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
+
 // ReSharper disable UnassignedGetOnlyAutoProperty
 
 namespace Avalonia.X11.Glx
 {
-    unsafe class GlxInterface : GlInterfaceBase
+    unsafe partial class GlxInterface
     {
         private const string libGL = "libGL.so.1";
-        [GlEntryPointAttribute("glXMakeContextCurrent")]
-        public GlxMakeContextCurrent MakeContextCurrent { get; }
-        public delegate bool GlxMakeContextCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
+        [GetProcAddress("glXMakeContextCurrent")]
+        public partial bool MakeContextCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
 
-        [GlEntryPoint("glXGetCurrentContext")]
-        public GlxGetCurrentContext GetCurrentContext { get; }
-        public delegate IntPtr GlxGetCurrentContext();
+        [GetProcAddress("glXGetCurrentContext")]
+        public partial IntPtr GetCurrentContext();
 
-        [GlEntryPoint("glXGetCurrentDisplay")]
-        public GlxGetCurrentDisplay GetCurrentDisplay { get; }
-        public delegate IntPtr GlxGetCurrentDisplay();
+        [GetProcAddress("glXGetCurrentDisplay")]
+        public partial IntPtr GetCurrentDisplay();
         
-        [GlEntryPoint("glXGetCurrentDrawable")]
-        public GlxGetCurrentDrawable GetCurrentDrawable { get; }
-        public delegate IntPtr GlxGetCurrentDrawable();
+        [GetProcAddress("glXGetCurrentDrawable")]
+        public partial IntPtr GetCurrentDrawable();
         
-        [GlEntryPoint("glXGetCurrentReadDrawable")]
-        public GlxGetCurrentReadDrawable GetCurrentReadDrawable { get; }
-        public delegate IntPtr GlxGetCurrentReadDrawable();
+        [GetProcAddress("glXGetCurrentReadDrawable")]
+        public partial IntPtr GetCurrentReadDrawable();
         
-        [GlEntryPoint("glXCreatePbuffer")]
-        public GlxCreatePbuffer CreatePbuffer { get; }
-        public delegate IntPtr GlxCreatePbuffer(IntPtr dpy, IntPtr fbc, int[] attrib_list);
+        [GetProcAddress("glXCreatePbuffer")]
+        public partial IntPtr CreatePbuffer(IntPtr dpy, IntPtr fbc, int[] attrib_list);
         
-        [GlEntryPoint("glXDestroyPbuffer")]
-        public GlxDestroyPbuffer DestroyPbuffer { get; }
-        public delegate IntPtr GlxDestroyPbuffer(IntPtr dpy, IntPtr fb);
+        [GetProcAddress("glXDestroyPbuffer")]
+        public partial IntPtr DestroyPbuffer(IntPtr dpy, IntPtr fb);
         
-        [GlEntryPointAttribute("glXChooseVisual")]
-        public GlxChooseVisual ChooseVisual { get; }
-        public delegate  XVisualInfo* GlxChooseVisual(IntPtr dpy, int screen, int[] attribList);
+        [GetProcAddress("glXChooseVisual")]
+        public partial  XVisualInfo* ChooseVisual(IntPtr dpy, int screen, int[] attribList);
         
         
-        [GlEntryPointAttribute("glXCreateContext")]
-        public GlxCreateContext CreateContext { get; }
-        public delegate  IntPtr GlxCreateContext(IntPtr dpy,  XVisualInfo* vis,  IntPtr shareList,  bool direct);
+        [GetProcAddress("glXCreateContext")]
+        public partial  IntPtr CreateContext(IntPtr dpy,  XVisualInfo* vis,  IntPtr shareList,  bool direct);
         
 
-        [GlEntryPointAttribute("glXCreateContextAttribsARB")]
-        public GlxCreateContextAttribsARB CreateContextAttribsARB { get; }
-        public delegate IntPtr GlxCreateContextAttribsARB(IntPtr dpy, IntPtr fbconfig, IntPtr shareList,
+        [GetProcAddress("glXCreateContextAttribsARB")]
+        public partial IntPtr CreateContextAttribsARB(IntPtr dpy, IntPtr fbconfig, IntPtr shareList,
             bool direct, int[] attribs);
         
 
         [DllImport(libGL, EntryPoint = "glXGetProcAddress")]
-        public static extern IntPtr GlxGetProcAddress(Utf8Buffer buffer);
+        public static extern IntPtr GlxGetProcAddress(string buffer);
 
         
-        [GlEntryPointAttribute("glXDestroyContext")]
-        public GlxDestroyContext DestroyContext { get; }
-        public delegate  void GlxDestroyContext(IntPtr dpy, IntPtr ctx);
+        [GetProcAddress("glXDestroyContext")]
+        public partial  void DestroyContext(IntPtr dpy, IntPtr ctx);
         
         
-        [GlEntryPointAttribute("glXChooseFBConfig")]
-        public GlxChooseFBConfig ChooseFBConfig { get; }
-        public delegate  IntPtr* GlxChooseFBConfig(IntPtr dpy,  int screen,  int[] attrib_list,  out int nelements);
+        [GetProcAddress("glXChooseFBConfig")]
+        public partial  IntPtr* ChooseFBConfig(IntPtr dpy,  int screen,  int[] attrib_list,  out int nelements);
         
         
-        public  IntPtr* GlxChooseFbConfig(IntPtr dpy, int screen, IEnumerable<int> attribs, out int nelements)
+        public  IntPtr* ChooseFbConfig(IntPtr dpy, int screen, IEnumerable<int> attribs, out int nelements)
         {
             var arr = attribs.Concat(new[]{0}).ToArray();
             return ChooseFBConfig(dpy, screen, arr, out nelements);
         }
         
-        [GlEntryPointAttribute("glXGetVisualFromFBConfig")]
-        public GlxGetVisualFromFBConfig GetVisualFromFBConfig { get; }
-        public delegate  XVisualInfo * GlxGetVisualFromFBConfig(IntPtr dpy,  IntPtr config);
+        [GetProcAddress("glXGetVisualFromFBConfig")]
+        public partial  XVisualInfo * GetVisualFromFBConfig(IntPtr dpy,  IntPtr config);
         
         
-        [GlEntryPointAttribute("glXGetFBConfigAttrib")]
-        public GlxGetFBConfigAttrib GetFBConfigAttrib { get; }
-        public delegate  int GlxGetFBConfigAttrib(IntPtr dpy, IntPtr config, int attribute, out int value);
+        [GetProcAddress("glXGetFBConfigAttrib")]
+        public partial  int GetFBConfigAttrib(IntPtr dpy, IntPtr config, int attribute, out int value);
         
         
-        [GlEntryPointAttribute("glXSwapBuffers")]
-        public GlxSwapBuffers SwapBuffers { get; }
-        public delegate  void GlxSwapBuffers(IntPtr dpy,  IntPtr drawable);
+        [GetProcAddress("glXSwapBuffers")]
+        public partial  void SwapBuffers(IntPtr dpy,  IntPtr drawable);
         
         
-        [GlEntryPointAttribute("glXWaitX")]
-        public GlxWaitX WaitX { get; }
-        public delegate  void GlxWaitX();
+        [GetProcAddress("glXWaitX")]
+        public partial  void WaitX();
         
         
-        [GlEntryPointAttribute("glXWaitGL")]
-        public GlxWaitGL WaitGL { get; }
-        public delegate void GlxWaitGL();
+        [GetProcAddress("glXWaitGL")]
+        public partial void WaitGL();
         
-        public delegate int GlGetError();
-        [GlEntryPoint("glGetError")]
-        public GlGetError GetError { get; }
 
-        public delegate IntPtr GlxQueryExtensionsString(IntPtr display, int screen);
-        [GlEntryPoint("glXQueryExtensionsString")]
-        public GlxQueryExtensionsString QueryExtensionsString { get; }
+        [GetProcAddress("glGetError")]
+        public partial int GlGetError();
+
+        
+        [GetProcAddress("glXQueryExtensionsString")]
+        public partial IntPtr QueryExtensionsString(IntPtr display, int screen);
 
-        public GlxInterface() : base(SafeGetProcAddress)
+        public GlxInterface()
         {
+            Initialize(SafeGetProcAddress);
         }
 
         // Ignores egl functions.
@@ -122,10 +108,9 @@ namespace Avalonia.X11.Glx
                 return IntPtr.Zero;
             }
 
-            return GlxConverted(proc);
+            return GlxGetProcAddress(proc);
         }
 
-        private static readonly Func<string, IntPtr> GlxConverted = ConvertNative(GlxGetProcAddress);
 
         public string[] GetExtensions(IntPtr display)
         {
diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index fcdc10e999..1e70608168 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -9,7 +9,7 @@ namespace Avalonia.X11.Glx
     unsafe class GlxDisplay
     {
         private readonly X11Info _x11;
-        private readonly List<GlVersion> _probeProfiles;
+        private readonly GlVersion[] _probeProfiles;
         private readonly IntPtr _fbconfig;
         private readonly XVisualInfo* _visual;
         private string[] _displayExtensions;
@@ -21,7 +21,7 @@ namespace Avalonia.X11.Glx
         public GlxDisplay(X11Info x11, IList<GlVersion> probeProfiles) 
         {
             _x11 = x11;
-            _probeProfiles = probeProfiles.ToList();
+            _probeProfiles = probeProfiles.ToArray();
             _displayExtensions = Glx.GetExtensions(_x11.Display);
 
             var baseAttribs = new[]
@@ -76,10 +76,10 @@ namespace Avalonia.X11.Glx
             if (Glx.GetFBConfigAttrib(_x11.Display, _fbconfig, GLX_STENCIL_SIZE, out var stencil) == 0)
                 stencilSize = stencil;
 
-            var pbuffers = Enumerable.Range(0, 2).Select(_ => Glx.CreatePbuffer(_x11.Display, _fbconfig, new[]
-            {
-                GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, 0
-            })).ToList();
+            var attributes = new[] { GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, 0 };
+            
+            Glx.CreatePbuffer(_x11.Display, _fbconfig, attributes);
+            Glx.CreatePbuffer(_x11.Display, _fbconfig, attributes);
             
             XLib.XFlush(_x11.Display);
 
@@ -104,7 +104,6 @@ namespace Avalonia.X11.Glx
                                     $"Renderer '{glInterface.Renderer}' is blacklisted by '{item}'");
                 }
             }
-
         }
 
         IntPtr CreatePBuffer()
diff --git a/src/Avalonia.X11/Glx/GlxPlatformFeature.cs b/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
index 6735a32ffe..0968adc799 100644
--- a/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
+++ b/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Logging;
 using Avalonia.OpenGL;
+using Avalonia.Platform;
 
 namespace Avalonia.X11.Glx
 {
@@ -14,6 +15,7 @@ namespace Avalonia.X11.Glx
         public IGlContext CreateSharedContext() => Display.CreateContext(PrimaryContext);
         public GlxContext DeferredContext { get; private set; }
         public IGlContext PrimaryContext => DeferredContext;
+        IPlatformGpuContext IPlatformGpu.PrimaryContext => PrimaryContext;
 
         public static bool TryInitialize(X11Info x11, IList<GlVersion> glProfiles)
         {
diff --git a/src/Avalonia.X11/ICELib.cs b/src/Avalonia.X11/ICELib.cs
index 8ef21dd000..19c973a5e0 100644
--- a/src/Avalonia.X11/ICELib.cs
+++ b/src/Avalonia.X11/ICELib.cs
@@ -46,7 +46,7 @@ namespace Avalonia.X11
             IntPtr iceConn,
             bool swap,
             int offendingMinorOpcode,
-            ulong offendingSequence,
+            nuint offendingSequence,
             int errorClass,
             int severity,
             IntPtr values
diff --git a/src/Avalonia.X11/Interop/GtkInteropHelper.cs b/src/Avalonia.X11/Interop/GtkInteropHelper.cs
new file mode 100644
index 0000000000..de0b755832
--- /dev/null
+++ b/src/Avalonia.X11/Interop/GtkInteropHelper.cs
@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+
+namespace Avalonia.X11.Interop;
+
+public class GtkInteropHelper
+{
+    public static async Task<T> RunOnGlibThread<T>(Func<T> cb)
+    {
+        if (!await NativeDialogs.Gtk.StartGtk().ConfigureAwait(false))
+            throw new Win32Exception("Unable to initialize GTK");
+        return await NativeDialogs.Glib.RunOnGlibThread(cb).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs b/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs
new file mode 100644
index 0000000000..5fe0f46b14
--- /dev/null
+++ b/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs
@@ -0,0 +1,64 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+
+namespace Avalonia.X11.NativeDialogs;
+
+internal class CompositeStorageProvider : IStorageProvider
+{
+    private readonly IEnumerable<Func<Task<IStorageProvider?>>> _factories;
+    public CompositeStorageProvider(IEnumerable<Func<Task<IStorageProvider?>>> factories)
+    {
+        _factories = factories;
+    }
+
+    public bool CanOpen => true;
+    public bool CanSave => true;
+    public bool CanPickFolder => true;
+
+    private async Task<IStorageProvider> EnsureStorageProvider()
+    {
+        foreach (var factory in _factories)
+        {
+            var provider = await factory();
+            if (provider is not null)
+            {
+                return provider;
+            }
+        }
+
+        throw new InvalidOperationException("Neither DBus nor GTK are available on the system");
+    }
+
+    public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.OpenFilePickerAsync(options).ConfigureAwait(false);
+    }
+
+    public async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.SaveFilePickerAsync(options).ConfigureAwait(false);
+    }
+
+    public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.OpenFolderPickerAsync(options).ConfigureAwait(false);
+    }
+
+    public async Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.OpenFileBookmarkAsync(bookmark).ConfigureAwait(false);
+    }
+
+    public async Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.OpenFolderBookmarkAsync(bookmark).ConfigureAwait(false);
+    }
+}
diff --git a/src/Avalonia.X11/NativeDialogs/Gtk.cs b/src/Avalonia.X11/NativeDialogs/Gtk.cs
index a0f146afa8..d5eae037a9 100644
--- a/src/Avalonia.X11/NativeDialogs/Gtk.cs
+++ b/src/Avalonia.X11/NativeDialogs/Gtk.cs
@@ -3,6 +3,8 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Platform.Interop;
+using JetBrains.Annotations;
+
 // ReSharper disable IdentifierTypo
 namespace Avalonia.X11.NativeDialogs
 {
@@ -195,7 +197,10 @@ namespace Avalonia.X11.NativeDialogs
 
         [DllImport(GtkName)]
         public static extern void gtk_file_chooser_set_current_name(IntPtr chooser, Utf8Buffer file);
-        
+
+        [DllImport(GtkName)]
+        public static extern void gtk_file_chooser_set_current_folder(IntPtr chooser, Utf8Buffer file);
+
         [DllImport(GtkName)]
         public static extern IntPtr gtk_file_filter_new();
         
@@ -205,6 +210,9 @@ namespace Avalonia.X11.NativeDialogs
         [DllImport(GtkName)]
         public static extern IntPtr gtk_file_filter_add_pattern(IntPtr filter, Utf8Buffer pattern);
         
+        [DllImport(GtkName)]
+        public static extern IntPtr gtk_file_filter_add_mime_type (IntPtr filter, Utf8Buffer mimeType);
+        
         [DllImport(GtkName)]
         public static extern IntPtr gtk_file_chooser_add_filter(IntPtr chooser, IntPtr filter);
 
@@ -252,8 +260,12 @@ namespace Avalonia.X11.NativeDialogs
 
         public static Task<bool> StartGtk()
         {
-            var tcs = new TaskCompletionSource<bool>();
-            new Thread(() =>
+            return StartGtkCore();
+        }
+
+        private static void GtkThread(TaskCompletionSource<bool> tcs)
+        {
+            try
             {
                 try
                 {
@@ -287,7 +299,17 @@ namespace Avalonia.X11.NativeDialogs
                 tcs.SetResult(true);
                 while (true)
                     gtk_main_iteration();
-            }) {Name = "GTK3THREAD", IsBackground = true}.Start();
+            }
+            catch
+            {
+                tcs.SetResult(false);
+            }
+        }
+        
+        private static Task<bool> StartGtkCore()
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            new Thread(() => GtkThread(tcs)) {Name = "GTK3THREAD", IsBackground = true}.Start();
             return tcs.Task;
         }
     }
diff --git a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
index 1a6514eb03..89aa0340b5 100644
--- a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
+++ b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
@@ -1,56 +1,148 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Platform;
 using Avalonia.Platform.Interop;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
 using static Avalonia.X11.NativeDialogs.Glib;
 using static Avalonia.X11.NativeDialogs.Gtk;
-// ReSharper disable AccessToModifiedClosure
+
 namespace Avalonia.X11.NativeDialogs
 {
-    class GtkSystemDialog : ISystemDialogImpl
+    internal class GtkSystemDialog : BclStorageProvider
     {
-        private Task<bool> _initialized;
-        private unsafe  Task<string[]> ShowDialog(string title, IWindowImpl parent, GtkFileChooserAction action,
-            bool multiSelect, string initialFileName, IEnumerable<FileDialogFilter> filters, string defaultExtension, bool overwritePrompt)
+        private static Task<bool>? _initialized;
+        private readonly X11Window _window;
+
+        private GtkSystemDialog(X11Window window)
+        {
+            _window = window;
+        }
+
+        public override bool CanOpen => true;
+
+        public override bool CanSave => true;
+
+        public override bool CanPickFolder => true;
+
+        internal static async Task<IStorageProvider?> TryCreate(X11Window window)
+        {
+            _initialized ??= StartGtk();
+
+            return await _initialized ? new GtkSystemDialog(window) : null;
+        }
+
+        public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            return await await RunOnGlibThread(async () =>
+            {
+                var res = await ShowDialog(options.Title, _window, GtkFileChooserAction.Open,
+                    options.AllowMultiple, options.SuggestedStartLocation, null, options.FileTypeFilter, null, false)
+                    .ConfigureAwait(false);
+                return res?.Select(f => new BclStorageFile(new FileInfo(f))).ToArray() ?? Array.Empty<IStorageFile>();
+            });
+        }
+
+        public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            return await await RunOnGlibThread(async () =>
+            {
+                var res = await ShowDialog(options.Title, _window, GtkFileChooserAction.SelectFolder,
+                    options.AllowMultiple, options.SuggestedStartLocation, null,
+                    null, null, false).ConfigureAwait(false);
+                return res?.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray() ?? Array.Empty<IStorageFolder>();
+            });
+        }
+
+        public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            return await await RunOnGlibThread(async () =>
+            {
+                var res = await ShowDialog(options.Title, _window, GtkFileChooserAction.Save,
+                    false, options.SuggestedStartLocation, options.SuggestedFileName, options.FileTypeChoices, options.DefaultExtension, options.ShowOverwritePrompt ?? false)
+                    .ConfigureAwait(false);
+                return res?.FirstOrDefault() is { } file
+                    ? new BclStorageFile(new FileInfo(file))
+                    : null;
+            });
+        }
+
+        private unsafe Task<string[]?> ShowDialog(string? title, IWindowImpl parent, GtkFileChooserAction action,
+            bool multiSelect, IStorageFolder? initialFolder, string? initialFileName,
+            IEnumerable<FilePickerFileType>? filters, string? defaultExtension, bool overwritePrompt)
         {
             IntPtr dlg;
             using (var name = new Utf8Buffer(title))
+            {
                 dlg = gtk_file_chooser_dialog_new(name, IntPtr.Zero, action, IntPtr.Zero);
+            }
+
             UpdateParent(dlg, parent);
             if (multiSelect)
+            {
                 gtk_file_chooser_set_select_multiple(dlg, true);
+            }
 
             gtk_window_set_modal(dlg, true);
-            var tcs = new TaskCompletionSource<string[]>();
-            List<IDisposable> disposables = null;
+            var tcs = new TaskCompletionSource<string[]?>();
+            List<IDisposable>? disposables = null;
 
             void Dispose()
             {
-                // ReSharper disable once PossibleNullReferenceException
-                foreach (var d in disposables) d.Dispose();
+                foreach (var d in disposables!)
+                {
+                    d.Dispose();
+                }
+
                 disposables.Clear();
             }
 
-            var filtersDic = new Dictionary<IntPtr, FileDialogFilter>();
-            if(filters != null)
+            var filtersDic = new Dictionary<IntPtr, FilePickerFileType>();
+            if (filters != null)
+            {
                 foreach (var f in filters)
                 {
-                    var filter = gtk_file_filter_new();
-                    filtersDic[filter] = f;
-                    using (var b = new Utf8Buffer(f.Name))
-                        gtk_file_filter_set_name(filter, b);
-                    
-                    foreach (var e in f.Extensions)
-                        using (var b = new Utf8Buffer("*." + e))
-                            gtk_file_filter_add_pattern(filter, b);
-
-                    gtk_file_chooser_add_filter(dlg, filter);
+                    if (f.Patterns?.Any() == true || f.MimeTypes?.Any() == true)
+                    {
+                        var filter = gtk_file_filter_new();
+                        filtersDic[filter] = f;
+                        using (var b = new Utf8Buffer(f.Name))
+                        {
+                            gtk_file_filter_set_name(filter, b);
+                        }
+
+                        if (f.Patterns is not null)
+                        {
+                            foreach (var e in f.Patterns)
+                            {
+                                using (var b = new Utf8Buffer(e))
+                                {
+                                    gtk_file_filter_add_pattern(filter, b);
+                                }
+                            }
+                        }
+
+                        if (f.MimeTypes is not null)
+                        {
+                            foreach (var e in f.MimeTypes)
+                            {
+                                using (var b = new Utf8Buffer(e))
+                                {
+                                    gtk_file_filter_add_mime_type(filter, b);
+                                }
+                            }
+                        }
+
+                        gtk_file_chooser_add_filter(dlg, filter);
+                    }
                 }
+            }
 
             disposables = new List<IDisposable>
             {
@@ -62,7 +154,7 @@ namespace Avalonia.X11.NativeDialogs
                 }),
                 ConnectSignal<signal_dialog_response>(dlg, "response", (_, resp, __) =>
                 {
-                    string[] result = null;
+                    string[]? result = null;
                     if (resp == GtkResponseType.Accept)
                     {
                         var resultList = new List<string>();
@@ -70,20 +162,18 @@ namespace Avalonia.X11.NativeDialogs
                         var cgs = gs;
                         while (cgs != null)
                         {
-                            if (cgs->Data != IntPtr.Zero)
-                                resultList.Add(Utf8Buffer.StringFromPtr(cgs->Data));
-                            cgs = cgs->Next;
+                            if (cgs->Data != IntPtr.Zero
+                                && Utf8Buffer.StringFromPtr(cgs->Data) is string str) { resultList.Add(str); } cgs = cgs->Next;
                         }
                         g_slist_free(gs);
                         result = resultList.ToArray();
-                        
+
                         // GTK doesn't auto-append the extension, so we need to do that manually
                         if (action == GtkFileChooserAction.Save)
                         {
                             var currentFilter = gtk_file_chooser_get_filter(dlg);
                             filtersDic.TryGetValue(currentFilter, out var selectedFilter);
-                            for (var c = 0; c < result.Length; c++)
-                                result[c] = NameWithExtension(result[c], defaultExtension, selectedFilter);
+                            for (var c = 0; c < result.Length; c++) { result[c] = StorageProviderHelpers.NameWithExtension(result[c], defaultExtension, selectedFilter); }
                         }
                     }
 
@@ -97,92 +187,55 @@ namespace Avalonia.X11.NativeDialogs
                 action == GtkFileChooserAction.Save ? "Save"
                 : action == GtkFileChooserAction.SelectFolder ? "Select"
                 : "Open"))
+            {
                 gtk_dialog_add_button(dlg, open, GtkResponseType.Accept);
+            }
+
             using (var open = new Utf8Buffer("Cancel"))
+            {
                 gtk_dialog_add_button(dlg, open, GtkResponseType.Cancel);
-            if (initialFileName != null)
-                using (var fn = new Utf8Buffer(initialFileName))
-                {
-                    if (action == GtkFileChooserAction.Save)
-                        gtk_file_chooser_set_current_name(dlg, fn);
-                    else
-                        gtk_file_chooser_set_filename(dlg, fn);
-                }
+            }
 
-            gtk_file_chooser_set_do_overwrite_confirmation(dlg, overwritePrompt);
-            
-            gtk_window_present(dlg);
-            return tcs.Task;
-        }
+            Uri? folderPath = null;
+            if (initialFolder?.TryGetUri(out folderPath) == true)
+            {
+                using var dir = new Utf8Buffer(folderPath.LocalPath);
+                gtk_file_chooser_set_current_folder(dlg, dir);
+            }
 
-        string NameWithExtension(string path, string defaultExtension, FileDialogFilter filter)
-        {
-            var name = Path.GetFileName(path);
-            if (name != null && !name.Contains("."))
+            if (initialFileName != null)
             {
-                if (filter?.Extensions?.Count > 0)
-                {
-                    if (defaultExtension != null
-                        && filter.Extensions.Contains(defaultExtension))
-                        return path + "." + defaultExtension.TrimStart('.');
+                // gtk_file_chooser_set_filename() expects full path
+                using var fn = action == GtkFileChooserAction.Open
+                    ? new Utf8Buffer(Path.Combine(folderPath?.LocalPath ?? "", initialFileName))
+                    : new Utf8Buffer(initialFileName);
 
-                    var ext = filter.Extensions.FirstOrDefault(x => x != "*");
-                    if (ext != null)
-                        return path + "." + ext.TrimStart('.');
+                if (action == GtkFileChooserAction.Save)
+                {
+                    gtk_file_chooser_set_current_name(dlg, fn);
+                }
+                else
+                {
+                    gtk_file_chooser_set_filename(dlg, fn);
                 }
-
-                if (defaultExtension != null)
-                    path += "." + defaultExtension.TrimStart('.');
             }
 
-            return path;
-        }
-
-        public async Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
-        {
-            await EnsureInitialized();
-
-            var platformImpl = parent?.PlatformImpl;
-
-            return await await RunOnGlibThread(
-                () => ShowDialog(dialog.Title, platformImpl,
-                    dialog is OpenFileDialog ? GtkFileChooserAction.Open : GtkFileChooserAction.Save,
-                    (dialog as OpenFileDialog)?.AllowMultiple ?? false,
-                    Path.Combine(string.IsNullOrEmpty(dialog.Directory) ? "" : dialog.Directory,
-                        string.IsNullOrEmpty(dialog.InitialFileName) ? "" : dialog.InitialFileName), dialog.Filters,
-                    (dialog as SaveFileDialog)?.DefaultExtension, (dialog as SaveFileDialog)?.ShowOverwritePrompt ?? false));
-        }
-
-        public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
-        {
-            await EnsureInitialized();
-
-            var platformImpl = parent?.PlatformImpl;
+            gtk_file_chooser_set_do_overwrite_confirmation(dlg, overwritePrompt);
 
-            return await await RunOnGlibThread(async () =>
-            {
-                var res = await ShowDialog(dialog.Title, platformImpl,
-                    GtkFileChooserAction.SelectFolder, false, dialog.Directory, null, null, false);
-                return res?.FirstOrDefault();
-            });
+            gtk_window_present(dlg);
+            return tcs.Task;
         }
-        
-        async Task EnsureInitialized()
-        {
-            if (_initialized == null) _initialized = StartGtk();
 
-            if (!(await _initialized))
-                throw new Exception("Unable to initialize GTK on separate thread");
-        }
-        
-        void UpdateParent(IntPtr chooser, IWindowImpl parentWindow)
+        private static void UpdateParent(IntPtr chooser, IWindowImpl parentWindow)
         {
             var xid = parentWindow.Handle.Handle;
             gtk_widget_realize(chooser);
             var window = gtk_widget_get_window(chooser);
             var parent = GetForeignWindow(xid);
             if (window != IntPtr.Zero && parent != IntPtr.Zero)
+            {
                 gdk_window_set_transient_for(window, parent);
+            }
         }
     }
 }
diff --git a/src/Avalonia.X11/SMLib.cs b/src/Avalonia.X11/SMLib.cs
index e2b39cfcff..f8f13e32f8 100644
--- a/src/Avalonia.X11/SMLib.cs
+++ b/src/Avalonia.X11/SMLib.cs
@@ -124,7 +124,7 @@ namespace Avalonia.X11
             IntPtr smcConn,
             bool swap,
             int offendingMinorOpcode,
-            ulong offendingSequence,
+            nuint offendingSequence,
             int errorClass,
             int severity,
             IntPtr values
diff --git a/src/Avalonia.X11/Stubs.cs b/src/Avalonia.X11/Stubs.cs
deleted file mode 100644
index f73512f1e8..0000000000
--- a/src/Avalonia.X11/Stubs.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Avalonia.Platform;
-
-namespace Avalonia.X11
-{
-    class PlatformSettingsStub : IPlatformSettings
-    {
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-    }
-}
diff --git a/src/Avalonia.X11/X11Atoms.cs b/src/Avalonia.X11/X11Atoms.cs
index b59883ef94..b00879bd1d 100644
--- a/src/Avalonia.X11/X11Atoms.cs
+++ b/src/Avalonia.X11/X11Atoms.cs
@@ -17,7 +17,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2006 Novell, Inc. (https://www.novell.com)
 //
 //
 
@@ -39,182 +39,176 @@ using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
 
-    internal class X11Atoms
+    internal partial class X11Atoms
     {
         private readonly IntPtr _display;
 
         // Our atoms
-        public readonly IntPtr AnyPropertyType = (IntPtr)0;
-        public readonly IntPtr XA_PRIMARY = (IntPtr)1;
-        public readonly IntPtr XA_SECONDARY = (IntPtr)2;
-        public readonly IntPtr XA_ARC = (IntPtr)3;
-        public readonly IntPtr XA_ATOM = (IntPtr)4;
-        public readonly IntPtr XA_BITMAP = (IntPtr)5;
-        public readonly IntPtr XA_CARDINAL = (IntPtr)6;
-        public readonly IntPtr XA_COLORMAP = (IntPtr)7;
-        public readonly IntPtr XA_CURSOR = (IntPtr)8;
-        public readonly IntPtr XA_CUT_BUFFER0 = (IntPtr)9;
-        public readonly IntPtr XA_CUT_BUFFER1 = (IntPtr)10;
-        public readonly IntPtr XA_CUT_BUFFER2 = (IntPtr)11;
-        public readonly IntPtr XA_CUT_BUFFER3 = (IntPtr)12;
-        public readonly IntPtr XA_CUT_BUFFER4 = (IntPtr)13;
-        public readonly IntPtr XA_CUT_BUFFER5 = (IntPtr)14;
-        public readonly IntPtr XA_CUT_BUFFER6 = (IntPtr)15;
-        public readonly IntPtr XA_CUT_BUFFER7 = (IntPtr)16;
-        public readonly IntPtr XA_DRAWABLE = (IntPtr)17;
-        public readonly IntPtr XA_FONT = (IntPtr)18;
-        public readonly IntPtr XA_INTEGER = (IntPtr)19;
-        public readonly IntPtr XA_PIXMAP = (IntPtr)20;
-        public readonly IntPtr XA_POINT = (IntPtr)21;
-        public readonly IntPtr XA_RECTANGLE = (IntPtr)22;
-        public readonly IntPtr XA_RESOURCE_MANAGER = (IntPtr)23;
-        public readonly IntPtr XA_RGB_COLOR_MAP = (IntPtr)24;
-        public readonly IntPtr XA_RGB_BEST_MAP = (IntPtr)25;
-        public readonly IntPtr XA_RGB_BLUE_MAP = (IntPtr)26;
-        public readonly IntPtr XA_RGB_DEFAULT_MAP = (IntPtr)27;
-        public readonly IntPtr XA_RGB_GRAY_MAP = (IntPtr)28;
-        public readonly IntPtr XA_RGB_GREEN_MAP = (IntPtr)29;
-        public readonly IntPtr XA_RGB_RED_MAP = (IntPtr)30;
-        public readonly IntPtr XA_STRING = (IntPtr)31;
-        public readonly IntPtr XA_VISUALID = (IntPtr)32;
-        public readonly IntPtr XA_WINDOW = (IntPtr)33;
-        public readonly IntPtr XA_WM_COMMAND = (IntPtr)34;
-        public readonly IntPtr XA_WM_HINTS = (IntPtr)35;
-        public readonly IntPtr XA_WM_CLIENT_MACHINE = (IntPtr)36;
-        public readonly IntPtr XA_WM_ICON_NAME = (IntPtr)37;
-        public readonly IntPtr XA_WM_ICON_SIZE = (IntPtr)38;
-        public readonly IntPtr XA_WM_NAME = (IntPtr)39;
-        public readonly IntPtr XA_WM_NORMAL_HINTS = (IntPtr)40;
-        public readonly IntPtr XA_WM_SIZE_HINTS = (IntPtr)41;
-        public readonly IntPtr XA_WM_ZOOM_HINTS = (IntPtr)42;
-        public readonly IntPtr XA_MIN_SPACE = (IntPtr)43;
-        public readonly IntPtr XA_NORM_SPACE = (IntPtr)44;
-        public readonly IntPtr XA_MAX_SPACE = (IntPtr)45;
-        public readonly IntPtr XA_END_SPACE = (IntPtr)46;
-        public readonly IntPtr XA_SUPERSCRIPT_X = (IntPtr)47;
-        public readonly IntPtr XA_SUPERSCRIPT_Y = (IntPtr)48;
-        public readonly IntPtr XA_SUBSCRIPT_X = (IntPtr)49;
-        public readonly IntPtr XA_SUBSCRIPT_Y = (IntPtr)50;
-        public readonly IntPtr XA_UNDERLINE_POSITION = (IntPtr)51;
-        public readonly IntPtr XA_UNDERLINE_THICKNESS = (IntPtr)52;
-        public readonly IntPtr XA_STRIKEOUT_ASCENT = (IntPtr)53;
-        public readonly IntPtr XA_STRIKEOUT_DESCENT = (IntPtr)54;
-        public readonly IntPtr XA_ITALIC_ANGLE = (IntPtr)55;
-        public readonly IntPtr XA_X_HEIGHT = (IntPtr)56;
-        public readonly IntPtr XA_QUAD_WIDTH = (IntPtr)57;
-        public readonly IntPtr XA_WEIGHT = (IntPtr)58;
-        public readonly IntPtr XA_POINT_SIZE = (IntPtr)59;
-        public readonly IntPtr XA_RESOLUTION = (IntPtr)60;
-        public readonly IntPtr XA_COPYRIGHT = (IntPtr)61;
-        public readonly IntPtr XA_NOTICE = (IntPtr)62;
-        public readonly IntPtr XA_FONT_NAME = (IntPtr)63;
-        public readonly IntPtr XA_FAMILY_NAME = (IntPtr)64;
-        public readonly IntPtr XA_FULL_NAME = (IntPtr)65;
-        public readonly IntPtr XA_CAP_HEIGHT = (IntPtr)66;
-        public readonly IntPtr XA_WM_CLASS = (IntPtr)67;
-        public readonly IntPtr XA_WM_TRANSIENT_FOR = (IntPtr)68;
+        public IntPtr AnyPropertyType = (IntPtr)0;
+        public IntPtr XA_PRIMARY = (IntPtr)1;
+        public IntPtr XA_SECONDARY = (IntPtr)2;
+        public IntPtr XA_ARC = (IntPtr)3;
+        public IntPtr XA_ATOM = (IntPtr)4;
+        public IntPtr XA_BITMAP = (IntPtr)5;
+        public IntPtr XA_CARDINAL = (IntPtr)6;
+        public IntPtr XA_COLORMAP = (IntPtr)7;
+        public IntPtr XA_CURSOR = (IntPtr)8;
+        public IntPtr XA_CUT_BUFFER0 = (IntPtr)9;
+        public IntPtr XA_CUT_BUFFER1 = (IntPtr)10;
+        public IntPtr XA_CUT_BUFFER2 = (IntPtr)11;
+        public IntPtr XA_CUT_BUFFER3 = (IntPtr)12;
+        public IntPtr XA_CUT_BUFFER4 = (IntPtr)13;
+        public IntPtr XA_CUT_BUFFER5 = (IntPtr)14;
+        public IntPtr XA_CUT_BUFFER6 = (IntPtr)15;
+        public IntPtr XA_CUT_BUFFER7 = (IntPtr)16;
+        public IntPtr XA_DRAWABLE = (IntPtr)17;
+        public IntPtr XA_FONT = (IntPtr)18;
+        public IntPtr XA_INTEGER = (IntPtr)19;
+        public IntPtr XA_PIXMAP = (IntPtr)20;
+        public IntPtr XA_POINT = (IntPtr)21;
+        public IntPtr XA_RECTANGLE = (IntPtr)22;
+        public IntPtr XA_RESOURCE_MANAGER = (IntPtr)23;
+        public IntPtr XA_RGB_COLOR_MAP = (IntPtr)24;
+        public IntPtr XA_RGB_BEST_MAP = (IntPtr)25;
+        public IntPtr XA_RGB_BLUE_MAP = (IntPtr)26;
+        public IntPtr XA_RGB_DEFAULT_MAP = (IntPtr)27;
+        public IntPtr XA_RGB_GRAY_MAP = (IntPtr)28;
+        public IntPtr XA_RGB_GREEN_MAP = (IntPtr)29;
+        public IntPtr XA_RGB_RED_MAP = (IntPtr)30;
+        public IntPtr XA_STRING = (IntPtr)31;
+        public IntPtr XA_VISUALID = (IntPtr)32;
+        public IntPtr XA_WINDOW = (IntPtr)33;
+        public IntPtr XA_WM_COMMAND = (IntPtr)34;
+        public IntPtr XA_WM_HINTS = (IntPtr)35;
+        public IntPtr XA_WM_CLIENT_MACHINE = (IntPtr)36;
+        public IntPtr XA_WM_ICON_NAME = (IntPtr)37;
+        public IntPtr XA_WM_ICON_SIZE = (IntPtr)38;
+        public IntPtr XA_WM_NAME = (IntPtr)39;
+        public IntPtr XA_WM_NORMAL_HINTS = (IntPtr)40;
+        public IntPtr XA_WM_SIZE_HINTS = (IntPtr)41;
+        public IntPtr XA_WM_ZOOM_HINTS = (IntPtr)42;
+        public IntPtr XA_MIN_SPACE = (IntPtr)43;
+        public IntPtr XA_NORM_SPACE = (IntPtr)44;
+        public IntPtr XA_MAX_SPACE = (IntPtr)45;
+        public IntPtr XA_END_SPACE = (IntPtr)46;
+        public IntPtr XA_SUPERSCRIPT_X = (IntPtr)47;
+        public IntPtr XA_SUPERSCRIPT_Y = (IntPtr)48;
+        public IntPtr XA_SUBSCRIPT_X = (IntPtr)49;
+        public IntPtr XA_SUBSCRIPT_Y = (IntPtr)50;
+        public IntPtr XA_UNDERLINE_POSITION = (IntPtr)51;
+        public IntPtr XA_UNDERLINE_THICKNESS = (IntPtr)52;
+        public IntPtr XA_STRIKEOUT_ASCENT = (IntPtr)53;
+        public IntPtr XA_STRIKEOUT_DESCENT = (IntPtr)54;
+        public IntPtr XA_ITALIC_ANGLE = (IntPtr)55;
+        public IntPtr XA_X_HEIGHT = (IntPtr)56;
+        public IntPtr XA_QUAD_WIDTH = (IntPtr)57;
+        public IntPtr XA_WEIGHT = (IntPtr)58;
+        public IntPtr XA_POINT_SIZE = (IntPtr)59;
+        public IntPtr XA_RESOLUTION = (IntPtr)60;
+        public IntPtr XA_COPYRIGHT = (IntPtr)61;
+        public IntPtr XA_NOTICE = (IntPtr)62;
+        public IntPtr XA_FONT_NAME = (IntPtr)63;
+        public IntPtr XA_FAMILY_NAME = (IntPtr)64;
+        public IntPtr XA_FULL_NAME = (IntPtr)65;
+        public IntPtr XA_CAP_HEIGHT = (IntPtr)66;
+        public IntPtr XA_WM_CLASS = (IntPtr)67;
+        public IntPtr XA_WM_TRANSIENT_FOR = (IntPtr)68;
 
-        public readonly IntPtr EDID;
+        public IntPtr EDID;
 
-        public readonly IntPtr WM_PROTOCOLS;
-        public readonly IntPtr WM_DELETE_WINDOW;
-        public readonly IntPtr WM_TAKE_FOCUS;
-        public readonly IntPtr _NET_SUPPORTED;
-        public readonly IntPtr _NET_CLIENT_LIST;
-        public readonly IntPtr _NET_NUMBER_OF_DESKTOPS;
-        public readonly IntPtr _NET_DESKTOP_GEOMETRY;
-        public readonly IntPtr _NET_DESKTOP_VIEWPORT;
-        public readonly IntPtr _NET_CURRENT_DESKTOP;
-        public readonly IntPtr _NET_DESKTOP_NAMES;
-        public readonly IntPtr _NET_ACTIVE_WINDOW;
-        public readonly IntPtr _NET_WORKAREA;
-        public readonly IntPtr _NET_SUPPORTING_WM_CHECK;
-        public readonly IntPtr _NET_VIRTUAL_ROOTS;
-        public readonly IntPtr _NET_DESKTOP_LAYOUT;
-        public readonly IntPtr _NET_SHOWING_DESKTOP;
-        public readonly IntPtr _NET_CLOSE_WINDOW;
-        public readonly IntPtr _NET_MOVERESIZE_WINDOW;
-        public readonly IntPtr _NET_WM_MOVERESIZE;
-        public readonly IntPtr _NET_RESTACK_WINDOW;
-        public readonly IntPtr _NET_REQUEST_FRAME_EXTENTS;
-        public readonly IntPtr _NET_WM_NAME;
-        public readonly IntPtr _NET_WM_VISIBLE_NAME;
-        public readonly IntPtr _NET_WM_ICON_NAME;
-        public readonly IntPtr _NET_WM_VISIBLE_ICON_NAME;
-        public readonly IntPtr _NET_WM_DESKTOP;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE;
-        public readonly IntPtr _NET_WM_STATE;
-        public readonly IntPtr _NET_WM_ALLOWED_ACTIONS;
-        public readonly IntPtr _NET_WM_STRUT;
-        public readonly IntPtr _NET_WM_STRUT_PARTIAL;
-        public readonly IntPtr _NET_WM_ICON_GEOMETRY;
-        public readonly IntPtr _NET_WM_ICON;
-        public readonly IntPtr _NET_WM_PID;
-        public readonly IntPtr _NET_WM_HANDLED_ICONS;
-        public readonly IntPtr _NET_WM_USER_TIME;
-        public readonly IntPtr _NET_FRAME_EXTENTS;
-        public readonly IntPtr _NET_WM_PING;
-        public readonly IntPtr _NET_WM_SYNC_REQUEST;
-        public readonly IntPtr _NET_SYSTEM_TRAY_S;
-        public readonly IntPtr _NET_SYSTEM_TRAY_ORIENTATION;
-        public readonly IntPtr _NET_SYSTEM_TRAY_OPCODE;
-        public readonly IntPtr _NET_WM_STATE_MAXIMIZED_HORZ;
-        public readonly IntPtr _NET_WM_STATE_MAXIMIZED_VERT;
-        public readonly IntPtr _NET_WM_STATE_FULLSCREEN;
-        public readonly IntPtr _XEMBED;
-        public readonly IntPtr _XEMBED_INFO;
-        public readonly IntPtr _MOTIF_WM_HINTS;
-        public readonly IntPtr _NET_WM_STATE_SKIP_TASKBAR;
-        public readonly IntPtr _NET_WM_STATE_ABOVE;
-        public readonly IntPtr _NET_WM_STATE_MODAL;
-        public readonly IntPtr _NET_WM_STATE_HIDDEN;
-        public readonly IntPtr _NET_WM_CONTEXT_HELP;
-        public readonly IntPtr _NET_WM_WINDOW_OPACITY;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_DESKTOP;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_DOCK;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_TOOLBAR;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_MENU;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_UTILITY;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_SPLASH;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_DIALOG;
-        public readonly IntPtr _NET_WM_WINDOW_TYPE_NORMAL;
-        public readonly IntPtr CLIPBOARD;
-        public readonly IntPtr CLIPBOARD_MANAGER;
-        public readonly IntPtr SAVE_TARGETS;
-        public readonly IntPtr MULTIPLE;
-        public readonly IntPtr PRIMARY;
-        public readonly IntPtr OEMTEXT;
-        public readonly IntPtr UNICODETEXT;
-        public readonly IntPtr TARGETS;
-        public readonly IntPtr UTF8_STRING;
-        public readonly IntPtr UTF16_STRING;
-        public readonly IntPtr ATOM_PAIR;
-        public readonly IntPtr MANAGER;
-        public readonly IntPtr _KDE_NET_WM_BLUR_BEHIND_REGION;
-        public readonly IntPtr INCR;
+        public IntPtr WM_PROTOCOLS;
+        public IntPtr WM_DELETE_WINDOW;
+        public IntPtr WM_TAKE_FOCUS;
+        public IntPtr _NET_SUPPORTED;
+        public IntPtr _NET_CLIENT_LIST;
+        public IntPtr _NET_NUMBER_OF_DESKTOPS;
+        public IntPtr _NET_DESKTOP_GEOMETRY;
+        public IntPtr _NET_DESKTOP_VIEWPORT;
+        public IntPtr _NET_CURRENT_DESKTOP;
+        public IntPtr _NET_DESKTOP_NAMES;
+        public IntPtr _NET_ACTIVE_WINDOW;
+        public IntPtr _NET_WORKAREA;
+        public IntPtr _NET_SUPPORTING_WM_CHECK;
+        public IntPtr _NET_VIRTUAL_ROOTS;
+        public IntPtr _NET_DESKTOP_LAYOUT;
+        public IntPtr _NET_SHOWING_DESKTOP;
+        public IntPtr _NET_CLOSE_WINDOW;
+        public IntPtr _NET_MOVERESIZE_WINDOW;
+        public IntPtr _NET_WM_MOVERESIZE;
+        public IntPtr _NET_RESTACK_WINDOW;
+        public IntPtr _NET_REQUEST_FRAME_EXTENTS;
+        public IntPtr _NET_WM_NAME;
+        public IntPtr _NET_WM_VISIBLE_NAME;
+        public IntPtr _NET_WM_ICON_NAME;
+        public IntPtr _NET_WM_VISIBLE_ICON_NAME;
+        public IntPtr _NET_WM_DESKTOP;
+        public IntPtr _NET_WM_WINDOW_TYPE;
+        public IntPtr _NET_WM_STATE;
+        public IntPtr _NET_WM_ALLOWED_ACTIONS;
+        public IntPtr _NET_WM_STRUT;
+        public IntPtr _NET_WM_STRUT_PARTIAL;
+        public IntPtr _NET_WM_ICON_GEOMETRY;
+        public IntPtr _NET_WM_ICON;
+        public IntPtr _NET_WM_PID;
+        public IntPtr _NET_WM_HANDLED_ICONS;
+        public IntPtr _NET_WM_USER_TIME;
+        public IntPtr _NET_FRAME_EXTENTS;
+        public IntPtr _NET_WM_PING;
+        public IntPtr _NET_WM_SYNC_REQUEST;
+        public IntPtr _NET_WM_SYNC_REQUEST_COUNTER;
+        public IntPtr _NET_SYSTEM_TRAY_S;
+        public IntPtr _NET_SYSTEM_TRAY_ORIENTATION;
+        public IntPtr _NET_SYSTEM_TRAY_OPCODE;
+        public IntPtr _NET_WM_STATE_MAXIMIZED_HORZ;
+        public IntPtr _NET_WM_STATE_MAXIMIZED_VERT;
+        public IntPtr _NET_WM_STATE_FULLSCREEN;
+        public IntPtr _XEMBED;
+        public IntPtr _XEMBED_INFO;
+        public IntPtr _MOTIF_WM_HINTS;
+        public IntPtr _NET_WM_STATE_SKIP_TASKBAR;
+        public IntPtr _NET_WM_STATE_ABOVE;
+        public IntPtr _NET_WM_STATE_MODAL;
+        public IntPtr _NET_WM_STATE_HIDDEN;
+        public IntPtr _NET_WM_CONTEXT_HELP;
+        public IntPtr _NET_WM_WINDOW_OPACITY;
+        public IntPtr _NET_WM_WINDOW_TYPE_DESKTOP;
+        public IntPtr _NET_WM_WINDOW_TYPE_DOCK;
+        public IntPtr _NET_WM_WINDOW_TYPE_TOOLBAR;
+        public IntPtr _NET_WM_WINDOW_TYPE_MENU;
+        public IntPtr _NET_WM_WINDOW_TYPE_UTILITY;
+        public IntPtr _NET_WM_WINDOW_TYPE_SPLASH;
+        public IntPtr _NET_WM_WINDOW_TYPE_DIALOG;
+        public IntPtr _NET_WM_WINDOW_TYPE_NORMAL;
+        public IntPtr CLIPBOARD;
+        public IntPtr CLIPBOARD_MANAGER;
+        public IntPtr SAVE_TARGETS;
+        public IntPtr MULTIPLE;
+        public IntPtr PRIMARY;
+        public IntPtr OEMTEXT;
+        public IntPtr UNICODETEXT;
+        public IntPtr TARGETS;
+        public IntPtr UTF8_STRING;
+        public IntPtr UTF16_STRING;
+        public IntPtr ATOM_PAIR;
+        public IntPtr MANAGER;
+        public IntPtr _KDE_NET_WM_BLUR_BEHIND_REGION;
+        public IntPtr INCR;
 
         private readonly Dictionary<string, IntPtr> _namesToAtoms  = new Dictionary<string, IntPtr>();
         private readonly Dictionary<IntPtr, string> _atomsToNames = new Dictionary<IntPtr, string>();
         public X11Atoms(IntPtr display)
         {
             _display = display;
+            PopulateAtoms(display);
+        }
 
-            // make sure this array stays in sync with the statements below
-
-            var fields = typeof(X11Atoms).GetFields()
-                .Where(f => f.FieldType == typeof(IntPtr) && (IntPtr)f.GetValue(this) == IntPtr.Zero).ToArray();
-            var atomNames = fields.Select(f => f.Name).ToArray();
-
-            IntPtr[] atoms = new IntPtr [atomNames.Length];
-            ;
-
-            XInternAtoms(display, atomNames, atomNames.Length, true, atoms);
-
-            for (var c = 0; c < fields.Length; c++)
+        private void InitAtom(ref IntPtr field, string name, IntPtr value)
+        {
+            if (value != IntPtr.Zero)
             {
-                _namesToAtoms[fields[c].Name] = atoms[c];
-                _atomsToNames[atoms[c]] = fields[c].Name;
-                fields[c].SetValue(this, atoms[c]);
+                field = value;
+                _namesToAtoms[name] = value;
+                _atomsToNames[value] = name;
             }
         }
 
diff --git a/src/Avalonia.X11/X11CursorFactory.cs b/src/Avalonia.X11/X11CursorFactory.cs
index 60f035cd7e..6041b53a62 100644
--- a/src/Avalonia.X11/X11CursorFactory.cs
+++ b/src/Avalonia.X11/X11CursorFactory.cs
@@ -5,13 +5,14 @@ using System.Runtime.InteropServices;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
 using Avalonia.Platform;
+using Avalonia.SourceGenerator;
 using Avalonia.Utilities;
 
 #nullable enable
 
 namespace Avalonia.X11
 {
-    class X11CursorFactory : ICursorFactory
+    partial class X11CursorFactory : ICursorFactory
     {
         private static readonly byte[] NullCursorData = new byte[] { 0 };
 
@@ -48,11 +49,14 @@ namespace Avalonia.X11
                 {StandardCursorType.TopRightCorner, CursorFontShape.XC_top_right_corner},
             };
 
+        [GenerateEnumValueList]
+        private static partial CursorFontShape[] GetAllCursorShapes();
+        
         public X11CursorFactory(IntPtr display)
         {
             _display = display;
             _nullCursor = GetNullCursor(display);
-            _cursors = Enum.GetValues(typeof(CursorFontShape)).Cast<CursorFontShape>()
+            _cursors = GetAllCursorShapes()
                 .ToDictionary(id => id, id => XLib.XCreateFontCursor(_display, id));
         }
 
diff --git a/src/Avalonia.X11/X11Globals.cs b/src/Avalonia.X11/X11Globals.cs
index 057693f810..39834a44b3 100644
--- a/src/Avalonia.X11/X11Globals.cs
+++ b/src/Avalonia.X11/X11Globals.cs
@@ -41,7 +41,7 @@ namespace Avalonia.X11
                 {
                     _wmName = value;
                     // The collection might change during enumeration
-                    foreach (var s in _subscribers.ToList()) 
+                    foreach (var s in _subscribers.ToArray()) 
                         s.WmChanged(value);
                 }
             }
@@ -69,7 +69,7 @@ namespace Avalonia.X11
                 {
                     _isCompositionEnabled = value;
                     // The collection might change during enumeration
-                    foreach (var s in _subscribers.ToList()) 
+                    foreach (var s in _subscribers.ToArray()) 
                         s.CompositionChanged(value);
                 }
             }
diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index 6632573ba2..632a7d39a2 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -2,23 +2,13 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using Avalonia.Controls.Platform.Surfaces;
-using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-using static Avalonia.X11.XLib;
+
 namespace Avalonia.X11
 {
     class X11IconLoader : IPlatformIconLoader
     {
-        private readonly X11Info _x11;
-
-        public X11IconLoader(X11Info x11)
-        {
-            _x11 = x11;
-        }
-        
         IWindowIconImpl LoadIcon(Bitmap bitmap)
         {
             var rv = new X11IconData(bitmap);
@@ -51,12 +41,6 @@ namespace Avalonia.X11
             _width = Math.Min(bitmap.PixelSize.Width, 128);
             _height = Math.Min(bitmap.PixelSize.Height, 128);
             _bdata = new uint[_width * _height];
-            fixed (void* ptr = _bdata)
-            {
-                var iptr = (int*)ptr;
-                iptr[0] = _width;
-                iptr[1] = _height;
-            }
             using(var rt = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateRenderTarget(new[]{this}))
             using (var ctx = rt.CreateDrawingContext(null))
                 ctx.DrawBitmap(bitmap.PlatformImpl, 1, new Rect(bitmap.Size),
@@ -68,7 +52,7 @@ namespace Avalonia.X11
             {
                 var r = y * _width;
                 for (var x = 0; x < _width; x++)
-                    Data[r + x] = new UIntPtr(_bdata[r + x]);
+                    Data[r + x + 2] = new UIntPtr(_bdata[r + x]);
             }
 
             _bdata = null;
@@ -77,9 +61,7 @@ namespace Avalonia.X11
         public void Save(Stream outputStream)
         {
             using (var wr =
-#pragma warning disable CS0618 // Type or member is obsolete
                 new WriteableBitmap(new PixelSize(_width, _height), new Vector(96, 96), PixelFormat.Bgra8888))
-#pragma warning restore CS0618 // Type or member is obsolete
             {
                 using (var fb = wr.Lock())
                 {
@@ -89,7 +71,7 @@ namespace Avalonia.X11
                         var r = y * _width;
                         var fbr = y * fb.RowBytes / 4;
                         for (var x = 0; x < _width; x++)
-                            fbp[fbr + x] = Data[r + x].ToUInt32();
+                            fbp[fbr + x] = Data[r + x + 2].ToUInt32();
                     }
                 }
                 wr.Save(outputStream);
diff --git a/src/Avalonia.X11/X11Info.cs b/src/Avalonia.X11/X11Info.cs
index 9920907601..13dc460f45 100644
--- a/src/Avalonia.X11/X11Info.cs
+++ b/src/Avalonia.X11/X11Info.cs
@@ -33,6 +33,7 @@ namespace Avalonia.X11
         public IntPtr LastActivityTimestamp { get; set; }
         public XVisualInfo? TransparentVisualInfo { get; set; }
         public bool HasXim { get; set; }
+        public bool HasXSync { get; set; }
         public IntPtr DefaultFontSet { get; set; }
         
         public unsafe X11Info(IntPtr display, IntPtr deferredDisplay, bool useXim)
@@ -101,6 +102,15 @@ namespace Avalonia.X11
             {
                 //Ignore, XI is not supported
             }
+
+            try
+            {
+                HasXSync = XSyncInitialize(display, out _, out _) != Status.Success;
+            }
+            catch
+            {
+                //Ignore, XSync is not supported
+            }
         }
     }
 }
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index ec3f29c806..96dc16e186 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Dialogs;
 using Avalonia.FreeDesktop;
 using Avalonia.FreeDesktop.DBusIme;
 using Avalonia.Input;
@@ -13,9 +14,9 @@ using Avalonia.OpenGL;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.X11;
 using Avalonia.X11.Glx;
-using Avalonia.X11.NativeDialogs;
 using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
@@ -29,6 +30,7 @@ namespace Avalonia.X11
         public XI2Manager XI2;
         public X11Info Info { get; private set; }
         public IX11Screens X11Screens { get; private set; }
+        public Compositor Compositor { get; private set; }
         public IScreenImpl Screens { get; private set; }
         public X11PlatformOptions Options { get; private set; }
         public IntPtr OrphanedWindow { get; private set; }
@@ -78,9 +80,8 @@ namespace Avalonia.X11
                 .Bind<IKeyboardDevice>().ToFunc(() => KeyboardDevice)
                 .Bind<ICursorFactory>().ToConstant(new X11CursorFactory(Display))
                 .Bind<IClipboard>().ToConstant(new X11Clipboard(this))
-                .Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
-                .Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader(Info))
-                .Bind<ISystemDialogImpl>().ToConstant(new GtkSystemDialog())
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
+                .Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader())
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider())
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(new X11PlatformLifetimeEvents(this));
             
@@ -101,7 +102,13 @@ namespace Avalonia.X11
                     GlxPlatformOpenGlInterface.TryInitialize(Info, Options.GlProfiles);
             }
 
-            
+            var gl = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+            if (gl != null)
+                AvaloniaLocator.CurrentMutable.Bind<IPlatformGpu>().ToConstant(gl);
+
+            if (options.UseCompositor)
+                Compositor = new Compositor(AvaloniaLocator.Current.GetService<IRenderLoop>()!, gl);
+
         }
 
         public IntPtr DeferredDisplay { get; set; }
@@ -210,9 +217,15 @@ namespace Avalonia
 
         /// <summary>
         /// Enables global menu support on Linux desktop environments where it's supported (e. g. XFCE and MATE with plugin, KDE, etc).
-        /// The default value is false.
+        /// The default value is true.
+        /// </summary>
+        public bool UseDBusMenu { get; set; } = true;
+
+        /// <summary>
+        /// Enables DBus file picker instead of GTK.
+        /// The default value is true.
         /// </summary>
-        public bool UseDBusMenu { get; set; }
+        public bool UseDBusFilePicker { get; set; } = true;
 
         /// <summary>
         /// Deferred renderer would be used when set to true. Immediate renderer when set to false. The default value is true.
@@ -223,6 +236,8 @@ namespace Avalonia
         /// </remarks>
         public bool UseDeferredRendering { get; set; } = true;
 
+        public bool UseCompositor { get; set; } = true;
+
         /// <summary>
         /// Determines whether to use IME.
         /// IME would be enabled by default if the current user input language is one of the following: Mandarin, Japanese, Vietnamese or Korean.
@@ -262,7 +277,9 @@ namespace Avalonia
             // and sometimes attempts to use GLX might cause a segfault
             "llvmpipe"
         };
-        public string WmClass { get; set; } = Assembly.GetEntryAssembly()?.GetName()?.Name ?? "AvaloniaApplication";
+
+        
+        public string WmClass { get; set; }
 
         /// <summary>
         /// Enables multitouch support. The default value is true.
@@ -271,6 +288,18 @@ namespace Avalonia
         /// Multitouch allows a surface (a touchpad or touchscreen) to recognize the presence of more than one point of contact with the surface at the same time.
         /// </remarks>
         public bool? EnableMultiTouch { get; set; } = true;
+
+        public X11PlatformOptions()
+        {
+            try
+            {
+                WmClass = Assembly.GetEntryAssembly()?.GetName()?.Name;
+            }
+            catch
+            {
+                //
+            }
+        }
     }
     public static class AvaloniaX11PlatformExtensions
     {
diff --git a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
index 1a17a018e8..8412bd0730 100644
--- a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
+++ b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
@@ -153,14 +153,14 @@ namespace Avalonia.X11
         }
 
         private static void StaticErrorHandler(IntPtr smcConn, bool swap, int offendingMinorOpcode,
-            ulong offendingSequence, int errorClass, int severity, IntPtr values)
+            nuint offendingSequence, int errorClass, int severity, IntPtr values)
         {
             GetInstance(smcConn)
                 ?.ErrorHandler(swap, offendingMinorOpcode, offendingSequence, errorClass, severity, values);
         }
 
         // ReSharper disable UnusedParameter.Local
-        private void ErrorHandler(bool swap, int offendingMinorOpcode, ulong offendingSequence, int errorClass,
+        private void ErrorHandler(bool swap, int offendingMinorOpcode, nuint offendingSequence, int errorClass,
             int severity, IntPtr values)
         {
             Logger.TryGet(LogEventLevel.Warning, LogArea.X11Platform)?.Log(this,
diff --git a/src/Avalonia.X11/X11Screens.cs b/src/Avalonia.X11/X11Screens.cs
index bf5c74e0e5..ba6029b350 100644
--- a/src/Avalonia.X11/X11Screens.cs
+++ b/src/Avalonia.X11/X11Screens.cs
@@ -9,7 +9,7 @@ using JetBrains.Annotations;
 
 namespace Avalonia.X11
 {
-    class X11Screens  : IScreenImpl
+    class X11Screens : IScreenImpl
     {
         private IX11Screens _impl;
 
@@ -200,10 +200,25 @@ namespace Avalonia.X11
 
         }
 
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
+
         public int ScreenCount => _impl.Screens.Length;
 
         public IReadOnlyList<Screen> AllScreens =>
-            _impl.Screens.Select(s => new Screen(s.PixelDensity, s.Bounds, s.WorkingArea, s.Primary)).ToArray();
+            _impl.Screens.Select(s => new Screen(s.Scaling, s.Bounds, s.WorkingArea, s.IsPrimary)).ToArray();
     }
 
     interface IX11Screens
@@ -266,30 +281,34 @@ namespace Avalonia.X11
     {
         private const int FullHDWidth = 1920;
         private const int FullHDHeight = 1080;
-        public bool Primary { get; }
+        public bool IsPrimary { get; }
         public string Name { get; set; }
         public PixelRect Bounds { get; set; }
         public Size? PhysicalSize { get; set; }
-        public double PixelDensity { get; set; }
+        public double Scaling { get; set; }
         public PixelRect WorkingArea { get; set; }
 
-        public X11Screen(PixelRect bounds, bool primary,
-            string name, Size? physicalSize, double? pixelDensity)
+        public X11Screen(
+            PixelRect bounds,
+            bool isPrimary,
+            string name,
+            Size? physicalSize,
+            double? scaling)
         {
-            Primary = primary;
+            IsPrimary = isPrimary;
             Name = name;
             Bounds = bounds;
-            if (physicalSize == null && pixelDensity == null)
+            if (physicalSize == null && scaling == null)
             {
-                PixelDensity = 1;
+                Scaling = 1;
             }
-            else if (pixelDensity == null)
+            else if (scaling == null)
             {
-                PixelDensity = GuessPixelDensity(bounds, physicalSize.Value);
+                Scaling = GuessPixelDensity(bounds, physicalSize.Value);
             }
             else
             {
-                PixelDensity = pixelDensity.Value;
+                Scaling = scaling.Value;
                 PhysicalSize = physicalSize;
             }
         }
diff --git a/src/Avalonia.X11/X11Structs.cs b/src/Avalonia.X11/X11Structs.cs
index b1006b43ee..3f0a6aeb67 100644
--- a/src/Avalonia.X11/X11Structs.cs
+++ b/src/Avalonia.X11/X11Structs.cs
@@ -32,6 +32,7 @@ using System.Collections;
 using System.Drawing;
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 // ReSharper disable FieldCanBeMadeReadOnly.Global
 // ReSharper disable IdentifierTypo
@@ -545,7 +546,7 @@ namespace Avalonia.X11 {
         {
             if (data == null)
                 throw new InvalidOperationException();
-            return *(T*)data;
+            return Unsafe.ReadUnaligned<T>(data);
         }
     }
 
@@ -660,7 +661,7 @@ namespace Avalonia.X11 {
 			Type type = ev.GetType ();
 			FieldInfo [] fields = type.GetFields (System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
 			for (int i = 0; i < fields.Length; i++) {
-				if (result != string.Empty) {
+				if (!string.IsNullOrEmpty(result)) {
 					result += ", ";
 				}
 				object value = fields [i].GetValue (ev);
diff --git a/src/Avalonia.X11/X11Window.Xim.cs b/src/Avalonia.X11/X11Window.Xim.cs
index ecb23ff097..10aece7f2e 100644
--- a/src/Avalonia.X11/X11Window.Xim.cs
+++ b/src/Avalonia.X11/X11Window.Xim.cs
@@ -10,17 +10,21 @@ namespace Avalonia.X11
 {
     partial class X11Window
     {
-
         class XimInputMethod : ITextInputMethodImpl, IX11InputMethodControl
         {
             private readonly X11Window _parent;
             private bool _controlActive, _windowActive, _imeActive;
             private Rect? _queuedCursorRect;
+            private ITextInputMethodClient? _client;
 
             public XimInputMethod(X11Window parent)
             {
                 _parent = parent;
             }
+
+            public ITextInputMethodClient? Client => _client;
+
+            public bool IsActive => _client != null;
             
             public void SetCursorRect(Rect rect)
             {
@@ -58,9 +62,9 @@ namespace Avalonia.X11
                 UpdateActive();
             }
 
-            public void SetActive(bool active)
+            public void SetClient(ITextInputMethodClient client)
             {
-                _controlActive = active;
+                _client = client;
                 UpdateActive();
             }
 
@@ -87,7 +91,7 @@ namespace Avalonia.X11
                 // No-op
             }
             
-            public void SetOptions(TextInputOptionsQueryEventArgs options)
+            public void SetOptions(TextInputOptions options)
             {
                 // No-op
             }
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 520b35dd03..690ac0ebce 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -17,9 +17,12 @@ using Avalonia.Input.TextInput;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Avalonia.X11.Glx;
+using Avalonia.X11.NativeDialogs;
 using static Avalonia.X11.XLib;
 // ReSharper disable IdentifierTypo
 // ReSharper disable StringLiteralTypo
@@ -28,7 +31,8 @@ namespace Avalonia.X11
     unsafe partial class X11Window : IWindowImpl, IPopupImpl, IXI2Client,
         ITopLevelImplWithNativeMenuExporter,
         ITopLevelImplWithNativeControlHost,
-        ITopLevelImplWithTextInputMethod
+        ITopLevelImplWithTextInputMethod,
+        ITopLevelImplWithStorageProvider
     {
         private readonly AvaloniaX11Platform _platform;
         private readonly bool _popup;
@@ -45,6 +49,9 @@ namespace Avalonia.X11
         private IntPtr _handle;
         private IntPtr _xic;
         private IntPtr _renderHandle;
+        private IntPtr _xSyncCounter;
+        private XSyncValue _xSyncValue;
+        private XSyncState _xSyncState = 0;
         private bool _mapped;
         private bool _wasMappedAtLeastOnce = false;
         private double? _scalingOverride;
@@ -52,6 +59,14 @@ namespace Avalonia.X11
         private TransparencyHelper _transparencyHelper;
         private RawEventGrouper _rawEventGrouper;
         private bool _useRenderWindow = false;
+
+        enum XSyncState
+        {
+            None,
+            WaitConfigure,
+            WaitPaint
+        }
+        
         public X11Window(AvaloniaX11Platform platform, IWindowImpl popupParent)
         {
             _platform = platform;
@@ -105,7 +120,7 @@ namespace Avalonia.X11
 
             if (!_popup && Screen != null)
             {
-                var monitor = Screen.AllScreens.OrderBy(x => x.PixelDensity)
+                var monitor = Screen.AllScreens.OrderBy(x => x.Scaling)
                    .FirstOrDefault(m => m.Bounds.Contains(Position));
 
                 if (monitor != null)
@@ -134,8 +149,8 @@ namespace Avalonia.X11
                                        SetWindowValuemask.WinGravity | SetWindowValuemask.BackingStore)), ref attr);
             else
                 _renderHandle = _handle;
-                
-            Handle = new PlatformHandle(_handle, "XID");
+
+            Handle = new SurfacePlatformHandle(this);
             _realSize = new PixelSize(defaultWidth, defaultHeight);
             platform.Windows[_handle] = OnEvent;
             XEventMask ignoredMask = XEventMask.SubstructureRedirectMask
@@ -153,8 +168,7 @@ namespace Avalonia.X11
             XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_WINDOW_TYPE, _x11.Atoms.XA_ATOM,
                 32, PropertyMode.Replace, new[] {_x11.Atoms._NET_WM_WINDOW_TYPE_NORMAL}, 1);
 
-            if (platform.Options.WmClass != null)
-                SetWmClass(platform.Options.WmClass);
+            SetWmClass(_platform.Options.WmClass);
 
             var surfaces = new List<object>
             {
@@ -169,7 +183,9 @@ namespace Avalonia.X11
             if (glx != null)
                 surfaces.Insert(0, new GlxGlPlatformSurface(glx.Display, glx.DeferredContext,
                     new SurfaceInfo(this, _x11.Display, _handle, _renderHandle)));
-            
+
+            surfaces.Add(Handle);
+
             Surfaces = surfaces.ToArray();
             UpdateMotifHints();
             UpdateSizeHints(null);
@@ -188,6 +204,22 @@ namespace Avalonia.X11
                 NativeMenuExporter = DBusMenuExporter.TryCreateTopLevelNativeMenu(_handle);
             NativeControlHost = new X11NativeControlHost(_platform, this);
             InitializeIme();
+            
+            XChangeProperty(_x11.Display, _handle, _x11.Atoms.WM_PROTOCOLS, _x11.Atoms.XA_ATOM, 32,
+                PropertyMode.Replace, new[] { _x11.Atoms.WM_DELETE_WINDOW, _x11.Atoms._NET_WM_SYNC_REQUEST }, 2);
+
+            if (_x11.HasXSync)
+            {
+                _xSyncCounter = XSyncCreateCounter(_x11.Display, _xSyncValue);
+                XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_SYNC_REQUEST_COUNTER,
+                    _x11.Atoms.XA_CARDINAL, 32, PropertyMode.Replace, ref _xSyncCounter, 1);
+            }
+
+            StorageProvider = new CompositeStorageProvider(new Func<Task<IStorageProvider>>[]
+            {
+                () => _platform.Options.UseDBusFilePicker ? DBusSystemDialog.TryCreate(Handle) : Task.FromResult<IStorageProvider>(null),
+                () => GtkSystemDialog.TryCreate(this),
+            });
         }
 
         class SurfaceInfo  : EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
@@ -270,7 +302,7 @@ namespace Avalonia.X11
                 min_height = min.Height
             };
             hints.height_inc = hints.width_inc = 1;
-            var flags = XSizeHintsFlags.PMinSize | XSizeHintsFlags.PResizeInc;
+            var flags = XSizeHintsFlags.PMinSize | XSizeHintsFlags.PResizeInc | XSizeHintsFlags.PPosition | XSizeHintsFlags.PSize;
             // People might be passing double.MaxValue
             if (max.Width < 100000 && max.Height < 100000)
             {
@@ -358,13 +390,15 @@ namespace Avalonia.X11
 
             if (customRendererFactory != null)
                 return customRendererFactory.Create(root, loop);
-            
-            return _platform.Options.UseDeferredRendering ?
-                new DeferredRenderer(root, loop)
-                {
-                    RenderOnlyOnRenderThread = true
-                } :
-                (IRenderer)new X11ImmediateRendererProxy(root, loop);
+
+            return _platform.Options.UseDeferredRendering
+                ? _platform.Options.UseCompositor
+                    ? new CompositingRenderer(root, this._platform.Compositor)
+                    : new DeferredRenderer(root, loop)
+                    {
+                        RenderOnlyOnRenderThread = true
+                    }
+                : (IRenderer)new X11ImmediateRendererProxy(root, loop);
         }
 
         void OnEvent(ref XEvent ev)
@@ -381,15 +415,7 @@ namespace Avalonia.X11
                      (ev.type == XEventName.VisibilityNotify &&
                       ev.VisibilityEvent.state < 2))
             {
-                if (!_triggeredExpose)
-                {
-                    _triggeredExpose = true;
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        _triggeredExpose = false;
-                        DoPaint();
-                    }, DispatcherPriority.Render);
-                }
+                EnqueuePaint();
             }
             else if (ev.type == XEventName.FocusIn)
             {
@@ -501,6 +527,11 @@ namespace Avalonia.X11
                 if (_useRenderWindow)
                     XConfigureResizeWindow(_x11.Display, _renderHandle, ev.ConfigureEvent.width,
                         ev.ConfigureEvent.height);
+                if (_xSyncState == XSyncState.WaitConfigure)
+                {
+                    _xSyncState = XSyncState.WaitPaint;
+                    EnqueuePaint();
+                }
             }
             else if (ev.type == XEventName.DestroyNotify 
                      && ev.DestroyWindowEvent.window == _handle)
@@ -516,7 +547,12 @@ namespace Avalonia.X11
                         if (Closing?.Invoke() != true)
                             Dispose();
                     }
-
+                    else if (ev.ClientMessageEvent.ptr1 == _x11.Atoms._NET_WM_SYNC_REQUEST)
+                    {
+                        _xSyncValue.Lo = new UIntPtr(ev.ClientMessageEvent.ptr3.ToPointer()).ToUInt32();
+                        _xSyncValue.Hi = ev.ClientMessageEvent.ptr4.ToInt32();
+                        _xSyncState = XSyncState.WaitConfigure;
+                    }
                 }
             }
             else if (ev.type == XEventName.KeyPress || ev.type == XEventName.KeyRelease)
@@ -534,9 +570,9 @@ namespace Avalonia.X11
                 newScaling = _scalingOverride.Value;
             else
             {
-                var monitor = _platform.X11Screens.Screens.OrderBy(x => x.PixelDensity)
+                var monitor = _platform.X11Screens.Screens.OrderBy(x => x.Scaling)
                     .FirstOrDefault(m => m.Bounds.Contains(Position));
-                newScaling = monitor?.PixelDensity ?? RenderScaling;
+                newScaling = monitor?.Scaling ?? RenderScaling;
             }
 
             if (RenderScaling != newScaling)
@@ -728,9 +764,27 @@ namespace Avalonia.X11
             ScheduleInput(mev, ref ev);
         }
 
+        void EnqueuePaint()
+        {
+            if (!_triggeredExpose)
+            {
+                _triggeredExpose = true;
+                Dispatcher.UIThread.Post(() =>
+                {
+                    _triggeredExpose = false;
+                    DoPaint();
+                }, DispatcherPriority.Render);
+            }
+        }
+        
         void DoPaint()
         {
             Paint?.Invoke(new Rect());
+            if (_xSyncCounter != IntPtr.Zero && _xSyncState == XSyncState.WaitPaint)
+            {
+                _xSyncState = XSyncState.None;
+                XSyncSetCounter(_x11.Display, _xSyncCounter, _xSyncValue);
+            }
         }
         
         public void Invalidate(Rect rect)
@@ -776,6 +830,12 @@ namespace Avalonia.X11
                 XDestroyIC(_xic);
                 _xic = IntPtr.Zero;
             }
+
+            if (_xSyncCounter != IntPtr.Zero)
+            {
+                XSyncDestroyCounter(_x11.Display, _xSyncCounter);
+                _xSyncCounter = IntPtr.Zero;
+            }
             
             if (_handle != IntPtr.Zero)
             {
@@ -934,7 +994,7 @@ namespace Avalonia.X11
 
         public IScreenImpl Screen => _platform.Screens;
 
-        public Size MaxAutoSizeHint => _platform.X11Screens.Screens.Select(s => s.Bounds.Size.ToSize(s.PixelDensity))
+        public Size MaxAutoSizeHint => _platform.X11Screens.Screens.Select(s => s.Bounds.Size.ToSize(s.Scaling))
             .OrderByDescending(x => x.Width + x.Height).FirstOrDefault();
 
 
@@ -1021,12 +1081,24 @@ namespace Avalonia.X11
 
         public void SetWmClass(string wmClass)
         {
-            var data = Encoding.ASCII.GetBytes(wmClass);
-            fixed (void* pdata = data)
+            // See https://tronche.com/gui/x/icccm/sec-4.html#WM_CLASS
+            // We don't actually parse the application's command line, so we only use RESOURCE_NAME and argv[0]
+            var appId = Environment.GetEnvironmentVariable("RESOURCE_NAME") 
+                        ?? Process.GetCurrentProcess().ProcessName;
+            
+            var encodedAppId = Encoding.ASCII.GetBytes(appId);
+            var encodedWmClass = Encoding.ASCII.GetBytes(wmClass ?? appId);
+
+            var hint = XAllocClassHint();
+            fixed(byte* pAppId = encodedAppId)
+            fixed (byte* pWmClass = encodedWmClass)
             {
-                XChangeProperty(_x11.Display, _handle, _x11.Atoms.XA_WM_CLASS, _x11.Atoms.XA_STRING, 8,
-                    PropertyMode.Replace, pdata, data.Length);
+                hint->res_name = pAppId;
+                hint->res_class = pWmClass;
+                XSetClassHint(_x11.Display, _handle, hint);
             }
+
+            XFree(hint);
         }
 
         public void SetMinMaxSize(Size minSize, Size maxSize)
@@ -1142,5 +1214,24 @@ namespace Avalonia.X11
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0.8);
 
         public bool NeedsManagedDecorations => false;
+
+        public IStorageProvider StorageProvider { get; }
+
+        public class SurfacePlatformHandle : IPlatformNativeSurfaceHandle
+        {
+            private readonly X11Window _owner;
+
+            public PixelSize Size => _owner.ToPixelSize(_owner.ClientSize);
+
+            public double Scaling => _owner.RenderScaling;
+
+            public SurfacePlatformHandle(X11Window owner)
+            {
+                _owner = owner;
+            }
+
+            public IntPtr Handle => _owner._renderHandle;
+            public string HandleDescriptor => "XID";
+        }
     }
 }
diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs
index e2b370821f..753d5f530c 100644
--- a/src/Avalonia.X11/XLib.cs
+++ b/src/Avalonia.X11/XLib.cs
@@ -109,6 +109,9 @@ namespace Avalonia.X11
 
         [DllImport(libX11)]
         public static extern int XFree(IntPtr data);
+        
+        [DllImport(libX11)]
+        public static extern int XFree(void* data);
 
         [DllImport(libX11)]
         public static extern int XRaiseWindow(IntPtr display, IntPtr window);
@@ -542,6 +545,18 @@ namespace Avalonia.X11
         public static extern int XRRQueryExtension (IntPtr dpy,
             out int event_base_return,
             out int error_base_return);
+        
+        [DllImport(libX11Ext)]
+        public static extern Status XSyncInitialize(IntPtr dpy, out int event_base_return, out int error_base_return);
+
+        [DllImport(libX11Ext)]
+        public static extern IntPtr XSyncCreateCounter(IntPtr dpy, XSyncValue initialValue);
+        
+        [DllImport(libX11Ext)]
+        public static extern int XSyncDestroyCounter(IntPtr dpy, IntPtr counter);
+        
+        [DllImport(libX11Ext)]
+        public static extern int XSyncSetCounter(IntPtr dpy, IntPtr counter, XSyncValue value);
 
         [DllImport(libX11Randr)]
         public static extern int XRRQueryVersion(IntPtr dpy,
@@ -616,6 +631,12 @@ namespace Avalonia.X11
             return XISelectEvents(display, window, emasks, devices.Count);
 
         }
+        
+        [DllImport(libX11)]
+        public static extern XClassHint* XAllocClassHint();
+
+        [DllImport(libX11)]
+        public static extern int XSetClassHint(IntPtr display, IntPtr window, XClassHint* class_hints);
 
         public struct XGeometry
         {
@@ -627,6 +648,16 @@ namespace Avalonia.X11
             public int bw;
             public int d;
         }
+        public struct XClassHint
+        {
+            public byte* res_name;
+            public byte* res_class;
+        }
+        
+        public struct XSyncValue {
+            public int Hi;
+            public uint Lo;
+        }
 
         public static bool XGetGeometry(IntPtr display, IntPtr window, out XGeometry geo)
         {
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 869602e452..55a1014188 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,6 +2,7 @@
   <Import Project="..\Directory.Build.props" />
   <Import Project="..\build\SharedVersion.props" />
   <Import Project="..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />
+  <Import Project="..\build\NetAnalyzers.props"/>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)\Shared\ModuleInitializer.cs" >
        <Link>Shared\_ModuleInitializer.cs</Link>
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs b/src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs
new file mode 100644
index 0000000000..ce843952e7
--- /dev/null
+++ b/src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs
@@ -0,0 +1,33 @@
+using Avalonia.LinuxFramebuffer.Output;
+using Avalonia.Media;
+using JetBrains.Annotations;
+
+namespace Avalonia.LinuxFramebuffer
+{
+    public class DrmOutputOptions
+    {
+        /// <summary>
+        /// Scaling factor.
+        /// Default: 1.0
+        /// </summary>
+        public double Scaling { get; set; } = 1.0;
+        
+        /// <summary>
+        /// If true an two cycle buffer swapping is processed at init.
+        /// Default: True
+        /// </summary>
+        public bool EnableInitialBufferSwapping { get; set; } = true;
+        
+        /// <summary>
+        /// Color for <see cref="EnableInitialBufferSwapping"/>
+        /// Default: R0 G0 B0 A0
+        /// </summary>
+        public Color InitialBufferSwappingColor { get; set; } = new Color(0, 0, 0, 0);
+
+        /// <summary>
+        /// specific the video mode with which the DrmOutput should be created, if it is not found it will fallback to the preferred mode.
+        /// If NULL preferred mode will be used.
+        /// </summary>
+        public PixelSize? VideoMode { get; set; }
+    }
+}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
index 8688671d3b..b64423ec10 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
@@ -7,6 +7,7 @@ using Avalonia.LinuxFramebuffer.Input;
 using Avalonia.LinuxFramebuffer.Output;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 
 namespace Avalonia.LinuxFramebuffer
 {
@@ -32,7 +33,7 @@ namespace Avalonia.LinuxFramebuffer
         {
             var factory = AvaloniaLocator.Current.GetService<IRendererFactory>();
             var renderLoop = AvaloniaLocator.Current.GetService<IRenderLoop>();
-            return factory?.Create(root, renderLoop) ?? new DeferredRenderer(root, renderLoop);
+            return factory?.Create(root, renderLoop) ?? new CompositingRenderer(root, LinuxFramebufferPlatform.Compositor);
         }
 
         public void Dispose()
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs b/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs
index 2eb10ae666..1e3c4bed48 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs
@@ -13,7 +13,6 @@ namespace Avalonia.LinuxFramebuffer.Input.EvDev
         private readonly EvDevDeviceDescription[] _deviceDescriptions;
         private readonly List<EvDevDeviceHandler> _handlers = new List<EvDevDeviceHandler>();
         private int _epoll;
-        private bool _isQueueHandlerTriggered;
         private object _lock = new object();
         private Action<RawInputEventArgs> _onInput;
         private IInputRoot _inputRoot;
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.Pointer.cs b/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.Pointer.cs
new file mode 100644
index 0000000000..ef039a38bc
--- /dev/null
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.Pointer.cs
@@ -0,0 +1,110 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Logging;
+using static Avalonia.LinuxFramebuffer.Input.LibInput.LibInputNativeUnsafeMethods;
+
+namespace Avalonia.LinuxFramebuffer.Input.LibInput;
+
+public partial class LibInputBackend
+{
+    private MouseDevice _mouse = new MouseDevice();
+    private Point _mousePosition;
+    private const string Pointer = LibInput + "/" + nameof(Pointer);
+
+    private void HandlePointer(IntPtr ev, LibInputEventType type)
+    {
+        var modifiers = RawInputModifiers.None; //TODO: support input modifiers
+        var pev = libinput_event_get_pointer_event(ev);
+        var info = _screen.ScaledSize;
+        var ts = libinput_event_pointer_get_time_usec(pev) / 1000;
+        switch (type)
+        {
+            case LibInputEventType.LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
+                _mousePosition = new Point(libinput_event_pointer_get_absolute_x_transformed(pev, (int)info.Width),
+                    libinput_event_pointer_get_absolute_y_transformed(pev, (int)info.Height));
+                ScheduleInput(new RawPointerEventArgs(_mouse, ts, _inputRoot, RawPointerEventType.Move, _mousePosition,
+                    modifiers));
+                break;
+            case LibInputEventType.LIBINPUT_EVENT_POINTER_BUTTON:
+                {
+                    var button = (EvKey)libinput_event_pointer_get_button(pev);
+                    var buttonState = libinput_event_pointer_get_button_state(pev);
+
+                    RawPointerEventArgs evnt = button switch
+                    {
+                        EvKey.BTN_LEFT when buttonState == 1
+                            => new(_mouse, ts, _inputRoot, RawPointerEventType.LeftButtonDown, _mousePosition, modifiers),
+                        EvKey.BTN_LEFT when buttonState == 0
+                            => new(_mouse, ts, _inputRoot, RawPointerEventType.LeftButtonUp, _mousePosition, modifiers),
+                        EvKey.BTN_RIGHT when buttonState == 1
+                            => new(_mouse, ts, _inputRoot, RawPointerEventType.RightButtonUp, _mousePosition, modifiers),
+                        EvKey.BTN_RIGHT when buttonState == 2
+                            => new(_mouse, ts, _inputRoot, RawPointerEventType.RightButtonDown, _mousePosition, modifiers),
+                        EvKey.BTN_MIDDLE when buttonState == 1
+                            => new(_mouse, ts, _inputRoot, RawPointerEventType.MiddleButtonDown, _mousePosition, modifiers),
+                        EvKey.BTN_MIDDLE when buttonState == 2
+                            => new(_mouse, ts, _inputRoot, RawPointerEventType.MiddleButtonUp, _mousePosition, modifiers),
+                        _ => default,
+                    };
+                    if (evnt is not null)
+                    {
+                        ScheduleInput(evnt);
+                    }
+                    else
+                    {
+                        Logger.TryGet(LogEventLevel.Warning, Pointer)
+                            ?.Log(this, $"The button {button} is not associated");
+                    }
+                }
+                break;
+            // Backward compatibility with low-res wheel
+            case LibInputEventType.LIBINPUT_EVENT_POINTER_AXIS:
+                {
+                    var sourceAxis = libinput_event_pointer_get_axis_source(pev);
+                    switch (sourceAxis)
+                    {
+                        case LibInputPointerAxisSource.LIBINPUT_POINTER_AXIS_SOURCE_WHEEL:
+                            {
+                                var value = libinput_event_pointer_get_axis_value_discrete(pev,
+                                    LibInputPointerAxis.LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+                                ScheduleInput(new RawMouseWheelEventArgs(_mouse
+                                    , ts
+                                    , _inputRoot
+                                    , _mousePosition
+                                    , new Vector(0, -value)
+                                    , modifiers));
+                            }
+                            break;
+                        case LibInputPointerAxisSource.LIBINPUT_POINTER_AXIS_SOURCE_FINGER:
+                        case LibInputPointerAxisSource.LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS:
+                        case LibInputPointerAxisSource.LIBINPUT_POINTER_AXIS_SOURCE_WHEEL_TILT:
+                        default:
+                            Logger.TryGet(LogEventLevel.Debug, Pointer)
+                                ?.Log(this, $"The pointer axis {sourceAxis} is not managed.");
+                            break;
+                    }
+                }
+                break;
+            // Hi-Res wheel
+            case LibInputEventType.LIBINPUT_EVENT_POINTER_SCROLL_WHEEL:
+                {
+                    var value = new Vector(0,
+                        -libinput_event_pointer_get_scroll_value_v120(pev,
+                            LibInputPointerAxis.LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL) / 120);
+                    ScheduleInput(new RawMouseWheelEventArgs(_mouse
+                        , ts
+                        , _inputRoot
+                        , _mousePosition
+                        , value
+                        , modifiers));
+                }
+                break;
+            default:
+                Logger.TryGet(LogEventLevel.Warning, Pointer)
+                    ?.Log(this, $"The pointer event {type} is not mapped.");
+                break;
+        }
+
+    }
+}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.cs b/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.cs
index 15d42789d4..77e8202fac 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputBackend.cs
@@ -1,23 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Threading;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
-using Avalonia.Threading;
-using static Avalonia.LinuxFramebuffer.Input.LibInput.LibInputNativeUnsafeMethods; 
+using static Avalonia.LinuxFramebuffer.Input.LibInput.LibInputNativeUnsafeMethods;
 namespace Avalonia.LinuxFramebuffer.Input.LibInput
 {
-    public class LibInputBackend : IInputBackend
+    public partial class LibInputBackend : IInputBackend
     {
         private IScreenInfoProvider _screen;
         private IInputRoot _inputRoot;
         private readonly Queue<Action> _inputThreadActions = new Queue<Action>();
         private TouchDevice _touch = new TouchDevice();
-        private MouseDevice _mouse = new MouseDevice();
-        private Point _mousePosition;
-
+        private const string LibInput = nameof(Avalonia.LinuxFramebuffer) + "/" + nameof(Avalonia.LinuxFramebuffer.Input) + "/" + nameof(LibInput);
         private readonly RawEventGroupingThreadingHelper _inputQueue;
         private Action<RawInputEventArgs> _onInput;
         private Dictionary<int, Point> _pointers = new Dictionary<int, Point>();
@@ -26,15 +22,13 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
         {
             var ctx = libinput_path_create_context();
             _inputQueue = new(e => _onInput?.Invoke(e));
-            new Thread(()=>InputThread(ctx)).Start();
+            new Thread(() => InputThread(ctx)).Start();
         }
 
-        
-        
         private unsafe void InputThread(IntPtr ctx)
         {
             var fd = libinput_get_fd(ctx);
-            
+
             var timeval = stackalloc IntPtr[2];
 
 
@@ -42,12 +36,11 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
                 libinput_path_add_device(ctx, f);
             while (true)
             {
-                
                 IntPtr ev;
                 libinput_dispatch(ctx);
                 while ((ev = libinput_get_event(ctx)) != IntPtr.Zero)
                 {
-                    
+
                     var type = libinput_event_get_type(ev);
                     if (type >= LibInputEventType.LIBINPUT_EVENT_TOUCH_DOWN &&
                         type <= LibInputEventType.LIBINPUT_EVENT_TOUCH_CANCEL)
@@ -56,12 +49,12 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
                     if (type >= LibInputEventType.LIBINPUT_EVENT_POINTER_MOTION
                         && type <= LibInputEventType.LIBINPUT_EVENT_POINTER_AXIS)
                         HandlePointer(ev, type);
-                    
+
                     libinput_event_destroy(ev);
                     libinput_dispatch(ctx);
                 }
 
-                pollfd pfd = new pollfd {fd = fd, events = 1};
+                pollfd pfd = new pollfd { fd = fd, events = 1 };
                 NativeUnsafeMethods.poll(&pfd, new IntPtr(1), 10);
             }
         }
@@ -71,7 +64,7 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
         private void HandleTouch(IntPtr ev, LibInputEventType type)
         {
             var tev = libinput_event_get_touch_event(ev);
-            if(tev == IntPtr.Zero)
+            if (tev == IntPtr.Zero)
                 return;
             if (type < LibInputEventType.LIBINPUT_EVENT_TOUCH_FRAME)
             {
@@ -106,46 +99,6 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
             }
         }
 
-        private void HandlePointer(IntPtr ev, LibInputEventType type)
-        {
-            //TODO: support input modifiers
-            var pev = libinput_event_get_pointer_event(ev);
-            var info = _screen.ScaledSize;
-            var ts = libinput_event_pointer_get_time_usec(pev) / 1000;
-            if (type == LibInputEventType.LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE)
-            {
-                _mousePosition = new Point(libinput_event_pointer_get_absolute_x_transformed(pev, (int)info.Width),
-                    libinput_event_pointer_get_absolute_y_transformed(pev, (int)info.Height));
-                ScheduleInput(new RawPointerEventArgs(_mouse, ts, _inputRoot, RawPointerEventType.Move, _mousePosition,
-                    RawInputModifiers.None));
-            }
-            else if (type == LibInputEventType.LIBINPUT_EVENT_POINTER_BUTTON)
-            {
-                var button = (EvKey)libinput_event_pointer_get_button(pev);
-                var buttonState = libinput_event_pointer_get_button_state(pev);
-
-
-                var evnt = button == EvKey.BTN_LEFT ?
-                    (buttonState == 1 ? RawPointerEventType.LeftButtonDown : RawPointerEventType.LeftButtonUp) :
-                    button == EvKey.BTN_MIDDLE ?
-                        (buttonState == 1 ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.MiddleButtonUp) :
-                        button == EvKey.BTN_RIGHT ?
-                            (buttonState == 1 ?
-                                RawPointerEventType.RightButtonDown :
-                                RawPointerEventType.RightButtonUp) :
-                            (RawPointerEventType)(-1);
-                if (evnt == (RawPointerEventType)(-1))
-                    return;
-                        
-
-                ScheduleInput(
-                    new RawPointerEventArgs(_mouse, ts, _inputRoot, evnt, _mousePosition, RawInputModifiers.None));
-            }
-            
-        }
-            
-        
-
         public void Initialize(IScreenInfoProvider screen, Action<RawInputEventArgs> onInput)
         {
             _screen = screen;
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputNativeUnsafeMethods.cs b/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputNativeUnsafeMethods.cs
index 0492090461..df6defb653 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputNativeUnsafeMethods.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Input/LibInput/LibInputNativeUnsafeMethods.cs
@@ -77,6 +77,9 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
             LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE,
             LIBINPUT_EVENT_POINTER_BUTTON,
             LIBINPUT_EVENT_POINTER_AXIS,
+            LIBINPUT_EVENT_POINTER_SCROLL_WHEEL,
+            LIBINPUT_EVENT_POINTER_SCROLL_FINGER,
+            LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS,
             LIBINPUT_EVENT_TOUCH_DOWN = 500,
             LIBINPUT_EVENT_TOUCH_UP,
             LIBINPUT_EVENT_TOUCH_MOTION,
@@ -97,8 +100,38 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
             LIBINPUT_EVENT_GESTURE_PINCH_END,
             LIBINPUT_EVENT_SWITCH_TOGGLE = 900,
         }
-        
-        
+
+        public enum LibInputPointerAxisSource
+        {
+            /**
+             * The event is caused by the rotation of a wheel.
+            **/
+            LIBINPUT_POINTER_AXIS_SOURCE_WHEEL = 1,
+            /**
+             * The event is caused by the movement of one or more fingers on a device.
+             **/
+            LIBINPUT_POINTER_AXIS_SOURCE_FINGER,
+            /**
+             * The event is caused by the motion of some device.
+             **/
+            LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,
+            /**
+             * The event is caused by the tilting of a mouse wheel rather than
+             * its rotation. This method is commonly used on mice without
+             * separate horizontal scroll wheels.
+             * @deprecated This axis source is deprecated as of libinput 1.16.
+             * It was never used by any device before libinput 1.16. All wheel
+             * tilt devices use @ref LIBINPUT_POINTER_AXIS_SOURCE_WHEEL instead.
+             **/
+            LIBINPUT_POINTER_AXIS_SOURCE_WHEEL_TILT,
+        };
+
+        public enum LibInputPointerAxis
+        {
+            LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL = 0,
+            LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL = 1,
+        };
+
         [DllImport(LibInput)]
         public extern static void libinput_event_destroy(IntPtr ev);
         
@@ -119,21 +152,29 @@ namespace Avalonia.LinuxFramebuffer.Input.LibInput
         
         [DllImport(LibInput)]
         public extern static IntPtr libinput_event_get_pointer_event(IntPtr ev);
-        
-        
+
         [DllImport(LibInput)]
         public extern static ulong libinput_event_pointer_get_time_usec(IntPtr ev);
         
         [DllImport(LibInput)]
         public extern static double libinput_event_pointer_get_absolute_x_transformed(IntPtr ev, int width);
-        
+
         [DllImport(LibInput)]
         public extern static double libinput_event_pointer_get_absolute_y_transformed(IntPtr ev, int height);
-        
+
         [DllImport(LibInput)]
         public extern static int libinput_event_pointer_get_button(IntPtr ev);
         
         [DllImport(LibInput)]
         public extern static int libinput_event_pointer_get_button_state(IntPtr ev);
+
+        [DllImport(LibInput)]
+        public extern static LibInputPointerAxisSource libinput_event_pointer_get_axis_source(IntPtr ev);
+
+        [DllImport((LibInput))]
+        public extern static double libinput_event_pointer_get_axis_value_discrete(IntPtr ev, LibInputPointerAxis axis);
+
+        [DllImport(LibInput)]
+        public extern static double libinput_event_pointer_get_scroll_value_v120(IntPtr ev, LibInputPointerAxis axis);
     }
 }
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Input/NullInput/NullInputBackend.cs b/src/Linux/Avalonia.LinuxFramebuffer/Input/NullInput/NullInputBackend.cs
new file mode 100644
index 0000000000..05dd0195b1
--- /dev/null
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Input/NullInput/NullInputBackend.cs
@@ -0,0 +1,16 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+
+namespace Avalonia.LinuxFramebuffer.Input.NullInput;
+
+public class NullInputBackend : IInputBackend
+{
+    public void Initialize(IScreenInfoProvider screen, Action<RawInputEventArgs> onInput)
+    {
+    }
+
+    public void SetInputRoot(IInputRoot root)
+    {
+    }
+}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index 4add4c423b..d881a97af2 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -15,6 +15,7 @@ using Avalonia.LinuxFramebuffer.Output;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using JetBrains.Annotations;
 
@@ -26,6 +27,10 @@ namespace Avalonia.LinuxFramebuffer
         private static readonly Stopwatch St = Stopwatch.StartNew();
         internal static uint Timestamp => (uint)St.ElapsedTicks;
         public static InternalPlatformThreadingInterface Threading;
+        
+        internal static Compositor Compositor { get; private set; }
+        
+        
         LinuxFramebufferPlatform(IOutputBackend backend)
         {
             _fb = backend;
@@ -37,25 +42,29 @@ namespace Avalonia.LinuxFramebuffer
             Threading = new InternalPlatformThreadingInterface();
             if (_fb is IGlOutputBackend gl)
                 AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToConstant(gl.PlatformOpenGlInterface);
-            
+
             var opts = AvaloniaLocator.Current.GetService<LinuxFramebufferPlatformOptions>() ?? new LinuxFramebufferPlatformOptions();
-            
+
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformThreadingInterface>().ToConstant(Threading)
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(opts.Fps))
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<ICursorFactory>().ToTransient<CursorFactoryStub>()
                 .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
-                .Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
+            
+            Compositor = new Compositor(
+                AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(),
+                AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>());
         }
 
-       
-        internal static LinuxFramebufferLifetime Initialize<T>(T builder, IOutputBackend outputBackend) where T : AppBuilderBase<T>, new()
+
+        internal static LinuxFramebufferLifetime Initialize<T>(T builder, IOutputBackend outputBackend, IInputBackend inputBackend) where T : AppBuilderBase<T>, new()
         {
             var platform = new LinuxFramebufferPlatform(outputBackend);
             builder.UseSkia().UseWindowingSubsystem(platform.Initialize, "fbdev");
-            return new LinuxFramebufferLifetime(platform._fb);
+            return new LinuxFramebufferLifetime(platform._fb, inputBackend);
         }
     }
 
@@ -71,13 +80,13 @@ namespace Avalonia.LinuxFramebuffer
         {
             _fb = fb;
         }
-        
+
         public LinuxFramebufferLifetime(IOutputBackend fb, IInputBackend input)
         {
             _fb = fb;
             _inputBackend = input;
         }
-        
+
         public Control MainView
         {
             get => (Control)_topLevel?.Content;
@@ -117,7 +126,7 @@ namespace Avalonia.LinuxFramebuffer
         {
             Startup?.Invoke(this, new ControlledApplicationLifetimeStartupEventArgs(args));
         }
-        
+
         public void Shutdown(int exitCode)
         {
             ExitCode = exitCode;
@@ -131,20 +140,22 @@ namespace Avalonia.LinuxFramebuffer
 
 public static class LinuxFramebufferPlatformExtensions
 {
-    public static int StartLinuxFbDev<T>(this T builder, string[] args, string fbdev = null, double scaling = 1)
+    public static int StartLinuxFbDev<T>(this T builder, string[] args, string fbdev = null, double scaling = 1, IInputBackend inputBackend = default)
         where T : AppBuilderBase<T>, new() =>
-        StartLinuxDirect(builder, args, new FbdevOutput(fileName: fbdev, format: null) { Scaling = scaling });
-    public static int StartLinuxFbDev<T>(this T builder, string[] args, string fbdev, PixelFormat? format, double scaling)
+        StartLinuxDirect(builder, args, new FbdevOutput(fileName: fbdev, format: null) { Scaling = scaling }, inputBackend);
+    public static int StartLinuxFbDev<T>(this T builder, string[] args, string fbdev, PixelFormat? format, double scaling, IInputBackend inputBackend = default)
         where T : AppBuilderBase<T>, new() =>
-        StartLinuxDirect(builder, args, new FbdevOutput(fileName: fbdev, format: format) { Scaling = scaling });
+        StartLinuxDirect(builder, args, new FbdevOutput(fileName: fbdev, format: format) { Scaling = scaling }, inputBackend);
+
+    public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, double scaling = 1, IInputBackend inputBackend = default)
+        where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card) { Scaling = scaling }, inputBackend);
+    public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, bool connectorsForceProbe = false, [CanBeNull] DrmOutputOptions options = null, IInputBackend inputBackend = default)
+        where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card, connectorsForceProbe, options), inputBackend);
 
-    public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, double scaling = 1)
-        where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card) {Scaling = scaling});
-    
-    public static int StartLinuxDirect<T>(this T builder, string[] args, IOutputBackend backend)
+    public static int StartLinuxDirect<T>(this T builder, string[] args, IOutputBackend outputBackend, IInputBackend inputBackend = default)
         where T : AppBuilderBase<T>, new()
     {
-        var lifetime = LinuxFramebufferPlatform.Initialize(builder, backend);
+        var lifetime = LinuxFramebufferPlatform.Initialize(builder, outputBackend, inputBackend);
         builder.SetupWithLifetime(lifetime);
         lifetime.Start(args);
         builder.Instance.Run(lifetime.Token);
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
index 9c476b1b63..04bc2c1f67 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
@@ -162,6 +162,8 @@ namespace Avalonia.LinuxFramebuffer.Output
         [DllImport(libdrm, SetLastError = true)]
         public static extern drmModeConnector* drmModeGetConnector(int fd, uint connector);
         [DllImport(libdrm, SetLastError = true)]
+        public static extern drmModeConnector* drmModeGetConnectorCurrent(int fd, uint connector);
+        [DllImport(libdrm, SetLastError = true)]
         public static extern void drmModeFreeConnector(drmModeConnector* res);
         
         [DllImport(libdrm, SetLastError = true)]
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
index e218da5f41..070e1a95bc 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
@@ -1,7 +1,9 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using static Avalonia.LinuxFramebuffer.NativeUnsafeMethods;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm;
 
@@ -82,7 +84,7 @@ namespace Avalonia.LinuxFramebuffer.Output
     {
         public List<DrmConnector> Connectors { get; }= new List<DrmConnector>();
         internal Dictionary<uint, DrmEncoder> Encoders { get; } = new Dictionary<uint, DrmEncoder>();
-        public DrmResources(int fd)
+        public DrmResources(int fd, bool connectorsForceProbe = false)
         {
             var res = drmModeGetResources(fd);
             if (res == null)
@@ -105,7 +107,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             
             for (var c = 0; c < res->count_connectors; c++)
             {
-                var conn = drmModeGetConnector(fd, res->connectors[c]);
+                var conn = connectorsForceProbe ? drmModeGetConnector(fd, res->connectors[c]) : drmModeGetConnectorCurrent(fd, res->connectors[c]);
                 Connectors.Add(new DrmConnector(conn));
                 drmModeFreeConnector(conn);
             }
@@ -142,13 +144,31 @@ namespace Avalonia.LinuxFramebuffer.Output
         public int Fd { get; private set; }
         public DrmCard(string path = null)
         {
-            path = path ?? "/dev/dri/card0";
-            Fd = open(path, 2, 0);
-            if (Fd == -1)
-                throw new Win32Exception("Couldn't open " + path);
+            if(path == null)
+            {
+                var files = Directory.GetFiles("/dev/dri/");
+
+                foreach(var file in files) 
+                {
+                    var match = Regex.Match(file, "card[0-9]+");
+
+                    if(match.Success)
+                    {
+                        Fd = open(file, 2, 0);
+                        if(Fd != -1) break; 
+                    }    
+                }
+
+                if(Fd == -1) throw new Win32Exception("Couldn't open /dev/dri/card[0-9]+");
+            }
+            else 
+            {
+                Fd = open(path, 2, 0);
+                if(Fd == -1) throw new Win32Exception($"Couldn't open {path}");
+            }
         }
 
-        public DrmResources GetResources() => new DrmResources(Fd);
+        public DrmResources GetResources(bool connectorsForceProbe = false) => new DrmResources(Fd, connectorsForceProbe);
         public void Dispose()
         {
             close(Fd);
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index ee4125101c..a4d7d8b1eb 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -7,6 +7,7 @@ using Avalonia.OpenGL;
 using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform.Interop;
+using JetBrains.Annotations;
 using static Avalonia.LinuxFramebuffer.NativeUnsafeMethods;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm.GbmColorFormats;
@@ -15,27 +16,51 @@ namespace Avalonia.LinuxFramebuffer.Output
 {
     public unsafe class DrmOutput : IGlOutputBackend, IGlPlatformSurface
     {
+        private DrmOutputOptions _outputOptions = new();
         private DrmCard _card;
         public PixelSize PixelSize => _mode.Resolution;
-        public double Scaling { get; set; }
+
+        public double Scaling
+        {
+            get => _outputOptions.Scaling;
+            set => _outputOptions.Scaling = value;
+        }
         public IGlContext PrimaryContext => _deferredContext;
 
         private EglPlatformOpenGlInterface _platformGl;
         public IPlatformOpenGlInterface PlatformOpenGlInterface => _platformGl;
 
-        public DrmOutput(string path = null)
+        public DrmOutput(DrmCard card, DrmResources resources, DrmConnector connector, DrmModeInfo modeInfo,
+            DrmOutputOptions? options = null)
         {
+            if(options != null) 
+                _outputOptions = options;
+            Init(card, resources, connector, modeInfo);
+        }
+        public DrmOutput(string path = null, bool connectorsForceProbe = false, [CanBeNull] DrmOutputOptions options = null)
+        {
+            if(options != null) 
+                _outputOptions = options;
+            
             var card = new DrmCard(path);
 
-            var resources = card.GetResources();
-
+            var resources = card.GetResources(connectorsForceProbe);
 
             var connector =
                 resources.Connectors.FirstOrDefault(x => x.Connection == DrmModeConnection.DRM_MODE_CONNECTED);
             if(connector == null)
                 throw new InvalidOperationException("Unable to find connected DRM connector");
 
-            var mode = connector.Modes.OrderByDescending(x => x.IsPreferred)
+            DrmModeInfo? mode = null;
+
+            if (options?.VideoMode != null)
+            {
+                mode = connector.Modes
+                    .FirstOrDefault(x => x.Resolution.Width == options.VideoMode.Value.Width &&
+                                         x.Resolution.Height == options.VideoMode.Value.Height);
+            }
+            
+            mode ??= connector.Modes.OrderByDescending(x => x.IsPreferred)
                 .ThenByDescending(x => x.Resolution.Width * x.Resolution.Height)
                 //.OrderByDescending(x => x.Resolution.Width * x.Resolution.Height)
                 .FirstOrDefault();
@@ -50,7 +75,7 @@ namespace Avalonia.LinuxFramebuffer.Output
         }
 
         [DllImport("libEGL.so.1")]
-        static extern IntPtr eglGetProcAddress(Utf8Buffer proc);
+        static extern IntPtr eglGetProcAddress(string proc);
 
         private GbmBoUserDataDestroyCallbackDelegate FbDestroyDelegate;
         private drmModeModeInfo _mode;
@@ -83,7 +108,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             // prepare for the new ioctl call
             var handles = new uint[] {handle, 0, 0, 0};
             var pitches = new uint[] {stride, 0, 0, 0};
-            var offsets = new uint[] {};
+            var offsets = Array.Empty<uint>();
 
             var ret = drmModeAddFB2(_card.Fd, w, h, format, handles, pitches,
                                     offsets, out var fbHandle, 0);
@@ -133,7 +158,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             var device = gbm_create_device(card.Fd);
             _gbmTargetSurface = gbm_surface_create(device, modeInfo.Resolution.Width, modeInfo.Resolution.Height,
                 GbmColorFormats.GBM_FORMAT_XRGB8888, GbmBoFlags.GBM_BO_USE_SCANOUT | GbmBoFlags.GBM_BO_USE_RENDERING);
-            if(_gbmTargetSurface == null)
+            if(_gbmTargetSurface == IntPtr.Zero)
                 throw new InvalidOperationException("Unable to create GBM surface");
 
             _eglDisplay = new EglDisplay(new EglInterface(eglGetProcAddress), false, 0x31D7, device, null);
@@ -142,9 +167,14 @@ namespace Avalonia.LinuxFramebuffer.Output
 
             _deferredContext = _platformGl.PrimaryEglContext;
 
+            var initialBufferSwappingColorR = _outputOptions.InitialBufferSwappingColor.R / 255.0f;
+            var initialBufferSwappingColorG = _outputOptions.InitialBufferSwappingColor.G / 255.0f;
+            var initialBufferSwappingColorB = _outputOptions.InitialBufferSwappingColor.B / 255.0f;
+            var initialBufferSwappingColorA = _outputOptions.InitialBufferSwappingColor.A / 255.0f;
             using (_deferredContext.MakeCurrent(_eglSurface))
             {
-                _deferredContext.GlInterface.ClearColor(0, 0, 0, 0);
+                _deferredContext.GlInterface.ClearColor(initialBufferSwappingColorR, initialBufferSwappingColorG, 
+                    initialBufferSwappingColorB, initialBufferSwappingColorA);
                 _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                 _eglSurface.SwapBuffers();
             }
@@ -162,13 +192,17 @@ namespace Avalonia.LinuxFramebuffer.Output
             _mode = mode;
             _currentBo = bo;
             
-            // Go trough two cycles of buffer swapping (there are render artifacts otherwise)
-            for(var c=0;c<2;c++)
-                using (CreateGlRenderTarget().BeginDraw())
-                {
-                    _deferredContext.GlInterface.ClearColor(0, 0, 0, 0);
-                    _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
-                }
+            if (_outputOptions.EnableInitialBufferSwapping)
+            {
+                //Go trough two cycles of buffer swapping (there are render artifacts otherwise)
+                for(var c=0;c<2;c++)
+                    using (CreateGlRenderTarget().BeginDraw())
+                    {
+                        _deferredContext.GlInterface.ClearColor(initialBufferSwappingColorR, initialBufferSwappingColorG, 
+                            initialBufferSwappingColorB, initialBufferSwappingColorA);
+                        _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
+                    }
+            }
             
         }
 
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs b/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
index dd60d5f09d..c5c7c13c67 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
@@ -14,13 +14,4 @@ namespace Avalonia.LinuxFramebuffer
             public void Dispose() { }
         }
     }
-    internal class PlatformSettings : IPlatformSettings
-    {
-        public Size DoubleClickSize { get; } = new Size(4, 4);
-        public TimeSpan DoubleClickTime { get; } = new TimeSpan(0, 0, 0, 0, 500);
-
-        public Size TouchDoubleClickSize => new Size(16,16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-    }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
index f75c96c759..1dc7ce5e99 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
@@ -6,11 +6,19 @@
     <PackageId>Avalonia.Markup.Xaml.Loader</PackageId>
     <DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants>
   </PropertyGroup>
+  <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
+  <PropertyGroup>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
   <Import Project="IncludeXamlIlSre.props" />
+  <ItemGroup>
+    <Compile Include="..\..\Avalonia.Base\Utilities\StringBuilderCache.cs" Link="Utilities\StringBuilderCache.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-  </ItemGroup>  
+  </ItemGroup>
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
index be293331df..3c7fc157a4 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
@@ -179,13 +179,15 @@ namespace Avalonia.Markup.Xaml.XamlIl
             var tb = _sreBuilder.DefineType("Builder_" + Guid.NewGuid().ToString("N") + "_" + uri);
             var clrPropertyBuilder = tb.DefineNestedType("ClrProperties_" + Guid.NewGuid().ToString("N"));
             var indexerClosureType = _sreBuilder.DefineType("IndexerClosure_" + Guid.NewGuid().ToString("N"));
+            var trampolineBuilder = _sreBuilder.DefineType("Trampolines_" + Guid.NewGuid().ToString("N"));
 
             bool compileBindingsByDefault = AppContext.TryGetSwitch(UseCompileBindingsByDefaultConfigSwitch, out var compileBindingsSwitchValue) && compileBindingsSwitchValue;
 
             var compiler = new AvaloniaXamlIlCompiler(new AvaloniaXamlIlCompilerConfiguration(_sreTypeSystem, asm,
                 _sreMappings, _sreXmlns, AvaloniaXamlIlLanguage.CustomValueConverter,
                 new XamlIlClrPropertyInfoEmitter(_sreTypeSystem.CreateTypeBuilder(clrPropertyBuilder)),
-                new XamlIlPropertyInfoAccessorFactoryEmitter(_sreTypeSystem.CreateTypeBuilder(indexerClosureType))), 
+                new XamlIlPropertyInfoAccessorFactoryEmitter(_sreTypeSystem.CreateTypeBuilder(indexerClosureType)),
+                new XamlIlTrampolineBuilder(_sreTypeSystem.CreateTypeBuilder(trampolineBuilder))), 
                 _sreEmitMappings,
                 _sreContextType) { EnableIlVerification = true, DefaultCompileBindings = compileBindingsByDefault };
 
@@ -199,6 +201,8 @@ namespace Avalonia.Markup.Xaml.XamlIl
             compiler.ParseAndCompile(xaml, uri?.ToString(), null, _sreTypeSystem.CreateTypeBuilder(tb), overrideType);
             var created = tb.CreateTypeInfo();
             clrPropertyBuilder.CreateTypeInfo();
+            indexerClosureType.CreateTypeInfo();
+            trampolineBuilder.CreateTypeInfo();
 
             return LoadOrPopulate(created, rootInstance);
         }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
index 1ca7be67a7..1692238d06 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
 using XamlX;
 using XamlX.Ast;
@@ -21,21 +22,20 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
         private AvaloniaXamlIlCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings)
             : base(configuration, emitMappings, true)
         {
-            void InsertAfter<T>(params IXamlAstTransformer[] t) 
+            void InsertAfter<T>(params IXamlAstTransformer[] t)
                 => Transformers.InsertRange(Transformers.FindIndex(x => x is T) + 1, t);
 
-            void InsertBefore<T>(params IXamlAstTransformer[] t) 
+            void InsertBefore<T>(params IXamlAstTransformer[] t)
                 => Transformers.InsertRange(Transformers.FindIndex(x => x is T), t);
 
 
             // Before everything else
-            
+
             Transformers.Insert(0, new XNameTransformer());
             Transformers.Insert(1, new IgnoredDirectivesTransformer());
             Transformers.Insert(2, _designTransformer = new AvaloniaXamlIlDesignPropertiesTransformer());
             Transformers.Insert(3, _bindingTransformer = new AvaloniaBindingExtensionTransformer());
-            
-            
+
             // Targeted
             InsertBefore<PropertyReferenceResolver>(
                 new AvaloniaXamlIlResolveClassesPropertiesTransformer(),
@@ -46,16 +46,27 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 new AvaloniaXamlIlReorderClassesPropertiesTransformer()
             );
 
-            InsertBefore<ContentConvertTransformer>(                
-                new AvaloniaXamlIlBindingPathParser(),
+            InsertBefore<ContentConvertTransformer>(
+                new AvaloniaXamlIlControlThemeTransformer(),
                 new AvaloniaXamlIlSelectorTransformer(),
                 new AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer(),
+                new AvaloniaXamlIlBindingPathParser(),
                 new AvaloniaXamlIlPropertyPathTransformer(),
+                new AvaloniaXamlIlSetterTargetTypeMetadataTransformer(),
                 new AvaloniaXamlIlSetterTransformer(),
                 new AvaloniaXamlIlConstructorServiceProviderTransformer(),
                 new AvaloniaXamlIlTransitionsTypeMetadataTransformer(),
                 new AvaloniaXamlIlResolveByNameMarkupExtensionReplacer()
             );
+            InsertBefore<ConvertPropertyValuesToAssignmentsTransformer>(
+                new AvaloniaXamlIlOptionMarkupExtensionTransformer());
+
+            InsertAfter<TypeReferenceResolver>(
+                new XDataTypeTransformer());
+
+            InsertBefore<DeferredContentTransformer>(
+                new AvaloniaXamlIlDeferredResourceTransformer()
+            );
 
             // After everything else
             InsertBefore<NewObjectTransformer>(
@@ -65,6 +76,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 new AvaloniaXamlIlCompiledBindingsMetadataRemover()
                 );
 
+            Transformers.Add(new AvaloniaXamlIlControlTemplatePriorityTransformer());
             Transformers.Add(new AvaloniaXamlIlMetadataRemover());
             Transformers.Add(new AvaloniaXamlIlRootObjectScope());
 
@@ -79,14 +91,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             _contextType = CreateContextType(contextTypeBuilder);
         }
 
-        
+
         public AvaloniaXamlIlCompiler(TransformerConfiguration configuration,
             XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings,
             IXamlType contextType) : this(configuration, emitMappings)
         {
             _contextType = contextType;
         }
-        
+
         public const string PopulateName = "__AvaloniaXamlIlPopulate";
         public const string BuildName = "__AvaloniaXamlIlBuild";
 
@@ -108,7 +120,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             {
                 {XamlNamespaces.Blend2008, XamlNamespaces.Blend2008}
             });
-            
+
             var rootObject = (XamlAstObjectNode)parsed.Root;
 
             var classDirective = rootObject.Children
@@ -123,8 +135,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                         false) :
                     TypeReferenceResolver.ResolveType(CreateTransformationContext(parsed, true),
                         (XamlAstXmlTypeReference)rootObject.Type, true);
-            
-            
+
+
             if (overrideRootType != null)
             {
                 if (!rootType.Type.IsAssignableFrom(overrideRootType))
@@ -137,7 +149,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
             Transform(parsed);
             Compile(parsed, tb, _contextType, PopulateName, BuildName, "__AvaloniaXamlIlNsInfo", baseUri, fileSource);
-            
+
         }
 
         public void OverrideRootType(XamlDocument doc, IXamlAstTypeReference newType)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs
index f6f47dce0d..9fc6b5d517 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs
@@ -7,6 +7,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
     {
         public XamlIlClrPropertyInfoEmitter ClrPropertyEmitter { get; }
         public XamlIlPropertyInfoAccessorFactoryEmitter AccessorFactoryEmitter { get; }
+        public XamlIlTrampolineBuilder TrampolineBuilder { get; }
 
         public AvaloniaXamlIlCompilerConfiguration(IXamlTypeSystem typeSystem, 
             IXamlAssembly defaultAssembly, 
@@ -15,13 +16,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             XamlValueConverter customValueConverter,
             XamlIlClrPropertyInfoEmitter clrPropertyEmitter,
             XamlIlPropertyInfoAccessorFactoryEmitter accessorFactoryEmitter,
+            XamlIlTrampolineBuilder trampolineBuilder,
             IXamlIdentifierGenerator identifierGenerator = null)
             : base(typeSystem, defaultAssembly, typeMappings, xmlnsMappings, customValueConverter, identifierGenerator)
         {
             ClrPropertyEmitter = clrPropertyEmitter;
             AccessorFactoryEmitter = accessorFactoryEmitter;
+            TrampolineBuilder = trampolineBuilder;
             AddExtra(ClrPropertyEmitter);
             AddExtra(AccessorFactoryEmitter);
+            AddExtra(TrampolineBuilder);
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
index 1db0208310..b4999136a4 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
@@ -39,6 +39,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 {
                     typeSystem.GetType("Avalonia.Metadata.ContentAttribute")
                 },
+                WhitespaceSignificantCollectionAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.WhitespaceSignificantCollectionAttribute")
+                },
+                TrimSurroundingWhitespaceAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.TrimSurroundingWhitespaceAttribute")
+                },
                 ProvideValueTarget = typeSystem.GetType("Avalonia.Markup.Xaml.IProvideValueTarget"),
                 RootObjectProvider = typeSystem.GetType("Avalonia.Markup.Xaml.IRootObjectProvider"),
                 RootObjectProviderIntermediateRootPropertyName = "IntermediateRootObject",
@@ -48,7 +56,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
                 XmlNamespaceInfoProvider =
                     typeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.IAvaloniaXamlIlXmlNamespaceInfoProvider"),
-                DeferredContentPropertyAttributes = {typeSystem.GetType("Avalonia.Metadata.TemplateContentAttribute")},
+                DeferredContentPropertyAttributes = { typeSystem.GetType("Avalonia.Metadata.TemplateContentAttribute") },
                 DeferredContentExecutorCustomizationDefaultTypeParameter = typeSystem.GetType("Avalonia.Controls.IControl"),
                 DeferredContentExecutorCustomizationTypeParameterDeferredContentAttributePropertyNames = new List<string>
                 {
@@ -62,6 +70,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 },
                 InnerServiceProviderFactoryMethod =
                     runtimeHelpers.FindMethod(m => m.Name == "CreateInnerServiceProviderV1"),
+                IAddChild = typeSystem.GetType("Avalonia.Metadata.IAddChild"),
+                IAddChildOfT = typeSystem.GetType("Avalonia.Metadata.IAddChild`1")
             };
             rv.CustomAttributeResolver = new AttributeResolver(typeSystem, rv);
 
@@ -175,6 +185,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
         public static bool CustomValueConverter(AstTransformationContext context,
             IXamlAstValueNode node, IXamlType type, out IXamlAstValueNode result)
         {
+            if (node is AvaloniaXamlIlOptionMarkupExtensionTransformer.OptionsMarkupExtensionNode optionsNode)
+            {
+                if (optionsNode.ConvertToReturnType(context, type, out var newOptionsNode))
+                {
+                    result = newOptionsNode;
+                    return true;
+                }
+            }
+
             if (!(node is XamlAstTextNode textNode))
             {
                 result = null;
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
index 4592b9c8b4..64fdfe155d 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
@@ -48,10 +48,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 try
                 {
                     var thickness = Thickness.Parse(text);
-            
+
                     result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.Thickness, types.ThicknessFullConstructor,
                         new[] { thickness.Left, thickness.Top, thickness.Right, thickness.Bottom });
-                
+
                     return true;
                 }
                 catch
@@ -65,10 +65,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 try
                 {
                     var point = Point.Parse(text);
-            
+
                     result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.Point, types.PointFullConstructor,
                         new[] { point.X, point.Y });
-                
+
                     return true;
                 }
                 catch
@@ -76,16 +76,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a point", node);
                 }
             }
-            
+
             if (type.Equals(types.Vector))
             {
                 try
                 {
                     var vector = Vector.Parse(text);
-            
+
                     result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.Vector, types.VectorFullConstructor,
                         new[] { vector.X, vector.Y });
-                
+
                     return true;
                 }
                 catch
@@ -93,16 +93,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a vector", node);
                 }
             }
-            
+
             if (type.Equals(types.Size))
             {
                 try
                 {
                     var size = Size.Parse(text);
-                
+
                     result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.Size, types.SizeFullConstructor,
                         new[] { size.Width, size.Height });
-                
+
                     return true;
                 }
                 catch
@@ -110,16 +110,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a size", node);
                 }
             }
-            
+
             if (type.Equals(types.Matrix))
             {
                 try
                 {
                     var matrix = Matrix.Parse(text);
-                    
+
                     result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.Matrix, types.MatrixFullConstructor,
                         new[] { matrix.M11, matrix.M12, matrix.M21, matrix.M22, matrix.M31, matrix.M32 });
-                
+
                     return true;
                 }
                 catch
@@ -127,16 +127,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a matrix", node);
                 }
             }
-            
+
             if (type.Equals(types.CornerRadius))
             {
                 try
                 {
                     var cornerRadius = CornerRadius.Parse(text);
-            
+
                     result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.CornerRadius, types.CornerRadiusFullConstructor,
                         new[] { cornerRadius.TopLeft, cornerRadius.TopRight, cornerRadius.BottomRight, cornerRadius.BottomLeft });
-                
+
                     return true;
                 }
                 catch
@@ -144,7 +144,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a corner radius", node);
                 }
             }
-            
+
             if (type.Equals(types.Color))
             {
                 if (!Color.TryParse(text, out Color color))
@@ -160,14 +160,37 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 return true;
             }
 
+            if (type.Equals(types.RelativePoint))
+            {
+                try
+                {
+                    var relativePoint = RelativePoint.Parse(text);
+
+                    var relativePointTypeRef = new XamlAstClrTypeReference(node, types.RelativePoint, false);
+
+                    result = new XamlAstNewClrObjectNode(node, relativePointTypeRef, types.RelativePointFullConstructor, new List<IXamlAstValueNode>
+                    {
+                        new XamlConstantNode(node, types.XamlIlTypes.Double, relativePoint.Point.X),
+                        new XamlConstantNode(node, types.XamlIlTypes.Double, relativePoint.Point.Y),
+                        new XamlConstantNode(node, types.RelativeUnit, (int) relativePoint.Unit),
+                    });
+
+                    return true;
+                }
+                catch
+                {
+                    throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a relative point", node);
+                }
+            }
+
             if (type.Equals(types.GridLength))
             {
                 try
                 {
                     var gridLength = GridLength.Parse(text);
-                
+
                     result = new AvaloniaXamlIlGridLengthAstNode(node, types, gridLength);
-                    
+
                     return true;
                 }
                 catch
@@ -178,12 +201,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
             if (type.Equals(types.Cursor))
             {
-                if (TypeSystemHelpers.TryGetEnumValueNode(types.StandardCursorType, text, node, out var enumConstantNode))
+                if (TypeSystemHelpers.TryGetEnumValueNode(types.StandardCursorType, text, node, false, out var enumConstantNode))
                 {
                     var cursorTypeRef = new XamlAstClrTypeReference(node, types.Cursor, false);
 
                     result = new XamlAstNewClrObjectNode(node, cursorTypeRef, types.CursorTypeConstructor, new List<IXamlAstValueNode> { enumConstantNode });
-                    
+
                     return true;
                 }
             }
@@ -201,7 +224,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             if (type.Equals(types.Classes))
             {
                 var classes = text.Split(' ');
-                var classNodes = classes.Select(c => new XamlAstTextNode(node, c, types.XamlIlTypes.String)).ToArray();
+                var classNodes = classes.Select(c => new XamlAstTextNode(node, c, type: types.XamlIlTypes.String)).ToArray();
 
                 result = new AvaloniaXamlIlAvaloniaListConstantAstNode(node, types, types.Classes, types.XamlIlTypes.String, classNodes);
                 return true;
@@ -221,12 +244,59 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 }
             }
 
+            if (type.Equals(types.TextTrimming))
+            {
+                foreach (var property in types.TextTrimming.Properties)
+                {
+                    if (property.PropertyType == types.TextTrimming && property.Name.Equals(text, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result = new XamlStaticOrTargetedReturnMethodCallNode(node, property.Getter, Enumerable.Empty<IXamlAstValueNode>());
+
+                        return true;
+                    }
+                }
+            }
+
+            if (type.Equals(types.TextDecorationCollection))
+            {
+                foreach (var property in types.TextDecorations.Properties)
+                {
+                    if (property.PropertyType == types.TextDecorationCollection && property.Name.Equals(text, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result = new XamlStaticOrTargetedReturnMethodCallNode(node, property.Getter, Enumerable.Empty<IXamlAstValueNode>());
+
+                        return true;
+                    }
+                }
+            }
+
+            if (type.Equals(types.Uri))
+            {
+                var uriText = text.Trim();
+
+                var kind = ((!uriText?.StartsWith("/") == true) ? UriKind.Absolute : UriKind.Relative);
+
+                if (string.IsNullOrWhiteSpace(uriText) || !Uri.TryCreate(uriText, kind, out var _))
+                {
+                        throw new XamlX.XamlLoadException($"Unable to parse text {uriText} as a {kind} uri.", node);
+                }
+                result = new XamlAstNewClrObjectNode(node
+                    , new(node, types.Uri, false)
+                    , types.UriConstructor
+                    , new List<IXamlAstValueNode>()
+                    {
+                        new XamlConstantNode(node, context.Configuration.WellKnownTypes.String, uriText),
+                        new XamlConstantNode(node, types.UriKind, (int)kind),
+                    });
+                return true;
+            }
+
             result = null;
             return false;
         }
 
         private static bool ConvertDefinitionList(
-            IXamlAstValueNode node, 
+            IXamlAstValueNode node,
             string text,
             AvaloniaXamlIlWellKnownTypes types,
             IXamlType listType,
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
index 890cbb69bf..6150265cf8 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
@@ -122,10 +122,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     throw new XamlParseException("Only one of ElementName, Source, or RelativeSource specified as a binding source. Only one property is allowed.", binding);
                 }
 
-                var mode = relativeSourceObject.Children
+                var modeProperty = relativeSourceObject.Children
                     .OfType<XamlAstXamlPropertyValueNode>()
-                    .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Mode")
-                    ?.Values[0] is XamlAstTextNode modeAssignedValue ? modeAssignedValue.Text : null;
+                    .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Mode")?
+                    .Values.FirstOrDefault() as XamlAstTextNode
+                    ?? relativeSourceObject.Arguments.OfType<XamlAstTextNode>().FirstOrDefault();
+                
+                var mode = modeProperty?.Text;
                 if (relativeSourceObject.Arguments.Count == 0 && mode == null)
                 {
                     mode = "FindAncestor";
@@ -212,16 +215,20 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 }
                 else if (mode == "TemplatedParent")
                 {
-                    var parentType = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>()
+                    var contentTemplateNode = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>()
                         .FirstOrDefault(x =>
-                            x.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.ControlTemplate)
-                        ?.TargetType.GetClrType();
-
-                    if (parentType is null)
+                            x.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.ControlTemplate);
+                    if (contentTemplateNode is null)
                     {
                         throw new XamlParseException("A binding with a TemplatedParent RelativeSource has to be in a ControlTemplate.", binding);
                     }
 
+                    var parentType = contentTemplateNode.TargetType.GetClrType();
+                    if (parentType is null)
+                    {
+                        throw new XamlParseException("TargetType has to be set on ControlTemplate or it should be defined inside of a Style.", binding);
+                    } 
+
                     convertedNode = new TemplatedParentBindingExpressionNode { Type = parentType };
                 }
                 else
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
index 048a6220c5..e509d47932 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
@@ -105,6 +105,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 {
                     startType = TypeReferenceResolver.ResolveType(context, text.Text, isMarkupExtension: false, text, strict: true).Type;
                 }
+                
+                if (dataTypeProperty?.Values.Count is 1 && dataTypeProperty.Values[0] is XamlTypeExtensionNode typeNode)
+                {
+                    startType = typeNode.Value.GetClrType();
+                }
 
                 Func<IXamlType> startTypeResolver = startType is not null ? () => startType : () =>
                 {
@@ -117,7 +122,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     return parentDataContextNode.DataContextType;
                 };
 
-                XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, binding, startTypeResolver, context.ParentNodes().OfType<XamlAstConstructableObjectNode>().First().Type.GetClrType());
+                var selfType = context.ParentNodes().OfType<XamlAstConstructableObjectNode>().First().Type.GetClrType();
+                
+                // When using self bindings with setters we need to change target type to resolved selector type.
+                if (context.GetAvaloniaTypes().ISetter.IsAssignableFrom(selfType))
+                {
+                    selfType = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>().First().TargetType.GetClrType();
+                }
+
+                XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, binding, startTypeResolver, selfType);
             }
 
             return node;
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
new file mode 100644
index 0000000000..6cab68e756
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Data;
+using XamlX.Ast;
+using XamlX.Transform;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    /// <summary>
+    /// Transforms property assignments within ControlTemplates to use Style priority where possible.
+    /// </summary>
+    class AvaloniaXamlIlControlTemplatePriorityTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            var bindingPriorityType = context.GetAvaloniaTypes().BindingPriority;
+
+            // The node is a candidate for transformation if:
+            // - It's a property assignment to an Avalonia property
+            // - There's a ControlTemplate ancestor
+            // - The property has a single value
+            if (node is XamlPropertyAssignmentNode prop &&
+                prop.Property is XamlIlAvaloniaProperty avaloniaProperty &&
+                context.ParentNodes().Any(IsControlTemplate) &&
+                prop.Values.Count == 1)
+            {
+                var priorityValueSetters = new List<IXamlPropertySetter>();
+
+                // Iterate through the possible setters, trying to find a setter on the property 
+                // which has a BindingPriority parameter followed by the parameter of the existing
+                // setter.
+                foreach (var setter in prop.PossibleSetters)
+                {
+                    var s = avaloniaProperty.Setters.FirstOrDefault(x => 
+                        x.Parameters[0] == bindingPriorityType &&
+                        x.Parameters[1] == setter.Parameters[0]);
+                    if (s != null)
+                        priorityValueSetters.Add(s);
+                }
+
+                // If any BindingPriority setters were found, use those.
+                if (priorityValueSetters.Count > 0)
+                {
+                    prop.PossibleSetters = priorityValueSetters;
+                    prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, (int)BindingPriority.TemplatedParent));
+                }
+            }
+
+            return node;
+        }
+
+        private static bool IsControlTemplate(IXamlAstNode node)
+        {
+            return node is AvaloniaXamlIlTargetTypeMetadataNode tt &&
+                tt.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.ControlTemplate;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs
new file mode 100644
index 0000000000..1338dc7248
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlControlThemeTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (!(node is XamlAstObjectNode on && on.Type.GetClrType().FullName == "Avalonia.Styling.ControlTheme"))
+                return node;
+
+            // Check if we've already transformed this node.
+            if (context.ParentNodes().FirstOrDefault() is AvaloniaXamlIlTargetTypeMetadataNode)
+                return node;
+
+            var targetTypeNode = on.Children.OfType<XamlAstXamlPropertyValueNode>()
+                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "TargetType") ??
+                throw new XamlParseException("ControlTheme must have a TargetType.", node);
+
+            IXamlType targetType;
+
+            if (targetTypeNode.Values[0] is XamlTypeExtensionNode extension)
+                targetType = extension.Value.GetClrType();
+            else if (targetTypeNode.Values[0] is XamlAstTextNode text)
+                targetType = TypeReferenceResolver.ResolveType(context, text.Text, false, text, true).GetClrType();
+            else
+                throw new XamlParseException("Could not determine TargetType for ControlTheme.", targetTypeNode);
+
+            return new AvaloniaXamlIlTargetTypeMetadataNode(on,
+                new XamlAstClrTypeReference(targetTypeNode, targetType, false),
+                AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
index cf691db860..d4dfcf9c4b 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
@@ -49,6 +49,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     }
                     else if (child is XamlPropertyAssignmentNode pa)
                     {
+                        var templateDataTypeAttribute = context.GetAvaloniaTypes().DataTypeAttribute;
+                        
                         if (pa.Property.Name == "DataContext"
                             && pa.Property.DeclaringType.Equals(context.GetAvaloniaTypes().StyledElement)
                             && pa.Values[0] is XamlMarkupExtensionNode ext
@@ -56,8 +58,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                         {
                             inferredDataContextTypeNode = ParseDataContext(context, on, obj);
                         }
-                        else if(context.GetAvaloniaTypes().DataTemplate.IsAssignableFrom(on.Type.GetClrType())
-                            && pa.Property.Name == "DataType"
+                        else if(pa.Property.CustomAttributes.Any(a => a.Type == templateDataTypeAttribute)
                             && pa.Values[0] is XamlTypeExtensionNode dataTypeNode)
                         {
                             inferredDataContextTypeNode = new AvaloniaXamlIlDataContextTypeMetadataNode(on, dataTypeNode.Value.GetClrType());
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
new file mode 100644
index 0000000000..c29dd94886
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    internal class AvaloniaXamlIlDeferredResourceTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (!(node is XamlPropertyAssignmentNode pa) || pa.Values.Count != 2)
+                return node;
+
+            if (!ShouldBeDeferred(pa.Values[1]))
+                return node;
+
+            var types = context.GetAvaloniaTypes();
+
+            if (pa.Property.DeclaringType == types.ResourceDictionary && pa.Property.Name == "Content")
+            {
+                pa.Values[1] = new XamlDeferredContentNode(pa.Values[1], types.XamlIlTypes.Object, context.Configuration);
+                pa.PossibleSetters = new List<IXamlPropertySetter>
+                {
+                    new XamlDirectCallPropertySetter(types.ResourceDictionaryDeferredAdd),
+                };
+            }
+            else if (pa.Property.Name == "Resources" && pa.Property.Getter.ReturnType.Equals(types.IResourceDictionary))
+            {
+                pa.Values[1] = new XamlDeferredContentNode(pa.Values[1], types.XamlIlTypes.Object, context.Configuration);
+                pa.PossibleSetters = new List<IXamlPropertySetter>
+                {
+                    new AdderSetter(pa.Property.Getter, types.ResourceDictionaryDeferredAdd),
+                };
+            }
+
+            return node;
+        }
+
+        private static bool ShouldBeDeferred(IXamlAstValueNode node)
+        {
+            // XAML compiler is currently strict about value types, allowing them to be created only through converters.
+            // At the moment it should be safe to not defer structs.
+            return !node.Type.GetClrType().IsValueType;
+        }
+        
+        class AdderSetter : IXamlILOptimizedEmitablePropertySetter, IEquatable<AdderSetter>
+        {
+            private readonly IXamlMethod _getter;
+            private readonly IXamlMethod _adder;
+
+            public AdderSetter(IXamlMethod getter, IXamlMethod adder)
+            {
+                _getter = getter;
+                _adder = adder;
+                TargetType = getter.DeclaringType;
+                Parameters = adder.ParametersWithThis().Skip(1).ToList();
+
+                bool allowNull = Parameters.Last().AcceptsNull();
+                BinderParameters = new PropertySetterBinderParameters
+                {
+                    AllowMultiple = true,
+                    AllowXNull = allowNull,
+                    AllowRuntimeNull = allowNull
+                };
+            }
+
+            public IXamlType TargetType { get; }
+
+            public PropertySetterBinderParameters BinderParameters { get; }
+
+            public IReadOnlyList<IXamlType> Parameters { get; }
+
+            public void Emit(IXamlILEmitter emitter)
+            {
+                var locals = new Stack<XamlLocalsPool.PooledLocal>();
+                // Save all "setter" parameters
+                for (var c = Parameters.Count - 1; c >= 0; c--)
+                {
+                    var loc = emitter.LocalsPool.GetLocal(Parameters[c]);
+                    locals.Push(loc);
+                    emitter.Stloc(loc.Local);
+                }
+
+                emitter.EmitCall(_getter);
+                while (locals.Count>0)
+                    using (var loc = locals.Pop())
+                        emitter.Ldloc(loc.Local);
+                emitter.EmitCall(_adder, true);
+            }
+
+            public void EmitWithArguments(
+                XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context,
+                IXamlILEmitter emitter,
+                IReadOnlyList<IXamlAstValueNode> arguments)
+            {
+                emitter.EmitCall(_getter);
+
+                for (var i = 0; i < arguments.Count; ++i)
+                    context.Emit(arguments[i], emitter, Parameters[i]);
+
+                emitter.EmitCall(_adder, true);
+            }
+
+            public bool Equals(AdderSetter other)
+            {
+                if (ReferenceEquals(null, other))
+                    return false;
+                if (ReferenceEquals(this, other))
+                    return true;
+
+                return _getter.Equals(other._getter) && _adder.Equals(other._adder);
+            }
+
+            public override bool Equals(object obj)
+                => Equals(obj as AdderSetter);
+
+            public override int GetHashCode()
+                => (_getter.GetHashCode() * 397) ^ _adder.GetHashCode();
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs
new file mode 100644
index 0000000000..5004e594f7
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs
@@ -0,0 +1,403 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Emit;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+
+internal class AvaloniaXamlIlOptionMarkupExtensionTransformer : IXamlAstTransformer
+{
+    public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+    {
+        if (node is XamlMarkupExtensionNode
+            {
+                Value: XamlAstObjectNode { Type: XamlAstClrTypeReference { Type: { } type } } objectNode
+            } markupExtensionNode
+            && type.FindMethods(m => m.IsPublic && m.Parameters.Count is 1 or 2 && m.ReturnType == context.Configuration.WellKnownTypes.Boolean && m.Name == "ShouldProvideOption").ToArray() is { } methods
+            && methods.Any())
+        {
+            var optionAttribute = context.GetAvaloniaTypes().MarkupExtensionOptionAttribute;
+            var defaultOptionAttribute = context.GetAvaloniaTypes().MarkupExtensionDefaultOptionAttribute;
+
+            var typeArgument = type.GenericArguments?.FirstOrDefault();
+
+            IXamlAstValueNode defaultValue = null;
+            var values = new List<OptionsMarkupExtensionBranch>();
+
+            if (objectNode.Arguments.FirstOrDefault() is { } argument)
+            {
+                var hasDefaultProp = objectNode.Type.GetClrType().GetAllProperties().Any(p =>
+                    p.CustomAttributes.Any(a => a.Type == defaultOptionAttribute));
+                if (hasDefaultProp)
+                {
+                    if (objectNode.Arguments.Count > 1)
+                    {
+                        throw new XamlParseException("Options MarkupExtensions allow only single argument", objectNode);
+                    }
+
+                    defaultValue = TransformNode(new[] { argument }, typeArgument, objectNode);
+                    objectNode.Arguments.Remove(argument);
+                }
+            }
+
+            foreach (var extProp in objectNode.Children.OfType<XamlAstXamlPropertyValueNode>().ToArray())
+            {
+                if (!extProp.Values.Any())
+                {
+                    continue;
+                }
+
+                var shouldRemoveProp = false;
+                var onObjs = extProp.Values.OfType<XamlAstObjectNode>()
+                    .Where(o => o.Type.GetClrType() == context.GetAvaloniaTypes().OnExtensionType).ToArray();
+                if (onObjs.Any())
+                {
+                    shouldRemoveProp = true;
+                    foreach (var onObj in onObjs)
+                    {
+                        var optionsPropNode = onObj.Children.OfType<XamlAstXamlPropertyValueNode>()
+                            .SingleOrDefault(v => v.Property.GetClrProperty().Name == "Options")
+                            ?.Values.Single();
+                        var options = (optionsPropNode as XamlAstTextNode)?.Text?.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                            ?? Array.Empty<string>();
+                        if (options.Length == 0)
+                        {
+                            throw new XamlParseException("On.Options string must be set", onObj);
+                        }
+
+                        var content = onObj.Children.OfType<XamlAstXamlPropertyValueNode>()
+                            .SingleOrDefault(v => v.Property.GetClrProperty().Name == "Content");
+                        if (content is null)
+                        {
+                            throw new XamlParseException("On content object must be set", onObj);
+                        }
+
+                        var propertiesSet = options
+                            .Select(o => type.GetAllProperties()
+                                .FirstOrDefault(p => o.Equals(p.Name, StringComparison.Ordinal))
+                                ?? throw new XamlParseException($"Property \"{o}\" wasn't found on the \"{type.Name}\" type", onObj))
+                            .ToArray();
+                        foreach (var propertySet in propertiesSet)
+                        {
+                            AddBranchNode(content.Values, propertySet.CustomAttributes, content);
+                        }
+                    }
+                }
+                else
+                {
+                    shouldRemoveProp = AddBranchNode(extProp.Values, extProp.Property.GetClrProperty().CustomAttributes, extProp);
+                }
+
+                if (shouldRemoveProp)
+                {
+                    objectNode.Children.Remove(extProp);
+                }
+            }
+
+            if (defaultValue is null && !values.Any())
+            {
+                throw new XamlParseException("Options markup extension requires at least one option to be set", objectNode);
+            }
+
+            return new OptionsMarkupExtensionNode(
+                markupExtensionNode, values.ToArray(), defaultValue,
+                context.Configuration.TypeMappings.ServiceProvider);
+
+            bool AddBranchNode(
+                IReadOnlyCollection<IXamlAstValueNode> valueNodes,
+                IReadOnlyCollection<IXamlCustomAttribute> propAttributes,
+                IXamlLineInfo li)
+            {
+                var transformed = TransformNode(valueNodes, typeArgument, li);
+                if (propAttributes.FirstOrDefault(a => a.Type == defaultOptionAttribute) is { } defAttr)
+                {
+                    defaultValue = transformed;
+                    return true;
+                }
+                else if (propAttributes.FirstOrDefault(a => a.Type == optionAttribute) is { } optAttr)
+                {
+                    var option = optAttr.Parameters.Single();
+                    if (option is null)
+                    {
+                        throw new XamlParseException("MarkupExtension option must not be null", li);
+                    }
+
+                    var optionAsString = option.ToString();
+                    IXamlAstValueNode optionNode = null;
+                    foreach (var method in methods)
+                    {
+                        try
+                        {
+                            var targetType = method.Parameters.Last();
+                            if (targetType.FullName == "System.Type")
+                            {
+                                if (option is IXamlType typeOption)
+                                {
+                                    optionNode = new XamlTypeExtensionNode(li,
+                                        new XamlAstClrTypeReference(li, typeOption, false), targetType);
+                                }
+                            }
+                            else if (targetType == context.Configuration.WellKnownTypes.String)
+                            {
+                                optionNode = new XamlConstantNode(li, targetType, optionAsString);
+                            }
+                            else if (targetType.IsEnum)
+                            {
+                                if (TypeSystemHelpers.TryGetEnumValueNode(targetType, optionAsString, li, false,
+                                        out var enumConstantNode))
+                                {
+                                    optionNode = enumConstantNode;
+                                }
+                            }
+                            else if (TypeSystemHelpers.ParseConstantIfTypeAllows(optionAsString, targetType, li,
+                                         out var constantNode))
+                            {
+                                optionNode = constantNode;
+                            }
+                        }
+                        catch (FormatException)
+                        {
+                            // try next method overload
+                        }
+
+                        if (optionNode is not null)
+                        {
+                            values.Add(new OptionsMarkupExtensionBranch(optionNode, transformed, method));
+                            return true;
+                        }
+                    }
+
+                    throw new XamlParseException($"Option value \"{optionAsString}\" is not assignable to any of existing ShouldProvideOption methods", li);
+                }
+
+                return false;
+            }
+        }
+
+        return node;
+
+        IXamlAstValueNode TransformNode(
+            IReadOnlyCollection<IXamlAstValueNode> values,
+            IXamlType suggestedType,
+            IXamlLineInfo line)
+        {
+            if (suggestedType is not null)
+            {
+                values = values
+                    .Select(v => XamlTransformHelpers
+                        .TryGetCorrectlyTypedValue(context, v, suggestedType, out var converted)
+                        ? converted : v)
+                    .ToArray();
+            }
+
+            if (values.Count > 1)
+            {
+                throw new XamlParseException("Options markup extension supports only a singular value", line);
+            }
+
+            return values.Single();
+        }
+    }
+
+    internal sealed class OptionsMarkupExtensionNode : XamlMarkupExtensionNode, IXamlAstValueNode
+    {
+        private readonly IXamlType _contextParameter;
+
+        public OptionsMarkupExtensionNode(
+            XamlMarkupExtensionNode original,
+            OptionsMarkupExtensionBranch[] branches,
+            IXamlAstValueNode defaultNode,
+            IXamlType contextParameter)
+            : base(
+            original.Value,
+            new OptionsMarkupExtensionMethod(new OptionsMarkupExtensionNodesContainer(branches, defaultNode), original.Value.Type.GetClrType(), contextParameter),
+            original.Value)
+        {
+            _contextParameter = contextParameter;
+        }
+
+        public new OptionsMarkupExtensionMethod ProvideValue => (OptionsMarkupExtensionMethod)base.ProvideValue;
+
+        IXamlAstTypeReference IXamlAstValueNode.Type => new XamlAstClrTypeReference(this, ProvideValue.ReturnType, false);
+
+        public override void VisitChildren(IXamlAstVisitor visitor)
+        {
+            ProvideValue.ExtensionNodeContainer.Visit(visitor);
+            base.VisitChildren(visitor);
+        }
+
+        public bool ConvertToReturnType(AstTransformationContext context, IXamlType type, out OptionsMarkupExtensionNode res)
+        {
+            IXamlAstValueNode convertedDefaultNode = null;
+
+            if (ProvideValue.ExtensionNodeContainer.DefaultNode is { } defaultNode)
+            {
+                if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context, defaultNode, type, out convertedDefaultNode))
+                {
+                    res = null;
+                    return false;
+                }
+            }
+
+            var convertedBranches = ProvideValue.ExtensionNodeContainer.Branches.Select(b => XamlTransformHelpers
+                .TryGetCorrectlyTypedValue(context, b.Value, type, out var convertedValue) ?
+                new OptionsMarkupExtensionBranch(b.Option, convertedValue, b.ConditionMethod) :
+                null).ToArray();
+            if (convertedBranches.Any(b => b is null))
+            {
+                res = null;
+                return false;
+            }
+
+            res = new OptionsMarkupExtensionNode(this, convertedBranches, convertedDefaultNode, _contextParameter);
+            return true;
+        }
+    }
+
+    internal sealed class OptionsMarkupExtensionNodesContainer : XamlAstNode
+    {
+        public OptionsMarkupExtensionNodesContainer(
+            OptionsMarkupExtensionBranch[] branches,
+            IXamlAstValueNode defaultNode) : base(branches.FirstOrDefault()?.Value ?? defaultNode)
+        {
+            Branches = branches;
+            DefaultNode = defaultNode;
+        }
+
+        public OptionsMarkupExtensionBranch[] Branches { get; }
+        public IXamlAstValueNode DefaultNode { get; private set; }
+
+        public override void VisitChildren(IXamlAstVisitor visitor)
+        {
+            VisitList(Branches, visitor);
+            DefaultNode = (IXamlAstValueNode)DefaultNode?.Visit(visitor);
+        }
+
+        public IXamlType GetReturnType()
+        {
+            var types = Branches.Select(b => b.Value.Type);
+            if (DefaultNode?.Type is { } type)
+            {
+                types = types.Concat(new [] { type });
+            }
+            return types.Select(t => t.GetClrType()).ToArray().GetCommonBaseClass();
+        }
+    }
+
+    internal sealed class OptionsMarkupExtensionBranch : XamlAstNode
+    {
+        public OptionsMarkupExtensionBranch(IXamlAstValueNode option, IXamlAstValueNode value, IXamlMethod conditionMethod) : base(value)
+        {
+            Option = option;
+            Value = value;
+            ConditionMethod = conditionMethod;
+        }
+
+        public IXamlAstValueNode Option { get; set; }
+        public IXamlAstValueNode Value { get; set; }
+        public IXamlMethod ConditionMethod { get; }
+
+        public bool HasContext => ConditionMethod.Parameters.Count > 1;
+
+        public override void VisitChildren(IXamlAstVisitor visitor)
+        {
+            Option = (IXamlAstValueNode)Option.Visit(visitor);
+            Value = (IXamlAstValueNode)Value.Visit(visitor);
+        }
+    }
+
+    internal sealed class OptionsMarkupExtensionMethod : IXamlCustomEmitMethodWithContext<IXamlILEmitter, XamlILNodeEmitResult>
+    {
+        public OptionsMarkupExtensionMethod(
+            OptionsMarkupExtensionNodesContainer extensionNodeContainer,
+            IXamlType declaringType,
+            IXamlType contextParameter)
+        {
+            ExtensionNodeContainer = extensionNodeContainer;
+            DeclaringType = declaringType;
+            Parameters = extensionNodeContainer.Branches.Any(c => c.HasContext) ?
+                new[] { contextParameter } :
+                Array.Empty<IXamlType>();
+        }
+
+        public OptionsMarkupExtensionNodesContainer ExtensionNodeContainer { get; }
+
+        public string Name => "ProvideValue";
+        public bool IsPublic => true;
+        public bool IsStatic => false;
+        public IXamlType ReturnType => ExtensionNodeContainer.GetReturnType();
+        public IReadOnlyList<IXamlType> Parameters { get; }
+        public IXamlType DeclaringType { get; }
+        public IXamlMethod MakeGenericMethod(IReadOnlyList<IXamlType> typeArguments) => throw new NotImplementedException();
+        public IReadOnlyList<IXamlCustomAttribute> CustomAttributes => Array.Empty<IXamlCustomAttribute>();
+
+        public void EmitCall(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            // At this point this extension will be called from MarkupExtensionEmitter.
+            // Since it's a "fake" method, we share stack and locals with parent method.
+            // Real ProvideValue method would pop 2 parameters from the stack and return one. This method should do the same.
+            // At this point we will have on stack:
+            // - context (if parameters > 1)
+            // - markup ext "@this" instance (always)
+            // We always pop context from the stack, as this method decide by itself either context is needed.
+            // We store "@this" as a local variable. But only if any conditional method is an instance method.
+            IXamlLocal @this = null;
+            if (Parameters.Count > 0)
+            {
+                codeGen.Pop();
+            }
+            if (ExtensionNodeContainer.Branches.Any(b => !b.ConditionMethod.IsStatic))
+            {
+                codeGen.Stloc(@this = codeGen.DefineLocal(DeclaringType));
+            }
+            else
+            {
+                codeGen.Pop();
+            }
+
+            // Iterate over all branches and push prepared locals into the stack if needed.
+            var ret = codeGen.DefineLabel();
+            foreach (var branch in ExtensionNodeContainer.Branches)
+            {
+                var next = codeGen.DefineLabel();
+                if (branch.HasContext)
+                {
+                    codeGen.Ldloc(context.ContextLocal);
+                }
+                if (!branch.ConditionMethod.IsStatic)
+                {
+                    codeGen.Ldloc(@this);
+                }
+                context.Emit(branch.Option, codeGen, branch.Option.Type.GetClrType());
+                codeGen.EmitCall(branch.ConditionMethod);
+                codeGen.Brfalse(next);
+
+                context.Emit(branch.Value, codeGen, branch.Value.Type.GetClrType());
+                codeGen.Br(ret);
+                codeGen.MarkLabel(next);
+            }
+
+            if (ExtensionNodeContainer.DefaultNode is {} defaultNode)
+            {
+                // Nop is needed, otherwise Label wouldn't be set on nested CALL op (limitation of our IL validator).
+                codeGen.Emit(OpCodes.Nop);
+                context.Emit(defaultNode, codeGen, defaultNode.Type.GetClrType());
+            }
+            else
+            {
+                codeGen.EmitDefault(ReturnType);
+            }
+
+            codeGen.MarkLabel(ret);
+        }
+
+        public bool Equals(IXamlMethod other) => ReferenceEquals(this, other);
+    }
+}
+
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
index 79589a5a4f..70209fb3ad 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                 throw new XamlParseException($"Cannot find '{property.Property}' on '{type}", node);
 
                             if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context,
-                                new XamlAstTextNode(node, property.Value, context.Configuration.WellKnownTypes.String),
+                                new XamlAstTextNode(node, property.Value, type: context.Configuration.WellKnownTypes.String),
                                 targetProperty.PropertyType, out var typedValue))
                                 throw new XamlParseException(
                                     $"Cannot convert '{property.Value}' to '{targetProperty.PropertyType.GetFqn()}",
@@ -118,7 +118,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                     .GetAvaloniaPropertyType(targetPropertyField, context.GetAvaloniaTypes(), node);
 
                                 if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context,
-                                    new XamlAstTextNode(node, attachedProperty.Value, context.Configuration.WellKnownTypes.String),
+                                    new XamlAstTextNode(node, attachedProperty.Value, type: context.Configuration.WellKnownTypes.String),
                                     targetPropertyType, out var typedValue))
                                         throw new XamlParseException(
                                             $"Cannot convert '{attachedProperty.Value}' to '{targetPropertyType.GetFqn()}",
@@ -151,6 +151,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                             results.Add(result);
                             result = initialNode;
                             break;
+                        case SelectorGrammar.NestingSyntax:
+                            var parentTargetType = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>().FirstOrDefault();
+
+                            if (parentTargetType is null)
+                                throw new XamlParseException($"Cannot find parent style for nested selector.", node);
+
+                            result = new XamlIlNestingSelector(result, parentTargetType.TargetType.GetClrType());
+                            break;
                         default:
                             throw new XamlParseException($"Unsupported selector grammar '{i.GetType()}'.", node);
                     }
@@ -474,4 +482,20 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 m => m.Name == "Or" && m.Parameters.Count == 1 && m.Parameters[0].Name.StartsWith("IReadOnlyList"));
         }
     }
+
+    class XamlIlNestingSelector : XamlIlSelectorNode
+    {
+        public XamlIlNestingSelector(XamlIlSelectorNode previous, IXamlType targetType)
+            : base(previous)
+        {
+            TargetType = targetType;
+        }
+
+        public override IXamlType TargetType { get; }
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            EmitCall(context, codeGen,
+                m => m.Name == "Nesting" && m.Parameters.Count == 1);
+        }
+    }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTargetTypeMetadataTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTargetTypeMetadataTransformer.cs
new file mode 100644
index 0000000000..ebc6c01ba8
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTargetTypeMetadataTransformer.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+
+internal class AvaloniaXamlIlSetterTargetTypeMetadataTransformer : IXamlAstTransformer
+{
+    public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+    {
+        if (node is XamlAstObjectNode on
+            && on.Children.FirstOrDefault(c => c is XamlAstXmlDirective
+            {
+                Namespace: XamlNamespaces.Xaml2006,
+                Name: "SetterTargetType"
+            }) is { } typeDirective)
+        {
+            var value = ((XamlAstXmlDirective)typeDirective).Values.Single();
+            var type = value is XamlTypeExtensionNode typeNode ? typeNode.Value
+                : value is XamlAstTextNode tn ? TypeReferenceResolver.ResolveType(context, tn.Text, false, tn, true)
+                : null;
+            on.Children.Remove(typeDirective);
+
+            if (type is null)
+            {
+                throw new XamlParseException("Unable to resolve SetterTargetType type", typeDirective);
+            }
+            return new AvaloniaXamlIlTargetTypeMetadataNode(on, type, AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style);
+        }
+        return node;
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
index e816265422..5a6fd8246d 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -1,19 +1,14 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Data.Core;
 using XamlX;
 using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
 using XamlX.Transform;
-using XamlX.Transform.Transformers;
 using XamlX.TypeSystem;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    using XamlParseException = XamlX.XamlParseException;
-    using XamlLoadException = XamlX.XamlLoadException;
     class AvaloniaXamlIlSetterTransformer : IXamlAstTransformer
     {
         public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
@@ -22,35 +17,36 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                   && on.Type.GetClrType().FullName == "Avalonia.Styling.Setter"))
                 return node;
 
-            var parent = context.ParentNodes().OfType<XamlAstObjectNode>()
-                .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style");
-            
-            if (parent == null)
-                throw new XamlParseException(
-                    "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
-            var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
-            if (selectorProperty == null)
-                throw new XamlParseException(
-                    "Can not find parent Style Selector", node);
-            var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-            if (selector?.TargetType == null)
-                throw new XamlParseException(
-                    "Can not resolve parent Style Selector type", node);
+            IXamlType targetType = null;
+            IXamlLineInfo lineInfo = null;
+
+            var styleParent = context.ParentNodes()
+                .OfType<AvaloniaXamlIlTargetTypeMetadataNode>()
+                .FirstOrDefault(x => x.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style);
+
+            if (styleParent != null)
+            {
+                targetType = styleParent.TargetType.GetClrType()
+                             ?? throw new XamlParseException("Can not find parent Style Selector or ControlTemplate TargetType. If setter is not part of the style, you can set x:SetterTargetType directive on its parent.", node);
+                lineInfo = on;
+            }
+
+            if (targetType == null)
+            {
+                throw new XamlParseException("Could not determine target type of Setter", node);
+            }
 
             IXamlType propType = null;
             var property = @on.Children.OfType<XamlAstXamlPropertyValueNode>()
                 .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Property");
             if (property != null)
             {
-
                 var propertyName = property.Values.OfType<XamlAstTextNode>().FirstOrDefault()?.Text;
                 if (propertyName == null)
                     throw new XamlParseException("Setter.Property must be a string", node);
 
-
                 var avaloniaPropertyNode = XamlIlAvaloniaPropertyHelper.CreateNode(context, propertyName,
-                    new XamlAstClrTypeReference(selector, selector.TargetType, false), property.Values[0]);
+                    new XamlAstClrTypeReference(lineInfo, targetType, false), property.Values[0]);
                 property.Values = new List<IXamlAstValueNode> {avaloniaPropertyNode};
                 propType = avaloniaPropertyNode.AvaloniaPropertyType;
             }
@@ -92,17 +88,17 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             {
                 Getter = setterType.Methods.First(m => m.Name == "get_Value");
                 var method = setterType.Methods.First(m => m.Name == "set_Value");
-                Setters.Add(new XamlIlDirectCallPropertySetter(method, types.IBinding));
-                Setters.Add(new XamlIlDirectCallPropertySetter(method, types.UnsetValueType));
-                Setters.Add(new XamlIlDirectCallPropertySetter(method, targetType));
+                Setters.Add(new XamlIlDirectCallPropertySetter(method, types.IBinding, false));
+                Setters.Add(new XamlIlDirectCallPropertySetter(method, types.UnsetValueType, false));
+                Setters.Add(new XamlIlDirectCallPropertySetter(method, targetType, targetType.AcceptsNull()));
             }
             
-            class XamlIlDirectCallPropertySetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
+            sealed class XamlIlDirectCallPropertySetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
             {
                 private readonly IXamlMethod _method;
                 private readonly IXamlType _type;
                 public IXamlType TargetType { get; }
-                public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters();
+                public PropertySetterBinderParameters BinderParameters { get; }
                 public IReadOnlyList<IXamlType> Parameters { get; }
                 public void Emit(IXamlILEmitter codegen)
                 {
@@ -111,13 +107,27 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     codegen.EmitCall(_method, true);
                 }
 
-                public XamlIlDirectCallPropertySetter(IXamlMethod method, IXamlType type)
+                public XamlIlDirectCallPropertySetter(IXamlMethod method, IXamlType type, bool allowNull)
                 {
                     _method = method;
                     _type = type;
                     Parameters = new[] {type};
                     TargetType = method.ThisOrFirstParameter();
+                    BinderParameters = new PropertySetterBinderParameters
+                    {
+                        AllowXNull = allowNull,
+                        AllowRuntimeNull = allowNull
+                    };
                 }
+
+                private bool Equals(XamlIlDirectCallPropertySetter other) 
+                    => Equals(_method, other._method) && Equals(_type, other._type);
+
+                public override bool Equals(object obj) 
+                    => Equals(obj as XamlIlDirectCallPropertySetter);
+
+                public override int GetHashCode() 
+                    => (_method.GetHashCode() * 397) ^ _type.GetHashCode();
             }
         }
     }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index 89b88790dc..bf8427a129 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -9,21 +9,30 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
     class AvaloniaXamlIlWellKnownTypes
     {
+        public IXamlType RuntimeHelpers { get; }
         public IXamlType AvaloniaObject { get; }
         public IXamlType IAvaloniaObject { get; }
         public IXamlType BindingPriority { get; }
         public IXamlType AvaloniaObjectExtensions { get; }
         public IXamlType AvaloniaProperty { get; }
         public IXamlType AvaloniaPropertyT { get; }
+        public IXamlType StyledPropertyT { get; }
+        public IXamlMethod AvaloniaObjectSetStyledPropertyValue { get; }
         public IXamlType AvaloniaAttachedPropertyT { get; }
         public IXamlType IBinding { get; }
         public IXamlMethod AvaloniaObjectBindMethod { get; }
         public IXamlMethod AvaloniaObjectSetValueMethod { get; }
         public IXamlType IDisposable { get; }
+        public IXamlType ICommand { get; }
         public XamlTypeWellKnownTypes XamlIlTypes { get; }
         public XamlLanguageTypeMappings XamlIlMappings { get; }
         public IXamlType Transitions { get; }
         public IXamlType AssignBindingAttribute { get; }
+        public IXamlType DependsOnAttribute { get; }
+        public IXamlType DataTypeAttribute { get; }
+        public IXamlType MarkupExtensionOptionAttribute { get; }
+        public IXamlType MarkupExtensionDefaultOptionAttribute { get; }
+        public IXamlType OnExtensionType { get; }
         public IXamlType UnsetValueType { get; }
         public IXamlType StyledElement { get; }
         public IXamlType IStyledElement { get; }
@@ -69,6 +78,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlConstructor MatrixFullConstructor { get; }
         public IXamlType CornerRadius { get; }
         public IXamlConstructor CornerRadiusFullConstructor { get; }
+        public IXamlType RelativeUnit { get; }
+        public IXamlType RelativePoint { get; }
+        public IXamlConstructor RelativePointFullConstructor { get; }
         public IXamlType GridLength { get; }
         public IXamlConstructor GridLengthConstructorValueType { get; }
         public IXamlType Color { get; }
@@ -85,21 +97,45 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlType IBrush { get; }
         public IXamlType ImmutableSolidColorBrush { get; }
         public IXamlConstructor ImmutableSolidColorBrushConstructorColor { get; }
+        public IXamlType TypeUtilities { get; }
+        public IXamlType TextDecorationCollection { get; }
+        public IXamlType TextDecorations { get; }
+        public IXamlType TextTrimming { get; }
+        public IXamlType ISetter { get; }
+        public IXamlType IResourceDictionary { get; }
+        public IXamlType ResourceDictionary { get; }
+        public IXamlMethod ResourceDictionaryDeferredAdd { get; }
+        public IXamlType UriKind { get; }
+        public IXamlConstructor UriConstructor { get; }
 
         public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
         {
+            RuntimeHelpers = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.XamlIlRuntimeHelpers");
+
             XamlIlTypes = cfg.WellKnownTypes;
             AvaloniaObject = cfg.TypeSystem.GetType("Avalonia.AvaloniaObject");
             IAvaloniaObject = cfg.TypeSystem.GetType("Avalonia.IAvaloniaObject");
             AvaloniaObjectExtensions = cfg.TypeSystem.GetType("Avalonia.AvaloniaObjectExtensions");
             AvaloniaProperty = cfg.TypeSystem.GetType("Avalonia.AvaloniaProperty");
             AvaloniaPropertyT = cfg.TypeSystem.GetType("Avalonia.AvaloniaProperty`1");
+            StyledPropertyT = cfg.TypeSystem.GetType("Avalonia.StyledProperty`1");
             AvaloniaAttachedPropertyT = cfg.TypeSystem.GetType("Avalonia.AttachedProperty`1");
             BindingPriority = cfg.TypeSystem.GetType("Avalonia.Data.BindingPriority");
+            AvaloniaObjectSetStyledPropertyValue = AvaloniaObject
+                .FindMethod(m => m.IsPublic && !m.IsStatic && m.Name == "SetValue"
+                                 && m.Parameters.Count == 3
+                                 && m.Parameters[0].Name == "StyledPropertyBase`1"
+                                 && m.Parameters[2].Equals(BindingPriority));
             IBinding = cfg.TypeSystem.GetType("Avalonia.Data.IBinding");
             IDisposable = cfg.TypeSystem.GetType("System.IDisposable");
+            ICommand = cfg.TypeSystem.GetType("System.Windows.Input.ICommand");
             Transitions = cfg.TypeSystem.GetType("Avalonia.Animation.Transitions");
             AssignBindingAttribute = cfg.TypeSystem.GetType("Avalonia.Data.AssignBindingAttribute");
+            DependsOnAttribute = cfg.TypeSystem.GetType("Avalonia.Metadata.DependsOnAttribute");
+            DataTypeAttribute = cfg.TypeSystem.GetType("Avalonia.Metadata.DataTypeAttribute");
+            MarkupExtensionOptionAttribute = cfg.TypeSystem.GetType("Avalonia.Metadata.MarkupExtensionOptionAttribute");
+            MarkupExtensionDefaultOptionAttribute = cfg.TypeSystem.GetType("Avalonia.Metadata.MarkupExtensionDefaultOptionAttribute");
+            OnExtensionType = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.On");
             AvaloniaObjectBindMethod = AvaloniaObjectExtensions.FindMethod("Bind", IDisposable, false, IAvaloniaObject,
                 AvaloniaProperty,
                 IBinding, cfg.WellKnownTypes.Object);
@@ -126,7 +162,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             NameScopeSetNameScope = NameScope.GetMethod(new FindMethodMethodSignature("SetNameScope",
                 XamlIlTypes.Void, StyledElement, INameScope)
             { IsStatic = true });
-            AvaloniaObjectSetValueMethod = AvaloniaObject.FindMethod("SetValue", XamlIlTypes.Void,
+            AvaloniaObjectSetValueMethod = AvaloniaObject.FindMethod("SetValue", IDisposable,
                 false, AvaloniaProperty, XamlIlTypes.Object, BindingPriority);
             IPropertyInfo = cfg.TypeSystem.GetType("Avalonia.Data.Core.IPropertyInfo");
             ClrPropertyInfo = cfg.TypeSystem.GetType("Avalonia.Data.Core.ClrPropertyInfo");
@@ -166,6 +202,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             (Matrix, MatrixFullConstructor) = GetNumericTypeInfo("Avalonia.Matrix", XamlIlTypes.Double, 6);
             (CornerRadius, CornerRadiusFullConstructor) = GetNumericTypeInfo("Avalonia.CornerRadius", XamlIlTypes.Double, 4);
 
+            RelativeUnit = cfg.TypeSystem.GetType("Avalonia.RelativeUnit");
+            RelativePoint = cfg.TypeSystem.GetType("Avalonia.RelativePoint");
+            RelativePointFullConstructor = RelativePoint.GetConstructor(new List<IXamlType> { XamlIlTypes.Double, XamlIlTypes.Double, RelativeUnit });
+
             GridLength = cfg.TypeSystem.GetType("Avalonia.Controls.GridLength");
             GridLengthConstructorValueType = GridLength.GetConstructor(new List<IXamlType> { XamlIlTypes.Double, cfg.TypeSystem.GetType("Avalonia.Controls.GridUnitType") });
             Color = cfg.TypeSystem.GetType("Avalonia.Media.Color");
@@ -187,6 +227,19 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             IBrush = cfg.TypeSystem.GetType("Avalonia.Media.IBrush");
             ImmutableSolidColorBrush = cfg.TypeSystem.GetType("Avalonia.Media.Immutable.ImmutableSolidColorBrush");
             ImmutableSolidColorBrushConstructorColor = ImmutableSolidColorBrush.GetConstructor(new List<IXamlType> { UInt });
+            TypeUtilities = cfg.TypeSystem.GetType("Avalonia.Utilities.TypeUtilities");
+            TextDecorationCollection = cfg.TypeSystem.GetType("Avalonia.Media.TextDecorationCollection");
+            TextDecorations = cfg.TypeSystem.GetType("Avalonia.Media.TextDecorations");
+            TextTrimming = cfg.TypeSystem.GetType("Avalonia.Media.TextTrimming");
+            ISetter = cfg.TypeSystem.GetType("Avalonia.Styling.ISetter");
+            IResourceDictionary = cfg.TypeSystem.GetType("Avalonia.Controls.IResourceDictionary");
+            ResourceDictionary = cfg.TypeSystem.GetType("Avalonia.Controls.ResourceDictionary");
+            ResourceDictionaryDeferredAdd = ResourceDictionary.FindMethod("AddDeferred", XamlIlTypes.Void, true, XamlIlTypes.Object,
+                cfg.TypeSystem.GetType("System.Func`2").MakeGenericType(
+                    cfg.TypeSystem.GetType("System.IServiceProvider"),
+                    XamlIlTypes.Object));
+            UriKind = cfg.TypeSystem.GetType("System.UriKind");
+            UriConstructor = Uri.GetConstructor(new List<IXamlType>() { cfg.WellKnownTypes.String, UriKind });
         }
     }
 
@@ -199,7 +252,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             ctx.SetItem(rv = new AvaloniaXamlIlWellKnownTypes(ctx.Configuration));
             return rv;
         }
-        
+
         public static AvaloniaXamlIlWellKnownTypes GetAvaloniaTypes(this XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> ctx)
         {
             if (ctx.TryGetItem<AvaloniaXamlIlWellKnownTypes>(out var rv))
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
new file mode 100644
index 0000000000..845dc5f831
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    internal class XDataTypeTransformer : IXamlAstTransformer
+    {
+        private const string DataTypePropertyName = "DataType";
+        
+        /// <summary>
+        /// Converts x:DataType directives to regular DataType assignments if property with Avalonia.Metadata.DataTypeAttribute exists.
+        /// </summary>
+        /// <returns></returns>
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlAstObjectNode on)
+            {
+                for (var c = 0; c < on.Children.Count; c++)
+                {
+                    var ch = on.Children[c];
+                    if (ch is XamlAstXmlDirective { Namespace: XamlNamespaces.Xaml2006, Name: DataTypePropertyName } d)
+                    {
+                        if (on.Children.OfType<XamlAstXamlPropertyValueNode>()
+                            .Any(p => ((XamlAstNamePropertyReference)p.Property)?.Name == DataTypePropertyName))
+                        {
+                            // Break iteration if any DataType property was already set by user code.
+                            break;
+                        }
+                        
+                        var templateDataTypeAttribute = context.GetAvaloniaTypes().DataTypeAttribute;
+
+                        var clrType = (on.Type as XamlAstClrTypeReference)?.Type;
+                        if (clrType is null)
+                        {
+                            break;
+                        }
+
+                        // Technically it's possible to map "x:DataType" to a property with [DataType] attribute regardless of its name,
+                        // but we go explicitly strict here and check the name as well.
+                        var (declaringType, dataTypeProperty) = GetAllProperties(clrType)
+                            .FirstOrDefault(t => t.property.Name == DataTypePropertyName && t.property.CustomAttributes
+                                .Any(a => a.Type == templateDataTypeAttribute));
+                       
+                        if (dataTypeProperty is not null)
+                        {
+                            on.Children[c] = new XamlAstXamlPropertyValueNode(d,
+                                new XamlAstNamePropertyReference(d,
+                                    new XamlAstClrTypeReference(ch, declaringType, false), dataTypeProperty.Name,
+                                    on.Type),
+                                d.Values);
+                        }
+                    }
+                }
+            }
+
+            return node;
+        }
+        
+        private static IEnumerable<(IXamlType declaringType, IXamlProperty property)> GetAllProperties(IXamlType t)
+        {
+            foreach (var p in t.Properties)
+                yield return (t, p);
+            if(t.BaseType!=null)
+                foreach (var tuple in GetAllProperties(t.BaseType))
+                    yield return tuple;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index 7f1b8caf0d..6c9d510ba0 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -185,46 +185,122 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             AvaloniaXamlIlWellKnownTypes types)
             :base(original, original.Name, original.DeclaringType, original.Getter, original.Setters)
         {
+            var assignBinding = original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute));
+
             AvaloniaProperty = field;
             CustomAttributes = original.CustomAttributes;
-            if (!original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute)))
+            if (!assignBinding)
                 Setters.Insert(0, new BindingSetter(types, original.DeclaringType, field));
-            
+
+            // Styled and attached properties can be set with a BindingPriority when they're
+            // assigned in a ControlTemplate.
+            if (field.FieldType.GenericTypeDefinition == types.StyledPropertyT ||
+                field.FieldType.GenericTypeDefinition == types.AvaloniaAttachedPropertyT)
+            {
+                var propertyType = field.FieldType.GenericArguments[0];
+                Setters.Insert(0, new SetValueWithPrioritySetter(types, original.DeclaringType, field, propertyType));
+                if (!assignBinding)
+                    Setters.Insert(1, new BindingWithPrioritySetter(types, original.DeclaringType, field));
+            }
+
             Setters.Insert(0, new UnsetValueSetter(types, original.DeclaringType, field));
         }
 
-        abstract class AvaloniaPropertyCustomSetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
+        abstract class AvaloniaPropertyCustomSetter : IXamlILOptimizedEmitablePropertySetter, IEquatable<AvaloniaPropertyCustomSetter>
         {
-            protected AvaloniaXamlIlWellKnownTypes Types;
-            protected IXamlField AvaloniaProperty;
+            protected readonly AvaloniaXamlIlWellKnownTypes Types;
+            protected readonly IXamlField AvaloniaProperty;
 
-            public AvaloniaPropertyCustomSetter(AvaloniaXamlIlWellKnownTypes types,
+            protected AvaloniaPropertyCustomSetter(
+                AvaloniaXamlIlWellKnownTypes types,
                 IXamlType declaringType,
-                IXamlField avaloniaProperty)
+                IXamlField avaloniaProperty,
+                bool allowNull)
             {
                 Types = types;
                 AvaloniaProperty = avaloniaProperty;
                 TargetType = declaringType;
+                BinderParameters = new PropertySetterBinderParameters
+                {
+                    AllowXNull = allowNull,
+                    AllowRuntimeNull = allowNull
+                };
             }
 
             public IXamlType TargetType { get; }
 
-            public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters
-            {
-                AllowXNull = false
-            };
+            public PropertySetterBinderParameters BinderParameters { get; }
 
             public IReadOnlyList<IXamlType> Parameters { get; set; }
-            public abstract void Emit(IXamlILEmitter codegen);
+
+            public abstract void Emit(IXamlILEmitter emitter);
+
+            public abstract void EmitWithArguments(
+                XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context,
+                IXamlILEmitter emitter,
+                IReadOnlyList<IXamlAstValueNode> arguments);
+
+            public bool Equals(AvaloniaPropertyCustomSetter other)
+            {
+                if (ReferenceEquals(null, other))
+                    return false;
+                if (ReferenceEquals(this, other))
+                    return true;
+
+                return GetType() == other.GetType() && AvaloniaProperty.Equals(other.AvaloniaProperty);
+            }
+
+            public override bool Equals(object obj)
+                => Equals(obj as AvaloniaPropertyCustomSetter);
+
+            public override int GetHashCode() 
+                => AvaloniaProperty.GetHashCode();
         }
 
         class BindingSetter : AvaloniaPropertyCustomSetter
         {
             public BindingSetter(AvaloniaXamlIlWellKnownTypes types,
                 IXamlType declaringType,
-                IXamlField avaloniaProperty) : base(types, declaringType, avaloniaProperty)
+                IXamlField avaloniaProperty) : base(types, declaringType, avaloniaProperty, false)
+            {
+                Parameters = new[] { types.IBinding };
+            }
+
+            public override void Emit(IXamlILEmitter emitter)
+            {
+                using (var bloc = emitter.LocalsPool.GetLocal(Types.IBinding))
+                    emitter
+                        .Stloc(bloc.Local)
+                        .Ldsfld(AvaloniaProperty)
+                        .Ldloc(bloc.Local);
+                EmitAnchorAndBind(emitter);
+            }
+
+            public override void EmitWithArguments(
+                XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context,
+                IXamlILEmitter emitter,
+                IReadOnlyList<IXamlAstValueNode> arguments)
+            {
+                emitter.Ldsfld(AvaloniaProperty);
+                context.Emit(arguments[0], emitter, Parameters[0]);
+                EmitAnchorAndBind(emitter);
+            }
+
+            private void EmitAnchorAndBind(IXamlILEmitter emitter)
+            {
+                emitter
+                    .Ldnull() // TODO: provide anchor?
+                    .EmitCall(Types.AvaloniaObjectBindMethod, true);
+            }
+        }
+
+        class BindingWithPrioritySetter : AvaloniaPropertyCustomSetter
+        {
+            public BindingWithPrioritySetter(AvaloniaXamlIlWellKnownTypes types,
+                IXamlType declaringType,
+                IXamlField avaloniaProperty) : base(types, declaringType, avaloniaProperty, false)
             {
-                Parameters = new[] {types.IBinding};
+                Parameters = new[] { types.BindingPriority, types.IBinding };
             }
 
             public override void Emit(IXamlILEmitter emitter)
@@ -232,28 +308,106 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 using (var bloc = emitter.LocalsPool.GetLocal(Types.IBinding))
                     emitter
                         .Stloc(bloc.Local)
+                        .Pop() // ignore priority
+                        .Ldsfld(AvaloniaProperty)
+                        .Ldloc(bloc.Local);
+                EmitAnchorAndBind(emitter);
+            }
+
+            public override void EmitWithArguments(
+                XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context,
+                IXamlILEmitter emitter,
+                IReadOnlyList<IXamlAstValueNode> arguments)
+            {
+                emitter.Ldsfld(AvaloniaProperty);
+                context.Emit(arguments[1], emitter, Parameters[1]);
+                EmitAnchorAndBind(emitter);
+            }
+
+            private void EmitAnchorAndBind(IXamlILEmitter emitter)
+            {
+                emitter
+                    .Ldnull() // TODO: provide anchor?
+                    .EmitCall(Types.AvaloniaObjectBindMethod, true);
+            }
+        }
+
+        class SetValueWithPrioritySetter : AvaloniaPropertyCustomSetter
+        {
+            public SetValueWithPrioritySetter(AvaloniaXamlIlWellKnownTypes types, IXamlType declaringType, IXamlField avaloniaProperty,
+                IXamlType propertyType)
+                : base(types, declaringType, avaloniaProperty, propertyType.AcceptsNull())
+            {
+                Parameters = new[] { types.BindingPriority, propertyType };
+            }
+
+            public override void Emit(IXamlILEmitter emitter)
+            {
+                /*
+                  Current stack:
+                   - object
+                   - binding priority
+                   - value
+                */
+
+                using (var valueLocal = emitter.LocalsPool.GetLocal(Parameters[1]))
+                using (var priorityLocal = emitter.LocalsPool.GetLocal(Types.Int))
+                    emitter
+                        .Stloc(valueLocal.Local)
+                        .Stloc(priorityLocal.Local)
                         .Ldsfld(AvaloniaProperty)
-                        .Ldloc(bloc.Local)
-                        // TODO: provide anchor?
-                        .Ldnull();
-                emitter.EmitCall(Types.AvaloniaObjectBindMethod, true);
+                        .Ldloc(valueLocal.Local)
+                        .Ldloc(priorityLocal.Local);
+
+                EmitSetStyledPropertyValue(emitter);
+            }
+
+            public override void EmitWithArguments(
+                XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context,
+                IXamlILEmitter emitter,
+                IReadOnlyList<IXamlAstValueNode> arguments)
+            {
+                emitter.Ldsfld(AvaloniaProperty);
+                context.Emit(arguments[1], emitter, Parameters[1]);
+                context.Emit(arguments[0], emitter, Parameters[0]);
+                EmitSetStyledPropertyValue(emitter);
+            }
+
+            private void EmitSetStyledPropertyValue(IXamlILEmitter emitter)
+            {
+                var method = Types.AvaloniaObjectSetStyledPropertyValue.MakeGenericMethod(new[] { Parameters[1] });
+                emitter.EmitCall(method, true);
             }
         }
 
         class UnsetValueSetter : AvaloniaPropertyCustomSetter
         {
             public UnsetValueSetter(AvaloniaXamlIlWellKnownTypes types, IXamlType declaringType, IXamlField avaloniaProperty) 
-                : base(types, declaringType, avaloniaProperty)
+                : base(types, declaringType, avaloniaProperty, false)
             {
-                Parameters = new[] {types.UnsetValueType};
+                Parameters = new[] { types.UnsetValueType };
             }
 
             public override void Emit(IXamlILEmitter codegen)
             {
+                codegen.Pop();
+                EmitSetValue(codegen);
+            }
+
+            public override void EmitWithArguments(
+                XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context,
+                IXamlILEmitter emitter,
+                IReadOnlyList<IXamlAstValueNode> arguments)
+            {
+                EmitSetValue(emitter);
+            }
+
+            private void EmitSetValue(IXamlILEmitter emitter)
+            {
+                // Ignore the instance and load one from the static field to avoid extra local variable
                 var unsetValue = Types.AvaloniaProperty.Fields.First(f => f.Name == "UnsetValue");
-                codegen
-                    // Ignore the instance and load one from the static field to avoid extra local variable
-                    .Pop()
+
+                emitter
                     .Ldsfld(AvaloniaProperty)
                     .Ldsfld(unsetValue)
                     .Ldc_I4(0)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
index 7f7f60ed94..ae29dcf9cb 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
@@ -14,7 +14,7 @@ using XamlX.Emit;
 using XamlX.IL;
 using Avalonia.Utilities;
 
-using XamlIlEmitContext = XamlX.Emit.XamlEmitContext<XamlX.IL.IXamlILEmitter, XamlX.IL.XamlILNodeEmitResult>;
+using XamlIlEmitContext = XamlX.Emit.XamlEmitContextWithLocals<XamlX.IL.IXamlILEmitter, XamlX.IL.XamlILNodeEmitResult>;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 {
@@ -32,6 +32,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     selfType,
                     bindingPath.Path);
 
+                transformed = TransformForTargetTyping(transformed, context);
+
                 bindingResultType = transformed.BindingResultType;
                 binding.Arguments[0] = transformed;
             }
@@ -45,7 +47,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     return startTypeResolver();
                 }
 
-                if (bindingPathAssignment.Values[0] is ParsedBindingPathNode bindingPathNode)
+                if (bindingPathAssignment.Values[0] is XamlIlBindingPathNode pathNode)
+                {
+                    bindingResultType = pathNode.BindingResultType;
+                }
+                else if (bindingPathAssignment.Values[0] is ParsedBindingPathNode bindingPathNode)
                 {
                     var transformed = TransformBindingPath(
                         context,
@@ -54,19 +60,55 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                         selfType,
                         bindingPathNode.Path);
 
+                    transformed = TransformForTargetTyping(transformed, context);
+
                     bindingResultType = transformed.BindingResultType;
                     bindingPathAssignment.Values[0] = transformed;
                 }
                 else
                 {
-                    throw new InvalidOperationException();
+                    throw new InvalidOperationException("Invalid state of Path property");
                 }
             }
 
             return bindingResultType;
         }
 
-        private static IXamlIlBindingPathNode TransformBindingPath(AstTransformationContext context, IXamlLineInfo lineInfo, Func<IXamlType> startTypeResolver, IXamlType selfType, IEnumerable<BindingExpressionGrammar.INode> bindingExpression)
+        private static XamlIlBindingPathNode TransformForTargetTyping(XamlIlBindingPathNode transformed, AstTransformationContext context)
+        {
+            var parentNode = context.ParentNodes().OfType<XamlPropertyAssignmentNode>().FirstOrDefault();
+
+            if (parentNode == null)
+            {
+                return transformed;
+            }
+
+            var lastElement =
+                transformed.Elements[transformed.Elements.Count - 1];
+            
+            if (parentNode.Property?.Getter?.ReturnType == context.GetAvaloniaTypes().ICommand && lastElement is XamlIlClrMethodPathElementNode methodPathElement)
+            {
+                IXamlMethod executeMethod = methodPathElement.Method;
+                IXamlMethod canExecuteMethod = executeMethod.DeclaringType.FindMethod(new FindMethodMethodSignature($"Can{executeMethod.Name}", context.Configuration.WellKnownTypes.Boolean, context.Configuration.WellKnownTypes.Object));
+                List<string> dependsOnProperties = new();
+                if (canExecuteMethod is not null)
+                {
+                    foreach (var attr in canExecuteMethod.CustomAttributes)
+                    {
+                        if (attr.Type == context.GetAvaloniaTypes().DependsOnAttribute)
+                        {
+                            dependsOnProperties.Add((string)attr.Parameters[0]);
+                        }
+                    }
+                }
+                transformed.Elements.RemoveAt(transformed.Elements.Count - 1);
+                transformed.Elements.Add(new XamlIlClrMethodAsCommandPathElementNode(context.GetAvaloniaTypes().ICommand, executeMethod, canExecuteMethod, dependsOnProperties));
+            }
+
+            return transformed;
+        }
+
+        private static XamlIlBindingPathNode TransformBindingPath(AstTransformationContext context, IXamlLineInfo lineInfo, Func<IXamlType> startTypeResolver, IXamlType selfType, IEnumerable<BindingExpressionGrammar.INode> bindingExpression)
         {
             List<IXamlIlBindingPathElementNode> transformNodes = new List<IXamlIlBindingPathElementNode>();
             List<IXamlIlBindingPathElementNode> nodes = new List<IXamlIlBindingPathElementNode>();
@@ -126,16 +168,18 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                                 nodes.Add(new XamlIlAvaloniaPropertyPropertyPathElementNode(avaloniaPropertyFieldMaybe,
                                     XamlIlAvaloniaPropertyHelper.GetAvaloniaPropertyType(avaloniaPropertyFieldMaybe, context.GetAvaloniaTypes(), lineInfo)));
                             }
-                            else
+                            else if (GetAllDefinedProperties(targetType).FirstOrDefault(p => p.Name == propName.PropertyName) is IXamlProperty clrProperty)
                             {
-                                var clrProperty = GetAllDefinedProperties(targetType).FirstOrDefault(p => p.Name == propName.PropertyName);
-
-                                if (clrProperty is null)
-                                {
-                                    throw new XamlX.XamlParseException($"Unable to resolve property of name '{propName.PropertyName}' on type '{targetType}'.", lineInfo);
-                                }
                                 nodes.Add(new XamlIlClrPropertyPathElementNode(clrProperty));
                             }
+                            else if (GetAllDefinedMethods(targetType).FirstOrDefault(m => m.Name == propName.PropertyName) is IXamlMethod method)
+                            {
+                                nodes.Add(new XamlIlClrMethodPathElementNode(method, context.Configuration.WellKnownTypes.Delegate));
+                            }
+                            else
+                            {
+                                throw new XamlX.XamlParseException($"Unable to resolve property or method of name '{propName.PropertyName}' on type '{targetType}'.", lineInfo);
+                            }
                             break;
                         }
                     case BindingExpressionGrammar.IndexerNode indexer:
@@ -200,6 +244,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     case TemplatedParentBindingExpressionNode templatedParent:
                         var templatedParentField = context.GetAvaloniaTypes().StyledElement.GetAllFields()
                             .FirstOrDefault(f => f.IsStatic && f.IsPublic && f.Name == "TemplatedParentProperty");
+                        nodes.Add(new SelfPathElementNode(selfType));
                         nodes.Add(new XamlIlAvaloniaPropertyPropertyPathElementNode(
                             templatedParentField,
                             templatedParent.Type));
@@ -284,6 +329,17 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 }
             }
 
+            static IEnumerable<IXamlMethod> GetAllDefinedMethods(IXamlType type)
+            {
+                foreach (var t in TraverseTypeHierarchy(type))
+                {
+                    foreach (var m in t.Methods)
+                    {
+                        yield return m;
+                    }
+                }
+            }
+
             static IEnumerable<IXamlType> TraverseTypeHierarchy(IXamlType type)
             {
                 if (type.IsInterface)
@@ -323,6 +379,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
             public static IXamlType GetTargetType(IXamlAstNode namescopeRoot, string name)
             {
+                // If we start from the nested scope - skip it.
+                if (namescopeRoot is NestedScopeMetadataNode scope)
+                {
+                    namescopeRoot = scope.Value;
+                }
+                
                 var finder = new ScopeRegistrationFinder(name);
                 namescopeRoot.Visit(finder);
                 return finder.TargetType;
@@ -348,6 +410,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
             IXamlAstNode IXamlAstVisitor.Visit(IXamlAstNode node)
             {
+                // Ignore name registrations, if we are inside of the nested namescope.
                 if (_childScopesStack.Count == 0 && node is AvaloniaNameScopeRegistrationXamlIlNode registration)
                 {
                     if (registration.Name is XamlAstTextNode text && text.Text == Name)
@@ -538,6 +601,131 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             public IXamlType Type => _property.Getter?.ReturnType ?? _property.Setter?.Parameters[0];
         }
 
+        class XamlIlClrMethodPathElementNode : IXamlIlBindingPathElementNode
+        {
+
+            public XamlIlClrMethodPathElementNode(IXamlMethod method, IXamlType systemDelegateType)
+            {
+                Method = method;
+                Type = systemDelegateType;
+            }
+            public IXamlMethod Method { get; }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                IXamlTypeBuilder<IXamlILEmitter> newDelegateTypeBuilder = null;
+                IXamlType specificDelegateType;
+                if (Method.ReturnType == context.Configuration.WellKnownTypes.Void && Method.Parameters.Count == 0)
+                {
+                    specificDelegateType = context.Configuration.TypeSystem
+                        .GetType("System.Action");
+                }
+                else if (Method.ReturnType == context.Configuration.WellKnownTypes.Void && Method.Parameters.Count <= 16)
+                {
+                    specificDelegateType = context.Configuration.TypeSystem
+                        .GetType($"System.Action`{Method.Parameters.Count}")
+                        .MakeGenericType(Method.Parameters);
+                }
+                else if (Method.Parameters.Count <= 16)
+                {
+                    List<IXamlType> genericParameters = new();
+                    genericParameters.AddRange(Method.Parameters);
+                    genericParameters.Add(Method.ReturnType);
+                    specificDelegateType = context.Configuration.TypeSystem
+                        .GetType($"System.Func`{Method.Parameters.Count + 1}")
+                        .MakeGenericType(genericParameters);
+                }
+                else
+                {
+                    // In this case, we need to emit our own delegate type.
+                    string delegateTypeName = context.Configuration.IdentifierGenerator.GenerateIdentifierPart();
+                    specificDelegateType = newDelegateTypeBuilder = context.DefineDelegateSubType(delegateTypeName, Method.ReturnType, Method.Parameters);
+                }
+
+                codeGen
+                    .Ldtoken(Method)
+                    .Ldtoken(specificDelegateType)
+                    .EmitCall(context.GetAvaloniaTypes()
+                        .CompiledBindingPathBuilder.FindMethod(m => m.Name == "Method"));
+
+                newDelegateTypeBuilder?.CreateType();
+            }
+        }
+
+        class XamlIlClrMethodAsCommandPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly IXamlMethod _executeMethod;
+            private readonly IXamlMethod _canExecuteMethod;
+            private readonly IReadOnlyList<string> _dependsOnProperties;
+
+            public XamlIlClrMethodAsCommandPathElementNode(IXamlType iCommandType, IXamlMethod executeMethod, IXamlMethod canExecuteMethod, IReadOnlyList<string> dependsOnProperties)
+            {
+                Type = iCommandType;
+                _executeMethod = executeMethod;
+                _canExecuteMethod = canExecuteMethod;
+                _dependsOnProperties = dependsOnProperties;
+            }
+
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                var trampolineBuilder = context.Configuration.GetExtra<XamlIlTrampolineBuilder>();
+                var objectType = context.Configuration.WellKnownTypes.Object;
+                codeGen
+                    .Ldstr(_executeMethod.Name)
+                    .Ldnull()
+                    .Ldftn(trampolineBuilder.EmitCommandExecuteTrampoline(context, _executeMethod))
+                    .Newobj(context.Configuration.TypeSystem.GetType("System.Action`2")
+                        .MakeGenericType(objectType, objectType)
+                        .GetConstructor(new() { objectType, context.Configuration.TypeSystem.GetType("System.IntPtr") }));
+
+                if (_canExecuteMethod is null)
+                {
+                    codeGen.Ldnull();
+                }
+                else
+                {
+                    codeGen
+                        .Ldnull()
+                        .Ldftn(trampolineBuilder.EmitCommandCanExecuteTrampoline(context, _canExecuteMethod))
+                        .Newobj(context.Configuration.TypeSystem.GetType("System.Func`3")
+                            .MakeGenericType(objectType, objectType, context.Configuration.WellKnownTypes.Boolean)
+                            .GetConstructor(new() { objectType, context.Configuration.TypeSystem.GetType("System.IntPtr") }));
+                }
+
+                if (_dependsOnProperties is { Count:> 1 })
+                {
+                    using var dependsOnPropertiesArray = context.GetLocalOfType(context.Configuration.WellKnownTypes.String.MakeArrayType(1));
+                    codeGen
+                        .Ldc_I4(_dependsOnProperties.Count)
+                        .Newarr(context.Configuration.WellKnownTypes.String)
+                        .Stloc(dependsOnPropertiesArray.Local);
+
+                    for (int i = 0; i < _dependsOnProperties.Count; i++)
+                    {
+                        codeGen
+                            .Ldloc(dependsOnPropertiesArray.Local)
+                            .Ldc_I4(i)
+                            .Ldstr(_dependsOnProperties[i])
+                            .Stelem_ref();
+                    }
+                    codeGen.Ldloc(dependsOnPropertiesArray.Local);
+                }
+                else
+                {
+                    codeGen.Ldnull();
+                }
+
+                codeGen
+                    .EmitCall(context.GetAvaloniaTypes()
+                        .CompiledBindingPathBuilder.FindMethod(m => m.Name == "Command"));
+            }
+        }
+
         class XamlIlClrIndexerPathElementNode : IXamlIlBindingPathElementNode
         {
             private readonly IXamlProperty _property;
@@ -660,10 +848,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             }
         }
 
-        class XamlIlBindingPathNode : XamlAstNode, IXamlIlBindingPathNode, IXamlAstEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>
+        class XamlIlBindingPathNode : XamlAstNode, IXamlIlBindingPathNode, IXamlAstLocalsEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>
         {
             private readonly List<IXamlIlBindingPathElementNode> _transformElements;
-            private readonly List<IXamlIlBindingPathElementNode> _elements;
 
             public XamlIlBindingPathNode(IXamlLineInfo lineInfo,
                 IXamlType bindingPathType,
@@ -672,16 +859,18 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             {
                 Type = new XamlAstClrTypeReference(lineInfo, bindingPathType, false);
                 _transformElements = transformElements;
-                _elements = elements;
+                Elements = elements;
             }
 
             public IXamlType BindingResultType
                 => _transformElements.Count > 0
                     ? _transformElements[0].Type
-                    : _elements[_elements.Count - 1].Type;
+                    : Elements[Elements.Count - 1].Type;
 
             public IXamlAstTypeReference Type { get; }
 
+            public List<IXamlIlBindingPathElementNode> Elements { get; }
+
             public XamlILNodeEmitResult Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
             {
                 var types = context.GetAvaloniaTypes();
@@ -692,7 +881,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     transform.Emit(context, codeGen);
                 }
 
-                foreach (var element in _elements)
+                foreach (var element in Elements)
                 {
                     element.Emit(context, codeGen);
                 }
@@ -710,11 +899,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                         _transformElements[i] = (IXamlIlBindingPathElementNode)ast.Visit(visitor);
                     }
                 }
-                for (int i = 0; i < _elements.Count; i++)
+                for (int i = 0; i < Elements.Count; i++)
                 {
-                    if (_elements[i] is IXamlAstNode ast)
+                    if (Elements[i] is IXamlAstNode ast)
                     {
-                        _elements[i] = (IXamlIlBindingPathElementNode)ast.Visit(visitor);
+                        Elements[i] = (IXamlIlBindingPathElementNode)ast.Visit(visitor);
                     }
                 }
             }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
index 871a2a2045..e76e2cd46e 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
@@ -55,7 +55,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                         return cached.get;
                 }
 
-                var name = lst.Count == 0 ? key : key + "_" + Guid.NewGuid().ToString("N");
+                var name = lst.Count == 0 ? key : key + "_" + context.Configuration.IdentifierGenerator.GenerateIdentifierPart();
                 
                 var field = _builder.DefineField(types.IPropertyInfo, name + "!Field", false, true);
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlTrampolineBuilder.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlTrampolineBuilder.cs
new file mode 100644
index 0000000000..a28607f0f4
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlTrampolineBuilder.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.TypeSystem;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using System.Reflection.Emit;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    internal class XamlIlTrampolineBuilder
+    {
+        private IXamlTypeBuilder<IXamlILEmitter> _builder;
+        private Dictionary<string, IXamlMethod> _trampolines = new();
+
+        public XamlIlTrampolineBuilder(IXamlTypeBuilder<IXamlILEmitter> builder)
+        {
+            _builder = builder;
+        }
+
+        public IXamlMethod EmitCommandExecuteTrampoline(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlMethod executeMethod)
+        {
+            Debug.Assert(!executeMethod.IsStatic);
+            string methodName = $"{executeMethod.DeclaringType.GetFqn()}+{executeMethod.Name}_{executeMethod.Parameters.Count}!CommandExecuteTrampoline";
+            if (_trampolines.TryGetValue(methodName, out var method))
+            {
+                return method;
+            }
+            var trampoline = _builder.DefineMethod(
+                context.Configuration.WellKnownTypes.Void,
+                new[] { context.Configuration.WellKnownTypes.Object, context.Configuration.WellKnownTypes.Object },
+                methodName,
+                true,
+                true,
+                false);
+            var gen = trampoline.Generator;
+            if (executeMethod.DeclaringType.IsValueType)
+            {
+                gen.Ldarg_0()
+                    .Unbox(executeMethod.DeclaringType);
+            }
+            else
+            {
+                gen.Ldarg_0()
+                    .Castclass(executeMethod.DeclaringType);
+            }
+            if (executeMethod.Parameters.Count != 0)
+            {
+                Debug.Assert(executeMethod.Parameters.Count == 1);
+                if (executeMethod.Parameters[0] != context.Configuration.WellKnownTypes.Object)
+                {
+                    var convertedValue = gen.DefineLocal(context.Configuration.WellKnownTypes.Object);
+                    gen.Ldtype(executeMethod.Parameters[0])
+                        .Ldarg(1)
+                        .EmitCall(context.Configuration.WellKnownTypes.CultureInfo.FindMethod(m => m.Name == "get_CurrentCulture"))
+                        .Ldloca(convertedValue)
+                        .EmitCall(
+                            context.GetAvaloniaTypes().TypeUtilities.FindMethod(m => m.Name == "TryConvert"),
+                            swallowResult: true)
+                        .Ldloc(convertedValue)
+                        .Unbox_Any(executeMethod.Parameters[0]);
+                }
+                else
+                {
+                    gen.Ldarg(1);
+                }
+            }
+            gen.EmitCall(executeMethod, swallowResult: true);
+            gen.Ret();
+
+            _trampolines.Add(methodName, trampoline);
+            return trampoline;
+        }
+
+        public IXamlMethod EmitCommandCanExecuteTrampoline(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlMethod canExecuteMethod)
+        {
+            Debug.Assert(!canExecuteMethod.IsStatic);
+            Debug.Assert(canExecuteMethod.Parameters.Count == 1);
+            Debug.Assert(canExecuteMethod.ReturnType == context.Configuration.WellKnownTypes.Boolean);
+            string methodName = $"{canExecuteMethod.DeclaringType.GetFqn()}+{canExecuteMethod.Name}!CommandCanExecuteTrampoline";
+            if (_trampolines.TryGetValue(methodName, out var method))
+            {
+                return method;
+            }
+            var trampoline = _builder.DefineMethod(
+                context.Configuration.WellKnownTypes.Boolean,
+                new[] { context.Configuration.WellKnownTypes.Object, context.Configuration.WellKnownTypes.Object },
+                methodName,
+                true,
+                true,
+                false);
+            if (canExecuteMethod.DeclaringType.IsValueType)
+            {
+                trampoline.Generator
+                    .Ldarg_0()
+                    .Unbox(canExecuteMethod.DeclaringType);
+            }
+            else
+            {
+                trampoline.Generator
+                    .Ldarg_0()
+                    .Castclass(canExecuteMethod.DeclaringType);
+            }
+            trampoline.Generator
+                .Ldarg(1)
+                .Emit(OpCodes.Tailcall)
+                .EmitCall(canExecuteMethod)
+                .Ret();
+
+            _trampolines.Add(methodName, trampoline);
+            return trampoline;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index 8e20d65eb5..880ba5742e 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit 8e20d65eb5f1efbae08e49b18f39bfdce32df7b3
+Subproject commit 880ba5742e52b67afda048c4023cf7e3c3c16a46
diff --git a/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 86132c5d27..f5bf14c2a4 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -9,6 +9,7 @@
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
     <ItemGroup>
+        <Compile Include="..\..\Shared\StringCompatibilityExtensions.cs" Link="Compatibility\StringCompatibilityExtensions.cs" />
         <Compile Include="AvaloniaXamlLoader.cs" />
         <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
         <Compile Include="Converters\ColorToBrushConverter.cs" />
@@ -18,14 +19,19 @@
         <Compile Include="MarkupExtension.cs" />
         <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\ArrayElementPlugin.cs" />
+        <Compile Include="MarkupExtensions\CompiledBindings\CommandAccessorPlugin.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\FindVisualAncestorNode.cs" />
+        <Compile Include="MarkupExtensions\CompiledBindings\MethodAccessorPlugin.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\ObservableStreamPlugin.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorPlugin.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\StrongTypeCastNode.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
         <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
+        <Compile Include="MarkupExtensions\On.cs" />
+        <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
+        <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
         <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
         <Compile Include="MarkupExtensions\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
@@ -46,6 +52,7 @@
         <Compile Include="Templates\Template.cs" />
         <Compile Include="Templates\TemplateContent.cs" />
         <Compile Include="Templates\TreeDataTemplate.cs" />
+        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
         <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
@@ -54,16 +61,19 @@
         <Compile Include="XamlTypes.cs" />
     </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\ApiDiff.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Compatibility\" />
+  </ItemGroup>
 </Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
index 1e42a46875..1b6fbcef5c 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Markup.Xaml.Converters
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
             var valueStr = (string)value;
-            if (!valueStr.Contains(":"))
+            if (!valueStr.Contains(':'))
             {
                 // shorthand seconds format (ie. "0.25")
                 var secs = double.Parse(valueStr, CultureInfo.InvariantCulture);
@@ -25,4 +25,4 @@ namespace Avalonia.Markup.Xaml.Converters
             return base.ConvertFrom(context, culture, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/Extensions.cs b/src/Markup/Avalonia.Markup.Xaml/Extensions.cs
index 263750c316..d937a83010 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Extensions.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Extensions.cs
@@ -24,10 +24,10 @@ namespace Avalonia.Markup.Xaml
         public static IEnumerable<T> GetParents<T>(this IServiceProvider sp)
         {
             return sp.GetService<IAvaloniaXamlIlParentStackProvider>().Parents.OfType<T>();
-            
-            
         }
 
+        public static bool IsInControlTemplate(this IServiceProvider sp) => sp.GetService<IAvaloniaXamlIlControlTemplateProvider>() != null;
+
         public static Type ResolveType(this IServiceProvider ctx, string namespacePrefix, string type)
         {
             var tr = ctx.GetService<IXamlTypeResolver>();
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs
new file mode 100644
index 0000000000..970cc767f7
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reflection;
+using System.Text;
+using System.Windows.Input;
+using Avalonia.Data;
+using Avalonia.Data.Core.Plugins;
+using Avalonia.Utilities;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    internal class CommandAccessorPlugin : IPropertyAccessorPlugin
+    {
+        private readonly Action<object, object> _execute;
+        private readonly Func<object, object, bool> _canExecute;
+        private readonly ISet<string> _dependsOnProperties;
+
+        public CommandAccessorPlugin(Action<object, object> execute, Func<object, object, bool> canExecute, ISet<string> dependsOnProperties)
+        {
+            _execute = execute;
+            _canExecute = canExecute;
+            _dependsOnProperties = dependsOnProperties;
+        }
+
+        public bool Match(object obj, string propertyName)
+        {
+            throw new InvalidOperationException("The CommandAccessorPlugin does not support dynamic matching");
+        }
+
+        public IPropertyAccessor Start(WeakReference<object> reference, string propertyName)
+        {
+            return new CommandAccessor(reference, _execute, _canExecute, _dependsOnProperties);
+        }
+
+        private sealed class CommandAccessor : PropertyAccessorBase
+        {
+            private readonly WeakReference<object> _reference;
+            private Command _command;
+            private readonly ISet<string> _dependsOnProperties;
+
+            public CommandAccessor(WeakReference<object> reference, Action<object, object> execute, Func<object, object, bool> canExecute, ISet<string> dependsOnProperties)
+            {
+                Contract.Requires<ArgumentNullException>(reference != null);
+
+                _reference = reference;
+                _dependsOnProperties = dependsOnProperties;
+                _command = new Command(reference, execute, canExecute);
+
+            }
+
+            public override object Value => _reference.TryGetTarget(out var _) ? _command : null;
+
+            private void RaiseCanExecuteChanged()
+            {
+                _command.RaiseCanExecuteChanged();
+            }
+
+            private sealed class Command : ICommand
+            {
+                private readonly WeakReference<object> _target;
+                private readonly Action<object, object> _execute;
+                private readonly Func<object, object, bool> _canExecute;
+
+                public event EventHandler CanExecuteChanged;
+
+                public Command(WeakReference<object> target, Action<object, object> execute, Func<object, object, bool> canExecute)
+                {
+                    _target = target;
+                    _execute = execute;
+                    _canExecute = canExecute;
+                }
+
+                public void RaiseCanExecuteChanged()
+                {
+                    Threading.Dispatcher.UIThread.Post(() => CanExecuteChanged?.Invoke(this, EventArgs.Empty)
+                       , Threading.DispatcherPriority.Input);
+                }
+
+                public bool CanExecute(object parameter)
+                {
+                    if (_target.TryGetTarget(out var target))
+                    {
+                        if (_canExecute == null)
+                        {
+                            return true;
+                        }
+                        return _canExecute(target, parameter);
+                    }
+                    return false;
+                }
+
+                public void Execute(object parameter)
+                {
+                    if (_target.TryGetTarget(out var target))
+                    {
+                        _execute(target, parameter);
+                    }
+                }
+            }
+
+            public override Type PropertyType => typeof(ICommand);
+
+            public override bool SetValue(object value, BindingPriority priority)
+            {
+                return false;
+            }
+
+            void OnNotifyPropertyChanged(object sender, PropertyChangedEventArgs e)
+            {
+                if (string.IsNullOrEmpty(e.PropertyName) || _dependsOnProperties.Contains(e.PropertyName))
+                {
+                    RaiseCanExecuteChanged();
+                }
+            }
+
+            protected override void SubscribeCore()
+            {
+                SendCurrentValue();
+                SubscribeToChanges();
+            }
+
+            protected override void UnsubscribeCore()
+            {
+                if (_dependsOnProperties is { Count: > 0 } && _reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
+                {
+                    WeakEventHandlerManager.Unsubscribe<PropertyChangedEventArgs, InpcPropertyAccessor>(
+                        inpc,
+                        nameof(INotifyPropertyChanged.PropertyChanged),
+                        OnNotifyPropertyChanged);
+                }
+            }
+
+            private void SendCurrentValue()
+            {
+                try
+                {
+                    var value = Value;
+                    PublishValue(value);
+                }
+                catch { }
+            }
+
+            private void SubscribeToChanges()
+            {
+                if (_dependsOnProperties is { Count:>0 } && _reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
+                {
+                    WeakEventHandlerManager.Subscribe<INotifyPropertyChanged, PropertyChangedEventArgs, InpcPropertyAccessor>(
+                        inpc,
+                        nameof(INotifyPropertyChanged.PropertyChanged),
+                        OnNotifyPropertyChanged);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
index 11489c39aa..f78d4867ff 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
@@ -36,6 +37,12 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
                     case PropertyElement prop:
                         node = new PropertyAccessorNode(prop.Property.Name, enableValidation, new PropertyInfoAccessorPlugin(prop.Property, prop.AccessorFactory));
                         break;
+                    case MethodAsCommandElement methodAsCommand:
+                        node = new PropertyAccessorNode(methodAsCommand.MethodName, enableValidation, new CommandAccessorPlugin(methodAsCommand.ExecuteMethod, methodAsCommand.CanExecuteMethod, methodAsCommand.DependsOnProperties));
+                        break;
+                    case MethodAsDelegateElement methodAsDelegate:
+                        node = new PropertyAccessorNode(methodAsDelegate.Method.Name, enableValidation, new MethodAccessorPlugin(methodAsDelegate.Method, methodAsDelegate.DelegateType));
+                        break;
                     case ArrayElementPathElement arr:
                         node = new PropertyAccessorNode(CommonPropertyNames.IndexerName, enableValidation, new ArrayElementPlugin(arr.Indices, arr.ElementType));
                         break;
@@ -67,6 +74,8 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
             return pathRoot ?? new EmptyExpressionNode();
         }
 
+        internal IEnumerable<ICompiledBindingPathElement> Elements => _elements;
+        
         internal SourceMode SourceMode => _elements.Count > 0 && _elements[0] is IControlSourceBindingPathElement ? SourceMode.Control : SourceMode.Data;
 
         internal object RawSource { get; }
@@ -92,6 +101,18 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
             return this;
         }
 
+        public CompiledBindingPathBuilder Method(RuntimeMethodHandle handle, RuntimeTypeHandle delegateType)
+        {
+            _elements.Add(new MethodAsDelegateElement(handle, delegateType));
+            return this;
+        }
+
+        public CompiledBindingPathBuilder Command(string methodName, Action<object, object> executeHelper, Func<object, object, bool> canExecuteHelper, string[] dependsOnProperties)
+        {
+            _elements.Add(new MethodAsCommandElement(methodName, executeHelper, canExecuteHelper, dependsOnProperties ?? Array.Empty<string>()));
+            return this;
+        }
+
         public CompiledBindingPathBuilder StreamTask<T>()
         {
             _elements.Add(new TaskStreamPathElement<T>());
@@ -178,6 +199,35 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
             => _isFirstElement ? Property.Name : $".{Property.Name}";
     }
 
+    internal class MethodAsDelegateElement : ICompiledBindingPathElement
+    {
+        public MethodAsDelegateElement(RuntimeMethodHandle method, RuntimeTypeHandle delegateType)
+        {
+            Method = (MethodInfo)MethodBase.GetMethodFromHandle(method);
+            DelegateType = Type.GetTypeFromHandle(delegateType);
+        }
+
+        public MethodInfo Method { get; }
+
+        public Type DelegateType { get; }
+    }
+
+    internal class MethodAsCommandElement : ICompiledBindingPathElement
+    {
+        public MethodAsCommandElement(string methodName, Action<object, object> executeHelper, Func<object, object, bool> canExecuteHelper, string[] dependsOnElements)
+        {
+            MethodName = methodName;
+            ExecuteMethod = executeHelper;
+            CanExecuteMethod = canExecuteHelper;
+            DependsOnProperties = new HashSet<string>(dependsOnElements);
+        }
+
+        public string MethodName { get; }
+        public Action<object, object> ExecuteMethod { get; }
+        public Func<object, object, bool> CanExecuteMethod { get; }
+        public HashSet<string> DependsOnProperties { get; }
+    }
+
     internal interface IStronglyTypedStreamElement : ICompiledBindingPathElement
     {
         IStreamPlugin CreatePlugin();
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/MethodAccessorPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/MethodAccessorPlugin.cs
new file mode 100644
index 0000000000..45ad45e658
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/MethodAccessorPlugin.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text;
+using Avalonia.Data;
+using Avalonia.Data.Core.Plugins;
+
+#nullable enable
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    internal class MethodAccessorPlugin : IPropertyAccessorPlugin
+    {
+        private MethodInfo _method;
+        private readonly Type _delegateType;
+
+        public MethodAccessorPlugin(MethodInfo method, Type delegateType)
+        {
+            _method = method;
+            _delegateType = delegateType;
+        }
+
+        public bool Match(object obj, string propertyName)
+        {
+            throw new InvalidOperationException("The MethodAccessorPlugin does not support dynamic matching");
+        }
+
+        public IPropertyAccessor Start(WeakReference<object?> reference, string propertyName)
+        {
+            Debug.Assert(_method.Name == propertyName);
+            return new Accessor(reference, _method, _delegateType);
+        }
+
+        private sealed class Accessor : PropertyAccessorBase
+        {
+            public Accessor(WeakReference<object?> reference, MethodInfo method, Type delegateType)
+            {
+                _ = reference ?? throw new ArgumentNullException(nameof(reference));
+                _ = method ?? throw new ArgumentNullException(nameof(method));
+
+                PropertyType = delegateType;
+
+                if (method.IsStatic)
+                {
+                    Value = method.CreateDelegate(PropertyType);
+                }
+                else if (reference.TryGetTarget(out var target))
+                {
+                    Value = method.CreateDelegate(PropertyType, target);
+                }
+            }
+
+            public override Type? PropertyType { get; }
+
+            public override object? Value { get; }
+
+            public override bool SetValue(object? value, BindingPriority priority) => false;
+
+            protected override void SubscribeCore()
+            {
+                try
+                {
+                    PublishValue(Value);
+                }
+                catch { }
+            }
+
+            protected override void UnsubscribeCore()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
index c21a2d4299..ef11b06369 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Text;
 using Avalonia.Data;
 using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
@@ -174,7 +172,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
                 WeakEvents.CollectionChanged.Unsubscribe(incc, this);
         }
         
-        public void OnEvent(object? sender, WeakEvent ev, NotifyCollectionChangedEventArgs args)
+        public void OnEvent(object sender, WeakEvent ev, NotifyCollectionChangedEventArgs args)
         {
             if (ShouldNotifyListeners(args))
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 087611bd59..f13ecab4e1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -11,6 +11,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
     public class DynamicResourceExtension : IBinding
     {
         private object? _anchor;
+        private BindingPriority _priority;
 
         public DynamicResourceExtension()
         {
@@ -25,6 +26,9 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public IBinding ProvideValue(IServiceProvider serviceProvider)
         {
+            if (serviceProvider.IsInControlTemplate())
+                _priority = BindingPriority.TemplatedParent;
+
             var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
 
             if (!(provideTarget.TargetObject is IStyledElement))
@@ -53,12 +57,12 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             if (control != null)
             {
                 var source = control.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
-                return InstancedBinding.OneWay(source);
+                return InstancedBinding.OneWay(source, _priority);
             }
             else if (_anchor is IResourceProvider resourceProvider)
             {
                 var source = resourceProvider.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
-                return InstancedBinding.OneWay(source);
+                return InstancedBinding.OneWay(source, _priority);
             }
 
             return null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/On.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/On.cs
new file mode 100644
index 0000000000..0752ab43b5
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/On.cs
@@ -0,0 +1,15 @@
+#nullable enable
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions;
+
+public class On<TReturn>
+{
+    public IReadOnlyList<string> Options { get; } = new List<string>();
+
+    [Content]
+    public TReturn? Content { get; set; }
+}
+
+public class On : On<object> {}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnFormFactorExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnFormFactorExtension.cs
new file mode 100644
index 0000000000..51e09eef71
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnFormFactorExtension.cs
@@ -0,0 +1,60 @@
+#nullable enable
+using System;
+
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions;
+
+public class OnFormFactorExtension : OnFormFactorExtensionBase<object, On>
+{
+    public OnFormFactorExtension()
+    {
+
+    }
+
+    public OnFormFactorExtension(object defaultValue)
+    {
+        Default = defaultValue;
+    }
+
+    public static bool ShouldProvideOption(IServiceProvider serviceProvider, FormFactorType option)
+    {
+        return serviceProvider.GetService<IRuntimePlatform>().GetRuntimeInfo().FormFactor == option;
+    }
+}
+
+public class OnFormFactorExtension<TReturn> : OnFormFactorExtensionBase<TReturn, On<TReturn>>
+{
+    public OnFormFactorExtension()
+    {
+
+    }
+
+    public OnFormFactorExtension(TReturn defaultValue)
+    {
+        Default = defaultValue;
+    }
+
+    public static bool ShouldProvideOption(IServiceProvider serviceProvider, FormFactorType option)
+    {
+        return serviceProvider.GetService<IRuntimePlatform>().GetRuntimeInfo().FormFactor == option;
+    }
+}
+
+public abstract class OnFormFactorExtensionBase<TReturn, TOn> : IAddChild<TOn>
+    where TOn : On<TReturn>
+{
+    [MarkupExtensionDefaultOption]
+    public TReturn? Default { get; set; }
+
+    [MarkupExtensionOption(FormFactorType.Desktop)]
+    public TReturn? Desktop { get; set; }
+
+    [MarkupExtensionOption(FormFactorType.Mobile)]
+    public TReturn? Mobile { get; set; }
+
+    // Required for the compiler, will be replaced with actual method compile time.
+    public object ProvideValue() { return this; }
+    void IAddChild<TOn>.AddChild(TOn child) {}
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs
new file mode 100644
index 0000000000..1ac7a522f1
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/OnPlatformExtension.cs
@@ -0,0 +1,73 @@
+#nullable enable
+using System;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions;
+
+public class OnPlatformExtension : OnPlatformExtensionBase<object, On>
+{
+    public OnPlatformExtension()
+    {
+
+    }
+
+    public OnPlatformExtension(object defaultValue)
+    {
+        Default = defaultValue;
+    }
+
+    public static bool ShouldProvideOption(IServiceProvider serviceProvider, OperatingSystemType option)
+    {
+        return serviceProvider.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem == option;
+    }
+}
+
+public class OnPlatformExtension<TReturn> : OnPlatformExtensionBase<TReturn, On<TReturn>>
+{
+    public OnPlatformExtension()
+    {
+
+    }
+
+    public OnPlatformExtension(TReturn defaultValue)
+    {
+        Default = defaultValue;
+    }
+
+    public static bool ShouldProvideOption(IServiceProvider serviceProvider, OperatingSystemType option)
+    {
+        return serviceProvider.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem == option;
+    }
+}
+
+public abstract class OnPlatformExtensionBase<TReturn, TOn> : IAddChild<TOn>
+    where TOn : On<TReturn>
+{
+    [MarkupExtensionDefaultOption]
+    public TReturn? Default { get; set; }
+
+    [MarkupExtensionOption(OperatingSystemType.WinNT)]
+    public TReturn? Windows { get; set; }
+
+    [MarkupExtensionOption(OperatingSystemType.OSX)]
+    // ReSharper disable once InconsistentNaming
+    public TReturn? macOS { get; set; }
+
+    [MarkupExtensionOption(OperatingSystemType.Linux)]
+    public TReturn? Linux { get; set; }
+
+    [MarkupExtensionOption(OperatingSystemType.Android)]
+    public TReturn? Android { get; set; }
+
+    [MarkupExtensionOption(OperatingSystemType.iOS)]
+    // ReSharper disable once InconsistentNaming
+    public TReturn? iOS { get; set; }
+
+    [MarkupExtensionOption(OperatingSystemType.Browser)]
+    public TReturn? Browser { get; set; }
+
+    // Required for the compiler, will be replaced with actual method compile time.
+    public object ProvideValue() { return this; }
+    void IAddChild<TOn>.AddChild(TOn child) {}
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
index b6137aa89f..1091b3ec7e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         bool IResourceNode.HasResources => Loaded.HasResources;
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add => Loaded.OwnerChanged += value;
             remove => Loaded.OwnerChanged -= value;
@@ -52,7 +52,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         {
             if (!_isLoading)
             {
-                return Loaded.TryGetResource(key, out value);                
+                return Loaded.TryGetResource(key, out value);
             }
 
             value = null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index db33b88cc3..f28f7bc626 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -39,26 +39,41 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 targetType = setter.Property.PropertyType;
             }
 
-            // Look upwards though the ambient context for IResourceHosts and IResourceProviders
+            var previousWasControlTheme = false;
+
+            // Look upwards though the ambient context for IResourceNodes
             // which might be able to give us the resource.
-            foreach (var e in stack.Parents)
+            foreach (var parent in stack.Parents)
             {
-                object value;
-
-                if (e is IResourceHost host && host.TryGetResource(ResourceKey, out value))
+                if (parent is IResourceNode node && node.TryGetResource(ResourceKey, out var value))
                 {
                     return ColorToBrushConverter.Convert(value, targetType);
                 }
-                else if (e is IResourceProvider provider && provider.TryGetResource(ResourceKey, out value))
+
+                // HACK: Temporary fix for #8678. Hard-coded to only work for the DevTools main
+                // window as we don't want 3rd parties to start relying on this hack.
+                //
+                // We need to implement compile-time merging of resource dictionaries and this
+                // hack can be removed.
+                if (previousWasControlTheme &&
+                    parent is IResourceProvider hack &&
+                    hack.Owner?.GetType().FullName == "Avalonia.Diagnostics.Views.MainWindow" &&
+                    hack.Owner.TryGetResource(ResourceKey, out value))
                 {
                     return ColorToBrushConverter.Convert(value, targetType);
                 }
+
+                previousWasControlTheme = parent is ControlTheme;
             }
 
             if (provideTarget.TargetObject is IControl target &&
                 provideTarget.TargetProperty is PropertyInfo property)
             {
-                DelayedBinding.Add(target, property, x => GetValue(x, targetType));
+                // This is stored locally to avoid allocating closure in the outer scope.
+                var localTargetType = targetType;
+                var localInstance = this;
+                
+                DelayedBinding.Add(target, property, x => localInstance.GetValue(x, localTargetType));
                 return AvaloniaProperty.UnsetValue;
             }
 
@@ -71,3 +86,4 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         }
     }
 }
+
diff --git a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
index cee4d90917..7e5b3159d4 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
@@ -1,9 +1,6 @@
 using Avalonia.Metadata;
-using System.Runtime.CompilerServices;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.MarkupExtensions")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Styling")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Templates")]
 
-[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
index 607b552c28..d92003ad9f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
@@ -60,11 +60,11 @@ namespace Avalonia.Markup.Xaml.Styling
             }
         }
 
-        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
+        bool IResourceNode.HasResources => Loaded?.HasResources ?? false;
 
         IReadOnlyList<IStyle> IStyle.Children => _loaded ?? Array.Empty<IStyle>();
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add
             {
@@ -82,13 +82,13 @@ namespace Avalonia.Markup.Xaml.Styling
             }
         }
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
+        public SelectorMatchResult TryAttach(IStyleable target, object? host) => Loaded.TryAttach(target, host);
 
         public bool TryGetResource(object key, out object? value)
         {
-            if (!_isLoading && Loaded is IResourceProvider p)
+            if (!_isLoading)
             {
-                return p.TryGetResource(key, out value);
+                return Loaded.TryGetResource(key, out value);
             }
 
             value = null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
index b7db1a3fbb..4da6b1b791 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
@@ -5,8 +5,9 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class DataTemplate : IRecyclingDataTemplate
+    public class DataTemplate : IRecyclingDataTemplate, ITypedDataTemplate
     {
+        [DataType]
         public Type DataType { get; set; }
 
         [Content]
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index 7b065c7f47..04e8b0a9c0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -9,8 +9,9 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class TreeDataTemplate : ITreeDataTemplate
+    public class TreeDataTemplate : ITreeDataTemplate, ITypedDataTemplate
     {
+        [DataType]
         public Type DataType { get; set; }
 
         [Content]
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs
new file mode 100644
index 0000000000..ed3f5bfdff
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Markup.Xaml.XamlIl.Runtime
+{
+    public interface IAvaloniaXamlIlControlTemplateProvider
+    {
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
index c48f386ffd..6682532455 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Platform;
+
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedParameter.Global
 
@@ -18,7 +19,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
         {
             return DeferredTransformationFactoryV2<IControl>(builder, provider);
         }
-        
+
         public static Func<IServiceProvider, object> DeferredTransformationFactoryV2<T>(Func<IServiceProvider, object> builder,
             IServiceProvider provider)
         {
@@ -31,7 +32,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
                 var scope = parentScope != null ? new ChildNameScope(parentScope) : (INameScope)new NameScope();
                 var obj = builder(new DeferredParentServiceProvider(sp, resourceNodes, rootObject, scope));
                 scope.Complete();
-                
+
                 if(typeof(T) == typeof(IControl))
                     return new ControlTemplateResult((IControl)obj, scope);
 
@@ -42,7 +43,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
         class DeferredParentServiceProvider :
             IAvaloniaXamlIlParentStackProvider,
             IServiceProvider,
-            IRootObjectProvider
+            IRootObjectProvider,
+            IAvaloniaXamlIlControlTemplateProvider
         {
             private readonly IServiceProvider _parentProvider;
             private readonly List<IResourceNode> _parentResourceNodes;
@@ -75,6 +77,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
                     return this;
                 if (serviceType == typeof(IRootObjectProvider))
                     return this;
+                if (serviceType == typeof(IAvaloniaXamlIlControlTemplateProvider))
+                    return this;
                 return _parentProvider?.GetService(serviceType);
             }
 
@@ -104,9 +108,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
                 throw new ArgumentException("Don't know what to do with " + value.GetType());
         }
 
-        public static IServiceProvider CreateInnerServiceProviderV1(IServiceProvider compiled) 
+        public static IServiceProvider CreateInnerServiceProviderV1(IServiceProvider compiled)
             => new InnerServiceProvider(compiled);
-       
+
         class InnerServiceProvider : IServiceProvider
         {
             private readonly IServiceProvider _compiledProvider;
@@ -133,7 +137,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
             {
                 _nsInfo = nsInfo;
             }
-            
+
             public Type Resolve(string qualifiedTypeName)
             {
                 var sp = qualifiedTypeName.Split(new[] {':'}, 2);
@@ -155,9 +159,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
                     string.Join(",", lst.Select(e => $"`{e.ClrAssemblyName}:{e.ClrNamespace}.{name}`")));
             }
         }
-        
-        [Obsolete("Don't use", true)]
-        public static readonly IServiceProvider RootServiceProviderV1 = new RootServiceProvider(null);
 
         // Don't emit debug symbols for this code so debugger will be forced to step into XAML instead
         #line hidden
@@ -166,22 +167,27 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
             return new RootServiceProvider(new NameScope());
         }
         #line default
-        
+
         class RootServiceProvider : IServiceProvider, IAvaloniaXamlIlParentStackProvider
         {
             private readonly INameScope _nameScope;
+            private readonly IRuntimePlatform _runtimePlatform;
 
             public RootServiceProvider(INameScope nameScope)
             {
                 _nameScope = nameScope;
+                _runtimePlatform = AvaloniaLocator.Current.GetService<IRuntimePlatform>();
             }
-            
+
             public object GetService(Type serviceType)
             {
                 if (serviceType == typeof(INameScope))
                     return _nameScope;
                 if (serviceType == typeof(IAvaloniaXamlIlParentStackProvider))
                     return this;
+                if (serviceType == typeof(IRuntimePlatform))
+                    return _runtimePlatform ?? throw new KeyNotFoundException($"{nameof(IRuntimePlatform)} was not registered");
+
                 return null;
             }
 
diff --git a/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 21370b3bf5..6711c3dd3d 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -11,11 +11,14 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\System.Memory.props" />
   <Import Project="..\..\..\build\ApiDiff.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Markup.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs b/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
index 265af3c5da..4a3538fff2 100644
--- a/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
@@ -19,6 +19,7 @@ namespace Avalonia.Data
         private bool _isSetterValue;
         private IStyledElement _target = default!;
         private Type? _targetType;
+        private bool _hasProducedValue;
 
         public TemplateBinding()
         {
@@ -143,10 +144,12 @@ namespace Avalonia.Data
                 }
 
                 PublishNext(value);
+                _hasProducedValue = true;
             }
-            else
+            else if (_hasProducedValue)
             {
                 PublishNext(AvaloniaProperty.UnsetValue);
+                _hasProducedValue = false;
             }
         }
 
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs
index 439bc15243..21c0d97c74 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs
@@ -168,7 +168,11 @@ namespace Avalonia.Markup.Parsers
             }
         }
 
-        private static State ParseAttachedProperty(ref CharacterReader r, List<INode> nodes)
+        private static State ParseAttachedProperty(
+#if NET7SDK
+            scoped
+#endif
+            ref CharacterReader r, List<INode> nodes)
         {
             var (ns, owner) = ParseTypeName(ref r);
 
@@ -318,7 +322,11 @@ namespace Avalonia.Markup.Parsers
             return State.AfterMember;
         }
 
-        private static TypeName ParseTypeName(ref CharacterReader r)
+        private static TypeName ParseTypeName(
+#if NET7SDK
+            scoped
+#endif
+            ref CharacterReader r)
         {
             ReadOnlySpan<char> ns, typeName;
             ns = ReadOnlySpan<char>.Empty;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs
index 297eef9e80..a88bfc3651 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs
@@ -8,6 +8,9 @@ using Avalonia.Controls;
 
 namespace Avalonia.Markup.Parsers
 {
+    /// <summary>
+    /// Parser for composition expressions
+    /// </summary>
     internal class ExpressionParser
     {
         private readonly bool _enableValidation;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
index a9fc18474c..4d6d16a3ce 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Markup.Parsers
                 switch (state)
                 {
                     case State.Start:
-                        state = ParseStart(ref r);
+                        (state, syntax) = ParseStart(ref r);
                         break;
                     case State.Middle:
                         (state, syntax) = ParseMiddle(ref r, end);
@@ -93,27 +93,31 @@ namespace Avalonia.Markup.Parsers
             return selector;
         }
 
-        private static State ParseStart(ref CharacterReader r)
+        private static (State, ISyntax?) ParseStart(ref CharacterReader r)
         {
             r.SkipWhitespace();
             if (r.End)
             {
-                return State.End;
+                return (State.End, null);
             }
 
             if (r.TakeIf(':'))
             {
-                return State.Colon;
+                return (State.Colon, null);
             }
             else if (r.TakeIf('.'))
             {
-                return State.Class;
+                return (State.Class, null);
             }
             else if (r.TakeIf('#'))
             {
-                return State.Name;
+                return (State.Name, null);
+            }
+            else if (r.TakeIf('^'))
+            {
+                return (State.CanHaveType, new NestingSyntax());
             }
-            return State.TypeName;
+            return (State.TypeName, null);
         }
 
         private static (State, ISyntax?) ParseMiddle(ref CharacterReader r, char? end)
@@ -142,6 +146,10 @@ namespace Avalonia.Markup.Parsers
             {
                 return (State.Start, new CommaSyntax());
             }
+            else if (r.TakeIf('^'))
+            {
+                return (State.CanHaveType, new NestingSyntax());
+            }
             else if (end.HasValue && !r.End && r.Peek == end.Value)
             {
                 return (State.End, null);
@@ -368,28 +376,28 @@ namespace Avalonia.Markup.Parsers
 
             if (r.Peek == 'o')
             {
-                var constArg = r.TakeUntil(')').ToString().Trim();
-                if (constArg.Equals("odd", StringComparison.Ordinal))
+                var constArg = r.TakeUntil(')').Trim();
+                if (constArg.SequenceEqual("odd".AsSpan()))
                 {
                     step = 2;
                     offset = 1;
                 }
                 else
                 {
-                    throw new ExpressionParseException(r.Position, $"Expected nth-child(odd). Actual '{constArg}'.");
+                    throw new ExpressionParseException(r.Position, $"Expected nth-child(odd). Actual '{constArg.ToString()}'.");
                 }
             }
             else if (r.Peek == 'e')
             {
-                var constArg = r.TakeUntil(')').ToString().Trim();
-                if (constArg.Equals("even", StringComparison.Ordinal))
+                var constArg = r.TakeUntil(')').Trim();
+                if (constArg.SequenceEqual("even".AsSpan()))
                 {
                     step = 2;
                     offset = 0;
                 }
                 else
                 {
-                    throw new ExpressionParseException(r.Position, $"Expected nth-child(even). Actual '{constArg}'.");
+                    throw new ExpressionParseException(r.Position, $"Expected nth-child(even). Actual '{constArg.ToString()}'.");
                 }
             }
             else
@@ -397,7 +405,7 @@ namespace Avalonia.Markup.Parsers
                 r.SkipWhitespace();
 
                 var stepOrOffset = 0;
-                var stepOrOffsetStr = r.TakeWhile(c => char.IsDigit(c) || c == '-' || c == '+').ToString();
+                var stepOrOffsetStr = r.TakeWhile(c => char.IsDigit(c) || c == '-' || c == '+');
                 if (stepOrOffsetStr.Length == 0
                     || (stepOrOffsetStr.Length == 1
                     && stepOrOffsetStr[0] == '+'))
@@ -409,7 +417,7 @@ namespace Avalonia.Markup.Parsers
                 {
                     stepOrOffset = -1;
                 }
-                else if (!int.TryParse(stepOrOffsetStr.ToString(), out stepOrOffset))
+                else if (!stepOrOffsetStr.TryParseInt(out stepOrOffset))
                 {
                     throw new ExpressionParseException(r.Position, "Couldn't parse nth-child step or offset value. Integer was expected.");
                 }
@@ -454,7 +462,7 @@ namespace Avalonia.Markup.Parsers
                         r.SkipWhitespace();
 
                         if (sign != 0
-                            && !int.TryParse(r.TakeUntil(')').ToString(), out offset))
+                            && !r.TakeUntil(')').TryParseInt(out offset))
                         {
                             throw new ExpressionParseException(r.Position, "Couldn't parse nth-child offset value. Integer was expected.");
                         }
@@ -635,5 +643,13 @@ namespace Avalonia.Markup.Parsers
                 return obj is CommaSyntax or;
             }
         }
+
+        public class NestingSyntax : ISyntax
+        {
+            public override bool Equals(object? obj)
+            {
+                return obj is NestingSyntax;
+            }
+        }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
index 46e2925f92..36ca2784da 100644
--- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
@@ -1,8 +1,5 @@
 using Avalonia.Metadata;
-using System.Runtime.CompilerServices;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Data")]
 
-[assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Shared/IsExternalInit.cs b/src/Shared/IsExternalInit.cs
new file mode 100644
index 0000000000..c6ddf762ad
--- /dev/null
+++ b/src/Shared/IsExternalInit.cs
@@ -0,0 +1,14 @@
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.CompilerServices
+{
+    /// <summary>
+    ///     Reserved to be used by the compiler for tracking metadata.
+    ///     This class should not be used by developers in source code.
+    /// </summary>
+    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    internal static class IsExternalInit
+    {
+    }
+}
diff --git a/src/Shared/ModuleInitializer.cs b/src/Shared/ModuleInitializer.cs
index c14b150c1a..a72929e06f 100644
--- a/src/Shared/ModuleInitializer.cs
+++ b/src/Shared/ModuleInitializer.cs
@@ -1,9 +1,9 @@
 namespace System.Runtime.CompilerServices
 {
-#if !NET5_0_OR_GREATER
+#if NETSTANDARD2_0
     internal class ModuleInitializerAttribute : Attribute
     {
-        
+
     }
 #endif
 }
diff --git a/src/Shared/RawEventGrouping.cs b/src/Shared/RawEventGrouping.cs
index 084593ffc6..966744888c 100644
--- a/src/Shared/RawEventGrouping.cs
+++ b/src/Shared/RawEventGrouping.cs
@@ -2,10 +2,8 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Collections.Pooled;
-using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Threading;
-using JetBrains.Annotations;
 
 namespace Avalonia;
 
@@ -19,7 +17,7 @@ internal class RawEventGrouper : IDisposable
     private readonly Action<RawInputEventArgs> _eventCallback;
     private readonly Queue<RawInputEventArgs> _inputQueue = new();
     private readonly Action _dispatchFromQueue;
-    readonly Dictionary<long, RawTouchEventArgs> _lastTouchPoints = new();
+    readonly Dictionary<long, RawPointerEventArgs> _lastTouchPoints = new();
     RawInputEventArgs? _lastEvent;
 
     public RawEventGrouper(Action<RawInputEventArgs> eventCallback)
@@ -49,7 +47,7 @@ internal class RawEventGrouper : IDisposable
                 _lastEvent = null;
             
             if (ev is RawTouchEventArgs { Type: RawPointerEventType.TouchUpdate } touchUpdate)
-                _lastTouchPoints.Remove(touchUpdate.TouchPointId);
+                _lastTouchPoints.Remove(touchUpdate.RawPointerId);
 
             _eventCallback?.Invoke(ev);
 
@@ -88,11 +86,11 @@ internal class RawEventGrouper : IDisposable
         {
             if (args is RawTouchEventArgs touchEvent)
             {
-                if (_lastTouchPoints.TryGetValue(touchEvent.TouchPointId, out var lastTouchEvent))
+                if (_lastTouchPoints.TryGetValue(touchEvent.RawPointerId, out var lastTouchEvent))
                     MergeEvents(lastTouchEvent, touchEvent);
                 else
                 {
-                    _lastTouchPoints[touchEvent.TouchPointId] = touchEvent;
+                    _lastTouchPoints[touchEvent.RawPointerId] = touchEvent;
                     AddToQueue(touchEvent);
                 }
             }
@@ -105,7 +103,7 @@ internal class RawEventGrouper : IDisposable
         {
             _lastTouchPoints.Clear();
             if (args is RawTouchEventArgs { Type: RawPointerEventType.TouchUpdate } touchEvent)
-                _lastTouchPoints[touchEvent.TouchPointId] = touchEvent;
+                _lastTouchPoints[touchEvent.RawPointerId] = touchEvent;
         }
         AddToQueue(args);
     }
diff --git a/src/Shared/SourceGeneratorAttributes.cs b/src/Shared/SourceGeneratorAttributes.cs
new file mode 100644
index 0000000000..3f00fbef57
--- /dev/null
+++ b/src/Shared/SourceGeneratorAttributes.cs
@@ -0,0 +1,49 @@
+using System;
+
+namespace Avalonia.SourceGenerator
+{
+    [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
+    internal sealed class SubtypesFactoryAttribute : Attribute
+    {
+        public SubtypesFactoryAttribute(Type baseType, string @namespace)
+        {
+            BaseType = baseType;
+            Namespace = @namespace;
+        }
+
+        public string Namespace { get; }
+        public Type BaseType { get; }
+    }
+    
+    
+    internal class GetProcAddressAttribute : Attribute
+    {
+        public GetProcAddressAttribute(string proc)
+        {
+            
+        }
+        
+        public GetProcAddressAttribute(string proc, bool optional = false)
+        {
+
+        }
+
+        public GetProcAddressAttribute(bool optional)
+        {
+
+        }
+
+        public GetProcAddressAttribute()
+        {
+
+        }
+    }
+
+    internal class GenerateEnumValueDictionaryAttribute : Attribute
+    {
+    }
+    
+    internal class GenerateEnumValueListAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Shared/StringCompatibilityExtensions.cs b/src/Shared/StringCompatibilityExtensions.cs
new file mode 100644
index 0000000000..7c894dba97
--- /dev/null
+++ b/src/Shared/StringCompatibilityExtensions.cs
@@ -0,0 +1,12 @@
+using System.Runtime.CompilerServices;
+
+namespace System;
+
+#if !NET6_0_OR_GREATER
+internal static class StringCompatibilityExtensions
+{
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool Contains(this string str, char search) =>
+        str.Contains(search.ToString());
+}
+#endif
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index 50ace8209c..413c2ba4d4 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -16,5 +16,15 @@
   </ItemGroup>
   
   <Import Project="..\..\..\build\SkiaSharp.props" />
-  <Import Project="..\..\..\build\HarfBuzzSharp.props" />  
+  <Import Project="..\..\..\build\HarfBuzzSharp.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Skia.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
 </Project>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index e695a9cb41..99ab60d1ac 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -9,7 +9,8 @@ using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
+using JetBrains.Annotations;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -17,7 +18,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// Skia based drawing context.
     /// </summary>
-    internal class DrawingContextImpl : IDrawingContextImpl, ISkiaDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
+    internal class DrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
     {
         private IDisposable[] _disposables;
         private readonly Vector _dpi;
@@ -38,7 +39,8 @@ namespace Avalonia.Skia
         private readonly SKPaint _fillPaint = new SKPaint();
         private readonly SKPaint _boxShadowPaint = new SKPaint();
         private static SKShader s_acrylicNoiseShader;
-        private readonly ISkiaGpuRenderSession _session; 
+        private readonly ISkiaGpuRenderSession _session;
+        private bool _leased = false;
 
         /// <summary>
         /// Context create info.
@@ -83,6 +85,47 @@ namespace Avalonia.Skia
             public ISkiaGpuRenderSession CurrentSession;
         }
 
+        class SkiaLeaseFeature : ISkiaSharpApiLeaseFeature
+        {
+            private readonly DrawingContextImpl _context;
+
+            public SkiaLeaseFeature(DrawingContextImpl context)
+            {
+                _context = context;
+            }
+
+            public ISkiaSharpApiLease Lease()
+            {
+                _context.CheckLease();
+                return new ApiLease(_context);
+            }
+
+            class ApiLease : ISkiaSharpApiLease
+            {
+                private DrawingContextImpl _context;
+                private readonly SKMatrix _revertTransform;
+
+                public ApiLease(DrawingContextImpl context)
+                {
+                    _revertTransform = context.Canvas.TotalMatrix;
+                    _context = context;
+                    _context._leased = true;
+                }
+
+                public SKCanvas SkCanvas => _context.Canvas;
+                public GRContext GrContext => _context.GrContext;
+                public SKSurface SkSurface => _context.Surface;
+                public double CurrentOpacity => _context._currentOpacity;
+                
+                public void Dispose()
+                {
+                    _context.Canvas.SetMatrix(_revertTransform);
+                    _context._leased = false;
+                    _context = null;
+                }
+            }
+        }
+        
         /// <summary>
         /// Create new drawing context.
         /// </summary>
@@ -123,19 +166,23 @@ namespace Avalonia.Skia
         public SKCanvas Canvas { get; }
         public SKSurface Surface { get; }
 
-        SKCanvas ISkiaDrawingContextImpl.SkCanvas => Canvas;
-        SKSurface ISkiaDrawingContextImpl.SkSurface => Surface;
-        GRContext ISkiaDrawingContextImpl.GrContext => _grContext;
-
+        private void CheckLease()
+        {
+            if (_leased)
+                throw new InvalidOperationException("The underlying graphics API is currently leased");
+        }
+        
         /// <inheritdoc />
         public void Clear(Color color)
         {
+            CheckLease();
             Canvas.Clear(color.ToSKColor());
         }
 
         /// <inheritdoc />
         public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
         {
+            CheckLease();
             var drawableImage = (IDrawableBitmapImpl)source.Item;
             var s = sourceRect.ToSKRect();
             var d = destRect.ToSKRect();
@@ -156,6 +203,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
+            CheckLease();
             PushOpacityMask(opacityMask, opacityMaskRect);
             DrawBitmap(source, 1, new Rect(0, 0, source.Item.PixelSize.Width, source.Item.PixelSize.Height), destRect, BitmapInterpolationMode.Default);
             PopOpacityMask();
@@ -164,6 +212,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawLine(IPen pen, Point p1, Point p2)
         {
+            CheckLease();
             using (var paint = CreatePaint(_strokePaint, pen, new Size(Math.Abs(p2.X - p1.X), Math.Abs(p2.Y - p1.Y))))
             {
                 if (paint.Paint is object)
@@ -176,11 +225,13 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry)
         {
+            CheckLease();
             var impl = (GeometryImpl) geometry;
             var size = geometry.Bounds.Size;
 
             using (var fill = brush != null ? CreatePaint(_fillPaint, brush, size) : default(PaintWrapper))
-            using (var stroke = pen?.Brush != null ? CreatePaint(_strokePaint, pen, size) : default(PaintWrapper))
+            using (var stroke = pen?.Brush != null ? CreatePaint(_strokePaint, pen, 
+                size.Inflate(new Thickness(pen?.Thickness / 2 ?? 0))) : default(PaintWrapper))
             {
                 if (fill.Paint != null)
                 {
@@ -258,6 +309,7 @@ namespace Avalonia.Skia
         {
             if (rect.Rect.Height <= 0 || rect.Rect.Width <= 0)
                 return;
+            CheckLease();
             
             var rc = rect.Rect.ToSKRect();
             var isRounded = rect.IsRounded;
@@ -294,6 +346,7 @@ namespace Avalonia.Skia
         {
             if (rect.Rect.Height <= 0 || rect.Rect.Width <= 0)
                 return;
+            CheckLease();
             // Arbitrary chosen values
             // On OSX Skia breaks OpenGL context when asked to draw, e. g. (0, 0, 623, 6666600) rect
             if (rect.Rect.Height > 8192 || rect.Rect.Width > 8192)
@@ -397,7 +450,7 @@ namespace Avalonia.Skia
 
             if (pen?.Brush != null)
             {
-                using (var paint = CreatePaint(_strokePaint, pen, rect.Rect.Size))
+                using (var paint = CreatePaint(_strokePaint, pen, rect.Rect.Size.Inflate(new Thickness(pen?.Thickness / 2 ?? 0))))
                 {
                     if (paint.Paint is object)
                     {
@@ -419,7 +472,8 @@ namespace Avalonia.Skia
         {
             if (rect.Height <= 0 || rect.Width <= 0)
                 return;
-
+            CheckLease();
+            
             var rc = rect.ToSKRect();
 
             if (brush != null)
@@ -432,7 +486,7 @@ namespace Avalonia.Skia
 
             if (pen?.Brush != null)
             {
-                using (var paint = CreatePaint(_strokePaint, pen, rect.Size))
+                using (var paint = CreatePaint(_strokePaint, pen, rect.Size.Inflate(new Thickness(pen?.Thickness / 2 ?? 0))))
                 {
                     if (paint.Paint is object)
                     {
@@ -445,6 +499,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
         {
+            CheckLease();
             using (var paintWrapper = CreatePaint(_fillPaint, foreground, glyphRun.Size))
             {
                 var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
@@ -457,18 +512,21 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public IDrawingContextLayerImpl CreateLayer(Size size)
         {
+            CheckLease();
             return CreateRenderTarget(size, true);
         }
 
         /// <inheritdoc />
         public void PushClip(Rect clip)
         {
+            CheckLease();
             Canvas.Save();
             Canvas.ClipRect(clip.ToSKRect());
         }
 
         public void PushClip(RoundedRect clip)
         {
+            CheckLease();
             Canvas.Save();
             Canvas.ClipRoundRect(clip.ToSKRoundRect(), antialias:true);
         }
@@ -476,12 +534,14 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopClip()
         {
+            CheckLease();
             Canvas.Restore();
         }
 
         /// <inheritdoc />
         public void PushOpacity(double opacity)
         {
+            CheckLease();
             _opacityStack.Push(_currentOpacity);
             _currentOpacity *= opacity;
         }
@@ -489,6 +549,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopOpacity()
         {
+            CheckLease();
             _currentOpacity = _opacityStack.Pop();
         }
 
@@ -497,6 +558,7 @@ namespace Avalonia.Skia
         {
             if(_disposed)
                 return;
+            CheckLease();
             try
             {
                 if (_grContext != null)
@@ -521,6 +583,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PushGeometryClip(IGeometryImpl clip)
         {
+            CheckLease();
             Canvas.Save();
             Canvas.ClipPath(((GeometryImpl)clip).EffectivePath, SKClipOperation.Intersect, true);
         }
@@ -528,12 +591,14 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopGeometryClip()
         {
+            CheckLease();
             Canvas.Restore();
         }
 
         /// <inheritdoc />
         public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
         {
+            CheckLease();
             _blendingModeStack.Push(_currentBlendingMode);
             _currentBlendingMode = blendingMode;
         }
@@ -541,14 +606,20 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopBitmapBlendMode()
         {
+            CheckLease();
             _currentBlendingMode = _blendingModeStack.Pop();
         }
 
-        public void Custom(ICustomDrawOperation custom) => custom.Render(this);
+        public void Custom(ICustomDrawOperation custom)
+        {
+            CheckLease();
+            custom.Render(this);
+        }
 
         /// <inheritdoc />
         public void PushOpacityMask(IBrush mask, Rect bounds)
         {
+            CheckLease();
             // TODO: This should be disposed
             var paint = new SKPaint();
 
@@ -559,6 +630,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopOpacityMask()
         {
+            CheckLease();
             using (var paint = new SKPaint { BlendMode = SKBlendMode.DstIn })
             {
                 Canvas.SaveLayer(paint);
@@ -578,6 +650,7 @@ namespace Avalonia.Skia
             get { return _currentTransform; }
             set
             {
+                CheckLease();
                 if (_currentTransform == value)
                     return;
 
@@ -594,6 +667,14 @@ namespace Avalonia.Skia
             }
         }
 
+        [CanBeNull]
+        public object GetFeature(Type t)
+        {
+            if (t == typeof(ISkiaSharpApiLeaseFeature))
+                return new SkiaLeaseFeature(this);
+            return null;
+        }
+
         /// <summary>
         /// Configure paint wrapper for using gradient brush.
         /// </summary>
@@ -614,10 +695,25 @@ namespace Avalonia.Skia
                     var end = linearGradient.EndPoint.ToPixels(targetSize).ToSKPoint();
 
                     // would be nice to cache these shaders possibly?
-                    using (var shader =
-                        SKShader.CreateLinearGradient(start, end, stopColors, stopOffsets, tileMode))
+                    if (linearGradient.Transform is null)
                     {
-                        paintWrapper.Paint.Shader = shader;
+                        using (var shader =
+                            SKShader.CreateLinearGradient(start, end, stopColors, stopOffsets, tileMode))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }
+                    }
+                    else
+                    {
+                        var transformOrigin = linearGradient.TransformOrigin.ToPixels(targetSize);
+                        var offset = Matrix.CreateTranslation(transformOrigin);
+                        var transform = (-offset) * linearGradient.Transform.Value * (offset);
+
+                        using (var shader =
+                            SKShader.CreateLinearGradient(start, end, stopColors, stopOffsets, tileMode, transform.ToSKMatrix()))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }   
                     }
 
                     break;
@@ -632,10 +728,25 @@ namespace Avalonia.Skia
                     if (origin.Equals(center))
                     {
                         // when the origin is the same as the center the Skia RadialGradient acts the same as D2D
-                        using (var shader =
-                            SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                        if (radialGradient.Transform is null)
                         {
-                            paintWrapper.Paint.Shader = shader;
+                            using (var shader =
+                                SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            }
+                        }
+                        else
+                        {
+                            var transformOrigin = radialGradient.TransformOrigin.ToPixels(targetSize);
+                            var offset = Matrix.CreateTranslation(transformOrigin);
+                            var transform = (-offset) * radialGradient.Transform.Value * (offset);
+                        
+                            using (var shader =
+                                SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode, transform.ToSKMatrix()))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            }
                         }
                     }
                     else
@@ -659,12 +770,30 @@ namespace Avalonia.Skia
                         }
                             
                         // compose with a background colour of the final stop to match D2D's behaviour of filling with the final color
-                        using (var shader = SKShader.CreateCompose(
-                            SKShader.CreateColor(reversedColors[0]),
-                            SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode)
-                        ))
+                        if (radialGradient.Transform is null)
                         {
-                            paintWrapper.Paint.Shader = shader;
+                            using (var shader = SKShader.CreateCompose(
+                                SKShader.CreateColor(reversedColors[0]),
+                                SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode)
+                            ))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            }
+                        }
+                        else
+                        {
+                                
+                            var transformOrigin = radialGradient.TransformOrigin.ToPixels(targetSize);
+                            var offset = Matrix.CreateTranslation(transformOrigin);
+                            var transform = (-offset) * radialGradient.Transform.Value * (offset);
+                           
+                            using (var shader = SKShader.CreateCompose(
+                                SKShader.CreateColor(reversedColors[0]),
+                                SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode, transform.ToSKMatrix())
+                            ))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            } 
                         }
                     }
 
@@ -679,6 +808,16 @@ namespace Avalonia.Skia
                     var angle = (float)(conicGradient.Angle - 90);
                     var rotation = SKMatrix.CreateRotationDegrees(angle, center.X, center.Y);
 
+                    if (conicGradient.Transform is { })
+                    {
+                            
+                        var transformOrigin = conicGradient.TransformOrigin.ToPixels(targetSize);
+                        var offset = Matrix.CreateTranslation(transformOrigin);
+                        var transform = (-offset) * conicGradient.Transform.Value * (offset);
+
+                        rotation = rotation.PreConcat(transform.ToSKMatrix());
+                    }
+
                     using (var shader = 
                         SKShader.CreateSweepGradient(center, stopColors, stopOffsets, rotation))
                     {
@@ -751,6 +890,15 @@ namespace Avalonia.Skia
                 tileTransform,
                 SKMatrix.CreateScale((float)(96.0 / _dpi.X), (float)(96.0 / _dpi.Y)));
 
+            if (tileBrush.Transform is { })
+            {
+                var origin = tileBrush.TransformOrigin.ToPixels(targetSize);
+                var offset = Matrix.CreateTranslation(origin);
+                var transform = (-offset) * tileBrush.Transform.Value * (offset);
+
+                paintTransform = paintTransform.PreConcat(transform.ToSKMatrix());
+            }
+
             using (var shader = image.ToShader(tileX, tileY, paintTransform))
             {
                 paintWrapper.Paint.Shader = shader;
diff --git a/src/Skia/Avalonia.Skia/FontManagerImpl.cs b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
index 6b560ac739..90ff9652d8 100644
--- a/src/Skia/Avalonia.Skia/FontManagerImpl.cs
+++ b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@@ -29,27 +29,27 @@ namespace Avalonia.Skia
         [ThreadStatic] private static string[] t_languageTagBuffer;
 
         public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
-            FontWeight fontWeight,
+            FontWeight fontWeight, FontStretch fontStretch,
             FontFamily fontFamily, CultureInfo culture, out Typeface fontKey)
         {
             SKFontStyle skFontStyle;
 
             switch (fontWeight)
             {
-                case FontWeight.Normal when fontStyle == FontStyle.Normal:
+                case FontWeight.Normal when fontStyle == FontStyle.Normal && fontStretch == FontStretch.Normal:
                     skFontStyle = SKFontStyle.Normal;
                     break;
-                case FontWeight.Normal when fontStyle == FontStyle.Italic:
+                case FontWeight.Normal when fontStyle == FontStyle.Italic && fontStretch == FontStretch.Normal:
                     skFontStyle = SKFontStyle.Italic;
                     break;
-                case FontWeight.Bold when fontStyle == FontStyle.Normal:
+                case FontWeight.Bold when fontStyle == FontStyle.Normal && fontStretch == FontStretch.Normal:
                     skFontStyle = SKFontStyle.Bold;
                     break;
-                case FontWeight.Bold when fontStyle == FontStyle.Italic:
+                case FontWeight.Bold when fontStyle == FontStyle.Italic && fontStretch == FontStretch.Normal:
                     skFontStyle = SKFontStyle.BoldItalic;
                     break;
                 default:
-                    skFontStyle = new SKFontStyle((SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle);
+                    skFontStyle = new SKFontStyle((SKFontStyleWeight)fontWeight, (SKFontStyleWidth)fontStretch, (SKFontStyleSlant)fontStyle);
                     break;
             }
 
@@ -80,7 +80,7 @@ namespace Avalonia.Skia
                         continue;
                     }
 
-                    fontKey = new Typeface(skTypeface.FamilyName, fontStyle, fontWeight);
+                    fontKey = new Typeface(skTypeface.FamilyName, fontStyle, fontWeight, fontStretch);
 
                     return true;
                 }
@@ -91,7 +91,7 @@ namespace Avalonia.Skia
 
                 if (skTypeface != null)
                 {
-                    fontKey = new Typeface(skTypeface.FamilyName, fontStyle, fontWeight);
+                    fontKey = new Typeface(skTypeface.FamilyName, fontStyle, fontWeight, fontStretch);
 
                     return true;
                 }
@@ -102,22 +102,27 @@ namespace Avalonia.Skia
             return false;
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphTypeface CreateGlyphTypeface(Typeface typeface)
         {
             SKTypeface skTypeface = null;
 
             if (typeface.FontFamily.Key == null)
             {
                 var defaultName = SKTypeface.Default.FamilyName;
-                var fontStyle = new SKFontStyle((SKFontStyleWeight)typeface.Weight, SKFontStyleWidth.Normal, (SKFontStyleSlant)typeface.Style);
+
+                var fontStyle = new SKFontStyle((SKFontStyleWeight)typeface.Weight, (SKFontStyleWidth)typeface.Stretch,
+                    (SKFontStyleSlant)typeface.Style);
 
                 foreach (var familyName in typeface.FontFamily.FamilyNames)
                 {
+                    if(familyName == FontFamily.DefaultFontFamilyName)
+                    {
+                        continue;
+                    }
+
                     skTypeface = _skFontManager.MatchFamily(familyName, fontStyle);
 
-                    if (skTypeface is null
-                        || (!skTypeface.FamilyName.Equals(familyName, StringComparison.Ordinal)
-                            && defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal)))
+                    if (skTypeface is null || defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal))
                     {
                         continue;
                     }
@@ -125,7 +130,10 @@ namespace Avalonia.Skia
                     break;
                 }
 
-                skTypeface ??= _skFontManager.MatchTypeface(SKTypeface.Default, fontStyle);
+                // MatchTypeface can return "null" if matched typeface wasn't found for the style
+                // Fallback to the default typeface and styles instead.
+                skTypeface ??= _skFontManager.MatchTypeface(SKTypeface.Default, fontStyle)
+                    ?? SKTypeface.Default;
             }
             else
             {
@@ -140,11 +148,19 @@ namespace Avalonia.Skia
                     $"Could not create glyph typeface for: {typeface.FontFamily.Name}.");
             }
 
-            var isFakeBold = (int)typeface.Weight >= 600 && !skTypeface.IsBold;
+            var fontSimulations = FontSimulations.None;
+
+            if((int)typeface.Weight >= 600 && !skTypeface.IsBold)
+            {
+                fontSimulations |= FontSimulations.Bold;
+            }
+
+            if(typeface.Style == FontStyle.Italic && !skTypeface.IsItalic)
+            {
+                fontSimulations |= FontSimulations.Oblique;
+            }
 
-            var isFakeItalic = typeface.Style == FontStyle.Italic && !skTypeface.IsItalic;
-            
-            return new GlyphTypefaceImpl(skTypeface, isFakeBold, isFakeItalic);
+            return new GlyphTypefaceImpl(skTypeface, fontSimulations);
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
index f59a0a32c2..bdc3d075cf 100644
--- a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using JetBrains.Annotations;
 using SkiaSharp;
@@ -6,6 +7,7 @@ using SkiaSharp;
 namespace Avalonia.Skia
 {
     /// <inheritdoc />
+    [Unstable]
     public class GlyphRunImpl : IGlyphRunImpl
     {
         public GlyphRunImpl([NotNull] SKTextBlob textBlob)
diff --git a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
index 5b6e5af60f..71bdc1bd6b 100644
--- a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
@@ -1,16 +1,18 @@
 using System;
 using System.Runtime.InteropServices;
-using Avalonia.Platform;
+using Avalonia.Media;
+using Avalonia.Metadata;
 using HarfBuzzSharp;
 using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    public class GlyphTypefaceImpl : IGlyphTypefaceImpl
+    [Unstable]
+    public class GlyphTypefaceImpl : IGlyphTypeface
     {
         private bool _isDisposed;
 
-        public GlyphTypefaceImpl(SKTypeface typeface, bool isFakeBold = false, bool isFakeItalic = false)
+        public GlyphTypefaceImpl(SKTypeface typeface, FontSimulations fontSimulations)
         {
             Typeface = typeface ?? throw new ArgumentNullException(nameof(typeface));
 
@@ -23,39 +25,34 @@ namespace Avalonia.Skia
 
             Font.SetFunctionsOpenType();
 
-            DesignEmHeight = (short)Typeface.UnitsPerEm;
-
             var metrics = Typeface.ToFont().Metrics;
 
             const double defaultFontRenderingEmSize = 12.0;
 
-            Ascent = (int)(metrics.Ascent / defaultFontRenderingEmSize * Typeface.UnitsPerEm);
-
-            Descent = (int)(metrics.Descent / defaultFontRenderingEmSize * Typeface.UnitsPerEm);
-
-            LineGap = (int)(metrics.Leading / defaultFontRenderingEmSize * Typeface.UnitsPerEm);
-
-            UnderlinePosition = metrics.UnderlinePosition != null ?
+            Metrics = new FontMetrics
+            {
+                DesignEmHeight = (short)Typeface.UnitsPerEm,
+                Ascent = (int)(metrics.Ascent / defaultFontRenderingEmSize * Typeface.UnitsPerEm),
+                Descent = (int)(metrics.Descent / defaultFontRenderingEmSize * Typeface.UnitsPerEm),
+                LineGap = (int)(metrics.Leading / defaultFontRenderingEmSize * Typeface.UnitsPerEm),
+                UnderlinePosition = metrics.UnderlinePosition != null ?
                 (int)(metrics.UnderlinePosition / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
-                0;
-
-            UnderlineThickness = metrics.UnderlineThickness != null ?
+                0,
+                UnderlineThickness = metrics.UnderlineThickness != null ?
                 (int)(metrics.UnderlineThickness / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
-                0;
-
-            StrikethroughPosition = metrics.StrikeoutPosition != null ?
+                0,
+                StrikethroughPosition = metrics.StrikeoutPosition != null ?
                 (int)(metrics.StrikeoutPosition / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
-                0;
-
-            StrikethroughThickness = metrics.StrikeoutThickness != null ?
+                0,
+                StrikethroughThickness = metrics.StrikeoutThickness != null ?
                 (int)(metrics.StrikeoutThickness / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
-                0;
-
-            IsFixedPitch = Typeface.IsFixedPitch;
+                0,
+                IsFixedPitch = Typeface.IsFixedPitch
+            };
 
-            IsFakeBold = isFakeBold;
+            GlyphCount = Typeface.GlyphCount;
 
-            IsFakeItalic = isFakeItalic;
+            FontSimulations = fontSimulations;
         }
 
         public Face Face { get; }
@@ -64,40 +61,35 @@ namespace Avalonia.Skia
 
         public SKTypeface Typeface { get; }
 
-        public int ReplacementCodepoint { get; }
-        
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public short DesignEmHeight { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int Ascent { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int Descent { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int LineGap { get; }
+        public FontSimulations FontSimulations { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int UnderlinePosition { get; }
+        public int ReplacementCodepoint { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int UnderlineThickness { get; }
+        public FontMetrics Metrics { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int StrikethroughPosition { get; }
+        public int GlyphCount { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int StrikethroughThickness { get; }
+        public bool TryGetGlyphMetrics(ushort glyph, out GlyphMetrics metrics)
+        {
+            metrics = default;
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public bool IsFixedPitch { get; }
-        
-        public bool IsFakeBold { get; }
-        
-        public bool IsFakeItalic { get; }
+            if (!Font.TryGetGlyphExtents(glyph, out var extents))
+            {
+                return false;
+            }
+            
+            metrics = new GlyphMetrics
+            {
+                XBearing = extents.XBearing,
+                YBearing = extents.YBearing,
+                Width = extents.Width,
+                Height = extents.Height
+            };
+                
+            return true;
+        }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public ushort GetGlyph(uint codepoint)
         {
             if (Font.TryGetGlyph(codepoint, out var glyph))
@@ -108,7 +100,14 @@ namespace Avalonia.Skia
             return 0;
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        public bool TryGetGlyph(uint codepoint, out ushort glyph)
+        {
+            glyph = GetGlyph(codepoint);
+
+            return glyph != 0;
+        }
+
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints)
         {
             var glyphs = new ushort[codepoints.Length];
@@ -124,13 +123,13 @@ namespace Avalonia.Skia
             return glyphs;
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public int GetGlyphAdvance(ushort glyph)
         {
             return Font.GetHorizontalGlyphAdvance(glyph);
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs)
         {
             var glyphIndices = new uint[glyphs.Length];
@@ -178,5 +177,10 @@ namespace Avalonia.Skia
             Dispose(true);
             GC.SuppressFinalize(this);
         }
+
+        public bool TryGetTable(uint tag, out byte[] table)
+        {
+            return Typeface.TryGetTableData(tag, out table);
+        }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
index 8ab275df63..984c1785b7 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
@@ -27,16 +27,13 @@ namespace Avalonia.Skia
             gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderbuffer);
             gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
 
-            var arr = new int[2];
-
+            
             // Generate FBO
-            gl.GenFramebuffers(1, arr);
-            _fbo = arr[0];
+            _fbo = gl.GenFramebuffer();
             gl.BindFramebuffer(GL_FRAMEBUFFER, _fbo);
 
             // Create a texture to render into
-            gl.GenTextures(1, arr);
-            _texture = arr[0];
+            _texture = gl.GenTexture();
             gl.BindTexture(GL_TEXTURE_2D, _texture);
             gl.TexImage2D(GL_TEXTURE_2D, 0,
                 InternalFormat, pixelSize.Width, pixelSize.Height,
@@ -48,8 +45,7 @@ namespace Avalonia.Skia
             var success = false;
             foreach (var useStencil8 in TrueFalse)
             {
-                gl.GenRenderbuffers(1, arr);
-                _depthStencil = arr[0];
+                _depthStencil = gl.GenRenderbuffer();
                 gl.BindRenderbuffer(GL_RENDERBUFFER, _depthStencil);
 
                 if (useStencil8)
@@ -73,7 +69,7 @@ namespace Avalonia.Skia
                 else
                 {
                     gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderbuffer);
-                    gl.DeleteRenderbuffers(1, arr);
+                    gl.DeleteRenderbuffer(_depthStencil);
                 }
             }
             
@@ -83,10 +79,8 @@ namespace Avalonia.Skia
 
             if (!success)
             {
-                arr[0] = _fbo;
-                gl.DeleteFramebuffers(1, arr);
-                arr[0] = _texture;
-                gl.DeleteTextures(1, arr);
+                gl.DeleteFramebuffer(_fbo);
+                gl.DeleteTexture(_texture);
                 throw new OpenGlException("Unable to create FBO with stencil");
             }
 
@@ -94,7 +88,7 @@ namespace Avalonia.Skia
                 new GRGlFramebufferInfo((uint)_fbo, SKColorType.Rgba8888.ToGlSizedFormat()));
             Surface = SKSurface.Create(_grContext, target,
                 surfaceOrigin, SKColorType.Rgba8888);
-            CanBlit = gl.BlitFramebuffer != null;
+            CanBlit = gl.IsBlitFramebufferAvailable;
         }
         
         public void Dispose()
@@ -106,9 +100,9 @@ namespace Avalonia.Skia
                 var gl = _glContext.GlInterface;
                 if (_fbo != 0)
                 {
-                    gl.DeleteFramebuffers(1, new[] { _fbo });
-                    gl.DeleteTextures(1, new[] { _texture });
-                    gl.DeleteRenderbuffers(1, new[] { _depthStencil });
+                    gl.DeleteFramebuffer(_fbo);
+                    gl.DeleteTexture(_texture);
+                    gl.DeleteRenderbuffer(_depthStencil);
                     _fbo = _texture = _depthStencil = 0;
                 }
             }
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
index b4c5619c85..809f50ab8b 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
@@ -69,6 +69,7 @@ namespace Avalonia.Skia
                 gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb);
 
                 var size = glSession.Size;
+                var colorType = SKColorType.Rgba8888;
                 var scaling = glSession.Scaling;
                 if (size.Width <= 0 || size.Height <= 0 || scaling < 0)
                 {
@@ -81,12 +82,16 @@ namespace Avalonia.Skia
                 {
                     _grContext.ResetContext();
 
-                    var renderTarget =
-                        new GRBackendRenderTarget(size.Width, size.Height, disp.SampleCount, disp.StencilSize,
-                            new GRGlFramebufferInfo((uint)fb, SKColorType.Rgba8888.ToGlSizedFormat()));
+                    var samples = disp.SampleCount;
+                    var maxSamples = _grContext.GetMaxSurfaceSampleCount(colorType);
+                    if (samples > maxSamples)
+                        samples = maxSamples;
+
+                    var glInfo = new GRGlFramebufferInfo((uint)fb, colorType.ToGlSizedFormat());
+                    var renderTarget = new GRBackendRenderTarget(size.Width, size.Height, samples, disp.StencilSize, glInfo);
                     var surface = SKSurface.Create(_grContext, renderTarget,
                         glSession.IsYFlipped ? GRSurfaceOrigin.TopLeft : GRSurfaceOrigin.BottomLeft,
-                        SKColorType.Rgba8888);
+                        colorType);
 
                     success = true;
 
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
index ec8a8436e1..08e0fbd808 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -54,7 +54,7 @@ namespace Avalonia.Skia
                 return null;
 
             // Blit feature requires glBlitFramebuffer
-            if (_glContext.GlInterface.BlitFramebuffer == null)
+            if (!_glContext.GlInterface.IsBlitFramebufferAvailable)
                 return null;
             
             size = new PixelSize(Math.Max(size.Width, 1), Math.Max(size.Height, 1));
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
index 2ebf7c680b..857433f95f 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
@@ -25,9 +25,9 @@ namespace Avalonia.Skia
         public Vector Dpi { get; }
         public PixelSize PixelSize { get; }
         public int Version { get; private set; }
-        public void Save(string fileName) => throw new NotSupportedException();
+        public void Save(string fileName, int? quality = null) => throw new NotSupportedException();
 
-        public void Save(Stream stream) => throw new NotSupportedException();
+        public void Save(Stream stream, int? quality = null) => throw new NotSupportedException();
 
         public void Draw(DrawingContextImpl context, SKRect sourceRect, SKRect destRect, SKPaint paint)
         {
@@ -41,7 +41,7 @@ namespace Avalonia.Skia
                         new GRGlTextureInfo(
                             GlConsts.GL_TEXTURE_2D, (uint)_surface.GetTextureId(),
                             (uint)_surface.InternalFormat)))
-                    using (var surface = SKSurface.Create(context.GrContext, backendTexture, GRSurfaceOrigin.TopLeft,
+                    using (var surface = SKSurface.Create(context.GrContext, backendTexture, GRSurfaceOrigin.BottomLeft,
                         SKColorType.Rgba8888))
                     {
                         // Again, silently ignore, if something went wrong it's not our fault
@@ -101,7 +101,7 @@ namespace Avalonia.Skia
         private bool _disposed;
         private readonly DisposableLock _lock = new DisposableLock();
 
-        public SharedOpenGlBitmapAttachment(GlOpenGlBitmapImpl bitmap, IGlContext context, Action presentCallback)
+        public unsafe SharedOpenGlBitmapAttachment(GlOpenGlBitmapImpl bitmap, IGlContext context, Action presentCallback)
         {
             _bitmap = bitmap;
             _context = context;
@@ -118,8 +118,9 @@ namespace Avalonia.Skia
                 {
                     var gl = _context.GlInterface;
                     
-                    var textures = new int[2];
-                    gl.GenTextures(2, textures);
+                    Span<int> textures = stackalloc int[2];
+                    fixed (int* ptex = textures)
+                        gl.GenTextures(2, ptex);
                     _texture = textures[0];
                     _frontBuffer = textures[1];
 
@@ -138,7 +139,6 @@ namespace Avalonia.Skia
 
                     gl.FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture, 0);
                     gl.BindTexture(GL_TEXTURE_2D, oldTexture);
-                    
                 }
             }
         }
@@ -160,15 +160,15 @@ namespace Avalonia.Skia
                     gl.GetIntegerv(GL_ACTIVE_TEXTURE, out var oldActive);
                     
                     gl.BindFramebuffer(GL_FRAMEBUFFER, _fbo);
-                    gl.BindTexture(GL_TEXTURE_2D, _frontBuffer);
                     gl.ActiveTexture(GL_TEXTURE0);
+                    gl.BindTexture(GL_TEXTURE_2D, _frontBuffer);
 
                     gl.CopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, _bitmap.PixelSize.Width,
                         _bitmap.PixelSize.Height);
 
                     gl.BindFramebuffer(GL_FRAMEBUFFER, oldFbo);
-                    gl.BindTexture(GL_TEXTURE_2D, oldTexture);
                     gl.ActiveTexture(oldActive);
+                    gl.BindTexture(GL_TEXTURE_2D, oldTexture);
                     
                     gl.Finish();
                 }
@@ -178,7 +178,7 @@ namespace Avalonia.Skia
             _presentCallback();
         }
 
-        public void Dispose()
+        public unsafe void Dispose()
         {
             var gl = _context.GlInterface;
             _bitmap.Present(null);
@@ -191,7 +191,8 @@ namespace Avalonia.Skia
                 if(_disposed)
                     return;
                 _disposed = true;
-                gl.DeleteTextures(2, new[] { _texture, _frontBuffer });
+                var ptex = stackalloc[] { _texture, _frontBuffer };
+                gl.DeleteTextures(2, ptex);
             }
         }
 
diff --git a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
index d0b45b7c5d..ec33770356 100644
--- a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
+++ b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using Avalonia.Platform;
+using Avalonia.Platform;
 using Avalonia.Rendering;
 using SkiaSharp;
 
@@ -29,70 +28,5 @@ namespace Avalonia.Skia.Helpers
             return new DrawingContextImpl(createInfo);
         }
         
-        /// <summary>
-        /// Unsupported - Wraps a GPU Backed SkiaSurface in an Avalonia DrawingContext.
-        /// </summary>
-        [Obsolete]
-        public static ISkiaDrawingContextImpl WrapSkiaSurface(this SKSurface surface, GRContext grContext, Vector dpi, params IDisposable[] disposables)
-        {
-            var createInfo = new DrawingContextImpl.CreateInfo
-            {
-                GrContext = grContext,
-                Surface = surface,
-                Dpi = dpi,
-                DisableTextLcdRendering = false,
-            };
-
-            return new DrawingContextImpl(createInfo, disposables);
-        }
-        
-        /// <summary>
-        /// Unsupported - Wraps a non-GPU Backed SkiaSurface in an Avalonia DrawingContext.
-        /// </summary>
-        [Obsolete]
-        public static ISkiaDrawingContextImpl WrapSkiaSurface(this SKSurface surface, Vector dpi, params IDisposable[] disposables)
-        {
-            var createInfo = new DrawingContextImpl.CreateInfo
-            {
-                Surface = surface,
-                Dpi = dpi,
-                DisableTextLcdRendering = false,
-            };
-
-            return new DrawingContextImpl(createInfo, disposables);
-        }
-
-        [Obsolete]
-        public static ISkiaDrawingContextImpl CreateDrawingContext(Size size, Vector dpi, GRContext grContext = null)
-        {
-            if (grContext is null)
-            {
-                var surface = SKSurface.Create(
-                    new SKImageInfo(
-                        (int)Math.Ceiling(size.Width),
-                        (int)Math.Ceiling(size.Height),
-                        SKImageInfo.PlatformColorType,
-                        SKAlphaType.Premul));
-
-                return WrapSkiaSurface(surface, dpi, surface);
-            }
-            else
-            {
-                var surface = SKSurface.Create(grContext, false,
-                    new SKImageInfo(
-                        (int)Math.Ceiling(size.Width),
-                        (int)Math.Ceiling(size.Height),
-                        SKImageInfo.PlatformColorType,
-                        SKAlphaType.Premul));
-
-                return WrapSkiaSurface(surface, grContext, dpi, surface);
-            }
-        }
-        
-        [Obsolete]
-        public static void DrawTo(this ISkiaDrawingContextImpl source, ISkiaDrawingContextImpl destination, SKPaint paint = null)
-        {
-            destination.SkCanvas.DrawSurface(source.SkSurface, new SKPoint(0, 0), paint);
-        }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs b/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs
index 5fa961cc99..b4dd754822 100644
--- a/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs
+++ b/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs
@@ -14,14 +14,19 @@ namespace Avalonia.Skia.Helpers
         /// </summary>
         /// <param name="image">Image to save</param>
         /// <param name="fileName">Target file.</param>
-        public static void SaveImage(SKImage image, string fileName)
+        /// <param name="quality">
+        /// The optional quality for PNG compression. 
+        /// The quality value is interpreted from 0 - 100. If quality is null 
+        /// the encoder applies the default quality value.
+        /// </param>
+        public static void SaveImage(SKImage image, string fileName, int? quality = null)
         {
             if (image == null) throw new ArgumentNullException(nameof(image));
             if (fileName == null) throw new ArgumentNullException(nameof(fileName));
 
             using (var stream = File.Create(fileName))
             {
-                SaveImage(image, stream);
+                SaveImage(image, stream, quality);
             }
         }
 
@@ -29,16 +34,30 @@ namespace Avalonia.Skia.Helpers
         /// Save Skia image to a stream.
         /// </summary>
         /// <param name="image">Image to save</param>
-        /// <param name="stream">Target stream.</param>
-        public static void SaveImage(SKImage image, Stream stream)
+        /// <param name="quality">
+        /// The optional quality for PNG compression. 
+        /// The quality value is interpreted from 0 - 100. If quality is null 
+        /// the encoder applies the default quality value.
+        /// </param>
+        public static void SaveImage(SKImage image, Stream stream, int? quality = null)
         {
             if (image == null) throw new ArgumentNullException(nameof(image));
             if (stream == null) throw new ArgumentNullException(nameof(stream));
 
-            using (var data = image.Encode())
+            if (quality == null)
             {
-                data.SaveTo(stream);
+                using (var data = image.Encode())
+                {
+                    data.SaveTo(stream);
+                }
+            }
+            else
+            {
+                using (var data = image.Encode(SKEncodedImageFormat.Png, (int)quality))
+                {
+                    data.SaveTo(stream);
+                }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
deleted file mode 100644
index 38fa5a5253..0000000000
--- a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Platform;
-using SkiaSharp;
-
-namespace Avalonia.Skia
-{
-    public interface ISkiaDrawingContextImpl : IDrawingContextImpl
-    {
-        SKCanvas SkCanvas { get; }
-        GRContext GrContext { get; }
-        SKSurface SkSurface { get; }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs b/src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs
new file mode 100644
index 0000000000..b3966c0324
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs
@@ -0,0 +1,20 @@
+using System;
+using Avalonia.Metadata;
+using SkiaSharp;
+
+namespace Avalonia.Skia;
+
+[Unstable]
+public interface ISkiaSharpApiLeaseFeature
+{
+    public ISkiaSharpApiLease Lease();
+}
+
+[Unstable]
+public interface ISkiaSharpApiLease : IDisposable
+{
+    SKCanvas SkCanvas { get; }
+    GRContext GrContext { get; }
+    SKSurface SkSurface { get; }
+    double CurrentOpacity { get; }
+}
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
index 3010f49420..e24d805050 100644
--- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
+++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
@@ -1,11 +1,8 @@
 using System;
 using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Skia.Helpers;
-using Avalonia.Visuals.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -57,7 +54,8 @@ namespace Avalonia.Skia
         public ImmutableBitmap(Stream stream, int decodeSize, bool horizontal, BitmapInterpolationMode interpolationMode)
         {
             using (var skStream = new SKManagedStream(stream))
-            using (var codec = SKCodec.Create(skStream))
+            using (var skData = SKData.Create(skStream))
+            using (var codec = SKCodec.Create(skData))
             {
                 var info = codec.Info;
 
@@ -141,13 +139,13 @@ namespace Avalonia.Skia
         }
 
         /// <inheritdoc />
-        public void Save(string fileName)
+        public void Save(string fileName, int? quality = null)
         {
             ImageSavingHelper.SaveImage(_image, fileName);
         }
 
         /// <inheritdoc />
-        public void Save(Stream stream)
+        public void Save(Stream stream, int? quality = null)
         {
             ImageSavingHelper.SaveImage(_image, stream);
         }
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index af3b570fd7..f34e25299c 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO; 
+using System.IO;
 using System.Linq;
 using System.Threading;
 
@@ -10,7 +10,7 @@ using Avalonia.Media;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Imaging;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -33,10 +33,17 @@ namespace Avalonia.Skia
             }
 
             var gl = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
-            if (gl != null) 
+            if (gl != null)
                 _skiaGpu = new GlSkiaGpu(gl, maxResourceBytes);
         }
 
+
+        public bool SupportsIndividualRoundRects => true;
+
+        public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
+
+        public PixelFormat DefaultPixelFormat { get; }
+
         public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
 
         public IGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2);
@@ -59,6 +66,49 @@ namespace Avalonia.Skia
             return new CombinedGeometryImpl(combineMode, g1, g2);
         }
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
+        {
+            if (glyphRun.GlyphTypeface is not GlyphTypefaceImpl glyphTypeface)
+            {
+                throw new InvalidOperationException("PlatformImpl can't be null.");
+            }
+
+            var fontRenderingEmSize = (float)glyphRun.FontRenderingEmSize;
+            var skFont = new SKFont(glyphTypeface.Typeface, fontRenderingEmSize)
+            {
+                Size = fontRenderingEmSize,
+                Edging = SKFontEdging.Alias,
+                Hinting = SKFontHinting.None,
+                LinearMetrics = true
+            };
+
+            SKPath path = new SKPath();
+
+            var (currentX, currentY) = glyphRun.BaselineOrigin;
+
+            for (var i = 0; i < glyphRun.GlyphIndices.Count; i++)
+            {
+                var glyph = glyphRun.GlyphIndices[i];
+                var glyphPath = skFont.GetGlyphPath(glyph);
+
+                if (!glyphPath.IsEmpty)
+                {
+                    path.AddPath(glyphPath, (float)currentX, (float)currentY);
+                }
+
+                if (glyphRun.GlyphAdvances != null)
+                {
+                    currentX += glyphRun.GlyphAdvances[i];
+                }
+                else
+                {
+                    currentX += glyphPath.Bounds.Right;
+                }
+            }
+
+            return new StreamGeometryImpl(path);
+        }
+
         /// <inheritdoc />
         public IBitmapImpl LoadBitmap(string fileName)
         {
@@ -182,133 +232,101 @@ namespace Avalonia.Skia
             return new WriteableBitmapImpl(size, dpi, format, alphaFormat);
         }
 
-        private static readonly SKFont s_font = new SKFont
+        public IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi)
         {
-            Subpixel = true,
-            Edging = SKFontEdging.SubpixelAntialias,
-            Hinting = SKFontHinting.Full,
-            LinearMetrics = true
-        };
-
-        private static readonly ThreadLocal<SKTextBlobBuilder> s_textBlobBuilderThreadLocal = new ThreadLocal<SKTextBlobBuilder>(() => new SKTextBlobBuilder());
+            if (_skiaGpu is IOpenGlAwareSkiaGpu glAware)
+                return glAware.CreateOpenGlBitmap(size, dpi);
+            if (_skiaGpu == null)
+                throw new PlatformNotSupportedException("GPU acceleration is not available");
+            throw new PlatformNotSupportedException(
+                "Current GPU acceleration backend does not support OpenGL integration");
+        }
 
-        /// <inheritdoc />
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices,
+            IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
         {
-            var count = glyphRun.GlyphIndices.Count;
-            var textBlobBuilder = s_textBlobBuilderThreadLocal.Value;
+            if (glyphTypeface == null)
+            {
+                throw new ArgumentNullException(nameof(glyphTypeface));
+            }
 
-            var glyphTypeface = (GlyphTypefaceImpl)glyphRun.GlyphTypeface.PlatformImpl;
+            if (glyphIndices == null)
+            {
+                throw new ArgumentNullException(nameof(glyphIndices));
+            }
 
-            var typeface = glyphTypeface.Typeface;
+            var glyphTypefaceImpl = glyphTypeface as GlyphTypefaceImpl;
 
-            s_font.Size = (float)glyphRun.FontRenderingEmSize;
-            s_font.Typeface = typeface;
-            s_font.Embolden = glyphTypeface.IsFakeBold;
-            s_font.SkewX = glyphTypeface.IsFakeItalic ? -0.2f : 0;
+            var font = new SKFont
+            {
+                LinearMetrics = true,
+                Subpixel = true,
+                Edging = SKFontEdging.SubpixelAntialias,
+                Hinting = SKFontHinting.Full,
+                Size = (float)fontRenderingEmSize,
+                Typeface = glyphTypefaceImpl.Typeface,
+                Embolden = (glyphTypefaceImpl.FontSimulations & FontSimulations.Bold) != 0,
+                SkewX = (glyphTypefaceImpl.FontSimulations & FontSimulations.Oblique) != 0 ? -0.2f : 0
+            };
 
-            SKTextBlob textBlob;
+            var builder = new SKTextBlobBuilder();
 
-            var scale = (float)(glyphRun.FontRenderingEmSize / glyphTypeface.DesignEmHeight);
+            var count = glyphIndices.Count;
 
-            if (glyphRun.GlyphOffsets == null)
+            if (glyphOffsets != null && glyphAdvances != null)
             {
-                if (glyphTypeface.IsFixedPitch)
-                {
-                    var buffer = textBlobBuilder.AllocateRun(s_font, glyphRun.GlyphIndices.Count, 0, 0);
+                var runBuffer = builder.AllocatePositionedRun(font, count);
 
-                    var glyphs = buffer.GetGlyphSpan();
+                var glyphSpan = runBuffer.GetGlyphSpan();
+                var positionSpan = runBuffer.GetPositionSpan();
 
-                    for (int i = 0; i < glyphs.Length; i++)
-                    {
-                        glyphs[i] = glyphRun.GlyphIndices[i];
-                    }
+                var currentX = 0.0;
 
-                    textBlob = textBlobBuilder.Build();
-                }
-                else
+                for (int i = 0; i < glyphOffsets.Count; i++)
                 {
-                    var buffer = textBlobBuilder.AllocateHorizontalRun(s_font, count, 0);
-
-                    var positions = buffer.GetPositionSpan();
-
-                    var width = 0d;
-
-                    for (var i = 0; i < count; i++)
-                    {
-                        positions[i] = (float)width;
-
-                        if (glyphRun.GlyphAdvances == null)
-                        {
-                            width += glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
-                        }
-                        else
-                        {
-                            width += glyphRun.GlyphAdvances[i];
-                        }
-                    }
+                    var offset = glyphOffsets[i];
 
-                    var glyphs = buffer.GetGlyphSpan();
+                    glyphSpan[i] = glyphIndices[i];
 
-                    for (int i = 0; i < glyphs.Length; i++)
-                    {
-                        glyphs[i] = glyphRun.GlyphIndices[i];
-                    }
+                    positionSpan[i] = new SKPoint((float)(currentX + offset.X), (float)offset.Y);
 
-                    textBlob = textBlobBuilder.Build();
+                    currentX += glyphAdvances[i];
                 }
             }
             else
             {
-                var buffer = textBlobBuilder.AllocatePositionedRun(s_font, count);
+                if (glyphAdvances != null)
+                {
+                    var runBuffer = builder.AllocateHorizontalRun(font, count, 0);
 
-                var glyphPositions = buffer.GetPositionSpan();
+                    var glyphSpan = runBuffer.GetGlyphSpan();
+                    var positionSpan = runBuffer.GetPositionSpan();
 
-                var currentX = 0.0;
+                    var currentX = 0.0;
 
-                for (var i = 0; i < count; i++)
-                {
-                    var glyphOffset = glyphRun.GlyphOffsets[i];
+                    for (int i = 0; i < glyphAdvances.Count; i++)
+                    {
+                        glyphSpan[i] = glyphIndices[i];
 
-                    glyphPositions[i] = new SKPoint((float)(currentX + glyphOffset.X), (float)glyphOffset.Y);
+                        positionSpan[i] = (float)currentX;
 
-                    if (glyphRun.GlyphAdvances == null)
-                    {
-                        currentX += glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
-                    }
-                    else
-                    {
-                        currentX += glyphRun.GlyphAdvances[i];
+                        currentX += glyphAdvances[i];
                     }
                 }
+                else
+                {
+                    var runBuffer = builder.AllocateRun(font, count, 0, 0);
 
-                var glyphs = buffer.GetGlyphSpan();
+                    var glyphSpan = runBuffer.GetGlyphSpan();
 
-                for (int i = 0; i < glyphs.Length; i++)
-                {
-                    glyphs[i] = glyphRun.GlyphIndices[i];
+                    for (int i = 0; i < glyphIndices.Count; i++)
+                    {
+                        glyphSpan[i] = glyphIndices[i];
+                    }
                 }
-
-                textBlob = textBlobBuilder.Build();
             }
 
-            return new GlyphRunImpl(textBlob);
-        }
-
-        public IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi)
-        {
-            if (_skiaGpu is IOpenGlAwareSkiaGpu glAware)
-                return glAware.CreateOpenGlBitmap(size, dpi);
-            if (_skiaGpu == null)
-                throw new PlatformNotSupportedException("GPU acceleration is not available");
-            throw new PlatformNotSupportedException(
-                "Current GPU acceleration backend does not support OpenGL integration");
+            return new GlyphRunImpl(builder.Build());
         }
-
-        public bool SupportsIndividualRoundRects => true;
-
-        public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
-
-        public PixelFormat DefaultPixelFormat { get; }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs b/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs
deleted file mode 100644
index a7e556ee84..0000000000
--- a/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
index 2b9d0b103e..1f3f20730f 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
@@ -1,6 +1,4 @@
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using Avalonia.Media;
 using SkiaSharp;
 
@@ -18,48 +16,183 @@ namespace Avalonia.Skia
 
         public SKTypeface Get(Typeface typeface)
         {
-            return GetNearestMatch(_typefaces, typeface);
+            return GetNearestMatch(typeface);
         }
 
-        private static SKTypeface GetNearestMatch(IDictionary<Typeface, SKTypeface> typefaces, Typeface key)
+        private SKTypeface GetNearestMatch(Typeface key)
         {
-            if (typefaces.TryGetValue(key, out var typeface))
+            if (_typefaces.Count == 0)
             {
-                return typeface;
+                return null;
             }
             
-            var initialWeight = (int)key.Weight;
+            if (_typefaces.TryGetValue(key, out var typeface))
+            {
+                return typeface;
+            }
+
+            if(key.Style != FontStyle.Normal)
+            {
+                key = new Typeface(key.FontFamily, FontStyle.Normal, key.Weight, key.Stretch);
+            }
+
+            if(key.Stretch != FontStretch.Normal)
+            {
+                if(TryFindStretchFallback(key, out typeface))
+                {
+                    return typeface;
+                }
+                
+                if(key.Weight != FontWeight.Normal)
+                {
+                    if (TryFindStretchFallback(new Typeface(key.FontFamily, key.Style, FontWeight.Normal, key.Stretch), out typeface))
+                    {
+                        return typeface;
+                    }
+                }
+
+                key = new Typeface(key.FontFamily, key.Style, key.Weight, FontStretch.Normal);
+            }
+
+            if(TryFindWeightFallback(key, out typeface))
+            {
+                return typeface;
+            }
 
+            if (TryFindStretchFallback(key, out typeface))
+            {
+                return typeface;
+            }
+
+            //Nothing was found so we try some regular typeface.
+            if (_typefaces.TryGetValue(new Typeface(key.FontFamily), out typeface))
+            {
+                return typeface;
+            }
+
+            SKTypeface skTypeface = null;
+
+            foreach(var pair in _typefaces)
+            {
+                skTypeface = pair.Value;
+
+                if (skTypeface.FamilyName.Contains(key.FontFamily.Name))
+                {
+                    return skTypeface;
+                }
+            }
+
+            return skTypeface;
+        }
+
+        private bool TryFindStretchFallback(Typeface key, out SKTypeface typeface)
+        {
+            typeface = null;
+            var stretch = (int)key.Stretch;
+
+            if (stretch < 5)
+            {
+                for (var i = 0; stretch + i < 9; i++)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, key.Weight, (FontStretch)(stretch + i)), out typeface))
+                    {
+                        return true;
+                    }
+                }
+            }
+            else
+            {
+                for (var i = 0; stretch - i > 1; i++)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, key.Weight, (FontStretch)(stretch - i)), out typeface))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private bool TryFindWeightFallback(Typeface key, out SKTypeface typeface)
+        {
+            typeface = null;
             var weight = (int)key.Weight;
 
-            weight -= weight % 50; // make sure we start at a full weight
+            //If the target weight given is between 400 and 500 inclusive          
+            if (weight >= 400 && weight <= 500)
+            {
+                //Look for available weights between the target and 500, in ascending order.
+                for (var i = 0; weight + i <= 500; i += 50)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight + i), key.Stretch), out typeface))
+                    {
+                        return true;
+                    }
+                }
+
+                //If no match is found, look for available weights less than the target, in descending order.
+                for (var i = 0; weight - i >= 100; i += 50)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight - i), key.Stretch), out typeface))
+                    {
+                        return true;
+                    }
+                }
+
+                //If no match is found, look for available weights greater than 500, in ascending order.
+                for (var i = 0; weight + i <= 900; i += 50)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight + i), key.Stretch), out typeface))
+                    {
+                        return true;
+                    }
+                }
+            }
 
-            for (var i = 0; i < 2; i++)
+            //If a weight less than 400 is given, look for available weights less than the target, in descending order.           
+            if (weight < 400)
             {
-                for (var j = 0; j < initialWeight; j += 50)
+                for (var i = 0; weight - i >= 100; i += 50)
                 {
-                    if (weight - j >= 100)
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight - i), key.Stretch), out typeface))
                     {
-                        if (typefaces.TryGetValue(new Typeface(key.FontFamily, (FontStyle)i, (FontWeight)(weight - j)), out typeface))
-                        {
-                            return typeface;
-                        }
+                        return true;
                     }
+                }
 
-                    if (weight + j > 900)
+                //If no match is found, look for available weights less than the target, in descending order.
+                for (var i = 0; weight + i <= 900; i += 50)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight + i), key.Stretch), out typeface))
                     {
-                        continue;
+                        return true;
                     }
+                }
+            }
 
-                    if (typefaces.TryGetValue(new Typeface(key.FontFamily, (FontStyle)i, (FontWeight)(weight + j)), out typeface))
+            //If a weight greater than 500 is given, look for available weights greater than the target, in ascending order.
+            if (weight > 500)
+            {
+                for (var i = 0; weight + i <= 900; i += 50)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight + i), key.Stretch), out typeface))
                     {
-                        return typeface;
+                        return true;
+                    }
+                }
+
+                //If no match is found, look for available weights less than the target, in descending order.
+                for (var i = 0; weight - i >= 100; i += 50)
+                {
+                    if (_typefaces.TryGetValue(new Typeface(key.FontFamily, key.Style, (FontWeight)(weight - i), key.Stretch), out typeface))
+                    {
+                        return true;
                     }
                 }
             }
 
-            //Nothing was found so we try to get a regular typeface.
-            return typefaces.TryGetValue(new Typeface(key.FontFamily), out typeface) ? typeface : null;
+            return false;
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
index 2816146806..5ca7f40d17 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
@@ -51,13 +51,13 @@ namespace Avalonia.Skia
                 if (typeface == null)
                     throw new InvalidOperationException("Typeface could not be loaded.");
 
-                if (typeface.FamilyName != fontFamily.Name)
+                if (!typeface.FamilyName.Contains(fontFamily.Name))
                 {
                     continue;
                 }
 
                 var key = new Typeface(fontFamily, typeface.FontSlant.ToAvalonia(),
-                    (FontWeight)typeface.FontWeight);
+                    (FontWeight)typeface.FontWeight, (FontStretch)typeface.FontWidth);
 
                 typeFaceCollection.AddTypeface(key, typeface);
             }
diff --git a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
index 75b4231640..d584216f17 100644
--- a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -103,9 +103,9 @@ namespace Avalonia.Skia
                 SkewY = (float)m.M12,
                 ScaleY = (float)m.M22,
                 TransY = (float)m.M32,
-                Persp0 = 0,
-                Persp1 = 0,
-                Persp2 = 1
+                Persp0 = (float)m.M13,
+                Persp1 = (float)m.M23,
+                Persp2 = (float)m.M33
             };
 
             return sm;
diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
index 01b7449b64..d3231c92a5 100644
--- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
@@ -116,20 +116,20 @@ namespace Avalonia.Skia
         public int Version { get; private set; } = 1;
 
         /// <inheritdoc />
-        public void Save(string fileName)
+        public void Save(string fileName, int? quality = null)
         {
             using (var image = SnapshotImage())
             {
-                ImageSavingHelper.SaveImage(image, fileName);
+                ImageSavingHelper.SaveImage(image, fileName, quality);
             }
         }
 
         /// <inheritdoc />
-        public void Save(Stream stream)
+        public void Save(Stream stream, int? quality = null)
         {
             using (var image = SnapshotImage())
             {
-                ImageSavingHelper.SaveImage(image, stream);
+                ImageSavingHelper.SaveImage(image, stream, quality);
             }
         }
 
diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index c4d11f4613..eaf588c27d 100644
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
@@ -13,12 +12,16 @@ namespace Avalonia.Skia
 {
     internal class TextShaperImpl : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+            var culture = options.Culture;
+
             using (var buffer = new Buffer())
             {
-                buffer.AddUtf16(text.Buffer.Span, text.Start, text.Length);
+                buffer.AddUtf16(text.Buffer.Span, text.BufferOffset, text.Length);
 
                 MergeBreakPair(buffer);
                 
@@ -28,11 +31,11 @@ namespace Avalonia.Skia
 
                 buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);              
 
-                var font = ((GlyphTypefaceImpl)typeface.PlatformImpl).Font;
+                var font = ((GlyphTypefaceImpl)typeface).Font;
 
                 font.Shape(buffer);
 
-                if (buffer.Direction == Direction.RightToLeft)
+                if(buffer.Direction == Direction.RightToLeft)
                 {
                     buffer.Reverse();
                 }
@@ -55,12 +58,21 @@ namespace Avalonia.Skia
 
                     var glyphIndex = (ushort)sourceInfo.Codepoint;
 
-                    var glyphCluster = (int)sourceInfo.Cluster;
+                    var glyphCluster = (int)(sourceInfo.Cluster);
 
-                    var glyphAdvance = GetGlyphAdvance(glyphPositions, i, textScale);
+                    var glyphAdvance = GetGlyphAdvance(glyphPositions, i, textScale) + options.LetterSpacing;
 
                     var glyphOffset = GetGlyphOffset(glyphPositions, i, textScale);
 
+                    if(text.Buffer.Span[glyphCluster] == '\t')
+                    {
+                        glyphIndex = typeface.GetGlyph(' ');
+
+                        glyphAdvance = options.IncrementalTabWidth > 0 ? 
+                            options.IncrementalTabWidth : 
+                            4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
+                    }
+
                     var targetInfo = new Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
 
                     shapedBuffer[i] = targetInfo;
@@ -78,7 +90,7 @@ namespace Avalonia.Skia
             
             var second = glyphInfos[length - 1];
 
-            if (!new Codepoint((int)second.Codepoint).IsBreakChar)
+            if (!new Codepoint(second.Codepoint).IsBreakChar)
             {
                 return;
             }
diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
index 63a1e8f869..d437f514bb 100644
--- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Skia.Helpers;
-using Avalonia.Visuals.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -25,8 +24,9 @@ namespace Avalonia.Skia
         public WriteableBitmapImpl(Stream stream)
         {
             using (var skiaStream = new SKManagedStream(stream))
+            using (var skData = SKData.Create(skiaStream))
             {
-                _bitmap = SKBitmap.Decode(skiaStream);
+                _bitmap = SKBitmap.Decode(skData);
 
                 if (_bitmap == null)
                 {
@@ -41,7 +41,8 @@ namespace Avalonia.Skia
         public WriteableBitmapImpl(Stream stream, int decodeSize, bool horizontal, BitmapInterpolationMode interpolationMode)
         {
             using (var skStream = new SKManagedStream(stream))
-            using (var codec = SKCodec.Create(skStream))
+            using (var skData = SKData.Create(skStream))
+            using (var codec = SKCodec.Create(skData))
             {
                 var info = codec.Info;
 
@@ -136,20 +137,20 @@ namespace Avalonia.Skia
         }
 
         /// <inheritdoc />
-        public void Save(Stream stream)
+        public void Save(Stream stream, int? quality = null)
         {
             using (var image = GetSnapshot())
             {
-                ImageSavingHelper.SaveImage(image, stream);
+                ImageSavingHelper.SaveImage(image, stream, quality);
             }
         }
 
         /// <inheritdoc />
-        public void Save(string fileName)
+        public void Save(string fileName, int? quality = null)
         {
             using (var image = GetSnapshot())
             {
-                ImageSavingHelper.SaveImage(image, fileName);
+                ImageSavingHelper.SaveImage(image, fileName, quality);
             }
         }
 
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props
deleted file mode 100644
index eb5e5dd733..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <EmccTotalMemory>16777216</EmccTotalMemory>
-    <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
-    <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
-  </PropertyGroup>
-</Project>
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
index 98fdccfe83..1c31e0eb5d 100644
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
+++ b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
@@ -1,57 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFramework>net7.0</TargetFramework>
     <PackageId>Avalonia.Web.Blazor</PackageId>
-    <LangVersion>preview</LangVersion>
-    <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
-    <StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>
+    <ResolveStaticWebAssetsInputsDependsOn>_IncludeGeneratedAvaloniaStaticFiles;$(ResolveStaticWebAssetsInputsDependsOn)</ResolveStaticWebAssetsInputsDependsOn>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TypescriptOutDir>wwwroot</TypescriptOutDir>
-    <TypeScriptNoEmitOnError>true</TypeScriptNoEmitOnError>
-    <TypeScriptNoImplicitReturns>true</TypeScriptNoImplicitReturns>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <TypeScriptRemoveComments>false</TypeScriptRemoveComments>
-    <TypeScriptSourceMap>true</TypeScriptSourceMap>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <TypeScriptRemoveComments>true</TypeScriptRemoveComments>
-    <TypeScriptSourceMap>false</TypeScriptSourceMap>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\..\build\SkiaSharp.props" />
-  <Import Project="..\..\..\build\HarfBuzzSharp.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
-  
-  <ItemGroup>
-    <Content Include="*.props">
-      <Pack>true</Pack>
-      <PackagePath>build\</PackagePath>
-    </Content>
-    <Content Include="*.targets">
-      <Pack>true</Pack>
-      <PackagePath>build\;buildTransitive\</PackagePath>
-    </Content>
-  </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0-*" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj" />
-    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\Avalonia.Web\Avalonia.Web.csproj" />
   </ItemGroup>
+
+  <Target Name="_IncludeGeneratedAvaloniaStaticFiles">
+    <ItemGroup>
+      <_AvaloniaWebAssets Include="$(MSBuildThisFileDirectory)../Avalonia.Web/wwwroot/**/*.*" />
+    </ItemGroup>
+    <DefineStaticWebAssets SourceId="$(PackageId)"
+                           SourceType="Computed"
+                           AssetKind="All"
+                           AssetRole="Primary"
+                           CopyToOutputDirectory="PreserveNewest"
+                           CopyToPublishDirectory="PreserveNewest"
+                           ContentRoot="$(MSBuildThisFileDirectory)../Avalonia.Web/wwwroot/"
+                           BasePath="_content\$(PackageId)"
+                           CandidateAssets="@(_AvaloniaWebAssets)"
+                           RelativePathFilter="**.js">
+      <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
+    </DefineStaticWebAssets>
+  </Target>
 </Project>
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props
deleted file mode 100644
index dd96a60c6a..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-  <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
-  <Import Project="Avalonia.Web.Blazor.CompilationTuning.props" />
-</Project>
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.targets b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.targets
deleted file mode 100644
index e9052fda88..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-  <ItemGroup>
-    <NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\2.0.23\libHarfBuzzSharp.a" />
-    <NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\2.0.23\libSkiaSharp.a" />
-  </ItemGroup>
-</Project>
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
deleted file mode 100644
index 2eb340406b..0000000000
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Platform;
-using Avalonia.PlatformSupport;
-
-namespace Avalonia.Web.Blazor
-{
-    public class AvaloniaBlazorAppBuilder : AppBuilderBase<AvaloniaBlazorAppBuilder>
-    {
-        public AvaloniaBlazorAppBuilder(IRuntimePlatform platform, Action<AvaloniaBlazorAppBuilder> platformServices)
-            : base(platform, platformServices)
-        {
-        }
-
-        public AvaloniaBlazorAppBuilder()
-            : base(new StandardRuntimePlatform(),
-                builder => StandardRuntimePlatformServices.Register(builder.ApplicationType!.Assembly))
-        {
-            UseWindowingSubsystem(BlazorWindowingPlatform.Register);
-        }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.cs
new file mode 100644
index 0000000000..909e2dd441
--- /dev/null
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.cs
@@ -0,0 +1,44 @@
+using System.Runtime.InteropServices.JavaScript;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+using System;
+using Avalonia.Controls.ApplicationLifetimes;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Rendering;
+using BrowserView = Avalonia.Web.AvaloniaView;
+
+namespace Avalonia.Web.Blazor;
+
+[SupportedOSPlatform("browser")]
+public class AvaloniaView : ComponentBase
+{
+    private BrowserView? _browserView;
+    private readonly string _containerId;
+
+    public AvaloniaView()
+    {
+        _containerId = "av_container_" + Guid.NewGuid();
+    }
+
+    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        builder.OpenElement(0, "div");
+        builder.AddAttribute(1, "id", _containerId);
+        builder.AddAttribute(2, "style", "width:100vw;height:100vh");
+        builder.CloseElement();
+    }
+
+    protected override async Task OnInitializedAsync()
+    {
+        if (OperatingSystem.IsBrowser())
+        {
+            await Avalonia.Web.Interop.AvaloniaModule.ImportMain();
+
+            _browserView = new BrowserView(_containerId);
+            if (Application.Current?.ApplicationLifetime is ISingleViewApplicationLifetime lifetime)
+            {
+                _browserView.Content = lifetime.MainView;
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor
deleted file mode 100644
index 584c77a62c..0000000000
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="container" class="avalonia-container" tabindex="0" oncontextmenu="return false;"
-     ontouchstart="@OnTouchStart"
-     ontouchend="@OnTouchEnd"
-     ontouchcancel="@OnTouchCancel"
-     ontouchmove="@OnTouchMove"
-     onmousemove="@OnMouseMove"
-     onmousedown="@OnMouseDown"
-     onmouseup="@OnMouseUp"
-     onwheel="@OnWheel"
-     onkeydown="@OnKeyDown"
-     onkeyup="@OnKeyUp">
-    
-    <canvas @ref="_htmlCanvas" @attributes="AdditionalAttributes"/>
-    
-    <input @ref="_inputElement"
-           class="overlay"
-           type="text"
-           oninput="@OnInput"/>
-</div>
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
deleted file mode 100644
index 07c776efb4..0000000000
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
+++ /dev/null
@@ -1,398 +0,0 @@
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Controls.Embedding;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
-using Avalonia.Rendering;
-using Avalonia.Web.Blazor.Interop;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor
-{
-    public partial class AvaloniaView : ITextInputMethodImpl
-    {
-        private readonly RazorViewTopLevelImpl _topLevelImpl;
-        private EmbeddableControlRoot _topLevel;
-
-        // Interop
-        private SKHtmlCanvasInterop _interop = null!;
-        private SizeWatcherInterop _sizeWatcher = null!;
-        private DpiWatcherInterop _dpiWatcher = null!;
-        private SKHtmlCanvasInterop.GLInfo? _jsGlInfo = null!;
-        private InputHelperInterop _inputHelper = null!;
-        private InputHelperInterop _canvasHelper = null!;
-        private ElementReference _htmlCanvas;
-        private ElementReference _inputElement;
-        private double _dpi = 1;
-        private SKSize _canvasSize = new (100, 100);
-
-        private GRContext? _context;
-        private GRGlInterface? _glInterface;
-        private const SKColorType ColorType = SKColorType.Rgba8888;
-
-        private bool _initialised;
-
-        [Inject] private IJSRuntime Js { get; set; } = null!;
-
-        public AvaloniaView()
-        {
-            _topLevelImpl = new RazorViewTopLevelImpl(this);
-
-            _topLevel = new EmbeddableControlRoot(_topLevelImpl);
-
-            if (Application.Current?.ApplicationLifetime is ISingleViewApplicationLifetime lifetime)
-            {
-                _topLevel.Content = lifetime.MainView;
-            }
-        }
-
-        private void OnTouchStart(TouchEventArgs e)
-        {
-            foreach (var touch in e.ChangedTouches)
-            {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchBegin, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
-            }
-        }
-
-        private void OnTouchEnd(TouchEventArgs e)
-        {
-            foreach (var touch in e.ChangedTouches)
-            {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchEnd, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
-            }
-        }
-
-        private void OnTouchCancel(TouchEventArgs e)
-        {
-            foreach (var touch in e.ChangedTouches)
-            {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchCancel, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
-            }
-        }
-
-        private void OnTouchMove(TouchEventArgs e)
-        {
-            foreach (var touch in e.ChangedTouches)
-            {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchUpdate, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
-            }
-        }
-
-        private void OnMouseMove(MouseEventArgs e)
-        {
-            _topLevelImpl.RawMouseEvent(RawPointerEventType.Move, new Point(e.ClientX, e.ClientY), GetModifiers(e));
-        }
-
-        private void OnMouseUp(MouseEventArgs e)
-        {
-            RawPointerEventType type = default;
-
-            switch (e.Button)
-            {
-                case 0:
-                    type = RawPointerEventType.LeftButtonUp;
-                    break;
-
-                case 1:
-                    type = RawPointerEventType.MiddleButtonUp;
-                    break;
-
-                case 2:
-                    type = RawPointerEventType.RightButtonUp;
-                    break;
-            }
-
-            _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
-        }
-
-        private void OnMouseDown(MouseEventArgs e)
-        {
-            RawPointerEventType type = default;
-
-            switch (e.Button)
-            {
-                case 0:
-                    type = RawPointerEventType.LeftButtonDown;
-                    break;
-
-                case 1:
-                    type = RawPointerEventType.MiddleButtonDown;
-                    break;
-
-                case 2:
-                    type = RawPointerEventType.RightButtonDown;
-                    break;
-            }
-
-            _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
-        }
-
-        private void OnWheel(WheelEventArgs e)
-        {
-            _topLevelImpl.RawMouseWheelEvent(new Point(e.ClientX, e.ClientY),
-                new Vector(-(e.DeltaX / 50), -(e.DeltaY / 50)), GetModifiers(e));
-        }
-
-        private static RawInputModifiers GetModifiers(WheelEventArgs e)
-        {
-            var modifiers = RawInputModifiers.None;
-
-            if (e.CtrlKey)
-                modifiers |= RawInputModifiers.Control;
-            if (e.AltKey)
-                modifiers |= RawInputModifiers.Alt;
-            if (e.ShiftKey)
-                modifiers |= RawInputModifiers.Shift;
-            if (e.MetaKey)
-                modifiers |= RawInputModifiers.Meta;
-
-            if ((e.Buttons & 1L) == 1)
-                modifiers |= RawInputModifiers.LeftMouseButton;
-
-            if ((e.Buttons & 2L) == 2)
-                modifiers |= RawInputModifiers.RightMouseButton;
-
-            if ((e.Buttons & 4L) == 4)
-                modifiers |= RawInputModifiers.MiddleMouseButton;
-
-            return modifiers;
-        }
-
-        private static RawInputModifiers GetModifiers(TouchEventArgs e)
-        {
-            var modifiers = RawInputModifiers.None;
-
-            if (e.CtrlKey)
-                modifiers |= RawInputModifiers.Control;
-            if (e.AltKey)
-                modifiers |= RawInputModifiers.Alt;
-            if (e.ShiftKey)
-                modifiers |= RawInputModifiers.Shift;
-            if (e.MetaKey)
-                modifiers |= RawInputModifiers.Meta;
-
-            return modifiers;
-        }
-
-        private static RawInputModifiers GetModifiers(MouseEventArgs e)
-        {
-            var modifiers = RawInputModifiers.None;
-
-            if (e.CtrlKey)
-                modifiers |= RawInputModifiers.Control;
-            if (e.AltKey)
-                modifiers |= RawInputModifiers.Alt;
-            if (e.ShiftKey)
-                modifiers |= RawInputModifiers.Shift;
-            if (e.MetaKey)
-                modifiers |= RawInputModifiers.Meta;
-
-            if ((e.Buttons & 1L) == 1)
-                modifiers |= RawInputModifiers.LeftMouseButton;
-
-            if ((e.Buttons & 2L) == 2)
-                modifiers |= RawInputModifiers.RightMouseButton;
-
-            if ((e.Buttons & 4L) == 4)
-                modifiers |= RawInputModifiers.MiddleMouseButton;
-
-            return modifiers;
-        }
-
-        private static RawInputModifiers GetModifiers(KeyboardEventArgs e)
-        {
-            var modifiers = RawInputModifiers.None;
-
-            if (e.CtrlKey)
-                modifiers |= RawInputModifiers.Control;
-            if (e.AltKey)
-                modifiers |= RawInputModifiers.Alt;
-            if (e.ShiftKey)
-                modifiers |= RawInputModifiers.Shift;
-            if (e.MetaKey)
-                modifiers |= RawInputModifiers.Meta;
-
-            return modifiers;
-        }
-
-        private void OnKeyDown(KeyboardEventArgs e)
-        {
-            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Key, GetModifiers(e));
-        }
-
-        private void OnKeyUp(KeyboardEventArgs e)
-        {
-            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, GetModifiers(e));
-        }
-
-        private void OnInput(ChangeEventArgs e)
-        {
-            if (e.Value != null)
-            {
-                var inputData = e.Value.ToString();
-                if (inputData != null)
-                {
-                    _topLevelImpl.RawTextEvent(inputData);
-                }
-            }
-
-            _inputHelper.Clear();
-        }
-
-        [Parameter(CaptureUnmatchedValues = true)]
-        public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
-
-        protected override async Task OnAfterRenderAsync(bool firstRender)
-        {
-            if (firstRender)
-            {
-                _inputHelper = await InputHelperInterop.ImportAsync(Js, _inputElement);
-                _canvasHelper = await InputHelperInterop.ImportAsync(Js, _htmlCanvas);
-
-                _inputHelper.Hide();
-                _canvasHelper.SetCursor("default");
-                _topLevelImpl.SetCssCursor = x =>
-                {
-                    _inputHelper.SetCursor(x); //macOS
-                    _canvasHelper.SetCursor(x); //windows
-                };
-
-                Console.WriteLine("starting html canvas setup");
-                _interop = await SKHtmlCanvasInterop.ImportAsync(Js, _htmlCanvas, OnRenderFrame);
-
-                Console.WriteLine("Interop created");
-                _jsGlInfo = _interop.InitGL();
-
-                Console.WriteLine("jsglinfo created - init gl");
-
-                // create the SkiaSharp context
-                if (_context == null)
-                {
-                    Console.WriteLine("create glcontext");
-                    _glInterface = GRGlInterface.Create();
-                    _context = GRContext.CreateGl(_glInterface);
-
-                    var options = AvaloniaLocator.Current.GetService<SkiaOptions>();
-                    // bump the default resource cache limit
-                    _context.SetResourceCacheLimit(options?.MaxGpuResourceSizeBytes ?? 32 * 1024 * 1024);
-                    Console.WriteLine("glcontext created and resource limit set");
-                }
-
-                _topLevelImpl.SetSurface(_context, _jsGlInfo, ColorType,
-                    new PixelSize((int)_canvasSize.Width, (int)_canvasSize.Height), _dpi);
-                
-                _interop.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
-
-                _initialised = true;
-
-                Threading.Dispatcher.UIThread.Post(async () =>
-                {
-                    _interop.RequestAnimationFrame(true);
-                    
-                    _sizeWatcher = await SizeWatcherInterop.ImportAsync(Js, _htmlCanvas, OnSizeChanged);
-                    _dpiWatcher = await DpiWatcherInterop.ImportAsync(Js, OnDpiChanged);
-                    
-                    _topLevel.Prepare();
-
-                    _topLevel.Renderer.Start();
-                });
-            }
-        }
-
-        private void OnRenderFrame()
-        {
-            if (_canvasSize.Width <= 0 || _canvasSize.Height <= 0 || _dpi <= 0 || _jsGlInfo == null)
-            {
-                Console.WriteLine("nothing to render");
-                return;
-            }
-
-            ManualTriggerRenderTimer.Instance.RaiseTick();
-        }
-
-        public void Dispose()
-        {
-            _dpiWatcher.Unsubscribe(OnDpiChanged);
-            _sizeWatcher.Dispose();
-            _interop.Dispose();
-        }
-
-        private void ForceBlit()
-        {
-            // Note: this is technically a hack, but it's a kinda unique use case when
-            // we want to blit the previous frame
-            // renderer doesn't have much control over the render target
-            // we render on the UI thread
-            // We also don't want to have it as a meaningful public API.
-            // Therefore we have InternalsVisibleTo hack here.
-
-            if (_topLevel.Renderer is DeferredRenderer dr)
-            {
-                dr.Render(true);
-            }
-        }
-
-        private void OnDpiChanged(double newDpi)
-        {
-            if (Math.Abs(_dpi - newDpi) > 0.0001)
-            {
-                _dpi = newDpi;
-
-                _interop.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
-
-                _topLevelImpl.SetClientSize(_canvasSize, _dpi);
-
-                ForceBlit();
-            }
-        }
-
-        private void OnSizeChanged(SKSize newSize)
-        {
-            if (_canvasSize != newSize)
-            {
-                _canvasSize = newSize;
-
-                _interop.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
-
-                _topLevelImpl.SetClientSize(_canvasSize, _dpi);
-
-                ForceBlit();
-            }
-        }
-
-        public void SetActive(bool active)
-        {
-            _inputHelper.Clear();
-
-            if (active)
-            {
-                _inputHelper.Show();
-                _inputHelper.Focus();
-            }
-            else
-            {
-                _inputHelper.Hide();
-            }
-        }
-
-        public void SetCursorRect(Rect rect)
-        {
-        }
-
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
-        {
-        }
-
-        public void Reset()
-        {
-            _inputHelper.Clear();
-        }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/BlazorSingleViewLifetime.cs b/src/Web/Avalonia.Web.Blazor/BlazorSingleViewLifetime.cs
index 7970f09a58..f38779f834 100644
--- a/src/Web/Avalonia.Web.Blazor/BlazorSingleViewLifetime.cs
+++ b/src/Web/Avalonia.Web.Blazor/BlazorSingleViewLifetime.cs
@@ -1,31 +1,39 @@
-using Avalonia.Controls;
+using System.Runtime.Versioning;
+
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Media;
 
-namespace Avalonia.Web.Blazor
+namespace Avalonia.Web.Blazor;
+
+[SupportedOSPlatform("browser")]
+public static class WebAppBuilder
 {
-    public class BlazorSingleViewLifetime : ISingleViewApplicationLifetime
+    public static T SetupWithSingleViewLifetime<T>(
+        this T builder)
+        where T : AppBuilderBase<T>, new()
     {
-        public Control? MainView { get; set; }
+        return builder.SetupWithLifetime(new BlazorSingleViewLifetime());
     }
 
-    public static class WebAppBuilder
+    public static T UseBlazor<T>(this T builder) where T : AppBuilderBase<T>, new()
     {
-        public static T SetupWithSingleViewLifetime<T>(
-            this T builder)
-            where T : AppBuilderBase<T>, new()
-        {
-            return builder.SetupWithLifetime(new BlazorSingleViewLifetime());
-        }
+        return builder
+            .UseBrowser()
+            .With(new BrowserPlatformOptions
+            {
+                FrameworkAssetPathResolver = new(filePath => $"/_content/Avalonia.Web.Blazor/{filePath}")
+            });
+    }
 
-        public static AvaloniaBlazorAppBuilder Configure<TApp>()
-            where TApp : Application, new()
-        {
-            var builder = AvaloniaBlazorAppBuilder.Configure<TApp>()
-                .UseSkia()
-                .With(new SkiaOptions { CustomGpuFactory = () => new BlazorSkiaGpu() });
+    public static AppBuilder Configure<TApp>()
+        where TApp : Application, new()
+    {
+        return AppBuilder.Configure<TApp>()
+            .UseBlazor();
+    }
 
-            return builder;
-        }
+    internal class BlazorSingleViewLifetime : ISingleViewApplicationLifetime
+    {
+        public Control? MainView { get; set; }
     }
 }
diff --git a/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpu.cs b/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpu.cs
deleted file mode 100644
index 6fa7bf0bde..0000000000
--- a/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpu.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Avalonia.Skia;
-
-namespace Avalonia.Web.Blazor
-{
-    public class BlazorSkiaGpu : ISkiaGpu
-    {
-        public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces)
-        {
-            foreach (var surface in surfaces)
-            {
-                if (surface is BlazorSkiaSurface blazorSkiaSurface)
-                {
-                    return new BlazorSkiaGpuRenderTarget(blazorSkiaSurface);
-                }
-            }
-
-            return null;
-        }
-
-        public ISkiaSurface? TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session)
-        {
-            return null;
-        }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpuRenderSession.cs b/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpuRenderSession.cs
deleted file mode 100644
index 0c53825131..0000000000
--- a/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpuRenderSession.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Avalonia.Skia;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor
-{
-    internal class BlazorSkiaGpuRenderSession : ISkiaGpuRenderSession
-    {
-        private readonly SKSurface _surface;
-
-
-        public BlazorSkiaGpuRenderSession(BlazorSkiaSurface blazorSkiaSurface, GRBackendRenderTarget renderTarget)
-        {
-            _surface = SKSurface.Create(blazorSkiaSurface.Context, renderTarget, blazorSkiaSurface.Origin, blazorSkiaSurface.ColorType);
-
-            GrContext = blazorSkiaSurface.Context;
-
-            ScaleFactor = blazorSkiaSurface.Scaling;
-
-            SurfaceOrigin = blazorSkiaSurface.Origin;
-        }
-
-        public void Dispose()
-        {
-            _surface.Flush();
-
-            _surface.Dispose();
-        }
-
-        public GRContext GrContext { get; }
-
-        public SKSurface SkSurface => _surface;
-
-        public double ScaleFactor { get; }
-
-        public GRSurfaceOrigin SurfaceOrigin { get; }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpuRenderTarget.cs b/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpuRenderTarget.cs
deleted file mode 100644
index fa6a39f210..0000000000
--- a/src/Web/Avalonia.Web.Blazor/BlazorSkiaGpuRenderTarget.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Avalonia.Skia;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor
-{
-    internal class BlazorSkiaGpuRenderTarget : ISkiaGpuRenderTarget
-    {
-        private readonly GRBackendRenderTarget _renderTarget;
-        private readonly BlazorSkiaSurface _blazorSkiaSurface;
-        private readonly PixelSize _size;
-
-        public BlazorSkiaGpuRenderTarget(BlazorSkiaSurface blazorSkiaSurface)
-        {
-            _size = blazorSkiaSurface.Size;
-
-            var glFbInfo = new GRGlFramebufferInfo(blazorSkiaSurface.GlInfo.FboId, blazorSkiaSurface.ColorType.ToGlSizedFormat());
-            {
-                _blazorSkiaSurface = blazorSkiaSurface;
-                _renderTarget = new GRBackendRenderTarget(
-                    (int)(blazorSkiaSurface.Size.Width * blazorSkiaSurface.Scaling),
-                    (int)(blazorSkiaSurface.Size.Height * blazorSkiaSurface.Scaling),
-                    blazorSkiaSurface.GlInfo.Samples,
-                    blazorSkiaSurface.GlInfo.Stencils, glFbInfo);
-            }
-        }
-
-        public void Dispose()
-        {
-            _renderTarget.Dispose();
-        }
-
-        public ISkiaGpuRenderSession BeginRenderingSession()
-        {
-            return new BlazorSkiaGpuRenderSession(_blazorSkiaSurface, _renderTarget);
-        }
-
-        public bool IsCorrupted => _blazorSkiaSurface.Size != _size;
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/BlazorSkiaSurface.cs b/src/Web/Avalonia.Web.Blazor/BlazorSkiaSurface.cs
deleted file mode 100644
index 512309cfe3..0000000000
--- a/src/Web/Avalonia.Web.Blazor/BlazorSkiaSurface.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Avalonia.Web.Blazor.Interop;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor
-{
-    internal class BlazorSkiaSurface
-    {
-        public BlazorSkiaSurface(GRContext context, SKHtmlCanvasInterop.GLInfo glInfo, SKColorType colorType, PixelSize size, double scaling, GRSurfaceOrigin origin)
-        {
-            Context = context;
-            GlInfo = glInfo;
-            ColorType = colorType;
-            Size = size;
-            Scaling = scaling;
-            Origin = origin;
-        }
-        
-        public SKColorType ColorType { get; set; }
-
-        public PixelSize Size { get; set; }
-
-        public GRContext Context { get; set; }
-
-        public GRSurfaceOrigin Origin { get; set; }
-
-        public double Scaling { get; set; }
-
-        public SKHtmlCanvasInterop.GLInfo GlInfo { get; set; }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Cursor.cs b/src/Web/Avalonia.Web.Blazor/Cursor.cs
deleted file mode 100644
index d921b2fa6c..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Cursor.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Avalonia.Input;
-using Avalonia.Platform;
-
-namespace Avalonia.Web.Blazor
-{
-    public class CssCursor : ICursorImpl
-    {
-        public const string Default = "default";
-        public string? Value { get; set; }
-        
-        public CssCursor(StandardCursorType type)
-        {
-            Value = ToKeyword(type);
-        }
-
-        /// <summary>
-        /// Create a cursor from base64 image
-        /// </summary>
-        public CssCursor(string base64, string format, PixelPoint hotspot, StandardCursorType fallback)
-        {
-            Value = $"url(\"data:image/{format};base64,{base64}\") {hotspot.X} {hotspot.Y}, {ToKeyword(fallback)}";
-        }
-        
-        /// <summary>
-        /// Create a cursor from url to *.cur file.
-        /// </summary>
-        public CssCursor(string url, StandardCursorType fallback)
-        {
-            Value = $"url('{url}'), {ToKeyword(fallback)}";
-        }
-        
-        /// <summary>
-        /// Create a cursor from png/svg and hotspot position
-        /// </summary>
-        public CssCursor(string url, PixelPoint hotSpot, StandardCursorType fallback)
-        {
-            Value = $"url('{url}') {hotSpot.X} {hotSpot.Y}, {ToKeyword(fallback)}";
-        }
-        
-        private static string ToKeyword(StandardCursorType type) => type switch
-        {
-            StandardCursorType.Hand => "pointer",
-            StandardCursorType.Cross => "crosshair",
-            StandardCursorType.Help => "help",
-            StandardCursorType.Ibeam => "text",
-            StandardCursorType.No => "not-allowed",
-            StandardCursorType.None => "none",
-            StandardCursorType.Wait => "progress",
-            StandardCursorType.AppStarting => "wait",
-            
-            StandardCursorType.DragMove => "move",
-            StandardCursorType.DragCopy => "copy",
-            StandardCursorType.DragLink => "alias",
-            
-            StandardCursorType.UpArrow => "default",/*not found matching one*/
-            StandardCursorType.SizeWestEast => "ew-resize",
-            StandardCursorType.SizeNorthSouth => "ns-resize",
-            StandardCursorType.SizeAll => "move",
-            
-            StandardCursorType.TopSide => "n-resize",
-            StandardCursorType.BottomSide => "s-resize",
-            StandardCursorType.LeftSide => "w-resize",
-            StandardCursorType.RightSide => "e-resize",
-            StandardCursorType.TopLeftCorner => "nw-resize",
-            StandardCursorType.TopRightCorner => "ne-resize",
-            StandardCursorType.BottomLeftCorner => "sw-resize",
-            StandardCursorType.BottomRightCorner => "se-resize",
-            
-            _ => Default,
-        };
-        
-        public void Dispose() {}
-    }
-
-    internal class CssCursorFactory : ICursorFactory
-    {
-        public ICursorImpl CreateCursor(IBitmapImpl cursor, PixelPoint hotSpot)
-        {
-            using var imageStream = new MemoryStream();
-            cursor.Save(imageStream);
-            
-            //not memory optimized because CryptoStream with ToBase64Transform is not supported in the browser.
-            var base64String = Convert.ToBase64String(imageStream.ToArray());
-            return new CssCursor(base64String, "png", hotSpot, StandardCursorType.Arrow);
-        }
-
-        ICursorImpl ICursorFactory.GetCursor(StandardCursorType cursorType)
-        {
-            return new CssCursor(cursorType);
-        }
-    }
-}
-
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/ActionHelper.cs b/src/Web/Avalonia.Web.Blazor/Interop/ActionHelper.cs
deleted file mode 100644
index d6d504e07e..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/ActionHelper.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel;
-using Microsoft.JSInterop;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class ActionHelper
-    {
-        private readonly Action action;
-
-        public ActionHelper(Action action)
-        {
-            this.action = action;
-        }
-
-        [JSInvokable]
-        public void Invoke() => action?.Invoke();
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/DpiWatcherInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/DpiWatcherInterop.cs
deleted file mode 100644
index 29a2686b3f..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/DpiWatcherInterop.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    internal class DpiWatcherInterop : JSModuleInterop
-    {
-        private const string JsFilename = "./_content/Avalonia.Web.Blazor/DpiWatcher.js";
-        private const string StartSymbol = "DpiWatcher.start";
-        private const string StopSymbol = "DpiWatcher.stop";
-        private const string GetDpiSymbol = "DpiWatcher.getDpi";
-
-        private static DpiWatcherInterop? instance;
-
-        private event Action<double>? callbacksEvent;
-        private readonly FloatFloatActionHelper callbackHelper;
-
-        private DotNetObjectReference<FloatFloatActionHelper>? callbackReference;
-
-        public static async Task<DpiWatcherInterop> ImportAsync(IJSRuntime js, Action<double>? callback = null)
-        {
-            var interop = Get(js);
-            await interop.ImportAsync();
-            if (callback != null)
-                interop.Subscribe(callback);
-            return interop;
-        }
-
-        public static DpiWatcherInterop Get(IJSRuntime js) =>
-            instance ??= new DpiWatcherInterop(js);
-
-        private DpiWatcherInterop(IJSRuntime js)
-            : base(js, JsFilename)
-        {
-            callbackHelper = new FloatFloatActionHelper((o, n) => callbacksEvent?.Invoke(n));
-        }
-
-        protected override void OnDisposingModule() =>
-            Stop();
-
-        public void Subscribe(Action<double> callback)
-        {
-            var shouldStart = callbacksEvent == null;
-
-            callbacksEvent += callback;
-
-            var dpi = shouldStart
-                ? Start()
-                : GetDpi();
-
-            callback(dpi);
-        }
-
-        public void Unsubscribe(Action<double> callback)
-        {
-            callbacksEvent -= callback;
-
-            if (callbacksEvent == null)
-                Stop();
-        }
-
-        private double Start()
-        {
-            if (callbackReference != null)
-                return GetDpi();
-
-            callbackReference = DotNetObjectReference.Create(callbackHelper);
-
-            return Invoke<double>(StartSymbol, callbackReference);
-        }
-
-        private void Stop()
-        {
-            if (callbackReference == null)
-                return;
-
-            Invoke(StopSymbol);
-
-            callbackReference?.Dispose();
-            callbackReference = null;
-        }
-
-        public double GetDpi() =>
-            Invoke<double>(GetDpiSymbol);
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/FloatFloatActionHelper.cs b/src/Web/Avalonia.Web.Blazor/Interop/FloatFloatActionHelper.cs
deleted file mode 100644
index 80b9e5689a..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/FloatFloatActionHelper.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel;
-using Microsoft.JSInterop;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class FloatFloatActionHelper
-    {
-        private readonly Action<float, float> action;
-
-        public FloatFloatActionHelper(Action<float, float> action)
-        {
-            this.action = action;
-        }
-
-        [JSInvokable]
-        public void Invoke(float width, float height) => action?.Invoke(width, height);
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/InputHelperInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/InputHelperInterop.cs
deleted file mode 100644
index 6d71e0c48f..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/InputHelperInterop.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    internal class InputHelperInterop : JSModuleInterop
-    {
-        private const string JsFilename = "./_content/Avalonia.Web.Blazor/InputHelper.js";
-        private const string ClearSymbol = "InputHelper.clear";
-        private const string FocusSymbol = "InputHelper.focus";
-        private const string SetCursorSymbol = "InputHelper.setCursor";
-        private const string HideSymbol = "InputHelper.hide";
-        private const string ShowSymbol = "InputHelper.show";
-
-        private readonly ElementReference inputElement;
-
-        public static async Task<InputHelperInterop> ImportAsync(IJSRuntime js, ElementReference element)
-        {
-            var interop = new InputHelperInterop(js, element);
-            await interop.ImportAsync();
-            return interop;
-        }
-
-        public InputHelperInterop(IJSRuntime js, ElementReference element)
-            : base(js, JsFilename)
-        {
-            inputElement = element;
-        }
-
-        public void Clear() => Invoke(ClearSymbol, inputElement);
-
-        public void Focus() => Invoke(FocusSymbol, inputElement);
-
-        public void SetCursor(string kind) => Invoke(SetCursorSymbol, inputElement, kind);
-
-        public void Hide() => Invoke(HideSymbol, inputElement);
-
-        public void Show() => Invoke(ShowSymbol, inputElement);
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/JSModuleInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/JSModuleInterop.cs
deleted file mode 100644
index 524326f7c0..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/JSModuleInterop.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    internal class JSModuleInterop : IDisposable
-    {
-        private readonly Task<IJSUnmarshalledObjectReference> moduleTask;
-        private IJSUnmarshalledObjectReference? module;
-
-        public JSModuleInterop(IJSRuntime js, string filename)
-        {
-            if (js is not IJSInProcessRuntime)
-                throw new NotSupportedException("SkiaSharp currently only works on Web Assembly.");
-
-            moduleTask = js.InvokeAsync<IJSUnmarshalledObjectReference>("import", filename).AsTask();
-        }
-
-        public async Task ImportAsync()
-        {
-            module = await moduleTask;
-        }
-
-        public void Dispose()
-        {
-            OnDisposingModule();
-            Module.Dispose();
-        }
-
-        protected IJSUnmarshalledObjectReference Module =>
-            module ?? throw new InvalidOperationException("Make sure to run ImportAsync() first.");
-
-        protected void Invoke(string identifier, params object?[]? args) =>
-            Module.InvokeVoid(identifier, args);
-
-        protected TValue Invoke<TValue>(string identifier, params object?[]? args) =>
-            Module.Invoke<TValue>(identifier, args);
-
-        protected virtual void OnDisposingModule() { }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/SKHtmlCanvasInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/SKHtmlCanvasInterop.cs
deleted file mode 100644
index 9cbbf24086..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/SKHtmlCanvasInterop.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    internal class SKHtmlCanvasInterop : JSModuleInterop
-    {
-        private const string JsFilename = "./_content/Avalonia.Web.Blazor/SKHtmlCanvas.js";
-        private const string InitGLSymbol = "SKHtmlCanvas.initGL";
-        private const string InitRasterSymbol = "SKHtmlCanvas.initRaster";
-        private const string DeinitSymbol = "SKHtmlCanvas.deinit";
-        private const string RequestAnimationFrameSymbol = "SKHtmlCanvas.requestAnimationFrame";
-        private const string SetCanvasSizeSymbol = "SKHtmlCanvas.setCanvasSize";
-        private const string PutImageDataSymbol = "SKHtmlCanvas.putImageData";
-
-        private readonly ElementReference htmlCanvas;
-        private readonly string htmlElementId;
-        private readonly ActionHelper callbackHelper;
-
-        private DotNetObjectReference<ActionHelper>? callbackReference;
-
-        public static async Task<SKHtmlCanvasInterop> ImportAsync(IJSRuntime js, ElementReference element, Action callback)
-        {
-            var interop = new SKHtmlCanvasInterop(js, element, callback);
-            await interop.ImportAsync();
-            return interop;
-        }
-
-        public SKHtmlCanvasInterop(IJSRuntime js, ElementReference element, Action renderFrameCallback)
-            : base(js, JsFilename)
-        {
-            htmlCanvas = element;
-            htmlElementId = element.Id;
-
-            callbackHelper = new ActionHelper(renderFrameCallback);
-        }
-
-        protected override void OnDisposingModule() =>
-            Deinit();
-
-        public GLInfo InitGL()
-        {
-            if (callbackReference != null)
-                throw new InvalidOperationException("Unable to initialize the same canvas more than once.");
-
-            callbackReference = DotNetObjectReference.Create(callbackHelper);
-
-            return Invoke<GLInfo>(InitGLSymbol, htmlCanvas, htmlElementId, callbackReference);
-        }
-
-        public bool InitRaster()
-        {
-            if (callbackReference != null)
-                throw new InvalidOperationException("Unable to initialize the same canvas more than once.");
-
-            callbackReference = DotNetObjectReference.Create(callbackHelper);
-
-            return Invoke<bool>(InitRasterSymbol, htmlCanvas, htmlElementId, callbackReference);
-        }
-
-        public void Deinit()
-        {
-            if (callbackReference == null)
-                return;
-
-            Invoke(DeinitSymbol, htmlElementId);
-
-            callbackReference?.Dispose();
-        }
-
-        public void RequestAnimationFrame(bool enableRenderLoop) =>
-            Invoke(RequestAnimationFrameSymbol, htmlCanvas, enableRenderLoop);
-
-        public void SetCanvasSize(int rawWidth, int rawHeight) =>
-            Invoke(SetCanvasSizeSymbol, htmlCanvas, rawWidth, rawHeight);
-
-        public void PutImageData(IntPtr intPtr, SKSizeI rawSize) =>
-            Invoke(PutImageDataSymbol, htmlCanvas, intPtr.ToInt64(), rawSize.Width, rawSize.Height);
-
-        public record GLInfo(int ContextId, uint FboId, int Stencils, int Samples, int Depth);
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/SizeWatcherInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/SizeWatcherInterop.cs
deleted file mode 100644
index 8904137b8b..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/SizeWatcherInterop.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using SkiaSharp;
-
-namespace Avalonia.Web.Blazor.Interop
-{
-    internal class SizeWatcherInterop : JSModuleInterop
-    {
-        private const string JsFilename = "./_content/Avalonia.Web.Blazor/SizeWatcher.js";
-        private const string ObserveSymbol = "SizeWatcher.observe";
-        private const string UnobserveSymbol = "SizeWatcher.unobserve";
-
-        private readonly ElementReference htmlElement;
-        private readonly string htmlElementId;
-        private readonly FloatFloatActionHelper callbackHelper;
-
-        private DotNetObjectReference<FloatFloatActionHelper>? callbackReference;
-
-        public static async Task<SizeWatcherInterop> ImportAsync(IJSRuntime js, ElementReference element, Action<SKSize> callback)
-        {
-            var interop = new SizeWatcherInterop(js, element, callback);
-            await interop.ImportAsync();
-            interop.Start();
-            return interop;
-        }
-
-        public SizeWatcherInterop(IJSRuntime js, ElementReference element, Action<SKSize> callback)
-            : base(js, JsFilename)
-        {
-            htmlElement = element;
-            htmlElementId = element.Id;
-            callbackHelper = new FloatFloatActionHelper((x, y) => callback(new SKSize(x, y)));
-        }
-
-        protected override void OnDisposingModule() =>
-            Stop();
-
-        public void Start()
-        {
-            if (callbackReference != null)
-                return;
-
-            callbackReference = DotNetObjectReference.Create(callbackHelper);
-
-            Invoke(ObserveSymbol, htmlElement, htmlElementId, callbackReference);
-        }
-
-        public void Stop()
-        {
-            if (callbackReference == null)
-                return;
-
-            Invoke(UnobserveSymbol, htmlElementId);
-
-            callbackReference?.Dispose();
-            callbackReference = null;
-        }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/DpiWatcher.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/DpiWatcher.ts
deleted file mode 100644
index 72baf14d8f..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/DpiWatcher.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-
-export class DpiWatcher {
-	static lastDpi: number;
-	static timerId: number;
-	static callback: DotNet.DotNetObjectReference;
-
-	public static getDpi() {
-		return window.devicePixelRatio;
-	}
-
-	public static start(callback: DotNet.DotNetObjectReference): number {
-		//console.info(`Starting DPI watcher with callback ${callback._id}...`);
-
-		DpiWatcher.lastDpi = window.devicePixelRatio;
-		DpiWatcher.timerId = window.setInterval(DpiWatcher.update, 1000);
-		DpiWatcher.callback = callback;
-
-		return DpiWatcher.lastDpi;
-	}
-
-	public static stop() {
-		//console.info(`Stopping DPI watcher with callback ${DpiWatcher.callback._id}...`);
-
-		window.clearInterval(DpiWatcher.timerId);
-
-		DpiWatcher.callback = undefined;
-	}
-
-	static update() {
-		if (!DpiWatcher.callback)
-			return;
-
-		const currentDpi = window.devicePixelRatio;
-		const lastDpi = DpiWatcher.lastDpi;
-		DpiWatcher.lastDpi = currentDpi;
-
-		if (Math.abs(lastDpi - currentDpi) > 0.001) {
-			DpiWatcher.callback.invokeMethod('Invoke', lastDpi, currentDpi);
-		}
-	}
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/InputHelper.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/InputHelper.ts
deleted file mode 100644
index a3bf9de31d..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/InputHelper.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-
-export class InputHelper {
-    public static clear (inputElement: HTMLInputElement){
-        inputElement.value = "";
-    }
-    
-    public static focus (inputElement: HTMLInputElement){
-        inputElement.focus();
-        inputElement.setSelectionRange(0, 0);
-    }
-    
-    public static setCursor (inputElement: HTMLInputElement, kind: string) {
-        inputElement.style.cursor = kind;
-    }
-
-    public static hide (inputElement: HTMLInputElement){
-        inputElement.style.display = 'none';
-    }
-
-    public static show (inputElement: HTMLInputElement){
-        inputElement.style.display = 'block';
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/SKHtmlCanvas.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/SKHtmlCanvas.ts
deleted file mode 100644
index 04d57a7756..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/SKHtmlCanvas.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-// aliases for emscripten
-declare let GL: any;
-declare let GLctx: WebGLRenderingContext;
-declare let Module: EmscriptenModule;
-
-// container for gl info
-type SKGLViewInfo = {
-	context: WebGLRenderingContext | WebGL2RenderingContext | undefined;
-	fboId: number;
-	stencil: number;
-	sample: number;
-	depth: number;
-}
-
-// alias for a potential skia html canvas
-type SKHtmlCanvasElement = {
-	SKHtmlCanvas: SKHtmlCanvas
-} & HTMLCanvasElement
-
-export class SKHtmlCanvas {
-	static elements: Map<string, HTMLCanvasElement>;
-
-	htmlCanvas: HTMLCanvasElement;
-	glInfo: SKGLViewInfo;
-	renderFrameCallback: DotNet.DotNetObjectReference;
-	renderLoopEnabled: boolean = false;
-	renderLoopRequest: number = 0;
-    newWidth: number;
-    newHeight: number;
-
-	public static initGL(element: HTMLCanvasElement, elementId: string, callback: DotNet.DotNetObjectReference): SKGLViewInfo {
-		var view = SKHtmlCanvas.init(true, element, elementId, callback);
-		if (!view || !view.glInfo)
-			return null;
-
-		return view.glInfo;
-	}
-
-	public static initRaster(element: HTMLCanvasElement, elementId: string, callback: DotNet.DotNetObjectReference): boolean {
-		var view = SKHtmlCanvas.init(false, element, elementId, callback);
-		if (!view)
-			return false;
-
-		return true;
-	}
-
-	static init(useGL: boolean, element: HTMLCanvasElement, elementId: string, callback: DotNet.DotNetObjectReference): SKHtmlCanvas {
-		var htmlCanvas = element as SKHtmlCanvasElement;
-		if (!htmlCanvas) {
-			console.error(`No canvas element was provided.`);
-			return null;
-		}
-
-		if (!SKHtmlCanvas.elements)
-			SKHtmlCanvas.elements = new Map<string, HTMLCanvasElement>();
-		SKHtmlCanvas.elements[elementId] = element;
-
-		const view = new SKHtmlCanvas(useGL, element, callback);
-
-		htmlCanvas.SKHtmlCanvas = view;
-
-		return view;
-	}
-
-	public static deinit(elementId: string) {
-		if (!elementId)
-			return;
-
-		const element = SKHtmlCanvas.elements[elementId];
-		SKHtmlCanvas.elements.delete(elementId);
-
-		const htmlCanvas = element as SKHtmlCanvasElement;
-		if (!htmlCanvas || !htmlCanvas.SKHtmlCanvas)
-			return;
-
-		htmlCanvas.SKHtmlCanvas.deinit();
-		htmlCanvas.SKHtmlCanvas = undefined;
-	}
-
-	public static requestAnimationFrame(element: HTMLCanvasElement, renderLoop?: boolean) {
-		const htmlCanvas = element as SKHtmlCanvasElement;
-		if (!htmlCanvas || !htmlCanvas.SKHtmlCanvas)
-			return;
-
-		htmlCanvas.SKHtmlCanvas.requestAnimationFrame(renderLoop);
-	}
-    
-    public static setCanvasSize(element: HTMLCanvasElement, width: number, height: number)
-    {
-        const htmlCanvas = element as SKHtmlCanvasElement;
-        if (!htmlCanvas || !htmlCanvas.SKHtmlCanvas)
-            return;
-        
-        htmlCanvas.SKHtmlCanvas.setCanvasSize(width, height);
-    }
-
-	public static setEnableRenderLoop(element: HTMLCanvasElement, enable: boolean) {
-		const htmlCanvas = element as SKHtmlCanvasElement;
-		if (!htmlCanvas || !htmlCanvas.SKHtmlCanvas)
-			return;
-
-		htmlCanvas.SKHtmlCanvas.setEnableRenderLoop(enable);
-	}
-
-	public static putImageData(element: HTMLCanvasElement, pData: number, width: number, height: number) {
-		const htmlCanvas = element as SKHtmlCanvasElement;
-		if (!htmlCanvas || !htmlCanvas.SKHtmlCanvas)
-			return;
-
-		htmlCanvas.SKHtmlCanvas.putImageData(pData, width, height);
-	}
-
-	public constructor(useGL: boolean, element: HTMLCanvasElement, callback: DotNet.DotNetObjectReference) {
-		this.htmlCanvas = element;
-		this.renderFrameCallback = callback;
-
-		if (useGL) {
-			const ctx = SKHtmlCanvas.createWebGLContext(this.htmlCanvas);
-			if (!ctx) {
-				console.error(`Failed to create WebGL context: err ${ctx}`);
-				return null;
-			}
-
-			// make current
-			GL.makeContextCurrent(ctx);
-
-			// read values
-			const fbo = GLctx.getParameter(GLctx.FRAMEBUFFER_BINDING);
-			this.glInfo = {
-				context: ctx,
-				fboId: fbo ? fbo.id : 0,
-				stencil: GLctx.getParameter(GLctx.STENCIL_BITS),
-				sample: 0, // TODO: GLctx.getParameter(GLctx.SAMPLES)
-				depth: GLctx.getParameter(GLctx.DEPTH_BITS),
-			};
-		}
-	}
-
-	public deinit() {
-		this.setEnableRenderLoop(false);
-	}
-    
-    public setCanvasSize(width: number, height: number)
-    {
-        this.newWidth = width;
-        this.newHeight = height;
-
-        if(this.htmlCanvas.width != this.newWidth)
-        {
-            this.htmlCanvas.width = this.newWidth;
-        }
-
-        if(this.htmlCanvas.height != this.newHeight)
-        {
-            this.htmlCanvas.height = this.newHeight;
-        }
-
-        if (this.glInfo) {
-            // make current
-            GL.makeContextCurrent(this.glInfo.context);
-        }
-    }
-
-	public requestAnimationFrame(renderLoop?: boolean) {
-		// optionally update the render loop
-		if (renderLoop !== undefined && this.renderLoopEnabled !== renderLoop)
-			this.setEnableRenderLoop(renderLoop);
-
-		// skip because we have a render loop
-		if (this.renderLoopRequest !== 0)
-			return;
-
-		// add the draw to the next frame
-		this.renderLoopRequest = window.requestAnimationFrame(() => {
-            if (this.glInfo) {
-                // make current
-                GL.makeContextCurrent(this.glInfo.context);
-            }
-            
-            if(this.htmlCanvas.width != this.newWidth)
-            {
-                this.htmlCanvas.width = this.newWidth;
-            }
-
-            if(this.htmlCanvas.height != this.newHeight)
-            {
-                this.htmlCanvas.height = this.newHeight;
-            }
-
-			this.renderFrameCallback.invokeMethod('Invoke');
-			this.renderLoopRequest = 0;
-
-			// we may want to draw the next frame
-			if (this.renderLoopEnabled)
-				this.requestAnimationFrame();
-		});
-	}
-
-	public setEnableRenderLoop(enable: boolean) {
-		this.renderLoopEnabled = enable;
-
-		// either start the new frame or cancel the existing one
-		if (enable) {
-			//console.info(`Enabling render loop with callback ${this.renderFrameCallback._id}...`);
-			this.requestAnimationFrame();
-		} else if (this.renderLoopRequest !== 0) {
-			window.cancelAnimationFrame(this.renderLoopRequest);
-			this.renderLoopRequest = 0;
-		}
-	}
-
-	public putImageData(pData: number, width: number, height: number): boolean {
-		if (this.glInfo || !pData || width <= 0 || width <= 0)
-			return false;
-
-		var ctx = this.htmlCanvas.getContext('2d');
-		if (!ctx) {
-			console.error(`Failed to obtain 2D canvas context.`);
-			return false;
-		}
-
-		// make sure the canvas is scaled correctly for the drawing
-		this.htmlCanvas.width = width;
-		this.htmlCanvas.height = height;
-
-		// set the canvas to be the bytes
-		var buffer = new Uint8ClampedArray(Module.HEAPU8.buffer, pData, width * height * 4);
-		var imageData = new ImageData(buffer, width, height);
-		ctx.putImageData(imageData, 0, 0);
-
-		return true;
-	}
-
-	static createWebGLContext(htmlCanvas: HTMLCanvasElement): WebGLRenderingContext | WebGL2RenderingContext {
-		const contextAttributes = {
-			alpha: 1,
-			depth: 1,
-			stencil: 8,
-			antialias: 0,
-			premultipliedAlpha: 1,
-			preserveDrawingBuffer: 0,
-			preferLowPowerToHighPerformance: 0,
-			failIfMajorPerformanceCaveat: 0,
-			majorVersion: 2,
-			minorVersion: 0,
-			enableExtensionsByDefault: 1,
-			explicitSwapControl: 0,
-			renderViaOffscreenBackBuffer: 1,
-		};
-
-		let ctx: WebGLRenderingContext = GL.createContext(htmlCanvas, contextAttributes);
-		if (!ctx && contextAttributes.majorVersion > 1) {
-			console.warn('Falling back to WebGL 1.0');
-			contextAttributes.majorVersion = 1;
-			contextAttributes.minorVersion = 0;
-			ctx = GL.createContext(htmlCanvas, contextAttributes);
-		}
-
-		return ctx;
-	}
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/SizeWatcher.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/SizeWatcher.ts
deleted file mode 100644
index 88b94f3a80..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/SizeWatcher.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-
-type SizeWatcherElement = {
-	SizeWatcher: SizeWatcherInstance;
-} & HTMLElement
-
-type SizeWatcherInstance = {
-	callback: DotNet.DotNetObjectReference;
-}
-
-export class SizeWatcher {
-	static observer: ResizeObserver;
-	static elements: Map<string, HTMLElement>;
-
-	public static observe(element: HTMLElement, elementId: string, callback: DotNet.DotNetObjectReference) {
-		if (!element || !callback)
-			return;
-
-		//console.info(`Adding size watcher observation with callback ${callback._id}...`);
-
-		SizeWatcher.init();
-
-		const watcherElement = element as SizeWatcherElement;
-		watcherElement.SizeWatcher = {
-			callback: callback
-		};
-
-		SizeWatcher.elements[elementId] = element;
-		SizeWatcher.observer.observe(element);
-
-		SizeWatcher.invoke(element);
-	}
-
-	public static unobserve(elementId: string) {
-		if (!elementId || !SizeWatcher.observer)
-			return;
-
-		//console.info('Removing size watcher observation...');
-
-		const element = SizeWatcher.elements[elementId];
-
-		SizeWatcher.elements.delete(elementId);
-		SizeWatcher.observer.unobserve(element);
-	}
-
-	static init() {
-		if (SizeWatcher.observer)
-			return;
-
-		//console.info('Starting size watcher...');
-
-		SizeWatcher.elements = new Map<string, HTMLElement>();
-		SizeWatcher.observer = new ResizeObserver((entries) => {
-			for (let entry of entries) {
-				SizeWatcher.invoke(entry.target);
-			}
-		});
-	}
-
-	static invoke(element: Element) {
-		const watcherElement = element as SizeWatcherElement;
-		const instance = watcherElement.SizeWatcher;
-
-		if (!instance || !instance.callback)
-			return;
-
-		return instance.callback.invokeMethod('Invoke', element.clientWidth, element.clientHeight);
-	}
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/dotnet/extras.d.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/dotnet/extras.d.ts
deleted file mode 100644
index 4a3d71e034..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/dotnet/extras.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-declare namespace DotNet {
-    interface DotNetObjectReference extends DotNet.DotNetObject {
-        _id: number;
-        dispose();
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/dotnet/index.d.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/dotnet/index.d.ts
deleted file mode 100644
index ff6dc4a8f8..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/dotnet/index.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for non-npm package @blazor/javascript-interop 3.1
-// Project: https://docs.microsoft.com/en-us/aspnet/core/blazor/javascript-interop?view=aspnetcore-3.1
-// Definitions by: Piotr Błażejewicz (Peter Blazejewicz) <https://github.com/peterblazejewicz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 3.0
-
-// Here be dragons!
-// This is community-maintained definition file intended to ease the process of developing
-// high quality JavaScript interop code to be used in Blazor application from your C# .Net code.
-// Could be removed without a notice in case official definition types ships with Blazor itself.
-
-// tslint:disable:no-unnecessary-generics
-
-declare namespace DotNet {
-    /**
-     * Invokes the specified .NET public method synchronously. Not all hosting scenarios support
-     * synchronous invocation, so if possible use invokeMethodAsync instead.
-     *
-     * @param assemblyName The short name (without key/version or .dll extension) of the .NET assembly containing the method.
-     * @param methodIdentifier The identifier of the method to invoke. The method must have a [JSInvokable] attribute specifying this identifier.
-     * @param args Arguments to pass to the method, each of which must be JSON-serializable.
-     * @returns The result of the operation.
-     */
-    function invokeMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T;
-    /**
-     * Invokes the specified .NET public method asynchronously.
-     *
-     * @param assemblyName The short name (without key/version or .dll extension) of the .NET assembly containing the method.
-     * @param methodIdentifier The identifier of the method to invoke. The method must have a [JSInvokable] attribute specifying this identifier.
-     * @param args Arguments to pass to the method, each of which must be JSON-serializable.
-     * @returns A promise representing the result of the operation.
-     */
-    function invokeMethodAsync<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): Promise<T>;
-    /**
-     * Represents the .NET instance passed by reference to JavaScript.
-     */
-    interface DotNetObject {
-        /**
-         * Invokes the specified .NET instance public method synchronously. Not all hosting scenarios support
-         * synchronous invocation, so if possible use invokeMethodAsync instead.
-         *
-         * @param methodIdentifier The identifier of the method to invoke. The method must have a [JSInvokable] attribute specifying this identifier.
-         * @param args Arguments to pass to the method, each of which must be JSON-serializable.
-         * @returns The result of the operation.
-         */
-        invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
-        /**
-         * Invokes the specified .NET instance public method asynchronously.
-         *
-         * @param methodIdentifier The identifier of the method to invoke. The method must have a [JSInvokable] attribute specifying this identifier.
-         * @param args Arguments to pass to the method, each of which must be JSON-serializable.
-         * @returns A promise representing the result of the operation.
-         */
-        invokeMethodAsync<T>(methodIdentifier: string, ...args: any[]): Promise<T>;
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/emscripten/index.d.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/emscripten/index.d.ts
deleted file mode 100644
index e3829d4db1..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/types/emscripten/index.d.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-// Type definitions for Emscripten 1.39.16
-// Project: https://emscripten.org
-// Definitions by: Kensuke Matsuzaki <https://github.com/zakki>
-//                 Periklis Tsirakidis <https://github.com/periklis>
-//                 Bumsik Kim <https://github.com/kbumsik>
-//                 Louis DeScioli <https://github.com/lourd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-/** Other WebAssembly declarations, for compatibility with older versions of Typescript */
-declare namespace WebAssembly {
-    interface Module {}
-}
-
-declare namespace Emscripten {
-    interface FileSystemType {}
-    type EnvironmentType = 'WEB' | 'NODE' | 'SHELL' | 'WORKER';
-
-    type JSType = 'number' | 'string' | 'array' | 'boolean';
-    type TypeCompatibleWithC = number | string | any[] | boolean;
-
-    type CIntType = 'i8' | 'i16' | 'i32' | 'i64';
-    type CFloatType = 'float' | 'double';
-    type CPointerType = 'i8*' | 'i16*' | 'i32*' | 'i64*' | 'float*' | 'double*' | '*';
-    type CType = CIntType | CFloatType | CPointerType;
-
-    type WebAssemblyImports = Array<{
-        name: string;
-        kind: string;
-    }>;
-
-    type WebAssemblyExports = Array<{
-        module: string;
-        name: string;
-        kind: string;
-    }>;
-
-    interface CCallOpts {
-        async?: boolean | undefined;
-    }
-}
-
-interface EmscriptenModule {
-    print(str: string): void;
-    printErr(str: string): void;
-    arguments: string[];
-    environment: Emscripten.EnvironmentType;
-    preInit: Array<{ (): void }>;
-    preRun: Array<{ (): void }>;
-    postRun: Array<{ (): void }>;
-    onAbort: { (what: any): void };
-    onRuntimeInitialized: { (): void };
-    preinitializedWebGLContext: WebGLRenderingContext;
-    noInitialRun: boolean;
-    noExitRuntime: boolean;
-    logReadFiles: boolean;
-    filePackagePrefixURL: string;
-    wasmBinary: ArrayBuffer;
-
-    destroy(object: object): void;
-    getPreloadedPackage(remotePackageName: string, remotePackageSize: number): ArrayBuffer;
-    instantiateWasm(
-        imports: Emscripten.WebAssemblyImports,
-        successCallback: (module: WebAssembly.Module) => void,
-    ): Emscripten.WebAssemblyExports;
-    locateFile(url: string, scriptDirectory: string): string;
-    onCustomMessage(event: MessageEvent): void;
-
-    // USE_TYPED_ARRAYS == 1
-    HEAP: Int32Array;
-    IHEAP: Int32Array;
-    FHEAP: Float64Array;
-
-    // USE_TYPED_ARRAYS == 2
-    HEAP8: Int8Array;
-    HEAP16: Int16Array;
-    HEAP32: Int32Array;
-    HEAPU8: Uint8Array;
-    HEAPU16: Uint16Array;
-    HEAPU32: Uint32Array;
-    HEAPF32: Float32Array;
-    HEAPF64: Float64Array;
-
-    TOTAL_STACK: number;
-    TOTAL_MEMORY: number;
-    FAST_MEMORY: number;
-
-    addOnPreRun(cb: () => any): void;
-    addOnInit(cb: () => any): void;
-    addOnPreMain(cb: () => any): void;
-    addOnExit(cb: () => any): void;
-    addOnPostRun(cb: () => any): void;
-
-    preloadedImages: any;
-    preloadedAudios: any;
-
-    _malloc(size: number): number;
-    _free(ptr: number): void;
-}
-
-/**
- * A factory function is generated when setting the `MODULARIZE` build option
- * to `1` in your Emscripten build. It return a Promise that resolves to an
- * initialized, ready-to-call `EmscriptenModule` instance.
- *
- * By default, the factory function will be named `Module`. It's recommended to
- * use the `EXPORT_ES6` option, in which the factory function will be the
- * default export. If used without `EXPORT_ES6`, the factory function will be a
- * global variable. You can rename the variable using the `EXPORT_NAME` build
- * option. It's left to you to declare any global variables as needed in your
- * application's types.
- * @param moduleOverrides Default properties for the initialized module.
- */
-type EmscriptenModuleFactory<T extends EmscriptenModule = EmscriptenModule> = (
-    moduleOverrides?: Partial<T>,
-) => Promise<T>;
-
-declare namespace FS {
-    interface Lookup {
-        path: string;
-        node: FSNode;
-    }
-
-    interface FSStream {}
-    interface FSNode {}
-    interface ErrnoError {}
-
-    let ignorePermissions: boolean;
-    let trackingDelegate: any;
-    let tracking: any;
-    let genericErrors: any;
-
-    //
-    // paths
-    //
-    function lookupPath(path: string, opts: any): Lookup;
-    function getPath(node: FSNode): string;
-
-    //
-    // nodes
-    //
-    function isFile(mode: number): boolean;
-    function isDir(mode: number): boolean;
-    function isLink(mode: number): boolean;
-    function isChrdev(mode: number): boolean;
-    function isBlkdev(mode: number): boolean;
-    function isFIFO(mode: number): boolean;
-    function isSocket(mode: number): boolean;
-
-    //
-    // devices
-    //
-    function major(dev: number): number;
-    function minor(dev: number): number;
-    function makedev(ma: number, mi: number): number;
-    function registerDevice(dev: number, ops: any): void;
-
-    //
-    // core
-    //
-    function syncfs(populate: boolean, callback: (e: any) => any): void;
-    function syncfs(callback: (e: any) => any, populate?: boolean): void;
-    function mount(type: Emscripten.FileSystemType, opts: any, mountpoint: string): any;
-    function unmount(mountpoint: string): void;
-
-    function mkdir(path: string, mode?: number): any;
-    function mkdev(path: string, mode?: number, dev?: number): any;
-    function symlink(oldpath: string, newpath: string): any;
-    function rename(old_path: string, new_path: string): void;
-    function rmdir(path: string): void;
-    function readdir(path: string): any;
-    function unlink(path: string): void;
-    function readlink(path: string): string;
-    function stat(path: string, dontFollow?: boolean): any;
-    function lstat(path: string): any;
-    function chmod(path: string, mode: number, dontFollow?: boolean): void;
-    function lchmod(path: string, mode: number): void;
-    function fchmod(fd: number, mode: number): void;
-    function chown(path: string, uid: number, gid: number, dontFollow?: boolean): void;
-    function lchown(path: string, uid: number, gid: number): void;
-    function fchown(fd: number, uid: number, gid: number): void;
-    function truncate(path: string, len: number): void;
-    function ftruncate(fd: number, len: number): void;
-    function utime(path: string, atime: number, mtime: number): void;
-    function open(path: string, flags: string, mode?: number, fd_start?: number, fd_end?: number): FSStream;
-    function close(stream: FSStream): void;
-    function llseek(stream: FSStream, offset: number, whence: number): any;
-    function read(stream: FSStream, buffer: ArrayBufferView, offset: number, length: number, position?: number): number;
-    function write(
-        stream: FSStream,
-        buffer: ArrayBufferView,
-        offset: number,
-        length: number,
-        position?: number,
-        canOwn?: boolean,
-    ): number;
-    function allocate(stream: FSStream, offset: number, length: number): void;
-    function mmap(
-        stream: FSStream,
-        buffer: ArrayBufferView,
-        offset: number,
-        length: number,
-        position: number,
-        prot: number,
-        flags: number,
-    ): any;
-    function ioctl(stream: FSStream, cmd: any, arg: any): any;
-    function readFile(path: string, opts: { encoding: 'binary'; flags?: string | undefined }): Uint8Array;
-    function readFile(path: string, opts: { encoding: 'utf8'; flags?: string | undefined }): string;
-    function readFile(path: string, opts?: { flags?: string | undefined }): Uint8Array;
-    function writeFile(path: string, data: string | ArrayBufferView, opts?: { flags?: string | undefined }): void;
-
-    //
-    // module-level FS code
-    //
-    function cwd(): string;
-    function chdir(path: string): void;
-    function init(
-        input: null | (() => number | null),
-        output: null | ((c: number) => any),
-        error: null | ((c: number) => any),
-    ): void;
-
-    function createLazyFile(
-        parent: string | FSNode,
-        name: string,
-        url: string,
-        canRead: boolean,
-        canWrite: boolean,
-    ): FSNode;
-    function createPreloadedFile(
-        parent: string | FSNode,
-        name: string,
-        url: string,
-        canRead: boolean,
-        canWrite: boolean,
-        onload?: () => void,
-        onerror?: () => void,
-        dontCreateFile?: boolean,
-        canOwn?: boolean,
-    ): void;
-    function createDataFile(
-        parent: string | FSNode,
-        name: string,
-        data: ArrayBufferView,
-        canRead: boolean,
-        canWrite: boolean,
-        canOwn: boolean,
-    ): FSNode;
-}
-
-declare var MEMFS: Emscripten.FileSystemType;
-declare var NODEFS: Emscripten.FileSystemType;
-declare var IDBFS: Emscripten.FileSystemType;
-
-// Below runtime function/variable declarations are exportable by
-// -s EXTRA_EXPORTED_RUNTIME_METHODS. You can extend or merge
-// EmscriptenModule interface to add runtime functions.
-//
-// For example, by using -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall']"
-// You can access ccall() via Module["ccall"]. In this case, you should
-// extend EmscriptenModule to pass the compiler check like the following:
-//
-// interface YourOwnEmscriptenModule extends EmscriptenModule {
-//     ccall: typeof ccall;
-// }
-//
-// See: https://emscripten.org/docs/getting_started/FAQ.html#why-do-i-get-typeerror-module-something-is-not-a-function
-
-declare function ccall(
-    ident: string,
-    returnType: Emscripten.JSType | null,
-    argTypes: Emscripten.JSType[],
-    args: Emscripten.TypeCompatibleWithC[],
-    opts?: Emscripten.CCallOpts,
-): any;
-declare function cwrap(
-    ident: string,
-    returnType: Emscripten.JSType | null,
-    argTypes: Emscripten.JSType[],
-    opts?: Emscripten.CCallOpts,
-): (...args: any[]) => any;
-
-declare function setValue(ptr: number, value: any, type: Emscripten.CType, noSafe?: boolean): void;
-declare function getValue(ptr: number, type: Emscripten.CType, noSafe?: boolean): number;
-
-declare function allocate(
-    slab: number[] | ArrayBufferView | number,
-    types: Emscripten.CType | Emscripten.CType[],
-    allocator: number,
-    ptr?: number,
-): number;
-
-declare function stackAlloc(size: number): number;
-declare function stackSave(): number;
-declare function stackRestore(ptr: number): void;
-
-declare function UTF8ToString(ptr: number, maxBytesToRead?: number): string;
-declare function stringToUTF8(str: string, outPtr: number, maxBytesToRead?: number): void;
-declare function lengthBytesUTF8(str: string): number;
-declare function allocateUTF8(str: string): number;
-declare function allocateUTF8OnStack(str: string): number;
-declare function UTF16ToString(ptr: number): string;
-declare function stringToUTF16(str: string, outPtr: number, maxBytesToRead?: number): void;
-declare function lengthBytesUTF16(str: string): number;
-declare function UTF32ToString(ptr: number): string;
-declare function stringToUTF32(str: string, outPtr: number, maxBytesToRead?: number): void;
-declare function lengthBytesUTF32(str: string): number;
-
-declare function intArrayFromString(stringy: string, dontAddNull?: boolean, length?: number): number[];
-declare function intArrayToString(array: number[]): string;
-declare function writeStringToMemory(str: string, buffer: number, dontAddNull: boolean): void;
-declare function writeArrayToMemory(array: number[], buffer: number): void;
-declare function writeAsciiToMemory(str: string, buffer: number, dontAddNull: boolean): void;
-
-declare function addRunDependency(id: any): void;
-declare function removeRunDependency(id: any): void;
-
-declare function addFunction(func: (...args: any[]) => any, signature?: string): number;
-declare function removeFunction(funcPtr: number): void;
-
-declare var ALLOC_NORMAL: number;
-declare var ALLOC_STACK: number;
-declare var ALLOC_STATIC: number;
-declare var ALLOC_DYNAMIC: number;
-declare var ALLOC_NONE: number;
diff --git a/src/Web/Avalonia.Web.Blazor/Keycodes.cs b/src/Web/Avalonia.Web.Blazor/Keycodes.cs
deleted file mode 100644
index ea30f0a9f0..0000000000
--- a/src/Web/Avalonia.Web.Blazor/Keycodes.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using Avalonia.Input;
-
-namespace Avalonia.Web.Blazor
-{
-    internal static class Keycodes
-    {
-        public static Dictionary<string, Key> KeyCodes = new()
-        {
-            { "Escape", Key.Escape },
-            { "Digit1", Key.D1 },
-            { "Digit2", Key.D2 },
-            { "Digit3", Key.D3 },
-            { "Digit4", Key.D4 },
-            { "Digit5", Key.D5 },
-            { "Digit6", Key.D6 },
-            { "Digit7", Key.D7 },
-            { "Digit8", Key.D8 },
-            { "Digit9", Key.D9 },
-            { "Digit0", Key.D0 },
-            { "Minus", Key.OemMinus },
-            //{	"Equal"	, Key. },
-            { "Backspace", Key.Back },
-            { "Tab", Key.Tab },
-            { "KeyQ", Key.Q },
-            { "KeyW", Key.W },
-            { "KeyE", Key.E },
-            { "KeyR", Key.R },
-            { "KeyT", Key.T },
-            { "KeyY", Key.Y },
-            { "KeyU", Key.U },
-            { "KeyI", Key.I },
-            { "KeyO", Key.O },
-            { "KeyP", Key.P },
-            { "BracketLeft", Key.OemOpenBrackets },
-            { "BracketRight", Key.OemCloseBrackets },
-            { "Enter", Key.Enter },
-            { "ControlLeft", Key.LeftCtrl },
-            { "KeyA", Key.A },
-            { "KeyS", Key.S },
-            { "KeyD", Key.D },
-            { "KeyF", Key.F },
-            { "KeyG", Key.G },
-            { "KeyH", Key.H },
-            { "KeyJ", Key.J },
-            { "KeyK", Key.K },
-            { "KeyL", Key.L },
-            { "Semicolon", Key.OemSemicolon },
-            { "Quote", Key.OemQuotes },
-            //{	"Backquote"	, Key. },
-            { "ShiftLeft", Key.LeftShift },
-            { "Backslash", Key.OemBackslash },
-            { "KeyZ", Key.Z },
-            { "KeyX", Key.X },
-            { "KeyC", Key.C },
-            { "KeyV", Key.V },
-            { "KeyB", Key.B },
-            { "KeyN", Key.N },
-            { "KeyM", Key.M },
-            { "Comma", Key.OemComma },
-            { "Period", Key.OemPeriod },
-            //{	"Slash"	, Key. },
-            { "ShiftRight", Key.RightShift },
-            { "NumpadMultiply", Key.Multiply },
-            { "AltLeft", Key.LeftAlt },
-            { "Space", Key.Space },
-            { "CapsLock", Key.CapsLock },
-            { "F1", Key.F1 },
-            { "F2", Key.F2 },
-            { "F3", Key.F3 },
-            { "F4", Key.F4 },
-            { "F5", Key.F5 },
-            { "F6", Key.F6 },
-            { "F7", Key.F7 },
-            { "F8", Key.F8 },
-            { "F9", Key.F9 },
-            { "F10", Key.F10 },
-            { "NumLock", Key.NumLock },
-            { "ScrollLock", Key.Scroll },
-            { "Numpad7", Key.NumPad7 },
-            { "Numpad8", Key.NumPad8 },
-            { "Numpad9", Key.NumPad9 },
-            { "NumpadSubtract", Key.Subtract },
-            { "Numpad4", Key.NumPad4 },
-            { "Numpad5", Key.NumPad5 },
-            { "Numpad6", Key.NumPad6 },
-            { "NumpadAdd", Key.Add },
-            { "Numpad1", Key.NumPad1 },
-            { "Numpad2", Key.NumPad2 },
-            { "Numpad3", Key.NumPad3 },
-            { "Numpad0", Key.NumPad0 },
-            { "NumpadDecimal", Key.Decimal },
-            { "Unidentified", Key.NoName },
-            //{	"IntlBackslash"	, Key.bac },
-            { "F11", Key.F11 },
-            { "F12", Key.F12 },
-            //{	"IntlRo"	, Key.Ro },
-            //{	"Unidentified"	, Key. },
-            { "Convert", Key.ImeConvert },
-            { "KanaMode", Key.KanaMode },
-            { "NonConvert", Key.ImeNonConvert },
-            //{	"Unidentified"	, Key. },
-            { "NumpadEnter", Key.Enter },
-            { "ControlRight", Key.RightCtrl },
-            { "NumpadDivide", Key.Divide },
-            { "PrintScreen", Key.PrintScreen },
-            { "AltRight", Key.RightAlt },
-            //{	"Unidentified"	, Key. },
-            { "Home", Key.Home },
-            { "ArrowUp", Key.Up },
-            { "PageUp", Key.PageUp },
-            { "ArrowLeft", Key.Left },
-            { "ArrowRight", Key.Right },
-            { "End", Key.End },
-            { "ArrowDown", Key.Down },
-            { "PageDown", Key.PageDown },
-            { "Insert", Key.Insert },
-            { "Delete", Key.Delete },
-            //{	"Unidentified"	, Key. },
-            { "AudioVolumeMute", Key.VolumeMute },
-            { "AudioVolumeDown", Key.VolumeDown },
-            { "AudioVolumeUp", Key.VolumeUp },
-            //{	"NumpadEqual"	, Key. },
-            { "Pause", Key.Pause },
-            { "NumpadComma", Key.OemComma }
-        };
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/ManualTriggerRenderTimer.cs b/src/Web/Avalonia.Web.Blazor/ManualTriggerRenderTimer.cs
deleted file mode 100644
index 1a06d47744..0000000000
--- a/src/Web/Avalonia.Web.Blazor/ManualTriggerRenderTimer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Diagnostics;
-using Avalonia.Rendering;
-
-namespace Avalonia.Web.Blazor
-{
-    public class ManualTriggerRenderTimer : IRenderTimer
-    {
-        private static readonly Stopwatch s_sw = Stopwatch.StartNew();
-
-        public static ManualTriggerRenderTimer Instance { get; } = new();
-
-        public void RaiseTick() => Tick?.Invoke(s_sw.Elapsed);
-
-        public event Action<TimeSpan>? Tick;
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs b/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs
deleted file mode 100644
index 209a635a7b..0000000000
--- a/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System.Diagnostics;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.Web.Blazor.Interop;
-using SkiaSharp;
-
-#nullable enable
-
-namespace Avalonia.Web.Blazor
-{
-    internal class RazorViewTopLevelImpl : ITopLevelImplWithTextInputMethod
-    {
-        private Size _clientSize;
-        private BlazorSkiaSurface? _currentSurface;
-        private IInputRoot? _inputRoot;
-        private readonly Stopwatch _sw = Stopwatch.StartNew();
-        private readonly ITextInputMethodImpl _textInputMethod;
-        private readonly TouchDevice _touchDevice;
-        private string _currentCursor = CssCursor.Default;
-
-        public RazorViewTopLevelImpl(ITextInputMethodImpl textInputMethod)
-        {
-            _textInputMethod = textInputMethod;
-            TransparencyLevel = WindowTransparencyLevel.None;
-            AcrylicCompensationLevels = new AcrylicPlatformCompensationLevels(1, 1, 1);
-            _touchDevice = new TouchDevice();
-        }
-
-        public ulong Timestamp => (ulong)_sw.ElapsedMilliseconds;
-
-
-        internal void SetSurface(GRContext context, SKHtmlCanvasInterop.GLInfo glInfo, SKColorType colorType, PixelSize size, double scaling)
-        {
-            _currentSurface =
-                new BlazorSkiaSurface(context, glInfo, colorType, size, scaling, GRSurfaceOrigin.BottomLeft);
-        }
-
-        public void SetClientSize(SKSize size, double dpi)
-        {
-            var newSize = new Size(size.Width, size.Height);
-
-            if (Math.Abs(RenderScaling - dpi) > 0.0001)
-            {
-                if (_currentSurface is { })
-                {
-                    _currentSurface.Scaling = dpi;
-                }
-                
-                ScalingChanged?.Invoke(dpi);
-            }
-
-            if (newSize != _clientSize)
-            {
-                _clientSize = newSize;
-
-                if (_currentSurface is { })
-                {
-                    _currentSurface.Size = new PixelSize((int)size.Width, (int)size.Height);
-                }
-
-                Resized?.Invoke(newSize, PlatformResizeReason.User);
-            }
-        }
-
-        public void RawTouchEvent(RawPointerEventType type, Point p, RawInputModifiers modifiers, long touchPointId)
-        {
-            if (_inputRoot is { })
-            {
-                Input?.Invoke(new RawTouchEventArgs(_touchDevice, Timestamp, _inputRoot, type, p, modifiers, touchPointId));
-            }
-        }
-
-        public void RawMouseEvent(RawPointerEventType type, Point p, RawInputModifiers modifiers)
-        {
-            if (_inputRoot is { })
-            {
-                Input?.Invoke(new RawPointerEventArgs(MouseDevice, Timestamp, _inputRoot, type, p, modifiers));
-            }
-        }
-
-        public void RawMouseWheelEvent(Point p, Vector v, RawInputModifiers modifiers)
-        {
-            if (_inputRoot is { })
-            {
-                Input?.Invoke(new RawMouseWheelEventArgs(MouseDevice, Timestamp, _inputRoot, p, v, modifiers));
-            }
-        }
-
-        public void RawKeyboardEvent(RawKeyEventType type, string key, RawInputModifiers modifiers)
-        {
-            if (Keycodes.KeyCodes.TryGetValue(key, out var avkey))
-            {
-                if (_inputRoot is { })
-                {
-                    Input?.Invoke(new RawKeyEventArgs(KeyboardDevice, Timestamp, _inputRoot, type, avkey, modifiers));
-                }
-            }
-        }
-
-        public void RawTextEvent(string text)
-        {
-            if (_inputRoot is { })
-            {
-                Input?.Invoke(new RawTextInputEventArgs(KeyboardDevice, Timestamp, _inputRoot, text));
-            }
-        }
-
-        public void Dispose()
-        {
-
-        }
-
-        public IRenderer CreateRenderer(IRenderRoot root)
-        {
-            var loop = AvaloniaLocator.Current.GetRequiredService<IRenderLoop>();
-            return new DeferredRenderer(root, loop);
-        }
-
-        public void Invalidate(Rect rect)
-        {
-            //Console.WriteLine("invalidate rect called");
-        }
-
-        public void SetInputRoot(IInputRoot inputRoot)
-        {
-            _inputRoot = inputRoot;
-        }
-
-        public Point PointToClient(PixelPoint point) => new Point(point.X, point.Y);
-
-        public PixelPoint PointToScreen(Point point) => new PixelPoint((int)point.X, (int)point.Y);
-
-        public void SetCursor(ICursorImpl? cursor)
-        {
-            var val = (cursor as CssCursor)?.Value ?? CssCursor.Default;
-            if (_currentCursor != val)
-            {
-                SetCssCursor?.Invoke(val);
-                _currentCursor = val;
-            }
-        }
-
-        public IPopupImpl? CreatePopup()
-        {
-            return null;
-        }
-
-        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
-        {
-
-        }
-
-        public Size ClientSize => _clientSize;
-        public Size? FrameSize => null;
-        public double RenderScaling => _currentSurface?.Scaling ?? 1;
-
-        public IEnumerable<object> Surfaces => new object[] { _currentSurface! };
-
-        public Action<string>? SetCssCursor { get; set; }
-        public Action<RawInputEventArgs>? Input { get; set; }
-        public Action<Rect>? Paint { get; set; }
-        public Action<Size, PlatformResizeReason>? Resized { get; set; }
-        public Action<double>? ScalingChanged { get; set; }
-        public Action<WindowTransparencyLevel>? TransparencyLevelChanged { get; set; }
-        public Action? Closed { get; set; }
-        public Action? LostFocus { get; set; }
-        public IMouseDevice MouseDevice { get; } = new MouseDevice();
-
-        public IKeyboardDevice KeyboardDevice { get; } = BlazorWindowingPlatform.Keyboard;
-        public WindowTransparencyLevel TransparencyLevel { get; }
-        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; }
-
-        public ITextInputMethodImpl TextInputMethod => _textInputMethod;
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/WinStubs.cs b/src/Web/Avalonia.Web.Blazor/WinStubs.cs
deleted file mode 100644
index 7b2bff6bfd..0000000000
--- a/src/Web/Avalonia.Web.Blazor/WinStubs.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-using Avalonia.Input;
-using Avalonia.Input.Platform;
-using Avalonia.Platform;
-
-#nullable enable
-
-namespace Avalonia.Web.Blazor
-{
-    internal class ClipboardStub : IClipboard
-    {
-        public Task<string> GetTextAsync() => Task.FromResult("");
-
-        public Task SetTextAsync(string text) => Task.CompletedTask;
-
-        public Task ClearAsync() => Task.CompletedTask;
-
-        public Task SetDataObjectAsync(IDataObject data) => Task.CompletedTask;
-
-        public Task<string[]> GetFormatsAsync() => Task.FromResult(Array.Empty<string>());
-
-        public Task<object> GetDataAsync(string format) => Task.FromResult<object>(new ());
-    }
-
-    internal class IconLoaderStub : IPlatformIconLoader
-    {
-        private class IconStub : IWindowIconImpl
-        {
-            public void Save(Stream outputStream)
-            {
-
-            }
-        }
-
-        public IWindowIconImpl LoadIcon(string fileName) => new IconStub();
-
-        public IWindowIconImpl LoadIcon(Stream stream) => new IconStub();
-
-        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) => new IconStub();
-    }
-
-    internal class SystemDialogsStub : ISystemDialogImpl
-    {
-        public Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent) =>
-            Task.FromResult((string[]?)null);
-
-        public Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent) =>
-            Task.FromResult((string?)null);
-    }
-
-    internal class ScreenStub : IScreenImpl
-    {
-        public int ScreenCount => 1;
-
-        public IReadOnlyList<Screen> AllScreens { get; } =
-            new[] { new Screen(96, new PixelRect(0, 0, 4000, 4000), new PixelRect(0, 0, 4000, 4000), true) };
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs b/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs
deleted file mode 100644
index ac970d067f..0000000000
--- a/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using Avalonia.Controls.Platform;
-using Avalonia.Input;
-using Avalonia.Input.Platform;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.Threading;
-
-#nullable enable
-
-namespace Avalonia.Web.Blazor
-{
-    public class BlazorWindowingPlatform : IWindowingPlatform, IPlatformSettings, IPlatformThreadingInterface
-    {
-        private bool _signaled;
-        private static KeyboardDevice? s_keyboard;
-
-        public IWindowImpl CreateWindow() => throw new NotSupportedException();
-
-        IWindowImpl IWindowingPlatform.CreateEmbeddableWindow()
-        {
-            throw new NotImplementedException();
-        }
-
-        public ITrayIconImpl? CreateTrayIcon()
-        {
-            return null;
-        }
-
-        public static KeyboardDevice Keyboard => s_keyboard ??
-            throw new InvalidOperationException("BlazorWindowingPlatform not registered.");
-
-        public static void Register()
-        {
-            var instance = new BlazorWindowingPlatform();
-            s_keyboard = new KeyboardDevice();
-            AvaloniaLocator.CurrentMutable
-                .Bind<IClipboard>().ToSingleton<ClipboardStub>()
-                .Bind<ICursorFactory>().ToSingleton<CssCursorFactory>()
-                .Bind<IKeyboardDevice>().ToConstant(s_keyboard)
-                .Bind<IPlatformSettings>().ToConstant(instance)
-                .Bind<IPlatformThreadingInterface>().ToConstant(instance)
-                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
-                .Bind<IRenderTimer>().ToConstant(ManualTriggerRenderTimer.Instance)
-                .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsStub>()
-                .Bind<IWindowingPlatform>().ToConstant(instance)
-                .Bind<IPlatformIconLoader>().ToSingleton<IconLoaderStub>()
-                .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
-        }
-
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-        public void RunLoop(CancellationToken cancellationToken)
-        {
-            throw new NotSupportedException();
-        }
-
-        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
-        {
-            return GetRuntimePlatform()
-                .StartSystemTimer(interval, () =>
-                {
-                    Dispatcher.UIThread.RunJobs(priority);
-                    tick();
-                });
-        }
-
-        public void Signal(DispatcherPriority priority)
-        {
-            if (_signaled)
-                return;
-            
-            _signaled = true;
-            
-            IDisposable? disp = null;
-            
-            disp = GetRuntimePlatform()
-                .StartSystemTimer(TimeSpan.FromMilliseconds(1),
-                    () =>
-                    {
-                        _signaled = false;
-                        disp?.Dispose();
-
-                        Signaled?.Invoke(null);
-                    });
-        }
-
-        public bool CurrentThreadIsLoopThread
-        {
-            get
-            {
-                return true; // Blazor is single threaded.
-            }
-        }
-
-        public event Action<DispatcherPriority?>? Signaled;
-
-        private static IRuntimePlatform GetRuntimePlatform()
-        {
-            return AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
-        }
-    }
-}
diff --git a/src/Web/Avalonia.Web.Blazor/_Imports.razor b/src/Web/Avalonia.Web.Blazor/_Imports.razor
deleted file mode 100644
index 77285129da..0000000000
--- a/src/Web/Avalonia.Web.Blazor/_Imports.razor
+++ /dev/null
@@ -1 +0,0 @@
-@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Web/Avalonia.Web.Blazor/tsconfig.json b/src/Web/Avalonia.Web.Blazor/tsconfig.json
deleted file mode 100644
index 71c462cd60..0000000000
--- a/src/Web/Avalonia.Web.Blazor/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "noImplicitAny": false,
-    "noEmitOnError": true,
-    "removeComments": false,
-    "sourceMap": true,
-    "target": "ES2020",
-    "module": "ES2020",
-    "outDir": "wwwroot"
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}
diff --git a/src/Web/Avalonia.Web/Avalonia.Web.csproj b/src/Web/Avalonia.Web/Avalonia.Web.csproj
new file mode 100644
index 0000000000..88b23cdad2
--- /dev/null
+++ b/src/Web/Avalonia.Web/Avalonia.Web.csproj
@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <LangVersion>preview</LangVersion>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SupportedPlatform Remove="@(SupportedPlatform)" />
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <Import Project="..\..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\..\build\SkiaSharp.props" />
+  <Import Project="..\..\..\build\HarfBuzzSharp.props" />
+  <Import Project="..\..\..\build\NullableEnable.props" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
+    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="*.props">
+      <Pack>true</Pack>
+      <PackagePath>build\</PackagePath>
+    </Content>
+    <Content Include="*.targets">
+      <Pack>true</Pack>
+      <PackagePath>build\;buildTransitive\</PackagePath>
+    </Content>
+    <Content Include="interop.js">
+      <Pack>true</Pack>
+      <PackagePath>build/interop.js;buildTransitive/interop.js</PackagePath>
+    </Content>
+    <Content Include="wwwroot/**/*.*">
+      <Pack>true</Pack>
+      <PackagePath>build\wwwroot;buildTransitive\wwwroot</PackagePath>
+    </Content>
+  </ItemGroup>
+
+  <Target Name="NpmInstall" Inputs="webapp/package.json" Outputs="webapp/node_modules/.install-stamp">
+    <Exec Command="npm install" WorkingDirectory="webapp" />
+    <!-- Write the stamp file, so incremental builds work -->
+    <Touch Files="webapp/node_modules/.install-stamp" AlwaysCreate="true" />
+  </Target>
+  <Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" BeforeTargets="BeforeBuild">
+    <Exec Command="npm run build" WorkingDirectory="webapp" />
+  </Target>
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Web.Blazor, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+  
+</Project>
diff --git a/src/Web/Avalonia.Web/Avalonia.Web.props b/src/Web/Avalonia.Web/Avalonia.Web.props
new file mode 100644
index 0000000000..668dd20789
--- /dev/null
+++ b/src/Web/Avalonia.Web/Avalonia.Web.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <EmccInitialHeapSize>16384000</EmccInitialHeapSize> <!-- must be a multiple of 64KiB, 1024000 * num MB, number grows -->
+  </PropertyGroup>
+</Project>
diff --git a/src/Web/Avalonia.Web/Avalonia.Web.targets b/src/Web/Avalonia.Web/Avalonia.Web.targets
new file mode 100644
index 0000000000..22363b33d8
--- /dev/null
+++ b/src/Web/Avalonia.Web/Avalonia.Web.targets
@@ -0,0 +1,37 @@
+<Project>
+  <ItemGroup>
+    <WasmExtraFilesToDeploy Include="$(MSBuildThisFileDirectory)/wwwroot/**/*.*" />
+    <NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\3.1.7\libHarfBuzzSharp.a" />
+    <NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\3.1.7\libSkiaSharp.a" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <UseAvaloniaWasmDefaultOptimizations Condition="'$(UseAvaloniaWasmDefaultOptimizations)'==''">True</UseAvaloniaWasmDefaultOptimizations>
+    <EmccExtraLDFlags>$(EmccExtraLDFlags) --js-library="$(MSBuildThisFileDirectory)\interop.js"</EmccExtraLDFlags>
+    <EmccFlags>$(EmccExtraLDFlags) -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
+    <WasmBuildNative>true</WasmBuildNative>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(UseAvaloniaWasmDefaultOptimizations)'=='True' And '$(Configuration)' == 'Release'">
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>full</TrimMode>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <EmccCompileOptimizationFlag>-Oz</EmccCompileOptimizationFlag>
+    <EmccLinkOptimizationFlag>-Oz</EmccLinkOptimizationFlag>
+    <WasmEmitSymbolMap>false</WasmEmitSymbolMap>
+    <WasmNativeDebugSymbols>false</WasmNativeDebugSymbols>
+    <WasmDebugLevel>0</WasmDebugLevel>
+    <WasmEnableExceptionHandling>false</WasmEnableExceptionHandling>
+    <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
+    <DebuggerSupport>false</DebuggerSupport>
+    <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
+    <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+    <EventSourceSupport>false</EventSourceSupport>
+    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+    <MetadataUpdaterSupport>false</MetadataUpdaterSupport>
+    <UseNativeHttpHandler>true</UseNativeHttpHandler>
+    <UseSystemResourceKeys>true</UseSystemResourceKeys>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <IncludeSatelliteDllsProjectOutputGroup>false</IncludeSatelliteDllsProjectOutputGroup>
+  </PropertyGroup>
+</Project>
diff --git a/src/Web/Avalonia.Web/AvaloniaView.cs b/src/Web/Avalonia.Web/AvaloniaView.cs
new file mode 100644
index 0000000000..37614399ee
--- /dev/null
+++ b/src/Web/Avalonia.Web/AvaloniaView.cs
@@ -0,0 +1,495 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices.JavaScript;
+
+using Avalonia.Collections.Pooled;
+using Avalonia.Controls;
+using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Avalonia.Rendering.Composition;
+using Avalonia.Threading;
+using Avalonia.Web.Interop;
+using Avalonia.Web.Skia;
+
+using SkiaSharp;
+
+namespace Avalonia.Web
+{
+    [System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
+    public partial class AvaloniaView : ITextInputMethodImpl
+    {
+        private static readonly PooledList<RawPointerPoint> s_intermediatePointsPooledList = new(ClearMode.Never);
+        private readonly BrowserTopLevelImpl _topLevelImpl;
+        private EmbeddableControlRoot _topLevel;
+
+        private readonly JSObject _containerElement;
+        private readonly JSObject _canvas;
+        private readonly JSObject _nativeControlsContainer;
+        private readonly JSObject _inputElement;
+        private readonly JSObject? _splash;
+
+        private GLInfo? _jsGlInfo = null;
+        private double _dpi = 1;
+        private Size _canvasSize = new(100.0, 100.0);
+
+        private GRContext? _context;
+        private GRGlInterface? _glInterface;
+        private const SKColorType ColorType = SKColorType.Rgba8888;
+
+        private bool _useGL;        
+        private ITextInputMethodClient? _client;
+
+        public AvaloniaView(string divId)
+            : this(DomHelper.GetElementById(divId) ?? throw new Exception($"Element with id {divId} was not found in the html document."))
+        {
+        }
+
+        public AvaloniaView(JSObject host)
+        {
+            var hostContent = DomHelper.CreateAvaloniaHost(host);
+            if (hostContent == null)
+            {
+                throw new InvalidOperationException("Avalonia WASM host wasn't initialized.");
+            }
+
+            _containerElement = hostContent.GetPropertyAsJSObject("host")
+                                ?? throw new InvalidOperationException("Host cannot be null");
+            _canvas = hostContent.GetPropertyAsJSObject("canvas")
+                      ?? throw new InvalidOperationException("Canvas cannot be null");
+            _nativeControlsContainer = hostContent.GetPropertyAsJSObject("nativeHost")
+                                       ?? throw new InvalidOperationException("NativeHost cannot be null");
+            _inputElement = hostContent.GetPropertyAsJSObject("inputElement")
+                            ?? throw new InvalidOperationException("InputElement cannot be null");
+
+            _splash = DomHelper.GetElementById("avalonia-splash");
+
+            _topLevelImpl = new BrowserTopLevelImpl(this);
+
+            _topLevel = new WebEmbeddableControlRoot(_topLevelImpl, () =>
+            {
+                Dispatcher.UIThread.Post(() =>
+                {
+                    if (_splash != null)
+                    {
+                        DomHelper.AddCssClass(_splash, "splash-close");
+                    }
+                });
+            });
+
+            _topLevelImpl.SetCssCursor = (cursor) =>
+            {
+                InputHelper.SetCursor(_containerElement, cursor);
+            };
+
+            _topLevel.Prepare();
+
+            _topLevel.Renderer.Start();
+
+            InputHelper.SubscribeKeyEvents(
+                _containerElement,
+                OnKeyDown,
+                OnKeyUp);
+
+            InputHelper.SubscribeTextEvents(
+                _inputElement,
+                OnTextInput,
+                OnCompositionStart,
+                OnCompositionUpdate,
+                OnCompositionEnd);
+
+            InputHelper.SubscribePointerEvents(_containerElement, OnPointerMove, OnPointerDown, OnPointerUp,
+                OnPointerCancel, OnWheel);
+
+            var skiaOptions = AvaloniaLocator.Current.GetService<SkiaOptions>();
+
+            _dpi = DomHelper.ObserveDpi(OnDpiChanged);
+
+            _useGL = skiaOptions?.CustomGpuFactory != null;
+
+            if (_useGL)
+            {
+                _jsGlInfo = CanvasHelper.InitialiseGL(_canvas, OnRenderFrame);
+                // create the SkiaSharp context
+                if (_context == null)
+                {
+                    _glInterface = GRGlInterface.Create();
+                    _context = GRContext.CreateGl(_glInterface);
+
+                    // bump the default resource cache limit
+                    _context.SetResourceCacheLimit(skiaOptions?.MaxGpuResourceSizeBytes ?? 32 * 1024 * 1024);
+                }
+
+                _topLevelImpl.Surfaces = new[]
+                {
+                    new BrowserSkiaSurface(_context, _jsGlInfo, ColorType,
+                        new PixelSize((int)_canvasSize.Width, (int)_canvasSize.Height), _dpi,
+                        GRSurfaceOrigin.BottomLeft)
+                };
+            }
+            else
+            {
+                //var rasterInitialized = _interop.InitRaster();
+                //Console.WriteLine("raster initialized: {0}", rasterInitialized);
+
+                //_topLevelImpl.SetSurface(ColorType,
+                // new PixelSize((int)_canvasSize.Width, (int)_canvasSize.Height), _dpi, _interop.PutImageData);
+            }
+
+            CanvasHelper.SetCanvasSize(_canvas, (int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
+
+            _topLevelImpl.SetClientSize(_canvasSize, _dpi);
+
+            DomHelper.ObserveSize(host, null, OnSizeChanged);
+
+            CanvasHelper.RequestAnimationFrame(_canvas, true);
+
+            InputHelper.FocusElement(_containerElement);
+        }
+
+        private static RawPointerPoint ExtractRawPointerFromJSArgs(JSObject args)
+        {
+            var point = new RawPointerPoint
+            {
+                Position = new Point(args.GetPropertyAsDouble("offsetX"), args.GetPropertyAsDouble("offsetY")),
+                Pressure = (float)args.GetPropertyAsDouble("pressure"),
+                XTilt = (float)args.GetPropertyAsDouble("tiltX"),
+                YTilt = (float)args.GetPropertyAsDouble("tiltY"),
+                Twist = (float)args.GetPropertyAsDouble("twist")
+            };
+
+            return point;
+        }
+
+        private bool OnPointerMove(JSObject args)
+        {
+            var pointerType = args.GetPropertyAsString("pointerType");
+            var point = ExtractRawPointerFromJSArgs(args);
+            var type = pointerType switch
+            {
+                "touch" => RawPointerEventType.TouchUpdate,
+                _ => RawPointerEventType.Move
+            };
+
+            var coalescedEvents = new Lazy<IReadOnlyList<RawPointerPoint>?>(() =>
+            {
+                var points = InputHelper.GetCoalescedEvents(args);
+                s_intermediatePointsPooledList.Clear();
+                s_intermediatePointsPooledList.Capacity = points.Length - 1;
+
+                // Skip the last one, as it is already processed point.
+                for (var i = 0; i < points.Length - 1; i++)
+                {
+                    var point = points[i];
+                    s_intermediatePointsPooledList.Add(ExtractRawPointerFromJSArgs(point));
+                }
+
+                return s_intermediatePointsPooledList;
+            });
+
+            return _topLevelImpl.RawPointerEvent(type, pointerType!, point, GetModifiers(args), args.GetPropertyAsInt32("pointerId"), coalescedEvents);
+        }
+
+        private bool OnPointerDown(JSObject args)
+        {
+            var pointerType = args.GetPropertyAsString("pointerType") ?? "mouse";
+            var type = pointerType switch
+            {
+                "touch" => RawPointerEventType.TouchBegin,
+                _ => args.GetPropertyAsInt32("button") switch
+                {
+                    0 => RawPointerEventType.LeftButtonDown,
+                    1 => RawPointerEventType.MiddleButtonDown,
+                    2 => RawPointerEventType.RightButtonDown,
+                    3 => RawPointerEventType.XButton1Down,
+                    4 => RawPointerEventType.XButton2Down,
+                    5 => RawPointerEventType.XButton1Down, // should be pen eraser button,
+                    _ => RawPointerEventType.Move
+                }
+            };
+
+            var point = ExtractRawPointerFromJSArgs(args);
+            return _topLevelImpl.RawPointerEvent(type, pointerType, point, GetModifiers(args), args.GetPropertyAsInt32("pointerId"));
+        }
+
+        private bool OnPointerUp(JSObject args)
+        {
+            var pointerType = args.GetPropertyAsString("pointerType") ?? "mouse";
+            var type = pointerType switch
+            {
+                "touch" => RawPointerEventType.TouchEnd,
+                _ => args.GetPropertyAsInt32("button") switch
+                {
+                    0 => RawPointerEventType.LeftButtonUp,
+                    1 => RawPointerEventType.MiddleButtonUp,
+                    2 => RawPointerEventType.RightButtonUp,
+                    3 => RawPointerEventType.XButton1Up,
+                    4 => RawPointerEventType.XButton2Up,
+                    5 => RawPointerEventType.XButton1Up, // should be pen eraser button,
+                    _ => RawPointerEventType.Move
+                }
+            };
+
+            var point = ExtractRawPointerFromJSArgs(args);
+            return _topLevelImpl.RawPointerEvent(type, pointerType, point, GetModifiers(args), args.GetPropertyAsInt32("pointerId"));
+        }
+        
+        private bool OnPointerCancel(JSObject args)
+        {
+            var pointerType = args.GetPropertyAsString("pointerType") ?? "mouse";
+            if (pointerType == "touch")
+            {
+                var point = ExtractRawPointerFromJSArgs(args);
+                _topLevelImpl.RawPointerEvent(RawPointerEventType.TouchCancel, pointerType, point,
+                    GetModifiers(args), args.GetPropertyAsInt32("pointerId"));
+            }
+
+            return false;
+        }
+
+        private bool OnWheel(JSObject args)
+        {
+            return _topLevelImpl.RawMouseWheelEvent(new Point(args.GetPropertyAsDouble("clientX"), args.GetPropertyAsDouble("clientY")),
+                new Vector(-(args.GetPropertyAsDouble("deltaX") / 50), -(args.GetPropertyAsDouble("deltaY") / 50)), GetModifiers(args));
+        }
+
+        private static RawInputModifiers GetModifiers(JSObject e)
+        {
+            var modifiers = RawInputModifiers.None;
+
+            if (e.GetPropertyAsBoolean("ctrlKey"))
+                modifiers |= RawInputModifiers.Control;
+            if (e.GetPropertyAsBoolean("altKey"))
+                modifiers |= RawInputModifiers.Alt;
+            if (e.GetPropertyAsBoolean("shiftKey"))
+                modifiers |= RawInputModifiers.Shift;
+            if (e.GetPropertyAsBoolean("metaKey"))
+                modifiers |= RawInputModifiers.Meta;
+
+            var buttons = e.GetPropertyAsInt32("buttons");
+            if ((buttons & 1L) == 1)
+                modifiers |= RawInputModifiers.LeftMouseButton;
+
+            if ((buttons & 2L) == 2)
+                modifiers |= e.GetPropertyAsString("type") == "pen" ? RawInputModifiers.PenBarrelButton : RawInputModifiers.RightMouseButton;
+
+            if ((buttons & 4L) == 4)
+                modifiers |= RawInputModifiers.MiddleMouseButton;
+
+            if ((buttons & 8L) == 8)
+                modifiers |= RawInputModifiers.XButton1MouseButton;
+
+            if ((buttons & 16L) == 16)
+                modifiers |= RawInputModifiers.XButton2MouseButton;
+
+            if ((buttons & 32L) == 32)
+                modifiers |= RawInputModifiers.PenEraser;
+
+            return modifiers;
+        }
+
+        private bool OnKeyDown (string code, string key, int modifier)
+        {
+            var handled = _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, code, key, (RawInputModifiers)modifier);
+
+            if (!handled && key.Length == 1)
+            {
+                handled = _topLevelImpl.RawTextEvent(key);
+            }
+
+            return handled;
+        }
+
+        private bool OnKeyUp(string code, string key, int modifier)
+        {
+            return _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, code, key, (RawInputModifiers)modifier);
+        }
+
+        private bool OnTextInput (string type, string? data)
+        {
+            if(data == null || IsComposing)
+            {
+                return false;
+            }
+
+            return _topLevelImpl.RawTextEvent(data);
+        }
+
+        private bool OnCompositionStart (JSObject args)
+        {
+            if (_client == null)
+                return false;
+
+            _client.SetPreeditText(null);
+            IsComposing = true;
+
+            return false;
+        }
+
+        private bool OnCompositionUpdate(JSObject args)
+        {
+            if (_client == null)
+                return false;
+
+            _client.SetPreeditText(args.GetPropertyAsString("data"));
+
+            return false;
+        }
+
+        private bool OnCompositionEnd(JSObject args)
+        {
+            if (_client == null)
+                return false;
+
+            IsComposing = false;
+            _client.SetPreeditText(null);
+            _topLevelImpl.RawTextEvent(args.GetPropertyAsString("data")!);
+
+            return false;
+        }
+
+        private void OnRenderFrame()
+        {
+            if (_useGL && (_jsGlInfo == null))
+            {
+                Console.WriteLine("nothing to render");
+                return;
+            }
+            if (_canvasSize.Width <= 0 || _canvasSize.Height <= 0 || _dpi <= 0)
+            {
+                Console.WriteLine("nothing to render");
+                return;
+            }
+
+            ManualTriggerRenderTimer.Instance.RaiseTick();
+        }
+
+        public Control? Content
+        {
+            get => (Control)_topLevel.Content!;
+            set => _topLevel.Content = value;
+        }
+
+        public bool IsComposing { get; private set; }
+
+        internal INativeControlHostImpl GetNativeControlHostImpl()
+        {
+            return new BrowserNativeControlHost(_nativeControlsContainer);
+        }
+
+        private void ForceBlit()
+        {
+            // Note: this is technically a hack, but it's a kinda unique use case when
+            // we want to blit the previous frame
+            // renderer doesn't have much control over the render target
+            // we render on the UI thread
+            // We also don't want to have it as a meaningful public API.
+            // Therefore we have InternalsVisibleTo hack here.
+
+            if (_topLevel.Renderer is CompositingRenderer dr)
+            {
+                dr.CompositionTarget.ImmediateUIThreadRender();
+            }
+        }
+
+        private void OnDpiChanged(double oldDpi, double newDpi)
+        {
+            if (Math.Abs(_dpi - newDpi) > 0.0001)
+            {
+                _dpi = newDpi;
+
+                CanvasHelper.SetCanvasSize(_canvas, (int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
+
+                _topLevelImpl.SetClientSize(_canvasSize, _dpi);
+
+                ForceBlit();
+            }
+        }
+
+        private void OnSizeChanged(int height, int width)
+        {
+            var newSize = new Size(height, width);
+
+            if (_canvasSize != newSize)
+            {
+                _canvasSize = newSize;
+
+                CanvasHelper.SetCanvasSize(_canvas, (int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
+
+                _topLevelImpl.SetClientSize(_canvasSize, _dpi);
+
+                ForceBlit();
+            }
+        }
+
+        private void HideIme()
+        {
+            InputHelper.HideElement(_inputElement);
+            InputHelper.FocusElement(_containerElement);
+        }
+
+        void ITextInputMethodImpl.SetClient(ITextInputMethodClient? client)
+        {
+            Console.WriteLine("Set Client");
+            if (_client != null)
+            {
+                _client.SurroundingTextChanged -= SurroundingTextChanged;
+            }
+
+            if (client != null)
+            {
+                client.SurroundingTextChanged += SurroundingTextChanged;
+            }
+
+            InputHelper.ClearInputElement(_inputElement);
+
+            _client = client;
+
+            if (_client != null)
+            {
+                InputHelper.ShowElement(_inputElement);
+                InputHelper.FocusElement(_inputElement);
+
+                var surroundingText = _client.SurroundingText;
+
+                InputHelper.SetSurroundingText(_inputElement, surroundingText.Text, surroundingText.AnchorOffset, surroundingText.CursorOffset);
+
+                Console.WriteLine("Shown, focused and surrounded.");
+            }
+            else
+            {
+                HideIme();
+            }
+        }
+
+        private void SurroundingTextChanged(object? sender, EventArgs e)
+        {
+            if (_client != null)
+            {
+                var surroundingText = _client.SurroundingText;
+
+                InputHelper.SetSurroundingText(_inputElement, surroundingText.Text, surroundingText.AnchorOffset, surroundingText.CursorOffset);
+            }
+        }
+
+        void ITextInputMethodImpl.SetCursorRect(Rect rect)
+        {
+            InputHelper.FocusElement(_inputElement);
+            InputHelper.SetBounds(_inputElement, (int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height, _client?.SurroundingText.CursorOffset ?? 0);
+            InputHelper.FocusElement(_inputElement);
+        }
+
+        void ITextInputMethodImpl.SetOptions(TextInputOptions options)
+        {
+        }
+
+        void ITextInputMethodImpl.Reset()
+        {
+            InputHelper.ClearInputElement(_inputElement);
+            InputHelper.SetSurroundingText(_inputElement, "", 0, 0);
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/BrowserNativeControlHost.cs b/src/Web/Avalonia.Web/BrowserNativeControlHost.cs
new file mode 100644
index 0000000000..4cdcf627e6
--- /dev/null
+++ b/src/Web/Avalonia.Web/BrowserNativeControlHost.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices.JavaScript;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using Avalonia.Web.Interop;
+
+namespace Avalonia.Web
+{
+    internal class BrowserNativeControlHost : INativeControlHostImpl
+    {
+        private readonly JSObject _hostElement;
+
+        public BrowserNativeControlHost(JSObject element)
+        {
+            _hostElement = element;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            var element = NativeControlHostHelper.CreateDefaultChild(null);
+            return new JSObjectControlHandle(element);
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            Attachment? a = null;
+            try
+            {
+                var child = create(new JSObjectControlHandle(_hostElement));
+                var attachmenetReference = NativeControlHostHelper.CreateAttachment();
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+#pragma warning disable IDE0017 // Simplify object initialization
+                a = new Attachment(attachmenetReference, child);
+#pragma warning restore IDE0017 // Simplify object initialization
+                a.AttachedTo = this;
+                return a;
+            }
+            catch
+            {
+                a?.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            var attachmenetReference = NativeControlHostHelper.CreateAttachment();
+            var a = new Attachment(attachmenetReference, handle);
+            a.AttachedTo = this;
+            return a;
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle is JSObjectControlHandle;
+
+        private class Attachment : INativeControlHostControlTopLevelAttachment
+        {
+            private const string InitializeWithChildHandleSymbol = "InitializeWithChildHandle";
+            private const string AttachToSymbol = "AttachTo";
+            private const string ShowInBoundsSymbol = "ShowInBounds";
+            private const string HideWithSizeSymbol = "HideWithSize";
+            private const string ReleaseChildSymbol = "ReleaseChild";
+
+            private JSObject? _native;
+            private BrowserNativeControlHost? _attachedTo;
+
+            public Attachment(JSObject native, IPlatformHandle handle)
+            {
+                _native = native;
+                NativeControlHostHelper.InitializeWithChildHandle(_native, ((JSObjectControlHandle)handle).Object);
+            }
+
+            public void Dispose()
+            {
+                if (_native != null)
+                {
+                    NativeControlHostHelper.ReleaseChild(_native);
+                    _native.Dispose();
+                    _native = null;
+                }
+            }
+
+            public INativeControlHostImpl? AttachedTo
+            {
+                get => _attachedTo!;
+                set
+                {
+                    CheckDisposed();
+
+                    var host = (BrowserNativeControlHost?)value;
+                    if (host == null)
+                    {
+                        NativeControlHostHelper.AttachTo(_native, null);
+                    }
+                    else
+                    {
+                        NativeControlHostHelper.AttachTo(_native, host._hostElement);
+                    }
+                    _attachedTo = host;
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is BrowserNativeControlHost;
+
+            public void HideWithSize(Size size)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    return;
+
+                NativeControlHostHelper.HideWithSize(_native, Math.Max(1, size.Width), Math.Max(1, size.Height));
+            }
+
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("Native control isn't attached to a toplevel");
+
+                bounds = new Rect(bounds.X, bounds.Y, Math.Max(1, bounds.Width),
+                    Math.Max(1, bounds.Height));
+
+                NativeControlHostHelper.ShowInBounds(_native, bounds.X, bounds.Y, bounds.Width, bounds.Height);
+            }
+
+            [MemberNotNull(nameof(_native))]
+            private void CheckDisposed()
+            {
+                if (_native == null)
+                    throw new ObjectDisposedException(nameof(Attachment));
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs b/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs
new file mode 100644
index 0000000000..ebcd3a9921
--- /dev/null
+++ b/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.JavaScript;
+using System.Text.RegularExpressions;
+using Avalonia.Platform;
+using Avalonia.Web.Interop;
+
+namespace Avalonia.Web;
+
+internal class BrowserRuntimePlatform : StandardRuntimePlatform
+{
+    private static readonly Lazy<RuntimePlatformInfo> Info = new(() =>
+    {
+        var result = new RuntimePlatformInfo
+        {
+            IsCoreClr = true, // WASM browser is always CoreCLR
+            IsBrowser = true, // BrowserRuntimePlatform only runs on Browser.
+            OperatingSystem = OperatingSystemType.Browser,
+            IsMobile = AvaloniaModule.IsMobile()
+        };
+        
+        return result;
+    });
+
+    public override RuntimePlatformInfo GetRuntimeInfo() => Info.Value;
+}
diff --git a/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs b/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs
new file mode 100644
index 0000000000..0dcc474f76
--- /dev/null
+++ b/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs
@@ -0,0 +1,54 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Web.Skia;
+using System.Runtime.Versioning;
+using Avalonia.Platform;
+
+namespace Avalonia.Web;
+
+[SupportedOSPlatform("browser")]
+public class BrowserSingleViewLifetime : ISingleViewApplicationLifetime
+{
+    public AvaloniaView? View;
+
+    public Control? MainView
+    {
+        get => View!.Content;
+        set => View!.Content = value;
+    }
+}
+
+public class BrowserPlatformOptions
+{
+    public Func<string, string> FrameworkAssetPathResolver { get; set; } = new(fileName => $"./{fileName}");
+}
+
+[SupportedOSPlatform("browser")]
+public static class WebAppBuilder
+{
+    public static T SetupBrowserApp<T>(
+        this T builder, string mainDivId)
+        where T : AppBuilderBase<T>, new()
+    {
+        var lifetime = new BrowserSingleViewLifetime();
+
+        return builder
+            .UseBrowser()
+            .AfterSetup(b =>
+            {
+                lifetime.View = new AvaloniaView(mainDivId);
+            })
+            .SetupWithLifetime(lifetime);
+    }
+
+    public static T UseBrowser<T>(
+        this T builder)
+        where T : AppBuilderBase<T>, new()
+    {
+        return builder
+            .UseWindowingSubsystem(BrowserWindowingPlatform.Register)
+            .UseSkia()
+            .With(new SkiaOptions { CustomGpuFactory = () => new BrowserSkiaGpu() });
+    }
+}
diff --git a/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs b/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs
new file mode 100644
index 0000000000..ed8f417870
--- /dev/null
+++ b/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Avalonia.Platform;
+using Avalonia.Platform.Storage;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Avalonia.Web.Skia;
+using Avalonia.Web.Storage;
+
+namespace Avalonia.Web
+{
+    [System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
+    internal class BrowserTopLevelImpl : ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost, ITopLevelImplWithStorageProvider
+    {
+        private Size _clientSize;
+        private IInputRoot? _inputRoot;
+        private readonly Stopwatch _sw = Stopwatch.StartNew();
+        private readonly AvaloniaView _avaloniaView;
+        private readonly TouchDevice _touchDevice;
+        private readonly PenDevice _penDevice;
+        private string _currentCursor = CssCursor.Default;
+
+        public BrowserTopLevelImpl(AvaloniaView avaloniaView)
+        {
+            Surfaces = Enumerable.Empty<object>();
+            _avaloniaView = avaloniaView;
+            TransparencyLevel = WindowTransparencyLevel.None;
+            AcrylicCompensationLevels = new AcrylicPlatformCompensationLevels(1, 1, 1);
+            _touchDevice = new TouchDevice();
+            _penDevice = new PenDevice();
+            NativeControlHost = _avaloniaView.GetNativeControlHostImpl();
+        }
+
+        public ulong Timestamp => (ulong)_sw.ElapsedMilliseconds;
+
+        public void SetClientSize(Size newSize, double dpi)
+        {
+            if (Math.Abs(RenderScaling - dpi) > 0.0001)
+            {
+                if (Surfaces.FirstOrDefault() is BrowserSkiaSurface surface)
+                {
+                    surface.Scaling = dpi;
+                }
+                
+                ScalingChanged?.Invoke(dpi);
+            }
+
+            if (newSize != _clientSize)
+            {
+                _clientSize = newSize;
+
+                if (Surfaces.FirstOrDefault() is BrowserSkiaSurface surface)
+                {
+                    surface.Size = new PixelSize((int)newSize.Width, (int)newSize.Height);
+                }
+
+                Resized?.Invoke(newSize, PlatformResizeReason.User);
+            }
+        }
+
+        public bool RawPointerEvent(
+            RawPointerEventType eventType, string pointerType,
+            RawPointerPoint p, RawInputModifiers modifiers, long touchPointId,
+            Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints = null)
+        {
+            if (_inputRoot is { }
+                && Input is { } input)
+            {
+                var device = GetPointerDevice(pointerType);
+                var args = device is TouchDevice ?
+                    new RawTouchEventArgs(device, Timestamp, _inputRoot, eventType, p, modifiers, touchPointId)
+                    {
+                        IntermediatePoints = intermediatePoints
+                    } :
+                    new RawPointerEventArgs(device, Timestamp, _inputRoot, eventType, p, modifiers)
+                    {
+                        RawPointerId = touchPointId,
+                        IntermediatePoints = intermediatePoints
+                    };
+
+                input.Invoke(args);
+
+                return args.Handled;
+            }
+
+            return false;
+        }
+
+        private IPointerDevice GetPointerDevice(string pointerType)
+        {
+            return pointerType switch
+            {
+                "touch" => _touchDevice,
+                "pen" => _penDevice,
+                _ => MouseDevice
+            };
+        }
+
+        public bool RawMouseWheelEvent(Point p, Vector v, RawInputModifiers modifiers)
+        {
+            if (_inputRoot is { })
+            {
+                var args = new RawMouseWheelEventArgs(MouseDevice, Timestamp, _inputRoot, p, v, modifiers);
+                
+                Input?.Invoke(args);
+
+                return args.Handled;
+            }
+
+            return false;
+        }
+
+        public bool RawKeyboardEvent(RawKeyEventType type, string code, string key, RawInputModifiers modifiers)
+        {
+            if (Keycodes.KeyCodes.TryGetValue(code, out var avkey))
+            {
+                if (_inputRoot is { })
+                {
+                    var args = new RawKeyEventArgs(KeyboardDevice, Timestamp, _inputRoot, type, avkey, modifiers);
+
+                    Input?.Invoke(args);
+
+                    return args.Handled;
+                }
+            }
+            else if (Keycodes.KeyCodes.TryGetValue(key, out avkey))
+            {
+                if (_inputRoot is { })
+                {
+                    var args = new RawKeyEventArgs(KeyboardDevice, Timestamp, _inputRoot, type, avkey, modifiers);
+
+                    Input?.Invoke(args);
+
+                    return args.Handled;
+                }
+            }
+
+            return false;
+        }
+
+        public bool RawTextEvent(string text)
+        {
+            if (_inputRoot is { })
+            {
+                var args = new RawTextInputEventArgs(KeyboardDevice, Timestamp, _inputRoot, text);
+                Input?.Invoke(args);
+
+                return args.Handled;
+            }
+
+            return false;
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public IRenderer CreateRenderer(IRenderRoot root)
+        {
+            var loop = AvaloniaLocator.Current.GetRequiredService<IRenderLoop>();
+            return new CompositingRenderer(root, new Compositor(loop, null));
+        }
+
+        public void Invalidate(Rect rect)
+        {
+            //Console.WriteLine("invalidate rect called");
+        }
+
+        public void SetInputRoot(IInputRoot inputRoot)
+        {
+            _inputRoot = inputRoot;
+        }
+
+        public Point PointToClient(PixelPoint point) => new Point(point.X, point.Y);
+
+        public PixelPoint PointToScreen(Point point) => new PixelPoint((int)point.X, (int)point.Y);
+
+        public void SetCursor(ICursorImpl? cursor)
+        {
+            var val = (cursor as CssCursor)?.Value ?? CssCursor.Default;
+            if (_currentCursor != val)
+            {
+                SetCssCursor?.Invoke(val);
+                _currentCursor = val;
+            }
+        }
+
+        public IPopupImpl? CreatePopup()
+        {
+            return null;
+        }
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
+        {
+
+        }
+
+        public Size ClientSize => _clientSize;
+        public Size? FrameSize => null;
+        public double RenderScaling => (Surfaces.FirstOrDefault() as BrowserSkiaSurface)?.Scaling ?? 1;
+
+        public IEnumerable<object> Surfaces { get; set; }
+
+        public Action<string>? SetCssCursor { get; set; }
+        public Action<RawInputEventArgs>? Input { get; set; }
+        public Action<Rect>? Paint { get; set; }
+        public Action<Size, PlatformResizeReason>? Resized { get; set; }
+        public Action<double>? ScalingChanged { get; set; }
+        public Action<WindowTransparencyLevel>? TransparencyLevelChanged { get; set; }
+        public Action? Closed { get; set; }
+        public Action? LostFocus { get; set; }
+        public IMouseDevice MouseDevice { get; } = new MouseDevice();
+
+        public IKeyboardDevice KeyboardDevice { get; } = BrowserWindowingPlatform.Keyboard;
+        public WindowTransparencyLevel TransparencyLevel { get; }
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; }
+
+        public ITextInputMethodImpl TextInputMethod => _avaloniaView;
+
+        public INativeControlHostImpl? NativeControlHost { get; }
+        public IStorageProvider StorageProvider { get; } = new BrowserStorageProvider();
+    }
+}
diff --git a/src/Web/Avalonia.Web/ClipboardImpl.cs b/src/Web/Avalonia.Web/ClipboardImpl.cs
new file mode 100644
index 0000000000..793099f55a
--- /dev/null
+++ b/src/Web/Avalonia.Web/ClipboardImpl.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Web.Interop;
+
+namespace Avalonia.Web
+{
+    internal class ClipboardImpl : IClipboard
+    {
+        public Task<string> GetTextAsync()
+        {
+            return InputHelper.ReadClipboardTextAsync();
+        }
+
+        public Task SetTextAsync(string text)
+        {
+            return InputHelper.WriteClipboardTextAsync(text);
+        }
+
+        public async Task ClearAsync() => await SetTextAsync("");
+
+        public Task SetDataObjectAsync(IDataObject data) => Task.CompletedTask;
+
+        public Task<string[]> GetFormatsAsync() => Task.FromResult(Array.Empty<string>());
+
+        public Task<object> GetDataAsync(string format) => Task.FromResult<object>(new());
+    }
+}
diff --git a/src/Web/Avalonia.Web/Cursor.cs b/src/Web/Avalonia.Web/Cursor.cs
new file mode 100644
index 0000000000..af7098f800
--- /dev/null
+++ b/src/Web/Avalonia.Web/Cursor.cs
@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using Avalonia.Input;
+using Avalonia.Platform;
+
+namespace Avalonia.Web
+{
+    internal class CssCursor : ICursorImpl
+    {
+        public const string Default = "default";
+        public string? Value { get; set; }
+        
+        public CssCursor(StandardCursorType type)
+        {
+            Value = ToKeyword(type);
+        }
+
+        /// <summary>
+        /// Create a cursor from base64 image
+        /// </summary>
+        public CssCursor(string base64, string format, PixelPoint hotspot, StandardCursorType fallback)
+        {
+            Value = $"url(\"data:image/{format};base64,{base64}\") {hotspot.X} {hotspot.Y}, {ToKeyword(fallback)}";
+        }
+        
+        /// <summary>
+        /// Create a cursor from url to *.cur file.
+        /// </summary>
+        public CssCursor(string url, StandardCursorType fallback)
+        {
+            Value = $"url('{url}'), {ToKeyword(fallback)}";
+        }
+        
+        /// <summary>
+        /// Create a cursor from png/svg and hotspot position
+        /// </summary>
+        public CssCursor(string url, PixelPoint hotSpot, StandardCursorType fallback)
+        {
+            Value = $"url('{url}') {hotSpot.X} {hotSpot.Y}, {ToKeyword(fallback)}";
+        }
+        
+        private static string ToKeyword(StandardCursorType type) => type switch
+        {
+            StandardCursorType.Hand => "pointer",
+            StandardCursorType.Cross => "crosshair",
+            StandardCursorType.Help => "help",
+            StandardCursorType.Ibeam => "text",
+            StandardCursorType.No => "not-allowed",
+            StandardCursorType.None => "none",
+            StandardCursorType.Wait => "progress",
+            StandardCursorType.AppStarting => "wait",
+            
+            StandardCursorType.DragMove => "move",
+            StandardCursorType.DragCopy => "copy",
+            StandardCursorType.DragLink => "alias",
+            
+            StandardCursorType.UpArrow => "default",/*not found matching one*/
+            StandardCursorType.SizeWestEast => "ew-resize",
+            StandardCursorType.SizeNorthSouth => "ns-resize",
+            StandardCursorType.SizeAll => "move",
+            
+            StandardCursorType.TopSide => "n-resize",
+            StandardCursorType.BottomSide => "s-resize",
+            StandardCursorType.LeftSide => "w-resize",
+            StandardCursorType.RightSide => "e-resize",
+            StandardCursorType.TopLeftCorner => "nw-resize",
+            StandardCursorType.TopRightCorner => "ne-resize",
+            StandardCursorType.BottomLeftCorner => "sw-resize",
+            StandardCursorType.BottomRightCorner => "se-resize",
+            
+            _ => Default,
+        };
+        
+        public void Dispose() {}
+    }
+
+    internal class CssCursorFactory : ICursorFactory
+    {
+        public ICursorImpl CreateCursor(IBitmapImpl cursor, PixelPoint hotSpot)
+        {
+            using var imageStream = new MemoryStream();
+            cursor.Save(imageStream);
+
+            //not memory optimized because CryptoStream with ToBase64Transform is not supported in the browser.
+            var base64String = Convert.ToBase64String(imageStream.ToArray());
+            return new CssCursor(base64String, "png", hotSpot, StandardCursorType.Arrow);
+        }
+
+        ICursorImpl ICursorFactory.GetCursor(StandardCursorType cursorType)
+        {
+            return new CssCursor(cursorType);
+        }
+    }
+}
+
diff --git a/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs b/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs
new file mode 100644
index 0000000000..0e54deb515
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs
@@ -0,0 +1,25 @@
+using System.Runtime.InteropServices.JavaScript;
+using System.Threading.Tasks;
+
+namespace Avalonia.Web.Interop;
+
+internal static partial class AvaloniaModule
+{
+    public const string MainModuleName = "avalonia";
+    public const string StorageModuleName = "storage";
+
+    public static Task ImportMain()
+    {
+        var options = AvaloniaLocator.Current.GetService<BrowserPlatformOptions>() ?? new BrowserPlatformOptions();
+        return JSHost.ImportAsync(MainModuleName, options.FrameworkAssetPathResolver("avalonia.js"));
+    }
+
+    public static Task ImportStorage()
+    {
+        var options = AvaloniaLocator.Current.GetService<BrowserPlatformOptions>() ?? new BrowserPlatformOptions();
+        return JSHost.ImportAsync(StorageModuleName, options.FrameworkAssetPathResolver("storage.js"));
+    }
+
+    [JSImport("Caniuse.isMobile", AvaloniaModule.MainModuleName)]
+    public static partial bool IsMobile();
+}
diff --git a/src/Web/Avalonia.Web/Interop/CanvasHelper.cs b/src/Web/Avalonia.Web/Interop/CanvasHelper.cs
new file mode 100644
index 0000000000..5bbe503bc1
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/CanvasHelper.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.JavaScript;
+
+namespace Avalonia.Web.Interop;
+
+internal record GLInfo(int ContextId, uint FboId, int Stencils, int Samples, int Depth);
+
+[System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
+internal static partial class CanvasHelper
+{
+
+    [DllImport("libSkiaSharp", CallingConvention = CallingConvention.Cdecl)]
+    static extern JSObject InterceptGLObject();
+
+    public static GLInfo InitialiseGL(JSObject canvas, Action renderFrameCallback)
+    {
+        InterceptGLObject();
+
+        var info = InitGL(canvas, canvas.GetPropertyAsString("id")!, renderFrameCallback);
+
+        var glInfo = new GLInfo(
+            info.GetPropertyAsInt32("context"),
+            (uint)info.GetPropertyAsInt32("fboId"),
+            info.GetPropertyAsInt32("stencil"),
+            info.GetPropertyAsInt32("sample"),
+            info.GetPropertyAsInt32("depth"));
+
+        return glInfo;
+    }
+
+    [JSImport("Canvas.requestAnimationFrame", AvaloniaModule.MainModuleName)]
+    public static partial void RequestAnimationFrame(JSObject canvas, bool renderLoop);
+
+    [JSImport("Canvas.setCanvasSize", AvaloniaModule.MainModuleName)]
+    public static partial void SetCanvasSize(JSObject canvas, int width, int height);
+
+    [JSImport("Canvas.initGL", AvaloniaModule.MainModuleName)]
+    private static partial JSObject InitGL(
+        JSObject canvas,
+        string canvasId,
+        [JSMarshalAs<JSType.Function>] Action renderFrameCallback);
+}
diff --git a/src/Web/Avalonia.Web/Interop/DomHelper.cs b/src/Web/Avalonia.Web/Interop/DomHelper.cs
new file mode 100644
index 0000000000..80f146a57a
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/DomHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.InteropServices.JavaScript;
+
+namespace Avalonia.Web.Interop;
+
+internal static partial class DomHelper
+{
+    [JSImport("globalThis.document.getElementById")]
+    internal static partial JSObject? GetElementById(string id);
+
+    [JSImport("AvaloniaDOM.createAvaloniaHost", AvaloniaModule.MainModuleName)]
+    public static partial JSObject CreateAvaloniaHost(JSObject element);
+
+    [JSImport("AvaloniaDOM.addClass", AvaloniaModule.MainModuleName)]
+    public static partial void AddCssClass(JSObject element, string className);
+
+    [JSImport("SizeWatcher.observe", AvaloniaModule.MainModuleName)]
+    public static partial JSObject ObserveSize(
+        JSObject canvas,
+        string? canvasId,
+        [JSMarshalAs<JSType.Function<JSType.Number, JSType.Number>>]
+        Action<int, int> onSizeChanged);
+
+    [JSImport("DpiWatcher.start", AvaloniaModule.MainModuleName)]
+    public static partial double ObserveDpi(
+       [JSMarshalAs<JSType.Function<JSType.Number, JSType.Number>>]
+        Action<double, double> onDpiChanged);
+}
diff --git a/src/Web/Avalonia.Web/Interop/InputHelper.cs b/src/Web/Avalonia.Web/Interop/InputHelper.cs
new file mode 100644
index 0000000000..904fa915a8
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/InputHelper.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.JavaScript;
+using System.Threading.Tasks;
+
+namespace Avalonia.Web.Interop;
+
+internal static partial class InputHelper
+{
+    [JSImport("InputHelper.subscribeKeyEvents", AvaloniaModule.MainModuleName)]
+    public static partial void SubscribeKeyEvents(
+        JSObject htmlElement,
+        [JSMarshalAs<JSType.Function<JSType.String, JSType.String, JSType.Number, JSType.Boolean>>]
+        Func<string, string, int, bool> keyDown,
+        [JSMarshalAs<JSType.Function<JSType.String, JSType.String, JSType.Number, JSType.Boolean>>]
+        Func<string, string, int, bool> keyUp);
+
+    [JSImport("InputHelper.subscribeTextEvents", AvaloniaModule.MainModuleName)]
+    public static partial void SubscribeTextEvents(
+        JSObject htmlElement,
+        [JSMarshalAs<JSType.Function<JSType.String, JSType.String, JSType.Boolean>>]
+        Func<string, string?, bool> onInput,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> onCompositionStart,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> onCompositionUpdate,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> onCompositionEnd);
+
+    [JSImport("InputHelper.subscribePointerEvents", AvaloniaModule.MainModuleName)]
+    public static partial void SubscribePointerEvents(
+        JSObject htmlElement,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> pointerMove,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> pointerDown,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> pointerUp,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> pointerCancel,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
+        Func<JSObject, bool> wheel);
+
+
+    [JSImport("InputHelper.subscribeInputEvents", AvaloniaModule.MainModuleName)]
+    public static partial void SubscribeInputEvents(
+        JSObject htmlElement,
+        [JSMarshalAs<JSType.Function<JSType.String, JSType.Boolean>>]
+        Func<string, bool> input);
+
+    [JSImport("InputHelper.getCoalescedEvents", AvaloniaModule.MainModuleName)]
+    [return: JSMarshalAs<JSType.Array<JSType.Object>>]
+    public static partial JSObject[] GetCoalescedEvents(JSObject pointerEvent);
+
+    [JSImport("InputHelper.clearInput", AvaloniaModule.MainModuleName)]
+    public static partial void ClearInputElement(JSObject htmlElement);
+
+    [JSImport("InputHelper.isInputElement", AvaloniaModule.MainModuleName)]
+    public static partial void IsInputElement(JSObject htmlElement);
+
+    [JSImport("InputHelper.focusElement", AvaloniaModule.MainModuleName)]
+    public static partial void FocusElement(JSObject htmlElement);
+
+    [JSImport("InputHelper.setCursor", AvaloniaModule.MainModuleName)]
+    public static partial void SetCursor(JSObject htmlElement, string kind);
+
+    [JSImport("InputHelper.hide", AvaloniaModule.MainModuleName)]
+    public static partial void HideElement(JSObject htmlElement);
+
+    [JSImport("InputHelper.show", AvaloniaModule.MainModuleName)]
+    public static partial void ShowElement(JSObject htmlElement);
+
+    [JSImport("InputHelper.setSurroundingText", AvaloniaModule.MainModuleName)]
+    public static partial void SetSurroundingText(JSObject htmlElement, string text, int start, int end);
+
+    [JSImport("InputHelper.setBounds", AvaloniaModule.MainModuleName)]
+    public static partial void SetBounds(JSObject htmlElement, int x, int y, int width, int height, int caret);
+
+    [JSImport("globalThis.navigator.clipboard.readText")]
+    public static partial Task<string> ReadClipboardTextAsync();
+
+    [JSImport("globalThis.navigator.clipboard.writeText")]
+    public static partial Task WriteClipboardTextAsync(string text);
+}
diff --git a/src/Web/Avalonia.Web/Interop/NativeControlHostHelper.cs b/src/Web/Avalonia.Web/Interop/NativeControlHostHelper.cs
new file mode 100644
index 0000000000..d3baaa2533
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/NativeControlHostHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.InteropServices.JavaScript;
+
+namespace Avalonia.Web.Interop;
+
+internal static partial class NativeControlHostHelper
+{
+    [JSImport("NativeControlHost.createDefaultChild", AvaloniaModule.MainModuleName)]
+    internal static partial JSObject CreateDefaultChild(JSObject? parent);
+
+    [JSImport("NativeControlHost.createAttachment", AvaloniaModule.MainModuleName)]
+    internal static partial JSObject CreateAttachment();
+
+    [JSImport("NativeControlHost.initializeWithChildHandle", AvaloniaModule.MainModuleName)]
+    internal static partial void InitializeWithChildHandle(JSObject element, JSObject child);
+
+    [JSImport("NativeControlHost.attachTo", AvaloniaModule.MainModuleName)]
+    internal static partial void AttachTo(JSObject element, JSObject? host);
+
+    [JSImport("NativeControlHost.showInBounds", AvaloniaModule.MainModuleName)]
+    internal static partial void ShowInBounds(JSObject element, double x, double y, double width, double height);
+
+    [JSImport("NativeControlHost.hideWithSize", AvaloniaModule.MainModuleName)]
+    internal static partial void HideWithSize(JSObject element, double width, double height);
+
+    [JSImport("NativeControlHost.releaseChild", AvaloniaModule.MainModuleName)]
+    internal static partial void ReleaseChild(JSObject element);
+}
diff --git a/src/Web/Avalonia.Web/Interop/StorageHelper.cs b/src/Web/Avalonia.Web/Interop/StorageHelper.cs
new file mode 100644
index 0000000000..9a6cfb9fc2
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/StorageHelper.cs
@@ -0,0 +1,55 @@
+using System.Runtime.InteropServices.JavaScript;
+using System.Threading.Tasks;
+
+namespace Avalonia.Web.Interop;
+
+internal static partial class StorageHelper
+{
+    [JSImport("Caniuse.canShowOpenFilePicker", AvaloniaModule.MainModuleName)]
+    public static partial bool CanShowOpenFilePicker();
+
+    [JSImport("Caniuse.canShowSaveFilePicker", AvaloniaModule.MainModuleName)]
+    public static partial bool CanShowSaveFilePicker();
+
+    [JSImport("Caniuse.canShowDirectoryPicker", AvaloniaModule.MainModuleName)]
+    public static partial bool CanShowDirectoryPicker();
+
+    [JSImport("StorageProvider.selectFolderDialog", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject?> SelectFolderDialog(JSObject? startIn);
+
+    [JSImport("StorageProvider.openFileDialog", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject?> OpenFileDialog(JSObject? startIn, bool multiple,
+        [JSMarshalAs<JSType.Array<JSType.Any>>] object[]? types, bool excludeAcceptAllOption);
+
+    [JSImport("StorageProvider.saveFileDialog", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject?> SaveFileDialog(JSObject? startIn, string? suggestedName,
+        [JSMarshalAs<JSType.Array<JSType.Any>>] object[]? types, bool excludeAcceptAllOption);
+
+    [JSImport("StorageProvider.openBookmark", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject?> OpenBookmark(string key);
+
+    [JSImport("StorageItem.saveBookmark", AvaloniaModule.StorageModuleName)]
+    public static partial Task<string?> SaveBookmark(JSObject item);
+
+    [JSImport("StorageItem.deleteBookmark", AvaloniaModule.StorageModuleName)]
+    public static partial Task DeleteBookmark(JSObject item);
+
+    [JSImport("StorageItem.getProperties", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject?> GetProperties(JSObject item);
+
+    [JSImport("StorageItem.openWrite", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject> OpenWrite(JSObject item);
+
+    [JSImport("StorageItem.openRead", AvaloniaModule.StorageModuleName)]
+    public static partial Task<JSObject> OpenRead(JSObject item);
+
+    [JSImport("StorageItem.getItems", AvaloniaModule.StorageModuleName)]
+    [return: JSMarshalAs<JSType.Promise<JSType.Object>>]
+    public static partial Task<JSObject> GetItems(JSObject item);
+
+    [JSImport("StorageItems.itemsArray", AvaloniaModule.StorageModuleName)]
+    public static partial JSObject[] ItemsArray(JSObject item);
+
+    [JSImport("StorageProvider.createAcceptType", AvaloniaModule.StorageModuleName)]
+    public static partial JSObject CreateAcceptType(string description, string[] mimeTypes);
+}
diff --git a/src/Web/Avalonia.Web/Interop/StreamHelper.cs b/src/Web/Avalonia.Web/Interop/StreamHelper.cs
new file mode 100644
index 0000000000..d9de7bcbd8
--- /dev/null
+++ b/src/Web/Avalonia.Web/Interop/StreamHelper.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Runtime.InteropServices.JavaScript;
+using System.Threading.Tasks;
+
+namespace Avalonia.Web.Interop;
+
+/// <summary>
+/// Set of FileSystemWritableFileStream and Blob methods.
+/// </summary>
+internal static partial class StreamHelper
+{
+    [JSImport("StreamHelper.seek", AvaloniaModule.MainModuleName)]
+    public static partial void Seek(JSObject stream, [JSMarshalAs<JSType.Number>] long position);
+
+    [JSImport("StreamHelper.truncate", AvaloniaModule.MainModuleName)]
+    public static partial void Truncate(JSObject stream, [JSMarshalAs<JSType.Number>] long size);
+
+    [JSImport("StreamHelper.write", AvaloniaModule.MainModuleName)]
+    public static partial Task WriteAsync(JSObject stream, [JSMarshalAs<JSType.MemoryView>] ArraySegment<byte> data);
+
+    [JSImport("StreamHelper.close", AvaloniaModule.MainModuleName)]
+    public static partial Task CloseAsync(JSObject stream);
+
+    [JSImport("StreamHelper.byteLength", AvaloniaModule.MainModuleName)]
+    [return: JSMarshalAs<JSType.Number>]
+    public static partial long ByteLength(JSObject stream);
+
+    [JSImport("StreamHelper.sliceArrayBuffer", AvaloniaModule.MainModuleName)]
+    private static partial Task<JSObject> SliceToArrayBuffer(JSObject stream, [JSMarshalAs<JSType.Number>] long offset, int count);
+
+    [JSImport("StreamHelper.toMemoryView", AvaloniaModule.MainModuleName)]
+    [return: JSMarshalAs<JSType.Array<JSType.Number>>]
+    private static partial byte[] ArrayBufferToMemoryView(JSObject stream);
+
+    public static async Task<byte[]> SliceAsync(JSObject stream, long offset, int count)
+    {
+        using var buffer = await SliceToArrayBuffer(stream, offset, count);
+        return ArrayBufferToMemoryView(buffer);
+    }
+}
diff --git a/src/Web/Avalonia.Web/JSObjectControlHandle.cs b/src/Web/Avalonia.Web/JSObjectControlHandle.cs
new file mode 100644
index 0000000000..e56ca123eb
--- /dev/null
+++ b/src/Web/Avalonia.Web/JSObjectControlHandle.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Runtime.InteropServices.JavaScript;
+
+using Avalonia.Controls.Platform;
+
+namespace Avalonia.Web;
+
+public class JSObjectControlHandle : INativeControlHostDestroyableControlHandle
+{
+    internal const string ElementReferenceDescriptor = "JSObject";
+
+    public JSObjectControlHandle(JSObject reference)
+    {
+        Object = reference;
+    }
+
+    public JSObject Object { get; }
+
+    public IntPtr Handle => throw new NotSupportedException();
+
+    public string? HandleDescriptor => ElementReferenceDescriptor;
+
+    public void Destroy()
+    {
+        if (Object is JSObject inProcess && !inProcess.IsDisposed)
+        {
+            inProcess.Dispose();
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Keycodes.cs b/src/Web/Avalonia.Web/Keycodes.cs
new file mode 100644
index 0000000000..d1185f6e45
--- /dev/null
+++ b/src/Web/Avalonia.Web/Keycodes.cs
@@ -0,0 +1,129 @@
+using System.Collections.Generic;
+
+using Avalonia.Input;
+
+namespace Avalonia.Web
+{
+    internal static class Keycodes
+    {
+        public static Dictionary<string, Key> KeyCodes = new()
+        {
+            { "Escape", Key.Escape },
+            { "Digit1", Key.D1 },
+            { "Digit2", Key.D2 },
+            { "Digit3", Key.D3 },
+            { "Digit4", Key.D4 },
+            { "Digit5", Key.D5 },
+            { "Digit6", Key.D6 },
+            { "Digit7", Key.D7 },
+            { "Digit8", Key.D8 },
+            { "Digit9", Key.D9 },
+            { "Digit0", Key.D0 },
+            { "Minus", Key.OemMinus },
+            //{	"Equal"	, Key. },
+            { "Backspace", Key.Back },
+            { "Tab", Key.Tab },
+            { "KeyQ", Key.Q },
+            { "KeyW", Key.W },
+            { "KeyE", Key.E },
+            { "KeyR", Key.R },
+            { "KeyT", Key.T },
+            { "KeyY", Key.Y },
+            { "KeyU", Key.U },
+            { "KeyI", Key.I },
+            { "KeyO", Key.O },
+            { "KeyP", Key.P },
+            { "BracketLeft", Key.OemOpenBrackets },
+            { "BracketRight", Key.OemCloseBrackets },
+            { "Enter", Key.Enter },
+            { "ControlLeft", Key.LeftCtrl },
+            { "KeyA", Key.A },
+            { "KeyS", Key.S },
+            { "KeyD", Key.D },
+            { "KeyF", Key.F },
+            { "KeyG", Key.G },
+            { "KeyH", Key.H },
+            { "KeyJ", Key.J },
+            { "KeyK", Key.K },
+            { "KeyL", Key.L },
+            { "Semicolon", Key.OemSemicolon },
+            { "Quote", Key.OemQuotes },
+            //{	"Backquote"	, Key. },
+            { "ShiftLeft", Key.LeftShift },
+            { "Backslash", Key.OemBackslash },
+            { "KeyZ", Key.Z },
+            { "KeyX", Key.X },
+            { "KeyC", Key.C },
+            { "KeyV", Key.V },
+            { "KeyB", Key.B },
+            { "KeyN", Key.N },
+            { "KeyM", Key.M },
+            { "Comma", Key.OemComma },
+            { "Period", Key.OemPeriod },
+            //{	"Slash"	, Key. },
+            { "ShiftRight", Key.RightShift },
+            { "NumpadMultiply", Key.Multiply },
+            { "AltLeft", Key.LeftAlt },
+            { "Space", Key.Space },
+            { "CapsLock", Key.CapsLock },
+            { "F1", Key.F1 },
+            { "F2", Key.F2 },
+            { "F3", Key.F3 },
+            { "F4", Key.F4 },
+            { "F5", Key.F5 },
+            { "F6", Key.F6 },
+            { "F7", Key.F7 },
+            { "F8", Key.F8 },
+            { "F9", Key.F9 },
+            { "F10", Key.F10 },
+            { "NumLock", Key.NumLock },
+            { "ScrollLock", Key.Scroll },
+            { "Numpad7", Key.NumPad7 },
+            { "Numpad8", Key.NumPad8 },
+            { "Numpad9", Key.NumPad9 },
+            { "NumpadSubtract", Key.Subtract },
+            { "Numpad4", Key.NumPad4 },
+            { "Numpad5", Key.NumPad5 },
+            { "Numpad6", Key.NumPad6 },
+            { "NumpadAdd", Key.Add },
+            { "Numpad1", Key.NumPad1 },
+            { "Numpad2", Key.NumPad2 },
+            { "Numpad3", Key.NumPad3 },
+            { "Numpad0", Key.NumPad0 },
+            { "NumpadDecimal", Key.Decimal },
+            { "Unidentified", Key.NoName },
+            //{	"IntlBackslash"	, Key.bac },
+            { "F11", Key.F11 },
+            { "F12", Key.F12 },
+            //{	"IntlRo"	, Key.Ro },
+            //{	"Unidentified"	, Key. },
+            { "Convert", Key.ImeConvert },
+            { "KanaMode", Key.KanaMode },
+            { "NonConvert", Key.ImeNonConvert },
+            //{	"Unidentified"	, Key. },
+            { "NumpadEnter", Key.Enter },
+            { "ControlRight", Key.RightCtrl },
+            { "NumpadDivide", Key.Divide },
+            { "PrintScreen", Key.PrintScreen },
+            { "AltRight", Key.RightAlt },
+            //{	"Unidentified"	, Key. },
+            { "Home", Key.Home },
+            { "ArrowUp", Key.Up },
+            { "PageUp", Key.PageUp },
+            { "ArrowLeft", Key.Left },
+            { "ArrowRight", Key.Right },
+            { "End", Key.End },
+            { "ArrowDown", Key.Down },
+            { "PageDown", Key.PageDown },
+            { "Insert", Key.Insert },
+            { "Delete", Key.Delete },
+            //{	"Unidentified"	, Key. },
+            { "AudioVolumeMute", Key.VolumeMute },
+            { "AudioVolumeDown", Key.VolumeDown },
+            { "AudioVolumeUp", Key.VolumeUp },
+            //{	"NumpadEqual"	, Key. },
+            { "Pause", Key.Pause },
+            { "NumpadComma", Key.OemComma }
+        };
+    }
+}
diff --git a/src/Web/Avalonia.Web/ManualTriggerRenderTimer.cs b/src/Web/Avalonia.Web/ManualTriggerRenderTimer.cs
new file mode 100644
index 0000000000..3309a6dd9f
--- /dev/null
+++ b/src/Web/Avalonia.Web/ManualTriggerRenderTimer.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Diagnostics;
+using Avalonia.Rendering;
+
+namespace Avalonia.Web
+{
+    internal class ManualTriggerRenderTimer : IRenderTimer
+    {
+        private static readonly Stopwatch s_sw = Stopwatch.StartNew();
+
+        public static ManualTriggerRenderTimer Instance { get; } = new();
+
+        public void RaiseTick() => Tick?.Invoke(s_sw.Elapsed);
+
+        public event Action<TimeSpan>? Tick;
+        public bool RunsInBackground => false;
+    }
+}
diff --git a/src/Web/Avalonia.Web/Skia/BrowserSkiaGpu.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpu.cs
new file mode 100644
index 0000000000..f80838232b
--- /dev/null
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpu.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Avalonia.Skia;
+
+namespace Avalonia.Web.Skia
+{
+    public class BrowserSkiaGpu : ISkiaGpu
+    {
+        public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces)
+        {
+            foreach (var surface in surfaces)
+            {
+                if (surface is BrowserSkiaSurface browserSkiaSurface)
+                {
+                    return new BrowserSkiaGpuRenderTarget(browserSkiaSurface);
+                }
+            }
+
+            return null;
+        }
+
+        public ISkiaSurface? TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderSession.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderSession.cs
new file mode 100644
index 0000000000..a7f7d9db3d
--- /dev/null
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderSession.cs
@@ -0,0 +1,36 @@
+using Avalonia.Skia;
+using SkiaSharp;
+
+namespace Avalonia.Web.Skia
+{
+    internal class BrowserSkiaGpuRenderSession : ISkiaGpuRenderSession
+    {
+        private readonly SKSurface _surface;
+
+        public BrowserSkiaGpuRenderSession(BrowserSkiaSurface browserSkiaSurface, GRBackendRenderTarget renderTarget)
+        {
+            _surface = SKSurface.Create(browserSkiaSurface.Context, renderTarget, browserSkiaSurface.Origin, browserSkiaSurface.ColorType);
+
+            GrContext = browserSkiaSurface.Context;
+
+            ScaleFactor = browserSkiaSurface.Scaling;
+
+            SurfaceOrigin = browserSkiaSurface.Origin;
+        }
+
+        public void Dispose()
+        {
+            _surface.Flush();
+
+            _surface.Dispose();
+        }
+
+        public GRContext GrContext { get; }
+
+        public SKSurface SkSurface => _surface;
+
+        public double ScaleFactor { get; }
+
+        public GRSurfaceOrigin SurfaceOrigin { get; }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderTarget.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderTarget.cs
new file mode 100644
index 0000000000..dba9b34166
--- /dev/null
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderTarget.cs
@@ -0,0 +1,39 @@
+using Avalonia.Skia;
+using SkiaSharp;
+
+namespace Avalonia.Web.Skia
+{
+    internal class BrowserSkiaGpuRenderTarget : ISkiaGpuRenderTarget
+    {
+        private readonly GRBackendRenderTarget _renderTarget;
+        private readonly BrowserSkiaSurface _browserSkiaSurface;
+        private readonly PixelSize _size;
+
+        public BrowserSkiaGpuRenderTarget(BrowserSkiaSurface browserSkiaSurface)
+        {
+            _size = browserSkiaSurface.Size;
+
+            var glFbInfo = new GRGlFramebufferInfo(browserSkiaSurface.GlInfo.FboId, browserSkiaSurface.ColorType.ToGlSizedFormat());
+            {
+                _browserSkiaSurface = browserSkiaSurface;
+                _renderTarget = new GRBackendRenderTarget(
+                    (int)(browserSkiaSurface.Size.Width * browserSkiaSurface.Scaling),
+                    (int)(browserSkiaSurface.Size.Height * browserSkiaSurface.Scaling),
+                    browserSkiaSurface.GlInfo.Samples,
+                    browserSkiaSurface.GlInfo.Stencils, glFbInfo);
+            }
+        }
+
+        public void Dispose()
+        {
+            _renderTarget.Dispose();
+        }
+
+        public ISkiaGpuRenderSession BeginRenderingSession()
+        {
+            return new BrowserSkiaGpuRenderSession(_browserSkiaSurface, _renderTarget);
+        }
+
+        public bool IsCorrupted => _browserSkiaSurface.Size != _size;
+    }
+}
diff --git a/src/Web/Avalonia.Web/Skia/BrowserSkiaRasterSurface.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaRasterSurface.cs
new file mode 100644
index 0000000000..c7005583ac
--- /dev/null
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaRasterSurface.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Controls.Platform.Surfaces;
+using Avalonia.Platform;
+using Avalonia.Skia;
+using SkiaSharp;
+
+namespace Avalonia.Web.Skia
+{
+    internal class BrowserSkiaRasterSurface : IBrowserSkiaSurface, IFramebufferPlatformSurface, IDisposable
+    {
+        public SKColorType ColorType { get; set; }
+
+        public PixelSize Size { get; set; }
+
+        public double Scaling { get; set; }
+
+        private FramebufferData? _fbData;
+        private readonly Action<IntPtr, SKSizeI> _blitCallback;
+        private readonly Action _onDisposeAction;
+
+        public BrowserSkiaRasterSurface(
+            SKColorType colorType, PixelSize size, double scaling, Action<IntPtr, SKSizeI> blitCallback)
+        {
+            ColorType = colorType;
+            Size = size;
+            Scaling = scaling;
+            _blitCallback = blitCallback;
+            _onDisposeAction = Blit;
+        }
+
+        public void Dispose()
+        {
+            _fbData?.Dispose();
+            _fbData = null;
+        }
+
+        public ILockedFramebuffer Lock()
+        {
+            var bytesPerPixel = 4; // TODO: derive from ColorType
+            var dpi = Scaling * 96.0;
+            var width = (int)(Size.Width * Scaling);
+            var height = (int)(Size.Height * Scaling);
+
+            if (_fbData is null || _fbData?.Size.Width != width || _fbData?.Size.Height != height)
+            {
+                _fbData?.Dispose();
+                _fbData = new FramebufferData(width, height, bytesPerPixel);
+            }
+
+            var pixelFormat = ColorType.ToPixelFormat();
+            var data = _fbData.Value;
+            return new LockedFramebuffer(
+                data.Address, data.Size, data.RowBytes,
+                new Vector(dpi, dpi), pixelFormat, _onDisposeAction);
+        }
+
+        private void Blit()
+        {
+            if (_fbData != null)
+            {
+                var data = _fbData.Value;
+                _blitCallback(data.Address, new SKSizeI(data.Size.Width, data.Size.Height));
+            }
+        }
+
+        private readonly struct FramebufferData
+        {
+            public PixelSize Size { get; }
+
+            public int RowBytes { get; }
+
+            public IntPtr Address { get; }
+
+            public FramebufferData(int width, int height, int bytesPerPixel)
+            {
+                Size = new PixelSize(width, height);
+                RowBytes = width * bytesPerPixel;
+                Address = Marshal.AllocHGlobal(width * height * bytesPerPixel);
+            }
+
+            public void Dispose()
+            {
+                Marshal.FreeHGlobal(Address);
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Skia/BrowserSkiaSurface.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaSurface.cs
new file mode 100644
index 0000000000..27a206c0ec
--- /dev/null
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaSurface.cs
@@ -0,0 +1,30 @@
+using Avalonia.Web.Interop;
+using SkiaSharp;
+
+namespace Avalonia.Web.Skia
+{
+    internal class BrowserSkiaSurface : IBrowserSkiaSurface
+    {
+        public BrowserSkiaSurface(GRContext context, GLInfo glInfo, SKColorType colorType, PixelSize size, double scaling, GRSurfaceOrigin origin)
+        {
+            Context = context;
+            GlInfo = glInfo;
+            ColorType = colorType;
+            Size = size;
+            Scaling = scaling;
+            Origin = origin;
+        }
+
+        public SKColorType ColorType { get; set; }
+
+        public PixelSize Size { get; set; }
+
+        public GRContext Context { get; set; }
+
+        public GRSurfaceOrigin Origin { get; set; }
+
+        public double Scaling { get; set; }
+
+        public GLInfo GlInfo { get; set; }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Skia/IBrowserSkiaSurface.cs b/src/Web/Avalonia.Web/Skia/IBrowserSkiaSurface.cs
new file mode 100644
index 0000000000..7301ae45cd
--- /dev/null
+++ b/src/Web/Avalonia.Web/Skia/IBrowserSkiaSurface.cs
@@ -0,0 +1,9 @@
+namespace Avalonia.Web.Skia
+{
+    internal interface IBrowserSkiaSurface
+    {
+        public PixelSize Size { get; set; }
+
+        public double Scaling { get; set; }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Storage/BlobReadableStream.cs b/src/Web/Avalonia.Web/Storage/BlobReadableStream.cs
new file mode 100644
index 0000000000..77734ea62f
--- /dev/null
+++ b/src/Web/Avalonia.Web/Storage/BlobReadableStream.cs
@@ -0,0 +1,90 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices.JavaScript;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Avalonia.Web.Interop;
+
+namespace Avalonia.Web.Storage;
+
+[System.Runtime.Versioning.SupportedOSPlatform("browser")]
+internal class BlobReadableStream : Stream
+{
+    private JSObject? _jSReference;
+    private long _position;
+    private readonly long _length;
+
+    public BlobReadableStream(JSObject jsStreamReference)
+    {
+        _jSReference = jsStreamReference;
+        _position = 0;
+        _length = StreamHelper.ByteLength(JSReference);
+    }
+
+    private JSObject JSReference => _jSReference ?? throw new ObjectDisposedException(nameof(WriteableStream));
+
+    public override bool CanRead => true;
+
+    public override bool CanSeek => false;
+
+    public override bool CanWrite => false;
+
+    public override long Length => _length;
+
+    public override long Position
+    {
+        get => _position;
+        set => throw new NotSupportedException();
+    }
+
+    public override void Flush() { }
+
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        return _position = origin switch
+        {
+            SeekOrigin.Current => _position + offset,
+            SeekOrigin.End => _length + offset,
+            _ => offset
+        };
+    }
+
+    public override void SetLength(long value)
+        => throw new NotSupportedException();
+
+    public override void Write(byte[] buffer, int offset, int count)
+        => throw new NotSupportedException();
+
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        throw new InvalidOperationException("Browser supports only ReadAsync");
+    }
+
+    public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        => await ReadAsync(buffer.AsMemory(offset, count), cancellationToken);
+
+    public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
+    {
+        var numBytesToRead = (int)Math.Min(buffer.Length, Length - _position);
+        var bytesRead = await StreamHelper.SliceAsync(JSReference, _position, numBytesToRead);
+        if (bytesRead.Length != numBytesToRead)
+        {
+            throw new EndOfStreamException("Failed to read the requested number of bytes from the stream.");
+        }
+
+        _position += bytesRead.Length;
+        bytesRead.CopyTo(buffer);
+
+        return bytesRead.Length;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (_jSReference is { } jsReference)
+        {
+            _jSReference = null;
+            jsReference.Dispose();
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/Storage/BrowserStorageProvider.cs b/src/Web/Avalonia.Web/Storage/BrowserStorageProvider.cs
new file mode 100644
index 0000000000..3932b79ad0
--- /dev/null
+++ b/src/Web/Avalonia.Web/Storage/BrowserStorageProvider.cs
@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.JavaScript;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+
+using Avalonia.Platform.Storage;
+using Avalonia.Web.Interop;
+
+namespace Avalonia.Web.Storage;
+
+internal record FilePickerAcceptType(string Description, IReadOnlyDictionary<string, IReadOnlyList<string>> Accept);
+
+[SupportedOSPlatform("browser")]
+internal class BrowserStorageProvider : IStorageProvider
+{
+    internal const string PickerCancelMessage = "The user aborted a request";
+    internal const string NoPermissionsMessage = "Permissions denied";
+
+    private readonly Lazy<Task> _lazyModule = new(() => AvaloniaModule.ImportStorage());
+
+    public bool CanOpen => StorageHelper.CanShowOpenFilePicker();
+    public bool CanSave => StorageHelper.CanShowSaveFilePicker();
+    public bool CanPickFolder => StorageHelper.CanShowDirectoryPicker();
+
+    public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+    {
+        await _lazyModule.Value;
+        var startIn = (options.SuggestedStartLocation as JSStorageItem)?.FileHandle;
+
+        var (types, exludeAll) = ConvertFileTypes(options.FileTypeFilter);
+
+        try
+        {
+            using var items = await StorageHelper.OpenFileDialog(startIn, options.AllowMultiple, types, exludeAll);
+            if (items is null)
+            {
+                return Array.Empty<IStorageFile>();
+            }
+
+            var itemsArray = StorageHelper.ItemsArray(items);
+            return itemsArray.Select(item => new JSStorageFile(item)).ToArray();
+        }
+        catch (JSException ex) when (ex.Message.Contains(PickerCancelMessage, StringComparison.Ordinal))
+        {
+            return Array.Empty<IStorageFile>();
+        }
+        finally
+        {
+            if (types is not null)
+            {
+                foreach (var type in types)
+                {
+                    type.Dispose();
+                }
+            }
+        }
+    }
+
+    public async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+    {
+        await _lazyModule.Value;
+        var startIn = (options.SuggestedStartLocation as JSStorageItem)?.FileHandle;
+
+        var (types, exludeAll) = ConvertFileTypes(options.FileTypeChoices);
+
+        try
+        {
+            var item = await StorageHelper.SaveFileDialog(startIn, options.SuggestedFileName, types, exludeAll);
+            return item is not null ? new JSStorageFile(item) : null;
+        }
+        catch (JSException ex) when (ex.Message.Contains(PickerCancelMessage, StringComparison.Ordinal))
+        {
+            return null;
+        }
+        finally
+        {
+            if (types is not null)
+            {
+                foreach (var type in types)
+                {
+                    type.Dispose();
+                }
+            }
+        }
+    }
+
+    public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+    {
+        await _lazyModule.Value;
+        var startIn = (options.SuggestedStartLocation as JSStorageItem)?.FileHandle;
+
+        try
+        {
+            var item = await StorageHelper.SelectFolderDialog(startIn);
+            return item is not null ? new[] { new JSStorageFolder(item) } : Array.Empty<IStorageFolder>();
+        }
+        catch (JSException ex) when (ex.Message.Contains(PickerCancelMessage, StringComparison.Ordinal))
+        {
+            return Array.Empty<IStorageFolder>();
+        }
+    }
+
+    public async Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark)
+    {
+        await _lazyModule.Value;
+        var item = await StorageHelper.OpenBookmark(bookmark);
+        return item is not null ? new JSStorageFile(item) : null;
+    }
+
+    public async Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark)
+    {
+        await _lazyModule.Value;
+        var item = await StorageHelper.OpenBookmark(bookmark);
+        return item is not null ? new JSStorageFolder(item) : null;
+    }
+
+    private static (JSObject[]? types, bool excludeAllOption) ConvertFileTypes(IEnumerable<FilePickerFileType>? input)
+    {
+        var types = input?
+            .Where(t => t.MimeTypes?.Any() == true && t != FilePickerFileTypes.All)
+            .Select(t => StorageHelper.CreateAcceptType(t.Name, t.MimeTypes!.ToArray()))
+            .ToArray();
+        if (types?.Length == 0)
+        {
+            types = null;
+        }
+
+        var inlcudeAll = input?.Contains(FilePickerFileTypes.All) == true || types is null;
+
+        return (types, !inlcudeAll);
+    }
+}
+
+internal abstract class JSStorageItem : IStorageBookmarkItem
+{
+    internal JSObject? _fileHandle;
+
+    protected JSStorageItem(JSObject fileHandle)
+    {
+        _fileHandle = fileHandle ?? throw new ArgumentNullException(nameof(fileHandle));
+    }
+
+    internal JSObject FileHandle => _fileHandle ?? throw new ObjectDisposedException(nameof(JSStorageItem));
+
+    public string Name => FileHandle.GetPropertyAsString("name") ?? string.Empty;
+
+    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
+    {
+        uri = new Uri(Name, UriKind.Relative);
+        return false;
+    }
+
+    public async Task<StorageItemProperties> GetBasicPropertiesAsync()
+    {
+        using var properties = await StorageHelper.GetProperties(FileHandle);
+        var size = (long?)properties?.GetPropertyAsDouble("Size");
+        var lastModified = (long?)properties?.GetPropertyAsDouble("LastModified");
+
+        return new StorageItemProperties(
+            (ulong?)size,
+            dateCreated: null,
+            dateModified: lastModified > 0 ? DateTimeOffset.FromUnixTimeMilliseconds(lastModified.Value) : null);
+    }
+
+    public bool CanBookmark => true;
+
+    public Task<string?> SaveBookmarkAsync()
+    {
+        return StorageHelper.SaveBookmark(FileHandle);
+    }
+
+    public Task<IStorageFolder?> GetParentAsync()
+    {
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public Task ReleaseBookmarkAsync()
+    {
+        return StorageHelper.DeleteBookmark(FileHandle);
+    }
+
+    public void Dispose()
+    {
+        _fileHandle?.Dispose();
+        _fileHandle = null;
+    }
+}
+
+internal class JSStorageFile : JSStorageItem, IStorageBookmarkFile
+{
+    public JSStorageFile(JSObject fileHandle) : base(fileHandle)
+    {
+    }
+
+    public bool CanOpenRead => true;
+    public async Task<Stream> OpenReadAsync()
+    {
+        try
+        {
+            var blob = await StorageHelper.OpenRead(FileHandle);
+            return new BlobReadableStream(blob);
+        }
+        catch (JSException ex) when (ex.Message == BrowserStorageProvider.NoPermissionsMessage)
+        {
+            throw new UnauthorizedAccessException("User denied permissions to open the file", ex);
+        }
+    }
+
+    public bool CanOpenWrite => true;
+    public async Task<Stream> OpenWriteAsync()
+    {
+        try
+        {
+            using var properties = await StorageHelper.GetProperties(FileHandle);
+            var streamWriter = await StorageHelper.OpenWrite(FileHandle);
+            var size = (long?)properties?.GetPropertyAsDouble("Size") ?? 0;
+
+            return new WriteableStream(streamWriter, size);
+        }
+        catch (JSException ex) when (ex.Message == BrowserStorageProvider.NoPermissionsMessage)
+        {
+            throw new UnauthorizedAccessException("User denied permissions to open the file", ex);
+        }
+    }
+}
+
+internal class JSStorageFolder : JSStorageItem, IStorageBookmarkFolder
+{
+    public JSStorageFolder(JSObject fileHandle) : base(fileHandle)
+    {
+    }
+
+    public async Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+        using var items = await StorageHelper.GetItems(FileHandle);
+        if (items is null)
+        {
+            return Array.Empty<IStorageItem>();
+        }
+
+        var itemsArray = StorageHelper.ItemsArray(items);
+
+        return itemsArray
+            .Select(reference => reference.GetPropertyAsString("kind") switch
+            {
+                "directory" => (IStorageItem)new JSStorageFolder(reference),
+                "file" => new JSStorageFile(reference),
+                _ => null
+            })
+            .Where(i => i is not null)
+            .ToArray()!;
+    }
+}
diff --git a/src/Web/Avalonia.Web/Storage/WriteableStream.cs b/src/Web/Avalonia.Web/Storage/WriteableStream.cs
new file mode 100644
index 0000000000..09e438c34e
--- /dev/null
+++ b/src/Web/Avalonia.Web/Storage/WriteableStream.cs
@@ -0,0 +1,126 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices.JavaScript;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Avalonia.Web.Interop;
+
+namespace Avalonia.Web.Storage;
+
+[System.Runtime.Versioning.SupportedOSPlatform("browser")]
+// Loose wrapper implementaion of a stream on top of FileAPI FileSystemWritableFileStream
+internal sealed class WriteableStream : Stream
+{
+    private JSObject? _jSReference;
+
+    // Unfortunatelly we can't read current length/position, so we need to keep it C#-side only.
+    private long _length, _position;
+
+    internal WriteableStream(JSObject jSReference, long initialLength)
+    {
+        _jSReference = jSReference;
+        _length = initialLength;
+    }
+
+    private JSObject JSReference => _jSReference ?? throw new ObjectDisposedException(nameof(WriteableStream));
+
+    public override bool CanRead => false;
+
+    public override bool CanSeek => true;
+
+    public override bool CanWrite => true;
+
+    public override long Length => _length;
+
+    public override long Position
+    {
+        get => _position;
+        set => Seek(_position, SeekOrigin.Begin);
+    }
+
+    public override void Flush()
+    {
+        // no-op
+    }
+
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        throw new NotSupportedException();
+    }
+
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        var position = origin switch
+        {
+            SeekOrigin.Current => _position + offset,
+            SeekOrigin.End => _length + offset,
+            _ => offset
+        };
+        StreamHelper.Seek(JSReference, position);
+        return position;
+    }
+
+    public override void SetLength(long value)
+    {
+        _length = value;
+
+        // See https://docs.w3cub.com/dom/filesystemwritablefilestream/truncate
+        // If the offset is smaller than the size, it remains unchanged. If the offset is larger than size, the offset is set to that size
+        if (_position > _length)
+        {
+            _position = _length;
+        }
+
+        StreamHelper.Truncate(JSReference, value);
+    }
+
+    public override void Write(byte[] buffer, int offset, int count)
+    {
+        throw new InvalidOperationException("Browser supports only WriteAsync");
+    }
+
+    public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
+    {
+        return new ValueTask(WriteAsyncInternal(buffer.ToArray(), cancellationToken));
+    }
+
+    private Task WriteAsyncInternal(byte[] buffer, CancellationToken _)
+    {
+        _position += buffer.Length;
+
+        return StreamHelper.WriteAsync(JSReference, buffer);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (_jSReference is { } jsReference)
+        {
+            _jSReference = null;
+            try
+            {
+                _ = StreamHelper.CloseAsync(jsReference);
+            }
+            finally
+            {
+                jsReference.Dispose();
+            }
+        }
+    }
+
+    public override async ValueTask DisposeAsync()
+    {
+        if (_jSReference is { } jsReference)
+        {
+            _jSReference = null;
+            try
+            {
+                await StreamHelper.CloseAsync(jsReference);
+            }
+            finally
+            {
+                jsReference.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/WebEmbeddableControlRoot.cs b/src/Web/Avalonia.Web/WebEmbeddableControlRoot.cs
new file mode 100644
index 0000000000..19f36403ad
--- /dev/null
+++ b/src/Web/Avalonia.Web/WebEmbeddableControlRoot.cs
@@ -0,0 +1,68 @@
+using System;
+using Avalonia.Controls.Embedding;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+
+namespace Avalonia.Web
+{
+    internal class WebEmbeddableControlRoot : EmbeddableControlRoot
+    {
+        class SplashScreenCloseCustomDrawingOperation : ICustomDrawOperation
+        {
+            private bool _hasRendered;
+            private Action _onFirstRender;
+
+            public SplashScreenCloseCustomDrawingOperation(Action onFirstRender)
+            {
+                _onFirstRender = onFirstRender;
+            }
+
+            public Rect Bounds => Rect.Empty;
+
+            public bool HasRendered => _hasRendered;
+
+            public void Dispose()
+            {
+                
+            }
+
+            public bool Equals(ICustomDrawOperation? other)
+            {
+                return false;
+            }
+
+            public bool HitTest(Point p)
+            {
+                return false;
+            }
+
+            public void Render(IDrawingContextImpl context)
+            {
+                _hasRendered = true;
+                _onFirstRender();
+            }
+        }
+
+        public WebEmbeddableControlRoot(ITopLevelImpl impl, Action onFirstRender) : base(impl)
+        {
+            _splashCloseOp = new SplashScreenCloseCustomDrawingOperation(() =>
+            {
+                _splashCloseOp = null;
+                onFirstRender();
+            });
+        }
+
+        private SplashScreenCloseCustomDrawingOperation? _splashCloseOp;
+
+        public override void Render(DrawingContext context)
+        {
+            base.Render(context);
+
+            if (_splashCloseOp != null)
+            {
+                context.Custom(_splashCloseOp);
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/WinStubs.cs b/src/Web/Avalonia.Web/WinStubs.cs
new file mode 100644
index 0000000000..b0961115fe
--- /dev/null
+++ b/src/Web/Avalonia.Web/WinStubs.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.IO;
+using Avalonia.Platform;
+
+#nullable enable
+
+namespace Avalonia.Web
+{
+    internal class IconLoaderStub : IPlatformIconLoader
+    {
+        private class IconStub : IWindowIconImpl
+        {
+            public void Save(Stream outputStream)
+            {
+
+            }
+        }
+
+        public IWindowIconImpl LoadIcon(string fileName) => new IconStub();
+
+        public IWindowIconImpl LoadIcon(Stream stream) => new IconStub();
+
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) => new IconStub();
+    }
+
+    internal class ScreenStub : IScreenImpl
+    {
+        public int ScreenCount => 1;
+
+        public IReadOnlyList<Screen> AllScreens { get; } =
+            new[] { new Screen(96, new PixelRect(0, 0, 4000, 4000), new PixelRect(0, 0, 4000, 4000), true) };
+
+        public Screen? ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen? ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen? ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/WindowingPlatform.cs b/src/Web/Avalonia.Web/WindowingPlatform.cs
new file mode 100644
index 0000000000..828964afa7
--- /dev/null
+++ b/src/Web/Avalonia.Web/WindowingPlatform.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Threading;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Threading;
+
+namespace Avalonia.Web
+{
+    internal class BrowserWindowingPlatform : IWindowingPlatform, IPlatformThreadingInterface
+    {
+        private bool _signaled;
+        private static KeyboardDevice? s_keyboard;
+
+        public IWindowImpl CreateWindow() => throw new NotSupportedException();
+
+        IWindowImpl IWindowingPlatform.CreateEmbeddableWindow()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ITrayIconImpl? CreateTrayIcon()
+        {
+            return null;
+        }
+
+        public static KeyboardDevice Keyboard => s_keyboard ??
+            throw new InvalidOperationException("BrowserWindowingPlatform not registered.");
+
+        public static void Register()
+        {
+            var instance = new BrowserWindowingPlatform();
+
+            s_keyboard = new KeyboardDevice();
+            AvaloniaLocator.CurrentMutable
+                .Bind<IRuntimePlatform>().ToSingleton<BrowserRuntimePlatform>()
+                .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
+                .Bind<ICursorFactory>().ToSingleton<CssCursorFactory>()
+                .Bind<IKeyboardDevice>().ToConstant(s_keyboard)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
+                .Bind<IPlatformThreadingInterface>().ToConstant(instance)
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
+                .Bind<IRenderTimer>().ToConstant(ManualTriggerRenderTimer.Instance)
+                .Bind<IWindowingPlatform>().ToConstant(instance)
+                .Bind<IPlatformIconLoader>().ToSingleton<IconLoaderStub>()
+                .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
+        }
+
+        public void RunLoop(CancellationToken cancellationToken)
+        {
+            throw new NotSupportedException();
+        }
+
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
+        {
+            return GetRuntimePlatform()
+                .StartSystemTimer(interval, () =>
+                {
+                    Dispatcher.UIThread.RunJobs(priority);
+                    tick();
+                });
+        }
+
+        public void Signal(DispatcherPriority priority)
+        {
+            if (_signaled)
+                return;
+
+            _signaled = true;
+
+            IDisposable? disp = null;
+
+            disp = GetRuntimePlatform()
+                .StartSystemTimer(TimeSpan.FromMilliseconds(1),
+                    () =>
+                    {
+                        _signaled = false;
+                        disp?.Dispose();
+
+                        Signaled?.Invoke(null);
+                    });
+        }
+
+        public bool CurrentThreadIsLoopThread
+        {
+            get
+            {
+                return true; // Browser is single threaded.
+            }
+        }
+
+        public event Action<DispatcherPriority?>? Signaled;
+
+        private static IRuntimePlatform GetRuntimePlatform()
+        {
+            return AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/interop.js b/src/Web/Avalonia.Web/interop.js
new file mode 100644
index 0000000000..c7ae3a56c7
--- /dev/null
+++ b/src/Web/Avalonia.Web/interop.js
@@ -0,0 +1,13 @@
+var LibraryExample = {
+    // Internal functions
+    $EXAMPLE: {
+        internal_func: function () {
+        }
+    },
+    InterceptGLObject: function () {
+        globalThis.AvaloniaGL = GL
+    }
+}
+
+autoAddDeps(LibraryExample, '$EXAMPLE')
+mergeInto(LibraryManager.library, LibraryExample)
diff --git a/src/Web/Avalonia.Web/webapp/.eslintrc.json b/src/Web/Avalonia.Web/webapp/.eslintrc.json
new file mode 100644
index 0000000000..4b7e24987f
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/.eslintrc.json
@@ -0,0 +1,47 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "extends": "standard-with-typescript",
+  "overrides": [],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "project": [
+      "tsconfig.json"
+    ]
+  },
+  "rules": {
+    "indent": [
+      "warn",
+      4
+    ],
+    "@typescript-eslint/indent": [
+      "warn",
+      4
+    ],
+    "quotes": ["warn", "double"],
+    "semi": ["error", "always"],
+    "@typescript-eslint/quotes": ["warn", "double"],
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-extraneous-class": "off",
+    "@typescript-eslint/strict-boolean-expressions": "off",
+    "@typescript-eslint/space-before-function-paren": "off",
+    "@typescript-eslint/semi": ["error", "always"],
+    "@typescript-eslint/member-delimiter-style": [
+      "error",
+      {
+        "multiline": {
+          "delimiter": "semi",
+          "requireLast": true
+        },
+        "singleline": {
+          "delimiter": "semi",
+          "requireLast": false
+        }
+      }
+    ]
+  },
+  "ignorePatterns": ["types/*"]
+}
diff --git a/src/Web/Avalonia.Web/webapp/build.js b/src/Web/Avalonia.Web/webapp/build.js
new file mode 100644
index 0000000000..81f863cac7
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/build.js
@@ -0,0 +1,16 @@
+require("esbuild").build({
+    entryPoints: [
+        "./modules/avalonia.ts",
+        "./modules/storage.ts"
+    ],
+    outdir: "../wwwroot",
+    bundle: true,
+    minify: true,
+    format: "esm",
+    target: "es2016",
+    platform: "browser",
+    sourcemap: "linked",
+    loader: { ".ts": "ts" }
+})
+    .then(() => console.log("⚡ Done"))
+    .catch(() => process.exit(1));
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia.ts
new file mode 100644
index 0000000000..0642bd475d
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia.ts
@@ -0,0 +1,32 @@
+import { RuntimeAPI } from "../types/dotnet";
+import { SizeWatcher, DpiWatcher, Canvas } from "./avalonia/canvas";
+import { InputHelper } from "./avalonia/input";
+import { AvaloniaDOM } from "./avalonia/dom";
+import { Caniuse } from "./avalonia/caniuse";
+import { StreamHelper } from "./avalonia/stream";
+import { NativeControlHost } from "./avalonia/nativeControlHost";
+
+async function registerAvaloniaModule(api: RuntimeAPI): Promise<void> {
+    api.setModuleImports("avalonia", {
+        Caniuse,
+        Canvas,
+        InputHelper,
+        SizeWatcher,
+        DpiWatcher,
+        AvaloniaDOM,
+        StreamHelper,
+        NativeControlHost
+    });
+}
+export {
+    Caniuse,
+    Canvas,
+    InputHelper,
+    SizeWatcher,
+    DpiWatcher,
+    AvaloniaDOM,
+    StreamHelper,
+    NativeControlHost,
+
+    registerAvaloniaModule
+};
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts
new file mode 100644
index 0000000000..e019f92113
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts
@@ -0,0 +1,25 @@
+export class Caniuse {
+    public static canShowOpenFilePicker(): boolean {
+        return typeof globalThis.showOpenFilePicker !== "undefined";
+    }
+
+    public static canShowSaveFilePicker(): boolean {
+        return typeof globalThis.showSaveFilePicker !== "undefined";
+    }
+
+    public static canShowDirectoryPicker(): boolean {
+        return typeof globalThis.showDirectoryPicker !== "undefined";
+    }
+
+    public static isMobile(): boolean {
+        const userAgentData = (globalThis.navigator as any)?.userAgentData;
+        if (userAgentData) {
+            return userAgentData.mobile;
+        }
+
+        const userAgent = navigator.userAgent;
+        const regex1 = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i;
+        const regex2 = /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw(n|u)|c55\/|capi|ccwa|cdm|cell|chtm|cldc|cmd|co(mp|nd)|craw|da(it|ll|ng)|dbte|dcs|devi|dica|dmob|do(c|p)o|ds(12|d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(|_)|g1 u|g560|gene|gf5|gmo|go(\.w|od)|gr(ad|un)|haie|hcit|hd(m|p|t)|hei|hi(pt|ta)|hp( i|ip)|hsc|ht(c(| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i(20|go|ma)|i230|iac( ||\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|[a-w])|libw|lynx|m1w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|mcr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|([1-8]|c))|phil|pire|pl(ay|uc)|pn2|po(ck|rt|se)|prox|psio|ptg|qaa|qc(07|12|21|32|60|[2-7]|i)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h|oo|p)|sdk\/|se(c(|0|1)|47|mc|nd|ri)|sgh|shar|sie(|m)|sk0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h|v|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl|tdg|tel(i|m)|tim|tmo|to(pl|sh)|ts(70|m|m3|m5)|tx9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas|your|zeto|zte/i;
+        return regex1.test(userAgent) || regex2.test(userAgent.substr(0, 4));
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/canvas.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/canvas.ts
new file mode 100644
index 0000000000..47c501cbb7
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/canvas.ts
@@ -0,0 +1,300 @@
+interface SKGLViewInfo {
+    context: WebGLRenderingContext | WebGL2RenderingContext | undefined;
+    fboId: number;
+    stencil: number;
+    sample: number;
+    depth: number;
+}
+
+type CanvasElement = {
+    Canvas: Canvas | undefined;
+} & HTMLCanvasElement;
+
+export class Canvas {
+    static elements: Map<string, HTMLCanvasElement>;
+
+    htmlCanvas: HTMLCanvasElement;
+    glInfo?: SKGLViewInfo;
+    renderFrameCallback: () => void;
+    renderLoopEnabled: boolean = false;
+    renderLoopRequest: number = 0;
+    newWidth?: number;
+    newHeight?: number;
+
+    public static initGL(element: HTMLCanvasElement, elementId: string, renderFrameCallback: () => void): SKGLViewInfo | null {
+        const view = Canvas.init(true, element, elementId, renderFrameCallback);
+        if (!view || !view.glInfo) {
+            return null;
+        }
+
+        return view.glInfo;
+    }
+
+    static init(useGL: boolean, element: HTMLCanvasElement, elementId: string, renderFrameCallback: () => void): Canvas | null {
+        const htmlCanvas = element as CanvasElement;
+        if (!htmlCanvas) {
+            console.error("No canvas element was provided.");
+            return null;
+        }
+
+        if (!Canvas.elements) {
+            Canvas.elements = new Map<string, HTMLCanvasElement>();
+        }
+        Canvas.elements.set(elementId, element);
+
+        const view = new Canvas(useGL, element, renderFrameCallback);
+
+        htmlCanvas.Canvas = view;
+
+        return view;
+    }
+
+    public constructor(useGL: boolean, element: HTMLCanvasElement, renderFrameCallback: () => void) {
+        this.htmlCanvas = element;
+        this.renderFrameCallback = renderFrameCallback;
+
+        if (useGL) {
+            const ctx = Canvas.createWebGLContext(element);
+            if (!ctx) {
+                console.error("Failed to create WebGL context");
+                return;
+            }
+
+            const GL = (globalThis as any).AvaloniaGL;
+
+            // make current
+            GL.makeContextCurrent(ctx);
+
+            const GLctx = GL.currentContext.GLctx as WebGLRenderingContext;
+
+            // read values
+            const fbo = GLctx.getParameter(GLctx.FRAMEBUFFER_BINDING);
+
+            this.glInfo = {
+                context: ctx,
+                fboId: fbo ? fbo.id : 0,
+                stencil: GLctx.getParameter(GLctx.STENCIL_BITS),
+                sample: 0, // TODO: GLctx.getParameter(GLctx.SAMPLES)
+                depth: GLctx.getParameter(GLctx.DEPTH_BITS)
+            };
+        }
+    }
+
+    public setEnableRenderLoop(enable: boolean): void {
+        this.renderLoopEnabled = enable;
+
+        // either start the new frame or cancel the existing one
+        if (enable) {
+            // console.info(`Enabling render loop with callback ${this.renderFrameCallback._id}...`);
+            this.requestAnimationFrame();
+        } else if (this.renderLoopRequest !== 0) {
+            window.cancelAnimationFrame(this.renderLoopRequest);
+            this.renderLoopRequest = 0;
+        }
+    }
+
+    public requestAnimationFrame(renderLoop?: boolean): void {
+        // optionally update the render loop
+        if (renderLoop !== undefined && this.renderLoopEnabled !== renderLoop) {
+            this.setEnableRenderLoop(renderLoop);
+        }
+
+        // skip because we have a render loop
+        if (this.renderLoopRequest !== 0) {
+            return;
+        }
+
+        // add the draw to the next frame
+        this.renderLoopRequest = window.requestAnimationFrame(() => {
+            if (this.htmlCanvas.width !== this.newWidth) {
+                this.htmlCanvas.width = this.newWidth ?? 0;
+            }
+
+            if (this.htmlCanvas.height !== this.newHeight) {
+                this.htmlCanvas.height = this.newHeight ?? 0;
+            }
+
+            this.renderFrameCallback();
+            this.renderLoopRequest = 0;
+
+            // we may want to draw the next frame
+            if (this.renderLoopEnabled) {
+                this.requestAnimationFrame();
+            }
+        });
+    }
+
+    public setCanvasSize(width: number, height: number): void {
+        if (this.renderLoopRequest !== 0) {
+            window.cancelAnimationFrame(this.renderLoopRequest);
+            this.renderLoopRequest = 0;
+        }
+
+        this.newWidth = width;
+        this.newHeight = height;
+
+        if (this.htmlCanvas.width !== this.newWidth) {
+            this.htmlCanvas.width = this.newWidth;
+        }
+
+        if (this.htmlCanvas.height !== this.newHeight) {
+            this.htmlCanvas.height = this.newHeight;
+        }
+
+        this.requestAnimationFrame();
+    }
+
+    public static setCanvasSize(element: HTMLCanvasElement, width: number, height: number): void {
+        const htmlCanvas = element as CanvasElement;
+        if (!htmlCanvas || !htmlCanvas.Canvas) {
+            return;
+        }
+
+        htmlCanvas.Canvas.setCanvasSize(width, height);
+    }
+
+    public static requestAnimationFrame(element: HTMLCanvasElement, renderLoop?: boolean): void {
+        const htmlCanvas = element as CanvasElement;
+        if (!htmlCanvas || !htmlCanvas.Canvas) {
+            return;
+        }
+
+        htmlCanvas.Canvas.requestAnimationFrame(renderLoop);
+    }
+
+    static createWebGLContext(htmlCanvas: HTMLCanvasElement): WebGLRenderingContext | WebGL2RenderingContext {
+        const contextAttributes = {
+            alpha: 1,
+            depth: 1,
+            stencil: 8,
+            antialias: 0,
+            premultipliedAlpha: 1,
+            preserveDrawingBuffer: 0,
+            preferLowPowerToHighPerformance: 0,
+            failIfMajorPerformanceCaveat: 0,
+            majorVersion: 2,
+            minorVersion: 0,
+            enableExtensionsByDefault: 1,
+            explicitSwapControl: 0,
+            renderViaOffscreenBackBuffer: 1
+        };
+
+        const GL = (globalThis as any).AvaloniaGL;
+
+        let ctx: WebGLRenderingContext = GL.createContext(htmlCanvas, contextAttributes);
+
+        if (!ctx && contextAttributes.majorVersion > 1) {
+            console.warn("Falling back to WebGL 1.0");
+            contextAttributes.majorVersion = 1;
+            contextAttributes.minorVersion = 0;
+            ctx = GL.createContext(htmlCanvas, contextAttributes);
+        }
+
+        return ctx;
+    }
+}
+
+type SizeWatcherElement = {
+    SizeWatcher: SizeWatcherInstance;
+} & HTMLElement;
+
+interface SizeWatcherInstance {
+    callback: (width: number, height: number) => void;
+}
+
+export class SizeWatcher {
+    static observer: ResizeObserver;
+    static elements: Map<string, HTMLElement>;
+    private static lastMove: number;
+
+    public static observe(element: HTMLElement, elementId: string | undefined, callback: (width: number, height: number) => void): void {
+        if (!element || !callback) {
+            return;
+        }
+
+        SizeWatcher.lastMove = Date.now();
+
+        callback(element.clientWidth, element.clientHeight);
+
+        const handleResize = (args: UIEvent) => {
+            if (Date.now() - SizeWatcher.lastMove > 33) {
+                callback(element.clientWidth, element.clientHeight);
+                SizeWatcher.lastMove = Date.now();
+            }
+        };
+
+        window.addEventListener("resize", handleResize);
+    }
+
+    public static unobserve(elementId: string): void {
+        if (!elementId || !SizeWatcher.observer) {
+            return;
+        }
+
+        const element = SizeWatcher.elements.get(elementId);
+        if (element) {
+            SizeWatcher.elements.delete(elementId);
+            SizeWatcher.observer.unobserve(element);
+        }
+    }
+
+    static init(): void {
+        if (SizeWatcher.observer) {
+            return;
+        }
+
+        SizeWatcher.elements = new Map<string, HTMLElement>();
+        SizeWatcher.observer = new ResizeObserver((entries) => {
+            for (const entry of entries) {
+                SizeWatcher.invoke(entry.target);
+            }
+        });
+    }
+
+    static invoke(element: Element): void {
+        const watcherElement = element as SizeWatcherElement;
+        const instance = watcherElement.SizeWatcher;
+
+        if (!instance || !instance.callback) {
+            return;
+        }
+
+        return instance.callback(element.clientWidth, element.clientHeight);
+    }
+}
+
+export class DpiWatcher {
+    static lastDpi: number;
+    static timerId: number;
+    static callback: (old: number, newdpi: number) => void;
+
+    public static getDpi(): number {
+        return window.devicePixelRatio;
+    }
+
+    public static start(callback: (old: number, newdpi: number) => void): number {
+        DpiWatcher.lastDpi = window.devicePixelRatio;
+        DpiWatcher.timerId = window.setInterval(DpiWatcher.update, 1000);
+        DpiWatcher.callback = callback;
+
+        return DpiWatcher.lastDpi;
+    }
+
+    public static stop(): void {
+        window.clearInterval(DpiWatcher.timerId);
+    }
+
+    static update(): void {
+        if (!DpiWatcher.callback) {
+            return;
+        }
+
+        const currentDpi = window.devicePixelRatio;
+        const lastDpi = DpiWatcher.lastDpi;
+        DpiWatcher.lastDpi = currentDpi;
+
+        if (Math.abs(lastDpi - currentDpi) > 0.001) {
+            DpiWatcher.callback(lastDpi, currentDpi);
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/caretHelper.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/caretHelper.ts
new file mode 100644
index 0000000000..546b41669f
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/caretHelper.ts
@@ -0,0 +1,149 @@
+// Based on https://github.com/component/textarea-caret-position/blob/master/index.js
+export class CaretHelper {
+    public static getCaretCoordinates(
+        element: HTMLInputElement | HTMLTextAreaElement,
+        position: number,
+        options?: { debug: boolean }
+    ) {
+        if (!isBrowser) {
+            throw new Error(
+                "textarea-caret-position#getCaretCoordinates should only be called in a browser"
+            );
+        }
+
+        const debug = options?.debug ?? false;
+        if (debug) {
+            const el = document.querySelector(
+                "#input-textarea-caret-position-mirror-div"
+            );
+            if (el) el.parentNode?.removeChild(el);
+        }
+
+        // The mirror div will replicate the textarea's style
+        const div = document.createElement("div");
+        div.id = "input-textarea-caret-position-mirror-div";
+        document.body.appendChild(div);
+
+        const style = div.style;
+        const computed = window.getComputedStyle
+            ? window.getComputedStyle(element)
+            : ((element as any).currentStyle as CSSStyleDeclaration); // currentStyle for IE < 9
+        const isInput = element.nodeName === "INPUT";
+
+        // Default textarea styles
+        style.whiteSpace = "pre-wrap";
+        if (!isInput) style.wordWrap = "break-word"; // only for textarea-s
+
+        // Position off-screen
+        style.position = "absolute"; // required to return coordinates properly
+        if (!debug) style.visibility = "hidden"; // not 'display: none' because we want rendering
+
+        // Transfer the element's properties to the div
+        properties.forEach((prop: string) => {
+            if (isInput && prop === "lineHeight") {
+                // Special case for <input>s because text is rendered centered and line height may be != height
+                if (computed.boxSizing === "border-box") {
+                    const height = parseInt(computed.height);
+                    const outerHeight =
+                        parseInt(computed.paddingTop) +
+                        parseInt(computed.paddingBottom) +
+                        parseInt(computed.borderTopWidth) +
+                        parseInt(computed.borderBottomWidth);
+                    const targetHeight = outerHeight + parseInt(computed.lineHeight);
+                    if (height > targetHeight) {
+                        style.lineHeight = `${height - outerHeight}px`;
+                    } else if (height === targetHeight) {
+                        style.lineHeight = computed.lineHeight;
+                    } else {
+                        style.lineHeight = "0";
+                    }
+                } else {
+                    style.lineHeight = computed.height;
+                }
+            } else {
+                (style as any)[prop] = (computed as any)[prop];
+            }
+        });
+
+        if (isFirefox) {
+            // Firefox lies about the overflow property for textareas: https://bugzilla.mozilla.org/show_bug.cgi?id=984275
+            if (element.scrollHeight > parseInt(computed.height)) {
+                style.overflowY = "scroll";
+            }
+        } else {
+            style.overflow = "hidden"; // for Chrome to not render a scrollbar; IE keeps overflowY = 'scroll'
+        }
+
+        div.textContent = element.value.substring(0, position);
+        // The second special handling for input type="text" vs textarea:
+        // spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037
+        if (isInput) div.textContent = div.textContent.replace(/\s/g, "\u00a0");
+
+        const span = document.createElement("span");
+        // Wrapping must be replicated *exactly*, including when a long word gets
+        // onto the next line, with whitespace at the end of the line before (#7).
+        // The  *only* reliable way to do that is to copy the *entire* rest of the
+        // textarea's content into the <span> created at the caret position.
+        // For inputs, just '.' would be enough, but no need to bother.
+        span.textContent = element.value.substring(position) || "."; // || because a completely empty faux span doesn't render at all
+        div.appendChild(span);
+
+        const coordinates = {
+            top: span.offsetTop + parseInt(computed.borderTopWidth),
+            left: span.offsetLeft + parseInt(computed.borderLeftWidth),
+            height: parseInt(computed.lineHeight)
+        };
+
+        if (debug) {
+            span.style.backgroundColor = "#aaa";
+        } else {
+            document.body.removeChild(div);
+        }
+
+        return coordinates;
+    }
+}
+
+const properties = [
+    "direction", // RTL support
+    "boxSizing",
+    "width", // on Chrome and IE, exclude the scrollbar, so the mirror div wraps exactly as the textarea does
+    "height",
+    "overflowX",
+    "overflowY", // copy the scrollbar for IE
+
+    "borderTopWidth",
+    "borderRightWidth",
+    "borderBottomWidth",
+    "borderLeftWidth",
+    "borderStyle",
+
+    "paddingTop",
+    "paddingRight",
+    "paddingBottom",
+    "paddingLeft",
+
+    // https://developer.mozilla.org/en-US/docs/Web/CSS/font
+    "fontStyle",
+    "fontVariant",
+    "fontWeight",
+    "fontStretch",
+    "fontSize",
+    "fontSizeAdjust",
+    "lineHeight",
+    "fontFamily",
+
+    "textAlign",
+    "textTransform",
+    "textIndent",
+    "textDecoration", // might not make a difference, but better be safe
+
+    "letterSpacing",
+    "wordSpacing",
+
+    "tabSize",
+    "MozTabSize"
+];
+
+const isBrowser = typeof window !== "undefined";
+const isFirefox = isBrowser && (window as any).mozInnerScreenX != null;
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/dom.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/dom.ts
new file mode 100644
index 0000000000..385cdd4c41
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/dom.ts
@@ -0,0 +1,67 @@
+export class AvaloniaDOM {
+    public static addClass(element: HTMLElement, className: string): void {
+        element.classList.add(className);
+    }
+
+    static createAvaloniaHost(host: HTMLElement) {
+        const randomIdPart = Math.random().toString(36).replace(/[^a-z]+/g, "").substr(2, 10);
+
+        // Root element
+        host.classList.add("avalonia-container");
+        host.tabIndex = 0;
+        host.oncontextmenu = function () { return false; };
+        host.style.overflow = "hidden";
+        host.style.touchAction = "none";
+
+        // Rendering target canvas
+        const canvas = document.createElement("canvas");
+        canvas.id = `canvas${randomIdPart}`;
+        canvas.classList.add("avalonia-canvas");
+        canvas.style.backgroundColor = "#ccc";
+        canvas.style.width = "100%";
+        canvas.style.position = "absolute";
+
+        // Native controls host
+        const nativeHost = document.createElement("div");
+        nativeHost.id = `nativeHost${randomIdPart}`;
+        nativeHost.classList.add("avalonia-native-host");
+        nativeHost.style.left = "0px";
+        nativeHost.style.top = "0px";
+        nativeHost.style.width = "100%";
+        nativeHost.style.height = "100%";
+        nativeHost.style.position = "absolute";
+
+        // IME
+        const inputElement = document.createElement("input");
+        inputElement.id = `inputElement${randomIdPart}`;
+        inputElement.classList.add("avalonia-input-element");
+        inputElement.autocapitalize = "none";
+        inputElement.type = "text";
+        inputElement.spellcheck = false;
+        inputElement.style.padding = "0";
+        inputElement.style.margin = "0";
+        inputElement.style.position = "absolute";
+        inputElement.style.overflow = "hidden";
+        inputElement.style.borderStyle = "hidden";
+        inputElement.style.outline = "none";
+        inputElement.style.background = "transparent";
+        inputElement.style.color = "transparent";
+        inputElement.style.display = "none";
+        inputElement.style.height = "20px";
+        inputElement.style.zIndex = "-1";
+        inputElement.onpaste = function () { return false; };
+        inputElement.oncopy = function () { return false; };
+        inputElement.oncut = function () { return false; };
+
+        host.prepend(inputElement);
+        host.prepend(nativeHost);
+        host.prepend(canvas);
+
+        return {
+            host,
+            canvas,
+            nativeHost,
+            inputElement
+        };
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/input.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/input.ts
new file mode 100644
index 0000000000..83e8ee7f1c
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/input.ts
@@ -0,0 +1,216 @@
+import { CaretHelper } from "./caretHelper";
+
+enum RawInputModifiers {
+    None = 0,
+    Alt = 1,
+    Control = 2,
+    Shift = 4,
+    Meta = 8,
+
+    LeftMouseButton = 16,
+    RightMouseButton = 32,
+    MiddleMouseButton = 64,
+    XButton1MouseButton = 128,
+    XButton2MouseButton = 256,
+    KeyboardMask = Alt | Control | Shift | Meta,
+
+    PenInverted = 512,
+    PenEraser = 1024,
+    PenBarrelButton = 2048
+}
+
+export class InputHelper {
+    public static subscribeKeyEvents(
+        element: HTMLInputElement,
+        keyDownCallback: (code: string, key: string, modifiers: RawInputModifiers) => boolean,
+        keyUpCallback: (code: string, key: string, modifiers: RawInputModifiers) => boolean) {
+        const keyDownHandler = (args: KeyboardEvent) => {
+            if (keyDownCallback(args.code, args.key, this.getModifiers(args))) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("keydown", keyDownHandler);
+
+        const keyUpHandler = (args: KeyboardEvent) => {
+            if (keyUpCallback(args.code, args.key, this.getModifiers(args))) {
+                args.preventDefault();
+            }
+        };
+
+        element.addEventListener("keyup", keyUpHandler);
+
+        return () => {
+            element.removeEventListener("keydown", keyDownHandler);
+            element.removeEventListener("keyup", keyUpHandler);
+        };
+    }
+
+    public static subscribeTextEvents(
+        element: HTMLInputElement,
+        inputCallback: (type: string, data: string | null) => boolean,
+        compositionStartCallback: (args: CompositionEvent) => boolean,
+        compositionUpdateCallback: (args: CompositionEvent) => boolean,
+        compositionEndCallback: (args: CompositionEvent) => boolean) {
+        const inputHandler = (args: Event) => {
+            const inputEvent = args as InputEvent;
+
+            // todo check cast
+            if (inputCallback(inputEvent.type, inputEvent.data)) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("input", inputHandler);
+
+        const compositionStartHandler = (args: CompositionEvent) => {
+            if (compositionStartCallback(args)) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("compositionstart", compositionStartHandler);
+
+        const compositionUpdateHandler = (args: CompositionEvent) => {
+            if (compositionUpdateCallback(args)) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("compositionupdate", compositionUpdateHandler);
+
+        const compositionEndHandler = (args: CompositionEvent) => {
+            if (compositionEndCallback(args)) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("compositionend", compositionEndHandler);
+
+        return () => {
+            element.removeEventListener("input", inputHandler);
+            element.removeEventListener("compositionstart", compositionStartHandler);
+            element.removeEventListener("compositionupdate", compositionUpdateHandler);
+            element.removeEventListener("compositionend", compositionEndHandler);
+        };
+    }
+
+    public static subscribePointerEvents(
+        element: HTMLInputElement,
+        pointerMoveCallback: (args: PointerEvent) => boolean,
+        pointerDownCallback: (args: PointerEvent) => boolean,
+        pointerUpCallback: (args: PointerEvent) => boolean,
+        pointerCancelCallback: (args: PointerEvent) => boolean,
+        wheelCallback: (args: WheelEvent) => boolean
+    ) {
+        const pointerMoveHandler = (args: PointerEvent) => {
+            pointerMoveCallback(args);
+            args.preventDefault();
+        };
+
+        const pointerDownHandler = (args: PointerEvent) => {
+            pointerDownCallback(args);
+            args.preventDefault();
+        };
+
+        const pointerUpHandler = (args: PointerEvent) => {
+            pointerUpCallback(args);
+            args.preventDefault();
+        };
+
+        const pointerCancelHandler = (args: PointerEvent) => {
+            pointerCancelCallback(args);
+            args.preventDefault();
+        };
+
+        const wheelHandler = (args: WheelEvent) => {
+            wheelCallback(args);
+            args.preventDefault();
+        };
+
+        element.addEventListener("pointermove", pointerMoveHandler);
+        element.addEventListener("pointerdown", pointerDownHandler);
+        element.addEventListener("pointerup", pointerUpHandler);
+        element.addEventListener("wheel", wheelHandler);
+        element.addEventListener("pointercancel", pointerCancelHandler);
+
+        return () => {
+            element.removeEventListener("pointerover", pointerMoveHandler);
+            element.removeEventListener("pointerdown", pointerDownHandler);
+            element.removeEventListener("pointerup", pointerUpHandler);
+            element.removeEventListener("pointercancel", pointerCancelHandler);
+            element.removeEventListener("wheel", wheelHandler);
+        };
+    }
+
+    public static subscribeInputEvents(
+        element: HTMLInputElement,
+        inputCallback: (value: string) => boolean
+    ) {
+        const inputHandler = (args: Event) => {
+            if (inputCallback((args as any).value)) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("input", inputHandler);
+
+        return () => {
+            element.removeEventListener("input", inputHandler);
+        };
+    }
+
+    public static getCoalescedEvents(pointerEvent: PointerEvent): PointerEvent[] {
+        return pointerEvent.getCoalescedEvents();
+    }
+
+    public static clearInput(inputElement: HTMLInputElement) {
+        inputElement.value = "";
+    }
+
+    public static focusElement(inputElement: HTMLElement) {
+        inputElement.focus();
+    }
+
+    public static setCursor(inputElement: HTMLInputElement, kind: string) {
+        if (kind === "pointer") {
+            inputElement.style.removeProperty("cursor");
+        } else {
+            inputElement.style.cursor = kind;
+        }
+    }
+
+    public static setBounds(inputElement: HTMLInputElement, x: number, y: number, caretWidth: number, caretHeight: number, caret: number) {
+        inputElement.style.left = (x).toFixed(0) + "px";
+        inputElement.style.top = (y).toFixed(0) + "px";
+
+        const { left, top } = CaretHelper.getCaretCoordinates(inputElement, caret);
+
+        inputElement.style.left = (x - left).toFixed(0) + "px";
+        inputElement.style.top = (y - top).toFixed(0) + "px";
+    }
+
+    public static hide(inputElement: HTMLInputElement) {
+        inputElement.style.display = "none";
+    }
+
+    public static show(inputElement: HTMLInputElement) {
+        inputElement.style.display = "block";
+    }
+
+    public static setSurroundingText(inputElement: HTMLInputElement, text: string, start: number, end: number) {
+        if (!inputElement) {
+            return;
+        }
+
+        inputElement.value = text;
+        inputElement.setSelectionRange(start, end);
+        inputElement.style.width = "20px";
+        inputElement.style.width = `${inputElement.scrollWidth}px`;
+    }
+
+    private static getModifiers(args: KeyboardEvent): RawInputModifiers {
+        let modifiers = RawInputModifiers.None;
+
+        if (args.ctrlKey) { modifiers |= RawInputModifiers.Control; }
+        if (args.altKey) { modifiers |= RawInputModifiers.Alt; }
+        if (args.shiftKey) { modifiers |= RawInputModifiers.Shift; }
+        if (args.metaKey) { modifiers |= RawInputModifiers.Meta; }
+
+        return modifiers;
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/nativeControlHost.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/nativeControlHost.ts
new file mode 100644
index 0000000000..c65d5836df
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/nativeControlHost.ts
@@ -0,0 +1,55 @@
+class NativeControlHostTopLevelAttachment {
+    _child?: HTMLElement;
+    _host?: HTMLElement;
+}
+
+export class NativeControlHost {
+    public static createDefaultChild(parent?: HTMLElement): HTMLElement {
+        return document.createElement("div");
+    }
+
+    public static createAttachment(): NativeControlHostTopLevelAttachment {
+        return new NativeControlHostTopLevelAttachment();
+    }
+
+    public static initializeWithChildHandle(element: NativeControlHostTopLevelAttachment, child: HTMLElement): void {
+        element._child = child;
+        element._child.style.position = "absolute";
+    }
+
+    public static attachTo(element: NativeControlHostTopLevelAttachment, host?: HTMLElement): void {
+        if (element._host && element._child) {
+            element._host.removeChild(element._child);
+        }
+
+        element._host = host;
+
+        if (element._host && element._child) {
+            element._host.appendChild(element._child);
+        }
+    }
+
+    public static showInBounds(element: NativeControlHostTopLevelAttachment, x: number, y: number, width: number, height: number): void {
+        if (element._child) {
+            element._child.style.top = `${y}px`;
+            element._child.style.left = `${x}px`;
+            element._child.style.width = `${width}px`;
+            element._child.style.height = `${height}px`;
+            element._child.style.display = "block";
+        }
+    }
+
+    public static hideWithSize(element: NativeControlHostTopLevelAttachment, width: number, height: number): void {
+        if (element._child) {
+            element._child.style.width = `${width}px`;
+            element._child.style.height = `${height}px`;
+            element._child.style.display = "none";
+        }
+    }
+
+    public static releaseChild(element: NativeControlHostTopLevelAttachment): void {
+        if (element._child) {
+            element._child = undefined;
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/stream.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/stream.ts
new file mode 100644
index 0000000000..1f2c181edc
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/stream.ts
@@ -0,0 +1,40 @@
+import { IMemoryView } from "../../types/dotnet";
+
+export class StreamHelper {
+    public static async seek(stream: FileSystemWritableFileStream, position: number) {
+        return await stream.seek(position);
+    }
+
+    public static async truncate(stream: FileSystemWritableFileStream, size: number) {
+        return await stream.truncate(size);
+    }
+
+    public static async close(stream: FileSystemWritableFileStream) {
+        return await stream.close();
+    }
+
+    public static async write(stream: FileSystemWritableFileStream, span: IMemoryView) {
+        const array = new Uint8Array(span.byteLength);
+        span.copyTo(array);
+
+        const data: WriteParams = {
+            type: "write",
+            data: array
+        };
+
+        return await stream.write(data);
+    }
+
+    public static byteLength(stream: Blob) {
+        return stream.size;
+    }
+
+    public static async sliceArrayBuffer(stream: Blob, offset: number, count: number) {
+        const buffer = await stream.slice(offset, offset + count).arrayBuffer();
+        return new Uint8Array(buffer);
+    }
+
+    public static toMemoryView(buffer: Uint8Array): Uint8Array {
+        return buffer;
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/storage.ts b/src/Web/Avalonia.Web/webapp/modules/storage.ts
new file mode 100644
index 0000000000..8b9987afa0
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/storage.ts
@@ -0,0 +1,2 @@
+export { StorageItem, StorageItems } from "./storage/storageItem";
+export { StorageProvider } from "./storage/storageProvider";
diff --git a/src/Web/Avalonia.Web/webapp/modules/storage/indexedDb.ts b/src/Web/Avalonia.Web/webapp/modules/storage/indexedDb.ts
new file mode 100644
index 0000000000..54b095d39e
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/storage/indexedDb.ts
@@ -0,0 +1,84 @@
+class InnerDbConnection {
+    constructor(private readonly database: IDBDatabase) { }
+
+    private openStore(store: string, mode: IDBTransactionMode): IDBObjectStore {
+        const tx = this.database.transaction(store, mode);
+        return tx.objectStore(store);
+    }
+
+    public async put(store: string, obj: any, key?: IDBValidKey): Promise<IDBValidKey> {
+        const os = this.openStore(store, "readwrite");
+
+        return await new Promise((resolve, reject) => {
+            const response = os.put(obj, key);
+            response.onsuccess = () => {
+                resolve(response.result);
+            };
+            response.onerror = () => {
+                reject(response.error);
+            };
+        });
+    }
+
+    public get(store: string, key: IDBValidKey): any {
+        const os = this.openStore(store, "readonly");
+
+        return new Promise((resolve, reject) => {
+            const response = os.get(key);
+            response.onsuccess = () => {
+                resolve(response.result);
+            };
+            response.onerror = () => {
+                reject(response.error);
+            };
+        });
+    }
+
+    public async delete(store: string, key: IDBValidKey): Promise<void> {
+        const os = this.openStore(store, "readwrite");
+
+        return await new Promise((resolve, reject) => {
+            const response = os.delete(key);
+            response.onsuccess = () => {
+                resolve();
+            };
+            response.onerror = () => {
+                reject(response.error);
+            };
+        });
+    }
+
+    public close() {
+        this.database.close();
+    }
+}
+
+class IndexedDbWrapper {
+    constructor(private readonly databaseName: string, private readonly objectStores: [string]) {
+    }
+
+    public async connect(): Promise<InnerDbConnection> {
+        const conn = window.indexedDB.open(this.databaseName, 1);
+
+        conn.onupgradeneeded = event => {
+            const db = (event.target as IDBRequest<IDBDatabase>).result;
+            this.objectStores.forEach(store => {
+                db.createObjectStore(store);
+            });
+        };
+
+        return await new Promise((resolve, reject) => {
+            conn.onsuccess = event => {
+                resolve(new InnerDbConnection((event.target as IDBRequest<IDBDatabase>).result));
+            };
+            conn.onerror = event => {
+                reject((event.target as IDBRequest<IDBDatabase>).error);
+            };
+        });
+    }
+}
+
+export const fileBookmarksStore: string = "fileBookmarks";
+export const avaloniaDb = new IndexedDbWrapper("AvaloniaDb", [
+    fileBookmarksStore
+]);
diff --git a/src/Web/Avalonia.Web/webapp/modules/storage/storageItem.ts b/src/Web/Avalonia.Web/webapp/modules/storage/storageItem.ts
new file mode 100644
index 0000000000..b4cf3d278b
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/storage/storageItem.ts
@@ -0,0 +1,111 @@
+import { avaloniaDb, fileBookmarksStore } from "./indexedDb";
+
+export class StorageItem {
+    constructor(public handle: FileSystemHandle, private readonly bookmarkId?: string) { }
+
+    public get name(): string {
+        return this.handle.name;
+    }
+
+    public get kind(): string {
+        return this.handle.kind;
+    }
+
+    public static async openRead(item: StorageItem): Promise<Blob> {
+        if (!(item.handle instanceof FileSystemFileHandle)) {
+            throw new Error("StorageItem is not a file");
+        }
+
+        await item.verityPermissions("read");
+
+        const file = await item.handle.getFile();
+        return file;
+    }
+
+    public static async openWrite(item: StorageItem): Promise<FileSystemWritableFileStream> {
+        if (!(item.handle instanceof FileSystemFileHandle)) {
+            throw new Error("StorageItem is not a file");
+        }
+
+        await item.verityPermissions("readwrite");
+
+        return await item.handle.createWritable({ keepExistingData: true });
+    }
+
+    public static async getProperties(item: StorageItem): Promise<{ Size: number; LastModified: number; Type: string } | null> {
+        const file = item.handle instanceof FileSystemFileHandle &&
+            await item.handle.getFile();
+
+        if (!file) {
+            return null;
+        }
+
+        return {
+            Size: file.size,
+            LastModified: file.lastModified,
+            Type: file.type
+        };
+    }
+
+    public static async getItems(item: StorageItem): Promise<StorageItems> {
+        if (item.handle.kind !== "directory") {
+            return new StorageItems([]);
+        }
+
+        const items: StorageItem[] = [];
+        for await (const [, value] of (item.handle as any).entries()) {
+            items.push(new StorageItem(value));
+        }
+        return new StorageItems(items);
+    }
+
+    private async verityPermissions(mode: FileSystemPermissionMode): Promise<void | never> {
+        if (await this.handle.queryPermission({ mode }) === "granted") {
+            return;
+        }
+
+        if (await this.handle.requestPermission({ mode }) === "denied") {
+            throw new Error("Permissions denied");
+        }
+    }
+
+    public static async saveBookmark(item: StorageItem): Promise<string> {
+        // If file was previously bookmarked, just return old one.
+        if (item.bookmarkId) {
+            return item.bookmarkId;
+        }
+
+        const connection = await avaloniaDb.connect();
+        try {
+            const key = await connection.put(fileBookmarksStore, item.handle, item.generateBookmarkId());
+            return key as string;
+        } finally {
+            connection.close();
+        }
+    }
+
+    public static async deleteBookmark(item: StorageItem): Promise<void> {
+        if (!item.bookmarkId) {
+            return;
+        }
+
+        const connection = await avaloniaDb.connect();
+        try {
+            await connection.delete(fileBookmarksStore, item.bookmarkId);
+        } finally {
+            connection.close();
+        }
+    }
+
+    private generateBookmarkId(): string {
+        return Date.now().toString(36) + Math.random().toString(36).substring(2);
+    }
+}
+
+export class StorageItems {
+    constructor(private readonly items: StorageItem[]) { }
+
+    public static itemsArray(instance: StorageItems): StorageItem[] {
+        return instance.items;
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/modules/storage/storageProvider.ts b/src/Web/Avalonia.Web/webapp/modules/storage/storageProvider.ts
new file mode 100644
index 0000000000..0198f92528
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/modules/storage/storageProvider.ts
@@ -0,0 +1,70 @@
+import { avaloniaDb, fileBookmarksStore } from "./indexedDb";
+import { StorageItem, StorageItems } from "./storageItem";
+
+declare global {
+    type WellKnownDirectory = "desktop" | "documents" | "downloads" | "music" | "pictures" | "videos";
+    type StartInDirectory = WellKnownDirectory | FileSystemHandle;
+    interface OpenFilePickerOptions {
+        startIn?: StartInDirectory;
+    }
+    interface SaveFilePickerOptions {
+        startIn?: StartInDirectory;
+    }
+}
+
+export class StorageProvider {
+    public static async selectFolderDialog(
+        startIn: StorageItem | null): Promise<StorageItem> {
+        // 'Picker' API doesn't accept "null" as a parameter, so it should be set to undefined.
+        const options: DirectoryPickerOptions = {
+            startIn: (startIn?.handle ?? undefined)
+        };
+
+        const handle = await window.showDirectoryPicker(options);
+        return new StorageItem(handle);
+    }
+
+    public static async openFileDialog(
+        startIn: StorageItem | null, multiple: boolean,
+        types: FilePickerAcceptType[] | null, excludeAcceptAllOption: boolean): Promise<StorageItems> {
+        const options: OpenFilePickerOptions = {
+            startIn: (startIn?.handle ?? undefined),
+            multiple,
+            excludeAcceptAllOption,
+            types: (types ?? undefined)
+        };
+
+        const handles = await window.showOpenFilePicker(options);
+        return new StorageItems(handles.map((handle: FileSystemHandle) => new StorageItem(handle)));
+    }
+
+    public static async saveFileDialog(
+        startIn: StorageItem | null, suggestedName: string | null,
+        types: FilePickerAcceptType[] | null, excludeAcceptAllOption: boolean): Promise<StorageItem> {
+        const options: SaveFilePickerOptions = {
+            startIn: (startIn?.handle ?? undefined),
+            suggestedName: (suggestedName ?? undefined),
+            excludeAcceptAllOption,
+            types: (types ?? undefined)
+        };
+
+        const handle = await window.showSaveFilePicker(options);
+        return new StorageItem(handle);
+    }
+
+    public static async openBookmark(key: string): Promise<StorageItem | null> {
+        const connection = await avaloniaDb.connect();
+        try {
+            const handle = await connection.get(fileBookmarksStore, key);
+            return handle && new StorageItem(handle, key);
+        } finally {
+            connection.close();
+        }
+    }
+
+    public static createAcceptType(description: string, mimeTypes: string[]): FilePickerAcceptType {
+        const accept: Record<string, string[]> = {};
+        mimeTypes.forEach(a => { accept[a] = []; });
+        return { description, accept };
+    }
+}
diff --git a/src/Web/Avalonia.Web/webapp/package-lock.json b/src/Web/Avalonia.Web/webapp/package-lock.json
new file mode 100644
index 0000000000..947f7e12e7
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/package-lock.json
@@ -0,0 +1,2234 @@
+{
+  "name": "avalonia.web",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@esbuild/android-arm": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.9.tgz",
+      "integrity": "sha512-VZPy/ETF3fBG5PiinIkA0W/tlsvlEgJccyN2DzWZEl0DlVKRbu91PvY2D6Lxgluj4w9QtYHjOWjAT44C+oQ+EQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.9.tgz",
+      "integrity": "sha512-O+NfmkfRrb3uSsTa4jE3WApidSe3N5++fyOVGP1SmMZi4A3BZELkhUUvj5hwmMuNdlpzAZ8iAPz2vmcR7DCFQA==",
+      "dev": true,
+      "optional": true
+    },
+    "@eslint/eslintrc": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
+      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
+      "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@types/emscripten": {
+      "version": "1.39.6",
+      "resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.6.tgz",
+      "integrity": "sha512-H90aoynNhhkQP6DRweEjJp5vfUVdIj7tdPLsu7pq89vODD/lcugKfZOsfgwpvM6XUewEp2N5dCg1Uf3Qe55Dcg==",
+      "dev": true
+    },
+    "@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "@types/wicg-file-system-access": {
+      "version": "2020.9.5",
+      "resolved": "https://registry.npmjs.org/@types/wicg-file-system-access/-/wicg-file-system-access-2020.9.5.tgz",
+      "integrity": "sha512-UYK244awtmcUYQfs7FR8710MJcefL2WvkyHMjA8yJzxd1mo0Gfn88sRZ1Bls7hiUhA2w7ne1gpJ9T5g3G0wOyA==",
+      "dev": true
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.1.tgz",
+      "integrity": "sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.38.1",
+        "@typescript-eslint/type-utils": "5.38.1",
+        "@typescript-eslint/utils": "5.38.1",
+        "debug": "^4.3.4",
+        "ignore": "^5.2.0",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.1.tgz",
+      "integrity": "sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.38.1",
+        "@typescript-eslint/types": "5.38.1",
+        "@typescript-eslint/typescript-estree": "5.38.1",
+        "debug": "^4.3.4"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz",
+      "integrity": "sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.38.1",
+        "@typescript-eslint/visitor-keys": "5.38.1"
+      }
+    },
+    "@typescript-eslint/type-utils": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.1.tgz",
+      "integrity": "sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/typescript-estree": "5.38.1",
+        "@typescript-eslint/utils": "5.38.1",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.1.tgz",
+      "integrity": "sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz",
+      "integrity": "sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.38.1",
+        "@typescript-eslint/visitor-keys": "5.38.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/utils": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.1.tgz",
+      "integrity": "sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.38.1",
+        "@typescript-eslint/types": "5.38.1",
+        "@typescript-eslint/typescript-estree": "5.38.1",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.38.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz",
+      "integrity": "sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.38.1",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
+    "array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.0.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
+      "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.6",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "esbuild": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.9.tgz",
+      "integrity": "sha512-OnYr1rkMVxtmMHIAKZLMcEUlJmqcbxBz9QoBU8G9v455na0fuzlT/GLu6l+SRghrk0Mm2fSSciMmzV43Q8e0Gg==",
+      "dev": true,
+      "requires": {
+        "@esbuild/android-arm": "0.15.9",
+        "@esbuild/linux-loong64": "0.15.9",
+        "esbuild-android-64": "0.15.9",
+        "esbuild-android-arm64": "0.15.9",
+        "esbuild-darwin-64": "0.15.9",
+        "esbuild-darwin-arm64": "0.15.9",
+        "esbuild-freebsd-64": "0.15.9",
+        "esbuild-freebsd-arm64": "0.15.9",
+        "esbuild-linux-32": "0.15.9",
+        "esbuild-linux-64": "0.15.9",
+        "esbuild-linux-arm": "0.15.9",
+        "esbuild-linux-arm64": "0.15.9",
+        "esbuild-linux-mips64le": "0.15.9",
+        "esbuild-linux-ppc64le": "0.15.9",
+        "esbuild-linux-riscv64": "0.15.9",
+        "esbuild-linux-s390x": "0.15.9",
+        "esbuild-netbsd-64": "0.15.9",
+        "esbuild-openbsd-64": "0.15.9",
+        "esbuild-sunos-64": "0.15.9",
+        "esbuild-windows-32": "0.15.9",
+        "esbuild-windows-64": "0.15.9",
+        "esbuild-windows-arm64": "0.15.9"
+      }
+    },
+    "esbuild-android-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.9.tgz",
+      "integrity": "sha512-HQCX7FJn9T4kxZQkhPjNZC7tBWZqJvhlLHPU2SFzrQB/7nDXjmTIFpFTjt7Bd1uFpeXmuwf5h5fZm+x/hLnhbw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-android-arm64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.9.tgz",
+      "integrity": "sha512-E6zbLfqbFVCNEKircSHnPiSTsm3fCRxeIMPfrkS33tFjIAoXtwegQfVZqMGR0FlsvVxp2NEDOUz+WW48COCjSg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.9.tgz",
+      "integrity": "sha512-gI7dClcDN/HHVacZhTmGjl0/TWZcGuKJ0I7/xDGJwRQQn7aafZGtvagOFNmuOq+OBFPhlPv1T6JElOXb0unkSQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-arm64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.9.tgz",
+      "integrity": "sha512-VZIMlcRN29yg/sv7DsDwN+OeufCcoTNaTl3Vnav7dL/nvsApD7uvhVRbgyMzv0zU/PP0xRhhIpTyc7lxEzHGSw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.9.tgz",
+      "integrity": "sha512-uM4z5bTvuAXqPxrI204txhlsPIolQPWRMLenvGuCPZTnnGlCMF2QLs0Plcm26gcskhxewYo9LkkmYSS5Czrb5A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-arm64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.9.tgz",
+      "integrity": "sha512-HHDjT3O5gWzicGdgJ5yokZVN9K9KG05SnERwl9nBYZaCjcCgj/sX8Ps1jvoFSfNCO04JSsHSOWo4qvxFuj8FoA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-32": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.9.tgz",
+      "integrity": "sha512-AQIdE8FugGt1DkcekKi5ycI46QZpGJ/wqcMr7w6YUmOmp2ohQ8eO4sKUsOxNOvYL7hGEVwkndSyszR6HpVHLFg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.9.tgz",
+      "integrity": "sha512-4RXjae7g6Qs7StZyiYyXTZXBlfODhb1aBVAjd+ANuPmMhWthQilWo7rFHwJwL7DQu1Fjej2sODAVwLbcIVsAYQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.9.tgz",
+      "integrity": "sha512-3Zf2GVGUOI7XwChH3qrnTOSqfV1V4CAc/7zLVm4lO6JT6wbJrTgEYCCiNSzziSju+J9Jhf9YGWk/26quWPC6yQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.9.tgz",
+      "integrity": "sha512-a+bTtxJmYmk9d+s2W4/R1SYKDDAldOKmWjWP0BnrWtDbvUBNOm++du0ysPju4mZVoEFgS1yLNW+VXnG/4FNwdQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-mips64le": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.9.tgz",
+      "integrity": "sha512-Zn9HSylDp89y+TRREMDoGrc3Z4Hs5u56ozZLQCiZAUx2+HdbbXbWdjmw3FdTJ/i7t5Cew6/Q+6kfO3KCcFGlyw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-ppc64le": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.9.tgz",
+      "integrity": "sha512-OEiOxNAMH9ENFYqRsWUj3CWyN3V8P3ZXyfNAtX5rlCEC/ERXrCEFCJji/1F6POzsXAzxvUJrTSTCy7G6BhA6Fw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-riscv64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.9.tgz",
+      "integrity": "sha512-ukm4KsC3QRausEFjzTsOZ/qqazw0YvJsKmfoZZm9QW27OHjk2XKSQGGvx8gIEswft/Sadp03/VZvAaqv5AIwNA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-s390x": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.9.tgz",
+      "integrity": "sha512-uDOQEH55wQ6ahcIKzQr3VyjGc6Po/xblLGLoUk3fVL1qjlZAibtQr6XRfy5wPJLu/M2o0vQKLq4lyJ2r1tWKcw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-netbsd-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.9.tgz",
+      "integrity": "sha512-yWgxaYTQz+TqX80wXRq6xAtb7GSBAp6gqLKfOdANg9qEmAI1Bxn04IrQr0Mzm4AhxvGKoHzjHjMgXbCCSSDxcw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-openbsd-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.9.tgz",
+      "integrity": "sha512-JmS18acQl4iSAjrEha1MfEmUMN4FcnnrtTaJ7Qg0tDCOcgpPPQRLGsZqhes0vmx8VA6IqRyScqXvaL7+Q0Uf3A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-sunos-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.9.tgz",
+      "integrity": "sha512-UKynGSWpzkPmXW3D2UMOD9BZPIuRaSqphxSCwScfEE05Be3KAmvjsBhht1fLzKpiFVJb0BYMd4jEbWMyJ/z1hQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-32": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.9.tgz",
+      "integrity": "sha512-aqXvu4/W9XyTVqO/hw3rNxKE1TcZiEYHPsXM9LwYmKSX9/hjvfIJzXwQBlPcJ/QOxedfoMVH0YnhhQ9Ffb0RGA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.9.tgz",
+      "integrity": "sha512-zm7h91WUmlS4idMtjvCrEeNhlH7+TNOmqw5dJPJZrgFaxoFyqYG6CKDpdFCQXdyKpD5yvzaQBOMVTCBVKGZDEg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-arm64": {
+      "version": "0.15.9",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.9.tgz",
+      "integrity": "sha512-yQEVIv27oauAtvtuhJVfSNMztJJX47ismRS6Sv2QMVV9RM+6xjbMWuuwM2nxr5A2/gj/mu2z9YlQxiwoFRCfZA==",
+      "dev": true,
+      "optional": true
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.24.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
+      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
+      "dev": true,
+      "requires": {
+        "@eslint/eslintrc": "^1.3.2",
+        "@humanwhocodes/config-array": "^0.10.5",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        }
+      }
+    },
+    "eslint-config-standard": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
+      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+      "dev": true
+    },
+    "eslint-config-standard-with-typescript": {
+      "version": "23.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-with-typescript/-/eslint-config-standard-with-typescript-23.0.0.tgz",
+      "integrity": "sha512-iaaWifImn37Z1OXbNW1es7KI+S7D408F9ys0bpaQf2temeBWlvb0Nc5qHkOgYaRb5QxTZT32GGeN1gtswASOXA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint-config-standard": "17.0.0"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-es": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+      "dev": true,
+      "requires": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "dependencies": {
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-n": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.3.0.tgz",
+      "integrity": "sha512-IyzPnEWHypCWasDpxeJnim60jhlumbmq0pubL6IOcnk8u2y53s5QfT8JnXy7skjHJ44yWHRb11PLtDHuu1kg/Q==",
+      "dev": true,
+      "requires": {
+        "builtins": "^5.0.1",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-utils": "^3.0.0",
+        "ignore": "^5.1.1",
+        "is-core-module": "^2.10.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.7"
+      }
+    },
+    "eslint-plugin-promise": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz",
+      "integrity": "sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "js-sdsl": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
+      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^5.0.0"
+      }
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+          "dev": true
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "requires": {
+        "yocto-queue": "^0.1.0"
+      }
+    },
+    "p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^3.0.2"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
+    "pidtree": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        }
+      }
+    },
+    "regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
+    "semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "shell-quote": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "dev": true
+    },
+    "string.prototype.padend": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz",
+      "integrity": "sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
+    "typescript": {
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+      "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
+      "dev": true
+    },
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    }
+  }
+}
diff --git a/src/Web/Avalonia.Web/webapp/package.json b/src/Web/Avalonia.Web/webapp/package.json
new file mode 100644
index 0000000000..8845dec604
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "avalonia.web",
+  "scripts": {
+    "typecheck": "npx tsc -noEmit",
+    "eslint": "npx eslint . --fix",
+    "prebuild": "npm-run-all typecheck eslint",
+    "build": "node build.js"
+  },
+  "devDependencies": {
+    "@types/emscripten": "^1.39.6",
+    "@types/wicg-file-system-access": "^2020.9.5",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "esbuild": "^0.15.7",
+    "eslint": "^8.24.0",
+    "eslint-config-standard-with-typescript": "^23.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.3.0",
+    "eslint-plugin-promise": "^6.0.1",
+    "npm-run-all": "^4.1.5",
+    "typescript": "^4.8.3"
+  }
+}
diff --git a/src/Web/Avalonia.Web/webapp/tsconfig.json b/src/Web/Avalonia.Web/webapp/tsconfig.json
new file mode 100644
index 0000000000..ad0e727150
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+      "target": "es2016",
+      "module": "es2020",
+      "strict": true,
+      "sourceMap": true,
+      "noEmitOnError": true,
+      "isolatedModules": true, // we need it for esbuild
+      "lib": [
+        "dom",
+        "es2016",
+        "esnext.asynciterable"
+      ]
+    },
+    "exclude": [
+      "node_modules"
+    ]
+  }
+  
\ No newline at end of file
diff --git a/src/Web/Avalonia.Web/webapp/types/dotnet.d.ts b/src/Web/Avalonia.Web/webapp/types/dotnet.d.ts
new file mode 100644
index 0000000000..0067ee3e0e
--- /dev/null
+++ b/src/Web/Avalonia.Web/webapp/types/dotnet.d.ts
@@ -0,0 +1,270 @@
+// See https://raw.githubusercontent.com/dotnet/runtime/main/src/mono/wasm/runtime/dotnet.d.ts
+
+//! Licensed to the .NET Foundation under one or more agreements.
+//! The .NET Foundation licenses this file to you under the MIT license.
+//!
+//! This is generated file, see src/mono/wasm/runtime/rollup.config.js
+
+//! This is not considered public API with backward compatibility guarantees. 
+
+interface DotnetHostBuilder {
+    withConfig(config: MonoConfig): DotnetHostBuilder;
+    withConfigSrc(configSrc: string): DotnetHostBuilder;
+    withApplicationArguments(...args: string[]): DotnetHostBuilder;
+    withEnvironmentVariable(name: string, value: string): DotnetHostBuilder;
+    withEnvironmentVariables(variables: {
+        [i: string]: string;
+    }): DotnetHostBuilder;
+    withVirtualWorkingDirectory(vfsPath: string): DotnetHostBuilder;
+    withDiagnosticTracing(enabled: boolean): DotnetHostBuilder;
+    withDebugging(level: number): DotnetHostBuilder;
+    withMainAssembly(mainAssemblyName: string): DotnetHostBuilder;
+    withApplicationArgumentsFromQuery(): DotnetHostBuilder;
+    create(): Promise<RuntimeAPI>;
+    run(): Promise<number>;
+}
+
+declare interface NativePointer {
+    __brandNativePointer: "NativePointer";
+}
+declare interface VoidPtr extends NativePointer {
+    __brand: "VoidPtr";
+}
+declare interface CharPtr extends NativePointer {
+    __brand: "CharPtr";
+}
+declare interface Int32Ptr extends NativePointer {
+    __brand: "Int32Ptr";
+}
+declare interface EmscriptenModule {
+    HEAP8: Int8Array;
+    HEAP16: Int16Array;
+    HEAP32: Int32Array;
+    HEAPU8: Uint8Array;
+    HEAPU16: Uint16Array;
+    HEAPU32: Uint32Array;
+    HEAPF32: Float32Array;
+    HEAPF64: Float64Array;
+    _malloc(size: number): VoidPtr;
+    _free(ptr: VoidPtr): void;
+    print(message: string): void;
+    printErr(message: string): void;
+    ccall<T>(ident: string, returnType?: string | null, argTypes?: string[], args?: any[], opts?: any): T;
+    cwrap<T extends Function>(ident: string, returnType: string, argTypes?: string[], opts?: any): T;
+    cwrap<T extends Function>(ident: string, ...args: any[]): T;
+    setValue(ptr: VoidPtr, value: number, type: string, noSafe?: number | boolean): void;
+    setValue(ptr: Int32Ptr, value: number, type: string, noSafe?: number | boolean): void;
+    getValue(ptr: number, type: string, noSafe?: number | boolean): number;
+    UTF8ToString(ptr: CharPtr, maxBytesToRead?: number): string;
+    UTF8ArrayToString(u8Array: Uint8Array, idx?: number, maxBytesToRead?: number): string;
+    FS_createPath(parent: string, path: string, canRead?: boolean, canWrite?: boolean): string;
+    FS_createDataFile(parent: string, name: string, data: TypedArray, canRead: boolean, canWrite: boolean, canOwn?: boolean): string;
+    FS_readFile(filename: string, opts: any): any;
+    removeRunDependency(id: string): void;
+    addRunDependency(id: string): void;
+    stackSave(): VoidPtr;
+    stackRestore(stack: VoidPtr): void;
+    stackAlloc(size: number): VoidPtr;
+    ready: Promise<unknown>;
+    instantiateWasm?: InstantiateWasmCallBack;
+    preInit?: (() => any)[] | (() => any);
+    preRun?: (() => any)[] | (() => any);
+    onRuntimeInitialized?: () => any;
+    postRun?: (() => any)[] | (() => any);
+    onAbort?: {
+        (error: any): void;
+    };
+}
+declare type InstantiateWasmSuccessCallback = (instance: WebAssembly.Instance, module: WebAssembly.Module) => void;
+declare type InstantiateWasmCallBack = (imports: WebAssembly.Imports, successCallback: InstantiateWasmSuccessCallback) => any;
+declare type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
+
+declare type MonoConfig = {
+    /**
+     * The subfolder containing managed assemblies and pdbs. This is relative to dotnet.js script.
+     */
+    assemblyRootFolder?: string;
+    /**
+     * A list of assets to load along with the runtime.
+     */
+    assets?: AssetEntry[];
+    /**
+     * Additional search locations for assets.
+     */
+    remoteSources?: string[];
+    /**
+     * It will not fail the startup is .pdb files can't be downloaded
+     */
+    ignorePdbLoadErrors?: boolean;
+    /**
+     * We are throttling parallel downloads in order to avoid net::ERR_INSUFFICIENT_RESOURCES on chrome. The default value is 16.
+     */
+    maxParallelDownloads?: number;
+    /**
+     * Name of the assembly with main entrypoint
+     */
+    mainAssemblyName?: string;
+    /**
+     * Configures the runtime's globalization mode
+     */
+    globalizationMode?: GlobalizationMode;
+    /**
+     * debugLevel > 0 enables debugging and sets the debug log level to debugLevel
+     * debugLevel == 0 disables debugging and enables interpreter optimizations
+     * debugLevel < 0 enabled debugging and disables debug logging.
+     */
+    debugLevel?: number;
+    /**
+    * Enables diagnostic log messages during startup
+    */
+    diagnosticTracing?: boolean;
+    /**
+     * Dictionary-style Object containing environment variables
+     */
+    environmentVariables?: {
+        [i: string]: string;
+    };
+    /**
+     * initial number of workers to add to the emscripten pthread pool
+     */
+    pthreadPoolSize?: number;
+};
+interface ResourceRequest {
+    name: string;
+    behavior: AssetBehaviours;
+    resolvedUrl?: string;
+    hash?: string;
+}
+interface LoadingResource {
+    name: string;
+    url: string;
+    response: Promise<Response>;
+}
+interface AssetEntry extends ResourceRequest {
+    /**
+     * If specified, overrides the path of the asset in the virtual filesystem and similar data structures once downloaded.
+     */
+    virtualPath?: string;
+    /**
+     * Culture code
+     */
+    culture?: string;
+    /**
+     * If true, an attempt will be made to load the asset from each location in MonoConfig.remoteSources.
+     */
+    loadRemote?: boolean;
+    /**
+     * If true, the runtime startup would not fail if the asset download was not successful.
+     */
+    isOptional?: boolean;
+    /**
+     * If provided, runtime doesn't have to fetch the data.
+     * Runtime would set the buffer to null after instantiation to free the memory.
+     */
+    buffer?: ArrayBuffer;
+    /**
+     * It's metadata + fetch-like Promise<Response>
+     * If provided, the runtime doesn't have to initiate the download. It would just await the response.
+     */
+    pendingDownload?: LoadingResource;
+}
+declare type AssetBehaviours = "resource" | "assembly" | "pdb" | "heap" | "icu" | "vfs" | "dotnetwasm" | "js-module-threads";
+declare type GlobalizationMode = "icu" | // load ICU globalization data from any runtime assets with behavior "icu".
+"invariant" | //  operate in invariant globalization mode.
+"auto";
+declare type DotnetModuleConfig = {
+    disableDotnet6Compatibility?: boolean;
+    config?: MonoConfig;
+    configSrc?: string;
+    onConfigLoaded?: (config: MonoConfig) => void | Promise<void>;
+    onDotnetReady?: () => void | Promise<void>;
+    imports?: any;
+    exports?: string[];
+    downloadResource?: (request: ResourceRequest) => LoadingResource | undefined;
+} & Partial<EmscriptenModule>;
+declare type APIType = {
+    runMain: (mainAssemblyName: string, args: string[]) => Promise<number>;
+    runMainAndExit: (mainAssemblyName: string, args: string[]) => Promise<number>;
+    setEnvironmentVariable: (name: string, value: string) => void;
+    getAssemblyExports(assemblyName: string): Promise<any>;
+    setModuleImports(moduleName: string, moduleImports: any): void;
+    getConfig: () => MonoConfig;
+    setHeapB32: (offset: NativePointer, value: number | boolean) => void;
+    setHeapU8: (offset: NativePointer, value: number) => void;
+    setHeapU16: (offset: NativePointer, value: number) => void;
+    setHeapU32: (offset: NativePointer, value: NativePointer | number) => void;
+    setHeapI8: (offset: NativePointer, value: number) => void;
+    setHeapI16: (offset: NativePointer, value: number) => void;
+    setHeapI32: (offset: NativePointer, value: number) => void;
+    setHeapI52: (offset: NativePointer, value: number) => void;
+    setHeapU52: (offset: NativePointer, value: number) => void;
+    setHeapI64Big: (offset: NativePointer, value: bigint) => void;
+    setHeapF32: (offset: NativePointer, value: number) => void;
+    setHeapF64: (offset: NativePointer, value: number) => void;
+    getHeapB32: (offset: NativePointer) => boolean;
+    getHeapU8: (offset: NativePointer) => number;
+    getHeapU16: (offset: NativePointer) => number;
+    getHeapU32: (offset: NativePointer) => number;
+    getHeapI8: (offset: NativePointer) => number;
+    getHeapI16: (offset: NativePointer) => number;
+    getHeapI32: (offset: NativePointer) => number;
+    getHeapI52: (offset: NativePointer) => number;
+    getHeapU52: (offset: NativePointer) => number;
+    getHeapI64Big: (offset: NativePointer) => bigint;
+    getHeapF32: (offset: NativePointer) => number;
+    getHeapF64: (offset: NativePointer) => number;
+};
+declare type RuntimeAPI = {
+    /**
+     * @deprecated Please use API object instead. See also MONOType in dotnet-legacy.d.ts
+     */
+    MONO: any;
+    /**
+     * @deprecated Please use API object instead. See also BINDINGType in dotnet-legacy.d.ts
+     */
+    BINDING: any;
+    INTERNAL: any;
+    Module: EmscriptenModule;
+    runtimeId: number;
+    runtimeBuildInfo: {
+        productVersion: string;
+        gitHash: string;
+        buildConfiguration: string;
+    };
+} & APIType;
+declare type ModuleAPI = {
+    dotnet: DotnetHostBuilder;
+    exit: (code: number, reason?: any) => void;
+};
+declare function createDotnetRuntime(moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)): Promise<RuntimeAPI>;
+declare type CreateDotnetRuntimeType = typeof createDotnetRuntime;
+
+declare global {
+    function getDotnetRuntime(runtimeId: number): RuntimeAPI | undefined;
+}
+
+declare const dotnet: ModuleAPI["dotnet"];
+declare const exit: ModuleAPI["exit"];
+
+export { CreateDotnetRuntimeType, DotnetModuleConfig, EmscriptenModule, ModuleAPI, MonoConfig, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
+
+export interface IMemoryView {
+    /**
+     * copies elements from provided source to the wasm memory.
+     * target has to have the elements of the same type as the underlying C# array.
+     * same as TypedArray.set()
+     */
+    set(source: TypedArray, targetOffset?: number): void;
+    /**
+     * copies elements from wasm memory to provided target.
+     * target has to have the elements of the same type as the underlying C# array.
+     */
+    copyTo(target: TypedArray, sourceOffset?: number): void;
+    /**
+     * same as TypedArray.slice()
+     */
+    slice(start?: number, end?: number): TypedArray;
+
+    get length(): number;
+    get byteLength(): number;
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index a1d8a60cb9..03b3ebec0d 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -18,4 +18,15 @@
   <Import Project="..\..\..\build\SharpDX.props" />
   <Import Project="..\..\..\build\HarfBuzzSharp.props" />
   <Import Project="..\..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Direct2D1.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  
 </Project>
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index c32c58605f..4d307c9762 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using Avalonia.Controls;
@@ -9,10 +8,9 @@ using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
 using SharpDX.DirectWrite;
 using GlyphRun = Avalonia.Media.GlyphRun;
-using TextAlignment = Avalonia.Media.TextAlignment;
+using SharpDX.Mathematics.Interop;
 
 namespace Avalonia
 {
@@ -159,6 +157,113 @@ namespace Avalonia.Direct2D1
         public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children) => new GeometryGroupImpl(fillRule, children);
         public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2) => new CombinedGeometryImpl(combineMode, g1, g2);
 
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, 
+            IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        {
+            var glyphTypefaceImpl = (GlyphTypefaceImpl)glyphTypeface;
+
+            var glyphCount = glyphIndices.Count;
+
+            var run = new SharpDX.DirectWrite.GlyphRun
+            {
+                FontFace = glyphTypefaceImpl.FontFace,
+                FontSize = (float)fontRenderingEmSize
+            };
+
+            var indices = new short[glyphCount];
+
+            for (var i = 0; i < glyphCount; i++)
+            {
+                indices[i] = (short)glyphIndices[i];
+            }
+
+            run.Indices = indices;
+
+            run.Advances = new float[glyphCount];
+
+            var scale = (float)(fontRenderingEmSize / glyphTypeface.Metrics.DesignEmHeight);
+
+            if (glyphAdvances == null)
+            {
+                for (var i = 0; i < glyphCount; i++)
+                {
+                    var advance = glyphTypeface.GetGlyphAdvance(glyphIndices[i]) * scale;
+
+                    run.Advances[i] = advance;
+                }
+            }
+            else
+            {
+                for (var i = 0; i < glyphCount; i++)
+                {
+                    var advance = (float)glyphAdvances[i];
+
+                    run.Advances[i] = advance;
+                }
+            }
+
+            if (glyphOffsets == null)
+            {
+                return new GlyphRunImpl(run);
+            }
+
+            run.Offsets = new GlyphOffset[glyphCount];
+
+            for (var i = 0; i < glyphCount; i++)
+            {
+                var (x, y) = glyphOffsets[i];
+
+                run.Offsets[i] = new GlyphOffset
+                {
+                    AdvanceOffset = (float)x,
+                    AscenderOffset = (float)y
+                };
+            }
+
+            return new GlyphRunImpl(run);
+        }
+
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
+        {
+            if (glyphRun.GlyphTypeface is not GlyphTypefaceImpl glyphTypeface)
+            {
+                throw new InvalidOperationException("PlatformImpl can't be null.");
+            }
+
+            var pathGeometry = new SharpDX.Direct2D1.PathGeometry(Direct2D1Factory);
+
+            using (var sink = pathGeometry.Open())
+            {
+                var glyphs = new short[glyphRun.GlyphIndices.Count];
+
+                for (int i = 0; i < glyphRun.GlyphIndices.Count; i++)
+                {
+                    glyphs[i] = (short)glyphRun.GlyphIndices[i];
+                }
+
+                glyphTypeface.FontFace.GetGlyphRunOutline((float)glyphRun.FontRenderingEmSize, glyphs, null, null, false, !glyphRun.IsLeftToRight, sink);
+
+                sink.Close();
+            }
+
+            var (baselineOriginX, baselineOriginY) = glyphRun.BaselineOrigin;
+
+            var transformedGeometry = new SharpDX.Direct2D1.TransformedGeometry(
+                Direct2D1Factory,
+                pathGeometry,
+                new RawMatrix3x2(1.0f, 0.0f, 0.0f, 1.0f, (float)baselineOriginX, (float)baselineOriginY));
+
+            return new TransformedGeometryWrapper(transformedGeometry);
+        }
+
+        private class TransformedGeometryWrapper : GeometryImpl
+        {
+            public TransformedGeometryWrapper(SharpDX.Direct2D1.TransformedGeometry geometry) : base(geometry)
+            {
+
+            }
+        }
+
         /// <inheritdoc />
         public IBitmapImpl LoadBitmap(string fileName)
         {
@@ -218,71 +323,6 @@ namespace Avalonia.Direct2D1
             return new WicBitmapImpl(format, alphaFormat, data, size, dpi, stride);
         }
 
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
-        {
-            var glyphTypeface = (GlyphTypefaceImpl)glyphRun.GlyphTypeface.PlatformImpl;
-
-            var glyphCount = glyphRun.GlyphIndices.Count;
-
-            var run = new SharpDX.DirectWrite.GlyphRun
-            {
-                FontFace = glyphTypeface.FontFace,
-                FontSize = (float)glyphRun.FontRenderingEmSize
-            };
-
-            var indices = new short[glyphCount];
-
-            for (var i = 0; i < glyphCount; i++)
-            {
-                indices[i] = (short)glyphRun.GlyphIndices[i];
-            }
-
-            run.Indices = indices;
-
-            run.Advances = new float[glyphCount];
-
-            var scale = (float)(glyphRun.FontRenderingEmSize / glyphTypeface.DesignEmHeight);
-
-            if (glyphRun.GlyphAdvances == null)
-            {
-                for (var i = 0; i < glyphCount; i++)
-                {
-                    var advance = glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
-
-                    run.Advances[i] = advance;
-                }
-            }
-            else
-            {
-                for (var i = 0; i < glyphCount; i++)
-                {
-                    var advance = (float)glyphRun.GlyphAdvances[i];
-
-                    run.Advances[i] = advance;
-                }
-            }
-
-            if (glyphRun.GlyphOffsets == null)
-            {
-                return new GlyphRunImpl(run);
-            }
-
-            run.Offsets = new GlyphOffset[glyphCount];
-
-            for (var i = 0; i < glyphCount; i++)
-            {
-                var (x, y) = glyphRun.GlyphOffsets[i];
-
-                run.Offsets[i] = new GlyphOffset
-                {
-                    AdvanceOffset = (float)x,
-                    AscenderOffset = (float)y
-                };
-            }
-
-            return new GlyphRunImpl(run);
-        }
-
         public bool SupportsIndividualRoundRects => false;
 
         public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
index ad609a0810..602ea9b568 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public abstract class BrushImpl : IDisposable
     {
         public SharpDX.Direct2D1.Brush PlatformBrush { get; set; }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs b/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
index 78bf25d607..792bf2d0be 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
@@ -5,6 +5,7 @@ using SharpDX.DirectWrite;
 using FontFamily = Avalonia.Media.FontFamily;
 using FontStyle = SharpDX.DirectWrite.FontStyle;
 using FontWeight = SharpDX.DirectWrite.FontWeight;
+using FontStretch = SharpDX.DirectWrite.FontStretch;
 
 namespace Avalonia.Direct2D1.Media
 {
@@ -32,7 +33,7 @@ namespace Avalonia.Direct2D1.Media
                 {
                     return fontCollection.GetFontFamily(index).GetFirstMatchingFont(
                         (FontWeight)typeface.Weight,
-                        FontStretch.Normal,
+                        (FontStretch)typeface.Stretch,
                         (FontStyle)typeface.Style);
                 }
             }
@@ -41,7 +42,7 @@ namespace Avalonia.Direct2D1.Media
 
             return InstalledFontCollection.GetFontFamily(index).GetFirstMatchingFont(
                 (FontWeight)typeface.Weight,
-                FontStretch.Normal,
+                (FontStretch)typeface.Stretch,
                 (FontStyle)typeface.Style);
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index b62a6fa5a6..180ae491b3 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -1,21 +1,24 @@
 using System;
 using System.Collections.Generic;
+using System.Numerics;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
-using BitmapInterpolationMode = Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode;
+using BitmapInterpolationMode = Avalonia.Media.Imaging.BitmapInterpolationMode;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
     /// <summary>
     /// Draws using Direct2D1.
     /// </summary>
+    [Unstable]
     public class DrawingContextImpl : IDrawingContextImpl
     {
         private readonly IVisualBrushRenderer _visualBrushRenderer;
@@ -73,6 +76,12 @@ namespace Avalonia.Direct2D1.Media
             set { _deviceContext.Transform = value.ToDirect2D(); }
         }
 
+        public Matrix4x4 Transform4x4
+        {
+            get => throw new NotSupportedException();
+            set => throw new NotSupportedException();
+        }
+
         /// <inheritdoc/>
         public void Clear(Color color)
         {
@@ -605,5 +614,6 @@ namespace Avalonia.Direct2D1.Media
         }
         
         public void Custom(ICustomDrawOperation custom) => custom.Render(this);
+        public object GetFeature(Type t) => null;
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs
index 6d95d759ec..b98ed3ffe6 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs
@@ -4,6 +4,7 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using SharpDX.DirectWrite;
 using FontFamily = Avalonia.Media.FontFamily;
+using FontStretch = Avalonia.Media.FontStretch;
 using FontStyle = Avalonia.Media.FontStyle;
 using FontWeight = Avalonia.Media.FontWeight;
 
@@ -32,7 +33,7 @@ namespace Avalonia.Direct2D1.Media
         }
 
         public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
-            FontWeight fontWeight,
+            FontWeight fontWeight, FontStretch fontStretch,
             FontFamily fontFamily, CultureInfo culture, out Typeface typeface)
         {
             var familyCount = Direct2D1FontCollectionCache.InstalledFontCollection.FontFamilyCount;
@@ -40,7 +41,8 @@ namespace Avalonia.Direct2D1.Media
             for (var i = 0; i < familyCount; i++)
             {
                 var font = Direct2D1FontCollectionCache.InstalledFontCollection.GetFontFamily(i)
-                    .GetMatchingFonts((SharpDX.DirectWrite.FontWeight)fontWeight, FontStretch.Normal,
+                    .GetMatchingFonts((SharpDX.DirectWrite.FontWeight)fontWeight,
+                        (SharpDX.DirectWrite.FontStretch)fontStretch,
                         (SharpDX.DirectWrite.FontStyle)fontStyle).GetFont(0);
 
                 if (!font.HasCharacter(codepoint))
@@ -50,7 +52,7 @@ namespace Avalonia.Direct2D1.Media
 
                 var fontFamilyName = font.FontFamily.FamilyNames.GetString(0);
 
-                typeface = new Typeface(fontFamilyName, fontStyle, fontWeight);
+                typeface = new Typeface(fontFamilyName, fontStyle, fontWeight, fontStretch);
 
                 return true;
             }
@@ -60,7 +62,7 @@ namespace Avalonia.Direct2D1.Media
             return false;
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphTypeface CreateGlyphTypeface(Typeface typeface)
         {
             return new GlyphTypefaceImpl(typeface);
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index ec88347a17..c84c14daac 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,4 +1,5 @@
 using Avalonia.Logging;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -7,6 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// The platform-specific interface for <see cref="Avalonia.Media.Geometry"/>.
     /// </summary>
+    [Unstable]
     public abstract class GeometryImpl : IGeometryImpl
     {
         private const float ContourApproximation = 0.0001f;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
index 4f2ed22a25..705c715455 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
@@ -1,12 +1,16 @@
 using System;
 using Avalonia.Media;
-using Avalonia.Platform;
+using Avalonia.Metadata;
 using HarfBuzzSharp;
 using SharpDX.DirectWrite;
+using FontMetrics = Avalonia.Media.FontMetrics;
+using FontSimulations = Avalonia.Media.FontSimulations;
+using GlyphMetrics = Avalonia.Media.GlyphMetrics;
 
 namespace Avalonia.Direct2D1.Media
 {
-    public class GlyphTypefaceImpl : IGlyphTypefaceImpl
+    [Unstable]
+    public class GlyphTypefaceImpl : IGlyphTypeface
     {
         private bool _isDisposed;
 
@@ -24,40 +28,28 @@ namespace Avalonia.Direct2D1.Media
 
             Font.GetScale(out var xScale, out _);
 
-            DesignEmHeight = (short)xScale;
-
             if (!Font.TryGetHorizontalFontExtents(out var fontExtents))
             {
                 Font.TryGetVerticalFontExtents(out fontExtents);
             }
 
-            Ascent = -fontExtents.Ascender;
-
-            Descent = -fontExtents.Descender;
-
-            LineGap = fontExtents.LineGap;
-
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineOffset, out var underlinePosition))
-            {
-                UnderlinePosition = underlinePosition;
-            }
+            Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineOffset, out var underlinePosition);
+            Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineSize, out var underlineThickness);
+            Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutOffset, out var strikethroughPosition);
+            Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutSize, out var strikethroughThickness);
 
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineSize, out var underlineThickness))
+            Metrics = new FontMetrics
             {
-                UnderlineThickness = underlineThickness;
-            }
-
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutOffset, out var strikethroughPosition))
-            {
-                StrikethroughPosition = strikethroughPosition;
-            }
-
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutSize, out var strikethroughThickness))
-            {
-                StrikethroughThickness = strikethroughThickness;
-            }
-
-            IsFixedPitch = FontFace.IsMonospacedFont;
+                DesignEmHeight = (short)xScale,
+                Ascent = -fontExtents.Ascender,
+                Descent = -fontExtents.Descender,
+                LineGap = fontExtents.LineGap,
+                UnderlinePosition = underlinePosition,
+                UnderlineThickness = underlineThickness,
+                StrikethroughPosition = strikethroughPosition,
+                StrikethroughThickness = strikethroughThickness,
+                IsFixedPitch = FontFace.IsMonospacedFont
+            };
         }
 
         private Blob GetTable(Face face, Tag tag)
@@ -87,35 +79,13 @@ namespace Avalonia.Direct2D1.Media
 
         public HarfBuzzSharp.Font Font { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public short DesignEmHeight { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int Ascent { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int Descent { get; }
+        public FontMetrics Metrics { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int LineGap { get; }
+        public int GlyphCount { get; set; }
 
-        //ToDo: Read font table for these values
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int UnderlinePosition { get; }
+        public FontSimulations FontSimulations => FontSimulations.None;
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int UnderlineThickness { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int StrikethroughPosition { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int StrikethroughThickness { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public bool IsFixedPitch { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public ushort GetGlyph(uint codepoint)
         {
             if (Font.TryGetGlyph(codepoint, out var glyph))
@@ -126,7 +96,14 @@ namespace Avalonia.Direct2D1.Media
             return 0;
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        public bool TryGetGlyph(uint codepoint, out ushort glyph)
+        {
+            glyph = GetGlyph(codepoint);
+
+            return glyph != 0;
+        }
+
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints)
         {
             var glyphs = new ushort[codepoints.Length];
@@ -142,13 +119,13 @@ namespace Avalonia.Direct2D1.Media
             return glyphs;
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public int GetGlyphAdvance(ushort glyph)
         {
             return Font.GetHorizontalGlyphAdvance(glyph);
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs)
         {
             var glyphIndices = new uint[glyphs.Length];
@@ -161,6 +138,26 @@ namespace Avalonia.Direct2D1.Media
             return Font.GetHorizontalGlyphAdvances(glyphIndices);
         }
 
+        public bool TryGetGlyphMetrics(ushort glyph, out GlyphMetrics metrics)
+        {
+            metrics = default;
+
+            if (!Font.TryGetGlyphExtents(glyph, out var extents))
+            {
+                return false;
+            }
+
+            metrics = new GlyphMetrics
+            {
+                XBearing = extents.XBearing,
+                YBearing = extents.YBearing,
+                Width = extents.Width,
+                Height = extents.Height
+            };
+
+            return true;
+        }
+
         private void Dispose(bool disposing)
         {
             if (_isDisposed)
@@ -185,6 +182,21 @@ namespace Avalonia.Direct2D1.Media
             Dispose(true);
             GC.SuppressFinalize(this);
         }
+
+        public bool TryGetTable(uint tag, out byte[] table)
+        {
+            table = null;
+            var blob = Face.ReferenceTable(tag);
+
+            if (blob.Length > 0)
+            {
+                table = blob.AsSpan().ToArray();
+
+                return true;
+            }
+
+            return false;
+        }
     }
 }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
index 09b900b0c2..17dc359ed7 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
@@ -1,15 +1,17 @@
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public sealed class ImageBrushImpl : BrushImpl
     {
         private readonly OptionalDispose<Bitmap> _bitmap;
 
-        private readonly Visuals.Media.Imaging.BitmapInterpolationMode _bitmapInterpolationMode;
+        private readonly Avalonia.Media.Imaging.BitmapInterpolationMode _bitmapInterpolationMode;
 
         public ImageBrushImpl(
             ITileBrush brush,
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
index af6d5c5e7b..059105c112 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,10 +1,12 @@
 using System;
 using System.IO;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
         public abstract Vector Dpi { get; }
@@ -13,7 +15,7 @@ namespace Avalonia.Direct2D1.Media
 
         public abstract OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target);
 
-        public void Save(string fileName)
+        public void Save(string fileName, int? quality = null)
         {
             if (Path.GetExtension(fileName) != ".png")
             {
@@ -23,11 +25,11 @@ namespace Avalonia.Direct2D1.Media
 
             using (FileStream s = new FileStream(fileName, FileMode.Create))
             {
-                Save(s);
+                Save(s, quality);
             }
         }
 
-        public abstract void Save(Stream stream);
+        public abstract void Save(Stream stream, int? quality = null);
 
         public virtual void Dispose()
         {
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
index 63676e30b5..a321b225a0 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Avalonia.Metadata;
 using SharpDX.WIC;
 using Bitmap = SharpDX.Direct2D1.Bitmap;
 
@@ -8,6 +9,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D Bitmap implementation that uses a GPU memory bitmap as its image.
     /// </summary>
+    [Unstable]
     public class D2DBitmapImpl : BitmapImpl
     {
         private readonly Bitmap _direct2DBitmap;
@@ -41,7 +43,7 @@ namespace Avalonia.Direct2D1.Media
             return new OptionalDispose<Bitmap>(_direct2DBitmap, false);
         }
 
-        public override void Save(Stream stream)
+        public override void Save(Stream stream, int? quality = null)
         {
             using (var encoder = new PngBitmapEncoder(Direct2D1Platform.ImagingFactory, stream))
             using (var frame = new BitmapFrameEncode(encoder))
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
index 9a0e2ec00c..c5f8e837ce 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Utilities;
@@ -9,6 +10,7 @@ using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
+    [Unstable]
     public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
     {
         private readonly BitmapRenderTarget _renderTarget;
@@ -54,7 +56,7 @@ namespace Avalonia.Direct2D1.Media.Imaging
             return new OptionalDispose<D2DBitmap>(_renderTarget.Bitmap, false);
         }
 
-        public override void Save(Stream stream)
+        public override void Save(Stream stream, int? quality = null)
         {
             using (var wic = new WicRenderTargetBitmapImpl(PixelSize, Dpi))
             {
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index cac35aa4ae..051790ef03 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -5,31 +5,33 @@ using SharpDX.WIC;
 using APixelFormat = Avalonia.Platform.PixelFormat;
 using AlphaFormat = Avalonia.Platform.AlphaFormat;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
     /// <summary>
     /// A WIC implementation of a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
     /// </summary>
+    [Unstable]
     public class WicBitmapImpl : BitmapImpl
     {
         private readonly BitmapDecoder _decoder;
 
-        private static BitmapInterpolationMode ConvertInterpolationMode(Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+        private static BitmapInterpolationMode ConvertInterpolationMode(Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
         {
             switch (interpolationMode)
             {
-                case Visuals.Media.Imaging.BitmapInterpolationMode.Default:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.Default:
                     return BitmapInterpolationMode.Fant;
 
-                case Visuals.Media.Imaging.BitmapInterpolationMode.LowQuality:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.LowQuality:
                     return BitmapInterpolationMode.NearestNeighbor;
 
-                case Visuals.Media.Imaging.BitmapInterpolationMode.MediumQuality:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.MediumQuality:
                     return BitmapInterpolationMode.Fant;
 
                 default:
-                case Visuals.Media.Imaging.BitmapInterpolationMode.HighQuality:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.HighQuality:
                     return BitmapInterpolationMode.HighQualityCubic;
 
             }
@@ -118,7 +120,7 @@ namespace Avalonia.Direct2D1.Media
             }
         }
 
-        public WicBitmapImpl(Stream stream, int decodeSize, bool horizontal, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+        public WicBitmapImpl(Stream stream, int decodeSize, bool horizontal, Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
         {
             _decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, stream, DecodeOptions.CacheOnLoad);
 
@@ -184,7 +186,7 @@ namespace Avalonia.Direct2D1.Media
             return new OptionalDispose<D2DBitmap>(D2DBitmap.FromWicBitmap(renderTarget, converter), true);
         }
 
-        public override void Save(Stream stream)
+        public override void Save(Stream stream, int? quality = null)
         {
             using (var encoder = new PngBitmapEncoder(Direct2D1Platform.ImagingFactory, stream))
             using (var frame = new BitmapFrameEncode(encoder))
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 1265a7bdf0..8c9d01f37d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -1,10 +1,12 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
     {
         private readonly WicRenderTarget _renderTarget;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index fef6a9aa82..885be132a4 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Direct2D1.Media.Imaging
     class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
         public WriteableWicBitmapImpl(Stream stream, int decodeSize, bool horizontal,
-            Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+            Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
         : base(stream, decodeSize, horizontal, interpolationMode)
         {
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
index 0e63d4cc03..5dfe683f59 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using Avalonia.Media;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class LinearGradientBrushImpl : BrushImpl
     {
         public LinearGradientBrushImpl(
diff --git a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
index 1fca6d4e33..0069e47001 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using Avalonia.Media;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class RadialGradientBrushImpl : BrushImpl
     {
         public RadialGradientBrushImpl(
diff --git a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
index fea1ca9157..b85494e2c1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
@@ -1,7 +1,9 @@
 using Avalonia.Media;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class SolidColorBrushImpl : BrushImpl
     {
         public SolidColorBrushImpl(ISolidColorBrush brush, SharpDX.Direct2D1.RenderTarget target)
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
index e1f7aad1b2..ec8f82556d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Logging;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 using D2D = SharpDX.Direct2D1;
@@ -8,6 +9,7 @@ using SweepDirection = SharpDX.Direct2D1.SweepDirection;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class StreamGeometryContextImpl : IStreamGeometryContextImpl
     {
         private readonly GeometrySink _sink;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
index 2bc2b2db71..e1677c0ed1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
@@ -1,3 +1,4 @@
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -6,6 +7,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.StreamGeometry"/>.
     /// </summary>
+    [Unstable]
     public class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
     {
         /// <summary>
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
index 62cf031f86..7f2cbc6182 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
@@ -11,29 +10,32 @@ using GlyphInfo = HarfBuzzSharp.GlyphInfo;
 
 namespace Avalonia.Direct2D1.Media
 {
-
-internal class TextShaperImpl : ITextShaperImpl
+    internal class TextShaperImpl : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+            var culture = options.Culture;
+
             using (var buffer = new Buffer())
             {
-                buffer.AddUtf16(text.Buffer.Span, text.Start, text.Length);
+                buffer.AddUtf16(text.Buffer.Span, text.BufferOffset, text.Length);
 
                 MergeBreakPair(buffer);
-                
+
                 buffer.GuessSegmentProperties();
 
                 buffer.Direction = (bidiLevel & 1) == 0 ? Direction.LeftToRight : Direction.RightToLeft;
 
-                buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);              
+                buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);
 
-                var font = ((GlyphTypefaceImpl)typeface.PlatformImpl).Font;
+                var font = ((GlyphTypefaceImpl)typeface).Font;
 
                 font.Shape(buffer);
 
-                if (buffer.Direction == Direction.RightToLeft)
+                if(buffer.Direction == Direction.RightToLeft)
                 {
                     buffer.Reverse();
                 }
@@ -56,15 +58,22 @@ internal class TextShaperImpl : ITextShaperImpl
 
                     var glyphIndex = (ushort)sourceInfo.Codepoint;
 
-                    var glyphCluster = (int)sourceInfo.Cluster;
+                    var glyphCluster = (int)(sourceInfo.Cluster);
 
                     var glyphAdvance = GetGlyphAdvance(glyphPositions, i, textScale);
 
                     var glyphOffset = GetGlyphOffset(glyphPositions, i, textScale);
 
-                    var targetInfo =
-                        new Avalonia.Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance,
-                            glyphOffset);
+                    if (text.Buffer.Span[glyphCluster] == '\t')
+                    {
+                        glyphIndex = typeface.GetGlyph(' ');
+
+                        glyphAdvance = options.IncrementalTabWidth > 0 ?
+                            options.IncrementalTabWidth :
+                            4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
+                    }
+
+                    var targetInfo = new Avalonia.Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
 
                     shapedBuffer[i] = targetInfo;
                 }
@@ -78,10 +87,10 @@ internal class TextShaperImpl : ITextShaperImpl
             var length = buffer.Length;
 
             var glyphInfos = buffer.GetGlyphInfoSpan();
-            
+
             var second = glyphInfos[length - 1];
 
-            if (!new Codepoint((int)second.Codepoint).IsBreakChar)
+            if (!new Codepoint(second.Codepoint).IsBreakChar)
             {
                 return;
             }
@@ -89,7 +98,7 @@ internal class TextShaperImpl : ITextShaperImpl
             if (length > 1 && glyphInfos[length - 2].Codepoint == '\r' && second.Codepoint == '\n')
             {
                 var first = glyphInfos[length - 2];
-                
+
                 first.Codepoint = '\u200C';
                 second.Codepoint = '\u200C';
                 second.Cluster = first.Cluster;
@@ -100,7 +109,7 @@ internal class TextShaperImpl : ITextShaperImpl
                     {
                         *p = first;
                     }
-                
+
                     fixed (GlyphInfo* p = &glyphInfos[length - 1])
                     {
                         *p = second;
@@ -135,7 +144,7 @@ internal class TextShaperImpl : ITextShaperImpl
         private static double GetGlyphAdvance(ReadOnlySpan<GlyphPosition> glyphPositions, int index, double textScale)
         {
             // Depends on direction of layout
-            // advanceBuffer[index] = buffer.GlyphPositions[index].YAdvance * textScale;
+            // glyphPositions[index].YAdvance * textScale;
             return glyphPositions[index].XAdvance * textScale;
         }
     }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
index fe274701bf..3ecdb49e46 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
@@ -1,8 +1,10 @@
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
     {
         /// <summary>
diff --git a/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
deleted file mode 100644
index cdeb675bcd..0000000000
--- a/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Platform;
-using Avalonia.Direct2D1;
-
-[assembly: ExportRenderingSubsystem(OperatingSystemType.WinNT, 1, "Direct2D1", typeof(Direct2D1Platform), nameof(Direct2D1Platform.Initialize),
-    typeof(Direct2DChecker))]
-
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
index 9f49808422..cc8a40e2d4 100644
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@@ -18,4 +18,5 @@
   </ItemGroup>
 
   <Import Project="..\..\..\build\SharpDX.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
index d36db107e3..7435e3342e 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
@@ -101,7 +101,6 @@ namespace Avalonia.Win32.Interop.Wpf
 
         Size ITopLevelImpl.ClientSize => _finalSize;
         Size? ITopLevelImpl.FrameSize => null;
-        IMouseDevice ITopLevelImpl.MouseDevice => _mouse;
 
         double ITopLevelImpl.RenderScaling => PresentationSource.FromVisual(this)?.CompositionTarget?.TransformToDevice.M11 ?? 1;
 
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs
new file mode 100644
index 0000000000..5f3f863493
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs
@@ -0,0 +1,19 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Provider;
+using UIA = Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal partial class AutomationNode : UIA.IExpandCollapseProvider
+    {
+        ExpandCollapseState UIA.IExpandCollapseProvider.ExpandCollapseState
+        {
+            get => InvokeSync<IExpandCollapseProvider, ExpandCollapseState>(x => x.ExpandCollapseState);
+        }
+
+        void UIA.IExpandCollapseProvider.Expand() => InvokeSync<IExpandCollapseProvider>(x => x.Expand());
+        void UIA.IExpandCollapseProvider.Collapse() => InvokeSync<IExpandCollapseProvider>(x => x.Collapse());
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs
new file mode 100644
index 0000000000..b91cb76888
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs
@@ -0,0 +1,19 @@
+using Avalonia.Automation.Provider;
+using UIA = Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal partial class AutomationNode : UIA.IRangeValueProvider
+    {
+        double UIA.IRangeValueProvider.Value => InvokeSync<IRangeValueProvider, double>(x => x.Value);
+        bool UIA.IRangeValueProvider.IsReadOnly => InvokeSync<IRangeValueProvider, bool>(x => x.IsReadOnly);
+        double UIA.IRangeValueProvider.Maximum => InvokeSync<IRangeValueProvider, double>(x => x.Maximum);
+        double UIA.IRangeValueProvider.Minimum => InvokeSync<IRangeValueProvider, double>(x => x.Minimum);
+        double UIA.IRangeValueProvider.LargeChange => 1;
+        double UIA.IRangeValueProvider.SmallChange => 1;
+
+        public void SetValue(double value) => InvokeSync<IRangeValueProvider>(x => x.SetValue(value));
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs
new file mode 100644
index 0000000000..4f2d4ae269
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs
@@ -0,0 +1,32 @@
+using Avalonia.Automation.Provider;
+using UIA = Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal partial class AutomationNode : UIA.IScrollProvider, UIA.IScrollItemProvider
+    {
+        bool UIA.IScrollProvider.HorizontallyScrollable => InvokeSync<IScrollProvider, bool>(x => x.HorizontallyScrollable);
+        double UIA.IScrollProvider.HorizontalScrollPercent => InvokeSync<IScrollProvider, double>(x => x.HorizontalScrollPercent);
+        double UIA.IScrollProvider.HorizontalViewSize => InvokeSync<IScrollProvider, double>(x => x.HorizontalViewSize);
+        bool UIA.IScrollProvider.VerticallyScrollable => InvokeSync<IScrollProvider, bool>(x => x.VerticallyScrollable);
+        double UIA.IScrollProvider.VerticalScrollPercent => InvokeSync<IScrollProvider, double>(x => x.VerticalScrollPercent);
+        double UIA.IScrollProvider.VerticalViewSize => InvokeSync<IScrollProvider, double>(x => x.VerticalViewSize);
+
+        void UIA.IScrollProvider.Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount)
+        {
+            InvokeSync<IScrollProvider>(x => x.Scroll(horizontalAmount, verticalAmount));
+        }
+
+        void UIA.IScrollProvider.SetScrollPercent(double horizontalPercent, double verticalPercent)
+        {
+            InvokeSync<IScrollProvider>(x => x.SetScrollPercent(horizontalPercent, verticalPercent));
+        }
+
+        void UIA.IScrollItemProvider.ScrollIntoView()
+        {
+            InvokeSync(() => Peer.BringIntoView());
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs
new file mode 100644
index 0000000000..61903ab5b0
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Automation.Peers;
+using Avalonia.Automation.Provider;
+using UIA = Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal partial class AutomationNode : UIA.ISelectionProvider, UIA.ISelectionItemProvider
+    {
+        bool UIA.ISelectionProvider.CanSelectMultiple => InvokeSync<ISelectionProvider, bool>(x => x.CanSelectMultiple);
+        bool UIA.ISelectionProvider.IsSelectionRequired => InvokeSync<ISelectionProvider, bool>(x => x.IsSelectionRequired);
+        bool UIA.ISelectionItemProvider.IsSelected => InvokeSync<ISelectionItemProvider, bool>(x => x.IsSelected);
+        
+        UIA.IRawElementProviderSimple? UIA.ISelectionItemProvider.SelectionContainer
+        {
+            get
+            {
+                var peer = InvokeSync<ISelectionItemProvider, ISelectionProvider?>(x => x.SelectionContainer);
+                return GetOrCreate(peer as AutomationPeer);
+            }
+        }
+
+        UIA.IRawElementProviderSimple[] UIA.ISelectionProvider.GetSelection()
+        {
+            var peers = InvokeSync<ISelectionProvider, IReadOnlyList<AutomationPeer>>(x => x.GetSelection());
+            return peers?.Select(x => (UIA.IRawElementProviderSimple)GetOrCreate(x)!).ToArray() ??
+                Array.Empty<UIA.IRawElementProviderSimple>();
+        }
+
+        void UIA.ISelectionItemProvider.AddToSelection() => InvokeSync<ISelectionItemProvider>(x => x.AddToSelection());
+        void UIA.ISelectionItemProvider.RemoveFromSelection() => InvokeSync<ISelectionItemProvider>(x => x.RemoveFromSelection());
+        void UIA.ISelectionItemProvider.Select() => InvokeSync<ISelectionItemProvider>(x => x.Select());
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs
new file mode 100644
index 0000000000..38f4d80946
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs
@@ -0,0 +1,13 @@
+using Avalonia.Automation.Provider;
+using UIA = Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal partial class AutomationNode : UIA.IToggleProvider
+    {
+        ToggleState UIA.IToggleProvider.ToggleState => InvokeSync<IToggleProvider, ToggleState>(x => x.ToggleState);
+        void UIA.IToggleProvider.Toggle() => InvokeSync<IToggleProvider>(x => x.Toggle());
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs
new file mode 100644
index 0000000000..34f5dfe0b9
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs
@@ -0,0 +1,19 @@
+using System.Runtime.InteropServices;
+using Avalonia.Automation.Provider;
+using UIA = Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal partial class AutomationNode : UIA.IValueProvider
+    {
+        bool UIA.IValueProvider.IsReadOnly => InvokeSync<IValueProvider, bool>(x => x.IsReadOnly);
+        string? UIA.IValueProvider.Value => InvokeSync<IValueProvider, string?>(x => x.Value);
+
+        void UIA.IValueProvider.SetValue([MarshalAs(UnmanagedType.LPWStr)] string? value)
+        {
+            InvokeSync<IValueProvider>(x => x.SetValue(value));
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
new file mode 100644
index 0000000000..70e415aff1
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
@@ -0,0 +1,351 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
+using Avalonia.Threading;
+using Avalonia.Win32.Interop.Automation;
+using AAP = Avalonia.Automation.Provider;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    [ComVisible(true)]
+    internal partial class AutomationNode : MarshalByRefObject,
+        IRawElementProviderSimple,
+        IRawElementProviderSimple2,
+        IRawElementProviderFragment,
+        IRawElementProviderAdviseEvents,
+        IInvokeProvider
+    {
+        private static Dictionary<AutomationProperty, UiaPropertyId> s_propertyMap = new Dictionary<AutomationProperty, UiaPropertyId>()
+        {
+            { AutomationElementIdentifiers.BoundingRectangleProperty, UiaPropertyId.BoundingRectangle },
+            { AutomationElementIdentifiers.ClassNameProperty, UiaPropertyId.ClassName },
+            { AutomationElementIdentifiers.NameProperty, UiaPropertyId.Name },
+            { ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty, UiaPropertyId.ExpandCollapseExpandCollapseState },
+            { RangeValuePatternIdentifiers.IsReadOnlyProperty, UiaPropertyId.RangeValueIsReadOnly},
+            { RangeValuePatternIdentifiers.MaximumProperty, UiaPropertyId.RangeValueMaximum },
+            { RangeValuePatternIdentifiers.MinimumProperty, UiaPropertyId.RangeValueMinimum },
+            { RangeValuePatternIdentifiers.ValueProperty, UiaPropertyId.RangeValueValue },
+            { ScrollPatternIdentifiers.HorizontallyScrollableProperty, UiaPropertyId.ScrollHorizontallyScrollable },
+            { ScrollPatternIdentifiers.HorizontalScrollPercentProperty, UiaPropertyId.ScrollHorizontalScrollPercent },
+            { ScrollPatternIdentifiers.HorizontalViewSizeProperty, UiaPropertyId.ScrollHorizontalViewSize },
+            { ScrollPatternIdentifiers.VerticallyScrollableProperty, UiaPropertyId.ScrollVerticallyScrollable },
+            { ScrollPatternIdentifiers.VerticalScrollPercentProperty, UiaPropertyId.ScrollVerticalScrollPercent },
+            { ScrollPatternIdentifiers.VerticalViewSizeProperty, UiaPropertyId.ScrollVerticalViewSize },
+            { SelectionPatternIdentifiers.CanSelectMultipleProperty, UiaPropertyId.SelectionCanSelectMultiple },
+            { SelectionPatternIdentifiers.IsSelectionRequiredProperty, UiaPropertyId.SelectionIsSelectionRequired },
+            { SelectionPatternIdentifiers.SelectionProperty, UiaPropertyId.SelectionSelection },
+        };
+
+        private static ConditionalWeakTable<AutomationPeer, AutomationNode> s_nodes =
+            new ConditionalWeakTable<AutomationPeer, AutomationNode>();
+
+        private readonly int[] _runtimeId;
+        private int _raiseFocusChanged;
+        private int _raisePropertyChanged;
+
+        public AutomationNode(AutomationPeer peer)
+        {
+            _runtimeId = new int[] { 3, GetHashCode() };
+            Peer = peer;
+            s_nodes.Add(peer, this);
+        }
+
+        public AutomationPeer Peer { get; protected set; }
+
+        public Rect BoundingRectangle
+        {
+            get => InvokeSync(() =>
+            {
+                if (GetRoot() is RootAutomationNode root)
+                    return root.ToScreen(Peer.GetBoundingRectangle());
+                return default;
+            });
+        }
+
+        public virtual IRawElementProviderFragmentRoot? FragmentRoot
+        {
+            get => InvokeSync(() => GetRoot()) as IRawElementProviderFragmentRoot;
+        }
+
+        public virtual IRawElementProviderSimple? HostRawElementProvider => null;
+        public ProviderOptions ProviderOptions => ProviderOptions.ServerSideProvider;
+
+        public void ChildrenChanged()
+        {
+            UiaCoreProviderApi.UiaRaiseStructureChangedEvent(
+                this,
+                StructureChangeType.ChildrenInvalidated,
+                null,
+                0);
+        }
+
+        public void PropertyChanged(AutomationProperty property, object? oldValue, object? newValue) 
+        {
+            if (_raisePropertyChanged > 0 && s_propertyMap.TryGetValue(property, out var id))
+            {
+                UiaCoreProviderApi.UiaRaiseAutomationPropertyChangedEvent(this, (int)id, oldValue, newValue);
+            }
+        }
+
+        [return: MarshalAs(UnmanagedType.IUnknown)]
+        public virtual object? GetPatternProvider(int patternId)
+        {
+            AutomationNode? ThisIfPeerImplementsProvider<T>() => Peer.GetProvider<T>() is object ? this : null;
+
+            return (UiaPatternId)patternId switch
+            {
+                UiaPatternId.ExpandCollapse => ThisIfPeerImplementsProvider<IExpandCollapseProvider>(),
+                UiaPatternId.Invoke => ThisIfPeerImplementsProvider<AAP.IInvokeProvider>(),
+                UiaPatternId.RangeValue => ThisIfPeerImplementsProvider<AAP.IRangeValueProvider>(),
+                UiaPatternId.Scroll => ThisIfPeerImplementsProvider<AAP.IScrollProvider>(),
+                UiaPatternId.ScrollItem => this,
+                UiaPatternId.Selection => ThisIfPeerImplementsProvider<AAP.ISelectionProvider>(),
+                UiaPatternId.SelectionItem => ThisIfPeerImplementsProvider<AAP.ISelectionItemProvider>(),
+                UiaPatternId.Toggle => ThisIfPeerImplementsProvider<AAP.IToggleProvider>(),
+                UiaPatternId.Value => ThisIfPeerImplementsProvider<AAP.IValueProvider>(),
+                _ => null,
+            };
+        }
+
+        public virtual object? GetPropertyValue(int propertyId)
+        {
+            return (UiaPropertyId)propertyId switch
+            {
+                UiaPropertyId.AcceleratorKey => InvokeSync(() => Peer.GetAcceleratorKey()),
+                UiaPropertyId.AccessKey => InvokeSync(() => Peer.GetAccessKey()),
+                UiaPropertyId.AutomationId => InvokeSync(() => Peer.GetAutomationId()),
+                UiaPropertyId.ClassName => InvokeSync(() => Peer.GetClassName()),
+                UiaPropertyId.ClickablePoint => new[] { BoundingRectangle.Center.X, BoundingRectangle.Center.Y },
+                UiaPropertyId.ControlType => InvokeSync(() => ToUiaControlType(Peer.GetAutomationControlType())),
+                UiaPropertyId.Culture => CultureInfo.CurrentCulture.LCID,
+                UiaPropertyId.FrameworkId => "Avalonia",
+                UiaPropertyId.HasKeyboardFocus => InvokeSync(() => Peer.HasKeyboardFocus()),
+                UiaPropertyId.IsContentElement => InvokeSync(() => Peer.IsContentElement()),
+                UiaPropertyId.IsControlElement => InvokeSync(() => Peer.IsControlElement()),
+                UiaPropertyId.IsEnabled => InvokeSync(() => Peer.IsEnabled()),
+                UiaPropertyId.IsKeyboardFocusable => InvokeSync(() => Peer.IsKeyboardFocusable()),
+                UiaPropertyId.LocalizedControlType => InvokeSync(() => Peer.GetLocalizedControlType()),
+                UiaPropertyId.Name => InvokeSync(() => Peer.GetName()),
+                UiaPropertyId.ProcessId => Process.GetCurrentProcess().Id,
+                UiaPropertyId.RuntimeId => _runtimeId,
+                _ => null,
+            };
+        }
+
+        public int[]? GetRuntimeId() => _runtimeId;
+
+        public virtual IRawElementProviderFragment? Navigate(NavigateDirection direction)
+        {
+            AutomationNode? GetSibling(int direction)
+            {
+                var children = Peer.GetParent()?.GetChildren();
+
+                for (var i = 0; i < (children?.Count ?? 0); ++i)
+                {
+                    if (ReferenceEquals(children![i], Peer))
+                    {
+                        var j = i + direction;
+                        if (j >= 0 && j < children.Count)
+                            return GetOrCreate(children[j]);
+                    }
+                }
+
+                return null;
+            }
+
+            return InvokeSync(() =>
+            {
+                return direction switch
+                {
+                    NavigateDirection.Parent => GetOrCreate(Peer.GetParent()),
+                    NavigateDirection.NextSibling => GetSibling(1),
+                    NavigateDirection.PreviousSibling => GetSibling(-1),
+                    NavigateDirection.FirstChild => GetOrCreate(Peer.GetChildren().FirstOrDefault()),
+                    NavigateDirection.LastChild => GetOrCreate(Peer.GetChildren().LastOrDefault()),
+                    _ => null,
+                };
+            }) as IRawElementProviderFragment;
+        }
+
+        public void SetFocus() => InvokeSync(() => Peer.SetFocus());
+
+        public static AutomationNode? GetOrCreate(AutomationPeer? peer)
+        {
+            return peer is null ? null : s_nodes.GetValue(peer, Create);
+        }
+
+        public static void Release(AutomationPeer peer) => s_nodes.Remove(peer);
+
+        IRawElementProviderSimple[]? IRawElementProviderFragment.GetEmbeddedFragmentRoots() => null;
+        void IRawElementProviderSimple2.ShowContextMenu() => InvokeSync(() => Peer.ShowContextMenu());
+        void IInvokeProvider.Invoke() => InvokeSync((AAP.IInvokeProvider x) => x.Invoke());
+
+        void IRawElementProviderAdviseEvents.AdviseEventAdded(int eventId, int[] properties)
+        {
+            switch ((UiaEventId)eventId)
+            {
+                case UiaEventId.AutomationPropertyChanged:
+                    ++_raisePropertyChanged;
+                    break;
+                case UiaEventId.AutomationFocusChanged:
+                    ++_raiseFocusChanged;
+                    break;
+            }
+        }
+
+        void IRawElementProviderAdviseEvents.AdviseEventRemoved(int eventId, int[] properties)
+        {
+            switch ((UiaEventId)eventId)
+            {
+                case UiaEventId.AutomationPropertyChanged:
+                    --_raisePropertyChanged;
+                    break;
+                case UiaEventId.AutomationFocusChanged:
+                    --_raiseFocusChanged;
+                    break;
+            }
+        }
+
+        protected void InvokeSync(Action action)
+        {
+            if (Dispatcher.UIThread.CheckAccess())
+                action();
+            else
+                Dispatcher.UIThread.InvokeAsync(action).Wait();
+        }
+
+        protected T InvokeSync<T>(Func<T> func)
+        {
+            if (Dispatcher.UIThread.CheckAccess())
+                return func();
+            else
+                return Dispatcher.UIThread.InvokeAsync(func).Result;
+        }
+
+        protected void InvokeSync<TInterface>(Action<TInterface> action)
+        {
+            if (Peer.GetProvider<TInterface>() is TInterface i)
+            {
+                try
+                {
+                    InvokeSync(() => action(i));
+                }
+                catch (AggregateException e) when (e.InnerException is ElementNotEnabledException)
+                {
+                    throw new COMException(e.Message, UiaCoreProviderApi.UIA_E_ELEMENTNOTENABLED);
+                }
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        protected TResult InvokeSync<TInterface, TResult>(Func<TInterface, TResult> func)
+        {
+            if (Peer.GetProvider<TInterface>() is TInterface i)
+            {
+                try
+                {
+                    return InvokeSync(() => func(i));
+                }
+                catch (AggregateException e) when (e.InnerException is ElementNotEnabledException)
+                {
+                    throw new COMException(e.Message, UiaCoreProviderApi.UIA_E_ELEMENTNOTENABLED);
+                }
+            }
+
+            throw new NotSupportedException();
+        }
+
+        protected void RaiseFocusChanged(AutomationNode? focused)
+        {
+            if (_raiseFocusChanged > 0)
+            {
+                UiaCoreProviderApi.UiaRaiseAutomationEvent(
+                    focused,
+                    (int)UiaEventId.AutomationFocusChanged);
+            }
+        }
+
+        private AutomationNode? GetRoot()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+
+            var peer = Peer;
+            var parent = peer.GetParent();
+
+            while (peer.GetProvider<AAP.IRootProvider>() is null && parent is object)
+            {
+                peer = parent;
+                parent = peer.GetParent();
+            }
+
+            return peer is object ? GetOrCreate(peer) : null;
+        }
+
+        private static AutomationNode Create(AutomationPeer peer)
+        {
+            return peer.GetProvider<AAP.IRootProvider>() is object ?
+                new RootAutomationNode(peer) :
+                new AutomationNode(peer);
+        }
+
+        private static UiaControlTypeId ToUiaControlType(AutomationControlType role)
+        {
+            return role switch
+            {
+                AutomationControlType.None => UiaControlTypeId.Group,
+                AutomationControlType.Button => UiaControlTypeId.Button,
+                AutomationControlType.Calendar => UiaControlTypeId.Calendar,
+                AutomationControlType.CheckBox => UiaControlTypeId.CheckBox,
+                AutomationControlType.ComboBox => UiaControlTypeId.ComboBox,
+                AutomationControlType.ComboBoxItem => UiaControlTypeId.ListItem,
+                AutomationControlType.Edit => UiaControlTypeId.Edit,
+                AutomationControlType.Hyperlink => UiaControlTypeId.Hyperlink,
+                AutomationControlType.Image => UiaControlTypeId.Image,
+                AutomationControlType.ListItem => UiaControlTypeId.ListItem,
+                AutomationControlType.List => UiaControlTypeId.List,
+                AutomationControlType.Menu => UiaControlTypeId.Menu,
+                AutomationControlType.MenuBar => UiaControlTypeId.MenuBar,
+                AutomationControlType.MenuItem => UiaControlTypeId.MenuItem,
+                AutomationControlType.ProgressBar => UiaControlTypeId.ProgressBar,
+                AutomationControlType.RadioButton => UiaControlTypeId.RadioButton,
+                AutomationControlType.ScrollBar => UiaControlTypeId.ScrollBar,
+                AutomationControlType.Slider => UiaControlTypeId.Slider,
+                AutomationControlType.Spinner => UiaControlTypeId.Spinner,
+                AutomationControlType.StatusBar => UiaControlTypeId.StatusBar,
+                AutomationControlType.Tab => UiaControlTypeId.Tab,
+                AutomationControlType.TabItem => UiaControlTypeId.TabItem,
+                AutomationControlType.Text => UiaControlTypeId.Text,
+                AutomationControlType.ToolBar => UiaControlTypeId.ToolBar,
+                AutomationControlType.ToolTip => UiaControlTypeId.ToolTip,
+                AutomationControlType.Tree => UiaControlTypeId.Tree,
+                AutomationControlType.TreeItem => UiaControlTypeId.TreeItem,
+                AutomationControlType.Custom => UiaControlTypeId.Custom,
+                AutomationControlType.Group => UiaControlTypeId.Group,
+                AutomationControlType.Thumb => UiaControlTypeId.Thumb,
+                AutomationControlType.DataGrid => UiaControlTypeId.DataGrid,
+                AutomationControlType.DataItem => UiaControlTypeId.DataItem,
+                AutomationControlType.Document => UiaControlTypeId.Document,
+                AutomationControlType.SplitButton => UiaControlTypeId.SplitButton,
+                AutomationControlType.Window => UiaControlTypeId.Window,
+                AutomationControlType.Pane => UiaControlTypeId.Pane,
+                AutomationControlType.Header => UiaControlTypeId.Header,
+                AutomationControlType.HeaderItem => UiaControlTypeId.HeaderItem,
+                AutomationControlType.Table => UiaControlTypeId.Table,
+                AutomationControlType.TitleBar => UiaControlTypeId.TitleBar,
+                AutomationControlType.Separator => UiaControlTypeId.Separator,
+                _ => UiaControlTypeId.Custom,
+            };
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
new file mode 100644
index 0000000000..1ec0ee9e2e
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Automation.Peers;
+using Avalonia.Automation.Provider;
+using Avalonia.Platform;
+using Avalonia.Win32.Interop.Automation;
+
+#nullable enable
+
+namespace Avalonia.Win32.Automation
+{
+    internal class RootAutomationNode : AutomationNode,
+        IRawElementProviderFragmentRoot
+    {
+        public RootAutomationNode(AutomationPeer peer)
+            : base(peer)
+        {
+            Peer = base.Peer.GetProvider<IRootProvider>() ?? throw new AvaloniaInternalException(
+                "Attempt to create RootAutomationNode from peer which does not implement IRootProvider.");
+            Peer.FocusChanged += FocusChanged;
+        }
+
+        public override IRawElementProviderFragmentRoot? FragmentRoot => this;
+        public new IRootProvider Peer { get; }
+        public IWindowBaseImpl? WindowImpl => Peer.PlatformImpl as IWindowBaseImpl;
+
+        public IRawElementProviderFragment? ElementProviderFromPoint(double x, double y)
+        {
+            if (WindowImpl is null)
+                return null;
+
+            var p = WindowImpl.PointToClient(new PixelPoint((int)x, (int)y));
+            var peer = (WindowBaseAutomationPeer)Peer;
+            var found = InvokeSync(() => peer.GetPeerFromPoint(p));
+            var result = GetOrCreate(found) as IRawElementProviderFragment;
+            return result;
+        }
+
+        public IRawElementProviderFragment? GetFocus()
+        {
+            var focus = InvokeSync(() => Peer.GetFocus());
+            return GetOrCreate(focus);
+        }
+
+        public void FocusChanged(object? sender, EventArgs e)
+        {
+            RaiseFocusChanged(GetOrCreate(Peer.GetFocus()));
+        }
+
+        public Rect ToScreen(Rect rect)
+        {
+            if (WindowImpl is null)
+                return default;
+            return new PixelRect(
+                WindowImpl.PointToScreen(rect.TopLeft),
+                WindowImpl.PointToScreen(rect.BottomRight))
+                    .ToRect(1);
+        }
+
+        public override IRawElementProviderSimple? HostRawElementProvider
+        {
+            get
+            {
+                var handle = WindowImpl?.Handle.Handle ?? IntPtr.Zero;
+                if (handle == IntPtr.Zero)
+                    return null;
+                var hr = UiaCoreProviderApi.UiaHostProviderFromHwnd(handle, out var result);
+                Marshal.ThrowExceptionForHR(hr);
+                return result;
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index d727acdc22..308e22b4e2 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -3,15 +3,25 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>Avalonia.Win32</PackageId>
-    <MicroComGeneratorRuntimeNamespace>Avalonia.MicroCom</MicroComGeneratorRuntimeNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <Compile Include="..\..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
-    <PackageReference Include="MicroCom.CodeGenerator.MSBuild" Version="0.10.4" PrivateAssets="all" />
+    <PackageReference Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.0" PrivateAssets="all" />
     <MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" />
     <MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />    
+  <ItemGroup>
+    <Compile Remove="..\..\Shared\ModuleInitializer.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+  <PropertyGroup Label="Warnings">
+    <NoWarn Condition="'$(NoWarn)' == ''">CA1416</NoWarn>
+    <NoWarn Condition="'$(NoWarn)' != ''">$(NoWarn),CA1416</NoWarn>
+  </PropertyGroup>
 </Project>
diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
index a18116aade..7bd7765f8c 100644
--- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using Avalonia.Input;
 using Avalonia.Win32.Interop;
+using Avalonia.Utilities;
 
 namespace Avalonia.Win32
 {
@@ -14,11 +14,11 @@ namespace Avalonia.Win32
 
         class ClipboardFormat
         {
-            public short Format { get; private set; }
+            public ushort Format { get; private set; }
             public string Name { get; private set; }
-            public short[] Synthesized { get; private set; }
+            public ushort[] Synthesized { get; private set; }
 
-            public ClipboardFormat(string name, short format, params short[] synthesized)
+            public ClipboardFormat(string name, ushort format, params ushort[] synthesized)
             {
                 Format = format;
                 Name = name;
@@ -28,20 +28,20 @@ namespace Avalonia.Win32
 
         private static readonly List<ClipboardFormat> FormatList = new List<ClipboardFormat>()
         {
-            new ClipboardFormat(DataFormats.Text, (short)UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT, (short)UnmanagedMethods.ClipboardFormat.CF_TEXT),
-            new ClipboardFormat(DataFormats.FileNames, (short)UnmanagedMethods.ClipboardFormat.CF_HDROP),
+            new ClipboardFormat(DataFormats.Text, (ushort)UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT, (ushort)UnmanagedMethods.ClipboardFormat.CF_TEXT),
+            new ClipboardFormat(DataFormats.FileNames, (ushort)UnmanagedMethods.ClipboardFormat.CF_HDROP),
         };
 
 
-        private static string QueryFormatName(short format)
+        private static string QueryFormatName(ushort format)
         {
-            StringBuilder sb = new StringBuilder(MAX_FORMAT_NAME_LENGTH);
+            var sb = StringBuilderCache.Acquire(MAX_FORMAT_NAME_LENGTH);
             if (UnmanagedMethods.GetClipboardFormatName(format, sb, sb.Capacity) > 0)
-                return sb.ToString();
+                return StringBuilderCache.GetStringAndRelease(sb);
             return null;
         }
 
-        public static string GetFormat(short format)
+        public static string GetFormat(ushort format)
         {
             lock (FormatList)
             {
@@ -58,7 +58,7 @@ namespace Avalonia.Win32
             }
         }
 
-        public static short GetFormat(string format)
+        public static ushort GetFormat(string format)
         {
             lock (FormatList)
             {
@@ -68,7 +68,7 @@ namespace Avalonia.Win32
                     int id = UnmanagedMethods.RegisterClipboardFormat(format);
                     if (id == 0)
                         throw new Win32Exception();
-                    pd = new ClipboardFormat(format, (short)id);
+                    pd = new ClipboardFormat(format, (ushort)id);
                     FormatList.Add(pd);
                 }
                 return pd.Format;
diff --git a/src/Windows/Avalonia.Win32/ClipboardImpl.cs b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
index 047b7c361f..7e058cb052 100644
--- a/src/Windows/Avalonia.Win32/ClipboardImpl.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
@@ -7,6 +7,7 @@ using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32
 {
@@ -78,12 +79,13 @@ namespace Avalonia.Win32
         public async Task SetDataObjectAsync(IDataObject data)
         {
             Dispatcher.UIThread.VerifyAccess();
-            var wrapper = new DataObject(data);
+            using var wrapper = new DataObject(data);
             var i = OleRetryCount;
 
             while (true)
             {
-                var hr = UnmanagedMethods.OleSetClipboard(wrapper);
+                var ptr = wrapper.GetNativeIntPtr<Win32Com.IDataObject>();
+                var hr = UnmanagedMethods.OleSetClipboard(ptr);
 
                 if (hr == 0)
                     break;
@@ -106,9 +108,9 @@ namespace Avalonia.Win32
 
                 if (hr == 0)
                 {
-                    var wrapper = new OleDataObject(dataObject);
+                    using var proxy = MicroComRuntime.CreateProxyFor<Win32Com.IDataObject>(dataObject, true);
+                    using var wrapper = new OleDataObject(proxy);
                     var formats = wrapper.GetDataFormats().ToArray();
-                    Marshal.ReleaseComObject(dataObject);
                     return formats;
                 }
 
@@ -130,9 +132,9 @@ namespace Avalonia.Win32
 
                 if (hr == 0)
                 {
-                    var wrapper = new OleDataObject(dataObject);
+                    using var proxy = MicroComRuntime.CreateProxyFor<Win32Com.IDataObject>(dataObject, true);
+                    using var wrapper = new OleDataObject(proxy);
                     var rv = wrapper.Get(format);
-                    Marshal.ReleaseComObject(dataObject);
                     return rv;
                 }
 
diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
index 3066403186..7a96ca9ee0 100644
--- a/src/Windows/Avalonia.Win32/DataObject.cs
+++ b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -8,22 +8,25 @@ using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Runtime.Serialization.Formatters.Binary;
 using Avalonia.Input;
+using Avalonia.MicroCom;
 using Avalonia.Win32.Interop;
+
+using FORMATETC = Avalonia.Win32.Interop.FORMATETC;
 using IDataObject = Avalonia.Input.IDataObject;
 
 namespace Avalonia.Win32
 {
-    class DataObject : IDataObject, IOleDataObject
+    internal sealed class DataObject : CallbackBase, IDataObject, Win32Com.IDataObject
     {
         // Compatibility with WinForms + WPF...
         internal static readonly byte[] SerializedObjectGUID = new Guid("FD9EA796-3B13-4370-A679-56106BB288FB").ToByteArray();
 
-        class FormatEnumerator : IEnumFORMATETC
+        class FormatEnumerator : CallbackBase, Win32Com.IEnumFORMATETC
         {
             private FORMATETC[] _formats;
-            private int _current;
+            private uint _current;
 
-            private FormatEnumerator(FORMATETC[] formats, int current)
+            private FormatEnumerator(FORMATETC[] formats, uint current)
             {
                 _formats = formats;
                 _current = current;
@@ -46,59 +49,70 @@ namespace Avalonia.Win32
                 return result;
             }
 
-            public void Clone(out IEnumFORMATETC newEnum)
-            {
-                newEnum = new FormatEnumerator(_formats, _current);
-            }
-
-            public int Next(int celt, FORMATETC[] rgelt, int[] pceltFetched)
+            public unsafe uint Next(uint celt, FORMATETC* rgelt, uint* results)
             {
                 if (rgelt == null)
-                    return unchecked((int)UnmanagedMethods.HRESULT.E_INVALIDARG);
+                    return (uint)UnmanagedMethods.HRESULT.E_INVALIDARG;
 
-                int i = 0;
+                uint i = 0;
                 while (i < celt && _current < _formats.Length)
                 {
                     rgelt[i] = _formats[_current];
                     _current++;
                     i++;
                 }
-                if (pceltFetched != null)
-                    pceltFetched[0] = i;
 
                 if (i != celt)
-                    return unchecked((int)UnmanagedMethods.HRESULT.S_FALSE);
-                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+                    return (uint)UnmanagedMethods.HRESULT.S_FALSE;
+
+                // "results" parameter can be NULL if celt is 1.
+                if (celt != 1 || results != default)
+                    *results = i;
+                return 0;
+            }
+
+            public uint Skip(uint celt)
+            {
+                _current += Math.Min(celt, int.MaxValue - _current);
+                if (_current >= _formats.Length)
+                    return (uint)UnmanagedMethods.HRESULT.S_FALSE;
+                return 0;
             }
 
-            public int Reset()
+            public void Reset()
             {
                 _current = 0;
-                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
             }
 
-            public int Skip(int celt)
+            public Win32Com.IEnumFORMATETC Clone()
             {
-                _current += Math.Min(celt, int.MaxValue - _current);
-                if (_current >= _formats.Length)
-                    return unchecked((int)UnmanagedMethods.HRESULT.S_FALSE);
-                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+                return new FormatEnumerator(_formats, _current);
             }
         }
 
-        private const int DV_E_TYMED = unchecked((int)0x80040069);
-        private const int DV_E_DVASPECT = unchecked((int)0x8004006B);
-        private const int DV_E_FORMATETC = unchecked((int)0x80040064);
-        private const int OLE_E_ADVISENOTSUPPORTED = unchecked((int)0x80040003);
-        private const int STG_E_MEDIUMFULL = unchecked((int)0x80030070);
+        private const uint DV_E_TYMED = 0x80040069;
+        private const uint DV_E_DVASPECT = 0x8004006B;
+        private const uint DV_E_FORMATETC = 0x80040064;
+        private const uint OLE_E_ADVISENOTSUPPORTED = 0x80040003;
+        private const uint STG_E_MEDIUMFULL = 0x80030070;
+
         private const int GMEM_ZEROINIT = 0x0040;
         private const int GMEM_MOVEABLE = 0x0002;
 
 
-        IDataObject _wrapped;
-        
+        private IDataObject _wrapped;
+
         public DataObject(IDataObject wrapped)
         {
+            if (wrapped == null)
+            {
+                throw new ArgumentNullException(nameof(wrapped));
+            }
+            if (_wrapped is DataObject || _wrapped is OleDataObject)
+            {
+                throw new InvalidOperationException();
+            }
+
             _wrapped = wrapped;
         }
 
@@ -131,123 +145,123 @@ namespace Avalonia.Win32
 
         #region IOleDataObject
 
-        int IOleDataObject.DAdvise(ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection)
+        unsafe int Win32Com.IDataObject.DAdvise(FORMATETC* pFormatetc, int advf, void* adviseSink)
         {
-            if (_wrapped is IOleDataObject ole)
-                return ole.DAdvise(ref pFormatetc, advf, adviseSink, out connection);
-            connection = 0;
-            return OLE_E_ADVISENOTSUPPORTED;
+            if (_wrapped is Win32Com.IDataObject ole)
+                return ole.DAdvise(pFormatetc, advf, adviseSink);
+            return 0;
         }
 
-        void IOleDataObject.DUnadvise(int connection)
+        void Win32Com.IDataObject.DUnadvise(int connection)
         {
-            if (_wrapped is IOleDataObject ole)
+            if (_wrapped is Win32Com.IDataObject ole)
                 ole.DUnadvise(connection);
-            Marshal.ThrowExceptionForHR(OLE_E_ADVISENOTSUPPORTED);
+            throw new COMException(nameof(OLE_E_ADVISENOTSUPPORTED), unchecked((int)OLE_E_ADVISENOTSUPPORTED));
         }
 
-        int IOleDataObject.EnumDAdvise(out IEnumSTATDATA enumAdvise)
+        unsafe void* Win32Com.IDataObject.EnumDAdvise()
         {
-            if (_wrapped is IOleDataObject ole)
-                return ole.EnumDAdvise(out enumAdvise);
+            if (_wrapped is Win32Com.IDataObject ole)
+                return ole.EnumDAdvise();
 
-            enumAdvise = null;
-            return OLE_E_ADVISENOTSUPPORTED;
+            return null;
         }
 
-        IEnumFORMATETC IOleDataObject.EnumFormatEtc(DATADIR direction)
+        Win32Com.IEnumFORMATETC Win32Com.IDataObject.EnumFormatEtc(int direction)
         {
-            if (_wrapped is IOleDataObject ole)
+            if (_wrapped is Win32Com.IDataObject ole)
                 return ole.EnumFormatEtc(direction);
-            if (direction == DATADIR.DATADIR_GET)
+            if ((DATADIR)direction == DATADIR.DATADIR_GET)
                 return new FormatEnumerator(_wrapped);
-            throw new NotSupportedException();
+            throw new COMException(nameof(UnmanagedMethods.HRESULT.E_NOTIMPL), unchecked((int)UnmanagedMethods.HRESULT.E_NOTIMPL));
         }
 
-        int IOleDataObject.GetCanonicalFormatEtc(ref FORMATETC formatIn, out FORMATETC formatOut)
+        unsafe FORMATETC Win32Com.IDataObject.GetCanonicalFormatEtc(FORMATETC* formatIn)
         {
-            if (_wrapped is IOleDataObject ole)
-                return ole.GetCanonicalFormatEtc(ref formatIn, out formatOut);
+            if (_wrapped is Win32Com.IDataObject ole)
+                return ole.GetCanonicalFormatEtc(formatIn);
 
-            formatOut = new FORMATETC();
+            var formatOut = new FORMATETC();
             formatOut.ptd = IntPtr.Zero;
-            return unchecked((int)UnmanagedMethods.HRESULT.E_NOTIMPL);
+
+            throw new COMException(nameof(UnmanagedMethods.HRESULT.E_NOTIMPL), unchecked((int)UnmanagedMethods.HRESULT.E_NOTIMPL));
         }
 
-        void IOleDataObject.GetData(ref FORMATETC format, out STGMEDIUM medium)
+        unsafe uint Win32Com.IDataObject.GetData(FORMATETC* format, Interop.STGMEDIUM* medium)
         {
-            if (_wrapped is IOleDataObject ole)
+            if (_wrapped is Win32Com.IDataObject ole)
             {
-                ole.GetData(ref format, out medium);
-                return;
+                return ole.GetData(format, medium);
             }
-            if(!format.tymed.HasAllFlags(TYMED.TYMED_HGLOBAL))
-                Marshal.ThrowExceptionForHR(DV_E_TYMED);
 
-            if (format.dwAspect != DVASPECT.DVASPECT_CONTENT)
-                Marshal.ThrowExceptionForHR(DV_E_DVASPECT);
+            if (!format->tymed.HasAllFlags(TYMED.TYMED_HGLOBAL))
+                return DV_E_TYMED;
+
+            if (format->dwAspect != DVASPECT.DVASPECT_CONTENT)
+                return DV_E_DVASPECT;
 
-            string fmt = ClipboardFormats.GetFormat(format.cfFormat);
+            string fmt = ClipboardFormats.GetFormat(format->cfFormat);
             if (string.IsNullOrEmpty(fmt) || !_wrapped.Contains(fmt))
-                Marshal.ThrowExceptionForHR(DV_E_FORMATETC);
+                return DV_E_FORMATETC;
 
-            medium = default(STGMEDIUM);
-            medium.tymed = TYMED.TYMED_HGLOBAL;
-            int result = WriteDataToHGlobal(fmt, ref medium.unionmember);
-            Marshal.ThrowExceptionForHR(result);
+            * medium = default(Interop.STGMEDIUM);
+            medium->tymed = TYMED.TYMED_HGLOBAL;
+            return WriteDataToHGlobal(fmt, ref medium->unionmember);
         }
 
-        void IOleDataObject.GetDataHere(ref FORMATETC format, ref STGMEDIUM medium)
+        unsafe uint Win32Com.IDataObject.GetDataHere(FORMATETC* format, Interop.STGMEDIUM* medium)
         {
-            if (_wrapped is IOleDataObject ole)
+            if (_wrapped is Win32Com.IDataObject ole)
             {
-                ole.GetDataHere(ref format, ref medium);
-                return;
+                return ole.GetDataHere(format, medium);
             }
 
-            if (medium.tymed != TYMED.TYMED_HGLOBAL || !format.tymed.HasAllFlags(TYMED.TYMED_HGLOBAL))
-                Marshal.ThrowExceptionForHR(DV_E_TYMED);
+            if (medium->tymed != TYMED.TYMED_HGLOBAL || !format->tymed.HasAllFlags(TYMED.TYMED_HGLOBAL))
+                return DV_E_TYMED;
 
-            if (format.dwAspect != DVASPECT.DVASPECT_CONTENT)
-                Marshal.ThrowExceptionForHR(DV_E_DVASPECT);
+            if (format->dwAspect != DVASPECT.DVASPECT_CONTENT)
+                return DV_E_DVASPECT;
 
-            string fmt = ClipboardFormats.GetFormat(format.cfFormat);
+            string fmt = ClipboardFormats.GetFormat(format->cfFormat);
             if (string.IsNullOrEmpty(fmt) || !_wrapped.Contains(fmt))
-                Marshal.ThrowExceptionForHR(DV_E_FORMATETC);
+                return DV_E_FORMATETC;
 
-            if (medium.unionmember == IntPtr.Zero)
-                Marshal.ThrowExceptionForHR(STG_E_MEDIUMFULL);
+            if (medium->unionmember == IntPtr.Zero)
+                return STG_E_MEDIUMFULL;
 
-            int result = WriteDataToHGlobal(fmt, ref medium.unionmember);
-            Marshal.ThrowExceptionForHR(result);
+            return WriteDataToHGlobal(fmt, ref medium->unionmember);
         }
 
-        int IOleDataObject.QueryGetData(ref FORMATETC format)
+        unsafe uint Win32Com.IDataObject.QueryGetData(FORMATETC* format)
         {
-            if (_wrapped is IOleDataObject ole)
-                return ole.QueryGetData(ref format);
-            if (format.dwAspect != DVASPECT.DVASPECT_CONTENT)
+            if (_wrapped is Win32Com.IDataObject ole)
+            {
+                return ole.QueryGetData(format);
+            }
+
+            if (format->dwAspect != DVASPECT.DVASPECT_CONTENT)
                 return DV_E_DVASPECT;
-            if (!format.tymed.HasAllFlags(TYMED.TYMED_HGLOBAL))
+            if (!format->tymed.HasAllFlags(TYMED.TYMED_HGLOBAL))
                 return DV_E_TYMED;
 
-            string dataFormat = ClipboardFormats.GetFormat(format.cfFormat);
-            if (!string.IsNullOrEmpty(dataFormat) && _wrapped.Contains(dataFormat))
-                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
-            return DV_E_FORMATETC;
+            var dataFormat = ClipboardFormats.GetFormat(format->cfFormat);
+
+            if (string.IsNullOrEmpty(dataFormat) || !_wrapped.Contains(dataFormat))
+                return DV_E_FORMATETC;
+
+            return 0;
         }
         
-        void IOleDataObject.SetData(ref FORMATETC formatIn, ref STGMEDIUM medium, bool release)
+        unsafe uint Win32Com.IDataObject.SetData(FORMATETC* pformatetc, Interop.STGMEDIUM* pmedium, int fRelease)
         {
-            if (_wrapped is IOleDataObject ole)
+            if (_wrapped is Win32Com.IDataObject ole)
             {
-                ole.SetData(ref formatIn, ref medium, release);
-                return;
+                return ole.SetData(pformatetc, pmedium, fRelease);
             }
-            Marshal.ThrowExceptionForHR(unchecked((int)UnmanagedMethods.HRESULT.E_NOTIMPL));
+            return (uint)UnmanagedMethods.HRESULT.E_NOTIMPL;
         }
 
-        private int WriteDataToHGlobal(string dataFormat, ref IntPtr hGlobal)
+        private uint WriteDataToHGlobal(string dataFormat, ref IntPtr hGlobal)
         {
             object data = _wrapped.Get(dataFormat);
             if (dataFormat == DataFormats.Text || data is string)
@@ -288,7 +302,7 @@ namespace Avalonia.Win32
             }
         }
 
-        private unsafe int WriteBytesToHGlobal(ref IntPtr hGlobal, ReadOnlySpan<byte> data)
+        private unsafe uint WriteBytesToHGlobal(ref IntPtr hGlobal, ReadOnlySpan<byte> data)
         {
             int required = data.Length;
             if (hGlobal == IntPtr.Zero)
@@ -312,7 +326,7 @@ namespace Avalonia.Win32
             }
         }
 
-        private int WriteFileListToHGlobal(ref IntPtr hGlobal, IEnumerable<string> files)
+        private uint WriteFileListToHGlobal(ref IntPtr hGlobal, IEnumerable<string> files)
         {
             if (!files?.Any() ?? false)
                 return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
@@ -344,7 +358,7 @@ namespace Avalonia.Win32
             }
         }
 
-        private int WriteStringToHGlobal(ref IntPtr hGlobal, string data)
+        private uint WriteStringToHGlobal(ref IntPtr hGlobal, string data)
         {
             int required = (data.Length + 1) * sizeof(char);
             if (hGlobal == IntPtr.Zero)
@@ -367,6 +381,15 @@ namespace Avalonia.Win32
             }
         }
 
+        protected override void Destroyed()
+        {
+            ReleaseWrapped();
+        }
+
+        public void ReleaseWrapped()
+        {
+            _wrapped = null;
+        }
         #endregion
     }
 }
diff --git a/src/Windows/Avalonia.Win32/DragSource.cs b/src/Windows/Avalonia.Win32/DragSource.cs
index f74e59a8f8..53d4345c5e 100644
--- a/src/Windows/Avalonia.Win32/DragSource.cs
+++ b/src/Windows/Avalonia.Win32/DragSource.cs
@@ -3,22 +3,32 @@ using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32
 {
     class DragSource : IPlatformDragSource
     {
-        public Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent,
+        public unsafe Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent,
             IDataObject data, DragDropEffects allowedEffects)
         {
             Dispatcher.UIThread.VerifyAccess();
+
             triggerEvent.Pointer.Capture(null);
-            OleDragSource src = new OleDragSource();
-            DataObject dataObject = new DataObject(data);
-            int allowed = (int)OleDropTarget.ConvertDropEffect(allowedEffects);
+            
+            using var dataObject = new DataObject(data);
+            using var src = new OleDragSource();
+            var allowed = OleDropTarget.ConvertDropEffect(allowedEffects);
+            
+            var objPtr = MicroComRuntime.GetNativeIntPtr<Win32Com.IDataObject>(dataObject);
+            var srcPtr = MicroComRuntime.GetNativeIntPtr<Win32Com.IDropSource>(src);
+
+            UnmanagedMethods.DoDragDrop(objPtr, srcPtr, (int)allowed, out var finalEffect);
+            
+            // Force releasing of internal wrapper to avoid memory leak, if drop target keeps com reference.
+            dataObject.ReleaseWrapped();
 
-            UnmanagedMethods.DoDragDrop(dataObject, src, allowed, out var finalEffect);
-            return Task.FromResult(OleDropTarget.ConvertDropEffect((DropEffect)finalEffect));
+            return Task.FromResult(OleDropTarget.ConvertDropEffect((Win32Com.DropEffect)finalEffect));
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/IconImpl.cs b/src/Windows/Avalonia.Win32/IconImpl.cs
index 8548801555..4d2b89b0cc 100644
--- a/src/Windows/Avalonia.Win32/IconImpl.cs
+++ b/src/Windows/Avalonia.Win32/IconImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using Avalonia.Platform;
 
@@ -8,31 +7,18 @@ namespace Avalonia.Win32
 {
     class IconImpl : IWindowIconImpl
     {
-        private Bitmap bitmap;
-        private Icon icon;
-
-        public IconImpl(Bitmap bitmap)
-        {
-            this.bitmap = bitmap;
-        }
+        private readonly Icon icon;
 
         public IconImpl(Icon icon)
         {
             this.icon = icon;
         }
 
-        public IntPtr HIcon => icon?.Handle ?? bitmap.GetHicon();
+        public IntPtr HIcon => icon.Handle;
 
         public void Save(Stream outputStream)
         {
-            if (icon != null)
-            {
-                icon.Save(outputStream);
-            }
-            else
-            {
-                bitmap.Save(outputStream, ImageFormat.Png);
-            }
+            icon.Save(outputStream);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Input/Imm32CaretManager.cs b/src/Windows/Avalonia.Win32/Input/Imm32CaretManager.cs
index 38605efa22..ca52bf6e67 100644
--- a/src/Windows/Avalonia.Win32/Input/Imm32CaretManager.cs
+++ b/src/Windows/Avalonia.Win32/Input/Imm32CaretManager.cs
@@ -7,14 +7,11 @@ namespace Avalonia.Win32.Input
     {
         private bool _isCaretCreated;
 
-        public void TryCreate(int _langId, IntPtr hwnd)
+        public void TryCreate(IntPtr hwnd)
         {
             if (!_isCaretCreated)
             {
-                if (_langId == LANG_ZH || _langId == LANG_JA)
-                {
-                    _isCaretCreated = CreateCaret(hwnd, IntPtr.Zero, 2, 10);
-                }
+                _isCaretCreated = CreateCaret(hwnd, IntPtr.Zero, 2, 2);               
             }
         }
 
@@ -31,6 +28,7 @@ namespace Avalonia.Win32.Input
             if (_isCaretCreated)
             {
                 DestroyCaret();
+
                 _isCaretCreated = false;
             }
         }
diff --git a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
index 71e33554f1..7ef1cb1d1c 100644
--- a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
+++ b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 using Avalonia.Input.TextInput;
 using Avalonia.Threading;
 
@@ -12,84 +13,129 @@ namespace Avalonia.Win32.Input
     class Imm32InputMethod : ITextInputMethodImpl
     {
         public IntPtr HWND { get; private set; }
-        private IntPtr _defaultImc;
+        private IntPtr _currentHimc;
         private WindowImpl _parent;
-        private bool _active;
-        private bool _showCompositionWindow;
+        private ITextInputMethodClient _client;
+
         private Imm32CaretManager _caretManager = new();
-        private bool _showCandidateList;
+
         private ushort _langId;
         private const int _caretMargin = 1;
-        
-        public void SetLanguageAndWindow(WindowImpl parent, IntPtr hwnd, IntPtr HKL)
+
+        public ITextInputMethodClient Client => _client;
+
+        public bool IsActive => _client != null;
+
+        public bool IsComposing { get; set; }
+
+        public bool ShowCompositionWindow => false;
+
+        public void CreateCaret()
+        {
+            _caretManager.TryCreate(HWND);
+        }
+
+        public void EnableImm()
         {
-            if (HWND != hwnd)
+            var himc = ImmGetContext(HWND);
+
+            if(himc == IntPtr.Zero)
+            {
+                himc = ImmCreateContext();
+            }
+
+            if(himc != _currentHimc)
             {
-                _defaultImc = IntPtr.Zero;
+                if(_currentHimc != IntPtr.Zero)
+                {
+                    DisableImm();
+                }
+
+                ImmAssociateContext(HWND, himc);
+
+                ImmReleaseContext(HWND, himc);
+
+                _currentHimc = himc;
+
+                _caretManager.TryCreate(HWND);
             }
+        }
+
+        public void DisableImm()
+        {
+            _caretManager.TryDestroy();
+
+            Reset();
+
+            ImmAssociateContext(HWND, IntPtr.Zero);
+
+            _caretManager.TryDestroy();
+
+            _currentHimc = IntPtr.Zero;
+        }
+
+        public void SetLanguageAndWindow(WindowImpl parent, IntPtr hwnd, IntPtr HKL)
+        {
             HWND = hwnd;
             _parent = parent;
-            _active = false;
             _langId = PRIMARYLANGID(LGID(HKL));
-            _showCompositionWindow = true;
-            _showCandidateList = true;
+
+            _parent = parent;
+
+            var langId= PRIMARYLANGID(LGID(HKL));
+
+            if(langId != _langId)
+            {
+                DisableImm();
+            }
+
+            _langId = langId;
+
+            EnableImm();
+        }
+
+        public void ClearLanguageAndWindow()
+        {
+            DisableImm();
+
+            HWND = IntPtr.Zero;
+            _parent = null;
+            _client = null;
+            _langId = 0;
 
             IsComposing = false;
         }
 
         //Dependant on CurrentThread. When Avalonia will support Multiple Dispatchers -
         //every Dispatcher should have their own InputMethod.
-        public static Imm32InputMethod Current { get; } = new Imm32InputMethod();
+        public static Imm32InputMethod Current { get; } = new Imm32InputMethod();    
 
-        private IntPtr DefaultImc
+        public void Reset()
         {
-            get
+            Dispatcher.UIThread.Post(() =>
             {
-                if (_defaultImc == IntPtr.Zero &&
-                    HWND != IntPtr.Zero)
-                {
-                    _defaultImc = ImmGetContext(HWND);
-                    ImmReleaseContext(HWND, _defaultImc);
-                }
+                var himc = ImmGetContext(HWND);
 
-                if (_defaultImc == IntPtr.Zero)
+                if (IsComposing)
                 {
-                    _defaultImc = ImmCreateContext();
+                    ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
+                   
+                    IsComposing = false;
                 }
 
-                return _defaultImc;
-            }
+                ImmReleaseContext(HWND, himc);
+            });
         }
 
-        public void Reset()
+        public void SetClient(ITextInputMethodClient client)
         {
-            if (IsComposing)
-            {
-                Dispatcher.UIThread.Post(() =>
-                {
-                    ImmNotifyIME(DefaultImc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
-                    ImmReleaseContext(HWND, DefaultImc);
-                    IsComposing = false;
-                });
-            }
-        }
+            _client = client;
 
-        public void SetActive(bool active)
-        {
-            _active = active;
             Dispatcher.UIThread.Post(() =>
             {
-                if (active)
+                if (IsActive)
                 {
-                    if (DefaultImc != IntPtr.Zero)
-                    {
-                        _caretManager.TryCreate(_langId, HWND);
-                        // Load the default IME context.
-                        // NOTE(hbono)
-                        //   IMM ignores this call if the IME context is loaded. Therefore, we do
-                        //   not have to check whether or not the IME context is loaded.
-                        ImmAssociateContext(HWND, _defaultImc);
-                    }
+                    EnableImm();
                 }
                 else
                 {
@@ -98,14 +144,8 @@ namespace Avalonia.Win32.Input
                     // mouse button and selected a password input while composing a text.
                     // For this case, we have to complete the ongoing composition and
                     // clean up the resources attached to this object BEFORE DISABLING THE IME.
-                    if (IsComposing)
-                    {
-                        ImmNotifyIME(DefaultImc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
-                        ImmReleaseContext(HWND, DefaultImc);
-                        IsComposing = false;
-                    }
-                    ImmAssociateContext(HWND, IntPtr.Zero);
-                    _caretManager.TryDestroy();
+
+                    DisableImm();
                 }
             });
         }
@@ -113,19 +153,23 @@ namespace Avalonia.Win32.Input
         public void SetCursorRect(Rect rect)
         {
             var focused = GetActiveWindow() == HWND;
+
             if (!focused)
             {
                 return;
             }
+
             Dispatcher.UIThread.Post(() =>
             {
-                IntPtr himc = DefaultImc;
+                var himc = ImmGetContext(HWND);
+
                 if (himc == IntPtr.Zero)
                 {
                     return;
                 }
 
                 MoveImeWindow(rect, himc);
+
                 ImmReleaseContext(HWND, himc);
             });
         }
@@ -139,8 +183,7 @@ namespace Avalonia.Win32.Input
             var s = _parent?.DesktopScaling ?? 1;
             var (x1, y1, x2, y2) = ((int) (p1.X * s), (int) (p1.Y * s), (int) (p2.X * s), (int) (p2.Y * s));
 
-            if (!_showCompositionWindow &&
-                _langId == LANG_ZH)
+            if (!ShowCompositionWindow && _langId == LANG_ZH)
             {
                 // Chinese IMEs ignore function calls to ::ImmSetCandidateWindow()
                 // when a user disables TSF (Text Service Framework) and CUAS (Cicero
@@ -157,12 +200,13 @@ namespace Avalonia.Win32.Input
                     dwStyle = CFS_CANDIDATEPOS,
                     ptCurrentPos = new POINT {X = x2, Y = y2}
                 };
+
                 ImmSetCandidateWindow(himc, ref candidateForm);
             }
-            
+
             _caretManager.TryMove(x2, y2);
 
-            if (_showCompositionWindow)
+            if (ShowCompositionWindow)
             {
                 ConfigureCompositionWindow(x1, y1, himc, y2 - y1);
                 // Don't need to set the position of candidate window.
@@ -196,6 +240,7 @@ namespace Avalonia.Win32.Input
                 ptCurrentPos = new POINT {X = x1, Y = y1},
                 rcArea = new RECT {left = x1, top = y1, right = x2, bottom = y2 + _caretMargin}
             };
+
             ImmSetCandidateWindow(himc, ref excludeRectangle);
         }
 
@@ -206,6 +251,7 @@ namespace Avalonia.Win32.Input
                 dwStyle = CFS_POINT,
                 ptCurrentPos = new POINT {X = x1, Y = y1},
             };
+
             ImmSetCompositionWindow(himc, ref compForm);
 
             var logFont = new LOGFONT()
@@ -213,15 +259,51 @@ namespace Avalonia.Win32.Input
                 lfHeight = height,
                 lfQuality = 5 //CLEARTYPE_QUALITY
             };
+
             ImmSetCompositionFont(himc, ref logFont);
         }
         
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
             // we're skipping this. not usable on windows
         }
+
+        public void CompositionChanged()
+        {
+            if (!IsComposing)
+            {
+                return;
+            }
+
+            if(!IsActive || !_client.SupportsPreedit)
+            {
+                return;
+            }
+
+            var composition = GetCompositionString();
+
+            _client.SetPreeditText(composition);
+        }
         
-        public bool IsComposing { get; set; }
+        private string GetCompositionString()
+        {
+            var himc = ImmGetContext(HWND);
+
+            var length = ImmGetCompositionString(himc, GCS.GCS_COMPSTR, IntPtr.Zero, 0);
+
+            var buffer = new byte[length];
+
+            unsafe
+            {
+                fixed (byte* bufferPtr = buffer)
+                {
+                    var error = ImmGetCompositionString(himc, GCS.GCS_COMPSTR, (IntPtr)bufferPtr, (uint)length);
+
+                    return Encoding.Unicode.GetString(buffer, 0, buffer.Length);
+                }
+            }
+          
+        }
 
         ~Imm32InputMethod()
         {
diff --git a/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs b/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs
index 1258bb0109..7e1e22579b 100644
--- a/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs
+++ b/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs
@@ -1,6 +1,6 @@
-using System.Text;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Utilities;
 using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32.Input
@@ -49,7 +49,7 @@ namespace Avalonia.Win32.Input
 
         public string StringFromVirtualKey(uint virtualKey)
         {
-            StringBuilder result = new StringBuilder(256);
+            var result = StringBuilderCache.Acquire(256);
             int length = UnmanagedMethods.ToUnicode(
                 virtualKey,
                 0,
@@ -57,7 +57,7 @@ namespace Avalonia.Win32.Input
                 result,
                 256,
                 0);
-            return result.ToString();
+            return StringBuilderCache.GetStringAndRelease(result);
         }
 
         private void UpdateKeyStates()
diff --git a/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs b/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
index b1064ae25d..224ffdc3fd 100644
--- a/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
+++ b/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
@@ -8,15 +8,28 @@ namespace Avalonia.Win32.Input
 {
     class WindowsMouseDevice : MouseDevice
     {
-        public WindowsMouseDevice() : base(new WindowsMousePointer())
+        private readonly IPointer _pointer;
+        public WindowsMouseDevice() : base(WindowsMousePointer.CreatePointer(out var pointer))
         {
-            
+            _pointer = pointer;
+        }
+
+        // Normally user should use IPointer.Capture instead of MouseDevice.Capture,
+        // But on Windows we need to handle WM_MOUSE capture manually without having access to the Pointer. 
+        internal void Capture(IInputElement control)
+        {
+            _pointer.Capture(control);
         }
         
-        class WindowsMousePointer : Pointer
+        internal class WindowsMousePointer : Pointer
         {
-            public WindowsMousePointer() : base(Pointer.GetNextFreeId(),PointerType.Mouse, true)
+            private WindowsMousePointer() : base(Pointer.GetNextFreeId(),PointerType.Mouse, true)
+            {
+            }
+            
+            public static WindowsMousePointer CreatePointer(out WindowsMousePointer pointer)
             {
+                return pointer = new WindowsMousePointer();
             }
 
             protected override void PlatformCapture(IInputElement element)
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IDockProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IDockProvider.cs
new file mode 100644
index 0000000000..2787434d26
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IDockProvider.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("70d46e77-e3a8-449d-913c-e30eb2afecdb")]
+    public enum DockPosition
+    {
+        Top,
+        Left,
+        Bottom,
+        Right,
+        Fill,
+        None
+    }
+
+    [ComVisible(true)]
+    [Guid("159bc72c-4ad3-485e-9637-d7052edf0146")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IDockProvider
+    {
+        void SetDockPosition(DockPosition dockPosition);
+        DockPosition DockPosition { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IExpandCollapseProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IExpandCollapseProvider.cs
new file mode 100644
index 0000000000..67be1e6c71
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IExpandCollapseProvider.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Automation;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("d847d3a5-cab0-4a98-8c32-ecb45c59ad24")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IExpandCollapseProvider
+    {
+        void Expand();
+        void Collapse();
+        ExpandCollapseState ExpandCollapseState { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IGridItemProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IGridItemProvider.cs
new file mode 100644
index 0000000000..f911c38472
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IGridItemProvider.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("d02541f1-fb81-4d64-ae32-f520f8a6dbd1")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IGridItemProvider
+    {
+        int Row { get; }
+        int Column { get; }
+        int RowSpan { get; }
+        int ColumnSpan { get; }
+        IRawElementProviderSimple ContainingGrid { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IGridProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IGridProvider.cs
new file mode 100644
index 0000000000..a8caf26524
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IGridProvider.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("b17d6187-0907-464b-a168-0ef17a1572b1")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IGridProvider
+    {
+        IRawElementProviderSimple GetItem(int row, int column); 
+        int RowCount { get; }
+        int ColumnCount { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IInvokeProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IInvokeProvider.cs
new file mode 100644
index 0000000000..f35646d456
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IInvokeProvider.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// Description: Invoke pattern provider interface
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("54fcb24b-e18e-47a2-b4d3-eccbe77599a2")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IInvokeProvider
+    {
+        void Invoke();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IMultipleViewProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IMultipleViewProvider.cs
new file mode 100644
index 0000000000..c487a0f5df
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IMultipleViewProvider.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("6278cab1-b556-4a1a-b4e0-418acc523201")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IMultipleViewProvider
+    {
+        string GetViewName(int viewId);
+        void SetCurrentView(int viewId);
+        int CurrentView { get; }
+        int[] GetSupportedViews();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IRangeValueProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IRangeValueProvider.cs
new file mode 100644
index 0000000000..558f38a2cc
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IRangeValueProvider.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("36dc7aef-33e6-4691-afe1-2be7274b3d33")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IRangeValueProvider
+    {
+        void SetValue(double value);
+        double Value { get; }
+        bool IsReadOnly { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        double Maximum { get; }
+        double Minimum { get; }
+        double LargeChange { get; }
+        double SmallChange { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderAdviseEvents.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderAdviseEvents.cs
new file mode 100644
index 0000000000..1e799e05a2
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderAdviseEvents.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.InteropServices;
+
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("a407b27b-0f6d-4427-9292-473c7bf93258")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IRawElementProviderAdviseEvents : IRawElementProviderSimple
+    {
+        void AdviseEventAdded(int eventId, int [] properties);
+        void AdviseEventRemoved(int eventId, int [] properties);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderFragment.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderFragment.cs
new file mode 100644
index 0000000000..a62aa842cb
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderFragment.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Runtime.InteropServices;
+
+#nullable enable
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("670c3006-bf4c-428b-8534-e1848f645122")]
+    public enum NavigateDirection
+    {
+        Parent,
+        NextSibling,
+        PreviousSibling,
+        FirstChild,
+        LastChild,
+    }
+
+    // NOTE: This interface needs to be public otherwise Navigate is never called. I have no idea
+    // why given that IRawElementProviderSimple and IRawElementProviderFragmentRoot seem to get
+    // called fine when they're internal, but I lost a couple of days to this.
+    [ComVisible(true)]
+    [Guid("f7063da8-8359-439c-9297-bbc5299a7d87")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IRawElementProviderFragment : IRawElementProviderSimple
+    {
+        IRawElementProviderFragment? Navigate(NavigateDirection direction);
+        int[]? GetRuntimeId();
+        Rect BoundingRectangle { get; }
+        IRawElementProviderSimple[]? GetEmbeddedFragmentRoots();
+        void SetFocus();
+        IRawElementProviderFragmentRoot? FragmentRoot { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderFragmentRoot.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderFragmentRoot.cs
new file mode 100644
index 0000000000..71d1bdce60
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderFragmentRoot.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("620ce2a5-ab8f-40a9-86cb-de3c75599b58")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IRawElementProviderFragmentRoot : IRawElementProviderFragment
+    {
+        IRawElementProviderFragment ElementProviderFromPoint(double x, double y);
+        IRawElementProviderFragment GetFocus();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderSimple.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderSimple.cs
new file mode 100644
index 0000000000..439036290e
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderSimple.cs
@@ -0,0 +1,285 @@
+using System;
+using System.Runtime.InteropServices;
+
+#nullable enable
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [Flags]
+    public enum ProviderOptions
+    {
+        ClientSideProvider = 0x0001,
+        ServerSideProvider = 0x0002,
+        NonClientAreaProvider = 0x0004,
+        OverrideProvider = 0x0008,
+        ProviderOwnsSetFocus = 0x0010,
+        UseComThreading = 0x0020
+    }
+
+    internal enum UiaPropertyId
+    {
+        RuntimeId = 30000,
+        BoundingRectangle,
+        ProcessId,
+        ControlType,
+        LocalizedControlType,
+        Name,
+        AcceleratorKey,
+        AccessKey,
+        HasKeyboardFocus,
+        IsKeyboardFocusable,
+        IsEnabled,
+        AutomationId,
+        ClassName,
+        HelpText,
+        ClickablePoint,
+        Culture,
+        IsControlElement,
+        IsContentElement,
+        LabeledBy,
+        IsPassword,
+        NativeWindowHandle,
+        ItemType,
+        IsOffscreen,
+        Orientation,
+        FrameworkId,
+        IsRequiredForForm,
+        ItemStatus,
+        IsDockPatternAvailable,
+        IsExpandCollapsePatternAvailable,
+        IsGridItemPatternAvailable,
+        IsGridPatternAvailable,
+        IsInvokePatternAvailable,
+        IsMultipleViewPatternAvailable,
+        IsRangeValuePatternAvailable,
+        IsScrollPatternAvailable,
+        IsScrollItemPatternAvailable,
+        IsSelectionItemPatternAvailable,
+        IsSelectionPatternAvailable,
+        IsTablePatternAvailable,
+        IsTableItemPatternAvailable,
+        IsTextPatternAvailable,
+        IsTogglePatternAvailable,
+        IsTransformPatternAvailable,
+        IsValuePatternAvailable,
+        IsWindowPatternAvailable,
+        ValueValue,
+        ValueIsReadOnly,
+        RangeValueValue,
+        RangeValueIsReadOnly,
+        RangeValueMinimum,
+        RangeValueMaximum,
+        RangeValueLargeChange,
+        RangeValueSmallChange,
+        ScrollHorizontalScrollPercent,
+        ScrollHorizontalViewSize,
+        ScrollVerticalScrollPercent,
+        ScrollVerticalViewSize,
+        ScrollHorizontallyScrollable,
+        ScrollVerticallyScrollable,
+        SelectionSelection,
+        SelectionCanSelectMultiple,
+        SelectionIsSelectionRequired,
+        GridRowCount,
+        GridColumnCount,
+        GridItemRow,
+        GridItemColumn,
+        GridItemRowSpan,
+        GridItemColumnSpan,
+        GridItemContainingGrid,
+        DockDockPosition,
+        ExpandCollapseExpandCollapseState,
+        MultipleViewCurrentView,
+        MultipleViewSupportedViews,
+        WindowCanMaximize,
+        WindowCanMinimize,
+        WindowWindowVisualState,
+        WindowWindowInteractionState,
+        WindowIsModal,
+        WindowIsTopmost,
+        SelectionItemIsSelected,
+        SelectionItemSelectionContainer,
+        TableRowHeaders,
+        TableColumnHeaders,
+        TableRowOrColumnMajor,
+        TableItemRowHeaderItems,
+        TableItemColumnHeaderItems,
+        ToggleToggleState,
+        TransformCanMove,
+        TransformCanResize,
+        TransformCanRotate,
+        IsLegacyIAccessiblePatternAvailable,
+        LegacyIAccessibleChildId,
+        LegacyIAccessibleName,
+        LegacyIAccessibleValue,
+        LegacyIAccessibleDescription,
+        LegacyIAccessibleRole,
+        LegacyIAccessibleState,
+        LegacyIAccessibleHelp,
+        LegacyIAccessibleKeyboardShortcut,
+        LegacyIAccessibleSelection,
+        LegacyIAccessibleDefaultAction,
+        AriaRole,
+        AriaProperties,
+        IsDataValidForForm,
+        ControllerFor,
+        DescribedBy,
+        FlowsTo,
+        ProviderDescription,
+        IsItemContainerPatternAvailable,
+        IsVirtualizedItemPatternAvailable,
+        IsSynchronizedInputPatternAvailable,
+        OptimizeForVisualContent,
+        IsObjectModelPatternAvailable,
+        AnnotationAnnotationTypeId,
+        AnnotationAnnotationTypeName,
+        AnnotationAuthor,
+        AnnotationDateTime,
+        AnnotationTarget,
+        IsAnnotationPatternAvailable,
+        IsTextPattern2Available,
+        StylesStyleId,
+        StylesStyleName,
+        StylesFillColor,
+        StylesFillPatternStyle,
+        StylesShape,
+        StylesFillPatternColor,
+        StylesExtendedProperties,
+        IsStylesPatternAvailable,
+        IsSpreadsheetPatternAvailable,
+        SpreadsheetItemFormula,
+        SpreadsheetItemAnnotationObjects,
+        SpreadsheetItemAnnotationTypes,
+        IsSpreadsheetItemPatternAvailable,
+        Transform2CanZoom,
+        IsTransformPattern2Available,
+        LiveSetting,
+        IsTextChildPatternAvailable,
+        IsDragPatternAvailable,
+        DragIsGrabbed,
+        DragDropEffect,
+        DragDropEffects,
+        IsDropTargetPatternAvailable,
+        DropTargetDropTargetEffect,
+        DropTargetDropTargetEffects,
+        DragGrabbedItems,
+        Transform2ZoomLevel,
+        Transform2ZoomMinimum,
+        Transform2ZoomMaximum,
+        FlowsFrom,
+        IsTextEditPatternAvailable,
+        IsPeripheral,
+        IsCustomNavigationPatternAvailable,
+        PositionInSet,
+        SizeOfSet,
+        Level,
+        AnnotationTypes,
+        AnnotationObjects,
+        LandmarkType,
+        LocalizedLandmarkType,
+        FullDescription,
+        FillColor,
+        OutlineColor,
+        FillType,
+        VisualEffects,
+        OutlineThickness,
+        CenterPoint,
+        Rotatation,
+        Size
+    }
+
+    internal enum UiaPatternId
+    {
+        Invoke = 10000,
+        Selection,
+        Value,
+        RangeValue,
+        Scroll,
+        ExpandCollapse,
+        Grid,
+        GridItem,
+        MultipleView,
+        Window,
+        SelectionItem,
+        Dock,
+        Table,
+        TableItem,
+        Text,
+        Toggle,
+        Transform,
+        ScrollItem,
+        LegacyIAccessible,
+        ItemContainer,
+        VirtualizedItem,
+        SynchronizedInput,
+        ObjectModel,
+        Annotation,
+        Text2,
+        Styles,
+        Spreadsheet,
+        SpreadsheetItem,
+        Transform2,
+        TextChild,
+        Drag,
+        DropTarget,
+        TextEdit,
+        CustomNavigation
+    };
+
+    internal enum UiaControlTypeId
+    {
+        Button = 50000,
+        Calendar,
+        CheckBox,
+        ComboBox,
+        Edit,
+        Hyperlink,
+        Image,
+        ListItem,
+        List,
+        Menu,
+        MenuBar,
+        MenuItem,
+        ProgressBar,
+        RadioButton,
+        ScrollBar,
+        Slider,
+        Spinner,
+        StatusBar,
+        Tab,
+        TabItem,
+        Text,
+        ToolBar,
+        ToolTip,
+        Tree,
+        TreeItem,
+        Custom,
+        Group,
+        Thumb,
+        DataGrid,
+        DataItem,
+        Document,
+        SplitButton,
+        Window,
+        Pane,
+        Header,
+        HeaderItem,
+        Table,
+        TitleBar,
+        Separator,
+        SemanticZoom,
+        AppBar
+    };
+
+    [ComVisible(true)]
+    [Guid("d6dd68d1-86fd-4332-8666-9abedea2d24c")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IRawElementProviderSimple
+    {
+        ProviderOptions ProviderOptions { get; }
+        [return: MarshalAs(UnmanagedType.IUnknown)]
+        object? GetPatternProvider(int patternId);
+        object? GetPropertyValue(int propertyId);
+        IRawElementProviderSimple? HostRawElementProvider { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderSimple2.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderSimple2.cs
new file mode 100644
index 0000000000..f3504b8d77
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IRawElementProviderSimple2.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+#nullable enable
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("a0a839a9-8da1-4a82-806a-8e0d44e79f56")]
+    public interface IRawElementProviderSimple2
+    {
+        void ShowContextMenu();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IScrollItemProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IScrollItemProvider.cs
new file mode 100644
index 0000000000..c34c8667ef
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IScrollItemProvider.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("2360c714-4bf1-4b26-ba65-9b21316127eb")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IScrollItemProvider
+    {
+        void ScrollIntoView();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IScrollProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IScrollProvider.cs
new file mode 100644
index 0000000000..154d52c6af
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IScrollProvider.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Automation.Provider;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("b38b8077-1fc3-42a5-8cae-d40c2215055a")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IScrollProvider
+    {
+        void Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount);
+        void SetScrollPercent(double horizontalPercent, double verticalPercent);
+        double HorizontalScrollPercent { get; }
+        double VerticalScrollPercent { get; }
+        double HorizontalViewSize { get; }
+        double VerticalViewSize { get; }
+        bool HorizontallyScrollable { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        bool VerticallyScrollable { [return: MarshalAs(UnmanagedType.Bool)] get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs
new file mode 100644
index 0000000000..8d6677315c
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs
@@ -0,0 +1,18 @@
+#nullable enable
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("2acad808-b2d4-452d-a407-91ff1ad167b2")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ISelectionItemProvider
+    {
+        void Select();
+        void AddToSelection();
+        void RemoveFromSelection();
+        bool IsSelected { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        IRawElementProviderSimple? SelectionContainer { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionProvider.cs
new file mode 100644
index 0000000000..8a5924126d
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionProvider.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("fb8b03af-3bdf-48d4-bd36-1a65793be168")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ISelectionProvider
+    {
+        IRawElementProviderSimple [] GetSelection();
+        bool CanSelectMultiple { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        bool IsSelectionRequired { [return: MarshalAs(UnmanagedType.Bool)] get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ISynchronizedInputProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ISynchronizedInputProvider.cs
new file mode 100644
index 0000000000..def1bbd4b9
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ISynchronizedInputProvider.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("fdc8f176-aed2-477a-8c89-5604c66f278d")]
+    public enum SynchronizedInputType
+    {
+        KeyUp = 0x01,
+        KeyDown = 0x02,
+        MouseLeftButtonUp = 0x04,
+        MouseLeftButtonDown = 0x08,
+        MouseRightButtonUp = 0x10,
+        MouseRightButtonDown = 0x20
+    }
+
+    [ComVisible(true)]
+    [Guid("29db1a06-02ce-4cf7-9b42-565d4fab20ee")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ISynchronizedInputProvider
+    {
+        void  StartListening(SynchronizedInputType inputType);
+        void Cancel();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ITableItemProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ITableItemProvider.cs
new file mode 100644
index 0000000000..36751122d1
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ITableItemProvider.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("b9734fa6-771f-4d78-9c90-2517999349cd")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ITableItemProvider : IGridItemProvider
+    {
+        IRawElementProviderSimple [] GetRowHeaderItems();
+        IRawElementProviderSimple [] GetColumnHeaderItems();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ITableProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ITableProvider.cs
new file mode 100644
index 0000000000..e82bda3272
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ITableProvider.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("15fdf2e2-9847-41cd-95dd-510612a025ea")]
+    public enum RowOrColumnMajor
+    {
+        RowMajor,
+        ColumnMajor,
+        Indeterminate,
+    }
+
+    [ComVisible(true)]
+    [Guid("9c860395-97b3-490a-b52a-858cc22af166")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ITableProvider : IGridProvider
+    {
+        IRawElementProviderSimple [] GetRowHeaders();
+        IRawElementProviderSimple [] GetColumnHeaders();
+        RowOrColumnMajor RowOrColumnMajor { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ITextProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ITextProvider.cs
new file mode 100644
index 0000000000..3f8fbc80c7
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ITextProvider.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [Flags]
+    [ComVisible(true)]
+    [Guid("3d9e3d8f-bfb0-484f-84ab-93ff4280cbc4")]
+    public enum SupportedTextSelection
+    {
+        None,
+        Single,
+        Multiple,
+    }
+
+    [ComVisible(true)]
+    [Guid("3589c92c-63f3-4367-99bb-ada653b77cf2")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ITextProvider
+    {
+        ITextRangeProvider [] GetSelection();
+        ITextRangeProvider [] GetVisibleRanges();
+        ITextRangeProvider RangeFromChild(IRawElementProviderSimple childElement);
+        ITextRangeProvider RangeFromPoint(Point screenLocation);
+        ITextRangeProvider DocumentRange { get; }
+        SupportedTextSelection SupportedTextSelection { get; }
+    }
+}
+
+
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ITextRangeProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ITextRangeProvider.cs
new file mode 100644
index 0000000000..9ebb4c9f49
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ITextRangeProvider.cs
@@ -0,0 +1,48 @@
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    public enum TextPatternRangeEndpoint
+    {
+        Start = 0,
+        End = 1,
+    }
+
+    public enum TextUnit
+    {
+        Character = 0,
+        Format = 1,
+        Word = 2,
+        Line = 3,
+        Paragraph = 4,
+        Page = 5,
+        Document = 6,
+    }
+
+    [ComVisible(true)]
+    [Guid("5347ad7b-c355-46f8-aff5-909033582f63")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ITextRangeProvider
+
+    {
+        ITextRangeProvider Clone();
+        [return: MarshalAs(UnmanagedType.Bool)]
+        bool Compare(ITextRangeProvider range);
+        int CompareEndpoints(TextPatternRangeEndpoint endpoint, ITextRangeProvider targetRange, TextPatternRangeEndpoint targetEndpoint);
+        void ExpandToEnclosingUnit(TextUnit unit);
+        ITextRangeProvider FindAttribute(int attribute, object value, [MarshalAs(UnmanagedType.Bool)] bool backward);
+        ITextRangeProvider FindText(string text, [MarshalAs(UnmanagedType.Bool)] bool backward, [MarshalAs(UnmanagedType.Bool)] bool ignoreCase);
+        object GetAttributeValue(int attribute);
+        double [] GetBoundingRectangles();
+        IRawElementProviderSimple GetEnclosingElement();
+        string GetText(int maxLength);
+        int Move(TextUnit unit, int count);
+        int MoveEndpointByUnit(TextPatternRangeEndpoint endpoint, TextUnit unit, int count);
+        void MoveEndpointByRange(TextPatternRangeEndpoint endpoint, ITextRangeProvider targetRange, TextPatternRangeEndpoint targetEndpoint);
+        void Select();
+        void AddToSelection();
+        void RemoveFromSelection();
+        void ScrollIntoView([MarshalAs(UnmanagedType.Bool)] bool alignToTop);
+        IRawElementProviderSimple[] GetChildren();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IToggleProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IToggleProvider.cs
new file mode 100644
index 0000000000..e4072a1250
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IToggleProvider.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Automation.Provider;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("56d00bd0-c4f4-433c-a836-1a52a57e0892")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IToggleProvider
+    {
+        void Toggle( );
+        ToggleState ToggleState { get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ITransformProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ITransformProvider.cs
new file mode 100644
index 0000000000..4859f2d078
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ITransformProvider.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("6829ddc4-4f91-4ffa-b86f-bd3e2987cb4c")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface ITransformProvider
+    {
+        void Move( double x, double y );
+        void Resize( double width, double height );
+        void Rotate( double degrees );
+        bool CanMove  { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        bool CanResize { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        bool CanRotate { [return: MarshalAs(UnmanagedType.Bool)] get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IValueProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IValueProvider.cs
new file mode 100644
index 0000000000..919be647f8
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IValueProvider.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.InteropServices;
+
+#nullable enable
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("c7935180-6fb3-4201-b174-7df73adbf64a")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IValueProvider
+    {
+        void SetValue([MarshalAs(UnmanagedType.LPWStr)] string? value);
+        string? Value { get; }
+        bool IsReadOnly { [return: MarshalAs(UnmanagedType.Bool)] get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/IWindowProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/IWindowProvider.cs
new file mode 100644
index 0000000000..d915beb601
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/IWindowProvider.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("fdc8f176-aed2-477a-8c89-ea04cc5f278d")]
+    public enum WindowVisualState
+    {
+        Normal,
+        Maximized,
+        Minimized
+    }
+
+    [ComVisible(true)]
+    [Guid("65101cc7-7904-408e-87a7-8c6dbd83a18b")]
+    public enum WindowInteractionState
+    {
+        Running,
+        Closing,
+        ReadyForUserInteraction,
+        BlockedByModalWindow,
+        NotResponding
+    }
+
+    [ComVisible(true)]
+    [Guid("987df77b-db06-4d77-8f8a-86a9c3bb90b9")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IWindowProvider
+    {
+        void SetVisualState(WindowVisualState state);
+        void Close();
+        [return: MarshalAs(UnmanagedType.Bool)]
+        bool WaitForInputIdle(int milliseconds);
+        bool Maximizable { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        bool Minimizable { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        bool IsModal { [return: MarshalAs(UnmanagedType.Bool)] get; }
+        WindowVisualState VisualState { get; }
+        WindowInteractionState InteractionState { get; }
+        bool IsTopmost { [return: MarshalAs(UnmanagedType.Bool)] get; }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/UiaCoreProviderApi.cs b/src/Windows/Avalonia.Win32/Interop/Automation/UiaCoreProviderApi.cs
new file mode 100644
index 0000000000..4ba7a710d4
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/UiaCoreProviderApi.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    [ComVisible(true)]
+    [Guid("d8e55844-7043-4edc-979d-593cc6b4775e")]
+    internal enum AsyncContentLoadedState
+    {
+        Beginning,
+        Progress,
+        Completed,
+    }
+
+    [ComVisible(true)]
+    [Guid("e4cfef41-071d-472c-a65c-c14f59ea81eb")]
+    internal enum StructureChangeType
+    {
+        ChildAdded,
+        ChildRemoved,
+        ChildrenInvalidated,
+        ChildrenBulkAdded,
+        ChildrenBulkRemoved,
+        ChildrenReordered,
+    }
+
+    internal enum UiaEventId
+    {
+        ToolTipOpened = 20000,
+        ToolTipClosed,
+        StructureChanged,
+        MenuOpened,
+        AutomationPropertyChanged,
+        AutomationFocusChanged,
+        AsyncContentLoaded,
+        MenuClosed,
+        LayoutInvalidated,
+        Invoke_Invoked,
+        SelectionItem_ElementAddedToSelection,
+        SelectionItem_ElementRemovedFromSelection,
+        SelectionItem_ElementSelected,
+        Selection_Invalidated,
+        Text_TextSelectionChanged,
+        Text_TextChanged,
+        Window_WindowOpened,
+        Window_WindowClosed,
+        MenuModeStart,
+        MenuModeEnd,
+        InputReachedTarget,
+        InputReachedOtherElement,
+        InputDiscarded,
+        SystemAlert,
+        LiveRegionChanged,
+        HostedFragmentRootsInvalidated,
+        Drag_DragStart,
+        Drag_DragCancel,
+        Drag_DragComplete,
+        DropTarget_DragEnter,
+        DropTarget_DragLeave,
+        DropTarget_Dropped,
+        TextEdit_TextChanged,
+        TextEdit_ConversionTargetChanged,
+        Changes
+    };
+
+    internal static class UiaCoreProviderApi
+    {
+        public const int UIA_E_ELEMENTNOTENABLED = unchecked((int)0x80040200);
+
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern bool UiaClientsAreListening();
+        
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern IntPtr UiaReturnRawElementProvider(IntPtr hwnd, IntPtr wParam, IntPtr lParam, IRawElementProviderSimple el);
+
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern int UiaHostProviderFromHwnd(IntPtr hwnd, [MarshalAs(UnmanagedType.Interface)] out IRawElementProviderSimple provider);
+
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern int UiaRaiseAutomationEvent(IRawElementProviderSimple provider, int id);
+
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern int UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple provider, int id, object oldValue, object newValue);
+
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern int UiaRaiseStructureChangedEvent(IRawElementProviderSimple provider, StructureChangeType structureChangeType, int[] runtimeId, int runtimeIdLen);
+
+        [DllImport("UIAutomationCore.dll", CharSet = CharSet.Unicode)]
+        public static extern int UiaDisconnectProvider(IRawElementProviderSimple provider);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/UiaCoreTypesApi.cs b/src/Windows/Avalonia.Win32/Interop/Automation/UiaCoreTypesApi.cs
new file mode 100644
index 0000000000..4375b2fde1
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/UiaCoreTypesApi.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.Interop.Automation
+{
+    internal static class UiaCoreTypesApi
+    {
+        private const string StartListeningExportName = "SynchronizedInputPattern_StartListening";
+
+        internal enum AutomationIdType
+        {
+            Property,
+            Pattern,
+            Event,
+            ControlType,
+            TextAttribute
+        }
+
+        internal const int UIA_E_ELEMENTNOTENABLED = unchecked((int)0x80040200);
+        internal const int UIA_E_ELEMENTNOTAVAILABLE = unchecked((int)0x80040201);
+        internal const int UIA_E_NOCLICKABLEPOINT = unchecked((int)0x80040202);
+        internal const int UIA_E_PROXYASSEMBLYNOTLOADED = unchecked((int)0x80040203);
+
+        internal static int UiaLookupId(AutomationIdType type, ref Guid guid)
+        {   
+            return RawUiaLookupId( type, ref guid );
+        }
+
+        internal static object UiaGetReservedNotSupportedValue()
+        {
+            object notSupportedValue;
+            CheckError(RawUiaGetReservedNotSupportedValue(out notSupportedValue));
+            return notSupportedValue;
+        }
+
+        internal static object UiaGetReservedMixedAttributeValue()
+        {
+            object mixedAttributeValue;
+            CheckError(RawUiaGetReservedMixedAttributeValue(out mixedAttributeValue));
+            return mixedAttributeValue;
+        }
+
+        private static void CheckError(int hr)
+        {
+            if (hr >= 0)
+            {
+                return;
+            }
+
+            Marshal.ThrowExceptionForHR(hr, (IntPtr)(-1));
+        }
+
+        [DllImport("UIAutomationCore.dll", EntryPoint = "UiaLookupId", CharSet = CharSet.Unicode)]
+        private static extern int RawUiaLookupId(AutomationIdType type, ref Guid guid);
+
+        [DllImport("UIAutomationCore.dll", EntryPoint = "UiaGetReservedNotSupportedValue", CharSet = CharSet.Unicode)]
+        private static extern int RawUiaGetReservedNotSupportedValue([MarshalAs(UnmanagedType.IUnknown)] out object notSupportedValue);
+
+        [DllImport("UIAutomationCore.dll", EntryPoint = "UiaGetReservedMixedAttributeValue", CharSet = CharSet.Unicode)]
+        private static extern int RawUiaGetReservedMixedAttributeValue([MarshalAs(UnmanagedType.IUnknown)] out object mixedAttributeValue);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index 1809fcf98b..9b86154043 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -7,6 +7,7 @@ using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 
 using Avalonia.MicroCom;
+using MicroCom.Runtime;
 using Avalonia.Win32.Win32Com;
 
 // ReSharper disable InconsistentNaming
@@ -225,20 +226,17 @@ namespace Avalonia.Win32.Interop
         [Flags]
         public enum ModifierKeys
         {
-            MK_CONTROL = 0x0008,
+            MK_NONE    = 0x0000,
 
             MK_LBUTTON = 0x0001,
-
-            MK_MBUTTON = 0x0010,
-
             MK_RBUTTON = 0x0002,
 
-            MK_SHIFT = 0x0004,
-
-            MK_ALT = 0x0020,
+            MK_SHIFT   = 0x0004,
+            MK_CONTROL = 0x0008,
 
+            MK_MBUTTON  = 0x0010,
+            MK_ALT      = 0x0020,
             MK_XBUTTON1 = 0x0020,
-
             MK_XBUTTON2 = 0x0040
         }
 
@@ -514,6 +512,33 @@ namespace Avalonia.Win32.Interop
             CS_DROPSHADOW = 0x00020000
         }
 
+        [Flags]
+        public enum PointerDeviceChangeFlags
+        {
+            PDC_ARRIVAL = 0x001,
+            PDC_REMOVAL = 0x002,
+            PDC_ORIENTATION_0 = 0x004,
+            PDC_ORIENTATION_90 = 0x008,
+            PDC_ORIENTATION_180 = 0x010,
+            PDC_ORIENTATION_270 = 0x020,
+            PDC_MODE_DEFAULT = 0x040,
+            PDC_MODE_CENTERED = 0x080,
+            PDC_MAPPING_CHANGE = 0x100,
+            PDC_RESOLUTION = 0x200,
+            PDC_ORIGIN = 0x400,
+            PDC_MODE_ASPECTRATIOPRESERVED = 0x800
+        }
+
+        public enum PointerInputType
+        {
+            PT_NONE = 0x00000000,
+            PT_POINTER = 0x00000001,
+            PT_TOUCH = 0x00000002,
+            PT_PEN = 0x00000003,
+            PT_MOUSE = 0x00000004,
+            PT_TOUCHPAD = 0x00000005
+        }
+
         public enum WindowsMessage : uint
         {
             WM_NULL = 0x0000,
@@ -689,6 +714,25 @@ namespace Avalonia.Win32.Interop
             WM_EXITSIZEMOVE = 0x0232,
             WM_DROPFILES = 0x0233,
             WM_MDIREFRESHMENU = 0x0234,
+
+            WM_POINTERDEVICECHANGE = 0x0238,
+            WM_POINTERDEVICEINRANGE = 0x239,
+            WM_POINTERDEVICEOUTOFRANGE = 0x23A,
+            WM_NCPOINTERUPDATE = 0x0241,
+            WM_NCPOINTERDOWN = 0x0242,
+            WM_NCPOINTERUP = 0x0243,
+            WM_POINTERUPDATE = 0x0245,
+            WM_POINTERDOWN = 0x0246,
+            WM_POINTERUP = 0x0247,
+            WM_POINTERENTER = 0x0249,
+            WM_POINTERLEAVE = 0x024A,
+            WM_POINTERACTIVATE = 0x024B,
+            WM_POINTERCAPTURECHANGED = 0x024C,
+            WM_TOUCHHITTESTING = 0x024D,
+            WM_POINTERWHEEL = 0x024E,
+            WM_POINTERHWHEEL = 0x024F,
+            DM_POINTERHITTEST = 0x0250,
+
             WM_IME_SETCONTEXT = 0x0281,
             WM_IME_NOTIFY = 0x0282,
             WM_IME_CONTROL = 0x0283,
@@ -765,6 +809,14 @@ namespace Avalonia.Win32.Interop
             DWMWA_CLOAK,
             DWMWA_CLOAKED,
             DWMWA_FREEZE_REPRESENTATION,
+            DWMWA_PASSIVE_UPDATE_MODE,
+            DWMWA_USE_HOSTBACKDROPBRUSH,
+            DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
+            DWMWA_WINDOW_CORNER_PREFERENCE = 33,
+            DWMWA_BORDER_COLOR,
+            DWMWA_CAPTION_COLOR,
+            DWMWA_TEXT_COLOR,
+            DWMWA_VISIBLE_FRAME_BORDER_THICKNESS,
             DWMWA_LAST
         };
 
@@ -836,6 +888,134 @@ namespace Avalonia.Win32.Interop
             SCF_ISSECURE = 0x00000001,
         }
 
+        [Flags]
+        public enum PointerFlags
+        {
+            POINTER_FLAG_NONE = 0x00000000,
+            POINTER_FLAG_NEW = 0x00000001,
+            POINTER_FLAG_INRANGE = 0x00000002,
+            POINTER_FLAG_INCONTACT = 0x00000004,
+            POINTER_FLAG_FIRSTBUTTON = 0x00000010,
+            POINTER_FLAG_SECONDBUTTON = 0x00000020,
+            POINTER_FLAG_THIRDBUTTON = 0x00000040,
+            POINTER_FLAG_FOURTHBUTTON = 0x00000080,
+            POINTER_FLAG_FIFTHBUTTON = 0x00000100,
+            POINTER_FLAG_PRIMARY = 0x00002000,
+            POINTER_FLAG_CONFIDENCE = 0x00000400,
+            POINTER_FLAG_CANCELED = 0x00000800,
+            POINTER_FLAG_DOWN = 0x00010000,
+            POINTER_FLAG_UPDATE = 0x00020000,
+            POINTER_FLAG_UP = 0x00040000,
+            POINTER_FLAG_WHEEL = 0x00080000,
+            POINTER_FLAG_HWHEEL = 0x00100000,
+            POINTER_FLAG_CAPTURECHANGED = 0x00200000,
+            POINTER_FLAG_HASTRANSFORM = 0x00400000
+        }
+
+        public enum PointerButtonChangeType : ulong
+        {
+            POINTER_CHANGE_NONE,
+            POINTER_CHANGE_FIRSTBUTTON_DOWN,
+            POINTER_CHANGE_FIRSTBUTTON_UP,
+            POINTER_CHANGE_SECONDBUTTON_DOWN,
+            POINTER_CHANGE_SECONDBUTTON_UP,
+            POINTER_CHANGE_THIRDBUTTON_DOWN,
+            POINTER_CHANGE_THIRDBUTTON_UP,
+            POINTER_CHANGE_FOURTHBUTTON_DOWN,
+            POINTER_CHANGE_FOURTHBUTTON_UP,
+            POINTER_CHANGE_FIFTHBUTTON_DOWN,
+            POINTER_CHANGE_FIFTHBUTTON_UP
+        }
+
+        [Flags]
+        public enum PenFlags
+        {
+            PEN_FLAGS_NONE = 0x00000000,
+            PEN_FLAGS_BARREL = 0x00000001,
+            PEN_FLAGS_INVERTED = 0x00000002,
+            PEN_FLAGS_ERASER = 0x00000004,
+        }
+
+        [Flags]
+        public enum PenMask
+        {
+            PEN_MASK_NONE = 0x00000000,
+            PEN_MASK_PRESSURE = 0x00000001,
+            PEN_MASK_ROTATION = 0x00000002,
+            PEN_MASK_TILT_X = 0x00000004,
+            PEN_MASK_TILT_Y = 0x00000008
+        }
+
+        [Flags]
+        public enum TouchFlags
+        {
+            TOUCH_FLAG_NONE = 0x00000000
+        }
+
+        [Flags]
+        public enum TouchMask
+        {
+            TOUCH_MASK_NONE = 0x00000000,
+            TOUCH_MASK_CONTACTAREA = 0x00000001,
+            TOUCH_MASK_ORIENTATION = 0x00000002,
+            TOUCH_MASK_PRESSURE = 0x00000004,
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public struct POINTER_TOUCH_INFO
+        {
+            public POINTER_INFO pointerInfo;
+            public TouchFlags touchFlags;
+            public TouchMask touchMask;
+            public int rcContactLeft;
+            public int rcContactTop;
+            public int rcContactRight;
+            public int rcContactBottom;
+            public int rcContactRawLeft;
+            public int rcContactRawTop;
+            public int rcContactRawRight;
+            public int rcContactRawBottom;
+            public uint orientation;
+            public uint pressure;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public struct POINTER_PEN_INFO
+        {
+            public POINTER_INFO pointerInfo;
+            public PenFlags penFlags;
+            public PenMask penMask;
+            public uint pressure;
+            public uint rotation;
+            public int tiltX;
+            public int tiltY;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public struct POINTER_INFO
+        {
+            public PointerInputType pointerType;
+            public uint pointerId;
+            public uint frameId;
+            public PointerFlags pointerFlags;
+            public IntPtr sourceDevice;
+            public IntPtr hwndTarget;
+            public int ptPixelLocationX;
+            public int ptPixelLocationY;
+            public int ptHimetricLocationX;
+            public int ptHimetricLocationY;
+            public int ptPixelLocationRawX;
+            public int ptPixelLocationRawY;
+            public int ptHimetricLocationRawX;
+            public int ptHimetricLocationRawY;
+            public uint dwTime;
+            public uint historyCount;
+            public int inputData;
+            public ModifierKeys dwKeyStates;
+            public ulong PerformanceCount;
+            public PointerButtonChangeType ButtonChangeType;
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         public struct RGBQUAD
         {
@@ -903,12 +1083,56 @@ namespace Avalonia.Win32.Interop
 
         public const int SizeOf_BITMAPINFOHEADER = 40;
 
+        [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto, SetLastError = true)]
+        unsafe internal static extern int GetMouseMovePointsEx(
+            uint cbSize, MOUSEMOVEPOINT* pointsIn,
+            MOUSEMOVEPOINT* pointsBufferOut, int nBufPoints, uint resolution);
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] // For GetMouseMovePointsEx
+        public struct MOUSEMOVEPOINT
+        {
+            public int x;                       //Specifies the x-coordinate of the mouse
+            public int y;                       //Specifies the x-coordinate of the mouse
+            public int time;                    //Specifies the time stamp of the mouse coordinate
+            public IntPtr dwExtraInfo;              //Specifies extra information associated with this coordinate.
+        }
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool IsMouseInPointerEnabled();
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern int EnableMouseInPointer(bool enable);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerCursorId(uint pointerId, out uint cursorId);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerType(uint pointerId, out PointerInputType pointerType);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerInfo(uint pointerId, out POINTER_INFO pointerInfo);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerInfoHistory(uint pointerId, ref int entriesCount, [MarshalAs(UnmanagedType.LPArray), In, Out] POINTER_INFO[] pointerInfos);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerPenInfo(uint pointerId, out POINTER_PEN_INFO penInfo);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerPenInfoHistory(uint pointerId, ref int entriesCount, [MarshalAs(UnmanagedType.LPArray), In, Out] POINTER_PEN_INFO[] penInfos);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerTouchInfo(uint pointerId, out POINTER_TOUCH_INFO touchInfo);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetPointerTouchInfoHistory(uint pointerId, ref int entriesCount, [MarshalAs(UnmanagedType.LPArray), In, Out] POINTER_TOUCH_INFO[] touchInfos);
+
         [DllImport("user32.dll")]
         public static extern bool EnumDisplayMonitors(IntPtr hdc, IntPtr lprcClip,
                                                       MonitorEnumDelegate lpfnEnum, IntPtr dwData);
-        
+
         public delegate bool MonitorEnumDelegate(IntPtr hMonitor, IntPtr hdcMonitor, ref Rect lprcMonitor, IntPtr dwData);
-        
+
         [DllImport("user32.dll", SetLastError = true)]
         public static extern IntPtr GetDC(IntPtr hWnd);
 
@@ -999,7 +1223,7 @@ namespace Avalonia.Win32.Interop
 
         public static uint GetWindowLong(IntPtr hWnd, int nIndex)
         {
-            if(IntPtr.Size == 4)
+            if (IntPtr.Size == 4)
             {
                 return GetWindowLong32b(hWnd, nIndex);
             }
@@ -1026,7 +1250,7 @@ namespace Avalonia.Win32.Interop
                 return (uint)SetWindowLong64b(hWnd, nIndex, new IntPtr((uint)value)).ToInt32();
             }
         }
-        
+
         public static IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr handle)
         {
             if (IntPtr.Size == 4)
@@ -1060,14 +1284,14 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("user32.dll")]
         public static extern bool InvalidateRect(IntPtr hWnd, RECT* lpRect, bool bErase);
-        
-        
+
+
         [DllImport("user32.dll")]
         public static extern bool ValidateRect(IntPtr hWnd, IntPtr lpRect);
 
         [DllImport("user32.dll")]
         public static extern bool IsWindow(IntPtr hWnd);
-        
+
         [DllImport("user32.dll")]
         public static extern bool IsWindowEnabled(IntPtr hWnd);
 
@@ -1094,22 +1318,25 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("user32")]
         public static extern IntPtr GetMessageExtraInfo();
-        
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "RegisterClassExW")]
         public static extern ushort RegisterClassEx(ref WNDCLASSEX lpwcx);
 
         [DllImport("user32.dll")]
         public static extern void RegisterTouchWindow(IntPtr hWnd, int flags);
-        
+
         [DllImport("user32.dll")]
         public static extern bool ReleaseCapture();
 
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern uint RegisterWindowMessage(string lpString);
+
         [DllImport("user32.dll")]
         public static extern bool ScreenToClient(IntPtr hWnd, ref POINT lpPoint);
 
         [DllImport("user32.dll", SetLastError = true)]
         public static extern IntPtr GetActiveWindow();
-        
+
         [DllImport("user32.dll", SetLastError = true)]
         public static extern IntPtr SetActiveWindow(IntPtr hWnd);
 
@@ -1277,10 +1504,10 @@ namespace Avalonia.Win32.Interop
         public static extern IntPtr SetClipboardData(ClipboardFormat uFormat, IntPtr hMem);
 
         [DllImport("ole32.dll", PreserveSig = false)]
-        public static extern int OleGetClipboard(out IOleDataObject dataObject);
+        public static extern int OleGetClipboard(out IntPtr dataObject);
 
         [DllImport("ole32.dll", PreserveSig = true)]
-        public static extern int OleSetClipboard(IOleDataObject dataObject);
+        public static extern int OleSetClipboard(IntPtr dataObject);
 
         [DllImport("kernel32.dll", ExactSpelling = true)]
         public static extern IntPtr GlobalLock(IntPtr handle);
@@ -1296,7 +1523,7 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("kernel32.dll", SetLastError = true)]
         public static extern IntPtr LoadLibrary(string fileName);
-        
+
         [DllImport("kernel32.dll", SetLastError = true)]
         public static extern IntPtr LoadLibraryEx(string fileName, IntPtr hFile, int flags);
 
@@ -1340,7 +1567,7 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("user32.dll")]
         public static extern IntPtr MonitorFromWindow(IntPtr hwnd, MONITOR dwFlags);
-        
+
         [DllImport("user32", EntryPoint = "GetMonitorInfoW", ExactSpelling = true, CharSet = CharSet.Unicode)]
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool GetMonitorInfo([In] IntPtr hMonitor, ref MONITORINFO lpmi);
@@ -1348,14 +1575,14 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32")]
         public static extern unsafe bool GetTouchInputInfo(
             IntPtr hTouchInput,
-            uint        cInputs,
+            uint cInputs,
             TOUCHINPUT* pInputs,
-            int         cbSize
+            int cbSize
         );
-        
+
         [DllImport("user32")]
         public static extern bool CloseTouchInputHandle(IntPtr hTouchInput);
-        
+
         [return: MarshalAs(UnmanagedType.Bool)]
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "PostMessageW")]
         public static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
@@ -1364,7 +1591,7 @@ namespace Avalonia.Win32.Interop
         public static extern int SetDIBitsToDevice(IntPtr hdc, int XDest, int YDest, uint
                 dwWidth, uint dwHeight, int XSrc, int YSrc, uint uStartScan, uint cScanLines,
             IntPtr lpvBits, [In] ref BITMAPINFOHEADER lpbmi, uint fuColorUse);
-        
+
         [DllImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool CloseHandle(IntPtr hObject);
@@ -1379,27 +1606,27 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("gdi32.dll")]
         public static extern int ChoosePixelFormat(IntPtr hdc, ref PixelFormatDescriptor pfd);
-        
+
         [DllImport("gdi32.dll")]
         public static extern int DescribePixelFormat(IntPtr hdc, ref PixelFormatDescriptor pfd);
 
         [DllImport("gdi32.dll")]
         public static extern int SetPixelFormat(IntPtr hdc, int iPixelFormat, ref PixelFormatDescriptor pfd);
-        
-        
+
+
         [DllImport("gdi32.dll")]
         public static extern int DescribePixelFormat(IntPtr hdc, int iPixelFormat, int bytes, ref PixelFormatDescriptor pfd);
-        
+
         [DllImport("gdi32.dll")]
         public static extern bool SwapBuffers(IntPtr hdc);
 
         [DllImport("opengl32.dll")]
         public static extern IntPtr wglCreateContext(IntPtr hdc);
-        
+
         [DllImport("opengl32.dll")]
         public static extern bool wglDeleteContext(IntPtr context);
 
-        
+
         [DllImport("opengl32.dll")]
         public static extern bool wglMakeCurrent(IntPtr hdc, IntPtr context);
 
@@ -1420,11 +1647,11 @@ namespace Avalonia.Win32.Interop
             uint dwMaximumSizeLow,
             string lpName);
 
-        [DllImport("msvcrt.dll", EntryPoint="memcpy", SetLastError = false, CallingConvention=CallingConvention.Cdecl)]
-        public static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, UIntPtr count); 
-        
+        [DllImport("msvcrt.dll", EntryPoint = "memcpy", SetLastError = false, CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, UIntPtr count);
+
         [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
-        public static extern HRESULT RegisterDragDrop(IntPtr hwnd, IDropTarget target);
+        public static extern HRESULT RegisterDragDrop(IntPtr hwnd, IntPtr target);
 
         [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
         public static extern HRESULT RevokeDragDrop(IntPtr hwnd);
@@ -1448,7 +1675,7 @@ namespace Avalonia.Win32.Interop
         public static extern int DragQueryFile(IntPtr hDrop, int iFile, StringBuilder lpszFile, int cch);
 
         [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void DoDragDrop(IOleDataObject dataObject, IDropSource dropSource, int allowedEffects, out int finalEffect);
+        internal static extern void DoDragDrop(IntPtr dataObject, IntPtr dropSource, int allowedEffects, [Out] out int finalEffect);
 
         [DllImport("dwmapi.dll")]
         public static extern int DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins);
@@ -1456,15 +1683,18 @@ namespace Avalonia.Win32.Interop
         [DllImport("dwmapi.dll")]
         public static extern int DwmGetWindowAttribute(IntPtr hwnd, int dwAttribute, out RECT pvAttribute, int cbAttribute);
 
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmSetWindowAttribute(IntPtr hwnd, int dwAttribute, void* pvAttribute, int cbAttribute);
+
         [DllImport("dwmapi.dll")]
         public static extern int DwmIsCompositionEnabled(out bool enabled);
 
         [DllImport("dwmapi.dll")]
         public static extern void DwmFlush();
-        
+
         [DllImport("dwmapi.dll")]
         public static extern bool DwmDefWindowProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref IntPtr plResult);
-        
+
         [DllImport("dwmapi.dll")]
         public static extern void DwmEnableBlurBehindWindow(IntPtr hwnd, ref DWM_BLURBEHIND blurBehind);
         
@@ -1531,8 +1761,8 @@ namespace Avalonia.Win32.Interop
                 throw new Exception("RtlGetVersion failed!");
             }
         }
-        
-        [DllImport("kernel32", EntryPoint="WaitForMultipleObjectsEx", SetLastError = true, CharSet = CharSet.Auto)]
+
+        [DllImport("kernel32", EntryPoint = "WaitForMultipleObjectsEx", SetLastError = true, CharSet = CharSet.Auto)]
         private static extern int IntWaitForMultipleObjectsEx(int nCount, IntPtr[] pHandles, bool bWaitAll, int dwMilliseconds, bool bAlertable);
 
         public const int WAIT_FAILED = unchecked((int)0xFFFFFFFF);
@@ -1540,7 +1770,7 @@ namespace Avalonia.Win32.Interop
         internal static int WaitForMultipleObjectsEx(int nCount, IntPtr[] pHandles, bool bWaitAll, int dwMilliseconds, bool bAlertable)
         {
             int result = IntWaitForMultipleObjectsEx(nCount, pHandles, bWaitAll, dwMilliseconds, bAlertable);
-            if(result ==  WAIT_FAILED)
+            if (result == WAIT_FAILED)
             {
                 throw new Win32Exception();
             }
@@ -1551,6 +1781,46 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref WindowCompositionAttributeData data);
 
+        [Flags]
+        public enum GCS : uint
+        {
+            /// <summary>Retrieve or update the attribute of the composition string.</summary>
+            GCS_COMPATTR = 0x0010,
+
+            /// <summary>Retrieve or update clause information of the composition string.</summary>
+            GCS_COMPCLAUSE = 0x0020,
+
+            /// <summary>Retrieve or update the attributes of the reading string of the current composition.</summary>
+            GCS_COMPREADATTR = 0x0002,
+
+            /// <summary>Retrieve or update the clause information of the reading string of the composition string.</summary>
+            GCS_COMPREADCLAUSE = 0x0004,
+
+            /// <summary>Retrieve or update the reading string of the current composition.</summary>
+            GCS_COMPREADSTR = 0x0001,
+
+            /// <summary>Retrieve or update the current composition string.</summary>
+            GCS_COMPSTR = 0x0008,
+
+            /// <summary>Retrieve or update the cursor position in composition string.</summary>
+            GCS_CURSORPOS = 0x0080,
+
+            /// <summary>Retrieve or update the starting position of any changes in composition string.</summary>
+            GCS_DELTASTART = 0x0100,
+
+            /// <summary>Retrieve or update clause information of the result string.</summary>
+            GCS_RESULTCLAUSE = 0x1000,
+
+            /// <summary>Retrieve or update clause information of the reading string.</summary>
+            GCS_RESULTREADCLAUSE = 0x0400,
+
+            /// <summary>Retrieve or update the reading string.</summary>
+            GCS_RESULTREADSTR = 0x0200,
+
+            /// <summary>Retrieve or update the string of the composition result.</summary>
+            GCS_RESULTSTR = 0x0800,
+        }
+
         [DllImport("imm32.dll", SetLastError = true)]
         public static extern IntPtr ImmGetContext(IntPtr hWnd);
         [DllImport("imm32.dll", SetLastError = true)]
@@ -1573,6 +1843,29 @@ namespace Avalonia.Win32.Interop
         public static extern bool ImmSetCompositionWindow(IntPtr hIMC, ref COMPOSITIONFORM lpComp);
         [DllImport("imm32.dll")]
         public static extern bool ImmSetCompositionFont(IntPtr hIMC, ref LOGFONT lf);
+
+        [DllImport("imm32.dll", SetLastError = false, CharSet = CharSet.Unicode)]
+        public static extern int ImmGetCompositionString(IntPtr hIMC, GCS dwIndex, [Out, Optional] IntPtr lpBuf, uint dwBufLen);
+
+        public static string ImmGetCompositionString(IntPtr hIMC, GCS dwIndex)
+        {
+            int bufferLength = ImmGetCompositionString(hIMC, dwIndex, IntPtr.Zero, 0);
+
+            if (bufferLength > 0)
+            {
+                var buffer = new byte[bufferLength];
+
+                fixed(byte* bufferPtr = buffer)
+                {
+                    var error = ImmGetCompositionString(hIMC, dwIndex, (IntPtr)bufferPtr, (uint)bufferLength);
+
+                    return Marshal.PtrToStringUni((IntPtr)bufferPtr);
+                }           
+            }
+
+            return null;
+        }
+
         [DllImport("imm32.dll")]
         public static extern bool ImmNotifyIME(IntPtr hIMC, int dwAction, int dwIndex, int dwValue);
         [DllImport("user32.dll")]
@@ -1599,7 +1892,10 @@ namespace Avalonia.Win32.Interop
 
         public static uint LGID(IntPtr HKL)
         {
-            return (uint)(HKL.ToInt32() & 0xffff);
+            unchecked
+            {
+                return (uint)((ulong)HKL & 0xffff);
+            }
         }
 
         public const int SORT_DEFAULT = 0;
@@ -1612,7 +1908,13 @@ namespace Avalonia.Win32.Interop
         public const int CFS_EXCLUDE = 0x0080;
         public const int CFS_POINT = 0x0002;
         public const int CFS_RECT = 0x0001;
-        public const uint ISC_SHOWUICOMPOSITIONWINDOW = 0x80000000;
+
+        // lParam for WM_IME_SETCONTEXT
+        public const long ISC_SHOWUICANDIDATEWINDOW = 0x00000001;
+        public const long ISC_SHOWUICOMPOSITIONWINDOW = 0x80000000;
+        public const long ISC_SHOWUIGUIDELINE = 0x40000000;
+        public const long ISC_SHOWUIALLCANDIDATEWINDOW = 0x0000000F;
+        public const long ISC_SHOWUIALL = 0xC000000F;
 
         public const int NI_COMPOSITIONSTR = 21;
         public const int CPS_COMPLETE = 1;
@@ -1688,7 +1990,7 @@ namespace Avalonia.Win32.Interop
             DrawLeftBorder = 0x20,
             DrawTopBorder = 0x40,
             DrawRightBorder = 0x80,
-            DrawBottomBorder = 0x100,            
+            DrawBottomBorder = 0x100,
         }
 
         [StructLayout(LayoutKind.Sequential)]
@@ -1756,9 +2058,9 @@ namespace Avalonia.Win32.Interop
             MDT_ANGULAR_DPI = 1,
             MDT_RAW_DPI = 2,
             MDT_DEFAULT = MDT_EFFECTIVE_DPI
-        } 
+        }
 
-        public enum ClipboardFormat 
+        public enum ClipboardFormat
         {
             /// <summary>
             /// Text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data. Use this format for ANSI text.
@@ -1809,13 +2111,19 @@ namespace Avalonia.Win32.Interop
             public int X;
             public int Y;
         }
-        
+
         public struct SIZE
         {
             public int X;
             public int Y;
         }
 
+        public struct SIZE_F
+        {
+            public float X;
+            public float Y;
+        }
+
         public struct RECT
         {
             public int left;
@@ -2010,7 +2318,7 @@ namespace Avalonia.Win32.Interop
             OFN_NOREADONLYRETURN = 0x00008000,
             OFN_OVERWRITEPROMPT = 0x00000002
         }
-        
+
         public enum HRESULT : uint
         {
             S_FALSE = 0x0001,
@@ -2064,64 +2372,6 @@ namespace Avalonia.Win32.Interop
         }
     }
 
-    [Flags]
-    internal enum DropEffect : int
-    {
-        None = 0,
-        Copy = 1,
-        Move = 2,
-        Link = 4,
-        Scroll = -2147483648,
-    }
-
-    [ComImport]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("00000122-0000-0000-C000-000000000046")]
-    internal interface IDropTarget
-    {
-        [PreserveSig]
-        UnmanagedMethods.HRESULT DragEnter([MarshalAs(UnmanagedType.Interface)] [In] IOleDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
-        [PreserveSig]
-        UnmanagedMethods.HRESULT DragOver([MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
-        [PreserveSig]
-        UnmanagedMethods.HRESULT DragLeave();
-        [PreserveSig]
-        UnmanagedMethods.HRESULT Drop([MarshalAs(UnmanagedType.Interface)] [In] IOleDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
-    }
-
-    [ComImport]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("00000121-0000-0000-C000-000000000046")]
-    internal interface IDropSource
-    {
-        [PreserveSig]
-        int QueryContinueDrag(int fEscapePressed, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState);
-        [PreserveSig]
-        int GiveFeedback([MarshalAs(UnmanagedType.U4)] [In] int dwEffect);
-    }
-
-
-    [ComImport]
-    [Guid("0000010E-0000-0000-C000-000000000046")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    internal interface IOleDataObject
-    {
-        void GetData([In] ref FORMATETC format, out STGMEDIUM medium);
-        void GetDataHere([In] ref FORMATETC format, ref STGMEDIUM medium);
-        [PreserveSig]
-        int QueryGetData([In] ref FORMATETC format);
-        [PreserveSig]
-        int GetCanonicalFormatEtc([In] ref FORMATETC formatIn, out FORMATETC formatOut);
-        void SetData([In] ref FORMATETC formatIn, [In] ref STGMEDIUM medium, [MarshalAs(UnmanagedType.Bool)] bool release);
-        IEnumFORMATETC EnumFormatEtc(DATADIR direction);
-        [PreserveSig]
-        int DAdvise([In] ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection);
-        void DUnadvise(int connection);
-        [PreserveSig]
-        int EnumDAdvise(out IEnumSTATDATA enumAdvise);
-    }
-
-
     [StructLayoutAttribute(LayoutKind.Sequential)]
     internal struct _DROPFILES
     {
@@ -2132,6 +2382,24 @@ namespace Avalonia.Win32.Interop
         public bool fWide;
     }
 
+    [StructLayoutAttribute(LayoutKind.Sequential)]
+    internal struct STGMEDIUM
+    {
+        public TYMED tymed;
+        public IntPtr unionmember;
+        public IntPtr pUnkForRelease;
+    }
+
+    [StructLayoutAttribute(LayoutKind.Sequential)]
+    internal struct FORMATETC
+    {
+        public ushort cfFormat;
+        public IntPtr ptd;
+        public DVASPECT dwAspect;
+        public int lindex;
+        public TYMED tymed;
+    }
+
     [Flags]
     internal enum PixelFormatDescriptorFlags : uint
     {
diff --git a/src/Windows/Avalonia.Win32/OleContext.cs b/src/Windows/Avalonia.Win32/OleContext.cs
index c6e04a29b4..e41423a334 100644
--- a/src/Windows/Avalonia.Win32/OleContext.cs
+++ b/src/Windows/Avalonia.Win32/OleContext.cs
@@ -4,6 +4,8 @@ using System.Threading;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;
+using Avalonia.Win32.Win32Com;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32
 {
@@ -46,7 +48,8 @@ namespace Avalonia.Win32
                 return false;
             }
 
-            return UnmanagedMethods.RegisterDragDrop(hwnd.Handle, target) == UnmanagedMethods.HRESULT.S_OK;
+            var trgPtr = target.GetNativeIntPtr();
+            return UnmanagedMethods.RegisterDragDrop(hwnd.Handle, trgPtr) == UnmanagedMethods.HRESULT.S_OK;
         }
 
         internal bool UnregisterDragDrop(IPlatformHandle hwnd)
diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs
index f111fe0a6b..90992d803f 100644
--- a/src/Windows/Avalonia.Win32/OleDataObject.cs
+++ b/src/Windows/Avalonia.Win32/OleDataObject.cs
@@ -1,25 +1,27 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
 using Avalonia.Input;
+using Avalonia.MicroCom;
+using Avalonia.Utilities;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
+using IDataObject = Avalonia.Input.IDataObject;
 
 namespace Avalonia.Win32
 {
-    class OleDataObject : Avalonia.Input.IDataObject
+    internal class OleDataObject : IDataObject, IDisposable
     {
-        private IOleDataObject _wrapped;
+        private readonly Win32Com.IDataObject _wrapped;
 
-        public OleDataObject(IOleDataObject wrapped)
+        public OleDataObject(Win32Com.IDataObject wrapped)
         {
-            _wrapped = wrapped;
+            _wrapped = wrapped.CloneReference();
         }
 
         public bool Contains(string dataFormat)
@@ -34,12 +36,12 @@ namespace Avalonia.Win32
 
         public string GetText()
         {
-            return GetDataFromOleHGLOBAL(DataFormats.Text, DVASPECT.DVASPECT_CONTENT) as string;
+            return (string)GetDataFromOleHGLOBAL(DataFormats.Text, DVASPECT.DVASPECT_CONTENT);
         }
 
         public IEnumerable<string> GetFileNames()
         {
-            return GetDataFromOleHGLOBAL(DataFormats.FileNames, DVASPECT.DVASPECT_CONTENT) as IEnumerable<string>;
+            return (IEnumerable<string>)GetDataFromOleHGLOBAL(DataFormats.FileNames, DVASPECT.DVASPECT_CONTENT);
         }
 
         public object Get(string dataFormat)
@@ -47,16 +49,17 @@ namespace Avalonia.Win32
             return GetDataFromOleHGLOBAL(dataFormat, DVASPECT.DVASPECT_CONTENT);
         }
 
-        private object GetDataFromOleHGLOBAL(string format, DVASPECT aspect)
+        private unsafe object GetDataFromOleHGLOBAL(string format, DVASPECT aspect)
         {
-            FORMATETC formatEtc = new FORMATETC();
+            var formatEtc = new Interop.FORMATETC();
             formatEtc.cfFormat = ClipboardFormats.GetFormat(format);
             formatEtc.dwAspect = aspect;
             formatEtc.lindex = -1;
             formatEtc.tymed = TYMED.TYMED_HGLOBAL;
-            if (_wrapped.QueryGetData(ref formatEtc) == 0)
+            if (_wrapped.QueryGetData(&formatEtc) == 0)
             {
-                _wrapped.GetData(ref formatEtc, out STGMEDIUM medium);
+                Interop.STGMEDIUM medium = default;
+                _ = _wrapped.GetData(&formatEtc, &medium);
                 try
                 {
                     if (medium.unionmember != IntPtr.Zero && medium.tymed == TYMED.TYMED_HGLOBAL)
@@ -100,11 +103,11 @@ namespace Avalonia.Win32
                 for (int i = 0; i < fileCount; i++)
                 {
                     int pathLen = UnmanagedMethods.DragQueryFile(hGlobal, i, null, 0);
-                    StringBuilder sb = new StringBuilder(pathLen+1);
+                    var sb = StringBuilderCache.Acquire(pathLen+1);
 
                     if (UnmanagedMethods.DragQueryFile(hGlobal, i, sb, sb.Capacity) == pathLen)
                     {
-                        files.Add(sb.ToString());
+                        files.Add(StringBuilderCache.GetStringAndRelease(sb));
                     }
                 }
             }
@@ -140,38 +143,53 @@ namespace Avalonia.Win32
             }
         }
 
-        private IEnumerable<string> GetDataFormatsCore()
+        private unsafe IEnumerable<string> GetDataFormatsCore()
         {
-            var enumFormat = _wrapped.EnumFormatEtc(DATADIR.DATADIR_GET);
+            var formatsList = new List<string>();
+            var enumFormat = _wrapped.EnumFormatEtc((int)DATADIR.DATADIR_GET);
 
             if (enumFormat != null)
             {
                 enumFormat.Reset();
                 
-                var formats = ArrayPool<FORMATETC>.Shared.Rent(1);
-                var fetched = ArrayPool<int>.Shared.Rent(1);
+                var formats = ArrayPool<Interop.FORMATETC>.Shared.Rent(1);
 
                 try
                 {
+                    uint fetched = 0;
                     do
                     {
-                        fetched[0] = 0;
-                        if (enumFormat.Next(1, formats, fetched) == 0 && fetched[0] > 0)
+                        fixed (Interop.FORMATETC* formatsPtr = formats)
+                        {
+                            // Read one item at a time.
+                            // When "celt" parameter is 1, "pceltFetched" is ignored.
+                            var res = enumFormat.Next(1, formatsPtr, &fetched);
+                            if (res != 0)
+                            {
+                                break;
+                            }
+                        }
+                        if (fetched > 0)
                         {
                             if (formats[0].ptd != IntPtr.Zero)
                                 Marshal.FreeCoTaskMem(formats[0].ptd);
 
-                            yield return ClipboardFormats.GetFormat(formats[0].cfFormat);
+                            formatsList.Add(ClipboardFormats.GetFormat(formats[0].cfFormat));
                         }
                     }
-                    while (fetched[0] > 0);
+                    while (fetched > 0);
                 }
                 finally
                 {
-                    ArrayPool<FORMATETC>.Shared.Return(formats);
-                    ArrayPool<int>.Shared.Return(fetched);
+                    ArrayPool<Interop.FORMATETC>.Shared.Return(formats);
                 }
             }
+            return formatsList;
+        }
+
+        public void Dispose()
+        {
+            _wrapped.Dispose();
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/OleDragSource.cs b/src/Windows/Avalonia.Win32/OleDragSource.cs
index c903a9ca57..30503339da 100644
--- a/src/Windows/Avalonia.Win32/OleDragSource.cs
+++ b/src/Windows/Avalonia.Win32/OleDragSource.cs
@@ -1,9 +1,12 @@
 using System.Linq;
+
+using Avalonia.MicroCom;
 using Avalonia.Win32.Interop;
+using Avalonia.Win32.Win32Com;
 
 namespace Avalonia.Win32
 {
-    class OleDragSource : IDropSource
+    internal class OleDragSource : CallbackBase, IDropSource
     {
         private const int DRAGDROP_S_USEDEFAULTCURSORS = 0x00040102;
         private const int DRAGDROP_S_DROP = 0x00040100;
@@ -30,7 +33,7 @@ namespace Avalonia.Win32
             return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
         }
 
-        public int GiveFeedback(int dwEffect)
+        public int GiveFeedback(DropEffect dwEffect)
         {
             return DRAGDROP_S_USEDEFAULTCURSORS;
         }
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index d8cb52a914..1c22fd025d 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -1,12 +1,16 @@
-using Avalonia.Input;
+using System;
+
+using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.MicroCom;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
-using IDataObject = Avalonia.Input.IDataObject;
+using MicroCom.Runtime;
+using DropEffect = Avalonia.Win32.Win32Com.DropEffect;
 
 namespace Avalonia.Win32
 {
-    internal class OleDropTarget : IDropTarget
+    internal class OleDropTarget : CallbackBase, Win32Com.IDropTarget
     {
         private readonly IInputRoot _target;
         private readonly ITopLevelImpl _tl;
@@ -65,58 +69,51 @@ namespace Avalonia.Win32
             return modifiers;
         }
 
-        UnmanagedMethods.HRESULT IDropTarget.DragEnter(IOleDataObject pDataObj, int grfKeyState, long pt, ref DropEffect pdwEffect)
+        unsafe void Win32Com.IDropTarget.DragEnter(Win32Com.IDataObject pDataObj, int grfKeyState, UnmanagedMethods.POINT pt, DropEffect* pdwEffect)
         {
             var dispatch = _tl?.Input;
             if (dispatch == null)
             {
-                pdwEffect = DropEffect.None;
-                return UnmanagedMethods.HRESULT.S_OK;
+                *pdwEffect= (int)DropEffect.None;
             }
-            _currentDrag = pDataObj as IDataObject;
-            if (_currentDrag == null)
-                _currentDrag = new OleDataObject(pDataObj);
+
+            SetDataObject(pDataObj);
 
             var args = new RawDragEvent(
                 _dragDevice,
                 RawDragEventType.DragEnter, 
-                _target, 
-                GetDragLocation(pt), 
+                _target,
+                GetDragLocation(pt),
                 _currentDrag, 
-                ConvertDropEffect(pdwEffect),
+                ConvertDropEffect(*pdwEffect),
                 ConvertKeyState(grfKeyState)
             );
             dispatch(args);
-            pdwEffect = ConvertDropEffect(args.Effects);
-            
-            return UnmanagedMethods.HRESULT.S_OK;
+            *pdwEffect = ConvertDropEffect(args.Effects);
         }
 
-        UnmanagedMethods.HRESULT IDropTarget.DragOver(int grfKeyState, long pt, ref DropEffect pdwEffect)
+        unsafe void Win32Com.IDropTarget.DragOver(int grfKeyState, UnmanagedMethods.POINT pt, DropEffect* pdwEffect)
         {
             var dispatch = _tl?.Input;
             if (dispatch == null)
             {
-                pdwEffect = DropEffect.None;
-                return UnmanagedMethods.HRESULT.S_OK;
+                *pdwEffect = (int)DropEffect.None;
             }
             
             var args = new RawDragEvent(
                 _dragDevice,
                 RawDragEventType.DragOver, 
-                _target, 
-                GetDragLocation(pt), 
-                _currentDrag, 
-                ConvertDropEffect(pdwEffect),
+                _target,
+                GetDragLocation(pt),
+                _currentDrag,
+                ConvertDropEffect(*pdwEffect),
                 ConvertKeyState(grfKeyState)
             );
             dispatch(args);
-            pdwEffect = ConvertDropEffect(args.Effects);
-            
-            return UnmanagedMethods.HRESULT.S_OK;  
+            *pdwEffect = ConvertDropEffect(args.Effects);
         }
 
-        UnmanagedMethods.HRESULT IDropTarget.DragLeave()
+        void Win32Com.IDropTarget.DragLeave()
         {
             try
             {
@@ -129,56 +126,91 @@ namespace Avalonia.Win32
                     DragDropEffects.None,
                     RawInputModifiers.None
                 ));
-                return UnmanagedMethods.HRESULT.S_OK;
             }
             finally
             {
-                _currentDrag = null;
+                ReleaseDataObject();
             }
         }
 
-        UnmanagedMethods.HRESULT IDropTarget.Drop(IOleDataObject pDataObj, int grfKeyState, long pt, ref DropEffect pdwEffect)
+        unsafe void Win32Com.IDropTarget.Drop(Win32Com.IDataObject pDataObj, int grfKeyState, UnmanagedMethods.POINT pt, DropEffect* pdwEffect)
         {
             try
             {
                 var dispatch = _tl?.Input;
                 if (dispatch == null)
                 {
-                    pdwEffect = DropEffect.None;
-                    return UnmanagedMethods.HRESULT.S_OK;
+                    *pdwEffect = (int)DropEffect.None;
                 }
 
-                _currentDrag = pDataObj as IDataObject;
-                if (_currentDrag == null)
-                    _currentDrag= new OleDataObject(pDataObj);
-                
+                SetDataObject(pDataObj);
+
                 var args = new RawDragEvent(
                     _dragDevice, 
                     RawDragEventType.Drop, 
-                    _target, 
-                    GetDragLocation(pt), 
-                    _currentDrag, 
-                    ConvertDropEffect(pdwEffect),
+                    _target,
+                    GetDragLocation(pt),
+                    _currentDrag,
+                    ConvertDropEffect(*pdwEffect),
                     ConvertKeyState(grfKeyState)
                 );
                 dispatch(args);
-                pdwEffect = ConvertDropEffect(args.Effects);
-            
-                return UnmanagedMethods.HRESULT.S_OK;  
+                *pdwEffect = ConvertDropEffect(args.Effects);
             }
             finally
             {
-                _currentDrag = null;
+                ReleaseDataObject();
             }
         }
 
-        private Point GetDragLocation(long dragPoint)
+        private void SetDataObject(Win32Com.IDataObject pDataObj)
         {
-            int x = (int)dragPoint;
-            int y = (int)(dragPoint >> 32);
+            var newDrag = GetAvaloniaObjectFromCOM(pDataObj);
+            if (_currentDrag != newDrag)
+            {
+                ReleaseDataObject();
+                _currentDrag = newDrag;
+            }
+        }
 
-            var screenPt = new PixelPoint(x, y);
+        private void ReleaseDataObject()
+        {
+            // OleDataObject keeps COM reference, so it should be disposed.
+            if (_currentDrag is OleDataObject oleDragSource)
+            {
+                oleDragSource?.Dispose();
+                _currentDrag = null;
+            }
+        }
+
+        private Point GetDragLocation(UnmanagedMethods.POINT dragPoint)
+        {
+            var screenPt = new PixelPoint(dragPoint.X, dragPoint.Y);
             return _target.PointToClient(screenPt);
         }
+
+        protected override void Destroyed()
+        {
+            ReleaseDataObject();
+        }
+
+        public static unsafe IDataObject GetAvaloniaObjectFromCOM(Win32Com.IDataObject pDataObj)
+        {
+            if (pDataObj is null)
+            {
+                throw new ArgumentNullException(nameof(pDataObj));
+            }
+            if (pDataObj is IDataObject disposableDataObject)
+            {
+                return disposableDataObject;
+            }
+
+            var dataObject = MicroComRuntime.TryUnwrapManagedObject(pDataObj) as DataObject;
+            if (dataObject is not null)
+            {
+                return dataObject;
+            }
+            return new OleDataObject(pDataObj);
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs b/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs
index b948495b99..1d0880a468 100644
--- a/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs
@@ -2,12 +2,14 @@ using System;
 using System.Linq;
 using Avalonia.Logging;
 using Avalonia.OpenGL;
+using Avalonia.Platform;
 
 namespace Avalonia.Win32.OpenGl
 {
     class WglPlatformOpenGlInterface : IPlatformOpenGlInterface
     {
         public WglContext PrimaryContext { get; }
+        IPlatformGpuContext IPlatformGpu.PrimaryContext => PrimaryContext;
         IGlContext IPlatformOpenGlInterface.PrimaryContext => PrimaryContext;
         public IGlContext CreateSharedContext() => WglDisplay.CreateContext(new[] { PrimaryContext.Version }, PrimaryContext);
 
diff --git a/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
deleted file mode 100644
index 30a3f71cad..0000000000
--- a/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Win32;
-
-[assembly: ExportWindowingSubsystem(OperatingSystemType.WinNT, 1, "Win32", typeof(Win32Platform), nameof(Win32Platform.Initialize))]
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index 442794f0f0..f3754cd58f 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
+    [Unstable]
     public class ScreenImpl : IScreenImpl
     {
         public int ScreenCount
@@ -70,5 +73,43 @@ namespace Avalonia.Win32
         {
             _allScreens = null;
         }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            var handle = window.Handle.Handle;
+
+            var monitor = MonitorFromWindow(handle, MONITOR.MONITOR_DEFAULTTONULL);
+
+            return FindScreenByHandle(monitor);
+        }
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            var monitor = MonitorFromPoint(new POINT
+            {
+                X = point.X,
+                Y = point.Y
+            }, MONITOR.MONITOR_DEFAULTTONULL);
+
+            return FindScreenByHandle(monitor);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            var monitor = MonitorFromRect(new RECT
+            {
+                left = rect.TopLeft.X,
+                top = rect.TopLeft.Y,
+                right = rect.TopRight.X,
+                bottom = rect.BottomRight.Y
+            }, MONITOR.MONITOR_DEFAULTTONULL);
+
+            return FindScreenByHandle(monitor);
+        }
+
+        private Screen FindScreenByHandle(IntPtr handle)
+        {
+            return AllScreens.Cast<WinScreen>().FirstOrDefault(m => m.Handle == handle);
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
deleted file mode 100644
index 410ba55627..0000000000
--- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-using Avalonia.MicroCom;
-using Avalonia.Win32.Interop;
-using Avalonia.Win32.Win32Com;
-
-namespace Avalonia.Win32
-{
-    internal class SystemDialogImpl : ISystemDialogImpl
-    {
-        private const uint SIGDN_FILESYSPATH = 0x80058000;
-
-        private const FILEOPENDIALOGOPTIONS DefaultDialogOptions = FILEOPENDIALOGOPTIONS.FOS_FORCEFILESYSTEM | FILEOPENDIALOGOPTIONS.FOS_NOVALIDATE |
-            FILEOPENDIALOGOPTIONS.FOS_NOTESTFILECREATE | FILEOPENDIALOGOPTIONS.FOS_DONTADDTORECENT;
-
-        public unsafe Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent)
-        {
-            var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
-            return Task.Run(() =>
-            {
-                string[]? result = default;
-                try
-                {
-                    var clsid = dialog is OpenFileDialog ? UnmanagedMethods.ShellIds.OpenFileDialog : UnmanagedMethods.ShellIds.SaveFileDialog;
-                    var iid = UnmanagedMethods.ShellIds.IFileDialog;
-                    var frm = UnmanagedMethods.CreateInstance<IFileDialog>(ref clsid, ref iid);
-
-                    var openDialog = dialog as OpenFileDialog;
-
-                    var options = frm.Options;
-                    options |= DefaultDialogOptions;
-                    if (openDialog?.AllowMultiple == true)
-                    {
-                        options |= FILEOPENDIALOGOPTIONS.FOS_ALLOWMULTISELECT;
-                    }
-
-                    if (dialog is SaveFileDialog saveFileDialog)
-                    {
-                        var overwritePrompt = saveFileDialog.ShowOverwritePrompt ?? true;
-
-                        if (!overwritePrompt)
-                        {
-                            options &= ~FILEOPENDIALOGOPTIONS.FOS_OVERWRITEPROMPT;
-                        }
-                    }
-                    frm.SetOptions(options);
-
-                    var defaultExtension = (dialog as SaveFileDialog)?.DefaultExtension ?? "";
-                    fixed (char* pExt = defaultExtension)
-                    {
-                        frm.SetDefaultExtension(pExt);
-                    }
-
-                    var initialFileName = dialog.InitialFileName ?? "";
-                    fixed (char* fExt = initialFileName)
-                    {
-                        frm.SetFileName(fExt);
-                    }
-
-                    var title = dialog.Title ?? "";
-                    fixed (char* tExt = title)
-                    {
-                        frm.SetTitle(tExt);
-                    }
-
-                    fixed (void* pFilters = FiltersToPointer(dialog.Filters, out var count))
-                    {
-                        frm.SetFileTypes((ushort)count, pFilters);
-                    }
-
-                    frm.SetFileTypeIndex(0);
-
-                    if (dialog.Directory != null)
-                    {
-                        var riid = UnmanagedMethods.ShellIds.IShellItem;
-                        if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.Directory, IntPtr.Zero, ref riid, out var directoryShellItem)
-                            == (uint)UnmanagedMethods.HRESULT.S_OK)
-                        {
-                            var proxy = MicroComRuntime.CreateProxyFor<IShellItem>(directoryShellItem, true);
-                            frm.SetFolder(proxy);
-                            frm.SetDefaultFolder(proxy);
-                        }
-                    }
-
-                    var showResult = frm.Show(hWnd);
-
-                    if ((uint)showResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
-                    {
-                        return result;
-                    } 
-                    else if ((uint)showResult != (uint)UnmanagedMethods.HRESULT.S_OK)
-                    {
-                        throw new Win32Exception(showResult);
-                    }
-
-                    if (openDialog?.AllowMultiple == true)
-                    {
-                        using var fileOpenDialog = frm.QueryInterface<IFileOpenDialog>();
-                        var shellItemArray = fileOpenDialog.Results;
-                        var count = shellItemArray.Count;
-
-                        var results = new List<string>();
-                        for (int i = 0; i < count; i++)
-                        {
-                            var shellItem = shellItemArray.GetItemAt(i);
-                            if (GetAbsoluteFilePath(shellItem) is { } selected)
-                            {
-                                results.Add(selected);
-                            }
-                        }
-                        result = results.ToArray();
-                    }
-                    else if (frm.Result is { } shellItem
-                        && GetAbsoluteFilePath(shellItem) is { } singleResult)
-                    {
-                        result = new[] { singleResult };
-                    }
-
-                    return result;
-                }
-                catch (COMException ex)
-                {
-                    throw new Win32Exception(ex.HResult);
-                }
-            })!;
-        }
-
-        public unsafe Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
-        {
-            return Task.Run(() =>
-            {
-                string? result = default;
-                try
-                {
-                    var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
-                    var clsid = UnmanagedMethods.ShellIds.OpenFileDialog;
-                    var iid = UnmanagedMethods.ShellIds.IFileDialog;
-                    var frm = UnmanagedMethods.CreateInstance<IFileDialog>(ref clsid, ref iid);
-
-                    var options = frm.Options;
-                    options = FILEOPENDIALOGOPTIONS.FOS_PICKFOLDERS | DefaultDialogOptions;
-                    frm.SetOptions(options);
-
-                    var title = dialog.Title ?? "";
-                    fixed (char* tExt = title)
-                    {
-                        frm.SetTitle(tExt);
-                    }
-
-                    if (dialog.Directory != null)
-                    {
-                        var riid = UnmanagedMethods.ShellIds.IShellItem;
-                        if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.Directory, IntPtr.Zero, ref riid, out var directoryShellItem)
-                            == (uint)UnmanagedMethods.HRESULT.S_OK)
-                        {
-                            var proxy = MicroComRuntime.CreateProxyFor<IShellItem>(directoryShellItem, true);
-                            frm.SetFolder(proxy);
-                            frm.SetDefaultFolder(proxy);
-                        }
-                    }
-
-                    var showResult = frm.Show(hWnd);
-
-                    if ((uint)showResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
-                    {
-                        return result;
-                    }
-                    else if ((uint)showResult != (uint)UnmanagedMethods.HRESULT.S_OK)
-                    {
-                        throw new Win32Exception(showResult);
-                    }
-
-                    if (frm.Result is not null)
-                    {
-                        result = GetAbsoluteFilePath(frm.Result);
-                    }
-
-                    return result;
-                }
-                catch (COMException ex)
-                {
-                    throw new Win32Exception(ex.HResult);
-                }
-            });
-        }
-
-        private unsafe string? GetAbsoluteFilePath(IShellItem shellItem)
-        {
-            var pszString = new IntPtr(shellItem.GetDisplayName(SIGDN_FILESYSPATH));
-            if (pszString != IntPtr.Zero)
-            {
-                try
-                {
-                    return Marshal.PtrToStringUni(pszString);
-                }
-                finally
-                {
-                    Marshal.FreeCoTaskMem(pszString);
-                }
-            }
-            return default;
-        }
-
-        private unsafe byte[] FiltersToPointer(List<FileDialogFilter>? filters, out int lenght)
-        {
-            if (filters == null || filters.Count == 0)
-            {
-                filters = new List<FileDialogFilter>
-                {
-                    new FileDialogFilter { Name = "All files", Extensions = new List<string> { "*" } }
-                };
-            }
-
-            var size = Marshal.SizeOf<UnmanagedMethods.COMDLG_FILTERSPEC>();
-            var arr = new byte[size];
-            var resultArr = new byte[size * filters.Count];
-
-            for (int i = 0; i < filters.Count; i++)
-            {
-                var filter = filters[i];
-                var filterPtr = Marshal.AllocHGlobal(size);
-                try
-                {
-                    var filterStr = new UnmanagedMethods.COMDLG_FILTERSPEC
-                    {
-                        pszName = filter.Name ?? string.Empty,
-                        pszSpec = string.Join(";", filter.Extensions.Select(e => "*." + e))
-                    };
-
-                    Marshal.StructureToPtr(filterStr, filterPtr, false);
-                    Marshal.Copy(filterPtr, resultArr, i * size, size);
-                }
-                finally
-                {
-                    Marshal.FreeHGlobal(filterPtr);
-                }
-            }
-
-            lenght = filters.Count;
-            return resultArr;
-        }
-    }
-}
diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index 23395dd9b5..8d565d7fef 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.LogicalTree;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Win32.Interop;
@@ -14,8 +15,11 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
+    [Unstable]
     public class TrayIconImpl : ITrayIconImpl
     {
+        private static readonly IntPtr s_emptyIcon = new System.Drawing.Bitmap(32, 32).GetHicon();
+        
         private readonly int _uniqueId;
         private static int s_nextUniqueId;
         private bool _iconAdded;
@@ -24,6 +28,7 @@ namespace Avalonia.Win32
         private readonly Win32NativeToManagedMenuExporter _exporter;
         private static readonly Dictionary<int, TrayIconImpl> s_trayIcons = new Dictionary<int, TrayIconImpl>();
         private bool _disposedValue;
+        private static readonly uint WM_TASKBARCREATED = UnmanagedMethods.RegisterWindowMessage("TaskbarCreated");
 
         public TrayIconImpl()
         {
@@ -44,6 +49,18 @@ namespace Avalonia.Win32
             {
                 s_trayIcons[wParam.ToInt32()].WndProc(hWnd, msg, wParam, lParam);
             }
+
+            if (msg == WM_TASKBARCREATED)
+            {
+                foreach (var tray in s_trayIcons.Values)
+                {
+                    if (tray._iconAdded)
+                    {
+                        tray.UpdateIcon(true);
+                        tray.UpdateIcon();
+                    }
+                }
+            }
         }
 
         public void SetIcon(IWindowIconImpl? icon)
@@ -71,7 +88,7 @@ namespace Avalonia.Win32
                 uID = _uniqueId,
                 uFlags = NIF.TIP | NIF.MESSAGE,
                 uCallbackMessage = (int)CustomWindowsMessage.WM_TRAYMOUSE,
-                hIcon = _icon?.HIcon ?? new IconImpl(new System.Drawing.Bitmap(32, 32)).HIcon,
+                hIcon = _icon?.HIcon ?? s_emptyIcon,
                 szTip = _tooltipText ?? ""
             };
 
@@ -145,7 +162,7 @@ namespace Avalonia.Win32
         private enum CustomWindowsMessage : uint
         {
             WM_TRAYICON = WindowsMessage.WM_APP + 1024,
-            WM_TRAYMOUSE = WindowsMessage.WM_USER + 1024
+            WM_TRAYMOUSE = WindowsMessage.WM_USER + 1024,
         }
 
         private class TrayIconMenuFlyoutPresenter : MenuFlyoutPresenter, IStyleable
@@ -180,7 +197,7 @@ namespace Avalonia.Win32
                 ShowActivated = true;
             }
 
-            private void TrayPopupRoot_Deactivated(object sender, EventArgs e)
+            private void TrayPopupRoot_Deactivated(object? sender, EventArgs e)
             {
                 Close();
             }
@@ -199,7 +216,7 @@ namespace Avalonia.Win32
                 {
                     Anchor = PopupAnchor.TopLeft,
                     Gravity = PopupGravity.BottomRight,
-                    AnchorRectangle = new Rect(Position.ToPoint(1) / Screens.Primary.PixelDensity, new Size(1, 1)),
+                    AnchorRectangle = new Rect(Position.ToPoint(1) / Screens.Primary.Scaling, new Size(1, 1)),
                     Size = finalRect.Size,
                     ConstraintAdjustment = PopupPositionerConstraintAdjustment.FlipX | PopupPositionerConstraintAdjustment.FlipY,
                 });
@@ -217,8 +234,9 @@ namespace Avalonia.Win32
                 }
 
                 public IReadOnlyList<ManagedPopupPositionerScreenInfo> Screens =>
-                _hiddenWindow.Screens.All.Select(s => new ManagedPopupPositionerScreenInfo(
-                    s.Bounds.ToRect(1), s.Bounds.ToRect(1))).ToList();
+                    _hiddenWindow.Screens.All
+                        .Select(s => new ManagedPopupPositionerScreenInfo(s.Bounds.ToRect(1), s.Bounds.ToRect(1)))
+                        .ToArray();
 
                 public Rect ParentClientAreaScreenGeometry
                 {
@@ -226,16 +244,16 @@ namespace Avalonia.Win32
                     {
                         var point = _hiddenWindow.Screens.Primary.Bounds.TopLeft;
                         var size = _hiddenWindow.Screens.Primary.Bounds.Size;
-                        return new Rect(point.X, point.Y, size.Width * _hiddenWindow.Screens.Primary.PixelDensity, size.Height * _hiddenWindow.Screens.Primary.PixelDensity);
+                        return new Rect(point.X, point.Y, size.Width * _hiddenWindow.Screens.Primary.Scaling, size.Height * _hiddenWindow.Screens.Primary.Scaling);
                     }
                 }
 
                 public void MoveAndResize(Point devicePoint, Size virtualSize)
                 {
-                    _moveResize(new PixelPoint((int)devicePoint.X, (int)devicePoint.Y), virtualSize, _hiddenWindow.Screens.Primary.PixelDensity);
+                    _moveResize(new PixelPoint((int)devicePoint.X, (int)devicePoint.Y), virtualSize, _hiddenWindow.Screens.Primary.Scaling);
                 }
 
-                public double Scaling => _hiddenWindow.Screens.Primary.PixelDensity;
+                public double Scaling => _hiddenWindow.Screens.Primary.Scaling;
             }
         }
 
diff --git a/src/Windows/Avalonia.Win32/Win32Com/win32.idl b/src/Windows/Avalonia.Win32/Win32Com/win32.idl
index 54e9aa583f..689f5b7a2e 100644
--- a/src/Windows/Avalonia.Win32/Win32Com/win32.idl
+++ b/src/Windows/Avalonia.Win32/Win32Com/win32.idl
@@ -27,6 +27,8 @@
 @clr-map REFGUID System.Guid*
 @clr-map REFIID System.Guid*
 @clr-map WCHAR System.Char
+@clr-map STGMEDIUM Avalonia.Win32.Interop.STGMEDIUM
+@clr-map FORMATETC Avalonia.Win32.Interop.FORMATETC
 
 [flags]
 enum FILEOPENDIALOGOPTIONS
@@ -53,6 +55,16 @@ enum FILEOPENDIALOGOPTIONS
     FOS_DEFAULTNOMINIMODE = 0x20000000
 }
 
+[flags]
+enum DropEffect
+{
+    None = 0,
+    Copy = 1,
+    Move = 2,
+    Link = 4,
+    Scroll = -2147483648,
+}
+
 [
     object,
     uuid(43826d1e-e718-42ee-bc55-a1e261c37bfe),
@@ -189,3 +201,114 @@ interface IFileOpenDialog : IFileDialog
     HRESULT GetSelectedItems(
         [out] IShellItemArray** ppsai);
 }
+
+[
+    object,
+    uuid(00000103-0000-0000-C000-000000000046),
+    pointer_default(unique)
+]
+interface IEnumFORMATETC : IUnknown
+{
+    UINT32 Next(
+        [in] ULONG celt,
+        [out] FORMATETC* rgelt,
+        ULONG* pceltFetched);
+
+    UINT32 Skip(
+        [in] ULONG celt);
+
+    HRESULT Reset();
+
+    HRESULT Clone(
+        [out] IEnumFORMATETC** ppenum);
+}
+
+[
+    object,
+    uuid(0000010e-0000-0000-C000-000000000046),
+    pointer_default(unique)
+]
+interface IDataObject : IUnknown
+{
+    UINT32 GetData(
+        [in, unique] FORMATETC* pformatetcIn,
+        [out] STGMEDIUM* pmedium);
+
+    UINT32 GetDataHere(
+        [in, unique] FORMATETC* pformatetc,
+        [in] STGMEDIUM* pmedium);
+
+    UINT32 QueryGetData(
+        [in, unique] FORMATETC* pformatetc);
+
+    HRESULT GetCanonicalFormatEtc(
+        [in, unique] FORMATETC* pformatectIn,
+        [out] FORMATETC* pformatetcOut);
+
+    UINT32 SetData(
+        [in, unique] FORMATETC* pformatetc,
+        [in, unique] STGMEDIUM* pmedium,
+        [in] BOOL fRelease);
+
+    HRESULT EnumFormatEtc(
+        [in] DWORD dwDirection,
+        [out] IEnumFORMATETC** ppenumFormatEtc);
+
+    HRESULT DAdvise(
+        [in] FORMATETC* pformatetc,
+        [in] DWORD advf,
+        [in, unique] void* pAdvSink,
+        [out] DWORD* pdwConnection);
+
+    HRESULT DUnadvise(
+        [in] DWORD dwConnection);
+
+    HRESULT EnumDAdvise(
+        [out] void** ppenumAdvise);
+}
+
+[
+    local,
+    object,
+    uuid(00000121-0000-0000-C000-000000000046)
+]
+
+interface IDropSource : IUnknown
+{
+    INT32 QueryContinueDrag([in] BOOL fEscapePressed, [in] DWORD grfKeyState);
+
+    INT32 GiveFeedback([in] DropEffect dwEffect);
+}
+
+[
+    object,
+    uuid(00000122-0000-0000-C000-000000000046),
+    pointer_default(unique)
+]
+interface IDropTarget : IUnknown
+{
+    HRESULT DragEnter
+    (
+        [in, unique] IDataObject* pDataObj,
+        [in] DWORD grfKeyState,
+        [in] POINT pt,
+        [in] DropEffect* pdwEffect
+    );
+
+    HRESULT DragOver
+    (
+        [in] DWORD grfKeyState,
+        [in] POINT pt,
+        [in] DropEffect* pdwEffect
+    );
+
+    HRESULT DragLeave();
+
+    HRESULT Drop
+    (
+        [in, unique] IDataObject* pDataObj,
+        [in] DWORD grfKeyState,
+        [in] POINT pt,
+        [in] DropEffect* pdwEffect
+    );
+}
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index 0376a41f8c..39a742d1ac 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -1,6 +1,7 @@
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Angle;
 using Avalonia.OpenGL.Egl;
+using Avalonia.Platform;
 using Avalonia.Win32.OpenGl;
 using Avalonia.Win32.WinRT.Composition;
 
@@ -9,31 +10,53 @@ namespace Avalonia.Win32
     static class Win32GlManager
     {
 
-        public static void Initialize()
+        public static IPlatformOpenGlInterface Initialize()
         {
-            AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToLazy<IPlatformOpenGlInterface>(() =>
+            var gl = InitializeCore();
+            AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToConstant(gl);
+            AvaloniaLocator.CurrentMutable.Bind<IPlatformGpu>().ToConstant(gl);
+            return gl;
+        }
+        
+        static IPlatformOpenGlInterface InitializeCore()
+        {
+
+            var opts = AvaloniaLocator.Current.GetService<Win32PlatformOptions>() ?? new Win32PlatformOptions();
+            if (opts.UseWgl)
             {
-                var opts = AvaloniaLocator.Current.GetService<Win32PlatformOptions>() ?? new Win32PlatformOptions();
-                if (opts.UseWgl)
-                {
-                    var wgl = WglPlatformOpenGlInterface.TryCreate();
-                    return wgl;
-                }
+                var wgl = WglPlatformOpenGlInterface.TryCreate();
+                return wgl;
+            }
 
-                if (opts.AllowEglInitialization ?? Win32Platform.WindowsVersion > PlatformConstants.Windows7)
+            if (opts.AllowEglInitialization ?? Win32Platform.WindowsVersion > PlatformConstants.Windows7)
+            {
+                var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
+
+                if (egl != null)
                 {
-                    var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
+                    if (opts.EglRendererBlacklist != null)
+                    {
+                        foreach (var item in opts.EglRendererBlacklist)
+                        {
+                            if (egl.PrimaryEglContext.GlInterface.Renderer.Contains(item))
+                            {
+                                return null;
+                            }
+                        }
+                    }
 
-                    if (egl != null && opts.UseWindowsUIComposition)
+                    if (opts.UseWindowsUIComposition)
                     {
                         WinUICompositorConnection.TryCreateAndRegister(egl, opts.CompositionBackdropCornerRadius);
                     }
-
-                    return egl;
                 }
 
-                return null;
-            });
+                return egl;
+            }
+
+            return null;
         }
+        
+        
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
index 2a1628ea7d..fd05e780bf 100644
--- a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
+++ b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
@@ -94,6 +94,10 @@ namespace Avalonia.Win32
                     IntPtr.Zero,
                     IntPtr.Zero,
                     IntPtr.Zero);
+
+                if (Handle == IntPtr.Zero)
+                    throw new InvalidOperationException("Unable to create child window for native control host. Application manifest with supported OS list might be required.");
+
                 if (layered)
                     UnmanagedMethods.SetLayeredWindowAttributes(Handle, 0, 255,
                         UnmanagedMethods.LayeredWindowFlags.LWA_ALPHA);
diff --git a/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs b/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs
index fa6f9927b5..2b8bf6f8bf 100644
--- a/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs
+++ b/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs
@@ -1,6 +1,10 @@
 using System.Collections.Generic;
+using System.Reactive.Linq;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Media.Imaging;
+using Avalonia.Utilities;
 
 #nullable enable
 
@@ -15,17 +19,28 @@ namespace Avalonia.Win32
             _nativeMenu = nativeMenu;
         }
 
-        private IEnumerable<MenuItem> Populate(NativeMenu nativeMenu)
+        private AvaloniaList<MenuItem> Populate(NativeMenu nativeMenu)
         {
+            var result = new AvaloniaList<MenuItem>();
+            
             foreach (var menuItem in nativeMenu.Items)
             {
                 if (menuItem is NativeMenuItemSeparator)
                 {
-                    yield return new MenuItem { Header = "-" };
+                    result.Add(new MenuItem { Header = "-" });
                 }
                 else if (menuItem is NativeMenuItem item)
                 {
-                    var newItem = new MenuItem { Header = item.Header, Icon = item.Icon, Command = item.Command, CommandParameter = item.CommandParameter };
+                    var newItem = new MenuItem
+                    {
+                        [!MenuItem.HeaderProperty] = item.GetObservable(NativeMenuItem.HeaderProperty).ToBinding(),
+                        [!MenuItem.IconProperty] = item.GetObservable(NativeMenuItem.IconProperty)
+                            .Select(i => i is {} bitmap ? new Image { Source = bitmap } : null).ToBinding(),
+                        [!MenuItem.IsEnabledProperty] = item.GetObservable(NativeMenuItem.IsEnabledProperty).ToBinding(),
+                        [!MenuItem.CommandProperty] = item.GetObservable(NativeMenuItem.CommandProperty).ToBinding(),
+                        [!MenuItem.CommandParameterProperty] = item.GetObservable(NativeMenuItem.CommandParameterProperty).ToBinding(),
+                        [!MenuItem.InputGestureProperty] = item.GetObservable(NativeMenuItem.GestureProperty).ToBinding()
+                    };
 
                     if (item.Menu != null)
                     {
@@ -33,15 +48,17 @@ namespace Avalonia.Win32
                     }
                     else if (item.HasClickHandlers && item is INativeMenuItemExporterEventsImplBridge bridge)
                     {
-                        newItem.Click += (_, __) => bridge.RaiseClicked();
+                        newItem.Click += (_, _) => bridge.RaiseClicked();
                     }
 
-                    yield return newItem;
+                    result.Add(newItem);
                 }
             }
+
+            return result;
         }
 
-        public IEnumerable<MenuItem>? GetMenu()
+        public AvaloniaList<MenuItem>? GetMenu()
         {
             if (_nativeMenu != null)
             {
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 5cfbab40e4..18977ec4c3 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -14,6 +14,7 @@ using Avalonia.Input.Platform;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Avalonia.Utilities;
 using Avalonia.Win32.Input;
@@ -49,6 +50,8 @@ namespace Avalonia
         /// </remarks>
         public bool UseDeferredRendering { get; set; } = true;
 
+        public bool UseCompositor { get; set; } = true;
+
         /// <summary>
         /// Enables ANGLE for Windows. For every Windows version that is above Windows 7, the default is true otherwise it's false.
         /// </summary>
@@ -56,14 +59,11 @@ namespace Avalonia
         /// GPU rendering will not be enabled if this is set to false.
         /// </remarks>
         public bool? AllowEglInitialization { get; set; }
-
-        /// <summary>
-        /// Enables multitouch support. The default value is true.
-        /// </summary>
-        /// <remarks>
-        /// Multitouch allows a surface (a touchpad or touchscreen) to recognize the presence of more than one point of contact with the surface at the same time.
-        /// </remarks>
-        public bool? EnableMultitouch { get; set; } = true;
+        
+        public IList<string> EglRendererBlacklist { get; set; } = new List<string>
+        {
+            "Microsoft Basic Render"
+        };
 
         /// <summary>
         /// Embeds popups to the window when set to true. The default value is false.
@@ -127,18 +127,9 @@ namespace Avalonia.Win32
         public static bool UseDeferredRendering => Options.UseDeferredRendering;
         internal static bool UseOverlayPopups => Options.OverlayPopups;
         public static Win32PlatformOptions Options { get; private set; }
+        
+        internal static Compositor Compositor { get; private set; }
 
-        public Size DoubleClickSize => new Size(
-            UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CXDOUBLECLK),
-            UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CYDOUBLECLK));
-
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(UnmanagedMethods.GetDoubleClickTime());
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(16,16);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
         public static void Initialize()
         {
             Initialize(new Win32PlatformOptions());
@@ -155,7 +146,6 @@ namespace Avalonia.Win32
                 .Bind<IPlatformThreadingInterface>().ToConstant(s_instance)
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
-                .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
                 .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Control)
                 {
@@ -170,12 +160,15 @@ namespace Avalonia.Win32
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new WindowsMountedVolumeInfoProvider())
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(s_instance);
 
-            Win32GlManager.Initialize();
+            var gl = Win32GlManager.Initialize();
 
             _uiThread = Thread.CurrentThread;
 
             if (OleContext.Current != null)
                 AvaloniaLocator.CurrentMutable.Bind<IPlatformDragSource>().ToSingleton<DragSource>();
+
+            if (Options.UseCompositor)
+                Compositor = new Compositor(AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(), gl);
         }
 
         public bool HasMessages()
@@ -237,8 +230,8 @@ namespace Avalonia.Win32
             });
         }
 
-        private static readonly int SignalW = unchecked((int) 0xdeadbeaf);
-        private static readonly int SignalL = unchecked((int)0x12345678);
+        private const int SignalW = unchecked((int)0xdeadbeaf);
+        private const int SignalL = unchecked((int)0x12345678);
 
         public void Signal(DispatcherPriority prio)
         {
@@ -346,7 +339,7 @@ namespace Avalonia.Win32
             using (var memoryStream = new MemoryStream())
             {
                 bitmap.Save(memoryStream);
-                return new IconImpl(new System.Drawing.Bitmap(memoryStream));
+                return CreateIconImpl(memoryStream);
             }
         }
 
@@ -354,11 +347,15 @@ namespace Avalonia.Win32
         {
             try
             {
+                // new Icon() will work only if stream is an "ico" file.
                 return new IconImpl(new System.Drawing.Icon(stream));
             }
             catch (ArgumentException)
             {
-                return new IconImpl(new System.Drawing.Bitmap(stream));
+                // Fallback to Bitmap creation and converting into a windows icon. 
+                using var icon = new System.Drawing.Bitmap(stream);
+                var hIcon = icon.GetHicon();
+                return new IconImpl(System.Drawing.Icon.FromHandle(hIcon));
             }
         }
 
@@ -390,5 +387,25 @@ namespace Avalonia.Win32
 
             SetProcessDPIAware();
         }
+
+        Size IPlatformSettings.GetTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(10, 10),
+                _ => new(GetSystemMetrics(SystemMetric.SM_CXDRAG), GetSystemMetrics(SystemMetric.SM_CYDRAG)),
+            };
+        }
+
+        Size IPlatformSettings.GetDoubleTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(16, 16),
+                _ => new(GetSystemMetrics(SystemMetric.SM_CXDOUBLECLK), GetSystemMetrics(SystemMetric.SM_CYDOUBLECLK)),
+            };
+        }
+
+        TimeSpan IPlatformSettings.GetDoubleTapTime(PointerType type) => TimeSpan.FromMilliseconds(GetDoubleClickTime());
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Win32StorageProvider.cs b/src/Windows/Avalonia.Win32/Win32StorageProvider.cs
new file mode 100644
index 0000000000..8cc0a380f9
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Win32StorageProvider.cs
@@ -0,0 +1,256 @@
+#nullable enable
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia.MicroCom;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+using Avalonia.Win32.Interop;
+using Avalonia.Win32.Win32Com;
+using MicroCom.Runtime;
+
+namespace Avalonia.Win32
+{
+    internal class Win32StorageProvider : BclStorageProvider
+    {
+        private const uint SIGDN_FILESYSPATH = 0x80058000;
+
+        private const FILEOPENDIALOGOPTIONS DefaultDialogOptions = FILEOPENDIALOGOPTIONS.FOS_FORCEFILESYSTEM | FILEOPENDIALOGOPTIONS.FOS_NOVALIDATE |
+            FILEOPENDIALOGOPTIONS.FOS_NOTESTFILECREATE | FILEOPENDIALOGOPTIONS.FOS_DONTADDTORECENT;
+
+        private readonly WindowImpl _windowImpl;
+
+        public Win32StorageProvider(WindowImpl windowImpl)
+        {
+            _windowImpl = windowImpl;
+        }
+
+        public override bool CanOpen => true;
+
+        public override bool CanSave => true;
+
+        public override bool CanPickFolder => true;
+
+        public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            var files = await ShowFilePicker(
+                true, true,
+                options.AllowMultiple, false,
+                options.Title, null, options.SuggestedStartLocation, null, null);
+            return files.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray();
+        }
+
+        public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            var files = await ShowFilePicker(
+                true, false,
+                options.AllowMultiple, false,
+                options.Title, null, options.SuggestedStartLocation,
+                null, options.FileTypeFilter);
+            return files.Select(f => new BclStorageFile(new FileInfo(f))).ToArray();
+        }
+
+        public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            var files = await ShowFilePicker(
+                false, false,
+                false, options.ShowOverwritePrompt,
+                options.Title, options.SuggestedFileName, options.SuggestedStartLocation,
+                options.DefaultExtension, options.FileTypeChoices);
+            return files.Select(f => new BclStorageFile(new FileInfo(f))).FirstOrDefault();
+        }
+
+        private unsafe Task<IEnumerable<string>> ShowFilePicker(
+            bool isOpenFile,
+            bool openFolder,
+            bool allowMultiple,
+            bool? showOverwritePrompt,
+            string? title,
+            string? suggestedFileName,
+            IStorageFolder? folder,
+            string? defaultExtension,
+            IReadOnlyList<FilePickerFileType>? filters)
+        {
+            return Task.Run(() =>
+            {
+                IEnumerable<string> result = Array.Empty<string>();
+                try
+                {
+                    var clsid = isOpenFile ? UnmanagedMethods.ShellIds.OpenFileDialog : UnmanagedMethods.ShellIds.SaveFileDialog;
+                    var iid = UnmanagedMethods.ShellIds.IFileDialog;
+                    var frm = UnmanagedMethods.CreateInstance<IFileDialog>(ref clsid, ref iid);
+
+                    var options = frm.Options;
+                    options |= DefaultDialogOptions;
+                    if (openFolder)
+                    {
+                        options |= FILEOPENDIALOGOPTIONS.FOS_PICKFOLDERS;
+                    }
+                    if (allowMultiple)
+                    {
+                        options |= FILEOPENDIALOGOPTIONS.FOS_ALLOWMULTISELECT;
+                    }
+
+                    if (showOverwritePrompt == false)
+                    {
+                        options &= ~FILEOPENDIALOGOPTIONS.FOS_OVERWRITEPROMPT;
+                    }
+                    frm.SetOptions(options);
+
+                    if (defaultExtension is not null)
+                    {
+                        fixed (char* pExt = defaultExtension)
+                        {
+                            frm.SetDefaultExtension(pExt);
+                        }
+                    }
+
+                    suggestedFileName ??= "";
+                    fixed (char* fExt = suggestedFileName)
+                    {
+                        frm.SetFileName(fExt);
+                    }
+
+                    title ??= "";
+                    fixed (char* tExt = title)
+                    {
+                        frm.SetTitle(tExt);
+                    }
+
+                    if (!openFolder)
+                    {
+                        fixed (void* pFilters = FiltersToPointer(filters, out var count))
+                        {
+                            frm.SetFileTypes((ushort)count, pFilters);
+                            if (count > 0)
+                            {
+                                frm.SetFileTypeIndex(0);
+                            }
+                        }
+                    }
+
+                    if (folder?.TryGetUri(out var folderPath) == true)
+                    {
+                        var riid = UnmanagedMethods.ShellIds.IShellItem;
+                        if (UnmanagedMethods.SHCreateItemFromParsingName(folderPath.LocalPath, IntPtr.Zero, ref riid, out var directoryShellItem)
+                            == (uint)UnmanagedMethods.HRESULT.S_OK)
+                        {
+                            var proxy = MicroComRuntime.CreateProxyFor<IShellItem>(directoryShellItem, true);
+                            frm.SetFolder(proxy);
+                            frm.SetDefaultFolder(proxy);
+                        }
+                    }
+
+                    var showResult = frm.Show(_windowImpl.Handle!.Handle);
+
+                    if ((uint)showResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
+                    {
+                        return result;
+                    }
+                    else if ((uint)showResult != (uint)UnmanagedMethods.HRESULT.S_OK)
+                    {
+                        throw new Win32Exception(showResult);
+                    }
+
+                    if (allowMultiple)
+                    {
+                        using var fileOpenDialog = frm.QueryInterface<IFileOpenDialog>();
+                        var shellItemArray = fileOpenDialog.Results;
+                        var count = shellItemArray.Count;
+
+                        var results = new List<string>();
+                        for (int i = 0; i < count; i++)
+                        {
+                            var shellItem = shellItemArray.GetItemAt(i);
+                            if (GetAbsoluteFilePath(shellItem) is { } selected)
+                            {
+                                results.Add(selected);
+                            }
+                        }
+
+                        result = results;
+                    }
+                    else if (frm.Result is { } shellItem
+                        && GetAbsoluteFilePath(shellItem) is { } singleResult)
+                    {
+                        result = new[] { singleResult };
+                    }
+
+                    return result;
+                }
+                catch (COMException ex)
+                {
+                    var message = new Win32Exception(ex.HResult).Message;
+                    throw new COMException(message, ex);
+                }
+            })!;
+        }
+
+
+        private static unsafe string? GetAbsoluteFilePath(IShellItem shellItem)
+        {
+            var pszString = new IntPtr(shellItem.GetDisplayName(SIGDN_FILESYSPATH));
+            if (pszString != IntPtr.Zero)
+            {
+                try
+                {
+                    return Marshal.PtrToStringUni(pszString);
+                }
+                finally
+                {
+                    Marshal.FreeCoTaskMem(pszString);
+                }
+            }
+            return default;
+        }
+
+        private static byte[] FiltersToPointer(IReadOnlyList<FilePickerFileType>? filters, out int length)
+        {
+            if (filters == null || filters.Count == 0)
+            {
+                filters = new List<FilePickerFileType>
+                {
+                    FilePickerFileTypes.All
+                };
+            }
+
+            var size = Marshal.SizeOf<UnmanagedMethods.COMDLG_FILTERSPEC>();
+            var arr = new byte[size];
+            var resultArr = new byte[size * filters.Count];
+
+            for (int i = 0; i < filters.Count; i++)
+            {
+                var filter = filters[i];
+                if (filter.Patterns is null || !filter.Patterns.Any())
+                {
+                    continue;
+                }
+
+                var filterPtr = Marshal.AllocHGlobal(size);
+                try
+                {
+                    var filterStr = new UnmanagedMethods.COMDLG_FILTERSPEC
+                    {
+                        pszName = filter.Name ?? string.Empty,
+                        pszSpec = string.Join(";", filter.Patterns)
+                    };
+
+                    Marshal.StructureToPtr(filterStr, filterPtr, false);
+                    Marshal.Copy(filterPtr, resultArr, i * size, size);
+                }
+                finally
+                {
+                    Marshal.FreeHGlobal(filterPtr);
+                }
+            }
+
+            length = filters.Count;
+            return resultArr;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs
index a09918a3a6..ef3de9fbe1 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs
@@ -6,6 +6,7 @@ using Avalonia.MicroCom;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32.WinRT.Composition
 {
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
index 57b0f71306..6da17b8ea5 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -12,16 +12,17 @@ using Avalonia.OpenGL.Angle;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Rendering;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32.WinRT.Composition
 {
     class WinUICompositorConnection : IRenderTimer
     {
+        public static readonly Version MinHostBackdropVersion = new Version(10, 0, 22000);
         private readonly float? _backdropCornerRadius;
         private readonly EglContext _syncContext;
         private readonly ICompositionBrush _micaBrush;
         private ICompositor _compositor;
-        private ICompositor2 _compositor2;
         private ICompositor5 _compositor5;
         private ICompositorInterop _compositorInterop;
         private AngleWin32EglDisplay _angle;
@@ -39,12 +40,11 @@ namespace Avalonia.Win32.WinRT.Composition
             _syncContext = _gl.PrimaryEglContext;
             _angle = (AngleWin32EglDisplay)_gl.Display;
             _compositor = NativeWinRTMethods.CreateInstance<ICompositor>("Windows.UI.Composition.Compositor");
-            _compositor2 = _compositor.QueryInterface<ICompositor2>();
             _compositor5 = _compositor.QueryInterface<ICompositor5>();
             _compositorInterop = _compositor.QueryInterface<ICompositorInterop>();
             _compositorDesktopInterop = _compositor.QueryInterface<ICompositorDesktopInterop>();
             using var device = MicroComRuntime.CreateProxyFor<IUnknown>(_angle.GetDirect3DDevice(), true);
-            
+
             _device = _compositorInterop.CreateGraphicsDevice(device);
             _blurBrush = CreateAcrylicBlurBackdropBrush();
             _micaBrush = CreateMicaBackdropBrush();
@@ -71,7 +71,7 @@ namespace Avalonia.Win32.WinRT.Composition
                     AvaloniaLocator.CurrentMutable.BindToSelf(connect);
                     AvaloniaLocator.CurrentMutable.Bind<IRenderTimer>().ToConstant(connect);
                     tcs.SetResult(true);
-                    
+
                 }
                 catch (Exception e)
                 {
@@ -99,7 +99,7 @@ namespace Avalonia.Win32.WinRT.Composition
             }
             public void Dispose()
             {
-                
+
             }
 
             public void Invoke(IAsyncAction asyncInfo, AsyncStatus asyncStatus)
@@ -118,19 +118,21 @@ namespace Avalonia.Win32.WinRT.Composition
             {
             }
         }
-        
+
         private void RunLoop()
         {
+            var cts = new CancellationTokenSource();
+            AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
+                cts.Cancel();
+                
+            using (var act = _compositor5.RequestCommitAsync())
+                act.SetCompleted(new RunLoopHandler(this));
+
+            while (!cts.IsCancellationRequested)
             {
-                var st = Stopwatch.StartNew();
-                using (var act = _compositor5.RequestCommitAsync()) 
-                    act.SetCompleted(new RunLoopHandler(this));
-                while (true)
-                {
-                    UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0);
-                    lock (_pumpLock)
-                        UnmanagedMethods.DispatchMessage(ref msg);
-                }
+                UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0);
+                lock (_pumpLock)
+                    UnmanagedMethods.DispatchMessage(ref msg);
             }
         }
 
@@ -172,12 +174,13 @@ namespace Avalonia.Win32.WinRT.Composition
             using var sc = _syncContext.EnsureLocked();
             using var desktopTarget = _compositorDesktopInterop.CreateDesktopWindowTarget(hWnd, 0);
             using var target = desktopTarget.QueryInterface<ICompositionTarget>();
-            
-            using var drawingSurface = _device.CreateDrawingSurface(new UnmanagedMethods.SIZE(), DirectXPixelFormat.B8G8R8A8UIntNormalized,
+            using var device2 = _device.QueryInterface<ICompositionGraphicsDevice2>();
+
+            using var drawingSurface = device2.CreateDrawingSurface2(new UnmanagedMethods.SIZE(), DirectXPixelFormat.B8G8R8A8UIntNormalized,
                 DirectXAlphaMode.Premultiplied);
             using var surface = drawingSurface.QueryInterface<ICompositionSurface>();
             using var surfaceInterop = drawingSurface.QueryInterface<ICompositionDrawingSurfaceInterop>();
-            
+
             using var surfaceBrush = _compositor.CreateSurfaceBrushWithSurface(surface);
             using var brush = surfaceBrush.QueryInterface<ICompositionBrush>();
 
@@ -190,7 +193,7 @@ namespace Avalonia.Win32.WinRT.Composition
             using var containerVisual2 = container.QueryInterface<IVisual2>();
             containerVisual2.SetRelativeSizeAdjustment(new Vector2(1, 1));
             using var containerChildren = container.Children;
-            
+
             target.SetRoot(containerVisual);
 
             using var blur = CreateBlurVisual(_blurBrush);
@@ -202,10 +205,10 @@ namespace Avalonia.Win32.WinRT.Composition
             }
 
             var compositionRoundedRectangleGeometry = ClipVisual(blur, mica);
-            
+
             containerChildren.InsertAtTop(blur);
             containerChildren.InsertAtTop(visual);
-            
+
             return new WinUICompositedWindow(_syncContext, _compositor, _pumpLock, target, surfaceInterop, visual,
                 blur, mica, compositionRoundedRectangleGeometry);
         }
@@ -234,10 +237,8 @@ namespace Avalonia.Win32.WinRT.Composition
             var blurEffect = new WinUIGaussianBlurEffect(backDropParameterAsSource);
             using var blurEffectFactory = _compositor.CreateEffectFactory(blurEffect);
             using var compositionEffectBrush = blurEffectFactory.CreateBrush();
-            using var backdrop = _compositor2.CreateBackdropBrush();
-            using var backdropBrush = backdrop.QueryInterface<ICompositionBrush>();
-            
-            
+            using var backdropBrush = CreateBackdropBrush();
+
             var saturateEffect = new SaturationEffect(blurEffect);
             using var satEffectFactory = _compositor.CreateEffectFactory(saturateEffect);
             using var sat = satEffectFactory.CreateBrush();
@@ -261,8 +262,8 @@ namespace Avalonia.Win32.WinRT.Composition
             foreach (var visual in containerVisuals)
             {
                 visual?.SetClip(geometricClipWithGeometry.QueryInterface<ICompositionClip>());
-        }
-        
+            }
+
             return roundedRectangleGeometry.CloneReference();
         }
 
@@ -271,8 +272,8 @@ namespace Avalonia.Win32.WinRT.Composition
             using var spriteVisual = _compositor.CreateSpriteVisual();
             using var visual = spriteVisual.QueryInterface<IVisual>();
             using var visual2 = spriteVisual.QueryInterface<IVisual2>();
-           
-            
+
+
             spriteVisual.SetBrush(compositionBrush);
             visual.SetIsVisible(0);
             visual2.SetRelativeSizeAdjustment(new Vector2(1.0f, 1.0f));
@@ -280,7 +281,31 @@ namespace Avalonia.Win32.WinRT.Composition
             return visual.CloneReference();
         }
 
+        private ICompositionBrush CreateBackdropBrush()
+        {
+            ICompositionBackdropBrush brush = null;
+            try
+            {
+                if (Win32Platform.WindowsVersion >= MinHostBackdropVersion)
+                {
+                    using var compositor3 = _compositor.QueryInterface<ICompositor3>();
+                    brush = compositor3.CreateHostBackdropBrush();
+                }
+                else
+                {
+                    using var compositor2 = _compositor.QueryInterface<ICompositor2>();
+                    brush = compositor2.CreateBackdropBrush();
+                }
+
+                return brush.QueryInterface<ICompositionBrush>();
+            }
+            finally
+            {
+                brush?.Dispose();
+            }
+        }
 
         public event Action<TimeSpan> Tick;
+        public bool RunsInBackground => true;
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
index ea75a2f311..32f44842f8 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.MicroCom;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32.WinRT.Composition
 {
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
index 4ed882552b..fc04dcda26 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
@@ -6,6 +6,7 @@ using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Utilities;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32.WinRT.Composition
 {
diff --git a/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs b/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
index 5026fbaaba..1794b022fe 100644
--- a/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
@@ -7,6 +7,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia.MicroCom;
 using Avalonia.Win32.Interop;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32.WinRT
 {
@@ -23,7 +24,7 @@ namespace Avalonia.Win32.WinRT
 
         [DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", 
             CallingConvention = CallingConvention.StdCall, PreserveSig = false)]
-        internal static extern unsafe IntPtr WindowsDeleteString(IntPtr hString);
+        internal static extern unsafe void WindowsDeleteString(IntPtr hString);
         
         [DllImport("Windows.UI.Composition", EntryPoint = "DllGetActivationFactory",
             CallingConvention = CallingConvention.StdCall, PreserveSig = false)]
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
index d2ec957b8e..1fde57fe38 100644
--- a/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Avalonia.MicroCom;
+using MicroCom.Runtime;
 
 namespace Avalonia.Win32.WinRT
 {
diff --git a/src/Windows/Avalonia.Win32/WinRT/winrt.idl b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
index 18a9a26fca..ffb98fafc8 100644
--- a/src/Windows/Avalonia.Win32/WinRT/winrt.idl
+++ b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
@@ -8,6 +8,7 @@
 @clr-map Matrix4x4 System.Numerics.Matrix4x4
 @clr-map RECT Avalonia.Win32.Interop.UnmanagedMethods.RECT
 @clr-map SIZE Avalonia.Win32.Interop.UnmanagedMethods.SIZE
+@clr-map SIZE_F Avalonia.Win32.Interop.UnmanagedMethods.SIZE_F
 @clr-map POINT Avalonia.Win32.Interop.UnmanagedMethods.POINT
 @clr-map HWND IntPtr
 @clr-map BOOL int
@@ -358,6 +359,12 @@ interface ICompositor2 : IInspectable
     [overload("CreateStepEasingFunction")] HRESULT CreateStepEasingFunctionWithStepCount([in] INT32 stepCount, [out] [retval] void** result);
 }
 
+[uuid(C9DD8EF0-6EB1-4E3C-A658-675D9C64D4AB)]
+interface ICompositor3 : IInspectable
+{
+    HRESULT CreateHostBackdropBrush([out][retval] ICompositionBackdropBrush** result);
+}
+
 [uuid(0D8FB190-F122-5B8D-9FDD-543B0D8EB7F3)]
 interface ICompositorWithBlurredWallpaperBackdropBrush : IInspectable
 {
@@ -436,12 +443,18 @@ interface IDesktopWindowContentBridgeInterop : IUnknown
 [uuid(FB22C6E1-80A2-4667-9936-DBEAF6EEFE95)]
 interface ICompositionGraphicsDevice : IInspectable
 {
-    HRESULT CreateDrawingSurface([in] SIZE sizePixels, [in] DirectXPixelFormat pixelFormat,
+    HRESULT CreateDrawingSurface([in] SIZE_F sizePixels, [in] DirectXPixelFormat pixelFormat,
         [in] DirectXAlphaMode alphaMode, [out] [retval] ICompositionDrawingSurface** result);
     HRESULT AddRenderingDeviceReplaced(void* handler, void* token);
     HRESULT RemoveRenderingDeviceReplaced([in] int token);
 }
 
+[uuid(0FB8BDF6-C0F0-4BCC-9FB8-084982490D7D)]
+interface ICompositionGraphicsDevice2 : IInspectable
+{
+    HRESULT CreateDrawingSurface2([in] SIZE sizePixels, [in] DirectXPixelFormat pixelFormat, [in] DirectXAlphaMode alphaMode, [out] [retval] ICompositionDrawingSurface** result);
+}
+
 [uuid(1527540D-42C7-47A6-A408-668F79A90DFB)]
 interface ICompositionSurface : IInspectable
 {
@@ -459,7 +472,7 @@ interface ICompositionDrawingSurface : IInspectable
 {
     [propget] HRESULT GetAlphaMode([out] [retval] DirectXAlphaMode* value);
     [propget] HRESULT GetPixelFormat([out] [retval] DirectXPixelFormat* value);
-    [propget] HRESULT GetSize([out] [retval] POINT* value);
+    [propget] HRESULT GetSize([out] [retval] SIZE_F* value);
 }
 
 enum CompositionBitmapInterpolationMode
diff --git a/src/Windows/Avalonia.Win32/WinScreen.cs b/src/Windows/Avalonia.Win32/WinScreen.cs
index 0cf9fe31db..1038f41a17 100644
--- a/src/Windows/Avalonia.Win32/WinScreen.cs
+++ b/src/Windows/Avalonia.Win32/WinScreen.cs
@@ -7,11 +7,14 @@ namespace Avalonia.Win32
     {
         private readonly IntPtr _hMonitor;
 
-        public WinScreen(double pixelDensity, PixelRect bounds, PixelRect workingArea, bool primary, IntPtr hMonitor) : base(pixelDensity, bounds, workingArea, primary)
+        public WinScreen(double scaling, PixelRect bounds, PixelRect workingArea, bool isPrimary, IntPtr hMonitor)
+            : base(scaling, bounds, workingArea, isPrimary)
         {
-            this._hMonitor = hMonitor;
+            _hMonitor = hMonitor;
         }
 
+        public IntPtr Handle => _hMonitor;
+
         public override int GetHashCode()
         {
             return (int)_hMonitor;
@@ -19,7 +22,7 @@ namespace Avalonia.Win32
 
         public override bool Equals(object obj)
         {
-            return (obj is WinScreen screen) ? this._hMonitor == screen._hMonitor : base.Equals(obj);
+            return (obj is WinScreen screen) ? _hMonitor == screen._hMonitor : base.Equals(obj);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 88a0744e3e..8aa4746b5a 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -1,13 +1,18 @@
 using System;
+using System.Buffers;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
 using Avalonia.Controls.Remote;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
+using Avalonia.Win32.Automation;
 using Avalonia.Win32.Input;
+using Avalonia.Win32.Interop.Automation;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
@@ -19,11 +24,12 @@ namespace Avalonia.Win32
         protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {
             const double wheelDelta = 120.0;
+            const long UiaRootObjectId = -25;
             uint timestamp = unchecked((uint)GetMessageTime());
             RawInputEventArgs e = null;
             var shouldTakeFocus = false;
-
-            switch ((WindowsMessage)msg)
+            var message = (WindowsMessage)msg;
+            switch (message)
             {
                 case WindowsMessage.WM_ACTIVATE:
                     {
@@ -77,6 +83,14 @@ namespace Avalonia.Win32
 
                 case WindowsMessage.WM_DESTROY:
                     {
+                        UiaCoreProviderApi.UiaReturnRawElementProvider(_hwnd, IntPtr.Zero, IntPtr.Zero, null);
+
+                        // We need to release IMM context and state to avoid leaks.
+                        if (Imm32InputMethod.Current.HWND == _hwnd)
+                        {
+                            Imm32InputMethod.Current.ClearLanguageAndWindow();
+                        }
+
                         //Window doesn't exist anymore
                         _hwnd = IntPtr.Zero;
                         //Remove root reference to this class, so unmanaged delegate can be collected
@@ -96,9 +110,9 @@ namespace Avalonia.Win32
                         var newDisplayRect = Marshal.PtrToStructure<RECT>(lParam);
                         _scaling = dpi / 96.0;
                         ScalingChanged?.Invoke(_scaling);
-                        
+
                         using (SetResizeReason(PlatformResizeReason.DpiChange))
-                        { 
+                        {
                             SetWindowPos(hWnd,
                                 IntPtr.Zero,
                                 newDisplayRect.left,
@@ -166,6 +180,10 @@ namespace Avalonia.Win32
                 case WindowsMessage.WM_MBUTTONDOWN:
                 case WindowsMessage.WM_XBUTTONDOWN:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         shouldTakeFocus = ShouldTakeFocusOnClick;
                         if (ShouldIgnoreTouchEmulatedMessage())
                         {
@@ -176,7 +194,7 @@ namespace Avalonia.Win32
                             _mouseDevice,
                             timestamp,
                             _owner,
-                            (WindowsMessage)msg switch
+                            message switch
                             {
                                 WindowsMessage.WM_LBUTTONDOWN => RawPointerEventType.LeftButtonDown,
                                 WindowsMessage.WM_RBUTTONDOWN => RawPointerEventType.RightButtonDown,
@@ -195,6 +213,10 @@ namespace Avalonia.Win32
                 case WindowsMessage.WM_MBUTTONUP:
                 case WindowsMessage.WM_XBUTTONUP:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         if (ShouldIgnoreTouchEmulatedMessage())
                         {
                             break;
@@ -204,7 +226,7 @@ namespace Avalonia.Win32
                             _mouseDevice,
                             timestamp,
                             _owner,
-                            (WindowsMessage)msg switch
+                            message switch
                             {
                                 WindowsMessage.WM_LBUTTONUP => RawPointerEventType.LeftButtonUp,
                                 WindowsMessage.WM_RBUTTONUP => RawPointerEventType.RightButtonUp,
@@ -219,11 +241,19 @@ namespace Avalonia.Win32
                     }
                 // Mouse capture is lost
                 case WindowsMessage.WM_CANCELMODE:
-                    _mouseDevice.Capture(null);
+                    if (!IsMouseInPointerEnabled)
+                    {
+                        _mouseDevice.Capture(null);
+                    }
+
                     break;
 
                 case WindowsMessage.WM_MOUSEMOVE:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         if (ShouldIgnoreTouchEmulatedMessage())
                         {
                             break;
@@ -242,47 +272,84 @@ namespace Avalonia.Win32
                             TrackMouseEvent(ref tm);
                         }
 
+                        var point = DipFromLParam(lParam);
+
+                        // Prepare points for the IntermediatePoints call.
+                        var p = new POINT()
+                        {
+                            X = (int)(point.X * RenderScaling),
+                            Y = (int)(point.Y * RenderScaling)
+                        };
+                        ClientToScreen(_hwnd, ref p);
+                        var currPoint = new MOUSEMOVEPOINT()
+                        {
+                            x = p.X & 0xFFFF,
+                            y = p.Y & 0xFFFF,
+                            time = (int)timestamp
+                        };
+                        var prevPoint = _lastWmMousePoint;
+                        _lastWmMousePoint = currPoint;
+
                         e = new RawPointerEventArgs(
                             _mouseDevice,
                             timestamp,
                             _owner,
                             RawPointerEventType.Move,
-                            DipFromLParam(lParam), GetMouseModifiers(wParam));
+                            point,
+                            GetMouseModifiers(wParam))
+                        {
+                            IntermediatePoints = new Lazy<IReadOnlyList<RawPointerPoint>>(() => CreateLazyIntermediatePoints(currPoint, prevPoint))
+                        };
 
                         break;
                     }
 
                 case WindowsMessage.WM_MOUSEWHEEL:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         e = new RawMouseWheelEventArgs(
                             _mouseDevice,
                             timestamp,
                             _owner,
                             PointToClient(PointFromLParam(lParam)),
-                            new Vector(0, (ToInt32(wParam) >> 16) / wheelDelta), GetMouseModifiers(wParam));
+                            new Vector(0, (ToInt32(wParam) >> 16) / wheelDelta),
+                            GetMouseModifiers(wParam));
                         break;
                     }
 
                 case WindowsMessage.WM_MOUSEHWHEEL:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         e = new RawMouseWheelEventArgs(
                             _mouseDevice,
                             timestamp,
                             _owner,
                             PointToClient(PointFromLParam(lParam)),
-                            new Vector(-(ToInt32(wParam) >> 16) / wheelDelta, 0), GetMouseModifiers(wParam));
+                            new Vector(-(ToInt32(wParam) >> 16) / wheelDelta, 0),
+                            GetMouseModifiers(wParam));
                         break;
                     }
 
                 case WindowsMessage.WM_MOUSELEAVE:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         _trackingMouse = false;
                         e = new RawPointerEventArgs(
                             _mouseDevice,
                             timestamp,
                             _owner,
                             RawPointerEventType.LeaveWindow,
-                            new Point(-1, -1), WindowsKeyboardDevice.Instance.Modifiers);
+                            new Point(-1, -1),
+                            WindowsKeyboardDevice.Instance.Modifiers);
                         break;
                     }
 
@@ -291,11 +358,15 @@ namespace Avalonia.Win32
                 case WindowsMessage.WM_NCMBUTTONDOWN:
                 case WindowsMessage.WM_NCXBUTTONDOWN:
                     {
+                        if (IsMouseInPointerEnabled)
+                        {
+                            break;
+                        }
                         e = new RawPointerEventArgs(
                             _mouseDevice,
                             timestamp,
                             _owner,
-                            (WindowsMessage)msg switch
+                            message switch
                             {
                                 WindowsMessage.WM_NCLBUTTONDOWN => RawPointerEventType
                                     .NonClientLeftButtonDown,
@@ -311,6 +382,10 @@ namespace Avalonia.Win32
                     }
                 case WindowsMessage.WM_TOUCH:
                     {
+                        if (_wmPointerEnabled)
+                        {
+                            break;
+                        }
                         var touchInputCount = wParam.ToInt32();
 
                         var pTouchInputs = stackalloc TOUCHINPUT[touchInputCount];
@@ -336,6 +411,120 @@ namespace Avalonia.Win32
                             return IntPtr.Zero;
                         }
 
+                        break;
+                    }
+                case WindowsMessage.WM_NCPOINTERDOWN:
+                case WindowsMessage.WM_NCPOINTERUP:
+                case WindowsMessage.WM_POINTERDOWN:
+                case WindowsMessage.WM_POINTERUP:
+                case WindowsMessage.WM_POINTERUPDATE:
+                    {
+                        if (!_wmPointerEnabled)
+                        {
+                            break;
+                        }
+                        GetDevicePointerInfo(wParam, out var device, out var info, out var point, out var modifiers, ref timestamp);
+                        var eventType = GetEventType(message, info);
+
+                        var args = CreatePointerArgs(device, timestamp, eventType, point, modifiers, info.pointerId);
+                        args.IntermediatePoints = CreateLazyIntermediatePoints(info);
+                        e = args;
+                        break;
+                    }
+                case WindowsMessage.WM_POINTERDEVICEOUTOFRANGE:
+                case WindowsMessage.WM_POINTERLEAVE:
+                case WindowsMessage.WM_POINTERCAPTURECHANGED:
+                    {
+                        if (!_wmPointerEnabled)
+                        {
+                            break;
+                        }
+                        GetDevicePointerInfo(wParam, out var device, out var info, out var point, out var modifiers, ref timestamp);
+                        var eventType = device is TouchDevice ? RawPointerEventType.TouchCancel : RawPointerEventType.LeaveWindow;
+                        e = CreatePointerArgs(device, timestamp, eventType, point, modifiers, info.pointerId);
+                        break;
+                    }
+                case WindowsMessage.WM_POINTERWHEEL:
+                case WindowsMessage.WM_POINTERHWHEEL:
+                    {
+                        if (!_wmPointerEnabled)
+                        {
+                            break;
+                        }
+                        GetDevicePointerInfo(wParam, out var device, out var info, out var point, out var modifiers, ref timestamp);
+
+                        var val = (ToInt32(wParam) >> 16) / wheelDelta;
+                        var delta = message == WindowsMessage.WM_POINTERWHEEL ? new Vector(0, val) : new Vector(val, 0);
+                        e = new RawMouseWheelEventArgs(device, timestamp, _owner, point.Position, delta, modifiers)
+                        {
+                            RawPointerId = info.pointerId
+                        };
+                        break;
+                    }
+                case WindowsMessage.WM_POINTERDEVICEINRANGE:
+                    {
+                        if (!_wmPointerEnabled)
+                        {
+                            break;
+                        }
+
+                        // Do not generate events, but release mouse capture on any other device input.
+                        GetDevicePointerInfo(wParam, out var device, out var info, out var point, out var modifiers, ref timestamp);
+                        if (device != _mouseDevice)
+                        {
+                            _mouseDevice.Capture(null);
+                            return IntPtr.Zero;
+                        }
+                        break;
+                    }
+                case WindowsMessage.WM_POINTERACTIVATE:
+                    {
+                        //occurs when a pointer activates an inactive window.
+                        //we should handle this and return PA_ACTIVATE or PA_NOACTIVATE
+                        //https://docs.microsoft.com/en-us/previous-versions/windows/desktop/inputmsg/wm-pointeractivate
+                        break;
+                    }
+                case WindowsMessage.WM_POINTERDEVICECHANGE:
+                    {
+                        //notifies about changes in the settings of a monitor that has a digitizer attached to it.
+                        //https://docs.microsoft.com/en-us/previous-versions/windows/desktop/inputmsg/wm-pointerdevicechange
+                        break;
+                    }
+                case WindowsMessage.WM_NCPOINTERUPDATE:
+                    {
+                        //NC stands for non-client area - window header and window border
+                        //As I found above in an old message handling - we dont need to handle NC pointer move/updates.
+                        //All we need is pointer down and up. So this is skipped for now.
+                        break;
+                    }
+                case WindowsMessage.WM_POINTERENTER:
+                    {
+                        //this is not handled by WM_MOUSEENTER so I think there is no need to handle this too.
+                        //but we can detect a new pointer by this message and calling IS_POINTER_NEW_WPARAM
+
+                        //note: by using a pen there can be a pointer leave or enter inside a window coords
+                        //when you are just lift up the pen above the display
+                        break;
+                    }
+                case WindowsMessage.DM_POINTERHITTEST:
+                    {
+                        //DM stands for direct manipulation.
+                        //https://docs.microsoft.com/en-us/previous-versions/windows/desktop/directmanipulation/direct-manipulation-portal
+                        break;
+                    }
+                case WindowsMessage.WM_TOUCHHITTESTING:
+                    {
+                        //This is to determine the most probable touch target.
+                        //provides an input bounding box and receives hit proximity
+                        //https://docs.microsoft.com/en-us/previous-versions/windows/desktop/inputmsg/wm-touchhittesting
+                        //https://docs.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-touch_hit_testing_input
+                        break;
+                    }
+                case WindowsMessage.WM_PARENTNOTIFY:
+                    {
+                        //This message is sent in a dialog scenarios. Contains mouse position.
+                        //Old message, but listed in the wm_pointer reference
+                        //https://docs.microsoft.com/en-us/previous-versions/windows/desktop/inputmsg/wm-parentnotify
                         break;
                     }
                 case WindowsMessage.WM_NCPAINT:
@@ -359,22 +548,22 @@ namespace Avalonia.Win32
                     }
 
                 case WindowsMessage.WM_PAINT:
-                {
-                    using(NonPumpingSyncContext.Use())
-                    using (_rendererLock.Lock())
                     {
-                        if (BeginPaint(_hwnd, out PAINTSTRUCT ps) != IntPtr.Zero)
+                        using (NonPumpingSyncContext.Use())
+                        using (_rendererLock.Lock())
                         {
-                            var f = RenderScaling;
-                            var r = ps.rcPaint;
-                            Paint?.Invoke(new Rect(r.left / f, r.top / f, (r.right - r.left) / f,
-                                (r.bottom - r.top) / f));
-                            EndPaint(_hwnd, ref ps);
+                            if (BeginPaint(_hwnd, out PAINTSTRUCT ps) != IntPtr.Zero)
+                            {
+                                var f = RenderScaling;
+                                var r = ps.rcPaint;
+                                Paint?.Invoke(new Rect(r.left / f, r.top / f, (r.right - r.left) / f,
+                                    (r.bottom - r.top) / f));
+                                EndPaint(_hwnd, ref ps);
+                            }
                         }
-                    }
 
-                    return IntPtr.Zero;
-                }
+                        return IntPtr.Zero;
+                    }
 
 
                 case WindowsMessage.WM_ENTERSIZEMOVE:
@@ -383,7 +572,7 @@ namespace Avalonia.Win32
 
                 case WindowsMessage.WM_SIZE:
                     {
-                        using(NonPumpingSyncContext.Use())
+                        using (NonPumpingSyncContext.Use())
                         using (_rendererLock.Lock())
                         {
                             // Do nothing here, just block until the pending frame render is completed on the render thread
@@ -434,7 +623,7 @@ namespace Avalonia.Win32
                 case WindowsMessage.WM_GETMINMAXINFO:
                     {
                         MINMAXINFO mmi = Marshal.PtrToStructure<MINMAXINFO>(lParam);
-                        
+
                         _maxTrackSize = mmi.ptMaxTrackSize;
 
                         if (_minSize.Width > 0)
@@ -483,13 +672,22 @@ namespace Avalonia.Win32
                     }
                 case WindowsMessage.WM_IME_SETCONTEXT:
                     {
-                        // TODO if we implement preedit, disable the composition window:
-                        // lParam = new IntPtr((int)(((uint)lParam.ToInt64()) & ~ISC_SHOWUICOMPOSITIONWINDOW));
+                        unchecked
+                        {
+                            DefWindowProc(Hwnd, msg, wParam, lParam & ~(nint)ISC_SHOWUICOMPOSITIONWINDOW);
+                        }
+
                         UpdateInputMethod(GetKeyboardLayout(0));
+
+                        return IntPtr.Zero;
+                    }
+                case WindowsMessage.WM_IME_COMPOSITION:
+                    {
+                        Imm32InputMethod.Current.CompositionChanged();
+
                         break;
                     }
                 case WindowsMessage.WM_IME_CHAR:
-                case WindowsMessage.WM_IME_COMPOSITION:
                 case WindowsMessage.WM_IME_COMPOSITIONFULL:
                 case WindowsMessage.WM_IME_CONTROL:
                 case WindowsMessage.WM_IME_KEYDOWN:
@@ -499,18 +697,27 @@ namespace Avalonia.Win32
                     break;
                 case WindowsMessage.WM_IME_STARTCOMPOSITION:
                     Imm32InputMethod.Current.IsComposing = true;
-                    break;
+                    return IntPtr.Zero;
                 case WindowsMessage.WM_IME_ENDCOMPOSITION:
                     Imm32InputMethod.Current.IsComposing = false;
                     break;
+
+                case WindowsMessage.WM_GETOBJECT:
+                    if ((long)lParam == UiaRootObjectId)
+                    {
+                        var peer = ControlAutomationPeer.CreatePeerForElement((Control)_owner);
+                        var node = AutomationNode.GetOrCreate(peer);
+                        return UiaCoreProviderApi.UiaReturnRawElementProvider(_hwnd, wParam, lParam, node);
+                    }
+                    break;
             }
 
 #if USE_MANAGED_DRAG
             if (_managedDrag.PreprocessInputEvent(ref e))
                 return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
 #endif
-            
-            if(shouldTakeFocus)
+
+            if (shouldTakeFocus)
             {
                 SetFocus(_hwnd);
             }
@@ -519,7 +726,7 @@ namespace Avalonia.Win32
             {
                 Input(e);
 
-                if ((WindowsMessage)msg == WindowsMessage.WM_KEYDOWN)
+                if (message == WindowsMessage.WM_KEYDOWN)
                 {
                     // Handling a WM_KEYDOWN message should cause the subsequent WM_CHAR message to
                     // be ignored. This should be safe to do as WM_CHAR should only be produced in
@@ -528,6 +735,11 @@ namespace Avalonia.Win32
                     _ignoreWmChar = e.Handled;
                 }
 
+                if (s_intermediatePointsPooledList.Count > 0)
+                {
+                    s_intermediatePointsPooledList.Dispose();
+                }
+
                 if (e.Handled)
                 {
                     return IntPtr.Zero;
@@ -540,18 +752,268 @@ namespace Avalonia.Win32
             }
         }
 
+        private unsafe Lazy<IReadOnlyList<RawPointerPoint>> CreateLazyIntermediatePoints(POINTER_INFO info)
+        {
+            var historyCount = Math.Min((int)info.historyCount, MaxPointerHistorySize);
+            if (historyCount > 1)
+            {
+                return new Lazy<IReadOnlyList<RawPointerPoint>>(() =>
+                {
+                    s_intermediatePointsPooledList.Clear();
+                    s_intermediatePointsPooledList.Capacity = historyCount;
+
+                    // Pointers in history are ordered from newest to oldest, so we need to reverse iteration.
+                    // Also we skip the newest pointer, because original event arguments already contains it.
+
+                    if (info.pointerType == PointerInputType.PT_TOUCH)
+                    {
+                        if (GetPointerTouchInfoHistory(info.pointerId, ref historyCount, s_historyTouchInfos))
+                        {
+                            for (int i = historyCount - 1; i >= 1; i--)
+                            {
+                                var historyTouchInfo = s_historyTouchInfos[i];
+                                s_intermediatePointsPooledList.Add(CreateRawPointerPoint(historyTouchInfo));
+                            }
+                        }
+                    }
+                    else if (info.pointerType == PointerInputType.PT_PEN)
+                    {
+                        if (GetPointerPenInfoHistory(info.pointerId, ref historyCount, s_historyPenInfos))
+                        {
+                            for (int i = historyCount - 1; i >= 1; i--)
+                            {
+                                var historyPenInfo = s_historyPenInfos[i];
+                                s_intermediatePointsPooledList.Add(CreateRawPointerPoint(historyPenInfo));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Currently Windows does not return history info for mouse input, but we handle it just for case.
+                        if (GetPointerInfoHistory(info.pointerId, ref historyCount, s_historyInfos))
+                        {
+                            for (int i = historyCount - 1; i >= 1; i--)
+                            {
+                                var historyInfo = s_historyInfos[i];
+                                s_intermediatePointsPooledList.Add(CreateRawPointerPoint(historyInfo));
+                            }
+                        }
+                    }
+                    return s_intermediatePointsPooledList;
+                });
+            }
+
+            return null;
+        }
+
+        private unsafe IReadOnlyList<RawPointerPoint> CreateLazyIntermediatePoints(MOUSEMOVEPOINT movePoint, MOUSEMOVEPOINT prevMovePoint)
+        {
+            // To understand some of this code, please check MS docs:
+            // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getmousemovepointsex#remarks
+
+            fixed (MOUSEMOVEPOINT* movePoints = s_mouseHistoryInfos)
+            {
+                var movePointCopy = movePoint;
+                movePointCopy.time = 0; // empty "time" as otherwise WinAPI will always fail
+                int pointsCount = GetMouseMovePointsEx(
+                    (uint)(Marshal.SizeOf(movePointCopy)),
+                    &movePointCopy, movePoints, s_mouseHistoryInfos.Length,
+                    1);
+
+                // GetMouseMovePointsEx can return -1 if point wasn't found or there is so beeg delay that original points were erased from the buffer.
+                if (pointsCount <= 1)
+                {
+                    return Array.Empty<RawPointerPoint>();
+                }
+
+                s_intermediatePointsPooledList.Clear();
+                s_intermediatePointsPooledList.Capacity = pointsCount;
+                for (int i = pointsCount - 1; i >= 1; i--)
+                {
+                    var historyInfo = s_mouseHistoryInfos[i];
+                    // Skip points newer than current point.
+                    if (historyInfo.time > movePoint.time ||
+                        (historyInfo.time == movePoint.time &&
+                         historyInfo.x == movePoint.x &&
+                         historyInfo.y == movePoint.y))
+                    {
+                        continue;
+                    }
+                    // Skip poins older from previous WM_MOUSEMOVE point.
+                    if (historyInfo.time < prevMovePoint.time ||
+                        (historyInfo.time == prevMovePoint.time &&
+                            historyInfo.x == prevMovePoint.x &&
+                            historyInfo.y == prevMovePoint.y))
+                    {
+                        continue;
+                    }
+
+                    // To support multiple screens.
+                    if (historyInfo.x > 32767)
+                        historyInfo.x -= 65536;
+
+                    if (historyInfo.y > 32767)
+                        historyInfo.y -= 65536;
+
+                    var point = PointToClient(new PixelPoint(historyInfo.x, historyInfo.y));
+                    s_intermediatePointsPooledList.Add(new RawPointerPoint
+                    {
+                        Position = point
+                    });
+                }
+                return s_intermediatePointsPooledList;
+            }
+        }
+
+        private RawPointerEventArgs CreatePointerArgs(IInputDevice device, ulong timestamp, RawPointerEventType eventType, RawPointerPoint point, RawInputModifiers modifiers, uint rawPointerId)
+        {
+            return device is TouchDevice
+                ? new RawTouchEventArgs(device, timestamp, _owner, eventType, point, modifiers, rawPointerId)
+                : new RawPointerEventArgs(device, timestamp, _owner, eventType, point, modifiers)
+                {
+                    RawPointerId = rawPointerId
+                };
+        }
+
+        private void GetDevicePointerInfo(IntPtr wParam,
+            out IPointerDevice device, out POINTER_INFO info, out RawPointerPoint point,
+            out RawInputModifiers modifiers, ref uint timestamp)
+        {
+            var pointerId = (uint)(ToInt32(wParam) & 0xFFFF);
+            GetPointerType(pointerId, out var type);
+
+            modifiers = default;
+
+            switch (type)
+            {
+                case PointerInputType.PT_PEN:
+                    device = _penDevice;
+                    GetPointerPenInfo(pointerId, out var penInfo);
+                    info = penInfo.pointerInfo;
+                    point = CreateRawPointerPoint(penInfo);
+                    if (penInfo.penFlags.HasFlag(PenFlags.PEN_FLAGS_BARREL))
+                    {
+                        modifiers |= RawInputModifiers.PenBarrelButton;
+                    }
+                    if (penInfo.penFlags.HasFlag(PenFlags.PEN_FLAGS_ERASER))
+                    {
+                        modifiers |= RawInputModifiers.PenEraser;
+                    }
+                    if (penInfo.penFlags.HasFlag(PenFlags.PEN_FLAGS_INVERTED))
+                    {
+                        modifiers |= RawInputModifiers.PenInverted;
+                    }
+                    break;
+                case PointerInputType.PT_TOUCH:
+                    device = _touchDevice;
+                    GetPointerTouchInfo(pointerId, out var touchInfo);
+                    info = touchInfo.pointerInfo;
+                    point = CreateRawPointerPoint(touchInfo);
+                    break;
+                default:
+                    device = _mouseDevice;
+                    GetPointerInfo(pointerId, out info);
+                    point = CreateRawPointerPoint(info);
+                    break;
+            }
+
+            if (info.dwTime != 0)
+            {
+                timestamp = info.dwTime;
+            }
+
+            modifiers |= GetInputModifiers(info.pointerFlags);
+        }
+
+        private RawPointerPoint CreateRawPointerPoint(POINTER_INFO pointerInfo)
+        {
+            var point = PointToClient(new PixelPoint(pointerInfo.ptPixelLocationX, pointerInfo.ptPixelLocationY));
+            return new RawPointerPoint
+            {
+                Position = point
+            };
+        }
+        private RawPointerPoint CreateRawPointerPoint(POINTER_TOUCH_INFO info)
+        {
+            var pointerInfo = info.pointerInfo;
+            var point = PointToClient(new PixelPoint(pointerInfo.ptPixelLocationX, pointerInfo.ptPixelLocationY));
+            return new RawPointerPoint
+            {
+                Position = point,
+                // POINTER_PEN_INFO.pressure is normalized to a range between 0 and 1024, with 512 as a default.
+                // But in our API we use range from 0.0 to 1.0.
+                Pressure = info.pressure / 1024f
+            };
+        }
+        private RawPointerPoint CreateRawPointerPoint(POINTER_PEN_INFO info)
+        {
+            var pointerInfo = info.pointerInfo;
+            var point = PointToClient(new PixelPoint(pointerInfo.ptPixelLocationX, pointerInfo.ptPixelLocationY));
+            return new RawPointerPoint
+            {
+                Position = point,
+                // POINTER_PEN_INFO.pressure is normalized to a range between 0 and 1024, with 512 as a default.
+                // But in our API we use range from 0.0 to 1.0.
+                Pressure = info.pressure / 1024f,
+                Twist = info.rotation,
+                XTilt = info.tiltX,
+                YTilt = info.tiltY
+            };
+        }
+
+        private static RawPointerEventType GetEventType(WindowsMessage message, POINTER_INFO info)
+        {
+            var isTouch = info.pointerType == PointerInputType.PT_TOUCH;
+            if (info.pointerFlags.HasFlag(PointerFlags.POINTER_FLAG_CANCELED))
+            {
+                return isTouch ? RawPointerEventType.TouchCancel : RawPointerEventType.LeaveWindow;
+            }
+
+            var eventType = ToEventType(info.ButtonChangeType, isTouch);
+            if (eventType == RawPointerEventType.LeftButtonDown &&
+                message == WindowsMessage.WM_NCPOINTERDOWN)
+            {
+                eventType = RawPointerEventType.NonClientLeftButtonDown;
+            }
+
+            return eventType;
+        }
+
+        private static RawPointerEventType ToEventType(PointerButtonChangeType type, bool isTouch)
+        {
+            return type switch
+            {
+                PointerButtonChangeType.POINTER_CHANGE_FIRSTBUTTON_DOWN when isTouch => RawPointerEventType.TouchBegin,
+                PointerButtonChangeType.POINTER_CHANGE_FIRSTBUTTON_DOWN when !isTouch => RawPointerEventType.LeftButtonDown,
+                PointerButtonChangeType.POINTER_CHANGE_SECONDBUTTON_DOWN => RawPointerEventType.RightButtonDown,
+                PointerButtonChangeType.POINTER_CHANGE_THIRDBUTTON_DOWN => RawPointerEventType.MiddleButtonDown,
+                PointerButtonChangeType.POINTER_CHANGE_FOURTHBUTTON_DOWN => RawPointerEventType.XButton1Down,
+                PointerButtonChangeType.POINTER_CHANGE_FIFTHBUTTON_DOWN => RawPointerEventType.XButton2Down,
+
+                PointerButtonChangeType.POINTER_CHANGE_FIRSTBUTTON_UP when isTouch => RawPointerEventType.TouchEnd,
+                PointerButtonChangeType.POINTER_CHANGE_FIRSTBUTTON_UP when !isTouch => RawPointerEventType.LeftButtonUp,
+                PointerButtonChangeType.POINTER_CHANGE_SECONDBUTTON_UP => RawPointerEventType.RightButtonUp,
+                PointerButtonChangeType.POINTER_CHANGE_THIRDBUTTON_UP => RawPointerEventType.MiddleButtonUp,
+                PointerButtonChangeType.POINTER_CHANGE_FOURTHBUTTON_UP => RawPointerEventType.XButton1Up,
+                PointerButtonChangeType.POINTER_CHANGE_FIFTHBUTTON_UP => RawPointerEventType.XButton2Up,
+                _ when isTouch => RawPointerEventType.TouchUpdate,
+                _ => RawPointerEventType.Move
+            };
+        }
+
         private void UpdateInputMethod(IntPtr hkl)
         {
             // note: for non-ime language, also create it so that emoji panel tracks cursor
             var langid = LGID(hkl);
+
             if (langid == _langid && Imm32InputMethod.Current.HWND == Hwnd)
             {
                 return;
-            } 
+            }
+
             _langid = langid;
 
             Imm32InputMethod.Current.SetLanguageAndWindow(this, Hwnd, hkl);
-            
         }
 
         private static int ToInt32(IntPtr ptr)
@@ -576,10 +1038,7 @@ namespace Avalonia.Win32
 
         private bool ShouldIgnoreTouchEmulatedMessage()
         {
-            if (!_multitouch)
-            {
-                return false;
-            }
+            // Note: GetMessageExtraInfo doesn't work with WM_POINTER events.
 
             // MI_WP_SIGNATURE
             // https://docs.microsoft.com/en-us/windows/win32/tablet/system-events-and-mouse-messages
@@ -592,6 +1051,11 @@ namespace Avalonia.Win32
         private static RawInputModifiers GetMouseModifiers(IntPtr wParam)
         {
             var keys = (ModifierKeys)ToInt32(wParam);
+            return GetInputModifiers(keys);
+        }
+
+        private static RawInputModifiers GetInputModifiers(ModifierKeys keys)
+        {
             var modifiers = WindowsKeyboardDevice.Instance.Modifiers;
 
             if (keys.HasAllFlags(ModifierKeys.MK_LBUTTON))
@@ -621,5 +1085,37 @@ namespace Avalonia.Win32
 
             return modifiers;
         }
+
+        private static RawInputModifiers GetInputModifiers(PointerFlags flags)
+        {
+            var modifiers = WindowsKeyboardDevice.Instance.Modifiers;
+
+            if (flags.HasAllFlags(PointerFlags.POINTER_FLAG_FIRSTBUTTON))
+            {
+                modifiers |= RawInputModifiers.LeftMouseButton;
+            }
+
+            if (flags.HasAllFlags(PointerFlags.POINTER_FLAG_SECONDBUTTON))
+            {
+                modifiers |= RawInputModifiers.RightMouseButton;
+            }
+
+            if (flags.HasAllFlags(PointerFlags.POINTER_FLAG_THIRDBUTTON))
+            {
+                modifiers |= RawInputModifiers.MiddleMouseButton;
+            }
+
+            if (flags.HasAllFlags(PointerFlags.POINTER_FLAG_FOURTHBUTTON))
+            {
+                modifiers |= RawInputModifiers.XButton1MouseButton;
+            }
+
+            if (flags.HasAllFlags(PointerFlags.POINTER_FLAG_FIFTHBUTTON))
+            {
+                modifiers |= RawInputModifiers.XButton2MouseButton;
+            }
+
+            return modifiers;
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index 8a340aac5e..e864f32138 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -23,16 +23,10 @@ namespace Avalonia.Win32
             AdjustWindowRectEx(ref rcFrame, (uint)(WindowStyles.WS_OVERLAPPEDWINDOW & ~WindowStyles.WS_CAPTION), false, 0);
 
             var borderThickness = new RECT();
-            if (GetStyle().HasAllFlags(WindowStyles.WS_THICKFRAME))
-            {
-                AdjustWindowRectEx(ref borderThickness, (uint)(GetStyle()), false, 0);
-                borderThickness.left *= -1;
-                borderThickness.top *= -1;
-            }
-            else if (GetStyle().HasAllFlags(WindowStyles.WS_BORDER))
-            {
-                borderThickness = new RECT { bottom = 1, left = 1, right = 1, top = 1 };
-            }
+            
+            AdjustWindowRectEx(ref borderThickness, (uint)GetStyle(), false, 0);
+            borderThickness.left *= -1;
+            borderThickness.top *= -1;
 
             if (_extendTitleBarHint >= 0)
             {
@@ -115,7 +109,7 @@ namespace Avalonia.Win32
 
                             if (_owner is Window window)
                             {
-                                var visual = window.Renderer.HitTestFirst(position, _owner as Window, x =>
+                                var visual = window.Renderer.HitTestFirst(position, _owner, x =>
                                 {
                                     if (x is IInputElement ie && (!ie.IsHitTestVisible || !ie.IsVisible))
                                     {
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index d1945e6c85..9ed1a50ff2 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
@@ -13,21 +15,28 @@ using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Avalonia.Win32.Automation;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
 using Avalonia.Win32.OpenGl;
 using Avalonia.Win32.WinRT;
 using Avalonia.Win32.WinRT.Composition;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
+using Avalonia.Collections.Pooled;
+using Avalonia.Metadata;
+using Avalonia.Platform.Storage;
 
 namespace Avalonia.Win32
 {
     /// <summary>
     /// Window implementation for Win32 platform.
     /// </summary>
+    [Unstable]
     public partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo,
         ITopLevelImplWithNativeControlHost,
-        ITopLevelImplWithTextInputMethod
+        ITopLevelImplWithTextInputMethod,
+        ITopLevelImplWithStorageProvider
     {
         private static readonly List<WindowImpl> s_instances = new List<WindowImpl>();
 
@@ -56,6 +65,7 @@ namespace Avalonia.Win32
         private bool _isUsingComposition;
         private IBlurHost _blurHost;
         private PlatformResizeReason _resizeReason;
+        private MOUSEMOVEPOINT _lastWmMousePoint;
 
 #if USE_MANAGED_DRAG
         private readonly ManagedWindowResizeDragHelper _managedDrag;
@@ -63,19 +73,20 @@ namespace Avalonia.Win32
 
         private const WindowStyles WindowStateMask = (WindowStyles.WS_MAXIMIZE | WindowStyles.WS_MINIMIZE);
         private readonly TouchDevice _touchDevice;
-        private readonly MouseDevice _mouseDevice;
+        private readonly WindowsMouseDevice _mouseDevice;
+        private readonly PenDevice _penDevice;
         private readonly ManagedDeferredRendererLock _rendererLock;
         private readonly FramebufferManager _framebuffer;
         private readonly IGlPlatformSurface _gl;
+        private readonly bool _wmPointerEnabled;
 
         private Win32NativeControlHost _nativeControlHost;
         private WndProc _wndProcDelegate;
         private string _className;
         private IntPtr _hwnd;
-        private bool _multitouch;
         private IInputRoot _owner;
         private WindowProperties _windowProperties;
-        private bool _trackingMouse;
+        private bool _trackingMouse;//ToDo - there is something missed. Needs investigation @Steven Kirk
         private bool _topmost;
         private double _scaling = 1;
         private WindowState _showWindowState;
@@ -84,7 +95,7 @@ namespace Avalonia.Win32
         private Size _minSize;
         private Size _maxSize;
         private POINT _maxTrackSize;
-        private WindowImpl _parent;        
+        private WindowImpl _parent;
         private ExtendClientAreaChromeHints _extendChromeHints = ExtendClientAreaChromeHints.Default;
         private bool _isCloseRequested;
         private bool _shown;
@@ -92,10 +103,18 @@ namespace Avalonia.Win32
         private uint _langid;
         private bool _ignoreWmChar;
 
+        private const int MaxPointerHistorySize = 512;
+        private static readonly PooledList<RawPointerPoint> s_intermediatePointsPooledList = new();
+        private static readonly POINTER_TOUCH_INFO[] s_historyTouchInfos = new POINTER_TOUCH_INFO[MaxPointerHistorySize];
+        private static readonly POINTER_PEN_INFO[] s_historyPenInfos = new POINTER_PEN_INFO[MaxPointerHistorySize];
+        private static readonly POINTER_INFO[] s_historyInfos = new POINTER_INFO[MaxPointerHistorySize];
+        private static readonly MOUSEMOVEPOINT[] s_mouseHistoryInfos = new MOUSEMOVEPOINT[64];
+
         public WindowImpl()
         {
             _touchDevice = new TouchDevice();
             _mouseDevice = new WindowsMouseDevice();
+            _penDevice = new PenDevice();
 
 #if USE_MANAGED_DRAG
             _managedDrag = new ManagedWindowResizeDragHelper(this, capture =>
@@ -124,6 +143,8 @@ namespace Avalonia.Win32
                     egl.Display is AngleWin32EglDisplay angleDisplay &&
                     angleDisplay.PlatformApi == AngleOptions.PlatformApi.DirectX11;
 
+            _wmPointerEnabled = Win32Platform.WindowsVersion >= PlatformConstants.Windows8;
+
             CreateWindow();
             _framebuffer = new FramebufferManager(_hwnd);
             UpdateInputMethod(GetKeyboardLayout(0));
@@ -148,6 +169,7 @@ namespace Avalonia.Win32
             }
 
             Screen = new ScreenImpl();
+            StorageProvider = new Win32StorageProvider(this);
 
             _nativeControlHost = new Win32NativeControlHost(this, _isUsingComposition);
             s_instances.Add(this);
@@ -172,7 +194,7 @@ namespace Avalonia.Win32
         public Action<PixelPoint> PositionChanged { get; set; }
 
         public Action<WindowState> WindowStateChanged { get; set; }
-        
+
         public Action LostFocus { get; set; }
 
         public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
@@ -204,6 +226,8 @@ namespace Avalonia.Win32
             }
         }
 
+        private double PrimaryScreenRenderScaling => Screen.AllScreens.FirstOrDefault(screen => screen.IsPrimary)?.Scaling ?? 1;
+
         public double RenderScaling => _scaling;
 
         public double DesktopScaling => RenderScaling;
@@ -245,7 +269,7 @@ namespace Avalonia.Win32
         {
             get
             {
-                if(_isFullScreenActive)
+                if (_isFullScreenActive)
                 {
                     return WindowState.FullScreen;
                 }
@@ -263,12 +287,13 @@ namespace Avalonia.Win32
 
             set
             {
-                if (IsWindowVisible(_hwnd))
+                if (IsWindowVisible(_hwnd) && _lastWindowState != value)
                 {
                     ShowWindow(value, value != WindowState.Minimized); // If the window is minimized, it shouldn't be activated
                 }
 
-                _showWindowState = value;                
+                _lastWindowState = value;
+                _showWindowState = value;
             }
         }
 
@@ -276,7 +301,9 @@ namespace Avalonia.Win32
 
         protected IntPtr Hwnd => _hwnd;
 
-        public void SetTransparencyLevelHint (WindowTransparencyLevel transparencyLevel)
+        private bool IsMouseInPointerEnabled => _wmPointerEnabled && IsMouseInPointerEnabled();
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
         {
             TransparencyLevel = EnableBlur(transparencyLevel);
         }
@@ -316,12 +343,12 @@ namespace Avalonia.Win32
             }
 
             var blurInfo = new DWM_BLURBEHIND(false);
-            
+
             if (transparencyLevel == WindowTransparencyLevel.Blur)
             {
                 blurInfo = new DWM_BLURBEHIND(true);
             }
-            
+
             DwmEnableBlurBehindWindow(_hwnd, ref blurInfo);
 
             if (transparencyLevel == WindowTransparencyLevel.Transparent)
@@ -377,13 +404,29 @@ namespace Avalonia.Win32
         {
             if (_isUsingComposition)
             {
-                _blurHost?.SetBlur(transparencyLevel switch
+                var effect = transparencyLevel switch
                 {
                     WindowTransparencyLevel.Mica => BlurEffect.Mica,
                     WindowTransparencyLevel.AcrylicBlur => BlurEffect.Acrylic,
                     WindowTransparencyLevel.Blur => BlurEffect.Acrylic,
                     _ => BlurEffect.None
-                });
+                };
+
+                if (Win32Platform.WindowsVersion >= WinUICompositorConnection.MinHostBackdropVersion)
+                {
+                    unsafe
+                    {
+                        int pvUseBackdropBrush = effect == BlurEffect.Acrylic ? 1 : 0;
+                        DwmSetWindowAttribute(_hwnd, (int)DwmWindowAttribute.DWMWA_USE_HOSTBACKDROPBRUSH, &pvUseBackdropBrush, sizeof(int));
+                    }
+                }
+
+                if (Win32Platform.WindowsVersion < WinUICompositorConnection.MinHostBackdropVersion && effect == BlurEffect.Mica)
+                {
+                    effect = BlurEffect.Acrylic;
+                }
+
+                _blurHost?.SetBlur(effect);
 
                 return transparencyLevel;
             }
@@ -415,7 +458,8 @@ namespace Avalonia.Win32
                         break;
 
                     case WindowTransparencyLevel.AcrylicBlur:
-                    case (WindowTransparencyLevel.AcrylicBlur + 1): // hack-force acrylic.
+                    case WindowTransparencyLevel.ForceAcrylicBlur: // hack-force acrylic.
+                    case WindowTransparencyLevel.Mica:
                         accent.AccentState = AccentState.ACCENT_ENABLE_ACRYLIC;
                         transparencyLevel = WindowTransparencyLevel.AcrylicBlur;
                         break;
@@ -440,7 +484,7 @@ namespace Avalonia.Win32
             }
         }
 
-        public IEnumerable<object> Surfaces => new object[] { Handle, _gl, _framebuffer };
+        public IEnumerable<object> Surfaces => new object[] { (IPlatformNativeSurfaceHandle)Handle, _gl, _framebuffer };
 
         public PixelPoint Position
         {
@@ -448,10 +492,14 @@ namespace Avalonia.Win32
             {
                 GetWindowRect(_hwnd, out var rc);
 
-                return new PixelPoint(rc.left, rc.top);
+                var border = HiddenBorderSize;
+                return new PixelPoint(rc.left + border.Width, rc.top + border.Height);
             }
             set
             {
+                var border = HiddenBorderSize;
+                value = new PixelPoint(value.X - border.Width, value.Y - border.Height);
+
                 SetWindowPos(
                     Handle.Handle,
                     IntPtr.Zero,
@@ -465,6 +513,24 @@ namespace Avalonia.Win32
 
         private bool HasFullDecorations => _windowProperties.Decorations == SystemDecorations.Full;
 
+        private PixelSize HiddenBorderSize
+        {
+            get
+            {
+                // Windows 10 and 11 add a 7 pixel invisible border on the left/right/bottom of windows for resizing
+                if (Win32Platform.WindowsVersion.Major < 10 || !HasFullDecorations)
+                {
+                    return PixelSize.Empty;
+                }
+
+                DwmGetWindowAttribute(_hwnd, (int)DwmWindowAttribute.DWMWA_EXTENDED_FRAME_BOUNDS, out var clientRect, Marshal.SizeOf(typeof(RECT)));
+                GetWindowRect(_hwnd, out var frameRect);
+                var borderWidth = GetSystemMetrics(SystemMetric.SM_CXBORDER);
+
+                return new PixelSize(clientRect.left - frameRect.left - borderWidth, 0);
+            }
+        }
+
         public void Move(PixelPoint point) => Position = point;
 
         public void SetMinMaxSize(Size minSize, Size maxSize)
@@ -481,12 +547,15 @@ namespace Avalonia.Win32
             if (customRendererFactory != null)
                 return customRendererFactory.Create(root, loop);
 
-            return Win32Platform.UseDeferredRendering 
-                ?  _isUsingComposition 
+            if (Win32Platform.Compositor != null)
+                return new CompositingRenderer(root, Win32Platform.Compositor);
+            
+            return Win32Platform.UseDeferredRendering
+                ? _isUsingComposition
                     ? new DeferredRenderer(root, loop)
                     {
                         RenderOnlyOnRenderThread = true
-                    } 
+                    }
                     : (IRenderer)new DeferredRenderer(root, loop, rendererLock: _rendererLock)
                 : new ImmediateRenderer(root);
         }
@@ -529,6 +598,7 @@ namespace Avalonia.Win32
             if (_dropTarget != null)
             {
                 OleContext.Current?.UnregisterDragDrop(Handle);
+                _dropTarget.Dispose();
                 _dropTarget = null;
             }
 
@@ -540,7 +610,7 @@ namespace Avalonia.Win32
                 {
                     BeforeCloseCleanup(true);
                 }
-                
+
                 DestroyWindow(_hwnd);
                 _hwnd = IntPtr.Zero;
             }
@@ -606,7 +676,7 @@ namespace Avalonia.Win32
         public void SetParent(IWindowImpl parent)
         {
             _parent = (WindowImpl)parent;
-            
+
             var parentHwnd = _parent?._hwnd ?? IntPtr.Zero;
 
             if (parentHwnd == IntPtr.Zero && !_windowProperties.ShowInTaskbar)
@@ -622,21 +692,23 @@ namespace Avalonia.Win32
 
         public void BeginMoveDrag(PointerPressedEventArgs e)
         {
-            _mouseDevice.Capture(null);
+            e.Pointer.Capture(null);
             DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
                 new IntPtr((int)HitTestValues.HTCAPTION), IntPtr.Zero);
-            e.Pointer.Capture(null);
         }
 
         public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e)
         {
+            if (_windowProperties.IsResizable)
+            {
 #if USE_MANAGED_DRAG
-            _managedDrag.BeginResizeDrag(edge, ScreenToClient(MouseDevice.Position.ToPoint(_scaling)));
+                _managedDrag.BeginResizeDrag(edge, ScreenToClient(MouseDevice.Position.ToPoint(_scaling)));
 #else
-            _mouseDevice.Capture(null);
-            DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
-                new IntPtr((int)s_edgeLookup[edge]), IntPtr.Zero);
+                e.Pointer.Capture(null);
+                DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
+                    new IntPtr((int)s_edgeLookup[edge]), IntPtr.Zero);
 #endif
+            }
         }
 
         public void SetTitle(string title)
@@ -717,7 +789,7 @@ namespace Avalonia.Win32
                 _isUsingComposition ? (int)WindowStyles.WS_EX_NOREDIRECTIONBITMAP : 0,
                 atom,
                 null,
-                (int)WindowStyles.WS_OVERLAPPEDWINDOW | (int) WindowStyles.WS_CLIPCHILDREN,
+                (int)WindowStyles.WS_OVERLAPPEDWINDOW | (int)WindowStyles.WS_CLIPCHILDREN,
                 CW_USEDEFAULT,
                 CW_USEDEFAULT,
                 CW_USEDEFAULT,
@@ -763,17 +835,12 @@ namespace Avalonia.Win32
                 throw new Win32Exception();
             }
 
-            Handle = new PlatformHandle(_hwnd, PlatformConstants.WindowHandleType);
-
-            _multitouch = Win32Platform.Options.EnableMultitouch ?? true;
+            Handle = new WindowImplPlatformHandle(this);
 
-            if (_multitouch)
-            {
-                RegisterTouchWindow(_hwnd, 0);
-            }
+            RegisterTouchWindow(_hwnd, 0);
 
             if (ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
-			{
+            {
                 var monitor = MonitorFromWindow(
                     _hwnd,
                     MONITOR.MONITOR_DEFAULTTONEAREST);
@@ -809,7 +876,14 @@ namespace Avalonia.Win32
             if (fullscreen)
             {
                 GetWindowRect(_hwnd, out var windowRect);
-                _savedWindowInfo.WindowRect = windowRect;
+                GetClientRect(_hwnd, out var clientRect);
+
+                clientRect.left += windowRect.left;
+                clientRect.right += windowRect.left;
+                clientRect.top += windowRect.top;
+                clientRect.bottom += windowRect.top;
+                
+                _savedWindowInfo.WindowRect = clientRect;
 
                 var current = GetStyle();
                 var currentEx = GetExtendedStyle();
@@ -846,24 +920,24 @@ namespace Avalonia.Win32
                 SetExtendedStyle(_savedWindowInfo.ExStyle, false);
 
                 // On restore, resize to the previous saved rect size.
-                var new_rect = _savedWindowInfo.WindowRect.ToPixelRect();
+                var newClientRect = _savedWindowInfo.WindowRect.ToPixelRect();
 
-                SetWindowPos(_hwnd, IntPtr.Zero, new_rect.X, new_rect.Y, new_rect.Width,
-                             new_rect.Height,
+                SetWindowPos(_hwnd, IntPtr.Zero, newClientRect.X, newClientRect.Y, newClientRect.Width,
+                             newClientRect.Height,
                             SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
 
                 UpdateWindowProperties(_windowProperties, true);
             }
 
             TaskBarList.MarkFullscreen(_hwnd, fullscreen);
-            
+
             ExtendClientArea();
         }
 
         private MARGINS UpdateExtendMargins()
         {
             RECT borderThickness = new RECT();
-            RECT borderCaptionThickness = new RECT();            
+            RECT borderCaptionThickness = new RECT();
 
             AdjustWindowRectEx(ref borderCaptionThickness, (uint)(GetStyle()), false, 0);
             AdjustWindowRectEx(ref borderThickness, (uint)(GetStyle() & ~WindowStyles.WS_CAPTION), false, 0);
@@ -879,22 +953,25 @@ namespace Avalonia.Win32
                 borderCaptionThickness.top = 1;
             }
 
+            //using a default margin of 0 when using WinUiComp removes artefacts when resizing. See issue #8316
+            var defaultMargin = _isUsingComposition ? 0 : 1;
+
             MARGINS margins = new MARGINS();
-            margins.cxLeftWidth = 1;
-            margins.cxRightWidth = 1;
-            margins.cyBottomHeight = 1;
+            margins.cxLeftWidth = defaultMargin;
+            margins.cxRightWidth = defaultMargin;
+            margins.cyBottomHeight = defaultMargin;
 
             if (_extendTitleBarHint != -1)
             {
-                borderCaptionThickness.top = (int)(_extendTitleBarHint * RenderScaling);                
+                borderCaptionThickness.top = (int)(_extendTitleBarHint * RenderScaling);
             }
 
-            margins.cyTopHeight = _extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) && !_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome) ? borderCaptionThickness.top : 1;
+            margins.cyTopHeight = _extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) && !_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome) ? borderCaptionThickness.top : defaultMargin;
 
             if (WindowState == WindowState.Maximized)
             {
                 _extendedMargins = new Thickness(0, (borderCaptionThickness.top - borderThickness.top) / RenderScaling, 0, 0);
-                _offScreenMargin = new Thickness(borderThickness.left / RenderScaling, borderThickness.top / RenderScaling, borderThickness.right / RenderScaling, borderThickness.bottom / RenderScaling);
+                _offScreenMargin = new Thickness(borderThickness.left / PrimaryScreenRenderScaling, borderThickness.top / PrimaryScreenRenderScaling, borderThickness.right / PrimaryScreenRenderScaling, borderThickness.bottom / PrimaryScreenRenderScaling);
             }
             else
             {
@@ -911,7 +988,7 @@ namespace Avalonia.Win32
             {
                 return;
             }
-            
+
             if (DwmIsCompositionEnabled(out bool compositionEnabled) < 0 || !compositionEnabled)
             {
                 _isClientAreaExtended = false;
@@ -939,11 +1016,11 @@ namespace Avalonia.Win32
 
                 _offScreenMargin = new Thickness();
                 _extendedMargins = new Thickness();
-                
-                Resize(new Size(rcWindow.Width/ RenderScaling, rcWindow.Height / RenderScaling), PlatformResizeReason.Layout);
+
+                Resize(new Size(rcWindow.Width / RenderScaling, rcWindow.Height / RenderScaling), PlatformResizeReason.Layout);
             }
 
-            if(!_isClientAreaExtended || (_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) &&
+            if (!_isClientAreaExtended || (_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) &&
                 !_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome)))
             {
                 EnableCloseButton(_hwnd);
@@ -959,12 +1036,12 @@ namespace Avalonia.Win32
         private void ShowWindow(WindowState state, bool activate)
         {
             _shown = true;
-            
+
             if (_isClientAreaExtended)
             {
                 ExtendClientArea();
             }
-            
+
             ShowWindowCommand? command;
 
             var newWindowProperties = _windowProperties;
@@ -982,7 +1059,7 @@ namespace Avalonia.Win32
 
                 case WindowState.Normal:
                     newWindowProperties.IsFullScreen = false;
-                    command = IsWindowVisible(_hwnd) ? ShowWindowCommand.Restore : 
+                    command = IsWindowVisible(_hwnd) ? ShowWindowCommand.Restore :
                         activate ? ShowWindowCommand.Normal : ShowWindowCommand.ShowNoActivate;
                     break;
 
@@ -1013,7 +1090,7 @@ namespace Avalonia.Win32
                 SetForegroundWindow(_hwnd);
             }
         }
-        
+
         private void BeforeCloseCleanup(bool isDisposing)
         {
             // Based on https://github.com/dotnet/wpf/blob/master/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs#L4270-L4337
@@ -1031,7 +1108,7 @@ namespace Avalonia.Win32
                     // Our window closed callback will set enabled state to a correct value after child window gets destroyed.
                     _parent.SetEnabled(true);
                 }
-                
+
                 // We also need to activate our parent window since again OS might try to activate a window behind if it is not set.
                 if (wasActive)
                 {
@@ -1058,7 +1135,7 @@ namespace Avalonia.Win32
                     SetWindowPos(_hwnd, WindowPosZOrder.HWND_NOTOPMOST, x, y, cx, cy, SetWindowPosFlags.SWP_SHOWWINDOW);
                 }
             }
-        }        
+        }
 
         private WindowStyles GetWindowStateStyles()
         {
@@ -1235,7 +1312,7 @@ namespace Avalonia.Win32
                         SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE |
                         SetWindowPosFlags.SWP_FRAMECHANGED);
                 }
-            }            
+            }
         }
 
         private const int MF_BYCOMMAND = 0x0;
@@ -1285,9 +1362,9 @@ namespace Avalonia.Win32
         public void SetExtendClientAreaToDecorationsHint(bool hint)
         {
             _isClientAreaExtended = hint;
-            
-            ExtendClientArea();            
-        }        
+
+            ExtendClientArea();
+        }
 
         public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
         {
@@ -1295,7 +1372,7 @@ namespace Avalonia.Win32
 
             ExtendClientArea();
         }
-        
+
         /// <inheritdoc/>
         public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
         {
@@ -1309,7 +1386,7 @@ namespace Avalonia.Win32
 
         /// <inheritdoc/>
         public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
-        
+
         /// <inheritdoc/>
         public bool NeedsManagedDecorations => _isClientAreaExtended && _extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome);
 
@@ -1348,7 +1425,7 @@ namespace Avalonia.Win32
         {
             private readonly WindowImpl _owner;
             private readonly PlatformResizeReason _restore;
-            
+
             public ResizeReasonScope(WindowImpl owner, PlatformResizeReason restore)
             {
                 _owner = owner;
@@ -1359,5 +1436,19 @@ namespace Avalonia.Win32
         }
 
         public ITextInputMethodImpl TextInputMethod => Imm32InputMethod.Current;
+
+        public IStorageProvider StorageProvider { get; }
+
+        private class WindowImplPlatformHandle : IPlatformNativeSurfaceHandle
+        {
+            private readonly WindowImpl _owner;
+            public WindowImplPlatformHandle(WindowImpl owner) => _owner = owner;
+            public IntPtr Handle => _owner.Hwnd;
+            public string HandleDescriptor => PlatformConstants.WindowHandleType;
+
+            public PixelSize Size => PixelSize.FromSize(_owner.ClientSize, Scaling);
+
+            public double Scaling => _owner.RenderScaling;
+        }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index e9015d857c..99d4fd2a27 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -1,17 +1,19 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>xamarin.ios10</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>net6.0-ios</TargetFramework>
+    <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK-1.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
-    <ProjectReference Include="..\..\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj">
-      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
-    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
+  
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
index b75aad17cf..b605d82541 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
@@ -1,6 +1,7 @@
+using Foundation;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Foundation;
+
 using UIKit;
 
 namespace Avalonia.iOS
@@ -8,6 +9,17 @@ namespace Avalonia.iOS
     public class AvaloniaAppDelegate<TApp> : UIResponder, IUIApplicationDelegate
         where TApp : Application, new()
     {
+        class SingleViewLifetime : ISingleViewApplicationLifetime
+        {
+            public AvaloniaView View;
+
+            public Control MainView
+            {
+                get => View.Content;
+                set => View.Content = value;
+            }
+        }
+
         protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder;
         
         [Export("window")]
@@ -16,12 +28,16 @@ namespace Avalonia.iOS
         [Export("application:didFinishLaunchingWithOptions:")]
         public bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
         {
-            var builder = AppBuilder.Configure<TApp>();
+            var builder = AppBuilder.Configure<TApp>().UseiOS();
             CustomizeAppBuilder(builder);
-            var lifetime = new Lifetime();
+
+            var lifetime = new SingleViewLifetime();
+
             builder.AfterSetup(_ =>
             {
                 Window = new UIWindow();
+                
+                
                 var view = new AvaloniaView();
                 lifetime.View = view;
                 Window.RootViewController = new UIViewController
@@ -31,19 +47,10 @@ namespace Avalonia.iOS
             });
             
             builder.SetupWithLifetime(lifetime);
-            
-            Window.Hidden = false;
-            return true;
-        }
 
-        class Lifetime : ISingleViewApplicationLifetime
-        {
-            public AvaloniaView View;
-            public Control MainView
-            {
-                get => View.Content;
-                set => View.Content = value;
-            }
+            Window.MakeKeyAndVisible();
+
+            return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs b/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
index dc963726b0..fb0857e472 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
@@ -1,32 +1,54 @@
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Foundation;
-using ObjCRuntime;
+#nullable enable
+using Avalonia.Input.TextInput;
+using JetBrains.Annotations;
 using UIKit;
 
-namespace Avalonia.iOS
+namespace Avalonia.iOS;
+
+public partial class AvaloniaView
 {
-    [Adopts("UIKeyInput")]
-    public partial class AvaloniaView
+    private const string ImeLog = "IOSIME";
+    private Rect _cursorRect;
+    private TextInputOptions? _options;
+
+    private static UIResponder? CurrentAvaloniaResponder { get; set; }
+    public override bool BecomeFirstResponder()
+    {
+        var res = base.BecomeFirstResponder();
+        if (res)
+            CurrentAvaloniaResponder = this;
+        return res;
+    }
+
+    public override bool ResignFirstResponder()
     {
-        public override bool CanBecomeFirstResponder => true;
+        var res = base.ResignFirstResponder();
+        if (res && ReferenceEquals(CurrentAvaloniaResponder, this))
+            CurrentAvaloniaResponder = null;
+        return res;
+    }
 
-        [Export("hasText")] public bool HasText => false;
+    private bool IsDrivingText => CurrentAvaloniaResponder is TextInputResponder t && ReferenceEquals(t.NextResponder, this);
 
-        [Export("insertText:")]
-        public void InsertText(string text) =>
-            _topLevelImpl.Input?.Invoke(new RawTextInputEventArgs(KeyboardDevice.Instance,
-                0, InputRoot, text));
+    void ITextInputMethodImpl.SetClient(ITextInputMethodClient? client)
+    {
+        _client = client;
+        if (_client == null && IsDrivingText)
+            BecomeFirstResponder();            
 
-        [Export("deleteBackward")]
-        public void DeleteBackward()
+        if (_client is { })
         {
-            // TODO: pass this through IME infrastructure instead of emulating a backspace press
-            _topLevelImpl.Input?.Invoke(new RawKeyEventArgs(KeyboardDevice.Instance,
-                0, InputRoot, RawKeyEventType.KeyDown, Key.Back, RawInputModifiers.None));
-            
-            _topLevelImpl.Input?.Invoke(new RawKeyEventArgs(KeyboardDevice.Instance,
-                0, InputRoot, RawKeyEventType.KeyUp, Key.Back, RawInputModifiers.None));
+            new TextInputResponder(this, _client).BecomeFirstResponder();
         }
     }
-}
\ No newline at end of file
+
+    void ITextInputMethodImpl.SetCursorRect(Rect rect) => _cursorRect = rect;
+
+    void ITextInputMethodImpl.SetOptions(TextInputOptions options) => _options = options;
+
+    void ITextInputMethodImpl.Reset()
+    {
+        if (IsDrivingText)
+            BecomeFirstResponder();
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs
index 5bb2f64879..2080352020 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.cs
@@ -2,12 +2,16 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Avalonia.iOS.Storage;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using CoreAnimation;
-using CoreGraphics;
 using Foundation;
 using ObjCRuntime;
 using OpenGLES;
@@ -15,34 +19,41 @@ using UIKit;
 
 namespace Avalonia.iOS
 {
-    public partial class AvaloniaView : UIView
+    public partial class AvaloniaView : UIView, ITextInputMethodImpl
     {
         internal IInputRoot InputRoot { get; private set; }
         private TopLevelImpl _topLevelImpl;
         private EmbeddableControlRoot _topLevel;
         private TouchHandler _touches;
+        private ITextInputMethodClient _client;
 
         public AvaloniaView()
         {
             _topLevelImpl = new TopLevelImpl(this);
             _touches = new TouchHandler(this, _topLevelImpl);
             _topLevel = new EmbeddableControlRoot(_topLevelImpl);
+
             _topLevel.Prepare();
-            
+
             _topLevel.Renderer.Start();
-            
-            var l = (CAEAGLLayer) Layer;
+
+            var l = (CAEAGLLayer)Layer;
             l.ContentsScale = UIScreen.MainScreen.Scale;
             l.Opaque = true;
             l.DrawableProperties = new NSDictionary(
                 EAGLDrawableProperty.RetainedBacking, false,
                 EAGLDrawableProperty.ColorFormat, EAGLColorFormat.RGBA8
             );
-            _topLevelImpl.Surfaces = new[] {new EaglLayerSurface(l)};
+            _topLevelImpl.Surfaces = new[] { new EaglLayerSurface(l) };
             MultipleTouchEnabled = true;
         }
 
-        internal class TopLevelImpl : ITopLevelImpl
+        public override bool CanBecomeFirstResponder => true;
+
+        public override bool CanResignFirstResponder => true;
+
+        internal class TopLevelImpl : ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost,
+            ITopLevelImplWithStorageProvider
         {
             private readonly AvaloniaView _view;
             public AvaloniaView View => _view;
@@ -50,6 +61,8 @@ namespace Avalonia.iOS
             public TopLevelImpl(AvaloniaView view)
             {
                 _view = view;
+                NativeControlHost = new NativeControlHostImpl(_view);
+                StorageProvider = new IOSStorageProvider(view);
             }
 
             public void Dispose()
@@ -57,8 +70,8 @@ namespace Avalonia.iOS
                 // No-op
             }
 
-            public IRenderer CreateRenderer(IRenderRoot root) => new DeferredRenderer(root,
-                AvaloniaLocator.Current.GetService<IRenderLoop>());
+            public IRenderer CreateRenderer(IRenderRoot root) => new CompositingRenderer(root, Platform.Compositor);
+
 
             public void Invalidate(Rect rect)
             {
@@ -72,7 +85,7 @@ namespace Avalonia.iOS
 
             public Point PointToClient(PixelPoint point) => new Point(point.X, point.Y);
 
-            public PixelPoint PointToScreen(Point point) => new PixelPoint((int) point.X, (int) point.Y);
+            public PixelPoint PointToScreen(Point point) => new PixelPoint((int)point.X, (int)point.Y);
 
             public void SetCursor(ICursorImpl _)
             {
@@ -109,6 +122,10 @@ namespace Avalonia.iOS
 
             public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } =
                 new AcrylicPlatformCompensationLevels();
+
+            public ITextInputMethodImpl? TextInputMethod => _view;
+            public INativeControlHostImpl NativeControlHost { get; }
+            public IStorageProvider StorageProvider { get; }
         }
 
         [Export("layerClass")]
diff --git a/src/iOS/Avalonia.iOS/Boilerplate/AppBuilder.cs b/src/iOS/Avalonia.iOS/Boilerplate/AppBuilder.cs
deleted file mode 100644
index d5830510f6..0000000000
--- a/src/iOS/Avalonia.iOS/Boilerplate/AppBuilder.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.PlatformSupport;
-
-namespace Avalonia
-{
-    public class AppBuilder : AppBuilderBase<AppBuilder>
-    {
-        public AppBuilder() : base(new StandardRuntimePlatform(),
-            b => StandardRuntimePlatformServices.Register(b.ApplicationType.Assembly))
-        {
-            this.UseSkia().UseWindowingSubsystem(iOS.Platform.Register);
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/CombinedSpan3.cs b/src/iOS/Avalonia.iOS/CombinedSpan3.cs
new file mode 100644
index 0000000000..e9f44b7d58
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/CombinedSpan3.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia.Controls.Documents;
+
+namespace Avalonia.iOS;
+
+internal ref struct CombinedSpan3<T>
+{
+    public ReadOnlySpan<T> Span1, Span2, Span3;
+
+    public CombinedSpan3(ReadOnlySpan<T> span1, ReadOnlySpan<T> span2, ReadOnlySpan<T> span3)
+    {
+        Span1 = span1;
+        Span2 = span2;
+        Span3 = span3;
+    }
+
+    public int Length => Span1.Length + Span2.Length + Span3.Length;
+
+    void CopyFromSpan(ReadOnlySpan<T> from, int offset, ref Span<T> to)
+    {
+        if(to.Length == 0)
+            return;
+        if (offset < from.Length)
+        {
+            var copyNow = Math.Min(from.Length - offset, to.Length);
+            from.Slice(offset, copyNow).CopyTo(to);
+            to = to.Slice(copyNow);
+            offset = 0;
+        }
+        else
+            offset -= from.Length;
+    }
+    
+    public void CopyTo(Span<T> to, int offset)
+    {
+        CopyFromSpan(Span1, offset, ref to);
+        CopyFromSpan(Span2, offset, ref to);
+        CopyFromSpan(Span3, offset, ref to);
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs b/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs
index df73479a65..eb124fd450 100644
--- a/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs
+++ b/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs
@@ -28,6 +28,8 @@ namespace Avalonia.iOS
         }
 
         public Thread TimerThread { get;  }
+        
+        public bool RunsInBackground => true;
 
         private void OnLinkTick()
         {
diff --git a/src/iOS/Avalonia.iOS/EaglDisplay.cs b/src/iOS/Avalonia.iOS/EaglDisplay.cs
index f9c787b6a8..906bbc29e7 100644
--- a/src/iOS/Avalonia.iOS/EaglDisplay.cs
+++ b/src/iOS/Avalonia.iOS/EaglDisplay.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Reactive.Disposables;
 using Avalonia.OpenGL;
+using Avalonia.Platform;
 using OpenGLES;
-using OpenTK.Graphics.ES30;
 
 namespace Avalonia.iOS
 {
@@ -10,6 +10,7 @@ namespace Avalonia.iOS
     {
         public IGlContext PrimaryContext => Context;
         public IGlContext CreateSharedContext() => throw new NotSupportedException();
+        IPlatformGpuContext IPlatformGpu.PrimaryContext => PrimaryContext;
         public bool CanShareContexts => false;
         public bool CanCreateContexts => false;
         public IGlContext CreateContext() => throw new System.NotSupportedException();
@@ -75,7 +76,21 @@ namespace Avalonia.iOS
 
         public GlVersion Version { get; } = new GlVersion(GlProfileType.OpenGLES, 3, 0);
         public GlInterface GlInterface { get; }
-        public int SampleCount { get; } = 0;
-        public int StencilSize { get; } = 9;
+        public int SampleCount
+        {
+            get
+            {
+                GlInterface.GetIntegerv(GlConsts.GL_SAMPLES, out var samples);
+                return samples;
+            }
+        }
+        public int StencilSize
+        {
+            get
+            {
+                GlInterface.GetIntegerv(GlConsts.GL_STENCIL_BITS, out var stencil);
+                return stencil;
+            }
+        }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/EaglLayerSurface.cs b/src/iOS/Avalonia.iOS/EaglLayerSurface.cs
index 5e5e1da949..0e8945d921 100644
--- a/src/iOS/Avalonia.iOS/EaglLayerSurface.cs
+++ b/src/iOS/Avalonia.iOS/EaglLayerSurface.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Surfaces;
 using CoreAnimation;
-using OpenTK.Graphics.ES30;
 
 namespace Avalonia.iOS
 {
@@ -35,7 +34,7 @@ namespace Avalonia.iOS
 
             public void Dispose()
             {
-                GL.Finish();
+                _ctx.GlInterface.Finish();
                 _fbo.Present();
                 _restoreContext.Dispose();
             }
@@ -85,7 +84,7 @@ namespace Avalonia.iOS
             var ctx = Platform.GlFeature.Context;
             using (ctx.MakeCurrent())
             {
-                var fbo = new SizeSynchronizedLayerFbo(ctx.Context, _layer);
+                var fbo = new SizeSynchronizedLayerFbo(ctx.Context, ctx.GlInterface, _layer);
                 if (!fbo.Sync())
                     throw new InvalidOperationException("Unable to create render target");
                 return new RenderTarget(ctx, fbo);
diff --git a/src/iOS/Avalonia.iOS/Extensions.cs b/src/iOS/Avalonia.iOS/Extensions.cs
index bf6262e5c5..80f6b419c9 100644
--- a/src/iOS/Avalonia.iOS/Extensions.cs
+++ b/src/iOS/Avalonia.iOS/Extensions.cs
@@ -12,7 +12,7 @@ namespace Avalonia.iOS
 
         public static Point ToAvalonia(this CGPoint point) => new Point(point.X, point.Y);
 
-        static nfloat ColorComponent(byte c) => ((float) c) / 255;
+        static float ColorComponent(byte c) => (float) c / 255;
 
         public static UIColor ToUiColor(this Color color) => new UIColor(
             ColorComponent(color.R),
@@ -20,4 +20,4 @@ namespace Avalonia.iOS
             ColorComponent(color.B),
             ColorComponent(color.A));
     }
-}
\ No newline at end of file
+}
diff --git a/src/iOS/Avalonia.iOS/LayerFbo.cs b/src/iOS/Avalonia.iOS/LayerFbo.cs
index 907af58c7e..9a93cdfb22 100644
--- a/src/iOS/Avalonia.iOS/LayerFbo.cs
+++ b/src/iOS/Avalonia.iOS/LayerFbo.cs
@@ -1,61 +1,62 @@
 using System;
+using Avalonia.OpenGL;
 using CoreAnimation;
 using OpenGLES;
-using OpenTK.Graphics.ES20;
 
 namespace Avalonia.iOS
 {
     public class LayerFbo
     {
         private readonly EAGLContext _context;
+        private readonly GlInterface _gl;
         private readonly CAEAGLLayer _layer;
         private int _framebuffer;
         private int _renderbuffer;
         private int _depthBuffer;
         private bool _disposed;
 
-        private LayerFbo(EAGLContext context, CAEAGLLayer layer, in int framebuffer, in int renderbuffer, in int depthBuffer)
+        private LayerFbo(EAGLContext context, GlInterface gl, CAEAGLLayer layer, int framebuffer, int renderbuffer, int depthBuffer)
         {
             _context = context;
+            _gl = gl;
             _layer = layer;
             _framebuffer = framebuffer;
             _renderbuffer = renderbuffer;
             _depthBuffer = depthBuffer;
         }
 
-        public static LayerFbo TryCreate(EAGLContext context, CAEAGLLayer layer)
+        public static LayerFbo TryCreate(EAGLContext context, GlInterface gl, CAEAGLLayer layer)
         {
             if (context != EAGLContext.CurrentContext)
                 return null;
-            GL.GenFramebuffers(1, out int fb);
-            GL.GenRenderbuffers(1, out int rb);
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, fb);
-            GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer,  rb);
-            context.RenderBufferStorage((uint) All.Renderbuffer, layer);
-            
-            GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferSlot.ColorAttachment0, RenderbufferTarget.Renderbuffer, rb);
 
-            int w;
-            int h;
-            GL.GetRenderbufferParameter(RenderbufferTarget.Renderbuffer, RenderbufferParameterName.RenderbufferWidth, out w);
-            GL.GetRenderbufferParameter(RenderbufferTarget.Renderbuffer, RenderbufferParameterName.RenderbufferHeight, out h);
+            var rb = gl.GenRenderbuffer();
+            gl.BindRenderbuffer(GlConsts.GL_RENDERBUFFER,  rb);
+            context.RenderBufferStorage(GlConsts.GL_RENDERBUFFER, layer);
+
+            var fb = gl.GenFramebuffer();
+            gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, fb);
+            gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_COLOR_ATTACHMENT0, GlConsts.GL_RENDERBUFFER, rb);
             
-            GL.GenRenderbuffers(1, out int depthBuffer);
+            gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_WIDTH, out var w);
+            gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_HEIGHT, out var h);
+
+            var db = gl.GenRenderbuffer();
             
             //GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer);
             //GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferInternalFormat.DepthComponent16, w, h);
-            GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferSlot.DepthAttachment, RenderbufferTarget.Renderbuffer, depthBuffer);
+            gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_DEPTH_ATTACHMENT, GlConsts.GL_RENDERBUFFER, db);
 
-            var frameBufferError = GL.CheckFramebufferStatus(FramebufferTarget.Framebuffer);
-            if(frameBufferError != FramebufferErrorCode.FramebufferComplete)
+            var frameBufferError = gl.CheckFramebufferStatus(GlConsts.GL_FRAMEBUFFER);
+            if(frameBufferError != GlConsts.GL_FRAMEBUFFER_COMPLETE)
             {
-                GL.DeleteFramebuffers(1, ref fb);
-                GL.DeleteRenderbuffers(1, ref depthBuffer);
-                GL.DeleteRenderbuffers(1, ref rb);
+                gl.DeleteFramebuffer(fb);
+                gl.DeleteRenderbuffer(db);
+                gl.DeleteRenderbuffer(rb);
                 return null;
             }
 
-            return new LayerFbo(context, layer, fb, rb, depthBuffer)
+            return new LayerFbo(context, gl, layer, fb, rb, db)
             {
                 Width = w,
                 Height = h
@@ -67,13 +68,13 @@ namespace Avalonia.iOS
 
         public void Bind()
         {
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, _framebuffer);
+            _gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, _framebuffer);
         }
 
         public void Present()
         {
             Bind();
-            var success = _context.PresentRenderBuffer((uint) All.Renderbuffer);
+            var success = _context.PresentRenderBuffer(GlConsts.GL_RENDERBUFFER);
         }
 
         public void Dispose()
@@ -81,9 +82,9 @@ namespace Avalonia.iOS
             if(_disposed)
                 return;
             _disposed = true;
-            GL.DeleteFramebuffers(1, ref _framebuffer);
-            GL.DeleteRenderbuffers(1, ref _depthBuffer);
-            GL.DeleteRenderbuffers(1, ref _renderbuffer);
+            _gl.DeleteFramebuffer(_framebuffer);
+            _gl.DeleteRenderbuffer(_depthBuffer);
+            _gl.DeleteRenderbuffer(_renderbuffer);
             if (_context != EAGLContext.CurrentContext)
                 throw new InvalidOperationException("Associated EAGLContext is not current");
         }
@@ -92,15 +93,16 @@ namespace Avalonia.iOS
     class SizeSynchronizedLayerFbo : IDisposable
     {
         private readonly EAGLContext _context;
+        private readonly GlInterface _gl;
         private readonly CAEAGLLayer _layer;
         private LayerFbo _fbo;
-        private nfloat _oldLayerWidth, _oldLayerHeight, _oldLayerScale;
+        private double _oldLayerWidth, _oldLayerHeight, _oldLayerScale;
         
-        public SizeSynchronizedLayerFbo(EAGLContext context, CAEAGLLayer layer)
+        public SizeSynchronizedLayerFbo(EAGLContext context, GlInterface gl, CAEAGLLayer layer)
         {
             _context = context;
+            _gl = gl;
             _layer = layer;
-            
         }
 
         public bool Sync()
@@ -112,7 +114,7 @@ namespace Avalonia.iOS
                 return true;
             _fbo?.Dispose();
             _fbo = null;
-            _fbo = LayerFbo.TryCreate(_context, _layer);
+            _fbo = LayerFbo.TryCreate(_context, _gl, _layer);
             _oldLayerWidth = _layer.Bounds.Width;
             _oldLayerHeight = _layer.Bounds.Height;
             _oldLayerScale = _layer.ContentsScale;
@@ -140,4 +142,4 @@ namespace Avalonia.iOS
         public int Height => _fbo?.Height ?? 0;
         public double Scaling => _oldLayerScale;
     }
-}
\ No newline at end of file
+}
diff --git a/src/iOS/Avalonia.iOS/NativeControlHostImpl.cs b/src/iOS/Avalonia.iOS/NativeControlHostImpl.cs
new file mode 100644
index 0000000000..f752936dc8
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/NativeControlHostImpl.cs
@@ -0,0 +1,160 @@
+#nullable enable
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using CoreGraphics;
+using ObjCRuntime;
+using UIKit;
+
+namespace Avalonia.iOS
+{
+    internal class NativeControlHostImpl : INativeControlHostImpl
+    {
+        private readonly AvaloniaView _avaloniaView;
+
+        public NativeControlHostImpl(AvaloniaView avaloniaView)
+        {
+            _avaloniaView = avaloniaView;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            return new UIViewControlHandle(new UIView());
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var parent = new UIViewControlHandle(_avaloniaView);
+            NativeControlAttachment? attachment = null;
+            try
+            {
+                var child = create(parent);
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+#pragma warning disable IDE0017 // Simplify object initialization
+                attachment = new NativeControlAttachment(child);
+#pragma warning restore IDE0017 // Simplify object initialization
+                attachment.AttachedTo = this;
+                return attachment;
+            }
+            catch
+            {
+                attachment?.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            return new NativeControlAttachment(handle)
+            {
+                AttachedTo = this
+            };
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == UIViewControlHandle.UIViewDescriptor;
+
+        private class ViewHolder : UIView
+        {
+            public ViewHolder(IntPtr handle) : base(new NativeHandle(handle))
+            {
+                
+            }
+        }
+        
+        private class NativeControlAttachment : INativeControlHostControlTopLevelAttachment
+        {
+            // ReSharper disable once NotAccessedField.Local (keep GC reference)
+            private IPlatformHandle? _child;
+            private UIView? _view;
+            private NativeControlHostImpl? _attachedTo;
+
+            public NativeControlAttachment(IPlatformHandle child)
+            {
+                _child = child;
+                
+                _view = (child as UIViewControlHandle)?.View ?? new ViewHolder(child.Handle);
+            }
+
+            [MemberNotNull(nameof(_view))]
+            private void CheckDisposed()
+            {
+                if (_view == null)
+                    throw new ObjectDisposedException(nameof(NativeControlAttachment));
+            }
+
+            public void Dispose()
+            {
+                _view?.RemoveFromSuperview();
+                _child = null;
+                _attachedTo = null;
+                _view?.Dispose();
+                _view = null;
+            }
+
+            public INativeControlHostImpl? AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    CheckDisposed();
+                    
+                    _attachedTo = (NativeControlHostImpl?)value;
+                    if (_attachedTo == null)
+                    {
+                        _view.RemoveFromSuperview();
+                    }
+                    else
+                    {
+                        _attachedTo._avaloniaView.AddSubview(_view);
+                    }
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is NativeControlHostImpl;
+
+            public void HideWithSize(Size size)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    return;
+
+                _view.Hidden = true;
+                _view.Frame = new CGRect(0d, 0d, Math.Max(1d, size.Width), Math.Max(1d, size.Height));
+            }
+
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("The control isn't currently attached to a toplevel");
+
+                _view.Frame = new CGRect(bounds.X, bounds.Y, Math.Max(1d, bounds.Width), Math.Max(1d, bounds.Height));
+                _view.Hidden = false;
+            }
+        }
+    }
+
+    public class UIViewControlHandle : INativeControlHostDestroyableControlHandle
+    {
+        internal const string UIViewDescriptor = "UIView";
+
+        
+        public UIViewControlHandle(UIView view)
+        {
+            View = view;
+        }
+        
+        public UIView View { get; }
+        
+        public string HandleDescriptor => UIViewDescriptor;
+
+        IntPtr IPlatformHandle.Handle => View.Handle.Handle;
+
+        public void Destroy()
+        {
+            View.Dispose();
+        }
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/Platform.cs b/src/iOS/Avalonia.iOS/Platform.cs
index 88f60ace1f..c2cf8c6f6c 100644
--- a/src/iOS/Avalonia.iOS/Platform.cs
+++ b/src/iOS/Avalonia.iOS/Platform.cs
@@ -1,9 +1,25 @@
 using System;
+
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+
+namespace Avalonia
+{
+    public static class IOSApplicationExtensions
+    {
+        public static T UseiOS<T>(this T builder) where T : AppBuilderBase<T>, new()
+        {
+            return builder
+                .UseWindowingSubsystem(iOS.Platform.Register, "iOS")
+                .UseSkia();
+        }
+    }
+}
 
 namespace Avalonia.iOS
 {
@@ -11,42 +27,30 @@ namespace Avalonia.iOS
     {
         public static EaglFeature GlFeature;
         public static DisplayLinkTimer Timer;
-        class PlatformSettings : IPlatformSettings
-        {
-            /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-            public Size TouchDoubleClickSize => new Size(10, 10);
-
-            /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-            public TimeSpan TouchDoubleClickTime => TimeSpan.FromMilliseconds(500);
-
-            public Size DoubleClickSize => new Size(4, 4);
-
-            public TimeSpan DoubleClickTime => TouchDoubleClickTime;
-        }
+        internal static Compositor Compositor { get; private set; }
 
         public static void Register()
         {
             GlFeature ??= new EaglFeature();
             Timer ??= new DisplayLinkTimer();
             var keyboard = new KeyboardDevice();
-            var softKeyboard = new SoftKeyboardHelper();
+
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformOpenGlInterface>().ToConstant(GlFeature)
                 .Bind<ICursorFactory>().ToConstant(new CursorFactoryStub())
                 .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
                 .Bind<IClipboard>().ToConstant(new ClipboardImpl())
-                .Bind<IPlatformSettings>().ToConstant(new PlatformSettings())
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformIconLoader>().ToConstant(new PlatformIconLoaderStub())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()
                 .Bind<IRenderLoop>().ToSingleton<RenderLoop>()
                 .Bind<IRenderTimer>().ToConstant(Timer)
                 .Bind<IPlatformThreadingInterface>().ToConstant(new PlatformThreadingInterface())
                 .Bind<IKeyboardDevice>().ToConstant(keyboard);
-            keyboard.PropertyChanged += (_, changed) =>
-            {
-                if (changed.PropertyName == nameof(KeyboardDevice.FocusedElement))
-                    softKeyboard.UpdateKeyboard(keyboard.FocusedElement);
-            };
+
+                Compositor = new Compositor(
+                    AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(),
+                    AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>());
         }
 
 
diff --git a/src/iOS/Avalonia.iOS/SingleViewLifetime.cs b/src/iOS/Avalonia.iOS/SingleViewLifetime.cs
deleted file mode 100644
index 914f0ba548..0000000000
--- a/src/iOS/Avalonia.iOS/SingleViewLifetime.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Avalonia.iOS
-{
-    public class SingleViewLifetime
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/SoftKeyboardHelper.cs b/src/iOS/Avalonia.iOS/SoftKeyboardHelper.cs
deleted file mode 100644
index b05ab280d2..0000000000
--- a/src/iOS/Avalonia.iOS/SoftKeyboardHelper.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-
-namespace Avalonia.iOS
-{
-    public class SoftKeyboardHelper
-    {
-        private AvaloniaView _oldView;
-        
-        public void UpdateKeyboard(IInputElement focusedElement)
-        {
-            if (_oldView?.IsFirstResponder == true)
-                _oldView?.ResignFirstResponder();
-            _oldView = null;
-            
-            //TODO: Raise a routed event to determine if any control wants to become the text input handler 
-            if (focusedElement is TextBox)
-            {
-                var view = ((focusedElement.VisualRoot as TopLevel)?.PlatformImpl as AvaloniaView.TopLevelImpl)?.View;
-                view?.BecomeFirstResponder();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs b/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs
new file mode 100644
index 0000000000..784937cb10
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs
@@ -0,0 +1,66 @@
+using System.IO;
+
+using Foundation;
+
+using UIKit;
+
+#nullable enable
+
+namespace Avalonia.iOS.Storage;
+
+internal sealed class IOSSecurityScopedStream : Stream
+{
+    private readonly UIDocument _document;
+    private readonly FileStream _stream;
+    private readonly NSUrl _url;
+
+    internal IOSSecurityScopedStream(NSUrl url, FileAccess access)
+    {
+        _document = new UIDocument(url);
+        var path = _document.FileUrl.Path;
+        _url = url;
+        _url.StartAccessingSecurityScopedResource();
+        _stream = File.Open(path, FileMode.Open, access);
+    }
+
+    public override bool CanRead => _stream.CanRead;
+
+    public override bool CanSeek => _stream.CanSeek;
+
+    public override bool CanWrite => _stream.CanWrite;
+
+    public override long Length => _stream.Length;
+
+    public override long Position
+    {
+        get => _stream.Position;
+        set => _stream.Position = value;
+    }
+
+    public override void Flush() =>
+        _stream.Flush();
+
+    public override int Read(byte[] buffer, int offset, int count) =>
+        _stream.Read(buffer, offset, count);
+
+    public override long Seek(long offset, SeekOrigin origin) =>
+        _stream.Seek(offset, origin);
+
+    public override void SetLength(long value) =>
+        _stream.SetLength(value);
+
+    public override void Write(byte[] buffer, int offset, int count) =>
+        _stream.Write(buffer, offset, count);
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        if (disposing)
+        {
+            _stream.Dispose();
+            _document.Dispose();
+            _url.StopAccessingSecurityScopedResource();
+        }
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
new file mode 100644
index 0000000000..a801e83562
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Logging;
+using Avalonia.Platform.Storage;
+using Foundation;
+
+using UIKit;
+
+#nullable enable
+
+namespace Avalonia.iOS.Storage;
+
+internal abstract class IOSStorageItem : IStorageBookmarkItem
+{
+    private readonly string _filePath;
+
+    protected IOSStorageItem(NSUrl url)
+    {
+        Url = url ?? throw new ArgumentNullException(nameof(url));
+
+        using (var doc = new UIDocument(url))
+        {
+            _filePath = doc.FileUrl?.Path ?? url.FilePathUrl.Path;
+            Name = doc.LocalizedName ?? Path.GetFileName(_filePath) ?? url.FilePathUrl.LastPathComponent;
+        }
+    }
+
+    internal NSUrl Url { get; }
+
+    public bool CanBookmark => true;
+
+    public string Name { get; }
+
+    public Task<StorageItemProperties> GetBasicPropertiesAsync()
+    {
+        var attributes = NSFileManager.DefaultManager.GetAttributes(_filePath, out var error);
+        if (error is not null)
+        {
+            Logger.TryGet(LogEventLevel.Error, LogArea.IOSPlatform)?.
+                Log(this, "GetBasicPropertiesAsync returned an error: {ErrorCode} {ErrorMessage}", error.Code, error.LocalizedFailureReason);
+        }
+        return Task.FromResult(new StorageItemProperties(attributes?.Size, (DateTime)attributes?.CreationDate, (DateTime)attributes?.ModificationDate));
+    }
+
+    public Task<IStorageFolder?> GetParentAsync()
+    {
+        return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(Url.RemoveLastPathComponent()));
+    }
+
+    public Task ReleaseBookmarkAsync()
+    {
+        // no-op
+        return Task.CompletedTask;
+    }
+
+    public Task<string?> SaveBookmarkAsync()
+    {
+        try
+        {
+            if (!Url.StartAccessingSecurityScopedResource())
+            {
+                return Task.FromResult<string?>(null);
+            }
+
+            var newBookmark = Url.CreateBookmarkData(NSUrlBookmarkCreationOptions.SuitableForBookmarkFile, Array.Empty<string>(), null, out var bookmarkError);
+            if (bookmarkError is not null)
+            {
+                Logger.TryGet(LogEventLevel.Error, LogArea.IOSPlatform)?.
+                    Log(this, "SaveBookmark returned an error: {ErrorCode} {ErrorMessage}", bookmarkError.Code, bookmarkError.LocalizedFailureReason);
+                return Task.FromResult<string?>(null);
+            }
+
+            return Task.FromResult<string?>(
+                newBookmark.GetBase64EncodedString(NSDataBase64EncodingOptions.None));
+        }
+        finally
+        {
+            Url.StopAccessingSecurityScopedResource();
+        }
+    }
+
+    public bool TryGetUri([NotNullWhen(true)] out Uri uri)
+    {
+        uri = Url;
+        return uri is not null;
+    }
+
+    public void Dispose()
+    {
+    }
+}
+
+internal sealed class IOSStorageFile : IOSStorageItem, IStorageBookmarkFile
+{
+    public IOSStorageFile(NSUrl url) : base(url)
+    {
+    }
+
+    public bool CanOpenRead => true;
+
+    public bool CanOpenWrite => true;
+
+    public Task<Stream> OpenReadAsync()
+    {
+        return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, FileAccess.Read));
+    }
+
+    public Task<Stream> OpenWriteAsync()
+    {
+        return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, FileAccess.Write));
+    }
+}
+
+internal sealed class IOSStorageFolder : IOSStorageItem, IStorageBookmarkFolder
+{
+    public IOSStorageFolder(NSUrl url) : base(url)
+    {
+    }
+
+    public Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+        var content = NSFileManager.DefaultManager.GetDirectoryContent(Url, null, NSDirectoryEnumerationOptions.None, out var error);
+        if (error is not null)
+        {
+            return Task.FromException<IReadOnlyList<IStorageItem>>(new NSErrorException(error));
+        }
+
+        var items = content
+            .Select(u => u.HasDirectoryPath ? (IStorageItem)new IOSStorageFolder(u) : new IOSStorageFile(u))
+            .ToArray();
+
+        return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs
new file mode 100644
index 0000000000..834418437b
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs
@@ -0,0 +1,212 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Avalonia.Logging;
+using Avalonia.Platform.Storage;
+using UIKit;
+using Foundation;
+using UniformTypeIdentifiers;
+using UTTypeLegacy = MobileCoreServices.UTType;
+using UTType = UniformTypeIdentifiers.UTType;
+
+#nullable enable
+
+namespace Avalonia.iOS.Storage;
+
+internal class IOSStorageProvider : IStorageProvider
+{
+    private readonly AvaloniaView _view;
+    public IOSStorageProvider(AvaloniaView view)
+    {
+        _view = view;
+    }
+
+    public bool CanOpen => true;
+
+    public bool CanSave => false;
+
+    public bool CanPickFolder => true;
+
+    public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+    {
+        UIDocumentPickerViewController documentPicker;
+        if (OperatingSystem.IsIOSVersionAtLeast(14))
+        {
+            var allowedUtis = options.FileTypeFilter?.SelectMany(f =>
+                {
+                    // We check for OS version outside of the lambda, it's safe.
+#pragma warning disable CA1416
+                    if (f.AppleUniformTypeIdentifiers?.Any() == true)
+                    {
+                        return f.AppleUniformTypeIdentifiers.Select(id => UTType.CreateFromIdentifier(id));
+                    }
+                    if (f.MimeTypes?.Any() == true)
+                    {
+                        return f.MimeTypes.Select(id => UTType.CreateFromMimeType(id));
+                    }
+                    return Array.Empty<UTType>();
+#pragma warning restore CA1416
+                })
+                .Where(id => id is not null)
+                .ToArray() ?? new[]
+            {
+                UTTypes.Content,
+                UTTypes.Item,
+                UTTypes.Data
+            };
+            documentPicker = new UIDocumentPickerViewController(allowedUtis!, false);
+        }
+        else
+        {
+            var allowedUtis = options.FileTypeFilter?.SelectMany(f => f.AppleUniformTypeIdentifiers ?? Array.Empty<string>())
+                .ToArray() ?? new[]
+            {
+                UTTypeLegacy.Content,
+                UTTypeLegacy.Item,
+                "public.data"
+            };
+            documentPicker = new UIDocumentPickerViewController(allowedUtis, UIDocumentPickerMode.Open);
+        }
+
+        using (documentPicker)
+        {
+            if (OperatingSystem.IsIOSVersionAtLeast(13))
+            {
+                documentPicker.DirectoryUrl = GetUrlFromFolder(options.SuggestedStartLocation);
+            }
+
+            if (OperatingSystem.IsIOSVersionAtLeast(11, 0))
+            {
+                documentPicker.AllowsMultipleSelection = options.AllowMultiple;
+            }
+
+            var urls = await ShowPicker(documentPicker);
+            return urls.Select(u => new IOSStorageFile(u)).ToArray();
+        }
+    }
+
+    public Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark)
+    {
+        return Task.FromResult<IStorageBookmarkFile?>(GetBookmarkedUrl(bookmark) is { } url
+            ? new IOSStorageFile(url) : null);
+    }
+
+    public Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark)
+    {
+        return Task.FromResult<IStorageBookmarkFolder?>(GetBookmarkedUrl(bookmark) is { } url
+            ? new IOSStorageFolder(url) : null);
+    }
+
+    public Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
+    {
+        return Task.FromException<IStorageFile?>(
+            new PlatformNotSupportedException("Save file picker is not supported by iOS"));
+    }
+
+    public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+    {
+        using var documentPicker = OperatingSystem.IsIOSVersionAtLeast(14) ?
+            new UIDocumentPickerViewController(new[] { UTTypes.Folder }, false) :
+            new UIDocumentPickerViewController(new string[] { UTTypeLegacy.Folder }, UIDocumentPickerMode.Open);
+
+        if (OperatingSystem.IsIOSVersionAtLeast(13))
+        {
+            documentPicker.DirectoryUrl = GetUrlFromFolder(options.SuggestedStartLocation);
+        }
+
+        if (OperatingSystem.IsIOSVersionAtLeast(11))
+        {
+            documentPicker.AllowsMultipleSelection = options.AllowMultiple;
+        }
+        
+        var urls = await ShowPicker(documentPicker);
+        return urls.Select(u => new IOSStorageFolder(u)).ToArray();
+    }
+
+    private static NSUrl? GetUrlFromFolder(IStorageFolder? folder)
+    {
+        if (folder is IOSStorageFolder iosFolder)
+        {
+            return iosFolder.Url;
+        }
+
+        if (folder?.TryGetUri(out var fullPath) == true)
+        {
+            return fullPath;
+        }
+
+        return null;
+    }
+
+    private Task<NSUrl[]> ShowPicker(UIDocumentPickerViewController documentPicker)
+    {
+        var tcs = new TaskCompletionSource<NSUrl[]>();
+        documentPicker.Delegate = new PickerDelegate(urls => tcs.TrySetResult(urls));
+
+        if (documentPicker.PresentationController != null)
+        {
+            documentPicker.PresentationController.Delegate =
+                new UIPresentationControllerDelegate(() => tcs.TrySetResult(Array.Empty<NSUrl>()));
+        }
+
+        var controller = _view.Window?.RootViewController ?? throw new InvalidOperationException("RootViewController wasn't initialized");
+        controller.PresentViewController(documentPicker, true, null);
+        
+        return tcs.Task;
+    }
+
+    private NSUrl? GetBookmarkedUrl(string bookmark)
+    {
+        var url = NSUrl.FromBookmarkData(new NSData(bookmark, NSDataBase64DecodingOptions.None),
+            NSUrlBookmarkResolutionOptions.WithoutUI, null, out var isStale, out var error);
+        if (isStale)
+        {
+            Logger.TryGet(LogEventLevel.Warning, LogArea.IOSPlatform)?.Log(this, "Stale bookmark detected");
+        }
+            
+        if (error != null)
+        {
+            throw new NSErrorException(error);
+        }
+        return url;
+    }
+        
+    private class PickerDelegate : UIDocumentPickerDelegate
+    {
+        private readonly Action<NSUrl[]>? _pickHandler;
+
+        internal PickerDelegate(Action<NSUrl[]> pickHandler)
+            => _pickHandler = pickHandler;
+
+        public override void WasCancelled(UIDocumentPickerViewController controller)
+            => _pickHandler?.Invoke(Array.Empty<NSUrl>());
+
+        public override void DidPickDocument(UIDocumentPickerViewController controller, NSUrl[] urls)
+            => _pickHandler?.Invoke(urls);
+
+        public override void DidPickDocument(UIDocumentPickerViewController controller, NSUrl url)
+            => _pickHandler?.Invoke(new[] { url });
+    }
+
+    private class UIPresentationControllerDelegate : UIAdaptivePresentationControllerDelegate
+    {
+        private Action? _dismissHandler;
+
+        internal UIPresentationControllerDelegate(Action dismissHandler)
+            => this._dismissHandler = dismissHandler;
+
+        public override void DidDismiss(UIPresentationController presentationController)
+        {
+            _dismissHandler?.Invoke();
+            _dismissHandler = null;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _dismissHandler?.Invoke();
+            base.Dispose(disposing);
+        }
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs b/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
new file mode 100644
index 0000000000..5298be107c
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
@@ -0,0 +1,92 @@
+#nullable enable
+using Avalonia.Input.TextInput;
+using Foundation;
+using UIKit;
+
+namespace Avalonia.iOS;
+
+partial class AvaloniaView
+{
+    partial class TextInputResponder
+    {
+        [Export("autocapitalizationType")]
+        public UITextAutocapitalizationType AutocapitalizationType { get; private set; }
+
+        [Export("autocorrectionType")]
+        public UITextAutocorrectionType AutocorrectionType => UITextAutocorrectionType.Yes;
+
+        [Export("keyboardType")]
+        public UIKeyboardType KeyboardType =>
+            _view._options == null ?
+                UIKeyboardType.Default :
+                _view._options.ContentType switch
+                {
+                    TextInputContentType.Alpha => UIKeyboardType.AsciiCapable,
+                    TextInputContentType.Digits or TextInputContentType.Number => UIKeyboardType.NumberPad,
+                    TextInputContentType.Pin => UIKeyboardType.NumberPad,
+                    TextInputContentType.Email => UIKeyboardType.EmailAddress,
+                    TextInputContentType.Url => UIKeyboardType.Url,
+                    TextInputContentType.Name => UIKeyboardType.NamePhonePad,
+                    TextInputContentType.Social => UIKeyboardType.Twitter,
+                    TextInputContentType.Search => UIKeyboardType.WebSearch,
+                    _ => UIKeyboardType.Default
+                };
+
+        [Export("keyboardAppearance")]
+        public UIKeyboardAppearance KeyboardAppearance => UIKeyboardAppearance.Alert;
+
+        [Export("returnKeyType")]
+        public UIReturnKeyType ReturnKeyType
+        {
+            get
+            {
+                if (_view._options != null)
+                {
+                    return _view._options.ReturnKeyType switch
+                    {
+                        TextInputReturnKeyType.Done => UIReturnKeyType.Done,
+                        TextInputReturnKeyType.Go => UIReturnKeyType.Go,
+                        TextInputReturnKeyType.Search => UIReturnKeyType.Search,
+                        TextInputReturnKeyType.Next => UIReturnKeyType.Next,
+                        TextInputReturnKeyType.Return => UIReturnKeyType.Default,
+                        TextInputReturnKeyType.Send => UIReturnKeyType.Send,
+                        _ => _view._options.Multiline ? UIReturnKeyType.Default : UIReturnKeyType.Done
+                    };
+                }
+
+                return UIReturnKeyType.Default;
+            }
+        } 
+
+        [Export("enablesReturnKeyAutomatically")]
+        public bool EnablesReturnKeyAutomatically { get; set; }
+
+        [Export("isSecureTextEntry")] public bool IsSecureEntry =>
+            _view._options?.ContentType is TextInputContentType.Password or TextInputContentType.Pin 
+            || (_view._options?.IsSensitive ?? false);
+
+        [Export("spellCheckingType")] public UITextSpellCheckingType SpellCheckingType => UITextSpellCheckingType.Yes;
+
+        [Export("textContentType")] public NSString TextContentType { get; set; } = new NSString("text/plain");
+
+        [Export("smartQuotesType")]
+        public UITextSmartQuotesType SmartQuotesType { get; set; } = UITextSmartQuotesType.Default;
+
+        [Export("smartDashesType")]
+        public UITextSmartDashesType SmartDashesType { get; set; } = UITextSmartDashesType.Default;
+
+        [Export("smartInsertDeleteType")]
+        public UITextSmartInsertDeleteType SmartInsertDeleteType { get; set; } = UITextSmartInsertDeleteType.Default;
+
+        [Export("passwordRules")] public UITextInputPasswordRules PasswordRules { get; set; } = null!;
+
+        public NSObject? WeakInputDelegate
+        {
+            get;
+            set;
+        }
+
+        NSObject IUITextInput.WeakTokenizer => _tokenizer;
+        
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.cs b/src/iOS/Avalonia.iOS/TextInputResponder.cs
new file mode 100644
index 0000000000..d5723d78f7
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.cs
@@ -0,0 +1,491 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+using Avalonia.Controls.Presenters;
+using Foundation;
+using ObjCRuntime;
+using Avalonia.Input.TextInput;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Logging;
+using CoreGraphics;
+using UIKit;
+// ReSharper disable InconsistentNaming
+// ReSharper disable StringLiteralTypo
+
+namespace Avalonia.iOS;
+
+#nullable enable
+
+partial class AvaloniaView
+{
+
+    [Adopts("UITextInput")]
+    [Adopts("UITextInputTraits")]
+    [Adopts("UIKeyInput")]
+    partial class TextInputResponder : UIResponder, IUITextInput
+    {
+        private class AvaloniaTextRange : UITextRange, INSCopying
+        {
+            private UITextPosition? _start;
+            private UITextPosition? _end;
+            public int StartIndex { get; }
+            public int EndIndex { get; }
+
+            public AvaloniaTextRange(int startIndex, int endIndex)
+            {
+                if (startIndex < 0)
+                    throw new ArgumentOutOfRangeException(nameof(startIndex));
+
+                if (endIndex < startIndex)
+                    throw new ArgumentOutOfRangeException(nameof(endIndex));
+
+                StartIndex = startIndex;
+                EndIndex = endIndex;
+            }
+
+            public override bool IsEmpty => StartIndex == EndIndex;
+
+            public override UITextPosition Start => _start ??= new AvaloniaTextPosition(StartIndex);
+            public override UITextPosition End => _end ??= new AvaloniaTextPosition(EndIndex);
+            public NSObject Copy(NSZone? zone)
+            {
+                return new AvaloniaTextRange(StartIndex, EndIndex);
+            }
+        }
+
+        private class AvaloniaTextPosition : UITextPosition, INSCopying
+        {
+            public AvaloniaTextPosition(int index)
+            {
+                if (index < 0)
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                Index = index;
+            }
+
+            public int Index { get; }
+            public NSObject Copy(NSZone? zone) => new AvaloniaTextPosition(Index);
+        }
+
+        public TextInputResponder(AvaloniaView view, ITextInputMethodClient client)
+        {
+            _view = view;
+            NextResponder = view;
+            _client = client;
+            _tokenizer = new UITextInputStringTokenizer(this);
+        }
+
+        public override UIResponder NextResponder { get; }
+
+        private readonly ITextInputMethodClient _client;
+        private int _inSurroundingTextUpdateEvent;
+        private readonly UITextPosition _beginningOfDocument = new AvaloniaTextPosition(0);
+        private readonly UITextInputStringTokenizer _tokenizer;
+
+        public ITextInputMethodClient? Client => _client;
+
+        public override bool CanResignFirstResponder => true;
+
+        public override bool CanBecomeFirstResponder => true;
+
+        public override UIEditingInteractionConfiguration EditingInteractionConfiguration =>
+            UIEditingInteractionConfiguration.Default;
+
+        public override NSString TextInputContextIdentifier => new NSString(Guid.NewGuid().ToString());
+
+        public override UITextInputMode TextInputMode => UITextInputMode.CurrentInputMode;
+
+        [DllImport("/usr/lib/libobjc.dylib")]
+        private static extern void objc_msgSend(IntPtr receiver, IntPtr selector, IntPtr arg);
+
+        private static readonly IntPtr SelectionWillChange = Selector.GetHandle("selectionWillChange:");
+        private static readonly IntPtr SelectionDidChange = Selector.GetHandle("selectionDidChange:");
+        private static readonly IntPtr TextWillChange = Selector.GetHandle("textWillChange:");
+        private static readonly IntPtr TextDidChange = Selector.GetHandle("textDidChange:");
+        private readonly AvaloniaView _view;
+        private string? _markedText;
+
+        
+        
+        private void SurroundingTextChanged(object? sender, EventArgs e)
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "SurroundingTextChanged");
+            if (WeakInputDelegate == null)
+                return;
+            _inSurroundingTextUpdateEvent++;
+            try
+            {
+                objc_msgSend(WeakInputDelegate.Handle.Handle, TextWillChange, Handle.Handle);
+                objc_msgSend(WeakInputDelegate.Handle.Handle, TextDidChange, Handle.Handle);
+                objc_msgSend(WeakInputDelegate.Handle.Handle, SelectionWillChange, this.Handle.Handle);
+                objc_msgSend(WeakInputDelegate.Handle.Handle, SelectionDidChange, this.Handle.Handle);
+            }
+            finally
+            {
+                _inSurroundingTextUpdateEvent--;
+            }
+        }
+
+        private void KeyPress(Key ev)
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "Triggering key press {key}", ev);
+            _view._topLevelImpl.Input(new RawKeyEventArgs(KeyboardDevice.Instance!, 0, _view.InputRoot,
+                RawKeyEventType.KeyDown, ev, RawInputModifiers.None));
+
+            _view._topLevelImpl.Input(new RawKeyEventArgs(KeyboardDevice.Instance!, 0, _view.InputRoot,
+                RawKeyEventType.KeyUp, ev, RawInputModifiers.None));
+        }
+
+        private void TextInput(string text)
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "Triggering text input {text}", text);
+            _view._topLevelImpl.Input(new RawTextInputEventArgs(KeyboardDevice.Instance!, 0, _view.InputRoot, text));
+        }
+
+        void IUIKeyInput.InsertText(string text)
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "IUIKeyInput.InsertText {text}", text);
+
+            if (text == "\n")
+            {
+                KeyPress(Key.Enter);
+
+                switch (ReturnKeyType)
+                {
+                    case UIReturnKeyType.Done:
+                        case UIReturnKeyType.Go:
+                        case UIReturnKeyType.Send:
+                        case UIReturnKeyType.Search:
+                        ResignFirstResponder();
+                        break;
+                }
+                return;
+            }
+
+            TextInput(text);
+        }
+        
+        void IUIKeyInput.DeleteBackward() => KeyPress(Key.Back);
+
+        bool IUIKeyInput.HasText => true;
+
+        string IUITextInput.TextInRange(UITextRange range)
+        {
+            var r = (AvaloniaTextRange)range;
+            var s = _client.SurroundingText;
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "IUIKeyInput.TextInRange {start} {end}", r.StartIndex, r.EndIndex);
+
+            string result = "";
+            if(string.IsNullOrEmpty(_markedText))
+                result = s.Text[r.StartIndex .. r.EndIndex];
+            else
+            {
+                var span = new CombinedSpan3<char>(s.Text.AsSpan().Slice(0, s.CursorOffset),
+                    _markedText,
+                    s.Text.AsSpan().Slice(s.CursorOffset));
+                var buf = new char[r.EndIndex - r.StartIndex];
+                span.CopyTo(buf, r.StartIndex);
+                result = new string(buf);
+            }
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "result: {res}", result);
+
+            return result;
+        }
+
+        void IUITextInput.ReplaceText(UITextRange range, string text)
+        {
+            var r = (AvaloniaTextRange)range;
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUIKeyInput.ReplaceText {start} {end} {text}", r.StartIndex, r.EndIndex, text);
+            _client.SelectInSurroundingText(r.StartIndex, r.EndIndex);
+            TextInput(text);
+        }
+
+        void IUITextInput.SetMarkedText(string markedText, NSRange selectedRange)
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUIKeyInput.SetMarkedText {start} {len} {text}", selectedRange.Location,
+                    selectedRange.Location, markedText);
+
+            _markedText = markedText;
+            _client.SetPreeditText(markedText);
+        }
+
+        void IUITextInput.UnmarkText()
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "IUIKeyInput.UnmarkText");
+            if(_markedText == null)
+                return;
+            var commitString = _markedText;
+            _markedText = null;
+            _client.SetPreeditText(null);
+            if (string.IsNullOrWhiteSpace(commitString))
+                return;
+            TextInput(commitString);
+        }
+
+        public UITextRange GetTextRange(UITextPosition fromPosition, UITextPosition toPosition)
+        {
+            var f = (AvaloniaTextPosition)fromPosition;
+            var t = (AvaloniaTextPosition)toPosition;
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?.Log(null, "IUIKeyInput.GetTextRange {start} {end}", f.Index, t.Index);
+
+            return new AvaloniaTextRange(f.Index, t.Index);
+        }
+
+        UITextPosition IUITextInput.GetPosition(UITextPosition fromPosition, nint offset)
+        {
+            var pos = (AvaloniaTextPosition)fromPosition;
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)
+                ?.Log(null, "IUIKeyInput.GetPosition {start} {offset}", pos.Index, (int)offset);
+
+             var res = GetPositionCore(pos, offset);
+             Logger.TryGet(LogEventLevel.Debug, ImeLog)
+                 ?.Log(null, $"res: " + (res == null ? "null" : (int)res.Index));
+             return res!;
+        }
+
+        private AvaloniaTextPosition? GetPositionCore(AvaloniaTextPosition pos, nint offset)
+        {
+            
+            var end = pos.Index + (int)offset;
+            if (end < 0)
+                return null!;
+            if (end > DocumentLength)
+                return null;
+            return new AvaloniaTextPosition(end);
+        }
+
+        UITextPosition IUITextInput.GetPosition(UITextPosition fromPosition, UITextLayoutDirection inDirection,
+            nint offset)
+        {
+            var pos = (AvaloniaTextPosition)fromPosition;
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)
+                ?.Log(null, "IUIKeyInput.GetPosition {start} {direction} {offset}", pos.Index,  inDirection, (int)offset);
+
+            var res = GetPositionCore(pos, inDirection, offset);
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)
+                ?.Log(null, $"res: " + (res == null ? "null" : (int)res.Index));
+            return res!;
+        }
+        
+        private AvaloniaTextPosition? GetPositionCore(AvaloniaTextPosition fromPosition, UITextLayoutDirection inDirection,
+            nint offset)
+        {
+            var f = (AvaloniaTextPosition)fromPosition;
+            var newPosition = f.Index;
+
+            switch (inDirection)
+            {
+                case UITextLayoutDirection.Left:
+                    newPosition -= (int)offset;
+                    break;
+
+                case UITextLayoutDirection.Right:
+                    newPosition += (int)offset;
+                    break;
+            }
+
+            if (newPosition < 0)
+                return null!;
+
+            if (newPosition > DocumentLength)
+                return null!;
+
+            return new AvaloniaTextPosition(newPosition);
+        }
+
+        NSComparisonResult IUITextInput.ComparePosition(UITextPosition first, UITextPosition second)
+        {
+            var f = (AvaloniaTextPosition)first;
+            var s = (AvaloniaTextPosition)second;
+            if (f.Index < s.Index)
+                return NSComparisonResult.Ascending;
+
+            if (f.Index > s.Index)
+                return NSComparisonResult.Descending;
+
+            return NSComparisonResult.Same;
+        }
+
+        nint IUITextInput.GetOffsetFromPosition(UITextPosition fromPosition, UITextPosition toPosition)
+        {
+            var f = (AvaloniaTextPosition)fromPosition;
+            var t = (AvaloniaTextPosition)toPosition;
+            return t.Index - f.Index;
+        }
+
+        UITextPosition IUITextInput.GetPositionWithinRange(UITextRange range, UITextLayoutDirection direction)
+        {
+            var r = (AvaloniaTextRange)range;
+
+            if (direction is UITextLayoutDirection.Right or UITextLayoutDirection.Down)
+                return r.End;
+            return r.Start;
+        }
+
+        UITextRange IUITextInput.GetCharacterRange(UITextPosition byExtendingPosition, UITextLayoutDirection direction)
+        {
+            var p = (AvaloniaTextPosition)byExtendingPosition;
+            if (direction is UITextLayoutDirection.Left or UITextLayoutDirection.Up)
+                return new AvaloniaTextRange(0, p.Index);
+
+            return new AvaloniaTextRange(p.Index, DocumentLength);
+        }
+
+        NSWritingDirection IUITextInput.GetBaseWritingDirection(UITextPosition forPosition,
+            UITextStorageDirection direction)
+        {
+            return NSWritingDirection.LeftToRight;
+
+            // todo query and retyrn RTL.
+        }
+
+        void IUITextInput.SetBaseWritingDirectionforRange(NSWritingDirection writingDirection, UITextRange range)
+        {
+            // todo ? ignore?
+        }
+
+        CGRect IUITextInput.GetFirstRectForRange(UITextRange range)
+        {
+            
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUITextInput:GetFirstRectForRange");
+            // TODO: Query from the input client
+            var r = _view._cursorRect;
+
+            return new CGRect(r.Left, r.Top, r.Width, r.Height);
+        }
+
+        CGRect IUITextInput.GetCaretRectForPosition(UITextPosition? position)
+        {
+            // TODO: Query from the input client
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUITextInput:GetCaretRectForPosition");
+            var rect = _client.CursorRectangle;
+
+            return new CGRect(rect.X, rect.Y, rect.Width, rect.Height);
+        }
+
+        UITextPosition IUITextInput.GetClosestPositionToPoint(CGPoint point)
+        {
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUITextInput:GetClosestPositionToPoint");
+
+            var presenter = _client.TextViewVisual as TextPresenter;
+
+            if (presenter is { })
+            {
+                var hitResult = presenter.TextLayout.HitTestPoint(new Point(point.X, point.Y));
+                
+                return new AvaloniaTextPosition(hitResult.TextPosition);
+            }
+
+            return null;
+        }
+
+        UITextPosition IUITextInput.GetClosestPositionToPoint(CGPoint point, UITextRange withinRange)
+        {
+            // TODO: Query from the input client
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUITextInput:GetClosestPositionToPoint");
+            return new AvaloniaTextPosition(0);
+        }
+
+        UITextRange IUITextInput.GetCharacterRangeAtPoint(CGPoint point)
+        {
+            // TODO: Query from the input client
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUITextInput:GetCharacterRangeAtPoint");
+            return new AvaloniaTextRange(0, 0);
+        }
+
+        UITextSelectionRect[] IUITextInput.GetSelectionRects(UITextRange range)
+        {
+            // TODO: Query from the input client
+            Logger.TryGet(LogEventLevel.Debug, ImeLog)?
+                .Log(null, "IUITextInput:GetSelectionRect");
+            return Array.Empty<UITextSelectionRect>();
+        }
+
+        [Export("textStylingAtPosition:inDirection:")]
+        public NSDictionary GetTextStylingAtPosition(UITextPosition position, UITextStorageDirection direction)
+        {
+            return null!;
+        }
+
+        UITextRange? IUITextInput.SelectedTextRange
+        {
+            get
+            {
+                return new AvaloniaTextRange(
+                    Math.Min(_client.SurroundingText.CursorOffset, _client.SurroundingText.AnchorOffset),
+                    Math.Max(_client.SurroundingText.CursorOffset, _client.SurroundingText.AnchorOffset));
+            }
+            set
+            {
+                if (_inSurroundingTextUpdateEvent > 0)
+                    return;
+                if (value == null)
+                    _client.SelectInSurroundingText(_client.SurroundingText.CursorOffset,
+                        _client.SurroundingText.CursorOffset);
+                else
+                {
+                    var r = (AvaloniaTextRange)value;
+                    _client.SelectInSurroundingText(r.StartIndex, r.EndIndex);
+                }
+            }
+        }
+
+        NSDictionary? IUITextInput.MarkedTextStyle
+        {
+            get => null;
+            set {}
+        }
+
+        UITextPosition IUITextInput.BeginningOfDocument => _beginningOfDocument;
+
+        private int DocumentLength => _client.SurroundingText.Text.Length + (_markedText?.Length ?? 0);
+        UITextPosition IUITextInput.EndOfDocument => new AvaloniaTextPosition(DocumentLength);
+
+        UITextRange IUITextInput.MarkedTextRange
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(_markedText))
+                    return null!;
+                return new AvaloniaTextRange(_client.SurroundingText.CursorOffset, _client.SurroundingText.CursorOffset + _markedText.Length);
+            }
+        }
+
+        public override bool BecomeFirstResponder()
+        {
+            var res = base.BecomeFirstResponder();
+            if (res)
+            {
+                Logger.TryGet(LogEventLevel.Debug, "IOSIME")
+                    ?.Log(null, "Became first responder");
+                _client.SurroundingTextChanged += SurroundingTextChanged;
+                CurrentAvaloniaResponder = this;
+            }
+
+            return res;
+        }
+
+
+        public override bool ResignFirstResponder()
+        {
+            var res = base.ResignFirstResponder();
+            if (res && ReferenceEquals(CurrentAvaloniaResponder, this))
+            {
+                
+                Logger.TryGet(LogEventLevel.Debug, "IOSIME")
+                    ?.Log(null, "Resigned first responder");
+                _client.SurroundingTextChanged -= SurroundingTextChanged;
+                CurrentAvaloniaResponder = null;
+            }
+
+            return res;
+        }
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/TouchHandler.cs b/src/iOS/Avalonia.iOS/TouchHandler.cs
index 43b19c85af..959a660d8a 100644
--- a/src/iOS/Avalonia.iOS/TouchHandler.cs
+++ b/src/iOS/Avalonia.iOS/TouchHandler.cs
@@ -41,7 +41,7 @@ namespace Avalonia.iOS
                         _ => RawPointerEventType.TouchUpdate
                     }, pt, RawInputModifiers.None, id);
 
-                _device.ProcessRawEvent(ev);
+                _tl.Input?.Invoke(ev);
                 
                 if (t.Phase == UITouchPhase.Cancelled || t.Phase == UITouchPhase.Ended)
                     _knownTouches.Remove(t);
@@ -49,4 +49,4 @@ namespace Avalonia.iOS
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index a2d27fd579..0c0fe5b921 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -3,25 +3,24 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
+  <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
+  <PropertyGroup>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>  
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
     <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\src\Markup\Avalonia.Markup.Xaml.Loader\IncludeXamlIlSre.props" />
   <ItemGroup>
     <Compile Include="..\..\..\src\Markup\Avalonia.Markup.Xaml.Loader\CompilerExtensions\**\*.cs" />
     <Compile Include="..\..\..\src\Markup\Avalonia.Markup.Xaml.Loader\AvaloniaXamlIlRuntimeCompiler.cs" />
+    <Compile Include="..\..\Avalonia.Base\Utilities\StringBuilderCache.cs" Link="Utilities\StringBuilderCache.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
diff --git a/src/tools/DevAnalyzers/DevAnalyzers.csproj b/src/tools/DevAnalyzers/DevAnalyzers.csproj
new file mode 100644
index 0000000000..53e3e74e76
--- /dev/null
+++ b/src/tools/DevAnalyzers/DevAnalyzers.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>10</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs b/src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs
new file mode 100644
index 0000000000..8ecd9119f6
--- /dev/null
+++ b/src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs
@@ -0,0 +1,40 @@
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace DevAnalyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class GenericVirtualAnalyzer : DiagnosticAnalyzer
+{
+    public const string DiagnosticId = "AVADEV1001";
+
+    private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(
+        DiagnosticId,
+        "Do not use generic virtual methods",
+        "Method '{0}' is a generic virtual method",
+        "Performance",
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        description: "Generic virtual methods affect JIT startup time adversly and should be avoided.");
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
+        context.EnableConcurrentExecution();
+        context.RegisterSymbolAction(AnalyzeMethod, SymbolKind.Method);
+    }
+
+    private static void AnalyzeMethod(SymbolAnalysisContext context)
+    {
+        var symbol = (IMethodSymbol)context.Symbol;
+
+        if (symbol.IsGenericMethod &&
+            (symbol.IsVirtual || symbol.ContainingType.TypeKind == TypeKind.Interface))
+        {
+            context.ReportDiagnostic(Diagnostic.Create(Rule, symbol.Locations[0], symbol.Name));
+        }
+    }
+}
diff --git a/src/tools/DevAnalyzers/GlobalSuppressions.cs b/src/tools/DevAnalyzers/GlobalSuppressions.cs
new file mode 100644
index 0000000000..9428b904b8
--- /dev/null
+++ b/src/tools/DevAnalyzers/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
diff --git a/src/tools/DevAnalyzers/OnPropertyChangedOverrideAnalyzer.cs b/src/tools/DevAnalyzers/OnPropertyChangedOverrideAnalyzer.cs
new file mode 100644
index 0000000000..8534ed4a66
--- /dev/null
+++ b/src/tools/DevAnalyzers/OnPropertyChangedOverrideAnalyzer.cs
@@ -0,0 +1,60 @@
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace DevAnalyzers
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class OnPropertyChangedOverrideAnalyzer : DiagnosticAnalyzer
+    {
+        public const string DiagnosticId = "AVADEV2001";
+
+        private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(
+            DiagnosticId,
+            "Missing invoke base.OnPropertyChanged",
+            "Method '{0}' do not invoke base.{0}",
+            "Potential issue",
+            DiagnosticSeverity.Warning,
+            isEnabledByDefault: true,
+            description: "The OnPropertyChanged of the base class was not invoked in the override method declaration, which could lead to unwanted behavior.");
+
+        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
+
+        public override void Initialize(AnalysisContext context)
+        {
+            context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
+            context.EnableConcurrentExecution();
+            context.RegisterSyntaxNodeAction(AnalyzeMethod, SyntaxKind.MethodDeclaration);
+        }
+
+        private static void AnalyzeMethod(SyntaxNodeAnalysisContext context)
+        {
+            var method = (MethodDeclarationSyntax)context.Node;
+            if (context.SemanticModel.GetDeclaredSymbol(method, context.CancellationToken) is IMethodSymbol currentMethod
+                && currentMethod.Name == "OnPropertyChanged"
+                && currentMethod.OverriddenMethod is IMethodSymbol originalMethod)
+            {
+                var baseInvocations = method.Body?.DescendantNodes().OfType<BaseExpressionSyntax>();
+                if (baseInvocations?.Any() == true)
+                {
+                    foreach (var baseInvocation in baseInvocations)
+                    {
+                        if (baseInvocation.Parent is SyntaxNode parent)
+                        {
+                            var targetSymbol = context.SemanticModel.GetSymbolInfo(parent, context.CancellationToken);
+                            if (SymbolEqualityComparer.Default.Equals(targetSymbol.Symbol, originalMethod))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+                context.ReportDiagnostic(Diagnostic.Create(Rule, currentMethod.Locations[0], currentMethod.Name));
+            }
+        }
+
+    }
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/CompositionRoslynGenerator.cs b/src/tools/DevGenerators/CompositionGenerator/CompositionRoslynGenerator.cs
new file mode 100644
index 0000000000..26bd4796df
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/CompositionRoslynGenerator.cs
@@ -0,0 +1,24 @@
+using System.IO;
+using System.Xml.Serialization;
+using Microsoft.CodeAnalysis;
+
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+    [Generator(LanguageNames.CSharp)]
+    public class CompositionRoslynGenerator : IIncrementalGenerator
+    {
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            var schema =
+                context.AdditionalTextsProvider.Where(static file => file.Path.EndsWith("composition-schema.xml"));
+            var configs = schema.Select((t, _) => t.GetText())
+                .Where(source => source is not null)
+                .Select((source, _) => (GConfig)new XmlSerializer(typeof(GConfig)).Deserialize(new StringReader(source!.ToString())));
+            context.RegisterSourceOutput(configs, (spc, config) =>
+            {
+                var generator = new Generator(new RoslynCompositionGeneratorSink(spc), config);
+                generator.Generate();
+            });
+        }
+    }
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/Config.cs b/src/tools/DevGenerators/CompositionGenerator/Config.cs
new file mode 100644
index 0000000000..d1fc691a8b
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/Config.cs
@@ -0,0 +1,124 @@
+#nullable disable
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+
+        
+    [XmlRoot("NComposition")]
+    public class GConfig
+    {
+        [XmlElement("Using")]
+        public List<GUsing> Usings { get; set; } = new List<GUsing>();
+        
+        [XmlElement(typeof(GManualClass), ElementName = "Manual")]
+        public List<GManualClass> ManualClasses { get; set; } = new List<GManualClass>();
+        
+        [XmlElement(typeof(GClass), ElementName = "Object")]
+        [XmlElement(typeof(GBrush), ElementName = "Brush")]
+        [XmlElement(typeof(GList), ElementName = "List")]
+        public List<GClass> Classes { get; set; } = new List<GClass>();
+
+        [XmlElement(typeof(GAnimationType), ElementName = "KeyFrameAnimation")]
+        public List<GAnimationType> KeyFrameAnimations { get; set; } = new List<GAnimationType>();
+    }
+        
+    public class GUsing
+    {
+        [XmlText]
+        public string Name { get; set; }
+    }
+
+    public class GManualClass
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        
+        
+        [XmlAttribute]
+        public bool Passthrough { get; set; }
+        
+        [XmlAttribute]
+        public string ServerName { get; set; }
+    }
+    
+    public class GImplements
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        [XmlAttribute]
+        public string ServerName { get; set; }
+    }
+    
+    public class GClass
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        
+        [XmlAttribute]
+        public string Inherits { get; set; }
+        
+        [XmlAttribute]
+        public string ChangesBase { get; set; }
+        
+        [XmlAttribute]
+        public string ServerBase { get; set; }
+        
+        [XmlAttribute]
+        public bool CustomCtor { get; set; }
+        
+        [XmlAttribute]
+        public bool CustomServerCtor { get; set; }
+        
+        [XmlElement(typeof(GImplements), ElementName = "Implements")]
+        public List<GImplements> Implements { get; set; } = new List<GImplements>();
+        
+        [XmlAttribute]
+        public bool Abstract { get; set; }
+        
+        [XmlElement(typeof(GProperty), ElementName = "Property")]
+        public List<GProperty> Properties { get; set; } = new List<GProperty>();
+    }
+
+    public class GBrush : GClass
+    {
+        [XmlAttribute]
+        public bool CustomUpdate { get; set; }
+        
+        public GBrush()
+        {
+            Inherits = "CompositionBrush";
+        }
+    }
+
+    public class GList : GClass
+    {
+        [XmlAttribute]
+        public string ItemType { get; set; }
+    }
+
+    public class GProperty
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        [XmlAttribute]
+        public string Type { get; set; }
+        [XmlAttribute]
+        public string DefaultValue { get; set; }
+        [XmlAttribute]
+        public bool Animated { get; set; }
+        [XmlAttribute]
+        public bool InternalSet { get; set; }
+        [XmlAttribute]
+        public bool Internal { get; set; }
+    }
+
+    public class GAnimationType
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        [XmlAttribute]
+        public string Type { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/tools/DevGenerators/CompositionGenerator/Extensions.cs b/src/tools/DevGenerators/CompositionGenerator/Extensions.cs
new file mode 100644
index 0000000000..f34765ec36
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/Extensions.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+    public static class Extensions
+    {
+        public static ClassDeclarationSyntax AddModifiers(this ClassDeclarationSyntax cl, params SyntaxKind[]? modifiers)
+        {
+            if (modifiers is null)
+                return cl;
+            return cl.AddModifiers(modifiers.Select(x => SyntaxFactory.Token(x)).ToArray());
+        }
+        
+        public static MethodDeclarationSyntax AddModifiers(this MethodDeclarationSyntax cl, params SyntaxKind[]? modifiers)
+        {
+            if (modifiers is null)
+                return cl;
+            return cl.AddModifiers(modifiers.Select(x => SyntaxFactory.Token(x)).ToArray());
+        }
+        
+        public static PropertyDeclarationSyntax AddModifiers(this PropertyDeclarationSyntax cl, params SyntaxKind[]? modifiers)
+        {
+            if (modifiers is null)
+                return cl;
+            return cl.AddModifiers(modifiers.Select(x => SyntaxFactory.Token(x)).ToArray());
+        }
+
+        public static ConstructorDeclarationSyntax AddModifiers(this ConstructorDeclarationSyntax cl, params SyntaxKind[]? modifiers)
+        {
+            if (modifiers is null)
+                return cl;
+            return cl.AddModifiers(modifiers.Select(x => SyntaxFactory.Token(x)).ToArray());
+        }
+        
+        public static AccessorDeclarationSyntax AddModifiers(this AccessorDeclarationSyntax cl, params SyntaxKind[]? modifiers)
+        {
+            if (modifiers is null)
+                return cl;
+            return cl.AddModifiers(modifiers.Select(x => SyntaxFactory.Token(x)).ToArray());
+        }
+        
+        public static EnumDeclarationSyntax AddModifiers(this EnumDeclarationSyntax cl, params SyntaxKind[]? modifiers)
+        {
+            if (modifiers is null)
+                return cl;
+            return cl.AddModifiers(modifiers.Select(x => SyntaxFactory.Token(x)).ToArray());
+        }
+
+        public static string WithLowerFirst(this string s)
+        {
+            if (string.IsNullOrEmpty(s))
+                return s;
+            return char.ToLowerInvariant(s[0]) + s.Substring(1);
+        }
+
+        public static ExpressionSyntax MemberAccess(params string[]? identifiers)
+        {
+            if (identifiers == null || identifiers.Length == 0)
+                throw new ArgumentException();
+            var expr = (ExpressionSyntax)IdentifierName(identifiers[0]);
+            for (var c = 1; c < identifiers.Length; c++)
+                expr = MemberAccess(expr, identifiers[c]);
+            return expr;
+        }
+        
+        public static ExpressionSyntax MemberAccess(ExpressionSyntax expr, params string[] identifiers)
+        {
+            foreach (var i in identifiers)
+                expr = MemberAccess(expr, i);
+            return expr;
+        }
+        
+        public static MemberAccessExpressionSyntax MemberAccess(ExpressionSyntax expr, string identifier) =>
+            MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, expr, IdentifierName(identifier));
+
+        public static ExpressionSyntax ConditionalMemberAccess(ExpressionSyntax expr, string member, bool checkNull)
+        {
+            if (checkNull)
+                return ConditionalAccessExpression(expr, MemberBindingExpression(IdentifierName(member)));
+            return MemberAccess(expr, member);
+        }
+        
+        public static ClassDeclarationSyntax WithBaseType(this ClassDeclarationSyntax cl, string bt)
+        {
+            return cl.AddBaseListTypes(SimpleBaseType(SyntaxFactory.ParseTypeName(bt)));
+        }
+
+        public static string StripPrefix(this string s, string prefix) => string.IsNullOrEmpty(s)
+            ? s
+            : s.StartsWith(prefix)
+                ? s.Substring(prefix.Length)
+                : s;
+    }
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
new file mode 100644
index 0000000000..9455f5fac2
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
@@ -0,0 +1,61 @@
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+    public partial class Generator
+    {
+        void GenerateAnimations()
+        {
+            var code = $@"using System.Numerics;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Rendering.Composition.Expressions;
+
+// Special license applies <see href=""https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md\"">License.md</see>
+
+namespace Avalonia.Rendering.Composition
+{{
+";
+
+            foreach (var a in _config.KeyFrameAnimations)
+            {
+                var name = a.Name ?? a.Type;
+
+                code += $@"
+    public class {name}KeyFrameAnimation : KeyFrameAnimation
+    {{
+        public {name}KeyFrameAnimation(Compositor compositor) : base(compositor)
+        {{
+        }}
+
+        internal override IAnimationInstance CreateInstance(Avalonia.Rendering.Composition.Server.ServerObject targetObject, ExpressionVariant? finalValue)
+        {{
+            return new KeyFrameAnimationInstance<{a.Type}>({name}Interpolator.Instance, _keyFrames.Snapshot(), CreateSnapshot(), 
+                finalValue?.CastOrDefault<{a.Type}>(), targetObject,
+                DelayBehavior, DelayTime, Direction, Duration, IterationBehavior,
+                IterationCount, StopBehavior);
+        }}
+        
+        private KeyFrames<{a.Type}> _keyFrames = new KeyFrames<{a.Type}>();
+        private protected override IKeyFrames KeyFrames => _keyFrames;
+
+        public void InsertKeyFrame(float normalizedProgressKey, {a.Type} value, Avalonia.Animation.Easings.IEasing easingFunction)
+        {{
+            _keyFrames.Insert(normalizedProgressKey, value, easingFunction);
+        }}
+        
+        public void InsertKeyFrame(float normalizedProgressKey, {a.Type} value)
+        {{
+            _keyFrames.Insert(normalizedProgressKey, value, Compositor.DefaultEasing);
+        }}
+    }}
+
+    public partial class Compositor
+    {{
+        public {name}KeyFrameAnimation Create{name}KeyFrameAnimation() => new {name}KeyFrameAnimation(this);
+    }}
+";
+            }
+
+            code += "}";
+            _output.AddSource("CompositionAnimations.cs", code);
+        }
+    }
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
new file mode 100644
index 0000000000..e0ea5b20ae
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
@@ -0,0 +1,123 @@
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+    public partial class Generator
+    {
+        private const string ListProxyTemplate = @"
+class Template
+{
+        private ServerListProxyHelper<ItemTypeName, ServerItemTypeName> _list = null!;
+
+        void ServerListProxyHelper<ItemTypeName, ServerItemTypeName>.IRegisterForSerialization.RegisterForSerialization() => RegisterForSerialization();
+
+        public List<ItemTypeName>.Enumerator GetEnumerator() => _list.GetEnumerator();
+
+        IEnumerator<ItemTypeName> IEnumerable<ItemTypeName>.GetEnumerator() =>
+            GetEnumerator();
+        
+        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable) _list).GetEnumerator();
+
+        public void Add(ItemTypeName item)
+        {
+            OnBeforeAdded(item);
+            _list.Add(item);
+            OnAdded(item);
+        }
+
+        public void Clear()
+        {
+            OnBeforeClear();
+            _list.Clear();
+            OnClear();
+        }
+
+        public bool Contains(ItemTypeName item) => _list.Contains(item);
+
+        public void CopyTo(ItemTypeName[] array, int arrayIndex) => _list.CopyTo(array, arrayIndex);
+
+        public bool Remove(ItemTypeName item)
+        {
+            var removed = _list.Remove(item);
+            if(removed)
+                OnRemoved(item);
+            return removed;
+        }
+
+        public int Count => _list.Count;
+
+        public bool IsReadOnly => _list.IsReadOnly;
+
+        public int IndexOf(ItemTypeName item) => _list.IndexOf(item);
+
+        public void Insert(int index, ItemTypeName item)
+        {
+            OnBeforeAdded(item);
+            _list.Insert(index, item);
+            OnAdded(item);
+        }
+
+        public void RemoveAt(int index)
+        {
+            var item = _list[index];
+            _list.RemoveAt(index);
+            OnRemoved(item);
+        }
+
+        public ItemTypeName this[int index]
+        {
+            get => _list[index];
+            set
+            {
+                var old = _list[index];
+                OnBeforeReplace(old, value);
+                _list[index] = value;
+                OnReplace(old, value);
+            }
+        }
+
+        partial void OnBeforeAdded(ItemTypeName item);
+        partial void OnAdded(ItemTypeName item);
+        partial void OnRemoved(ItemTypeName item);
+        partial void OnBeforeClear();
+        partial void OnBeforeReplace(ItemTypeName oldItem, ItemTypeName newItem);
+        partial void OnReplace(ItemTypeName oldItem, ItemTypeName newItem);
+        partial void OnClear();
+        private protected override void SerializeChangesCore(BatchStreamWriter writer)
+        {{
+            _list.Serialize(writer);
+            base.SerializeChangesCore(writer);
+        }}
+";
+
+        private ClassDeclarationSyntax AppendListProxy(GList list, ClassDeclarationSyntax cl)
+        {
+
+            var itemType = list.ItemType;
+            var serverItemType = ServerName(itemType);
+
+            cl = cl.AddBaseListTypes(SimpleBaseType(
+                    ParseTypeName("ServerListProxyHelper<" + itemType + ", " + serverItemType + ">.IRegisterForSerialization")),
+                SimpleBaseType(ParseTypeName("IList<" + itemType + ">"))
+            );
+            var code = ListProxyTemplate.Replace("ListTypeName", list.Name)
+                .Replace("ItemTypeName", itemType);
+
+            var parsed = ParseCompilationUnit(code);
+            var parsedClass = (ClassDeclarationSyntax)parsed.Members.First();
+
+            cl = cl.AddMembers(parsedClass.Members.ToArray());
+
+            var defs = cl.Members.OfType<MethodDeclarationSyntax>().First(m => m.Identifier.Text == "InitializeDefaults");
+
+            cl = cl.ReplaceNode(defs.Body, defs.Body.AddStatements(
+
+                ParseStatement($"_list = new ServerListProxyHelper<{itemType}, {serverItemType}>(this);")));
+          
+            return cl;
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs
new file mode 100644
index 0000000000..16aa15d95a
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs
@@ -0,0 +1,66 @@
+using System.IO;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+    public partial class Generator
+    {
+        static void CleanDirectory(string path)
+        {
+            Directory.CreateDirectory(path);
+            Directory.Delete(path, true);
+            Directory.CreateDirectory(path);
+        }
+        
+        CompilationUnitSyntax Unit()
+            => CompilationUnit().WithUsings(List(new[]
+                {
+                    "System",
+                    "System.Text",
+                    "System.Collections",
+                    "System.Collections.Generic"
+                }
+                .Concat(_config.Usings
+                    .Select(x => x.Name)).Select(u => UsingDirective(IdentifierName(u)))));
+        
+        void SaveTo(CompilationUnitSyntax unit, params string[] path)
+        {
+            var text = @"
+#nullable enable
+#pragma warning disable CS0108, CS0114
+
+" +
+
+                       unit.NormalizeWhitespace().ToFullString();
+            _output.AddSource(string.Join("_", path), text);
+        }
+        
+        
+        SyntaxToken Semicolon() => Token(SyntaxKind.SemicolonToken);
+
+        
+        FieldDeclarationSyntax DeclareConstant(string type, string name, LiteralExpressionSyntax value)
+            => FieldDeclaration(
+                    VariableDeclaration(ParseTypeName(type),
+                        SingletonSeparatedList(
+                            VariableDeclarator(name).WithInitializer(EqualsValueClause(value))
+                        ))
+                ).WithSemicolonToken(Semicolon())
+                .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.ConstKeyword)));
+
+        FieldDeclarationSyntax DeclareField(string type, string name, params SyntaxKind[] modifiers) =>
+            DeclareField(type, name, null, modifiers);
+
+        FieldDeclarationSyntax DeclareField(string type, string name, EqualsValueClauseSyntax? initializer,
+            params SyntaxKind[] modifiers) =>
+            FieldDeclaration(
+                    VariableDeclaration(ParseTypeName(type),
+                        SingletonSeparatedList(
+                            VariableDeclarator(name).WithInitializer(initializer))))
+                .WithSemicolonToken(Semicolon())
+                .WithModifiers(TokenList(modifiers.Select(x => Token(x))));
+    }
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
new file mode 100644
index 0000000000..5c4af5de2e
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@@ -0,0 +1,565 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using static Avalonia.SourceGenerator.CompositionGenerator.Extensions;
+namespace Avalonia.SourceGenerator.CompositionGenerator
+{
+    public partial class Generator
+    {
+        private readonly ICompositionGeneratorSink _output;
+        private readonly GConfig _config;
+        private readonly HashSet<string> _objects;
+        private readonly HashSet<string> _brushes;
+        private readonly Dictionary<string, GManualClass> _manuals;
+        public Generator(ICompositionGeneratorSink output, GConfig config)
+        {
+            _output = output;
+            _config = config;
+            _manuals = _config.ManualClasses.ToDictionary(x => x.Name);
+            _objects = new HashSet<string>(_config.ManualClasses.Select(x => x.Name)
+                .Concat(_config.Classes.Select(x => x.Name)));
+            _brushes = new HashSet<string>(_config.Classes.OfType<GBrush>().Select(x => x.Name)) {"CompositionBrush"};
+        }
+
+        
+        
+        public void Generate()
+        {
+            foreach (var cl in _config.Classes)
+                GenerateClass(cl);
+            
+            GenerateAnimations();
+        }
+
+
+
+        string ServerName(string? c) => c != null ? ("Server" + c) : "ServerObject";
+        string ChangesName(string? c) => c != null ? (c + "Changes") : "ChangeSet";
+        string ChangedFieldsTypeName(GClass c) => c.Name + "ChangedFields";
+        string ChangedFieldsFieldName(GClass c) =>  "_changedFieldsOf" + c.Name;
+        string PropertyBackingFieldName(GProperty prop) => "_" + prop.Name.WithLowerFirst();
+        string CompositionPropertyField(GProperty prop) => "s_IdOf" + prop.Name + "Property";
+
+        ExpressionSyntax ClientProperty(GClass c, GProperty p) =>
+            MemberAccess(ServerName(c.Name), CompositionPropertyField(p));
+
+        void GenerateClass(GClass cl)
+        {
+            var list = cl as GList;
+            
+            var unit = Unit();
+            
+            var clientNs = NamespaceDeclaration(IdentifierName("Avalonia.Rendering.Composition"));
+            var serverNs = NamespaceDeclaration(IdentifierName("Avalonia.Rendering.Composition.Server"));
+            var transportNs = NamespaceDeclaration(IdentifierName("Avalonia.Rendering.Composition.Transport"));
+
+            var inherits = cl.Inherits ?? "CompositionObject";
+            var abstractModifier = cl.Abstract ? new[] {SyntaxKind.AbstractKeyword} : null;
+            
+            var client = ClassDeclaration(cl.Name)
+                .AddModifiers(abstractModifier)
+                .AddModifiers(SyntaxKind.PublicKeyword, SyntaxKind.UnsafeKeyword, SyntaxKind.PartialKeyword)
+                .WithBaseType(inherits);
+            
+            var serverName = ServerName(cl.Name);
+            var serverBase = cl.ServerBase ?? ServerName(cl.Inherits);
+            if (list != null)
+                serverBase = "ServerList<" + ServerName(list.ItemType) + ">";
+            
+            var server = ClassDeclaration(serverName)
+                .AddModifiers(abstractModifier)
+                .AddModifiers(SyntaxKind.UnsafeKeyword, SyntaxKind.PartialKeyword)
+                .WithBaseType(serverBase);
+
+            string changesName = ChangesName(cl.Name);
+            string changedFieldsTypeName = ChangedFieldsTypeName(cl);
+            string changedFieldsName = ChangedFieldsFieldName(cl);
+
+            if (cl.Properties.Count > 0)
+                client = client
+                    .AddMembers(DeclareField(changedFieldsTypeName, changedFieldsName));
+            
+            
+            if (!cl.CustomCtor)
+            {
+                client = client.AddMembers(PropertyDeclaration(ParseTypeName(serverName), "Server")
+                    .AddModifiers(SyntaxKind.InternalKeyword, SyntaxKind.NewKeyword)
+                    .AddAccessorListAccessors(AccessorDeclaration(SyntaxKind.GetAccessorDeclaration)
+                        .WithSemicolonToken(Semicolon())));
+            client = client.AddMembers(
+                    ConstructorDeclaration(cl.Name)
+                        .AddModifiers(SyntaxKind.InternalKeyword)
+                        .WithParameterList(ParameterList(SeparatedList(new[]
+                        {
+                            Parameter(Identifier("compositor")).WithType(ParseTypeName("Compositor")),
+                            Parameter(Identifier("server")).WithType(ParseTypeName(serverName)),
+                        })))
+                        .WithInitializer(ConstructorInitializer(SyntaxKind.BaseConstructorInitializer,
+                            ArgumentList(SeparatedList(new[]
+                            {
+                                Argument(IdentifierName("compositor")),
+                                Argument(IdentifierName("server")),
+                            })))).WithBody(Block(
+                            ExpressionStatement(
+                                AssignmentExpression(
+                                    SyntaxKind.SimpleAssignmentExpression,
+                                    IdentifierName("Server"),
+                                    CastExpression(ParseTypeName(serverName), IdentifierName("server")))),
+                            ExpressionStatement(InvocationExpression(IdentifierName("InitializeDefaults")))
+                        )));
+            }
+
+            if (!cl.CustomServerCtor)
+            {
+                server = server.AddMembers(
+                    ConstructorDeclaration(serverName)
+                        .AddModifiers(SyntaxKind.InternalKeyword)
+                        .WithParameterList(ParameterList(SeparatedList(new[]
+                        {
+                            Parameter(Identifier("compositor")).WithType(ParseTypeName("ServerCompositor")),
+                        })))
+                        .WithInitializer(ConstructorInitializer(SyntaxKind.BaseConstructorInitializer,
+                            ArgumentList(SeparatedList(new[]
+                            {
+                                Argument(IdentifierName("compositor")),
+                            })))).WithBody(Block(ParseStatement("Initialize();"))));
+            }
+
+            server = server.AddMembers(
+                MethodDeclaration(ParseTypeName("void"), "Initialize")
+                    .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
+
+            server = server.AddMembers(
+                MethodDeclaration(ParseTypeName("void"), "DeserializeChangesExtra")
+                    .AddParameterListParameters(Parameter(Identifier("c")).WithType(ParseTypeName("BatchStreamReader")))
+                    .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
+
+            var resetBody = Block();
+            var startAnimationBody = Block();
+            var serverGetPropertyBody = Block();
+            var serverGetCompositionPropertyBody = Block();
+            var serializeMethodBody = SerializeChangesPrologue(cl);
+            var deserializeMethodBody = DeserializeChangesPrologue(cl);
+
+            var defaultsMethodBody = Block(ParseStatement("InitializeDefaultsExtra();"));
+            
+            foreach (var prop in cl.Properties)
+            {
+                var fieldName = PropertyBackingFieldName(prop);
+                var propType = ParseTypeName(prop.Type);
+                var filteredPropertyType = prop.Type.TrimEnd('?');
+                var isObject = _objects.Contains(filteredPropertyType);
+                var isNullable = prop.Type.EndsWith("?");
+                bool isPassthrough = false;
+
+                client = GenerateClientProperty(client, cl, prop, propType, isObject, isNullable);
+
+                var animatedServer = prop.Animated;
+                
+                var serverPropertyType = ((isObject ? "Server" : "") + prop.Type);
+                if (_manuals.TryGetValue(filteredPropertyType, out var manual))
+                {
+                    if (manual.Passthrough)
+                    {
+                        isPassthrough = true;
+                        serverPropertyType = prop.Type;
+                    }
+
+                    if (manual.ServerName != null)
+                        serverPropertyType = manual.ServerName + (isNullable ? "?" : "");
+                }
+                
+                if (animatedServer)
+                    server = server.AddMembers(
+                        DeclareField(serverPropertyType, fieldName),
+                        PropertyDeclaration(ParseTypeName(serverPropertyType), prop.Name)
+                            .AddModifiers(SyntaxKind.PublicKeyword)
+                            .WithExpressionBody(ArrowExpressionClause(
+                                InvocationExpression(IdentifierName("GetAnimatedValue"),
+                                    ArgumentList(SeparatedList(new[]{
+                                        Argument(IdentifierName(CompositionPropertyField(prop))),
+                                        Argument(null, Token(SyntaxKind.RefKeyword), IdentifierName(fieldName))
+                                        }
+                                        )))))
+                            .WithSemicolonToken(Semicolon())
+                    );
+                else
+                {
+                    server = server
+                        .AddMembers(DeclareField(serverPropertyType, fieldName))
+                        .AddMembers(PropertyDeclaration(ParseTypeName(serverPropertyType), prop.Name)
+                            .AddModifiers(SyntaxKind.PublicKeyword)
+                            .AddAccessorListAccessors(
+                                AccessorDeclaration(SyntaxKind.GetAccessorDeclaration,
+                                    Block(ReturnStatement(
+                                        InvocationExpression(IdentifierName("GetValue"),
+                                            ArgumentList(SeparatedList(new[]{
+                                                    Argument(IdentifierName(CompositionPropertyField(prop))),
+                                                    Argument(null, Token(SyntaxKind.RefKeyword), IdentifierName(fieldName))
+                                                }
+                                            )))))),
+                                AccessorDeclaration(SyntaxKind.SetAccessorDeclaration,
+                                    Block(
+                                        ParseStatement("var changed = false;"),
+                                        IfStatement(BinaryExpression(SyntaxKind.NotEqualsExpression,
+                                                 IdentifierName(fieldName),
+                                                IdentifierName("value")),
+                                            Block(
+                                                ParseStatement("On" + prop.Name + "Changing();"),
+                                                ParseStatement($"changed = true;"))
+                                        ),
+                                        ExpressionStatement(InvocationExpression(IdentifierName("SetValue"),
+                                            ArgumentList(SeparatedList(new[]{
+                                                    Argument(IdentifierName(CompositionPropertyField(prop))),
+                                                    Argument(null, Token(SyntaxKind.OutKeyword), IdentifierName(fieldName)),
+                                                    Argument(IdentifierName("value"))
+                                                }
+                                            )))),
+                                        ParseStatement($"if(changed) On" + prop.Name + "Changed();")
+                                    ))
+                            ))
+                        .AddMembers(MethodDeclaration(ParseTypeName("void"), "On" + prop.Name + "Changed")
+                            .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()))
+                        .AddMembers(MethodDeclaration(ParseTypeName("void"), "On" + prop.Name + "Changing")
+                            .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
+                }
+                
+                resetBody = resetBody.AddStatements(
+                    ExpressionStatement(InvocationExpression(MemberAccess(prop.Name, "Reset"))));
+                
+                serializeMethodBody = ApplySerializeField(serializeMethodBody,cl, prop, isObject, isPassthrough);
+                deserializeMethodBody = ApplyDeserializeField(deserializeMethodBody,cl, prop, serverPropertyType, isObject);
+                
+                if (animatedServer)
+                {
+                    startAnimationBody = ApplyStartAnimation(startAnimationBody, cl, prop);
+                }
+
+                
+                serverGetPropertyBody = ApplyGetProperty(serverGetPropertyBody, prop);
+                serverGetCompositionPropertyBody = ApplyGetProperty(serverGetCompositionPropertyBody, prop, CompositionPropertyField(prop));
+
+                server = server.AddMembers(DeclareField("CompositionProperty", CompositionPropertyField(prop),
+                    EqualsValueClause(ParseExpression("CompositionProperty.Register()")),
+                    SyntaxKind.InternalKeyword, SyntaxKind.StaticKeyword));
+                
+                if (prop.DefaultValue != null)
+                {
+                    defaultsMethodBody = defaultsMethodBody.AddStatements(
+                        ExpressionStatement(
+                            AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
+                                IdentifierName(prop.Name), ParseExpression(prop.DefaultValue))));
+                }
+            }
+            
+            if (cl.Properties.Count > 0)
+            {
+                server = server.AddMembers(((MethodDeclarationSyntax)ParseMemberDeclaration(
+                            $"protected override void DeserializeChangesCore(BatchStreamReader reader, TimeSpan commitedAt){{}}")
+                        !)
+                    .WithBody(ApplyDeserializeChangesEpilogue(deserializeMethodBody, cl)));
+                server = server.AddMembers(MethodDeclaration(ParseTypeName("void"), "OnFieldsDeserialized")
+                    .WithParameterList(ParameterList(SingletonSeparatedList(Parameter(Identifier("changed"))
+                        .WithType(ParseTypeName(ChangedFieldsTypeName(cl))))))
+                    .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
+            }
+
+            client = client.AddMembers(
+                    MethodDeclaration(ParseTypeName("void"), "InitializeDefaults").WithBody(defaultsMethodBody))
+                .AddMembers(
+                    MethodDeclaration(ParseTypeName("void"), "InitializeDefaultsExtra")
+                        .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
+
+            if (cl.Properties.Count > 0)
+            {
+                serializeMethodBody = serializeMethodBody.AddStatements(SerializeChangesEpilogue(cl));
+                client = client.AddMembers(((MethodDeclarationSyntax)ParseMemberDeclaration(
+                        $"private protected override void SerializeChangesCore(BatchStreamWriter writer){{}}")!)
+                    .WithBody(serializeMethodBody));
+            }
+
+            if (list != null)
+                client = AppendListProxy(list, client);
+
+            if (startAnimationBody.Statements.Count != 0)
+                client = WithStartAnimation(client, startAnimationBody);
+            
+            server = WithGetPropertyForAnimation(server, serverGetPropertyBody);
+            server = WithGetCompositionProperty(server, serverGetCompositionPropertyBody);
+            
+            if(cl.Implements.Count > 0)
+                foreach (var impl in cl.Implements)
+                {
+                    client = client.WithBaseList(client.BaseList?.AddTypes(SimpleBaseType(ParseTypeName(impl.Name))));
+                    if (impl.ServerName != null)
+                        server = server.WithBaseList(
+                            server.BaseList?.AddTypes(SimpleBaseType(ParseTypeName(impl.ServerName))));
+
+                    client = client.AddMembers(
+                        ParseMemberDeclaration($"{impl.ServerName} {impl.Name}.Server => Server;"));
+                }
+
+
+            SaveTo(unit.AddMembers(GenerateChangedFieldsEnum(cl)), "Transport",
+                ChangedFieldsTypeName(cl) + ".generated.cs");
+            
+            SaveTo(unit.AddMembers(clientNs.AddMembers(client)),
+                cl.Name + ".generated.cs");
+            SaveTo(unit.AddMembers(serverNs.AddMembers(server)),
+                "Server", "Server" + cl.Name + ".generated.cs");
+        }
+        
+        private ClassDeclarationSyntax GenerateClientProperty(ClassDeclarationSyntax client, GClass cl, GProperty prop,
+            TypeSyntax propType, bool isObject, bool isNullable)
+        {
+            var fieldName = PropertyBackingFieldName(prop);
+            return client
+                    .AddMembers(DeclareField(prop.Type, fieldName))
+                    .AddMembers(PropertyDeclaration(propType, prop.Name)
+                        .AddModifiers(prop.Internal ? SyntaxKind.InternalKeyword : SyntaxKind.PublicKeyword)
+                        .AddAccessorListAccessors(
+                            AccessorDeclaration(SyntaxKind.GetAccessorDeclaration,
+                                Block(ReturnStatement(IdentifierName(fieldName)))),
+                            AccessorDeclaration(SyntaxKind.SetAccessorDeclaration,
+                                Block(
+                                    ParseStatement("var changed = false;"),
+                                    IfStatement(BinaryExpression(SyntaxKind.NotEqualsExpression,
+                                            IdentifierName(fieldName),
+                                            IdentifierName("value")),
+                                        Block(
+                                            ParseStatement("On" + prop.Name + "Changing();"),
+                                            ParseStatement("changed = true;"),
+                                            GeneratePropertySetterAssignment(cl, prop, isObject, isNullable))
+                                    ),
+                                    ExpressionStatement(AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
+                                        IdentifierName(fieldName), IdentifierName("value"))),
+                                    ParseStatement($"if(changed) On" + prop.Name + "Changed();")
+                                )).WithModifiers(TokenList(prop.InternalSet ? new[]{Token(SyntaxKind.InternalKeyword)} : Array.Empty<SyntaxToken>()))
+                        ))
+                    .AddMembers(MethodDeclaration(ParseTypeName("void"), "On" + prop.Name + "Changed")
+                        .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()))
+                    .AddMembers(MethodDeclaration(ParseTypeName("void"), "On" + prop.Name + "Changing")
+                        .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
+        }
+
+        EnumDeclarationSyntax GenerateChangedFieldsEnum(GClass cl)
+        {
+            var changedFieldsEnum = EnumDeclaration(Identifier(ChangedFieldsTypeName(cl)));
+            int count = 0;
+
+            void AddValue(string name)
+            {
+                var value = 1ul << count; 
+                changedFieldsEnum = changedFieldsEnum.AddMembers(
+                    EnumMemberDeclaration(name)
+                        .WithEqualsValue(EqualsValueClause(ParseExpression(value.ToString()))));
+                count++;
+            }
+
+            foreach (var prop in cl.Properties)
+            {
+                AddValue(prop.Name);
+
+                if (prop.Animated) 
+                    AddValue(prop.Name + "Animated");
+            }
+
+            var baseType = count <= 8 ? "byte" : count <= 16 ? "ushort" : count <= 32 ? "uint" : "ulong";
+            return changedFieldsEnum.AddBaseListTypes(SimpleBaseType(ParseTypeName(baseType)))
+                .AddAttributeLists(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("System.Flags")))));
+        }
+
+        StatementSyntax GeneratePropertySetterAssignment(GClass cl, GProperty prop, bool isObject, bool isNullable)
+        {
+            var code = @$"
+    // Update the backing value
+    {PropertyBackingFieldName(prop)} = value;
+    
+    // Register object for serialization in the next batch
+    {ChangedFieldsFieldName(cl)} |= {ChangedFieldsTypeName(cl)}.{prop.Name};
+    RegisterForSerialization();
+";
+            if (prop.Animated)
+            {
+                code += @$"
+    // Reset previous animation if any
+    PendingAnimations.Remove({ClientProperty(cl, prop)});
+    {ChangedFieldsFieldName(cl)} &= ~{ChangedFieldsTypeName(cl)}.{prop.Name}Animated;
+    // Check for implicit animations
+    if(ImplicitAnimations != null && ImplicitAnimations.TryGetValue(""{prop.Name}"", out var animation) == true)
+    {{
+        // Animation affects only current property
+        if(animation is CompositionAnimation a)
+        {{
+            {ChangedFieldsFieldName(cl)} |= {ChangedFieldsTypeName(cl)}.{prop.Name}Animated;
+            PendingAnimations[{ClientProperty(cl, prop)}] = a.CreateInstance(this.Server, value);
+        }}  
+        // Animation is triggered by the current field, but does not necessary affects it
+        StartAnimationGroup(animation, ""{prop.Name}"", value);
+    }}
+";
+            }
+
+            return ParseStatement("{\n" + code + "\n}");
+        }
+        
+        BlockSyntax ApplyStartAnimation(BlockSyntax body, GClass cl, GProperty prop)
+        {
+            var code = $@"
+if (propertyName == ""{prop.Name}"")
+{{
+var current = {PropertyBackingFieldName(prop)};
+var server = animation.CreateInstance(this.Server, finalValue);
+PendingAnimations[{ClientProperty(cl, prop)}] = server;
+{ChangedFieldsFieldName(cl)} |= {ChangedFieldsTypeName(cl)}.{prop.Name}Animated;
+RegisterForSerialization();
+return;
+}}
+";
+            return body.AddStatements(ParseStatement(code));
+        }
+
+        private static HashSet<string> VariantPropertyTypes = new HashSet<string>
+        {
+            "bool",
+            "float",
+            "Vector2",
+            "Vector3",
+            "Vector4",
+            "Matrix",
+            "Matrix3x2",
+            "Matrix4x4",
+            "Quaternion",
+            "Color",
+            "Avalonia.Media.Color"
+        };
+        
+        BlockSyntax ApplyGetProperty(BlockSyntax body, GProperty prop, string? expr = null)
+        {
+            if (VariantPropertyTypes.Contains(prop.Type))
+                return body.AddStatements(
+                    ParseStatement($"if(name == \"{prop.Name}\")\n return  {expr ?? prop.Name};\n")
+                );
+
+            return body;
+        }
+        
+        private BlockSyntax SerializeChangesPrologue(GClass cl)
+        {
+            return Block(
+                ParseStatement("base.SerializeChangesCore(writer);"),
+                ParseStatement($"writer.Write({ChangedFieldsFieldName(cl)});")
+                );
+        }
+
+        private BlockSyntax SerializeChangesEpilogue(GClass cl) =>
+            Block(ParseStatement(ChangedFieldsFieldName(cl) + " = default;"));
+        
+        BlockSyntax ApplySerializeField(BlockSyntax body, GClass cl, GProperty prop, bool isObject, bool isPassthrough)
+        {
+            var changedFields = ChangedFieldsFieldName(cl);
+            var changedFieldsType = ChangedFieldsTypeName(cl);
+            
+            var code = "";
+            if (prop.Animated)
+            {
+                code = $@"
+    if(({changedFields} & {changedFieldsType}.{prop.Name}Animated) == {changedFieldsType}.{prop.Name}Animated)
+        writer.WriteObject(PendingAnimations.GetAndRemove({ClientProperty(cl, prop)}));
+    else ";
+            }
+
+            code += $@"
+    if(({changedFields} & {changedFieldsType}.{prop.Name}) == {changedFieldsType}.{prop.Name})
+        writer.Write{(isObject ? "Object" : "")}({PropertyBackingFieldName(prop)}{(isObject && !isPassthrough ? "?.Server!":"")});
+";
+            return body.AddStatements(ParseStatement(code));
+        }     
+        
+        private BlockSyntax DeserializeChangesPrologue(GClass cl)
+        {
+            return Block(ParseStatement($@"
+base.DeserializeChangesCore(reader, commitedAt);
+DeserializeChangesExtra(reader);
+var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
+"));
+        }
+
+        private BlockSyntax ApplyDeserializeChangesEpilogue(BlockSyntax body, GClass cl)
+        {
+            return body.AddStatements(ParseStatement("OnFieldsDeserialized(changed);"));
+        }
+        
+        BlockSyntax ApplyDeserializeField(BlockSyntax body, GClass cl, GProperty prop, string serverType, bool isObject)
+        {
+            var changedFieldsType = ChangedFieldsTypeName(cl);
+            var code = "";
+            if (prop.Animated)
+            {
+                code = $@"
+    if((changed & {changedFieldsType}.{prop.Name}Animated) == {changedFieldsType}.{prop.Name}Animated)
+            SetAnimatedValue({CompositionPropertyField(prop)}, ref {PropertyBackingFieldName(prop)}, commitedAt, reader.ReadObject<IAnimationInstance>());
+    else ";
+            }
+
+            var readValueCode = $"reader.Read{(isObject ? "Object" : "")}<{serverType}>()";
+            code += $@"
+    if((changed & {changedFieldsType}.{prop.Name}) == {changedFieldsType}.{prop.Name})
+";
+            if (prop.Animated)
+                code += $"SetAnimatedValue({CompositionPropertyField(prop)}, out {PropertyBackingFieldName(prop)}, {readValueCode});";
+            else code += $"{prop.Name} =  {readValueCode};";
+            return body.AddStatements(ParseStatement(code));
+        }
+
+        ClassDeclarationSyntax WithGetPropertyForAnimation(ClassDeclarationSyntax cl, BlockSyntax body)
+        {
+            if (body.Statements.Count == 0)
+                return cl;
+            body = body.AddStatements(
+                ParseStatement("return base.GetPropertyForAnimation(name);"));
+            var method = ((MethodDeclarationSyntax) ParseMemberDeclaration(
+                    $"public override Avalonia.Rendering.Composition.Expressions.ExpressionVariant GetPropertyForAnimation(string name){{}}")!)
+                .WithBody(body);
+
+            return cl.AddMembers(method);
+        }
+        
+        ClassDeclarationSyntax WithGetCompositionProperty(ClassDeclarationSyntax cl, BlockSyntax body)
+        {
+            if (body.Statements.Count == 0)
+                return cl;
+            body = body.AddStatements(
+                ParseStatement("return base.GetCompositionProperty(name);"));
+            var method = ((MethodDeclarationSyntax)ParseMemberDeclaration(
+                    $"public override CompositionProperty? GetCompositionProperty(string name){{}}")!)
+                .WithBody(body);
+
+            return cl.AddMembers(method);
+        }
+
+        ClassDeclarationSyntax WithStartAnimation(ClassDeclarationSyntax cl, BlockSyntax body)
+        {
+            body = body.AddStatements(
+                ExpressionStatement(InvocationExpression(MemberAccess("base", "StartAnimation"),
+                    ArgumentList(SeparatedList(new[]
+                    {
+                        Argument(IdentifierName("propertyName")),
+                        Argument(IdentifierName("animation")),
+                        Argument(IdentifierName("finalValue")),
+                    }))))
+            );
+            return cl.AddMembers(
+                ((MethodDeclarationSyntax) ParseMemberDeclaration(
+                    "internal override void StartAnimation(string propertyName, CompositionAnimation animation, Avalonia.Rendering.Composition.Expressions.ExpressionVariant? finalValue){}")!)
+                .WithBody(body));
+
+
+        }
+        
+    }
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/ICompositionGeneratorSink.cs b/src/tools/DevGenerators/CompositionGenerator/ICompositionGeneratorSink.cs
new file mode 100644
index 0000000000..085a4041be
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/ICompositionGeneratorSink.cs
@@ -0,0 +1,6 @@
+namespace Avalonia.SourceGenerator.CompositionGenerator;
+
+public interface ICompositionGeneratorSink
+{
+    void AddSource(string name, string code);
+}
\ No newline at end of file
diff --git a/src/tools/DevGenerators/CompositionGenerator/RoslynCompositionGeneratorSink.cs b/src/tools/DevGenerators/CompositionGenerator/RoslynCompositionGeneratorSink.cs
new file mode 100644
index 0000000000..6fec3faf93
--- /dev/null
+++ b/src/tools/DevGenerators/CompositionGenerator/RoslynCompositionGeneratorSink.cs
@@ -0,0 +1,15 @@
+using Microsoft.CodeAnalysis;
+
+namespace Avalonia.SourceGenerator.CompositionGenerator;
+
+class RoslynCompositionGeneratorSink : ICompositionGeneratorSink
+{
+    private readonly SourceProductionContext _ctx;
+
+    public RoslynCompositionGeneratorSink(SourceProductionContext ctx)
+    {
+        _ctx = ctx;
+    }
+
+    public void AddSource(string name, string code) => _ctx.AddSource(name, code);
+}
\ No newline at end of file
diff --git a/src/tools/DevGenerators/DevGenerators.csproj b/src/tools/DevGenerators/DevGenerators.csproj
new file mode 100644
index 0000000000..069ff159fc
--- /dev/null
+++ b/src/tools/DevGenerators/DevGenerators.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <LangVersion>10</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+    <Compile Include="..\..\Shared\SourceGeneratorAttributes.cs" />
+    <Compile Include="..\..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs b/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
new file mode 100644
index 0000000000..86dbb3a452
--- /dev/null
+++ b/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
@@ -0,0 +1,94 @@
+using System.IO;
+using System.Linq;
+using System.Text;
+using Generator;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace DevGenerators;
+
+[Generator(LanguageNames.CSharp)]
+public class EnumMemberDictionaryGenerator : IIncrementalGenerator
+{
+    const string DictionaryAttributeFullName = "global::Avalonia.SourceGenerator.GenerateEnumValueDictionaryAttribute";
+    const string ListAttributeFullName = "global::Avalonia.SourceGenerator.GenerateEnumValueListAttribute";
+    
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        var allMethodsWithAttributes = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                static (s, _) => s is MethodDeclarationSyntax
+                {
+                    AttributeLists.Count: > 0,
+                } md && md.Modifiers.Any(m=>m.IsKind(SyntaxKind.PartialKeyword)),
+                static (context, _) =>
+                    (IMethodSymbol)context.SemanticModel.GetDeclaredSymbol(context.Node)!);
+
+        var all = allMethodsWithAttributes
+            .Where(s =>
+                s.HasAttributeWithFullyQualifiedName(DictionaryAttributeFullName)
+                || s.HasAttributeWithFullyQualifiedName(ListAttributeFullName)
+            ).Collect();
+        context.RegisterSourceOutput(all, static (context, methods) =>
+        {
+            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType, SymbolEqualityComparer.Default))
+            {
+                var classBuilder = new StringBuilder();
+                if (typeGroup.Key.ContainingNamespace != null)
+                    classBuilder
+                        .AppendLine("using System;")
+                        .Append("namespace ")
+                        .Append(typeGroup.Key.ContainingNamespace)
+                        .AppendLine(";");
+                classBuilder
+                    .Append("partial class ")
+                    .AppendLine(typeGroup.Key.Name)
+                    .AppendLine("{");
+
+                foreach (var method in typeGroup)
+                {
+                    var namedReturn = method.ReturnType as INamedTypeSymbol;
+                    var arrayReturn = method.ReturnType as IArrayTypeSymbol;
+                    
+                    if ((namedReturn != null && namedReturn.Arity > 0) || arrayReturn != null)
+                    {
+                        ITypeSymbol enumType = namedReturn != null
+                            ? namedReturn.TypeArguments.Last()
+                            : arrayReturn!.ElementType;
+
+                        var isDic = method.HasAttributeWithFullyQualifiedName(DictionaryAttributeFullName);
+
+                        classBuilder
+                            .Pad(1)
+                            .Append("private static partial " + method.ReturnType + " " + method.Name + "()")
+                            .AppendLine().Pad(4).Append(" => new ").Append(method.ReturnType).AppendLine("{");
+                        foreach (var member in enumType.GetMembers())
+                        {
+                            if (member.Name == ".ctor")
+                                continue;
+
+                            if (isDic)
+                                classBuilder.Pad(2)
+                                    .Append("{\"")
+                                    .Append(member.Name)
+                                    .Append("\", ")
+                                    .Append(member.ToString())
+                                    .AppendLine("},");
+                            else
+                                classBuilder.Pad(2).Append(member.ToString()).AppendLine(",");
+                        }
+
+                        classBuilder.Pad(1).AppendLine("};");
+                    }
+                }
+                classBuilder.AppendLine("}");
+
+                context.AddSource(typeGroup.Key.GetFullyQualifiedName().Replace(":", ""), classBuilder.ToString());
+            }
+        });
+
+        
+    }
+
+}
diff --git a/src/tools/DevGenerators/GetProcAddressInitialization.cs b/src/tools/DevGenerators/GetProcAddressInitialization.cs
new file mode 100644
index 0000000000..aedc13e7f6
--- /dev/null
+++ b/src/tools/DevGenerators/GetProcAddressInitialization.cs
@@ -0,0 +1,341 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Generator;
+
+[Generator(LanguageNames.CSharp)]
+public class GetProcAddressInitializationGenerator : IIncrementalGenerator
+{
+    const string GetProcAddressFullName = "global::Avalonia.SourceGenerator.GetProcAddressAttribute";
+    
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        var allMethodsWithAttributes = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                static (s, _) => s is MethodDeclarationSyntax
+                {
+                    AttributeLists.Count: > 0,
+                } md && md.Modifiers.Any(m=>m.IsKind(SyntaxKind.PartialKeyword)),
+                static (context, _) =>
+                    (IMethodSymbol)context.SemanticModel.GetDeclaredSymbol(context.Node)!);
+
+        var fieldsWithAttribute = allMethodsWithAttributes
+            .Where(s => s.HasAttributeWithFullyQualifiedName(GetProcAddressFullName));
+
+        var all = fieldsWithAttribute.Collect();
+        context.RegisterSourceOutput(all, static (context, methods) =>
+        {
+            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType, SymbolEqualityComparer.Default))
+            {
+                var nextContext = 0;
+                var contexts = new Dictionary<string, int>();
+
+                string GetContextNameFromIndex(int c) => "context" + (c == 0 ? "" : c);
+                string GetContextName(string type)
+                {
+                    if (contexts.TryGetValue(type, out var idx))
+                        return GetContextNameFromIndex(idx);
+                    if (nextContext != 0)
+                        idx += nextContext;
+                    nextContext++;
+                    return GetContextNameFromIndex(contexts[type] = idx);
+                }
+                
+                var classBuilder = new StringBuilder();
+                if (typeGroup.Key.ContainingNamespace != null)
+                    classBuilder
+                        .AppendLine("using System;")
+                        .Append("namespace ")
+                        .Append(typeGroup.Key.ContainingNamespace)
+                        .AppendLine(";");
+                classBuilder
+                    .Append("unsafe partial class ")
+                    .AppendLine(typeGroup.Key.Name)
+                    .AppendLine("{");
+                var initializeBody = new StringBuilder()
+                    .Pad(2)
+                    .AppendLine("var addr = IntPtr.Zero;");
+                
+                foreach (var method in typeGroup)
+                {
+                    var isOptional = false;
+                    var first = true;
+                    var fieldName = "_addr_" + method.Name;
+                    var delegateType = BuildDelegateType(method);
+
+                    void AppendNextAddr()
+                    {
+                        if (first)
+                        {
+                            first = false;
+                            initializeBody.Pad(2);
+                        }
+                        else
+                            initializeBody
+                                .Pad(2)
+                                .Append("if(addr == IntPtr.Zero) ");
+                    }
+
+                    initializeBody
+                        .Pad(2).Append("// Initializing ").AppendLine(method.Name)
+                        .Pad(2)
+                        .AppendLine("addr = IntPtr.Zero;");
+                    foreach (var attr in method.GetAttributes())
+                    {
+                        if (attr.AttributeClass?.HasFullyQualifiedName(GetProcAddressFullName) == true)
+                        {
+                            string? primaryName = null;
+                            foreach (var arg in attr.ConstructorArguments)
+                            {
+                                if (arg.Value is string name)
+                                    primaryName = name;
+                                if (arg.Value is bool opt)
+                                    isOptional = opt;
+                            }
+
+                            if (primaryName != null)
+                            {
+                                AppendNextAddr();
+                                initializeBody
+                                    .Append("addr = getProcAddress(\"")
+                                    .Append(primaryName)
+                                    .AppendLine("\");");
+                            }
+                        }
+                        else
+                        {
+                            if (attr.AttributeClass != null
+                                && attr.AttributeClass.MemberNames.Contains("GetProcAddress"))
+                            {
+                                var getProcMethod = attr.AttributeClass.GetMembers()
+                                    .FirstOrDefault(m => m.Name == "GetProcAddress") as IMethodSymbol;
+                                if (getProcMethod == null || !getProcMethod.IsStatic || getProcMethod.Parameters.Length < 2)
+                                    continue;
+                                var contextName =
+                                    GetContextName(getProcMethod
+                                        .Parameters[1].Type
+                                        .ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+                                AppendNextAddr();
+                                initializeBody
+                                    .Append("addr = ")
+                                    .Append(attr.AttributeClass.GetFullyQualifiedName())
+                                    .Append(".GetProcAddress(")
+                                    .Append("getProcAddress, ")
+                                    .Append(contextName);
+
+                                if (attr.ApplicationSyntaxReference?.GetSyntax() is AttributeSyntax syntaxNode 
+                                    && syntaxNode.ArgumentList is { })
+                                {
+                                    foreach (var arg in syntaxNode.ArgumentList.Arguments)
+                                        initializeBody.Append(", ").Append(arg.GetText());
+                                }
+                                initializeBody.AppendLine(");");
+                            }
+                        }
+                    }
+
+                    if (!isOptional)
+                    {
+                        initializeBody
+                            .Pad(2)
+                            .Append("if (addr == IntPtr.Zero) throw new System.EntryPointNotFoundException(\"")
+                            .Append(fieldName).AppendLine("\");");
+                    }
+
+                    initializeBody
+                        .Pad(2)
+                        .Append(fieldName)
+                        .Append(" = (")
+                        .Append(delegateType)
+                        .AppendLine(")addr;");
+
+                    classBuilder
+                        .Pad(1)
+                        .Append(delegateType);
+                    classBuilder
+                        .Append(fieldName)
+                        .AppendLine(";");
+
+                    classBuilder
+                        .Pad(1)
+                        .Append("public partial ")
+                        .Append(method.ReturnType.GetFullyQualifiedName())
+                        .Append(" ")
+                        .Append(method.Name)
+                        .Append("(");
+                    var firstArg = true;
+                    foreach (var p in method.Parameters)
+                    {
+                        if (firstArg)
+                            firstArg = false;
+                        else
+                            classBuilder.Append(", ");
+                        AppendRefKind(classBuilder, p.RefKind);
+                        classBuilder
+                            .Append(p.Type.GetFullyQualifiedName())
+                            .Append(" @")
+                            .Append(p.Name);
+                    }
+                    classBuilder
+                        .AppendLine(")")
+                        .Pad(1)
+                        .AppendLine("{");
+                    if (isOptional)
+                        classBuilder
+                            .Pad(2)
+                            .Append("if (")
+                            .Append(fieldName)
+                            .Append(" == null) throw new System.EntryPointNotFoundException(\"")
+                            .Append(method.Name)
+                            .AppendLine("\");");
+
+                    foreach(var p in method.Parameters)
+                        if (NeedsPin(p.Type))
+                            classBuilder.Pad(2)
+                                .Append("fixed(")
+                                .Append(MapToNative(p.Type))
+                                .Append(" @__p_")
+                                .Append(p.Name)
+                                .Append(" = ")
+                                .Append(p.Name)
+                                .AppendLine(")");
+                    
+                    classBuilder.Pad(2);
+                    if (!method.ReturnsVoid)
+                        classBuilder.Append("return ");
+
+                    var invokeBuilder = new StringBuilder();
+                    
+                    invokeBuilder
+                        .Append(fieldName)
+                        .Append("(");
+                    firstArg = true;
+                    foreach (var p in method.Parameters)
+                    {
+                        if (firstArg)
+                            firstArg = false;
+                        else
+                            invokeBuilder.Append(", ");
+                        AppendRefKind(invokeBuilder, p.RefKind);
+                        invokeBuilder
+                            .Append("@")
+                            .Append(ConvertToNative(p.Name, p.Type));
+                    }
+
+                    invokeBuilder.Append(")");
+                    classBuilder.Append(ConvertToManaged(method.ReturnType, invokeBuilder.ToString()));
+                    
+                    classBuilder.AppendLine(";").Pad(1).AppendLine("}");
+                    if (isOptional)
+                        classBuilder
+                            .Pad(1)
+                            .Append("public bool Is")
+                            .Append(method.Name)
+                            .Append("Available => ")
+                            .Append(fieldName)
+                            .AppendLine(" != null;");
+                }
+                
+                classBuilder
+                    .Pad(1)
+                    .Append("void Initialize(Func<string, IntPtr> getProcAddress");
+                foreach (var kv in contexts.OrderBy(x => x.Value))
+                { 
+                    classBuilder
+                        .Append(", ")
+                        .Append(kv.Key)
+                        .Append(" ")
+                        .Append(GetContextNameFromIndex(kv.Value));
+                }
+
+                classBuilder.AppendLine(")").Pad(1).AppendLine("{");
+                classBuilder.Append(initializeBody.ToString());
+                classBuilder.Append("}\n}");
+
+
+                context.AddSource(typeGroup.Key.GetFullyQualifiedName().Replace(":", ""), classBuilder.ToString());
+            }
+        });
+
+        
+    }
+
+    static StringBuilder AppendRefKind(StringBuilder sb, RefKind kind)
+    {
+        if (kind == RefKind.Ref)
+            sb.Append("ref ");
+        if (kind == RefKind.Out)
+            sb.Append("out ");
+        return sb;
+    }
+
+    static bool NeedsPin(ITypeSymbol type)
+    {
+        if (type.TypeKind == TypeKind.Array)
+            return true;
+        return false;
+    }
+
+    static string ConvertToNative(string name, ITypeSymbol type)
+    {
+        if (NeedsPin(type))
+            return "__p_" + name;
+        if (IsBool(type))
+            return $"{name} ? 1 : 0";
+        return name;
+    }
+
+    static string ConvertToManaged(ITypeSymbol type, string expr)
+    {
+        if (IsBool(type))
+            return expr + " != 0";
+        return expr;
+    }
+
+    static bool IsBool(ITypeSymbol type) => type.GetFullyQualifiedName() == "global::System.Boolean" ||
+                                            type.GetFullyQualifiedName() == "bool";
+    
+    static string MapToNative(ITypeSymbol type)
+    {
+        if (type.TypeKind == TypeKind.Array)
+            return ((IArrayTypeSymbol)type).ElementType.GetFullyQualifiedName() + "*";
+        if (IsBool(type))
+            return "int";
+        return type.GetFullyQualifiedName();
+    }
+
+    static string BuildDelegateType(IMethodSymbol method)
+    {
+        StringBuilder name = new("delegate* unmanaged[Stdcall]<");
+        var firstArg = true;
+
+        void AppendArg(string a, RefKind kind)
+        {
+            if (firstArg)
+                firstArg = false;
+            else
+                name.Append(",");
+            AppendRefKind(name, kind);
+            name.Append(a);
+        }
+
+        foreach (var p in method.Parameters)
+        {
+            AppendArg(MapToNative(p.Type), p.RefKind);
+        }
+
+        AppendArg(MapToNative(method.ReturnType), RefKind.None);
+        name.Append(">");
+        return name.ToString();
+    }
+
+}
diff --git a/src/tools/DevGenerators/Helpers.cs b/src/tools/DevGenerators/Helpers.cs
new file mode 100644
index 0000000000..3da89d2d0e
--- /dev/null
+++ b/src/tools/DevGenerators/Helpers.cs
@@ -0,0 +1,31 @@
+using System.Collections.Immutable;
+using System.Text;
+using Microsoft.CodeAnalysis;
+
+namespace Generator;
+
+static class Helpers
+{
+    public static StringBuilder Pad(this StringBuilder sb, int count) => sb.Append(' ', count * 4);
+
+    public static string GetFullyQualifiedName(this ISymbol symbol)
+    {
+        return symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+    }
+    
+    public static bool HasFullyQualifiedName(this ISymbol symbol, string name)
+    {
+        return symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) == name;
+    }
+
+    public static bool HasAttributeWithFullyQualifiedName(this ISymbol symbol, string name)
+    {
+        ImmutableArray<AttributeData> attributes = symbol.GetAttributes();
+
+        foreach (AttributeData attribute in attributes)
+            if (attribute.AttributeClass?.HasFullyQualifiedName(name) == true)
+                return true;
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/tools/DevGenerators/SubtypesFactoryGenerator.cs b/src/tools/DevGenerators/SubtypesFactoryGenerator.cs
new file mode 100644
index 0000000000..4fc9397e7a
--- /dev/null
+++ b/src/tools/DevGenerators/SubtypesFactoryGenerator.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Avalonia.SourceGenerator
+{
+    [Generator(LanguageNames.CSharp)]
+    public class SubtypesFactoryGenerator : IIncrementalGenerator
+    {
+        private record struct MethodTarget(IMethodSymbol Method, string MethodDecl, ITypeSymbol BaseType, string Namespace);
+        private static readonly string s_attributeName = typeof(SubtypesFactoryAttribute).FullName;
+
+        private static bool IsSubtypeOf(ITypeSymbol type, ITypeSymbol baseType)
+        {
+            return type.BaseType is not null && (SymbolEqualityComparer.Default.Equals(type.BaseType, baseType) || IsSubtypeOf(type.BaseType, baseType));
+        }
+
+        private static void GenerateSubTypes(SourceProductionContext context, MethodTarget methodTarget, ImmutableArray<ITypeSymbol> types)
+        {
+            var (method, methodDecl, baseType, @namespace) = methodTarget;
+            var candidateTypes = types.Where(i => IsSubtypeOf(i, baseType)).Where(i => $"{i.ContainingNamespace}.".StartsWith($"{@namespace}.")).ToArray();
+            var type = method.ContainingType;
+            var isGeneric = type.TypeParameters.Length > 0;
+            var isClass = type.TypeKind == TypeKind.Class;
+
+            var typeDecl = $"partial {(isClass ? "class" : "struct")} {type.Name}{(isGeneric ? $"<{string.Join(", ", type.TypeParameters)}>" : "")}";
+            var source = $@"using System;
+using System.Collections.Generic;
+
+namespace {method.ContainingNamespace}
+{{
+    {typeDecl}
+    {{
+        {methodDecl}
+        {{
+            var hasMatch = false;
+            (hasMatch, {method.Parameters[1].Name}) = {method.Parameters[0].Name} switch
+            {{
+{string.Join("\n", candidateTypes.Select(i => $"                \"{i.Name}\" => (true, ({method.Parameters[1].Type})new {i}()),"))}
+                _ => (false, default({method.Parameters[1].Type}))
+            }};
+
+            return hasMatch;
+        }}
+    }}
+}}";
+
+            context.AddSource($"{type}.{method.MetadataName}.gen.cs", source);
+        }
+
+        private static MethodTarget? PopulateMethodTargets(GeneratorSyntaxContext context, CancellationToken token)
+        {
+            token.ThrowIfCancellationRequested();
+            if (context.Node is MethodDeclarationSyntax method)
+            {
+                var attributes = method.AttributeLists.SelectMany(i => i.Attributes);
+                var semanticModel = context.SemanticModel;
+                foreach (var attribute in attributes)
+                {
+                    var attributeTypeInfo = semanticModel.GetTypeInfo(attribute);
+                    if (attributeTypeInfo.Type is null ||
+                        attributeTypeInfo.Type.ToString() != s_attributeName ||
+                        attribute.ArgumentList is null)
+                    {
+                        continue;
+                    }
+
+                    var arguments = attribute.ArgumentList.Arguments;
+                    if (arguments.Count != 2)
+                    {
+                        continue;
+                    }
+
+                    if (arguments[0].Expression is not TypeOfExpressionSyntax typeOfExpr ||
+                        arguments[1].Expression is not LiteralExpressionSyntax and not IdentifierNameSyntax)
+                    {
+                        continue;
+                    }
+
+                    var type = semanticModel.GetTypeInfo(typeOfExpr.Type);
+                    var ns = semanticModel.GetConstantValue(arguments[1].Expression);
+                    var methodDeclInfo = semanticModel.GetDeclaredSymbol(method);
+
+                    if (type.Type is not ITypeSymbol baseType ||
+                        ns.HasValue is false ||
+                        ns.Value is not string nsValue ||
+                        methodDeclInfo is not IMethodSymbol methodSymbol ||
+                        methodSymbol.Parameters.Length != 2 ||
+                        methodSymbol.Parameters[1].RefKind != RefKind.Out)
+                    {
+                        continue;
+                    }
+
+                    var parameters = new SeparatedSyntaxList<ParameterSyntax>().AddRange(method.ParameterList.Parameters.Select(i => i.WithAttributeLists(new SyntaxList<AttributeListSyntax>())));
+                    var methodDecl = method
+                        .WithAttributeLists(new SyntaxList<AttributeListSyntax>())
+                        .WithParameterList(method.ParameterList.WithParameters(parameters))
+                        .WithBody(null)
+                        .WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+                        .WithoutTrivia().ToString();
+
+                    return new MethodTarget(methodSymbol, methodDecl, baseType, nsValue);
+                }
+            }
+
+            return null;
+        }
+
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            var typesProvider = context.SyntaxProvider.CreateSyntaxProvider(
+                static (syntaxNode, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return syntaxNode is ClassDeclarationSyntax or StructDeclarationSyntax;
+                },
+                static (syntaxContext, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return syntaxContext.Node is ClassDeclarationSyntax or StructDeclarationSyntax &&
+                        syntaxContext.SemanticModel.GetDeclaredSymbol(syntaxContext.Node) is ITypeSymbol typeSymbol
+                        ? typeSymbol : null;
+                })
+                .SelectMany((type, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return type is null ? Array.Empty<ITypeSymbol>() : new ITypeSymbol[] { type };
+                });
+
+            var methodsProvider = context.SyntaxProvider.CreateSyntaxProvider(
+                static (syntaxNode, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return syntaxNode is MethodDeclarationSyntax { AttributeLists.Count: > 0 };
+                }, PopulateMethodTargets)
+                .SelectMany((method, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return method is null ? Array.Empty<MethodTarget>() : new MethodTarget[] { method.Value };
+                });
+
+            var generateContext = methodsProvider.Combine(typesProvider.Collect());
+
+            context.RegisterSourceOutput(generateContext, static (sourceContext, source) =>
+            {
+                sourceContext.CancellationToken.ThrowIfCancellationRequested();
+                GenerateSubTypes(sourceContext, source.Left, source.Right);
+            });
+        }
+    }
+}
diff --git a/src/tools/DevGenerators/X11AtomsGenerator.cs b/src/tools/DevGenerators/X11AtomsGenerator.cs
new file mode 100644
index 0000000000..daf003c4c4
--- /dev/null
+++ b/src/tools/DevGenerators/X11AtomsGenerator.cs
@@ -0,0 +1,73 @@
+using System.IO;
+using System.Linq;
+using System.Text;
+using Generator;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace DevGenerators;
+
+[Generator(LanguageNames.CSharp)]
+public class X11AtomsGenerator : IIncrementalGenerator
+{
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        var x11AtomsClasses = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                static (s, _) => s is ClassDeclarationSyntax
+                {
+                    Identifier.Text: "X11Atoms"
+                },
+                static (context, _) =>
+                    (INamedTypeSymbol)context.SemanticModel.GetDeclaredSymbol(context.Node)!);
+
+        var all = x11AtomsClasses.Collect();
+        context.RegisterSourceOutput(all, static (context, classes) =>
+        {
+            foreach (var cl in classes)
+            {
+                var classBuilder = new StringBuilder();
+                if (cl.ContainingNamespace != null)
+                    classBuilder
+                        .AppendLine("using System;")
+                        .AppendLine("using static Avalonia.X11.XLib;")
+                        .Append("namespace ")
+                        .Append(cl.ContainingNamespace)
+                        .AppendLine(";");
+                classBuilder
+                    .Append("partial class ")
+                    .AppendLine(cl.Name)
+                    .AppendLine("{");
+
+                var fields = cl.GetMembers().OfType<IFieldSymbol>()
+                    .Where(f => f.Type.Name == "IntPtr"
+                                && f.DeclaredAccessibility == Accessibility.Public).ToList();
+                
+                classBuilder.Pad(1).AppendLine("private void PopulateAtoms(IntPtr display)").Pad(1).AppendLine("{");
+                classBuilder.Pad(2).Append("var atoms = new IntPtr[").Append(fields.Count).AppendLine("];");
+                classBuilder.Pad(2).Append("var atomNames = new string[").Append(fields.Count).AppendLine("] {");
+
+
+                for (int c = 0; c < fields.Count; c++)
+                    classBuilder.Pad(3).Append("\"").Append(fields[c].Name).AppendLine("\",");
+                classBuilder.Pad(2).AppendLine("};");
+                
+                classBuilder.Pad(2).AppendLine("XInternAtoms(display, atomNames, atomNames.Length, true, atoms);");
+
+                for (int c = 0; c < fields.Count; c++)
+                    classBuilder.Pad(2).Append("InitAtom(ref ").Append(fields[c].Name).Append(", \"")
+                        .Append(fields[c].Name).Append("\", atoms[").Append(c).AppendLine("]);");
+
+
+                classBuilder.Pad(1).AppendLine("}");
+                classBuilder.AppendLine("}");
+
+                context.AddSource(cl.GetFullyQualifiedName().Replace(":", ""), classBuilder.ToString());
+            }
+        });
+
+        
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
deleted file mode 100644
index 1d5296bebd..0000000000
--- a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-using System;
-using Avalonia.Animation.Animators;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Data;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class AnimatableTests
-    {
-        [Fact]
-        public void Transition_Is_Not_Applied_When_Not_Attached_To_Visual_Tree()
-        {
-            var target = CreateTarget();
-            var control = new Control
-            {
-                Transitions = new Transitions { target.Object },
-            };
-
-            control.Opacity = 0.5;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5),
-                Times.Never);
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_To_Initial_Style()
-        {
-            using (Start())
-            {
-                var target = CreateTarget();
-                var control = new Control
-                {
-                    Transitions = new Transitions { target.Object },
-                };
-
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<Control>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Visual.OpacityProperty, 0.8),
-                            }
-                        }
-                    }
-                };
-
-                root.Child = control;
-
-                Assert.Equal(0.8, control.Opacity);
-
-                target.Verify(x => x.Apply(
-                    It.IsAny<Control>(),
-                    It.IsAny<IClock>(),
-                    It.IsAny<object>(),
-                    It.IsAny<object>()),
-                    Times.Never);
-            }
-        }
-
-        [Fact]
-        public void Transition_Is_Applied_When_Local_Value_Changes()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.Opacity = 0.5;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5));
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_When_Animated_Value_Changes()
-        {
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.SetValue(Visual.OpacityProperty, 0.5, BindingPriority.Animation);
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5),
-                Times.Never);
-        }
-
-
-        [Theory]
-        [InlineData(null)] //null value
-        [InlineData("stringValue")] //string value
-        public void Invalid_Values_In_Animation_Should_Not_Crash_Animations(object invalidValue)
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Layoutable.WidthProperty, 1d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Layoutable.WidthProperty, 2d),
-                },
-                KeyTime = TimeSpan.FromSeconds(2),
-            };
-
-            var keyframe3 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Layoutable.WidthProperty, invalidValue),
-                },
-                KeyTime = TimeSpan.FromSeconds(3),
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(3),
-                Children =
-                {
-                    keyframe1,
-                    keyframe2,
-                    keyframe3
-                },
-                IterationCount = new IterationCount(5),
-                PlaybackDirection = PlaybackDirection.Alternate,
-            };
-
-            var rect = new Rectangle()
-            {
-                Width = 11,
-            };
-
-            var originalValue = rect.Width;
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(rect, clock);
-
-            clock.Step(TimeSpan.Zero);
-            Assert.Equal(rect.Width, 1);
-            clock.Step(TimeSpan.FromSeconds(2));
-            Assert.Equal(rect.Width, 2);
-            clock.Step(TimeSpan.FromSeconds(3));
-            //here we have invalid value so value should be expected and set to initial original value
-            Assert.Equal(rect.Width, originalValue);
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.SetValue(Visual.OpacityProperty, 0.5);
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5));
-            target.Invocations.Clear();
-
-            control.SetValue(Visual.OpacityProperty, 0.8, BindingPriority.StyleTrigger);
-
-            target.Verify(x => x.Apply(
-                It.IsAny<Control>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>()),
-                Times.Never);
-        }
-
-        [Fact]
-        public void Transition_Is_Disposed_When_Local_Value_Changes()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-            var sub = new Mock<IDisposable>();
-
-            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5)).Returns(sub.Object);
-
-            control.Opacity = 0.5;
-            sub.Invocations.Clear();
-            control.Opacity = 0.4;
-
-            sub.Verify(x => x.Dispose());
-        }
-
-        [Fact]
-        public void New_Transition_Is_Applied_When_Local_Value_Changes()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            target.Setup(x => x.Property).Returns(Visual.OpacityProperty);
-            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5))
-                .Callback(() =>
-                {
-                    control.SetValue(Visual.OpacityProperty, 0.9, BindingPriority.Animation);
-                })
-                .Returns(Mock.Of<IDisposable>());
-
-            control.Opacity = 0.5;
-
-            Assert.Equal(0.9, control.Opacity);
-            target.Invocations.Clear();
-
-            control.Opacity = 0.4;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                0.9,
-                0.4));
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_When_Removed_From_Visual_Tree()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.Opacity = 0.5;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5));
-            target.Invocations.Clear();
-
-            var root = (TestRoot)control.Parent;
-            root.Child = null;
-            control.Opacity = 0.8;
-
-            target.Verify(x => x.Apply(
-                It.IsAny<Control>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>()),
-                Times.Never);
-        }
-
-        [Fact]
-        public void Animation_Is_Cancelled_When_Transition_Removed()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-            var sub = new Mock<IDisposable>();
-
-            target.Setup(x => x.Apply(
-                It.IsAny<Animatable>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>())).Returns(sub.Object);
-
-            control.Opacity = 0.5;
-            control.Transitions.RemoveAt(0);
-
-            sub.Verify(x => x.Dispose());
-        }
-
-        [Fact]
-        public void Animation_Is_Cancelled_When_New_Style_Activates()
-        {
-            using (Start())
-            {
-                var target = CreateTarget();
-                var control = CreateStyledControl(target.Object);
-                var sub = new Mock<IDisposable>();
-
-                target.Setup(x => x.Apply(
-                    control,
-                    It.IsAny<IClock>(),
-                    1.0,
-                    0.5)).Returns(sub.Object);
-
-                control.Opacity = 0.5;
-
-                target.Verify(x => x.Apply(
-                    control,
-                    It.IsAny<IClock>(),
-                    1.0,
-                    0.5),
-                    Times.Once);
-
-                control.Classes.Add("foo");
-
-                sub.Verify(x => x.Dispose());
-            }
-        }
-
-        [Fact]
-        public void Transition_From_Style_Trigger_Is_Applied()
-        {
-            using (Start())
-            {
-                var target = CreateTransition(Control.WidthProperty);
-                var control = CreateStyledControl(transition2: target.Object);
-                var sub = new Mock<IDisposable>();
-
-                control.Classes.Add("foo");
-                control.Width = 100;
-
-                target.Verify(x => x.Apply(
-                    control,
-                    It.IsAny<IClock>(),
-                    double.NaN,
-                    100.0),
-                    Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Replacing_Transitions_During_Animation_Does_Not_Throw_KeyNotFound()
-        {
-            // Issue #4059
-            using (Start())
-            {
-                Border target;
-                var clock = new TestClock();
-                var root = new TestRoot
-                {
-                    Clock = clock,
-                    Styles =
-                    {
-                        new Style(x => x.OfType<Border>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.TransitionsProperty,
-                                    new Transitions
-                                    {
-                                        new DoubleTransition
-                                        {
-                                            Property = Border.OpacityProperty,
-                                            Duration = TimeSpan.FromSeconds(1),
-                                        },
-                                    }),
-                            },
-                        },
-                        new Style(x => x.OfType<Border>().Class("foo"))
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.TransitionsProperty,
-                                    new Transitions
-                                    {
-                                        new DoubleTransition
-                                        {
-                                            Property = Border.OpacityProperty,
-                                            Duration = TimeSpan.FromSeconds(1),
-                                        },
-                                    }),
-                                new Setter(Border.OpacityProperty, 0.0),
-                            },
-                        },
-                    },
-                    Child = target = new Border
-                    {
-                        Background = Brushes.Red,
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                target.Classes.Add("foo");
-                clock.Step(TimeSpan.FromSeconds(0));
-                clock.Step(TimeSpan.FromSeconds(0.5));
-
-                Assert.Equal(0.5, target.Opacity);
-
-                target.Classes.Remove("foo");
-            }
-        }
-
-        [Fact]
-        public void Transitions_Can_Be_Changed_To_Collection_That_Contains_The_Same_Transitions()
-        {
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.Transitions = new Transitions { target.Object };
-        }
-
-        [Fact]
-        public void Transitions_Can_Re_Set_During_Batch_Update()
-        {
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            // Assigning and then clearing Transitions ensures we have a transition state
-            // collection created.
-            control.Transitions = null;
-
-            control.BeginBatchUpdate();
-
-            // Setting opacity then Transitions means that we receive the Transitions change
-            // after the Opacity change when EndBatchUpdate is called.
-            control.Opacity = 0.5;
-            control.Transitions = new Transitions { target.Object };
-
-            // Which means that the transition state hasn't been initialized with the new
-            // Transitions when the Opacity change notification gets raised here.
-            control.EndBatchUpdate();
-        }
-
-        private static IDisposable Start()
-        {
-            var clock = new MockGlobalClock();
-            var services = TestServices.RealStyler.With(globalClock: clock);
-            return UnitTestApplication.Start(services);
-        }
-
-        private static Mock<ITransition> CreateTarget()
-        {
-            return CreateTransition(Visual.OpacityProperty);
-        }
-
-        private static Control CreateControl(ITransition transition)
-        {
-            var control = new Control
-            {
-                Transitions = new Transitions { transition },
-            };
-
-            var root = new TestRoot(control);
-            return control;
-        }
-
-        private static Control CreateStyledControl(
-            ITransition transition1 = null,
-            ITransition transition2 = null)
-        {
-            transition1 = transition1 ?? CreateTarget().Object;
-            transition2 = transition2 ?? CreateTransition(Control.WidthProperty).Object;
-
-            var control = new Control
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Control>())
-                    {
-                        Setters =
-                        {
-                            new Setter
-                            {
-                                Property = Control.TransitionsProperty,
-                                Value = new Transitions { transition1 },
-                            }
-                        }
-                    },
-                    new Style(x => x.OfType<Control>().Class("foo"))
-                    {
-                        Setters =
-                        {
-                            new Setter
-                            {
-                                Property = Control.TransitionsProperty,
-                                Value = new Transitions { transition2 },
-                            }
-                        }
-                    }
-                }
-            };
-
-            var root = new TestRoot(control);
-            return control;
-        }
-
-        private static Mock<ITransition> CreateTransition(AvaloniaProperty property)
-        {
-            var target = new Mock<ITransition>();
-            var sub = new Mock<IDisposable>();
-
-            target.Setup(x => x.Property).Returns(property);
-            target.Setup(x => x.Apply(
-                It.IsAny<Animatable>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>())).Returns(sub.Object);
-
-            return target;
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs b/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs
deleted file mode 100644
index 58bd7a42c3..0000000000
--- a/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Avalonia.Data;
-using Xunit;
-using Avalonia.Animation.Easings;
-using System.Threading;
-using System.Reactive.Linq;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class AnimationIterationTests
-    {
-        [Fact]
-        public void Check_KeyTime_Correctly_Converted_To_Cue()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0.5)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 0d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(border, clock);
-
-            clock.Step(TimeSpan.Zero); 
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(1)); 
-            Assert.Equal(border.Width, 100d);
- 
-        }
-
-
-        [Fact]
-        public void Check_Initial_Inter_and_Trailing_Delay_Values()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(3),
-                Delay = TimeSpan.FromSeconds(3),
-                DelayBetweenIterations = TimeSpan.FromSeconds(3),
-                IterationCount = new IterationCount(2),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(border, clock);
-
-            clock.Step(TimeSpan.Zero);
-
-            // Initial Delay.
-            clock.Step(TimeSpan.FromSeconds(1));
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(6));
-
-            // First Inter-Iteration delay.
-            clock.Step(TimeSpan.FromSeconds(8));
-            Assert.Equal(border.Width, 200d);
-
-            // Trailing Delay should be non-existent.
-            clock.Step(TimeSpan.FromSeconds(14));
-            Assert.True(animationRun.Status == TaskStatus.RanToCompletion);
-            Assert.Equal(border.Width, 100d);
-        }
-
-        [Fact]
-        public void Check_FillModes_Start_and_End_Values_if_Retained()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 0d),
-                },
-                Cue = new Cue(0.0d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 300d),
-                },
-                Cue = new Cue(1.0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(0.05d),
-                Delay = TimeSpan.FromSeconds(0.05d),
-                Easing = new SineEaseInOut(),
-                FillMode = FillMode.Both,
-                Children =
-                {
-                    keyframe1,
-                    keyframe2
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d,
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(border, clock);
-
-            clock.Step(TimeSpan.FromSeconds(0d));
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(0.050d));
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(0.100d));
-            Assert.Equal(border.Width, 300d);
-        }
-
-        [Fact(Skip = "See #6111")]
-        public void Dispose_Subscription_Should_Stop_Animation()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 50d
-            };
-            var propertyChangedCount = 0;
-            var animationCompletedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var disposable = animation.Apply(border, clock, Observable.Return(true), () => animationCompletedCount++);
-
-            Assert.Equal(0, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(0));
-            Assert.Equal(0, animationCompletedCount);
-            Assert.Equal(1, propertyChangedCount);
-
-            disposable.Dispose();
-
-            // Clock ticks should be ignored after Dispose
-            clock.Step(TimeSpan.FromSeconds(5));
-            clock.Step(TimeSpan.FromSeconds(6));
-            clock.Step(TimeSpan.FromSeconds(7));
-
-            // On animation disposing (cancellation) on completed is not invoked (is it expected?)
-            Assert.Equal(0, animationCompletedCount);
-            // Initial property changed before cancellation + animation value removal.
-            Assert.Equal(2, propertyChangedCount);
-        }
-
-        [Fact]
-        public void Do_Not_Run_Cancelled_Animation()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d
-            };
-            var propertyChangedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
-            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
-
-            clock.Step(TimeSpan.FromSeconds(10));
-            Assert.Equal(0, propertyChangedCount);
-            Assert.True(animationRun.IsCompleted);
-        }
-
-        [Fact(Skip = "See #6111")]
-        public void Cancellation_Should_Stop_Animation()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 50d
-            };
-            var propertyChangedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var cancellationTokenSource = new CancellationTokenSource();
-            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
-
-            Assert.Equal(0, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(0));
-            Assert.False(animationRun.IsCompleted);
-            Assert.Equal(1, propertyChangedCount);
-
-            cancellationTokenSource.Cancel();
-            clock.Step(TimeSpan.FromSeconds(1));
-            clock.Step(TimeSpan.FromSeconds(2));
-            clock.Step(TimeSpan.FromSeconds(3));
-            //Assert.Equal(2, propertyChangedCount);
-
-            animationRun.Wait();
-
-            clock.Step(TimeSpan.FromSeconds(6));
-            Assert.True(animationRun.IsCompleted);
-            Assert.Equal(2, propertyChangedCount);
-        }
-
-        [Fact]
-        public void Cancellation_Of_Completed_Animation_Does_Not_Fail()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 50d
-            };
-            var propertyChangedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var cancellationTokenSource = new CancellationTokenSource();
-            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
-
-            Assert.Equal(0, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(0));
-            Assert.False(animationRun.IsCompleted);
-            Assert.Equal(1, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(10));
-            Assert.True(animationRun.IsCompleted);
-            Assert.Equal(2, propertyChangedCount);
-
-            cancellationTokenSource.Cancel();
-            animationRun.Wait();
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj b/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
deleted file mode 100644
index e07ece5460..0000000000
--- a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs b/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs
deleted file mode 100644
index fa2ed61e65..0000000000
--- a/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-using System;
-using Avalonia.Animation.Easings;
-using Avalonia.Controls.Shapes;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class KeySplineTests
-    {
-        [Theory]
-        [InlineData("1,2 3,4")]
-        [InlineData("1 2 3 4")]
-        [InlineData("1 2,3 4")]
-        [InlineData("1,2,3,4")]
-        public void Can_Parse_KeySpline_Via_TypeConverter(string input)
-        {
-            var conv = new KeySplineTypeConverter();
-
-            var keySpline = (KeySpline)conv.ConvertFrom(input);
-
-            Assert.Equal(1, keySpline.ControlPointX1);
-            Assert.Equal(2, keySpline.ControlPointY1);
-            Assert.Equal(3, keySpline.ControlPointX2);
-            Assert.Equal(4, keySpline.ControlPointY2);
-        }
-
-        [Theory]
-        [InlineData("1,2F,3,4")] 
-        [InlineData("Foo,Bar,Fee,Buzz")] 
-        public void Can_Handle_Invalid_String_KeySpline_Via_TypeConverter(string input)
-        {
-            var conv = new KeySplineTypeConverter();
-
-            Assert.ThrowsAny<Exception>(() => (KeySpline)conv.ConvertFrom(input));
-        }
-
-        [Theory]
-        [InlineData(0.00)]
-        [InlineData(0.50)]
-        [InlineData(1.00)]
-        public void KeySpline_X_Values_In_Range_Do_Not_Throw(double input)
-        {
-            var keySpline = new KeySpline();
-            keySpline.ControlPointX1 = input; // no exception will be thrown -- test will fail if exception thrown
-            keySpline.ControlPointX2 = input; // no exception will be thrown -- test will fail if exception thrown
-        }
-
-        [Theory]
-        [InlineData(-0.01)]
-        [InlineData(1.01)]
-        public void KeySpline_X_Values_Cannot_Be_Out_Of_Range(double input)
-        {
-            var keySpline = new KeySpline();
-            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX1 = input);
-            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX2 = input);
-        }
-
-        [Fact]
-        public void SplineEasing_Can_Be_Mutated()
-        {
-            var easing = new SplineEasing();
-
-            Assert.Equal(0, easing.Ease(0));
-            Assert.Equal(1, easing.Ease(1));
-
-            easing.X1 = 0.25;
-            easing.Y1 = 0.5;
-            easing.X2 = 0.75;
-            easing.Y2 = 1.0;
-
-            Assert.NotEqual(0.5, easing.Ease(0.5));
-        }
-
-        /*
-          To get the test values for the KeySpline test, you can:
-          1) Grab the WPF sample for KeySpline animations from https://github.com/microsoft/WPF-Samples/tree/master/Animation/KeySplineAnimations
-          2) Add the following xaml somewhere:
-            <Button Content="Capture"
-                    Click="Button_Click"/>
-            <ScrollViewer VerticalScrollBarVisibility="Visible">
-                <TextBlock Name="CaptureData"
-                           Text="---"
-                           TextWrapping="Wrap" />
-            </ScrollViewer>
-          3) Add the following code to the code behind:
-            private void Button_Click(object sender, RoutedEventArgs e)
-            {
-                CaptureData.Text += string.Format("\n{0} | {1}", myTranslateTransform3D.OffsetX, (TimeSpan)ExampleStoryboard.GetCurrentTime(this));
-                CaptureData.Text +=
-                    "\nKeySpline=\"" + mySplineKeyFrame.KeySpline.ControlPoint1.X.ToString() + "," +
-                    mySplineKeyFrame.KeySpline.ControlPoint1.Y.ToString() + " " +
-                    mySplineKeyFrame.KeySpline.ControlPoint2.X.ToString() + "," +
-                    mySplineKeyFrame.KeySpline.ControlPoint2.Y.ToString() + "\"";
-                CaptureData.Text += "\n-----";
-            }
-          4) Run the app, mess with the slider values, then click the button to capture output values
-         **/
-
-        [Fact]
-        public void Check_KeySpline_Handled_properly()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, -2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, 2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(5),
-                KeySpline = new KeySpline(0.1123555056179775,
-                                          0.657303370786517,
-                                          0.8370786516853934,
-                                          0.499999999999999999)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(5),
-                Children =
-                {
-                    keyframe1,
-                    keyframe2
-                },
-                IterationCount = new IterationCount(5),
-                PlaybackDirection = PlaybackDirection.Alternate
-            };
-
-            var rotateTransform = new RotateTransform(-2.5);
-            var rect = new Rectangle()
-            {
-                RenderTransform = rotateTransform
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(rect, clock);
-
-            // position is what you'd expect at end and beginning
-            clock.Step(TimeSpan.Zero);
-            Assert.Equal(rotateTransform.Angle, -2.5);
-            clock.Step(TimeSpan.FromSeconds(5));
-            Assert.Equal(rotateTransform.Angle, 2.5);
-
-            // test some points in between end and beginning
-            var tolerance = 0.01;
-            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
-            var expected = -2.4122350198982545;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
-            expected = -0.37153223002125113;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
-            expected = 0.3967885416786294;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
-            expected = 1.8016358493761722;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-        }
-        
-        [Fact]
-        public void Check_KeySpline_Parsing_Is_Correct()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, -2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, 2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(5),
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(5),
-                Children =
-                {
-                    keyframe1,
-                    keyframe2
-                },
-                IterationCount = new IterationCount(5),
-                PlaybackDirection = PlaybackDirection.Alternate,
-                Easing = Easing.Parse("0.1123555056179775,0.657303370786517,0.8370786516853934,0.499999999999999999")
-            };
-
-            var rotateTransform = new RotateTransform(-2.5);
-            var rect = new Rectangle()
-            {
-                RenderTransform = rotateTransform
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(rect, clock);
-
-            // position is what you'd expect at end and beginning
-            clock.Step(TimeSpan.Zero);
-            Assert.Equal(rotateTransform.Angle, -2.5);
-            clock.Step(TimeSpan.FromSeconds(5));
-            Assert.Equal(rotateTransform.Angle, 2.5);
-
-            // test some points in between end and beginning
-            var tolerance = 0.01;
-            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
-            var expected = -2.4122350198982545;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
-            expected = -0.37153223002125113;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
-            expected = 0.3967885416786294;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
-            expected = 1.8016358493761722;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index b57cd55868..0000000000
--- a/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Animation.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Animation.UnitTests/TestClock.cs b/tests/Avalonia.Animation.UnitTests/TestClock.cs
deleted file mode 100644
index 4812880c03..0000000000
--- a/tests/Avalonia.Animation.UnitTests/TestClock.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Animation.UnitTests
-{
-    internal class TestClock : IClock, IDisposable
-    {
-        private TimeSpan _curTime;
-
-        private IObserver<TimeSpan> _observer;
-
-        public PlayState PlayState { get; set; } = PlayState.Run;
-
-        public void Dispose()
-        {
-            _observer?.OnCompleted();
-        }
-
-        public void Step(TimeSpan time)
-        {
-            _observer?.OnNext(time);
-        }
-
-        public void Pulse(TimeSpan time)
-        {
-            _curTime += time;
-            _observer?.OnNext(_curTime);
-        }
-
-        public IDisposable Subscribe(IObserver<TimeSpan> observer)
-        {
-            _observer = observer;
-            return this;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs b/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
deleted file mode 100644
index 640013dedd..0000000000
--- a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class TransitionsTests
-    {
-        [Fact]
-        public void Check_Transitions_Interpolation_Negative_Bounds_Clamp()
-        {
-            var clock = new TestClock();
-
-            var border = new Border
-            {
-                Transitions = new Transitions
-                    {
-                        new DoubleTransition
-                        {
-                            Duration = TimeSpan.FromSeconds(1),
-                            Property = Border.OpacityProperty,
-                        }
-                    }
-            };
-
-            border.Opacity = 0;
-
-            clock.Pulse(TimeSpan.FromSeconds(0));
-            clock.Pulse(TimeSpan.FromSeconds(-0.5));
-
-            Assert.Equal(0, border.Opacity);
-
-        }
-
-        [Fact]
-        public void Check_Transitions_Interpolation_Positive_Bounds_Clamp()
-        {
-            var clock = new TestClock();
-
-            var border = new Border
-            {
-                Transitions = new Transitions
-                    {
-                        new DoubleTransition
-                        {
-                            Duration = TimeSpan.FromSeconds(1),
-                            Property = Border.OpacityProperty,
-                        }
-                    }
-            };
-
-            border.Opacity = 0;
-
-            clock.Pulse(TimeSpan.FromSeconds(0));
-            clock.Pulse(TimeSpan.FromMilliseconds(1001));
-
-            Assert.Equal(0, border.Opacity);
-
-        }
-
-        [Fact]
-        public void TransitionInstance_With_Zero_Duration_Is_Completed_On_First_Tick()
-        {
-            var clock = new TestClock();
-
-            int i = 0;
-            var inst = new TransitionInstance(clock, TimeSpan.Zero, TimeSpan.Zero).Subscribe(nextValue =>
-            {
-                switch (i++)
-                {
-                    case 0: Assert.Equal(0, nextValue); break;
-                    case 1: Assert.Equal(1d, nextValue); break;
-                }
-            });
-
-            clock.Pulse(TimeSpan.FromMilliseconds(10));
-
-        }
-
-        [Fact]
-        public void TransitionInstance_Properly_Calculates_Delay_And_Duration_Values()
-        {
-            var clock = new TestClock();
-
-            int i = -1;
-            var inst = new TransitionInstance(clock, TimeSpan.FromMilliseconds(30), TimeSpan.FromMilliseconds(70)).Subscribe(nextValue =>
-            {
-                switch (i++)
-                {
-                    case 0: Assert.Equal(0, nextValue); break;
-                    case 1: Assert.Equal(0, nextValue); break;
-                    case 2: Assert.Equal(0, nextValue); break;
-                    case 3: Assert.Equal(0, nextValue); break;
-                    case 4: Assert.Equal(Math.Round(10d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 5: Assert.Equal(Math.Round(20d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 6: Assert.Equal(Math.Round(30d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 7: Assert.Equal(Math.Round(40d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 8: Assert.Equal(Math.Round(50d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 9: Assert.Equal(Math.Round(60d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 10: Assert.Equal(1d, nextValue); break;
-                }
-            });
-
-            for (int z = 0; z <= 10; z++)
-            {
-                clock.Pulse(TimeSpan.FromMilliseconds(10));
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/AnimatableTests.cs b/tests/Avalonia.Base.UnitTests/Animation/AnimatableTests.cs
new file mode 100644
index 0000000000..f9ff8caab1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/AnimatableTests.cs
@@ -0,0 +1,515 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Data;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class AnimatableTests
+    {
+        [Fact]
+        public void Transition_Is_Not_Applied_When_Not_Attached_To_Visual_Tree()
+        {
+            var target = CreateTarget();
+            var control = new Control
+            {
+                Transitions = new Transitions { target.Object },
+            };
+
+            control.Opacity = 0.5;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5),
+                Times.Never);
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_To_Initial_Style()
+        {
+            using (Start())
+            {
+                var target = CreateTarget();
+                var control = new Control
+                {
+                    Transitions = new Transitions { target.Object },
+                };
+
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<Control>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Visual.OpacityProperty, 0.8),
+                            }
+                        }
+                    }
+                };
+
+                root.Child = control;
+
+                Assert.Equal(0.8, control.Opacity);
+
+                target.Verify(x => x.Apply(
+                    It.IsAny<Control>(),
+                    It.IsAny<IClock>(),
+                    It.IsAny<object>(),
+                    It.IsAny<object>()),
+                    Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Transition_Is_Applied_When_Local_Value_Changes()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.Opacity = 0.5;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5));
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_Animated_Value_Changes()
+        {
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.SetValue(Visual.OpacityProperty, 0.5, BindingPriority.Animation);
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5),
+                Times.Never);
+        }
+
+
+        [Theory]
+        [InlineData(null)] //null value
+        [InlineData("stringValue")] //string value
+        public void Invalid_Values_In_Animation_Should_Not_Crash_Animations(object invalidValue)
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, 1d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, 2d),
+                },
+                KeyTime = TimeSpan.FromSeconds(2),
+            };
+
+            var keyframe3 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, invalidValue),
+                },
+                KeyTime = TimeSpan.FromSeconds(3),
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2,
+                    keyframe3
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate,
+            };
+
+            var rect = new Rectangle()
+            {
+                Width = 11,
+            };
+
+            var originalValue = rect.Width;
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rect.Width, 1);
+            clock.Step(TimeSpan.FromSeconds(2));
+            Assert.Equal(rect.Width, 2);
+            clock.Step(TimeSpan.FromSeconds(3));
+            //here we have invalid value so value should be expected and set to initial original value
+            Assert.Equal(rect.Width, originalValue);
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.SetValue(Visual.OpacityProperty, 0.5);
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5));
+            target.Invocations.Clear();
+
+            control.SetValue(Visual.OpacityProperty, 0.8, BindingPriority.StyleTrigger);
+
+            target.Verify(x => x.Apply(
+                It.IsAny<Control>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void Transition_Is_Disposed_When_Local_Value_Changes()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+            var sub = new Mock<IDisposable>();
+
+            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5)).Returns(sub.Object);
+
+            control.Opacity = 0.5;
+            sub.Invocations.Clear();
+            control.Opacity = 0.4;
+
+            sub.Verify(x => x.Dispose());
+        }
+
+        [Fact]
+        public void New_Transition_Is_Applied_When_Local_Value_Changes()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            target.Setup(x => x.Property).Returns(Visual.OpacityProperty);
+            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5))
+                .Callback(() =>
+                {
+                    control.SetValue(Visual.OpacityProperty, 0.9, BindingPriority.Animation);
+                })
+                .Returns(Mock.Of<IDisposable>());
+
+            control.Opacity = 0.5;
+
+            Assert.Equal(0.9, control.Opacity);
+            target.Invocations.Clear();
+
+            control.Opacity = 0.4;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                0.9,
+                0.4));
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_Removed_From_Visual_Tree()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.Opacity = 0.5;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5));
+            target.Invocations.Clear();
+
+            var root = (TestRoot)control.Parent;
+            root.Child = null;
+            control.Opacity = 0.8;
+
+            target.Verify(x => x.Apply(
+                It.IsAny<Control>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void Animation_Is_Cancelled_When_Transition_Removed()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+            var sub = new Mock<IDisposable>();
+
+            target.Setup(x => x.Apply(
+                It.IsAny<Animatable>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>())).Returns(sub.Object);
+
+            control.Opacity = 0.5;
+            control.Transitions.RemoveAt(0);
+
+            sub.Verify(x => x.Dispose());
+        }
+
+        [Fact]
+        public void Animation_Is_Cancelled_When_New_Style_Activates()
+        {
+            using (Start())
+            {
+                var target = CreateTarget();
+                var control = CreateStyledControl(target.Object);
+                var sub = new Mock<IDisposable>();
+
+                target.Setup(x => x.Apply(
+                    control,
+                    It.IsAny<IClock>(),
+                    1.0,
+                    0.5)).Returns(sub.Object);
+
+                control.Opacity = 0.5;
+
+                target.Verify(x => x.Apply(
+                    control,
+                    It.IsAny<IClock>(),
+                    1.0,
+                    0.5),
+                    Times.Once);
+
+                control.Classes.Add("foo");
+
+                sub.Verify(x => x.Dispose());
+            }
+        }
+
+        [Fact]
+        public void Transition_From_Style_Trigger_Is_Applied()
+        {
+            using (Start())
+            {
+                var target = CreateTransition(Control.WidthProperty);
+                var control = CreateStyledControl(transition2: target.Object);
+                var sub = new Mock<IDisposable>();
+
+                control.Classes.Add("foo");
+                control.Width = 100;
+
+                target.Verify(x => x.Apply(
+                    control,
+                    It.IsAny<IClock>(),
+                    double.NaN,
+                    100.0),
+                    Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Replacing_Transitions_During_Animation_Does_Not_Throw_KeyNotFound()
+        {
+            // Issue #4059
+            using (Start())
+            {
+                Border target;
+                var clock = new TestClock();
+                var root = new TestRoot
+                {
+                    Clock = clock,
+                    Styles =
+                    {
+                        new Style(x => x.OfType<Border>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.TransitionsProperty,
+                                    new Transitions
+                                    {
+                                        new DoubleTransition
+                                        {
+                                            Property = Border.OpacityProperty,
+                                            Duration = TimeSpan.FromSeconds(1),
+                                        },
+                                    }),
+                            },
+                        },
+                        new Style(x => x.OfType<Border>().Class("foo"))
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.TransitionsProperty,
+                                    new Transitions
+                                    {
+                                        new DoubleTransition
+                                        {
+                                            Property = Border.OpacityProperty,
+                                            Duration = TimeSpan.FromSeconds(1),
+                                        },
+                                    }),
+                                new Setter(Border.OpacityProperty, 0.0),
+                            },
+                        },
+                    },
+                    Child = target = new Border
+                    {
+                        Background = Brushes.Red,
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                target.Classes.Add("foo");
+                clock.Step(TimeSpan.FromSeconds(0));
+                clock.Step(TimeSpan.FromSeconds(0.5));
+
+                Assert.Equal(0.5, target.Opacity);
+
+                target.Classes.Remove("foo");
+            }
+        }
+
+        [Fact]
+        public void Transitions_Can_Be_Changed_To_Collection_That_Contains_The_Same_Transitions()
+        {
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.Transitions = new Transitions { target.Object };
+        }
+
+        [Fact]
+        public void Transitions_Can_Re_Set_During_Batch_Update()
+        {
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            // Assigning and then clearing Transitions ensures we have a transition state
+            // collection created.
+            control.Transitions = null;
+
+            control.BeginBatchUpdate();
+
+            // Setting opacity then Transitions means that we receive the Transitions change
+            // after the Opacity change when EndBatchUpdate is called.
+            control.Opacity = 0.5;
+            control.Transitions = new Transitions { target.Object };
+
+            // Which means that the transition state hasn't been initialized with the new
+            // Transitions when the Opacity change notification gets raised here.
+            control.EndBatchUpdate();
+        }
+
+        private static IDisposable Start()
+        {
+            var clock = new MockGlobalClock();
+            var services = TestServices.RealStyler.With(globalClock: clock);
+            return UnitTestApplication.Start(services);
+        }
+
+        private static Mock<ITransition> CreateTarget()
+        {
+            return CreateTransition(Visual.OpacityProperty);
+        }
+
+        private static Control CreateControl(ITransition transition)
+        {
+            var control = new Control
+            {
+                Transitions = new Transitions { transition },
+            };
+
+            var root = new TestRoot(control);
+            return control;
+        }
+
+        private static Control CreateStyledControl(
+            ITransition transition1 = null,
+            ITransition transition2 = null)
+        {
+            transition1 = transition1 ?? CreateTarget().Object;
+            transition2 = transition2 ?? CreateTransition(Control.WidthProperty).Object;
+
+            var control = new Control
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Control>())
+                    {
+                        Setters =
+                        {
+                            new Setter
+                            {
+                                Property = Control.TransitionsProperty,
+                                Value = new Transitions { transition1 },
+                            }
+                        }
+                    },
+                    new Style(x => x.OfType<Control>().Class("foo"))
+                    {
+                        Setters =
+                        {
+                            new Setter
+                            {
+                                Property = Control.TransitionsProperty,
+                                Value = new Transitions { transition2 },
+                            }
+                        }
+                    }
+                }
+            };
+
+            var root = new TestRoot(control);
+            return control;
+        }
+
+        private static Mock<ITransition> CreateTransition(AvaloniaProperty property)
+        {
+            var target = new Mock<ITransition>();
+            var sub = new Mock<IDisposable>();
+
+            target.Setup(x => x.Property).Returns(property);
+            target.Setup(x => x.Apply(
+                It.IsAny<Animatable>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>())).Returns(sub.Object);
+
+            return target;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs b/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
new file mode 100644
index 0000000000..ca24b95e65
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
@@ -0,0 +1,450 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Avalonia.Data;
+using Xunit;
+using Avalonia.Animation.Easings;
+using System.Threading;
+using System.Reactive.Linq;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    using Animation = Avalonia.Animation.Animation;
+
+    public class AnimationIterationTests
+    {
+        [Fact]
+        public void Check_KeyTime_Correctly_Converted_To_Cue()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0.5)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 0d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock);
+
+            clock.Step(TimeSpan.Zero); 
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(1)); 
+            Assert.Equal(border.Width, 100d);
+ 
+        }
+
+
+        [Fact]
+        public void Check_Initial_Inter_and_Trailing_Delay_Values()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                Delay = TimeSpan.FromSeconds(3),
+                DelayBetweenIterations = TimeSpan.FromSeconds(3),
+                IterationCount = new IterationCount(2),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock);
+
+            clock.Step(TimeSpan.Zero);
+
+            // Initial Delay.
+            clock.Step(TimeSpan.FromSeconds(1));
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(6));
+
+            // First Inter-Iteration delay.
+            clock.Step(TimeSpan.FromSeconds(8));
+            Assert.Equal(border.Width, 200d);
+
+            // Trailing Delay should be non-existent.
+            clock.Step(TimeSpan.FromSeconds(14));
+            Assert.True(animationRun.Status == TaskStatus.RanToCompletion);
+            Assert.Equal(border.Width, 100d);
+        }
+
+        [Fact]
+        public void Check_FillModes_Start_and_End_Values_if_Retained()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 0d),
+                },
+                Cue = new Cue(0.0d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 300d),
+                },
+                Cue = new Cue(1.0d)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.05d),
+                Delay = TimeSpan.FromSeconds(0.05d),
+                Easing = new SineEaseInOut(),
+                FillMode = FillMode.Both,
+                Children =
+                {
+                    keyframe1,
+                    keyframe2
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d,
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock);
+
+            clock.Step(TimeSpan.FromSeconds(0d));
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(0.050d));
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(0.100d));
+            Assert.Equal(border.Width, 300d);
+        }
+
+        [Fact(Skip = "See #6111")]
+        public void Dispose_Subscription_Should_Stop_Animation()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 50d
+            };
+            var propertyChangedCount = 0;
+            var animationCompletedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var disposable = animation.Apply(border, clock, Observable.Return(true), () => animationCompletedCount++);
+
+            Assert.Equal(0, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(0));
+            Assert.Equal(0, animationCompletedCount);
+            Assert.Equal(1, propertyChangedCount);
+
+            disposable.Dispose();
+
+            // Clock ticks should be ignored after Dispose
+            clock.Step(TimeSpan.FromSeconds(5));
+            clock.Step(TimeSpan.FromSeconds(6));
+            clock.Step(TimeSpan.FromSeconds(7));
+
+            // On animation disposing (cancellation) on completed is not invoked (is it expected?)
+            Assert.Equal(0, animationCompletedCount);
+            // Initial property changed before cancellation + animation value removal.
+            Assert.Equal(2, propertyChangedCount);
+        }
+
+        [Fact]
+        public void Do_Not_Run_Cancelled_Animation()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d
+            };
+            var propertyChangedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var cancellationTokenSource = new CancellationTokenSource();
+            cancellationTokenSource.Cancel();
+            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
+
+            clock.Step(TimeSpan.FromSeconds(10));
+            Assert.Equal(0, propertyChangedCount);
+            Assert.True(animationRun.IsCompleted);
+        }
+
+        [Fact(Skip = "See #6111")]
+        public void Cancellation_Should_Stop_Animation()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 50d
+            };
+            var propertyChangedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
+
+            Assert.Equal(0, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(0));
+            Assert.False(animationRun.IsCompleted);
+            Assert.Equal(1, propertyChangedCount);
+
+            cancellationTokenSource.Cancel();
+            clock.Step(TimeSpan.FromSeconds(1));
+            clock.Step(TimeSpan.FromSeconds(2));
+            clock.Step(TimeSpan.FromSeconds(3));
+            //Assert.Equal(2, propertyChangedCount);
+
+            animationRun.Wait();
+
+            clock.Step(TimeSpan.FromSeconds(6));
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(2, propertyChangedCount);
+        }
+
+        [Fact]
+        public void Cancellation_Of_Completed_Animation_Does_Not_Fail()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 50d
+            };
+            var propertyChangedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
+
+            Assert.Equal(0, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(0));
+            Assert.False(animationRun.IsCompleted);
+            Assert.Equal(1, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(10));
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(2, propertyChangedCount);
+
+            cancellationTokenSource.Cancel();
+            animationRun.Wait();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/BrushTransitionTests.cs b/tests/Avalonia.Base.UnitTests/Animation/BrushTransitionTests.cs
new file mode 100644
index 0000000000..acc32fd6a2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/BrushTransitionTests.cs
@@ -0,0 +1,51 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class BrushTransitionTests
+    {
+        [Fact]
+        public void SolidColorBrush_Opacity_IsInteroplated()
+        {
+            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 0 });
+            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+            Test(0.5, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+            Test(0.5, new SolidColorBrush { Opacity = 0.5 }, new SolidColorBrush { Opacity = 0.5 });
+            Test(1, new SolidColorBrush { Opacity = 1 }, new SolidColorBrush { Opacity = 1 });
+            // TODO: investigate why this case fails.
+            //Test2(1, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+        }
+
+        [Fact]
+        public void LinearGradientBrush_Opacity_IsInteroplated()
+        {
+            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 0 });
+            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
+            Test(0.5, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
+            Test(0.5, new LinearGradientBrush { Opacity = 0.5 }, new LinearGradientBrush { Opacity = 0.5 });
+            Test(1, new LinearGradientBrush { Opacity = 1 }, new LinearGradientBrush { Opacity = 1 });
+        }
+
+        private static void Test(double progress, IBrush oldBrush, IBrush newBrush)
+        {
+            var clock = new TestClock();
+            var border = new Border() { Background = oldBrush };
+            BrushTransition sut = new BrushTransition
+            {
+                Duration = TimeSpan.FromSeconds(1),
+                Property = Border.BackgroundProperty
+            };
+
+            sut.Apply(border, clock, oldBrush, newBrush);
+            clock.Pulse(TimeSpan.Zero);
+            clock.Pulse(sut.Duration * progress);
+
+            Assert.NotNull(border.Background);
+            Assert.Equal(oldBrush.Opacity + (newBrush.Opacity - oldBrush.Opacity) * progress, border.Background.Opacity);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/KeySplineTests.cs b/tests/Avalonia.Base.UnitTests/Animation/KeySplineTests.cs
new file mode 100644
index 0000000000..3cd12d92ec
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/KeySplineTests.cs
@@ -0,0 +1,241 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class KeySplineTests
+    {
+        [Theory]
+        [InlineData("1,2 3,4")]
+        [InlineData("1 2 3 4")]
+        [InlineData("1 2,3 4")]
+        [InlineData("1,2,3,4")]
+        public void Can_Parse_KeySpline_Via_TypeConverter(string input)
+        {
+            var conv = new KeySplineTypeConverter();
+
+            var keySpline = (KeySpline)conv.ConvertFrom(input);
+
+            Assert.Equal(1, keySpline.ControlPointX1);
+            Assert.Equal(2, keySpline.ControlPointY1);
+            Assert.Equal(3, keySpline.ControlPointX2);
+            Assert.Equal(4, keySpline.ControlPointY2);
+        }
+
+        [Theory]
+        [InlineData("1,2F,3,4")] 
+        [InlineData("Foo,Bar,Fee,Buzz")] 
+        public void Can_Handle_Invalid_String_KeySpline_Via_TypeConverter(string input)
+        {
+            var conv = new KeySplineTypeConverter();
+
+            Assert.ThrowsAny<Exception>(() => (KeySpline)conv.ConvertFrom(input));
+        }
+
+        [Theory]
+        [InlineData(0.00)]
+        [InlineData(0.50)]
+        [InlineData(1.00)]
+        public void KeySpline_X_Values_In_Range_Do_Not_Throw(double input)
+        {
+            var keySpline = new KeySpline();
+            keySpline.ControlPointX1 = input; // no exception will be thrown -- test will fail if exception thrown
+            keySpline.ControlPointX2 = input; // no exception will be thrown -- test will fail if exception thrown
+        }
+
+        [Theory]
+        [InlineData(-0.01)]
+        [InlineData(1.01)]
+        public void KeySpline_X_Values_Cannot_Be_Out_Of_Range(double input)
+        {
+            var keySpline = new KeySpline();
+            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX1 = input);
+            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX2 = input);
+        }
+
+        [Fact]
+        public void SplineEasing_Can_Be_Mutated()
+        {
+            var easing = new SplineEasing();
+
+            Assert.Equal(0, easing.Ease(0));
+            Assert.Equal(1, easing.Ease(1));
+
+            easing.X1 = 0.25;
+            easing.Y1 = 0.5;
+            easing.X2 = 0.75;
+            easing.Y2 = 1.0;
+
+            Assert.NotEqual(0.5, easing.Ease(0.5));
+        }
+
+        /*
+          To get the test values for the KeySpline test, you can:
+          1) Grab the WPF sample for KeySpline animations from https://github.com/microsoft/WPF-Samples/tree/master/Animation/KeySplineAnimations
+          2) Add the following xaml somewhere:
+            <Button Content="Capture"
+                    Click="Button_Click"/>
+            <ScrollViewer VerticalScrollBarVisibility="Visible">
+                <TextBlock Name="CaptureData"
+                           Text="---"
+                           TextWrapping="Wrap" />
+            </ScrollViewer>
+          3) Add the following code to the code behind:
+            private void Button_Click(object sender, RoutedEventArgs e)
+            {
+                CaptureData.Text += string.Format("\n{0} | {1}", myTranslateTransform3D.OffsetX, (TimeSpan)ExampleStoryboard.GetCurrentTime(this));
+                CaptureData.Text +=
+                    "\nKeySpline=\"" + mySplineKeyFrame.KeySpline.ControlPoint1.X.ToString() + "," +
+                    mySplineKeyFrame.KeySpline.ControlPoint1.Y.ToString() + " " +
+                    mySplineKeyFrame.KeySpline.ControlPoint2.X.ToString() + "," +
+                    mySplineKeyFrame.KeySpline.ControlPoint2.Y.ToString() + "\"";
+                CaptureData.Text += "\n-----";
+            }
+          4) Run the app, mess with the slider values, then click the button to capture output values
+         **/
+
+        [Fact]
+        public void Check_KeySpline_Handled_properly()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, -2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, 2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(5),
+                KeySpline = new KeySpline(0.1123555056179775,
+                                          0.657303370786517,
+                                          0.8370786516853934,
+                                          0.499999999999999999)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(5),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate
+            };
+
+            var rotateTransform = new RotateTransform(-2.5);
+            var rect = new Rectangle()
+            {
+                RenderTransform = rotateTransform
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            // position is what you'd expect at end and beginning
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rotateTransform.Angle, -2.5);
+            clock.Step(TimeSpan.FromSeconds(5));
+            Assert.Equal(rotateTransform.Angle, 2.5);
+
+            // test some points in between end and beginning
+            var tolerance = 0.01;
+            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
+            var expected = -2.4122350198982545;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
+            expected = -0.37153223002125113;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
+            expected = 0.3967885416786294;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
+            expected = 1.8016358493761722;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+        }
+        
+        [Fact]
+        public void Check_KeySpline_Parsing_Is_Correct()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, -2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, 2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(5),
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(5),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate,
+                Easing = Easing.Parse("0.1123555056179775,0.657303370786517,0.8370786516853934,0.499999999999999999")
+            };
+
+            var rotateTransform = new RotateTransform(-2.5);
+            var rect = new Rectangle()
+            {
+                RenderTransform = rotateTransform
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            // position is what you'd expect at end and beginning
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rotateTransform.Angle, -2.5);
+            clock.Step(TimeSpan.FromSeconds(5));
+            Assert.Equal(rotateTransform.Angle, 2.5);
+
+            // test some points in between end and beginning
+            var tolerance = 0.01;
+            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
+            var expected = -2.4122350198982545;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
+            expected = -0.37153223002125113;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
+            expected = 0.3967885416786294;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
+            expected = 1.8016358493761722;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/SpringTests.cs b/tests/Avalonia.Base.UnitTests/Animation/SpringTests.cs
new file mode 100644
index 0000000000..47c0e48033
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/SpringTests.cs
@@ -0,0 +1,118 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation;
+
+public class SpringTests
+{
+    [Theory]
+    [InlineData("1,2 3,4")]
+    public void Can_Parse_Spring_Via_TypeConverter(string input)
+    {
+        var conv = new SpringTypeConverter();
+
+        var spring = (Spring)conv.ConvertFrom(input);
+
+        Assert.Equal(1, spring.Mass);
+        Assert.Equal(2, spring.Stiffness);
+        Assert.Equal(3, spring.Damping);
+        Assert.Equal(4, spring.InitialVelocity);
+    }
+
+    [Theory]
+    [InlineData("1,2F,3,4")] 
+    [InlineData("Foo,Bar,Fee,Buzz")] 
+    public void Can_Handle_Invalid_String_Via_TypeConverter(string input)
+    {
+        var conv = new SpringTypeConverter();
+
+        Assert.ThrowsAny<Exception>(() => (Spring)conv.ConvertFrom(input));
+    }
+
+    [Fact]
+    public void SplineEasing_Can_Be_Mutated()
+    {
+        var easing = new SpringEasing(1, 1, 1, 0);
+
+        Assert.Equal(0, easing.Ease(0));
+        Assert.Equal(0.34029984660829826, easing.Ease(1));
+
+        easing.Mass = 2;
+        easing.Stiffness = 2;
+        easing.Damping = 2;
+        easing.InitialVelocity = 1;
+
+        Assert.NotEqual(0.05136985716812037, easing.Ease(0.5));
+    }
+
+    [Fact]
+    public void Check_SpringEasing_Handled_properly()
+    {
+        var keyframe1 = new KeyFrame()
+        {
+            Setters =
+            {
+                new Setter(RotateTransform.AngleProperty, -2.5d),
+            },
+            KeyTime = TimeSpan.FromSeconds(0)
+        };
+
+        var keyframe2 = new KeyFrame()
+        {
+            Setters =
+            {
+                new Setter(RotateTransform.AngleProperty, 2.5d),
+            },
+            KeyTime = TimeSpan.FromSeconds(5)
+        };
+
+        var animation = new Avalonia.Animation.Animation()
+        {
+            Duration = TimeSpan.FromSeconds(5),
+            Children =
+            {
+                keyframe1,
+                keyframe2
+            },
+            IterationCount = new IterationCount(5),
+            PlaybackDirection = PlaybackDirection.Alternate,
+            Easing = new SpringEasing(1, 10, 1, 0)
+        };
+
+        var rotateTransform = new RotateTransform(-2.5);
+        var rect = new Rectangle()
+        {
+            RenderTransform = rotateTransform
+        };
+
+        var clock = new TestClock();
+        var animationRun = animation.RunAsync(rect, clock);
+
+        clock.Step(TimeSpan.Zero);
+        Assert.Equal(rotateTransform.Angle, -2.5);
+        clock.Step(TimeSpan.FromSeconds(5));
+        Assert.Equal(rotateTransform.Angle, 5.522828945000075);
+
+        var tolerance = 0.01;
+        clock.Step(TimeSpan.Parse("00:00:10.0153932"));
+        var expected = -2.499763294237805;
+        Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+        clock.Step(TimeSpan.Parse("00:00:11.2655407"));
+        expected = -1.1011448950348934;
+        Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+        clock.Step(TimeSpan.Parse("00:00:12.6158773"));
+        expected = 2.1264981706749007;
+        Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+        clock.Step(TimeSpan.Parse("00:00:14.6495256"));
+        expected = 5.4337608446234782;
+        Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/TestClock.cs b/tests/Avalonia.Base.UnitTests/Animation/TestClock.cs
new file mode 100644
index 0000000000..6604bd29a4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/TestClock.cs
@@ -0,0 +1,36 @@
+using System;
+using Avalonia.Animation;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    internal class TestClock : IClock, IDisposable
+    {
+        private TimeSpan _curTime;
+
+        private IObserver<TimeSpan> _observer;
+
+        public PlayState PlayState { get; set; } = PlayState.Run;
+
+        public void Dispose()
+        {
+            _observer?.OnCompleted();
+        }
+
+        public void Step(TimeSpan time)
+        {
+            _observer?.OnNext(time);
+        }
+
+        public void Pulse(TimeSpan time)
+        {
+            _curTime += time;
+            _observer?.OnNext(_curTime);
+        }
+
+        public IDisposable Subscribe(IObserver<TimeSpan> observer)
+        {
+            _observer = observer;
+            return this;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/TransitionsTests.cs b/tests/Avalonia.Base.UnitTests/Animation/TransitionsTests.cs
new file mode 100644
index 0000000000..65cf90b642
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/TransitionsTests.cs
@@ -0,0 +1,111 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class TransitionsTests
+    {
+        [Fact]
+        public void Check_Transitions_Interpolation_Negative_Bounds_Clamp()
+        {
+            var clock = new TestClock();
+
+            var border = new Border
+            {
+                Transitions = new Transitions
+                    {
+                        new DoubleTransition
+                        {
+                            Duration = TimeSpan.FromSeconds(1),
+                            Property = Border.OpacityProperty,
+                        }
+                    }
+            };
+
+            border.Opacity = 0;
+
+            clock.Pulse(TimeSpan.FromSeconds(0));
+            clock.Pulse(TimeSpan.FromSeconds(-0.5));
+
+            Assert.Equal(0, border.Opacity);
+
+        }
+
+        [Fact]
+        public void Check_Transitions_Interpolation_Positive_Bounds_Clamp()
+        {
+            var clock = new TestClock();
+
+            var border = new Border
+            {
+                Transitions = new Transitions
+                    {
+                        new DoubleTransition
+                        {
+                            Duration = TimeSpan.FromSeconds(1),
+                            Property = Border.OpacityProperty,
+                        }
+                    }
+            };
+
+            border.Opacity = 0;
+
+            clock.Pulse(TimeSpan.FromSeconds(0));
+            clock.Pulse(TimeSpan.FromMilliseconds(1001));
+
+            Assert.Equal(0, border.Opacity);
+
+        }
+
+        [Fact]
+        public void TransitionInstance_With_Zero_Duration_Is_Completed_On_First_Tick()
+        {
+            var clock = new TestClock();
+
+            int i = 0;
+            var inst = new TransitionInstance(clock, TimeSpan.Zero, TimeSpan.Zero).Subscribe(nextValue =>
+            {
+                switch (i++)
+                {
+                    case 0: Assert.Equal(0, nextValue); break;
+                    case 1: Assert.Equal(1d, nextValue); break;
+                }
+            });
+
+            clock.Pulse(TimeSpan.FromMilliseconds(10));
+
+        }
+
+        [Fact]
+        public void TransitionInstance_Properly_Calculates_Delay_And_Duration_Values()
+        {
+            var clock = new TestClock();
+
+            int i = -1;
+            var inst = new TransitionInstance(clock, TimeSpan.FromMilliseconds(30), TimeSpan.FromMilliseconds(70)).Subscribe(nextValue =>
+            {
+                switch (i++)
+                {
+                    case 0: Assert.Equal(0, nextValue); break;
+                    case 1: Assert.Equal(0, nextValue); break;
+                    case 2: Assert.Equal(0, nextValue); break;
+                    case 3: Assert.Equal(0, nextValue); break;
+                    case 4: Assert.Equal(Math.Round(10d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 5: Assert.Equal(Math.Round(20d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 6: Assert.Equal(Math.Round(30d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 7: Assert.Equal(Math.Round(40d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 8: Assert.Equal(Math.Round(50d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 9: Assert.Equal(Math.Round(60d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 10: Assert.Equal(1d, nextValue); break;
+                }
+            });
+
+            for (int z = 0; z <= 10; z++)
+            {
+                clock.Pulse(TimeSpan.FromMilliseconds(10));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs b/tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs
new file mode 100644
index 0000000000..28fb19e119
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Reflection;
+using Avalonia.Platform;
+using Avalonia.Platform.Internal;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests;
+
+public class AssetLoaderTests : IDisposable
+{
+    public class MockAssembly : Assembly {}
+
+    private const string AssemblyNameWithWhitespace = "Awesome Library";
+
+    private const string AssemblyNameWithNonAscii = "Какое-то-название";
+
+    public AssetLoaderTests()
+    {
+        var resolver = Mock.Of<IAssemblyDescriptorResolver>();
+
+        var descriptor = CreateAssemblyDescriptor(AssemblyNameWithWhitespace);
+        Mock.Get(resolver).Setup(x => x.GetAssembly(AssemblyNameWithWhitespace)).Returns(descriptor);
+
+        descriptor = CreateAssemblyDescriptor(AssemblyNameWithNonAscii);
+        Mock.Get(resolver).Setup(x => x.GetAssembly(AssemblyNameWithNonAscii)).Returns(descriptor);
+
+        AssetLoader.SetAssemblyDescriptorResolver(resolver);
+    }
+
+    [Fact]
+    public void AssemblyName_With_Whitespace_Should_Load_Resm()
+    {
+        var uri = new Uri($"resm:Avalonia.Base.UnitTests.Assets.something?assembly={AssemblyNameWithWhitespace}");
+        var loader = new AssetLoader();
+
+        var assemblyActual = loader.GetAssembly(uri, null);
+
+        Assert.Equal(AssemblyNameWithWhitespace, assemblyActual?.FullName);
+    }
+
+    [Fact(Skip = "RegisterResUriParsers breaks this test. See https://github.com/AvaloniaUI/Avalonia/issues/2555.")]
+    public void AssemblyName_With_Non_ASCII_Should_Load_Avares()
+    {
+        var uri = new Uri($"avares://{AssemblyNameWithNonAscii}/Assets/something");
+        var loader = new AssetLoader();
+
+        var assemblyActual = loader.GetAssembly(uri, null);
+
+        Assert.Equal(AssemblyNameWithNonAscii, assemblyActual?.FullName);
+    }
+
+    private static IAssemblyDescriptor CreateAssemblyDescriptor(string assemblyName)
+    {
+        var assembly = Mock.Of<MockAssembly>();
+        Mock.Get(assembly).Setup(x => x.GetName()).Returns(new AssemblyName(assemblyName));
+        Mock.Get(assembly).Setup(x => x.FullName).Returns(assemblyName);
+
+        var descriptor = Mock.Of<IAssemblyDescriptor>();
+        Mock.Get(descriptor).Setup(x => x.Assembly).Returns(assembly);
+        return descriptor;
+    }
+
+    public void Dispose()
+    {
+        AssetLoader.SetAssemblyDescriptorResolver(new AssemblyDescriptorResolver());
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index 9628d16a6c..602e5e4496 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -12,6 +12,11 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
   <Import Project="..\..\build\SharedVersion.props" />
+  <ItemGroup>
+    <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
+    <EmbeddedResource Remove="..\Avalonia.RenderTests\Assets\NotoColorEmoji.ttf" />
+    <EmbeddedResource Include="Media\TextFormatting\BreakPairTable.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_BatchUpdate.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_BatchUpdate.cs
index 01d5752ead..45de860894 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_BatchUpdate.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_BatchUpdate.cs
@@ -611,6 +611,36 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foo", notifications[1].NewValue);
         }
 
+        [Fact]
+        public void Can_Run_Empty_Batch_Update_When_Ending_Batch_Update()
+        {
+            var target = new TestClass();
+            var raised = 0;
+            var notifications = new List<AvaloniaPropertyChangedEventArgs>();
+
+            target.Foo = "foo";
+            target.Bar = "bar";
+
+            target.BeginBatchUpdate();
+            target.ClearValue(TestClass.FooProperty);
+            target.ClearValue(TestClass.BarProperty);
+            target.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == TestClass.BarProperty)
+                {
+                    target.BeginBatchUpdate();
+                    target.EndBatchUpdate();
+                }
+
+                ++raised;
+            };
+            target.EndBatchUpdate();
+
+            Assert.Null(target.Foo);
+            Assert.Null(target.Bar);
+            Assert.Equal(2, raised);
+        }
+
         public class TestClass : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 7c4c5c96a5..6b4a6f89df 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -11,6 +11,7 @@ using Avalonia.Logging;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Avalonia.Utilities;
 using Microsoft.Reactive.Testing;
 using Moq;
 using Xunit;
@@ -785,7 +786,7 @@ namespace Avalonia.Base.UnitTests
 
             target.Bind(Class1.DoubleValueProperty, new Binding(nameof(source.Value), BindingMode.TwoWay) { Source = source });
 
-            Assert.False(source.SetterCalled);
+            Assert.False(source.ValueSetterCalled);
         }
 
         [Fact]
@@ -796,7 +797,7 @@ namespace Avalonia.Base.UnitTests
 
             target.Bind(Class1.DoubleValueProperty, new Binding("[0]", BindingMode.TwoWay) { Source = source });
 
-            Assert.False(source.SetterCalled);
+            Assert.False(source.ValueSetterCalled);
         }
 
         [Fact]
@@ -829,6 +830,59 @@ namespace Avalonia.Base.UnitTests
             subscription.Dispose();
         }
 
+        [Fact]
+        public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation_With_Value()
+        {
+            var target = new Class1();
+            var source = new TestTwoWayBindingViewModel() { Value = 1 };
+            source.ResetSetterCalled();
+
+            target.Bind(Class1.DoubleValueProperty, new Binding(nameof(source.Value), BindingMode.TwoWay) { Source = source });
+
+            Assert.False(source.ValueSetterCalled);
+        }
+
+        [Fact]
+        public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation_Indexer_With_Value()
+        {
+            var target = new Class1();
+            var source = new TestTwoWayBindingViewModel() { [0] = 1 };
+            source.ResetSetterCalled();
+
+            target.Bind(Class1.DoubleValueProperty, new Binding("[0]", BindingMode.TwoWay) { Source = source });
+
+            Assert.False(source.ValueSetterCalled);
+        }
+
+
+        [Fact]
+        public void Disposing_a_TwoWay_Binding_Should_Set_Default_Value_On_Binding_Target_But_Not_On_Source()
+        {
+            var target = new Class3();
+
+            // Create a source class which has a Value set to -1 and a Minimum set to -2
+            var source = new TestTwoWayBindingViewModel() { Value = -1, Minimum = -2 };
+
+            // Reset the setter counter
+            source.ResetSetterCalled();
+
+            // 1. bind the minimum
+            var disposable_1 = target.Bind(Class3.MinimumProperty, new Binding("Minimum", BindingMode.TwoWay) { Source = source });
+            // 2. Bind the value
+            var disposable_2 = target.Bind(Class3.ValueProperty, new Binding("Value", BindingMode.TwoWay) { Source = source });
+
+            // Dispose the minimum binding
+            disposable_1.Dispose();
+            // Dispose the value binding
+            disposable_2.Dispose();
+
+
+            // The value setter should be called here as we have disposed minimum fist and the default value of minimum is 0, so this should be changed.
+            Assert.True(source.ValueSetterCalled);
+            // The minimum value should not be changed in the source.
+            Assert.False(source.MinimumSetterCalled);
+        }
+
         /// <summary>
         /// Returns an observable that returns a single value but does not complete.
         /// </summary>
@@ -864,6 +918,56 @@ namespace Avalonia.Base.UnitTests
                 AvaloniaProperty.Register<Class2, string>("Bar", "bardefault");
         }
 
+        private class Class3 : AvaloniaObject 
+        {
+            static Class3()
+            {
+                MinimumProperty.Changed.Subscribe(x => OnMinimumChanged(x));
+            }
+
+            private static void OnMinimumChanged(AvaloniaPropertyChangedEventArgs<double> e)
+            {
+                if (e.Sender is Class3 s)
+                {
+                    s.SetValue(ValueProperty, MathUtilities.Clamp(s.Value, e.NewValue.Value, double.PositiveInfinity));
+                }
+            }
+
+            /// <summary>
+            /// Defines the <see cref="Value"/> property.
+            /// </summary>
+            public static readonly StyledProperty<double> ValueProperty =
+                AvaloniaProperty.Register<Class3, double>(nameof(Value), 0);
+
+            /// <summary>
+            /// Gets or sets the Value property
+            /// </summary>
+            public double Value
+            {
+                get { return GetValue(ValueProperty); }
+                set { SetValue(ValueProperty, value); }
+            }
+
+
+            /// <summary>
+            /// Defines the <see cref="Minimum"/> property.
+            /// </summary>
+            public static readonly StyledProperty<double> MinimumProperty =
+                AvaloniaProperty.Register<Class3, double>(nameof(Minimum), 0);
+
+            /// <summary>
+            /// Gets or sets the minimum property
+            /// </summary>
+            public double Minimum
+            {
+                get { return GetValue(MinimumProperty); }
+                set { SetValue(MinimumProperty, value); }
+            }
+
+
+        }
+
+
         private class TestOneTimeBinding : IBinding
         {
             private IObservable<object> _source;
@@ -928,7 +1032,18 @@ namespace Avalonia.Base.UnitTests
                 set
                 {
                     _value = value;
-                    SetterCalled = true;
+                    ValueSetterCalled = true;
+                }
+            }
+
+            private double _minimum;
+            public double Minimum
+            {
+                get => _minimum;
+                set
+                {
+                    _minimum = value;
+                    MinimumSetterCalled = true;
                 }
             }
 
@@ -938,11 +1053,18 @@ namespace Avalonia.Base.UnitTests
                 set
                 {
                     _value = value;
-                    SetterCalled = true;
+                    ValueSetterCalled = true;
                 }
             }
 
-            public bool SetterCalled { get; private set; }
+            public bool ValueSetterCalled { get; private set; }
+            public bool MinimumSetterCalled { get; private set; }
+
+            public void ResetSetterCalled()
+            {
+                ValueSetterCalled = false;
+                MinimumSetterCalled = false;
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
index 65f03b3eca..d48e58136a 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
@@ -52,14 +52,14 @@ namespace Avalonia.Base.UnitTests
             source.OnNext(BindingValue<int>.DataValidationError(new Exception()));
             source.OnNext(7);
 
-            var result = target.Notifications.Cast<BindingValue<int>>().ToList();
+            var result = target.Notifications;
             Assert.Equal(4, result.Count);
-            Assert.Equal(BindingValueType.Value, result[0].Type);
-            Assert.Equal(6, result[0].Value);
-            Assert.Equal(BindingValueType.BindingError, result[1].Type);
-            Assert.Equal(BindingValueType.DataValidationError, result[2].Type);
-            Assert.Equal(BindingValueType.Value, result[3].Type);
-            Assert.Equal(7, result[3].Value);
+            Assert.Equal(BindingValueType.Value, result[0].type);
+            Assert.Equal(6, result[0].value);
+            Assert.Equal(BindingValueType.BindingError, result[1].type);
+            Assert.Equal(BindingValueType.DataValidationError, result[2].type);
+            Assert.Equal(BindingValueType.Value, result[3].type);
+            Assert.Equal(7, result[3].value);
         }
 
         [Fact]
@@ -72,8 +72,7 @@ namespace Avalonia.Base.UnitTests
             target.Bind(Class1.NonValidatedDirectProperty, source);
             source.OnNext(1);
 
-            var result = target.Notifications.Cast<BindingValue<int>>().ToList();
-            Assert.Equal(1, result.Count);
+            Assert.Equal(1, target.Notifications.Count);
         }
 
         [Fact]
@@ -154,13 +153,14 @@ namespace Avalonia.Base.UnitTests
                 set { SetAndRaise(ValidatedDirectStringProperty, ref _directString, value); }
             }
 
-            public IList<object> Notifications { get; } = new List<object>();
+            public List<(BindingValueType type, object value)> Notifications { get; } = new();
 
-            protected override void UpdateDataValidation<T>(
-                AvaloniaProperty<T> property,
-                BindingValue<T> value)
+            protected override void UpdateDataValidation(
+                AvaloniaProperty property,
+                BindingValueType state,
+                Exception error)
             {
-                Notifications.Add(value);
+                Notifications.Add((state, GetValue(property)));
             }
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
index e8fc3f9f40..7f4dcace71 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
@@ -109,25 +109,26 @@ namespace Avalonia.Base.UnitTests
             public List<AvaloniaPropertyChangedEventArgs> Changes { get; }
             public List<AvaloniaPropertyChangedEventArgs> CoreChanges { get; }
 
-            protected override void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            protected override void OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs change)
             {
                 CoreChanges.Add(Clone(change));
                 base.OnPropertyChangedCore(change);
             }
 
-            protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
             {
                 Changes.Add(Clone(change));
                 base.OnPropertyChanged(change);
             }
 
-            private static AvaloniaPropertyChangedEventArgs<T> Clone<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            private static AvaloniaPropertyChangedEventArgs Clone(AvaloniaPropertyChangedEventArgs change)
             {
-                var result = new AvaloniaPropertyChangedEventArgs<T>(
+                var e = (AvaloniaPropertyChangedEventArgs<string>)change;
+                var result = new AvaloniaPropertyChangedEventArgs<string>(
                     change.Sender,
-                    change.Property,
-                    change.OldValue,
-                    change.NewValue,
+                    e.Property,
+                    e.OldValue,
+                    e.NewValue,
                     change.Priority);
 
                 if (!change.IsEffectiveValueChange)
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
index 954a609315..72162a4d8e 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
@@ -17,6 +17,21 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
         }
 
+        [Fact]
+        public void ClearValue_Resets_Value_To_Style_value()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "style", BindingPriority.Style);
+            target.SetValue(Class1.FooProperty, "local");
+
+            Assert.Equal("local", target.GetValue(Class1.FooProperty));
+
+            target.ClearValue(Class1.FooProperty);
+
+            Assert.Equal("style", target.GetValue(Class1.FooProperty));
+        }
+
         [Fact]
         public void ClearValue_Raises_PropertyChanged()
         {
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
index 7f4db23268..0d62f20f7e 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Reactive.Linq;
 using Xunit;
@@ -56,7 +57,7 @@ namespace Avalonia.Base.UnitTests
                 .Select(x => x.Name)
                 .ToArray();
 
-            Assert.Equal(new[] { "Attached" }, names);
+            Assert.Contains("Attached", names);
         }
 
         [Fact]
@@ -66,7 +67,7 @@ namespace Avalonia.Base.UnitTests
                 .Select(x => x.Name)
                 .ToArray();
 
-            Assert.Equal(new[] { "Attached" }, names);
+            Assert.Contains("Attached", names);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
index 1adb6988a2..f3f39b465b 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Data;
+using Avalonia.Styling;
 using Avalonia.Utilities;
 using Xunit;
 
@@ -146,46 +147,46 @@ namespace Avalonia.Base.UnitTests
                 OverrideMetadata(typeof(T), metadata);
             }
 
-            public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
-            {
-                throw new NotImplementedException();
-            }
-
             internal override IDisposable RouteBind(
-                IAvaloniaObject o,
+                AvaloniaObject o,
                 IObservable<BindingValue<object>> source,
                 BindingPriority priority)
             {
                 throw new NotImplementedException();
             }
 
-            internal override void RouteClearValue(IAvaloniaObject o)
+            internal override void RouteClearValue(AvaloniaObject o)
             {
                 throw new NotImplementedException();
             }
 
-            internal override object RouteGetValue(IAvaloniaObject o)
+            internal override object RouteGetValue(AvaloniaObject o)
             {
                 throw new NotImplementedException();
             }
 
-            internal override object RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+            internal override object RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority)
             {
                 throw new NotImplementedException();
             }
 
-            internal override void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject oldParent)
+            internal override void RouteInheritanceParentChanged(AvaloniaObject o, AvaloniaObject oldParent)
             {
                 throw new NotImplementedException();
             }
 
             internal override IDisposable RouteSetValue(
-                IAvaloniaObject o,
+                AvaloniaObject o,
                 object value,
                 BindingPriority priority)
             {
                 throw new NotImplementedException();
             }
+
+            internal override ISetterInstance CreateSetterInstance(IStyleable target, object value)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         private class Class1 : AvaloniaObject
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
deleted file mode 100644
index b1b2d3d8f2..0000000000
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System.Linq;
-using Avalonia.Collections;
-using Xunit;
-
-namespace Avalonia.Base.UnitTests.Collections
-{
-    public class AvaloniaListExtenionsTests
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        [Fact]
-        public void CreateDerivedList_Creates_Initial_Items()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_Add()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.Add(4);
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_Insert()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.Insert(1, 4);
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_Remove()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.Remove(2);
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_RemoveRange()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.RemoveRange(1, 2);
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_Move()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.Move(2, 0);
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Theory]
-        [InlineData(0, 2, 3)]
-        [InlineData(0, 2, 4)]
-        [InlineData(0, 2, 5)]
-        [InlineData(0, 4, 4)]
-        [InlineData(1, 2, 0)]
-        [InlineData(1, 2, 4)]
-        [InlineData(1, 2, 5)]
-        [InlineData(1, 4, 0)]
-        [InlineData(2, 2, 0)]
-        [InlineData(2, 2, 1)]
-        [InlineData(2, 2, 3)]
-        [InlineData(2, 2, 4)]
-        [InlineData(2, 2, 5)]
-        [InlineData(4, 2, 0)]
-        [InlineData(4, 2, 1)]
-        [InlineData(4, 2, 3)]
-        [InlineData(5, 1, 0)]
-        [InlineData(5, 1, 3)]
-        public void CreateDerivedList_Handles_MoveRange(int oldIndex, int count, int newIndex)
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3, 4, 5 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.MoveRange(oldIndex, count, newIndex);
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_Replace()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source[1] = 4;
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-
-        [Fact]
-        public void CreateDerivedList_Handles_Clear()
-        {
-            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
-            var target = source.CreateDerivedList(x => new Wrapper(x));
-
-            source.Clear();
-
-            var result = target.Select(x => x.Value).ToList();
-
-            Assert.Equal(source, result);
-        }
-#pragma warning restore CS0618 // Type or member is obsolete
-
-
-        private class Wrapper
-        {
-            public Wrapper(int value)
-            {
-                Value = value;
-            }
-
-            public int Value { get; }
-        }
-    }
-}
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
index f5ae4cc1e0..b59f272b0c 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
@@ -146,6 +146,23 @@ namespace Avalonia.Base.UnitTests.Collections
             Assert.True(raised);
         }
 
+        [Fact]
+        public void AddRange_IEnumerable_Should_Raise_Count_PropertyChanged()
+        {
+            var target = new AvaloniaList<int>(new[] { 1, 2, 3, 4, 5 });
+            var raised = false;
+
+            target.PropertyChanged += (s, e) => {
+                Assert.Equal(e.PropertyName, nameof(target.Count));
+                Assert.Equal(target.Count, 7);
+                raised = true;
+            };
+
+            target.AddRange(Enumerable.Range(6, 2));
+
+            Assert.True(raised);
+        }
+
         [Fact]
         public void AddRange_Items_Should_Raise_Correct_CollectionChanged()
         {
diff --git a/tests/Avalonia.Base.UnitTests/Composition/BatchStreamTests.cs b/tests/Avalonia.Base.UnitTests/Composition/BatchStreamTests.cs
new file mode 100644
index 0000000000..a1b55257e6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Composition/BatchStreamTests.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks.Dataflow;
+using Avalonia.Rendering.Composition.Transport;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Composition;
+
+public class BatchStreamTests
+{
+    [Fact]
+    public void BatchStreamCorrectlyWritesAndReadsData()
+    {
+        var data = new BatchStreamData();
+        var memPool = new BatchStreamMemoryPool(100, _ => { });
+        var objPool = new BatchStreamObjectPool<object>(10, _ => { });
+
+        var guids = new List<Guid>();
+        var objects = new List<object>();
+        for (var c = 0; c < 453; c++)
+        {
+            guids.Add(Guid.NewGuid());
+            objects.Add(new object());
+        }
+
+        using (var writer = new BatchStreamWriter(data, memPool, objPool))
+        {
+            foreach(var guid in guids)
+                writer.Write(guid);
+            foreach (var obj in objects)
+                writer.WriteObject(obj);
+        }
+
+        using (var reader = new BatchStreamReader(data, memPool, objPool))
+        {
+            foreach (var guid in guids) 
+                Assert.Equal(guid, reader.Read<Guid>());
+            foreach (var obj in objects)
+                Assert.Equal(obj, reader.ReadObject());
+        }
+        
+
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Base.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Base.UnitTests/CornerRadiusTests.cs
new file mode 100644
index 0000000000..edfbd5acd9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/CornerRadiusTests.cs
@@ -0,0 +1,39 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class CornerRadiusTests
+    {
+        [Fact]
+        public void Parse_Parses_Single_Uniform_Radius()
+        {
+            var result = CornerRadius.Parse("3.4");
+
+            Assert.Equal(new CornerRadius(3.4), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Top_Bottom()
+        {
+            var result = CornerRadius.Parse("1.1,2.2");
+
+            Assert.Equal(new CornerRadius(1.1, 2.2), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_TopLeft_TopRight_BottomRight_BottomLeft()
+        {
+            var result = CornerRadius.Parse("1.1,2.2,3.3,4.4");
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+
+        [Fact]
+        public void Parse_Accepts_Spaces()
+        {
+            var result = CornerRadius.Parse("1.1 2.2 3.3 4.4");
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
index 1d9524a191..574ecd2ca4 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
@@ -7,7 +7,7 @@ using Avalonia.Data.Core.Plugins;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data.Plugins
+namespace Avalonia.Base.UnitTests.Data.Core.Plugins
 {
     public class DataAnnotationsValidationPluginTests : IClassFixture<InvariantCultureFixture>
     {
diff --git a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
index f522acf9ce..7cf84d767a 100644
--- a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
@@ -7,7 +7,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Layout;
 using Xunit;
 
-namespace Avalonia.Base.UnitTests.Data.Converters
+namespace Avalonia.Base.UnitTests.Data
 {
     public class DefaultValueConverterTests
     {
diff --git a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
new file mode 100644
index 0000000000..57ec00cb58
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
@@ -0,0 +1,205 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class GesturesTests
+    {
+        private MouseTestHelper _mouse = new MouseTestHelper();
+        
+        [Fact]
+        public void Tapped_Should_Follow_Pointer_Pressed_Released()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, false);
+
+            _mouse.Click(border);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
+        }
+
+        [Fact]
+        public void Tapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, true);
+
+            _mouse.Click(border);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
+        }
+
+        [Fact]
+        public void Tapped_Should_Not_Be_Raised_For_Middle_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Middle);
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void Tapped_Should_Not_Be_Raised_For_Right_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Right);
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void RightTapped_Should_Be_Raised_For_Right_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.RightTappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Right);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Follow_Pointer_Pressed_Released_Pressed()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, false);
+
+            _mouse.Click(border);
+            _mouse.Down(border, clickCount: 2);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, true);
+
+            _mouse.Click(border);
+            _mouse.Down(border, clickCount: 2);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Middle);
+            _mouse.Down(border, MouseButton.Middle, clickCount: 2);
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Not_Be_Raised_For_Right_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Right);
+            _mouse.Down(border, MouseButton.Right, clickCount: 2);
+
+            Assert.False(raised);
+        }
+
+        private void AddHandlers(
+            Decorator decorator,
+            Border border,
+            IList<string> result,
+            bool markHandled)
+        {
+            decorator.AddHandler(Border.PointerPressedEvent, (s, e) =>
+            {
+                result.Add("dp");
+
+                if (markHandled)
+                {
+                    e.Handled = true;
+                }
+            });
+
+            decorator.AddHandler(Border.PointerReleasedEvent, (s, e) =>
+            {
+                result.Add("dr");
+
+                if (markHandled)
+                {
+                    e.Handled = true;
+                }
+            });
+
+            border.AddHandler(Border.PointerPressedEvent, (s, e) => result.Add("bp"));
+            border.AddHandler(Border.PointerReleasedEvent, (s, e) => result.Add("br"));
+
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("dt"));
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("ddt"));
+            border.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("bt"));
+            border.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("bdt"));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/InputElement_Enabled.cs b/tests/Avalonia.Base.UnitTests/Input/InputElement_Enabled.cs
new file mode 100644
index 0000000000..1c001d4b3a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/InputElement_Enabled.cs
@@ -0,0 +1,98 @@
+using Avalonia.Controls;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class InputElement_Enabled
+    {
+        [Fact]
+        public void IsEffectivelyEnabled_Follows_IsEnabled()
+        {
+            var target = new Decorator();
+
+            Assert.True(target.IsEnabled);
+            Assert.True(target.IsEffectivelyEnabled);
+
+            target.IsEnabled = false;
+
+            Assert.False(target.IsEnabled);
+            Assert.False(target.IsEffectivelyEnabled);
+        }
+
+        [Fact]
+        public void IsEffectivelyEnabled_Follows_Ancestor_IsEnabled()
+        {
+            Decorator child;
+            Decorator grandchild;
+            var target = new Decorator
+            {
+                Child = child = new Decorator
+                {
+                    Child = grandchild = new Decorator(),
+                }
+            };
+
+            Assert.True(target.IsEnabled);
+            Assert.True(target.IsEffectivelyEnabled);
+            Assert.True(child.IsEnabled);
+            Assert.True(child.IsEffectivelyEnabled);
+            Assert.True(grandchild.IsEnabled);
+            Assert.True(grandchild.IsEffectivelyEnabled);
+
+            target.IsEnabled = false;
+
+            Assert.False(target.IsEnabled);
+            Assert.False(target.IsEffectivelyEnabled);
+            Assert.True(child.IsEnabled);
+            Assert.False(child.IsEffectivelyEnabled);
+            Assert.True(grandchild.IsEnabled);
+            Assert.False(grandchild.IsEffectivelyEnabled);
+        }
+
+        [Fact]
+        public void Disabled_Pseudoclass_Follows_IsEffectivelyEnabled()
+        {
+            Decorator child;
+            var target = new Decorator
+            {
+                Child = child = new Decorator()
+            };
+
+            Assert.DoesNotContain(":disabled", child.Classes);
+
+            target.IsEnabled = false;
+
+            Assert.Contains(":disabled", child.Classes);
+        }
+
+        [Fact]
+        public void IsEffectivelyEnabled_Respects_IsEnabledCore()
+        {
+            Decorator child;
+            var target = new TestControl
+            {
+                Child = child = new Decorator()
+            };
+
+            target.ShouldEnable = false;
+
+            Assert.True(target.IsEnabled);
+            Assert.False(target.IsEffectivelyEnabled);
+            Assert.True(child.IsEnabled);
+            Assert.False(child.IsEffectivelyEnabled);
+        }
+
+        private class TestControl : Decorator
+        {
+            private bool _shouldEnable;
+
+            public bool ShouldEnable
+            {
+                get => _shouldEnable;
+                set { _shouldEnable = value; UpdateIsEffectivelyEnabled(); }
+            }
+
+            protected override bool IsEnabledCore => IsEnabled && _shouldEnable; 
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
new file mode 100644
index 0000000000..2d8ee62ef2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
@@ -0,0 +1,342 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class InputElement_Focus
+    {
+        [Fact]
+        public void Focus_Should_Set_FocusManager_Current()
+        {
+            Button target;
+
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var root = new TestRoot
+                {
+                    Child = target = new Button()
+                };
+
+                target.Focus();
+
+                Assert.Same(target, FocusManager.Instance.Current);
+            }
+        }
+
+        [Fact]
+        public void Focus_Should_Be_Cleared_When_Control_Is_Removed_From_VisualTree()
+        {
+            Button target;
+
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var root = new TestRoot
+                {
+                    Child = target = new Button()
+                };
+
+                target.Focus();
+                root.Child = null;
+
+                Assert.Null(FocusManager.Instance.Current);
+            }
+        }
+
+        [Fact]
+        public void Focus_Pseudoclass_Should_Be_Applied_On_Focus()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus"));
+                Assert.False(target2.IsFocused);
+                Assert.False(target2.Classes.Contains(":focus"));
+
+                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus"));
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus"));
+            }
+        }
+
+        [Fact]
+        public void Control_FocusVsisible_Pseudoclass_Should_Be_Applied_On_Tab_And_DirectionalFocus()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-visible"));
+                Assert.False(target2.IsFocused);
+                Assert.False(target2.Classes.Contains(":focus-visible"));
+
+                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-visible"));
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus-visible"));
+
+                FocusManager.Instance?.Focus(target1, NavigationMethod.Directional);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-visible"));
+                Assert.False(target2.IsFocused);
+                Assert.False(target2.Classes.Contains(":focus-visible"));
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_PseudoClass_Should_Be_Applied()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_PseudoClass_Should_Be_Applied_and_Removed()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var panel1 = new Panel { Children = { target1 } };
+                var panel2 = new Panel { Children = { target2 } };
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            panel1,
+                            panel2
+                        }
+                    }
+                };
+                
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(panel1.Classes.Contains(":focus-within"));
+                Assert.True(panel1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+                
+                FocusManager.Instance?.Focus(target2);
+                
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-within"));
+                Assert.False(target1.IsKeyboardFocusWithin);
+                Assert.False(panel1.Classes.Contains(":focus-within"));
+                Assert.False(panel1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+                
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus-within"));
+                Assert.True(target2.IsKeyboardFocusWithin);
+                Assert.True(panel2.Classes.Contains(":focus-within"));
+                Assert.True(panel2.IsKeyboardFocusWithin);
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_When_Removed_From_Tree()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+
+                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
+                
+                root.Child = null;
+                
+                Assert.Null(KeyboardDevice.Instance.FocusedElement);
+                
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-within"));
+                Assert.False(target1.IsKeyboardFocusWithin);
+                Assert.False(root.Classes.Contains(":focus-within"));
+                Assert.False(root.IsKeyboardFocusWithin);
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_Focus_Moves_To_Different_Root()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                
+                var root1 = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                        }
+                    }
+                };
+                
+                var root2 = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target2,
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(root1.Child.Classes.Contains(":focus-within"));
+                Assert.True(root1.Child.IsKeyboardFocusWithin);
+                Assert.True(root1.Classes.Contains(":focus-within"));
+                Assert.True(root1.IsKeyboardFocusWithin);
+
+                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
+                
+                FocusManager.Instance?.Focus(target2);
+                
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-within"));
+                Assert.False(target1.IsKeyboardFocusWithin);
+                Assert.False(root1.Child.Classes.Contains(":focus-within"));
+                Assert.False(root1.Child.IsKeyboardFocusWithin);
+                Assert.False(root1.Classes.Contains(":focus-within"));
+                Assert.False(root1.IsKeyboardFocusWithin);
+                
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus-within"));
+                Assert.True(target2.IsKeyboardFocusWithin);
+                Assert.True(root2.Child.Classes.Contains(":focus-within"));
+                Assert.True(root2.Child.IsKeyboardFocusWithin);
+                Assert.True(root2.Classes.Contains(":focus-within"));
+                Assert.True(root2.IsKeyboardFocusWithin);
+            }
+        }
+
+        [Fact]
+        public void Can_Clear_Focus()
+        {
+            Button target;
+
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var root = new TestRoot
+                {
+                    Child = target = new Button()
+                };
+
+                target.Focus();
+                FocusManager.Instance.Focus(null);
+
+                Assert.Null(FocusManager.Instance.Current);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyGestureTests.cs b/tests/Avalonia.Base.UnitTests/Input/KeyGestureTests.cs
new file mode 100644
index 0000000000..33cd94ec98
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyGestureTests.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using Avalonia.Input;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyGestureTests
+    {
+        public static readonly IEnumerable<object[]> ParseData = new object[][]
+        {
+            new object[]{"Ctrl+A", new KeyGesture(Key.A, KeyModifiers.Control)},
+            new object[]{"  \tShift\t+Alt +B", new KeyGesture(Key.B, KeyModifiers.Shift | KeyModifiers.Alt) },
+            new object[]{"Control++", new KeyGesture(Key.OemPlus, KeyModifiers.Control) },
+            new object[]{ "Shift+⌘+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
+            new object[]{ "Shift+Cmd+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
+        };
+
+        public static readonly IEnumerable<object[]> ToStringData = new object[][]
+        {
+            new object[]{new KeyGesture(Key.A), "A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Control), "Ctrl+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Shift), "Ctrl+Shift+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Alt | KeyModifiers.Shift), "Shift+Alt+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Alt | KeyModifiers.Shift), "Ctrl+Shift+Alt+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift), "Shift+Cmd+A"},
+        };
+
+        [Theory]
+        [MemberData(nameof(ParseData))]
+        public void Key_Gesture_Is_Able_To_Parse_Sample_Data(string text, KeyGesture gesture)
+        {
+            Assert.Equal(gesture, KeyGesture.Parse(text));
+        }
+
+        [Theory]
+        [InlineData(Key.OemMinus, Key.Subtract)]
+        [InlineData(Key.OemPlus, Key.Add)]
+        [InlineData(Key.OemPeriod, Key.Decimal)]
+        public void Key_Gesture_Matches_NumPad_To_Regular_Digit(Key gestureKey, Key pressedKey)
+        {
+            var keyGesture = new KeyGesture(gestureKey);
+
+            Assert.True(keyGesture.Matches(new KeyEventArgs
+            {
+                Key = pressedKey
+            }));
+        }
+
+        [Theory]
+        [MemberData(nameof(ToStringData))]
+        public void ToString_Produces_Correct_Results(KeyGesture gesture, string expected)
+        {
+            Assert.Equal(expected, gesture.ToString());
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardDeviceTests.cs
new file mode 100644
index 0000000000..07bfa0d2e6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardDeviceTests.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Windows.Input;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyboardDeviceTests
+    {
+        [Fact]
+        public void Keypresses_Should_Be_Sent_To_Root_If_No_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var root = new Mock<IInputRoot>();
+
+            target.ProcessRawEvent(
+                new RawKeyEventArgs(
+                    target,
+                    0,
+                    root.Object,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.None));
+
+            root.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
+        }
+
+        [Fact]
+        public void Keypresses_Should_Be_Sent_To_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var focused = new Mock<IInputElement>();
+            var root = Mock.Of<IInputRoot>();
+
+            target.SetFocusedElement(
+                focused.Object,
+                NavigationMethod.Unspecified,
+                KeyModifiers.None);
+
+            target.ProcessRawEvent(
+                new RawKeyEventArgs(
+                    target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.None));
+
+            focused.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
+        }
+
+        [Fact]
+        public void TextInput_Should_Be_Sent_To_Root_If_No_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var root = new Mock<IInputRoot>();
+
+            target.ProcessRawEvent(
+                new RawTextInputEventArgs(
+                    target,
+                    0,
+                    root.Object,
+                    "Foo"));
+
+            root.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
+        }
+
+        [Fact]
+        public void TextInput_Should_Be_Sent_To_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var focused = new Mock<IInputElement>();
+            var root = Mock.Of<IInputRoot>();
+
+            target.SetFocusedElement(
+                focused.Object,
+                NavigationMethod.Unspecified,
+                KeyModifiers.None);
+
+            target.ProcessRawEvent(
+                new RawTextInputEventArgs(
+                    target,
+                    0,
+                    root,
+                    "Foo"));
+
+            focused.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
+        }
+
+        [Fact]
+        public void Can_Change_KeyBindings_In_Keybinding_Event_Handler()
+        {
+            var target = new KeyboardDevice();
+            var button = new Button();
+            var root = new TestRoot(button);
+            var raised = 0;
+
+            button.KeyBindings.Add(new KeyBinding
+            {
+                Gesture = new KeyGesture(Key.O, KeyModifiers.Control),
+                Command = new DelegateCommand(() =>
+                {
+                    button.KeyBindings.Clear();
+                    ++raised;
+                }),
+            });
+
+            target.SetFocusedElement(button, NavigationMethod.Pointer, 0);
+            target.ProcessRawEvent(
+                new RawKeyEventArgs(
+                    target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.O,
+                    RawInputModifiers.Control));
+
+            Assert.Equal(1, raised);
+        }
+
+        private class DelegateCommand : ICommand
+        {
+            private readonly Action _action;
+            public DelegateCommand(Action action) => _action = action;
+            public event EventHandler CanExecuteChanged { add { } remove { } }
+            public bool CanExecute(object parameter) => true;
+            public void Execute(object parameter) => _action();
+        }
+
+        [Fact]
+        public void Control_Focus_Should_Be_Set_Before_FocusedElement_Raises_PropertyChanged()
+        {
+            var target = new KeyboardDevice();
+            var focused = new Mock<IInputElement>();
+            var root = Mock.Of<IInputRoot>();
+            var raised = 0;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.PropertyName == nameof(target.FocusedElement))
+                {
+                    focused.Verify(x => x.RaiseEvent(It.IsAny<GotFocusEventArgs>()));
+                    ++raised;
+                }
+            };
+
+            target.SetFocusedElement(
+                focused.Object,
+                NavigationMethod.Unspecified,
+                KeyModifiers.None);
+
+            Assert.Equal(1, raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Custom.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Custom.cs
new file mode 100644
index 0000000000..830f7223ec
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Custom.cs
@@ -0,0 +1,214 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyboardNavigationTests_Custom
+    {
+        [Fact]
+        public void Tab_Should_Custom_Navigate_Within_Children()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    (current = new Button { Content = "Button 1" }),
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Right_Should_Custom_Navigate_Within_Children()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    (current = new Button { Content = "Button 1" }),
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Right);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Tab_Should_Custom_Navigate_From_Outside()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var root = new StackPanel
+            {
+                Children =
+                {
+                    (current = new Button { Content = "Outside" }),
+                    target,
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Tab_Should_Custom_Navigate_From_Outside_When_Wrapping()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (current = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void ShiftTab_Should_Custom_Navigate_From_Outside()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (current = new Button { Content = "Outside" }),
+                    target,
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void ShiftTab_Should_Navigate_Outside_When_Null_Returned_As_Next()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    (current = new Button { Content = "Button 2" }),
+                    new Button { Content = "Button 3" },
+                },
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (next = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Tab_Should_Navigate_Outside_When_Null_Returned_As_Next()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    (current = new Button { Content = "Button 2" }),
+                    new Button { Content = "Button 3" },
+                },
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (next = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        private class CustomNavigatingStackPanel : StackPanel, ICustomKeyboardNavigation
+        {
+            public bool CustomNavigates { get; set; } = true;
+            public IInputElement NextControl { get; set; }
+
+            public (bool handled, IInputElement next) GetNext(IInputElement element, NavigationDirection direction)
+            {
+                return (CustomNavigates, NextControl);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Tab.cs
new file mode 100644
index 0000000000..7fd8cb345d
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Tab.cs
@@ -0,0 +1,1257 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyboardNavigationTests_Tab
+    {
+        [Fact]
+        public void Next_Continue_Returns_Next_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_First_Control_In_Next_Sibling_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Skips_Unfocusable_Siblings()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (current = new Button { Name = "Button3" }),
+                                }
+                            },
+                            new TextBlock { Name = "TextBlock" },
+                            (next = new Button { Name = "Button4" }),
+                        }
+                    },
+                    new Button { Name = "Button5" },
+                    new Button { Name = "Button6" },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Doesnt_Enter_Panel_With_TabNavigation_None()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    new Button { Name = "Button4" },
+                                    new Button { Name = "Button5" },
+                                    new Button { Name = "Button6" },
+                                }
+                            },
+                        }
+                    }
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_Next_Sibling()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    (next = new Button { Name = "Button4" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Skips_Non_TabStop_Siblings()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                            new Button { Name="Button4", [KeyboardNavigation.IsTabStopProperty] = false }
+                        }
+                    },
+                    (next = new Button { Name = "Button5" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_First_Control_In_Next_Uncle_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    new Button { Name = "Button1" },
+                                    new Button { Name = "Button2" },
+                                    (current = new Button { Name = "Button3" }),
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_Child_Of_Top_Level()
+        {
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (next = new Button { Name = "Button1" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Wraps()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (next = new Button { Name = "Button1" }),
+                                    new Button { Name = "Button2" },
+                                    new Button { Name = "Button3" },
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Cycle_Returns_Next_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Cycle_Wraps_To_First()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Contained_Returns_Next_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Contained_Stops_At_End()
+        {
+            Button current;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Next_Once_Moves_To_Next_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Once_Moves_To_Active_Element()
+        {
+            StackPanel container;
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (container = new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    }),
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            KeyboardNavigation.SetTabOnceActiveElement(container, next);
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_None_Moves_To_Next_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_None_Skips_Container()
+        {
+            StackPanel container;
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (container = new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
+                        }
+                    }),
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            KeyboardNavigation.SetTabOnceActiveElement(container, next);
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Previous_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Last_Control_In_Previous_Sibling_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Last_Child_Of_Sibling()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    (current = new Button { Name = "Button4" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Last_Control_In_Previous_Nephew_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    new Button { Name = "Button1" },
+                                    new Button { Name = "Button2" },
+                                    (next = new Button { Name = "Button3" }),
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Wraps()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (current = new Button { Name = "Button1" }),
+                                    new Button { Name = "Button2" },
+                                    new Button { Name = "Button3" },
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (next = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Parent()
+        {
+            Button current;
+
+            var top = new Decorator
+            {
+                Focusable = true,
+                Child = current = new Button
+                {
+                    Name = "Button",
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(top, result);
+        }
+
+        [Fact]
+        public void Previous_Cycle_Returns_Previous_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Cycle_Wraps_To_Last()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            (current = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Contained_Returns_Previous_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Contained_Stops_At_Beginning()
+        {
+            Button current;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            (current = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Previous_Once_Moves_To_Previous_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            (current = new Button { Name = "Button5" }),
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Once_Moves_To_Active_Element()
+        {
+            StackPanel container;
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (container = new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    }),
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            KeyboardNavigation.SetTabOnceActiveElement(container, next);
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Once_Moves_To_First_Element()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Contained_Doesnt_Select_Child_Control()
+        {
+            Decorator current;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                Children =
+                {
+                    (current = new Decorator
+                    {
+                        Focusable = true,
+                        Child = new Button(),
+                    })
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Respects_TabIndex_Moving_Forwards()
+        {
+            Button start;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1", TabIndex = 5 },
+                            (start = new Button { Name = "Button2", TabIndex = 2 }),
+                            new Button { Name = "Button3", TabIndex = 1 },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4", TabIndex = 3  },
+                            new Button { Name = "Button5", TabIndex = 6  },
+                            new Button { Name = "Button6", TabIndex = 4  },
+                        }
+                    },
+                }
+            };
+
+            var result = new List<string>();
+            var current = (IInputElement)start;
+
+            do
+            {
+                result.Add(((IControl)current).Name);
+                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+            } while (current is object && current != start);
+
+            Assert.Equal(new[]
+            {
+                "Button2", "Button4", "Button6", "Button1", "Button5", "Button3"
+            }, result);
+        }
+
+        [Fact]
+        public void Respects_TabIndex_Moving_Backwards()
+        {
+            Button start;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1", TabIndex = 5 },
+                            (start = new Button { Name = "Button2", TabIndex = 2 }),
+                            new Button { Name = "Button3", TabIndex = 1 },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4", TabIndex = 3  },
+                            new Button { Name = "Button5", TabIndex = 6  },
+                            new Button { Name = "Button6", TabIndex = 4  },
+                        }
+                    },
+                }
+            };
+
+            var result = new List<string>();
+            var current = (IInputElement)start;
+
+            do
+            {
+                result.Add(((IControl)current).Name);
+                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+            } while (current is object && current != start);
+
+            Assert.Equal(new[]
+            {
+                "Button2", "Button3", "Button5", "Button1", "Button6", "Button4"
+            }, result);
+        }
+
+        [Fact]
+        public void Cannot_Focus_Child_Of_Disabled_Control()
+        {
+            Button start;
+            Button expected;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (start = new Button { Name = "Button1" }),
+                    new Border
+                    {
+                        IsEnabled = false,
+                        Child = new Button { Name = "Button2" },
+                    },
+                    (expected = new Button { Name = "Button3" }),
+                }
+            };
+
+            var current = (IInputElement)start;
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(expected, result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
new file mode 100644
index 0000000000..466aba43ee
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class MouseDeviceTests : PointerTestsBase
+    {
+        [Fact]
+        public void Capture_Is_Transferred_To_Parent_When_Control_Removed()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = new MouseDevice();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas control;
+            Panel rootChild;
+            var root = CreateInputRoot(impl.Object, rootChild = new Panel
+            {
+                Children =
+                {
+                    (control = new Canvas())
+                }
+            });
+
+            // Synthesize event to receive a pointer.
+            IPointer result = null;
+            root.PointerMoved += (_, a) =>
+            {
+                result = a.Pointer;
+            };
+            SetHit(renderer, control);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.NotNull(result);
+            
+            result.Capture(control);
+            Assert.Same(control, result.Captured);
+
+            rootChild.Children.Clear();
+
+            Assert.Same(rootChild, result.Captured);
+        }
+
+        [Fact]
+        public void GetPosition_Should_Respect_Control_RenderTransform()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = new MouseDevice();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Border border;
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (border = new Border
+                    {
+                        Background = Brushes.Black,
+                        RenderTransform = new TranslateTransform(10, 0),
+                    })
+                }
+            });
+            
+            
+            Point? result = null;
+            root.PointerMoved += (_, a) =>
+            {
+                result = a.GetPosition(border);
+            };
+
+            SetHit(renderer, border);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root, new Point(11, 11)));
+
+            Assert.Equal(new Point(1, 11), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs b/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
new file mode 100644
index 0000000000..1ac50446c0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
@@ -0,0 +1,502 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+
+using Moq;
+
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class PointerOverTests : PointerTestsBase
+    {
+        // https://github.com/AvaloniaUI/Avalonia/issues/2821
+        [Fact]
+        public void Close_Should_Remove_PointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock().Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(canvas.IsPointerOver);
+
+            impl.Object.Closed!();
+
+            Assert.False(canvas.IsPointerOver);
+        }
+
+        [Fact]
+        public void MouseMove_Should_Update_IsPointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock().Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(decorator.IsPointerOver);
+            Assert.True(border.IsPointerOver);
+            Assert.False(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.False(decorator.IsPointerOver);
+            Assert.False(border.IsPointerOver);
+            Assert.True(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+        }
+
+
+        [Fact]
+        public void TouchMove_Should_Not_Set_IsPointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock(pointerType: PointerType.Touch).Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.False(canvas.IsPointerOver);
+            Assert.False(root.IsPointerOver);
+        }
+
+        [Fact]
+        public void HitTest_Should_Be_Ignored_If_Element_Captured()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var pointer = new Mock<IPointer>();
+            var device = CreatePointerDeviceMock(pointer.Object).Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, canvas);
+            pointer.SetupGet(p => p.Captured).Returns(decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(decorator.IsPointerOver);
+            Assert.True(border.IsPointerOver);
+            Assert.False(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+        }
+
+        [Fact]
+        public void IsPointerOver_Should_Be_Updated_When_Child_Sets_Handled_True()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock().Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.False(decorator.IsPointerOver);
+            Assert.False(border.IsPointerOver);
+            Assert.True(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+
+            // Ensure that e.Handled is reset between controls.
+            root.PointerMoved += (s, e) => e.Handled = true;
+            decorator.PointerEntered += (s, e) => e.Handled = true;
+
+            SetHit(renderer, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(decorator.IsPointerOver);
+            Assert.True(border.IsPointerOver);
+            Assert.False(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+        }
+
+        [Fact]
+        public void Pointer_Enter_Move_Leave_Should_Be_Followed()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+            var result = new List<(object?, string)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name));
+            }
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            AddEnteredExitedHandlers(HandleEvent, canvas, decorator);
+
+            // Enter decorator
+            SetHit(renderer, decorator);
+            SetMove(deviceMock, root, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            // Leave decorator
+            SetHit(renderer, canvas);
+            SetMove(deviceMock, root, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            Assert.Equal(
+                new[]
+                {
+                        ((object?)decorator, nameof(InputElement.PointerEntered)),
+                        (decorator, nameof(InputElement.PointerMoved)),
+                        (decorator, nameof(InputElement.PointerExited)),
+                        (canvas, nameof(InputElement.PointerEntered)),
+                        (canvas, nameof(InputElement.PointerMoved))
+                },
+                result);
+        }
+
+        [Fact]
+        public void PointerEntered_Exited_Should_Be_Raised_In_Correct_Order()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+            var result = new List<(object?, string)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name));
+            }
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            AddEnteredExitedHandlers(HandleEvent, root, canvas, border, decorator);
+
+            SetHit(renderer, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, nameof(InputElement.PointerExited)),
+                    (decorator, nameof(InputElement.PointerEntered)),
+                    (border, nameof(InputElement.PointerEntered)),
+                },
+                result);
+        }
+
+        // https://github.com/AvaloniaUI/Avalonia/issues/7896
+        [Fact]
+        public void PointerEntered_Exited_Should_Set_Correct_Position()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var expectedPosition = new Point(15, 15);
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+            var result = new List<(object?, string, Point)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name, e.GetPosition(null)));
+            }
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            AddEnteredExitedHandlers(HandleEvent, root, canvas);
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, expectedPosition));
+
+            SetHit(renderer, null);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, expectedPosition));
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, nameof(InputElement.PointerEntered), expectedPosition),
+                    (root, nameof(InputElement.PointerEntered), expectedPosition),
+                    (canvas, nameof(InputElement.PointerExited), expectedPosition),
+                    (root, nameof(InputElement.PointerExited), expectedPosition)
+                },
+                result);
+        }
+
+        [Fact]
+        public void Render_Invalidation_Should_Affect_PointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            var invalidateRect = new Rect(0, 0, 15, 15);
+            var lastClientPosition = new Point(1, 5);
+
+            var result = new List<(object?, string, Point)>();
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name, e.GetPosition(null)));
+            }
+
+            Canvas canvas;
+
+            var root = (Window)CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+            AddEnteredExitedHandlers(HandleEvent, root, canvas);
+
+            // Let input know about latest device.
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, lastClientPosition));
+            Assert.True(canvas.IsPointerOver);
+
+            SetHit(renderer, canvas);
+            renderer.Raise(r => r.SceneInvalidated += null, new SceneInvalidatedEventArgs((IRenderRoot)root, invalidateRect));
+            Assert.True(canvas.IsPointerOver);
+
+            // Raise SceneInvalidated again, but now hide element from the hittest.
+            SetHit(renderer, null);
+            renderer.Raise(r => r.SceneInvalidated += null, new SceneInvalidatedEventArgs((IRenderRoot)root, invalidateRect));
+            Assert.False(canvas.IsPointerOver);
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, nameof(InputElement.PointerEntered), lastClientPosition),
+                    (root, nameof(InputElement.PointerEntered), lastClientPosition),
+                    (canvas, nameof(InputElement.PointerExited), lastClientPosition),
+                    (root, nameof(InputElement.PointerExited), lastClientPosition),
+                },
+                result);
+        }
+
+        [Fact]
+        public void PointerOver_Invalidation_Should_Use_Previously_Captured_Element()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            var invalidateRect = new Rect(0, 0, 15, 15);
+
+            Canvas canvas1, canvas2;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas1 = new Canvas()),
+                    (canvas2 = new Canvas())
+                }
+            });
+
+            canvas1.PointerMoved += (s, a) => a.Pointer.Capture(canvas1);
+
+            // Let input know about latest device.
+            SetHit(renderer, canvas1);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+            Assert.True(canvas1.IsPointerOver);
+            Assert.False(canvas2.IsPointerOver);
+
+            SetHit(renderer, canvas2);
+            renderer.Raise(r => r.SceneInvalidated += null, new SceneInvalidatedEventArgs((IRenderRoot)root, invalidateRect));
+            Assert.False(canvas1.IsPointerOver);
+            Assert.True(canvas2.IsPointerOver);
+        }
+
+        // https://github.com/AvaloniaUI/Avalonia/issues/7748
+        [Fact]
+        public void LeaveWindow_Should_Reset_PointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            var lastClientPosition = new Point(1, 5);
+            var invalidateRect = new Rect(0, 0, 15, 15);
+            var result = new List<(object?, string, Point)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name, e.GetPosition(null)));
+            }
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            AddEnteredExitedHandlers(HandleEvent, root, canvas);
+
+            // Init pointer over.
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, lastClientPosition));
+            Assert.True(canvas.IsPointerOver);
+
+            // Send LeaveWindow.
+            impl.Object.Input!(new RawPointerEventArgs(deviceMock.Object, 0, root, RawPointerEventType.LeaveWindow, new Point(), default));
+            Assert.False(canvas.IsPointerOver);
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, nameof(InputElement.PointerEntered), lastClientPosition),
+                    (root, nameof(InputElement.PointerEntered), lastClientPosition),
+                    (canvas, nameof(InputElement.PointerExited), lastClientPosition),
+                    (root, nameof(InputElement.PointerExited), lastClientPosition),
+                },
+                result);
+        }
+
+        private static void AddEnteredExitedHandlers(
+            EventHandler<PointerEventArgs> handler,
+            params IInputElement[] controls)
+        {
+            foreach (var c in controls)
+            {
+                c.PointerEntered += handler;
+                c.PointerExited += handler;
+                c.PointerMoved += handler;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerTests.cs b/tests/Avalonia.Base.UnitTests/Input/PointerTests.cs
new file mode 100644
index 0000000000..0bd23d64a9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerTests.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class PointerTests : PointerTestsBase
+    {
+        [Fact]
+        public void On_Capture_Transfer_PointerCaptureLost_Should_Propagate_Up_To_The_Common_Parent()
+        {
+            Border initialParent, initialCapture, newParent, newCapture;
+            var el = new StackPanel
+            {
+                Children =
+                {
+                    (initialParent = new Border { Child = initialCapture = new Border() }),
+                    (newParent = new Border { Child = newCapture = new Border() })
+                }
+            };
+            var receivers = new List<object>();
+            var root = new TestRoot(el);
+            foreach (InputElement d in root.GetSelfAndVisualDescendants())
+                d.PointerCaptureLost += (s, e) => receivers.Add(s);
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+            
+            pointer.Capture(initialCapture);
+            pointer.Capture(newCapture);
+            Assert.True(receivers.SequenceEqual(new[] { initialCapture, initialParent }));
+            
+            receivers.Clear();
+            pointer.Capture(null);
+            Assert.True(receivers.SequenceEqual(new object[] { newCapture, newParent, el, root }));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs b/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
new file mode 100644
index 0000000000..1ca6678aef
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
@@ -0,0 +1,90 @@
+#nullable enable
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.VisualTree;
+using Moq;
+
+namespace Avalonia.Base.UnitTests.Input;
+
+public abstract class PointerTestsBase
+{
+    protected static void SetHit(Mock<IRenderer> renderer, IControl? hit)
+    {
+        renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
+            .Returns(hit is null ? Array.Empty<IControl>() : new[] { hit });
+
+        renderer.Setup(x => x.HitTestFirst(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
+            .Returns(hit);
+    }
+
+    protected static void SetMove(Mock<IPointerDevice> deviceMock, IInputRoot root, IInputElement element)
+    {
+        deviceMock.Setup(d => d.ProcessRawEvent(It.IsAny<RawPointerEventArgs>()))
+            .Callback(() => element.RaiseEvent(CreatePointerMovedArgs(root, element)));
+    }
+
+    protected static Mock<IWindowImpl> CreateTopLevelImplMock(IRenderer renderer)
+    {
+        var impl = new Mock<IWindowImpl>();
+        impl.DefaultValue = DefaultValue.Mock;
+        impl.SetupAllProperties();
+        impl.SetupGet(r => r.RenderScaling).Returns(1);
+        impl.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer);
+        impl.Setup(r => r.PointToScreen(It.IsAny<Point>())).Returns<Point>(p => new PixelPoint((int)p.X, (int)p.Y));
+        impl.Setup(r => r.PointToClient(It.IsAny<PixelPoint>())).Returns<PixelPoint>(p => new Point(p.X, p.Y));
+        return impl;
+    }
+
+    protected static IInputRoot CreateInputRoot(IWindowImpl impl, IControl child)
+    {
+        var root = new Window(impl)
+        {
+            Width = 100,
+            Height = 100,
+            Content = child,
+            Template = new FuncControlTemplate<Window>((w, _) => new ContentPresenter { Content = w.Content })
+        };
+        root.Show();
+        return root;
+    }
+
+    protected static RawPointerEventArgs CreateRawPointerMovedArgs(
+        IPointerDevice pointerDevice,
+        IInputRoot root,
+        Point? positition = null)
+    {
+        return new RawPointerEventArgs(pointerDevice, 0, root, RawPointerEventType.Move,
+            positition ?? default, default);
+    }
+
+    protected static PointerEventArgs CreatePointerMovedArgs(
+        IInputRoot root, IInputElement? source, Point? positition = null)
+    {
+        return new PointerEventArgs(InputElement.PointerMovedEvent, source, new Mock<IPointer>().Object, root,
+            positition ?? default, default, PointerPointProperties.None, KeyModifiers.None);
+    }
+
+    protected static Mock<IPointerDevice> CreatePointerDeviceMock(
+        IPointer? pointer = null,
+        PointerType pointerType = PointerType.Mouse)
+    {
+        if (pointer is null)
+        {
+            var pointerMock = new Mock<IPointer>();
+            pointerMock.SetupGet(p => p.Type).Returns(pointerType);
+            pointer = pointerMock.Object;
+        }
+
+        var pointerDevice = new Mock<IPointerDevice>();
+        pointerDevice.Setup(d => d.TryGetPointer(It.IsAny<RawPointerEventArgs>()))
+            .Returns(pointer);
+
+        return pointerDevice;
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
new file mode 100644
index 0000000000..c0c0182622
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
@@ -0,0 +1,256 @@
+using System;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Input.UnitTests
+{
+    public class TouchDeviceTests
+    {
+        [Fact]
+        public void Tapped_Event_Is_Fired_With_Touch()
+        {
+            using var app = UnitTestApp(new TimeSpan(200));
+            var root = new TestRoot();
+            var touchDevice = new TouchDevice();
+
+            var isTapped = false;
+            var executedTimes = 0;
+            root.Tapped += (a, e) =>
+            {
+                isTapped = true;
+                executedTimes++;
+            };
+            TapOnce(InputManager.Instance, touchDevice, root);
+            Assert.True(isTapped);
+            Assert.Equal(1, executedTimes);
+
+        }
+
+        [Fact]
+        public void DoubleTapped_Event_Is_Fired_With_Touch()
+        {
+            using var app = UnitTestApp(new TimeSpan(200));
+            var root = new TestRoot();
+            var touchDevice = new TouchDevice();
+
+            var isDoubleTapped = false;
+            var doubleTappedExecutedTimes = 0;
+            var tappedExecutedTimes = 0;
+            root.DoubleTapped += (a, e) =>
+            {
+                isDoubleTapped = true;
+                doubleTappedExecutedTimes++;
+            };
+            root.Tapped += (a, e) =>
+            {
+                tappedExecutedTimes++;
+            };
+            TapOnce(InputManager.Instance, touchDevice, root);
+            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 1);
+            Assert.Equal(1, tappedExecutedTimes);
+            Assert.True(isDoubleTapped);
+            Assert.Equal(1, doubleTappedExecutedTimes);
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        [InlineData(4)]
+        [InlineData(5)]
+        public void PointerPressed_Counts_Clicks_Correctly(int clickCount)
+        {
+            using var app = UnitTestApp(new TimeSpan(200));
+            var root = new TestRoot();
+            var touchDevice = new TouchDevice();
+
+            var pointerPressedExecutedTimes = 0;
+            var pointerPressedClicks = 0;
+            root.PointerPressed += (a, e) =>
+            {
+                pointerPressedClicks = e.ClickCount;
+                pointerPressedExecutedTimes++;
+            };
+            for (int i = 0; i < clickCount; i++)
+            {
+                TapOnce(InputManager.Instance, touchDevice, root, touchPointId: i);
+            }
+
+            Assert.Equal(clickCount, pointerPressedExecutedTimes);
+            Assert.Equal(pointerPressedClicks, clickCount);
+        }
+
+        [Fact]
+        public void DoubleTapped_Not_Fired_When_Click_Too_Late()
+        {
+            using var app = UnitTestApp(new TimeSpan(0, 0, 0, 0, 20));
+            var root = new TestRoot();
+            var touchDevice = new TouchDevice();
+
+            var isDoubleTapped = false;
+            var doubleTappedExecutedTimes = 0;
+            var tappedExecutedTimes = 0;
+            root.DoubleTapped += (a, e) =>
+            {
+                isDoubleTapped = true;
+                doubleTappedExecutedTimes++;
+            };
+            root.Tapped += (a, e) =>
+            {
+                tappedExecutedTimes++;
+            };
+            TapOnce(InputManager.Instance, touchDevice, root);
+            TapOnce(InputManager.Instance, touchDevice, root, 21, 1);
+            Assert.Equal(2, tappedExecutedTimes);
+            Assert.False(isDoubleTapped);
+            Assert.Equal(0, doubleTappedExecutedTimes);
+
+        }
+
+        [Fact]
+        public void DoubleTapped_Not_Fired_When_Second_Click_Is_From_Different_Touch_Contact()
+        {
+            using var app = UnitTestApp(new TimeSpan(200));
+            var root = new TestRoot();
+            var touchDevice = new TouchDevice();
+
+            var isDoubleTapped = false;
+            var doubleTappedExecutedTimes = 0;
+            var tappedExecutedTimes = 0;
+            root.DoubleTapped += (a, e) =>
+            {
+                isDoubleTapped = true;
+                doubleTappedExecutedTimes++;
+            };
+            root.Tapped += (a, e) =>
+            {
+                tappedExecutedTimes++;
+            };
+            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchBegin, 0, 1);
+            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchEnd, 0, 1);
+            Assert.Equal(2, tappedExecutedTimes);
+            Assert.False(isDoubleTapped);
+            Assert.Equal(0, doubleTappedExecutedTimes);
+        }
+
+        [Fact]
+        public void Click_Counting_Should_Work_Correctly_With_Few_Touch_Contacts()
+        {
+            using var app = UnitTestApp(new TimeSpan(200));
+
+            var root = new TestRoot();
+            var touchDevice = new TouchDevice();
+
+            var pointerPressedExecutedTimes = 0;
+            var tappedExecutedTimes = 0;
+            var isDoubleTapped = false;
+            var doubleTappedExecutedTimes = 0;
+            root.PointerPressed += (a, e) =>
+            {
+                pointerPressedExecutedTimes++;
+                switch (pointerPressedExecutedTimes)
+                {
+                    case <= 2:
+                        Assert.True(e.ClickCount == 1);
+                        break;
+                    case 3:
+                        Assert.True(e.ClickCount == 2);
+                        break;
+                    case 4:
+                        Assert.True(e.ClickCount == 3);
+                        break;
+                    case 5:
+                        Assert.True(e.ClickCount == 4);
+                        break;
+                    case 6:
+                        Assert.True(e.ClickCount == 5);
+                        break;
+                    case 7:
+                        Assert.True(e.ClickCount == 1);
+                        break;
+                    case 8:
+                        Assert.True(e.ClickCount == 1);
+                        break;
+                    case 9:
+                        Assert.True(e.ClickCount == 2);
+                        break;
+                    default:
+                        break;
+                }
+            };
+            root.DoubleTapped += (a, e) =>
+            {
+                isDoubleTapped = true;
+                doubleTappedExecutedTimes++;
+            };
+            root.Tapped += (a, e) =>
+            {
+                tappedExecutedTimes++;
+            };
+            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchBegin, 0, 1);
+            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchEnd, 0, 1);
+            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 2);
+            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 3);
+            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 4);
+            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchBegin, 5, 6, 7);
+            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchEnd, 5, 6, 7);
+            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 8);
+            Assert.Equal(6, tappedExecutedTimes);
+            Assert.Equal(9, pointerPressedExecutedTimes);
+            Assert.True(isDoubleTapped);
+            Assert.Equal(3, doubleTappedExecutedTimes);
+        }
+
+        private IDisposable UnitTestApp(TimeSpan doubleClickTime = new TimeSpan())
+        {
+            var unitTestApp = UnitTestApplication.Start(
+                new TestServices(inputManager: new InputManager()));
+            var iSettingsMock = new Mock<IPlatformSettings>();
+            iSettingsMock.Setup(x => x.GetDoubleTapTime(It.IsAny<PointerType>())).Returns(doubleClickTime);
+            iSettingsMock.Setup(x => x.GetDoubleTapSize(It.IsAny<PointerType>())).Returns(new Size(16, 16));
+            iSettingsMock.Setup(x => x.GetTapSize(It.IsAny<PointerType>())).Returns(new Size(16, 16));
+            AvaloniaLocator.CurrentMutable.BindToSelf(this)
+               .Bind<IPlatformSettings>().ToConstant(iSettingsMock.Object);
+            return unitTestApp;
+        }
+        
+        private static void SendXTouchContactsWithIds(IInputManager inputManager, TouchDevice device, IInputRoot root, RawPointerEventType type, params long[] touchPointIds)
+        {
+            for (int i = 0; i < touchPointIds.Length; i++)
+            {
+                inputManager.ProcessInput(new RawPointerEventArgs(device, 0,
+                                                              root,
+                                                              type,
+                                                              new Point(0, 0),
+                                                              RawInputModifiers.None)
+                {
+                    RawPointerId = touchPointIds[i]
+                });
+            }
+        }
+
+
+        private static void TapOnce(IInputManager inputManager, TouchDevice device, IInputRoot root, ulong timestamp = 0, long touchPointId = 0)
+        {
+            inputManager.ProcessInput(new RawPointerEventArgs(device, timestamp,
+                                               root,
+                                               RawPointerEventType.TouchBegin,
+                                               new Point(0, 0),
+                                               RawInputModifiers.None)
+            {
+                RawPointerId = touchPointId
+            });
+            inputManager.ProcessInput(new RawPointerEventArgs(device, timestamp,
+                                                root,
+                                                RawPointerEventType.TouchEnd,
+                                                new Point(0, 0),
+                                                RawInputModifiers.None)
+            {
+                RawPointerId = touchPointId
+            });
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
new file mode 100644
index 0000000000..1ca7e9bd49
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
@@ -0,0 +1,448 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Interactivity
+{
+    public class InteractiveTests
+    {
+        [Fact]
+        public void Direct_Event_Should_Go_Straight_To_Source()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Direct_Event_Should_Have_Route_Set_To_Direct()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
+            bool called = false;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                Assert.Equal(RoutingStrategies.Direct, e.Route);
+                called = true;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void Bubbling_Event_Should_Bubble_Up()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Tunneling_Event_Should_Tunnel()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Tunnel, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Tunneling_Bubbling_Event_Should_Tunnel_Then_Bubble_Up()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Events_Should_Have_Route_Set()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<RoutingStrategies>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(e.Route);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[]
+            {
+                RoutingStrategies.Tunnel,
+                RoutingStrategies.Tunnel,
+                RoutingStrategies.Bubble,
+                RoutingStrategies.Bubble,
+            },
+            invoked);
+        }
+
+        [Fact]
+        public void Handled_Bubbled_Event_Should_Not_Propogate_Further()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                var t = (TestInteractive)s;
+                invoked.Add(t.Name);
+                e.Handled = t.Name == "2b";
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Handled_Tunnelled_Event_Should_Not_Propogate_Further()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel, 
+                typeof(RoutedEventArgs), 
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                var t = (TestInteractive)s;
+                invoked.Add(t.Name);
+                e.Handled = t.Name == "2b";
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Direct_Subscription_Should_Not_Catch_Tunneling_Or_Bubbling()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var count = 0;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                ++count;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void Bubbling_Subscription_Should_Not_Catch_Tunneling()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var count = 0;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                Assert.Equal(RoutingStrategies.Bubble, e.Route);
+                ++count;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void Tunneling_Subscription_Should_Not_Catch_Bubbling()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var count = 0;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                Assert.Equal(RoutingStrategies.Tunnel, e.Route);
+                ++count;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void Event_Should_Should_Keep_Propogating_To_HandedEventsToo_Handlers()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                invoked.Add(((TestInteractive)s).Name);
+                e.Handled = true;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel, true);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Direct_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Direct,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Tunneling_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Bubbling_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Typed_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent<RoutedEventArgs>(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(TestInteractive));
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler<TestInteractive>((x, e) => x.ClassHandler(e), RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.True(target.ClassHandlerInvoked);
+            Assert.True(target.GetVisualParent<TestInteractive>().ClassHandlerInvoked);
+        }
+
+        [Fact]
+        public void GetObservable_Should_Listen_To_Event()
+        {
+            var ev = new RoutedEvent<RoutedEventArgs>("test", RoutingStrategies.Direct, typeof(TestInteractive));
+            var target = new TestInteractive();
+            var called = 0;
+            var subscription = target.GetObservable(ev).Subscribe(_ => ++called);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            subscription.Dispose();
+
+            target.RaiseEvent(args);
+
+            Assert.Equal(1, called);
+        }
+
+        [Fact]
+        public void Removing_Control_In_Handler_Should_Not_Stop_Event()
+        {
+            // Issue #3176
+            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var parent = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+            var target = (IInteractive)parent.GetVisualChildren().Single();
+
+            EventHandler<RoutedEventArgs> removeHandler = (s, e) =>
+            {
+                parent.Children = Array.Empty<IVisual>();
+            };
+            
+            target.AddHandler(ev, removeHandler);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "3", "2b", "1" }, invoked);
+        }
+
+        private TestInteractive CreateTree(
+            RoutedEvent ev,
+            EventHandler<RoutedEventArgs> handler,
+            RoutingStrategies handlerRoutes,
+            bool handledEventsToo = false)
+        {
+            TestInteractive target;
+
+            var tree = new TestInteractive
+            {
+                Name = "1",
+                Children = new[]
+                {
+                    new TestInteractive
+                    {
+                        Name = "2a",
+                    },
+                    (target = new TestInteractive
+                    {
+                        Name = "2b",
+                        Children = new[]
+                        {
+                            new TestInteractive
+                            {
+                                Name = "3",
+                            },
+                        },
+                    }),
+                }
+            };
+
+            if (handler != null)
+            {
+                foreach (var i in tree.GetSelfAndVisualDescendants().Cast<Interactive>())
+                {
+                    i.AddHandler(ev, handler, handlerRoutes, handledEventsToo);
+                }
+            }
+
+            return target;
+        }
+
+        private class TestInteractive : Interactive
+        {
+            public bool ClassHandlerInvoked { get; private set; }
+            public new string Name { get; set; }
+
+            public IEnumerable<IVisual> Children
+            {
+                get
+                {
+                    return ((IVisual)this).VisualChildren.AsEnumerable();
+                }
+
+                set
+                {
+                    VisualChildren.Clear();
+                    VisualChildren.AddRange(value.Cast<Visual>());
+                }
+            }
+
+            public void ClassHandler(RoutedEventArgs e)
+            {
+                ClassHandlerInvoked = true;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Interactivity/RoutedEventRegistryTests.cs b/tests/Avalonia.Base.UnitTests/Interactivity/RoutedEventRegistryTests.cs
new file mode 100644
index 0000000000..05b2187df4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Interactivity/RoutedEventRegistryTests.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Interactivity
+{
+    public class RoutedEventRegistryTests
+    {
+        [Fact]
+        public void Pointer_Events_Should_Be_Registered()
+        {
+            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent }; 
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<InputElement>();
+            Assert.Contains(registeredEvents, expectedEvents.Contains);
+        }
+
+        [Fact]
+        public void ClickEvent_Should_Be_Registered_On_Button()
+        {
+            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
+            Assert.Contains(registeredEvents, expectedEvents.Contains);
+        }
+
+        [Fact]
+        public void ClickEvent_Should_Not_Be_Registered_On_ContentControl()
+        {
+            // force ContentControl type to be loaded
+            new ContentControl();
+            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<ContentControl>();
+            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
+        }
+
+        [Fact]
+        public void InputElement_Events_Should_Not_Be_Registered_On_Button()
+        {
+            // force Button type to be loaded
+            new Button();
+            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent };
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
+            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/ArrangeTests.cs b/tests/Avalonia.Base.UnitTests/Layout/ArrangeTests.cs
new file mode 100644
index 0000000000..b771cf2d24
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/ArrangeTests.cs
@@ -0,0 +1,137 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class ArrangeTests
+    {
+        [Fact]
+        public void Bounds_Should_Not_Include_Margin()
+        {
+            var target = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(5),
+            };
+
+            Assert.False(target.IsMeasureValid);
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Rect(5, 5, 100, 100), target.Bounds);
+        }
+
+        [Fact]
+        public void Margin_Should_Be_Subtracted_From_Arrange_FinalSize()
+        {
+            var target = new TestControl
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void ArrangeOverride_Receives_Desired_Size_When_Centered()
+        {
+            var target = new TestControl
+            {
+                MeasureResult = new Size(100, 100),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void ArrangeOverride_Receives_Available_Size_Minus_Margin_When_Stretched()
+        {
+            var target = new TestControl
+            {
+                MeasureResult = new Size(100, 100),
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                VerticalAlignment = VerticalAlignment.Stretch,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            Assert.Equal(new Size(184, 184), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void ArrangeOverride_Receives_Requested_Size_When_Arranged_To_DesiredSize()
+        {
+            var target = new TestControl
+            {
+                MeasureResult = new Size(100, 100),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void Arrange_With_IsMeasureValid_False_Calls_Measure()
+        {
+            var target = new TestControl();
+
+            Assert.False(target.IsMeasureValid);
+            target.Arrange(new Rect(0, 0, 120, 120));
+            Assert.True(target.IsMeasureValid);
+            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
+        }
+
+        [Fact]
+        public void Arrange_With_IsMeasureValid_False_Calls_Measure_With_Previous_Size_If_Available()
+        {
+            var target = new TestControl();
+
+            Assert.False(target.IsMeasureValid);
+            target.Arrange(new Rect(0, 0, 120, 120));
+            target.InvalidateMeasure();
+            target.Arrange(new Rect(0, 0, 100, 100));
+            Assert.True(target.IsMeasureValid);
+            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
+        }
+
+        private class TestControl : Decorator
+        {
+            public Size MeasureConstraint { get; private set; }
+
+            public Size MeasureResult { get; set; }
+
+            public Size ArrangeFinalSize { get; private set; }
+
+            protected override Size MeasureOverride(Size constraint)
+            {
+                MeasureConstraint = constraint;
+                return MeasureResult;
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ArrangeFinalSize = finalSize;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/FullLayoutTests.cs b/tests/Avalonia.Base.UnitTests/Layout/FullLayoutTests.cs
new file mode 100644
index 0000000000..1d6eead6dd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/FullLayoutTests.cs
@@ -0,0 +1,115 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class FullLayoutTests
+    {
+        [Fact]
+        public void Grandchild_Size_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                Border border;
+                TextBlock textBlock;
+
+                var window = new Window()
+                {
+                    SizeToContent = SizeToContent.WidthAndHeight,
+                    Content = border = new Border
+                    {
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        Child = new Border
+                        {
+                            Child = textBlock = new TextBlock
+                            {
+                                Width = 400,
+                                Height = 400,
+                                Text = "Hello World!",
+                            },
+                        }
+                    }
+                };
+
+                window.Show();
+
+                Assert.Equal(new Size(400, 400), border.Bounds.Size);
+                textBlock.Width = 200;
+                window.LayoutManager.ExecuteLayoutPass();
+
+                Assert.Equal(new Size(200, 400), border.Bounds.Size);
+            }
+        }
+
+        [Fact]
+        public void Test_ScrollViewer_With_TextBlock()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                ScrollViewer scrollViewer;
+                TextBlock textBlock;
+
+                var window = new Window()
+                {
+                    Width = 800,
+                    Height = 600,
+                    Content = scrollViewer = new ScrollViewer
+                    {
+                        Width = 200,
+                        Height = 200,
+                        HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        Content = textBlock = new TextBlock
+                        {
+                            Width = 400,
+                            Height = 400,
+                            Text = "Hello World!",
+                        },
+                    }
+                };
+
+                window.Resources["ScrollBarThickness"] = 10.0;
+
+                window.Show();
+
+                Assert.Equal(new Size(800, 600), window.Bounds.Size);
+                Assert.Equal(new Size(200, 200), scrollViewer.Bounds.Size);
+                Assert.Equal(new Point(300, 200), Position(scrollViewer));
+                Assert.Equal(new Size(400, 400), textBlock.Bounds.Size);
+
+                var scrollBars = scrollViewer.GetTemplateChildren().OfType<ScrollBar>().ToList();
+                var presenters = scrollViewer.GetTemplateChildren().OfType<ScrollContentPresenter>().ToList();
+
+                Assert.Equal(2, scrollBars.Count);
+                Assert.Single(presenters);
+
+                var presenter = presenters[0];
+                Assert.Equal(new Size(190, 190), presenter.Bounds.Size);
+
+                var horzScroll = scrollBars.Single(x => x.Orientation == Orientation.Horizontal);
+                var vertScroll = scrollBars.Single(x => x.Orientation == Orientation.Vertical);
+
+                Assert.True(horzScroll.IsVisible);
+                Assert.True(vertScroll.IsVisible);
+                Assert.Equal(new Size(190, 10), horzScroll.Bounds.Size);
+                Assert.Equal(new Size(10, 190), vertScroll.Bounds.Size);
+                Assert.Equal(new Point(0, 190), Position(horzScroll));
+                Assert.Equal(new Point(190, 0), Position(vertScroll));
+            }
+        }
+
+        private static Point Position(IVisual v)
+        {
+            return v.Bounds.Position;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
new file mode 100644
index 0000000000..3df31939d1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
@@ -0,0 +1,28 @@
+using System;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutHelperTests
+    {
+        [Fact]
+        public void Round_Layout_Value_Without_DPI_Aware()
+        {
+            const double value = 42.5;
+            var expectedValue = Math.Round(value);
+            var actualValue = LayoutHelper.RoundLayoutValue(value, 1.0);
+            Assert.Equal(expectedValue, actualValue);
+        }
+
+        [Fact]
+        public void Round_Layout_Value_With_DPI_Aware()
+        {
+            const double dpiScale = 1.25;
+            const double value = 42.5;
+            var expectedValue = Math.Round(value * dpiScale) / dpiScale;
+            var actualValue = LayoutHelper.RoundLayoutValue(value, dpiScale);
+            Assert.Equal(expectedValue, actualValue);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
new file mode 100644
index 0000000000..37e07c244e
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
@@ -0,0 +1,443 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Threading;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutManagerTests
+    {
+        [Fact]
+        public void Measures_And_Arranges_InvalidateMeasured_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Doesnt_Measure_And_Arrange_InvalidateMeasured_Control_When_TopLevel_Is_Not_Visible()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control, IsVisible = false };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.False(control.Arranged);
+        }
+
+        [Fact]
+        public void Arranges_InvalidateArranged_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateArrange();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Measures_Parent_Of_Newly_Added_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot();
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            root.Child = control;
+            root.Measured = root.Arranged = false;
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(root.Measured);
+            Assert.True(root.Arranged);
+            Assert.True(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Measures_In_Correct_Order()
+        {
+            LayoutTestControl control1;
+            LayoutTestControl control2;
+            var root = new LayoutTestRoot
+            {
+                Child = control1 = new LayoutTestControl
+                {
+                    Child = control2 = new LayoutTestControl(),
+                }
+            };
+
+            var order = new List<ILayoutable>();
+            Size MeasureOverride(ILayoutable control, Size size)
+            {
+                order.Add(control);
+                return new Size(10, 10);
+            }
+
+            root.DoMeasureOverride = MeasureOverride;
+            control1.DoMeasureOverride = MeasureOverride;
+            control2.DoMeasureOverride = MeasureOverride;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            control2.InvalidateMeasure();
+            control1.InvalidateMeasure();
+            root.InvalidateMeasure();
+
+            order.Clear();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(new ILayoutable[] { root, control1, control2 }, order);
+        }
+
+        [Fact]
+        public void Measures_Root_And_Grandparent_In_Correct_Order()
+        {
+            LayoutTestControl control1;
+            LayoutTestControl control2;
+            var root = new LayoutTestRoot
+            {
+                Child = control1 = new LayoutTestControl
+                {
+                    Child = control2 = new LayoutTestControl(),
+                }
+            };
+
+            var order = new List<ILayoutable>();
+            Size MeasureOverride(ILayoutable control, Size size)
+            {
+                order.Add(control);
+                return new Size(10, 10);
+            }
+
+            root.DoMeasureOverride = MeasureOverride;
+            control1.DoMeasureOverride = MeasureOverride;
+            control2.DoMeasureOverride = MeasureOverride;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            control2.InvalidateMeasure();
+            root.InvalidateMeasure();
+
+            order.Clear();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(new ILayoutable[] { root, control2 }, order);
+        }
+
+        [Fact]
+        public void Doesnt_Measure_Non_Invalidated_Root()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            root.Measured = root.Arranged = false;
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(root.Measured);
+            Assert.False(root.Arranged);
+            Assert.True(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Doesnt_Measure_Removed_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.Child = null;
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.False(control.Arranged);
+        }
+
+        [Fact]
+        public void Measures_Root_With_Infinity()
+        {
+            var root = new LayoutTestRoot();
+            var availableSize = default(Size);
+
+            // Should not measure with this size.
+            root.MaxClientSize = new Size(123, 456);
+
+            root.DoMeasureOverride = (_, s) =>
+            {
+                availableSize = s;
+                return new Size(100, 100);
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Equal(Size.Infinity, availableSize);
+        }
+
+        [Fact]
+        public void Arranges_Root_With_DesiredSize()
+        {
+            var root = new LayoutTestRoot
+            {
+                Width = 100,
+                Height = 100,
+            };
+
+            var arrangeSize = default(Size);
+
+            root.DoArrangeOverride = (_, s) =>
+            {
+                arrangeSize = s;
+                return s;
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            Assert.Equal(new Size(100, 100), arrangeSize);
+
+            root.Width = 120;
+
+            root.LayoutManager.ExecuteLayoutPass();
+            Assert.Equal(new Size(120, 100), arrangeSize);
+        }
+
+        [Fact]
+        public void Invalidating_Child_Remeasures_Parent()
+        {
+            Border border;
+            StackPanel panel;
+
+            var root = new LayoutTestRoot
+            {
+                Child = panel = new StackPanel
+                {
+                    Children =
+                    {
+                        (border = new Border())
+                    }
+                }
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            Assert.Equal(new Size(0, 0), root.DesiredSize);
+
+            border.Width = 100;
+            border.Height = 100;
+
+            root.LayoutManager.ExecuteLayoutPass();
+            Assert.Equal(new Size(100, 100), panel.DesiredSize);
+        }
+
+        [Fact]
+        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Measure()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = false;
+
+            int cnt = 0;
+            int maxcnt = 100;
+            control.DoMeasureOverride = (l, s) =>
+            {
+                //emulate a problem in the logic of a control that triggers
+                //invalidate measure during measure
+                //it can lead to an infinite loop in layoutmanager
+                if (++cnt < maxcnt)
+                {
+                    control.InvalidateMeasure();
+                }
+
+                return new Size(100, 100);
+            };
+
+            control.InvalidateMeasure();
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(cnt < 100);
+        }
+
+        [Fact]
+        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Arrange()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Arranged = false;
+
+            int cnt = 0;
+            int maxcnt = 100;
+            control.DoArrangeOverride = (l, s) =>
+            {
+                //emulate a problem in the logic of a control that triggers
+                //invalidate measure during arrange
+                //it can lead to infinity loop in layoutmanager
+                if (++cnt < maxcnt)
+                {
+                    control.InvalidateArrange();
+                }
+
+                return new Size(100, 100);
+            };
+
+            control.InvalidateArrange();
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(cnt < 100);
+        }
+
+        [Fact]
+        public void LayoutManager_Should_Properly_Arrange_Visuals_Even_When_There_Are_Issues_With_Previous_Arranged()
+        {
+            var nonArrageableTargets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
+            var targets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
+
+            StackPanel panel;
+
+            var root = new LayoutTestRoot
+            {
+                Child = panel = new StackPanel()
+            };
+
+            panel.Children.AddRange(nonArrageableTargets);
+            panel.Children.AddRange(targets);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            foreach (var c in panel.Children.OfType<LayoutTestControl>())
+            {
+                c.Measured = c.Arranged = false;
+                c.InvalidateMeasure();
+            }
+
+            foreach (var c in nonArrageableTargets)
+            {
+                c.DoArrangeOverride = (l, s) =>
+                {
+                    //emulate a problem in the logic of a control that triggers
+                    //invalidate measure during arrange
+                    c.InvalidateMeasure();
+                    return new Size(100, 100);
+                };
+            }
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            //altough nonArrageableTargets has rubbish logic and can't be measured/arranged properly
+            //layoutmanager should process properly other visuals
+            Assert.All(targets, c => Assert.True(c.Arranged));
+        }
+
+
+        [Fact]
+        public void LayoutManager_Should_Recover_From_Infinite_Loop_On_Measure()
+        {
+            // Test for issue #3041.
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = false;
+
+            control.DoMeasureOverride = (l, s) =>
+            {
+                control.InvalidateMeasure();
+                return new Size(100, 100);
+            };
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            // This is the important part: running a second layout pass in which we exceed the maximum
+            // retries causes LayoutQueue<T>.Info.Count to exceed _maxEnqueueCountPerLoop.
+            root.LayoutManager.ExecuteLayoutPass();
+
+            control.Measured = false;
+            control.DoMeasureOverride = null;
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(control.Measured);
+            Assert.True(control.IsMeasureValid);
+        }
+
+        [Fact]
+        public void Calling_ExecuteLayoutPass_From_ExecuteInitialLayoutPass_Does_Not_Break_Measure()
+        {
+            // Test for issue #3550.
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+            var count = 0;
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = false;
+
+            control.DoMeasureOverride = (l, s) =>
+            {
+                if (count++ == 0)
+                {
+                    control.InvalidateMeasure();
+                    root.LayoutManager.ExecuteLayoutPass();
+                    return new Size(100, 100);
+                }
+                else
+                {
+                    return new Size(200, 200);
+                }
+            };
+
+            root.InvalidateMeasure();
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Equal(new Size(200, 200), control.Bounds.Size);
+            Assert.Equal(new Size(200, 200), control.DesiredSize);
+        }
+        
+        [Fact]
+        public void LayoutManager_Execute_Layout_Pass_Should_Clear_Queued_LayoutPasses()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            int layoutCount = 0;
+            root.LayoutUpdated += (_, _) => layoutCount++;
+
+            root.LayoutManager.InvalidateArrange(control);
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Layout);
+            
+            Assert.Equal(1, layoutCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutQueueTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutQueueTests.cs
new file mode 100644
index 0000000000..fc3b5c3d43
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutQueueTests.cs
@@ -0,0 +1,197 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutQueueTests
+    {
+        [Fact]
+        public void Should_Enqueue()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+            var refQueue = new Queue<string>();
+            var items = new[] { "1", "2", "3" };
+
+            foreach (var item in items)
+            {
+                target.Enqueue(item);
+                refQueue.Enqueue(item);
+            }
+
+            Assert.Equal(refQueue, target);
+        }
+
+        [Fact]
+        public void Should_Dequeue()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+            var refQueue = new Queue<string>();
+            var items = new[] { "1", "2", "3" };
+
+            foreach (var item in items)
+            {
+                target.Enqueue(item);
+                refQueue.Enqueue(item);
+            }
+
+            while (refQueue.Count > 0)
+            {
+                Assert.Equal(refQueue.Dequeue(), target.Dequeue());
+            }
+        }
+
+        [Fact]
+        public void Should_Enqueue_UniqueElements()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            var items = new[] { "1", "2", "3", "1" };
+
+            foreach (var item in items)
+            {
+                target.Enqueue(item);
+            }
+
+            Assert.Equal(3, target.Count);
+            Assert.Equal(items.Take(3), target);
+        }
+
+        [Fact]
+        public void Shouldnt_Enqueue_More_Than_Limit_In_Loop()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+        }
+
+        [Fact]
+        public void Shouldnt_Count_Unique_Enqueue_For_Limit_In_Loop()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+        }
+
+        [Fact]
+        public void Should_Enqueue_When_Condition_True_After_Loop_When_Limit_Met()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added to queue
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+
+            target.EndLoop();
+
+            //after loop should be added once
+            Assert.Equal(1, target.Count);
+            Assert.Equal("Foo", target.First());
+        }
+
+        [Fact]
+        public void Shouldnt_Enqueue_When_Condition_False_After_Loop_When_Limit_Met()
+        {
+            var target = new LayoutQueue<string>(_ => false);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+
+            target.EndLoop();
+
+            Assert.Equal(0, target.Count);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutTestControl.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestControl.cs
new file mode 100644
index 0000000000..ca593cc665
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestControl.cs
@@ -0,0 +1,30 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    internal class LayoutTestControl : Decorator
+    {
+        public bool Measured { get; set; }
+        public bool Arranged { get; set; }
+        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
+        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            Measured = true;
+            return DoMeasureOverride != null ?
+                DoMeasureOverride(this, availableSize) :
+                base.MeasureOverride(availableSize);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            Arranged = true;
+            return DoArrangeOverride != null ?
+                DoArrangeOverride(this, finalSize) :
+                base.ArrangeOverride(finalSize);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutTestRoot.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestRoot.cs
new file mode 100644
index 0000000000..19ab54a339
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestRoot.cs
@@ -0,0 +1,41 @@
+using System;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    internal class LayoutTestRoot : TestRoot, ILayoutable
+    {
+        public bool Measured { get; set; }
+        public bool Arranged { get; set; }
+        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
+        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
+
+        void ILayoutable.Measure(Size availableSize)
+        {
+            Measured = true;
+            Measure(availableSize);
+        }
+
+        void ILayoutable.Arrange(Rect rect)
+        {
+            Arranged = true;
+            Arrange(rect);
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            return DoMeasureOverride != null ?
+                DoMeasureOverride(this, availableSize) :
+                base.MeasureOverride(availableSize);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            Arranged = true;
+            return DoArrangeOverride != null ?
+                DoArrangeOverride(this, finalSize) :
+                base.ArrangeOverride(finalSize);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests.cs
new file mode 100644
index 0000000000..c4b0795022
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests.cs
@@ -0,0 +1,409 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutableTests
+    {
+        [Theory]
+        [InlineData(0, 0, 0, 0, 100, 100)]
+        [InlineData(10, 0, 0, 0, 90, 100)]
+        [InlineData(10, 0, 5, 0, 85, 100)]
+        [InlineData(0, 10, 0, 0, 100, 90)]
+        [InlineData(0, 10, 0, 5, 100, 85)]
+        [InlineData(4, 4, 6, 7, 90, 89)]
+        public void Margin_Is_Applied_To_MeasureOverride_Size(
+            double l,
+            double t,
+            double r,
+            double b,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                Margin = new Thickness(l, t, r, b),
+            };
+
+            target.Measure(new Size(100, 100));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.MeasureSize);
+        }
+
+        [Theory]
+        [InlineData(HorizontalAlignment.Stretch, 100)]
+        [InlineData(HorizontalAlignment.Left, 10)]
+        [InlineData(HorizontalAlignment.Center, 10)]
+        [InlineData(HorizontalAlignment.Right, 10)]
+        public void HorizontalAlignment_Is_Applied_To_ArrangeOverride_Size(
+            HorizontalAlignment h,
+            double expectedWidth)
+        {
+            var target = new TestLayoutable
+            {
+                HorizontalAlignment = h,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(expectedWidth, 100), target.ArrangeSize);
+        }
+
+        [Theory]
+        [InlineData(VerticalAlignment.Stretch, 100)]
+        [InlineData(VerticalAlignment.Top, 10)]
+        [InlineData(VerticalAlignment.Center, 10)]
+        [InlineData(VerticalAlignment.Bottom, 10)]
+        public void VerticalAlignment_Is_Applied_To_ArrangeOverride_Size(
+            VerticalAlignment v,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                VerticalAlignment = v,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(100, expectedHeight), target.ArrangeSize);
+        }
+
+        [Theory]
+        [InlineData(0, 0, 0, 0, 100, 100)]
+        [InlineData(10, 0, 0, 0, 90, 100)]
+        [InlineData(10, 0, 5, 0, 85, 100)]
+        [InlineData(0, 10, 0, 0, 100, 90)]
+        [InlineData(0, 10, 0, 5, 100, 85)]
+        [InlineData(4, 4, 6, 7, 90, 89)]
+        public void Margin_Is_Applied_To_ArrangeOverride_Size(
+            double l,
+            double t,
+            double r,
+            double b,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                Margin = new Thickness(l, t, r, b),
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.ArrangeSize);
+        }
+
+        [Fact]
+        public void Only_Calls_LayoutManager_InvalidateMeasure_Once()
+        {
+            var target = new Mock<ILayoutManager>();
+            var control = new Decorator();
+            var root = new LayoutTestRoot
+            {
+                Child = control,
+                LayoutManager = target.Object,
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+            target.Invocations.Clear();
+
+            control.InvalidateMeasure();
+            control.InvalidateMeasure();
+
+            target.Verify(x => x.InvalidateMeasure(control), Times.Once());
+        }
+
+        [Fact]
+        public void Only_Calls_LayoutManager_InvalidateArrange_Once()
+        {
+            var target = new Mock<ILayoutManager>();
+            var control = new Decorator();
+            var root = new LayoutTestRoot
+            {
+                Child = control,
+                LayoutManager = target.Object,
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+            target.Invocations.Clear();
+
+            control.InvalidateArrange();
+            control.InvalidateArrange();
+
+            target.Verify(x => x.InvalidateArrange(control), Times.Once());
+        }
+
+        [Fact]
+        public void Attaching_Control_To_Tree_Invalidates_Parent_Measure()
+        {
+            var target = new Mock<ILayoutManager>();
+            var control = new Decorator();
+            var root = new LayoutTestRoot
+            {
+                Child = control,
+                LayoutManager = target.Object,
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+            Assert.True(control.IsMeasureValid);
+
+            root.Child = null;
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            Assert.False(control.IsMeasureValid);
+            Assert.True(root.IsMeasureValid);
+
+            target.Invocations.Clear();
+
+            root.Child = control;
+
+            Assert.False(root.IsMeasureValid);
+            Assert.False(control.IsMeasureValid);
+            target.Verify(x => x.InvalidateMeasure(root), Times.Once());
+        }
+
+        [Fact]
+        public void LayoutUpdated_Is_Called_At_End_Of_Layout_Pass()
+        {
+            Border border1;
+            Border border2;
+            var root = new TestRoot
+            {
+                Child = border1 = new Border
+                {
+                    Child = border2 = new Border(),
+                },
+            };
+            var raised = 0;
+
+            void ValidateBounds(object sender, EventArgs e)
+            {
+                Assert.Equal(new Rect(0, 0, 100, 100), border1.Bounds);
+                Assert.Equal(new Rect(0, 0, 100, 100), border2.Bounds);
+                ++raised;
+            }
+
+            root.LayoutUpdated += ValidateBounds;
+            border1.LayoutUpdated += ValidateBounds;
+            border2.LayoutUpdated += ValidateBounds;
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(0, 0, 100, 100));
+            
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(3, raised);
+            Assert.Equal(new Rect(0, 0, 100, 100), border1.Bounds);
+            Assert.Equal(new Rect(0, 0, 100, 100), border2.Bounds);
+        }
+
+        [Fact]
+        public void LayoutUpdated_Subscribes_To_LayoutManager()
+        {
+            Border target;
+            var layoutManager = new Mock<ILayoutManager>();
+            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
+
+            var root = new TestRoot
+            {
+                Child = new Border
+                {
+                    Child = target = new Border(),
+                },
+                LayoutManager = layoutManager.Object,
+            };
+
+            void Handler(object sender, EventArgs e) {}
+
+            layoutManager.Invocations.Clear();
+            target.LayoutUpdated += Handler;
+
+            layoutManager.VerifyAdd(
+                x => x.LayoutUpdated += It.IsAny<EventHandler>(),
+                Times.Once);
+
+            layoutManager.Invocations.Clear();
+            target.LayoutUpdated -= Handler;
+
+            layoutManager.VerifyRemove(
+                x => x.LayoutUpdated -= It.IsAny<EventHandler>(),
+                Times.Once);
+        }
+
+        [Fact]
+        public void LayoutManager_LayoutUpdated_Is_Subscribed_When_Attached_To_Tree()
+        {
+            Border border1;
+            var layoutManager = new Mock<ILayoutManager>();
+            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
+
+            var root = new TestRoot
+            {
+                Child = border1 = new Border(),
+                LayoutManager = layoutManager.Object,
+            };
+
+            var border2 = new Border();
+            border2.LayoutUpdated += (s, e) => { };
+
+            layoutManager.Invocations.Clear();
+            border1.Child = border2;
+
+            layoutManager.VerifyAdd(
+                x => x.LayoutUpdated += It.IsAny<EventHandler>(),
+                Times.Once);
+        }
+
+        [Fact]
+        public void LayoutManager_LayoutUpdated_Is_Unsubscribed_When_Detached_From_Tree()
+        {
+            Border border1;
+            var layoutManager = new Mock<ILayoutManager>();
+            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
+
+            var root = new TestRoot
+            {
+                Child = border1 = new Border(),
+                LayoutManager = layoutManager.Object,
+            };
+
+            var border2 = new Border();
+            border2.LayoutUpdated += (s, e) => { };
+            border1.Child = border2;
+
+            layoutManager.Invocations.Clear();
+            border1.Child = null;
+
+            layoutManager.VerifyRemove(
+                x => x.LayoutUpdated -= It.IsAny<EventHandler>(),
+                Times.Once);
+        }
+
+        [Fact]
+        public void Making_Control_Invisible_Should_Invalidate_Parent_Measure()
+        {
+            Border child;
+            var target = new StackPanel
+            {
+                Children =
+                {
+                    (child = new Border
+                    {
+                        Width = 100,
+                    }),
+                }
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.True(child.IsMeasureValid);
+            Assert.True(child.IsArrangeValid);
+
+            child.IsVisible = false;
+
+            Assert.False(target.IsMeasureValid);
+            Assert.False(target.IsArrangeValid);
+            Assert.True(child.IsMeasureValid);
+            Assert.True(child.IsArrangeValid);
+        }
+
+        [Fact]
+        public void Making_Control_Visible_Should_Invalidate_Own_And_Parent_Measure()
+        {
+            Border child;
+            var target = new StackPanel
+            {
+                Children =
+                {
+                    (child = new Border
+                    {
+                        Width = 100,
+                        IsVisible = false,
+                    }),
+                }
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.True(child.IsMeasureValid);
+            Assert.False(child.IsArrangeValid);
+
+            child.IsVisible = true;
+
+            Assert.False(target.IsMeasureValid);
+            Assert.False(target.IsArrangeValid);
+            Assert.False(child.IsMeasureValid);
+            Assert.False(child.IsArrangeValid);
+        }
+
+        [Fact]
+        public void Measuring_Invisible_Control_Should_Not_Invalidate_Parent_Measure()
+        {
+            Border child;
+            var target = new StackPanel
+            {
+                Children =
+                {
+                    (child = new Border
+                    {
+                        Width = 100,
+                    }),
+                }
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.Equal(new Size(100, 0), child.DesiredSize);
+
+            child.IsVisible = false;
+            Assert.Equal(default, child.DesiredSize);
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+            child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.Equal(default, child.DesiredSize);
+        }
+
+        private class TestLayoutable : Layoutable
+        {
+            public Size ArrangeSize { get; private set; }
+            public Size MeasureResult { get; set; } = new Size(10, 10);
+            public Size MeasureSize { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureSize = availableSize;
+                return MeasureResult;
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ArrangeSize = finalSize;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
new file mode 100644
index 0000000000..a58d28004f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
@@ -0,0 +1,451 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutableTests_EffectiveViewportChanged
+    {
+        [Fact]
+        public async Task EffectiveViewportChanged_Not_Raised_When_Control_Added_To_Tree()
+        {
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+            await RunOnUIThread.Execute(async () =>
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+            {
+                var root = CreateRoot();
+                var target = new Canvas();
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                Assert.Equal(0, raised);
+            });
+        }
+
+        [Fact]
+        public async Task EffectiveViewportChanged_Raised_Before_LayoutUpdated()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas();
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Parent_Affects_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-550, -400, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                await ExecuteInitialLayoutPass(root);
+            });
+        }
+
+        [Fact]
+        public async Task Invalidating_In_Handler_Causes_Layout_To_Be_Rerun_Before_LayoutUpdated_Raised()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new TestCanvas();
+                var raised = 0;
+                var layoutUpdatedRaised = 0;
+
+                root.LayoutUpdated += (s, e) =>
+                {
+                    Assert.Equal(2, target.MeasureCount);
+                    Assert.Equal(2, target.ArrangeCount);
+                    ++layoutUpdatedRaised;
+                };
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    target.InvalidateMeasure();
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+
+                Assert.Equal(1, raised);
+                Assert.Equal(1, layoutUpdatedRaised);
+            });
+        }
+
+        [Fact]
+        public async Task Viewport_Extends_Beyond_Centered_Control()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 52, Height = 52, };
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Viewport_Extends_Beyond_Nested_Centered_Control()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 52, Height = 52 };
+                var parent = new Border { Width = 100, Height = 100, Child = target };
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task ScrollViewer_Determines_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 200, Height = 200 };
+                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(0, 0, 100, 100), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                root.Child = scroller;
+
+                await ExecuteInitialLayoutPass(root);
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Scrolled_ScrollViewer_Determines_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 200, Height = 200 };
+                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
+                var raised = 0;
+
+                root.Child = scroller;
+
+                await ExecuteInitialLayoutPass(root);
+                scroller.Offset = new Vector(0, 10);
+
+                await ExecuteScrollerLayoutPass(root, scroller, target, (s, e) =>
+                {
+                    Assert.Equal(new Rect(0, 10, 100, 100), e.EffectiveViewport);
+                    ++raised;
+                });
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Moving_Parent_Updates_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-554, -400, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                parent.Margin = new Thickness(8, 0, 0, 0);
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Translate_Transform_Doesnt_Affect_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+                target.EffectiveViewportChanged += (s, e) => ++raised;
+                target.RenderTransform = new TranslateTransform { X = 8 };
+                target.InvalidateMeasure();
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(0, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Translate_Transform_On_Parent_Affects_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-558, -400, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                // Change the parent render transform to move it. A layout is then needed before
+                // EffectiveViewportChanged is raised.
+                parent.RenderTransform = new TranslateTransform { X = 8 };
+                parent.InvalidateMeasure();
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Rotate_Transform_On_Parent_Affects_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    AssertArePixelEqual(new Rect(-651, -792, 1484, 1484), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                parent.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
+                parent.RenderTransform = new RotateTransform { Angle = 45 };
+                parent.InvalidateMeasure();
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Event_Unsubscribed_While_Inside_Callback()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas();
+                var raised = 0;
+
+                void OnTargetOnEffectiveViewportChanged(object s, EffectiveViewportChangedEventArgs e)
+                {
+                    target.EffectiveViewportChanged -= OnTargetOnEffectiveViewportChanged;
+                    ++raised;
+                }
+                target.EffectiveViewportChanged += OnTargetOnEffectiveViewportChanged;
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        private TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 };
+
+        private Task ExecuteInitialLayoutPass(TestRoot root)
+        {
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            return Task.CompletedTask;
+        }
+
+        private Task ExecuteLayoutPass(TestRoot root)
+        {
+            root.LayoutManager.ExecuteLayoutPass();
+            return Task.CompletedTask;
+        }
+
+        private Task ExecuteScrollerLayoutPass(
+            TestRoot root,
+            ScrollViewer scroller,
+            Control target,
+            Action<object, EffectiveViewportChangedEventArgs> handler)
+        {
+            void ViewportChanged(object sender, EffectiveViewportChangedEventArgs e)
+            {
+                handler(sender, e);
+            }
+
+            target.EffectiveViewportChanged += ViewportChanged;
+            root.LayoutManager.ExecuteLayoutPass();
+            return Task.CompletedTask;
+        }
+        private IControlTemplate ScrollViewerTemplate()
+        {
+            return new FuncControlTemplate<ScrollViewer>((control, scope) => new Grid
+            {
+                ColumnDefinitions = new ColumnDefinitions
+                {
+                    new ColumnDefinition(1, GridUnitType.Star),
+                    new ColumnDefinition(GridLength.Auto),
+                },
+                RowDefinitions = new RowDefinitions
+                {
+                    new RowDefinition(1, GridUnitType.Star),
+                    new RowDefinition(GridLength.Auto),
+                },
+                Children =
+                {
+                    new ScrollContentPresenter
+                    {
+                        Name = "PART_ContentPresenter",
+                        [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
+                        [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
+                        [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
+                        [~~ScrollContentPresenter.ViewportProperty] = control[~~ScrollViewer.ViewportProperty],
+                        [~ScrollContentPresenter.CanHorizontallyScrollProperty] = control[~ScrollViewer.CanHorizontallyScrollProperty],
+                        [~ScrollContentPresenter.CanVerticallyScrollProperty] = control[~ScrollViewer.CanVerticallyScrollProperty],
+                    }.RegisterInNameScope(scope),
+                    new ScrollBar
+                    {
+                        Name = "horizontalScrollBar",
+                        Orientation = Orientation.Horizontal,
+                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
+                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
+                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.HorizontalScrollBarViewportSizeProperty],
+                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty],
+                        [Grid.RowProperty] = 1,
+                    }.RegisterInNameScope(scope),
+                    new ScrollBar
+                    {
+                        Name = "verticalScrollBar",
+                        Orientation = Orientation.Vertical,
+                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
+                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
+                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.VerticalScrollBarViewportSizeProperty],
+                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty],
+                        [Grid.ColumnProperty] = 1,
+                    }.RegisterInNameScope(scope),
+                },
+            });
+        }
+
+        private void AssertArePixelEqual(Rect expected, Rect actual)
+        {
+            var expectedRounded = new Rect((int)expected.X, (int)expected.Y, (int)expected.Width, (int)expected.Height);
+            var actualRounded = new Rect((int)actual.X, (int)actual.Y, (int)actual.Width, (int)actual.Height);
+            Assert.Equal(expectedRounded, actualRounded);
+        }
+
+        private class TestCanvas : Canvas
+        {
+            public int MeasureCount { get; private set; }
+            public int ArrangeCount { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                ++MeasureCount;
+                return base.MeasureOverride(availableSize);
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ++ArrangeCount;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
+
+        private static class RunOnUIThread
+        {
+            public static async Task Execute(Func<Task> func)
+            {
+                await func();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs
new file mode 100644
index 0000000000..77f1a8882d
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs
@@ -0,0 +1,140 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutableTests_LayoutRounding
+    {
+        [Theory]
+        [InlineData(100, 100)]
+        [InlineData(101, 101.33333333333333)]
+        [InlineData(103, 103.33333333333333)]
+        public void Measure_Adjusts_DesiredSize_Upwards_When_Constraint_Allows(double desiredSize, double expectedSize)
+        {
+            var target = new TestLayoutable(new Size(desiredSize, desiredSize));
+            var root = CreateRoot(1.5, target);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Equal(new Size(expectedSize, expectedSize), target.DesiredSize);
+        }
+
+        [Fact]
+        public void Measure_Constrains_Adjusted_DesiredSize_To_Constraint()
+        {
+            var target = new TestLayoutable(new Size(101, 101));
+            var root = CreateRoot(1.5, target, constraint: new Size(101, 101));
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            // Desired width/height with layout rounding is 101.3333 but constraint is 101,101 so
+            // layout rounding should be ignored.
+            Assert.Equal(new Size(101, 101), target.DesiredSize);
+        }
+
+        [Fact]
+        public void Measure_Adjusts_DesiredSize_Upwards_When_Margin_Present()
+        {
+            var target = new TestLayoutable(new Size(101, 101), margin: 1);
+            var root = CreateRoot(1.5, target);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            // - 1 pixel margin is rounded up to 1.3333; for both sides it is 2.6666
+            // - Size of 101 gets rounded up to 101.3333
+            // - Final size = 101.3333 + 2.6666 = 104
+            AssertEqual(new Size(104, 104), target.DesiredSize);
+        }
+
+        [Fact]
+        public void Arrange_Adjusts_Bounds_Upwards_With_Margin()
+        {
+            var target = new TestLayoutable(new Size(101, 101), margin: 1);
+            var root = CreateRoot(1.5, target);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            // - 1 pixel margin is rounded up to 1.3333
+            // - Size of 101 gets rounded up to 101.3333
+            AssertEqual(new Point(1.3333333333333333, 1.3333333333333333), target.Bounds.Position);
+            AssertEqual(new Size(101.33333333333333, 101.33333333333333), target.Bounds.Size);
+        }
+
+        [Theory]
+        [InlineData(16, 6, 5.333333333333333)]
+        [InlineData(18, 10, 4)]
+        public void Arranges_Center_Alignment_Correctly_With_Fractional_Scaling(
+            double containerWidth,
+            double childWidth,
+            double expectedX)
+        {
+            Border target;
+            var root = new TestRoot
+            {
+                LayoutScaling = 1.5,
+                UseLayoutRounding = true,
+                Child = new Decorator
+                {
+                    Width = containerWidth,
+                    Height = 100,
+                    Child = target = new Border
+                    {
+                        Width = childWidth,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                    }
+                }
+            };
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Rect(expectedX, 0, childWidth, 100), target.Bounds);
+        }
+
+        private static TestRoot CreateRoot(
+            double scaling,
+            Control child,
+            Size? constraint = null)
+        {
+            return new TestRoot
+            {
+                LayoutScaling = scaling,
+                UseLayoutRounding = true,
+                Child = child,
+                ClientSize = constraint ?? new Size(1000, 1000),
+            };
+        }
+
+        private static void AssertEqual(Point expected, Point actual)
+        {
+            if (!expected.NearlyEquals(actual))
+            {
+                throw new EqualException(expected, actual);
+            }
+        }
+
+        private static void AssertEqual(Size expected, Size actual)
+        {
+            if (!expected.NearlyEquals(actual))
+            {
+                throw new EqualException(expected, actual);
+            }
+        }
+
+        private class TestLayoutable : Control
+        {
+            private Size _desiredSize;
+
+            public TestLayoutable(Size desiredSize, double margin = 0)
+            {
+                _desiredSize = desiredSize;
+                Margin = new Thickness(margin);
+            }
+
+            protected override Size MeasureOverride(Size availableSize) => _desiredSize;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/MeasureTests.cs b/tests/Avalonia.Base.UnitTests/Layout/MeasureTests.cs
new file mode 100644
index 0000000000..32c3e89b74
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/MeasureTests.cs
@@ -0,0 +1,154 @@
+using Avalonia.Controls;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class MeasureTests
+    {
+        [Fact]
+        public void Margin_Should_Be_Included_In_DesiredSize()
+        {
+            var decorator = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(8),
+            };
+
+            decorator.Measure(Size.Infinity);
+
+            Assert.Equal(new Size(116, 116), decorator.DesiredSize);
+        }
+
+        [Fact]
+        public void Invalidating_Child_Should_Not_Invalidate_Parent()
+        {
+            var panel = new StackPanel();
+            var child = new Border();
+            panel.Children.Add(child);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+
+            Assert.Equal(new Size(0, 0), panel.DesiredSize);
+
+            child.Width = 100;
+            child.Height = 100;
+
+            Assert.True(panel.IsMeasureValid);
+            Assert.False(child.IsMeasureValid);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            Assert.Equal(new Size(0, 0), panel.DesiredSize);
+        }
+
+        [Fact]
+        public void Removing_From_Parent_Should_Invalidate_Measure_Of_Control_And_Descendants()
+        {
+            var panel = new StackPanel();
+            var child2 = new Border();
+            var child1 = new Border { Child = child2 };
+            panel.Children.Add(child1);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            Assert.True(child1.IsMeasureValid);
+            Assert.True(child2.IsMeasureValid);
+
+            panel.Children.Remove(child1);
+            Assert.False(child1.IsMeasureValid);
+            Assert.False(child2.IsMeasureValid);
+        }
+
+        [Fact]
+        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Width_0()
+        {
+            Control target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new Control
+                {
+                    Margin = new Thickness(-100, 0, 0, 0),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(0, target.DesiredSize.Width);
+        }
+
+        [Fact]
+        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Height_0()
+        {
+            Control target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new Control
+                {
+                    Margin = new Thickness(0, -100, 0, 0),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(0, target.DesiredSize.Height);
+        }
+
+        [Fact]
+        public void Margin_Should_Affect_AvailableSize()
+        {
+            MeasureTest target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new MeasureTest
+                {
+                    Margin = new Thickness(10),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(new Size(80, 80), target.AvailableSize);
+        }
+
+        [Fact]
+        public void Margin_Should_Be_Applied_Before_Width_Height()
+        {
+            MeasureTest target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new MeasureTest
+                {
+                    Width = 80,
+                    Height = 80,
+                    Margin = new Thickness(10),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(new Size(80, 80), target.AvailableSize);
+        }
+
+        class MeasureTest : Control
+        {
+            public Size? AvailableSize { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                AvailableSize = availableSize;
+                return availableSize;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
new file mode 100644
index 0000000000..78cf63ed3f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
@@ -0,0 +1,336 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class NonVirtualizingStackLayoutTests
+    {
+        [Fact]
+        public void Lays_Out_Children_Vertically()
+        {
+            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Vertical };
+            var context = CreateContext(new[]
+            {
+                new Border { Height = 20, Width = 120 },
+                new Border { Height = 30 },
+                new Border { Height = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(120, 100), desiredSize);
+            Assert.Equal(new Size(120, 100), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 20, 120, 30), context.Children[1].Bounds);
+            Assert.Equal(new Rect(0, 50, 120, 50), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_Children_Horizontally()
+        {
+            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Horizontal };
+            var context = CreateContext(new[]
+            {
+                new Border { Width = 20, Height = 120 },
+                new Border { Width = 30 },
+                new Border { Width = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(100, 120), desiredSize);
+            Assert.Equal(new Size(100, 120), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
+            Assert.Equal(new Rect(20, 0, 30, 120), context.Children[1].Bounds);
+            Assert.Equal(new Rect(50, 0, 50, 120), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_Children_Vertically_With_Spacing()
+        {
+            var target = new NonVirtualizingStackLayout 
+            { 
+                Orientation = Orientation.Vertical,
+                Spacing = 10,
+            };
+
+            var context = CreateContext(new[]
+            {
+                new Border { Height = 20, Width = 120 },
+                new Border { Height = 30 },
+                new Border { Height = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(120, 120), desiredSize);
+            Assert.Equal(new Size(120, 120), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 30, 120, 30), context.Children[1].Bounds);
+            Assert.Equal(new Rect(0, 70, 120, 50), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_Children_Horizontally_With_Spacing()
+        {
+            var target = new NonVirtualizingStackLayout 
+            { 
+                Orientation = Orientation.Horizontal,
+                Spacing = 10,
+            };
+
+            var context = CreateContext(new[]
+            {
+                new Border { Width = 20, Height = 120 },
+                new Border { Width = 30 },
+                new Border { Width = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(120, 120), desiredSize);
+            Assert.Equal(new Size(120, 120), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
+            Assert.Equal(new Rect(30, 0, 30, 120), context.Children[1].Bounds);
+            Assert.Equal(new Rect(70, 0, 50, 120), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Arranges_Vertical_Children_With_Correct_Bounds()
+        {
+            var target = new NonVirtualizingStackLayout
+            {
+                Orientation = Orientation.Vertical
+            };
+            
+            var context = CreateContext(new[]
+            {
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Left,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Left,
+                    MeasureSize = new Size(150, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    MeasureSize = new Size(150, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    MeasureSize = new Size(150, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    MeasureSize = new Size(150, 10),
+                },
+            });
+
+            var desiredSize = target.Measure(context, new Size(100, 150));
+            Assert.Equal(new Size(100, 80), desiredSize);
+
+            target.Arrange(context, desiredSize);
+
+            var bounds = context.Children.Select(x => x.Bounds).ToArray();
+
+            Assert.Equal(
+                new[]
+                {
+                    new Rect(0, 0, 50, 10),
+                    new Rect(0, 10, 100, 10),
+                    new Rect(25, 20, 50, 10),
+                    new Rect(0, 30, 100, 10),
+                    new Rect(50, 40, 50, 10),
+                    new Rect(0, 50, 100, 10),
+                    new Rect(0, 60, 100, 10),
+                    new Rect(0, 70, 100, 10),
+
+                }, bounds);
+        }
+
+        [Fact]
+        public void Arranges_Horizontal_Children_With_Correct_Bounds()
+        {
+            var target = new NonVirtualizingStackLayout
+            {
+                Orientation = Orientation.Horizontal
+            };
+
+            var context = CreateContext(new[]
+            {
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Top,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Top,
+                    MeasureSize = new Size(10, 150),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Center,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Center,
+                    MeasureSize = new Size(10, 150),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    MeasureSize = new Size(10, 150),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    MeasureSize = new Size(10, 150),
+                },
+            });
+
+            var desiredSize = target.Measure(context, new Size(150, 100));
+            Assert.Equal(new Size(80, 100), desiredSize);
+
+            target.Arrange(context, desiredSize);
+
+            var bounds = context.Children.Select(x => x.Bounds).ToArray();
+
+            Assert.Equal(
+                new[]
+                {
+                    new Rect(0, 0, 10, 50),
+                    new Rect(10, 0, 10, 100),
+                    new Rect(20, 25, 10, 50),
+                    new Rect(30, 0, 10, 100),
+                    new Rect(40, 50, 10, 50),
+                    new Rect(50, 0, 10, 100),
+                    new Rect(60, 0, 10, 100),
+                    new Rect(70, 0, 10, 100),
+                }, bounds);
+        }
+
+        [Theory]
+        [InlineData(Orientation.Horizontal)]
+        [InlineData(Orientation.Vertical)]
+        public void Spacing_Not_Added_For_Invisible_Children(Orientation orientation)
+        {
+            var targetThreeChildrenOneInvisble = new NonVirtualizingStackLayout
+            {
+                Orientation = orientation,
+                Spacing = 40,
+            };
+
+            var contextThreeChildrenOneInvisble = CreateContext(new[]
+            {
+                new StackPanel { Width = 10, Height= 10, IsVisible = false },
+                new StackPanel { Width = 10, Height= 10 },
+                new StackPanel { Width = 10, Height= 10 },
+            });
+
+            var targetTwoChildrenNoneInvisible = new NonVirtualizingStackLayout
+            {
+                Spacing = 40,
+                Orientation = orientation,
+            };
+
+            var contextTwoChildrenNoneInvisible = CreateContext(new[]
+            {
+                new StackPanel { Width = 10, Height = 10 },
+                new StackPanel { Width = 10, Height = 10 }
+            });
+
+            var desiredSize1 = targetThreeChildrenOneInvisble.Measure(contextThreeChildrenOneInvisble, Size.Infinity);
+            var desiredSize2 = targetTwoChildrenNoneInvisible.Measure(contextTwoChildrenNoneInvisible, Size.Infinity);
+ 
+            Assert.Equal(desiredSize2, desiredSize1);
+        }
+
+        [Theory]
+        [InlineData(Orientation.Horizontal)]
+        [InlineData(Orientation.Vertical)]
+        public void Only_Arrange_Visible_Children(Orientation orientation)
+        {
+            var hiddenPanel = new Panel { Width = 10, Height = 10, IsVisible = false };
+            var panel = new Panel { Width = 10, Height = 10 };
+
+            var target = new NonVirtualizingStackLayout
+            {
+                Spacing = 40,
+                Orientation = orientation,
+            };
+
+            var context = CreateContext(new[]
+            {
+                hiddenPanel,
+                panel
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+            Assert.Equal(new Size(10, 10), arrangeSize);
+        }
+
+        private NonVirtualizingLayoutContext CreateContext(Control[] children)
+        {
+            return new TestLayoutContext(children);
+        }
+
+        private class TestLayoutContext : NonVirtualizingLayoutContext
+        {
+            public TestLayoutContext(Control[] children) => ChildrenCore = children;
+            protected override IReadOnlyList<ILayoutable> ChildrenCore { get; }
+        }
+
+        private class TestControl : Control
+        {
+            public Size MeasureConstraint { get; private set; }
+            public Size MeasureSize { get; set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureConstraint = availableSize;
+                return MeasureSize;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/MatrixTests.cs b/tests/Avalonia.Base.UnitTests/MatrixTests.cs
new file mode 100644
index 0000000000..99fe4685d7
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/MatrixTests.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests;
+
+/// <summary>
+///  These tests use the "official" Matrix4x4 and Matrix3x2 from the System.Numerics namespace, to validate
+///  that Avalonias own implementation of a 3x3 Matrix works correctly.
+/// </summary>
+public class MatrixTests
+{
+    /// <summary>
+    ///  Because Avalonia is working internally with doubles, but System.Numerics Vector and Matrix implementations
+    ///  only make use of floats, we need to reduce precision, comparing them. It should be sufficient to compare
+    ///  5 fractional digits to ensure, that the result is correct.
+    /// </summary>
+    /// <param name="expected">The expected vector</param>
+    /// <param name="actual">The actual transformed point</param>
+    private void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual)
+    {
+        double ReducePrecision(double input) => Math.Truncate(input * 10000);
+        
+        var expectedX = ReducePrecision(expected.X);
+        var expectedY = ReducePrecision(expected.Y);
+        
+        var actualX = ReducePrecision(actual.X);
+        var actualY = ReducePrecision(actual.Y);
+        
+        Assert.Equal(expectedX, actualX);
+        Assert.Equal(expectedY, actualY);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Translated_Matrix()
+    {
+        var vector2 = Vector2.Transform(
+            new Vector2(1, 1), 
+            Matrix3x2.CreateTranslation(2, 2));
+        var expected = new Point(vector2.X, vector2.Y);
+        
+        var matrix = Matrix.CreateTranslation(2, 2);
+        var point = new Point(1, 1);
+        var transformedPoint = matrix.Transform(point);
+        
+        Assert.Equal(expected, transformedPoint);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Rotated_Matrix()
+    {
+        var expected = Vector2.Transform(
+            new Vector2(0, 10), 
+            Matrix3x2.CreateRotation((float)Matrix.ToRadians(45)));
+
+        var matrix = Matrix.CreateRotation(Matrix.ToRadians(45));
+        var point = new Point(0, 10);
+        var actual = matrix.Transform(point);
+
+        AssertCoordinatesEqualWithReducedPrecision(expected, actual);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Scaled_Matrix()
+    {
+        var vector2 = Vector2.Transform(
+            new Vector2(1, 1), 
+            Matrix3x2.CreateScale(2, 2));
+        var expected = new Point(vector2.X, vector2.Y);
+        var matrix = Matrix.CreateScale(2, 2);
+        var point = new Point(1, 1);
+        var actual = matrix.Transform(point);
+        
+        Assert.Equal(expected, actual);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Skewed_Matrix()
+    {
+        var expected = Vector2.Transform(
+            new Vector2(1, 1), 
+            Matrix3x2.CreateSkew(30, 20));
+
+        var matrix = Matrix.CreateSkew(30, 20);
+        var point = new Point(1, 1);
+        var actual = matrix.Transform(point);
+        
+        AssertCoordinatesEqualWithReducedPrecision(expected, actual);
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/BoxShadowTests.cs b/tests/Avalonia.Base.UnitTests/Media/BoxShadowTests.cs
new file mode 100644
index 0000000000..5f1860d177
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/BoxShadowTests.cs
@@ -0,0 +1,45 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class BoxShadowTests
+    {
+        [Fact]
+        public void BoxShadow_Should_Parse()
+        {
+            foreach (var extraSpaces in new[] { false, true })
+            foreach (var inset in new[] { false, true })
+                for (var componentCount = 2; componentCount < 5; componentCount++)
+                {
+                    var s = (inset ? "inset " : "") + "10 20";
+                    double blur = 0;
+                    double spread = 0;
+                    if (componentCount > 2)
+                    {
+                        s += " 30";
+                        blur = 30;
+                    }
+
+                    if (componentCount > 3)
+                    {
+                        s += " 40";
+                        spread = 40;
+                    }
+
+                    s += " red";
+
+                    if (extraSpaces)
+                        s = " " + s.Replace(" ", "  ") + "   ";
+
+                    var parsed = BoxShadow.Parse(s);
+                    Assert.Equal(inset, parsed.IsInset);
+                    Assert.Equal(10, parsed.OffsetX);
+                    Assert.Equal(20, parsed.OffsetY);
+                    Assert.Equal(blur, parsed.Blur);
+                    Assert.Equal(spread, parsed.Spread);
+                    Assert.Equal(Colors.Red, parsed.Color);
+                }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/BrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/BrushTests.cs
new file mode 100644
index 0000000000..6edce79de1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/BrushTests.cs
@@ -0,0 +1,93 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class BrushTests
+    {
+        [Fact]
+        public void Parse_Parses_RGB_Hash_Brush()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("#ff8844");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x88, result.Color.G);
+            Assert.Equal(0x44, result.Color.B);
+            Assert.Equal(0xff, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_ARGB_Hash_Brush()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("#40ff8844");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x88, result.Color.G);
+            Assert.Equal(0x44, result.Color.B);
+            Assert.Equal(0x40, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Brush_Lowercase()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("red");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x00, result.Color.G);
+            Assert.Equal(0x00, result.Color.B);
+            Assert.Equal(0xff, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Brush_Uppercase()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("RED");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x00, result.Color.G);
+            Assert.Equal(0x00, result.Color.B);
+            Assert.Equal(0xff, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_ToString_Named_Brush_Roundtrip()
+        {
+            const string expectedName = "Red";
+            var brush = (ISolidColorBrush)Brush.Parse(expectedName);
+            var name = brush.ToString();
+
+            Assert.Equal(expectedName, name);
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
+        {
+            Assert.Throws<FormatException>(() => Brush.Parse("#ff"));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
+        {
+            Assert.Throws<FormatException>(() => Brush.Parse("#ff5555555"));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
+        {
+            Assert.Throws<FormatException>(() => Brush.Parse("#ff808g80"));
+        }
+
+        [Fact]
+        public void Changing_Opacity_Raises_Invalidated()
+        {
+            var target = new SolidColorBrush();
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Opacity = 0.5;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/ColorTests.cs b/tests/Avalonia.Base.UnitTests/Media/ColorTests.cs
new file mode 100644
index 0000000000..36929d5e95
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/ColorTests.cs
@@ -0,0 +1,339 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class ColorTests
+    {
+        [Fact]
+        public void Parse_Parses_RGB_Hash_Color()
+        {
+            var result = Color.Parse("#ff8844");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_RGB_Hash_Color()
+        {
+            var success = Color.TryParse("#ff8844", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_RGB_Hash_Shorthand_Color()
+        {
+            var result = Color.Parse("#f84");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_RGB_Hash_Shorthand_Color()
+        {
+            var success = Color.TryParse("#f84", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_ARGB_Hash_Color()
+        {
+            var result = Color.Parse("#40ff8844");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x40, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_ARGB_Hash_Color()
+        {
+            var success = Color.TryParse("#40ff8844", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x40, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_ARGB_Hash_Shorthand_Color()
+        {
+            var result = Color.Parse("#4f84");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x44, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_ARGB_Hash_Shorthand_Color()
+        {
+            var success = Color.TryParse("#4f84", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x44, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Color_Lowercase()
+        {
+            var result = Color.Parse("red");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void TryParse_Parses_Named_Color_Lowercase()
+        {
+            var success = Color.TryParse("red", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Color_Uppercase()
+        {
+            var result = Color.Parse("RED");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void TryParse_Parses_Named_Color_Uppercase()
+        {
+            var success = Color.TryParse("RED", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse("#ff"));
+        }
+
+        [Fact]
+        public void TryParse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
+        {
+            Assert.False(Color.TryParse("#ff", out _));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse("#ff5555555"));
+        }
+
+        [Fact]
+        public void TryParse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
+        {
+            Assert.False(Color.TryParse("#ff5555555", out _));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse("#ff808g80"));
+        }
+
+        [Fact]
+        public void TryParse_Hex_Value_Doesnt_Accept_Invalid_Number()
+        {
+            Assert.False(Color.TryParse("#ff808g80", out _));
+        }
+
+        [Fact]
+        public void Parse_Throws_ArgumentNullException_For_Null_Input()
+        {
+            Assert.Throws<ArgumentNullException>(() => Color.Parse((string)null));
+        }
+
+        [Fact]
+        public void Parse_Throws_FormatException_For_Invalid_Input()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse(string.Empty));
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void TryParse_Returns_False_For_Invalid_Input(string input)
+        {
+            Assert.False(Color.TryParse(input, out _));
+        }
+
+        [Fact]
+        public void Try_Parse_HslColor()
+        {
+            // Inline data requires constants, so the data is handled internally here
+            var data = new Tuple<string, HslColor>[]
+            {
+                // HSV
+                Tuple.Create("hsl(0, 0, 0)",         new HslColor(1, 0, 0, 0)),
+                Tuple.Create("hsl(0, 0%, 0%)",       new HslColor(1, 0, 0, 0)),
+                Tuple.Create("hsl(180, 0.5, 0.5)",   new HslColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsl(180, 50%, 50%)",   new HslColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsl(360, 1.0, 1.0)",   new HslColor(1, 0, 1, 1)),         // Wraps Hue to zero
+                Tuple.Create("hsl(360, 100%, 100%)", new HslColor(1, 0, 1, 1)),         // Wraps Hue to zero
+
+                Tuple.Create("hsl(-1000, -1000, -1000)",   new HslColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsl(-1000, -1000%, -1000%)", new HslColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsl(1000, 1000, 1000)",      new HslColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsl(1000, 1000%, 1000%)",    new HslColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsl(300, 0.8, 0.2)", new HslColor(1.0, 300, 0.8, 0.2)),
+                Tuple.Create("hsl(300, 80%, 20%)", new HslColor(1.0, 300, 0.8, 0.2)),
+
+                // HSVA
+                Tuple.Create("hsla(0, 0, 0, 0)",            new HslColor(0, 0, 0, 0)),
+                Tuple.Create("hsla(0, 0%, 0%, 0%)",         new HslColor(0, 0, 0, 0)),
+                Tuple.Create("hsla(180, 0.5, 0.5, 0.5)",    new HslColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsla(180, 50%, 50%, 50%)",    new HslColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsla(360, 1.0, 1.0, 1.0)",    new HslColor(1, 0, 1, 1)),          // Wraps Hue to zero
+                Tuple.Create("hsla(360, 100%, 100%, 100%)", new HslColor(1, 0, 1, 1)),          // Wraps Hue to zero
+
+                Tuple.Create("hsla(-1000, -1000, -1000, -1000)",    new HslColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsla(-1000, -1000%, -1000%, -1000%)", new HslColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsla(1000, 1000, 1000, 1000)",        new HslColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsla(1000, 1000%, 1000%, 1000%)",     new HslColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsla(300, 0.9, 0.2, 0.8)", new HslColor(0.8, 300, 0.9, 0.2)),
+                Tuple.Create("hsla(300, 90%, 20%, 0.8)", new HslColor(0.8, 300, 0.9, 0.2)),
+            };
+
+            foreach (var dataPoint in data)
+            {
+                Assert.True(HslColor.TryParse(dataPoint.Item1, out HslColor parsedHslColor));
+                Assert.True(dataPoint.Item2 == parsedHslColor);
+            }
+        }
+
+        [Fact]
+        public void Try_Parse_HsvColor()
+        {
+            // Inline data requires constants, so the data is handled internally here
+            var data = new Tuple<string, HsvColor>[]
+            {
+                // HSV
+                Tuple.Create("hsv(0, 0, 0)",         new HsvColor(1, 0, 0, 0)),
+                Tuple.Create("hsv(0, 0%, 0%)",       new HsvColor(1, 0, 0, 0)),
+                Tuple.Create("hsv(180, 0.5, 0.5)",   new HsvColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsv(180, 50%, 50%)",   new HsvColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsv(360, 1.0, 1.0)",   new HsvColor(1, 0, 1, 1)),         // Wraps Hue to zero
+                Tuple.Create("hsv(360, 100%, 100%)", new HsvColor(1, 0, 1, 1)),         // Wraps Hue to zero
+
+                Tuple.Create("hsv(-1000, -1000, -1000)",   new HsvColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsv(-1000, -1000%, -1000%)", new HsvColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsv(1000, 1000, 1000)",      new HsvColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsv(1000, 1000%, 1000%)",    new HsvColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsv(300, 0.8, 0.2)", new HsvColor(1.0, 300, 0.8, 0.2)),
+                Tuple.Create("hsv(300, 80%, 20%)", new HsvColor(1.0, 300, 0.8, 0.2)),
+
+                // HSVA
+                Tuple.Create("hsva(0, 0, 0, 0)",            new HsvColor(0, 0, 0, 0)),
+                Tuple.Create("hsva(0, 0%, 0%, 0%)",         new HsvColor(0, 0, 0, 0)),
+                Tuple.Create("hsva(180, 0.5, 0.5, 0.5)",    new HsvColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsva(180, 50%, 50%, 50%)",    new HsvColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsva(360, 1.0, 1.0, 1.0)",    new HsvColor(1, 0, 1, 1)),          // Wraps Hue to zero
+                Tuple.Create("hsva(360, 100%, 100%, 100%)", new HsvColor(1, 0, 1, 1)),          // Wraps Hue to zero
+
+                Tuple.Create("hsva(-1000, -1000, -1000, -1000)",    new HsvColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsva(-1000, -1000%, -1000%, -1000%)", new HsvColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsva(1000, 1000, 1000, 1000)",        new HsvColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsva(1000, 1000%, 1000%, 1000%)",     new HsvColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsva(300, 0.9, 0.2, 0.8)", new HsvColor(0.8, 300, 0.9, 0.2)),
+                Tuple.Create("hsva(300, 90%, 20%, 0.8)", new HsvColor(0.8, 300, 0.9, 0.2)),
+            };
+
+            foreach (var dataPoint in data)
+            {
+                Assert.True(HsvColor.TryParse(dataPoint.Item1, out HsvColor parsedHsvColor));
+                Assert.True(dataPoint.Item2 == parsedHsvColor);
+            }
+        }
+
+        [Fact]
+        public void Try_Parse_All_Formats_With_Conversion()
+        {
+            // Inline data requires constants, so the data is handled internally here
+            var data = new Tuple<string, Color>[]
+            {
+                // RGB
+                Tuple.Create("White",   new Color(0xff, 0xff, 0xff, 0xff)),
+                Tuple.Create("#123456", new Color(0xff, 0x12, 0x34, 0x56)),
+
+                Tuple.Create("rgb(100, 30, 45)",       new Color(255, 100, 30, 45)),
+                Tuple.Create("rgba(100, 30, 45, 0.9)", new Color(230, 100, 30, 45)),
+                Tuple.Create("rgba(100, 30, 45, 90%)", new Color(230, 100, 30, 45)),
+
+                Tuple.Create("rgb(255,0,0)", new Color(255, 255, 0, 0)),
+                Tuple.Create("rgb(0,255,0)", new Color(255, 0, 255, 0)),
+                Tuple.Create("rgb(0,0,255)", new Color(255, 0, 0, 255)),
+
+                Tuple.Create("rgb(100%, 0, 0)", new Color(255, 255, 0, 0)),
+                Tuple.Create("rgb(0, 100%, 0)", new Color(255, 0, 255, 0)),
+                Tuple.Create("rgb(0, 0, 100%)", new Color(255, 0, 0, 255)),
+
+                Tuple.Create("rgba(0, 0, 100%, 50%)",    new Color(128, 0, 0, 255)),
+                Tuple.Create("rgba(50%, 10%, 80%, 50%)", new Color(128, 128, 26, 204)),
+                Tuple.Create("rgba(50%, 10%, 80%, 0.5)", new Color(128, 128, 26, 204)),
+
+                // HSL
+                Tuple.Create("hsl(296, 85%, 12%)",         new Color(255, 53, 5, 57)),
+                Tuple.Create("hsla(296, 0.85, 0.12, 0.9)", new Color(230, 53, 5, 57)),
+                Tuple.Create("hsla(296, 85%, 12%, 90%)",   new Color(230, 53, 5, 57)),
+
+                // HSV
+                Tuple.Create("hsv(240, 83%, 78%)",         new Color(255, 34, 34, 199)),
+                Tuple.Create("hsva(240, 0.83, 0.78, 0.9)", new Color(230, 34, 34, 199)),
+                Tuple.Create("hsva(240, 83%, 78%, 90%)",   new Color(230, 34, 34, 199)),
+            };
+
+            foreach (var dataPoint in data)
+            {
+                Assert.True(Color.TryParse(dataPoint.Item1, out Color parsedColor));
+                Assert.True(dataPoint.Item2 == parsedColor);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/FontFamilyTests.cs b/tests/Avalonia.Base.UnitTests/Media/FontFamilyTests.cs
new file mode 100644
index 0000000000..1f8ae9bd8b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/FontFamilyTests.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.Fonts;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class FontFamilyTests
+    {
+        [Fact]
+        public void Should_Implicitly_Convert_String_To_FontFamily()
+        {
+            FontFamily fontFamily = "Arial";
+
+            Assert.Equal(new FontFamily("Arial"), fontFamily);
+        }
+
+        [InlineData("Font A")]
+        [InlineData("Font A, Font B")]
+        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        [Theory]
+        public void Should_Have_Equal_Hash(string s)
+        {
+            var fontFamily = new FontFamily(s);
+
+            Assert.Equal(new FontFamily(s).GetHashCode(), fontFamily.GetHashCode());
+        }
+
+        [InlineData("Font A, Font B", "Font B, Font A")]
+        [InlineData("Font A, Font B", "Font A, Font C")]
+        [Theory]
+        public void Should_Not_Have_Equal_Hash(string a, string b)
+        {
+            var fontFamily = new FontFamily(b);
+
+            Assert.NotEqual(new FontFamily(a).GetHashCode(), fontFamily.GetHashCode());
+        }
+
+        [InlineData("Font A")]
+        [InlineData("Font A, Font B")]
+        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        [Theory]
+        public void Should_Be_Equal(string s)
+        {
+            var fontFamily = new FontFamily(s);
+
+            Assert.Equal(new FontFamily(s), fontFamily);
+        }
+
+        [InlineData("Font A, Font B", "Font B, Font A")]
+        [InlineData("Font A, Font B", "Font A, Font C")]
+        [Theory]
+        public void Should_Not_Be_Equal(string a, string b)
+        {
+            var fontFamily = new FontFamily(b);
+
+            Assert.NotEqual(new FontFamily(a), fontFamily);
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_SystemFont_Name()
+        {
+            var fontFamily = FontFamily.Parse("Courier New");
+
+            Assert.Equal("Courier New", fontFamily.Name);
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_Fallbacks()
+        {
+            var fontFamily = FontFamily.Parse("Courier New, Times New Roman");
+
+            Assert.Equal("Courier New", fontFamily.Name);
+
+            Assert.Equal(2, fontFamily.FamilyNames.Count());
+
+            Assert.Equal("Times New Roman", fontFamily.FamilyNames.Last());
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_Resource_Folder()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
+
+            var key = new FontFamilyKey(source);
+
+            var fontFamily = FontFamily.Parse(source.OriginalString);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.Equal(key, fontFamily.Key);
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_Resource_Filename()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
+
+            var key = new FontFamilyKey(source);
+
+            var fontFamily = FontFamily.Parse(source.OriginalString);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.Equal(key, fontFamily.Key);
+        }
+
+        [Theory]
+        [InlineData("resm:Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        public void Should_Create_FontFamily_From_Uri(string name)
+        {
+            var fontFamily = new FontFamily(name);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.NotNull(fontFamily.Key);
+        }
+
+        [Theory]
+        [InlineData("resm:Avalonia.Visuals.UnitTests.Assets.Fonts", "#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts", "#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests", "/Assets/Fonts#MyFont")]
+        public void Should_Create_FontFamily_From_Uri_With_Base_Uri(string @base, string name)
+        {
+            var baseUri = new Uri(@base);
+
+            var fontFamily = new FontFamily(baseUri, name);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.NotNull(fontFamily.Key);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs b/tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs
new file mode 100644
index 0000000000..11ecac0039
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs
@@ -0,0 +1,74 @@
+using System;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class FontManagerTests
+    {
+        [Fact]
+        public void Should_Create_Single_Instance_Typeface()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontFamily = new FontFamily("MyFont");
+
+                var typeface = new Typeface(fontFamily);
+
+                var glyphTypeface = FontManager.Current.GetOrAddGlyphTypeface(typeface);
+
+                Assert.Same(glyphTypeface, FontManager.Current.GetOrAddGlyphTypeface(typeface));
+            }
+        }
+
+        [Fact]
+        public void Should_Throw_When_Default_FamilyName_Is_Null()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface.With(fontManagerImpl: new MockFontManagerImpl(null))))
+            {
+                Assert.Throws<InvalidOperationException>(() => FontManager.Current);
+            }
+        }
+
+        [Fact]
+        public void Should_Use_FontManagerOptions_DefaultFamilyName()
+        {
+            var options = new FontManagerOptions { DefaultFamilyName = "MyFont" };
+
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(fontManagerImpl: new MockFontManagerImpl())))
+            {
+                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
+
+                Assert.Equal("MyFont", FontManager.Current.DefaultFontFamilyName);
+            }
+        }
+
+        [Fact]
+        public void Should_Use_FontManagerOptions_FontFallback()
+        {
+            var options = new FontManagerOptions
+            {
+                FontFallbacks = new[]
+                {
+                    new FontFallback
+                    {
+                        FontFamily = new FontFamily("MyFont"), UnicodeRange = UnicodeRange.Default
+                    }
+                }
+            };
+
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(fontManagerImpl: new MockFontManagerImpl())))
+            {
+                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
+
+                FontManager.Current.TryMatchCharacter(1, FontStyle.Normal, FontWeight.Normal, FontStretch.Normal,
+                    FontFamily.Default, null, out var typeface);
+
+                Assert.Equal("MyFont", typeface.FontFamily.Name);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs b/tests/Avalonia.Base.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
new file mode 100644
index 0000000000..07415ac2d6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
@@ -0,0 +1,23 @@
+using System;
+using Avalonia.Media.Fonts;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.Fonts
+{
+    public class FamilyNameCollectionTests
+    {
+        [Fact]
+        public void Exception_Should_Be_Thrown_If_Names_Is_Null()
+        {
+            Assert.Throws<ArgumentNullException>(() => new FamilyNameCollection(null));
+        }
+
+        [Fact]
+        public void Should_Be_Equal()
+        {
+            var familyNames = new FamilyNameCollection("Arial, Times New Roman");
+
+            Assert.Equal(new FamilyNameCollection("Arial, Times New Roman"), familyNames);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyKeyTests.cs b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
new file mode 100644
index 0000000000..0cb70ea016
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Media.Fonts;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.Fonts
+{
+    public class FontFamilyKeyTests
+    {
+        [Fact]
+        public void Exception_Should_Be_Thrown_If_Source_Is_Null()
+        {
+            Assert.Throws<ArgumentNullException>(() => new FontFamilyKey(null));
+        }
+
+        [Fact]
+        public void Should_Initialize_With_Location()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
+
+            var fontFamilyKey = new FontFamilyKey(source);
+
+            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests"), fontFamilyKey.Source);
+        }
+
+        [Fact]
+        public void Should_Initialize_With_Location_And_Filename()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
+
+            var fontFamilyKey = new FontFamilyKey(source);
+
+            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf"), fontFamilyKey.Source);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
new file mode 100644
index 0000000000..1bb2300724
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.Fonts;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.Fonts
+{
+    public class FontFamilyLoaderTests : IDisposable
+    {
+        private const string AssetMyFontRegular = AssetLocation + ".MyFont Regular.ttf" + Assembly + FontName;
+        private const string FontName = "#MyFont";
+        private const string Assembly = "?assembly=Avalonia.Visuals.UnitTests";
+        private const string AssetLocation = "resm:Avalonia.Visuals.UnitTests.Assets";
+        private const string AssetLocationAvares = "avares://Avalonia.Visuals.UnitTests";
+        private const string AssetYourFileName = "/Assets/YourFont.ttf";
+        private const string AssetYourFontAvares = AssetLocationAvares + AssetYourFileName;
+
+        private readonly IDisposable _testApplication;
+
+        public FontFamilyLoaderTests()
+        {
+            const string AssetMyFontBold = AssetLocation + ".MyFont Bold.ttf" + Assembly + FontName;
+            const string AssetYourFont = AssetLocation + ".YourFont.ttf" + Assembly + FontName;
+
+            var fontAssets = new[]
+            {
+                (AssetMyFontRegular, "AssetData"),
+                (AssetMyFontBold, "AssetData"),
+                (AssetYourFont, "AssetData"),
+                (AssetYourFontAvares, "AssetData")
+            };
+
+            _testApplication = StartWithResources(fontAssets);
+        }
+
+        public void Dispose()
+        {
+            _testApplication.Dispose();
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset()
+        {
+            var source = new Uri(AssetMyFontRegular, UriKind.RelativeOrAbsolute);
+            var key = new FontFamilyKey(source);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset_Avares_Without_BaseUri()
+        {
+            var source = new Uri(AssetYourFontAvares);
+            var key = new FontFamilyKey(source);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset_Avares_With_BaseUri()
+        {
+            var source = new Uri(AssetYourFileName, UriKind.RelativeOrAbsolute);
+            var baseUri = new Uri(AssetLocationAvares);
+            var key = new FontFamilyKey(source, baseUri);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Matching_Assets()
+        {
+            var source = new Uri(AssetLocation + ".MyFont*.ttf" + Assembly + FontName, UriKind.RelativeOrAbsolute);
+            var key = new FontFamilyKey(source);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key).ToArray();
+
+            foreach (var fontAsset in fontAssets)
+            {
+                Debug.WriteLine(fontAsset);
+            }
+
+            Assert.Equal(2, fontAssets.Length);
+        }
+
+        [Fact]
+        public void Should_Load_Embedded_Font()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+
+                var fontFamily = new FontFamily("resm:Avalonia.Base.UnitTests.Assets?assembly=Avalonia.Base.UnitTests#Noto Mono");
+
+                var fontAssets = FontFamilyLoader.LoadFontAssets(fontFamily.Key).ToArray();
+
+                Assert.NotEmpty(fontAssets);
+
+                foreach (var fontAsset in fontAssets)
+                {
+                    var stream = assetLoader.Open(fontAsset);
+
+                    Assert.NotNull(stream);
+                }
+            }
+        }
+
+        private static IDisposable StartWithResources(params (string, string)[] assets)
+        {
+            var assetLoader = new MockAssetLoader(assets);
+            var services = new TestServices(assetLoader: assetLoader, platform: new AppBuilder().RuntimePlatform);
+            return UnitTestApplication.Start(services);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/GeometryGroupTests.cs b/tests/Avalonia.Base.UnitTests/Media/GeometryGroupTests.cs
new file mode 100644
index 0000000000..fb4c35a1a8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/GeometryGroupTests.cs
@@ -0,0 +1,34 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class GeometryGroupTests
+    {
+        [Fact]
+        public void Children_Should_Have_Initial_Collection()
+        {
+            var target = new GeometryGroup();
+
+            Assert.NotNull(target.Children);
+        }
+
+        [Fact]
+        public void Children_Change_Should_Raise_Changed()
+        {
+            var target = new GeometryGroup();
+
+            var children = new GeometryCollection();
+
+            target.Children = children;
+
+            var isCalled = false;
+
+            target.Changed += (s, e) => isCalled = true;
+
+            children.Add(new StreamGeometry());
+
+            Assert.True(isCalled);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Base.UnitTests/Media/GeometryTests.cs
new file mode 100644
index 0000000000..ae8dc9dad2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/GeometryTests.cs
@@ -0,0 +1,115 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class GeometryTests
+    {
+        [Fact]
+        public void Changing_AffectsGeometry_Property_Causes_PlatformImpl_To_Be_Updated()
+        {
+            var target = new TestGeometry();
+            var platformImpl = target.PlatformImpl;
+
+            target.Foo = true;
+
+            Assert.NotSame(platformImpl, target.PlatformImpl);
+        }
+
+        [Fact]
+        public void Changing_AffectsGeometry_Property_Causes_Changed_To_Be_Raised()
+        {
+            var target = new TestGeometry();
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Foo = true;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Setting_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var target = new TestGeometry();
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Transform = new RotateTransform(45);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var transform = new RotateTransform(45);
+            var target = new TestGeometry { Transform = transform };
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            transform.Angle = 90;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Removing_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var transform = new RotateTransform(45);
+            var target = new TestGeometry { Transform = transform };
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Transform = null;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Transform_Produces_Transformed_PlatformImpl()
+        {
+            var target = new TestGeometry();
+            var rotate = new RotateTransform(45);
+
+            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
+            target.Transform = rotate;
+            Assert.True(target.PlatformImpl is ITransformedGeometryImpl);
+            rotate.Angle = 0;
+            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
+        }
+
+        private class TestGeometry : Geometry
+        {
+            public static readonly StyledProperty<bool> FooProperty =
+                AvaloniaProperty.Register<TestGeometry, bool>(nameof(Foo));
+
+            static TestGeometry()
+            {
+                AffectsGeometry(FooProperty);
+            }
+
+            public bool Foo
+            {
+                get => GetValue(FooProperty);
+                set => SetValue(FooProperty, value);
+            }
+
+            public override Geometry Clone()
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IGeometryImpl CreateDefiningGeometry()
+            {
+                return Mock.Of<IGeometryImpl>(
+                    x => x.WithTransform(It.IsAny<Matrix>()) == 
+                        Mock.Of<ITransformedGeometryImpl>(y =>
+                            y.SourceGeometry == x));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
new file mode 100644
index 0000000000..df16c1b34f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
@@ -0,0 +1,192 @@
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class GlyphRunTests : TestWithServicesBase
+    {
+        public GlyphRunTests()
+        {
+            AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0)]
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 3, 30)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 1, 0, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 0, 20)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 1, 30)]
+        [Theory]
+        public void Should_Get_Distance_From_CharacterHit(double[] advances, int[] clusters, int start, int trailingLength, double expectedDistance)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters))
+            {
+                var characterHit = new CharacterHit(start, trailingLength);
+
+                var distance = glyphRun.GetDistanceFromCharacterHit(characterHit);
+
+                Assert.Equal(expectedDistance, distance);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 26.0, 0, 3, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 20.0, 1, 1, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 26.0, 2, 1, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 35.0, 2, 1, false)]
+        [Theory]
+        public void Should_Get_CharacterHit_FromDistance(double[] advances, int[] clusters, double distance, int start,
+            int trailingLengthExpected, bool isInsideExpected)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters))
+            {
+                var textBounds = glyphRun.GetCharacterHitFromDistance(distance, out var isInside);
+
+                Assert.Equal(start, textBounds.FirstCharacterIndex);
+
+                Assert.Equal(trailingLengthExpected, textBounds.TrailingLength);
+
+                Assert.Equal(isInsideExpected, isInside);
+            }
+        }
+
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, -1, 10, 1, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, 15, 12, 1, 10)]
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 30.0)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 0, 1, 1, 1, 10.0)]
+        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 2, 1, 2, 20.0)]
+        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 1, 1, 2, 20.0)]
+        [InlineData(new double[] { 10, 0, 20, 10 }, new int[] { 3, 1, 1, 0 }, 1, 1, 1, 2, 20.0)]
+        [Theory]
+        public void Should_Find_Nearest_CharacterHit(double[] advances, int[] clusters, int bidiLevel,
+            int index, int expectedIndex, int expectedLength, double expectedWidth)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var textBounds = glyphRun.FindNearestCharacterHit(index, out var width);
+
+                Assert.Equal(expectedIndex, textBounds.FirstCharacterIndex);
+
+                Assert.Equal(expectedLength, textBounds.TrailingLength);
+
+                Assert.Equal(expectedWidth, width, 2);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 0)]
+        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 1)]
+        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 0, 3, 1, 0)]
+        [InlineData(new double[] { 10, 0, 0, 30 }, new int[] { 3, 0, 0, 0 }, 3, 0, 3, 1, 1)]
+        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 1, 0, 4, 0, 0)]
+        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1, 0, 4, 0, 1)]
+        [Theory]
+        public void Should_Get_Next_CharacterHit(double[] advances,int[] clusters,
+            int firstCharacterIndex, int trailingLength,
+            int nextIndex, int nextLength,
+            int bidiLevel)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var characterHit = glyphRun.GetNextCaretCharacterHit(new CharacterHit(firstCharacterIndex, trailingLength));
+
+                Assert.Equal(nextIndex, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(nextLength, characterHit.TrailingLength);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 0)]
+        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 1)]
+        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 1, 3, 0, 0)]
+        [InlineData(new double[] { 0, 0, 30, 10 }, new int[] { 3, 0, 0, 0 }, 3, 1, 3, 0, 1)]
+        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 4, 1, 4, 0, 0)]
+        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 4, 1, 4, 0, 1)]
+        [Theory]
+        public void Should_Get_Previous_CharacterHit(double[] advances, int[] clusters,
+            int currentIndex, int currentLength,
+            int previousIndex, int previousLength,
+            int bidiLevel)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var characterHit = glyphRun.GetPreviousCaretCharacterHit(new CharacterHit(currentIndex, currentLength));
+
+                Assert.Equal(previousIndex, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(previousLength, characterHit.TrailingLength);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0)]
+        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 0, 0, 0, 3 }, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 3, 0, 0, 0 }, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 0, 1, 1, 1, 4 }, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1)]
+        [Theory]
+        public void Should_Find_Glyph_Index(double[] advances, int[] clusters, int bidiLevel)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                if (glyphRun.IsLeftToRight)
+                {
+                    for (var i = 0; i < clusters.Length; i++)
+                    {
+                        var cluster = clusters[i];
+
+                        var found = glyphRun.FindGlyphIndex(cluster);
+
+                        var expected = i;
+
+                        while (expected - 1 >= 0 && clusters[expected - 1] == cluster)
+                        {
+                            expected--;
+                        }
+
+                        Assert.Equal(expected, found);
+                    }
+                }
+                else
+                {
+                    for (var i = clusters.Length - 1; i > 0; i--)
+                    {
+                        var cluster = clusters[i];
+
+                        var found = glyphRun.FindGlyphIndex(cluster);
+
+                        var expected = i;
+
+                        while (expected + 1 < clusters.Length && clusters[expected + 1] == cluster)
+                        {
+                            expected++;
+                        }
+
+                        Assert.Equal(expected, found);
+                    }
+                }
+            }
+        }
+
+        private static GlyphRun CreateGlyphRun(double[] glyphAdvances, int[] glyphClusters, int bidiLevel = 0)
+        {
+            var count = glyphAdvances.Length;
+            var glyphIndices = new ushort[count];
+
+            var start = bidiLevel == 0 ? glyphClusters[0] : glyphClusters[^1];
+
+            var characters = new ReadOnlySlice<char>(Enumerable.Repeat('a', count).ToArray(), start, count);
+
+            return new GlyphRun(new MockGlyphTypeface(), 10, characters, glyphIndices, glyphAdvances,
+                glyphClusters: glyphClusters, biDiLevel: bidiLevel);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/ImageBrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/ImageBrushTests.cs
new file mode 100644
index 0000000000..2e872e7f7f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/ImageBrushTests.cs
@@ -0,0 +1,24 @@
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class ImageBrushTests
+    {
+        [Fact]
+        public void Changing_Source_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new ImageBrush(bitmap1);
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Source = bitmap2;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/LinearGradientBrushTests.cs
new file mode 100644
index 0000000000..736bafba66
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/LinearGradientBrushTests.cs
@@ -0,0 +1,85 @@
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class LinearGradientBrushTests
+    {
+        [Fact]
+        public void Changing_StartPoint_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.StartPoint = new RelativePoint();
+            target.Invalidated += (s, e) => raised = true;
+            target.StartPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_EndPoint_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.EndPoint = new RelativePoint();
+            target.Invalidated += (s, e) => raised = true;
+            target.EndPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_GradientStops_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Green, 0) };
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_GradientStop_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops.Add(new GradientStop(Colors.Green, 1));
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_GradientStop_Offset_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops[0].Offset = 0.5;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/MatrixTests.cs b/tests/Avalonia.Base.UnitTests/Media/MatrixTests.cs
new file mode 100644
index 0000000000..4aa13fab3a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/MatrixTests.cs
@@ -0,0 +1,109 @@
+using System;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class MatrixTests
+    {
+        [Fact]
+        public void Can_Parse()
+        {
+            var matrix = Matrix.Parse("1,2,3,-4,5 6");
+            var expected = new Matrix(1, 2, 3, -4, 5, 6);
+            Assert.Equal(expected, matrix);
+        }
+
+        [Fact]
+        public void Singular_Has_No_Inverse()
+        {
+            var matrix = new Matrix(0, 0, 0, 0, 0, 0);
+
+            Assert.False(matrix.HasInverse);
+        }
+
+        [Fact]
+        public void Identity_Has_Inverse()
+        {
+            var matrix = Matrix.Identity;
+
+            Assert.True(matrix.HasInverse);
+        }
+
+        [Fact]
+        public void Invert_Should_Work()
+        {
+            var matrix = new Matrix(1, 2, 3, 0, 1, 4, 5, 6, 0);
+            var inverted = matrix.Invert();
+
+            Assert.Equal(matrix * inverted, Matrix.Identity);
+            Assert.Equal(inverted * matrix, Matrix.Identity);
+        }
+
+        [Fact]
+        public void Can_Decompose_Translation()
+        {
+            var matrix = Matrix.CreateTranslation(5, 10);
+
+            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
+
+            Assert.Equal(true, result);
+            Assert.Equal(5, decomposed.Translate.X);
+            Assert.Equal(10, decomposed.Translate.Y);
+        }
+
+        [Theory]
+        [InlineData(30d)]
+        [InlineData(0d)]
+        [InlineData(90d)]
+        [InlineData(270d)]
+        public void Can_Decompose_Angle(double angleDeg)
+        {
+            var angleRad = MathUtilities.Deg2Rad(angleDeg);
+
+            var matrix = Matrix.CreateRotation(angleRad);
+
+            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
+
+            Assert.Equal(true, result);
+
+            var expected = NormalizeAngle(angleRad);
+            var actual = NormalizeAngle(decomposed.Angle);
+
+            Assert.Equal(expected, actual, 4);
+        }
+
+        [Theory]
+        [InlineData(1d, 1d)]
+        [InlineData(-1d, 1d)]
+        [InlineData(1d, -1d)]
+        [InlineData(5d, 10d)]
+        public void Can_Decompose_Scale(double x, double y)
+        {
+            var matrix = Matrix.CreateScale(x, y);
+
+            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
+
+            Assert.Equal(true, result);
+            Assert.Equal(x, decomposed.Scale.X);
+            Assert.Equal(y, decomposed.Scale.Y);
+        }
+
+        private static double NormalizeAngle(double rad)
+        {
+            double twoPi = 2 * Math.PI;
+
+            while (rad < 0)
+            {
+                rad += twoPi;
+            }
+
+            while (rad > twoPi)
+            {
+                rad -= twoPi;
+            }
+
+            return rad;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs
new file mode 100644
index 0000000000..c829690eb4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs
@@ -0,0 +1,323 @@
+using System.Globalization;
+using System.IO;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Visuals.Platform;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PathMarkupParserTests
+    {
+        [Fact]
+        public void Parses_Move()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M10 10");
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.Equal(new Point(10, 10), figure.StartPoint);
+            }
+        }
+
+        [Fact]
+        public void Parses_Line()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M0 0L10 10");
+
+                var figure = pathGeometry.Figures[0];
+
+                var segment = figure.Segments[0];
+
+                Assert.IsType<LineSegment>(segment);
+
+                var lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(10, 10), lineSegment.Point);
+            }
+        }
+
+        [Fact]
+        public void Parses_Close()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M0 0L10 10z");
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.True(figure.IsClosed);
+            }
+        }
+
+        [Fact]
+        public void Parses_FillMode_Before_Move()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("F 1M0,0");
+
+                Assert.Equal(FillRule.NonZero, pathGeometry.FillRule);
+            }
+        }
+
+        [Theory]
+        [InlineData("M0 0 10 10 20 20")]
+        [InlineData("M0,0 10,10 20,20")]
+        [InlineData("M0,0,10,10,20,20")]
+        public void Parses_Implicit_Line_Command_After_Move(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse(pathData);
+
+                var figure = pathGeometry.Figures[0];
+
+                var segment = figure.Segments[0];
+
+                Assert.IsType<LineSegment>(segment);
+
+                var lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(10, 10), lineSegment.Point);
+
+                segment = figure.Segments[1];
+
+                Assert.IsType<LineSegment>(segment);
+
+                lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(20, 20), lineSegment.Point);
+            }
+        }
+
+        [Theory]
+        [InlineData("m0 0 10 10 20 20")]
+        [InlineData("m0,0 10,10 20,20")]
+        [InlineData("m0,0,10,10,20,20")]
+        public void Parses_Implicit_Line_Command_After_Relative_Move(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse(pathData);
+
+                var figure = pathGeometry.Figures[0];
+
+                var segment = figure.Segments[0];
+
+                Assert.IsType<LineSegment>(segment);
+
+                var lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(10, 10), lineSegment.Point);
+
+                segment = figure.Segments[1];
+
+                Assert.IsType<LineSegment>(segment);
+
+                lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(30, 30), lineSegment.Point);
+            }
+        }
+
+        [Fact]
+        public void Parses_Scientific_Notation_Double()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M -1.01725E-005 -1.01725e-005");
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.Equal(
+                    new Point(
+                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture),
+                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture)),
+                    figure.StartPoint);
+            }
+        }
+
+        [Theory]
+        [InlineData("M5.5.5 5.5.5 5.5.5")]
+        [InlineData("F1M9.0771,11C9.1161,10.701,9.1801,10.352,9.3031,10L9.0001,10 9.0001,6.166 3.0001,9.767 3.0001,10 "
+                    + "9.99999999997669E-05,10 9.99999999997669E-05,0 3.0001,0 3.0001,0.234 9.0001,3.834 9.0001,0 "
+                    + "12.0001,0 12.0001,8.062C12.1861,8.043 12.3821,8.031 12.5941,8.031 15.3481,8.031 15.7961,9.826 "
+                    + "15.9201,11L16.0001,16 9.0001,16 9.0001,12.562 9.0001,11z")] // issue #1708
+        [InlineData("         M0 0")]
+        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z")] // issue #1107
+        [InlineData("M0 0L10 10z")]
+        [InlineData("M50 50 L100 100 L150 50")]
+        [InlineData("M50 50L100 100L150 50")]
+        [InlineData("M50,50 L100,100 L150,50")]
+        [InlineData("M50 50 L-10 -10 L10 50")]
+        [InlineData("M50 50L-10-10L10 50")]
+        [InlineData("M50 50 L100 100 L150 50zM50 50 L70 70 L120 50z")]
+        [InlineData("M 50 50 L 100 100 L 150 50")]
+        [InlineData("M50 50 L100 100 L150 50 H200 V100Z")]
+        [InlineData("M 80 200 A 100 50 45 1 0 100 50")]
+        [InlineData(
+            "F1 M 16.6309 18.6563C 17.1309 8.15625 29.8809 14.1563 29.8809 14.1563C 30.8809 11.1563 34.1308 11.4063" +
+            " 34.1308 11.4063C 33.5 12 34.6309 13.1563 34.6309 13.1563C 32.1309 13.1562 31.1309 14.9062 31.1309 14.9" +
+            "062C 41.1309 23.9062 32.6309 27.9063 32.6309 27.9062C 24.6309 24.9063 21.1309 22.1562 16.6309 18.6563 Z" +
+            " M 16.6309 19.9063C 21.6309 24.1563 25.1309 26.1562 31.6309 28.6562C 31.6309 28.6562 26.3809 39.1562 18" +
+            ".3809 36.1563C 18.3809 36.1563 18 38 16.3809 36.9063C 15 36 16.3809 34.9063 16.3809 34.9063C 16.3809 34" +
+            ".9063 10.1309 30.9062 16.6309 19.9063 Z ")]
+        [InlineData(
+            "F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 " +
+            "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 " +
+            "12.461,8.046C14.45,8.278,16,9.949,16,12")]
+        public void Should_Parse(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse(pathData);
+
+                Assert.True(true);
+            }
+        }
+
+        [Theory]
+        [InlineData("M0 0L10 10")]
+        [InlineData("M0 0L10 10z")]
+        [InlineData("M0 0L10 10 \n ")]
+        [InlineData("M0 0L10 10z \n ")]
+        [InlineData("M0 0L10 10 ")]
+        [InlineData("M0 0L10 10z ")]
+        public void Should_AlwaysEndFigure(string pathData)
+        {
+            var context = new Mock<IGeometryContext>();
+
+            using (var parser = new PathMarkupParser(context.Object))
+            {
+                parser.Parse(pathData);
+            }
+
+            context.Verify(v => v.EndFigure(It.IsAny<bool>()), Times.AtLeastOnce());
+        }
+
+        [Theory]
+        [InlineData("M 5.5, 5 L 5.5, 5 L 5.5, 5")]
+        [InlineData("F1 M 9.0771, 11 C 9.1161, 10.701 9.1801, 10.352 9.3031, 10 L 9.0001, 10 L 9.0001, 6.166 L 3.0001, 9.767 L 3.0001, 10 "
+            + "L 9.99999999997669E-05, 10 L 9.99999999997669E-05, 0 L 3.0001, 0 L 3.0001, 0.234 L 9.0001, 3.834 L 9.0001, 0 "
+            + "L 12.0001, 0 L 12.0001, 8.062 C 12.1861, 8.043 12.3821, 8.031 12.5941, 8.031 C 15.3481, 8.031 15.7961, 9.826 "
+            + "15.9201, 11 L 16.0001, 16 L 9.0001, 16 L 9.0001, 12.562 L 9.0001, 11Z")]
+        [InlineData("F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
+        [InlineData("M 0, 0 L 10, 10Z")]
+        [InlineData("M 50, 50 L 100, 100 L 150, 50")]
+        [InlineData("M 50, 50 L -10, -10 L 10, 50")]
+        [InlineData("M 50, 50 L 100, 100 L 150, 50Z M 50, 50 L 70, 70 L 120, 50Z")]
+        [InlineData("M 80, 200 A 100, 50 45 1 0 100, 50")]
+        [InlineData("F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
+            + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
+            + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
+        public void Parsed_Geometry_ToString_Should_Produce_Valid_Value(string pathData)
+        {
+            var target = PathGeometry.Parse(pathData);
+
+            string output = target.ToString();
+
+            Assert.Equal(pathData, output);
+        }
+
+        [Theory]
+        [InlineData("M5.5.5 5.5.5 5.5.5", "M 5.5, 0.5 L 5.5, 0.5 L 5.5, 0.5")]
+        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z", "F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
+        [InlineData("F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 "
+                    + "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 "
+                    + "12.461,8.046C14.45,8.278,16,9.949,16,12",
+                    "F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
+                    + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
+                    + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
+        public void Parsed_Geometry_ToString_Should_Format_Value(string pathData, string formattedPathData)
+        {
+            var target = PathGeometry.Parse(pathData);
+
+            string output = target.ToString();
+
+            Assert.Equal(formattedPathData, output);
+        }
+
+        [Theory]
+        [InlineData("0 0")]
+        [InlineData("j")]
+        public void Throws_InvalidDataException_On_None_Defined_Command(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                Assert.Throws<InvalidDataException>(() => parser.Parse(pathData));
+            }
+        }
+
+        [Fact]
+        public void CloseFigure_Should_Move_CurrentPoint_To_CreateFigurePoint()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M10,10L100,100Z m10,10");
+
+                Assert.Equal(2, pathGeometry.Figures.Count);
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.Equal(new Point(10, 10), figure.StartPoint);
+
+                Assert.Equal(true, figure.IsClosed);
+
+                Assert.Equal(new Point(100, 100), ((LineSegment)figure.Segments[0]).Point);
+
+                figure = pathGeometry.Figures[1];
+
+                Assert.Equal(new Point(20, 20), figure.StartPoint);
+            }
+        }
+
+        [Fact]
+        public void Should_Parse_Flags_Without_Separator()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("a.898.898 0 01.27.188");
+
+                var figure = pathGeometry.Figures[0];
+
+                var segments = figure.Segments;
+                
+                Assert.NotNull(segments);
+                
+                Assert.Equal(1, segments.Count);
+
+                var arcSegment = segments[0];
+
+                Assert.IsType<ArcSegment>(arcSegment);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PathSegmentTests.cs b/tests/Avalonia.Base.UnitTests/Media/PathSegmentTests.cs
new file mode 100644
index 0000000000..41d2fdb349
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PathSegmentTests.cs
@@ -0,0 +1,34 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PathSegmentTests
+    {
+        [Fact]
+        public void PathSegment_Triggers_Invalidation_On_Property_Change()
+        {
+            var targetSegment = new ArcSegment()
+            {
+                Size = new Size(10, 10),
+                Point = new Point(5, 5)
+            };
+
+            var target = new PathGeometry
+            {
+                Figures = new PathFigures
+                {
+                    new PathFigure { IsClosed = false, Segments = new PathSegments { targetSegment } }
+                }
+            };
+            
+            var changed = false;
+
+            target.Changed += (s, e) => changed = true;
+
+            targetSegment.Size = new Size(20, 20);
+
+            Assert.True(changed);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PenTests.cs b/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
new file mode 100644
index 0000000000..6016978fde
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
@@ -0,0 +1,108 @@
+using Avalonia.Collections;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PenTests
+    {
+        [Fact]
+        public void Changing_Thickness_Raises_Invalidated()
+        {
+            var target = new Pen();
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Thickness = 18;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_Brush_Color_Raises_Invalidated()
+        {
+            var brush = new SolidColorBrush(Colors.Red);
+            var target = new Pen { Brush = brush };
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            brush.Color = Colors.Green;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_DashStyle_Dashes_Raises_Invalidated()
+        {
+            var dashes = new DashStyle();
+            var target = new Pen { DashStyle = dashes };
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            dashes.Dashes = new AvaloniaList<double> { 0.1, 0.2 };
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_DashStyle_Dashes_Raises_Invalidated()
+        {
+            var dashes = new DashStyle();
+            var target = new Pen { DashStyle = dashes };
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            dashes.Dashes = new AvaloniaList<double>
+            {
+                0.3
+            };
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Equality_Is_Implemented_Between_Immutable_And_Mutable_Pens()
+        {
+            var brush = new ImmutableSolidColorBrush(Colors.Red);
+            var target1 = new ImmutablePen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: (ImmutableDashStyle)DashStyle.Dash,
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+            var target2 = new Pen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: DashStyle.Dash,
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            Assert.True(Equals(target1, target2));
+        }
+
+        [Fact]
+        public void Equality_Is_Implemented_Between_Mutable_And_Immutable_DashStyles()
+        {
+            var brush = new ImmutableSolidColorBrush(Colors.Red);
+            var target1 = new ImmutablePen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+            var target2 = new Pen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: new DashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            Assert.True(Equals(target1, target2));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PixelRectTests.cs b/tests/Avalonia.Base.UnitTests/Media/PixelRectTests.cs
new file mode 100644
index 0000000000..61c410ca8e
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PixelRectTests.cs
@@ -0,0 +1,43 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PixelRectTests
+    {
+        [Fact]
+        public void FromRect_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRect(rect, 1.5);
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+
+        [Fact]
+        public void FromRect_Vector_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRect(rect, new Vector(1.5, 1.5));
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+
+        [Fact]
+        public void FromRectWithDpi_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRectWithDpi(rect, 144);
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+
+        [Fact]
+        public void FromRectWithDpi_Vector_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRectWithDpi(rect, new Vector(144, 144));
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/RectTests.cs b/tests/Avalonia.Base.UnitTests/Media/RectTests.cs
new file mode 100644
index 0000000000..96473348cd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/RectTests.cs
@@ -0,0 +1,15 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class RectTests
+    {
+        [Fact]
+        public void Parse_Parses()
+        {
+            var rect = Rect.Parse("1,2 3,-4");
+            var expected = new Rect(1, 2, 3, -4);
+            Assert.Equal(expected, rect);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
new file mode 100644
index 0000000000..387b2f4a19
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
@@ -0,0 +1,38 @@
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class RectangleGeometryTests
+    {
+        [Fact]
+        public void Rectangle_With_Transform_Can_Be_Changed()
+        {
+            using (UnitTestApplication.Start(GetServices()))
+            {
+                var target = new RectangleGeometry
+                {
+                    Rect = new Rect(0, 0, 100, 100),
+                    Transform = new RotateTransform(45),
+                };
+
+                target.Rect = new Rect(50, 50, 150, 150);
+            }
+        }
+
+        private TestServices GetServices()
+        {
+            var context = Mock.Of<IStreamGeometryContextImpl>();
+            var transformedGeometry = new Mock<ITransformedGeometryImpl>();
+            var streamGeometry = Mock.Of<IStreamGeometryImpl>(x => 
+                x.Open() == context &&
+                x.WithTransform(It.IsAny<Matrix>()) == transformedGeometry.Object);
+            var renderInterface = Mock.Of<IPlatformRenderInterface>(x =>
+                x.CreateStreamGeometry() == streamGeometry);
+            return new TestServices(renderInterface: renderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/SolidColorBrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/SolidColorBrushTests.cs
new file mode 100644
index 0000000000..c982d8c1c8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/SolidColorBrushTests.cs
@@ -0,0 +1,20 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class SolidColorBrushTests
+    {
+        [Fact]
+        public void Changing_Color_Raises_Invalidated()
+        {
+            var target = new SolidColorBrush(Colors.Red);
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Color = Colors.Green;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextDecorationTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextDecorationTests.cs
new file mode 100644
index 0000000000..c4537ea2f8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextDecorationTests.cs
@@ -0,0 +1,28 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class TextDecorationTests
+    {
+        [Fact]
+        public void Should_Parse_TextDecorations()
+        {
+            var baseline = TextDecorationCollection.Parse("baseline");
+
+            Assert.Equal(TextDecorationLocation.Baseline, baseline[0].Location);
+
+            var underline = TextDecorationCollection.Parse("underline");
+
+            Assert.Equal(TextDecorationLocation.Underline, underline[0].Location);
+
+            var overline = TextDecorationCollection.Parse("overline");
+
+            Assert.Equal(TextDecorationLocation.Overline, overline[0].Location);
+
+            var strikethrough = TextDecorationCollection.Parse("strikethrough");
+
+            Assert.Equal(TextDecorationLocation.Strikethrough, strikethrough[0].Location);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
new file mode 100644
index 0000000000..5ff2c0e07b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
@@ -0,0 +1,85 @@
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    public class BiDiAlgorithmTests
+    {
+        private readonly ITestOutputHelper _outputHelper;
+
+        public BiDiAlgorithmTests(ITestOutputHelper outputHelper)
+        {
+            _outputHelper = outputHelper;
+        }
+        
+        [Fact(Skip = "Only run when the Unicode spec changes.")]
+        public void Should_Process()
+        {
+            var generator = new BiDiTestDataGenerator();
+            
+            foreach(var testData in generator)
+            {
+                Assert.True(Run(testData));
+            }
+        }
+        
+        private bool Run(BiDiTestData testData)
+        {
+            var bidi = new BidiAlgorithm();
+            
+            // Run the algorithm...
+            ArraySlice<sbyte> resultLevels;
+
+            bidi.Process(
+                testData.Classes,
+                ArraySlice<BidiPairedBracketType>.Empty,
+                ArraySlice<int>.Empty,
+                testData.ParagraphEmbeddingLevel,
+                false,
+                null,
+                null,
+                null);
+
+            resultLevels = bidi.ResolvedLevels;
+
+            // Check the results match
+            var pass = true;
+            
+            if (resultLevels.Length == testData.Levels.Length)
+            {
+                for (var i = 0; i < testData.Levels.Length; i++)
+                {
+                    if (testData.Levels[i] == -1)
+                    {
+                        continue;
+                    }
+
+                    if (resultLevels[i] != testData.Levels[i])
+                    {
+                        pass = false;
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                pass = false;
+            }
+
+            if (!pass)
+            {
+                _outputHelper.WriteLine($"Failed line {testData.LineNumber}");
+                _outputHelper.WriteLine($"        Data: {string.Join(" ", testData.Classes)}");
+                _outputHelper.WriteLine($" Embed Level: {testData.ParagraphEmbeddingLevel}");
+                _outputHelper.WriteLine($"    Expected: {string.Join(" ", testData.Levels)}");
+                _outputHelper.WriteLine($"      Actual: {string.Join(" ", resultLevels)}");
+
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
new file mode 100644
index 0000000000..f6b01d737c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Base.UnitTests.Media.TextFormatting;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    internal class BiDiClassTestDataGenerator : IEnumerable<BiDiClassData>
+    {
+        private readonly List<BiDiClassData> _testData;
+
+        public BiDiClassTestDataGenerator()
+        {
+            _testData = ReadData();
+        }
+        
+        public IEnumerator<BiDiClassData> GetEnumerator()
+        {
+            return _testData.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+        
+        private static List<BiDiClassData> ReadData()
+        {
+            var testData = new List<BiDiClassData>();
+            
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiCharacterTest.txt");
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                        return testData;
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        var lineNumber = 0;
+                        
+                        // Process each line
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            lineNumber++;
+                            
+                            if (line == null)
+                            {
+                                break;
+                            }
+
+                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+                            
+                            // Split into fields
+                            var fields = line.Split(';');
+
+                            // Parse field 0 - code points
+                            var codePoints = fields[0].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x, 16)).ToArray();
+
+                            // Parse field 1 - paragraph level
+                            var paragraphLevel = sbyte.Parse(fields[1]);
+
+                            // Parse field 2 - resolved paragraph level
+                            var resolvedParagraphLevel = sbyte.Parse(fields[2]);
+
+                            // Parse field 3 - resolved levels
+                            var resolvedLevels = fields[3].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => x == "x" ? (sbyte)-1 : Convert.ToSByte(x)).ToArray();
+
+                            // Parse field 4 - resolved levels
+                            var resolvedOrder = fields[4].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x)).ToArray();
+
+                            testData.Add(new BiDiClassData
+                            {
+                                LineNumber = lineNumber,
+                                CodePoints = codePoints,
+                                ParagraphLevel = paragraphLevel,
+                                ResolvedParagraphLevel = resolvedParagraphLevel,
+                                ResolvedLevels = resolvedLevels,
+                                ResolvedOrder = resolvedOrder
+                            });
+                        }
+                    }
+                }
+            }
+
+            return testData;
+        }
+        
+       
+    }
+    
+    internal struct BiDiClassData
+    {
+        public int LineNumber { get; set; }
+        public int[] CodePoints{ get; set; }
+        public sbyte ParagraphLevel{ get; set; }
+        public  sbyte ResolvedParagraphLevel{ get; set; }
+        public sbyte[] ResolvedLevels{ get; set; }
+        public int[] ResolvedOrder{ get; set; }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
new file mode 100644
index 0000000000..d2cea45ce1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    public class BiDiClassTests
+    {
+        private readonly ITestOutputHelper _outputHelper;
+
+        public BiDiClassTests(ITestOutputHelper outputHelper)
+        {
+            _outputHelper = outputHelper;
+        }
+    
+        [Fact(Skip = "Only run when the Unicode spec changes.")]
+        public void Should_Resolve()
+        {
+            var generator = new BiDiClassTestDataGenerator();
+
+            foreach (var testData in generator)
+            {
+                Assert.True(Run(testData));
+            }
+        }
+
+        private bool Run(BiDiClassData t)
+        {
+            var bidi = new BidiAlgorithm();
+            var bidiData = new BidiData(t.ParagraphLevel);
+        
+            var text = Encoding.UTF32.GetString(MemoryMarshal.Cast<int, byte>(t.CodePoints).ToArray());
+
+            // Append
+            bidiData.Append(text.AsMemory());
+
+            // Act
+            for (int i = 0; i < 10; i++)
+            {
+                bidi.Process(bidiData);
+            }
+
+            var resultLevels = bidi.ResolvedLevels;
+            var resultParagraphLevel = bidi.ResolvedParagraphEmbeddingLevel;
+
+            // Assert
+            var passed = true;
+
+            if (t.ResolvedParagraphLevel != resultParagraphLevel)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < t.ResolvedLevels.Length; i++)
+            {
+                if (t.ResolvedLevels[i] == -1)
+                {
+                    continue;
+                }
+
+                if (t.ResolvedLevels[i] != resultLevels[i])
+                {
+                    passed = false;
+                    break;
+                }
+            }
+
+            if (passed)
+            {
+                return true;
+            }
+        
+            _outputHelper.WriteLine($"Failed line {t.LineNumber}");
+
+            _outputHelper.WriteLine(
+                $"             Code Points: {string.Join(" ", t.CodePoints.Select(x => x.ToString("X4")))}");
+
+            _outputHelper.WriteLine(
+                $"      Pair Bracket Types: {string.Join(" ", bidiData.PairedBracketTypes.Select(x => " " + x.ToString()))}");
+
+            _outputHelper.WriteLine(
+                $"     Pair Bracket Values: {string.Join(" ", bidiData.PairedBracketValues.Select(x => x.ToString("X4")))}");
+            _outputHelper.WriteLine($"             Embed Level: {t.ParagraphLevel}");
+            _outputHelper.WriteLine($"    Expected Embed Level: {t.ResolvedParagraphLevel}");
+            _outputHelper.WriteLine($"      Actual Embed Level: {resultParagraphLevel}");
+            _outputHelper.WriteLine($"          Directionality: {string.Join(" ", bidiData.Classes)}");
+            _outputHelper.WriteLine($"         Expected Levels: {string.Join(" ", t.ResolvedLevels)}");
+            _outputHelper.WriteLine($"           Actual Levels: {string.Join(" ", resultLevels)}");
+        
+            return false;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
new file mode 100644
index 0000000000..28d37130ae
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Base.UnitTests.Media.TextFormatting;
+using Avalonia.Media.TextFormatting.Unicode;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    internal class BiDiTestDataGenerator : IEnumerable<BiDiTestData>
+    {
+        private readonly List<BiDiTestData> _testData;
+
+        public BiDiTestDataGenerator()
+        {
+            _testData = ReadTestData();
+        }
+
+        public IEnumerator<BiDiTestData> GetEnumerator()
+        {
+            return _testData.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        private static List<BiDiTestData> ReadTestData()
+        {
+            var testData = new List<BiDiTestData>();
+
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiTest.txt");
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                        return testData;
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        var lineNumber = 0;
+
+                        // Process each line
+                        int[] levels = null;
+
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            lineNumber++;
+
+                            if (line == null)
+                            {
+                                break;
+                            }
+
+                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            // Directive?
+                            if (line.StartsWith("@"))
+                            {
+                                if (line.StartsWith("@Levels:"))
+                                {
+                                    levels = line.Substring(8).Trim().Split(' ').Where(x => x.Length > 0).Select(x =>
+                                    {
+                                        if (x == "x")
+                                        {
+                                            return -1;
+                                        }
+
+                                        return int.Parse(x);
+
+                                    }).ToArray();
+                                }
+
+                                continue;
+                            }
+
+                            // Split data line
+                            var parts = line.Split(';');
+
+                            // Get the directions
+                            var directions = parts[0].Split(' ').Select(PropertyValueAliasHelper.GetBidiClass)
+                                .ToArray();
+
+                            // Get the bit set
+                            var bitset = Convert.ToInt32(parts[1].Trim(), 16);
+
+                            for (var bit = 1; bit < 8; bit <<= 1)
+                            {
+                                if ((bitset & bit) == 0)
+                                {
+                                    continue;
+                                }
+
+                                sbyte paragraphEmbeddingLevel;
+
+                                switch (bit)
+                                {
+                                    case 1:
+                                        paragraphEmbeddingLevel = 2; // Auto
+                                        break;
+
+                                    case 2:
+                                        paragraphEmbeddingLevel = 0; // LTR
+                                        break;
+
+                                    case 4:
+                                        paragraphEmbeddingLevel = 1; // RTL
+                                        break;
+
+                                    default:
+                                        throw new NotSupportedException();
+                                }
+
+                                testData.Add(new BiDiTestData
+                                {
+                                    LineNumber = lineNumber,
+                                    Classes = directions,
+                                    ParagraphEmbeddingLevel = paragraphEmbeddingLevel,
+                                    Levels = levels
+                                });
+
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return testData;
+        }
+    }
+
+    internal class BiDiTestData
+    {
+        public int LineNumber { get; set; }
+        public BidiClass[] Classes { get; set; }
+        public sbyte ParagraphEmbeddingLevel { get; set; }
+        public int[] Levels { get; set; }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BreakPairTable.txt b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BreakPairTable.txt
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BreakPairTable.txt
rename to tests/Avalonia.Base.UnitTests/Media/TextFormatting/BreakPairTable.txt
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
new file mode 100644
index 0000000000..1a8d41caa4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using Avalonia.Media.TextFormatting.Unicode;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    public static class GraphemeBreakClassTrieGenerator
+    {
+        public static void Execute()
+        {
+            if (!Directory.Exists("Generated"))
+            {
+                Directory.CreateDirectory("Generated");
+            }
+
+            var trie = GenerateBreakTypeTrie();
+
+            UnicodeDataGenerator.GenerateTrieClass("GraphemeBreak", trie);
+        }
+
+        private static UnicodeTrie GenerateBreakTypeTrie()
+        {
+            var trieBuilder = new UnicodeTrieBuilder();
+
+            var graphemeBreakData = ReadBreakData(Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/GraphemeBreakProperty.txt"));
+
+            var emojiBreakData = ReadBreakData(Path.Combine(UnicodeDataGenerator.Ucd, "emoji/emoji-data.txt"));
+
+            foreach (var breakData in new [] { graphemeBreakData, emojiBreakData })
+            {
+                foreach (var (start, end, graphemeBreakType) in breakData)
+                {
+                    if (!Enum.TryParse<GraphemeBreakClass>(graphemeBreakType.Replace("_", ""), out var value))
+                    {
+                        continue;                                     
+                    }
+
+                    if (start == end)
+                    {
+                        trieBuilder.Set(start, (uint)value);
+                    }
+                    else
+                    {
+                        trieBuilder.SetRange(start, end, (uint)value);
+                    }
+                }
+            }
+
+            return trieBuilder.Freeze();
+        }
+
+        public static List<(int, int, string)> ReadBreakData(string file)
+        {
+            var data = new List<(int, int, string)>();
+
+            var rx = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s*;\s*(\w+)\s*#.*", RegexOptions.Compiled);
+
+            using (var client = new HttpClient())
+            {
+                using (var result = client.GetAsync(file).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return data;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            var match = rx.Match(line);
+
+                            if (!match.Success)
+                            {
+                                continue;
+                            }
+
+                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
+
+                            var end = start;
+
+                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
+                            {
+                                end = Convert.ToInt32(match.Groups[2].Value, 16);
+                            }
+
+                            var breakType = match.Groups[3].Value;
+
+                            data.Add((start, end, breakType));
+                        }
+                    }
+                }
+            }
+
+            return data;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
new file mode 100644
index 0000000000..c9f869cea9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Visuals.UnitTests.Media.TextFormatting;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    /// <summary>
+    ///     This class is intended for use when the Unicode spec changes. Otherwise the containing tests are redundant.
+    ///     To update the <c>GraphemeBreak.trie</c> run the <see cref="Should_Generate_Trie"/> test.
+    /// </summary>
+    public class GraphemeBreakClassTrieGeneratorTests
+    {
+        private readonly ITestOutputHelper _outputHelper;
+
+        public GraphemeBreakClassTrieGeneratorTests(ITestOutputHelper outputHelper)
+        {
+            _outputHelper = outputHelper;
+        }
+
+        [Fact(/*Skip = "Only run when we update the trie."*/)]
+        public void Should_Enumerate()
+        {
+            var generator = new GraphemeBreakTestDataGenerator();
+
+            foreach (var testData in generator)
+            {
+                Assert.True(Run(testData));
+            }
+        }
+
+        private bool Run(GraphemeBreakData t)
+        {
+            var text = Encoding.UTF32.GetString(MemoryMarshal.Cast<int, byte>(t.Codepoints).ToArray());
+            var grapheme = Encoding.UTF32.GetString(MemoryMarshal.Cast<int, byte>(t.Grapheme).ToArray()).AsSpan();
+
+            var enumerator = new GraphemeEnumerator(text.AsMemory());
+
+            enumerator.MoveNext();
+
+            var actual = enumerator.Current.Text.Span;
+
+            var pass = true;
+
+            if(actual.Length != grapheme.Length)
+            {
+                pass = false;
+            }
+
+            if (pass)
+            {
+                for (int i = 0; i < grapheme.Length; i++)
+                {
+                    var a = grapheme[i];
+                    var b = actual[i];
+                
+                    if (a != b)
+                    {
+                        pass = false;
+
+                        break;
+                    }
+                }
+            }      
+
+            if (!pass)
+            {
+                _outputHelper.WriteLine($"Failed line {t.LineNumber}");
+                _outputHelper.WriteLine($"       Text: {text}");
+                _outputHelper.WriteLine($" Codepoints: {string.Join(" ", t.Codepoints)}");
+                _outputHelper.WriteLine($"   Grapheme: {string.Join(" ", t.Grapheme)}");
+                _outputHelper.WriteLine($"       Line: {t.Line}");
+
+                return false;
+            }
+
+          
+            return true;
+        }
+
+        [Fact(/*Skip = "Only run when we update the trie."*/)]
+        public void Should_Enumerate_Other()
+        {
+            const string text = "ABCDEFGHIJ";
+
+            var textMemory = text.AsMemory();
+
+            var enumerator = new GraphemeEnumerator(textMemory);
+
+            var count = 0;
+
+            while (enumerator.MoveNext())
+            {
+                Assert.Equal(1, enumerator.Current.Text.Length);
+
+                count++;
+            }
+
+            Assert.Equal(10, count);
+        }
+
+        [Fact(/*Skip = "Only run when we update the trie."*/)]
+        public void Should_Generate_Trie()
+        {
+            GraphemeBreakClassTrieGenerator.Execute();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
new file mode 100644
index 0000000000..029f8e236c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Base.UnitTests.Media.TextFormatting;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    internal class GraphemeBreakTestDataGenerator : IEnumerable<GraphemeBreakData>
+    {
+        private readonly List<GraphemeBreakData> _testData;
+
+        public GraphemeBreakTestDataGenerator()
+        {
+            _testData = ReadData();
+        }
+        
+        public IEnumerator<GraphemeBreakData> GetEnumerator()
+        {
+            return _testData.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+        
+        private static List<GraphemeBreakData> ReadData()
+        {
+            var testData = new List<GraphemeBreakData>();
+
+            var url = Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/GraphemeBreakTest.txt");
+
+            using (var client = new HttpClient())
+            using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+            {
+                if (!result.IsSuccessStatusCode)
+                {
+                    return testData;
+                }
+
+                using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                using (var reader = new StreamReader(stream))
+                {
+                    var lineNumber = 0;
+
+                    while (!reader.EndOfStream)
+                    {
+                        var line = reader.ReadLine();
+
+                        lineNumber++;
+
+                        if (line == null)
+                        {
+                            break;
+                        }
+
+                        if (line.StartsWith("#") || string.IsNullOrEmpty(line))
+                        {
+                            continue;
+                        }
+
+                        var elements = line.Split('#');
+
+                        elements = elements[0].Replace("÷\t", "÷").Trim('÷').Split('÷');
+
+                        var graphemeChars = elements[0].Replace(" × ", " ").Split(' ');
+
+                        var codepoints = graphemeChars.Where(x => x != "" && x != "×")
+                            .Select(x => Convert.ToInt32(x, 16)).ToList();
+
+                        var grapheme = codepoints.ToArray();
+
+                        if(elements.Length > 1)
+                        {
+                            var remainingChars = elements[1].Replace(" × ", " ").Split(' ');
+
+                            var remaining = remainingChars.Where(x => x != "" && x != "×").Select(x => Convert.ToInt32(x, 16)).ToArray();
+
+                            codepoints.AddRange(remaining);
+                        }
+
+                        var data = new GraphemeBreakData
+                        {
+                            Line = line,
+                            LineNumber = lineNumber,
+                            Grapheme = grapheme,
+                            Codepoints = codepoints.ToArray()
+                        };
+
+                        testData.Add(data);
+                    }
+                }
+            }
+            return testData;
+        }       
+    }
+    
+    internal struct GraphemeBreakData
+    {
+        public string Line { get; set; }
+        public int LineNumber { get; set; }
+        public int[] Grapheme { get; set; }
+        public int[] Codepoints{ get; set; }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
new file mode 100644
index 0000000000..15be1200c8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
@@ -0,0 +1,259 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    public class LineBreakEnumeratorTests
+    {
+        private readonly ITestOutputHelper _outputHelper;
+        
+        public LineBreakEnumeratorTests(ITestOutputHelper outputHelper)
+        {
+            _outputHelper = outputHelper;
+        }
+        
+        [Fact]
+        public void BasicLatinTest()
+        {
+            var lineBreaker = new LineBreakEnumerator("Hello World\r\nThis is a test.".AsMemory());
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(6, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(13, lineBreaker.Current.PositionWrap);
+            Assert.True(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(18, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(21, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(23, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(28, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.False(lineBreaker.MoveNext());
+        }
+
+
+        [Fact]
+        public void ForwardTextWithOuterWhitespace()
+        {
+            var lineBreaker = new LineBreakEnumerator(" Apples Pears Bananas   ".AsMemory());
+            var positionsF = GetBreaks(lineBreaker);
+            Assert.Equal(1, positionsF[0].PositionWrap);
+            Assert.Equal(0, positionsF[0].PositionMeasure);
+            Assert.Equal(8, positionsF[1].PositionWrap);
+            Assert.Equal(7, positionsF[1].PositionMeasure);
+            Assert.Equal(14, positionsF[2].PositionWrap);
+            Assert.Equal(13, positionsF[2].PositionMeasure);
+            Assert.Equal(24, positionsF[3].PositionWrap);
+            Assert.Equal(21, positionsF[3].PositionMeasure);
+        }
+
+        private static List<LineBreak> GetBreaks(LineBreakEnumerator lineBreaker)
+        {
+            var breaks = new List<LineBreak>();
+
+            while (lineBreaker.MoveNext())
+            {
+                breaks.Add(lineBreaker.Current);
+            }
+
+            return breaks;
+        }
+
+        [Fact]
+        public void ForwardTest()
+        {
+            var lineBreaker = new LineBreakEnumerator("Apples Pears Bananas".AsMemory());
+
+            var positionsF = GetBreaks(lineBreaker);
+            Assert.Equal(7, positionsF[0].PositionWrap);
+            Assert.Equal(6, positionsF[0].PositionMeasure);
+            Assert.Equal(13, positionsF[1].PositionWrap);
+            Assert.Equal(12, positionsF[1].PositionMeasure);
+            Assert.Equal(20, positionsF[2].PositionWrap);
+            Assert.Equal(20, positionsF[2].PositionMeasure);
+        }
+
+        [Theory(Skip = "Only run when the Unicode spec changes.")]
+        [ClassData(typeof(LineBreakTestDataGenerator))]
+        public void ShouldFindBreaks(int lineNumber, int[] codePoints, int[] breakPoints)
+        {
+            var text = string.Join(null, codePoints.Select(char.ConvertFromUtf32));
+
+            var lineBreaker = new LineBreakEnumerator(text.AsMemory());
+
+            var foundBreaks = new List<int>();
+            
+            while (lineBreaker.MoveNext())
+            {
+                foundBreaks.Add(lineBreaker.Current.PositionWrap);
+            }
+            
+            // Check the same
+            var pass = true;
+
+            if (foundBreaks.Count != breakPoints.Length)
+            {
+                pass = false;
+            }
+            else
+            {
+                for (var i = 0; i < foundBreaks.Count; i++)
+                {
+                    if (foundBreaks[i] != breakPoints[i])
+                    {
+                        pass = false;
+                    }
+                }
+            }
+
+            if (!pass)
+            {
+                _outputHelper.WriteLine($"Failed test on line {lineNumber}");
+                _outputHelper.WriteLine("");
+                _outputHelper.WriteLine($"    Code Points: {string.Join(" ", codePoints)}");
+                _outputHelper.WriteLine($"Expected Breaks: {string.Join(" ", breakPoints)}");
+                _outputHelper.WriteLine($"  Actual Breaks: {string.Join(" ", foundBreaks)}");
+                _outputHelper.WriteLine($"           Text: {text}");
+                _outputHelper.WriteLine($"     Char Props: {string.Join(" ", codePoints.Select(x => new Codepoint((uint)x).LineBreakClass))}");
+                _outputHelper.WriteLine("");
+            }
+            
+            Assert.True(pass);
+        }
+
+        private class LineBreakTestDataGenerator : IEnumerable<object[]>
+        {
+            private readonly List<object[]> _testData;
+
+            public LineBreakTestDataGenerator()
+            {
+                _testData = GenerateTestData();
+            }
+
+            public IEnumerator<object[]> GetEnumerator()
+            {
+                return _testData.GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            private static List<object[]> GenerateTestData()
+            {
+                // Process each line
+                var tests = new List<object[]>();
+
+                // Read the test file
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/LineBreakTest.txt");
+
+                using (var client = new HttpClient())
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return tests;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        var lineNumber = 1;
+
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (line is null)
+                            {
+                                break;
+                            }
+
+                            // Get the line, remove comments
+                            line = line.Split('#')[0].Trim();
+
+                            // Ignore blank/comment only lines
+                            if (string.IsNullOrWhiteSpace(line))
+                            {
+                                lineNumber++;
+                                continue;
+                            }
+
+                            var codePoints = new List<int>();
+                            var breakPoints = new List<int>();
+
+                            // Parse the test
+                            var p = 0;
+
+                            while (p < line.Length)
+                            {
+                                // Ignore white space
+                                if (char.IsWhiteSpace(line[p]))
+                                {
+                                    p++;
+                                    continue;
+                                }
+
+                                if (line[p] == '×')
+                                {
+                                    p++;
+                                    continue;
+                                }
+
+                                if (line[p] == '÷')
+                                {
+                                    breakPoints.Add(codePoints.Select(x=> x > ushort.MaxValue ? 2 : 1).Sum());
+                                    p++;
+                                    continue;
+                                }
+
+                                var codePointPos = p;
+
+                                while (p < line.Length && IsHexDigit(line[p]))
+                                {
+                                    p++;
+                                }
+
+                                var codePointStr = line.Substring(codePointPos, p - codePointPos);
+                                var codePoint = Convert.ToInt32(codePointStr, 16);
+                                codePoints.Add(codePoint);
+                            }
+
+                            tests.Add(new object[] { lineNumber, codePoints.ToArray(), breakPoints.ToArray() });
+
+                            lineNumber++;
+                        }
+                    }
+                }
+
+                return tests;
+            }
+
+            private static bool IsHexDigit(char ch)
+            {
+                return char.IsDigit(ch) || (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f');
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
new file mode 100644
index 0000000000..f05a1e574a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
@@ -0,0 +1,487 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    internal static class UnicodeDataGenerator
+    {
+        public const string Ucd = "https://www.unicode.org/Public/15.0.0/ucd/";
+
+        public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries, out Dictionary<int, BiDiDataItem> biDiData)
+        {
+            biDiData = new Dictionary<int, BiDiDataItem>();
+
+            var bidiClassEntries =
+                UnicodeEnumsGenerator.CreateBidiClassEnum();
+
+            var bidiClassMappings = CreateTagToIndexMappings(bidiClassEntries);
+
+            var bidiClassData = ReadBiDiData();
+
+            foreach (var (range, name) in bidiClassData)
+            {
+                var biDiClass = bidiClassMappings[name];
+
+                AddBiDiClassRange(biDiData, range, biDiClass);
+            }
+
+            var biDiPairedBracketTypeEntries = UnicodeEnumsGenerator.CreateBiDiPairedBracketTypeEnum();
+
+            var biDiPairedBracketTypeMappings = CreateTagToIndexMappings(biDiPairedBracketTypeEntries);
+
+            var biDiPairedBracketData = ReadBiDiPairedBracketData();
+            
+            foreach (var (range, name) in biDiPairedBracketData)
+            {
+                var bracketType = biDiPairedBracketTypeMappings[name];
+
+                AddBiDiBracket(biDiData, range, bracketType);
+            }
+            
+            var biDiTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
+            
+            foreach (var properties in biDiData.Values)
+            {
+                //[bracket]|[bracketType]|[biDiClass]
+                var value = (properties.BiDiClass << UnicodeData.BIDICLASS_SHIFT) |
+                            (properties.BracketType << UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT) | properties.Bracket;
+
+                biDiTrieBuilder.Set(properties.Codepoint, (uint)value);
+            }
+
+            biDiDataEntries = new BiDiDataEntries()
+            {
+                PairedBracketTypes = biDiPairedBracketTypeEntries, BiDiClasses = bidiClassEntries
+            };
+
+            var trie = biDiTrieBuilder.Freeze();
+
+            GenerateTrieClass("Bidi", trie);
+
+            return trie;
+        }
+
+        public static void GenerateTrieClass(string name, UnicodeTrie trie)
+        {
+            var stream = new MemoryStream();
+
+            trie.Save(stream);
+
+            using (var fileStream = File.Create($"Generated\\{name}.trie.cs"))
+            using (var writer = new StreamWriter(fileStream))
+            {
+                writer.WriteLine("using System;");
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine($"   internal static class {name}Trie");
+                writer.WriteLine("    {");
+                writer.WriteLine("        public static ReadOnlySpan<byte> Data => new byte[]");
+                writer.WriteLine("        {");
+
+                stream.Position = 0;
+
+                writer.Write("            ");
+
+                long length = stream.Length;
+
+                while (true)
+                {
+                    var b = stream.ReadByte();
+
+                    if(b == -1)
+                    {
+                        break;
+                    }
+
+                    writer.Write(b.ToString());
+
+                    if (stream.Position % 100 > 0 && stream.Position != length)
+                    {
+                        writer.Write(", ");
+                    }
+                    else
+                    {
+                        writer.Write(',');
+                        writer.Write(Environment.NewLine);
+
+                        if (stream.Position != length)
+                        {
+                            writer.Write("            ");
+                        }
+                    }
+                }
+
+                writer.WriteLine("        };");              
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+        }
+
+        public static UnicodeTrie GenerateUnicodeDataTrie(out UnicodeDataEntries dataEntries, out Dictionary<int, UnicodeDataItem> unicodeData)
+        {
+            var generalCategoryEntries =
+                UnicodeEnumsGenerator.CreateGeneralCategoryEnum();
+
+            var generalCategoryMappings = CreateTagToIndexMappings(generalCategoryEntries);
+            
+            var scriptEntries = UnicodeEnumsGenerator.CreateScriptEnum();
+
+            var scriptMappings = CreateNameToIndexMappings(scriptEntries);
+            
+            var lineBreakClassEntries =
+                UnicodeEnumsGenerator.CreateLineBreakClassEnum();
+
+            var lineBreakClassMappings = CreateTagToIndexMappings(lineBreakClassEntries);
+
+            unicodeData = GetUnicodeData(generalCategoryMappings, scriptMappings, lineBreakClassMappings);
+            
+            var unicodeDataTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
+            
+            foreach (var properties in unicodeData.Values)
+            {
+                //[line break]|[biDi]|[script]|[category]
+                var value = (properties.LineBreakClass << UnicodeData.LINEBREAK_SHIFT) |
+                            (properties.Script << UnicodeData.SCRIPT_SHIFT) | properties.GeneralCategory;
+
+                unicodeDataTrieBuilder.Set(properties.Codepoint, (uint)value);
+            }
+
+            dataEntries = new UnicodeDataEntries
+            {
+                Scripts = scriptEntries,
+                GeneralCategories = generalCategoryEntries,
+                LineBreakClasses = lineBreakClassEntries
+            };
+
+            var trie = unicodeDataTrieBuilder.Freeze();
+
+            GenerateTrieClass("UnicodeData", trie);
+
+            return trie;
+        }
+
+        private static Dictionary<int, UnicodeDataItem> GetUnicodeData(IReadOnlyDictionary<string, int> generalCategoryMappings, 
+            IReadOnlyDictionary<string, int> scriptMappings, IReadOnlyDictionary<string, int> lineBreakClassMappings)
+        {
+            var unicodeData = new Dictionary<int, UnicodeDataItem>();
+            
+            var generalCategoryData = ReadGeneralCategoryData();
+
+            foreach (var (range, name) in generalCategoryData)
+            {
+                var generalCategory = generalCategoryMappings[name];
+
+                AddGeneralCategoryRange(unicodeData, range, generalCategory);
+            }
+            
+            var scriptData = ReadScriptData();
+
+            foreach (var (range, name) in scriptData)
+            {
+                var script = scriptMappings[name];
+
+                AddScriptRange(unicodeData, range, script);
+            }
+            
+            var lineBreakClassData = ReadLineBreakClassData();
+
+            foreach (var (range, name) in lineBreakClassData)
+            {
+                var lineBreakClass = lineBreakClassMappings[name];
+
+                AddLineBreakClassRange(unicodeData, range, lineBreakClass);
+            }
+
+            return unicodeData;
+        }
+
+        private static Dictionary<string, int> CreateTagToIndexMappings(IReadOnlyList<DataEntry> entries)
+        {
+            var mappings = new Dictionary<string, int>();
+
+            for (var i = 0; i < entries.Count; i++)
+            {
+                mappings.Add(entries[i].Tag, i);
+            }
+
+            return mappings;
+        }
+
+        private static Dictionary<string, int> CreateNameToIndexMappings(IReadOnlyList<DataEntry> entries)
+        {
+            var mappings = new Dictionary<string, int>();
+
+            for (var i = 0; i < entries.Count; i++)
+            {
+                mappings.Add(entries[i].Name, i);
+            }
+
+            return mappings;
+        }
+
+        private static void AddGeneralCategoryRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
+            int generalCategory)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, GeneralCategory = generalCategory });
+                }
+                else
+                {
+                    codepoints[i].GeneralCategory = generalCategory;
+                }
+            }
+        }
+
+        private static void AddScriptRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
+            int script)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, Script = script });
+                }
+                else
+                {
+                    codepoints[i].Script = script;
+                }
+            }
+        }
+
+        private static void AddBiDiClassRange(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
+            int biDiClass)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new BiDiDataItem { Codepoint = i, BiDiClass = biDiClass });
+                }
+                else
+                {
+                    codepoints[i].BiDiClass = biDiClass;
+                }
+            }
+        }
+
+        private static void AddBiDiBracket(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
+            int bracketType)
+        {
+            if (!codepoints.ContainsKey(range.Start))
+            {
+                codepoints.Add(range.Start,
+                    new BiDiDataItem { Codepoint = range.Start, Bracket = range.End, BracketType = bracketType });
+            }
+            else
+            {
+                var codepoint = codepoints[range.Start];
+
+                codepoint.Bracket = range.End;
+                codepoint.BracketType = bracketType;
+            }
+        }
+
+        private static void AddLineBreakClassRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
+            int lineBreakClass)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, LineBreakClass = lineBreakClass });
+                }
+                else
+                {
+                    codepoints[i].LineBreakClass = lineBreakClass;
+                }
+            }
+        }
+
+        public static List<(CodepointRange, string)> ReadGeneralCategoryData()
+        {
+            return ReadUnicodeData("extracted/DerivedGeneralCategory.txt");
+        }
+
+        public static List<(CodepointRange, string)> ReadScriptData()
+        {
+            return ReadUnicodeData("Scripts.txt");
+        }
+
+        public static List<(CodepointRange, string)> ReadBiDiData()
+        {
+            return ReadUnicodeData("extracted/DerivedBidiClass.txt");
+        }
+
+        public static List<(CodepointRange, string)> ReadLineBreakClassData()
+        {
+            return ReadUnicodeData("extracted/DerivedLineBreak.txt");
+        }
+        
+        public static List<(CodepointRange, string)> ReadBiDiPairedBracketData()
+        {
+            const string file = "BidiBrackets.txt";
+        
+            var data = new List<(CodepointRange, string)>();
+            
+            var regex = new Regex(@"^([0-9A-F]+);\s([0-9A-F]+);\s([ocn])");
+
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(Ucd, file);
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return data;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            var match = regex.Match(line);
+
+                            if (!match.Success)
+                            {
+                                continue;
+                            }
+
+                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
+
+                            var end = start;
+
+                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
+                            {
+                                end = Convert.ToInt32(match.Groups[2].Value, 16);
+                            }
+
+                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
+                        }
+                    }
+                }
+            }
+
+            return data;
+        }
+
+        private static List<(CodepointRange, string)> ReadUnicodeData(string file)
+        {
+            var data = new List<(CodepointRange, string)>();
+
+            var regex = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+)\s+#.*", RegexOptions.Compiled);
+
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(Ucd, file);
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return data;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            var match = regex.Match(line);
+
+                            if (!match.Success)
+                            {
+                                continue;
+                            }
+
+                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
+
+                            var end = start;
+
+                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
+                            {
+                                end = Convert.ToInt32(match.Groups[2].Value, 16);
+                            }
+
+                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
+                        }
+                    }
+                }
+            }
+
+            return data;
+        }
+
+        internal class UnicodeDataItem
+        {
+            public int Codepoint { get; set; }
+
+            public int Script { get; set; }
+
+            public int GeneralCategory { get; set; }
+
+            public int BiDiClass { get; set; }
+
+            public int LineBreakClass { get; set; }
+        }
+        
+        internal class BiDiDataItem
+        {
+            public int Codepoint { get; set; }
+
+            public int Bracket { get; set; }
+
+            public int BracketType { get; set; }
+
+            public int BiDiClass { get; set; }
+        }      
+    }
+    
+    internal class UnicodeDataEntries
+    {
+        public IReadOnlyList<DataEntry> Scripts { get; set; }
+        public IReadOnlyList<DataEntry> GeneralCategories{ get; set; }
+        public IReadOnlyList<DataEntry> LineBreakClasses{ get; set; }
+    }
+    
+    internal class BiDiDataEntries
+    {
+        public IReadOnlyList<DataEntry> PairedBracketTypes { get; set; }
+        public IReadOnlyList<DataEntry> BiDiClasses{ get; set; }
+    }
+
+    internal readonly struct CodepointRange
+    {
+        public CodepointRange(int start, int end)
+        {
+            Start = start;
+            End = end;
+        }
+
+        public int Start { get; }
+        public int End { get; }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
new file mode 100644
index 0000000000..c753bf3741
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
@@ -0,0 +1,55 @@
+using System.IO;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    public class UnicodeDataGeneratorTests
+    {
+        /// <summary>
+        ///     This test is used to generate all Unicode related types.
+        ///     We only need to run this when the Unicode spec changes.
+        /// </summary>
+        [Fact(Skip = "Only run when we update the trie.")]
+        public void Should_Generate_Data()
+        {
+            if (!Directory.Exists("Generated"))
+            {
+                Directory.CreateDirectory("Generated");
+            }
+
+            var unicodeDataTrie = UnicodeDataGenerator.GenerateUnicodeDataTrie(out var unicodeDataEntries, out var unicodeData);
+
+            foreach (var value in unicodeData.Values)
+            {
+                var data = unicodeDataTrie.Get((uint)value.Codepoint);
+                
+                Assert.Equal(value.GeneralCategory, GetValue(data, 0, UnicodeData.CATEGORY_MASK));
+                
+                Assert.Equal(value.Script, GetValue(data, UnicodeData.SCRIPT_SHIFT, UnicodeData.SCRIPT_MASK));
+                
+                Assert.Equal(value.LineBreakClass, GetValue(data, UnicodeData.LINEBREAK_SHIFT, UnicodeData.LINEBREAK_MASK));
+            }
+            
+            var biDiTrie = UnicodeDataGenerator.GenerateBiDiTrie(out var biDiDataEntries, out var biDiData);
+
+            foreach (var value in biDiData.Values)
+            {
+                var data = biDiTrie.Get((uint)value.Codepoint);
+                
+                Assert.Equal(value.Bracket, GetValue(data, 0, UnicodeData.BIDIPAIREDBRACKED_MASK));
+                
+                Assert.Equal(value.BracketType, GetValue(data, UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT, UnicodeData.BIDIPAIREDBRACKEDTYPE_MASK));
+                
+                Assert.Equal(value.BiDiClass, GetValue(data, UnicodeData.BIDICLASS_SHIFT, UnicodeData.BIDICLASS_MASK));
+            }
+            
+            UnicodeEnumsGenerator.CreatePropertyValueAliasHelper(unicodeDataEntries, biDiDataEntries);
+        }
+
+        private static int GetValue(uint value, int shift, int mask)
+        {
+            return (int)((value >> shift) & mask);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
new file mode 100644
index 0000000000..110e57cbd3
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
@@ -0,0 +1,474 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    internal static class UnicodeEnumsGenerator
+    {
+        public static List<DataEntry> CreateScriptEnum()
+        {
+            var entries = new List<DataEntry>
+            {
+                new DataEntry("Unknown", "Zzzz", string.Empty),
+                new DataEntry("Common", "Zyyy", string.Empty),
+                new DataEntry("Inherited", "Zinh", string.Empty)
+            };
+
+            ParseDataEntries("# Script (sc)", entries);
+
+            using (var stream = File.Create("Generated\\Script.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum Script");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        public static List<DataEntry> CreateGeneralCategoryEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("Other", "C", " Cc | Cf | Cn | Co | Cs") };
+
+            ParseDataEntries("# General_Category (gc)", entries);
+
+            using (var stream = File.Create("Generated\\GeneralCategory.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum GeneralCategory");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        public static List<DataEntry> CreateGraphemeBreakTypeEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("Other", "XX", string.Empty) };
+
+            ParseDataEntries("# Grapheme_Cluster_Break (GCB)", entries);
+
+            using (var stream = File.Create("Generated\\GraphemeBreakClass.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum GraphemeBreakClass");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("        ExtendedPictographic");
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        private static List<string> GenerateBreakPairTable()
+        {
+            var rows = new List<string[]>();
+
+            using (var stream =
+                typeof(UnicodeEnumsGenerator).Assembly.GetManifestResourceStream(
+                    "Avalonia.Base.UnitTests.Media.TextFormatting.BreakPairTable.txt"))
+            using (var reader = new StreamReader(stream))
+            {
+                while (!reader.EndOfStream)
+                {
+                    var line = reader.ReadLine();
+
+                    var columns = line.Split('\t');
+
+                    rows.Add(columns);
+                }
+            }
+
+            using (var stream = File.Create("Generated\\BreakPairTable.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    internal static class BreakPairTable");
+                writer.WriteLine("    {");
+
+                writer.WriteLine("        private static readonly byte[][] s_breakPairTable = ");
+                writer.WriteLine("            {");
+
+                for (var i = 1; i < rows.Count; i++)
+                {
+                    writer.Write("             new byte[] {");
+
+                    writer.Write($"{GetBreakPairType(rows[i][1])}");
+
+                    for (var index = 2; index < rows[i].Length; index++)
+                    {
+                        var column = rows[i][index];
+
+                        writer.Write($",{GetBreakPairType(column)}");
+                    }
+
+                    writer.Write("},");
+                    writer.Write(Environment.NewLine);
+                }
+                writer.WriteLine("        };");
+
+                writer.WriteLine();
+
+                writer.WriteLine("        public static PairBreakType Map(LineBreakClass first, LineBreakClass second)");
+                writer.WriteLine("        {");
+                writer.WriteLine("            return (PairBreakType)s_breakPairTable[(int)first][(int)second];");
+                writer.WriteLine("        }");
+
+                writer.WriteLine("    }");
+
+                writer.WriteLine();
+
+                writer.WriteLine("    internal enum PairBreakType : byte");
+                writer.WriteLine("    {");
+                writer.WriteLine("        DI = 0, // Direct break opportunity");
+                writer.WriteLine("        IN = 1, // Indirect break opportunity");
+                writer.WriteLine("        CI = 2, // Indirect break opportunity for combining marks");
+                writer.WriteLine("        CP = 3, // Prohibited break for combining marks");
+                writer.WriteLine("        PR = 4 // Prohibited break");
+                writer.WriteLine("    }");
+
+
+                writer.WriteLine("}");
+            }
+
+            return rows[0].Where(x => !string.IsNullOrEmpty(x)).ToList();
+        }
+
+        public const byte DI_BRK = 0; // Direct break opportunity
+        public const byte IN_BRK = 1; // Indirect break opportunity
+        public const byte CI_BRK = 2; // Indirect break opportunity for combining marks
+        public const byte CP_BRK = 3; // Prohibited break for combining marks
+        public const byte PR_BRK = 4; // Prohibited break
+
+        private static byte GetBreakPairType(string type)
+        {
+            switch (type)
+            {
+                case "_":
+                    return DI_BRK;
+                case "%":
+                    return IN_BRK;
+                case "#":
+                    return CI_BRK;
+                case "@":
+                    return CP_BRK;
+                case "^":
+                    return PR_BRK;
+                default:
+                    return byte.MaxValue;
+            }
+        }
+
+        public static List<DataEntry> CreateLineBreakClassEnum()
+        {
+            var usedLineBreakClasses = GenerateBreakPairTable();
+
+            var entries = new List<DataEntry> { new DataEntry("Unknown", "XX", string.Empty) };
+
+            ParseDataEntries("# Line_Break (lb)", entries);
+
+            var orderedLineBreakEntries = new Dictionary<string, DataEntry>();
+
+            foreach (var tag in usedLineBreakClasses)
+            {
+                var entry = entries.Single(x => x.Tag == tag);
+
+                orderedLineBreakEntries.Add(tag, entry);
+            }
+
+            foreach (var entry in entries)
+            {
+                if (orderedLineBreakEntries.ContainsKey(entry.Tag))
+                {
+                    continue;
+                }
+
+                orderedLineBreakEntries.Add(entry.Tag, entry);
+            }
+
+            using (var stream = File.Create("Generated\\LineBreakClass.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum LineBreakClass");
+                writer.WriteLine("    {");
+
+                foreach (var entry in orderedLineBreakEntries.Values)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return orderedLineBreakEntries.Values.ToList();
+        }
+
+        public static List<DataEntry> CreateBidiClassEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("Left_To_Right", "L", string.Empty) };
+
+            ParseDataEntries("# Bidi_Class (bc)", entries);
+
+            using (var stream = File.Create("Generated\\BidiClass.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum BidiClass");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+        
+        public static List<DataEntry> CreateBiDiPairedBracketTypeEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("None", "n", string.Empty) };
+
+            ParseDataEntries("# Bidi_Paired_Bracket_Type (bpt)", entries);
+
+            using (var stream = File.Create("Generated\\BidiPairedBracketType.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum BidiPairedBracketType");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        public static void CreatePropertyValueAliasHelper(UnicodeDataEntries unicodeDataEntries, 
+            BiDiDataEntries biDiDataEntries)
+        {
+            using (var stream = File.Create("Generated\\PropertyValueAliasHelper.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("using System.Collections.Generic;");
+                writer.WriteLine();
+
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    internal static class PropertyValueAliasHelper");
+                writer.WriteLine("    {");
+
+                WritePropertyValueAliasGetTag(writer, unicodeDataEntries.Scripts, "Script", "Zzzz");
+
+                WritePropertyValueAlias(writer, unicodeDataEntries.Scripts, "Script", "Unknown");
+
+                WritePropertyValueAlias(writer, unicodeDataEntries.GeneralCategories, "GeneralCategory", "Other");
+                
+                WritePropertyValueAlias(writer, unicodeDataEntries.LineBreakClasses, "LineBreakClass", "Unknown");
+
+                WritePropertyValueAlias(writer, biDiDataEntries.PairedBracketTypes, "BiDiPairedBracketType", "None");
+                
+                WritePropertyValueAlias(writer, biDiDataEntries.BiDiClasses, "BiDiClass", "LeftToRight");
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+        }
+
+        public static void ParseDataEntries(string property, List<DataEntry> entries)
+        {
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "PropertyValueAliases.txt");
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            if (line != property)
+                            {
+                                continue;
+                            }
+
+                            reader.ReadLine();
+
+                            break;
+                        }
+
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line) || line.StartsWith("#"))
+                            {
+                                break;
+                            }
+
+                            var elements = line.Split(';');
+
+                            var tag = elements[1].Trim();
+
+                            elements = elements[2].Split('#');
+
+                            var name = elements[0].Trim();
+
+                            if (entries.Any(x => x.Name == name))
+                            {
+                                continue;
+                            }
+
+                            var comment = string.Empty;
+
+                            if (elements.Length > 1)
+                            {
+                                comment = elements[1];
+                            }
+
+                            var entry = new DataEntry(name, tag, comment);
+
+                            entries.Add(entry);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void WritePropertyValueAliasGetTag(TextWriter writer, IEnumerable<DataEntry> entries,
+            string typeName, string defaultValue)
+        {
+            writer.WriteLine(
+                $"        private static readonly Dictionary<{typeName}, string> s_{typeName.ToLower()}ToTag = ");
+            writer.WriteLine($"            new Dictionary<{typeName}, string>{{");
+
+            foreach (var entry in entries)
+            {
+                writer.WriteLine($"                {{ {typeName}.{entry.Name.Replace("_", "")}, \"{entry.Tag}\"}},");
+            }
+
+            writer.WriteLine("        };");
+
+            writer.WriteLine();
+
+            writer.WriteLine($"        public static string GetTag({typeName} {typeName.ToLower()})");
+            writer.WriteLine("        {");
+            writer.WriteLine($"            if(!s_{typeName.ToLower()}ToTag.ContainsKey({typeName.ToLower()}))");
+            writer.WriteLine("            {");
+            writer.WriteLine($"                return \"{defaultValue}\";");
+            writer.WriteLine("            }");
+            writer.WriteLine($"            return s_{typeName.ToLower()}ToTag[{typeName.ToLower()}];");
+            writer.WriteLine("        }");
+
+            writer.WriteLine();
+        }
+
+        private static void WritePropertyValueAlias(TextWriter writer, IEnumerable<DataEntry> entries, string typeName,
+            string defaultValue)
+        {
+            writer.WriteLine($"        private static readonly Dictionary<string, {typeName}> s_tagTo{typeName} = ");
+            writer.WriteLine($"            new Dictionary<string,{typeName}>{{");
+
+            foreach (var entry in entries)
+            {
+                writer.WriteLine($"                {{ \"{entry.Tag}\", {typeName}.{entry.Name.Replace("_", "")}}},");
+            }
+
+            writer.WriteLine("        };");
+
+            writer.WriteLine();
+
+            writer.WriteLine($"        public static {typeName} Get{typeName}(string tag)");
+            writer.WriteLine("        {");
+            writer.WriteLine($"            if(!s_tagTo{typeName}.ContainsKey(tag))");
+            writer.WriteLine("            {");
+            writer.WriteLine($"                return {typeName}.{defaultValue};");
+            writer.WriteLine("            }");
+            writer.WriteLine($"            return s_tagTo{typeName}[tag];");
+            writer.WriteLine("        }");
+
+            writer.WriteLine();
+        }
+    }
+
+    public readonly struct DataEntry
+    {
+        public DataEntry(string name, string tag, string comment)
+        {
+            Name = name;
+            Tag = tag;
+            Comment = comment;
+        }
+
+        public string Name { get; }
+        public string Tag { get; }
+        public string Comment { get; }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TransformOperationsTests.cs b/tests/Avalonia.Base.UnitTests/Media/TransformOperationsTests.cs
new file mode 100644
index 0000000000..0d84ba1700
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TransformOperationsTests.cs
@@ -0,0 +1,297 @@
+using Avalonia.Media.Transformation;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class TransformOperationsTests
+    {
+        [Theory]
+        [InlineData("translate(10px)", 10d, 0d)]
+        [InlineData("translate(10px, 10px)", 10d, 10d)]
+        [InlineData("translate(0px, 10px)", 0d, 10d)]
+        [InlineData("translate(10px, 0px)", 10d, 0d)]
+        [InlineData("translateX(10px)", 10d, 0d)]
+        [InlineData("translateY(10px)", 0d, 10d)]
+        public void Can_Parse_Translation(string data, double x, double y)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Translate.X);
+            Assert.Equal(y, operations[0].Data.Translate.Y);
+        }
+
+        [Theory]
+        [InlineData("rotate(90deg)", 90d)]
+        [InlineData("rotate(0.5turn)", 180d)]
+        [InlineData("rotate(200grad)", 180d)]
+        [InlineData("rotate(3.14159265rad)", 180d)]
+        public void Can_Parse_Rotation(string data, double angleDeg)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(angleDeg), operations[0].Data.Rotate.Angle, 4);
+        }
+
+        [Theory]
+        [InlineData("scale(10)", 10d, 10d)]
+        [InlineData("scale(10, 10)", 10d, 10d)]
+        [InlineData("scale(0, 10)", 0d, 10d)]
+        [InlineData("scale(10, 0)", 10d, 0d)]
+        [InlineData("scaleX(10)", 10d, 1d)]
+        [InlineData("scaleY(10)", 1d, 10d)]
+        public void Can_Parse_Scale(string data, double x, double y)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Scale.X);
+            Assert.Equal(y, operations[0].Data.Scale.Y);
+        }
+
+        [Theory]
+        [InlineData("skew(90deg)", 90d, 0d)]
+        [InlineData("skew(0.5turn)", 180d, 0d)]
+        [InlineData("skew(200grad)", 180d, 0d)]
+        [InlineData("skew(3.14159265rad)", 180d, 0d)]
+        [InlineData("skewX(90deg)", 90d, 0d)]
+        [InlineData("skewX(0.5turn)", 180d, 0d)]
+        [InlineData("skewX(200grad)", 180d, 0d)]
+        [InlineData("skewX(3.14159265rad)", 180d, 0d)]
+        [InlineData("skew(0, 90deg)", 0d, 90d)]
+        [InlineData("skew(0, 0.5turn)", 0d, 180d)]
+        [InlineData("skew(0, 200grad)", 0d, 180d)]
+        [InlineData("skew(0, 3.14159265rad)", 0d, 180d)]
+        [InlineData("skewY(90deg)", 0d, 90d)]
+        [InlineData("skewY(0.5turn)", 0d, 180d)]
+        [InlineData("skewY(200grad)", 0d, 180d)]
+        [InlineData("skewY(3.14159265rad)", 0d, 180d)]
+        [InlineData("skew(90deg, 90deg)", 90d, 90d)]
+        [InlineData("skew(0.5turn, 0.5turn)", 180d, 180d)]
+        [InlineData("skew(200grad, 200grad)", 180d, 180d)]
+        [InlineData("skew(3.14159265rad, 3.14159265rad)", 180d, 180d)]
+        public void Can_Parse_Skew(string data, double x, double y)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X, 4);
+            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y, 4);
+        }
+
+        [Fact]
+        public void Can_Parse_Compound_Operations()
+        {
+            var data = "scale(1,2) translate(3px,4px) rotate(5deg) skew(6deg,7deg)";
+
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
+            Assert.Equal(1, operations[0].Data.Scale.X);
+            Assert.Equal(2, operations[0].Data.Scale.Y);
+
+            Assert.Equal(TransformOperation.OperationType.Translate, operations[1].Type);
+            Assert.Equal(3, operations[1].Data.Translate.X);
+            Assert.Equal(4, operations[1].Data.Translate.Y);
+
+            Assert.Equal(TransformOperation.OperationType.Rotate, operations[2].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(5), operations[2].Data.Rotate.Angle);
+
+            Assert.Equal(TransformOperation.OperationType.Skew, operations[3].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(6), operations[3].Data.Skew.X);
+            Assert.Equal(MathUtilities.Deg2Rad(7), operations[3].Data.Skew.Y);
+        }
+
+        [Fact]
+        public void Can_Parse_Matrix_Operation()
+        {
+            var data = "matrix(1,2,3,4,5,6)";
+
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
+
+            var expectedMatrix = new Matrix(1, 2, 3, 4, 5, 6);
+
+            Assert.Equal(expectedMatrix, operations[0].Matrix);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d, 0d)]
+        [InlineData(0.5d, 5d, 10d)]
+        [InlineData(1d, 0d, 20d)]
+        public void Can_Interpolate_Translation(double progress, double x, double y)
+        {
+            var from = TransformOperations.Parse("translateX(10px)");
+            var to = TransformOperations.Parse("translateY(20px)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Translate.X);
+            Assert.Equal(y, operations[0].Data.Translate.Y);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d, 1d)]
+        [InlineData(0.5d, 5.5d, 10.5d)]
+        [InlineData(1d, 1d, 20d)]
+        public void Can_Interpolate_Scale(double progress, double x, double y)
+        {
+            var from = TransformOperations.Parse("scaleX(10)");
+            var to = TransformOperations.Parse("scaleY(20)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Scale.X);
+            Assert.Equal(y, operations[0].Data.Scale.Y);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d, 0d)]
+        [InlineData(0.5d, 5d, 10d)]
+        [InlineData(1d, 0d, 20d)]
+        public void Can_Interpolate_Skew(double progress, double x, double y)
+        {
+            var from = TransformOperations.Parse("skewX(10deg)");
+            var to = TransformOperations.Parse("skewY(20deg)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X);
+            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d)]
+        [InlineData(0.5d, 15d)]
+        [InlineData(1d, 20d)]
+        public void Can_Interpolate_Rotation(double progress, double angle)
+        {
+            var from = TransformOperations.Parse("rotate(10deg)");
+            var to = TransformOperations.Parse("rotate(20deg)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(angle), operations[0].Data.Rotate.Angle);
+        }
+
+        [Fact]
+        public void Interpolation_Fallback_To_Matrix()
+        {
+            double progress = 0.5d;
+
+            var from = TransformOperations.Parse("rotate(45deg)");
+            var to = TransformOperations.Parse("translate(100px, 100px) rotate(1215deg)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
+        }
+
+        [Fact]
+        public void Order_Of_Operations_Is_Preserved_No_Prefix()
+        {
+            var from = TransformOperations.Parse("scale(1)");
+            var to = TransformOperations.Parse("translate(50px,50px) scale(0.5,0.5)");
+
+            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
+
+            Assert.True(interpolated_0.IsIdentity);
+
+            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
+
+            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 12.5, translateY: 12.5);
+
+            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
+
+            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 25, translateY: 25);
+        }
+
+        [Fact]
+        public void Order_Of_Operations_Is_Preserved_One_Prefix()
+        {
+            var from = TransformOperations.Parse("scale(1)");
+            var to = TransformOperations.Parse("scale(0.5,0.5) translate(50px,50px)");
+
+            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
+
+            Assert.True(interpolated_0.IsIdentity);
+
+            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
+
+            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 25.0, translateY: 25);
+
+            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
+
+            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 50, translateY: 50);
+        }
+
+        private static void AssertMatrix(Matrix matrix, double? angle = null, double? scaleX = null, double? scaleY = null, double? translateX = null, double? translateY = null)
+        {
+            Assert.True(Matrix.TryDecomposeTransform(matrix, out var composed));
+
+            if (angle.HasValue)
+            {
+                Assert.Equal(angle.Value, composed.Angle);
+            }
+
+            if (scaleX.HasValue)
+            {
+                Assert.Equal(scaleX.Value, composed.Scale.X);
+            }
+
+            if (scaleY.HasValue)
+            {
+                Assert.Equal(scaleY.Value, composed.Scale.Y);
+            }
+
+            if (translateX.HasValue)
+            {
+                Assert.Equal(translateX.Value, composed.Translate.X);
+            }
+
+            if (translateY.HasValue)
+            {
+                Assert.Equal(translateY.Value, composed.Translate.Y);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TypefaceTests.cs b/tests/Avalonia.Base.UnitTests/Media/TypefaceTests.cs
new file mode 100644
index 0000000000..826c1f292b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TypefaceTests.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class TypefaceTests
+    {
+        [Fact]
+        public void Exception_Should_Be_Thrown_If_FontWeight_LessThanEqualTo_Zero()
+        {
+            Assert.Throws<ArgumentException>(() => new Typeface("foo", (FontStyle)12, 0));
+        }
+
+        [Fact]
+        public void Should_Be_Equal()
+        {
+            Assert.Equal(new Typeface("Font A"), new Typeface("Font A"));
+        }
+
+        [Fact]
+        public void Should_Have_Equal_Hash()
+        {
+            Assert.Equal(new Typeface("Font A").GetHashCode(), new Typeface("Font A").GetHashCode());
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeSegmentTests.cs b/tests/Avalonia.Base.UnitTests/Media/UnicodeRangeSegmentTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeSegmentTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/UnicodeRangeSegmentTests.cs
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeTests.cs b/tests/Avalonia.Base.UnitTests/Media/UnicodeRangeTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/UnicodeRangeTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
index 0caa984a22..aa5993f3b2 100644
--- a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
+++ b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
@@ -10,8 +10,8 @@ namespace Avalonia.Base.UnitTests
 {
     public class PriorityValueTests
     {
-        private static readonly IValueSink NullSink = new MockSink();
-        private static readonly IAvaloniaObject Owner = Mock.Of<IAvaloniaObject>();
+        private static readonly AvaloniaObject Owner = new AvaloniaObject();
+        private static readonly ValueStore ValueStore = new ValueStore(Owner);
         private static readonly StyledProperty<string> TestProperty = new StyledProperty<string>(
             "Test",
             typeof(PriorityValueTests),
@@ -23,12 +23,12 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink,
+                ValueStore,
                 new ConstantValueEntry<string>(
                     TestProperty,
                     "1",
                     BindingPriority.StyleTrigger,
-                    NullSink));
+                    new(ValueStore)));
 
             Assert.Equal("1", target.GetValue().Value);
             Assert.Equal(BindingPriority.StyleTrigger, target.Priority);
@@ -40,7 +40,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             target.SetValue("animation", BindingPriority.Animation);
             target.SetValue("local", BindingPriority.LocalValue);
@@ -60,7 +60,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             target.SetValue("1", BindingPriority.LocalValue);
             target.SetValue("2", BindingPriority.LocalValue);
@@ -74,7 +74,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             target.SetValue("1", BindingPriority.Style);
             target.SetValue("2", BindingPriority.Animation);
@@ -93,7 +93,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             Assert.Equal(BindingPriority.Unset, target.Priority);
             target.SetValue("style", BindingPriority.Style);
@@ -109,7 +109,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Binding_With_Same_Priority_Should_Be_Appended()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
 
@@ -129,7 +129,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Binding_With_Higher_Priority_Should_Be_Appended()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
 
@@ -149,7 +149,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Binding_With_Lower_Priority_Should_Be_Prepended()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
 
@@ -169,7 +169,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Second_Binding_With_Lower_Priority_Should_Be_Inserted_In_Middle()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -191,7 +191,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Competed_Binding_Should_Be_Removed()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -214,7 +214,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Value_Should_Come_From_Last_Entry()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -229,7 +229,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void LocalValue_Should_Override_LocalValue_Binding()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
 
             target.AddBinding(source1, BindingPriority.LocalValue).Start();
@@ -241,7 +241,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void LocalValue_Should_Override_Style_Binding()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
 
             target.AddBinding(source1, BindingPriority.Style).Start();
@@ -253,7 +253,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void LocalValue_Should_Not_Override_Animation_Binding()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
 
             target.AddBinding(source1, BindingPriority.Animation).Start();
@@ -265,7 +265,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void NonAnimated_Value_Should_Be_Correct_1()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -281,7 +281,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void NonAnimated_Value_Should_Be_Correct_2()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -310,16 +310,5 @@ namespace Avalonia.Base.UnitTests
 
             public void OnCompleted() => _observer.OnCompleted();
         }
-
-        private class MockSink : IValueSink
-        {
-            public void Completed<T>(StyledPropertyBase<T> property, IPriorityValueEntry entry, Optional<T> oldValue)
-            {
-            }
-
-            public void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-            {
-            }
-        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/RectTests.cs b/tests/Avalonia.Base.UnitTests/RectTests.cs
new file mode 100644
index 0000000000..95a438b287
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RectTests.cs
@@ -0,0 +1,58 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RectTests
+    {
+        [Fact]
+        public void Union_Should_Return_Correct_Value_For_Intersecting_Rects()
+        {
+            var result = new Rect(0, 0, 100, 100).Union(new Rect(50, 50, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 150, 150), result);
+        }
+
+        [Fact]
+        public void Union_Should_Return_Correct_Value_For_NonIntersecting_Rects()
+        {
+            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 250, 250), result);
+        }
+
+        [Fact]
+        public void Union_Should_Ignore_Empty_This_rect()
+        {
+            var result = new Rect(0, 0, 0, 0).Union(new Rect(150, 150, 100, 100));
+
+            Assert.Equal(new Rect(150, 150, 100, 100), result);
+        }
+
+        [Fact]
+        public void Union_Should_Ignore_Empty_Other_rect()
+        {
+            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 0, 0));
+
+            Assert.Equal(new Rect(0, 0, 100, 100), result);
+        }
+
+        [Fact]
+        public void Normalize_Should_Reverse_Negative_Size()
+        {
+            var result = new Rect(new Point(100, 100), new Point(0, 0)).Normalize();
+
+            Assert.Equal(new Rect(0, 0, 100, 100), result);
+        }
+
+        [Fact]
+        public void Normalize_Should_Make_Invalid_Rects_Empty()
+        {
+            var result = new Rect(
+                double.NegativeInfinity, double.PositiveInfinity, 
+                double.PositiveInfinity, double.PositiveInfinity)
+                .Normalize();
+
+            Assert.Equal(Rect.Empty, result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RelativePointTests.cs b/tests/Avalonia.Base.UnitTests/RelativePointTests.cs
new file mode 100644
index 0000000000..c242a504b9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RelativePointTests.cs
@@ -0,0 +1,23 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RelativePointTests
+    {
+        [Fact]
+        public void Parse_Should_Accept_Absolute_Value()
+        {
+            var result = RelativePoint.Parse("4,5");
+
+            Assert.Equal(new RelativePoint(4, 5, RelativeUnit.Absolute), result);
+        }
+
+        [Fact]
+        public void Parse_Should_Accept_Relative_Value()
+        {
+            var result = RelativePoint.Parse("25%, 50%");
+
+            Assert.Equal(new RelativePoint(0.25, 0.5, RelativeUnit.Relative), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RelativeRectComparer.cs b/tests/Avalonia.Base.UnitTests/RelativeRectComparer.cs
new file mode 100644
index 0000000000..3e0acddb02
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RelativeRectComparer.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RelativeRectComparer : IEqualityComparer<RelativeRect>
+    {
+        public bool Equals(RelativeRect a, RelativeRect b)
+        {
+            return a.Unit == b.Unit &&
+                   Math.Round(a.Rect.X, 3) == Math.Round(b.Rect.X, 3) &&
+                   Math.Round(a.Rect.Y, 3) == Math.Round(b.Rect.Y, 3) &&
+                   Math.Round(a.Rect.Width, 3) == Math.Round(b.Rect.Width, 3) &&
+                   Math.Round(a.Rect.Height, 3) == Math.Round(b.Rect.Height, 3);
+        }
+
+        public int GetHashCode(RelativeRect obj)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RelativeRectTests.cs b/tests/Avalonia.Base.UnitTests/RelativeRectTests.cs
new file mode 100644
index 0000000000..ff53419d5c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RelativeRectTests.cs
@@ -0,0 +1,33 @@
+using System;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RelativeRectTests
+    {
+        private static readonly RelativeRectComparer Compare = new RelativeRectComparer();
+        
+        [Fact]
+        public void Parse_Should_Accept_Absolute_Value()
+        {
+            var result = RelativeRect.Parse("4,5,50,60");
+
+            Assert.Equal(new RelativeRect(4, 5, 50, 60, RelativeUnit.Absolute), result, Compare);
+        }
+
+        [Fact]
+        public void Parse_Should_Accept_Relative_Value()
+        {
+            var result = RelativeRect.Parse("10%, 20%, 40%, 70%");
+
+            Assert.Equal(new RelativeRect(0.1, 0.2, 0.4, 0.7, RelativeUnit.Relative), result, Compare);
+        }
+
+        [Fact]
+        public void Parse_Should_Throw_Mixed_Values()
+        {
+            Assert.Throws<FormatException>(() =>
+                RelativeRect.Parse("10%, 20%, 40, 70%"));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs
new file mode 100644
index 0000000000..c7421c5827
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs
@@ -0,0 +1,197 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RenderTests_Culling
+    {
+        [Fact]
+        public void In_Bounds_Control_Should_Be_Rendered()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        (target = new TestControl
+                        {
+                            Width = 10, Height = 10, [Canvas.LeftProperty] = 98, [Canvas.TopProperty] = 98,
+                        })
+                    }
+                };
+
+                Render(container);
+
+                Assert.True(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Out_Of_Bounds_Control_Should_Not_Be_Rendered()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        (target = new TestControl
+                        {
+                            Width = 10,
+                            Height = 10,
+                            ClipToBounds = true,
+                            [Canvas.LeftProperty] = 110,
+                            [Canvas.TopProperty] = 110,
+                        })
+                    }
+                };
+
+                Render(container);
+
+                Assert.False(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Out_Of_Bounds_Child_Control_Should_Not_Be_Rendered()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        new Canvas
+                        {
+                            Width = 100,
+                            Height = 100,
+                            [Canvas.LeftProperty] = 50,
+                            [Canvas.TopProperty] = 50,
+                            Children =
+                            {
+                                (target = new TestControl
+                                {
+                                    Width = 10,
+                                    Height = 10,
+                                    ClipToBounds = true,
+                                    [Canvas.LeftProperty] = 50,
+                                    [Canvas.TopProperty] = 50,
+                                })
+                            }
+                        }
+                    }
+                };
+
+                Render(container);
+
+                Assert.False(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void RenderTransform_Should_Be_Respected()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        (target = new TestControl
+                        {
+                            Width = 10,
+                            Height = 10,
+                            [Canvas.LeftProperty] = 110,
+                            [Canvas.TopProperty] = 110,
+                            RenderTransform = new TranslateTransform(-100, -100),
+                        })
+                    }
+                };
+
+                Render(container);
+
+                Assert.True(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Negative_Margin_Should_Be_Respected()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        new Border
+                        {
+                            Margin = new Thickness(100, 100, 0, 0),
+                            Child = target = new TestControl
+                            {
+                                Width = 10, Height = 10, Margin = new Thickness(-100, -100, 0, 0),
+                            }
+                        }
+                    }
+                };
+
+                Render(container);
+
+                Assert.True(target.Rendered);
+            }
+        }
+
+        private void Render(IControl control)
+        {
+            var ctx = CreateDrawingContext();
+            control.Measure(Size.Infinity);
+            control.Arrange(new Rect(control.DesiredSize));
+            ImmediateRenderer.Render(control, ctx);
+        }
+
+        private DrawingContext CreateDrawingContext()
+        {
+            return new DrawingContext(Mock.Of<IDrawingContextImpl>());
+        }
+
+        private class TestControl : Control
+        {
+            public bool Rendered { get; private set; }
+
+            public override void Render(DrawingContext context)
+            {
+                Rendered = true;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
new file mode 100644
index 0000000000..d83bb12aea
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -0,0 +1,468 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering;
+
+public class CompositorHitTestingTests : CompositorTestsBase
+{
+
+    [Fact]
+    public void HitTest_Should_Find_Controls_At_Point()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            var border = new Border
+            {
+                Width = 100,
+                Height = 100,
+                Background = Brushes.Red,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+
+            s.TopLevel.Content = border;
+            
+            s.AssertHitTest(new Point(100, 100), null, border);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Not_Find_Empty_Controls_At_Point()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            var border = new Border
+            {
+                Width = 100,
+                Height = 100,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+
+            s.TopLevel.Content = border;
+
+            s.AssertHitTest(new Point(100, 100), null);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Border visible, border;
+            s.TopLevel.Content = border = new Border
+            {
+                Width = 100,
+                Height = 100,
+                Background = Brushes.Red,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                IsVisible = false,
+                Child = visible = new Border
+                {
+                    Background = Brushes.Red,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                }
+            };
+
+            s.AssertHitTest(new Point(100, 100), null);
+        }
+    }
+    
+    [Fact]
+    public void HitTest_Should_Not_Find_Control_Outside_Point()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            var border = new Border
+            {
+                Width = 100,
+                Height = 100,
+                Background = Brushes.Red,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+
+            };
+            s.TopLevel.Content = border;
+
+            s.AssertHitTest(new Point(10, 10), null);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Return_Top_Controls_First()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Panel container = new Panel
+            {
+                Width = 200,
+                Height = 200,
+                Children =
+                {
+                    new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    },
+                    new Border
+                    {
+                        Width = 50,
+                        Height = 50,
+                        Background = Brushes.Blue,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+            s.TopLevel.Content = container;
+
+            s.AssertHitTest(new Point(100, 100), null, container.Children[1], container.Children[0]);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Panel container = new Panel
+            {
+                Width = 200,
+                Height = 200,
+                Children =
+                {
+                    new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        ZIndex = 1,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    },
+                    new Border
+                    {
+                        Width = 50,
+                        Height = 50,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    },
+                    new Border
+                    {
+                        Width = 75,
+                        Height = 75,
+                        ZIndex = 2,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+
+            };
+            s.TopLevel.Content = container;
+
+            s.AssertHitTest(new Point(100, 100), null, new[] { container.Children[2], container.Children[0], container.Children[1] });
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Border target;
+            Panel container = new Panel
+            {
+                Width = 200,
+                Height = 200,
+                Background = Brushes.Red,
+                ClipToBounds = false,
+                Children =
+                {
+                    new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        ZIndex = 1,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Child = target = new Border
+                        {
+                            Width = 50,
+                            Height = 50,
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Left,
+                            VerticalAlignment = VerticalAlignment.Top,
+                            RenderTransform = new TranslateTransform(110, 110),
+                        }
+                    },
+                }
+            };
+            s.TopLevel.Content = container;
+
+            s.AssertHitTest(new Point(120, 120), null, target, container);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Border target;
+            Panel container = new Panel
+            {
+                Width = 100,
+                Height = 200,
+                Background = Brushes.Red,
+                Children =
+                {
+                    new Panel()
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        Margin = new Thickness(0, 100, 0, 0),
+                        ClipToBounds = true,
+                        Children =
+                        {
+                            (target = new Border()
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, -100, 0, 0)
+                            })
+                        }
+                    }
+                }
+
+            };
+            s.TopLevel.Content = container;
+
+            s.AssertHitTest(new Point(50, 50), null, container);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
+    {
+        using (var s = new CompositorServices(new Size(100, 200)))
+        {
+            Border target;
+            Border item1;
+            Border item2;
+            ScrollContentPresenter scroll;
+            Panel container = new Panel
+            {
+                Width = 100,
+                Height = 200,
+                Background = Brushes.Red,
+                Children =
+                {
+                    (target = new Border()
+                    {
+                        Name = "b1",
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                    }),
+                    new Border()
+                    {
+                        Name = "b2",
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        Margin = new Thickness(0, 100, 0, 0),
+                        Child = scroll = new ScrollContentPresenter()
+                        {
+                            CanHorizontallyScroll = true,
+                            CanVerticallyScroll = true,
+                            Content = new StackPanel()
+                            {
+                                Children =
+                                {
+                                    (item1 = new Border()
+                                    {
+                                        Name = "b3",
+                                        Width = 100,
+                                        Height = 100,
+                                        Background = Brushes.Red,
+                                    }),
+                                    (item2 = new Border()
+                                    {
+                                        Name = "b4",
+                                        Width = 100,
+                                        Height = 100,
+                                        Background = Brushes.Red,
+                                    }),
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+            s.TopLevel.Content = container;
+
+            scroll.UpdateChild();
+            
+            s.AssertHitTestFirst(new Point(50, 150), null, item1);
+
+            s.AssertHitTestFirst(new Point(50,50), null, target);
+            
+            scroll.Offset = new Vector(0, 100);
+
+            s.AssertHitTestFirst(new Point(50, 150), null, item2);
+            
+            s.AssertHitTestFirst(new Point(50,50), null, target);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Not_Find_Path_When_Outside_Fill()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Path path = new Path
+            {
+                Width = 200,
+                Height = 200,
+                Fill = Brushes.Red,
+                Data = StreamGeometry.Parse("M100,0 L0,100 100,100")
+            };
+            s.TopLevel.Content = path;
+
+            s.AssertHitTest(new Point(100, 100), null, path);
+            s.AssertHitTest(new Point(10, 10), null);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Respect_Geometry_Clip()
+    {
+        using (var s = new CompositorServices(new Size(400, 400)))
+        {
+            Canvas canvas;
+            Border border = new Border
+            {
+                Background = Brushes.Red,
+                Clip = StreamGeometry.Parse("M100,0 L0,100 100,100"),
+                Width = 200,
+                Height = 200,
+                Child = canvas = new Canvas
+                {
+                    Background = Brushes.Yellow,
+                    Margin = new Thickness(10),
+                }
+
+            };
+            s.TopLevel.Content = border;
+
+            s.RunJobs();
+            Assert.Equal(new Rect(100, 100, 200, 200), border.Bounds);
+
+            s.AssertHitTest(new Point(200,200), null, canvas, border);
+
+            s.AssertHitTest(new Point(110, 110), null);
+        }
+    }
+
+    [Fact]
+    public void HitTest_Should_Accommodate_ICustomHitTest()
+    {
+        using (var s = new CompositorServices(new Size(300, 200)))
+        {
+            Border border = new CustomHitTestBorder
+            {
+                ClipToBounds = false,
+                Width = 100,
+                Height = 100,
+                Background = Brushes.Red,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+
+            s.TopLevel.Content = border;
+            
+            s.AssertHitTest(75, 100, null, border);
+            s.AssertHitTest(125, 100, null, border);
+            s.AssertHitTest(175, 100, null);
+        }
+    }
+    
+    [Fact]
+    public void HitTest_Should_Not_Hit_Controls_Next_Pixel()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Border targetRectangle;
+
+            var stackPanel = new StackPanel
+            {
+                Orientation = Orientation.Vertical,
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Children =
+                {
+                    new Border { Width = 10, Height = 10, Background= Brushes.Red},
+                    { targetRectangle = new Border { Width = 10, Height = 10, Background = Brushes.Green} }
+                }
+            };
+
+            s.TopLevel.Content = stackPanel;
+            
+            s.AssertHitTest(new Point(5, 10), null, targetRectangle);
+        }
+    }
+    
+    
+    [Fact]
+    public void HitTest_Filter_Should_Filter_Out_Children()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Border child, parent;
+            s.TopLevel.Content = parent = new Border
+            {
+                Width = 100,
+                Height = 100,
+                Background = Brushes.Red,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Child = child = new Border
+                {
+                    Background = Brushes.Red,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                }
+            };
+
+            s.AssertHitTest(new Point(100, 100), null, child, parent);
+            s.AssertHitTest(new Point(100, 100), v => v != parent);
+        }
+    }
+
+    private IDisposable TestApplication()
+    {
+        return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+    }
+
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationTests.cs
new file mode 100644
index 0000000000..699f450223
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationTests.cs
@@ -0,0 +1,109 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering;
+
+public class CompositorInvalidationTests : CompositorTestsBase
+{
+    [Fact]
+    public void Control_Should_Invalidate_Own_Rect_When_Added()
+    {
+        using (var s = new CompositorCanvas())
+        {
+            var control = new Border()
+            {
+                Background = Brushes.Red, Width = 20, Height = 10,
+                [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50
+            };
+            s.Canvas.Children.Add(control);
+            s.AssertRects(new Rect(30, 50, 20, 10));
+        }
+    }
+
+    [Fact]
+    public void Control_Should_Invalidate_Own_Rect_When_Removed()
+    {
+        using (var s = new CompositorCanvas())
+        {
+            var control = new Border()
+            {
+                Background = Brushes.Red, Width = 20, Height = 10,
+                [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50
+            };
+            s.Canvas.Children.Add(control);
+            s.RunJobs();
+            s.Events.Rects.Clear();
+            s.Canvas.Children.Remove(control);
+            s.AssertRects(new Rect(30, 50, 20, 10));
+        }
+    }
+
+    [Fact]
+    public void Control_Should_Invalidate_Both_Own_Rects_When_Moved()
+    {
+        using (var s = new CompositorCanvas())
+        {
+            var control = new Border()
+            {
+                Background = Brushes.Red, Width = 20, Height = 10,
+                [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50
+            };
+            s.Canvas.Children.Add(control);
+            s.RunJobs();
+            s.Events.Rects.Clear();
+            control[Canvas.LeftProperty] = 55;
+            s.AssertRects(new Rect(30, 50, 20, 10),
+                new Rect(55, 50, 20, 10)
+            );
+        }
+    }
+
+    [Fact]
+    public void Control_Should_Invalidate_Child_Rects_When_Moved()
+    {
+        using (var s = new CompositorCanvas())
+        {
+            var control = new Decorator()
+            {
+                [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50,
+                Padding = new Thickness(10),
+                Child = new Border()
+                {
+                    Width = 20, Height = 10,
+                    Background = Brushes.Red
+                }
+            };
+            s.Canvas.Children.Add(control);
+            s.RunJobs();
+            s.Events.Rects.Clear();
+            control[Canvas.LeftProperty] = 55;
+            s.AssertRects(new Rect(40, 60, 20, 10),
+                new Rect(65, 60, 20, 10)
+            );
+        }
+    }
+
+    [Fact]
+    public void Control_Should_Invalidate_Child_Rects_When_Becomes_Invisible()
+    {
+        using (var s = new CompositorCanvas())
+        {
+            var control = new Decorator()
+            {
+                [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50,
+                Padding = new Thickness(10),
+                Child = new Border()
+                {
+                    Width = 20, Height = 10,
+                    Background = Brushes.Red
+                }
+            };
+            s.Canvas.Children.Add(control);
+            s.RunJobs();
+            s.Events.Rects.Clear();
+            control.IsVisible = false;
+            s.AssertRects(new Rect(40, 60, 20, 10));
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorTestsBase.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorTestsBase.cs
new file mode 100644
index 0000000000..fa722a23b8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorTestsBase.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using JetBrains.Annotations;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering;
+
+public class CompositorTestsBase
+{
+    public class DebugEvents : ICompositionTargetDebugEvents
+    {
+        public List<Rect> Rects = new();
+
+        public void RectInvalidated(Rect rc)
+        {
+            Rects.Add(rc);
+        }
+
+        public void Reset()
+        {
+            Rects.Clear();
+        }
+    }
+
+    public class ManualRenderTimer : IRenderTimer
+    {
+        public event Action<TimeSpan> Tick;
+        public bool RunsInBackground => false;
+        public void TriggerTick() => Tick?.Invoke(TimeSpan.Zero);
+        public Task TriggerBackgroundTick() => Task.Run(TriggerTick);
+    }
+
+    class TopLevelImpl : ITopLevelImpl
+    {
+        private readonly Compositor _compositor;
+        public CompositingRenderer Renderer { get; private set; }
+
+        public TopLevelImpl(Compositor compositor, Size clientSize)
+        {
+            ClientSize = clientSize;
+            _compositor = compositor;
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public Size ClientSize { get; }
+        public Size? FrameSize { get; }
+        public double RenderScaling => 1;
+        public IEnumerable<object> Surfaces { get; } = Array.Empty<object>();
+        public Action<RawInputEventArgs> Input { get; set; }
+        public Action<Rect> Paint { get; set; }
+        public Action<Size, PlatformResizeReason> Resized { get; set; }
+        public Action<double> ScalingChanged { get; set; }
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+
+        public IRenderer CreateRenderer(IRenderRoot root)
+        {
+            return Renderer = new CompositingRenderer(root, _compositor);
+        }
+
+        public void Invalidate(Rect rect)
+        {
+        }
+
+        public void SetInputRoot(IInputRoot inputRoot)
+        {
+        }
+
+        public Point PointToClient(PixelPoint point) => default;
+
+        public PixelPoint PointToScreen(Point point) => new();
+
+        public void SetCursor(ICursorImpl cursor)
+        {
+        }
+
+        public Action Closed { get; set; }
+        public Action LostFocus { get; set; }
+        public IMouseDevice MouseDevice { get; } = new MouseDevice();
+        public IPopupImpl CreatePopup() => throw new NotImplementedException();
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
+        {
+        }
+
+        public WindowTransparencyLevel TransparencyLevel { get; }
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; }
+    }
+
+    protected class CompositorServices : IDisposable
+    {
+        private readonly IDisposable _app;
+        public Compositor Compositor { get; }
+        public ManualRenderTimer Timer { get; } = new();
+        public EmbeddableControlRoot TopLevel { get; }
+        public CompositingRenderer Renderer { get; } = null!;
+        public DebugEvents Events { get; } = new();
+
+        public void Dispose()
+        {
+            TopLevel.Renderer.Stop();
+            TopLevel.Dispose();
+            _app.Dispose();
+        }
+
+        public CompositorServices(Size? size = null)
+        {
+            _app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+            try
+            {
+                AvaloniaLocator.CurrentMutable.Bind<IRenderTimer>().ToConstant(Timer);
+                AvaloniaLocator.CurrentMutable.Bind<IRenderLoop>()
+                    .ToConstant(new RenderLoop(Timer, Dispatcher.UIThread));
+
+                Compositor = new Compositor(AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(), null);
+                var impl = new TopLevelImpl(Compositor, size ?? new Size(1000, 1000));
+                TopLevel = new EmbeddableControlRoot(impl)
+                {
+                    Template = new FuncControlTemplate((parent, scope) =>
+                    {
+                        var presenter = new ContentPresenter
+                        {
+                            [~ContentPresenter.ContentProperty] = new TemplateBinding(ContentControl.ContentProperty)
+                        };
+                        scope.Register("PART_ContentPresenter", presenter);
+                        return presenter;
+                    })
+                };
+                Renderer = impl.Renderer;
+                TopLevel.Prepare();
+                TopLevel.Renderer.Start();
+                RunJobs();
+                Renderer.CompositionTarget.Server.DebugEvents = Events;
+            }
+            catch
+            {
+                _app.Dispose();
+                throw;
+            }
+        }
+
+        public void RunJobs()
+        {
+            Dispatcher.UIThread.RunJobs();
+            Timer.TriggerTick();
+            Dispatcher.UIThread.RunJobs();
+        }
+
+        public void AssertRects(params Rect[] rects)
+        {
+            RunJobs();
+            var toAssert = rects.Select(x => x.ToString()).Distinct().OrderBy(x => x);
+            var invalidated = Events.Rects.Select(x => x.ToString()).Distinct().OrderBy(x => x);
+            Assert.Equal(toAssert, invalidated);
+            Events.Rects.Clear();
+        }
+
+        public void AssertHitTest(double x, double y, Func<IVisual, bool> filter, params object[] expected)
+            => AssertHitTest(new Point(x, y), filter, expected);
+        public void AssertHitTest(Point pt, Func<IVisual, bool> filter, params object[] expected)
+        {
+            RunJobs();
+            var tested = Renderer.HitTest(pt, TopLevel, filter);
+            Assert.Equal(expected, tested);
+        }
+        
+        public void AssertHitTestFirst(Point pt, Func<IVisual, bool> filter, object expected)
+        {
+            RunJobs();
+            var tested = Renderer.HitTest(pt, TopLevel, filter).First();
+            Assert.Equal(expected, tested);
+        }
+    }
+
+
+    protected class CompositorCanvas : CompositorServices
+    {
+        public Canvas Canvas { get; } = new();
+
+        public CompositorCanvas()
+        {
+            TopLevel.Content = Canvas;
+            RunJobs();
+            Events.Reset();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CustomHitTestBorder.cs b/tests/Avalonia.Base.UnitTests/Rendering/CustomHitTestBorder.cs
new file mode 100644
index 0000000000..fece152713
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CustomHitTestBorder.cs
@@ -0,0 +1,16 @@
+using Avalonia.Controls;
+using Avalonia.Rendering;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    internal class CustomHitTestBorder : Border, ICustomHitTest
+    {
+        public bool HitTest(Point point)
+        {
+            // Move hit testing window halfway to the left
+            return Bounds
+                .WithX(Bounds.X - Bounds.Width / 2)  
+                .Contains(point);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs
new file mode 100644
index 0000000000..c345b9a7ea
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs
@@ -0,0 +1,779 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Avalonia.Media.Imaging;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class DeferredRendererTests
+    {
+        [Fact]
+        public void First_Frame_Calls_SceneBuilder_UpdateAll()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot();
+                var sceneBuilder = MockSceneBuilder(root);
+
+                CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
+
+                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
+            }
+        }
+
+        [Fact]
+        public void Frame_Does_Not_Call_SceneBuilder_If_No_Dirty_Controls()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+                var root = new TestRoot();
+                var sceneBuilder = MockSceneBuilder(root);
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder.Object);
+
+                target.Start();
+                IgnoreFirstFrame(target, sceneBuilder);
+                RunFrame(target);
+
+                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()), Times.Never);
+                sceneBuilder.Verify(x => x.Update(It.IsAny<Scene>(), It.IsAny<Visual>()), Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Dirty_Controls_In_Order()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Border border;
+                Decorator decorator;
+                Canvas canvas;
+
+                var root = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border { Child = canvas = new Canvas() }
+                    }
+                };
+
+                var sceneBuilder = MockSceneBuilder(root);
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder.Object,
+                    dispatcher: dispatcher);
+
+                target.Start();
+                IgnoreFirstFrame(target, sceneBuilder);
+                target.AddDirty(border);
+                target.AddDirty(canvas);
+                target.AddDirty(root);
+                target.AddDirty(decorator);
+
+                var result = new List<IVisual>();
+
+                sceneBuilder.Setup(x => x.Update(It.IsAny<Scene>(), It.IsAny<IVisual>()))
+                    .Callback<Scene, IVisual>((_, v) => result.Add(v));
+
+                RunFrame(target);
+
+                Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
+            }
+        }
+
+        [Fact]
+        public void Should_Add_Dirty_Rect_On_Child_Remove()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator decorator;
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border { Width = 50, Height = 50, Background = Brushes.Red, },
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                decorator.Child = null;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(decorator);
+                var dirty = scene.Layers[0].Dirty.ToList();
+
+                Assert.Equal(1, dirty.Count);
+                Assert.Equal(new Rect(25, 25, 50, 50), dirty[0]);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_Child_Remove_Insert()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                stack.Children.Remove(canvas2);
+                stack.Children.Insert(0, canvas2);
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_Child_Move()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                stack.Children.Move(1, 0);
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_ZIndex_Change()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children =
+                        {
+                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
+                        }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                canvas1.ZIndex = 3;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_ZIndex_Change_With_Dirty_Ancestor()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children =
+                        {
+                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
+                        }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                root.InvalidateVisual();
+                canvas1.ZIndex = 3;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            (moveFrom = new Decorator { Child = moveMe = new Canvas(), }),
+                            (moveTo = new Decorator()),
+                        }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent_And_New_Root()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children = { (moveFrom = new Decorator { Child = moveMe = new Canvas(), }) }
+                    }
+                };
+
+                var otherRoot = new TestRoot { Child = new StackPanel { Children = { (moveTo = new Decorator()) } } };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                var otherSceneBuilder = new SceneBuilder();
+
+                var otherTarget = new DeferredRenderer(
+                    otherRoot,
+                    loop.Object,
+                    sceneBuilder: otherSceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                otherRoot.Renderer = otherTarget;
+
+                target.Start();
+                otherTarget.Start();
+
+                RunFrame(target);
+                RunFrame(otherTarget);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+
+                RunFrame(target);
+                RunFrame(otherTarget);
+
+                var scene = target.UnitTestScene();
+                var otherScene = otherTarget.UnitTestScene();
+
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)otherScene.FindNode(moveTo);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Push_Opacity_For_Controls_With_Less_Than_1_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot
+                {
+                    Width = 100, Height = 100, Child = new Border { Background = Brushes.Red, Opacity = 0.5, }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, root);
+                var animation = new BehaviorSubject<double>(0.5);
+
+                context.Verify(x => x.PushOpacity(0.5), Times.Once);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
+                context.Verify(x => x.PopOpacity(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Draw_Controls_With_0_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
+                    {
+                        Background = Brushes.Red,
+                        Opacity = 0,
+                        Child = new Border { Background = Brushes.Green, }
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, root);
+                var animation = new BehaviorSubject<double>(0.5);
+
+                context.Verify(x => x.PushOpacity(0.5), Times.Never);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Never);
+                context.Verify(x => x.PopOpacity(), Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Should_Push_Opacity_Mask()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border { Background = Brushes.Red, OpacityMask = Brushes.Green, }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, root);
+                var animation = new BehaviorSubject<double>(0.5);
+
+                context.Verify(x => x.PushOpacityMask(Brushes.Green, new Rect(0, 0, 100, 100)), Times.Once);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
+                context.Verify(x => x.PopOpacityMask(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Should_Create_Layer_For_Root()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot();
+                var rootLayer = new Mock<IRenderTargetBitmapImpl>();
+
+                var sceneBuilder = new Mock<ISceneBuilder>();
+
+                sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
+                    .Callback<Scene>(scene =>
+                    {
+                        scene.Size = root.ClientSize;
+                        scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
+                    });
+
+                var renderInterface = new Mock<IPlatformRenderInterface>();
+                var target = CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
+
+                Assert.Single(target.Layers);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Create_And_Delete_Layers_For_Controls_With_Animated_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
+                    {
+                        Background = Brushes.Red,
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Green, Child = new Canvas(), Opacity = 0.9,
+                        }
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var timer = new Mock<IRenderTimer>();
+                var target = CreateTargetAndRunFrame(root, timer);
+
+                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                RunFrame(target);
+
+                Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
+
+                animation.OnCompleted();
+                RunFrame(target);
+
+                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Not_Create_Layer_For_Childless_Control_With_Animated_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
+                    {
+                        Background = Brushes.Red, Child = border = new Border { Background = Brushes.Green, }
+                    }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var timer = new Mock<IRenderTimer>();
+                var target = CreateTargetAndRunFrame(root, timer);
+
+                Assert.Single(target.Layers);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Not_Push_Opacity_For_Transparent_Layer_Root_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, border);
+
+                context.Verify(x => x.PushOpacity(0.5), Times.Never);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
+                context.Verify(x => x.PopOpacity(), Times.Never);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Draw_Transparent_Layer_With_Correct_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = Mock.Get(target.RenderTarget.CreateDrawingContext(null));
+                var borderLayer = target.Layers[border].Bitmap;
+
+                context.Verify(x => x.DrawBitmap(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>(),
+                    BitmapInterpolationMode.Default));
+            }
+        }
+
+        [Fact]
+        public void Can_Dirty_Control_In_SceneInvalidated()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border1;
+                Border border2;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            (border1 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
+                            (border2 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
+                        }
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var invalidated = false;
+
+                target.SceneInvalidated += (s, e) =>
+                {
+                    invalidated = true;
+                    target.AddDirty(border2);
+                };
+
+                target.AddDirty(border1);
+                target.Paint(new Rect(root.DesiredSize));
+
+                Assert.True(invalidated);
+                Assert.True(((IRenderLoopTask)target).NeedsUpdate);
+            }
+        }
+
+        private DeferredRenderer CreateTargetAndRunFrame(
+            TestRoot root,
+            Mock<IRenderTimer> timer = null,
+            ISceneBuilder sceneBuilder = null,
+            IDispatcher dispatcher = null)
+        {
+            timer = timer ?? new Mock<IRenderTimer>();
+            dispatcher = dispatcher ?? new ImmediateDispatcher();
+            var target = new DeferredRenderer(
+                root,
+                new RenderLoop(timer.Object, dispatcher),
+                sceneBuilder: sceneBuilder,
+                dispatcher: dispatcher);
+            root.Renderer = target;
+            target.Start();
+            RunFrame(target);
+            return target;
+        }
+
+        private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
+        {
+            return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
+        }
+
+        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
+        {
+            RunFrame(task);
+            sceneBuilder.Invocations.Clear();
+        }
+
+        private void RunFrame(IRenderLoopTask task)
+        {
+            task.Update(TimeSpan.Zero);
+            task.Render();
+        }
+
+        private IRenderTargetBitmapImpl CreateLayer()
+        {
+            return Mock.Of<IRenderTargetBitmapImpl>(x =>
+                x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
+        }
+
+        private Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
+        {
+            var result = new Mock<ISceneBuilder>();
+            result.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
+                .Callback<Scene>(x => x.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)));
+            return result;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
new file mode 100644
index 0000000000..d3fdbb63db
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -0,0 +1,577 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class DeferredRendererTests_HitTesting
+    {
+        [Fact]
+        public void HitTest_Should_Find_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { root.Child }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Empty_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                Border visible;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        IsVisible = false,
+                        Child = visible = new Border
+                        {
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Stretch,
+                            VerticalAlignment = VerticalAlignment.Stretch,
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
+
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { container.Children[1], container.Children[0] }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 75,
+                                Height = 75,
+                                ZIndex = 2,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { container.Children[2], container.Children[0], container.Children[1] }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        ClipToBounds = false,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Top,
+                                Child = target = new Border
+                                {
+                                    Width = 50,
+                                    Height = 50,
+                                    Background = Brushes.Red,
+                                    HorizontalAlignment = HorizontalAlignment.Left,
+                                    VerticalAlignment = VerticalAlignment.Top,
+                                    RenderTransform = new TranslateTransform(110, 110),
+                                }
+                            },
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
+
+                Assert.Equal(new IVisual[] { target, container }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            new Panel()
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                ClipToBounds = true,
+                                Children =
+                                {
+                                    (target = new Border()
+                                    {
+                                        Width = 100,
+                                        Height = 100,
+                                        Background = Brushes.Red,
+                                        Margin = new Thickness(0, -100, 0, 0)
+                                    })
+                                }
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
+
+                Assert.Equal(new[] { container }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Border item1;
+                Border item2;
+                ScrollContentPresenter scroll;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            (target = new Border()
+                            {
+                                Name = "b1",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                            }),
+                            new Border()
+                            {
+                                Name = "b2",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                Child = scroll = new ScrollContentPresenter()
+                                {
+                                    CanHorizontallyScroll = true,
+                                    CanVerticallyScroll = true,
+                                    Content = new StackPanel()
+                                    {
+                                        Children =
+                                        {
+                                            (item1 = new Border()
+                                            {
+                                                Name = "b3",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                            (item2 = new Border()
+                                            {
+                                                Name = "b4",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+
+                scroll.UpdateChild();
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                
+                root.Renderer.Paint(Rect.Empty);
+                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+
+                Assert.Equal(item1, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+
+                Assert.Equal(target, result);
+
+                scroll.Offset = new Vector(0, 100);
+
+                // We don't have LayoutManager set up so do the layout pass manually.
+                scroll.Parent.InvalidateArrange();
+                container.InvalidateArrange();
+                container.Arrange(new Rect(container.DesiredSize));
+
+                root.Renderer.Paint(Rect.Empty);
+                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+                Assert.Equal(item2, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+                Assert.Equal(target, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Path_When_Outside_Fill()
+        {
+            using (TestApplication())
+            {
+                Path path;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = path = new Path
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Fill = Brushes.Red,
+                        Data = StreamGeometry.Parse("M100,0 L0,100 100,100")
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+                Assert.Equal(new[] { path }, result);
+
+                result = root.Renderer.HitTest(new Point(10, 10), root, null);
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Respect_Geometry_Clip()
+        {
+            using (TestApplication())
+            {
+                Border border;
+                Canvas canvas;
+                var root = new TestRoot
+                {
+                    Width = 400,
+                    Height = 400,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Red,
+                        Clip = StreamGeometry.Parse("M100,0 L0,100 100,100"),
+                        Width = 200,
+                        Height = 200,
+                        Child = canvas = new Canvas
+                        {
+                            Background = Brushes.Yellow,
+                            Margin = new Thickness(10),
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                Assert.Equal(new Rect(100, 100, 200, 200), border.Bounds);
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+
+                var result = root.Renderer.HitTest(new Point(200, 200), root, null);
+                Assert.Equal(new IVisual[] { canvas, border }, result);
+
+                result = root.Renderer.HitTest(new Point(110, 110), root, null);
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Accommodate_ICustomHitTest()
+        {
+            using (TestApplication())
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 300,
+                    Height = 200,
+                    Child = border = new CustomHitTestBorder
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }; 
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(75, 100), root, null);
+                Assert.Equal(new[] { border }, result);
+
+                result = root.Renderer.HitTest(new Point(125, 100), root, null);
+                Assert.Equal(new[] { border }, result);
+
+                result = root.Renderer.HitTest(new Point(175, 100), root, null);
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Hit_Controls_Next_Pixel()
+        {
+            using (TestApplication())
+            {
+                Border targetRectangle;
+
+                var root = new TestRoot
+                {
+                    Width = 50,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Orientation = Orientation.Vertical,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        Children =
+                            {
+                                new Border { Width = 50, Height = 50, Background = Brushes.Red},
+                                { targetRectangle = new Border { Width = 50, Height = 50, Background = Brushes.Green} }
+                            }
+                    }
+                }; 
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(25, 50), root, null);
+                Assert.Equal(new[] { targetRectangle }, result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests.cs
new file mode 100644
index 0000000000..84bb9b00cd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests.cs
@@ -0,0 +1,320 @@
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class ImmediateRendererTests
+    {
+        [Fact]
+        public void AddDirty_Call_RenderRoot_Invalidate()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var visual = new Mock<Visual>();
+                var child = new Mock<Visual>() { CallBase = true };
+                var renderRoot = visual.As<IRenderRoot>();
+
+                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
+
+                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(10, 10, 100, 100));
+                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
+
+                var target = new ImmediateRenderer(visual.Object);
+
+                target.AddDirty(child.Object);
+
+                renderRoot.Verify(v => v.Invalidate(new Rect(10, 10, 100, 100)));
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void AddDirty_With_RenderTransform_Call_RenderRoot_Invalidate()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var visual = new Mock<Visual>();
+                var child = new Mock<Visual>() { CallBase = true };
+                var renderRoot = visual.As<IRenderRoot>();
+
+                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
+
+                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(100, 100, 100, 100));
+                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
+                child.Object.RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 };
+
+                var target = new ImmediateRenderer(visual.Object);
+
+                target.AddDirty(child.Object);
+
+                renderRoot.Verify(v => v.Invalidate(new Rect(50, 50, 200, 200)));
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void AddDirty_For_Child_Moved_Should_Invalidate_Previous_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var visual = new Mock<Visual>() { CallBase = true };
+                var child = new Mock<Visual>() { CallBase = true };
+                var renderRoot = visual.As<IRenderRoot>();
+                var renderTarget = visual.As<IRenderTarget>();
+
+                renderRoot.Setup(r => r.CreateRenderTarget()).Returns(renderTarget.Object);
+
+                renderTarget.Setup(r => r.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()))
+                    .Returns(Mock.Of<IDrawingContextImpl>());
+
+                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
+
+                visual.As<IVisual>().Setup(v => v.VisualChildren)
+                    .Returns(new AvaloniaList<IVisual>() { child.As<IVisual>().Object });
+
+                Rect childBounds = new Rect(0, 0, 100, 100);
+                child.As<IVisual>().Setup(v => v.Bounds).Returns(() => childBounds);
+                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
+                child.As<IVisual>().Setup(v => v.VisualChildren).Returns(new AvaloniaList<IVisual>());
+
+                var invalidationCalls = new List<Rect>();
+
+                renderRoot.Setup(v => v.Invalidate(It.IsAny<Rect>())).Callback<Rect>(v => invalidationCalls.Add(v));
+
+                var target = new ImmediateRenderer(visual.Object);
+
+                target.AddDirty(child.Object);
+
+                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[0]);
+
+                target.Paint(new Rect(0, 0, 100, 100));
+
+                //move child 100 pixels bottom/right
+                childBounds = new Rect(100, 100, 100, 100);
+
+                //renderer should invalidate old child bounds with new one
+                //as on old area there can be artifacts
+                target.AddDirty(child.Object);
+
+                //invalidate first old position
+                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[1]);
+
+                //then new position
+                Assert.Equal(new Rect(100, 100, 100, 100), invalidationCalls[2]);
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void Should_Render_Child_In_Parent_With_RenderTransform()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var targetMock = new Mock<Control>() { CallBase = true };
+                var target = targetMock.Object;
+                target.Width = 100;
+                target.Height = 50;
+
+                var child = new Panel()
+                {
+                    RenderTransform = new RotateTransform() { Angle = 90 },
+                    Children = { new Panel() { Children = { target } } }
+                };
+
+                var visualTarget = targetMock.As<IVisual>();
+                int rendered = 0;
+                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
+
+                var root = new TestRoot(child);
+                root.Renderer = new ImmediateRenderer(root);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                root.Measure(new Size(50, 100));
+                root.Arrange(new Rect(new Size(50, 100)));
+
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.Equal(1, rendered);
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void Should_Render_Child_In_Parent_With_RenderTransform2()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var targetMock = new Mock<Control>() { CallBase = true };
+                var target = targetMock.Object;
+
+                target.Width = 100;
+                target.Height = 50;
+                target.HorizontalAlignment = HorizontalAlignment.Center;
+                target.VerticalAlignment = VerticalAlignment.Center;
+
+                var child = new Panel()
+                {
+                    RenderTransform = new RotateTransform() { Angle = 90 },
+                    Children = { new Panel() { Children = { target } } }
+                };
+
+                var visualTarget = targetMock.As<IVisual>();
+                int rendered = 0;
+                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
+
+                var root = new TestRoot(child);
+                root.Renderer = new ImmediateRenderer(root);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                root.Measure(new Size(300, 100));
+                root.Arrange(new Rect(new Size(300, 100)));
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.Equal(1, rendered);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Clip_Children_With_RenderTransform_When_In_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                const int RootWidth = 300;
+                const int RootHeight = 300;
+
+                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
+
+                var stackPanel = new StackPanel
+                {
+                    Orientation = Orientation.Horizontal,
+                    VerticalAlignment = VerticalAlignment.Top,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    Margin = new Thickness(0, 10, 0, 0),
+                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
+                    RenderTransform = new TransformGroup
+                    {
+                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 240 } }
+                    }
+                };
+
+                rootGrid.Children.Add(stackPanel);
+
+                TestControl CreateControl()
+                    => new TestControl
+                    {
+                        Width = 80, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
+                    };
+
+                var control1 = CreateControl();
+                var control2 = CreateControl();
+                var control3 = CreateControl();
+
+                stackPanel.Children.Add(control1);
+                stackPanel.Children.Add(control2);
+                stackPanel.Children.Add(control3);
+
+                var root = new TestRoot(rootGrid);
+                root.Renderer = new ImmediateRenderer(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var rootSize = new Size(RootWidth, RootHeight);
+                root.Measure(rootSize);
+                root.Arrange(new Rect(rootSize));
+
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.True(control1.Rendered);
+                Assert.True(control2.Rendered);
+                Assert.True(control3.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Render_Clipped_Child_With_RenderTransform_When_Not_In_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                const int RootWidth = 300;
+                const int RootHeight = 300;
+
+                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
+
+                var stackPanel = new StackPanel
+                {
+                    Orientation = Orientation.Horizontal,
+                    VerticalAlignment = VerticalAlignment.Top,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    Margin = new Thickness(0, 10, 0, 0),
+                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
+                    RenderTransform = new TransformGroup
+                    {
+                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 280 } }
+                    }
+                };
+
+                rootGrid.Children.Add(stackPanel);
+
+                TestControl CreateControl()
+                    => new TestControl
+                    {
+                        Width = 160, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
+                    };
+
+                var control1 = CreateControl();
+                var control2 = CreateControl();
+                var control3 = CreateControl();
+
+                stackPanel.Children.Add(control1);
+                stackPanel.Children.Add(control2);
+                stackPanel.Children.Add(control3);
+
+                var root = new TestRoot(rootGrid);
+                root.Renderer = new ImmediateRenderer(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var rootSize = new Size(RootWidth, RootHeight);
+                root.Measure(rootSize);
+                root.Arrange(new Rect(rootSize));
+
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.True(control1.Rendered);
+                Assert.True(control2.Rendered);
+                Assert.False(control3.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Static_Render_Method_Does_Not_Update_TransformedBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new Border();
+                var expected = new TransformedBounds(new Rect(1, 2, 3, 4), new Rect(4, 5, 6, 7), Matrix.CreateRotation(0.8));
+
+                ((IVisual)target).TransformedBounds = expected;
+
+                var renderTarget = Mock.Of<IRenderTarget>(x => 
+                    x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
+                ImmediateRenderer.Render(target, renderTarget);
+
+                Assert.Equal(expected, target.TransformedBounds);
+            }
+        }
+
+        private class TestControl : Control
+        {
+            public bool Rendered { get; private set; }
+
+            public override void Render(DrawingContext context)
+                => Rendered = true;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
new file mode 100644
index 0000000000..1a9822e259
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -0,0 +1,458 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class ImmediateRendererTests_HitTesting
+    {
+        [Fact]
+        public void HitTest_Should_Find_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { root.Child, root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                Border visible;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        IsVisible = false,
+                        Child = visible = new Border
+                        {
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Stretch,
+                            VerticalAlignment = VerticalAlignment.Stretch,
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
+
+                Assert.Equal(new[] { root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { container.Children[1], container.Children[0], container, root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 75,
+                                Height = 75,
+                                ZIndex = 2,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(
+                    new[] 
+                    {
+                        container.Children[2],
+                        container.Children[0],
+                        container.Children[1],
+                        container,
+                        root
+                    }, 
+                    result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        ClipToBounds = false,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Top,
+                                Child = target = new Border
+                                {
+                                    Width = 50,
+                                    Height = 50,
+                                    Background = Brushes.Red,
+                                    HorizontalAlignment = HorizontalAlignment.Left,
+                                    VerticalAlignment = VerticalAlignment.Top,
+                                    RenderTransform = new TranslateTransform(110, 110),
+                                }
+                            },
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
+
+                Assert.Equal(new IVisual[] { target, container }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            new Panel()
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                ClipToBounds = true,
+                                Children =
+                                {
+                                    (target = new Border()
+                                    {
+                                        Width = 100,
+                                        Height = 100,
+                                        Background = Brushes.Red,
+                                        Margin = new Thickness(0, -100, 0, 0)
+                                    })
+                                }
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
+
+                Assert.Equal(new IVisual[] { container, root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Border item1;
+                Border item2;
+                ScrollContentPresenter scroll;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            (target = new Border()
+                            {
+                                Name = "b1",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                            }),
+                            new Border()
+                            {
+                                Name = "b2",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                Child = scroll = new ScrollContentPresenter()
+                                {
+                                    CanHorizontallyScroll = true,
+                                    CanVerticallyScroll = true,
+                                    Content = new StackPanel()
+                                    {
+                                        Children =
+                                        {
+                                            (item1 = new Border()
+                                            {
+                                                Name = "b3",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                            (item2 = new Border()
+                                            {
+                                                Name = "b4",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+
+                scroll.UpdateChild();
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+
+                Assert.Equal(item1, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+
+                Assert.Equal(target, result);
+
+                scroll.Offset = new Vector(0, 100);
+
+                // We don't have LayoutManager set up so do the layout pass manually.
+                scroll.Parent.InvalidateArrange();
+                container.InvalidateArrange();
+                container.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+                Assert.Equal(item2, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+                Assert.Equal(target, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Accommodate_ICustomHitTest()
+        {
+            using (TestApplication())
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 300,
+                    Height = 200,
+                    Child = border = new CustomHitTestBorder
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(75, 100), root, null).First();
+                Assert.Equal(border, result);
+
+                result = root.Renderer.HitTest(new Point(125, 100), root, null).First();
+                Assert.Equal(border, result);
+
+                result = root.Renderer.HitTest(new Point(175, 100), root, null).First();
+                Assert.Equal(root, result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/RenderLoopTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/RenderLoopTests.cs
new file mode 100644
index 0000000000..6855a378b4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/RenderLoopTests.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Rendering;
+using Avalonia.Threading;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class RenderLoopTests
+    {
+        [Fact]
+        public void RenderLoop_Update_Runs_On_Dispatcher()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+
+            bool inDispatcher = false;
+
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) =>
+                {
+                    inDispatcher = true;
+                    a();
+                    inDispatcher = false;
+                });
+
+            var timer = new Mock<IRenderTimer>();
+
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+
+            var renderTask = new Mock<IRenderLoopTask>();
+
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+            renderTask.Setup(t => t.Update(It.IsAny<TimeSpan>()))
+                .Callback((TimeSpan _) => Assert.True(inDispatcher));
+
+            loop.Add(renderTask.Object);
+
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
+        }
+
+        [Fact]
+        public void RenderLoop_Does_Not_Update_When_No_Tasks_Need_Update()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            dispatcher.Setup(
+                d => d.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) => a())
+                .Returns(Task.CompletedTask);
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+            var renderTask = new Mock<IRenderLoopTask>();
+            renderTask.Setup(t => t.NeedsUpdate).Returns(false);
+
+            loop.Add(renderTask.Object);
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+            
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Never());
+        }
+
+        [Fact]
+        public void RenderLoop_Render_Runs_Off_Dispatcher()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            bool inDispatcher = false;
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) =>
+                {
+                    inDispatcher = true;
+                    a();
+                    inDispatcher = false;
+                });
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+
+            var renderTask = new Mock<IRenderLoopTask>();
+
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+            renderTask.Setup(t => t.Render())
+                .Callback(() => Assert.False(inDispatcher));
+
+            loop.Add(renderTask.Object);
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
+        }
+        
+        [Fact]
+        public void RenderLoop_Passes_Tick_Count_To_Update()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) => a());
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+            var renderTask = new Mock<IRenderLoopTask>();
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+
+            loop.Add(renderTask.Object);
+            var time = new TimeSpan(123456789L);
+            timer.Raise(t => t.Tick += null, time);
+
+            renderTask.Verify(t => t.Update(time), Times.Once());
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
new file mode 100644
index 0000000000..8f307978f2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -0,0 +1,225 @@
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class DeferredDrawingContextImplTests
+    {
+        [Fact]
+        public void Should_Add_VisualNode()
+        {
+            var parent = new VisualNode(new TestRoot(), null);
+            var child = new VisualNode(Mock.Of<IVisual>(), parent);
+            var layers = new SceneLayers(parent.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            target.BeginUpdate(parent);
+            target.BeginUpdate(child);
+
+            Assert.Equal(1, parent.Children.Count);
+            Assert.Same(child, parent.Children[0]);
+        }
+
+        [Fact]
+        public void Should_Not_Replace_Identical_VisualNode()
+        {
+            var parent = new VisualNode(new TestRoot(), null);
+            var child = new VisualNode(Mock.Of<IVisual>(), parent);
+            var layers = new SceneLayers(parent.Visual);
+
+            parent.AddChild(child);
+
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            target.BeginUpdate(parent);
+            target.BeginUpdate(child);
+
+            Assert.Equal(1, parent.Children.Count);
+            Assert.Same(child, parent.Children[0]);
+        }
+
+        [Fact]
+        public void Should_Replace_Different_VisualNode()
+        {
+            var parent = new VisualNode(new TestRoot(), null);
+            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var layers = new SceneLayers(parent.Visual);
+
+            parent.AddChild(child1);
+
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            target.BeginUpdate(parent);
+            target.BeginUpdate(child2);
+
+            Assert.Equal(1, parent.Children.Count);
+            Assert.Same(child2, parent.Children[0]);
+        }
+
+        [Fact]
+        public void TrimChildren_Should_Trim_Children()
+        {
+            var root = new TestRoot();
+            var node = new VisualNode(root, null) { LayerRoot = root };
+
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+
+            var layers = new SceneLayers(root);
+            var target = new DeferredDrawingContextImpl(null, layers);
+            var child1 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
+            var child2 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
+
+            target.BeginUpdate(node);
+            using (target.BeginUpdate(child1)) { }
+            using (target.BeginUpdate(child2)) { }
+            target.TrimChildren();
+
+            Assert.Equal(2, node.Children.Count);
+        }
+
+        [Fact]
+        public void Should_Add_DrawOperations()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Red, new Pen(Brushes.Green, 1), new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void Should_Not_Replace_Identical_DrawOperation()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.Same(operation.Item, node.DrawOperations.Single().Item);
+
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void Should_Replace_Different_DrawOperation()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.NotSame(operation, node.DrawOperations.Single());
+
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void Should_Update_DirtyRects()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default);
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(new Rect(0, 0, 100, 100), layers.Single().Dirty.Single());
+        }
+
+        [Fact]
+        public void Should_Trim_DrawOperations()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            node.LayerRoot = node.Visual;
+
+            for (var i = 0; i < 4; ++i)
+            {
+                var drawOperation = new Mock<IDrawOperation>();
+                using (var r = RefCountable.Create(drawOperation.Object))
+                {
+                    node.AddDrawOperation(r);
+                }
+            }
+
+            var drawOperations = node.DrawOperations.Select(op => op.Item).ToList();
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 10, 100));
+                target.DrawRectangle(Brushes.Blue, null, new Rect(0, 0, 20, 100));
+            }
+
+            Assert.Equal(2, node.DrawOperations.Count);
+
+            foreach (var i in drawOperations)
+            {
+                Mock.Get(i).Verify(x => x.Dispose());
+            }
+        }
+
+        [Fact]
+        public void Trimmed_DrawOperations_Releases_Reference()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+            Assert.Equal(2, operation.RefCount);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.NotSame(operation, node.DrawOperations.Single());
+            Assert.Equal(1, operation.RefCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
new file mode 100644
index 0000000000..2fac968206
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
@@ -0,0 +1,102 @@
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{  
+    public class DrawOperationTests
+    {
+        [Fact]
+        public void Empty_Bounds_Remain_Empty()
+        {
+            var target = new TestDrawOperation(Rect.Empty, Matrix.Identity, null);
+
+            Assert.Equal(Rect.Empty, target.Bounds);
+        }
+
+        [Theory]
+        [InlineData(10, 10, 10, 10, 1, 1, 1, 9, 9, 12, 12)]
+        [InlineData(10, 10, 10, 10, 1, 1, 2, 9, 9, 12, 12)]
+        [InlineData(10, 10, 10, 10, 1.5, 1.5, 1, 14, 14, 17, 17)]
+        public void Rectangle_Bounds_Are_Snapped_To_Pixels(
+            double x,
+            double y,
+            double width,
+            double height,
+            double scaleX,
+            double scaleY,
+            double? penThickness,
+            double expectedX,
+            double expectedY,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestRectangleDrawOperation(
+                new Rect(x, y, width, height),
+                Matrix.CreateScale(scaleX, scaleY),
+                penThickness.HasValue ? new Pen(Brushes.Black, penThickness.Value) : null);
+            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), target.Bounds);
+        }
+
+        [Fact]
+        public void Image_Node_Releases_Reference_To_Bitmap_On_Dispose()
+        {
+            var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+            var imageNode = new ImageNode(
+                Matrix.Identity,
+                bitmap,
+                1,
+                new Rect(1, 1, 1, 1),
+                new Rect(1, 1, 1, 1),
+                BitmapInterpolationMode.Default);
+
+            Assert.Equal(2, bitmap.RefCount);
+
+            imageNode.Dispose();
+
+            Assert.Equal(1, bitmap.RefCount);
+        }
+
+        [Fact]
+        public void HitTest_On_Geometry_Node_With_Zero_Transform_Does_Not_Throw()
+        {
+            var geometry = Mock.Of<IGeometryImpl>();
+            var geometryNode = new GeometryNode(
+                new Matrix(),
+                Brushes.Black,
+                null,
+                geometry, default);
+
+            geometryNode.HitTest(new Point());
+        }
+
+        private class TestRectangleDrawOperation : RectangleNode
+        {
+            public TestRectangleDrawOperation(Rect bounds, Matrix transform, Pen pen) 
+                : base(transform, pen.Brush, pen, bounds, new BoxShadows())
+            {
+
+            }
+
+            public override bool HitTest(Point p) => false;
+
+            public override void Render(IDrawingContextImpl context) { }
+        }
+
+        private class TestDrawOperation : DrawOperation
+        {
+            public TestDrawOperation(Rect bounds, Matrix transform, Pen pen)
+                :base(bounds, transform)
+            {
+            }
+
+            public override bool HitTest(Point p) => false;
+
+            public override void Render(IDrawingContextImpl context) { }
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs
rename to tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/LineNodeTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/LineNodeTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/LineNodeTests.cs
rename to tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/LineNodeTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
new file mode 100644
index 0000000000..502575702a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -0,0 +1,1087 @@
+using System.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public partial class SceneBuilderTests
+    {
+        [Fact]
+        public void Should_Build_Initial_Scene()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                TextBlock textBlock;
+                var tree = new TestRoot
+                {
+                    Child = border = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        Child = textBlock = new TextBlock
+                        {
+                            TextWrapping = TextWrapping.NoWrap,
+                            Text = "Hello World",
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                Assert.Same(tree, ((VisualNode)result.Root).LayerRoot);
+                Assert.Equal(1, result.Root.Children.Count);
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Same(borderNode, result.FindNode(border));
+                Assert.Same(border, borderNode.Visual);
+                Assert.Equal(1, borderNode.Children.Count);
+                Assert.Equal(1, borderNode.DrawOperations.Count);
+
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
+                Assert.Equal(Brushes.Red, backgroundNode.Brush);
+
+                var textBlockNode = borderNode.Children[0];
+                Assert.Same(textBlockNode, result.FindNode(textBlock));
+                Assert.Same(textBlock, textBlockNode.Visual);
+                Assert.Equal(1, textBlockNode.DrawOperations.Count);
+
+                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
+                Assert.NotNull(textNode.GlyphRun);
+            }
+        }
+
+        [Fact]
+        public void Should_Respect_Margin_For_ClipBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = new Border
+                    {
+                        Margin = new Thickness(10, 20, 30, 40),
+                        Child = canvas = new Canvas
+                        {
+                            ClipToBounds = true,
+                            Background = Brushes.AliceBlue,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var canvasNode = result.FindNode(canvas);
+                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
+
+                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
+                result = result.CloneScene();
+                Assert.True(sceneBuilder.Update(result, canvas));
+
+                canvasNode = result.FindNode(canvas);
+                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void ClipBounds_Should_Be_Intersection_With_Parent_ClipBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = new Canvas
+                    {
+                        ClipToBounds = true,
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Children =
+                        {
+                            (border = new Border
+                            {
+                                Background = Brushes.AliceBlue,
+                                ClipToBounds = true,
+                                Width = 100,
+                                Height = 100,
+                                [Canvas.LeftProperty] = 50,
+                                [Canvas.TopProperty] = 50,
+                            })
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Descendent_ClipBounds_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = canvas = new Canvas
+                    {
+                        ClipToBounds = true,
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Children =
+                        {
+                            (border = new Border
+                            {
+                                Background = Brushes.AliceBlue,
+                                ClipToBounds = true,
+                                Width = 100,
+                                Height = 100,
+                                [Canvas.LeftProperty] = 50,
+                                [Canvas.TopProperty] = 50,
+                            })
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+
+                canvas.Width = canvas.Height = 125;
+                canvas.Measure(Size.Infinity);
+                canvas.Arrange(new Rect(tree.DesiredSize));
+
+                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
+                scene = scene.CloneScene();
+                Assert.True(sceneBuilder.Update(scene, canvas));
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 75, 75), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Respect_ZIndex()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border front;
+                Border back;
+                var tree = new TestRoot
+                {
+                    Child = new Panel
+                    {
+                        Children =
+                        {
+                            (front = new Border
+                            {
+                                ZIndex = 1,
+                            }),
+                            (back = new Border
+                            {
+                                ZIndex = 0,
+                            }),
+                        }
+                    }
+                };
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var panelNode = result.FindNode(tree.Child);
+                var expected = new IVisual[] { back, front };
+                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void Should_Respect_Uniform_ZIndex()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Panel panel;
+
+                var tree = new TestRoot
+                {
+                    Child = panel = new Panel()
+                };
+
+                for (var i = 0; i < 128; i++)
+                {
+                    panel.Children.Add(new Border());
+                }
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var panelNode = result.FindNode(tree.Child);
+                var expected = panel.Children.ToArray();
+                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void ClipBounds_Should_Be_In_Global_Coordinates()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border target;
+                var tree = new TestRoot
+                {
+                    Child = new Decorator
+                    {
+                        Margin = new Thickness(24, 26),
+                        Child = target = new Border
+                        {
+                            ClipToBounds = true,
+                            Margin = new Thickness(26, 24),
+                            Width = 100,
+                            Height = 100,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var targetNode = result.FindNode(target);
+
+                Assert.Equal(new Rect(50, 50, 100, 100), targetNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Transform_For_Control_With_RenderTransform_Should_Be_Correct_After_Update()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 400,
+                    Height = 200,
+                    Child = new Decorator
+                    {
+                        Width = 200,
+                        Height = 100,
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Right,
+                            Width = 100,
+                            RenderTransform = new ScaleTransform(0.5, 1),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var expectedTransform = Matrix.CreateScale(0.5, 1) * Matrix.CreateTranslation(225, 50);
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(expectedTransform, borderNode.Transform);
+
+                scene = scene.CloneScene();
+                Assert.True(sceneBuilder.Update(scene, border));
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(expectedTransform, borderNode.Transform);
+            }
+        }
+
+        [Fact]
+        public void MirrorTransform_For_Control_With_RenderTransform_Should_Be_Correct()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 400,
+                    Height = 200,
+                    Child = border = new Border
+                    {
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        Background = Brushes.Red,
+                        Width = 100,
+                        RenderTransform = new ScaleTransform(0.5, 1),
+                        FlowDirection = FlowDirection.RightToLeft
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var expectedTransform = new Matrix(-1, 0, 0, 1, 100, 0) * Matrix.CreateScale(0.5, 1) * Matrix.CreateTranslation(25, 0);
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(expectedTransform, borderNode.Transform);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Border_Background_Node()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                TextBlock textBlock;
+                var tree = new TestRoot
+                {
+                    Child = border = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        Child = textBlock = new TextBlock
+                        {
+                            Foreground = Brushes.Green,
+                            Text = "Hello World",
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                var initialBackgroundNode = initial.FindNode(border).Children[0];
+                var initialTextNode = initial.FindNode(textBlock).DrawOperations[0];
+
+                Assert.NotNull(initialBackgroundNode);
+                Assert.NotNull(initialTextNode);
+
+                border.Background = Brushes.Green;
+
+                var result = initial.CloneScene();
+                sceneBuilder.Update(result, border);
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Same(border, borderNode.Visual);
+
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
+                Assert.NotSame(initialBackgroundNode, backgroundNode);
+                Assert.Equal(Brushes.Green, backgroundNode.Brush);
+
+                var textBlockNode = (VisualNode)borderNode.Children[0];
+                Assert.Same(textBlock, textBlockNode.Visual);
+
+                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
+                Assert.Same(initialTextNode.Item, textNode);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Added()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Red,
+                    }
+                };
+
+                Canvas canvas;
+                var decorator = new Decorator
+                {
+                    Child = canvas = new Canvas(),
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                border.Child = decorator;
+                var result = initial.CloneScene();
+
+                Assert.True(sceneBuilder.Update(result, decorator));
+
+                // Updating canvas should result in no-op as it should have been updated along 
+                // with decorator as part of the add opeation.
+                Assert.False(sceneBuilder.Update(result, canvas));
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Equal(1, borderNode.Children.Count);
+                Assert.Equal(1, borderNode.DrawOperations.Count);
+
+                var decoratorNode = (VisualNode)borderNode.Children[0];
+                Assert.Same(decorator, decoratorNode.Visual);
+                Assert.Same(decoratorNode, result.FindNode(decorator));
+
+                var canvasNode = (VisualNode)decoratorNode.Children[0];
+                Assert.Same(canvas, canvasNode.Visual);
+                Assert.Same(canvasNode, result.FindNode(canvas));
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Removed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                Decorator decorator;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Red,
+                        Child = decorator = new Decorator
+                        {
+                            Child = canvas = new Canvas
+                            {
+                                Background = Brushes.AliceBlue,
+                            }
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                border.Child = null;
+                var result = initial.CloneScene();
+
+                Assert.True(sceneBuilder.Update(result, decorator));
+                Assert.False(sceneBuilder.Update(result, canvas));
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Equal(0, borderNode.Children.Count);
+                Assert.Equal(1, borderNode.DrawOperations.Count);
+
+                Assert.Null(result.FindNode(decorator));
+                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Moved()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            (moveFrom = new Decorator
+                            {
+                                Child = moveMe = new Canvas(),
+                            }),
+                            (moveTo = new Decorator()),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                Assert.Equal(1, moveFromNode.Children.Count);
+                Assert.Same(moveMe, moveFromNode.Children[0].Visual);
+                Assert.Empty(moveToNode.Children);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+
+                scene = scene.CloneScene();
+                moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                moveFromNode.SortChildren(scene);
+                moveToNode.SortChildren(scene);
+                sceneBuilder.Update(scene, moveFrom);
+                sceneBuilder.Update(scene, moveTo);
+                sceneBuilder.Update(scene, moveMe);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Moved_Causing_Layout_Change()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new DockPanel
+                    {
+                        Children =
+                        {
+                            (moveFrom = new Decorator
+                            {
+                                Child = moveMe = new Canvas
+                                {
+                                    Width = 100,
+                                    Height = 100,
+                                },
+                            }),
+                            (moveTo = new Decorator()),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                Assert.Equal(1, moveFromNode.Children.Count);
+                Assert.Same(moveMe, moveFromNode.Children[0].Visual);
+                Assert.Empty(moveToNode.Children);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+                tree.LayoutManager.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+                moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                moveFromNode.SortChildren(scene);
+                moveToNode.SortChildren(scene);
+                sceneBuilder.Update(scene, moveFrom);
+                sceneBuilder.Update(scene, moveTo);
+                sceneBuilder.Update(scene, moveMe);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Made_Invisible()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                border.IsVisible = false;
+                var result = initial.CloneScene();
+
+                Assert.True(sceneBuilder.Update(result, border));
+                Assert.False(sceneBuilder.Update(result, canvas));
+
+                var decoratorNode = (VisualNode)result.Root.Children[0];
+                Assert.Equal(0, decoratorNode.Children.Count);
+
+                Assert.Null(result.FindNode(border));
+                Assert.Null(result.FindNode(canvas));
+                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Dispose_Active_VisualNode_When_Control_Reparented_And_Child_Made_Invisible()
+        {
+            // Issue #3115
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                StackPanel panel;
+                Border border1;
+                Border border2;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = panel = new StackPanel
+                    {
+                        Children =
+                        {
+                            (border1 = new Border
+                            {
+                                Background = Brushes.Red,
+                            }),
+                            (border2 = new Border
+                            {
+                                Background = Brushes.Green,
+                            }),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var decorator = new Decorator();
+                tree.Child = null;
+                decorator.Child = panel;
+                tree.Child = decorator;
+                border1.IsVisible = false;
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                var panelNode = (VisualNode)scene.FindNode(panel);
+                Assert.Equal(2, panelNode.Children.Count);
+                Assert.False(panelNode.Children[0].Disposed);
+                Assert.False(panelNode.Children[1].Disposed);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_ClipBounds_For_Negative_Margin()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            ClipToBounds = true,
+                            Margin = new Thickness(0, -5, 0, 0),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(0, 5, 100, 95), borderNode.ClipBounds);
+
+                border.Margin = new Thickness(0, -8, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, border);
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(0, 2, 100, 98), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Descendent_Tranform_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                var canvasNode = scene.FindNode(canvas);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
+
+                decorator.Margin = new Thickness(0, 20, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                borderNode = scene.FindNode(border);
+                canvasNode = scene.FindNode(canvas);
+                Assert.Equal(Matrix.CreateTranslation(0, 20), borderNode.Transform);
+                Assert.Equal(Matrix.CreateTranslation(0, 20), canvasNode.Transform);
+            }
+        }
+
+        [Fact]
+        public void DirtyRects_Should_Contain_Old_And_New_Bounds_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                var canvasNode = scene.FindNode(canvas);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
+
+                decorator.Margin = new Thickness(0, 20, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, decorator);
+
+                var rects = scene.Layers.Single().Dirty.ToArray();
+                Assert.Equal(new[] { new Rect(0, 10, 100, 90) }, rects);
+            }
+        }
+
+        [Fact]
+        public void Resizing_Scene_Should_Add_DirtyRects()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    ClientSize = new Size(100, 100),
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Equal(new Size(100, 100), scene.Size);
+
+                tree.ClientSize = new Size(110, 120);
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, tree);
+
+                Assert.Equal(new Size(110, 120), scene.Size);
+
+                var expected = new[]
+                {
+                    new Rect(100, 0, 10, 100),
+                    new Rect(0, 100, 110, 20),
+                };
+
+                Assert.Equal(expected, scene.Layers[tree].Dirty.ToArray());
+                
+                // Layers are disabled. See #2244
+                // Assert.Equal(expected, scene.Layers[border].Dirty.ToArray());
+            }
+        }
+
+        [Fact]
+        public void Setting_Opacity_Should_Add_Descendent_Bounds_To_DirtyRects()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Width = 100,
+                            Height = 100,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                decorator.Opacity = 0.5;
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                Assert.NotEmpty(scene.Layers.Single().Dirty);
+                var dirty = scene.Layers.Single().Dirty.Single();
+                Assert.Equal(new Rect(0, 0, 100, 100), dirty);
+            }
+        }
+
+        [Fact]
+        public void Should_Set_GeometryClip()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
+                Decorator decorator;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Clip = clip,
+                    }
+                };
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var decoratorNode = scene.FindNode(decorator);
+                Assert.Same(clip.PlatformImpl, decoratorNode.GeometryClip);
+            }
+        }
+
+        [Fact]
+        public void Disposing_Scene_Releases_DrawOperation_References()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
+                    x => x.PixelSize == new PixelSize(100, 100) &&
+                    x.Dpi == new Vector(96, 96)));
+
+                Image img;
+                var tree = new TestRoot
+                {
+                    Child = img = new Image
+                    {
+                        Source = new Bitmap(bitmap),
+                        Height = 100,
+                        Width = 100
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(new Size(100, 100)));
+
+                Assert.Equal(2, bitmap.RefCount);
+                IRef<IDrawOperation> operation;
+
+                using (var scene = new Scene(tree))
+                {
+                    var sceneBuilder = new SceneBuilder();
+                    sceneBuilder.UpdateAll(scene);
+                    operation = scene.FindNode(img).DrawOperations[0];
+                    Assert.Equal(1, operation.RefCount);
+
+                    Assert.Equal(3, bitmap.RefCount);
+                }
+                Assert.Equal(0, operation.RefCount);
+                Assert.Equal(2, bitmap.RefCount);
+            }
+        }
+
+        [Fact]
+        public void Replacing_Control_Releases_DrawOperation_Reference()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
+                    x => x.PixelSize == new PixelSize(100, 100) &&
+                    x.Dpi == new Vector(96, 96)));
+
+                Image img;
+                var tree = new TestRoot
+                {
+                    Child = img = new Image
+                    {
+                        Source = new Bitmap(bitmap),
+                        Width = 100,
+                        Height = 100
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(new Size(100, 100)));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var operation = scene.FindNode(img).DrawOperations[0];
+
+                tree.Child = new Decorator();
+
+                using (var result = scene.CloneScene())
+                {
+                    sceneBuilder.Update(result, img);
+                    scene.Dispose();
+
+                    Assert.Equal(0, operation.RefCount);
+                    Assert.Equal(2, bitmap.RefCount);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
new file mode 100644
index 0000000000..9f5a0363ed
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -0,0 +1,258 @@
+using System.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public partial class SceneBuilderTests
+    {
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Control_With_Animated_Opacity_And_Children_Should_Start_New_Layer()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Padding = new Thickness(12),
+                            Child = canvas = new Canvas()
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var rootNode = (VisualNode)scene.Root;
+                var borderNode = (VisualNode)scene.FindNode(border);
+                var canvasNode = (VisualNode)scene.FindNode(canvas);
+
+                Assert.Same(tree, rootNode.LayerRoot);
+                Assert.Same(border, borderNode.LayerRoot);
+                Assert.Same(border, canvasNode.LayerRoot);
+                Assert.Equal(0.5, scene.Layers[border].Opacity);
+
+                Assert.Equal(2, scene.Layers.Count());
+                Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
+
+                animation.OnCompleted();
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, border);
+
+                rootNode = (VisualNode)scene.Root;
+                borderNode = (VisualNode)scene.FindNode(border);
+                canvasNode = (VisualNode)scene.FindNode(canvas);
+
+                Assert.Same(tree, rootNode.LayerRoot);
+                Assert.Same(tree, borderNode.LayerRoot);
+                Assert.Same(tree, canvasNode.LayerRoot);
+                Assert.Single(scene.Layers);
+
+                var rootDirty = scene.Layers[tree].Dirty;
+
+                Assert.Single(rootDirty);
+                Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
+            }
+        }
+
+        [Fact]
+        public void Control_With_Animated_Opacity_And_No_Children_Should_Not_Start_New_Layer()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Single(scene.Layers);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Padding = new Thickness(12),
+                            Child = canvas = new Canvas
+                            {
+                                Children = { new TextBlock() },
+                            }
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Equal(3, scene.Layers.Count);
+
+                decorator.Child = null;
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, border);
+
+                Assert.Equal(1, scene.Layers.Count);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Hiding_Transparent_Control_Should_Remove_Layers()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Padding = new Thickness(12),
+                            Child = canvas = new Canvas
+                            {
+                                Children = { new TextBlock() },
+                            }
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Equal(3, scene.Layers.Count);
+
+                border.IsVisible = false;
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, border);
+
+                Assert.Equal(1, scene.Layers.Count);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void GeometryClip_Should_Affect_Child_Layers()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Clip = clip,
+                        Margin = new Thickness(12, 16),
+                        Child = border = new Border
+                        {
+                            Opacity = 0.5,
+                            Child = new Canvas(),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderLayer = scene.Layers[border];
+                Assert.Equal(
+                    Matrix.CreateTranslation(12, 16),
+                    ((MockStreamGeometryImpl)borderLayer.GeometryClip).Transform);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
new file mode 100644
index 0000000000..9d25a3aa44
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
@@ -0,0 +1,35 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class SceneLayersTests
+    {
+        [Fact]
+        public void Layers_Should_Be_Ordered()
+        {
+            Border border;
+            Decorator decorator;
+            var root = new TestRoot
+            {
+                Child = border = new Border
+                {
+                    Child = decorator = new Decorator(),
+                }
+            };
+
+            var target = new SceneLayers(root);
+            target.Add(root);
+            target.Add(decorator);
+            target.Add(border);
+
+            var result = target.Select(x => x.LayerRoot).ToArray();
+
+            Assert.Equal(new IVisual[] { root, border, decorator }, result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneTests.cs
new file mode 100644
index 0000000000..18ff31f676
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneTests.cs
@@ -0,0 +1,33 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class SceneTests
+    {
+        [Fact]
+        public void Cloning_Scene_Should_Retain_Layers_But_Not_DirtyRects()
+        {
+            Decorator decorator;
+            var tree = new TestRoot
+            {
+                Child = decorator = new Decorator(),
+            };
+
+            var scene = new Scene(tree);
+            scene.Layers.Add(tree);
+            scene.Layers.Add(decorator);
+
+            scene.Layers[tree].Dirty.Add(new Rect(0, 0, 100, 100));
+            scene.Layers[decorator].Dirty.Add(new Rect(0, 0, 50, 100));
+
+            scene = scene.CloneScene();
+            Assert.Equal(2, scene.Layers.Count());
+            Assert.Empty(scene.Layers[0].Dirty);
+            Assert.Empty(scene.Layers[1].Dirty);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
new file mode 100644
index 0000000000..93266c428c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
@@ -0,0 +1,123 @@
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class VisualNodeTests
+    {
+        [Fact]
+        public void Empty_Children_Collections_Should_Be_Shared()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
+
+            Assert.Same(node1.Children, node2.Children);
+        }
+
+        [Fact]
+        public void Adding_Child_Should_Create_Collection()
+        {
+            var node = new VisualNode(Mock.Of<IVisual>(), null);
+            var collection = node.Children;
+
+            node.AddChild(Mock.Of<IVisualNode>(x => x.Parent == node));
+
+            Assert.NotSame(collection, node.Children);
+        }
+
+        [Fact]
+        public void Empty_DrawOperations_Collections_Should_Be_Shared()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
+
+            Assert.Same(node1.DrawOperations, node2.DrawOperations);
+        }
+
+        [Fact]
+        public void Adding_DrawOperation_Should_Create_Collection()
+        {
+            var node = new VisualNode(Mock.Of<IVisual>(), null);
+            var collection = node.DrawOperations;
+
+            node.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
+
+            Assert.NotSame(collection, node.DrawOperations);
+        }
+
+        [Fact]
+        public void Cloned_Nodes_Should_Share_DrawOperations_Collection()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            node1.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
+
+            var node2 = node1.Clone(null);
+
+            Assert.Same(node1.DrawOperations, node2.DrawOperations);
+        }
+
+        [Fact]
+        public void Adding_DrawOperation_To_Cloned_Node_Should_Create_New_Collection()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node1.AddDrawOperation(operation1);
+
+            var node2 = node1.Clone(null);
+            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node2.ReplaceDrawOperation(0, operation2);
+
+            Assert.NotSame(node1.DrawOperations, node2.DrawOperations);
+            Assert.Equal(1, node1.DrawOperations.Count);
+            Assert.Equal(1, node2.DrawOperations.Count);
+            Assert.Same(operation1.Item, node1.DrawOperations[0].Item);
+            Assert.Same(operation2.Item, node2.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void DrawOperations_In_Cloned_Node_Are_Cloned()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node1.AddDrawOperation(operation1);
+
+            var node2 = node1.Clone(null);
+            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node2.AddDrawOperation(operation2);
+            
+            Assert.Same(node1.DrawOperations[0].Item, node2.DrawOperations[0].Item);
+            Assert.NotSame(node1.DrawOperations[0], node2.DrawOperations[0]);
+        }
+
+        [Fact]
+        public void SortChildren_Does_Not_Throw_On_Null_Children()
+        {
+            var node = new VisualNode(Mock.Of<IVisual>(), null);
+            var scene = new Scene(Mock.Of<IVisual>());
+
+            node.SortChildren(scene);
+        }
+
+        [Fact]
+        public void TrimChildren_Should_Work_Correctly()
+        {
+            var parent = new VisualNode(Mock.Of<IVisual>(), null);
+            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var child3 = new VisualNode(Mock.Of<IVisual>(), parent);
+
+            parent.AddChild(child1);
+            parent.AddChild(child2);
+            parent.AddChild(child3);
+            parent.TrimChildren(2);
+
+            Assert.Equal(2, parent.Children.Count);
+            Assert.False(child1.Disposed);
+            Assert.False(child2.Disposed);
+            Assert.True(child3.Disposed);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
new file mode 100644
index 0000000000..349fd0a6d0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
@@ -0,0 +1,138 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Rendering.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.Utilities
+{
+    public class TileBrushCalculatorTests
+    {
+        [Fact]
+        public void NoTile_Fill_1x()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Fill,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(100, 100));
+
+            Assert.False(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.DestinationRect);
+        }
+
+        [Fact]
+        public void NoTile_Fill_2x()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Fill,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(200, 200));
+
+            // TODO: This doesn't need an intermediate render target.
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 200, 200), result.DestinationRect);
+        }
+
+        [Fact]
+        public void NoTile_Uniform_CenterHoriz()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Uniform,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(200, 100));
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 200, 100), result.DestinationRect);
+            Assert.Equal(new Size(200, 100), result.IntermediateSize);
+            Assert.Equal(Matrix.CreateTranslation(50, 0), result.IntermediateTransform);
+        }
+
+        [Fact]
+        public void NoTile_Uniform_CenterVert()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Uniform,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(100, 200));
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 100, 200), result.DestinationRect);
+            Assert.Equal(new Size(100, 200), result.IntermediateSize);
+            Assert.Equal(Matrix.CreateTranslation(0, 50), result.IntermediateTransform);
+        }
+
+        [Fact]
+        public void NoTile_NoStretch_BottomRightQuarterDest()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.None,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+                new Size(800, 800),
+                new Size(400, 400));
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 800, 800), result.SourceRect);
+            Assert.Equal(new Rect(200, 200, 200, 200), result.DestinationRect);
+            Assert.Equal(new Size(400, 400), result.IntermediateSize);
+            Assert.Equal(new Rect(200, 200, 200, 200), result.IntermediateClip);
+            Assert.Equal(Matrix.CreateTranslation(-100, -100), result.IntermediateTransform);
+        }
+
+        [Fact]
+        public void Tile_NoStretch_BottomRightQuarterSource_CenterQuarterDest()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.Tile,
+                Stretch.None,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+                new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
+                new Size(800, 800),
+                new Size(400, 400));
+
+            var b = new VisualBrush
+            {
+                TileMode = TileMode.Tile,
+                Stretch = Stretch.None,
+                SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+                DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
+                Visual = new Border { Width = 400, Height = 400 },
+            };
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(400, 400, 400, 400), result.SourceRect);
+            Assert.Equal(new Rect(100, 100, 200, 200), result.DestinationRect);
+            Assert.Equal(new Size(200, 200), result.IntermediateSize);
+            Assert.Equal(new Rect(0, 0, 200, 200), result.IntermediateClip);
+            Assert.Equal(Matrix.CreateTranslation(-500, -500), result.IntermediateTransform);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/SizeTests.cs b/tests/Avalonia.Base.UnitTests/SizeTests.cs
new file mode 100644
index 0000000000..9b8125748a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/SizeTests.cs
@@ -0,0 +1,23 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class SizeTests
+    {
+        [Fact]
+        public void Should_Produce_Correct_Aspect_Ratio()
+        {
+            var result = new Size(3, 2).AspectRatio;
+
+            Assert.Equal(1.5, result);
+        }
+
+        [Fact]
+        public void Dividing_Should_Produce_Scaling_Factor()
+        {
+            var result = new Size(15, 10) / new Size(5, 5);
+
+            Assert.Equal(new Vector(3, 2), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs b/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
new file mode 100644
index 0000000000..7a27a02fc4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
@@ -0,0 +1,92 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class ControlThemeTests
+    {
+        [Fact]
+        public void ControlTheme_Cannot_Be_Added_To_Styles()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var styles = new Styles();
+
+            Assert.Throws<InvalidOperationException>(() => styles.Add(target));
+        }
+
+        [Fact]
+        public void ControlTheme_Cannot_Be_Added_To_Style_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var style = new Style();
+
+            Assert.Throws<InvalidOperationException>(() => style.Children.Add(target));
+        }
+
+        [Fact]
+        public void ControlTheme_Cannot_Be_Added_To_ControlTheme_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var other = new ControlTheme(typeof(CheckBox));
+
+            Assert.Throws<InvalidOperationException>(() => other.Children.Add(target));
+        }
+
+        [Fact]
+        public void Style_Without_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style();
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_Without_Nesting_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.OfType<Button>().Template().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_NonTemplate_Child_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Child().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_NonTemplate_Descendent_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Descendant().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_NonTemplate_Child_Template_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Child().Template().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_Double_Template_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Template().OfType<ToggleButton>().Template().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/ResourceDictionaryTests.cs b/tests/Avalonia.Base.UnitTests/Styling/ResourceDictionaryTests.cs
new file mode 100644
index 0000000000..86b1b897d4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/ResourceDictionaryTests.cs
@@ -0,0 +1,251 @@
+using System;
+using Avalonia.Controls;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class ResourceDictionaryTests
+    {
+        [Fact]
+        public void Cannot_Add_Null_Key()
+        {
+            var target = new ResourceDictionary();
+            Assert.Throws<ArgumentNullException>(() => target.Add(null, "null"));
+        }
+
+        [Fact]
+        public void Can_Add_Null_Value()
+        {
+            var target = new ResourceDictionary();
+            target.Add("null", null);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource()
+        {
+            var target = new ResourceDictionary
+            {
+                { "foo", "bar" },
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource_From_Merged_Dictionary()
+        {
+            var target = new ResourceDictionary
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary
+                    {
+                        { "foo", "bar" },
+                    }
+                }
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource_From_Itself_Before_Merged_Dictionary()
+        {
+            var target = new ResourceDictionary
+            {
+                { "foo", "bar" },
+            };
+
+            target.MergedDictionaries.Add(new ResourceDictionary
+            {
+                { "foo", "baz" },
+            });
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource_From_Later_Merged_Dictionary()
+        {
+            var target = new ResourceDictionary
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary
+                    {
+                        { "foo", "bar" },
+                    },
+                    new ResourceDictionary
+                    {
+                        { "foo", "baz" },
+                    }
+                }
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("baz", result);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_AddOwner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary { { "foo", "bar" } };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_RemoveOwner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary { { "foo", "bar" } };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
+            host.Invocations.Clear();
+            ((IResourceProvider)target).RemoveOwner(host.Object);
+
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_Resource_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
+
+            host.Invocations.Clear();
+            target.Add("foo", "bar");
+
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
+
+            host.Invocations.Clear();
+            target.MergedDictionaries.Add(new ResourceDictionary
+            {
+                { "foo", "bar" },
+            });
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Not_Be_Called_On_Empty_MergedDictionary_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
+
+            host.Invocations.Clear();
+            target.MergedDictionaries.Add(new ResourceDictionary());
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Remove()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object)
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary { { "foo", "bar" } },
+                }
+            };
+
+            host.Invocations.Clear();
+            target.MergedDictionaries.RemoveAt(0);
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Resource_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object)
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary(),
+                }
+            };
+
+            host.Invocations.Clear();
+            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
+        }
+
+        [Fact]
+        public void Sets_Added_MergedDictionary_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+
+            var target = new ResourceDictionary(host.Object);
+            target.MergedDictionaries.Add(new ResourceDictionary());
+
+            Assert.Same(host.Object, target.Owner);
+            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
+        }
+
+        [Fact]
+        public void AddOwner_Sets_MergedDictionary_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+
+            var target = new ResourceDictionary
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary(),
+                }
+            };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            Assert.Same(host.Object, target.Owner);
+            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
+        }
+
+        [Fact]
+        public void RemoveOwner_Clears_MergedDictionary_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+
+            var target = new ResourceDictionary(host.Object)
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary(),
+                }
+            };
+
+            ((IResourceProvider)target).RemoveOwner(host.Object);
+
+            Assert.Null(target.Owner);
+            Assert.Null(((ResourceDictionary)target.MergedDictionaries[0]).Owner);
+        }
+
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Child.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Child.cs
new file mode 100644
index 0000000000..66efe2cc7b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Child.cs
@@ -0,0 +1,97 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Child
+    {
+        [Fact]
+        public void Child_Matches_Control_When_It_Is_Child_OfType()
+        {
+            var parent = new TestLogical1();
+            var child = new TestLogical2();
+
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical2>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public void Child_Doesnt_Match_Control_When_It_Is_Grandchild_OfType()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public async Task Child_Matches_Control_When_It_Is_Child_OfType_And_Class()
+        {
+            var parent = new TestLogical1();
+            var child = new TestLogical2();
+
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Child().OfType<TestLogical2>();
+            var activator = selector.Match(child).Activator;
+            var result = new List<bool>();
+
+            Assert.False(await activator.Take(1));
+            parent.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+            parent.Classes.Remove("foo");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Child_Doesnt_Match_Control_When_It_Has_No_Parent()
+        {
+            var control = new TestLogical3();
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(control).Result);
+        }
+
+        [Fact]
+        public void Child_Selector_Should_Have_Correct_String_Representation()
+        {
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
+
+            Assert.Equal("TestLogical1 > TestLogical3", selector.ToString());
+        }
+
+        public abstract class TestLogical : Control
+        {
+            public ILogical LogicalParent
+            {
+                get => Parent;
+                set => ((ISetLogicalParent)this).SetParent(value);
+            }
+        }
+
+        public class TestLogical1 : TestLogical
+        {
+        }
+
+        public class TestLogical2 : TestLogical
+        {
+        }
+
+        public class TestLogical3 : TestLogical
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Class.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Class.cs
new file mode 100644
index 0000000000..376e2b23d0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Class.cs
@@ -0,0 +1,146 @@
+using System.Collections.Generic;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Class
+    {
+        [Fact]
+        public void Class_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector).Class("foo");
+
+            Assert.Equal(".foo", target.ToString());
+        }
+
+        [Fact]
+        public void PesudoClass_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector).Class(":foo");
+
+            Assert.Equal(":foo", target.ToString());
+        }
+
+        [Fact]
+        public async Task Class_Matches_Control_With_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Doesnt_Match_Control_Without_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "bar" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.False(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Matches_Control_With_TemplatedParent()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+                TemplatedParent = new Mock<ITemplatedControl>().Object,
+            };
+
+            var target = default(Selector).Class("foo");
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Tracks_Additions()
+        {
+            var control = new Control1();
+
+            var target = default(Selector).Class("foo");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Tracks_Removals()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.True(await activator.Take(1));
+            control.Classes.Remove("foo");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Multiple_Classes()
+        {
+            var control = new Control1();
+            var target = default(Selector).Class("foo").Class("bar");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Classes.Add("foo");
+            Assert.False(await activator.Take(1));
+            control.Classes.Add("bar");
+            Assert.True(await activator.Take(1));
+            control.Classes.Remove("bar");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Only_Notifies_When_Result_Changes()
+        {
+            // Test for #1698
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var activator = target.Match(control).Activator;
+            var result = new List<bool>();
+
+            using (activator.Subscribe(x => result.Add(x)))
+            {
+                control.Classes.Add("bar");
+                control.Classes.Remove("foo");
+            }
+
+            Assert.Equal(new[] { true, false }, result);
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Descendent.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Descendent.cs
new file mode 100644
index 0000000000..6b52936ec5
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Descendent.cs
@@ -0,0 +1,128 @@
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Descendant
+    {
+        [Fact]
+        public void Descendant_Matches_Control_When_It_Is_Child_OfType()
+        {
+            var parent = new TestLogical1();
+            var child = new TestLogical2();
+
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical2>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public void Descendant_Matches_Control_When_It_Is_Descendant_OfType()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical3>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public async Task Descendant_Matches_Control_When_It_Is_Descendant_OfType_And_Class()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            grandparent.Classes.Add("foo");
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+            var activator = selector.Match(child).Activator;
+
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Descendant_Doesnt_Match_Control_When_It_Is_Descendant_OfType_But_Wrong_Class()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            grandparent.Classes.Add("bar");
+            parent.LogicalParent = grandparent;
+            parent.Classes.Add("foo");
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+            var activator = selector.Match(child).Activator;
+
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Descendant_Matches_Any_Ancestor()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical1();
+            var child = new TestLogical3();
+
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+            var activator = selector.Match(child).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            parent.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+            grandparent.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+            parent.Classes.Remove("foo");
+            Assert.True(await activator.Take(1));
+            grandparent.Classes.Remove("foo");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Descendant_Selector_Should_Have_Correct_String_Representation()
+        {
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+
+            Assert.Equal("TestLogical1.foo TestLogical3", selector.ToString());
+        }
+
+        public abstract class TestLogical : Control
+        {
+            public ILogical LogicalParent
+            {
+                get => Parent;
+                set => ((ISetLogicalParent)this).SetParent(value);
+            }
+        }
+
+        public class TestLogical1 : TestLogical
+        {
+        }
+
+        public class TestLogical2 : TestLogical
+        {
+        }
+
+        public class TestLogical3 : TestLogical
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Multiple.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Multiple.cs
new file mode 100644
index 0000000000..258a4a44a1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Multiple.cs
@@ -0,0 +1,239 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Multiple
+    {
+        [Fact]
+        public void Named_Template_Child_Of_Control_With_Two_Classes()
+        {
+            var template = new FuncControlTemplate((parent, scope) =>
+            {
+                return new Border
+                {
+                    Name = "border",
+                }.RegisterInNameScope(scope);
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Template()
+                .Name("border");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var match = selector.Match(border);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            match.Activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            control.Classes.AddRange(new[] { "foo", "bar" });
+            Assert.Equal(new[] { false, true }, values);
+            control.Classes.Remove("foo");
+            Assert.Equal(new[] { false, true, false }, values);
+        }
+
+        [Fact]
+        public void Named_OfType_Template_Child_Of_Control_With_Two_Classes_Wrong_Type()
+        {
+            var template = new FuncControlTemplate((parent, scope) =>
+            {
+                return new Border
+                {
+                    Name = "border",
+                }.RegisterInNameScope(scope);
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Template()
+                .OfType<TextBlock>()
+                .Name("baz");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var match = selector.Match(border);
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Control_With_Class_Descendent_Of_Control_With_Two_Classes()
+        {
+            var textBlock = new TextBlock();
+            var control = new Button { Content = textBlock };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Descendant()
+                .OfType<TextBlock>()
+                .Class("baz");
+
+            var values = new List<bool>();
+            var match = selector.Match(textBlock);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            match.Activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            control.Classes.AddRange(new[] { "foo", "bar" });
+            Assert.Equal(new[] { false }, values);
+            textBlock.Classes.Add("baz");
+            Assert.Equal(new[] { false, true }, values);
+        }
+
+        [Fact]
+        public void Named_Class_Template_Child_Of_Control()
+        {
+            var template = new FuncControlTemplate((parent, scope) =>
+            {
+                return new Border
+                {
+                    Name = "border",
+                }.RegisterInNameScope(scope);
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Template()
+                .Name("border")
+                .Class("foo");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var match = selector.Match(border);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            match.Activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            border.Classes.AddRange(new[] { "foo" });
+            Assert.Equal(new[] { false, true }, values);
+            border.Classes.Remove("foo");
+            Assert.Equal(new[] { false, true, false }, values);
+        }
+
+        [Fact]
+        public async Task Nested_PropertyEquals()
+        {
+            var control = new Canvas();
+            var parent = new Border { Child = control };
+
+            var target = default(Selector)
+                .OfType<Border>()
+                .PropertyEquals(Border.TagProperty, "foo")
+                .Child()
+                .OfType<Canvas>()
+                .PropertyEquals(Canvas.TagProperty, "bar");
+
+            var match = target.Match(control);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var activator = match.Activator;
+
+            Assert.False(await activator.Take(1));
+            control.Tag = "bar";
+            Assert.False(await activator.Take(1));
+            parent.Tag = "foo";
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public void TargetType_OfType()
+        {
+            var selector = default(Selector).OfType<Button>();
+
+            Assert.Equal(typeof(Button), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_OfType_Class()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo");
+
+            Assert.Equal(typeof(Button), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Is_Class()
+        {
+            var selector = default(Selector)
+                .Is<Button>()
+                .Class("foo");
+
+            Assert.Equal(typeof(Button), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Child()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Child()
+                .OfType<TextBlock>();
+
+            Assert.Equal(typeof(TextBlock), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Descendant()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Descendant()
+                .OfType<TextBlock>();
+
+            Assert.Equal(typeof(TextBlock), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Template()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Template()
+                .OfType<TextBlock>();
+
+            Assert.Equal(typeof(TextBlock), selector.TargetType);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Name.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Name.cs
new file mode 100644
index 0000000000..46b97cf384
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Name.cs
@@ -0,0 +1,58 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Name
+    {
+        [Fact]
+        public void Name_Matches_Control_With_Correct_Name()
+        {
+            var control = new Control1 { Name = "foo" };
+            var target = default(Selector).Name("foo");
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Name_Doesnt_Match_Control_Of_Wrong_Name()
+        {
+            var control = new Control1 { Name = "foo" };
+            var target = default(Selector).Name("bar");
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Name_Doesnt_Match_Control_With_TemplatedParent()
+        {
+            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
+            var target = default(Selector).Name("foo");
+            var activator = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Name_Has_Correct_String_Representation()
+        {
+            var target = default(Selector).Name("foo");
+
+            Assert.Equal("#foo", target.ToString());
+        }
+
+        [Fact]
+        public void Type_And_Name_Has_Correct_String_Representation()
+        {
+            var target = default(Selector).OfType<Control1>().Name("foo");
+
+            Assert.Equal("Control1#foo", target.ToString());
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
new file mode 100644
index 0000000000..9048b488b6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -0,0 +1,300 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+using Avalonia.Styling.Activators;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Nesting
+    {
+        [Fact]
+        public void Nesting_Class_Doesnt_Match_Parent_OfType_Selector()
+        {
+            var control = new Control2();
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Class("foo"))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Or_Nesting_Class_Doesnt_Match_Parent_OfType_Selector()
+        {
+            var control = new Control2();
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Class("foo"),
+                        x.Nesting().Class("bar")))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Or_Nesting_Child_OfType_Doesnt_Match_Parent_OfType_Selector()
+        {
+            var control = new Control1();
+            var panel = new DockPanel { Children = { control } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Panel>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Child().OfType<Control1>(),
+                        x.Nesting().Child().OfType<Control1>()))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, match.Result);
+        }
+
+        [Fact]
+        public void Double_Nesting_Class_Doesnt_Match_Grandparent_OfType_Selector()
+        {
+            var control = new Control2
+            {
+                Classes = { "foo", "bar" },
+            };
+
+            Style parent;
+            Style nested;
+            var grandparent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (parent = new Style(x => x.Nesting().Class("foo"))
+                    {
+                        Children =
+                        {
+                            (nested = new Style(x => x.Nesting().Class("bar")))
+                        }
+                    })
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Nesting_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Class("foo"))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.True(sink.Active);
+            control.Classes.Clear();
+            Assert.False(sink.Active);
+        }
+
+        [Fact]
+        public void Double_Nesting_Class_Matches()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo", "bar" },
+            };
+
+            Style parent;
+            Style nested;
+            var grandparent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (parent = new Style(x => x.Nesting().Class("foo"))
+                    {
+                        Children =
+                        {
+                            (nested = new Style(x => x.Nesting().Class("bar")))
+                        }
+                    })
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.True(sink.Active);
+            control.Classes.Remove("foo");
+            Assert.False(sink.Active);
+        }
+
+        [Fact]
+        public void Or_Nesting_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Class("foo"),
+                        x.Nesting().Class("bar")))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.True(sink.Active);
+            control.Classes.Clear();
+            Assert.False(sink.Active);
+        }
+
+        [Fact]
+        public void Or_Nesting_Child_OfType_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            var panel = new Panel { Children = { control } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Panel>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Child().OfType<Control1>(),
+                        x.Nesting().Child().OfType<Control1>()))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match.Result);
+        }
+
+        [Fact]
+        public void Nesting_With_No_Parent_Style_Fails()
+        {
+            var control = new Control1();
+            var style = new Style(x => x.Nesting().OfType<Control1>());
+
+            Assert.Throws<InvalidOperationException>(() => style.Selector.Match(control, null));
+        }
+
+        [Fact]
+        public void Nesting_With_No_Parent_Selector_Fails()
+        {
+            var control = new Control1();
+            Style nested;
+            var parent = new Style
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Class("foo"))),
+                }
+            };
+
+            Assert.Throws<InvalidOperationException>(() => nested.Selector.Match(control, parent));
+        }
+
+        [Fact]
+        public void Adding_Child_With_No_Nesting_Selector_Fails()
+        {
+            var parent = new Style(x => x.OfType<Control1>());
+            var child = new Style(x => x.Class("foo"));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(child));
+        }
+
+        [Fact]
+        public void Adding_Combinator_Selector_Child_With_No_Nesting_Selector_Fails()
+        {
+            var parent = new Style(x => x.OfType<Control1>());
+            var child = new Style(x => x.Class("foo").Descendant().Class("bar"));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(child));
+        }
+
+        [Fact]
+        public void Adding_Or_Selector_Child_With_No_Nesting_Selector_Fails()
+        {
+            var parent = new Style(x => x.OfType<Control1>());
+            var child = new Style(x => Selectors.Or(
+                x.Nesting().Class("foo"),
+                x.Class("bar")));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(child));
+        }
+
+        [Fact]
+        public void Can_Add_Child_Without_Nesting_Selector_To_Style_Without_Selector()
+        {
+            var parent = new Style();
+            var child = new Style(x => x.Class("foo"));
+
+            parent.Children.Add(child);
+        }
+
+
+        [Fact]
+        public void Nesting_Not_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Not(y => y.Class("foo")))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.False(sink.Active);
+            control.Classes.Clear();
+            Assert.True(sink.Active);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+
+        private class ActivatorSink : IStyleActivatorSink
+        {
+            public ActivatorSink(IStyleActivator source) => source.Subscribe(this);
+            public bool Active { get; private set; }
+            public void OnNext(bool value, int tag) => Active = value;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Not.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Not.cs
new file mode 100644
index 0000000000..fd1385ac47
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Not.cs
@@ -0,0 +1,111 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Not
+    {
+        [Fact]
+        public void Not_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector).Not(x => x.Class("foo"));
+
+            Assert.Equal(":not(.foo)", target.ToString());
+        }
+
+        [Fact]
+        public void Not_OfType_Matches_Control_Of_Incorrect_Type()
+        {
+            var control = new Control1();
+            var target = default(Selector).Not(x => x.OfType<Control1>());
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+        
+        [Fact]
+        public void Not_OfType_Doesnt_Match_Control_Of_Correct_Type()
+        {
+            var control = new Control2();
+            var target = default(Selector).Not(x => x.OfType<Control1>());
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public async Task Not_Class_Doesnt_Match_Control_With_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.False(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Not_Class_Matches_Control_Without_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "bar" },
+            };
+
+            var target = default(Selector).Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task OfType_Not_Class_Matches_Control_Without_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "bar" },
+            };
+
+            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public void OfType_Not_Class_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new Control2
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType()
+        {
+            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthChild.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthChild.cs
new file mode 100644
index 0000000000..7f645be4a9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthChild.cs
@@ -0,0 +1,292 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_NthChild
+    {
+        [Theory]
+        [InlineData(2, 0, ":nth-child(2n)")]
+        [InlineData(2, 1, ":nth-child(2n+1)")]
+        [InlineData(1, 0, ":nth-child(1n)")]
+        [InlineData(4, -1, ":nth-child(4n-1)")]
+        [InlineData(0, 1, ":nth-child(1)")]
+        [InlineData(0, -1, ":nth-child(-1)")]
+        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-child(2147483647n-2147483647)")]
+        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
+        {
+            var target = default(Selector).NthChild(step, offset);
+
+            Assert.Equal(expected, target.ToString());
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(2, 0);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(2, 1);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(4, -1);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(1, 2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(1, -1);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(0, 2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(0, -2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
+        {
+            Border b1, b2;
+            Button b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new Control[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Button(),
+                b4 = new Button()
+            });
+
+            var previous = default(Selector).OfType<Border>();
+            var target = previous.NthChild(2, 0);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.Null(target.Match(b3).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
+            Assert.Null(target.Match(b4).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
+        }
+
+        [Fact]
+        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
+        {
+            Border b1;
+            var contentControl = new ContentControl();
+            contentControl.Content = b1 = new Border();
+
+            var target = default(Selector).NthChild(1, 0);
+
+            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
+        }
+
+
+        [Theory] // http://nthmaster.com/
+        [InlineData(+0, 8, false, false, false, false, false, false, false, true , false, false, false)]
+        [InlineData(+1, 6, false, false, false, false, false, true , true , true , true , true , true )]
+        [InlineData(-1, 9, true , true , true , true , true , true , true , true , true , false, false)]
+        public async Task Nth_Child_Master_Com_Test_Sigle_Selector(
+            int step, int offset, params bool[] items)
+        {
+            var panel = new StackPanel();
+            panel.Children.AddRange(items.Select(_ => new Border()));
+
+            var previous = default(Selector).OfType<Border>();
+            var target = previous.NthChild(step, offset);
+
+            var results = new bool[items.Length];
+            for (int index = 0; index < items.Length; index++)
+            {
+                var border = panel.Children[index];
+                results[index] = await target.Match(border).Activator!.Take(1);
+            }
+
+            Assert.Equal(items, results);
+        }
+
+        [Theory] // http://nthmaster.com/
+        [InlineData(+1, 4, -1, 8, false, false, false, true , true , true , true , true , false, false, false)]
+        [InlineData(+3, 1, +2, 0, false, false, false, true , false, false, false, false, false, true , false)]
+        public async Task Nth_Child_Master_Com_Test_Double_Selector(
+            int step1, int offset1, int step2, int offset2, params bool[] items)
+        {
+            var panel = new StackPanel();
+            panel.Children.AddRange(items.Select(_ => new Border()));
+
+            var previous = default(Selector).OfType<Border>();
+            var middle = previous.NthChild(step1, offset1);
+            var target = middle.NthChild(step2, offset2);
+
+            var results = new bool[items.Length];
+            for (int index = 0; index < items.Length; index++)
+            {
+                var border = panel.Children[index];
+                results[index] = await target.Match(border).Activator!.Take(1);
+            }
+
+            Assert.Equal(items, results);
+        }
+
+        [Theory] // http://nthmaster.com/
+        [InlineData(+1, 2, 2, 1, -1, 9, false, false, true , false, true , false, true , false, true , false, false)]
+        public async Task Nth_Child_Master_Com_Test_Triple_Selector(
+            int step1, int offset1, int step2, int offset2, int step3, int offset3, params bool[] items)
+        {
+            var panel = new StackPanel();
+            panel.Children.AddRange(items.Select(_ => new Border()));
+
+            var previous = default(Selector).OfType<Border>();
+            var middle1 = previous.NthChild(step1, offset1);
+            var middle2 = middle1.NthChild(step2, offset2);
+            var target = middle2.NthChild(step3, offset3);
+
+            var results = new bool[items.Length];
+            for (int index = 0; index < items.Length; index++)
+            {
+                var border = panel.Children[index];
+                results[index] = await target.Match(border).Activator!.Take(1);
+            }
+
+            Assert.Equal(items, results);
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType()
+        {
+            var target = new NthChildSelector(default(Selector).OfType<Control1>(), 1, 0);
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthLastChild.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthLastChild.cs
new file mode 100644
index 0000000000..821ed3d0ab
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthLastChild.cs
@@ -0,0 +1,221 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_NthLastChild
+    {
+        [Theory]
+        [InlineData(2, 0, ":nth-last-child(2n)")]
+        [InlineData(2, 1, ":nth-last-child(2n+1)")]
+        [InlineData(1, 0, ":nth-last-child(1n)")]
+        [InlineData(4, -1, ":nth-last-child(4n-1)")]
+        [InlineData(0, 1, ":nth-last-child(1)")]
+        [InlineData(0, -1, ":nth-last-child(-1)")]
+        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-last-child(2147483647n-2147483647)")]
+        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
+        {
+            var target = default(Selector).NthLastChild(step, offset);
+
+            Assert.Equal(expected, target.ToString());
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(2, 0);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(2, 1);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(4, -1);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(1, 2);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(1, -2);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(0, 2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(0, -2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
+        {
+            Border b1, b2;
+            Button b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new Control[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Button(),
+                b4 = new Button()
+            });
+
+            var previous = default(Selector).OfType<Border>();
+            var target = previous.NthLastChild(2, 0);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.Null(target.Match(b3).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
+            Assert.Null(target.Match(b4).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
+        }
+
+        [Fact]
+        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
+        {
+            Border b1;
+            var contentControl = new ContentControl();
+            contentControl.Content = b1 = new Border();
+
+            var target = default(Selector).NthLastChild(1, 0);
+
+            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType()
+        {
+            var target = new NthLastChildSelector(default(Selector).OfType<Control1>(), 1, 0);
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_OfType.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_OfType.cs
new file mode 100644
index 0000000000..e86a323c71
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_OfType.cs
@@ -0,0 +1,54 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_OfType
+    {
+        [Fact]
+        public void OfType_Matches_Control_Of_Correct_Type()
+        {
+            var control = new Control1();
+            var target = default(Selector).OfType<Control1>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void OfType_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new Control2();
+            var target = default(Selector).OfType<Control1>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void OfType_Class_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new Control2();
+            var target = default(Selector).OfType<Control1>().Class("foo");
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void OfType_Matches_Control_With_TemplatedParent()
+        {
+            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
+            var target = default(Selector).OfType<Control1>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Or.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Or.cs
new file mode 100644
index 0000000000..fb5d54bd1f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Or.cs
@@ -0,0 +1,105 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Or
+    {
+        [Fact]
+        public void Or_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).OfType<Control2>().Class("bar"));
+
+            Assert.Equal("Control1.foo, Control2.bar", target.ToString());
+        }
+
+        [Fact]
+        public void Or_Selector_Matches_Control_Of_Correct_Type()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>(),
+                default(Selector).OfType<Control2>().Class("bar"));
+            var control = new Control1();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Or_Selector_Matches_Control_Of_Correct_Type_With_Class()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>(),
+                default(Selector).OfType<Control2>().Class("bar"));
+            var control = new Control2();
+
+            Assert.Equal(SelectorMatchResult.Sometimes, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Or_Selector_Doesnt_Match_Control_Of_Incorrect_Type()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>(),
+                default(Selector).OfType<Control2>().Class("bar"));
+            var control = new Control3();
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Or_Selector_Doesnt_Match_Control_With_Incorrect_Name()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Name("foo"),
+                default(Selector).OfType<Control2>().Name("foo"));
+            var control = new Control1 { Name = "bar" };
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType_When_Types_Same()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).OfType<Control1>().Class("bar"));
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        [Fact]
+        public void Returns_Common_TargetType()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).OfType<Control2>().Class("bar"));
+
+            Assert.Equal(typeof(Control), target.TargetType);
+        }
+
+        [Fact]
+        public void Returns_Null_TargetType_When_A_Selector_Has_No_TargetType()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).Class("bar"));
+
+            Assert.Equal(null, target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+
+        public class Control3 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_PropertyEquals.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_PropertyEquals.cs
new file mode 100644
index 0000000000..ee1b654ba8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_PropertyEquals.cs
@@ -0,0 +1,134 @@
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_PropertyEquals
+    {
+        static SelectorTests_PropertyEquals()
+        {
+            //Ensure the attached properties are registered before run tests
+            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Grid).TypeHandle);
+            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Auth).TypeHandle);
+        }
+
+        class Auth
+        {
+            public readonly static AttachedProperty<string> NameProperty =
+                AvaloniaProperty.RegisterAttached<Auth, AvaloniaObject, string>("Name");
+
+            public static string GetName(AvaloniaObject avaloniaObject) =>
+                avaloniaObject.GetValue(NameProperty);
+
+            public static void SetName(AvaloniaObject avaloniaObject, string value) =>
+                avaloniaObject.SetValue(NameProperty, value);
+        }
+
+        [Fact]
+        public async Task PropertyEquals_Attached_Property_Matching_Value()
+        {
+            var target = new Markup.Parsers.SelectorParser((ns, type) =>
+            {
+                return (ns, type) switch
+                {
+                    ("", nameof(TextBlock)) => typeof(TextBlock),
+                    ("", nameof(Grid)) => typeof(Grid),
+                    _ => null
+                };
+            }).Parse("TextBlock[(Grid.Column)=1]");
+            
+
+            var control = new TextBlock();
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            Grid.SetColumn(control, 1);
+            Assert.True(await activator.Take(1));
+            Grid.SetColumn(control, 0);
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task PropertyEquals_Attached_Property_With_Namespace_Matching_Value()
+        {
+            var target = new Markup.Parsers.SelectorParser((ns, type) =>
+            {
+                return (ns, type) switch
+                {
+                    ("", nameof(TextBlock)) => typeof(TextBlock),
+                    ("l", nameof(Auth)) => typeof(Auth),
+                    _ => null
+                };
+            }).Parse("TextBlock[(l|Auth.Name)=Admin]");
+
+
+            var control = new TextBlock();
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            Auth.SetName(control, "Admin");
+            Assert.True(await activator.Take(1));
+            Auth.SetName(control, null);
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value()
+        {
+            var control = new TextBlock();
+            var target = default(Selector).PropertyEquals(TextBlock.TextProperty, "foo");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Text = "foo";
+            Assert.True(await activator.Take(1));
+            control.Text = null;
+            Assert.False(await activator.Take(1));
+        }
+
+        [Theory]
+        [InlineData("Bar", FooBar.Bar)]
+        [InlineData("352", 352)]
+        [InlineData("0.1", 0.1)]
+        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value_And_Different_Type(string literal, object value)
+        {
+            var control = new TextBlock();
+            var target = default(Selector).PropertyEquals(TextBlock.TagProperty, literal);
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Tag = value;
+            Assert.True(await activator.Take(1));
+            control.Tag = null;
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void OfType_PropertyEquals_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new TextBlock();
+            var target = default(Selector).OfType<Border>().PropertyEquals(TextBlock.TextProperty, "foo");
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void PropertyEquals_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector)
+                .OfType<TextBlock>()
+                .PropertyEquals(TextBlock.TextProperty, "foo");
+
+            Assert.Equal("TextBlock[Text=foo]", target.ToString());
+        }
+
+        private enum FooBar
+        {
+            Foo,
+            Bar
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs
new file mode 100644
index 0000000000..176fa07f19
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs
@@ -0,0 +1,169 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Diagnostics;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Template
+    {
+        [Fact]
+        public void Control_In_Template_Is_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.GetVisualChildren().Single();
+            var selector = default(Selector)
+                .OfType(target.Object.GetType())
+                .Template()
+                .OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public void Control_Not_In_Template_Is_Not_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.GetVisualChildren().Single();
+            border.SetValue(Control.TemplatedParentProperty, null);
+            var selector = default(Selector)
+                .OfType(target.Object.GetType())
+                .Template()
+                .OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public void Control_In_Template_Of_Wrong_Type_Is_Not_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.GetVisualChildren().Single();
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Template()
+                .OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public void Nested_Control_In_Template_Is_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var textBlock = (TextBlock)target.Object.VisualChildren.Single().VisualChildren.Single();
+            var selector = default(Selector)
+                .OfType(target.Object.GetType())
+                .Template()
+                .OfType<TextBlock>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(textBlock).Result);
+        }
+
+        [Fact]
+        public void Control_In_Template_Is_Matched_With_TypeOf_TemplatedControl()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            var styleKey = templatedControl.Object.GetType();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.VisualChildren.Single();
+
+            var selector = default(Selector).OfType(styleKey).Template().OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public async Task Control_In_Template_Is_Matched_With_Correct_TypeOf_And_Class_Of_TemplatedControl()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            var styleKey = templatedControl.Object.GetType();
+            BuildVisualTree(target);
+
+            styleable.Setup(x => x.StyleKey).Returns(styleKey);
+            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
+            var border = (Border)target.Object.VisualChildren.Single();
+            var selector = default(Selector).OfType(styleKey).Class("foo").Template().OfType<Border>();
+            var activator = selector.Match(border).Activator;
+
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Control_In_Template_Is_Not_Matched_With_Correct_TypeOf_And_Wrong_Class_Of_TemplatedControl()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            styleable.Setup(x => x.Classes).Returns(new Classes("bar"));
+            var border = (Border)target.Object.VisualChildren.Single();
+            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
+            var activator = selector.Match(border).Activator;
+
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Nested_Selector_Is_Unsubscribed()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
+            var border = (Border)target.Object.VisualChildren.Single();
+            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
+            var activator = selector.Match(border).Activator;
+
+            using (activator.Subscribe(_ => { }))
+            {
+                Assert.Equal(1, ((Classes)styleable.Object.Classes).ListenerCount);
+            }
+
+            Assert.Equal(0, ((Classes)styleable.Object.Classes).ListenerCount);
+        }
+
+        private void BuildVisualTree<T>(Mock<T> templatedControl) where T : class, IVisual
+        {
+            templatedControl.Setup(x => x.VisualChildren).Returns(new Controls.Controls
+            {
+                new Border
+                {
+                    [Control.TemplatedParentProperty] = templatedControl.Object,
+                    Child = new TextBlock
+                    {
+                        [Control.TemplatedParentProperty] = templatedControl.Object,
+                    },
+                },
+            });
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SetterTests.cs b/tests/Avalonia.Base.UnitTests/Styling/SetterTests.cs
new file mode 100644
index 0000000000..b57a024f41
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SetterTests.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Globalization;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Diagnostics;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SetterTests
+    {
+        [Fact]
+        public void Cannot_Assign_Control_To_Value()
+        {
+            var target = new Setter();
+
+            Assert.Throws<InvalidOperationException>(() => target.Value = new Border());
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_To_Property()
+        {
+            var control = new TextBlock();
+            var subject = new BehaviorSubject<object>("foo");
+            var descriptor = InstancedBinding.OneWay(subject);
+            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TextProperty, null, false) == descriptor);
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(TextBlock.TextProperty, binding);
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("foo", control.Text);
+        }
+
+        [Fact]
+        public void Setter_Should_Handle_Binding_Producing_UnsetValue()
+        {
+            var control = new TextBlock();
+            var subject = new BehaviorSubject<object>(AvaloniaProperty.UnsetValue);
+            var descriptor = InstancedBinding.OneWay(subject);
+            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TagProperty, null, false) == descriptor);
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(TextBlock.TagProperty, binding);
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal(null, control.Text);
+        }
+
+        [Fact]
+        public void Setter_Should_Materialize_Template_To_Property()
+        {
+            var control = new Decorator();
+            var template = new FuncTemplate<Canvas>(() => new Canvas());
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(Decorator.ChildProperty, template);
+
+            setter.Instance(control).Start(false);
+
+            Assert.IsType<Canvas>(control.Child);
+        }
+
+        [Fact]
+        public void Does_Not_Call_Converter_ConvertBack_On_OneWay_Binding()
+        {
+            var control = new Decorator { Name = "foo" };
+            var style = Mock.Of<IStyle>();
+            var binding = new Binding("Name", BindingMode.OneWay)
+            {
+                Converter = new TestConverter(),
+                RelativeSource = new RelativeSource(RelativeSourceMode.Self),
+            };
+            var setter = new Setter(Decorator.TagProperty, binding);
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            Assert.Equal("foobar", control.Tag);
+
+            // Issue #1218 caused TestConverter.ConvertBack to throw here.
+            instance.Deactivate();
+            Assert.Null(control.Tag);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Value_Without_Activator_With_Style_Priority()
+        {
+            var control = new Control();
+            var setter = new Setter(TextBlock.TagProperty, "foo");
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.Style, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Value_With_Activator_As_Binding_With_StyleTrigger_Priority()
+        {
+            var control = new Canvas();
+            var setter = new Setter(TextBlock.TagProperty, "foo");
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.StyleTrigger, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_Without_Activator_With_Style_Priority()
+        {
+            var control = new Canvas();
+            var source = new { Foo = "foo" };
+            var setter = new Setter(TextBlock.TagProperty, new Binding
+            {
+                Source = source,
+                Path = nameof(source.Foo),
+            });
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.Style, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_With_Activator_With_StyleTrigger_Priority()
+        {
+            var control = new Canvas();
+            var source = new { Foo = "foo" };
+            var setter = new Setter(TextBlock.TagProperty, new Binding
+            {
+                Source = source,
+                Path = nameof(source.Foo),
+            });
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.StyleTrigger, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Disposing_Setter_Should_Preserve_LocalValue()
+        {
+            var control = new Canvas();
+            var setter = new Setter(TextBlock.TagProperty, "foo");
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            control.Tag = "bar";
+
+            instance.Dispose();
+
+            Assert.Equal("bar", control.Tag);
+        }
+
+        [Fact]
+        public void Disposing_Binding_Setter_Should_Preserve_LocalValue()
+        {
+            var control = new Canvas();
+            var source = new { Foo = "foo" };
+            var setter = new Setter(TextBlock.TagProperty, new Binding
+            {
+                Source = source,
+                Path = nameof(source.Foo),
+            });
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            control.Tag = "bar";
+
+            instance.Dispose();
+
+            Assert.Equal("bar", control.Tag);
+        }
+
+        private class TestConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                return value.ToString() + "bar";
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyleActivatorExtensions.cs b/tests/Avalonia.Base.UnitTests/Styling/StyleActivatorExtensions.cs
new file mode 100644
index 0000000000..f5b3bb40a3
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyleActivatorExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Reactive;
+using Avalonia.Styling.Activators;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    internal static class StyleActivatorExtensions
+    {
+        public static IDisposable Subscribe(this IStyleActivator activator, Action<bool> action)
+        {
+            return activator.ToObservable().Subscribe(action);
+        }
+
+        public static async Task<bool> Take(this IStyleActivator activator, int value)
+        {
+            return await activator.ToObservable().Take(value);
+        }
+
+        public static IObservable<bool> ToObservable(this IStyleActivator activator)
+        {
+            if (activator == null)
+            {
+                throw new ArgumentNullException(nameof(activator));
+            }
+
+            return new ObservableAdapter(activator);
+        }
+
+        private class ObservableAdapter : LightweightObservableBase<bool>, IStyleActivatorSink
+        {
+            private readonly IStyleActivator _source;
+            
+            public ObservableAdapter(IStyleActivator source) => _source = source;
+            protected override void Initialize() => _source.Subscribe(this);
+            protected override void Deinitialize() => _source.Unsubscribe(this);
+
+            void IStyleActivatorSink.OnNext(bool value, int tag)
+            {
+                PublishNext(value);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
new file mode 100644
index 0000000000..f2dfe66054
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
@@ -0,0 +1,800 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StyleTests
+    {
+        [Fact]
+        public void Style_With_Only_Type_Selector_Should_Update_Value()
+        {
+            Style style = new Style(x => x.OfType<Class1>())
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+
+            style.TryAttach(target, null);
+
+            Assert.Equal("Foo", target.Foo);
+        }
+
+        [Fact]
+        public void Style_With_Class_Selector_Should_Update_And_Restore_Value()
+        {
+            Style style = new Style(x => x.OfType<Class1>().Class("foo"))
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+
+            style.TryAttach(target, null);
+            Assert.Equal("foodefault", target.Foo);
+            target.Classes.Add("foo");
+            Assert.Equal("Foo", target.Foo);
+            target.Classes.Remove("foo");
+            Assert.Equal("foodefault", target.Foo);
+        }
+
+        [Fact]
+        public void Style_With_No_Selector_Should_Apply_To_Containing_Control()
+        {
+            Style style = new Style
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+
+            style.TryAttach(target, target);
+
+            Assert.Equal("Foo", target.Foo);
+        }
+
+        [Fact]
+        public void Should_Throw_For_Selector_With_Trailing_Template_Selector()
+        {
+            Assert.Throws<InvalidOperationException>(() =>
+                new Style(x => x.OfType<Button>().Template()));
+        }
+
+        [Fact]
+        public void Style_With_No_Selector_Should_Not_Apply_To_Other_Control()
+        {
+            Style style = new Style
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+            var other = new Class1();
+
+            style.TryAttach(target, other);
+
+            Assert.Equal("foodefault", target.Foo);
+        }
+
+        [Fact]
+        public void LocalValue_Should_Override_Style()
+        {
+            Style style = new Style(x => x.OfType<Class1>())
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1
+            {
+                Foo = "Original",
+            };
+
+            style.TryAttach(target, null);
+            Assert.Equal("Original", target.Foo);
+        }
+
+        [Fact]
+        public void Later_Styles_Should_Override_Earlier()
+        {
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Foo"),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Bar"),
+                    },
+                }
+            };
+
+            var target = new Class1();
+
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+
+            styles.TryAttach(target, null);
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+
+            Assert.Equal(new[] { "foodefault", "Foo", "Bar", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Later_Styles_Should_Override_Earlier_2()
+        {
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Foo"),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>().Class("bar"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Bar"),
+                    },
+                }
+            };
+
+            var target = new Class1();
+
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+
+            styles.TryAttach(target, null);
+            target.Classes.Add("bar");
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Later_Styles_Should_Override_Earlier_3()
+        {
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, new Binding("Foo")),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>().Class("bar"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, new Binding("Bar")),
+                    },
+                }
+            };
+
+            var target = new Class1
+            {
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
+            };
+
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+
+            styles.TryAttach(target, null);
+            target.Classes.Add("bar");
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Attach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Foo"),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Bar"),
+                        },
+                    }
+                }
+            };
+
+            var values = new List<string>();
+            var target = new Class1();
+
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = target;
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Attach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Foo")),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Bar")),
+                        },
+                    }
+                }
+            };
+
+            var values = new List<string>();
+            var target = new Class1
+            {
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
+            };
+
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = target;
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Foo"),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Bar"),
+                        },
+                    }
+                }
+            };
+
+            var target = new Class1();
+            root.Child = target;
+
+            var values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = null;
+
+            Assert.Equal(new[] { "Bar", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach_2()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>().Class("foo"))
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Foo"),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Bar"),
+                        },
+                    }
+                }
+            };
+
+            var target = new Class1 { Classes = { "foo" } };
+            root.Child = target;
+
+            var values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = null;
+
+            Assert.Equal(new[] { "Foo", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Detach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Foo")),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Bar")),
+                        },
+                    }
+                }
+            };
+
+            var target = new Class1
+            {
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
+            };
+
+            root.Child = target;
+
+            var values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = null;
+
+            Assert.Equal(new[] { "Bar", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Template_In_Non_Matching_Style_Is_Not_Built()
+        {
+            var instantiationCount = 0;
+            var template = new FuncTemplate<Class1>(() =>
+            {
+                ++instantiationCount;
+                return new Class1();
+            });
+
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>())
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                }
+            };
+
+            var target = new Class1();
+            styles.TryAttach(target, null);
+
+            Assert.NotNull(target.Child);
+            Assert.Equal(1, instantiationCount);
+        }
+
+        [Fact]
+        public void Template_In_Inactive_Style_Is_Not_Built()
+        {
+            var instantiationCount = 0;
+            var template = new FuncTemplate<Class1>(() =>
+            {
+                ++instantiationCount;
+                return new Class1();
+            });
+
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>())
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>())
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                }
+            };
+
+            var target = new Class1();
+            target.BeginBatchUpdate();
+            styles.TryAttach(target, null);
+            target.EndBatchUpdate();
+
+            Assert.NotNull(target.Child);
+            Assert.Equal(1, instantiationCount);
+        }
+
+        [Fact]
+        public void Style_Should_Detach_When_Control_Removed_From_Logical_Tree()
+        {
+            Border border;
+
+            var style = new Style(x => x.OfType<Border>())
+            {
+                Setters =
+                {
+                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                }
+            };
+
+            var root = new TestRoot
+            {
+                Child = border = new Border(),
+            };
+
+            style.TryAttach(border, null);
+
+            Assert.Equal(new Thickness(4), border.BorderThickness);
+            root.Child = null;
+            Assert.Equal(new Thickness(0), border.BorderThickness);
+        }
+
+        [Fact]
+        public void Removing_Style_Should_Detach_From_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    { 
+                        new Style(x => x.OfType<Border>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                root.Styles.RemoveAt(0);
+                Assert.Equal(new Thickness(0), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Adding_Style_Should_Attach_To_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<Border>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                root.Styles.Add(new Style(x => x.OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
+                    }
+                });
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(6), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Removing_Style_With_Nested_Style_Should_Detach_From_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Styles
+                        {
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                                }
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                root.Styles.RemoveAt(0);
+                Assert.Equal(new Thickness(0), border.BorderThickness);
+            }
+        }
+        
+        [Fact]
+        public void Adding_Nested_Style_Should_Attach_To_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Styles
+                        {
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                                }
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                ((Styles)root.Styles[0]).Add(new Style(x => x.OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
+                    }
+                });
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(6), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Removing_Nested_Style_Should_Detach_From_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Styles
+                        {
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                                }
+                            },
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(6)),
+                                }
+                            },
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(6), border.BorderThickness);
+
+                ((Styles)root.Styles[0]).RemoveAt(1);
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Style();
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources_2()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Style();
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Nested_Style_Can_Be_Added()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style(x => x.Nesting().Class("foo"));
+
+            parent.Children.Add(nested);
+
+            Assert.Same(parent, nested.Parent);
+        }
+
+        [Fact]
+        public void Nested_Or_Style_Can_Be_Added()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style(x => Selectors.Or(
+                x.Nesting().Class("foo"),
+                x.Nesting().Class("bar")));
+
+            parent.Children.Add(nested);
+
+            Assert.Same(parent, nested.Parent);
+        }
+
+        [Fact]
+        public void Nested_Style_Without_Selector_Throws()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style();
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(nested));
+        }
+
+        [Fact(Skip = "TODO")]
+        public void Nested_Style_Without_Nesting_Operator_Throws()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style(x => x.Class("foo"));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(nested));
+        }
+
+        private class Class1 : Control
+        {
+            public static readonly StyledProperty<string> FooProperty =
+                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
+
+            public static readonly StyledProperty<Class1> ChildProperty =
+                AvaloniaProperty.Register<Class1, Class1>(nameof(Child));
+
+            public string Foo
+            {
+                get { return GetValue(FooProperty); }
+                set { SetValue(FooProperty, value); }
+            }
+
+            public Class1 Child
+            {
+                get => GetValue(ChildProperty);
+                set => SetValue(ChildProperty, value);
+            }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests.cs
new file mode 100644
index 0000000000..bb4d590060
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests.cs
@@ -0,0 +1,636 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StyledElementTests
+    {
+        [Fact]
+        public void Classes_Should_Initially_Be_Empty()
+        {
+            var target = new StyledElement();
+
+            Assert.Empty(target.Classes);
+        }
+
+        [Fact]
+        public void Setting_Parent_Should_Also_Set_InheritanceParent()
+        {
+            var parent = new Decorator();
+            var target = new TestControl();
+
+            parent.Child = target;
+
+            Assert.Equal(parent, target.Parent);
+            Assert.Equal(parent, target.InheritanceParent);
+        }
+
+        [Fact]
+        public void Setting_Parent_Should_Not_Set_InheritanceParent_If_Already_Set()
+        {
+            var parent = new Decorator();
+            var inheritanceParent = new Decorator();
+            var target = new TestControl();
+
+            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
+            parent.Child = target;
+
+            Assert.Equal(parent, target.Parent);
+            Assert.Equal(inheritanceParent, target.InheritanceParent);
+        }
+
+        [Fact]
+        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent()
+        {
+            var parent = new Decorator();
+            var target = new TestControl();
+
+            parent.Child = target;
+            parent.Child = null;
+
+            Assert.Null(target.InheritanceParent);
+        }
+
+        [Fact]
+        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent_When_Has_Different_InheritanceParent()
+        {
+            var parent = new Decorator();
+            var inheritanceParent = new Decorator();
+            var target = new TestControl();
+
+            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
+            parent.Child = target;
+            parent.Child = null;
+
+            Assert.Null(target.InheritanceParent);
+        }
+
+        [Fact]
+        public void Adding_Element_With_Null_Parent_To_Logical_Tree_Should_Throw()
+        {
+            var target = new Border();
+            var visualParent = new Panel();
+            var logicalParent = new Panel();
+            var root = new TestRoot();
+
+            // Set the logical parent...
+            ((ISetLogicalParent)target).SetParent(logicalParent);
+
+            // ...so that when it's added to `visualParent`, the parent won't be set again.
+            visualParent.Children.Add(target);
+
+            // Clear the logical parent. It's now a logical child of `visualParent` but doesn't have
+            // a logical parent itself.
+            ((ISetLogicalParent)target).SetParent(null);
+
+            // In this case, attaching the control to a logical tree should throw.
+            logicalParent.Children.Add(visualParent);
+            Assert.Throws<InvalidOperationException>(() => root.Child = logicalParent);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Be_Called_When_Added_To_Tree()
+        {
+            var root = new TestRoot();
+            var parent = new Border();
+            var child = new Border();
+            var grandchild = new Border();
+            var parentRaised = false;
+            var childRaised = false;
+            var grandchildRaised = false;
+
+            parent.AttachedToLogicalTree += (s, e) => parentRaised = true;
+            child.AttachedToLogicalTree += (s, e) => childRaised = true;
+            grandchild.AttachedToLogicalTree += (s, e) => grandchildRaised = true;
+
+            parent.Child = child;
+            child.Child = grandchild;
+
+            Assert.False(parentRaised);
+            Assert.False(childRaised);
+            Assert.False(grandchildRaised);
+
+            root.Child = parent;
+
+            Assert.True(parentRaised);
+            Assert.True(childRaised);
+            Assert.True(grandchildRaised);
+        }
+        
+        [Fact]
+        public void AttachedToLogicalTree_Should_Be_Called_Before_Parent_Change_Signalled()
+        {
+            var root = new TestRoot();
+            var child = new Border();
+            var raised = new List<string>();
+
+            child.AttachedToLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, child.Parent);
+                raised.Add("attached");
+            };
+
+            child.GetObservable(StyledElement.ParentProperty).Skip(1).Subscribe(_ => raised.Add("parent"));
+
+            root.Child = child;
+
+            Assert.Equal(new[] { "attached", "parent" }, raised);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        {
+            var globalStyles = Mock.Of<IGlobalStyles>();
+            var root = new TestRoot { StylingParent = globalStyles };
+            var child = new Border();
+            var raised = false;
+
+            child.AttachedToLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, e.Root);
+                raised = true;
+            };
+
+            root.Child = child;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Have_Source_Set()
+        {
+            var root = new TestRoot();
+            var canvas = new Canvas();
+            var border = new Border { Child = canvas };
+            var raised = 0;
+
+            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
+            {
+                Assert.Same(border, e.Source);
+                ++raised;
+            }
+
+            border.AttachedToLogicalTree += Attached;
+            canvas.AttachedToLogicalTree += Attached;
+
+            root.Child = border;
+
+            Assert.Equal(2, raised);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Have_Parent_Set()
+        {
+            var root = new TestRoot();
+            var canvas = new Canvas();
+            var border = new Border { Child = canvas };
+            var raised = 0;
+
+            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
+            {
+                Assert.Same(root, e.Parent);
+                ++raised;
+            }
+
+            border.AttachedToLogicalTree += Attached;
+            canvas.AttachedToLogicalTree += Attached;
+
+            root.Child = border;
+
+            Assert.Equal(2, raised);
+        }
+
+        [Fact]
+        public void DetachedFromLogicalTree_Should_Be_Called_When_Removed_From_Tree()
+        {
+            var root = new TestRoot();
+            var parent = new Border();
+            var child = new Border();
+            var grandchild = new Border();
+            var parentRaised = false;
+            var childRaised = false;
+            var grandchildRaised = false;
+
+            parent.Child = child;
+            child.Child = grandchild;
+            root.Child = parent;
+
+            parent.DetachedFromLogicalTree += (s, e) => parentRaised = true;
+            child.DetachedFromLogicalTree += (s, e) => childRaised = true;
+            grandchild.DetachedFromLogicalTree += (s, e) => grandchildRaised = true;
+
+            root.Child = null;
+
+            Assert.True(parentRaised);
+            Assert.True(childRaised);
+            Assert.True(grandchildRaised);
+        }
+
+        [Fact]
+        public void DetachedFromLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        {
+            var globalStyles = Mock.Of<IGlobalStyles>();
+            var root = new TestRoot { StylingParent = globalStyles };
+            var child = new Border();
+            var raised = false;
+
+            child.DetachedFromLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, e.Root);
+                raised = true;
+            };
+
+            root.Child = child;
+            root.Child = null;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Parent_Should_Be_Null_When_DetachedFromLogicalTree_Called()
+        {
+            var target = new TestControl();
+            var root = new TestRoot(target);
+            var called = 0;
+
+            target.DetachedFromLogicalTree += (s, e) =>
+            {
+                Assert.Null(target.Parent);
+                Assert.Null(target.InheritanceParent);
+                ++called;
+            };
+
+            root.Child = null;
+
+            Assert.Equal(1, called);
+        }
+
+        [Fact]
+        public void Adding_Tree_To_IStyleRoot_Should_Style_Controls()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var parent = new Border();
+                var child = new Border();
+                var grandchild = new Control();
+                var styler = new Mock<IStyler>();
+
+                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
+
+                parent.Child = child;
+                child.Child = grandchild;
+
+                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
+
+                root.Child = parent;
+
+                styler.Verify(x => x.ApplyStyles(parent), Times.Once());
+                styler.Verify(x => x.ApplyStyles(child), Times.Once());
+                styler.Verify(x => x.ApplyStyles(grandchild), Times.Once());
+            }
+        }
+
+        [Fact]
+        public void Styles_Not_Applied_Until_Initialization_Finished()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+                var styler = new Mock<IStyler>();
+
+                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
+
+                ((ISupportInitialize)child).BeginInit();
+                root.Child = child;
+                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
+
+                ((ISupportInitialize)child).EndInit();
+                styler.Verify(x => x.ApplyStyles(child), Times.Once());
+            }
+        }
+
+        [Fact]
+        public void Name_Cannot_Be_Set_After_Added_To_Logical_Tree()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+
+                root.Child = child;
+
+                Assert.Throws<InvalidOperationException>(() => child.Name = "foo");
+            }
+        }
+
+        [Fact]
+        public void Name_Can_Be_Set_While_Initializing()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+
+                child.BeginInit();
+                root.Child = child;
+                child.Name = "foo";
+                child.EndInit();
+            }
+        }
+
+        [Fact]
+        public void StyleInstance_Is_Disposed_When_Control_Removed_From_Logical_Tree()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+
+                root.Child = child;
+
+                var styleInstance = new Mock<IStyleInstance>();
+                ((IStyleable)child).StyleApplied(styleInstance.Object);
+
+                root.Child = null;
+
+                styleInstance.Verify(x => x.Dispose(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void EndInit_Should_Raise_Initialized()
+        {
+            var root = new TestRoot();
+            var target = new Border();
+            var called = false;
+
+            target.Initialized += (s, e) => called = true;
+            ((ISupportInitialize)target).BeginInit();
+            root.Child = target;
+            ((ISupportInitialize)target).EndInit();
+
+            Assert.True(called);
+            Assert.True(target.IsInitialized);
+        }
+
+        [Fact]
+        public void Attaching_To_Visual_Tree_Should_Raise_Initialized()
+        {
+            var root = new TestRoot();
+            var target = new Border();
+            var called = false;
+
+            target.Initialized += (s, e) => called = true;
+            root.Child = target;
+
+            Assert.True(called);
+            Assert.True(target.IsInitialized);
+        }
+
+        [Fact]
+        public void DataContextChanged_Should_Be_Called()
+        {
+            var root = new TestStackPanel
+            {
+                Name = "root",
+                Children =
+                {
+                    new TestControl
+                    {
+                        Name = "a1",
+                        Child = new TestControl
+                        {
+                            Name = "b1",
+                        }
+                    },
+                    new TestControl
+                    {
+                        Name = "a2",
+                        DataContext = "foo",
+                    },
+                }
+            };
+
+            var called = new List<string>();
+            void Record(object sender, EventArgs e) => called.Add(((StyledElement)sender).Name);
+
+            root.DataContextChanged += Record;
+
+            foreach (TestControl c in root.GetLogicalDescendants())
+            {
+                c.DataContextChanged += Record;
+            }
+
+            root.DataContext = "foo";
+
+            Assert.Equal(new[] { "root", "a1", "b1", }, called);
+        }
+
+        [Fact]
+        public void DataContext_Notifications_Should_Be_Called_In_Correct_Order()
+        {
+            var root = new TestStackPanel
+            {
+                Name = "root",
+                Children =
+                {
+                    new TestControl
+                    {
+                        Name = "a1",
+                        Child = new TestControl
+                        {
+                            Name = "b1",
+                        }
+                    },
+                    new TestControl
+                    {
+                        Name = "a2",
+                        DataContext = "foo",
+                    },
+                }
+            };
+
+            var called = new List<string>();
+
+            foreach (IDataContextEvents c in root.GetSelfAndLogicalDescendants())
+            {
+                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((StyledElement)s).Name);
+                c.DataContextChanged += (s, e) => called.Add("changed " + ((StyledElement)s).Name);
+                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((StyledElement)s).Name);
+            }
+
+            root.DataContext = "foo";
+
+            Assert.Equal(
+                new[] 
+                {
+                    "begin root",
+                    "begin a1",
+                    "begin b1",
+                    "changed root",
+                    "changed a1",
+                    "changed b1",
+                    "end b1",
+                    "end a1",
+                    "end root",
+                },
+                called);
+        }
+
+        [Fact]
+        public void Resources_Owner_Is_Set()
+        {
+            var target = new TestControl();
+
+            Assert.Same(target, ((ResourceDictionary)target.Resources).Owner);
+        }
+
+        [Fact]
+        public void Assigned_Resources_Parent_Is_Set()
+        {
+            var resources = new Mock<IResourceDictionary>();
+            var target = new TestControl { Resources = resources.Object };
+
+            resources.Verify(x => x.AddOwner(target));
+        }
+
+        [Fact]
+        public void Assigning_Resources_Raises_ResourcesChanged()
+        {
+            var resources = new ResourceDictionary { { "foo", "bar" } };
+            var target = new TestControl();
+            var raised = 0;
+
+            target.ResourcesChanged += (s, e) => ++raised;
+            target.Resources = resources;
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Styles_Owner_Is_Set()
+        {
+            var target = new TestControl();
+
+            Assert.Same(target, target.Styles.Owner);
+        }
+
+        [Fact]
+        public void Adding_To_Logical_Tree_Raises_ResourcesChanged()
+        {
+            var target = new TestRoot();
+            var parent = new Decorator { Resources = { { "foo", "bar" } } };
+            var raised = 0;
+
+            target.ResourcesChanged += (s, e) => ++raised;
+
+            parent.Child = target;
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void SetParent_Does_Not_Crash_Due_To_Reentrancy()
+        {
+            // Issue #3708
+            var app = UnitTestApplication.Start(TestServices.StyledWindow);
+
+            ContentControl target;
+            var root = new TestRoot
+            {
+                DataContext = false,
+                Child = target = new ContentControl
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<ContentControl>())
+                        {
+                            Setters =
+                            {
+                                new Setter(
+                                    ContentControl.ContentProperty,
+                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Enabled" })),
+                            },
+                        },
+                        new Style(x => x.OfType<ContentControl>().Class(":disabled"))
+                        {
+                            Setters =
+                            {
+                                new Setter(
+                                    ContentControl.ContentProperty,
+                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Disabled" })),
+                            },
+                        },
+                    },
+                    [!ContentControl.IsEnabledProperty] = new Binding(),
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var textBlock = Assert.IsType<TextBlock>(target.Content);
+            Assert.Equal("Disabled", textBlock.Text);
+
+            // #3708 was crashing here with AvaloniaInternalException.
+            root.Child = null;
+        }
+
+        private interface IDataContextEvents
+        {
+            event EventHandler DataContextBeginUpdate;
+            event EventHandler DataContextChanged;
+            event EventHandler DataContextEndUpdate;
+        }
+
+        private class TestControl : Decorator, IDataContextEvents
+        {
+            public event EventHandler DataContextBeginUpdate;
+            public event EventHandler DataContextEndUpdate;
+
+            public new IAvaloniaObject InheritanceParent => base.InheritanceParent;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+
+            protected override void OnDataContextEndUpdate()
+            {
+                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextEndUpdate();
+            }
+        }
+
+        private class TestStackPanel : StackPanel, IDataContextEvents
+        {
+            public event EventHandler DataContextBeginUpdate;
+            public event EventHandler DataContextEndUpdate;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+
+            protected override void OnDataContextEndUpdate()
+            {
+                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextEndUpdate();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
new file mode 100644
index 0000000000..69d37d1c54
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
@@ -0,0 +1,211 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StyledElementTests_Resources
+    {
+        [Fact]
+        public void FindResource_Should_Find_Control_Resource()
+        {
+            var target = new StyledElement
+            {
+                Resources =
+                {
+                    { "foo", "foo-value" },
+                }
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Control_Resource_In_Parent()
+        {
+            Control target;
+
+            var root = new Decorator
+            {
+                Resources =
+                {
+                    { "foo", "foo-value" },
+                },
+                Child = target = new Control(),
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Application_Resource()
+        {
+            Control target;
+
+            var app = new Application
+            {
+                Resources =
+                {
+                    { "foo", "foo-value" },
+                },
+            };
+
+            var root = new TestRoot
+            {
+                Child = target = new Control(),
+                StylingParent = app,
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Style_Resource()
+        {
+            var target = new StyledElement
+            {
+                Styles =
+                {
+                    new Style
+                    {
+                        Resources =
+                        {
+                            { "foo", "foo-value" },
+                        }
+                    }
+                },
+                Resources =
+                {
+                    { "bar", "bar-value" },
+                },
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Styles_Resource()
+        {
+            var target = new StyledElement
+            {
+                Styles =
+                {
+                    new Styles
+                    {
+                        Resources =
+                        {
+                            { "foo", "foo-value" },
+                        }
+                    }
+                },
+                Resources =
+                {
+                    { "bar", "bar-value" },
+                },
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Application_Style_Resource()
+        {
+            Control target;
+
+            var app = new Application
+            {
+                Styles =
+                {
+                    new Style
+                    {
+                        Resources =
+                        {
+                            { "foo", "foo-value" },
+                        },
+                    }
+                },
+                Resources =
+                {
+                    { "bar", "bar-value" },
+                },
+            };
+
+            var root = new TestRoot
+            {
+                Child = target = new Control(),
+                StylingParent = app,
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void Adding_Resource_Should_Call_Raise_ResourceChanged_On_Logical_Children()
+        {
+            Border child;
+
+            var target = new ContentControl
+            {
+                Content = child = new Border(),
+                Template = ContentControlTemplate(),
+            };
+
+            var raisedOnTarget = false;
+            var raisedOnChild = false;
+
+            target.Measure(Size.Infinity);
+            target.ResourcesChanged += (_, __) => raisedOnTarget = true;
+            child.ResourcesChanged += (_, __) => raisedOnChild = true;
+
+            target.Resources.Add("foo", "bar");
+
+            Assert.True(raisedOnTarget);
+            Assert.True(raisedOnChild);
+        }
+
+        [Fact]
+        public void Adding_Resource_To_Styles_Should_Raise_ResourceChanged()
+        {
+            var target = new Decorator();
+            var raised = false;
+
+            target.ResourcesChanged += (_, __) => raised = true;
+            target.Styles.Resources.Add("foo", "bar");
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_Resource_To_Nested_Style_Should_Raise_ResourceChanged()
+        {
+            Style style;
+            var target = new StyledElement
+            {
+                Styles =
+                {
+                    (style = new Style()),
+                }
+            };
+
+            var raised = false;
+
+            target.ResourcesChanged += (_, __) => raised = true;
+            style.Resources.Add("foo", "bar");
+
+            Assert.True(raised);
+        }
+
+        private IControlTemplate ContentControlTemplate()
+        {
+            return new FuncControlTemplate<ContentControl>((x, scope) =>
+                new ContentPresenter
+                {
+                    Name = "PART_ContentPresenter",
+                    [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
+                }.RegisterInNameScope(scope));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
new file mode 100644
index 0000000000..45188de6cb
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -0,0 +1,418 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+#nullable enable
+
+namespace Avalonia.Base.UnitTests.Styling;
+
+public class StyledElementTests_Theming
+{
+    public class InlineTheme
+    {
+        [Fact]
+        public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+        }
+
+        [Fact]
+        public void Theme_Is_Applied_To_Derived_Class_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new DerivedThemedControl
+            {
+                Theme = CreateTheme(),
+            };
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+        }
+
+        [Fact]
+        public void Theme_Is_Detached_When_Theme_Property_Cleared()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+
+            Assert.NotNull(target.Template);
+
+            target.Theme = null;
+            Assert.Null(target.Template);
+        }
+
+        [Fact]
+        public void Theme_Is_Detached_From_Template_Controls_When_Theme_Property_Cleared()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var theme = new ControlTheme
+            {
+                TargetType = typeof(ThemedControl),
+                Children =
+                {
+                    new Style(x => x.Nesting().Template().OfType<Canvas>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Panel.BackgroundProperty, Brushes.Red),
+                        }
+                    },
+                }
+            };
+
+            var target = CreateTarget(theme);
+            target.Template = new FuncControlTemplate<ThemedControl>((o, n) => new Canvas());
+
+            var root = CreateRoot(target);
+
+            var canvas = Assert.IsType<Canvas>(target.VisualChild);
+            Assert.Equal(Brushes.Red, canvas.Background);
+
+            target.Theme = null;
+
+            Assert.IsType<Canvas>(target.VisualChild);
+            Assert.Null(canvas.Background);
+        }
+
+        [Fact]
+        public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new ThemedControl();
+            var root = CreateRoot(target);
+
+            Assert.Null(target.Template);
+
+            target.Theme = CreateTheme();
+            Assert.Null(target.Template);
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.NotNull(target.Template);
+            Assert.Equal(Brushes.Red, border.Background);
+        }
+
+        [Fact]
+        public void BasedOn_Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget(CreateDerivedTheme());
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+            Assert.Equal(Brushes.Blue, target.BorderBrush);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+            Assert.Equal(Brushes.Yellow, border.BorderBrush);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+            Assert.Equal(Brushes.Cyan, border.BorderBrush);
+        }
+
+        private static ThemedControl CreateTarget(ControlTheme? theme = null)
+        {
+            return new ThemedControl
+            {
+                Theme = theme ?? CreateTheme(),
+            };
+        }
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot(child);
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+    }
+
+    public class ImplicitTheme
+    {
+        [Fact]
+        public void Implicit_Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+        }
+
+        [Fact]
+        public void Implicit_Theme_Is_Cleared_When_Removed_From_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+            
+            Assert.NotNull(((IStyleable)target).GetEffectiveTheme());
+
+            root.Child = null;
+
+            Assert.Null(((IStyleable)target).GetEffectiveTheme());
+        }
+
+        [Fact]
+        public void Nested_Style_Can_Override_Property_In_Inner_Templated_Control()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new ThemedControl2
+            {
+                Theme = new ControlTheme(typeof(ThemedControl2))
+                {
+                    Setters =
+                    {
+                        new Setter(
+                            TemplatedControl.TemplateProperty,
+                            new FuncControlTemplate<ThemedControl2>((o, n) => new ThemedControl())),
+                    },
+                    Children =
+                    {
+                        new Style(x => x.Nesting().Template().OfType<ThemedControl>())
+                        {
+                            Setters = { new Setter(TemplatedControl.CornerRadiusProperty, new CornerRadius(7)), }
+                        },
+                    }
+                },
+            };
+
+            var root = CreateRoot(target);
+            var inner = Assert.IsType<ThemedControl>(target.VisualChild);
+
+            Assert.Equal(new CornerRadius(7), inner.CornerRadius);
+        }
+
+        private static ThemedControl CreateTarget() => new ThemedControl();
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot();
+            result.Resources.Add(typeof(ThemedControl), CreateTheme());
+            result.Child = child;
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+    }
+
+    public class ThemeFromStyle
+    {
+        [Fact]
+        public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+
+            Assert.Null(target.Theme);
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+
+            Assert.NotNull(target.Theme);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(border.Background, Brushes.Red);
+
+            target.Classes.Add("foo");
+            Assert.Equal(border.Background, Brushes.Green);
+        }
+
+        [Fact]
+        public void Theme_Can_Be_Changed_By_Style_Class()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var theme1 = CreateTheme();
+            var theme2 = new ControlTheme(typeof(ThemedControl));
+            var root = new TestRoot()
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<ThemedControl>())
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme1) }
+                    },
+                    new Style(x => x.OfType<ThemedControl>().Class("bar"))
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme2) }
+                    },
+                }
+            };
+
+            root.Child = target;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Same(theme1, target.Theme);
+            Assert.NotNull(target.Template);
+
+            target.Classes.Add("bar");
+            Assert.Same(theme2, target.Theme);
+            Assert.Null(target.Template);
+        }
+
+        [Fact]
+        public void Theme_Can_Be_Set_To_LocalValue_While_Updating_Due_To_Style_Class()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var theme1 = CreateTheme();
+            var theme2 = new ControlTheme(typeof(ThemedControl));
+            var theme3 = new ControlTheme(typeof(ThemedControl));
+            var root = new TestRoot()
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<ThemedControl>())
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme1) }
+                    },
+                    new Style(x => x.OfType<ThemedControl>().Class("bar"))
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme2) }
+                    },
+                }
+            };
+
+            root.Child = target;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Same(theme1, target.Theme);
+            Assert.NotNull(target.Template);
+
+            target.Classes.Add("bar");
+
+            // At this point, theme2 has been promoted to a local value internally in StyledElement;
+            // make sure that setting a new local value here doesn't cause it to be cleared when we
+            // do a layout pass because StyledElement thinks its clearing the promoted theme.
+            target.Theme = theme3;
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Same(target.Theme, theme3);
+        }
+
+        private static ThemedControl CreateTarget()
+        {
+            return new ThemedControl();
+        }
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot()
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<ThemedControl>())
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, CreateTheme()) }
+                    }
+                }
+            };
+
+            result.Child = child;
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+    }
+
+    private static ControlTheme CreateTheme()
+    {
+        var template = new FuncControlTemplate<ThemedControl>((o, n) => new Border());
+
+        return new ControlTheme
+        {
+            TargetType = typeof(ThemedControl),
+            Setters =
+            {
+                new Setter(TemplatedControl.TemplateProperty, template),
+                new Setter(TemplatedControl.CornerRadiusProperty, new CornerRadius(5)),
+            },
+            Children =
+            {
+                new Style(x => x.Nesting().Template().OfType<Border>())
+                {
+                    Setters = { new Setter(Border.BackgroundProperty, Brushes.Red) }
+                },
+                new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+                {
+                    Setters = { new Setter(Border.BackgroundProperty, Brushes.Green) }
+                },
+            }
+        };
+    }
+
+    private static ControlTheme CreateDerivedTheme()
+    {
+        return new ControlTheme
+        {
+            TargetType = typeof(ThemedControl),
+            BasedOn = CreateTheme(),
+            Setters =
+            {
+                new Setter(Border.BorderBrushProperty, Brushes.Blue),
+            },
+            Children =
+            {
+                new Style(x => x.Nesting().Template().OfType<Border>())
+                {
+                    Setters = { new Setter(Border.BorderBrushProperty, Brushes.Yellow) }
+                },
+                new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+                {
+                    Setters = { new Setter(Border.BorderBrushProperty, Brushes.Cyan) }
+                },
+            }
+        };
+    }
+
+    private class ThemedControl : TemplatedControl
+    {
+        public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
+    }
+
+    private class ThemedControl2 : TemplatedControl
+    {
+        public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
+    }
+
+    private class DerivedThemedControl : ThemedControl
+    {
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StylesTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StylesTests.cs
new file mode 100644
index 0000000000..a6777c9466
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StylesTests.cs
@@ -0,0 +1,115 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StylesTests
+    {
+        [Fact]
+        public void Adding_Style_Should_Set_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles(host.Object);
+            var style = new Mock<IStyle>();
+            var rp = style.As<IResourceProvider>();
+
+            host.Invocations.Clear();
+            target.Add(style.Object);
+
+            rp.Verify(x => x.AddOwner(host.Object));
+        }
+
+        [Fact]
+        public void Removing_Style_Should_Clear_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles(host.Object);
+            var style = new Mock<IStyle>();
+            var rp = style.As<IResourceProvider>();
+
+            host.Invocations.Clear();
+            target.Add(style.Object);
+            target.Remove(style.Object);
+
+            rp.Verify(x => x.RemoveOwner(host.Object));
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources_2()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Child_Style()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            var style = new Mock<IStyle>();
+            var resourceProvider = style.As<IResourceProvider>();
+            target.Add(style.Object);
+
+            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Child_Style_2()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+
+            var style = new Mock<IStyle>();
+            var resourceProvider = style.As<IResourceProvider>();
+            target.Add(style.Object);
+
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+        [Fact]
+        public void Finds_Resource_In_Merged_Dictionary()
+        {
+            var target = new Styles
+            {
+                Resources = new ResourceDictionary
+                {
+                    MergedDictionaries =
+                    {
+                        new ResourceDictionary
+                        {
+                            { "foo", "bar" },
+                        }
+                    }
+                }
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestObservable.cs b/tests/Avalonia.Base.UnitTests/Styling/TestObservable.cs
new file mode 100644
index 0000000000..05cf7ef3e1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestObservable.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class TestObservable : IObservable<bool>
+    {
+        public int SubscribedCount { get; private set; }
+
+        public IDisposable Subscribe(IObserver<bool> observer)
+        {
+            ++SubscribedCount;
+            observer.OnNext(true);
+            return Disposable.Create(() => --SubscribedCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestObserver.cs b/tests/Avalonia.Base.UnitTests/Styling/TestObserver.cs
new file mode 100644
index 0000000000..46f26804f1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestObserver.cs
@@ -0,0 +1,59 @@
+using System;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    internal class TestObserver<T> : IObserver<T>
+    {
+        private bool _hasValue;
+
+        private T _value;
+
+        public bool Completed { get; private set; }
+
+        public Exception Error { get; private set; }
+
+        public T GetValue()
+        {
+            if (!_hasValue)
+            {
+                throw new Exception("Observable provided no value.");
+            }
+
+            if (Completed)
+            {
+                throw new Exception("Observable completed unexpectedly.");
+            }
+
+            if (Error != null)
+            {
+                throw new Exception("Observable errored unexpectedly.");
+            }
+
+            _hasValue = false;
+            return _value;
+        }
+
+        public void OnCompleted()
+        {
+            Completed = true;
+        }
+
+        public void OnError(Exception error)
+        {
+            Error = error;
+        }
+
+        public void OnNext(T value)
+        {
+            if (!_hasValue)
+            {
+                _value = value;
+                _hasValue = true;
+            }
+            else
+            {
+                throw new Exception("Observable pushed more than one value.");
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestSelectors.cs b/tests/Avalonia.Base.UnitTests/Styling/TestSelectors.cs
new file mode 100644
index 0000000000..bd60275d50
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestSelectors.cs
@@ -0,0 +1,17 @@
+using System;
+using Avalonia.Styling;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public static class TestSelectors
+    {
+        public static Selector SubscribeCheck(this Selector selector)
+        {
+            throw new NotImplementedException();
+            //return new Selector(
+            //    selector,
+            //    control => new SelectorMatch(((TestControlBase)control).SubscribeCheckObservable),
+            //    "");
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestSubject.cs b/tests/Avalonia.Base.UnitTests/Styling/TestSubject.cs
new file mode 100644
index 0000000000..c162f24d59
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestSubject.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    internal class TestSubject<T> : IObserver<T>, IObservable<T>
+    {
+        private readonly T _initial;
+
+        private readonly List<IObserver<T>> _subscribers = new List<IObserver<T>>();
+
+        public TestSubject(T initial)
+        {
+            _initial = initial;
+        }
+
+        public int SubscriberCount => _subscribers.Count;
+
+        public void OnCompleted()
+        {
+            foreach (IObserver<T> subscriber in _subscribers.ToArray())
+            {
+                subscriber.OnCompleted();
+            }
+        }
+
+        public void OnError(Exception error)
+        {
+            foreach (IObserver<T> subscriber in _subscribers.ToArray())
+            {
+                subscriber.OnError(error);
+            }
+        }
+
+        public void OnNext(T value)
+        {
+            foreach (IObserver<T> subscriber in _subscribers.ToArray())
+            {
+                subscriber.OnNext(value);
+            }
+        }
+
+        public IDisposable Subscribe(IObserver<T> observer)
+        {
+            _subscribers.Add(observer);
+            observer.OnNext(_initial);
+            return Disposable.Create(() => _subscribers.Remove(observer));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/TestVisual.cs b/tests/Avalonia.Base.UnitTests/TestVisual.cs
new file mode 100644
index 0000000000..fc9b9e22fb
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/TestVisual.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class ParamEventArgs<T> : EventArgs
+    {
+        public ParamEventArgs(T param)
+        {
+            Param = param;
+        }
+
+        public T Param { get; set; }
+    }
+
+    public class TestVisual : Visual
+    {
+        public IVisual Child
+        {
+            get
+            {
+                return ((IVisual)this).VisualChildren.FirstOrDefault();
+            }
+
+            set
+            {
+                if (Child != null)
+                {
+                    VisualChildren.Remove(Child);
+                }
+
+                if (value != null)
+                {
+                    VisualChildren.Add(value);
+                }
+            }
+        }
+
+        public void AddChild(Visual v)
+        {
+            VisualChildren.Add(v);
+        }
+
+        public void AddChildren(IEnumerable<Visual> v)
+        {
+            VisualChildren.AddRange(v);
+        }
+
+        public void RemoveChild(Visual v)
+        {
+            VisualChildren.Remove(v);
+        }
+
+        public void ClearChildren()
+        {
+            VisualChildren.Clear();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/ThicknessTests.cs b/tests/Avalonia.Base.UnitTests/ThicknessTests.cs
new file mode 100644
index 0000000000..094acada26
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/ThicknessTests.cs
@@ -0,0 +1,39 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class ThicknessTests
+    {
+        [Fact]
+        public void Parse_Parses_Single_Uniform_Size()
+        {
+            var result = Thickness.Parse("1.2");
+
+            Assert.Equal(new Thickness(1.2), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Horizontal_Vertical()
+        {
+            var result = Thickness.Parse("1.2,3.4");
+
+            Assert.Equal(new Thickness(1.2, 3.4), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Left_Top_Right_Bottom()
+        {
+            var result = Thickness.Parse("1.2, 3.4, 5, 6");
+
+            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
+        }
+
+        [Fact]
+        public void Parse_Accepts_Spaces()
+        {
+            var result = Thickness.Parse("1.2 3.4 5 6");
+
+            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/ReadOnlySpanTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/ReadOnlySpanTests.cs
new file mode 100644
index 0000000000..da30ee9d02
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/ReadOnlySpanTests.cs
@@ -0,0 +1,37 @@
+using System.Linq;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities
+{
+    public class ReadOnlySpanTests
+    {
+        [Fact]
+        public void Should_Skip()
+        {
+            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+            var slice = new ReadOnlySlice<int>(buffer);
+
+            var skipped = slice.Skip(2);
+
+            var expected = buffer.Skip(2);
+
+            Assert.Equal(expected, skipped);
+        }
+
+        [Fact]
+        public void Should_Take()
+        {
+            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+            var slice = new ReadOnlySlice<int>(buffer);
+
+            var taken = slice.Take(8);
+
+            var expected = buffer.Take(8);
+
+            Assert.Equal(expected, taken);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
new file mode 100644
index 0000000000..4a879c8ced
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
@@ -0,0 +1,29 @@
+using System;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities;
+
+public class UriExtensionsTests
+{
+    [Fact]
+    public void Assembly_Name_From_Query_Parsed()
+    {
+        const string key = "assembly";
+        const string value = "Avalonia.Themes.Simple";
+
+        var uri = new Uri($"resm:Avalonia.Themes.Simple.Accents.BaseLight.xaml?{key}={value}");
+        var name = uri.GetAssemblyNameFromQuery();
+
+        Assert.Equal(value, name);
+    }
+
+    [Fact]
+    public void Assembly_Name_From_Empty_Query_Not_Parsed()
+    {
+        var uri = new Uri("resm:Avalonia.Themes.Simple.Accents.BaseLight.xaml");
+        var name = uri.GetAssemblyNameFromQuery();
+
+        Assert.Equal(string.Empty, name);
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/WeakHashListTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/WeakHashListTests.cs
new file mode 100644
index 0000000000..9ae82e2be0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/WeakHashListTests.cs
@@ -0,0 +1,66 @@
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities;
+
+public class WeakHashListTests
+{
+    [Fact]
+    public void Is_Empty_Works()
+    {
+        var target = new WeakHashList<string>();
+        
+        Assert.True(target.IsEmpty);
+        
+        target.Add("1");
+        
+        Assert.False(target.IsEmpty);
+        
+        target.Remove("1");
+        
+        Assert.True(target.IsEmpty);
+
+        // Fill array storage.
+        var arrMaxSize = WeakHashList<string>.DefaultArraySize;
+
+        for (int i = 0; i < arrMaxSize; i++)
+        {
+            target.Add(i.ToString());
+        }
+        
+        Assert.False(target.IsEmpty);
+        
+        // This goes above array storage and upgrades to a dictionary.
+        target.Add(arrMaxSize.ToString());
+        
+        Assert.False(target.IsEmpty);
+
+        // Remove everything, this should still keep an empty dictionary.
+        for (int i = 0; i < arrMaxSize + 1; i++)
+        {
+            target.Remove(i.ToString());
+        }
+        
+        Assert.True(target.IsEmpty);
+    }
+
+    [Fact]
+    public void Array_Compact_After_Remove_Works()
+    {
+        var target = new WeakHashList<string>();
+        
+        // Use all slots in array storage.
+        var arrMaxSize = WeakHashList<string>.DefaultArraySize;
+
+        for (int i = 0; i < arrMaxSize; i++)
+        {
+            target.Add(i.ToString());
+        }
+        
+        // This should compact the array.
+        target.Remove("3");
+        
+        // And new value should fill empty space.
+        target.Add("42");
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VectorTests.cs b/tests/Avalonia.Base.UnitTests/VectorTests.cs
new file mode 100644
index 0000000000..154b4a8e6c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VectorTests.cs
@@ -0,0 +1,118 @@
+using System;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class VectorTests
+    {
+        [Fact]
+        public void Length_Should_Return_Correct_Length_Of_Vector()
+        {
+            var vector = new Vector(2, 4);
+            var length = Math.Sqrt(2 * 2 + 4 * 4);
+
+            Assert.Equal(length, vector.Length);
+        }
+
+        [Fact]
+        public void Length_Squared_Should_Return_Correct_Length_Of_Vector()
+        {
+            var vectorA = new Vector(2, 4);
+            var squaredLengthA = 2 * 2 + 4 * 4;
+
+            Assert.Equal(squaredLengthA, vectorA.SquaredLength);
+        }
+
+        [Fact]
+        public void Normalize_Should_Return_Normalized_Vector()
+        {
+            // the length of a normalized vector must be 1
+
+            var vectorA = new Vector(13, 84);
+            var vectorB = new Vector(-34, 345);
+            var vectorC = new Vector(-34, -84);
+
+            Assert.Equal(1.0, vectorA.Normalize().Length);
+            Assert.Equal(1.0, vectorB.Normalize().Length);
+            Assert.Equal(1.0, vectorC.Normalize().Length);
+        }
+
+        [Fact]
+        public void Negate_Should_Return_Negated_Vector()
+        {
+            var vector = new Vector(2, 4);
+            var negated = new Vector(-2, -4);
+
+            Assert.Equal(negated, vector.Negate());
+        }
+
+        [Fact]
+        public void Dot_Should_Return_Correct_Value()
+        {
+            var a = new Vector(-6, 8.0);
+            var b = new Vector(5, 12.0);
+
+            Assert.Equal(66.0, Vector.Dot(a, b));
+        }
+
+        [Fact]
+        public void Cross_Should_Return_Correct_Value()
+        {
+            var a = new Vector(-6, 8.0);
+            var b = new Vector(5, 12.0);
+
+            Assert.Equal(-112.0, Vector.Cross(a, b));
+        }
+
+        [Fact]
+        public void Divied_By_Vector_Should_Return_Correct_Value()
+        {
+            var a = new Vector(10, 2);
+            var b = new Vector(5, 2);
+
+            var expected = new Vector(2, 1);
+
+            Assert.Equal(expected, Vector.Divide(a, b));
+        }
+
+        [Fact]
+        public void Divied_Should_Return_Correct_Value()
+        {
+            var vector = new Vector(10, 2);
+            var expected = new Vector(5, 1);
+
+            Assert.Equal(expected, Vector.Divide(vector, 2));
+        }
+
+        [Fact]
+        public void Multiply_By_Vector_Should_Return_Correct_Value()
+        {
+            var a = new Vector(10, 2);
+            var b = new Vector(2, 2);
+
+            var expected = new Vector(20, 4);
+
+            Assert.Equal(expected, Vector.Multiply(a, b));
+        }
+
+        [Fact]
+        public void Multiply_Should_Return_Correct_Value()
+        {
+            var vector = new Vector(10, 2);
+
+            var expected = new Vector(20, 4);
+
+            Assert.Equal(expected, Vector.Multiply(vector, 2));
+        }
+
+        [Fact]
+        public void Scale_Vector_Should_Be_Commutative()
+        {
+            var vector = new Vector(10, 2);
+
+            var expected = vector * 2;
+
+            Assert.Equal(expected, 2 * vector);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/VisualExtensionsTests.cs
new file mode 100644
index 0000000000..4863c0fa61
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualExtensionsTests.cs
@@ -0,0 +1,210 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class VisualExtensionsTests
+    {
+        [Fact]
+        public void FindAncestorOfType_Finds_Direct_Parent()
+        {
+            StackPanel target;
+
+            var root = new TestRoot
+            {
+                Child = target = new StackPanel()
+            };
+
+            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
+        }
+
+        [Fact]
+        public void FindAncestorOfType_Finds_Ancestor_Of_Nested_Child()
+        {
+            Button target;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new StackPanel
+                        {
+                            Children =
+                            {
+                                (target = new Button())
+                            }
+                        }
+                    }
+                }
+            };
+
+            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
+        }
+
+        [Fact]
+        public void FindDescendantOfType_Finds_Direct_Child()
+        {
+            StackPanel target;
+
+            var root = new TestRoot
+            {
+                Child = target = new StackPanel()
+            };
+
+            Assert.Equal(target, root.FindDescendantOfType<StackPanel>());
+        }
+
+        [Fact]
+        public void FindDescendantOfType_Finds_Nested_Child()
+        {
+            Button target;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new StackPanel
+                        {
+                            Children =
+                            {
+                                (target = new Button())
+                            }
+                        }
+                    }
+                }
+            };
+
+            Assert.Equal(target, root.FindDescendantOfType<Button>());
+        }
+
+        [Fact]
+        public void FindCommonVisualAncestor_First_Is_Parent_Of_Second()
+        {
+            Control left, right;
+
+            var root = new TestRoot
+            {
+                Child = left = new Decorator
+                {
+                    Child = right = new Decorator()
+                }
+            };
+
+            var ancestor = left.FindCommonVisualAncestor(right);
+            Assert.Equal(left, ancestor);
+
+            ancestor = right.FindCommonVisualAncestor(left);
+            Assert.Equal(left, ancestor);
+        }
+
+        [Fact]
+        public void FindCommonVisualAncestor_Two_Subtrees_Uniform_Height()
+        {
+            Control left, right;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = left = new Decorator()
+                            }
+                        },
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = right = new Decorator()
+                            }
+                        }
+                    }
+                }
+            };
+
+            var ancestor = left.FindCommonVisualAncestor(right);
+            Assert.Equal(root.Child, ancestor);
+
+            ancestor = right.FindCommonVisualAncestor(left);
+            Assert.Equal(root.Child, ancestor);
+        }
+
+        [Fact]
+        public void FindCommonVisualAncestor_Two_Subtrees_NonUniform_Height()
+        {
+            Control left, right;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = left = new Decorator()
+                            }
+                        },
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = new Decorator
+                                {
+                                    Child = right = new Decorator()
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var ancestor = left.FindCommonVisualAncestor(right);
+            Assert.Equal(root.Child, ancestor);
+
+            ancestor = right.FindCommonVisualAncestor(left);
+            Assert.Equal(root.Child, ancestor);
+        }
+
+        [Fact]
+        public void TranslatePoint_Should_Respect_RenderTransforms()
+        {
+            Border target;
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Decorator
+                {
+                    Width = 50,
+                    Height = 50,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    RenderTransform = new TranslateTransform(25, 25),
+                    Child = target = new Border(),
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var result = target.TranslatePoint(new Point(0, 0), root);
+
+            Assert.Equal(new Point(50, 50), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTests.cs b/tests/Avalonia.Base.UnitTests/VisualTests.cs
new file mode 100644
index 0000000000..382001229b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTests.cs
@@ -0,0 +1,349 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class VisualTests
+    {
+        [Fact]
+        public void Added_Child_Should_Have_VisualParent_Set()
+        {
+            var target = new TestVisual();
+            var child = new Visual();
+
+            target.AddChild(child);
+
+            Assert.Equal(target, child.GetVisualParent());
+        }
+
+        [Fact]
+        public void Added_Child_Should_Notify_VisualParent_Changed()
+        {
+            var target = new TestVisual();
+            var child = new TestVisual();
+            var parents = new List<IVisual>();
+
+            child.GetObservable(Visual.VisualParentProperty).Subscribe(x => parents.Add(x));
+            target.AddChild(child);
+            target.RemoveChild(child);
+
+            Assert.Equal(new IVisual[] { null, target, null }, parents);
+        }
+
+        [Fact]
+        public void Removed_Child_Should_Have_VisualParent_Cleared()
+        {
+            var target = new TestVisual();
+            var child = new Visual();
+
+            target.AddChild(child);
+            target.RemoveChild(child);
+
+            Assert.Null(child.GetVisualParent());
+        }
+
+        [Fact]
+        public void Clearing_Children_Should_Clear_VisualParent()
+        {
+            var children = new[] { new Visual(), new Visual() };
+            var target = new TestVisual();
+
+            target.AddChildren(children);
+            target.ClearChildren();
+
+            var result = children.Select(x => x.GetVisualParent()).ToList();
+
+            Assert.Equal(new Visual[] { null, null }, result);
+        }
+
+        [Fact]
+        public void Adding_Children_Should_Fire_OnAttachedToVisualTree()
+        {
+            var child2 = new Decorator();
+            var child1 = new Decorator { Child = child2 };
+            var root = new TestRoot();
+            var called1 = false;
+            var called2 = false;
+
+            child1.AttachedToVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called1 = true;
+            };
+
+            child2.AttachedToVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called2 = true;
+            };
+
+            root.Child = child1;
+
+            Assert.True(called1);
+            Assert.True(called2);
+        }
+
+        [Fact]
+        public void Removing_Children_Should_Fire_OnDetachedFromVisualTree()
+        {
+            var child2 = new Decorator();
+            var child1 = new Decorator { Child = child2 };
+            var root = new TestRoot();
+            var called1 = false;
+            var called2 = false;
+
+            root.Child = child1;
+
+            child1.DetachedFromVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called1 = true;
+            };
+
+            child2.DetachedFromVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called2 = true;
+            };
+
+            root.Child = null;
+
+            Assert.True(called1);
+            Assert.True(called2);
+        }
+
+        [Fact]
+        public void Root_Should_Retun_Self_As_VisualRoot()
+        {
+            var root = new TestRoot();
+
+            Assert.Same(root, ((IVisual)root).VisualRoot);
+        }
+
+        [Fact]
+        public void Descendants_Should_RetunVisualRoot()
+        {
+            var root = new TestRoot();
+            var child1 = new Decorator();
+            var child2 = new Decorator();
+
+            root.Child = child1;
+            child1.Child = child2;
+
+            Assert.Same(root, ((IVisual)child1).VisualRoot);
+            Assert.Same(root, ((IVisual)child2).VisualRoot);
+        }
+
+        [Fact]
+        public void Attaching_To_Visual_Tree_Should_Invalidate_Visual()
+        {
+            var renderer = new Mock<IRenderer>();
+            var child = new Decorator();
+            var root = new TestRoot
+            {
+                Renderer = renderer.Object,
+            };
+
+            root.Child = child;
+
+            renderer.Verify(x => x.AddDirty(child));
+        }
+
+        [Fact]
+        public void Detaching_From_Visual_Tree_Should_Invalidate_Visual()
+        {
+            var renderer = new Mock<IRenderer>();
+            var child = new Decorator();
+            var root = new TestRoot
+            {
+                Renderer = renderer.Object,
+            };
+
+            root.Child = child;
+            renderer.Invocations.Clear();
+            root.Child = null;
+
+            renderer.Verify(x => x.AddDirty(child));
+        }
+
+        [Fact]
+        public void Adding_Already_Parented_Control_Should_Throw()
+        {
+            var root1 = new TestRoot();
+            var root2 = new TestRoot();
+            var child = new Canvas();
+
+            root1.Child = child;
+
+            Assert.Throws<InvalidOperationException>(() => root2.Child = child);
+            Assert.Empty(root2.GetVisualChildren());
+        }
+
+        [Fact]
+        public void TransformToVisual_Should_Work()
+        {
+            var child = new Decorator { Width = 100, Height = 100 };
+            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(new Point(), root.DesiredSize));
+
+            var tr = child.TransformToVisual(root);
+
+            Assert.NotNull(tr);
+
+            var point = root.Bounds.TopLeft * tr;
+
+            //child is centered (400 - 100)/2
+            Assert.Equal(new Point(150, 150), point);
+        }
+
+        [Fact]
+        public void TransformToVisual_With_RenderTransform_Should_Work()
+        {
+            var child = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 }
+            };
+            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(new Point(), root.DesiredSize));
+
+            var tr = child.TransformToVisual(root);
+
+            Assert.NotNull(tr);
+
+            var point = root.Bounds.TopLeft * tr;
+
+            //child is centered (400 - 100*2 scale)/2
+            Assert.Equal(new Point(100, 100), point);
+        }
+
+        [Fact]
+        public void TransformToVisual_With_NonInvertible_RenderTransform_Should_Work()
+        {
+            var child = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                RenderTransform = new ScaleTransform() { ScaleX = 0, ScaleY = 0 }
+            };
+            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(new Point(), root.DesiredSize));
+
+            var tr = root.TransformToVisual(child);
+
+            Assert.Null(tr);
+        }
+
+        [Fact]
+        public void Should_Not_Log_Binding_Error_When_Not_Attached_To_Logical_Tree()
+        {
+            var target = new Decorator { DataContext = "foo" };
+            var called = false;
+
+            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
+            {
+                if (level >= Avalonia.Logging.LogEventLevel.Warning)
+                {
+                    called = true;
+                }
+            };
+
+            using (TestLogSink.Start(checkLogMessage))
+            {
+                target.Bind(Decorator.TagProperty, new Binding("Foo"));
+            }
+
+            Assert.False(called);
+        }
+
+        [Fact]
+        public void Should_Log_Binding_Error_When_Attached_To_Logical_Tree()
+        {
+            var target = new Decorator();
+            var root = new TestRoot { Child = target, DataContext = "foo" };
+            var called = false;
+
+            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
+            {
+                if (level >= Avalonia.Logging.LogEventLevel.Warning)
+                {
+                    called = true;
+                }
+            };
+
+            using (TestLogSink.Start(checkLogMessage))
+            {
+                target.Bind(Decorator.TagProperty, new Binding("Foo"));
+            }
+
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void Changing_ZIndex_Should_InvalidateVisual()
+        {
+            Canvas canvas1;
+            var renderer = new Mock<IRenderer>();
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        (canvas1 = new Canvas()),
+                        new Canvas(),
+                    },
+                },
+            };
+
+            root.Renderer = renderer.Object;
+            canvas1.ZIndex = 10;
+
+            renderer.Verify(x => x.AddDirty(canvas1));
+        }
+
+        [Fact]
+        public void Changing_ZIndex_Should_Recalculate_Parent_Children()
+        {
+            Canvas canvas1;
+            StackPanel stackPanel;
+            var renderer = new Mock<IRenderer>();
+            var root = new TestRoot
+            {
+                Child = stackPanel = new StackPanel
+                {
+                    Children =
+                    {
+                        (canvas1 = new Canvas()),
+                        new Canvas(),
+                    },
+                },
+            };
+
+            root.Renderer = renderer.Object;
+            canvas1.ZIndex = 10;
+
+            renderer.Verify(x => x.RecalculateChildren(stackPanel));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
new file mode 100644
index 0000000000..10db08f302
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
@@ -0,0 +1,268 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Base.UnitTests.VisualTree
+{
+    class MockRenderInterface : IPlatformRenderInterface
+    {
+        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IStreamGeometryImpl CreateStreamGeometry()
+        {
+            return new MockStreamGeometry();
+        }
+
+        public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(Stream stream)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(string fileName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool SupportsIndividualRoundRects { get; set; }
+        public AlphaFormat DefaultAlphaFormat { get; }
+        public PixelFormat DefaultPixelFormat { get; }
+
+        public IFontManagerImpl CreateFontManager()
+        {
+            return new MockFontManagerImpl();
+        }
+
+        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat fmt, AlphaFormat alphaFormat)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateEllipseGeometry(Rect rect)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateRectangleGeometry(Rect rect)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
+        {
+            throw new NotImplementedException();
+        }
+
+        class MockStreamGeometry : IStreamGeometryImpl
+        {
+            private MockStreamGeometryContext _impl = new MockStreamGeometryContext();
+            public Rect Bounds
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public double ContourLength { get; }
+
+            public IStreamGeometryImpl Clone()
+            {
+                return this;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public bool FillContains(Point point)
+            {
+                return _impl.FillContains(point);
+            }
+
+            public Rect GetRenderBounds(IPen pen)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IGeometryImpl Intersect(IGeometryImpl geometry)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IStreamGeometryContextImpl Open()
+            {
+                return _impl;
+            }
+
+            public bool StrokeContains(IPen pen, Point point)
+            {
+                throw new NotImplementedException();
+            }
+
+            public ITransformedGeometryImpl WithTransform(Matrix transform)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool TryGetPointAtDistance(double distance, out Point point)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry)
+            {
+                throw new NotImplementedException();
+            }
+
+            class MockStreamGeometryContext : IStreamGeometryContextImpl
+            {
+                private List<Point> points = new List<Point>();
+                public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public void BeginFigure(Point startPoint, bool isFilled)
+                {
+                    points.Add(startPoint);
+                }
+
+                public void CubicBezierTo(Point point1, Point point2, Point point3)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public void Dispose()
+                {
+                }
+
+                public void EndFigure(bool isClosed)
+                {
+                }
+
+                public void LineTo(Point point)
+                {
+                    points.Add(point);
+                }
+
+                public void QuadraticBezierTo(Point control, Point endPoint)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public void SetFillRule(FillRule fillRule)
+                {
+                }
+
+                public bool FillContains(Point point)
+                {
+                    // Use the algorithm from https://www.blackpawn.com/texts/pointinpoly/default.html
+                    // to determine if the point is in the geometry (since it will always be convex in this situation)
+                    for (int i = 0; i < points.Count; i++)
+                    {
+                        var a = points[i];
+                        var b = points[(i + 1) % points.Count];
+                        var c = points[(i + 2) % points.Count];
+
+                        Vector v0 = c - a;
+                        Vector v1 = b - a;
+                        Vector v2 = point - a;
+
+                        var dot00 = v0 * v0;
+                        var dot01 = v0 * v1;
+                        var dot02 = v0 * v2;
+                        var dot11 = v1 * v1;
+                        var dot12 = v1 * v2;
+
+
+                        var invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
+                        var u = (dot11 * dot02 - dot01 * dot12) * invDenom;
+                        var v = (dot00 * dot12 - dot01 * dot02) * invDenom;
+                        if ((u >= 0) && (v >= 0) && (u + v < 1)) return true;
+                    }
+                    return false;
+                }
+            }
+        }
+    }
+
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/TransformedBoundsTests.cs b/tests/Avalonia.Base.UnitTests/VisualTree/TransformedBoundsTests.cs
new file mode 100644
index 0000000000..d8158fd673
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/TransformedBoundsTests.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.VisualTree
+{
+    public class TransformedBoundsTests
+    {
+        [Fact]
+        public void Should_Track_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var control = default(Rectangle);
+                var tree = new Decorator
+                {
+                    Padding = new Thickness(10),
+                    Child = new Decorator
+                    {
+                        Padding = new Thickness(5),
+                        Child = control = new Rectangle
+                        {
+                            Width = 15,
+                            Height = 15,
+                        },
+                    }
+                };
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(0, 0, 100, 100));
+                ImmediateRenderer.Render(tree, context, true);
+
+                var track = control.GetObservable(Visual.TransformedBoundsProperty);
+                var results = new List<TransformedBounds?>();
+                track.Subscribe(results.Add);
+
+                Assert.Equal(new Rect(0, 0, 15, 15), results[0].Value.Bounds);
+                Assert.Equal(Matrix.CreateTranslation(42, 42), results[0].Value.Transform);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
new file mode 100644
index 0000000000..1020a3a4d6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.VisualTree
+{
+    public class VisualExtensions_GetVisualsAt
+    {
+        [Fact]
+        public void Should_Find_Control()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Background = Brushes.White,
+                        Children =
+                        {
+                            (target = new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Red,
+                            }),
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Green,
+                            }
+                        },
+                        Orientation = Orientation.Horizontal,
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = target.GetVisualsAt(new Point(50, 50));
+
+                Assert.Same(target, result.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Find_Sibling_Control()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Background = Brushes.White,
+                        Children =
+                        {
+                            (target = new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Red,
+                            }),
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Green,
+                            }
+                        },
+                        Orientation = Orientation.Horizontal,
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = target.GetVisualsAt(new Point(150, 50));
+
+                Assert.Empty(result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/WeakSubscriptionManagerTests.cs b/tests/Avalonia.Base.UnitTests/WeakSubscriptionManagerTests.cs
deleted file mode 100644
index 7b2cac2819..0000000000
--- a/tests/Avalonia.Base.UnitTests/WeakSubscriptionManagerTests.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Base.UnitTests
-{
-    public class WeakSubscriptionManagerTests
-    {
-        class EventSource
-        {
-            public event EventHandler<EventArgs> Event;
-
-            public void Fire()
-            {
-                Event?.Invoke(this, new EventArgs());
-            }
-        }
-
-        class Subscriber : IWeakSubscriber<EventArgs>
-        {
-            private readonly Action _onEvent;
-
-            public Subscriber(Action onEvent)
-            {
-                _onEvent = onEvent;
-            }
-
-            public void OnEvent(object sender, EventArgs ev)
-            {
-                _onEvent?.Invoke();
-            }
-        }
-
-        [Fact]
-        public void EventShoudBePassedToSubscriber()
-        {
-            bool handled = false;
-            var subscriber = new Subscriber(() => handled = true);
-            var source = new EventSource();
-            WeakSubscriptionManager.Subscribe(source, "Event", subscriber);
-            source.Fire();
-            Assert.True(handled);
-        }
-
- 
-        [Fact]
-        public void EventHandlerShouldNotBeKeptAlive()
-        {
-            bool handled = false;
-            var source = new EventSource();
-            AddSubscriber(source, "Event", () => handled = true);
-            for (int c = 0; c < 10; c++)
-            {
-                GC.Collect();
-                GC.Collect(3, GCCollectionMode.Forced, true);
-            }
-            source.Fire();
-            Assert.False(handled);
-        }
-
-        private void AddSubscriber(EventSource source, string name, Action func)
-        {
-            WeakSubscriptionManager.Subscribe(source, name, new Subscriber(func));
-        }
-    }
-}
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index 3994d20c68..754a1d6a24 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -1,25 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Binding.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Binding.cs
new file mode 100644
index 0000000000..885e202544
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Binding.cs
@@ -0,0 +1,149 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_Binding
+    {
+        private static TestClass _target = null!;
+        private static TestBindingObservable<string?> s_stringSource = new();
+        private static TestBindingObservable<Struct1> s_struct1Source = new();
+        private static TestBindingObservable<Struct2> s_struct2Source = new();
+        private static TestBindingObservable<Struct3> s_struct3Source = new();
+        private static TestBindingObservable<Struct4> s_struct4Source = new();
+        private static TestBindingObservable<Struct5> s_struct5Source = new();
+        private static TestBindingObservable<Struct6> s_struct6Source = new();
+        private static TestBindingObservable<Struct7> s_struct7Source = new();
+        private static TestBindingObservable<Struct8> s_struct8Source = new();
+
+        public AvaloniaObject_Binding()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new TestClass();
+        }
+
+        [Benchmark]
+        public void Setup_Dispose_LocalValue_Bindings()
+        {
+            var target = _target;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                using var s0 = target.Bind(TestClass.StringProperty, s_stringSource);
+                using var s1 = target.Bind(TestClass.Struct1Property, s_struct1Source);
+                using var s2 = target.Bind(TestClass.Struct2Property, s_struct2Source);
+                using var s3 = target.Bind(TestClass.Struct3Property, s_struct3Source);
+                using var s4 = target.Bind(TestClass.Struct4Property, s_struct4Source);
+                using var s5 = target.Bind(TestClass.Struct5Property, s_struct5Source);
+                using var s6 = target.Bind(TestClass.Struct6Property, s_struct6Source);
+                using var s7 = target.Bind(TestClass.Struct7Property, s_struct7Source);
+                using var s8 = target.Bind(TestClass.Struct8Property, s_struct8Source);
+            }
+        }
+
+
+        [Benchmark]
+        public void Fire_LocalValue_Bindings()
+        {
+            var target = _target;
+
+            using var s0 = target.Bind(TestClass.StringProperty, s_stringSource);
+            using var s1 = target.Bind(TestClass.Struct1Property, s_struct1Source);
+            using var s2 = target.Bind(TestClass.Struct2Property, s_struct2Source);
+            using var s3 = target.Bind(TestClass.Struct3Property, s_struct3Source);
+            using var s4 = target.Bind(TestClass.Struct4Property, s_struct4Source);
+            using var s5 = target.Bind(TestClass.Struct5Property, s_struct5Source);
+            using var s6 = target.Bind(TestClass.Struct6Property, s_struct6Source);
+            using var s7 = target.Bind(TestClass.Struct7Property, s_struct7Source);
+            using var s8 = target.Bind(TestClass.Struct8Property, s_struct8Source);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                s_stringSource.OnNext(i.ToString());
+                s_struct1Source.OnNext(new(i + 1));
+                s_struct2Source.OnNext(new(i + 1));
+                s_struct3Source.OnNext(new(i + 1));
+                s_struct4Source.OnNext(new(i + 1));
+                s_struct5Source.OnNext(new(i + 1));
+                s_struct6Source.OnNext(new(i + 1));
+                s_struct7Source.OnNext(new(i + 1));
+                s_struct8Source.OnNext(new(i + 1));
+            }
+        }
+
+        [GlobalSetup(Target = nameof(Fire_LocalValue_Bindings_With_Style_Values))]
+        public void SetupStyleValues()
+        {
+            _target = new TestClass();
+            _target.SetValue(TestClass.StringProperty, "foo", BindingPriority.Style);
+            _target.SetValue(TestClass.Struct1Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct2Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct3Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct4Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct5Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct6Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct7Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct8Property, new(), BindingPriority.Style);
+        }
+
+        [Benchmark]
+        public void Fire_LocalValue_Bindings_With_Style_Values()
+        {
+            var target = _target;
+
+            using var s0 = target.Bind(TestClass.StringProperty, s_stringSource);
+            using var s1 = target.Bind(TestClass.Struct1Property, s_struct1Source);
+            using var s2 = target.Bind(TestClass.Struct2Property, s_struct2Source);
+            using var s3 = target.Bind(TestClass.Struct3Property, s_struct3Source);
+            using var s4 = target.Bind(TestClass.Struct4Property, s_struct4Source);
+            using var s5 = target.Bind(TestClass.Struct5Property, s_struct5Source);
+            using var s6 = target.Bind(TestClass.Struct6Property, s_struct6Source);
+            using var s7 = target.Bind(TestClass.Struct7Property, s_struct7Source);
+            using var s8 = target.Bind(TestClass.Struct8Property, s_struct8Source);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                s_stringSource.OnNext(i.ToString());
+                s_struct1Source.OnNext(new(i + 1));
+                s_struct2Source.OnNext(new(i + 1));
+                s_struct3Source.OnNext(new(i + 1));
+                s_struct4Source.OnNext(new(i + 1));
+                s_struct5Source.OnNext(new(i + 1));
+                s_struct6Source.OnNext(new(i + 1));
+                s_struct7Source.OnNext(new(i + 1));
+                s_struct8Source.OnNext(new(i + 1));
+            }
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Construct.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Construct.cs
new file mode 100644
index 0000000000..1f07d4e867
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Construct.cs
@@ -0,0 +1,81 @@
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_Construct
+    {
+        public AvaloniaObject_Construct()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Benchmark(Baseline = true)]
+        public void ConstructClrObject_And_Set_Values()
+        {
+            var target = new BaselineTestClass();
+            target.StringProperty = "foo";
+            target.Struct1Property = new(1);
+            target.Struct2Property = new(1);
+            target.Struct3Property = new(1);
+            target.Struct4Property = new(1);
+            target.Struct5Property = new(1);
+            target.Struct6Property = new(1);
+            target.Struct7Property = new(1);
+            target.Struct8Property = new(1);
+        }
+
+        [Benchmark]
+        public void Construct_And_Set_Values()
+        {
+            var target = new TestClass();
+            target.SetValue(TestClass.StringProperty, "foo");
+            target.SetValue(TestClass.Struct1Property, new(1));
+            target.SetValue(TestClass.Struct2Property, new(1));
+            target.SetValue(TestClass.Struct3Property, new(1));
+            target.SetValue(TestClass.Struct4Property, new(1));
+            target.SetValue(TestClass.Struct5Property, new(1));
+            target.SetValue(TestClass.Struct6Property, new(1));
+            target.SetValue(TestClass.Struct7Property, new(1));
+            target.SetValue(TestClass.Struct8Property, new(1));
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class BaselineTestClass
+        {
+            public string? StringProperty { get; set; }
+            public Struct1 Struct1Property { get; set; }
+            public Struct2 Struct2Property { get; set; }
+            public Struct3 Struct3Property { get; set; }
+            public Struct4 Struct4Property { get; set; }
+            public Struct5 Struct5Property { get; set; }
+            public Struct6 Struct6Property { get; set; }
+            public Struct7 Struct7Property { get; set; }
+            public Struct8 Struct8Property { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetObservable.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetObservable.cs
new file mode 100644
index 0000000000..9157dd156c
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetObservable.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_GetObservable
+    {
+        private TestClass _target = null!;
+        public static int result;
+
+        public AvaloniaObject_GetObservable()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new();
+        }
+
+        [Benchmark(Baseline = true)]
+        public void PropertyChangedSubscription()
+        {
+            var target = _target;
+
+            static void ChangeHandler(object? sender, AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Property == TestClass.StringProperty)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<string?>)e;
+                    result += ev.NewValue.Value?.Length ?? 0;
+                }
+                else if (e.Property == TestClass.Struct1Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct1>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct2Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct2>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct3Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct3>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct4Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct4>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct5Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct5>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct6Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct6>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct7Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct7>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct8Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct8>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+            }
+
+            target.PropertyChanged += ChangeHandler;
+
+            // GetObservable fires with the initial value so to compare like-for-like we also need
+            // to get the initial value here.
+            result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+            result += target.GetValue(TestClass.Struct1Property).Int1;
+            result += target.GetValue(TestClass.Struct2Property).Int1;
+            result += target.GetValue(TestClass.Struct3Property).Int1;
+            result += target.GetValue(TestClass.Struct4Property).Int1;
+            result += target.GetValue(TestClass.Struct5Property).Int1;
+            result += target.GetValue(TestClass.Struct6Property).Int1;
+            result += target.GetValue(TestClass.Struct7Property).Int1;
+            result += target.GetValue(TestClass.Struct8Property).Int1;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo" + i);
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+
+            target.PropertyChanged -= ChangeHandler;
+        }
+
+        [Benchmark]
+        public void GetObservables()
+        {
+            var target = _target;
+
+            var sub1 = target.GetObservable(TestClass.StringProperty).Subscribe(x => result += x?.Length ?? 0);
+            var sub2 = target.GetObservable(TestClass.Struct1Property).Subscribe(x => result += x.Int1);
+            var sub3 = target.GetObservable(TestClass.Struct2Property).Subscribe(x => result += x.Int1);
+            var sub4 = target.GetObservable(TestClass.Struct3Property).Subscribe(x => result += x.Int1);
+            var sub5 = target.GetObservable(TestClass.Struct4Property).Subscribe(x => result += x.Int1);
+            var sub6 = target.GetObservable(TestClass.Struct5Property).Subscribe(x => result += x.Int1);
+            var sub7 = target.GetObservable(TestClass.Struct6Property).Subscribe(x => result += x.Int1);
+            var sub8 = target.GetObservable(TestClass.Struct7Property).Subscribe(x => result += x.Int1);
+            var sub9 = target.GetObservable(TestClass.Struct8Property).Subscribe(x => result += x.Int1);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo" + i);
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+
+            sub1.Dispose();
+            sub2.Dispose();
+            sub3.Dispose();
+            sub4.Dispose();
+            sub5.Dispose();
+            sub6.Dispose();
+            sub7.Dispose();
+            sub8.Dispose();
+            sub9.Dispose();
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValue.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValue.cs
new file mode 100644
index 0000000000..0bfea0fafe
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValue.cs
@@ -0,0 +1,181 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_GetValue
+    {
+        private BaselineTestClass _baseline = new(){ StringProperty = "foo" };
+        private TestClass _target = new();
+
+        public AvaloniaObject_GetValue()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Benchmark(Baseline = true)]
+        public int GetClrPropertyValues()
+        {
+            var target = _baseline;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.StringProperty?.Length ?? 0;
+                result += target.Struct1Property.Int1;
+                result += target.Struct2Property.Int1;
+                result += target.Struct3Property.Int1;
+                result += target.Struct4Property.Int1;
+                result += target.Struct5Property.Int1;
+                result += target.Struct6Property.Int1;
+                result += target.Struct7Property.Int1;
+                result += target.Struct8Property.Int1;
+            }
+
+            return result;
+        }
+
+        [Benchmark]
+        public int GetDefaultValues()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        [GlobalSetup(Target = nameof(Get_Local_Values))]
+        public void SetupLocalValues()
+        {
+            _target.SetValue(TestClass.StringProperty, "foo");
+            _target.SetValue(TestClass.Struct1Property, new(1));
+            _target.SetValue(TestClass.Struct2Property, new(1));
+            _target.SetValue(TestClass.Struct3Property, new(1));
+            _target.SetValue(TestClass.Struct4Property, new(1));
+            _target.SetValue(TestClass.Struct5Property, new(1));
+            _target.SetValue(TestClass.Struct6Property, new(1));
+            _target.SetValue(TestClass.Struct7Property, new(1));
+            _target.SetValue(TestClass.Struct8Property, new(1));
+        }
+
+        [Benchmark]
+        public int Get_Local_Values()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        [GlobalSetup(Target = nameof(Get_Local_Values_With_Style_Values))]
+        public void SetupLocalValuesAndStyleValues()
+        {
+            var target = _target;
+            target.SetValue(TestClass.StringProperty, "foo");
+            target.SetValue(TestClass.Struct1Property, new(1));
+            target.SetValue(TestClass.Struct2Property, new(1));
+            target.SetValue(TestClass.Struct3Property, new(1));
+            target.SetValue(TestClass.Struct4Property, new(1));
+            target.SetValue(TestClass.Struct5Property, new(1));
+            target.SetValue(TestClass.Struct6Property, new(1));
+            target.SetValue(TestClass.Struct7Property, new(1));
+            target.SetValue(TestClass.Struct8Property, new(1));
+            target.SetValue(TestClass.StringProperty, "bar", BindingPriority.Style);
+            target.SetValue(TestClass.Struct1Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct2Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct3Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct4Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct5Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct6Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct7Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct8Property, new(), BindingPriority.Style);
+        }
+
+        [Benchmark]
+        public int Get_Local_Values_With_Style_Values()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class BaselineTestClass
+        {
+            public string? StringProperty { get; set; }
+            public Struct1 Struct1Property { get; set; }
+            public Struct2 Struct2Property { get; set; }
+            public Struct3 Struct3Property { get; set; }
+            public Struct4 Struct4Property { get; set; }
+            public Struct5 Struct5Property { get; set; }
+            public Struct6 Struct6Property { get; set; }
+            public Struct7 Struct7Property { get; set; }
+            public Struct8 Struct8Property { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValueInherited.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValueInherited.cs
new file mode 100644
index 0000000000..45e129ecd8
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValueInherited.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_GetValueInherited
+    {
+        private TestClass _root = null!;
+        private TestClass _target = null!;
+
+        public AvaloniaObject_GetValueInherited()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Params(1, 2, 10, 50, 100, 200)]
+        public int Depth { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _root = new();
+            _root.SetValue(TestClass.StringProperty, "foo");
+            _root.SetValue(TestClass.Struct1Property, new(1));
+            _root.SetValue(TestClass.Struct2Property, new(1));
+            _root.SetValue(TestClass.Struct3Property, new(1));
+            _root.SetValue(TestClass.Struct4Property, new(1));
+            _root.SetValue(TestClass.Struct5Property, new(1));
+            _root.SetValue(TestClass.Struct6Property, new(1));
+            _root.SetValue(TestClass.Struct7Property, new(1));
+            _root.SetValue(TestClass.Struct8Property, new(1));
+
+            var parent = _root;
+
+            for (var i = 0; i < Depth; ++i)
+            {
+                var c = new TestClass();
+                ((ISetLogicalParent)c).SetParent(parent);
+                parent = c;
+            }
+
+            _target = parent;
+        }
+
+        [Benchmark]
+        public int GetInheritedValues()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String", inherits: true);
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1", inherits: true);
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2", inherits: true);
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3", inherits: true);
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4", inherits: true);
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5", inherits: true);
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6", inherits: true);
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7", inherits: true);
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8", inherits: true);
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_SetValue.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_SetValue.cs
new file mode 100644
index 0000000000..2df265984b
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_SetValue.cs
@@ -0,0 +1,130 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_SetValue
+    {
+        private BaselineTestClass _baseline = new();
+        private TestClass _target = new();
+
+        public AvaloniaObject_SetValue()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Benchmark(Baseline = true)]
+        public int SetClrPropertyValues()
+        {
+            var target = _baseline;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.StringProperty = "foo";
+                target.Struct1Property = new(i + 1);
+                target.Struct2Property = new(i + 1);
+                target.Struct3Property = new(i + 1);
+                target.Struct4Property = new(i + 1);
+                target.Struct5Property = new(i + 1);
+                target.Struct6Property = new(i + 1);
+                target.Struct7Property = new(i + 1);
+                target.Struct8Property = new(i + 1);
+            }
+
+            return result;
+        }
+
+        [Benchmark]
+        public void SetValues()
+        {
+            var target = _target;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo");
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+        }
+
+        [GlobalSetup(Target = nameof(Set_Local_Values_With_Style_Values))]
+        public void SetupStyleValues()
+        {
+            var target = _target;
+            target.SetValue(TestClass.StringProperty, "foo", BindingPriority.Style);
+            target.SetValue(TestClass.Struct1Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct2Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct3Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct4Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct5Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct6Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct7Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct8Property, new(), BindingPriority.Style);
+        }
+
+        [Benchmark]
+        public void Set_Local_Values_With_Style_Values()
+        {
+            var target = _target;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo");
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class BaselineTestClass
+        {
+            public string? StringProperty { get; set; }
+            public Struct1 Struct1Property { get; set; }
+            public Struct2 Struct2Property { get; set; }
+            public Struct3 Struct3Property { get; set; }
+            public Struct4 Struct4Property { get; set; }
+            public Struct5 Struct5Property { get; set; }
+            public Struct6 Struct6Property { get; set; }
+            public Struct7 Struct7Property { get; set; }
+            public Struct8 Struct8Property { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs b/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs
index 02f9397e2c..e823b29526 100644
--- a/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs
@@ -1,14 +1,22 @@
-using BenchmarkDotNet.Attributes;
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
 
 namespace Avalonia.Benchmarks.Base
 {
     [MemoryDiagnoser]
     public class DirectPropertyBenchmark
     {
+        private DirectClass _target = new();
+
+        public DirectPropertyBenchmark()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(DirectClass).TypeHandle);
+        }
+
         [Benchmark(Baseline = true)]
         public void SetAndRaiseOriginal()
         {
-            var obj = new DirectClass();
+            var obj = _target;
 
             for (var i = 0; i < 100; ++i)
             {
@@ -19,7 +27,7 @@ namespace Avalonia.Benchmarks.Base
         [Benchmark]
         public void SetAndRaiseSimple()
         {
-            var obj = new DirectClass();
+            var obj = _target;
 
             for (var i = 0; i < 100; ++i)
             {
diff --git a/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs b/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
index 3493dd0f53..51b52d6130 100644
--- a/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Avalonia.Controls;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using BenchmarkDotNet.Attributes;
 
@@ -37,6 +38,21 @@ namespace Avalonia.Benchmarks.Layout
             _root.Child = calendar;
 
             _root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+        }
+
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void CreateCalendarWithLoaded()
+        {
+            using var subscription = Control.LoadedEvent.AddClassHandler<Control>((c, s) => { });
+
+            var calendar = new Calendar();
+
+            _root.Child = calendar;
+
+            _root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
         }
 
         [Benchmark]
@@ -48,6 +64,7 @@ namespace Avalonia.Benchmarks.Layout
             _root.Child = button;
 
             _root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
         }
 
         [Benchmark]
@@ -59,6 +76,7 @@ namespace Avalonia.Benchmarks.Layout
             _root.Child = textBox;
 
             _root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
         }
 
         public void Dispose()
diff --git a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
index 59067e642f..8436881122 100644
--- a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
+++ b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
@@ -1,8 +1,9 @@
-using Avalonia.Media;
+using System;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 
 namespace Avalonia.Benchmarks
 {
@@ -99,5 +100,7 @@ namespace Avalonia.Benchmarks
         public void Custom(ICustomDrawOperation custom)
         {
         }
+
+        public object GetFeature(Type t) => null;
     }
 }
diff --git a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
index ccdb0eed2f..4170de71e6 100644
--- a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
+++ b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
@@ -4,7 +4,8 @@ using System.IO;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
+using Microsoft.Diagnostics.Runtime;
 
 namespace Avalonia.Benchmarks
 {
@@ -112,9 +113,14 @@ namespace Avalonia.Benchmarks
             return new MockFontManagerImpl();
         }
 
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
         {
-            return new NullGlyphRun();
+            return new MockStreamGeometryImpl();
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        {
+            return new MockGlyphRun();
         }
 
         public bool SupportsIndividualRoundRects => true;
diff --git a/tests/Avalonia.Benchmarks/Program.cs b/tests/Avalonia.Benchmarks/Program.cs
index 903778ff00..8f7aa3eb79 100644
--- a/tests/Avalonia.Benchmarks/Program.cs
+++ b/tests/Avalonia.Benchmarks/Program.cs
@@ -1,6 +1,8 @@
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Running;
 
 namespace Avalonia.Benchmarks
@@ -19,7 +21,17 @@ namespace Avalonia.Benchmarks
                 .ThenBy(t => t.Name)
                 .ToArray();
             var benchmarkSwitcher = new BenchmarkSwitcher(benchmarks);
-            benchmarkSwitcher.Run(args);
+            IConfig config = null;
+
+            if (args.Contains("--debug"))
+            {
+                config = new DebugInProcessConfig();
+                var a = new List<string>(args);
+                a.Remove("--debug");
+                args = a.ToArray();
+            }
+
+            benchmarkSwitcher.Run(args, config);
         }
     }
 }
diff --git a/tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs b/tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs
new file mode 100644
index 0000000000..0c9bcf412f
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs
@@ -0,0 +1,147 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Media;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class ControlTheme_Apply
+    {
+        private ControlTheme _theme;
+        private ControlTheme _otherTheme;
+        private List<Style> _styles = new();
+
+        public ControlTheme_Apply()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestControl).TypeHandle);
+
+            _theme = CreateControlTheme(Brushes.Red);
+            _otherTheme = CreateControlTheme(Brushes.Orange);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                _styles.Add(new Style(x => x.OfType<TestControl>())
+                {
+                    Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Yellow) }
+                });
+            }
+        }
+
+        [Benchmark]
+        public void Apply_Control_Theme()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            target.EndBatchUpdate();
+        }
+
+
+        [Benchmark]
+        public void Apply_Remove_Control_Theme()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            target.EndBatchUpdate();
+
+            // Switching to another theme will cause the current theme to be removed but won't
+            // immediately apply the new theme, so for the benefit of the benchmark it has the
+            // effect of simply removing the theme.
+            target.Theme = _otherTheme;
+        }
+
+        [Benchmark]
+        public void Apply_Control_Theme_With_Styles()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            foreach (var style in _styles)
+                style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+        }
+
+        [Benchmark]
+        public void Apply_Remove_Control_Theme_With_Styles()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            foreach (var style in _styles)
+                style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+
+            // Switching to another theme will cause the current theme to be removed but won't
+            // immediately apply the new theme, so for the benefit of the benchmark it has the
+            // effect of simply removing the theme.
+            target.Theme = _otherTheme;
+        }
+
+        private static ControlTheme CreateControlTheme(IBrush background)
+        {
+            return new ControlTheme(typeof(TestControl))
+            {
+                Setters =
+                {
+                    new Setter(TestControl.BackgroundProperty, Brushes.Transparent),
+                    new Setter(TestControl.TemplateProperty, new FuncControlTemplate<TestControl>((_, x) =>
+                        new Border())),
+                },
+                Children =
+                {
+                    new Style(x => x.Nesting().Template().OfType<Border>())
+                    {
+                        Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Red), }
+                    },
+                    new Style(x => x.Nesting().Class(":pointerover").Template().OfType<Border>())
+                    {
+                        Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Green), }
+                    },
+                    new Style(x => x.Nesting().Class(":pressed").Template().OfType<Border>())
+                    {
+                        Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Blue), }
+                    },
+                }
+            };
+        }
+
+        private class TestControl : TemplatedControl
+        {
+            public IStyleable VisualChild => (IStyleable)VisualChildren[0];
+        }
+
+        private class TestClass2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs b/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
new file mode 100644
index 0000000000..b16e891924
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
@@ -0,0 +1,112 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using BenchmarkDotNet.Attributes;
+using Moq;
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class ResourceBenchmarks : IDisposable
+    {
+        private readonly Control _searchStart;
+        private readonly IDisposable _app;
+    
+        private static IDisposable CreateApp()
+        {
+            var services = new TestServices(
+                assetLoader: new AssetLoader(),
+                globalClock: new MockGlobalClock(),
+                platform: new AppBuilder().RuntimePlatform,
+                renderInterface: new MockPlatformRenderInterface(),
+                standardCursorFactory: Mock.Of<ICursorFactory>(),
+                styler: new Styler(),
+                theme: () => CreateTheme(),
+                threadingInterface: new NullThreadingPlatform(),
+                fontManagerImpl: new MockFontManagerImpl(),
+                textShaperImpl: new MockTextShaperImpl(),
+                windowingPlatform: new MockWindowingPlatform());
+
+            return UnitTestApplication.Start(services);
+        }
+    
+        private static Styles CreateTheme()
+        {
+            AssetLoader.RegisterResUriParsers();
+            
+            var preHost = new Style();
+            preHost.Resources.Add("preTheme", null);
+            
+            var postHost = new Style();
+            postHost.Resources.Add("postTheme", null);
+
+            return new Styles
+            {
+                preHost,
+                new TestStyles(50, 3, 5),
+                postHost
+            };
+        }
+
+        public void Dispose()
+        {
+            _app.Dispose();
+        }
+        
+        public ResourceBenchmarks()
+        {
+            _searchStart = new Button();
+
+            _app = CreateApp();
+        
+            Decorator root = new TestRoot(true, null)
+            {
+                Renderer = new NullRenderer()
+            };
+        
+            var current = root;
+            
+            for (int i = 0; i < 10; i++)
+            {
+                var child = new Decorator();
+
+                current.Child = child;
+
+                current = child;
+            }
+
+            current.Child = _searchStart;
+        }
+
+        private const int LookupCount = 100;
+        
+        [Benchmark]
+        public void FindPreResource()
+        {
+            for (int i = 0; i < LookupCount; ++i)
+            {
+                _searchStart.FindResource("preTheme");
+            }
+        }
+        
+        [Benchmark]
+        public void FindPostResource()
+        {
+            for (int i = 0; i < LookupCount; ++i)
+            {
+                _searchStart.FindResource("postTheme");
+            }
+        }
+        
+        [Benchmark]
+        public void FindNotExistingResource()
+        {
+            for (int i = 0; i < LookupCount; ++i)
+            {
+                _searchStart.FindResource("notPresent");
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_Activation.cs b/tests/Avalonia.Benchmarks/Styling/Style_Activation.cs
new file mode 100644
index 0000000000..f5878286e7
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_Activation.cs
@@ -0,0 +1,65 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_Activation
+    {
+        private TestClass _target = null!;
+
+        public Style_Activation()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new TestClass();
+
+            var style = new Style(x => x.OfType<TestClass>().Class("foo"))
+            {
+                Setters = { new Setter(TestClass.StringProperty, "foo") }
+            };
+
+            style.TryAttach(_target, null);
+        }
+
+        [Benchmark]
+        public void Toggle_Style_Activation_Via_Class()
+        {
+            for (var i = 0; i < 100; ++i)
+            {
+                _target.Classes.Add("foo");
+                _target.Classes.Remove("foo");
+            }
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_Apply.cs b/tests/Avalonia.Benchmarks/Styling/Style_Apply.cs
new file mode 100644
index 0000000000..2943eef55a
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_Apply.cs
@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_Apply
+    {
+        private List<Style> _styles = new();
+
+        public Style_Apply()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Params(1, 5, 50)]
+        public int MatchingStyles { get; set; }
+
+
+        [Params(1, 5, 50)]
+        public int NonMatchingStyles { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _styles.Clear();
+
+            for (var i = 0; i < MatchingStyles; ++i)
+            {
+                _styles.Add(new Style(x => x.OfType<TestClass>())
+                {
+                    Setters = { new Setter(TestClass.StringProperty, "foo") }
+                });
+            }
+
+            for (var i = 0; i < NonMatchingStyles; ++i)
+            {
+                _styles.Add(new Style(x => x.OfType<TestClass2>().Class("missing"))
+                {
+                    Setters = { new Setter(TestClass.StringProperty, "foo") }
+                });
+            }
+        }
+
+        [Benchmark]
+        public void Apply_Simple_Styles()
+        {
+            var target = new TestClass();
+
+            target.BeginBatchUpdate();
+
+            foreach (var style in _styles)
+                style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class TestClass2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_ClassSelector.cs b/tests/Avalonia.Benchmarks/Styling/Style_ClassSelector.cs
new file mode 100644
index 0000000000..f242e95966
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_ClassSelector.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_ClassSelector
+    {
+        private Style _style = null!;
+
+        public Style_ClassSelector()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _style = new Style(x => x.OfType<TestClass>().Class("foo"))
+            {
+                Setters = { new Setter(TestClass.StringProperty, "foo") }
+            };
+        }
+
+        [Benchmark(OperationsPerInvoke = 50)]
+        public void Apply()
+        {
+            var target = new TestClass();
+
+            target.BeginBatchUpdate();
+
+            for (var i = 0; i < 50; ++i)
+                _style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+        }
+
+        [Benchmark(OperationsPerInvoke = 50)]
+        public void Apply_Toggle()
+        {
+            var target = new TestClass();
+
+            target.BeginBatchUpdate();
+
+            for (var i = 0; i < 50; ++i)
+                _style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+        }
+
+        [Benchmark(OperationsPerInvoke = 50)]
+        public void Apply_Detach()
+        {
+            var target = new TestClass();
+
+            target.BeginBatchUpdate();
+
+            for (var i = 0; i < 50; ++i)
+                _style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+
+            target.DetachStyles();
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public void DetachStyles() => InvalidateStyles();
+        }
+
+        private class TestClass2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_NonActive.cs b/tests/Avalonia.Benchmarks/Styling/Style_NonActive.cs
new file mode 100644
index 0000000000..cad947d762
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_NonActive.cs
@@ -0,0 +1,74 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_NonActive
+    {
+        private TestClass _target = null!;
+
+        public Style_NonActive()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new TestClass();
+
+            var style = new Style(x => x.OfType<TestClass>().Class("foo"))
+            {
+                Setters = { new Setter(TestClass.StringProperty, "foo") }
+            };
+
+            style.TryAttach(_target, null);
+            _target.SetValue(TestClass.StringProperty, "foo");
+            _target.SetValue(TestClass.Struct1Property, new(1));
+            _target.SetValue(TestClass.Struct2Property, new(1));
+            _target.SetValue(TestClass.Struct3Property, new(1));
+            _target.SetValue(TestClass.Struct4Property, new(1));
+            _target.SetValue(TestClass.Struct5Property, new(1));
+            _target.SetValue(TestClass.Struct6Property, new(1));
+            _target.SetValue(TestClass.Struct7Property, new(1));
+            _target.SetValue(TestClass.Struct8Property, new(1));
+        }
+
+        [Benchmark]
+        public void Toggle_NonActive_Style_Activation()
+        {
+            for (var i = 0; i < 100; ++i)
+            {
+                _target.Classes.Add("foo");
+                _target.Classes.Remove("foo");
+            }
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/TestBindingObservable.cs b/tests/Avalonia.Benchmarks/TestBindingObservable.cs
new file mode 100644
index 0000000000..653959ba18
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/TestBindingObservable.cs
@@ -0,0 +1,39 @@
+#nullable enable
+using System;
+using Avalonia.Data;
+
+namespace Avalonia.Benchmarks
+{
+    internal class TestBindingObservable<T> : IObservable<BindingValue<T?>>, IDisposable
+    {
+        private T? _value;
+        private IObserver<BindingValue<T?>>? _observer;
+
+        public TestBindingObservable(T? initialValue = default) => _value = initialValue;
+
+        public IDisposable Subscribe(IObserver<BindingValue<T?>> observer)
+        {
+            if (_observer is object)
+                throw new InvalidOperationException("The observable can only be subscribed once.");
+
+            _observer = observer;
+            observer.OnNext(_value);
+            return this;
+        }
+
+        public void Dispose() => _observer = null;
+        public void OnNext(T? value) => _observer?.OnNext(value);
+
+        public void PublishCompleted()
+        {
+            _observer?.OnCompleted();
+            _observer = null;
+        }
+
+        protected void PublishError(Exception error)
+        {
+            _observer?.OnError(error);
+            _observer = null;
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/TestStyles.cs b/tests/Avalonia.Benchmarks/TestStyles.cs
new file mode 100644
index 0000000000..be2ad7d072
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/TestStyles.cs
@@ -0,0 +1,29 @@
+using Avalonia.Styling;
+
+namespace Avalonia.Benchmarks
+{
+    public class TestStyles : Styles
+    {
+        public TestStyles(int childStylesCount, int childInnerStyleCount, int childResourceCount)
+        {
+            for (int i = 0; i < childStylesCount; i++)
+            {
+                var childStyles = new Styles();
+
+                for (int j = 0; j < childInnerStyleCount; j++)
+                {
+                    var childStyle = new Style();
+
+                    for (int k = 0; k < childResourceCount; k++)
+                    {
+                        childStyle.Resources.Add($"resource.{i}.{j}.{k}", null);
+                    }
+                    
+                    childStyles.Add(childStyle);
+                }
+                
+                Add(childStyles);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/TestTypes.cs b/tests/Avalonia.Benchmarks/TestTypes.cs
new file mode 100644
index 0000000000..584055a949
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/TestTypes.cs
@@ -0,0 +1,112 @@
+using System;
+
+namespace Avalonia.Benchmarks
+{
+    internal record struct Struct1
+    {
+        public Struct1(int value)
+        {
+            Int1 = value;
+        }
+
+        public int Int1;
+    }
+
+    internal record struct Struct2
+    {
+        public Struct2(int value)
+        {
+            Int1 = Int2 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+    }
+
+    internal record struct Struct3
+    {
+        public Struct3(int value)
+        {
+            Int1 = Int2 = Int3 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+    }
+
+    internal record struct Struct4
+    {
+        public Struct4(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+    }
+
+    internal record struct Struct5
+    {
+        public Struct5(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+    }
+
+    internal record struct Struct6
+    {
+        public Struct6(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = Int6 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+        public int Int6;
+    }
+
+    internal record struct Struct7
+    {
+        public Struct7(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = Int6 = Int7 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+        public int Int6;
+        public int Int7;
+    }
+
+    internal record struct Struct8
+    {
+        public Struct8(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = Int6 = Int7 = Int8 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+        public int Int6;
+        public int Int7;
+        public int Int8;
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
index 6f04bb5206..ceb015ee63 100644
--- a/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
@@ -1,7 +1,6 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Platform;
-using Avalonia.PlatformSupport;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using BenchmarkDotNet.Attributes;
diff --git a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
index 81264f109c..86ba4c6005 100644
--- a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
@@ -2,8 +2,10 @@
 
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml.Styling;
-using Avalonia.PlatformSupport;
+using Avalonia.Platform;
 using Avalonia.Styling;
+using Avalonia.Themes.Fluent;
+using Avalonia.Themes.Simple;
 using Avalonia.UnitTests;
 
 using BenchmarkDotNet.Attributes;
@@ -25,32 +27,25 @@ namespace Avalonia.Benchmarks.Themes
         }
 
         [Benchmark]
-        [Arguments("avares://Avalonia.Themes.Fluent/FluentDark.xaml")]
-        [Arguments("avares://Avalonia.Themes.Fluent/FluentLight.xaml")]
-        public bool InitFluentTheme(string themeUri)
+        [Arguments(FluentThemeMode.Dark)]
+        [Arguments(FluentThemeMode.Light)]
+        public bool InitFluentTheme(FluentThemeMode mode)
         {
-            UnitTestApplication.Current.Styles[0] = new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
+            UnitTestApplication.Current.Styles[0] = new FluentTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
             {
-                Source = new Uri(themeUri)
+                Mode = mode
             };
             return ((IResourceHost)UnitTestApplication.Current).TryGetResource("SystemAccentColor", out _);
         }
 
         [Benchmark]
-        [Arguments("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")]
-        [Arguments("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")]
-        public bool InitDefaultTheme(string themeUri)
+        [Arguments(SimpleThemeMode.Dark)]
+        [Arguments(SimpleThemeMode.Light)]
+        public bool InitSimpleTheme(SimpleThemeMode mode)
         {
-            UnitTestApplication.Current.Styles[0] = new Styles
+            UnitTestApplication.Current.Styles[0] = new SimpleTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
             {
-                new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
-                {
-                    Source = new Uri(themeUri)
-                },
-                new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
-                {
-                    Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
-                }
+                Mode = mode
             };
             return ((IResourceHost)UnitTestApplication.Current).TryGetResource("ThemeAccentColor", out _);
         }
diff --git a/tests/Avalonia.Benchmarks/Visuals/VisualAffectsRenderBenchmarks.cs b/tests/Avalonia.Benchmarks/Visuals/VisualAffectsRenderBenchmarks.cs
new file mode 100644
index 0000000000..5b85a068d6
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Visuals/VisualAffectsRenderBenchmarks.cs
@@ -0,0 +1,45 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Visuals;
+
+[MemoryDiagnoser]
+public class VisualAffectsRenderBenchmarks
+{
+    private readonly TestVisual _target;
+    private readonly IPen _pen;
+        
+    public VisualAffectsRenderBenchmarks()
+    {
+        _target = new TestVisual();
+        _pen = new Pen(Brushes.Black);
+    }
+        
+    [Benchmark]
+    public void SetPropertyThatAffectsRender()
+    {
+        _target.Pen = _pen;
+        _target.Pen = null;
+    }
+
+    private class TestVisual : Visual
+    {
+        /// <summary>
+        /// Defines the <see cref="Pen"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IPen> PenProperty =
+            AvaloniaProperty.Register<Border, IPen>(nameof(Pen));
+            
+        public IPen Pen
+        {
+            get => GetValue(PenProperty);
+            set => SetValue(PenProperty, value);
+        }
+
+        static TestVisual()
+        {
+            AffectsRender<TestVisual>(PenProperty);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Automation/ControlAutomationPeerTests.cs b/tests/Avalonia.Controls.UnitTests/Automation/ControlAutomationPeerTests.cs
new file mode 100644
index 0000000000..b128e6d83a
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Automation/ControlAutomationPeerTests.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Linq;
+using Avalonia.Automation.Peers;
+using Avalonia.Automation.Provider;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+#nullable enable
+
+namespace Avalonia.Controls.UnitTests.Automation
+{
+    public class ControlAutomationPeerTests
+    {
+        public class Children
+        {
+            [Fact]
+            public void Creates_Children_For_Controls_In_Visual_Tree()
+            {
+                var panel = new Panel
+                {
+                    Children =
+                    {
+                        new Border(),
+                        new Border(),
+                    },
+                };
+
+                var target = CreatePeer(panel);
+
+                Assert.Equal(
+                    panel.GetVisualChildren(),
+                    target.GetChildren().Cast<ControlAutomationPeer>().Select(x => x.Owner));
+            }
+
+            [Fact]
+            public void Creates_Children_when_Controls_Attached_To_Visual_Tree()
+            {
+                var contentControl = new ContentControl
+                {
+                    Template = new FuncControlTemplate<ContentControl>((o, ns) =>
+                        new ContentPresenter
+                        {
+                            Name = "PART_ContentPresenter",
+                            [!ContentPresenter.ContentProperty] = o[!ContentControl.ContentProperty],
+                        }),
+                    Content = new Border(),
+                };
+
+                var target = CreatePeer(contentControl);
+
+                Assert.Empty(target.GetChildren());
+
+                contentControl.Measure(Size.Infinity);
+
+                Assert.Equal(1, target.GetChildren().Count);
+            }
+
+            [Fact]
+            public void Updates_Children_When_VisualChildren_Added()
+            {
+                var panel = new Panel
+                {
+                    Children =
+                    {
+                        new Border(),
+                        new Border(),
+                    },
+                };
+
+                var target = CreatePeer(panel);
+                var children = target.GetChildren();
+
+                Assert.Equal(2, children.Count);
+
+                panel.Children.Add(new Decorator());
+
+                children = target.GetChildren();
+                Assert.Equal(3, children.Count);
+            }
+
+            [Fact]
+            public void Updates_Children_When_VisualChildren_Removed()
+            {
+                var panel = new Panel
+                {
+                    Children =
+                    {
+                        new Border(),
+                        new Border(),
+                    },
+                };
+
+                var target = CreatePeer(panel);
+                var children = target.GetChildren();
+
+                Assert.Equal(2, children.Count);
+
+                panel.Children.RemoveAt(1);
+
+                children = target.GetChildren();
+                Assert.Equal(1, children.Count);
+            }
+
+            [Fact]
+            public void Updates_Children_When_Visibility_Changes()
+            {
+                var panel = new Panel
+                {
+                    Children =
+                    {
+                        new Border(),
+                        new Border(),
+                    },
+                };
+
+                var target = CreatePeer(panel);
+                var children = target.GetChildren();
+
+                Assert.Equal(2, children.Count);
+
+                panel.Children[1].IsVisible = false;
+                children = target.GetChildren();
+                Assert.Equal(1, children.Count);
+
+                panel.Children[1].IsVisible = true;
+                children = target.GetChildren();
+                Assert.Equal(2, children.Count);
+            }
+        }
+
+        public class Parent
+        {
+            [Fact]
+            public void Connects_Peer_To_Tree_When_GetParent_Called()
+            {
+                var border = new Border();
+                var tree = new Decorator
+                {
+                    Child = new Decorator
+                    {
+                        Child = border,
+                    }
+                };
+
+                // We're accessing Border directly without going via its ancestors. Because the tree
+                // is built lazily, ensure that calling GetParent causes the ancestor tree to be built.
+                var target = CreatePeer(border);
+
+                var parentPeer = Assert.IsAssignableFrom<ControlAutomationPeer>(target.GetParent());
+                Assert.Same(border.GetVisualParent(), parentPeer.Owner);
+            }
+
+            [Fact]
+            public void Parent_Updated_When_Moved_To_Separate_Visual_Tree()
+            {
+                var border = new Border();
+                var root1 = new Decorator { Child = border };
+                var root2 = new Decorator();
+                var target = CreatePeer(border);
+
+                var parentPeer = Assert.IsAssignableFrom<ControlAutomationPeer>(target.GetParent());
+                Assert.Same(root1, parentPeer.Owner);
+
+                root1.Child = null;
+
+                Assert.Null(target.GetParent());
+
+                root2.Child = border;
+
+                parentPeer = Assert.IsAssignableFrom<ControlAutomationPeer>(target.GetParent());
+                Assert.Same(root2, parentPeer.Owner);
+            }
+        }
+
+        private static AutomationPeer CreatePeer(Control control)
+        {
+            return ControlAutomationPeer.CreatePeerForElement(control);
+        }
+
+        private class TestControl : Control
+        {
+            protected override AutomationPeer OnCreateAutomationPeer()
+            {
+                return new TestAutomationPeer(this);
+            }
+        }
+
+        private class AutomationTestRoot : TestRoot
+        {
+            protected override AutomationPeer OnCreateAutomationPeer()
+            {
+                return new TestRootAutomationPeer(this);
+            }
+        }
+
+        private class TestAutomationPeer : ControlAutomationPeer
+        {
+            public TestAutomationPeer( Control owner)
+                : base(owner)
+            {
+            }
+        }
+
+        private class TestRootAutomationPeer : ControlAutomationPeer, IRootProvider
+        {
+            public TestRootAutomationPeer(Control owner)
+                : base(owner)
+            {
+            }
+
+            public ITopLevelImpl PlatformImpl => throw new System.NotImplementedException();
+            public event EventHandler? FocusChanged;
+
+            public AutomationPeer GetFocus()
+            {
+                throw new System.NotImplementedException();
+            }
+
+            public AutomationPeer GetPeerFromPoint(Point p)
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index 4aed8c60c3..12eb290fde 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -18,14 +18,8 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index ab33eaaff9..e9ddc8e8a3 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -1,6 +1,8 @@
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Moq;
 using Xunit;
 
@@ -60,5 +62,119 @@ namespace Avalonia.Controls.UnitTests
 
             renderer.Verify(x => x.AddDirty(target), Times.Once);
         }
+
+        public class UseLayoutRounding
+        {
+            [Fact]
+            public void Measure_Rounds_Padding()
+            {
+                var target = new Border 
+                { 
+                    Padding = new Thickness(1),
+                    Child = new Canvas
+                    {
+                        Width = 101,
+                        Height = 101,
+                    }
+                };
+
+                var root = CreateRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 1 pixel padding is rounded up to 1.3333; for both sides it is 2.6666
+                // - Size of 101 gets rounded up to 101.3333
+                // - Desired size = 101.3333 + 2.6666 = 104
+                Assert.Equal(new Size(104, 104), target.DesiredSize);
+            }
+
+            [Fact]
+            public void Measure_Rounds_BorderThickness()
+            {
+                var target = new Border
+                {
+                    BorderThickness = new Thickness(1),
+                    Child = new Canvas
+                    {
+                        Width = 101,
+                        Height = 101,
+                    }
+                };
+
+                var root = CreateRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 1 pixel border thickness is rounded up to 1.3333; for both sides it is 2.6666
+                // - Size of 101 gets rounded up to 101.3333
+                // - Desired size = 101.3333 + 2.6666 = 104
+                Assert.Equal(new Size(104, 104), target.DesiredSize);
+            }
+
+            [Fact]
+            public void Measure_Arranges_Child_To_Rounded_BorderThickness()
+            {
+                Canvas child;
+                var target = new Border
+                {
+                    BorderThickness = new Thickness(1),
+                    Width = 82,
+                    Height = 82,
+                    Child = child = new Canvas(),
+                };
+
+                var root = CreateRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 1 pixel border thickness is rounded up to 1.3333; for both sides it is 2.6666
+                // - Size of 82 needs no rounding
+                // - Minus border thickness, space for child is 82 - 2.6666 = 79.3333
+                Assert.Equal(1.3333, child.Bounds.Left, 3);
+                Assert.Equal(1.3333, child.Bounds.Top, 3);
+                Assert.Equal(79.3333, child.Bounds.Width, 3);
+                Assert.Equal(79.3333, child.Bounds.Height, 3);
+            }
+
+            [Fact]
+            public void Measure_Arranges_Child_With_Rounded_Margin()
+            {
+                Border child;
+                var target = new Border
+                {
+                    Width = 220,
+                    Height = 220,
+                    Child = child = new Border
+                    {
+                        Margin = new Thickness(0, 25, 25, 25),
+                    },
+                };
+
+                var root = CreateRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 25 margin gets rounded up to 25.3333
+                // - Size of 220 needs no rounding
+                Assert.Equal(0, child.Bounds.Left, 3);
+                Assert.Equal(25.3333, child.Bounds.Top, 3);
+                Assert.Equal(194.6666, child.Bounds.Width, 3);
+                Assert.Equal(169.3333, child.Bounds.Height, 3);
+            }
+
+            private static TestRoot CreateRoot(
+                double scaling,
+                Control child,
+                Size? constraint = null)
+            {
+                return new TestRoot
+                {
+                    LayoutScaling = scaling,
+                    UseLayoutRounding = true,
+                    Child = child,
+                    ClientSize = constraint ?? new Size(1000, 1000),
+                };
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
index f4acf5ea37..42bdffd908 100644
--- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
@@ -150,7 +150,7 @@ namespace Avalonia.Controls.UnitTests
 
             target.Click += (s, e) => clicked = true;
 
-            RaisePointerEnter(target);
+            RaisePointerEntered(target);
             RaisePointerMove(target, pt);
             RaisePointerPressed(target, 1, MouseButton.Left, pt);
 
@@ -182,10 +182,10 @@ namespace Avalonia.Controls.UnitTests
 
             target.Click += (s, e) => clicked = true;
 
-            RaisePointerEnter(target);
+            RaisePointerEntered(target);
             RaisePointerMove(target, new Point(50,50));
             RaisePointerPressed(target, 1, MouseButton.Left, new Point(50, 50));
-            RaisePointerLeave(target);
+            RaisePointerExited(target);
 
             Assert.Equal(_helper.Captured, target);
 
@@ -224,7 +224,7 @@ namespace Avalonia.Controls.UnitTests
 
             target.Click += (s, e) => clicked = true;
 
-            RaisePointerEnter(target);
+            RaisePointerEntered(target);
             RaisePointerMove(target, pt);
             RaisePointerPressed(target, 1, MouseButton.Left, pt);
 
@@ -309,6 +309,80 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(0, raised);
         }
+        
+        [Fact]
+        public void Button_IsDefault_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var raised = 0;
+                var target = new Button();
+                var window = new Window { Content = target };
+                window.Show();
+                
+                target.Click += (s, e) => ++raised;
+
+                target.IsDefault = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(0, raised);
+                
+                target.IsDefault = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(1, raised);
+
+                target.IsDefault = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(1, raised);
+                
+                target.IsDefault = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(2, raised);
+                
+                window.Content = null;
+                // To check if handler was raised on the button, when it's detached, we need to pass it as a source manually.
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter, target));
+                Assert.Equal(2, raised);
+            }
+        }
+        
+        [Fact]
+        public void Button_IsCancel_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var raised = 0;
+                var target = new Button();
+                var window = new Window { Content = target };
+                window.Show();
+                
+                target.Click += (s, e) => ++raised;
+
+                target.IsCancel = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(0, raised);
+                
+                target.IsCancel = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(1, raised);
+
+                target.IsCancel = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(1, raised);
+                
+                target.IsCancel = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(2, raised);
+                
+                window.Content = null;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape, target));
+                Assert.Equal(2, raised);
+            }
+        }
+
+        private KeyEventArgs CreateKeyDownEvent(Key key, IInteractive source = null)
+        {
+            return new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, Source = source };
+        }
 
         private class TestButton : Button, IRenderRoot
         {
@@ -348,12 +422,12 @@ namespace Avalonia.Controls.UnitTests
             _helper.Up(button, mouseButton, pt);
         }
 
-        private void RaisePointerEnter(Button button)
+        private void RaisePointerEntered(Button button)
         {
             _helper.Enter(button);
         }
 
-        private void RaisePointerLeave(Button button)
+        private void RaisePointerExited(Button button)
         {
             _helper.Leave(button);
         }
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
index 95ddd211da..13c6638308 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls.UnitTests
                 first.Day == second.Day;
         }
 
-        [Fact(Skip ="FIX ME ASAP")]
+        [Fact]
         public void SelectedDatesChanged_Should_Fire_When_SelectedDate_Set()
         {
             bool handled = false;
diff --git a/tests/Avalonia.Controls.UnitTests/ClassesTests.cs b/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
index c10e7b467c..bcd2b6ec1f 100644
--- a/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
@@ -168,5 +168,36 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new[] { "foo" }, target);
         }
+
+        [Fact]
+        public void Listeners_Can_Be_Added_By_Listener()
+        {
+            var classes = new Classes();
+            var listener1 = new ClassesChangedListener(() => { });
+            var listener2 = new ClassesChangedListener(() => classes.AddListener(listener1));
+
+            classes.AddListener(listener2);
+            classes.Add("bar");
+        }
+
+        [Fact]
+        public void Listeners_Can_Be_Removed_By_Listener()
+        {
+            var classes = new Classes();
+            var listener1 = new ClassesChangedListener(() => { });
+            var listener2 = new ClassesChangedListener(() => classes.RemoveListener(listener1));
+
+            classes.AddListener(listener1);
+            classes.AddListener(listener2);
+            classes.Add("bar");
+        }
+
+        private class ClassesChangedListener : IClassesChangedListener
+        {
+            private Action _action;
+
+            public ClassesChangedListener(Action action) => _action = action;
+            public void Changed() => _action();
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
index cb2fd11175..21438543d5 100644
--- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
@@ -8,7 +8,7 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
-using Avalonia.Threading;
+using Avalonia.VisualTree;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -29,11 +29,111 @@ namespace Avalonia.Controls.UnitTests
             _helper.Down(target);
             _helper.Up(target);
             Assert.True(target.IsDropDownOpen);
+            Assert.True(target.Classes.Contains(ComboBox.pcDropdownOpen));
 
             _helper.Down(target);
             _helper.Up(target);
 
             Assert.False(target.IsDropDownOpen);
+            Assert.True(!target.Classes.Contains(ComboBox.pcDropdownOpen));
+        }
+
+        [Fact]
+        public void Clicking_On_Control_PseudoClass()
+        {
+            var target = new ComboBox
+            {
+                Items = new[] { "Foo", "Bar" },
+            };
+
+            _helper.Down(target);
+            Assert.True(target.Classes.Contains(ComboBox.pcPressed));
+            _helper.Up(target);
+            Assert.True(!target.Classes.Contains(ComboBox.pcPressed));
+            Assert.True(target.Classes.Contains(ComboBox.pcDropdownOpen));
+
+            _helper.Down(target);
+            Assert.True(target.Classes.Contains(ComboBox.pcPressed));
+            _helper.Up(target);
+            Assert.True(!target.Classes.Contains(ComboBox.pcPressed));
+
+            Assert.False(target.IsDropDownOpen);
+            Assert.True(!target.Classes.Contains(ComboBox.pcDropdownOpen));
+        }
+
+        [Fact]
+        public void WrapSelection_Should_Work()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var items = new[]
+                {
+                    new ComboBoxItem() { Content = "bla" },
+                    new ComboBoxItem() { Content = "dd" },
+                    new ComboBoxItem() { Content = "sdf", IsEnabled = false }
+                };
+                var target = new ComboBox
+                {
+                    Items = items,
+                    Template = GetTemplate(),
+                    WrapSelection = true
+                };
+                var root = new TestRoot(target);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.Focus();
+                Assert.Equal(target.SelectedIndex, -1);
+                Assert.True(target.IsFocused);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Up,
+                });
+                Assert.Equal(target.SelectedIndex, 1);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Down,
+                });
+                Assert.Equal(target.SelectedIndex, 0);
+            }
+        }
+
+        [Fact]
+        public void Focuses_Next_Item_On_Key_Down()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var items = new[]
+                {
+                    new ComboBoxItem() { Content = "bla" },
+                    new ComboBoxItem() { Content = "dd", IsEnabled = false },
+                    new ComboBoxItem() { Content = "sdf" }
+                };
+                var target = new ComboBox
+                {
+                    Items = items,
+                    Template = GetTemplate()
+                };
+                var root = new TestRoot(target);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.Focus();
+                Assert.Equal(target.SelectedIndex, -1);
+                Assert.True(target.IsFocused);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Down,
+                });
+                Assert.Equal(target.SelectedIndex, 0);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Down,
+                });
+                Assert.Equal(target.SelectedIndex, 2);
+            }
         }
 
         [Fact]
@@ -261,5 +361,104 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(1, count);
             }
         }
+
+        [Fact]
+        public void FlowDirection_Of_RectangleContent_Shuold_Be_LeftToRight()
+        {
+            var items = new[]
+            {
+                new ComboBoxItem()
+                { 
+                    Content = new Control()
+                }
+            };
+            var target = new ComboBox
+            {
+                FlowDirection = FlowDirection.RightToLeft,
+                Items = items,
+                Template = GetTemplate()
+            };
+
+            var root = new TestRoot(target);
+            target.ApplyTemplate();
+            target.SelectedIndex = 0;
+
+            var rectangle = target.GetValue(ComboBox.SelectionBoxItemProperty) as Rectangle;
+
+            Assert.Equal(FlowDirection.LeftToRight, rectangle.FlowDirection);
+        }
+
+        [Fact]
+        public void FlowDirection_Of_RectangleContent_Updated_After_InvalidateMirrorTransform()
+        {
+            var parentContent = new Decorator()
+            {
+                Child = new Control()
+            };
+            var items = new[]
+            { 
+                new ComboBoxItem()
+                {
+                    Content = parentContent.Child
+                }
+            };
+            var target = new ComboBox
+            {
+                Items = items,
+                Template = GetTemplate()
+            };
+
+            var root = new TestRoot(target);
+            target.ApplyTemplate();
+            target.SelectedIndex = 0;
+
+            var rectangle = target.GetValue(ComboBox.SelectionBoxItemProperty) as Rectangle;
+            Assert.Equal(FlowDirection.LeftToRight, rectangle.FlowDirection);
+
+            parentContent.FlowDirection = FlowDirection.RightToLeft;
+            target.FlowDirection = FlowDirection.RightToLeft;
+            
+            Assert.Equal(FlowDirection.RightToLeft, rectangle.FlowDirection);
+        }
+
+        [Fact]
+        public void FlowDirection_Of_RectangleContent_Updated_After_OpenPopup()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var parentContent = new Decorator()
+                {
+                    Child = new Control()
+                };
+                var items = new[]
+                { 
+                    new ComboBoxItem()
+                    {
+                        Content = parentContent.Child
+                    }
+                };
+                var target = new ComboBox
+                {
+                    FlowDirection = FlowDirection.RightToLeft,
+                    Items = items,
+                    Template = GetTemplate()
+                };
+
+                var root = new TestRoot(target);
+                target.ApplyTemplate();
+                target.SelectedIndex = 0;
+
+                var rectangle = target.GetValue(ComboBox.SelectionBoxItemProperty) as Rectangle;
+                Assert.Equal(FlowDirection.LeftToRight, rectangle.FlowDirection);
+
+                parentContent.FlowDirection = FlowDirection.RightToLeft;
+
+                var popup = target.GetVisualDescendants().OfType<Popup>().First();
+                popup.PlacementTarget = new Window();
+                popup.Open();
+                
+                Assert.Equal(FlowDirection.RightToLeft, rectangle.FlowDirection);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index ba01f3db40..b63cbd286e 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -446,6 +446,27 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Detached()
+        {
+            using (Application())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var menu = new ContextMenu();
+                userControl.ContextMenu = menu;
+                menu.Open();
+                
+                var popup = Assert.IsType<Popup>(menu.Parent);
+                Assert.NotNull(popup.Parent);
+                
+                window.Content = null;
+                Assert.Null(popup.Parent);
+            }
+        }
+
         [Fact]
         public void Context_Menu_In_Resources_Can_Be_Shared()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index 3105263290..8271dde3f6 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -55,7 +55,7 @@ namespace Avalonia.Controls.UnitTests
 
                 for(int i = 0; i < container.Children.Count; i++)
                 {
-                    if(container.Children[i] is TextBlock tb && tb.Name == "DayText")
+                    if(container.Children[i] is TextBlock tb && tb.Name == "PART_DayTextBlock")
                     {
                         dayText = tb;
                         break;
@@ -93,7 +93,7 @@ namespace Avalonia.Controls.UnitTests
 
                 for (int i = 0; i < container.Children.Count; i++)
                 {
-                    if (container.Children[i] is TextBlock tb && tb.Name == "MonthText")
+                    if (container.Children[i] is TextBlock tb && tb.Name == "PART_MonthTextBlock")
                     {
                         monthText = tb;
                         break;
@@ -131,7 +131,7 @@ namespace Avalonia.Controls.UnitTests
 
                 for (int i = 0; i < container.Children.Count; i++)
                 {
-                    if (container.Children[i] is TextBlock tb && tb.Name == "YearText")
+                    if (container.Children[i] is TextBlock tb && tb.Name == "PART_YearTextBlock")
                     {
                         yearText = tb;
                         break;
@@ -171,15 +171,15 @@ namespace Avalonia.Controls.UnitTests
 
                 for (int i = 0; i < container.Children.Count; i++)
                 {
-                    if (container.Children[i] is TextBlock tb && tb.Name == "YearText")
+                    if (container.Children[i] is TextBlock tb && tb.Name == "PART_YearTextBlock")
                     {
                         yearText = tb;
                     }
-                    else if (container.Children[i] is TextBlock tb1 && tb1.Name == "MonthText")
+                    else if (container.Children[i] is TextBlock tb1 && tb1.Name == "PART_MonthTextBlock")
                     {
                         monthText = tb1;
                     }
-                    else if (container.Children[i] is TextBlock tb2 && tb2.Name == "DayText")
+                    else if (container.Children[i] is TextBlock tb2 && tb2.Name == "PART_DayTextBlock")
                     {
                         dayText = tb2;
                     }
@@ -218,31 +218,31 @@ namespace Avalonia.Controls.UnitTests
                 //Skip contentpresenter
                 var flyoutButton = new Button
                 {
-                    Name = "FlyoutButton"
+                    Name = "PART_FlyoutButton"
                 }.RegisterInNameScope(scope);
                 var contentGrid = new Grid
                 {
-                    Name = "ButtonContentGrid"
+                    Name = "PART_ButtonContentGrid"
                 }.RegisterInNameScope(scope);
                 var dayText = new TextBlock
                 {
-                    Name = "DayText"
+                    Name = "PART_DayTextBlock"
                 }.RegisterInNameScope(scope);
                 var monthText = new TextBlock
                 {
-                    Name = "MonthText"
+                    Name = "PART_MonthTextBlock"
                 }.RegisterInNameScope(scope);
                 var yearText = new TextBlock
                 {
-                    Name = "YearText"
+                    Name = "PART_YearTextBlock"
                 }.RegisterInNameScope(scope);
                 var firstSpacer = new Rectangle
                 {
-                    Name = "FirstSpacer"
+                    Name = "PART_FirstSpacer"
                 }.RegisterInNameScope(scope);
                 var secondSpacer = new Rectangle
                 {
-                    Name = "SecondSpacer"
+                    Name = "PART_SecondSpacer"
                 }.RegisterInNameScope(scope);
                
                 contentGrid.Children.AddRange(new IControl[] { dayText, monthText, yearText, firstSpacer, secondSpacer });
diff --git a/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs b/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs
index 65749efbf9..fe58cd4c7f 100644
--- a/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs
@@ -1,6 +1,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.LogicalTree;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -116,5 +117,45 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(16, 16), target.DesiredSize);
         }
+
+        public class UseLayoutRounding
+        {
+            [Fact]
+            public void Measure_Rounds_Padding()
+            {
+                var target = new Decorator
+                {
+                    Padding = new Thickness(1),
+                    Child = new Canvas
+                    {
+                        Width = 101,
+                        Height = 101,
+                    }
+                };
+
+                var root = CreatedRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 1 pixel padding is rounded up to 1.3333; for both sides it is 2.6666
+                // - Size of 101 gets rounded up to 101.3333
+                // - Desired size = 101.3333 + 2.6666 = 104
+                Assert.Equal(new Size(104, 104), target.DesiredSize);
+            }
+
+            private static TestRoot CreatedRoot(
+                double scaling,
+                Control child,
+                Size? constraint = null)
+            {
+                return new TestRoot
+                {
+                    LayoutScaling = scaling,
+                    UseLayoutRounding = true,
+                    Child = child,
+                    ClientSize = constraint ?? new Size(1000, 1000),
+                };
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/FlowDirectionTests.cs b/tests/Avalonia.Controls.UnitTests/FlowDirectionTests.cs
new file mode 100644
index 0000000000..6c43103ecb
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/FlowDirectionTests.cs
@@ -0,0 +1,57 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class FlowDirectionTests
+    {
+        [Fact]
+        public void HasMirrorTransform_Should_Be_True()
+        {
+            var target = new Control
+            {
+                FlowDirection = FlowDirection.RightToLeft,
+            };
+
+            Assert.True(target.HasMirrorTransform);    
+        }
+
+        [Fact]
+        public void HasMirrorTransform_Of_LTR_Children_Should_Be_True_For_RTL_Parent()
+        {
+            Control child;
+            var target = new Decorator
+            {
+                FlowDirection = FlowDirection.RightToLeft,
+                Child = child = new Control()
+            };
+
+            child.FlowDirection = FlowDirection.LeftToRight;
+
+            Assert.True(target.HasMirrorTransform);
+            Assert.True(child.HasMirrorTransform);  
+        }
+
+        [Fact]
+        public void HasMirrorTransform_Of_Children_Is_Updated_After_Parent_Changeed()
+        {
+            Control child;
+            var target = new Decorator
+            {
+                FlowDirection = FlowDirection.LeftToRight,
+                Child = child = new Control()
+                {
+                    FlowDirection = FlowDirection.LeftToRight,
+                }
+            };
+
+            Assert.False(target.HasMirrorTransform);
+            Assert.False(child.HasMirrorTransform);
+
+            target.FlowDirection = FlowDirection.RightToLeft;
+
+            Assert.True(target.HasMirrorTransform);
+            Assert.True(child.HasMirrorTransform);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
index c2dd8cf01a..776b4508c2 100644
--- a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
@@ -432,6 +432,48 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Detached()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var flyout = new TestFlyout();
+                flyout.ShowAt(userControl);
+                
+                var popup = Assert.IsType<Popup>(flyout.Popup);
+                Assert.NotNull(popup.Parent);
+                
+                window.Content = null;
+                Assert.Null(popup.Parent);
+            }
+        }
+        
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Attach_Following_Detach()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var flyout = new TestFlyout();
+                flyout.ShowAt(userControl);
+                
+                var popup = Assert.IsType<Popup>(flyout.Popup);
+                Assert.NotNull(popup.Parent);
+                
+                flyout.Hide();
+                
+                flyout.ShowAt(userControl);
+                Assert.NotNull(popup.Parent);
+            }
+        }
+
         [Fact]
         public void ContextFlyout_Can_Be_Set_In_Styles()
         {
@@ -549,5 +591,10 @@ namespace Avalonia.Controls.UnitTests
                 new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
                 KeyModifiers.None);
         }
+        
+        public class TestFlyout : Flyout
+        {
+            public new Popup Popup => base.Popup;
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs b/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs
index 8c00726e05..aab282a54f 100644
--- a/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -100,5 +102,23 @@ namespace Avalonia.Controls.UnitTests
                 },
                 result);
         }
+
+        [Theory]
+        [InlineData(1.2d, GridUnitType.Pixel, "1.2")]
+        [InlineData(1.2d, GridUnitType.Star, "1.2*")]
+        [InlineData(1.2d, GridUnitType.Auto, "Auto")]
+        public async void ToString_AllCulture_Should_Pass(double d, GridUnitType type, string result)
+        {
+            List<CultureInfo> cultureInfos = CultureInfo.GetCultures(CultureTypes.AllCultures).ToList();
+            GridLength length = new GridLength(d, type);
+            foreach(var culture in cultureInfos)
+            {
+                await Task.Run(() =>
+                {
+                    CultureInfo.CurrentCulture = culture;
+                    Assert.Equal(result, length.ToString());
+                });
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index bfece7871c..f08653a4f8 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -1,15 +1,14 @@
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
-using Xunit;
-using System.Collections.ObjectModel;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
-using Avalonia.Input;
-using System.Collections.Generic;
+using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -62,6 +61,25 @@ namespace Avalonia.Controls.UnitTests
             Assert.Null(container.TemplatedParent);
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            var theme = new ControlTheme();
+            var target = new ItemsControl
+            {
+                ItemContainerTheme = theme,
+            };
+
+            target.Template = GetTemplate();
+            target.Items = new[] { "Foo" };
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var container = (ContentPresenter)target.Presenter.Panel.Children[0];
+
+            Assert.Same(container.Theme, theme);
+        }
+
         [Fact]
         public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index aa63e18691..f6d96edb99 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -9,7 +9,6 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
-using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
@@ -19,7 +18,7 @@ namespace Avalonia.Controls.UnitTests
     public class ListBoxTests
     {
         private MouseTestHelper _mouse = new MouseTestHelper();
-        
+
         [Fact]
         public void Should_Use_ItemTemplate_To_Create_Item_Content()
         {
@@ -94,6 +93,50 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var items = new[] { "Foo", "Bar", "Baz " };
+                var theme = new ControlTheme();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemContainerTheme = theme,
+                };
+
+                Prepare(target);
+
+                var container = (ListBoxItem)target.Presenter.Panel.Children[0];
+
+                Assert.Same(container.Theme, theme);
+            }
+        }
+
+        [Fact]
+        public void Inline_Item_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var items = new[] { "Foo", "Bar", "Baz " };
+                var theme = new ControlTheme();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = new[] { new ListBoxItem() },
+                    ItemContainerTheme = theme,
+                };
+
+                Prepare(target);
+
+                var container = (ListBoxItem)target.Presenter.Panel.Children[0];
+
+                Assert.Same(container.Theme, theme);
+            }
+        }
+
         [Fact]
         public void LogicalChildren_Should_Be_Set_For_DataTemplate_Generated_Items()
         {
@@ -156,112 +199,127 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Selection_Should_Be_Cleared_On_Recycled_Items()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = Enumerable.Range(0, 20).Select(x => $"Item {x}").ToList(),
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 }),
-                SelectedIndex = 0,
-            };
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = Enumerable.Range(0, 20).Select(x => $"Item {x}").ToList(),
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 }),
+                    SelectedIndex = 0,
+                };
 
-            Prepare(target);
+                Prepare(target);
 
-            // Make sure we're virtualized and first item is selected.
-            Assert.Equal(10, target.Presenter.Panel.Children.Count);
-            Assert.True(((ListBoxItem)target.Presenter.Panel.Children[0]).IsSelected);
+                // Make sure we're virtualized and first item is selected.
+                Assert.Equal(10, target.Presenter.Panel.Children.Count);
+                Assert.True(((ListBoxItem)target.Presenter.Panel.Children[0]).IsSelected);
 
-            // Scroll down a page.
-            target.Scroll.Offset = new Vector(0, 10);
+                // Scroll down a page.
+                target.Scroll.Offset = new Vector(0, 10);
 
-            // Make sure recycled item isn't now selected.
-            Assert.False(((ListBoxItem)target.Presenter.Panel.Children[0]).IsSelected);
+                // Make sure recycled item isn't now selected.
+                Assert.False(((ListBoxItem)target.Presenter.Panel.Children[0]).IsSelected);
+            }
         }
 
         [Fact]
         public void ScrollViewer_Should_Have_Correct_Extent_And_Viewport()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = Enumerable.Range(0, 20).Select(x => $"Item {x}").ToList(),
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectedIndex = 0,
-            };
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = Enumerable.Range(0, 20).Select(x => $"Item {x}").ToList(),
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectedIndex = 0,
+                };
 
-            Prepare(target);
+                Prepare(target);
 
-            Assert.Equal(new Size(20, 20), target.Scroll.Extent);
-            Assert.Equal(new Size(100, 10), target.Scroll.Viewport);
+                Assert.Equal(new Size(20, 20), target.Scroll.Extent);
+                Assert.Equal(new Size(100, 10), target.Scroll.Viewport);
+            }
         }
 
         [Fact]
         public void Containers_Correct_After_Clear_Add_Remove()
         {
-            // Issue #1936
-            var items = new AvaloniaList<string>(Enumerable.Range(0, 11).Select(x => $"Item {x}"));
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = items,
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectedIndex = 0,
-            };
+                // Issue #1936
+                var items = new AvaloniaList<string>(Enumerable.Range(0, 11).Select(x => $"Item {x}"));
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectedIndex = 0,
+                };
 
-            Prepare(target);
+                Prepare(target);
 
-            items.Clear();
-            items.AddRange(Enumerable.Range(0, 11).Select(x => $"Item {x}"));
-            items.Remove("Item 2");
+                items.Clear();
+                items.AddRange(Enumerable.Range(0, 11).Select(x => $"Item {x}"));
+                items.Remove("Item 2");
 
-            Assert.Equal(
-                items,
-                target.Presenter.Panel.Children.Cast<ListBoxItem>().Select(x => (string)x.Content));
+                Assert.Equal(
+                    items,
+                    target.Presenter.Panel.Children.Cast<ListBoxItem>().Select(x => (string)x.Content));
+            }
         }
 
         [Fact]
         public void Toggle_Selection_Should_Update_Containers()
         {
-            var items = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToArray();
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = items,
-                SelectionMode = SelectionMode.Toggle,
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 })
-            };
+                var items = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToArray();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    SelectionMode = SelectionMode.Toggle,
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 })
+                };
 
-            Prepare(target);
+                Prepare(target);
 
-            var lbItems = target.GetLogicalChildren().OfType<ListBoxItem>().ToArray();
+                var lbItems = target.GetLogicalChildren().OfType<ListBoxItem>().ToArray();
 
-            var item = lbItems[0];
+                var item = lbItems[0];
 
-            Assert.Equal(false, item.IsSelected);
+                Assert.Equal(false, item.IsSelected);
 
-            RaisePressedEvent(target, item, MouseButton.Left);
+                RaisePressedEvent(target, item, MouseButton.Left);
 
-            Assert.Equal(true, item.IsSelected);
+                Assert.Equal(true, item.IsSelected);
 
-            RaisePressedEvent(target, item, MouseButton.Left);
+                RaisePressedEvent(target, item, MouseButton.Left);
 
-            Assert.Equal(false, item.IsSelected);
+                Assert.Equal(false, item.IsSelected);
+            }
         }
 
         [Fact]
         public void Can_Decrease_Number_Of_Materialized_Items_By_Removing_From_Source_Collection()
         {
-            var items = new AvaloniaList<string>(Enumerable.Range(0, 20).Select(x => $"Item {x}"));
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = items,
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 })
-            };
+                var items = new AvaloniaList<string>(Enumerable.Range(0, 20).Select(x => $"Item {x}"));
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 })
+                };
 
-            Prepare(target);
-            target.Scroll.Offset = new Vector(0, 1);
+                Prepare(target);
+                target.Scroll.Offset = new Vector(0, 1);
 
-            items.RemoveRange(0, 11);
+                items.RemoveRange(0, 11);
+            }
         }
 
         private void RaisePressedEvent(ListBox listBox, ListBoxItem item, MouseButton mouseButton)
@@ -272,35 +330,38 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void ListBox_After_Scroll_IndexOutOfRangeException_Shouldnt_Be_Thrown()
         {
-            var items = Enumerable.Range(0, 11).Select(x => $"{x}").ToArray();
-
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = items,
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 11 })
-            };
+                var items = Enumerable.Range(0, 11).Select(x => $"{x}").ToArray();
 
-            Prepare(target);
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 11 })
+                };
 
-            var panel = target.Presenter.Panel as IVirtualizingPanel;
+                Prepare(target);
+
+                var panel = target.Presenter.Panel as IVirtualizingPanel;
 
-            var listBoxItems = panel.Children.OfType<ListBoxItem>();
+                var listBoxItems = panel.Children.OfType<ListBoxItem>();
 
-            //virtualization should have created exactly 10 items
-            Assert.Equal(10, listBoxItems.Count());
-            Assert.Equal("0", listBoxItems.First().DataContext);
-            Assert.Equal("9", listBoxItems.Last().DataContext);
+                //virtualization should have created exactly 10 items
+                Assert.Equal(10, listBoxItems.Count());
+                Assert.Equal("0", listBoxItems.First().DataContext);
+                Assert.Equal("9", listBoxItems.Last().DataContext);
 
-            //instead pixeloffset > 0 there could be pretty complex sequence for repro
-            //it involves add/remove/scroll to end multiple actions
-            //which i can't find so far :(, but this is the simplest way to add it to unit test
-            panel.PixelOffset = 1;
+                //instead pixeloffset > 0 there could be pretty complex sequence for repro
+                //it involves add/remove/scroll to end multiple actions
+                //which i can't find so far :(, but this is the simplest way to add it to unit test
+                panel.PixelOffset = 1;
 
-            //here scroll to end -> IndexOutOfRangeException is thrown
-            target.Scroll.Offset = new Vector(0, 2);
+                //here scroll to end -> IndexOutOfRangeException is thrown
+                target.Scroll.Offset = new Vector(0, 2);
 
-            Assert.True(true);
+                Assert.True(true);
+            }
         }
 
         [Fact]
@@ -372,43 +433,87 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Clicking_Item_Should_Raise_BringIntoView_For_Correct_Control()
+        public void ListBox_Should_Be_Valid_After_Remove_Of_Item_In_NonVisibleArea()
         {
-            // Issue #3934
-            var items = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToArray();
-            var target = new ListBox
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Template = ListBoxTemplate(),
-                Items = items,
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 }),
-                SelectionMode = SelectionMode.AlwaysSelected,
-                VirtualizationMode = ItemVirtualizationMode.None,
-            };
+                var items = new AvaloniaList<string>(Enumerable.Range(1, 30).Select(v => v.ToString()));
 
-            Prepare(target);
+                var wnd = new Window() { Width = 100, Height = 100, IsVisible = true };
 
-            // First an item that is not index 0 must be selected.
-            _mouse.Click(target.Presenter.Panel.Children[1]);
-            Assert.Equal(1, target.Selection.AnchorIndex);
+                var target = new ListBox()
+                {
+                    AutoScrollToSelectedItem = true,
+                    Height = 100,
+                    Width = 50,
+                    VirtualizationMode = ItemVirtualizationMode.Simple,
+                    ItemTemplate = new FuncDataTemplate<object>((c, _) => new Border() { Height = 10 }),
+                    Items = items,
+                };
+                wnd.Content = target;
 
-            // We're going to be clicking on item 9.
-            var item = (ListBoxItem)target.Presenter.Panel.Children[9];
-            var raised = 0;
+                var lm = wnd.LayoutManager;
+
+                lm.ExecuteInitialLayoutPass();
+
+                //select last / scroll to last item
+                target.SelectedItem = items.Last();
 
-            // Make sure a RequestBringIntoView event is raised for item 9. It won't be handled
-            // by the ScrollContentPresenter as the item is already visible, so we don't need
-            // handledEventsToo: true. Issue #3934 failed here because item 0 was being scrolled
-            // into view due to SelectionMode.AlwaysSelected.
-            target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) =>
+                lm.ExecuteLayoutPass();
+
+                //remove the first item (in non realized area of the listbox)
+                items.Remove("1");
+                lm.ExecuteLayoutPass();
+
+                Assert.Equal("30", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 1).DataContext);
+                Assert.Equal("29", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 2).DataContext);
+                Assert.Equal("28", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 3).DataContext);
+                Assert.Equal("27", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 4).DataContext);
+                Assert.Equal("26", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 5).DataContext);
+            }
+        }
+
+        [Fact]
+        public void Clicking_Item_Should_Raise_BringIntoView_For_Correct_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                Assert.Same(item, e.TargetObject);
-                ++raised;
-            });
+                // Issue #3934
+                var items = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToArray();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 }),
+                    SelectionMode = SelectionMode.AlwaysSelected,
+                    VirtualizationMode = ItemVirtualizationMode.None,
+                };
+
+                Prepare(target);
+
+                // First an item that is not index 0 must be selected.
+                _mouse.Click(target.Presenter.Panel.Children[1]);
+                Assert.Equal(1, target.Selection.AnchorIndex);
+
+                // We're going to be clicking on item 9.
+                var item = (ListBoxItem)target.Presenter.Panel.Children[9];
+                var raised = 0;
+
+                // Make sure a RequestBringIntoView event is raised for item 9. It won't be handled
+                // by the ScrollContentPresenter as the item is already visible, so we don't need
+                // handledEventsToo: true. Issue #3934 failed here because item 0 was being scrolled
+                // into view due to SelectionMode.AlwaysSelected.
+                target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) =>
+                {
+                    Assert.Same(item, e.TargetObject);
+                    ++raised;
+                });
 
-            // Click item 9.
-            _mouse.Click(item);
+                // Click item 9.
+                _mouse.Click(item);
 
-            Assert.Equal(1, raised);
+                Assert.Equal(1, raised);
+            }
         }
 
         [Fact]
@@ -591,7 +696,6 @@ namespace Avalonia.Controls.UnitTests
             public string Value { get; }
         }
 
-
         [Fact]
         public void SelectedItem_Validation()
         {
@@ -605,11 +709,11 @@ namespace Avalonia.Controls.UnitTests
             };
 
             Prepare(target);
-            
+
             var exception = new System.InvalidCastException("failed validation");
             var textObservable = new BehaviorSubject<BindingNotification>(new BindingNotification(exception, BindingErrorType.DataValidationError));
             target.Bind(ComboBox.SelectedItemProperty, textObservable);
-                
+
             Assert.True(DataValidationErrors.GetHasErrors(target));
             Assert.True(DataValidationErrors.GetErrors(target).SequenceEqual(new[] { exception }));
         }
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
index 7c7cdd08db..556959effb 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Focusing_Item_With_Ctrl_And_Arrow_Key_Should_Add_To_Selection()
+        public void Focusing_Item_With_Ctrl_And_Arrow_Key_Should_Not_Add_To_Selection()
         {
             var target = new ListBox
             {
@@ -56,11 +56,11 @@ namespace Avalonia.Controls.UnitTests
                 KeyModifiers = KeyModifiers.Control
             });
 
-            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+            Assert.Equal(new[] { "Foo" }, target.SelectedItems);
         }
 
         [Fact]
-        public void Focusing_Selected_Item_With_Ctrl_And_Arrow_Key_Should_Remove_From_Selection()
+        public void Focusing_Selected_Item_With_Ctrl_And_Arrow_Key_Should_Not_Remove_From_Selection()
         {
             var target = new ListBox
             {
@@ -81,7 +81,7 @@ namespace Avalonia.Controls.UnitTests
                 KeyModifiers = KeyModifiers.Control
             });
 
-            Assert.Equal(new[] { "Bar" }, target.SelectedItems);
+            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
         }
 
         private Control CreateListBoxTemplate(ITemplatedControl parent, INameScope scope)
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index 8f795104bf..726a39ac46 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -5,10 +5,12 @@ using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -58,7 +60,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Clicking_Item_Should_Select_It()
+        public void Focusing_Item_With_Arrow_Key_And_Ctrl_Pressed_Should_Not_Select_It()
         {
             var target = new ListBox
             {
@@ -67,97 +69,168 @@ namespace Avalonia.Controls.UnitTests
             };
 
             ApplyTemplate(target);
-            _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+            target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
+            {
+                RoutedEvent = InputElement.GotFocusEvent,
+                NavigationMethod = NavigationMethod.Directional,
+                KeyModifiers = KeyModifiers.Control
+            });
+
+            Assert.Equal(-1, target.SelectedIndex);
         }
 
         [Fact]
-        public void Clicking_Selected_Item_Should_Not_Deselect_It()
+        public void Pressing_Space_On_Focused_Item_With_Ctrl_Pressed_Should_Select_It()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-            };
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
 
-            ApplyTemplate(target);
-            target.SelectedIndex = 0;
+                target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
+                {
+                    RoutedEvent = InputElement.GotFocusEvent,
+                    NavigationMethod = NavigationMethod.Directional,
+                    KeyModifiers = KeyModifiers.Control
+                });
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                target.Presenter.Panel.Children[0].RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Space,
+                    KeyModifiers = KeyModifiers.Control
+                });
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
-        public void Clicking_Item_Should_Select_It_When_SelectionMode_Toggle()
+        public void Clicking_Item_Should_Select_It()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
-            };
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
+        }
 
-            ApplyTemplate(target);
+        [Fact]
+        public void Clicking_Selected_Item_Should_Not_Deselect_It()
+        {
+            using (UnitTestApplication.Start())
+            {
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 0;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
+        }
+
+        [Fact]
+        public void Clicking_Item_Should_Select_It_When_SelectionMode_Toggle()
+        {
+            using (UnitTestApplication.Start())
+            {
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+
+                _mouse.Click(target.Presenter.Panel.Children[0]);
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Selected_Item_Should_Deselect_It_When_SelectionMode_Toggle()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Toggle,
-            };
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Toggle,
+                };
 
-            ApplyTemplate(target);
-            target.SelectedIndex = 0;
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 0;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(-1, target.SelectedIndex);
+                Assert.Equal(-1, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Selected_Item_Should_Not_Deselect_It_When_SelectionMode_ToggleAlwaysSelected()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Toggle | SelectionMode.AlwaysSelected,
-            };
-
-            ApplyTemplate(target);
-            target.SelectedIndex = 0;
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Toggle | SelectionMode.AlwaysSelected,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 0;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Another_Item_Should_Select_It_When_SelectionMode_Toggle()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
-            };
-
-            ApplyTemplate(target);
-            target.SelectedIndex = 1;
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 1;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/LoadedTests.cs b/tests/Avalonia.Controls.UnitTests/LoadedTests.cs
new file mode 100644
index 0000000000..aaf0dce30e
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/LoadedTests.cs
@@ -0,0 +1,71 @@
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests;
+
+public class LoadedTests
+{
+    [Fact]
+    public void Window_Loads_And_Unloads()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            int loadedCount = 0, unloadedCount = 0;
+            var target = new Window();
+
+            target.Loaded += (_, _) => loadedCount++;
+            target.Unloaded += (_, _) => unloadedCount++; 
+            
+            Assert.Equal(0, loadedCount);
+            Assert.Equal(0, unloadedCount);
+            
+            target.Show();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+            Assert.True(target.IsLoaded);
+
+            Assert.Equal(1, loadedCount);
+            Assert.Equal(0, unloadedCount);
+            
+            target.Close();
+            
+            Assert.Equal(1, loadedCount);
+            Assert.Equal(1, unloadedCount);
+            Assert.False(target.IsLoaded);
+        }
+    }
+    
+    [Fact]
+    public void Control_Loads_And_Unloads()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            int loadedCount = 0, unloadedCount = 0;
+            var window = new Window();
+            window.Show();
+
+            var target = new Button();
+
+            target.Loaded += (_, _) => loadedCount++;
+            target.Unloaded += (_, _) => unloadedCount++; 
+            
+            Assert.Equal(0, loadedCount);
+            Assert.Equal(0, unloadedCount);
+            
+            window.Content = target;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+            Assert.True(target.IsLoaded);
+
+            Assert.Equal(1, loadedCount);
+            Assert.Equal(0, unloadedCount);
+            
+            window.Content = null;
+            
+            Assert.Equal(1, loadedCount);
+            Assert.Equal(1, unloadedCount);
+            Assert.False(target.IsLoaded);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
index af54be61f7..d1fa522206 100644
--- a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
@@ -179,34 +179,6 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact]
-        public void Typing_Beginning_With_0_Should_Not_Modify_Text_When_Bound_To_Int()
-        {
-            using (Start())
-            {
-                var source = new Class1();
-                var target = new MaskedTextBox
-                {
-                    DataContext = source,
-                    Template = CreateTemplate(),
-                };
-
-                target.ApplyTemplate();
-                target.Bind(TextBox.TextProperty, new Binding(nameof(Class1.Foo), BindingMode.TwoWay));
-
-                Assert.Equal("0", target.Text);
-
-                target.CaretIndex = 1;
-                target.RaiseEvent(new TextInputEventArgs
-                {
-                    RoutedEvent = InputElement.TextInputEvent,
-                    Text = "2",
-                });
-
-                Assert.Equal("02", target.Text);
-            }
-        }
-
         [Fact]
         public void Control_Backspace_Should_Remove_The_Word_Before_The_Caret_If_There_Is_No_Selection()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs
index db31d22b4f..d25a790fde 100644
--- a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs
@@ -8,6 +8,7 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Moq;
 using Xunit;
 
@@ -301,6 +302,49 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(3, canExecuteCallCount);
             }
         }
+
+
+        [Fact]
+        public void TemplatedParent_Should_Not_Be_Applied_To_Submenus()
+        {
+            using (Application())
+            {
+                MenuItem topLevelMenu;
+                MenuItem childMenu1;
+                MenuItem childMenu2;
+                var menu = new Menu
+                {
+                    Items = new[]
+                    {
+                        (topLevelMenu = new MenuItem
+                        {
+                            Header = "Foo",
+                            Items = new[]
+                            {
+                                (childMenu1 = new MenuItem { Header = "Bar" }),
+                                (childMenu2 = new MenuItem { Header = "Baz" }),
+                            }
+                        }),
+                    }
+                };
+
+                var window = new Window { Content = menu };
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                topLevelMenu.IsSubMenuOpen = true;
+
+                Assert.True(((IVisual)childMenu1).IsAttachedToVisualTree);
+                Assert.Null(childMenu1.TemplatedParent);
+                Assert.Null(childMenu2.TemplatedParent);
+
+                topLevelMenu.IsSubMenuOpen = false;
+                topLevelMenu.IsSubMenuOpen = true;
+
+                Assert.Null(childMenu1.TemplatedParent);
+                Assert.Null(childMenu2.TemplatedParent);
+            }
+        }
+
         private IDisposable Application()
         {
             var screen = new PixelRect(new PixelPoint(), new PixelSize(100, 100));
diff --git a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
index 9eedd17716..192734581d 100644
--- a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
@@ -53,6 +53,19 @@ namespace Avalonia.Controls.UnitTests.Platform
                 Assert.True(e.Handled);
             }
 
+            [Fact]
+            public void Down_Selects_First_Item_Of_Already_Opened_Submenu()
+            {
+                var target = new DefaultMenuInteractionHandler(false);
+                var item = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.IsSubMenuOpen);
+                var e = new KeyEventArgs { Key = Key.Down, Source = item };
+
+                target.KeyDown(item, e);
+
+                Mock.Get(item).Verify(x => x.MoveSelection(NavigationDirection.First, true));
+                Assert.True(e.Handled);
+            }
+
             [Fact]
             public void Right_Selects_Next_MenuItem()
             {
@@ -161,7 +174,7 @@ namespace Avalonia.Controls.UnitTests.Platform
             }
 
             [Fact]
-            public void PointerEnter_Opens_Item_When_Old_Item_Is_Open()
+            public void PointerEntered_Opens_Item_When_Old_Item_Is_Open()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = new Mock<IMenu>();
@@ -174,11 +187,11 @@ namespace Avalonia.Controls.UnitTests.Platform
                     x.IsTopLevel == true &&
                     x.HasSubMenu == true &&
                     x.Parent == menu.Object);
-                var e = CreateArgs(MenuItem.PointerEnterItemEvent, nextItem);
+                var e = CreateArgs(MenuItem.PointerEnteredItemEvent, nextItem);
 
                 menu.SetupGet(x => x.SelectedItem).Returns(item);
 
-                target.PointerEnter(nextItem, e);
+                target.PointerEntered(nextItem, e);
 
                 Mock.Get(item).Verify(x => x.Close());
                 menu.VerifySet(x => x.SelectedItem = nextItem);
@@ -189,31 +202,31 @@ namespace Avalonia.Controls.UnitTests.Platform
             }
 
             [Fact]
-            public void PointerLeave_Deselects_Item_When_Menu_Not_Open()
+            public void PointerExited_Deselects_Item_When_Menu_Not_Open()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = new Mock<IMenu>();
                 var item = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.Parent == menu.Object);
-                var e = CreateArgs(MenuItem.PointerLeaveItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerExitedItemEvent, item);
 
                 menu.SetupGet(x => x.SelectedItem).Returns(item);
-                target.PointerLeave(item, e);
+                target.PointerExited(item, e);
 
                 menu.VerifySet(x => x.SelectedItem = null);
                 Assert.False(e.Handled);
             }
 
             [Fact]
-            public void PointerLeave_Doesnt_Deselect_Item_When_Menu_Open()
+            public void PointerExited_Doesnt_Deselect_Item_When_Menu_Open()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = new Mock<IMenu>();
                 var item = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.Parent == menu.Object);
-                var e = CreateArgs(MenuItem.PointerLeaveItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerExitedItemEvent, item);
 
                 menu.SetupGet(x => x.IsOpen).Returns(true);
                 menu.SetupGet(x => x.SelectedItem).Returns(item);
-                target.PointerLeave(item, e);
+                target.PointerExited(item, e);
 
                 menu.VerifySet(x => x.SelectedItem = null, Times.Never);
                 Assert.False(e.Handled);
@@ -369,31 +382,31 @@ namespace Avalonia.Controls.UnitTests.Platform
             }
 
             [Fact]
-            public void PointerEnter_Selects_Item()
+            public void PointerEntered_Selects_Item()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = Mock.Of<IMenu>();
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem);
-                var e = CreateArgs(MenuItem.PointerEnterItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerEnteredItemEvent, item);
 
-                target.PointerEnter(item, e);
+                target.PointerEntered(item, e);
 
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
                 Assert.False(e.Handled);
             }
 
             [Fact]
-            public void PointerEnter_Opens_Submenu_After_Delay()
+            public void PointerEntered_Opens_Submenu_After_Delay()
             {
                 var timer = new TestTimer();
                 var target = new DefaultMenuInteractionHandler(false, null, timer.RunOnce);
                 var menu = Mock.Of<IMenu>();
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem && x.HasSubMenu == true);
-                var e = CreateArgs(MenuItem.PointerEnterItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerEnteredItemEvent, item);
 
-                target.PointerEnter(item, e);
+                target.PointerEntered(item, e);
                 Mock.Get(item).Verify(x => x.Open(), Times.Never);
 
                 timer.Pulse();
@@ -403,7 +416,7 @@ namespace Avalonia.Controls.UnitTests.Platform
             }
 
             [Fact]
-            public void PointerEnter_Closes_Sibling_Submenu_After_Delay()
+            public void PointerEntered_Closes_Sibling_Submenu_After_Delay()
             {
                 var timer = new TestTimer();
                 var target = new DefaultMenuInteractionHandler(false, null, timer.RunOnce);
@@ -411,11 +424,11 @@ namespace Avalonia.Controls.UnitTests.Platform
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem);
                 var sibling = Mock.Of<IMenuItem>(x => x.Parent == parentItem && x.HasSubMenu == true && x.IsSubMenuOpen == true);
-                var e = CreateArgs(MenuItem.PointerEnterItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerEnteredItemEvent, item);
 
                 Mock.Get(parentItem).SetupGet(x => x.SubItems).Returns(new[] { item, sibling });
 
-                target.PointerEnter(item, e);
+                target.PointerEntered(item, e);
                 Mock.Get(sibling).Verify(x => x.Close(), Times.Never);
 
                 timer.Pulse();
@@ -425,48 +438,48 @@ namespace Avalonia.Controls.UnitTests.Platform
             }
 
             [Fact]
-            public void PointerLeave_Deselects_Item()
+            public void PointerExited_Deselects_Item()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = Mock.Of<IMenu>();
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem);
-                var e = CreateArgs(MenuItem.PointerLeaveItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerExitedItemEvent, item);
 
                 Mock.Get(parentItem).SetupGet(x => x.SelectedItem).Returns(item);
-                target.PointerLeave(item, e);
+                target.PointerExited(item, e);
 
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = null);
                 Assert.False(e.Handled);
             }
 
             [Fact]
-            public void PointerLeave_Doesnt_Deselect_Sibling()
+            public void PointerExited_Doesnt_Deselect_Sibling()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = Mock.Of<IMenu>();
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem);
                 var sibling = Mock.Of<IMenuItem>(x => x.Parent == parentItem);
-                var e = CreateArgs(MenuItem.PointerLeaveItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerExitedItemEvent, item);
 
                 Mock.Get(parentItem).SetupGet(x => x.SelectedItem).Returns(sibling);
-                target.PointerLeave(item, e);
+                target.PointerExited(item, e);
 
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = null, Times.Never);
                 Assert.False(e.Handled);
             }
 
             [Fact]
-            public void PointerLeave_Doesnt_Deselect_Item_If_Pointer_Over_Submenu()
+            public void PointerExited_Doesnt_Deselect_Item_If_Pointer_Over_Submenu()
             {
                 var target = new DefaultMenuInteractionHandler(false);
                 var menu = Mock.Of<IMenu>();
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem && x.HasSubMenu == true && x.IsPointerOverSubMenu == true);
-                var e = CreateArgs(MenuItem.PointerLeaveItemEvent, item);
+                var e = CreateArgs(MenuItem.PointerExitedItemEvent, item);
 
-                target.PointerLeave(item, e);
+                target.PointerExited(item, e);
 
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = null, Times.Never);
                 Assert.False(e.Handled);
@@ -497,11 +510,11 @@ namespace Avalonia.Controls.UnitTests.Platform
                 var parentItem = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.Parent == menu);
                 var item = Mock.Of<IMenuItem>(x => x.Parent == parentItem && x.HasSubMenu == true);
                 var childItem = Mock.Of<IMenuItem>(x => x.Parent == item);
-                var enter = CreateArgs(MenuItem.PointerEnterItemEvent, item);
-                var leave = CreateArgs(MenuItem.PointerLeaveItemEvent, item);
+                var enter = CreateArgs(MenuItem.PointerEnteredItemEvent, item);
+                var leave = CreateArgs(MenuItem.PointerExitedItemEvent, item);
 
                 // Pointer enters item; item is selected.
-                target.PointerEnter(item, enter);
+                target.PointerEntered(item, enter);
                 Assert.True(timer.ActionIsQueued);
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
                 Mock.Get(parentItem).Invocations.Clear();
@@ -513,13 +526,13 @@ namespace Avalonia.Controls.UnitTests.Platform
                 Mock.Get(item).Invocations.Clear();
 
                 // Pointer briefly exits item, but submenu remains open.
-                target.PointerLeave(item, leave);
+                target.PointerExited(item, leave);
                 Mock.Get(item).Verify(x => x.Close(), Times.Never);
                 Mock.Get(item).Invocations.Clear();
 
                 // Pointer enters child item; is selected.
                 enter.Source = childItem;
-                target.PointerEnter(childItem, enter);
+                target.PointerEntered(childItem, enter);
                 Mock.Get(item).VerifySet(x => x.SelectedItem = childItem);
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
                 Mock.Get(item).Invocations.Clear();
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index a579e869b0..6d20c72674 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -353,6 +353,29 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Null(target.Host);
         }
 
+        [Fact]
+        public void Content_Should_Become_DataContext_When_ControlTemplate_Is_Not_Null()
+        {
+            var (target, _) = CreateTarget();
+
+            var textBlock = new TextBlock
+            {
+                [!TextBlock.TextProperty] = new Binding("Name"),
+            };
+
+            var canvas = new Canvas()
+            {
+                Name = "Canvas"
+            };
+
+            target.ContentTemplate = new FuncDataTemplate<Canvas>((_, __) => textBlock);
+            target.Content = canvas;
+
+            Assert.NotNull(target.DataContext);
+            Assert.Equal(canvas, target.DataContext);
+            Assert.Equal("Canvas", textBlock.Text);
+        }
+
         (ContentPresenter presenter, ContentControl templatedParent) CreateTarget()
         {
             var templatedParent = new ContentControl
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index ed44fbfc32..e82050528f 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls.Presenters;
 using Avalonia.Layout;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Presenters
@@ -232,5 +233,68 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             Assert.Equal(new Rect(32, 32, 0, 0), content.Bounds);
         }
+
+        public class UseLayoutRounding
+        {
+            [Fact]
+            public void Measure_Rounds_Padding()
+            {
+                var target = new ContentPresenter
+                {
+                    Padding = new Thickness(1),
+                    Content = new Canvas
+                    {
+                        Width = 101,
+                        Height = 101,
+                    }
+                };
+
+                var root = CreatedRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 1 pixel padding is rounded up to 1.3333; for both sides it is 2.6666
+                // - Size of 101 gets rounded up to 101.3333
+                // - Desired size = 101.3333 + 2.6666 = 104
+                Assert.Equal(new Size(104, 104), target.DesiredSize);
+            }
+
+            [Fact]
+            public void Measure_Rounds_BorderThickness()
+            {
+                var target = new ContentPresenter
+                {
+                    BorderThickness = new Thickness(1),
+                    Content = new Canvas
+                    {
+                        Width = 101,
+                        Height = 101,
+                    }
+                };
+
+                var root = CreatedRoot(1.5, target);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                // - 1 pixel border thickness is rounded up to 1.3333; for both sides it is 2.6666
+                // - Size of 101 gets rounded up to 101.3333
+                // - Desired size = 101.3333 + 2.6666 = 104
+                Assert.Equal(new Size(104, 104), target.DesiredSize);
+            }
+
+            private static TestRoot CreatedRoot(
+                double scaling,
+                Control child,
+                Size? constraint = null)
+            {
+                return new TestRoot
+                {
+                    LayoutScaling = scaling,
+                    UseLayoutRounding = true,
+                    Child = child,
+                    ClientSize = constraint ?? new Size(1000, 1000),
+                };
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index f27ff3928c..6d3351d2b2 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -78,9 +78,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
                 var templatedChild = ((Visual)target.Host).GetVisualChildren().Single();
                 
-                Assert.IsType<Panel>(templatedChild);
+                Assert.IsType<LayoutTransformControl>(templatedChild);
 
-                var visualLayerManager = templatedChild.GetVisualChildren().Skip(1).Single();
+                var panel = templatedChild.GetVisualChildren().Single();
+
+                Assert.IsType<Panel>(panel);
+
+                var visualLayerManager = panel.GetVisualChildren().Skip(1).Single();
 
                 Assert.IsType<VisualLayerManager>(visualLayerManager);
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index 9c1822ff5c..5f91f2e2a1 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -295,7 +295,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent()
+        public void ContentControl_With_Popup_In_Template_Should_Set_TemplatedParent()
         {
             // Test uses OverlayPopupHost default template
             using (CreateServices())
@@ -325,6 +325,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Assert.Equal(
                         new[]
                         {
+                            "LayoutTransformControl",
                             "VisualLayerManager",
                             "ContentPresenter",
                             "ContentPresenter",
@@ -337,6 +338,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Assert.Equal(
                         new[]
                         {
+                            "LayoutTransformControl",
                             "Panel",
                             "Border",
                             "VisualLayerManager",
@@ -356,6 +358,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Assert.Equal(
                         new object[]
                         {
+                            popupRoot,
                             popupRoot,
                             popupRoot,
                             target,
@@ -372,6 +375,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                             popupRoot,
                             popupRoot,
                             popupRoot,
+                            popupRoot,
                             target,
                             null,
                         },
@@ -380,6 +384,134 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
+        [Fact]
+        public void ItemsControl_With_Popup_In_Template_Should_Set_TemplatedParent()
+        {
+            // Test uses OverlayPopupHost default template
+            using (CreateServices())
+            {
+                PopupItemsControl target;
+                var item = new Border();
+                var root = PreparedWindow(target = new PopupItemsControl
+                {
+                    Items = new[] { item },
+                    Template = new FuncControlTemplate<PopupItemsControl>(PopupItemsControlTemplate),
+                }); ;
+                root.Show();
+
+                target.ApplyTemplate();
+
+                var popup = (Popup)target.GetTemplateChildren().First(x => x.Name == "popup");
+                popup.Open();
+
+                var popupRoot = (Control)popup.Host;
+                popupRoot.Measure(Size.Infinity);
+                popupRoot.Arrange(new Rect(popupRoot.DesiredSize));
+
+                var children = popupRoot.GetVisualDescendants().ToList();
+                var types = children.Select(x => x.GetType().Name).ToList();
+
+                if (UsePopupHost)
+                {
+                    Assert.Equal(
+                        new[]
+                        {
+                            "LayoutTransformControl",
+                            "VisualLayerManager",
+                            "ContentPresenter",
+                            "ItemsPresenter",
+                            "StackPanel",
+                            "Border",
+                        },
+                        types);
+                }
+                else
+                {
+                    Assert.Equal(
+                        new[]
+                        {
+                            "LayoutTransformControl",
+                            "Panel",
+                            "Border",
+                            "VisualLayerManager",
+                            "ContentPresenter",
+                            "ItemsPresenter",
+                            "StackPanel",
+                            "Border",
+                        },
+                        types);
+                }
+
+                var templatedParents = children
+                    .OfType<IControl>()
+                    .Select(x => x.TemplatedParent).ToList();
+
+                if (UsePopupHost)
+                {
+                    Assert.Equal(
+                        new object[]
+                        {
+                            popupRoot,
+                            popupRoot,
+                            popupRoot,
+                            target,
+                            target,
+                            null,
+                        },
+                        templatedParents);
+                }
+                else
+                {
+                    Assert.Equal(
+                        new object[]
+                        {
+                            popupRoot,
+                            popupRoot,
+                            popupRoot,
+                            popupRoot,
+                            popupRoot,
+                            target,
+                            target,
+                            null,
+                        },
+                        templatedParents);
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Overwrite_TemplatedParent_Of_Item_In_ItemsControl_With_Popup_On_Second_Open()
+        {
+            // Test uses OverlayPopupHost default template
+            using (CreateServices())
+            {
+                PopupItemsControl target;
+                var item = new Border();
+                var root = PreparedWindow(target = new PopupItemsControl
+                {
+                    Items = new[] { item },
+                    Template = new FuncControlTemplate<PopupItemsControl>(PopupItemsControlTemplate),
+                });
+                root.Show();
+
+                target.ApplyTemplate();
+
+                var popup = (Popup)target.GetTemplateChildren().First(x => x.Name == "popup");
+                popup.Open();
+
+                var popupRoot = (Control)popup.Host;
+                popupRoot.Measure(Size.Infinity);
+                popupRoot.Arrange(new Rect(popupRoot.DesiredSize));
+
+                Assert.Null(item.TemplatedParent);
+
+                popup.Close();
+                popup.Open();
+
+                Assert.Null(item.TemplatedParent);
+            }
+        }
+
         [Fact]
         public void DataContextBeginUpdate_Should_Not_Be_Called_For_Controls_That_Dont_Inherit()
         {
@@ -525,6 +657,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             using (CreateServicesWithFocus())
             {
                 var window = PreparedWindow();
+                window.Focusable = true;
 
                 var tb = new TextBox();
                 var p = new Popup
@@ -974,10 +1107,27 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }.RegisterInNameScope(scope);
         }
 
+        private static IControl PopupItemsControlTemplate(PopupItemsControl control, INameScope scope)
+        {
+            return new Popup
+            {
+                Name = "popup",
+                PlacementTarget = control,
+                Child = new ItemsPresenter
+                {
+                    [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
+                }
+            }.RegisterInNameScope(scope);
+        }
+
         private class PopupContentControl : ContentControl
         {
         }
 
+        private class PopupItemsControl : ItemsControl
+        {
+        }
+
         private class TestControl : Decorator
         {
             public event EventHandler DataContextBeginUpdate;
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 0e0ca7cd25..330cbfd7b9 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -6,6 +6,7 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
+using System.Threading.Tasks;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -13,6 +14,7 @@ using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Data;
 using Avalonia.Platform;
@@ -1114,42 +1116,48 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Setting_SelectedItem_With_Pointer_Should_Set_TabOnceActiveElement()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz " },
-            };
-
-            Prepare(target);
-            _helper.Down((Interactive)target.Presenter.Panel.Children[1]);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
+                _helper.Down((Interactive)target.Presenter.Panel.Children[1]);
 
-            var panel = target.Presenter.Panel;
+                var panel = target.Presenter.Panel;
 
-            Assert.Equal(
-                KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel),
-                panel.Children[1]);
+                Assert.Equal(
+                    KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel),
+                    panel.Children[1]);
+            }
         }
 
         [Fact]
         public void Removing_SelectedItem_Should_Clear_TabOnceActiveElement()
         {
-            var items = new ObservableCollection<string>(new[] { "Foo", "Bar", "Baz " });
-
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = items,
-            };
+                var items = new ObservableCollection<string>(new[] { "Foo", "Bar", "Baz " });
 
-            Prepare(target);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = items,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
 
-            _helper.Down(target.Presenter.Panel.Children[1]);
+                _helper.Down(target.Presenter.Panel.Children[1]);
 
-            items.RemoveAt(1);
+                items.RemoveAt(1);
 
-            var panel = target.Presenter.Panel;
+                var panel = target.Presenter.Panel;
 
-            Assert.Null(KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel));
+                Assert.Null(KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel));
+            }
         }
 
         [Fact]
@@ -1229,31 +1237,37 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Should_Select_Correct_Item_When_Duplicate_Items_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-            };
-
-            Prepare(target);
-            _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
+                _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
 
-            Assert.Equal(3, target.SelectedIndex);
+                Assert.Equal(3, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Should_Apply_Selected_Pseudoclass_To_Correct_Item_When_Duplicate_Items_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-            };
-
-            Prepare(target);
-            _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
+                _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
 
-            Assert.Equal(new[] { ":pressed", ":selected" }, target.Presenter.Panel.Children[3].Classes);
+                Assert.Equal(new[] { ":pressed", ":selected" }, target.Presenter.Panel.Children[3].Classes);
+            }
         }
 
         [Fact]
@@ -1594,8 +1608,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(new[] { "Bar" }, selectedItems);
         }
 
-        [Fact]
-        public void MoveSelection_Wrap_Does_Not_Hang_With_No_Focusable_Controls()
+        [Fact(Timeout = 2000)]
+        public async Task MoveSelection_Wrap_Does_Not_Hang_With_No_Focusable_Controls()
         {
             // Issue #3094.
             var target = new TestSelector
@@ -1611,7 +1625,96 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
-            target.MoveSelection(NavigationDirection.Next, true);
+
+            // Timeout in xUnit doesn't work with synchronous methods so we need to apply hack below.
+            // https://github.com/xunit/xunit/issues/2222
+            await Task.Run(() => target.MoveSelection(NavigationDirection.Next, true));
+        }
+
+        [Fact]
+        public void MoveSelection_Skips_Non_Focusable_Controls_When_Moving_To_Last_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem(),
+                    new ListBoxItem { Focusable = false },
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+            target.MoveSelection(NavigationDirection.Last, true);
+
+            Assert.Equal(0, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void MoveSelection_Skips_Non_Focusable_Controls_When_Moving_To_First_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem { Focusable = false },
+                    new ListBoxItem(),
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+            target.MoveSelection(NavigationDirection.Last, true);
+
+            Assert.Equal(1, target.SelectedIndex);
+        }
+
+        [Fact(Timeout = 2000)]
+        public async Task MoveSelection_Does_Not_Hang_When_All_Items_Are_Non_Focusable_And_We_Move_To_First_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem { Focusable = false },
+                    new ListBoxItem { Focusable = false },
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            // Timeout in xUnit doesn't work with synchronous methods so we need to apply hack below.
+            // https://github.com/xunit/xunit/issues/2222
+            await Task.Run(() => target.MoveSelection(NavigationDirection.First, true));
+
+            Assert.Equal(-1, target.SelectedIndex);
+        }
+
+        [Fact(Timeout = 2000)]
+        public async Task MoveSelection_Does_Not_Hang_When_All_Items_Are_Non_Focusable_And_We_Move_To_Last_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem { Focusable = false },
+                    new ListBoxItem { Focusable = false },
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            // Timeout in xUnit doesn't work with synchronous methods so we need to apply hack below.
+            // https://github.com/xunit/xunit/issues/2222
+            await Task.Run(() => target.MoveSelection(NavigationDirection.Last, true));
+
+            Assert.Equal(-1, target.SelectedIndex);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 6b26d76371..5d2f4e2a64 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -10,8 +10,10 @@ using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
@@ -701,261 +703,290 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Shift_Selecting_From_No_Selection_Selects_From_Start()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
-            Assert.Equal(new[] { 0, 1, 2 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
+                Assert.Equal(new[] { 0, 1, 2 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Ctrl_Selecting_Raises_SelectionChanged_Events()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
 
-            SelectionChangedEventArgs receivedArgs = null;
+                SelectionChangedEventArgs receivedArgs = null;
 
-            target.SelectionChanged += (_, args) => receivedArgs = args;
+                target.SelectionChanged += (_, args) => receivedArgs = args;
 
-            void VerifyAdded(string selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(new[] { selection }, receivedArgs.AddedItems);
-                Assert.Empty(receivedArgs.RemovedItems);
-            }
+                void VerifyAdded(string selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(new[] { selection }, receivedArgs.AddedItems);
+                    Assert.Empty(receivedArgs.RemovedItems);
+                }
 
-            void VerifyRemoved(string selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
-                Assert.Empty(receivedArgs.AddedItems);
-            }
+                void VerifyRemoved(string selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
+                    Assert.Empty(receivedArgs.AddedItems);
+                }
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
 
-            VerifyAdded("Bar");
+                VerifyAdded("Bar");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
-            VerifyAdded("Baz");
+                VerifyAdded("Baz");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
 
-            VerifyAdded("Qux");
+                VerifyAdded("Qux");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
 
-            VerifyRemoved("Bar");
+                VerifyRemoved("Bar");
+            }
         }
 
         [Fact]
         public void Ctrl_Selecting_SelectedItem_With_Multiple_Selection_Active_Sets_SelectedItem_To_Next_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
-
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Bar", target.SelectedItem);
-            Assert.Equal(new[] { "Bar", "Baz", "Qux" }, target.SelectedItems);
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
-
-            Assert.Equal(2, target.SelectedIndex);
-            Assert.Equal("Baz", target.SelectedItem);
-            Assert.Equal(new[] { "Baz", "Qux" }, target.SelectedItems);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal("Bar", target.SelectedItem);
+                Assert.Equal(new[] { "Bar", "Baz", "Qux" }, target.SelectedItems);
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal("Baz", target.SelectedItem);
+                Assert.Equal(new[] { "Baz", "Qux" }, target.SelectedItems);
+            }
         }
 
         [Fact]
         public void Ctrl_Selecting_Non_SelectedItem_With_Multiple_Selection_Active_Leaves_SelectedItem_The_Same()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Bar", target.SelectedItem);
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal("Bar", target.SelectedItem);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Bar", target.SelectedItem);
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal("Bar", target.SelectedItem);
+            }
         }
 
         [Fact]
         public void Should_Ctrl_Select_Correct_Item_When_Duplicate_Items_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
-            Assert.Equal(new[] { 3, 4 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+                Assert.Equal(new[] { 3, 4 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Should_Shift_Select_Correct_Item_When_Duplicates_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
-            Assert.Equal(new[] { 3, 4, 5 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
+                Assert.Equal(new[] { 3, 4, 5 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Can_Shift_Select_All_Items_When_Duplicates_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" }, target.SelectedItems);
-            Assert.Equal(new[] { 0, 1, 2, 3, 4, 5 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" }, target.SelectedItems);
+                Assert.Equal(new[] { 0, 1, 2, 3, 4, 5 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Shift_Selecting_Raises_SelectionChanged_Events()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
 
-            SelectionChangedEventArgs receivedArgs = null;
+                SelectionChangedEventArgs receivedArgs = null;
 
-            target.SelectionChanged += (_, args) => receivedArgs = args;
+                target.SelectionChanged += (_, args) => receivedArgs = args;
 
-            void VerifyAdded(params string[] selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(selection, receivedArgs.AddedItems);
-                Assert.Empty(receivedArgs.RemovedItems);
-            }
+                void VerifyAdded(params string[] selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(selection, receivedArgs.AddedItems);
+                    Assert.Empty(receivedArgs.RemovedItems);
+                }
 
-            void VerifyRemoved(string selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
-                Assert.Empty(receivedArgs.AddedItems);
-            }
+                void VerifyRemoved(string selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
+                    Assert.Empty(receivedArgs.AddedItems);
+                }
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
 
-            VerifyAdded("Bar");
+                VerifyAdded("Bar");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Shift);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Shift);
 
-            VerifyAdded("Baz" ,"Qux");
+                VerifyAdded("Baz", "Qux");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
 
-            VerifyRemoved("Qux");
+                VerifyRemoved("Qux");
+            }
         }
 
         [Fact]
         public void Duplicate_Items_Are_Added_To_SelectedItems_In_Order()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(new[] { "Foo" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems);
+            }
         }
 
         [Fact]
@@ -1158,70 +1189,79 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Left_Click_On_SelectedItem_Should_Clear_Existing_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            target.SelectAll();
-
-            Assert.Equal(3, target.SelectedItems.Count);
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-
-            Assert.Equal(1, target.SelectedItems.Count);
-            Assert.Equal(new[] { "Foo", }, target.SelectedItems);
-            Assert.Equal(new[] { 0 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.SelectAll();
+
+                Assert.Equal(3, target.SelectedItems.Count);
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+                Assert.Equal(new[] { "Foo", }, target.SelectedItems);
+                Assert.Equal(new[] { 0 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Right_Click_On_SelectedItem_Should_Not_Clear_Existing_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            target.SelectAll();
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.SelectAll();
 
-            Assert.Equal(3, target.SelectedItems.Count);
+                Assert.Equal(3, target.SelectedItems.Count);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
 
-            Assert.Equal(3, target.SelectedItems.Count);
+                Assert.Equal(3, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
         public void Right_Click_On_UnselectedItem_Should_Clear_Existing_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Shift);
-
-            Assert.Equal(2, target.SelectedItems.Count);
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right);
-
-            Assert.Equal(1, target.SelectedItems.Count);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Shift);
+
+                Assert.Equal(2, target.SelectedItems.Count);
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
@@ -1253,41 +1293,47 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Shift_Right_Click_Should_Not_Select_Multiple()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Shift);
-
-            Assert.Equal(1, target.SelectedItems.Count);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Shift);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
         public void Ctrl_Right_Click_Should_Not_Select_Multiple()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Control);
-
-            Assert.Equal(1, target.SelectedItems.Count);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Control);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
index 59276a94d0..f4001a8ca1 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(33, 0, 33, 12), thumb.Bounds);
+            Assert.Equal(new Rect(33, 0, 34, 12), thumb.Bounds);
         }
 
         [Fact]
@@ -92,7 +92,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(0, 33, 12, 33), thumb.Bounds);
+            Assert.Equal(new Rect(0, 33, 12, 34), thumb.Bounds);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs b/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs
index 6b2f05c923..b3a75dafa7 100644
--- a/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs
@@ -138,5 +138,34 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Rect(0, 0, 20, 20), target.Children[0].Bounds);
             Assert.Equal(new Rect(0, -20, 20, 20), target.Children[1].Bounds);
         }
+
+        [Theory]
+        [InlineData(100, 100, 100, 100)]
+        [InlineData(100, double.PositiveInfinity, 100, 40)]
+        [InlineData(double.PositiveInfinity, 100, 20, 100)]
+        [InlineData(double.PositiveInfinity, double.PositiveInfinity, 20, 40)]
+        public void StretchedPanel_Measures_Correctly(double availableWidth, double availableHeight, double desiredWidth, double desiredHeight)
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+            var rect1 = new Rectangle { Height = 20, Width = 20 };
+            var rect2 = new Rectangle { Height = 20, Width = 20 };
+
+            var target = new RelativePanel
+            {
+                VerticalAlignment = Layout.VerticalAlignment.Stretch,
+                HorizontalAlignment = Layout.HorizontalAlignment.Stretch,
+                Children =
+                {
+                    rect1, rect2
+                }
+            };
+
+            RelativePanel.SetBelow(rect2, rect1);
+            target.Measure(new Size(availableWidth, availableHeight));
+            target.Arrange(new Rect(target.DesiredSize));
+            
+            Assert.Equal(desiredWidth, target.DesiredSize.Width);
+            Assert.Equal(desiredHeight, target.DesiredSize.Height);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index b180a536a5..de5e5a8ea3 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@@ -1,5 +1,9 @@
+using System;
+using Avalonia.Controls.Documents;
+using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Moq;
@@ -18,13 +22,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Default_Text_Value_Should_Be_EmptyString()
+        public void Default_Text_Value_Should_Be_Null()
         {
             var textBlock = new TextBlock();
 
-            Assert.Equal(
-                "",
-                textBlock.Text);
+            Assert.Equal(null, textBlock.Text);
         }
 
         [Fact]
@@ -60,5 +62,146 @@ namespace Avalonia.Controls.UnitTests
 
             renderer.Verify(x => x.AddDirty(target), Times.Once);
         }
+
+        [Fact]
+        public void Changing_InlinesCollection_Should_Invalidate_Measure()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new TextBlock();
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+
+                target.Inlines.Add(new Run("Hello"));
+
+                Assert.False(target.IsMeasureValid);
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+            }
+        }
+
+        [Fact]
+        public void Changing_Inlines_Properties_Should_Invalidate_Measure()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new TextBlock();
+
+                var inline = new Run("Hello");
+
+                target.Inlines.Add(inline);
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+
+                inline.Foreground = Brushes.Green;
+
+                Assert.False(target.IsMeasureValid);
+            }
+        }
+
+        [Fact]
+        public void Changing_Inlines_Should_Invalidate_Measure()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new TextBlock();
+
+                var inlines = new InlineCollection { new Run("Hello") };
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+
+                target.Inlines = inlines;
+
+                Assert.False(target.IsMeasureValid);
+            }
+        }
+
+        [Fact]
+        public void Changing_Inlines_Should_Reset_Inlines_Parent()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new TextBlock();
+
+                var run = new Run("Hello");
+
+                target.Inlines.Add(run);
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+
+                target.Inlines = null;
+
+                Assert.Null(run.Parent);
+
+                target.Inlines = new InlineCollection { run };
+
+                Assert.Equal(target, run.Parent);
+            }
+        }
+
+        [Fact]
+        public void InlineUIContainer_Child_Schould_Be_Arranged()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TextBlock();
+
+                var button = new Button { Content = "12345678" };
+
+                button.Template = new FuncControlTemplate<Button>((parent, scope) =>
+                        new TextBlock
+                        {
+                            Name = "PART_ContentPresenter",
+                            [!TextBlock.TextProperty] = parent[!ContentControl.ContentProperty],
+                        }.RegisterInNameScope(scope)
+                );
+
+                target.Inlines!.Add("123456");
+                target.Inlines.Add(new InlineUIContainer(button));
+                target.Inlines.Add("123456");
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(button.IsMeasureValid);
+                Assert.Equal(80, button.DesiredSize.Width);
+
+                target.Arrange(new Rect(new Size(200, 50)));
+
+                Assert.True(button.IsArrangeValid);
+
+                Assert.Equal(60, button.Bounds.Left);
+            }
+        }
+
+        [Fact]
+        public void Setting_Text_Should_Reset_Inlines()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TextBlock();
+
+                target.Inlines.Add(new Run("Hello World"));
+
+                Assert.Equal("Hello World", target.Text);
+
+                Assert.Equal(1, target.Inlines.Count);
+
+                target.Text = "1234";
+
+                Assert.Equal("1234", target.Text);
+
+                Assert.Equal(0, target.Inlines.Count);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index c0c9e841f4..23a330c96f 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -180,34 +180,6 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact]
-        public void Typing_Beginning_With_0_Should_Not_Modify_Text_When_Bound_To_Int()
-        {
-            using (UnitTestApplication.Start(Services))
-            {
-                var source = new Class1();
-                var target = new TextBox
-                {
-                    DataContext = source,
-                    Template = CreateTemplate(),
-                };
-
-                target.ApplyTemplate();
-                target.Bind(TextBox.TextProperty, new Binding(nameof(Class1.Foo), BindingMode.TwoWay));
-
-                Assert.Equal("0", target.Text);
-
-                target.CaretIndex = 1;
-                target.RaiseEvent(new TextInputEventArgs
-                {
-                    RoutedEvent = InputElement.TextInputEvent,
-                    Text = "2",
-                });
-
-                Assert.Equal("02", target.Text);
-            }
-        }
-
         [Fact]
         public void Control_Backspace_Should_Remove_The_Word_Before_The_Caret_If_There_Is_No_Selection()
         {
@@ -865,6 +837,35 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Should_Fullfill_MaxLines_Contraint()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "ABC",
+                    MaxLines = 1,
+                    AcceptsReturn= true
+                };
+
+                target.Measure(Size.Infinity);
+
+                AvaloniaLocator.CurrentMutable.Bind<IClipboard>().ToSingleton<ClipboardStub>();
+
+                var clipboard = AvaloniaLocator.CurrentMutable.GetService<IClipboard>();
+                clipboard.SetTextAsync(Environment.NewLine).GetAwaiter().GetResult();
+
+                RaiseKeyEvent(target, Key.V, KeyModifiers.Control);
+                clipboard.ClearAsync().GetAwaiter().GetResult();
+
+                RaiseTextEvent(target, Environment.NewLine);
+
+                Assert.Equal("ABC", target.Text);
+            }
+        }
+
         private static TestServices FocusServices => TestServices.MockThreadingInterface.With(
             focusManager: new FocusManager(),
             keyboardDevice: () => new KeyboardDevice(),
diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
index c39a963dae..1c2b49dc7d 100644
--- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
@@ -114,52 +114,52 @@ namespace Avalonia.Controls.UnitTests
                 //Skip contentpresenter
                 var flyoutButton = new Button
                 {
-                    Name = "FlyoutButton"
+                    Name = "PART_FlyoutButton"
                 }.RegisterInNameScope(scope);
                 var contentGrid = new Grid
                 {
-                    Name = "FlyoutButtonContentGrid"
+                    Name = "PART_FlyoutButtonContentGrid"
                 }.RegisterInNameScope(scope);
 
                 var firstPickerHost = new Border
                 {
-                    Name = "FirstPickerHost",
+                    Name = "PART_FirstPickerHost",
                     Child = new TextBlock
                     {
-                        Name = "HourTextBlock"
+                        Name = "PART_HourTextBlock"
                     }.RegisterInNameScope(scope)
                 }.RegisterInNameScope(scope);
                 Grid.SetColumn(firstPickerHost, 0);
 
                 var secondPickerHost = new Border
                 {
-                    Name = "SecondPickerHost",
+                    Name = "PART_SecondPickerHost",
                     Child = new TextBlock
                     {
-                        Name = "MinuteTextBlock"
+                        Name = "PART_MinuteTextBlock"
                     }.RegisterInNameScope(scope)
                 }.RegisterInNameScope(scope);
                 Grid.SetColumn(secondPickerHost, 2);
 
                 var thirdPickerHost = new Border
                 {
-                    Name = "ThirdPickerHost",
+                    Name = "PART_ThirdPickerHost",
                     Child = new TextBlock
                     {
-                        Name = "PeriodTextBlock"
+                        Name = "PART_PeriodTextBlock"
                     }.RegisterInNameScope(scope)
                 }.RegisterInNameScope(scope);
                 Grid.SetColumn(thirdPickerHost, 4);
 
                 var firstSpacer = new Rectangle
                 {
-                    Name = "FirstColumnDivider"
+                    Name = "PART_FirstColumnDivider"
                 }.RegisterInNameScope(scope);
                 Grid.SetColumn(firstSpacer, 1);
 
                 var secondSpacer = new Rectangle
                 {
-                    Name = "SecondColumnDivider"
+                    Name = "PART_SecondColumnDivider"
                 }.RegisterInNameScope(scope);
                 Grid.SetColumn(secondSpacer, 3);
 
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index 9c2d760733..db6349cc5a 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -193,6 +193,9 @@ namespace Avalonia.Controls.UnitTests
         public void Impl_Input_Should_Pass_Input_To_InputManager()
         {
             var inputManagerMock = new Mock<IInputManager>();
+            inputManagerMock.DefaultValue = DefaultValue.Mock;
+            inputManagerMock.SetupAllProperties();
+
             var services = TestServices.StyledWindow.With(inputManager: inputManagerMock.Object);
 
             using (UnitTestApplication.Start(services))
@@ -249,24 +252,6 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact]
-        public void Close_Should_Notify_MouseDevice()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var impl = new Mock<ITopLevelImpl>();
-                var mouseDevice = new Mock<IMouseDevice>();
-                impl.SetupAllProperties();
-                impl.Setup(x => x.MouseDevice).Returns(mouseDevice.Object);
-
-                var target = new TestTopLevel(impl.Object);
-
-                impl.Object.Closed();
-
-                mouseDevice.Verify(x => x.TopLevelClosed(target));
-            }
-        }
-
         [Fact]
         public void Close_Should_Dispose_LayoutManager()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 2169b15cad..9cf21423a3 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -18,6 +18,7 @@ using Avalonia.LogicalTree;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using JetBrains.Annotations;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -72,6 +73,35 @@ namespace Avalonia.Controls.UnitTests
             Assert.All(items, x => Assert.IsType<Canvas>(x.HeaderPresenter.Child));
         }
 
+        [Fact]
+        public void Items_Should_Be_Created_Using_ItemConatinerTheme_If_Present()
+        {
+            TreeView target;
+            var theme = new ControlTheme();
+
+            var root = new TestRoot
+            {
+                Child = target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = CreateTestTreeData(),
+                    ItemContainerTheme = theme,
+                    ItemTemplate = new FuncTreeDataTemplate<Node>(
+                        (_, __) => new Canvas(),
+                        x => x.Children),
+                }
+            };
+
+            ApplyTemplates(target);
+
+            var items = target.ItemContainerGenerator.Index.Containers
+                .OfType<TreeViewItem>()
+                .ToList();
+
+            Assert.Equal(5, items.Count);
+            Assert.All(items, x => Assert.Same(theme, x.ItemContainerTheme));
+        }
+
         [Fact]
         public void Root_ItemContainerGenerator_Containers_Should_Be_Root_Containers()
         {
@@ -856,28 +886,31 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Right_Click_On_SelectedItem_Should_Not_Clear_Existing_Selection()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (UnitTestApplication.Start())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
-            target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
-            target.SelectAll();
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
+                target.SelectAll();
 
-            AssertChildrenSelected(target, tree[0]);
-            Assert.Equal(5, target.SelectedItems.Count);
+                AssertChildrenSelected(target, tree[0]);
+                Assert.Equal(5, target.SelectedItems.Count);
 
-            _mouse.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
+                _mouse.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
 
-            Assert.Equal(5, target.SelectedItems.Count);
+                Assert.Equal(5, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index b0eb694944..e4d177f7ca 100644
--- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -12,6 +12,7 @@ using Moq;
 using Xunit;
 using Avalonia.Input.Raw;
 using Factory = System.Func<int, System.Action<object>, Avalonia.Controls.Window, Avalonia.AvaloniaObject>;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls.UnitTests.Utils
 {
@@ -60,141 +61,119 @@ namespace Avalonia.Controls.UnitTests.Utils
             }
         }
 
-        [Fact]
-        public void HotKeyManager_Should_Release_Reference_When_Control_Detached()
+        [Theory]
+        [MemberData(nameof(ElementsFactory), parameters: true)]
+        public void HotKeyManager_Should_Use_CommandParameter(string factoryName, Factory factory)
         {
             using (AvaloniaLocator.EnterScope())
             {
                 var styler = new Mock<Styler>();
-
+                var target = new KeyboardDevice();
+                var commandResult = 0;
+                var expectedParameter = 1;
                 AvaloniaLocator.CurrentMutable
                     .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
                     .Bind<IStyler>().ToConstant(styler.Object);
 
-                var gesture1 = new KeyGesture(Key.A, KeyModifiers.Control);
+                var gesture = new KeyGesture(Key.A, KeyModifiers.Control);
 
-                WeakReference reference = null;
+                var action = new Action<object>(parameter =>
+                {
+                    if (parameter is int value)
+                    {
+                        commandResult = value;
+                    }
+                });
 
-                var tl = new Window();
+                var root = new Window();
+                var element = factory(expectedParameter, action, root);
 
-                new Action(() =>
-                {
-                    var button = new Button();
-                    reference = new WeakReference(button, true);
-                    tl.Content = button;
-                    tl.Template = CreateWindowTemplate();
-                    tl.ApplyTemplate();
-                    tl.Presenter.ApplyTemplate();
-                    HotKeyManager.SetHotKey(button, gesture1);
-
-                    // Detach the button from the logical tree, so there is no reference to it
-                    tl.Content = null;
-                    tl.ApplyTemplate();
-                })();
-
-
-                // The button should be collected since it's detached from the listbox
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-
-                Assert.Null(reference?.Target);
+                root.Template = CreateWindowTemplate();
+                root.ApplyTemplate();
+                root.Presenter.ApplyTemplate();
+
+                HotKeyManager.SetHotKey(element, gesture);
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+                Assert.True(expectedParameter == commandResult, $"{factoryName} HotKey did not carry the CommandParameter.");
             }
         }
 
-        [Fact]
-        public void HotKeyManager_Should_Release_Reference_When_Control_In_Item_Template_Detached()
+
+        [Theory]
+        [MemberData(nameof(ElementsFactory), parameters: true)]
+        public void HotKeyManager_Should_Do_Not_Executed_When_IsEnabled_False(string factoryName, Factory factory)
         {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            using (AvaloniaLocator.EnterScope())
             {
                 var styler = new Mock<Styler>();
-
+                var target = new KeyboardDevice();
+                var isExecuted = false;
                 AvaloniaLocator.CurrentMutable
                     .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
                     .Bind<IStyler>().ToConstant(styler.Object);
 
-                var gesture1 = new KeyGesture(Key.A, KeyModifiers.Control);
-
-                var weakReferences = new List<WeakReference>();
-                var tl = new Window { SizeToContent = SizeToContent.WidthAndHeight, IsVisible = true };
-                var lm = tl.LayoutManager;
+                var gesture = new KeyGesture(Key.A, KeyModifiers.Control);
 
-                var keyGestures = new AvaloniaList<KeyGesture> { gesture1 };
-                var listBox = new ListBox
-                {
-                    Width = 100,
-                    Height = 100,
-                    VirtualizationMode = ItemVirtualizationMode.None,
-                    // Create a button with binding to the KeyGesture in the template and add it to references list
-                    ItemTemplate = new FuncDataTemplate(typeof(KeyGesture), (o, scope) =>
-                    {
-                        var keyGesture = o as KeyGesture;
-                        var button = new Button
-                        {
-                            DataContext = keyGesture, [!Button.HotKeyProperty] = new Binding("")
-                        };
-                        weakReferences.Add(new WeakReference(button, true));
-                        return button;
-                    })
-                };
-                // Add the listbox and render it
-                tl.Content = listBox;
-                lm.ExecuteInitialLayoutPass();
-                listBox.Items = keyGestures;
-                lm.ExecuteLayoutPass();
-
-                // Let the button detach when clearing the source items
-                keyGestures.Clear();
-                lm.ExecuteLayoutPass();
-                
-                // Add it again to double check,and render
-                keyGestures.Add(gesture1);
-                lm.ExecuteLayoutPass();
-                
-                keyGestures.Clear();
-                lm.ExecuteLayoutPass();
-                
-                // The button should be collected since it's detached from the listbox
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-                
-                Assert.True(weakReferences.Count > 0);
-                foreach (var weakReference in weakReferences)
+                var action = new Action<object>(parameter =>
                 {
-                    Assert.Null(weakReference.Target);
-                }
+                    isExecuted = true;
+                });
+
+                var root = new Window();
+                var element = factory(0, action, root) as InputElement;
+
+                element.IsEnabled = false;
+
+                root.Template = CreateWindowTemplate();
+                root.ApplyTemplate();
+                root.Presenter.ApplyTemplate();
+
+                HotKeyManager.SetHotKey(element, gesture);
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+                Assert.True(isExecuted == false, $"{factoryName} Execution raised when IsEnabled is false.");
             }
         }
 
         [Theory]
-        [MemberData(nameof(ElementsFactory))]
-        public void HotKeyManager_Should_Use_CommandParameter(string factoryName, Factory factory)
+        [MemberData(nameof(ElementsFactory), parameters:false)]
+        public void HotKeyManager_Should_Invoke_Event_Click_When_Command_Is_Null(string factoryName, Factory factory)
         {
             using (AvaloniaLocator.EnterScope())
             {
                 var styler = new Mock<Styler>();
                 var target = new KeyboardDevice();
-                var commandResult = 0;
-                var expectedParameter = 1;
+                var clickExecutedCount = 0;
                 AvaloniaLocator.CurrentMutable
                     .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
                     .Bind<IStyler>().ToConstant(styler.Object);
 
                 var gesture = new KeyGesture(Key.A, KeyModifiers.Control);
 
-                var action = new Action<object>(parameter =>
+                void Clickable_Click(object sender, Interactivity.RoutedEventArgs e)
                 {
-                    if (parameter is int value)
-                    {
-                        commandResult = value;
-                    }
-                });
+                    clickExecutedCount++;
+                }
 
                 var root = new Window();
-                var element = factory(expectedParameter, action, root);
+                var element = factory(0, default, root) as InputElement;
+                if (element is IClickableControl clickable)
+                {
+                    clickable.Click += Clickable_Click;
+                }
 
                 root.Template = CreateWindowTemplate();
                 root.ApplyTemplate();
@@ -209,35 +188,52 @@ namespace Avalonia.Controls.UnitTests.Utils
                     Key.A,
                     RawInputModifiers.Control));
 
-                Assert.True(expectedParameter == commandResult, $"{factoryName} HotKey did not carry the CommandParameter.");
+                element.IsEnabled = false;
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+
+                Assert.True(clickExecutedCount == 1, $"{factoryName} Execution raised when IsEnabled is false.");
             }
         }
 
-
         [Theory]
-        [MemberData(nameof(ElementsFactory))]
-        public void HotKeyManager_Should_Do_Not_Executed_When_IsEnabled_False(string factoryName, Factory factory)
+        [MemberData(nameof(ElementsFactory), parameters: true)]
+        public void HotKeyManager_Should_Not_Invoke_Event_Click_When_Command_Is_Not_Null(string factoryName, Factory factory)
         {
             using (AvaloniaLocator.EnterScope())
             {
                 var styler = new Mock<Styler>();
                 var target = new KeyboardDevice();
-                var isExecuted = false;
+                var clickExecutedCount = 0;
+                var commandExecutedCount = 0;
                 AvaloniaLocator.CurrentMutable
                     .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
                     .Bind<IStyler>().ToConstant(styler.Object);
 
                 var gesture = new KeyGesture(Key.A, KeyModifiers.Control);
 
-                var action = new Action<object>(parameter =>
+                void DoExecute(object parameter)
                 {
-                    isExecuted = true;
-                });
+                    commandExecutedCount++;
+                }
 
-                var root = new Window();
-                var element = factory(0, action, root) as InputElement;
+                void Clickable_Click(object sender, Interactivity.RoutedEventArgs e)
+                {
+                    clickExecutedCount++;
+                }
 
-                element.IsEnabled = false;
+                var root = new Window();
+                var element = factory(0, DoExecute, root) as InputElement;
+                if (element is IClickableControl clickable)
+                {
+                    clickable.Click += Clickable_Click;
+                }
 
                 root.Template = CreateWindowTemplate();
                 root.ApplyTemplate();
@@ -252,15 +248,27 @@ namespace Avalonia.Controls.UnitTests.Utils
                     Key.A,
                     RawInputModifiers.Control));
 
-                Assert.True(isExecuted == false, $"{factoryName} Execution raised when IsEnabled is false.");
+                element.IsEnabled = false;
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+                Assert.True(commandExecutedCount == 1, $"{factoryName} Execution raised when IsEnabled is false.");
+                Assert.True(clickExecutedCount == 0, $"{factoryName} Execution raised event Click.");
             }
         }
 
-        public static TheoryData<string, Factory> ElementsFactory =>
+
+        public static TheoryData<string, Factory> ElementsFactory(bool withCommand) =>
+
             new TheoryData<string, Factory>()
             {
-                {nameof(Button), MakeButton},
-                {nameof(MenuItem),MakeMenu},
+                {nameof(Button), withCommand ? MakeButton : MakeButtonWithoutCommand},
+                {nameof(MenuItem),withCommand ? MakeMenu : MakeMenuWithoutCommand},
             };
 
         private static AvaloniaObject MakeMenu(int expectedParameter, Action<object> action, Window root)
@@ -290,6 +298,29 @@ namespace Avalonia.Controls.UnitTests.Utils
             return button;
         }
 
+        private static AvaloniaObject MakeMenuWithoutCommand(int expectedParameter, Action<object> action, Window root)
+        {
+            var menuitem = new MenuItem()
+            {
+            };
+            var rootMenu = new Menu();
+
+            rootMenu.Items = new[] { menuitem };
+
+            root.Content = rootMenu;
+            return menuitem;
+        }
+
+        private static AvaloniaObject MakeButtonWithoutCommand(int expectedParameter, Action<object> action, Window root)
+        {
+            var button = new Button()
+            {
+            };
+
+            root.Content = button;
+            return button;
+        }
+
         private FuncControlTemplate CreateWindowTemplate()
         {
             return new FuncControlTemplate<Window>((parent, scope) =>
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/SafeEnumerableListTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/SafeEnumerableListTests.cs
new file mode 100644
index 0000000000..f48bde4731
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Utils/SafeEnumerableListTests.cs
@@ -0,0 +1,130 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Utils
+{
+    public class SafeEnumerableListTests
+    {
+        [Fact]
+        public void List_Is_Not_Copied_Outside_Enumeration()
+        {
+            var target = new SafeEnumerableList<string>();
+            var inner = target.Inner;
+
+            target.Add("foo");
+            target.Add("bar");
+            target.Remove("foo");
+
+            Assert.Same(inner, target.Inner);
+        }
+
+        [Fact]
+        public void List_Is_Copied_Outside_Enumeration()
+        {
+            var target = new SafeEnumerableList<string>();
+            var inner = target.Inner;
+
+            target.Add("foo");
+
+            foreach (var i in target)
+            {
+                Assert.Same(inner, target.Inner);
+                target.Add("bar");
+                Assert.NotSame(inner, target.Inner);
+                Assert.Equal("foo", i);
+            }
+
+            inner = target.Inner;
+
+            foreach (var i in target)
+            {
+                target.Add("baz");
+                Assert.NotSame(inner, target.Inner);
+            }
+
+            Assert.Equal(new[] { "foo", "bar", "baz", "baz" }, target);
+        }
+
+        [Fact]
+        public void List_Is_Not_Copied_After_Enumeration()
+        {
+            var target = new SafeEnumerableList<string>();
+            var inner = target.Inner;
+
+            target.Add("foo");
+
+            foreach (var i in target)
+            {
+                target.Add("bar");
+                Assert.NotSame(inner, target.Inner);
+                inner = target.Inner;
+                Assert.Equal("foo", i);
+            }
+
+            target.Add("baz");
+            Assert.Same(inner, target.Inner);
+        }
+
+        [Fact]
+        public void List_Is_Copied_Only_Once_During_Enumeration()
+        {
+            var target = new SafeEnumerableList<string>();
+            var inner = target.Inner;
+
+            target.Add("foo");
+
+            foreach (var i in target)
+            {
+                target.Add("bar");
+                Assert.NotSame(inner, target.Inner);
+                inner = target.Inner;
+                target.Add("baz");
+                Assert.Same(inner, target.Inner);
+            }
+
+            target.Add("baz");
+        }
+
+        [Fact]
+        public void List_Is_Copied_During_Nested_Enumerations()
+        {
+            var target = new SafeEnumerableList<string>();
+            var initialInner = target.Inner;
+            var firstItems = new List<string>();
+            var secondItems = new List<string>();
+            List<string> firstInner;
+            List<string> secondInner;
+
+            target.Add("foo");
+
+            foreach (var i in target)
+            {
+                target.Add("bar");
+
+                firstInner = target.Inner;
+                Assert.NotSame(initialInner, firstInner);
+
+                foreach (var j in target)
+                {
+                    target.Add("baz");
+
+                    secondInner = target.Inner;
+                    Assert.NotSame(firstInner, secondInner);
+
+                    secondItems.Add(j);
+                }
+
+                firstItems.Add(i);
+            }
+
+            Assert.Equal(new[] { "foo" }, firstItems);
+            Assert.Equal(new[] { "foo", "bar" }, secondItems);
+            Assert.Equal(new[] { "foo", "bar", "baz", "baz" }, target);
+
+            var finalInner = target.Inner;
+            target.Add("final");
+            Assert.Same(finalInner, target.Inner);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
index 7eaec35506..629408bcba 100644
--- a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls.Shapes;
+using Avalonia.Data;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.UnitTests;
 using Xunit;
@@ -18,11 +20,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 100), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(2.0, scaleTransform.ScaleX);
-            Assert.Equal(2.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(2.0, scale.X);
+            Assert.Equal(2.0, scale.Y);
         }
 
         [Fact]
@@ -36,11 +37,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(100, 50), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(1.0, scaleTransform.ScaleX);
-            Assert.Equal(1.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(1.0, scale.X);
+            Assert.Equal(1.0, scale.Y);
         }
 
         [Fact]
@@ -54,11 +54,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 200), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(2.0, scaleTransform.ScaleX);
-            Assert.Equal(4.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(2.0, scale.X);
+            Assert.Equal(4.0, scale.Y);
         }
 
         [Fact]
@@ -72,11 +71,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 200), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(4.0, scaleTransform.ScaleX);
-            Assert.Equal(4.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(4.0, scale.X);
+            Assert.Equal(4.0, scale.Y);
         }
 
         [Fact]
@@ -90,11 +88,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(400, 200), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(4.0, scaleTransform.ScaleX);
-            Assert.Equal(4.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(4.0, scale.X);
+            Assert.Equal(4.0, scale.Y);
         }
 
         [Fact]
@@ -108,11 +105,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 100), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(2.0, scaleTransform.ScaleX);
-            Assert.Equal(2.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(2.0, scale.X);
+            Assert.Equal(2.0, scale.Y);
         }
 
         [Theory]
@@ -136,11 +132,9 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(expectedWidth, expectedHeight), target.DesiredSize);
 
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(expectedScale, scaleTransform.ScaleX);
-            Assert.Equal(expectedScale, scaleTransform.ScaleY);
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(expectedScale, scale.X);
+            Assert.Equal(expectedScale, scale.Y);
         }
 
         [Theory]
@@ -164,11 +158,90 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(expectedWidth, expectedHeight), target.DesiredSize);
 
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(expectedScale, scale.X);
+            Assert.Equal(expectedScale, scale.Y);
+        }
+
+        [Fact]
+        public void Child_Should_Be_Logical_Child_Of_Viewbox()
+        {
+            var target = new Viewbox();
+
+            Assert.Empty(target.GetLogicalChildren());
+
+            var child = new Canvas();
+            target.Child = child;
+
+            Assert.Single(target.GetLogicalChildren(), child);
+            Assert.Same(child.GetLogicalParent(), target);
+
+            target.Child = null;
+
+            Assert.Empty(target.GetLogicalChildren());
+            Assert.Null(child.GetLogicalParent());
+        }
+
+        [Fact]
+        public void Changing_Child_Should_Invalidate_Layout()
+        {
+            var target = new Viewbox();
+
+            target.Child = new Canvas
+            {
+                Width = 100,
+                Height = 100,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Size(100, 100), target.DesiredSize);
+
+            target.Child = new Canvas
+            {
+                Width = 200,
+                Height = 200,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Size(200, 200), target.DesiredSize);
+        }
+
+        [Fact]
+        public void Child_DataContext_Binding_Works()
+        {
+            var data = new
+            {
+                Foo = "foo",
+            };
+
+            var target = new Viewbox()
+            {
+                DataContext = data,
+                Child = new Canvas
+                {
+                    [!Canvas.DataContextProperty] = new Binding("Foo"),
+                },
+            };
+
+            Assert.Equal("foo", target.Child.DataContext);
+        }
+
+        private bool TryGetScale(Viewbox viewbox, out Vector scale)
+        {
+            if (viewbox.InternalTransform is null)
+            {
+                scale = default;
+                return false;
+            }
+
+            var matrix = viewbox.InternalTransform.Value;
+
+            Matrix.TryDecomposeTransform(matrix, out var decomposed);
 
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(expectedScale, scaleTransform.ScaleX);
-            Assert.Equal(expectedScale, scaleTransform.ScaleY);
+            scale = decomposed.Scale;
+            return true;
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 4166242455..0cdde445d5 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -516,6 +516,8 @@ namespace Avalonia.Controls.UnitTests
 
             var screens = new Mock<IScreenImpl>();
             screens.Setup(x => x.AllScreens).Returns(new Screen[] { screen1.Object, screen2.Object });
+            screens.Setup(x => x.ScreenFromPoint(It.IsAny<PixelPoint>())).Returns(screen1.Object);
+            
 
             var windowImpl = MockWindowingPlatform.CreateWindowMock();
             windowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
@@ -538,6 +540,33 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(window.Position, expectedPosition);
             }
         }
+        
+        [Fact]
+        public void Window_Should_Be_Sized_To_MinSize_If_InitialSize_Less_Than_MinSize()
+        {
+            var screen1 = new Mock<Screen>(1.75, new PixelRect(new PixelSize(1920, 1080)), new PixelRect(new PixelSize(1920, 966)), true);
+            var screens = new Mock<IScreenImpl>();
+            screens.Setup(x => x.AllScreens).Returns(new Screen[] { screen1.Object });
+            screens.Setup(x => x.ScreenFromPoint(It.IsAny<PixelPoint>())).Returns(screen1.Object);
+            
+            var windowImpl = MockWindowingPlatform.CreateWindowMock(400, 300);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1.75);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1.75);
+            windowImpl.Setup(x => x.Screen).Returns(screens.Object);
+            
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window(windowImpl.Object);
+                window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+                window.MinWidth = 720;
+                window.MinHeight = 480;
+
+                window.Show();
+                
+                Assert.Equal(new PixelPoint(330, 63), window.Position);
+                Assert.Equal(new Size(720, 480), window.Bounds.Size);
+            }
+        }
 
         [Fact]
         public void Window_Should_Be_Centered_Relative_To_Owner_When_WindowStartupLocation_Is_CenterOwner()
@@ -693,6 +722,31 @@ namespace Avalonia.Controls.UnitTests
                 }
             }
 
+            [Fact]
+            public void Width_Height_Should_Not_Be_NaN_After_Show_With_SizeToContent_Manual()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 800,
+                    };
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.Manual,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    // Values come from MockWindowingPlatform defaults.
+                    Assert.Equal(800, target.Width);
+                    Assert.Equal(600, target.Height);
+                }
+            }
+
             [Fact]
             public void Width_Height_Should_Not_Be_NaN_After_Show_With_SizeToContent_WidthAndHeight()
             {
@@ -710,6 +764,8 @@ namespace Avalonia.Controls.UnitTests
                         Content = child
                     };
 
+                    target.GetObservable(Window.WidthProperty).Subscribe(x => { });
+
                     Show(target);
 
                     Assert.Equal(400, target.Width);
@@ -717,6 +773,27 @@ namespace Avalonia.Controls.UnitTests
                 }
             }
 
+            [Fact]
+            public void MaxWidth_And_MaxHeight_Should_Be_Respected_With_SizeToContent_WidthAndHeight()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new ChildControl();
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        MaxWidth = 300,
+                        MaxHeight = 700,
+                        Content = child,
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(new[] { new Size(300, 700) }, child.MeasureSizes);
+                }
+            }
+
             [Fact]
             public void SizeToContent_Should_Not_Be_Lost_On_Show()
             {
@@ -821,7 +898,7 @@ namespace Avalonia.Controls.UnitTests
                     target.Width = 410;
                     target.LayoutManager.ExecuteLayoutPass();
 
-                    var windowImpl = Mock.Get(ValidatingWindowImpl.Unwrap(target.PlatformImpl));
+                    var windowImpl = Mock.Get(target.PlatformImpl);
                     windowImpl.Verify(x => x.Resize(new Size(410, 800), PlatformResizeReason.Application));
                     Assert.Equal(410, target.Width);
                 }
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
index 5a33ffff80..ad32431b37 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
@@ -1,10 +1,7 @@
-<Application
-    x:Class="Avalonia.DesignerSupport.TestApp.App"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/Base.xaml" />
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml" />
-    </Application.Styles>
+<Application x:Class="Avalonia.DesignerSupport.TestApp.App"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Application.Styles>
+    <SimpleTheme />
+  </Application.Styles>
 </Application>
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
index 5358b71571..a91cf3911a 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@@ -8,27 +8,20 @@
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="**\*.xaml">
+    <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
-    </EmbeddedResource>
+    </AvaloniaResource>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.DesktopRuntime\Avalonia.DesktopRuntime.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.OpenGL\Avalonia.OpenGL.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
index 5477bcfd29..eb57cfb8da 100644
--- a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
@@ -389,9 +389,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true
     },
     "ansi-styles": {
@@ -587,9 +587,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "string-width": {
@@ -1333,9 +1333,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mocha": {
@@ -1437,9 +1437,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "cliui": {
@@ -2117,9 +2117,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "ansi-styles": {
@@ -2211,9 +2211,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "find-up": {
@@ -2305,9 +2305,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "find-up": {
diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index 4353b7b09c..4a90da77e7 100644
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -9,23 +9,16 @@
     <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.DesktopRuntime\Avalonia.DesktopRuntime.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
+  <Import Project="..\..\build\ImageSharp.props" />
   <Import Project="..\..\build\SharedVersion.props" />
 </Project>
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
index 636643d9e4..ad7e3ad504 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@@ -12,14 +12,8 @@
     <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
deleted file mode 100644
index 3b0b082093..0000000000
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Input.UnitTests/GesturesTests.cs b/tests/Avalonia.Input.UnitTests/GesturesTests.cs
deleted file mode 100644
index b2687c2555..0000000000
--- a/tests/Avalonia.Input.UnitTests/GesturesTests.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class GesturesTests
-    {
-        private MouseTestHelper _mouse = new MouseTestHelper();
-        
-        [Fact]
-        public void Tapped_Should_Follow_Pointer_Pressed_Released()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, false);
-
-            _mouse.Click(border);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
-        }
-
-        [Fact]
-        public void Tapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, true);
-
-            _mouse.Click(border);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
-        }
-
-        [Fact]
-        public void Tapped_Should_Not_Be_Raised_For_Middle_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Middle);
-
-            Assert.False(raised);
-        }
-
-        [Fact]
-        public void Tapped_Should_Not_Be_Raised_For_Right_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Right);
-
-            Assert.False(raised);
-        }
-
-        [Fact]
-        public void RightTapped_Should_Be_Raised_For_Right_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.RightTappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Right);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Follow_Pointer_Pressed_Released_Pressed()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, false);
-
-            _mouse.Click(border);
-            _mouse.Down(border, clickCount: 2);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, true);
-
-            _mouse.Click(border);
-            _mouse.Down(border, clickCount: 2);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Middle);
-            _mouse.Down(border, MouseButton.Middle, clickCount: 2);
-
-            Assert.False(raised);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Not_Be_Raised_For_Right_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Right);
-            _mouse.Down(border, MouseButton.Right, clickCount: 2);
-
-            Assert.False(raised);
-        }
-
-        private void AddHandlers(
-            Decorator decorator,
-            Border border,
-            IList<string> result,
-            bool markHandled)
-        {
-            decorator.AddHandler(Border.PointerPressedEvent, (s, e) =>
-            {
-                result.Add("dp");
-
-                if (markHandled)
-                {
-                    e.Handled = true;
-                }
-            });
-
-            decorator.AddHandler(Border.PointerReleasedEvent, (s, e) =>
-            {
-                result.Add("dr");
-
-                if (markHandled)
-                {
-                    e.Handled = true;
-                }
-            });
-
-            border.AddHandler(Border.PointerPressedEvent, (s, e) => result.Add("bp"));
-            border.AddHandler(Border.PointerReleasedEvent, (s, e) => result.Add("br"));
-
-            decorator.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("dt"));
-            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("ddt"));
-            border.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("bt"));
-            border.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("bdt"));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs b/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
deleted file mode 100644
index 11d68d307e..0000000000
--- a/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class InputElement_Enabled
-    {
-        [Fact]
-        public void IsEffectivelyEnabled_Follows_IsEnabled()
-        {
-            var target = new Decorator();
-
-            Assert.True(target.IsEnabled);
-            Assert.True(target.IsEffectivelyEnabled);
-
-            target.IsEnabled = false;
-
-            Assert.False(target.IsEnabled);
-            Assert.False(target.IsEffectivelyEnabled);
-        }
-
-        [Fact]
-        public void IsEffectivelyEnabled_Follows_Ancestor_IsEnabled()
-        {
-            Decorator child;
-            Decorator grandchild;
-            var target = new Decorator
-            {
-                Child = child = new Decorator
-                {
-                    Child = grandchild = new Decorator(),
-                }
-            };
-
-            Assert.True(target.IsEnabled);
-            Assert.True(target.IsEffectivelyEnabled);
-            Assert.True(child.IsEnabled);
-            Assert.True(child.IsEffectivelyEnabled);
-            Assert.True(grandchild.IsEnabled);
-            Assert.True(grandchild.IsEffectivelyEnabled);
-
-            target.IsEnabled = false;
-
-            Assert.False(target.IsEnabled);
-            Assert.False(target.IsEffectivelyEnabled);
-            Assert.True(child.IsEnabled);
-            Assert.False(child.IsEffectivelyEnabled);
-            Assert.True(grandchild.IsEnabled);
-            Assert.False(grandchild.IsEffectivelyEnabled);
-        }
-
-        [Fact]
-        public void Disabled_Pseudoclass_Follows_IsEffectivelyEnabled()
-        {
-            Decorator child;
-            var target = new Decorator
-            {
-                Child = child = new Decorator()
-            };
-
-            Assert.DoesNotContain(":disabled", child.Classes);
-
-            target.IsEnabled = false;
-
-            Assert.Contains(":disabled", child.Classes);
-        }
-
-        [Fact]
-        public void IsEffectivelyEnabled_Respects_IsEnabledCore()
-        {
-            Decorator child;
-            var target = new TestControl
-            {
-                Child = child = new Decorator()
-            };
-
-            target.ShouldEnable = false;
-
-            Assert.True(target.IsEnabled);
-            Assert.False(target.IsEffectivelyEnabled);
-            Assert.True(child.IsEnabled);
-            Assert.False(child.IsEffectivelyEnabled);
-        }
-
-        private class TestControl : Decorator
-        {
-            private bool _shouldEnable;
-
-            public bool ShouldEnable
-            {
-                get => _shouldEnable;
-                set { _shouldEnable = value; UpdateIsEffectivelyEnabled(); }
-            }
-
-            protected override bool IsEnabledCore => IsEnabled && _shouldEnable; 
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs b/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
deleted file mode 100644
index 602455ba36..0000000000
--- a/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class InputElement_Focus
-    {
-        [Fact]
-        public void Focus_Should_Set_FocusManager_Current()
-        {
-            Button target;
-
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var root = new TestRoot
-                {
-                    Child = target = new Button()
-                };
-
-                target.Focus();
-
-                Assert.Same(target, FocusManager.Instance.Current);
-            }
-        }
-
-        [Fact]
-        public void Focus_Should_Be_Cleared_When_Control_Is_Removed_From_VisualTree()
-        {
-            Button target;
-
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var root = new TestRoot
-                {
-                    Child = target = new Button()
-                };
-
-                target.Focus();
-                root.Child = null;
-
-                Assert.Null(FocusManager.Instance.Current);
-            }
-        }
-
-        [Fact]
-        public void Focus_Pseudoclass_Should_Be_Applied_On_Focus()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus"));
-                Assert.False(target2.IsFocused);
-                Assert.False(target2.Classes.Contains(":focus"));
-
-                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus"));
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus"));
-            }
-        }
-
-        [Fact]
-        public void Control_FocusVsisible_Pseudoclass_Should_Be_Applied_On_Tab_And_DirectionalFocus()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-visible"));
-                Assert.False(target2.IsFocused);
-                Assert.False(target2.Classes.Contains(":focus-visible"));
-
-                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-visible"));
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus-visible"));
-
-                FocusManager.Instance?.Focus(target1, NavigationMethod.Directional);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-visible"));
-                Assert.False(target2.IsFocused);
-                Assert.False(target2.Classes.Contains(":focus-visible"));
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_PseudoClass_Should_Be_Applied()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_PseudoClass_Should_Be_Applied_and_Removed()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var panel1 = new Panel { Children = { target1 } };
-                var panel2 = new Panel { Children = { target2 } };
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            panel1,
-                            panel2
-                        }
-                    }
-                };
-                
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(panel1.Classes.Contains(":focus-within"));
-                Assert.True(panel1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-                
-                FocusManager.Instance?.Focus(target2);
-                
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-within"));
-                Assert.False(target1.IsKeyboardFocusWithin);
-                Assert.False(panel1.Classes.Contains(":focus-within"));
-                Assert.False(panel1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-                
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus-within"));
-                Assert.True(target2.IsKeyboardFocusWithin);
-                Assert.True(panel2.Classes.Contains(":focus-within"));
-                Assert.True(panel2.IsKeyboardFocusWithin);
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_When_Removed_From_Tree()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-
-                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
-                
-                root.Child = null;
-                
-                Assert.Null(KeyboardDevice.Instance.FocusedElement);
-                
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-within"));
-                Assert.False(target1.IsKeyboardFocusWithin);
-                Assert.False(root.Classes.Contains(":focus-within"));
-                Assert.False(root.IsKeyboardFocusWithin);
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_Focus_Moves_To_Different_Root()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                
-                var root1 = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                        }
-                    }
-                };
-                
-                var root2 = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target2,
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(root1.Child.Classes.Contains(":focus-within"));
-                Assert.True(root1.Child.IsKeyboardFocusWithin);
-                Assert.True(root1.Classes.Contains(":focus-within"));
-                Assert.True(root1.IsKeyboardFocusWithin);
-
-                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
-                
-                FocusManager.Instance?.Focus(target2);
-                
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-within"));
-                Assert.False(target1.IsKeyboardFocusWithin);
-                Assert.False(root1.Child.Classes.Contains(":focus-within"));
-                Assert.False(root1.Child.IsKeyboardFocusWithin);
-                Assert.False(root1.Classes.Contains(":focus-within"));
-                Assert.False(root1.IsKeyboardFocusWithin);
-                
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus-within"));
-                Assert.True(target2.IsKeyboardFocusWithin);
-                Assert.True(root2.Child.Classes.Contains(":focus-within"));
-                Assert.True(root2.Child.IsKeyboardFocusWithin);
-                Assert.True(root2.Classes.Contains(":focus-within"));
-                Assert.True(root2.IsKeyboardFocusWithin);
-            }
-        }
-
-        [Fact]
-        public void Can_Clear_Focus()
-        {
-            Button target;
-
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var root = new TestRoot
-                {
-                    Child = target = new Button()
-                };
-
-                target.Focus();
-                FocusManager.Instance.Focus(null);
-
-                Assert.Null(FocusManager.Instance.Current);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs b/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
deleted file mode 100644
index 90f9a0a985..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Collections.Generic;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyGestureTests
-    {
-        public static readonly IEnumerable<object[]> ParseData = new object[][]
-        {
-            new object[]{"Ctrl+A", new KeyGesture(Key.A, KeyModifiers.Control)},
-            new object[]{"  \tShift\t+Alt +B", new KeyGesture(Key.B, KeyModifiers.Shift | KeyModifiers.Alt) },
-            new object[]{"Control++", new KeyGesture(Key.OemPlus, KeyModifiers.Control) },
-            new object[]{ "Shift+⌘+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
-            new object[]{ "Shift+Cmd+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
-        };
-
-        public static readonly IEnumerable<object[]> ToStringData = new object[][]
-        {
-            new object[]{new KeyGesture(Key.A), "A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Control), "Ctrl+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Shift), "Ctrl+Shift+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Alt | KeyModifiers.Shift), "Shift+Alt+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Alt | KeyModifiers.Shift), "Ctrl+Shift+Alt+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift), "Shift+Cmd+A"},
-        };
-
-        [Theory]
-        [MemberData(nameof(ParseData))]
-        public void Key_Gesture_Is_Able_To_Parse_Sample_Data(string text, KeyGesture gesture)
-        {
-            Assert.Equal(gesture, KeyGesture.Parse(text));
-        }
-
-        [Theory]
-        [InlineData(Key.OemMinus, Key.Subtract)]
-        [InlineData(Key.OemPlus, Key.Add)]
-        [InlineData(Key.OemPeriod, Key.Decimal)]
-        public void Key_Gesture_Matches_NumPad_To_Regular_Digit(Key gestureKey, Key pressedKey)
-        {
-            var keyGesture = new KeyGesture(gestureKey);
-
-            Assert.True(keyGesture.Matches(new KeyEventArgs
-            {
-                Key = pressedKey
-            }));
-        }
-
-        [Theory]
-        [MemberData(nameof(ToStringData))]
-        public void ToString_Produces_Correct_Results(KeyGesture gesture, string expected)
-        {
-            Assert.Equal(expected, gesture.ToString());
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs b/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
deleted file mode 100644
index c354dbe72e..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Windows.Input;
-using Avalonia.Controls;
-using Avalonia.Input.Raw;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyboardDeviceTests
-    {
-        [Fact]
-        public void Keypresses_Should_Be_Sent_To_Root_If_No_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var root = new Mock<IInputRoot>();
-
-            target.ProcessRawEvent(
-                new RawKeyEventArgs(
-                    target,
-                    0,
-                    root.Object,
-                    RawKeyEventType.KeyDown,
-                    Key.A,
-                    RawInputModifiers.None));
-
-            root.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
-        }
-
-        [Fact]
-        public void Keypresses_Should_Be_Sent_To_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var focused = new Mock<IInputElement>();
-            var root = Mock.Of<IInputRoot>();
-
-            target.SetFocusedElement(
-                focused.Object,
-                NavigationMethod.Unspecified,
-                KeyModifiers.None);
-
-            target.ProcessRawEvent(
-                new RawKeyEventArgs(
-                    target,
-                    0,
-                    root,
-                    RawKeyEventType.KeyDown,
-                    Key.A,
-                    RawInputModifiers.None));
-
-            focused.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
-        }
-
-        [Fact]
-        public void TextInput_Should_Be_Sent_To_Root_If_No_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var root = new Mock<IInputRoot>();
-
-            target.ProcessRawEvent(
-                new RawTextInputEventArgs(
-                    target,
-                    0,
-                    root.Object,
-                    "Foo"));
-
-            root.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
-        }
-
-        [Fact]
-        public void TextInput_Should_Be_Sent_To_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var focused = new Mock<IInputElement>();
-            var root = Mock.Of<IInputRoot>();
-
-            target.SetFocusedElement(
-                focused.Object,
-                NavigationMethod.Unspecified,
-                KeyModifiers.None);
-
-            target.ProcessRawEvent(
-                new RawTextInputEventArgs(
-                    target,
-                    0,
-                    root,
-                    "Foo"));
-
-            focused.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
-        }
-
-        [Fact]
-        public void Can_Change_KeyBindings_In_Keybinding_Event_Handler()
-        {
-            var target = new KeyboardDevice();
-            var button = new Button();
-            var root = new TestRoot(button);
-            var raised = 0;
-
-            button.KeyBindings.Add(new KeyBinding
-            {
-                Gesture = new KeyGesture(Key.O, KeyModifiers.Control),
-                Command = new DelegateCommand(() =>
-                {
-                    button.KeyBindings.Clear();
-                    ++raised;
-                }),
-            });
-
-            target.SetFocusedElement(button, NavigationMethod.Pointer, 0);
-            target.ProcessRawEvent(
-                new RawKeyEventArgs(
-                    target,
-                    0,
-                    root,
-                    RawKeyEventType.KeyDown,
-                    Key.O,
-                    RawInputModifiers.Control));
-
-            Assert.Equal(1, raised);
-        }
-
-        private class DelegateCommand : ICommand
-        {
-            private readonly Action _action;
-            public DelegateCommand(Action action) => _action = action;
-            public event EventHandler CanExecuteChanged { add { } remove { } }
-            public bool CanExecute(object parameter) => true;
-            public void Execute(object parameter) => _action();
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
deleted file mode 100644
index f9c85ee4ca..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyboardNavigationTests_Custom
-    {
-        [Fact]
-        public void Tab_Should_Custom_Navigate_Within_Children()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    (current = new Button { Content = "Button 1" }),
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Right_Should_Custom_Navigate_Within_Children()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    (current = new Button { Content = "Button 1" }),
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Right);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Tab_Should_Custom_Navigate_From_Outside()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var root = new StackPanel
-            {
-                Children =
-                {
-                    (current = new Button { Content = "Outside" }),
-                    target,
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Tab_Should_Custom_Navigate_From_Outside_When_Wrapping()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    target,
-                    (current = new Button { Content = "Outside" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void ShiftTab_Should_Custom_Navigate_From_Outside()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (current = new Button { Content = "Outside" }),
-                    target,
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void ShiftTab_Should_Navigate_Outside_When_Null_Returned_As_Next()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    (current = new Button { Content = "Button 2" }),
-                    new Button { Content = "Button 3" },
-                },
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    target,
-                    (next = new Button { Content = "Outside" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Tab_Should_Navigate_Outside_When_Null_Returned_As_Next()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    (current = new Button { Content = "Button 2" }),
-                    new Button { Content = "Button 3" },
-                },
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    target,
-                    (next = new Button { Content = "Outside" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        private class CustomNavigatingStackPanel : StackPanel, ICustomKeyboardNavigation
-        {
-            public bool CustomNavigates { get; set; } = true;
-            public IInputElement NextControl { get; set; }
-
-            public (bool handled, IInputElement next) GetNext(IInputElement element, NavigationDirection direction)
-            {
-                return (CustomNavigates, NextControl);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
deleted file mode 100644
index 9a117bb71d..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ /dev/null
@@ -1,1256 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyboardNavigationTests_Tab
-    {
-        [Fact]
-        public void Next_Continue_Returns_Next_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_First_Control_In_Next_Sibling_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Skips_Unfocusable_Siblings()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    (current = new Button { Name = "Button3" }),
-                                }
-                            },
-                            new TextBlock { Name = "TextBlock" },
-                            (next = new Button { Name = "Button4" }),
-                        }
-                    },
-                    new Button { Name = "Button5" },
-                    new Button { Name = "Button6" },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Doesnt_Enter_Panel_With_TabNavigation_None()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    new Button { Name = "Button4" },
-                                    new Button { Name = "Button5" },
-                                    new Button { Name = "Button6" },
-                                }
-                            },
-                        }
-                    }
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_Next_Sibling()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    (next = new Button { Name = "Button4" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Skips_Non_TabStop_Siblings()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                            new Button { Name="Button4", [KeyboardNavigation.IsTabStopProperty] = false }
-                        }
-                    },
-                    (next = new Button { Name = "Button5" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_First_Control_In_Next_Uncle_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    new Button { Name = "Button1" },
-                                    new Button { Name = "Button2" },
-                                    (current = new Button { Name = "Button3" }),
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_Child_Of_Top_Level()
-        {
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (next = new Button { Name = "Button1" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Wraps()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    (next = new Button { Name = "Button1" }),
-                                    new Button { Name = "Button2" },
-                                    new Button { Name = "Button3" },
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            (current = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Cycle_Returns_Next_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Cycle_Wraps_To_First()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Contained_Returns_Next_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Contained_Stops_At_End()
-        {
-            Button current;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Next_Once_Moves_To_Next_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Once_Moves_To_Active_Element()
-        {
-            StackPanel container;
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (container = new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (next = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    }),
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            (current = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            KeyboardNavigation.SetTabOnceActiveElement(container, next);
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_None_Moves_To_Next_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_None_Skips_Container()
-        {
-            StackPanel container;
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (container = new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            new Button { Name = "Button3" },
-                        }
-                    }),
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            (current = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            KeyboardNavigation.SetTabOnceActiveElement(container, next);
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Previous_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (next = new Button { Name = "Button2" }),
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Last_Control_In_Previous_Sibling_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Last_Child_Of_Sibling()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    (current = new Button { Name = "Button4" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Last_Control_In_Previous_Nephew_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    new Button { Name = "Button1" },
-                                    new Button { Name = "Button2" },
-                                    (next = new Button { Name = "Button3" }),
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Wraps()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    (current = new Button { Name = "Button1" }),
-                                    new Button { Name = "Button2" },
-                                    new Button { Name = "Button3" },
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            (next = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Parent()
-        {
-            Button current;
-
-            var top = new Decorator
-            {
-                Focusable = true,
-                Child = current = new Button
-                {
-                    Name = "Button",
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(top, result);
-        }
-
-        [Fact]
-        public void Previous_Cycle_Returns_Previous_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Cycle_Wraps_To_Last()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            (current = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Contained_Returns_Previous_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Contained_Stops_At_Beginning()
-        {
-            Button current;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            (current = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Previous_Once_Moves_To_Previous_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            (current = new Button { Name = "Button5" }),
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Once_Moves_To_Active_Element()
-        {
-            StackPanel container;
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (container = new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (next = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    }),
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            KeyboardNavigation.SetTabOnceActiveElement(container, next);
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Once_Moves_To_First_Element()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Contained_Doesnt_Select_Child_Control()
-        {
-            Decorator current;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                Children =
-                {
-                    (current = new Decorator
-                    {
-                        Focusable = true,
-                        Child = new Button(),
-                    })
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Respects_TabIndex_Moving_Forwards()
-        {
-            Button start;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1", TabIndex = 5 },
-                            (start = new Button { Name = "Button2", TabIndex = 2 }),
-                            new Button { Name = "Button3", TabIndex = 1 },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4", TabIndex = 3  },
-                            new Button { Name = "Button5", TabIndex = 6  },
-                            new Button { Name = "Button6", TabIndex = 4  },
-                        }
-                    },
-                }
-            };
-
-            var result = new List<string>();
-            var current = (IInputElement)start;
-
-            do
-            {
-                result.Add(((IControl)current).Name);
-                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-            } while (current is object && current != start);
-
-            Assert.Equal(new[]
-            {
-                "Button2", "Button4", "Button6", "Button1", "Button5", "Button3"
-            }, result);
-        }
-
-        [Fact]
-        public void Respects_TabIndex_Moving_Backwards()
-        {
-            Button start;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1", TabIndex = 5 },
-                            (start = new Button { Name = "Button2", TabIndex = 2 }),
-                            new Button { Name = "Button3", TabIndex = 1 },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4", TabIndex = 3  },
-                            new Button { Name = "Button5", TabIndex = 6  },
-                            new Button { Name = "Button6", TabIndex = 4  },
-                        }
-                    },
-                }
-            };
-
-            var result = new List<string>();
-            var current = (IInputElement)start;
-
-            do
-            {
-                result.Add(((IControl)current).Name);
-                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-            } while (current is object && current != start);
-
-            Assert.Equal(new[]
-            {
-                "Button2", "Button3", "Button5", "Button1", "Button6", "Button4"
-            }, result);
-        }
-
-        [Fact]
-        public void Cannot_Focus_Child_Of_Disabled_Control()
-        {
-            Button start;
-            Button expected;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (start = new Button { Name = "Button1" }),
-                    new Border
-                    {
-                        IsEnabled = false,
-                        Child = new Button { Name = "Button2" },
-                    },
-                    (expected = new Button { Name = "Button3" }),
-                }
-            };
-
-            var current = (IInputElement)start;
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(expected, result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
deleted file mode 100644
index 223f458f25..0000000000
--- a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using System;
-using System.Collections.Generic;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class MouseDeviceTests
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        [Fact]
-        public void Capture_Is_Transferred_To_Parent_When_Control_Removed()
-        {
-            Canvas control;
-            var root = new TestRoot
-            {
-                Child = control = new Canvas(),
-            };
-            var target = new MouseDevice();
-
-            target.Capture(control);
-            Assert.Same(control, target.Captured);
-
-            root.Child = null;
-
-            Assert.Same(root, target.Captured);
-        }
-#pragma warning restore CS0618 // Type or member is obsolete
-
-        [Fact]
-        public void MouseMove_Should_Update_IsPointerOver()
-        {
-            var renderer = new Mock<IRenderer>();
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                Canvas canvas;
-                Border border;
-                Decorator decorator;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Renderer = renderer.Object,
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (canvas = new Canvas()),
-                            (border = new Border
-                            {
-                                Child = decorator = new Decorator(),
-                            })
-                        }
-                    }
-                };
-
-                SetHit(renderer, decorator);
-                SendMouseMove(inputManager, root);
-
-                Assert.True(decorator.IsPointerOver);
-                Assert.True(border.IsPointerOver);
-                Assert.False(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-
-                SetHit(renderer, canvas);
-                SendMouseMove(inputManager, root);
-
-                Assert.False(decorator.IsPointerOver);
-                Assert.False(border.IsPointerOver);
-                Assert.True(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-            }
-        }
-
-        [Fact]
-        public void IsPointerOver_Should_Be_Updated_When_Child_Sets_Handled_True()
-        {
-            var renderer = new Mock<IRenderer>();
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                Canvas canvas;
-                Border border;
-                Decorator decorator;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Renderer = renderer.Object,
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (canvas = new Canvas()),
-                            (border = new Border
-                            {
-                                Child = decorator = new Decorator(),
-                            })
-                        }
-                    }
-                };
-
-                SetHit(renderer, canvas);
-                SendMouseMove(inputManager, root);
-
-                Assert.False(decorator.IsPointerOver);
-                Assert.False(border.IsPointerOver);
-                Assert.True(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-
-                // Ensure that e.Handled is reset between controls.
-                decorator.PointerEnter += (s, e) => e.Handled = true;
-
-                SetHit(renderer, decorator);
-                SendMouseMove(inputManager, root);
-
-                Assert.True(decorator.IsPointerOver);
-                Assert.True(border.IsPointerOver);
-                Assert.False(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-            }
-        }
-
-        [Fact]
-        public void PointerEnter_Leave_Should_Be_Raised_In_Correct_Order()
-        {
-            var renderer = new Mock<IRenderer>();
-            var result = new List<(object, string)>();
-
-            void HandleEvent(object sender, PointerEventArgs e)
-            {
-                result.Add((sender, e.RoutedEvent.Name));
-            }
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                Canvas canvas;
-                Border border;
-                Decorator decorator;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Renderer = renderer.Object,
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (canvas = new Canvas()),
-                            (border = new Border
-                            {
-                                Child = decorator = new Decorator(),
-                            })
-                        }
-                    }
-                };
-
-                SetHit(renderer, canvas);
-                SendMouseMove(inputManager, root);
-
-                AddEnterLeaveHandlers(HandleEvent, root, canvas, border, decorator);
-                SetHit(renderer, decorator);
-                SendMouseMove(inputManager, root);
-
-                Assert.Equal(
-                    new[]
-                    {
-                        ((object)canvas, "PointerLeave"),
-                        ((object)decorator, "PointerEnter"),
-                        ((object)border, "PointerEnter"),
-                    },
-                    result);
-            }
-        }
-
-
-        [Fact]
-        public void GetPosition_Should_Respect_Control_RenderTransform()
-        {
-            var renderer = new Mock<IRenderer>();
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Child = new Border
-                    {
-                        Background = Brushes.Black,
-                        RenderTransform = new TranslateTransform(10, 0),
-                    }
-                };
-
-                SendMouseMove(inputManager, root, new Point(11, 11));
-
-#pragma warning disable CS0618 // Type or member is obsolete
-                var result = root.MouseDevice.GetPosition(root.Child);
-#pragma warning restore CS0618 // Type or member is obsolete
-                Assert.Equal(new Point(1, 11), result);
-            }
-        }
-
-        private void AddEnterLeaveHandlers(
-            EventHandler<PointerEventArgs> handler,
-            params IControl[] controls)
-        {
-            foreach (var c in controls)
-            {
-                c.PointerEnter += handler;
-                c.PointerLeave += handler;
-            }
-        }
-
-        private void SendMouseMove(IInputManager inputManager, TestRoot root, Point p = new Point())
-        {
-            inputManager.ProcessInput(new RawPointerEventArgs(
-                root.MouseDevice,
-                0,
-                root,
-                RawPointerEventType.Move,
-                p,
-                RawInputModifiers.None));
-        }
-
-        private void SetHit(Mock<IRenderer> renderer, IControl hit)
-        {
-            renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
-                .Returns(new[] { hit });
-
-            renderer.Setup(x => x.HitTestFirst(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
-                .Returns(hit);
-        }
-
-        private IDisposable TestApplication(IRenderer renderer)
-        {
-            return UnitTestApplication.Start(
-                new TestServices(inputManager: new InputManager()));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/PointerTests.cs b/tests/Avalonia.Input.UnitTests/PointerTests.cs
deleted file mode 100644
index e639726dbd..0000000000
--- a/tests/Avalonia.Input.UnitTests/PointerTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class PointerTests
-    {
-        [Fact]
-        public void On_Capture_Transfer_PointerCaptureLost_Should_Propagate_Up_To_The_Common_Parent()
-        {
-            Border initialParent, initialCapture, newParent, newCapture;
-            var el = new StackPanel
-            {
-                Children =
-                {
-                    (initialParent = new Border { Child = initialCapture = new Border() }),
-                    (newParent = new Border { Child = newCapture = new Border() })
-                }
-            };
-            var receivers = new List<object>();
-            var root = new TestRoot(el);
-            foreach (InputElement d in root.GetSelfAndVisualDescendants())
-                d.PointerCaptureLost += (s, e) => receivers.Add(s);
-            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
-            
-            pointer.Capture(initialCapture);
-            pointer.Capture(newCapture);
-            Assert.True(receivers.SequenceEqual(new[] { initialCapture, initialParent }));
-            
-            receivers.Clear();
-            pointer.Capture(null);
-            Assert.True(receivers.SequenceEqual(new object[] { newCapture, newParent, el, root }));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3974559efc..0000000000
--- a/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Input.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Input.UnitTests/TouchDeviceTests.cs b/tests/Avalonia.Input.UnitTests/TouchDeviceTests.cs
deleted file mode 100644
index 80c5a45c1a..0000000000
--- a/tests/Avalonia.Input.UnitTests/TouchDeviceTests.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using Avalonia.Input.Raw;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class TouchDeviceTests
-    {
-        [Fact]
-        public void Tapped_Event_Is_Fired_With_Touch()
-        {
-            using var app = UnitTestApp(new TimeSpan(200));
-            var root = new TestRoot();
-            var touchDevice = new TouchDevice();
-
-            var isTapped = false;
-            var executedTimes = 0;
-            root.Tapped += (a, e) =>
-            {
-                isTapped = true;
-                executedTimes++;
-            };
-            TapOnce(InputManager.Instance, touchDevice, root);
-            Assert.True(isTapped);
-            Assert.Equal(1, executedTimes);
-
-        }
-
-        [Fact]
-        public void DoubleTapped_Event_Is_Fired_With_Touch()
-        {
-            using var app = UnitTestApp(new TimeSpan(200));
-            var root = new TestRoot();
-            var touchDevice = new TouchDevice();
-
-            var isDoubleTapped = false;
-            var doubleTappedExecutedTimes = 0;
-            var tappedExecutedTimes = 0;
-            root.DoubleTapped += (a, e) =>
-            {
-                isDoubleTapped = true;
-                doubleTappedExecutedTimes++;
-            };
-            root.Tapped += (a, e) =>
-            {
-                tappedExecutedTimes++;
-            };
-            TapOnce(InputManager.Instance, touchDevice, root);
-            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 1);
-            Assert.Equal(1, tappedExecutedTimes);
-            Assert.True(isDoubleTapped);
-            Assert.Equal(1, doubleTappedExecutedTimes);
-        }
-
-        [Theory]
-        [InlineData(1)]
-        [InlineData(2)]
-        [InlineData(3)]
-        [InlineData(4)]
-        [InlineData(5)]
-        public void PointerPressed_Counts_Clicks_Correctly(int clickCount)
-        {
-            using var app = UnitTestApp(new TimeSpan(200));
-            var root = new TestRoot();
-            var touchDevice = new TouchDevice();
-
-            var pointerPressedExecutedTimes = 0;
-            var pointerPressedClicks = 0;
-            root.PointerPressed += (a, e) =>
-            {
-                pointerPressedClicks = e.ClickCount;
-                pointerPressedExecutedTimes++;
-            };
-            for (int i = 0; i < clickCount; i++)
-            {
-                TapOnce(InputManager.Instance, touchDevice, root, touchPointId: i);
-            }
-
-            Assert.Equal(clickCount, pointerPressedExecutedTimes);
-            Assert.Equal(pointerPressedClicks, clickCount);
-        }
-
-        [Fact]
-        public void DoubleTapped_Not_Fired_When_Click_Too_Late()
-        {
-            using var app = UnitTestApp(new TimeSpan(0, 0, 0, 0, 20));
-            var root = new TestRoot();
-            var touchDevice = new TouchDevice();
-
-            var isDoubleTapped = false;
-            var doubleTappedExecutedTimes = 0;
-            var tappedExecutedTimes = 0;
-            root.DoubleTapped += (a, e) =>
-            {
-                isDoubleTapped = true;
-                doubleTappedExecutedTimes++;
-            };
-            root.Tapped += (a, e) =>
-            {
-                tappedExecutedTimes++;
-            };
-            TapOnce(InputManager.Instance, touchDevice, root);
-            TapOnce(InputManager.Instance, touchDevice, root, 21, 1);
-            Assert.Equal(2, tappedExecutedTimes);
-            Assert.False(isDoubleTapped);
-            Assert.Equal(0, doubleTappedExecutedTimes);
-
-        }
-
-        [Fact]
-        public void DoubleTapped_Not_Fired_When_Second_Click_Is_From_Different_Touch_Contact()
-        {
-            using var app = UnitTestApp(new TimeSpan(200));
-            var root = new TestRoot();
-            var touchDevice = new TouchDevice();
-
-            var isDoubleTapped = false;
-            var doubleTappedExecutedTimes = 0;
-            var tappedExecutedTimes = 0;
-            root.DoubleTapped += (a, e) =>
-            {
-                isDoubleTapped = true;
-                doubleTappedExecutedTimes++;
-            };
-            root.Tapped += (a, e) =>
-            {
-                tappedExecutedTimes++;
-            };
-            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchBegin, 0, 1);
-            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchEnd, 0, 1);
-            Assert.Equal(2, tappedExecutedTimes);
-            Assert.False(isDoubleTapped);
-            Assert.Equal(0, doubleTappedExecutedTimes);
-        }
-
-        [Fact]
-        public void Click_Counting_Should_Work_Correctly_With_Few_Touch_Contacts()
-        {
-            using var app = UnitTestApp(new TimeSpan(200));
-
-            var root = new TestRoot();
-            var touchDevice = new TouchDevice();
-
-            var pointerPressedExecutedTimes = 0;
-            var tappedExecutedTimes = 0;
-            var isDoubleTapped = false;
-            var doubleTappedExecutedTimes = 0;
-            root.PointerPressed += (a, e) =>
-            {
-                pointerPressedExecutedTimes++;
-                switch (pointerPressedExecutedTimes)
-                {
-                    case <= 2:
-                        Assert.True(e.ClickCount == 1);
-                        break;
-                    case 3:
-                        Assert.True(e.ClickCount == 2);
-                        break;
-                    case 4:
-                        Assert.True(e.ClickCount == 3);
-                        break;
-                    case 5:
-                        Assert.True(e.ClickCount == 4);
-                        break;
-                    case 6:
-                        Assert.True(e.ClickCount == 5);
-                        break;
-                    case 7:
-                        Assert.True(e.ClickCount == 1);
-                        break;
-                    case 8:
-                        Assert.True(e.ClickCount == 1);
-                        break;
-                    case 9:
-                        Assert.True(e.ClickCount == 2);
-                        break;
-                    default:
-                        break;
-                }
-            };
-            root.DoubleTapped += (a, e) =>
-            {
-                isDoubleTapped = true;
-                doubleTappedExecutedTimes++;
-            };
-            root.Tapped += (a, e) =>
-            {
-                tappedExecutedTimes++;
-            };
-            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchBegin, 0, 1);
-            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchEnd, 0, 1);
-            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 2);
-            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 3);
-            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 4);
-            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchBegin, 5, 6, 7);
-            SendXTouchContactsWithIds(InputManager.Instance, touchDevice, root, RawPointerEventType.TouchEnd, 5, 6, 7);
-            TapOnce(InputManager.Instance, touchDevice, root, touchPointId: 8);
-            Assert.Equal(6, tappedExecutedTimes);
-            Assert.Equal(9, pointerPressedExecutedTimes);
-            Assert.True(isDoubleTapped);
-            Assert.Equal(3, doubleTappedExecutedTimes);
-        }
-
-        private IDisposable UnitTestApp(TimeSpan doubleClickTime = new TimeSpan())
-        {
-            var unitTestApp = UnitTestApplication.Start(
-                new TestServices(inputManager: new InputManager()));
-            var iSettingsMock = new Mock<IPlatformSettings>();
-            iSettingsMock.Setup(x => x.TouchDoubleClickTime).Returns(doubleClickTime);
-            AvaloniaLocator.CurrentMutable.BindToSelf(this)
-               .Bind<IPlatformSettings>().ToConstant(iSettingsMock.Object);
-            return unitTestApp;
-        }
-        
-        private static void SendXTouchContactsWithIds(IInputManager inputManager, TouchDevice device, IInputRoot root, RawPointerEventType type, params long[] touchPointIds)
-        {
-            for (int i = 0; i < touchPointIds.Length; i++)
-            {
-                inputManager.ProcessInput(new RawTouchEventArgs(device, 0,
-                                                              root,
-                                                              type,
-                                                              new Point(0, 0),
-                                                              RawInputModifiers.None,
-                                                              touchPointIds[i]));
-            }
-        }
-
-
-        private static void TapOnce(IInputManager inputManager, TouchDevice device, IInputRoot root, ulong timestamp = 0, long touchPointId = 0)
-        {
-            inputManager.ProcessInput(new RawTouchEventArgs(device, timestamp,
-                                               root,
-                                               RawPointerEventType.TouchBegin,
-                                               new Point(0, 0),
-                                               RawInputModifiers.None,
-                                               touchPointId));
-            inputManager.ProcessInput(new RawTouchEventArgs(device, timestamp,
-                                                root,
-                                                RawPointerEventType.TouchEnd,
-                                                new Point(0, 0),
-                                                RawInputModifiers.None,
-                                                touchPointId));
-        }
-    }
-}
diff --git a/tests/Avalonia.IntegrationTests.Appium/AutomationTests.cs b/tests/Avalonia.IntegrationTests.Appium/AutomationTests.cs
new file mode 100644
index 0000000000..bad015506f
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/AutomationTests.cs
@@ -0,0 +1,39 @@
+using OpenQA.Selenium.Appium;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class AutomationTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public AutomationTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Automation");
+            tab.Click();
+        }
+
+        [Fact]
+        public void AutomationId()
+        {
+            // AutomationID can be specified by the Name or AutomationProperties.AutomationId
+            // properties, with the latter taking precedence.
+            var byName = _session.FindElementByAccessibilityId("TextBlockWithName");
+            var byAutomationId = _session.FindElementByAccessibilityId("TextBlockWithNameAndAutomationId");
+        }
+
+        [Fact]
+        public void LabeledBy()
+        {
+            var label = _session.FindElementByAccessibilityId("TextBlockAsLabel");
+            var labeledTextBox = _session.FindElementByAccessibilityId("LabeledByTextBox");
+
+            Assert.Equal("Label for TextBox", label.Text);
+            Assert.Equal("Label for TextBox", labeledTextBox.GetName());
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj
new file mode 100644
index 0000000000..03d9332051
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Appium.WebDriver" Version="4.3.1" />
+    <PackageReference Include="Xunit.Extensions.Ordering" Version="1.4.5" />
+  </ItemGroup>
+
+  <Import Project="..\..\build\XUnit.props" />
+</Project>
diff --git a/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs b/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs
new file mode 100644
index 0000000000..6c630ae782
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs
@@ -0,0 +1,55 @@
+using System.Runtime.InteropServices;
+using OpenQA.Selenium.Appium;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class ButtonTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public ButtonTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Button");
+            tab.Click();
+        }
+
+        [Fact]
+        public void DisabledButton()
+        {
+            var button = _session.FindElementByAccessibilityId("DisabledButton");
+
+            Assert.Equal("Disabled Button", button.Text);
+            Assert.False(button.Enabled);
+        }
+
+        [Fact]
+        public void BasicButton()
+        {
+            var button = _session.FindElementByAccessibilityId("BasicButton");
+
+            Assert.Equal("Basic Button", button.Text);
+            Assert.True(button.Enabled);
+        }
+
+        [Fact]
+        public void ButtonWithTextBlock()
+        {
+            var button = _session.FindElementByAccessibilityId("ButtonWithTextBlock");
+
+            Assert.Equal("Button with TextBlock", button.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void ButtonWithAcceleratorKey()
+        {
+            var button = _session.FindElementByAccessibilityId("ButtonWithAcceleratorKey");
+
+            Assert.Equal("Ctrl+B", button.GetAttribute("AcceleratorKey"));
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/CheckBoxTests.cs b/tests/Avalonia.IntegrationTests.Appium/CheckBoxTests.cs
new file mode 100644
index 0000000000..02e7ac60c4
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/CheckBoxTests.cs
@@ -0,0 +1,62 @@
+using OpenQA.Selenium.Appium;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class CheckBoxTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public CheckBoxTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("CheckBox");
+            tab.Click();
+        }
+
+        [Fact]
+        public void UncheckedCheckBox()
+        {
+            var checkBox = _session.FindElementByAccessibilityId("UncheckedCheckBox");
+
+            Assert.Equal("Unchecked", checkBox.GetName());
+            Assert.Equal(false, checkBox.GetIsChecked());
+
+            checkBox.Click();
+            Assert.Equal(true, checkBox.GetIsChecked());
+        }
+
+        [Fact]
+        public void CheckedCheckBox()
+        {
+            var checkBox = _session.FindElementByAccessibilityId("CheckedCheckBox");
+
+            Assert.Equal("Checked", checkBox.GetName());
+            Assert.Equal(true, checkBox.GetIsChecked());
+
+            checkBox.Click();
+            Assert.Equal(false, checkBox.GetIsChecked());
+        }
+
+        [Fact]
+        public void ThreeStateCheckBox()
+        {
+            var checkBox = _session.FindElementByAccessibilityId("ThreeStateCheckBox");
+
+            Assert.Equal("ThreeState", checkBox.GetName());
+            Assert.Null(checkBox.GetIsChecked());
+
+            checkBox.Click();
+            Assert.Equal(false, checkBox.GetIsChecked());
+
+            checkBox.Click();
+            Assert.Equal(true, checkBox.GetIsChecked());
+
+            checkBox.Click();
+            Assert.Null(checkBox.GetIsChecked());
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs b/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs
new file mode 100644
index 0000000000..abdb4e2dd8
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs
@@ -0,0 +1,100 @@
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class ComboBoxTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public ComboBoxTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("ComboBox");
+            tab.Click();
+        }
+
+        [Fact]
+        public void Can_Change_Selection_Using_Mouse()
+        {
+            var comboBox = _session.FindElementByAccessibilityId("BasicComboBox");
+
+            _session.FindElementByAccessibilityId("ComboBoxSelectFirst").Click();
+            Assert.Equal("Item 0", comboBox.GetComboBoxValue());
+
+            comboBox.Click();
+            _session.FindElementByName("Item 1").SendClick();
+
+            Assert.Equal("Item 1", comboBox.GetComboBoxValue());
+        }
+
+        [Fact]
+        public void Can_Change_Selection_From_Unselected_Using_Mouse()
+        {
+            var comboBox = _session.FindElementByAccessibilityId("BasicComboBox");
+
+            _session.FindElementByAccessibilityId("ComboBoxSelectionClear").Click();
+            Assert.Equal(string.Empty, comboBox.GetComboBoxValue());
+
+            comboBox.Click();
+            _session.FindElementByName("Item 0").SendClick();
+
+            Assert.Equal("Item 0", comboBox.GetComboBoxValue());
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Can_Change_Selection_With_Keyboard()
+        {
+            var comboBox = _session.FindElementByAccessibilityId("BasicComboBox");
+
+            _session.FindElementByAccessibilityId("ComboBoxSelectFirst").Click();
+            Assert.Equal("Item 0", comboBox.GetComboBoxValue());
+
+            comboBox.SendKeys(Keys.LeftAlt + Keys.ArrowDown);
+            comboBox.SendKeys(Keys.ArrowDown);
+
+            var item = _session.FindElementByName("Item 1");
+            item.SendKeys(Keys.Enter);
+
+            Assert.Equal("Item 1", comboBox.GetComboBoxValue());
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Can_Change_Selection_With_Keyboard_From_Unselected()
+        {
+            var comboBox = _session.FindElementByAccessibilityId("BasicComboBox");
+
+            _session.FindElementByAccessibilityId("ComboBoxSelectionClear").Click();
+            Assert.Equal(string.Empty, comboBox.GetComboBoxValue());
+
+            comboBox.SendKeys(Keys.LeftAlt + Keys.ArrowDown);
+            comboBox.SendKeys(Keys.ArrowDown);
+
+            var item = _session.FindElementByName("Item 0");
+            item.SendKeys(Keys.Enter);
+
+            Assert.Equal("Item 0", comboBox.GetComboBoxValue());
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Can_Cancel_Keyboard_Selection_With_Escape()
+        {
+            var comboBox = _session.FindElementByAccessibilityId("BasicComboBox");
+
+            _session.FindElementByAccessibilityId("ComboBoxSelectionClear").Click();
+            Assert.Equal(string.Empty, comboBox.GetComboBoxValue());
+
+            comboBox.SendKeys(Keys.LeftAlt + Keys.ArrowDown);
+            comboBox.SendKeys(Keys.ArrowDown);
+
+            var item = _session.FindElementByName("Item 0");
+            item.SendKeys(Keys.Escape);
+
+            Assert.Equal(string.Empty, comboBox.GetComboBoxValue());
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/DefaultCollection.cs b/tests/Avalonia.IntegrationTests.Appium/DefaultCollection.cs
new file mode 100644
index 0000000000..bb2dd1fbec
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/DefaultCollection.cs
@@ -0,0 +1,9 @@
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [CollectionDefinition("Default")]
+    public class DefaultCollection : ICollectionFixture<TestAppFixture>
+    {
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
new file mode 100644
index 0000000000..4b361c6716
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Runtime.InteropServices;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    internal static class ElementExtensions
+    {
+        public static IReadOnlyList<AppiumWebElement> GetChildren(this AppiumWebElement element) =>
+            element.FindElementsByXPath("*/*");
+
+        public static (AppiumWebElement close, AppiumWebElement minimize, AppiumWebElement maximize) GetChromeButtons(this AppiumWebElement window)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                var closeButton = window.FindElementByXPath("//XCUIElementTypeButton[1]");
+                var fullscreenButton = window.FindElementByXPath("//XCUIElementTypeButton[2]");
+                var minimizeButton = window.FindElementByXPath("//XCUIElementTypeButton[3]");
+                return (closeButton, minimizeButton, fullscreenButton);
+            }
+
+            throw new NotSupportedException("GetChromeButtons not supported on this platform.");
+        }
+
+        public static string GetComboBoxValue(this AppiumWebElement element)
+        {
+            return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+                element.Text :
+                element.GetAttribute("value");
+        }
+        
+        public static string GetName(this AppiumWebElement element) => GetAttribute(element, "Name", "title");
+
+        public static bool? GetIsChecked(this AppiumWebElement element) =>
+            GetAttribute(element, "Toggle.ToggleState", "value") switch
+            {
+                "0" => false,
+                "1" => true,
+                "2" => null,
+                _ => throw new ArgumentOutOfRangeException($"Unexpected IsChecked value.")
+            };
+
+        public static bool GetIsFocused(this AppiumWebElement element)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                var active = element.WrappedDriver.SwitchTo().ActiveElement() as AppiumWebElement;
+                return element.Id == active?.Id;
+            }
+            else
+            {
+                // https://stackoverflow.com/questions/71807788/check-if-element-is-focused-in-appium
+                throw new NotSupportedException("Couldn't work out how to check if an element is focused on mac.");
+            }
+        }
+
+        /// <summary>
+        /// Clicks a button which is expected to open a new window.
+        /// </summary>
+        /// <param name="element">The button to click.</param>
+        /// <returns>
+        /// An object which when disposed will cause the newly opened window to close.
+        /// </returns>
+        public static IDisposable OpenWindowWithClick(this AppiumWebElement element)
+        {
+            var session = element.WrappedDriver;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                var oldHandle = session.CurrentWindowHandle;
+                var oldHandles = session.WindowHandles.ToList();
+                var oldChildWindows = session.FindElements(By.XPath("//Window"));
+
+                element.Click();
+
+                var newHandle = session.WindowHandles.Except(oldHandles).SingleOrDefault();
+
+                if (newHandle is not null)
+                {
+                    // A new top-level window was opened. We need to switch to it.
+                    session.SwitchTo().Window(newHandle);
+
+                    return Disposable.Create(() =>
+                    {
+                        session.Close();
+                        session.SwitchTo().Window(oldHandle);
+                    });
+                }
+                else
+                {
+                    // If a new window handle hasn't been added to the session then it's likely
+                    // that a child window was opened. These don't appear in session.WindowHandles
+                    // so we have to use an XPath query to get hold of it.
+                    var newChildWindows = session.FindElements(By.XPath("//Window"));
+                    var childWindow = Assert.Single(newChildWindows.Except(oldChildWindows));
+
+                    return Disposable.Create(() =>
+                    {
+                        childWindow.SendKeys(Keys.Alt + Keys.F4 + Keys.Alt);
+                    });
+                }
+            }
+            else
+            {
+                var oldWindows = session.FindElements(By.XPath("/XCUIElementTypeApplication/XCUIElementTypeWindow"));
+                var oldWindowTitles = oldWindows.ToDictionary(x => x.Text);
+                
+                element.Click();
+
+                var newWindows = session.FindElements(By.XPath("/XCUIElementTypeApplication/XCUIElementTypeWindow"));
+                var newWindowTitles = newWindows.ToDictionary(x => x.Text);
+                var newWindowTitle = Assert.Single(newWindowTitles.Keys.Except(oldWindowTitles.Keys));
+                var newWindow = (AppiumWebElement)newWindowTitles[newWindowTitle]; 
+                
+                return Disposable.Create(() =>
+                {
+                    // TODO: We should be able to use Cmd+W here but Avalonia apps don't seem to have this shortcut
+                    // set up by default.
+                    var (close, _, _) = newWindow.GetChromeButtons();
+                    close!.Click();
+                });
+            }
+        }
+
+        public static void SendClick(this AppiumWebElement element)
+        {
+            // The Click() method seems to correspond to accessibilityPerformPress on macOS but certain controls
+            // such as list items don't support this action, so instead simulate a physical click as VoiceOver
+            // does. On Windows, Click() seems to fail with the WindowState checkbox for some reason.
+            new Actions(element.WrappedDriver).MoveToElement(element).Click().Perform();
+        }
+
+        public static void MovePointerOver(this AppiumWebElement element)
+        {
+            new Actions(element.WrappedDriver).MoveToElement(element).Perform();
+        }
+
+        public static string GetAttribute(AppiumWebElement element, string windows, string macOS)
+        {
+            return element.GetAttribute(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? windows : macOS);
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
new file mode 100644
index 0000000000..9745f993cb
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
@@ -0,0 +1,179 @@
+using System;
+using System.Threading;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class GestureTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public GestureTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Gestures");
+            tab.Click();
+            var clear = _session.FindElementByAccessibilityId("ResetGestures");
+            clear.Click();
+        }
+
+        [Fact]
+        public void Tapped_Is_Raised()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).Click(border).Perform();
+
+            Assert.Equal("Tapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void Tapped_Is_Raised_Slow()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ClickAndHold(border).Perform();
+
+            Thread.Sleep(2000);
+
+            new Actions(_session).Release(border).Perform();
+
+            Assert.Equal("Tapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void Tapped_Is_Not_Raised_For_Drag()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session)
+                .ClickAndHold(border)
+                .MoveByOffset(50, 50)
+                .Release()
+                .Perform();
+
+            Assert.Equal(string.Empty, lastGesture.Text);
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).DoubleClick(border).Perform();
+
+            Assert.Equal("DoubleTapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised_2()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Thread.Sleep(50);
+
+            // DoubleTapped is raised on second pointer press, not release.
+            new Actions(_session).ClickAndHold(border).Perform();
+
+            try
+            {
+                Assert.Equal("DoubleTapped", lastGesture.Text);
+            }
+            finally
+            {
+                
+                new Actions(_session).MoveToElement(lastGesture).Release().Perform();
+            }
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised_Not_Raised_If_Too_Slow()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Thread.Sleep(2000);
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Assert.Equal("Tapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised_After_Control_Changes()
+        {
+            // #8733
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+            
+            new Actions(_session)
+                .MoveToElement(border)
+                .DoubleClick()
+                .Perform();
+            
+            Thread.Sleep(100);
+            
+            new Actions(_session).MoveToElement(lastGesture, 200, 200).DoubleClick().Perform();
+
+            Assert.Equal("DoubleTapped2", lastGesture.Text);
+        }
+
+        [Fact]
+        public void RightTapped_Is_Raised()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ContextClick(border).Perform();
+
+            Assert.Equal("RightTapped", lastGesture.Text);
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void RightTapped_Is_Raised_2()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+            var device = new PointerInputDevice(PointerKind.Mouse);
+            var b = new ActionBuilder();
+
+            b.AddAction(device.CreatePointerMove(border, 50, 50, TimeSpan.FromMilliseconds(50)));
+            b.AddAction(device.CreatePointerDown(MouseButton.Right));
+            b.AddAction(device.CreatePointerMove(border, 52, 52, TimeSpan.FromMilliseconds(50)));
+            b.AddAction(device.CreatePointerUp(MouseButton.Right));
+            _session.PerformActions(b.ToActionSequenceList());
+
+            Assert.Equal("RightTapped", lastGesture.Text);
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void RightTapped_Is_Not_Raised_For_Drag()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+            var device = new PointerInputDevice(PointerKind.Mouse);
+            var b = new ActionBuilder();
+
+            b.AddAction(device.CreatePointerMove(border, 50, 50, TimeSpan.FromMilliseconds(100)));
+            b.AddAction(device.CreatePointerDown(MouseButton.Right));
+            b.AddAction(device.CreatePointerMove(CoordinateOrigin.Pointer, 50, 50, TimeSpan.FromMilliseconds(100)));
+            b.AddAction(device.CreatePointerUp(MouseButton.Right));
+
+            Assert.Equal(string.Empty, lastGesture.Text);
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/ListBoxTests.cs b/tests/Avalonia.IntegrationTests.Appium/ListBoxTests.cs
new file mode 100644
index 0000000000..e2943b3349
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/ListBoxTests.cs
@@ -0,0 +1,103 @@
+using System.Threading;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class ListBoxTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public ListBoxTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("ListBox");
+            tab.Click();
+        }
+
+        [Fact]
+        public void Can_Select_Item_By_Clicking()
+        {
+            var listBox = GetTarget();
+            var item2 = listBox.FindElementByName("Item 2");
+            var item4 = listBox.FindElementByName("Item 4");
+
+            Assert.False(item2.Selected);
+            Assert.False(item4.Selected);
+
+            item2.SendClick();
+            Assert.True(item2.Selected);
+            Assert.False(item4.Selected);
+
+            item4.SendClick();
+            Assert.False(item2.Selected);
+            Assert.True(item4.Selected);
+        }
+
+        [Fact(Skip = "WinAppDriver seems unable to consistently send a Ctrl key and appium-mac2-driver just hangs")]
+        public void Can_Select_Items_By_Ctrl_Clicking()
+        {
+            var listBox = GetTarget();
+            var item2 = listBox.FindElementByName("Item 2");
+            var item4 = listBox.FindElementByName("Item 4");
+
+            Assert.False(item2.Selected);
+            Assert.False(item4.Selected);
+            
+            new Actions(_session)
+                .Click(item2)
+                .KeyDown(Keys.Control)
+                .Click(item4)
+                .KeyUp(Keys.Control)
+                .Perform();
+
+            Assert.True(item2.Selected);
+            Assert.True(item4.Selected);
+        }
+
+        // appium-mac2-driver just hangs
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Can_Select_Range_By_Shift_Clicking()
+        {
+            var listBox = GetTarget();
+            var item2 = listBox.FindElementByName("Item 2");
+            var item3 = listBox.FindElementByName("Item 3");
+            var item4 = listBox.FindElementByName("Item 4");
+
+            Assert.False(item2.Selected);
+            Assert.False(item3.Selected);
+            Assert.False(item4.Selected);
+
+            new Actions(_session)
+                .Click(item2)
+                .KeyDown(Keys.Shift)
+                .Click(item4)
+                .KeyUp(Keys.Shift)
+                .Perform();
+
+            Assert.True(item2.Selected);
+            Assert.True(item3.Selected);
+            Assert.True(item4.Selected);
+        }
+
+        [Fact]
+        public void Is_Virtualized()
+        {
+            var listBox = GetTarget();
+            var children = listBox.GetChildren();
+
+            Assert.True(children.Count < 100);
+        }
+
+        private AppiumWebElement GetTarget()
+        {
+            _session.FindElementByAccessibilityId("ListBoxSelectionClear").Click();
+            return _session.FindElementByAccessibilityId("BasicListBox");
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
new file mode 100644
index 0000000000..3f1fe7de12
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
@@ -0,0 +1,185 @@
+using System.Threading;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class MenuTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public MenuTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Menu");
+            tab.Click();
+
+            var reset = _session.FindElementByAccessibilityId("MenuClickedMenuItemReset");
+            reset.Click();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("None", clickedMenuItem.Text);
+        }
+
+        [Fact]
+        public void Click_Child()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            
+            rootMenuItem.SendClick();
+
+            var childMenuItem = _session.FindElementByAccessibilityId("Child1MenuItem");
+            childMenuItem.SendClick();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [Fact]
+        public void Click_Grandchild()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            
+            rootMenuItem.SendClick();
+
+            var childMenuItem = _session.FindElementByAccessibilityId("Child2MenuItem");
+            childMenuItem.SendClick();
+
+            var grandchildMenuItem = _session.FindElementByAccessibilityId("GrandchildMenuItem");
+            grandchildMenuItem.SendClick();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Select_Child_With_Alt_Arrow_Keys()
+        {
+            MovePointerOutOfTheWay();
+
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys(Keys.Down + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Select_Grandchild_With_Alt_Arrow_Keys()
+        {
+            MovePointerOutOfTheWay();
+
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Select_Child_With_Alt_Access_Keys()
+        {
+            MovePointerOutOfTheWay();
+
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys("rc")
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Select_Grandchild_With_Alt_Access_Keys()
+        {
+            MovePointerOutOfTheWay();
+
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys("rhg")
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Select_Child_With_Click_Arrow_Keys()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            rootMenuItem.SendClick();
+
+            MovePointerOutOfTheWay();
+
+            new Actions(_session)
+                .SendKeys(Keys.Down + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Select_Grandchild_With_Click_Arrow_Keys()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            rootMenuItem.SendClick();
+
+            MovePointerOutOfTheWay();
+
+            new Actions(_session)
+                .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void Child_AcceleratorKey()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+
+            rootMenuItem.SendClick();
+
+            var childMenuItem = _session.FindElementByAccessibilityId("Child1MenuItem");
+
+            Assert.Equal("Ctrl+O", childMenuItem.GetAttribute("AcceleratorKey"));
+        }
+
+        [PlatformFact(TestPlatforms.Windows)]
+        public void PointerOver_Does_Not_Steal_Focus()
+        {
+            // Issue #7906
+            var textBox = _session.FindElementByAccessibilityId("MenuFocusTest");
+            textBox.Click();
+
+            Assert.True(textBox.GetIsFocused());
+
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            rootMenuItem.MovePointerOver();
+
+            Assert.True(textBox.GetIsFocused());
+        }
+
+        private void MovePointerOutOfTheWay()
+        {
+            // Move the pointer to the menu tab item so that it's not over the menu in preparation
+            // for key press tests. This prevents the mouse accidentially selecting the wrong item
+            // by hovering.
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Menu");
+            tab.MovePointerOver();
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/NativeMenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/NativeMenuTests.cs
new file mode 100644
index 0000000000..7858c4cc81
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/NativeMenuTests.cs
@@ -0,0 +1,37 @@
+using OpenQA.Selenium.Appium;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class NativeMenuTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public NativeMenuTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Automation");
+            tab.Click();
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void View_Menu_Select_Button_Tab()
+        {
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var buttonTab = tabs.FindElementByName("Button");
+            var menuBar = _session.FindElementByXPath("/XCUIElementTypeApplication/XCUIElementTypeMenuBar");
+            var viewMenu = menuBar.FindElementByName("View");
+            
+            Assert.False(buttonTab.Selected);
+            
+            viewMenu.Click();
+            var buttonMenu = viewMenu.FindElementByName("Button");
+            buttonMenu.Click();
+
+            Assert.True(buttonTab.Selected);
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs b/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs
new file mode 100644
index 0000000000..3acf9fd5e2
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs
@@ -0,0 +1,46 @@
+#nullable enable
+using System;
+using System.Runtime.InteropServices;
+using Xunit;
+
+namespace Avalonia
+{
+    [Flags]
+    internal enum TestPlatforms
+    {
+        Windows = 0x01,
+        MacOS = 0x02,
+        Linux = 0x04,
+        All = Windows | MacOS | Linux,
+    }
+
+    internal class PlatformFactAttribute : FactAttribute
+    {
+        private readonly string? _reason;
+
+        public PlatformFactAttribute(TestPlatforms platforms, string? reason = null)
+        {
+            _reason = reason;
+            Platforms = platforms;
+        }
+
+        public TestPlatforms Platforms { get; }
+
+        public override string? Skip
+        {
+            get => IsSupported() ? null : $"Ignored on {RuntimeInformation.OSDescription}" + (_reason is not null ? $" reason: \"{_reason}\"" : "");
+            set => throw new NotSupportedException();
+        }
+
+        private bool IsSupported()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                return Platforms.HasAnyFlag(TestPlatforms.Windows);
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                return Platforms.HasAnyFlag(TestPlatforms.MacOS);
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                return Platforms.HasAnyFlag(TestPlatforms.Linux);
+            return false;
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs b/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs
new file mode 100644
index 0000000000..7ac30ee11b
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    internal class PlatformTheoryAttribute : TheoryAttribute
+    {
+        public PlatformTheoryAttribute(TestPlatforms platforms = TestPlatforms.All) => Platforms = platforms;
+
+        public TestPlatforms Platforms { get; }
+
+        public override string? Skip
+        {
+            get => IsSupported() ? null : $"Ignored on {RuntimeInformation.OSDescription}";
+            set => throw new NotSupportedException();
+        }
+
+        private bool IsSupported()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                return Platforms.HasAnyFlag(TestPlatforms.Windows);
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                return Platforms.HasAnyFlag(TestPlatforms.MacOS);
+            return false;
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/Properties/AssemblyInfo.cs b/tests/Avalonia.IntegrationTests.Appium/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f9248a3152
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using Xunit;
+
+// Don't run tests in parallel.
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
new file mode 100644
index 0000000000..d71f9e9bcc
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Runtime.InteropServices;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Appium.Enums;
+using OpenQA.Selenium.Appium.Mac;
+using OpenQA.Selenium.Appium.Windows;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    public class TestAppFixture : IDisposable
+    {
+        private const string TestAppPath = @"..\..\..\..\..\samples\IntegrationTestApp\bin\Debug\net7.0\IntegrationTestApp.exe";
+        private const string TestAppBundleId = "net.avaloniaui.avalonia.integrationtestapp";
+
+        public TestAppFixture()
+        {
+            var opts = new AppiumOptions();
+            var path = Path.GetFullPath(TestAppPath);
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                opts.AddAdditionalCapability(MobileCapabilityType.App, path);
+                opts.AddAdditionalCapability(MobileCapabilityType.PlatformName, MobilePlatform.Windows);
+                opts.AddAdditionalCapability(MobileCapabilityType.DeviceName, "WindowsPC");
+
+                Session = new WindowsDriver<AppiumWebElement>(
+                    new Uri("http://127.0.0.1:4723"),
+                    opts);
+
+                // https://github.com/microsoft/WinAppDriver/issues/1025
+                SetForegroundWindow(new IntPtr(int.Parse(
+                    Session.WindowHandles[0].Substring(2),
+                    NumberStyles.AllowHexSpecifier)));
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                opts.AddAdditionalCapability("appium:bundleId", TestAppBundleId);
+                opts.AddAdditionalCapability(MobileCapabilityType.PlatformName, MobilePlatform.MacOS);
+                opts.AddAdditionalCapability(MobileCapabilityType.AutomationName, "mac2");
+                opts.AddAdditionalCapability("appium:showServerLogs", true);
+
+                Session = new MacDriver<AppiumWebElement>(
+                    new Uri("http://127.0.0.1:4723/wd/hub"),
+                    opts);
+            }
+            else
+            {
+                throw new NotSupportedException("Unsupported platform.");
+            }
+        }
+
+        public AppiumDriver<AppiumWebElement> Session { get; }
+
+        public void Dispose()
+        {
+            try
+            {
+                Session.Close();
+            }
+            catch
+            {
+                // Closing the session currently seems to crash the mac2 driver.
+            }
+        }
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool SetForegroundWindow(IntPtr hWnd);
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
new file mode 100644
index 0000000000..9cce169744
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -0,0 +1,257 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia.Controls;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class WindowTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public WindowTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Window");
+            tab.Click();
+        }
+
+        [Theory]
+        [MemberData(nameof(StartupLocationData))]
+        public void StartupLocation(Size? size, ShowWindowMode mode, WindowStartupLocation location)
+        {
+            using var window = OpenWindow(size, mode, location);
+            var info = GetWindowInfo();
+
+            if (size.HasValue)
+                Assert.Equal(size.Value, info.ClientSize);
+
+            Assert.True(info.FrameSize.Width >= info.ClientSize.Width, "Expected frame width >= client width.");
+            Assert.True(info.FrameSize.Height > info.ClientSize.Height, "Expected frame height > client height.");
+
+            var frameRect = new PixelRect(info.Position, PixelSize.FromSize(info.FrameSize, info.Scaling));
+
+            switch (location)
+            {
+                case WindowStartupLocation.CenterScreen:
+                {
+                    var expected = info.ScreenRect.CenterRect(frameRect);
+                    AssertCloseEnough(expected.Position, frameRect.Position);
+                    break;
+                }
+                case WindowStartupLocation.CenterOwner:
+                {
+                    Assert.NotNull(info.OwnerRect);
+                    var expected = info.OwnerRect!.Value.CenterRect(frameRect);
+                    AssertCloseEnough(expected.Position, frameRect.Position);
+                    break;
+                }
+            }
+        }
+        
+        [PlatformFact(TestPlatforms.Windows)]
+        public void OnWindows_Docked_Windows_Retain_Size_Position_When_Restored()
+        {
+            using (OpenWindow(new Size(400, 400), ShowWindowMode.NonOwned, WindowStartupLocation.Manual))
+            {
+                var windowState = _session.FindElementByAccessibilityId("WindowState");
+
+                Assert.Equal("Normal", windowState.GetComboBoxValue());
+                
+                
+                var window = _session.FindElements(By.XPath("//Window")).First();
+                
+                new Actions(_session)
+                    .KeyDown(Keys.Meta)
+                    .SendKeys(Keys.Left)
+                    .KeyUp(Keys.Meta)
+                    .Perform();
+                
+                var original = GetWindowInfo();
+                
+                windowState.Click();
+                _session.FindElementByName("Minimized").SendClick();
+                
+                new Actions(_session)
+                    .KeyDown(Keys.Alt)
+                    .SendKeys(Keys.Tab)
+                    .KeyUp(Keys.Alt)
+                    .Perform();
+                
+                var current = GetWindowInfo();
+                
+                Assert.Equal(original.Position, current.Position);
+                Assert.Equal(original.FrameSize, current.FrameSize);
+
+            }
+        }
+
+
+        [Theory]
+        [InlineData(ShowWindowMode.NonOwned)]
+        [InlineData(ShowWindowMode.Owned)]
+        [InlineData(ShowWindowMode.Modal)]
+        public void WindowState(ShowWindowMode mode)
+        {
+            using var window = OpenWindow(null, mode, WindowStartupLocation.Manual);
+            var windowState = _session.FindElementByAccessibilityId("WindowState");
+            var original = GetWindowInfo();
+
+            Assert.Equal("Normal", windowState.GetComboBoxValue());
+
+            windowState.Click();
+            _session.FindElementByName("Maximized").SendClick();
+            Assert.Equal("Maximized", windowState.GetComboBoxValue());
+
+            windowState.Click();
+            _session.FindElementByName("Normal").SendClick();
+
+            var current = GetWindowInfo();
+            Assert.Equal(original.Position, current.Position);
+            Assert.Equal(original.FrameSize, current.FrameSize);
+
+            // On macOS, only non-owned windows can go fullscreen.
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || mode == ShowWindowMode.NonOwned)
+            {
+                windowState.Click();
+                _session.FindElementByName("Fullscreen").SendClick();
+                Assert.Equal("Fullscreen", windowState.GetComboBoxValue());
+
+                current = GetWindowInfo();
+                var clientSize = PixelSize.FromSize(current.ClientSize, current.Scaling);
+                Assert.True(clientSize.Width >= current.ScreenRect.Width);
+                Assert.True(clientSize.Height >= current.ScreenRect.Height);
+
+                windowState.SendClick();
+                
+                _session.FindElementByName("Normal").SendClick();
+
+                current = GetWindowInfo();
+                Assert.Equal(original.Position, current.Position);
+                Assert.Equal(original.FrameSize, current.FrameSize);
+            }
+        }
+
+        public static TheoryData<Size?, ShowWindowMode, WindowStartupLocation> StartupLocationData()
+        {
+            var sizes = new Size?[] { null, new Size(400, 300) };
+            var data = new TheoryData<Size?, ShowWindowMode, WindowStartupLocation>();
+
+            foreach (var size in sizes)
+            {
+                foreach (var mode in Enum.GetValues<ShowWindowMode>())
+                {
+                    foreach (var location in Enum.GetValues<WindowStartupLocation>())
+                    {
+                        if (!(location == WindowStartupLocation.CenterOwner && mode == ShowWindowMode.NonOwned))
+                        {
+                            data.Add(size, mode, location);
+                        }
+                    }
+                }
+            }
+
+            return data;
+        }
+
+        private static void AssertCloseEnough(PixelPoint expected, PixelPoint actual)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // On win32, accurate frame information cannot be obtained until a window is shown but
+                // WindowStartupLocation needs to be calculated before the window is shown, meaning that
+                // the position of a centered window can be off by a bit. From initial testing, looks
+                // like this shouldn't be more than 10 pixels.
+                if (Math.Abs(expected.X - actual.X) > 10)
+                    throw new EqualException(expected, actual);
+                if (Math.Abs(expected.Y - actual.Y) > 10)
+                    throw new EqualException(expected, actual);
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                if (Math.Abs(expected.X - actual.X) > 15)
+                    throw new EqualException(expected, actual);
+                if (Math.Abs(expected.Y - actual.Y) > 15)
+                    throw new EqualException(expected, actual);
+            }
+            else
+            {
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        private IDisposable OpenWindow(Size? size, ShowWindowMode mode, WindowStartupLocation location)
+        {
+            var sizeTextBox = _session.FindElementByAccessibilityId("ShowWindowSize");
+            var modeComboBox = _session.FindElementByAccessibilityId("ShowWindowMode");
+            var locationComboBox = _session.FindElementByAccessibilityId("ShowWindowLocation");
+            var showButton = _session.FindElementByAccessibilityId("ShowWindow");
+
+            if (size.HasValue)
+                sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
+
+            modeComboBox.Click();
+            _session.FindElementByName(mode.ToString()).SendClick();
+
+            locationComboBox.Click();
+            _session.FindElementByName(location.ToString()).SendClick();
+
+            return showButton.OpenWindowWithClick();
+        }
+
+        private WindowInfo GetWindowInfo()
+        {
+            PixelRect? ReadOwnerRect()
+            {
+                var text = _session.FindElementByAccessibilityId("OwnerRect").Text;
+                return !string.IsNullOrWhiteSpace(text) ? PixelRect.Parse(text) : null;
+            }
+
+            var retry = 0;
+
+            for (;;)
+            {
+                try
+                {
+                    return new(
+                        Size.Parse(_session.FindElementByAccessibilityId("ClientSize").Text),
+                        Size.Parse(_session.FindElementByAccessibilityId("FrameSize").Text),
+                        PixelPoint.Parse(_session.FindElementByAccessibilityId("Position").Text),
+                        ReadOwnerRect(),
+                        PixelRect.Parse(_session.FindElementByAccessibilityId("ScreenRect").Text),
+                        double.Parse(_session.FindElementByAccessibilityId("Scaling").Text));
+                }
+                catch (OpenQA.Selenium.NoSuchElementException) when (retry++ < 3)
+                {
+                    // MacOS sometimes seems to need a bit of time to get itself back in order after switching out
+                    // of fullscreen.
+                    Thread.Sleep(1000);
+                }
+            }
+        }
+
+        public enum ShowWindowMode
+        {
+            NonOwned,
+            Owned,
+            Modal
+        }
+
+        private record WindowInfo(
+            Size ClientSize,
+            Size FrameSize,
+            PixelPoint Position,
+            PixelRect? OwnerRect,
+            PixelRect ScreenRect,
+            double Scaling);
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
new file mode 100644
index 0000000000..05ed0616a8
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Avalonia.Controls;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class WindowTests_MacOS
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public WindowTests_MacOS(TestAppFixture fixture)
+        {
+            var retry = 0;
+
+            _session = fixture.Session;
+
+            for (;;)
+            {
+                try
+                {
+                    var tabs = _session.FindElementByAccessibilityId("MainTabs");
+                    var tab = tabs.FindElementByName("Window");
+                    tab.Click();
+                    return;
+                }
+                catch (WebDriverException) when (retry++ < 3)
+                {
+                    // MacOS sometimes seems to need a bit of time to get itself back in order after switching out
+                    // of fullscreen.
+                    Thread.Sleep(1000);
+                }
+            }
+
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent()
+        {
+            var mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Modal, WindowStartupLocation.Manual))
+            {
+                mainWindow.Click();
+
+                var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+
+                Assert.Equal(1, secondaryWindowIndex);
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_Clicking_Resize_Grip()
+        {
+            var mainWindow = GetWindow("MainWindow");
+
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Modal, WindowStartupLocation.Manual))
+            {
+                new Actions(_session)
+                    .MoveToElement(mainWindow, 100, 1)
+                    .ClickAndHold()
+                    .Perform();
+
+                var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+
+                new Actions(_session)
+                    .MoveToElement(mainWindow, 100, 1)
+                    .Release()
+                    .Perform();
+
+                Assert.Equal(1, secondaryWindowIndex);
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_In_Fullscreen()
+        {
+            var mainWindow = GetWindow("MainWindow");
+            var buttons = mainWindow.GetChromeButtons();
+
+            buttons.maximize.Click();
+
+            Thread.Sleep(500);
+
+            try
+            {
+                using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Modal, WindowStartupLocation.Manual))
+                {
+                    var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+                    Assert.Equal(1, secondaryWindowIndex);
+                }
+            }
+            finally
+            {
+                _session.FindElementByAccessibilityId("ExitFullscreen").Click();
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_Owned_Dialog_Stays_InFront_Of_Parent()
+        {
+            var mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Owned, WindowStartupLocation.Manual))
+            {
+                mainWindow.SendClick();
+                var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+                Assert.Equal(1, secondaryWindowIndex);
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_NonOwned_Window_Does_Not_Stay_InFront_Of_Parent()
+        {
+            var mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+
+            using (OpenWindow(new PixelSize(800, 100), ShowWindowMode.NonOwned, WindowStartupLocation.Manual))
+            {
+                mainWindow.Click();
+
+                var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+
+                Assert.Equal(2, secondaryWindowIndex);
+
+                var sendToBack = _session.FindElementByAccessibilityId("SendToBack");
+                sendToBack.Click();
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_Owned_Is_Correct_After_Closing_Window()
+        {
+            using (OpenWindow(new PixelSize(300, 500), ShowWindowMode.Owned, WindowStartupLocation.CenterOwner))
+            {
+                // Open a second child window, and close it.
+                using (OpenWindow(new PixelSize(200, 200), ShowWindowMode.Owned, WindowStartupLocation.CenterOwner))
+                {
+                }
+        
+                var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+        
+                Assert.Equal(1, secondaryWindowIndex);
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void Parent_Window_Has_Disabled_ChromeButtons_When_Modal_Dialog_Shown()
+        {
+            var window = GetWindow("MainWindow");
+            var (closeButton, miniaturizeButton, zoomButton) = window.GetChromeButtons();
+
+            Assert.True(closeButton.Enabled);
+            Assert.True(zoomButton.Enabled);
+            Assert.True(miniaturizeButton.Enabled);
+
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Modal, WindowStartupLocation.CenterOwner))
+            {
+                Assert.False(closeButton.Enabled);
+                Assert.False(zoomButton.Enabled);
+                Assert.False(miniaturizeButton.Enabled);
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void Minimize_Button_Is_Disabled_On_Modal_Dialog()
+        {
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Modal, WindowStartupLocation.CenterOwner))
+            {
+                var secondaryWindow = GetWindow("SecondaryWindow");
+                var (closeButton, miniaturizeButton, zoomButton) = secondaryWindow.GetChromeButtons();
+
+                Assert.True(closeButton.Enabled);
+                Assert.True(zoomButton.Enabled);
+                Assert.False(miniaturizeButton.Enabled);
+            }
+        }
+        
+        [PlatformTheory(TestPlatforms.MacOS)]
+        [InlineData(ShowWindowMode.Owned)]
+        public void Minimize_Button_Disabled_Owned_Window(ShowWindowMode mode)
+        {
+            using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual))
+            {
+                var secondaryWindow = GetWindow("SecondaryWindow");
+                var (_, miniaturizeButton, _) = secondaryWindow.GetChromeButtons();
+
+                Assert.Equal(false, miniaturizeButton.Enabled);
+            }
+        }
+        
+
+        [PlatformTheory(TestPlatforms.MacOS)]
+        [InlineData(ShowWindowMode.NonOwned)]
+        public void Minimize_Button_Minimizes_Window(ShowWindowMode mode)
+        {
+            using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual))
+            {
+                var secondaryWindow = GetWindow("SecondaryWindow");
+                var (_, miniaturizeButton, _) = secondaryWindow.GetChromeButtons();
+
+                miniaturizeButton.Click();
+                Thread.Sleep(1000);
+
+                var hittable = _session.FindElementsByXPath("/XCUIElementTypeApplication/XCUIElementTypeWindow")
+                    .Select(x => x.GetAttribute("hittable")).ToList();
+                Assert.Equal(new[] { "true", "false" }, hittable);
+
+                _session.FindElementByAccessibilityId("RestoreAll").Click();
+                Thread.Sleep(1000);
+
+                hittable = _session.FindElementsByXPath("/XCUIElementTypeApplication/XCUIElementTypeWindow")
+                    .Select(x => x.GetAttribute("hittable")).ToList();
+                Assert.Equal(new[] { "true", "true" }, hittable);
+            }
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void Hidden_Child_Window_Is_Not_Reshown_When_Parent_Clicked()
+        {
+            var mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+
+            // We don't use dispose to close the window here, because it seems that hiding and re-showing a window
+            // causes Appium to think it's a different window.
+            OpenWindow(null, ShowWindowMode.Owned, WindowStartupLocation.Manual);
+            
+            var secondaryWindow = GetWindow("SecondaryWindow");
+            var hideButton = secondaryWindow.FindElementByAccessibilityId("HideButton");
+
+            hideButton.Click();
+                
+            var windows = _session.FindElementsByXPath("XCUIElementTypeWindow");
+            Assert.Single(windows);
+                
+            mainWindow.Click();
+                
+            windows = _session.FindElementsByXPath("XCUIElementTypeWindow");
+            Assert.Single(windows);
+                
+            _session.FindElementByAccessibilityId("RestoreAll").Click();
+
+            // Close the window manually.
+            secondaryWindow = GetWindow("SecondaryWindow");
+            secondaryWindow.GetChromeButtons().close.Click();
+        }
+
+        private IDisposable OpenWindow(PixelSize? size, ShowWindowMode mode, WindowStartupLocation location)
+        {
+            var sizeTextBox = _session.FindElementByAccessibilityId("ShowWindowSize");
+            var modeComboBox = _session.FindElementByAccessibilityId("ShowWindowMode");
+            var locationComboBox = _session.FindElementByAccessibilityId("ShowWindowLocation");
+            var showButton = _session.FindElementByAccessibilityId("ShowWindow");
+
+            if (size.HasValue)
+                sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
+
+            modeComboBox.Click();
+            _session.FindElementByName(mode.ToString()).SendClick();
+
+            locationComboBox.Click();
+            _session.FindElementByName(location.ToString()).SendClick();
+
+            return showButton.OpenWindowWithClick();
+        }
+
+        private AppiumWebElement GetWindow(string identifier)
+        {
+            // The Avalonia a11y tree currently exposes two nested Window elements, this is a bug and should be fixed 
+            // but in the meantime use the `parent::' selector to return the parent "real" window. 
+            return _session.FindElementByXPath(
+                $"XCUIElementTypeWindow//*[@identifier='{identifier}']/parent::XCUIElementTypeWindow");
+        }
+
+        private int GetWindowOrder(string identifier)
+        {
+            var window = GetWindow(identifier);
+            var order = window.FindElementByXPath("//*[@identifier='Order']");
+            return int.Parse(order.Text);
+        }
+
+        public enum ShowWindowMode
+        {
+            NonOwned,
+            Owned,
+            Modal
+        }
+    }
+}
diff --git a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
new file mode 100755
index 0000000000..dc4619f35c
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
@@ -0,0 +1,18 @@
+# Cleans, builds, and runs integration tests on macOS.
+# Can be used by `git bisect run` to automatically find the commit which introduced a problem. 
+SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+cd "$SCRIPT_DIR"/../.. || exit
+git clean -xdf
+pkill node
+appium &
+pkill IntegrationTestApp
+./build.sh CompileNative
+rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")")
+pkill IntegrationTestApp
+./samples/IntegrationTestApp/bundle.sh
+open -n ./samples/IntegrationTestApp/bin/Debug/net7.0/osx-arm64/publish/IntegrationTestApp.app
+pkill IntegrationTestApp
+open -b net.avaloniaui.avalonia.integrationtestapp
+dotnet test tests/Avalonia.IntegrationTests.Appium/ -l "console;verbosity=detailed"
+pkill IntegrationTestApp
+pkill node
diff --git a/tests/Avalonia.IntegrationTests.Appium/readme.md b/tests/Avalonia.IntegrationTests.Appium/readme.md
new file mode 100644
index 0000000000..f54720920d
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/readme.md
@@ -0,0 +1,30 @@
+# Running Integration Tests
+
+## Windows
+
+### Prerequisites
+
+- Install WinAppDriver: https://github.com/microsoft/WinAppDriver
+
+### Running
+
+- Run WinAppDriver (it gets installed to the start menu)
+- Run the tests in this project
+
+## macOS
+
+### Prerequisites
+
+- Install Appium: https://appium.io/
+- Give [Xcode helper the required permissions](https://apple.stackexchange.com/questions/334008)
+- `cd samples/IntegrationTestApp` then `./bundle.sh` to create an app bundle for `IntegrationTestApp`
+- Register the app bundle by running `open -n ./bin/Debug/net7.0/osx-arm64/publish/IntegrationTestApp.app` 
+
+### Running
+
+- Run `appium`
+- Run the tests in this project
+
+Each time you make a change to Avalonia or `IntegrationTestApp`, re-run the `bundle.sh` script (registration only needs to be done once).
+
+
diff --git a/tests/Avalonia.IntegrationTests.Appium/xunit.runner.json b/tests/Avalonia.IntegrationTests.Appium/xunit.runner.json
new file mode 100644
index 0000000000..f78bc2f0c6
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json"
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
deleted file mode 100644
index f6cfe51db4..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs b/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
deleted file mode 100644
index b997ffbbd9..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Interactivity.UnitTests
-{
-    public class InteractiveTests
-    {
-        [Fact]
-        public void Direct_Event_Should_Go_Straight_To_Source()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Direct_Event_Should_Have_Route_Set_To_Direct()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
-            bool called = false;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                Assert.Equal(RoutingStrategies.Direct, e.Route);
-                called = true;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.True(called);
-        }
-
-        [Fact]
-        public void Bubbling_Event_Should_Bubble_Up()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Tunneling_Event_Should_Tunnel()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Tunnel, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Tunneling_Bubbling_Event_Should_Tunnel_Then_Bubble_Up()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Events_Should_Have_Route_Set()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<RoutingStrategies>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(e.Route);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[]
-            {
-                RoutingStrategies.Tunnel,
-                RoutingStrategies.Tunnel,
-                RoutingStrategies.Bubble,
-                RoutingStrategies.Bubble,
-            },
-            invoked);
-        }
-
-        [Fact]
-        public void Handled_Bubbled_Event_Should_Not_Propogate_Further()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                var t = (TestInteractive)s;
-                invoked.Add(t.Name);
-                e.Handled = t.Name == "2b";
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Handled_Tunnelled_Event_Should_Not_Propogate_Further()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel, 
-                typeof(RoutedEventArgs), 
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                var t = (TestInteractive)s;
-                invoked.Add(t.Name);
-                e.Handled = t.Name == "2b";
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Direct_Subscription_Should_Not_Catch_Tunneling_Or_Bubbling()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var count = 0;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                ++count;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(0, count);
-        }
-
-        [Fact]
-        public void Bubbling_Subscription_Should_Not_Catch_Tunneling()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var count = 0;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                Assert.Equal(RoutingStrategies.Bubble, e.Route);
-                ++count;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(2, count);
-        }
-
-        [Fact]
-        public void Tunneling_Subscription_Should_Not_Catch_Bubbling()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var count = 0;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                Assert.Equal(RoutingStrategies.Tunnel, e.Route);
-                ++count;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(2, count);
-        }
-
-        [Fact]
-        public void Event_Should_Should_Keep_Propogating_To_HandedEventsToo_Handlers()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                invoked.Add(((TestInteractive)s).Name);
-                e.Handled = true;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel, true);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Direct_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Direct,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Tunneling_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Bubbling_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Typed_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent<RoutedEventArgs>(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(TestInteractive));
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler<TestInteractive>((x, e) => x.ClassHandler(e), RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.True(target.ClassHandlerInvoked);
-            Assert.True(target.GetVisualParent<TestInteractive>().ClassHandlerInvoked);
-        }
-
-        [Fact]
-        public void GetObservable_Should_Listen_To_Event()
-        {
-            var ev = new RoutedEvent<RoutedEventArgs>("test", RoutingStrategies.Direct, typeof(TestInteractive));
-            var target = new TestInteractive();
-            var called = 0;
-            var subscription = target.GetObservable(ev).Subscribe(_ => ++called);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            subscription.Dispose();
-
-            target.RaiseEvent(args);
-
-            Assert.Equal(1, called);
-        }
-
-        [Fact]
-        public void Removing_Control_In_Handler_Should_Not_Stop_Event()
-        {
-            // Issue #3176
-            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var parent = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-            var target = (IInteractive)parent.GetVisualChildren().Single();
-
-            EventHandler<RoutedEventArgs> removeHandler = (s, e) =>
-            {
-                parent.Children = Array.Empty<IVisual>();
-            };
-            
-            target.AddHandler(ev, removeHandler);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "3", "2b", "1" }, invoked);
-        }
-
-        private TestInteractive CreateTree(
-            RoutedEvent ev,
-            EventHandler<RoutedEventArgs> handler,
-            RoutingStrategies handlerRoutes,
-            bool handledEventsToo = false)
-        {
-            TestInteractive target;
-
-            var tree = new TestInteractive
-            {
-                Name = "1",
-                Children = new[]
-                {
-                    new TestInteractive
-                    {
-                        Name = "2a",
-                    },
-                    (target = new TestInteractive
-                    {
-                        Name = "2b",
-                        Children = new[]
-                        {
-                            new TestInteractive
-                            {
-                                Name = "3",
-                            },
-                        },
-                    }),
-                }
-            };
-
-            if (handler != null)
-            {
-                foreach (var i in tree.GetSelfAndVisualDescendants().Cast<Interactive>())
-                {
-                    i.AddHandler(ev, handler, handlerRoutes, handledEventsToo);
-                }
-            }
-
-            return target;
-        }
-
-        private class TestInteractive : Interactive
-        {
-            public bool ClassHandlerInvoked { get; private set; }
-            public new string Name { get; set; }
-
-            public IEnumerable<IVisual> Children
-            {
-                get
-                {
-                    return ((IVisual)this).VisualChildren.AsEnumerable();
-                }
-
-                set
-                {
-                    VisualChildren.Clear();
-                    VisualChildren.AddRange(value.Cast<Visual>());
-                }
-            }
-
-            public void ClassHandler(RoutedEventArgs e)
-            {
-                ClassHandlerInvoked = true;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index c5bf2d8657..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Interactivity.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs b/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
deleted file mode 100644
index 8276039d09..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Xunit;
-
-namespace Avalonia.Interactivity.UnitTests
-{
-    public class RoutedEventRegistryTests
-    {
-        [Fact]
-        public void Pointer_Events_Should_Be_Registered()
-        {
-            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent }; 
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<InputElement>();
-            Assert.Contains(registeredEvents, expectedEvents.Contains);
-        }
-
-        [Fact]
-        public void ClickEvent_Should_Be_Registered_On_Button()
-        {
-            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
-            Assert.Contains(registeredEvents, expectedEvents.Contains);
-        }
-
-        [Fact]
-        public void ClickEvent_Should_Not_Be_Registered_On_ContentControl()
-        {
-            // force ContentControl type to be loaded
-            new ContentControl();
-            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<ContentControl>();
-            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
-        }
-
-        [Fact]
-        public void InputElement_Events_Should_Not_Be_Registered_On_Button()
-        {
-            // force Button type to be loaded
-            new Button();
-            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent };
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
-            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs b/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
deleted file mode 100644
index db0ead1b00..0000000000
--- a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class ArrangeTests
-    {
-        [Fact]
-        public void Bounds_Should_Not_Include_Margin()
-        {
-            var target = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Margin = new Thickness(5),
-            };
-
-            Assert.False(target.IsMeasureValid);
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(target.DesiredSize));
-            Assert.Equal(new Rect(5, 5, 100, 100), target.Bounds);
-        }
-
-        [Fact]
-        public void Margin_Should_Be_Subtracted_From_Arrange_FinalSize()
-        {
-            var target = new TestControl
-            {
-                Width = 100,
-                Height = 100,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void ArrangeOverride_Receives_Desired_Size_When_Centered()
-        {
-            var target = new TestControl
-            {
-                MeasureResult = new Size(100, 100),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(0, 0, 200, 200));
-
-            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void ArrangeOverride_Receives_Available_Size_Minus_Margin_When_Stretched()
-        {
-            var target = new TestControl
-            {
-                MeasureResult = new Size(100, 100),
-                HorizontalAlignment = HorizontalAlignment.Stretch,
-                VerticalAlignment = VerticalAlignment.Stretch,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(0, 0, 200, 200));
-
-            Assert.Equal(new Size(184, 184), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void ArrangeOverride_Receives_Requested_Size_When_Arranged_To_DesiredSize()
-        {
-            var target = new TestControl
-            {
-                MeasureResult = new Size(100, 100),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void Arrange_With_IsMeasureValid_False_Calls_Measure()
-        {
-            var target = new TestControl();
-
-            Assert.False(target.IsMeasureValid);
-            target.Arrange(new Rect(0, 0, 120, 120));
-            Assert.True(target.IsMeasureValid);
-            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
-        }
-
-        [Fact]
-        public void Arrange_With_IsMeasureValid_False_Calls_Measure_With_Previous_Size_If_Available()
-        {
-            var target = new TestControl();
-
-            Assert.False(target.IsMeasureValid);
-            target.Arrange(new Rect(0, 0, 120, 120));
-            target.InvalidateMeasure();
-            target.Arrange(new Rect(0, 0, 100, 100));
-            Assert.True(target.IsMeasureValid);
-            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
-        }
-
-        private class TestControl : Decorator
-        {
-            public Size MeasureConstraint { get; private set; }
-
-            public Size MeasureResult { get; set; }
-
-            public Size ArrangeFinalSize { get; private set; }
-
-            protected override Size MeasureOverride(Size constraint)
-            {
-                MeasureConstraint = constraint;
-                return MeasureResult;
-            }
-
-            protected override Size ArrangeOverride(Size finalSize)
-            {
-                ArrangeFinalSize = finalSize;
-                return base.ArrangeOverride(finalSize);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
deleted file mode 100644
index a3c85c72b5..0000000000
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-    <ProjectReference Include="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
deleted file mode 100644
index dcc29a9716..0000000000
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class FullLayoutTests
-    {
-        [Fact]
-        public void Grandchild_Size_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                Border border;
-                TextBlock textBlock;
-
-                var window = new Window()
-                {
-                    SizeToContent = SizeToContent.WidthAndHeight,
-                    Content = border = new Border
-                    {
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        Child = new Border
-                        {
-                            Child = textBlock = new TextBlock
-                            {
-                                Width = 400,
-                                Height = 400,
-                                Text = "Hello World!",
-                            },
-                        }
-                    }
-                };
-
-                window.Show();
-
-                Assert.Equal(new Size(400, 400), border.Bounds.Size);
-                textBlock.Width = 200;
-                window.LayoutManager.ExecuteLayoutPass();
-
-                Assert.Equal(new Size(200, 400), border.Bounds.Size);
-            }
-        }
-
-        [Fact]
-        public void Test_ScrollViewer_With_TextBlock()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                ScrollViewer scrollViewer;
-                TextBlock textBlock;
-
-                var window = new Window()
-                {
-                    Width = 800,
-                    Height = 600,
-                    Content = scrollViewer = new ScrollViewer
-                    {
-                        Width = 200,
-                        Height = 200,
-                        HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        Content = textBlock = new TextBlock
-                        {
-                            Width = 400,
-                            Height = 400,
-                            Text = "Hello World!",
-                        },
-                    }
-                };
-
-                window.Resources["ScrollBarThickness"] = 10.0;
-
-                window.Show();
-
-                Assert.Equal(new Size(800, 600), window.Bounds.Size);
-                Assert.Equal(new Size(200, 200), scrollViewer.Bounds.Size);
-                Assert.Equal(new Point(300, 200), Position(scrollViewer));
-                Assert.Equal(new Size(400, 400), textBlock.Bounds.Size);
-
-                var scrollBars = scrollViewer.GetTemplateChildren().OfType<ScrollBar>().ToList();
-                var presenters = scrollViewer.GetTemplateChildren().OfType<ScrollContentPresenter>().ToList();
-
-                Assert.Equal(2, scrollBars.Count);
-                Assert.Single(presenters);
-
-                var presenter = presenters[0];
-                Assert.Equal(new Size(190, 190), presenter.Bounds.Size);
-
-                var horzScroll = scrollBars.Single(x => x.Orientation == Orientation.Horizontal);
-                var vertScroll = scrollBars.Single(x => x.Orientation == Orientation.Vertical);
-
-                Assert.True(horzScroll.IsVisible);
-                Assert.True(vertScroll.IsVisible);
-                Assert.Equal(new Size(190, 10), horzScroll.Bounds.Size);
-                Assert.Equal(new Size(10, 190), vertScroll.Bounds.Size);
-                Assert.Equal(new Point(0, 190), Position(horzScroll));
-                Assert.Equal(new Point(190, 0), Position(vertScroll));
-            }
-        }
-
-        private static Point Position(IVisual v)
-        {
-            return v.Bounds.Position;
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs
deleted file mode 100644
index f9187edc42..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutHelperTests
-    {
-        [Fact]
-        public void Round_Layout_Value_Without_DPI_Aware()
-        {
-            const double value = 42.5;
-            var expectedValue = Math.Round(value);
-            var actualValue = LayoutHelper.RoundLayoutValue(value, 1.0);
-            Assert.Equal(expectedValue, actualValue);
-        }
-
-        [Fact]
-        public void Round_Layout_Value_With_DPI_Aware()
-        {
-            const double dpiScale = 1.25;
-            const double value = 42.5;
-            var expectedValue = Math.Round(value * dpiScale) / dpiScale;
-            var actualValue = LayoutHelper.RoundLayoutValue(value, dpiScale);
-            Assert.Equal(expectedValue, actualValue);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
deleted file mode 100644
index e429adce85..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutManagerTests
-    {
-        [Fact]
-        public void Measures_And_Arranges_InvalidateMeasured_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Doesnt_Measure_And_Arrange_InvalidateMeasured_Control_When_TopLevel_Is_Not_Visible()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control, IsVisible = false };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(control.Measured);
-            Assert.False(control.Arranged);
-        }
-
-        [Fact]
-        public void Arranges_InvalidateArranged_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateArrange();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Measures_Parent_Of_Newly_Added_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot();
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            root.Child = control;
-            root.Measured = root.Arranged = false;
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(root.Measured);
-            Assert.True(root.Arranged);
-            Assert.True(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Measures_In_Correct_Order()
-        {
-            LayoutTestControl control1;
-            LayoutTestControl control2;
-            var root = new LayoutTestRoot
-            {
-                Child = control1 = new LayoutTestControl
-                {
-                    Child = control2 = new LayoutTestControl(),
-                }
-            };
-
-            var order = new List<ILayoutable>();
-            Size MeasureOverride(ILayoutable control, Size size)
-            {
-                order.Add(control);
-                return new Size(10, 10);
-            }
-
-            root.DoMeasureOverride = MeasureOverride;
-            control1.DoMeasureOverride = MeasureOverride;
-            control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            control2.InvalidateMeasure();
-            control1.InvalidateMeasure();
-            root.InvalidateMeasure();
-
-            order.Clear();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.Equal(new ILayoutable[] { root, control1, control2 }, order);
-        }
-
-        [Fact]
-        public void Measures_Root_And_Grandparent_In_Correct_Order()
-        {
-            LayoutTestControl control1;
-            LayoutTestControl control2;
-            var root = new LayoutTestRoot
-            {
-                Child = control1 = new LayoutTestControl
-                {
-                    Child = control2 = new LayoutTestControl(),
-                }
-            };
-
-            var order = new List<ILayoutable>();
-            Size MeasureOverride(ILayoutable control, Size size)
-            {
-                order.Add(control);
-                return new Size(10, 10);
-            }
-
-            root.DoMeasureOverride = MeasureOverride;
-            control1.DoMeasureOverride = MeasureOverride;
-            control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            control2.InvalidateMeasure();
-            root.InvalidateMeasure();
-
-            order.Clear();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.Equal(new ILayoutable[] { root, control2 }, order);
-        }
-
-        [Fact]
-        public void Doesnt_Measure_Non_Invalidated_Root()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            root.Measured = root.Arranged = false;
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(root.Measured);
-            Assert.False(root.Arranged);
-            Assert.True(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Doesnt_Measure_Removed_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.Child = null;
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(control.Measured);
-            Assert.False(control.Arranged);
-        }
-
-        [Fact]
-        public void Measures_Root_With_Infinity()
-        {
-            var root = new LayoutTestRoot();
-            var availableSize = default(Size);
-
-            // Should not measure with this size.
-            root.MaxClientSize = new Size(123, 456);
-
-            root.DoMeasureOverride = (_, s) =>
-            {
-                availableSize = s;
-                return new Size(100, 100);
-            };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            Assert.Equal(Size.Infinity, availableSize);
-        }
-
-        [Fact]
-        public void Arranges_Root_With_DesiredSize()
-        {
-            var root = new LayoutTestRoot
-            {
-                Width = 100,
-                Height = 100,
-            };
-
-            var arrangeSize = default(Size);
-
-            root.DoArrangeOverride = (_, s) =>
-            {
-                arrangeSize = s;
-                return s;
-            };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            Assert.Equal(new Size(100, 100), arrangeSize);
-
-            root.Width = 120;
-
-            root.LayoutManager.ExecuteLayoutPass();
-            Assert.Equal(new Size(120, 100), arrangeSize);
-        }
-
-        [Fact]
-        public void Invalidating_Child_Remeasures_Parent()
-        {
-            Border border;
-            StackPanel panel;
-
-            var root = new LayoutTestRoot
-            {
-                Child = panel = new StackPanel
-                {
-                    Children =
-                    {
-                        (border = new Border())
-                    }
-                }
-            };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            Assert.Equal(new Size(0, 0), root.DesiredSize);
-
-            border.Width = 100;
-            border.Height = 100;
-
-            root.LayoutManager.ExecuteLayoutPass();
-            Assert.Equal(new Size(100, 100), panel.DesiredSize);
-        }
-
-        [Fact]
-        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Measure()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = false;
-
-            int cnt = 0;
-            int maxcnt = 100;
-            control.DoMeasureOverride = (l, s) =>
-            {
-                //emulate a problem in the logic of a control that triggers
-                //invalidate measure during measure
-                //it can lead to an infinite loop in layoutmanager
-                if (++cnt < maxcnt)
-                {
-                    control.InvalidateMeasure();
-                }
-
-                return new Size(100, 100);
-            };
-
-            control.InvalidateMeasure();
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(cnt < 100);
-        }
-
-        [Fact]
-        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Arrange()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Arranged = false;
-
-            int cnt = 0;
-            int maxcnt = 100;
-            control.DoArrangeOverride = (l, s) =>
-            {
-                //emulate a problem in the logic of a control that triggers
-                //invalidate measure during arrange
-                //it can lead to infinity loop in layoutmanager
-                if (++cnt < maxcnt)
-                {
-                    control.InvalidateArrange();
-                }
-
-                return new Size(100, 100);
-            };
-
-            control.InvalidateArrange();
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(cnt < 100);
-        }
-
-        [Fact]
-        public void LayoutManager_Should_Properly_Arrange_Visuals_Even_When_There_Are_Issues_With_Previous_Arranged()
-        {
-            var nonArrageableTargets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
-            var targets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
-
-            StackPanel panel;
-
-            var root = new LayoutTestRoot
-            {
-                Child = panel = new StackPanel()
-            };
-
-            panel.Children.AddRange(nonArrageableTargets);
-            panel.Children.AddRange(targets);
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            foreach (var c in panel.Children.OfType<LayoutTestControl>())
-            {
-                c.Measured = c.Arranged = false;
-                c.InvalidateMeasure();
-            }
-
-            foreach (var c in nonArrageableTargets)
-            {
-                c.DoArrangeOverride = (l, s) =>
-                {
-                    //emulate a problem in the logic of a control that triggers
-                    //invalidate measure during arrange
-                    c.InvalidateMeasure();
-                    return new Size(100, 100);
-                };
-            }
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            //altough nonArrageableTargets has rubbish logic and can't be measured/arranged properly
-            //layoutmanager should process properly other visuals
-            Assert.All(targets, c => Assert.True(c.Arranged));
-        }
-
-
-        [Fact]
-        public void LayoutManager_Should_Recover_From_Infinite_Loop_On_Measure()
-        {
-            // Test for issue #3041.
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = false;
-
-            control.DoMeasureOverride = (l, s) =>
-            {
-                control.InvalidateMeasure();
-                return new Size(100, 100);
-            };
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            // This is the important part: running a second layout pass in which we exceed the maximum
-            // retries causes LayoutQueue<T>.Info.Count to exceed _maxEnqueueCountPerLoop.
-            root.LayoutManager.ExecuteLayoutPass();
-
-            control.Measured = false;
-            control.DoMeasureOverride = null;
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(control.Measured);
-            Assert.True(control.IsMeasureValid);
-        }
-
-        [Fact]
-        public void Calling_ExecuteLayoutPass_From_ExecuteInitialLayoutPass_Does_Not_Break_Measure()
-        {
-            // Test for issue #3550.
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-            var count = 0;
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = false;
-
-            control.DoMeasureOverride = (l, s) =>
-            {
-                if (count++ == 0)
-                {
-                    control.InvalidateMeasure();
-                    root.LayoutManager.ExecuteLayoutPass();
-                    return new Size(100, 100);
-                }
-                else
-                {
-                    return new Size(200, 200);
-                }
-            };
-
-            root.InvalidateMeasure();
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            Assert.Equal(new Size(200, 200), control.Bounds.Size);
-            Assert.Equal(new Size(200, 200), control.DesiredSize);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutQueueTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutQueueTests.cs
deleted file mode 100644
index f047677a8a..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutQueueTests.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutQueueTests
-    {
-        [Fact]
-        public void Should_Enqueue()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-            var refQueue = new Queue<string>();
-            var items = new[] { "1", "2", "3" };
-
-            foreach (var item in items)
-            {
-                target.Enqueue(item);
-                refQueue.Enqueue(item);
-            }
-
-            Assert.Equal(refQueue, target);
-        }
-
-        [Fact]
-        public void Should_Dequeue()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-            var refQueue = new Queue<string>();
-            var items = new[] { "1", "2", "3" };
-
-            foreach (var item in items)
-            {
-                target.Enqueue(item);
-                refQueue.Enqueue(item);
-            }
-
-            while (refQueue.Count > 0)
-            {
-                Assert.Equal(refQueue.Dequeue(), target.Dequeue());
-            }
-        }
-
-        [Fact]
-        public void Should_Enqueue_UniqueElements()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            var items = new[] { "1", "2", "3", "1" };
-
-            foreach (var item in items)
-            {
-                target.Enqueue(item);
-            }
-
-            Assert.Equal(3, target.Count);
-            Assert.Equal(items.Take(3), target);
-        }
-
-        [Fact]
-        public void Shouldnt_Enqueue_More_Than_Limit_In_Loop()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-        }
-
-        [Fact]
-        public void Shouldnt_Count_Unique_Enqueue_For_Limit_In_Loop()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-        }
-
-        [Fact]
-        public void Should_Enqueue_When_Condition_True_After_Loop_When_Limit_Met()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added to queue
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-
-            target.EndLoop();
-
-            //after loop should be added once
-            Assert.Equal(1, target.Count);
-            Assert.Equal("Foo", target.First());
-        }
-
-        [Fact]
-        public void Shouldnt_Enqueue_When_Condition_False_After_Loop_When_Limit_Met()
-        {
-            var target = new LayoutQueue<string>(_ => false);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-
-            target.EndLoop();
-
-            Assert.Equal(0, target.Count);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutTestControl.cs b/tests/Avalonia.Layout.UnitTests/LayoutTestControl.cs
deleted file mode 100644
index f7f072eb1e..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutTestControl.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using Avalonia.Controls;
-
-namespace Avalonia.Layout.UnitTests
-{
-    internal class LayoutTestControl : Decorator
-    {
-        public bool Measured { get; set; }
-        public bool Arranged { get; set; }
-        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
-        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            Measured = true;
-            return DoMeasureOverride != null ?
-                DoMeasureOverride(this, availableSize) :
-                base.MeasureOverride(availableSize);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            Arranged = true;
-            return DoArrangeOverride != null ?
-                DoArrangeOverride(this, finalSize) :
-                base.ArrangeOverride(finalSize);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs b/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
deleted file mode 100644
index a94459df96..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using Avalonia.UnitTests;
-
-namespace Avalonia.Layout.UnitTests
-{
-    internal class LayoutTestRoot : TestRoot, ILayoutable
-    {
-        public bool Measured { get; set; }
-        public bool Arranged { get; set; }
-        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
-        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
-
-        void ILayoutable.Measure(Size availableSize)
-        {
-            Measured = true;
-            Measure(availableSize);
-        }
-
-        void ILayoutable.Arrange(Rect rect)
-        {
-            Arranged = true;
-            Arrange(rect);
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            return DoMeasureOverride != null ?
-                DoMeasureOverride(this, availableSize) :
-                base.MeasureOverride(availableSize);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            Arranged = true;
-            return DoArrangeOverride != null ?
-                DoArrangeOverride(this, finalSize) :
-                base.ArrangeOverride(finalSize);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
deleted file mode 100644
index a8aa0bbf0e..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutableTests
-    {
-        [Theory]
-        [InlineData(0, 0, 0, 0, 100, 100)]
-        [InlineData(10, 0, 0, 0, 90, 100)]
-        [InlineData(10, 0, 5, 0, 85, 100)]
-        [InlineData(0, 10, 0, 0, 100, 90)]
-        [InlineData(0, 10, 0, 5, 100, 85)]
-        [InlineData(4, 4, 6, 7, 90, 89)]
-        public void Margin_Is_Applied_To_MeasureOverride_Size(
-            double l,
-            double t,
-            double r,
-            double b,
-            double expectedWidth,
-            double expectedHeight)
-        {
-            var target = new TestLayoutable
-            {
-                Margin = new Thickness(l, t, r, b),
-            };
-
-            target.Measure(new Size(100, 100));
-
-            Assert.Equal(new Size(expectedWidth, expectedHeight), target.MeasureSize);
-        }
-
-        [Theory]
-        [InlineData(HorizontalAlignment.Stretch, 100)]
-        [InlineData(HorizontalAlignment.Left, 10)]
-        [InlineData(HorizontalAlignment.Center, 10)]
-        [InlineData(HorizontalAlignment.Right, 10)]
-        public void HorizontalAlignment_Is_Applied_To_ArrangeOverride_Size(
-            HorizontalAlignment h,
-            double expectedWidth)
-        {
-            var target = new TestLayoutable
-            {
-                HorizontalAlignment = h,
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Size(expectedWidth, 100), target.ArrangeSize);
-        }
-
-        [Theory]
-        [InlineData(VerticalAlignment.Stretch, 100)]
-        [InlineData(VerticalAlignment.Top, 10)]
-        [InlineData(VerticalAlignment.Center, 10)]
-        [InlineData(VerticalAlignment.Bottom, 10)]
-        public void VerticalAlignment_Is_Applied_To_ArrangeOverride_Size(
-            VerticalAlignment v,
-            double expectedHeight)
-        {
-            var target = new TestLayoutable
-            {
-                VerticalAlignment = v,
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Size(100, expectedHeight), target.ArrangeSize);
-        }
-
-        [Theory]
-        [InlineData(0, 0, 0, 0, 100, 100)]
-        [InlineData(10, 0, 0, 0, 90, 100)]
-        [InlineData(10, 0, 5, 0, 85, 100)]
-        [InlineData(0, 10, 0, 0, 100, 90)]
-        [InlineData(0, 10, 0, 5, 100, 85)]
-        [InlineData(4, 4, 6, 7, 90, 89)]
-        public void Margin_Is_Applied_To_ArrangeOverride_Size(
-            double l,
-            double t,
-            double r,
-            double b,
-            double expectedWidth,
-            double expectedHeight)
-        {
-            var target = new TestLayoutable
-            {
-                Margin = new Thickness(l, t, r, b),
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Size(expectedWidth, expectedHeight), target.ArrangeSize);
-        }
-
-        [Fact]
-        public void Only_Calls_LayoutManager_InvalidateMeasure_Once()
-        {
-            var target = new Mock<ILayoutManager>();
-            var control = new Decorator();
-            var root = new LayoutTestRoot
-            {
-                Child = control,
-                LayoutManager = target.Object,
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-            target.Invocations.Clear();
-
-            control.InvalidateMeasure();
-            control.InvalidateMeasure();
-
-            target.Verify(x => x.InvalidateMeasure(control), Times.Once());
-        }
-
-        [Fact]
-        public void Only_Calls_LayoutManager_InvalidateArrange_Once()
-        {
-            var target = new Mock<ILayoutManager>();
-            var control = new Decorator();
-            var root = new LayoutTestRoot
-            {
-                Child = control,
-                LayoutManager = target.Object,
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-            target.Invocations.Clear();
-
-            control.InvalidateArrange();
-            control.InvalidateArrange();
-
-            target.Verify(x => x.InvalidateArrange(control), Times.Once());
-        }
-
-        [Fact]
-        public void Attaching_Control_To_Tree_Invalidates_Parent_Measure()
-        {
-            var target = new Mock<ILayoutManager>();
-            var control = new Decorator();
-            var root = new LayoutTestRoot
-            {
-                Child = control,
-                LayoutManager = target.Object,
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-            Assert.True(control.IsMeasureValid);
-
-            root.Child = null;
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-
-            Assert.False(control.IsMeasureValid);
-            Assert.True(root.IsMeasureValid);
-
-            target.Invocations.Clear();
-
-            root.Child = control;
-
-            Assert.False(root.IsMeasureValid);
-            Assert.False(control.IsMeasureValid);
-            target.Verify(x => x.InvalidateMeasure(root), Times.Once());
-        }
-
-        [Theory]
-        [InlineData(16, 6, 5.333333333333333)]
-        [InlineData(18, 10, 4)]
-        public void UseLayoutRounding_Arranges_Center_Alignment_Correctly_With_Fractional_Scaling(
-            double containerWidth,
-            double childWidth,
-            double expectedX)
-        {
-            Border target;
-            var root = new TestRoot
-            {
-                LayoutScaling = 1.5,
-                UseLayoutRounding = true,
-                Child = new Decorator
-                {
-                    Width = containerWidth,
-                    Height = 100,
-                    Child = target = new Border
-                    {
-                        Width = childWidth,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                    }
-                }
-            };
-
-            root.Measure(new Size(100, 100));
-            root.Arrange(new Rect(target.DesiredSize));
-
-            Assert.Equal(new Rect(expectedX, 0, childWidth, 100), target.Bounds);
-        }
-
-        [Fact]
-        public void LayoutUpdated_Is_Called_At_End_Of_Layout_Pass()
-        {
-            Border border1;
-            Border border2;
-            var root = new TestRoot
-            {
-                Child = border1 = new Border
-                {
-                    Child = border2 = new Border(),
-                },
-            };
-            var raised = 0;
-
-            void ValidateBounds(object sender, EventArgs e)
-            {
-                Assert.Equal(new Rect(0, 0, 100, 100), border1.Bounds);
-                Assert.Equal(new Rect(0, 0, 100, 100), border2.Bounds);
-                ++raised;
-            }
-
-            root.LayoutUpdated += ValidateBounds;
-            border1.LayoutUpdated += ValidateBounds;
-            border2.LayoutUpdated += ValidateBounds;
-
-            root.Measure(new Size(100, 100));
-            root.Arrange(new Rect(0, 0, 100, 100));
-            
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.Equal(3, raised);
-            Assert.Equal(new Rect(0, 0, 100, 100), border1.Bounds);
-            Assert.Equal(new Rect(0, 0, 100, 100), border2.Bounds);
-        }
-
-        [Fact]
-        public void LayoutUpdated_Subscribes_To_LayoutManager()
-        {
-            Border target;
-            var layoutManager = new Mock<ILayoutManager>();
-            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
-
-            var root = new TestRoot
-            {
-                Child = new Border
-                {
-                    Child = target = new Border(),
-                },
-                LayoutManager = layoutManager.Object,
-            };
-
-            void Handler(object sender, EventArgs e) {}
-
-            layoutManager.Invocations.Clear();
-            target.LayoutUpdated += Handler;
-
-            layoutManager.VerifyAdd(
-                x => x.LayoutUpdated += It.IsAny<EventHandler>(),
-                Times.Once);
-
-            layoutManager.Invocations.Clear();
-            target.LayoutUpdated -= Handler;
-
-            layoutManager.VerifyRemove(
-                x => x.LayoutUpdated -= It.IsAny<EventHandler>(),
-                Times.Once);
-        }
-
-        [Fact]
-        public void LayoutManager_LayoutUpdated_Is_Subscribed_When_Attached_To_Tree()
-        {
-            Border border1;
-            var layoutManager = new Mock<ILayoutManager>();
-            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
-
-            var root = new TestRoot
-            {
-                Child = border1 = new Border(),
-                LayoutManager = layoutManager.Object,
-            };
-
-            var border2 = new Border();
-            border2.LayoutUpdated += (s, e) => { };
-
-            layoutManager.Invocations.Clear();
-            border1.Child = border2;
-
-            layoutManager.VerifyAdd(
-                x => x.LayoutUpdated += It.IsAny<EventHandler>(),
-                Times.Once);
-        }
-
-        [Fact]
-        public void LayoutManager_LayoutUpdated_Is_Unsubscribed_When_Detached_From_Tree()
-        {
-            Border border1;
-            var layoutManager = new Mock<ILayoutManager>();
-            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
-
-            var root = new TestRoot
-            {
-                Child = border1 = new Border(),
-                LayoutManager = layoutManager.Object,
-            };
-
-            var border2 = new Border();
-            border2.LayoutUpdated += (s, e) => { };
-            border1.Child = border2;
-
-            layoutManager.Invocations.Clear();
-            border1.Child = null;
-
-            layoutManager.VerifyRemove(
-                x => x.LayoutUpdated -= It.IsAny<EventHandler>(),
-                Times.Once);
-        }
-
-        private class TestLayoutable : Layoutable
-        {
-            public Size ArrangeSize { get; private set; }
-            public Size MeasureResult { get; set; } = new Size(10, 10);
-            public Size MeasureSize { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                MeasureSize = availableSize;
-                return MeasureResult;
-            }
-
-            protected override Size ArrangeOverride(Size finalSize)
-            {
-                ArrangeSize = finalSize;
-                return base.ArrangeOverride(finalSize);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
deleted file mode 100644
index 178855d71c..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
+++ /dev/null
@@ -1,426 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Media;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutableTests_EffectiveViewportChanged
-    {
-        [Fact]
-        public async Task EffectiveViewportChanged_Not_Raised_When_Control_Added_To_Tree()
-        {
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-            await RunOnUIThread.Execute(async () =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-            {
-                var root = CreateRoot();
-                var target = new Canvas();
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                Assert.Equal(0, raised);
-            });
-        }
-
-        [Fact]
-        public async Task EffectiveViewportChanged_Raised_Before_LayoutUpdated()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas();
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                await ExecuteInitialLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Parent_Affects_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-550, -400, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                await ExecuteInitialLayoutPass(root);
-            });
-        }
-
-        [Fact]
-        public async Task Invalidating_In_Handler_Causes_Layout_To_Be_Rerun_Before_LayoutUpdated_Raised()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new TestCanvas();
-                var raised = 0;
-                var layoutUpdatedRaised = 0;
-
-                root.LayoutUpdated += (s, e) =>
-                {
-                    Assert.Equal(2, target.MeasureCount);
-                    Assert.Equal(2, target.ArrangeCount);
-                    ++layoutUpdatedRaised;
-                };
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    target.InvalidateMeasure();
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                await ExecuteInitialLayoutPass(root);
-
-                Assert.Equal(1, raised);
-                Assert.Equal(1, layoutUpdatedRaised);
-            });
-        }
-
-        [Fact]
-        public async Task Viewport_Extends_Beyond_Centered_Control()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 52, Height = 52, };
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                await ExecuteInitialLayoutPass(root);
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Viewport_Extends_Beyond_Nested_Centered_Control()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 52, Height = 52 };
-                var parent = new Border { Width = 100, Height = 100, Child = target };
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task ScrollViewer_Determines_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 200, Height = 200 };
-                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(0, 0, 100, 100), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                root.Child = scroller;
-
-                await ExecuteInitialLayoutPass(root);
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Scrolled_ScrollViewer_Determines_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 200, Height = 200 };
-                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
-                var raised = 0;
-
-                root.Child = scroller;
-
-                await ExecuteInitialLayoutPass(root);
-                scroller.Offset = new Vector(0, 10);
-
-                await ExecuteScrollerLayoutPass(root, scroller, target, (s, e) =>
-                {
-                    Assert.Equal(new Rect(0, 10, 100, 100), e.EffectiveViewport);
-                    ++raised;
-                });
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Moving_Parent_Updates_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-554, -400, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                parent.Margin = new Thickness(8, 0, 0, 0);
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Translate_Transform_Doesnt_Affect_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-                target.EffectiveViewportChanged += (s, e) => ++raised;
-                target.RenderTransform = new TranslateTransform { X = 8 };
-                target.InvalidateMeasure();
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(0, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Translate_Transform_On_Parent_Affects_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-558, -400, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                // Change the parent render transform to move it. A layout is then needed before
-                // EffectiveViewportChanged is raised.
-                parent.RenderTransform = new TranslateTransform { X = 8 };
-                parent.InvalidateMeasure();
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Rotate_Transform_On_Parent_Affects_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    AssertArePixelEqual(new Rect(-651, -792, 1484, 1484), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                parent.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
-                parent.RenderTransform = new RotateTransform { Angle = 45 };
-                parent.InvalidateMeasure();
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        private TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 };
-
-        private Task ExecuteInitialLayoutPass(TestRoot root)
-        {
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            return Task.CompletedTask;
-        }
-
-        private Task ExecuteLayoutPass(TestRoot root)
-        {
-            root.LayoutManager.ExecuteLayoutPass();
-            return Task.CompletedTask;
-        }
-
-        private Task ExecuteScrollerLayoutPass(
-            TestRoot root,
-            ScrollViewer scroller,
-            Control target,
-            Action<object, EffectiveViewportChangedEventArgs> handler)
-        {
-            void ViewportChanged(object sender, EffectiveViewportChangedEventArgs e)
-            {
-                handler(sender, e);
-            }
-
-            target.EffectiveViewportChanged += ViewportChanged;
-            root.LayoutManager.ExecuteLayoutPass();
-            return Task.CompletedTask;
-        }
-        private IControlTemplate ScrollViewerTemplate()
-        {
-            return new FuncControlTemplate<ScrollViewer>((control, scope) => new Grid
-            {
-                ColumnDefinitions = new ColumnDefinitions
-                {
-                    new ColumnDefinition(1, GridUnitType.Star),
-                    new ColumnDefinition(GridLength.Auto),
-                },
-                RowDefinitions = new RowDefinitions
-                {
-                    new RowDefinition(1, GridUnitType.Star),
-                    new RowDefinition(GridLength.Auto),
-                },
-                Children =
-                {
-                    new ScrollContentPresenter
-                    {
-                        Name = "PART_ContentPresenter",
-                        [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
-                        [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
-                        [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
-                        [~~ScrollContentPresenter.ViewportProperty] = control[~~ScrollViewer.ViewportProperty],
-                        [~ScrollContentPresenter.CanHorizontallyScrollProperty] = control[~ScrollViewer.CanHorizontallyScrollProperty],
-                        [~ScrollContentPresenter.CanVerticallyScrollProperty] = control[~ScrollViewer.CanVerticallyScrollProperty],
-                    }.RegisterInNameScope(scope),
-                    new ScrollBar
-                    {
-                        Name = "horizontalScrollBar",
-                        Orientation = Orientation.Horizontal,
-                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
-                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
-                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.HorizontalScrollBarViewportSizeProperty],
-                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty],
-                        [Grid.RowProperty] = 1,
-                    }.RegisterInNameScope(scope),
-                    new ScrollBar
-                    {
-                        Name = "verticalScrollBar",
-                        Orientation = Orientation.Vertical,
-                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
-                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
-                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.VerticalScrollBarViewportSizeProperty],
-                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty],
-                        [Grid.ColumnProperty] = 1,
-                    }.RegisterInNameScope(scope),
-                },
-            });
-        }
-
-        private void AssertArePixelEqual(Rect expected, Rect actual)
-        {
-            var expectedRounded = new Rect((int)expected.X, (int)expected.Y, (int)expected.Width, (int)expected.Height);
-            var actualRounded = new Rect((int)actual.X, (int)actual.Y, (int)actual.Width, (int)actual.Height);
-            Assert.Equal(expectedRounded, actualRounded);
-        }
-
-        private class TestCanvas : Canvas
-        {
-            public int MeasureCount { get; private set; }
-            public int ArrangeCount { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                ++MeasureCount;
-                return base.MeasureOverride(availableSize);
-            }
-
-            protected override Size ArrangeOverride(Size finalSize)
-            {
-                ++ArrangeCount;
-                return base.ArrangeOverride(finalSize);
-            }
-        }
-
-        private static class RunOnUIThread
-        {
-            public static async Task Execute(Func<Task> func)
-            {
-                await func();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs b/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
deleted file mode 100644
index 140ebede15..0000000000
--- a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class MeasureTests
-    {
-        [Fact]
-        public void Margin_Should_Be_Included_In_DesiredSize()
-        {
-            var decorator = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Margin = new Thickness(8),
-            };
-
-            decorator.Measure(Size.Infinity);
-
-            Assert.Equal(new Size(116, 116), decorator.DesiredSize);
-        }
-
-        [Fact]
-        public void Invalidating_Child_Should_Not_Invalidate_Parent()
-        {
-            var panel = new StackPanel();
-            var child = new Border();
-            panel.Children.Add(child);
-
-            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-
-            Assert.Equal(new Size(0, 0), panel.DesiredSize);
-
-            child.Width = 100;
-            child.Height = 100;
-
-            Assert.True(panel.IsMeasureValid);
-            Assert.False(child.IsMeasureValid);
-
-            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            Assert.Equal(new Size(0, 0), panel.DesiredSize);
-        }
-
-        [Fact]
-        public void Removing_From_Parent_Should_Invalidate_Measure_Of_Control_And_Descendants()
-        {
-            var panel = new StackPanel();
-            var child2 = new Border();
-            var child1 = new Border { Child = child2 };
-            panel.Children.Add(child1);
-
-            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            Assert.True(child1.IsMeasureValid);
-            Assert.True(child2.IsMeasureValid);
-
-            panel.Children.Remove(child1);
-            Assert.False(child1.IsMeasureValid);
-            Assert.False(child2.IsMeasureValid);
-        }
-
-        [Fact]
-        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Width_0()
-        {
-            Control target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new Control
-                {
-                    Margin = new Thickness(-100, 0, 0, 0),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(0, target.DesiredSize.Width);
-        }
-
-        [Fact]
-        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Height_0()
-        {
-            Control target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new Control
-                {
-                    Margin = new Thickness(0, -100, 0, 0),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(0, target.DesiredSize.Height);
-        }
-
-        [Fact]
-        public void Margin_Should_Affect_AvailableSize()
-        {
-            MeasureTest target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new MeasureTest
-                {
-                    Margin = new Thickness(10),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(new Size(80, 80), target.AvailableSize);
-        }
-
-        [Fact]
-        public void Margin_Should_Be_Applied_Before_Width_Height()
-        {
-            MeasureTest target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new MeasureTest
-                {
-                    Width = 80,
-                    Height = 80,
-                    Margin = new Thickness(10),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(new Size(80, 80), target.AvailableSize);
-        }
-
-        class MeasureTest : Control
-        {
-            public Size? AvailableSize { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                AvailableSize = availableSize;
-                return availableSize;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs
deleted file mode 100644
index a7b378c322..0000000000
--- a/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class NonVirtualizingStackLayoutTests
-    {
-        [Fact]
-        public void Lays_Out_Children_Vertically()
-        {
-            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Vertical };
-            var context = CreateContext(new[]
-            {
-                new Border { Height = 20, Width = 120 },
-                new Border { Height = 30 },
-                new Border { Height = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(120, 100), desiredSize);
-            Assert.Equal(new Size(120, 100), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
-            Assert.Equal(new Rect(0, 20, 120, 30), context.Children[1].Bounds);
-            Assert.Equal(new Rect(0, 50, 120, 50), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Lays_Out_Children_Horizontally()
-        {
-            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Horizontal };
-            var context = CreateContext(new[]
-            {
-                new Border { Width = 20, Height = 120 },
-                new Border { Width = 30 },
-                new Border { Width = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(100, 120), desiredSize);
-            Assert.Equal(new Size(100, 120), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
-            Assert.Equal(new Rect(20, 0, 30, 120), context.Children[1].Bounds);
-            Assert.Equal(new Rect(50, 0, 50, 120), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Lays_Out_Children_Vertically_With_Spacing()
-        {
-            var target = new NonVirtualizingStackLayout 
-            { 
-                Orientation = Orientation.Vertical,
-                Spacing = 10,
-            };
-
-            var context = CreateContext(new[]
-            {
-                new Border { Height = 20, Width = 120 },
-                new Border { Height = 30 },
-                new Border { Height = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(120, 120), desiredSize);
-            Assert.Equal(new Size(120, 120), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
-            Assert.Equal(new Rect(0, 30, 120, 30), context.Children[1].Bounds);
-            Assert.Equal(new Rect(0, 70, 120, 50), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Lays_Out_Children_Horizontally_With_Spacing()
-        {
-            var target = new NonVirtualizingStackLayout 
-            { 
-                Orientation = Orientation.Horizontal,
-                Spacing = 10,
-            };
-
-            var context = CreateContext(new[]
-            {
-                new Border { Width = 20, Height = 120 },
-                new Border { Width = 30 },
-                new Border { Width = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(120, 120), desiredSize);
-            Assert.Equal(new Size(120, 120), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
-            Assert.Equal(new Rect(30, 0, 30, 120), context.Children[1].Bounds);
-            Assert.Equal(new Rect(70, 0, 50, 120), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Arranges_Vertical_Children_With_Correct_Bounds()
-        {
-            var target = new NonVirtualizingStackLayout
-            {
-                Orientation = Orientation.Vertical
-            };
-            
-            var context = CreateContext(new[]
-            {
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    MeasureSize = new Size(150, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    MeasureSize = new Size(150, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    MeasureSize = new Size(150, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    MeasureSize = new Size(150, 10),
-                },
-            });
-
-            var desiredSize = target.Measure(context, new Size(100, 150));
-            Assert.Equal(new Size(100, 80), desiredSize);
-
-            target.Arrange(context, desiredSize);
-
-            var bounds = context.Children.Select(x => x.Bounds).ToArray();
-
-            Assert.Equal(
-                new[]
-                {
-                    new Rect(0, 0, 50, 10),
-                    new Rect(0, 10, 100, 10),
-                    new Rect(25, 20, 50, 10),
-                    new Rect(0, 30, 100, 10),
-                    new Rect(50, 40, 50, 10),
-                    new Rect(0, 50, 100, 10),
-                    new Rect(0, 60, 100, 10),
-                    new Rect(0, 70, 100, 10),
-
-                }, bounds);
-        }
-
-        [Fact]
-        public void Arranges_Horizontal_Children_With_Correct_Bounds()
-        {
-            var target = new NonVirtualizingStackLayout
-            {
-                Orientation = Orientation.Horizontal
-            };
-
-            var context = CreateContext(new[]
-            {
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Top,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Top,
-                    MeasureSize = new Size(10, 150),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Center,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Center,
-                    MeasureSize = new Size(10, 150),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Bottom,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Bottom,
-                    MeasureSize = new Size(10, 150),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Stretch,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Stretch,
-                    MeasureSize = new Size(10, 150),
-                },
-            });
-
-            var desiredSize = target.Measure(context, new Size(150, 100));
-            Assert.Equal(new Size(80, 100), desiredSize);
-
-            target.Arrange(context, desiredSize);
-
-            var bounds = context.Children.Select(x => x.Bounds).ToArray();
-
-            Assert.Equal(
-                new[]
-                {
-                    new Rect(0, 0, 10, 50),
-                    new Rect(10, 0, 10, 100),
-                    new Rect(20, 25, 10, 50),
-                    new Rect(30, 0, 10, 100),
-                    new Rect(40, 50, 10, 50),
-                    new Rect(50, 0, 10, 100),
-                    new Rect(60, 0, 10, 100),
-                    new Rect(70, 0, 10, 100),
-                }, bounds);
-        }
-
-        [Theory]
-        [InlineData(Orientation.Horizontal)]
-        [InlineData(Orientation.Vertical)]
-        public void Spacing_Not_Added_For_Invisible_Children(Orientation orientation)
-        {
-            var targetThreeChildrenOneInvisble = new NonVirtualizingStackLayout
-            {
-                Orientation = orientation,
-                Spacing = 40,
-            };
-
-            var contextThreeChildrenOneInvisble = CreateContext(new[]
-            {
-                new StackPanel { Width = 10, Height= 10, IsVisible = false },
-                new StackPanel { Width = 10, Height= 10 },
-                new StackPanel { Width = 10, Height= 10 },
-            });
-
-            var targetTwoChildrenNoneInvisible = new NonVirtualizingStackLayout
-            {
-                Spacing = 40,
-                Orientation = orientation,
-            };
-
-            var contextTwoChildrenNoneInvisible = CreateContext(new[]
-            {
-                new StackPanel { Width = 10, Height = 10 },
-                new StackPanel { Width = 10, Height = 10 }
-            });
-
-            var desiredSize1 = targetThreeChildrenOneInvisble.Measure(contextThreeChildrenOneInvisble, Size.Infinity);
-            var desiredSize2 = targetTwoChildrenNoneInvisible.Measure(contextTwoChildrenNoneInvisible, Size.Infinity);
- 
-            Assert.Equal(desiredSize2, desiredSize1);
-        }
-
-        [Theory]
-        [InlineData(Orientation.Horizontal)]
-        [InlineData(Orientation.Vertical)]
-        public void Only_Arrange_Visible_Children(Orientation orientation)
-        {
-            var hiddenPanel = new Panel { Width = 10, Height = 10, IsVisible = false };
-            var panel = new Panel { Width = 10, Height = 10 };
-
-            var target = new NonVirtualizingStackLayout
-            {
-                Spacing = 40,
-                Orientation = orientation,
-            };
-
-            var context = CreateContext(new[]
-            {
-                hiddenPanel,
-                panel
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-            Assert.Equal(new Size(10, 10), arrangeSize);
-        }
-
-        private NonVirtualizingLayoutContext CreateContext(Control[] children)
-        {
-            return new TestLayoutContext(children);
-        }
-
-        private class TestLayoutContext : NonVirtualizingLayoutContext
-        {
-            public TestLayoutContext(Control[] children) => ChildrenCore = children;
-            protected override IReadOnlyList<ILayoutable> ChildrenCore { get; }
-        }
-
-        private class TestControl : Control
-        {
-            public Size MeasureConstraint { get; private set; }
-            public Size MeasureSize { get; set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                MeasureConstraint = availableSize;
-                return MeasureSize;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6f62e38bda..0000000000
--- a/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Layout.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index d49a859b89..4572f7ae7c 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -9,17 +9,13 @@
   <Import Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\SharedVersion.props" />
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
     <Compile Remove="testproject/**/*.cs" />
   </ItemGroup>
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index eed767e771..a7474dc92e 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -1,17 +1,23 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
+using System.Reactive.Disposables;
+
+using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Diagnostics;
 using Avalonia.Input;
-using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Styling;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using JetBrains.dotMemoryUnit;
@@ -24,11 +30,55 @@ namespace Avalonia.LeakTests
     [DotMemoryUnit(FailIfRunWithoutSupport = false)]
     public class ControlTests
     {
+        // Need to have the collection as field, so GC will not free it
+        private readonly ObservableCollection<string> _observableCollection = new();
+        
         public ControlTests(ITestOutputHelper atr)
         {
             DotMemoryUnitTestOutput.SetOutputMethod(atr.WriteLine);
         }
 
+ 
+        [Fact]
+        public void DataGrid_Is_Freed()
+        {
+            using (Start())
+            {
+                // When attached to INotifyCollectionChanged, DataGrid will subscribe to it's events, potentially causing leak
+                Func<Window> run = () =>
+                {
+                    var window = new Window
+                    {
+                        Content = new DataGrid
+                        {
+                            Items = _observableCollection
+                        }
+                    };
+
+                    window.Show();
+
+                    // Do a layout and make sure that DataGrid gets added to visual tree.
+                    window.LayoutManager.ExecuteInitialLayoutPass();
+                    Assert.IsType<DataGrid>(window.Presenter.Child);
+
+                    // Clear the content and ensure the DataGrid is removed.
+                    window.Content = null;
+                    window.LayoutManager.ExecuteLayoutPass();
+                    Assert.Null(window.Presenter.Child);
+
+                    return window;
+                };
+
+                var result = run();
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<DataGrid>()).ObjectsCount));
+            }
+        }
+
         [Fact]
         public void Canvas_Is_Freed()
         {
@@ -57,6 +107,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Canvas>()).ObjectsCount));
             }
@@ -98,6 +151,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Canvas>()).ObjectsCount));
             }
@@ -136,6 +192,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TextBox>()).ObjectsCount));
                 dotMemory.Check(memory =>
@@ -173,6 +232,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TextBox>()).ObjectsCount));
             }
@@ -218,6 +280,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TextBox>()).ObjectsCount));
                 dotMemory.Check(memory =>
@@ -249,7 +314,7 @@ namespace Avalonia.LeakTests
 
                 // The TextBox should have subscriptions to its Classes collection from the
                 // default theme.
-                Assert.NotEmpty(((INotifyCollectionChangedDebug)textBox.Classes).GetCollectionChangedSubscribers());
+                Assert.NotEqual(0, textBox.Classes.ListenerCount);
 
                 // Clear the content and ensure the TextBox is removed.
                 window.Content = null;
@@ -308,6 +373,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TreeView>()).ObjectsCount));
             }
@@ -341,6 +409,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Slider>()).ObjectsCount));
             }
@@ -378,6 +449,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TabItem>()).ObjectsCount));
             }
@@ -453,6 +527,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Canvas>()).ObjectsCount));
             }
@@ -493,10 +570,13 @@ namespace Avalonia.LeakTests
                     initialMenuCount = memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount;
                     initialMenuItemCount = memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount;
                 });
-                
+
                 AttachShowAndDetachContextMenu(window);
 
-                Mock.Get(ValidatingWindowImpl.Unwrap(window.PlatformImpl)).Invocations.Clear();
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                Mock.Get(window.PlatformImpl).Invocations.Clear();
                 dotMemory.Check(memory =>
                     Assert.Equal(initialMenuCount, memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount));
                 dotMemory.Check(memory =>
@@ -537,11 +617,14 @@ namespace Avalonia.LeakTests
                     initialMenuCount = memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount;
                     initialMenuItemCount = memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount;
                 });
-                
+
                 BuildAndShowContextMenu(window);
                 BuildAndShowContextMenu(window);
 
-                Mock.Get(ValidatingWindowImpl.Unwrap(window.PlatformImpl)).Invocations.Clear();
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                Mock.Get(window.PlatformImpl).Invocations.Clear();
                 dotMemory.Check(memory =>
                     Assert.Equal(initialMenuCount, memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount));
                 dotMemory.Check(memory =>
@@ -580,6 +663,9 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Path>()).ObjectsCount));
 
@@ -614,19 +700,322 @@ namespace Avalonia.LeakTests
 
                 var result = run();
 
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
                 dotMemory.Check(memory =>
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<ItemsRepeater>()).ObjectsCount));
             }
         }
 
+        [Fact]
+        public void ElementName_Binding_In_DataTemplate_Is_Freed()
+        {
+            using (Start())
+            {
+                var items = new ObservableCollection<int>(Enumerable.Range(0, 10));
+                NameScope ns;
+                TextBox tb;
+                ListBox lb;
+                var window = new Window
+                {
+                    [NameScope.NameScopeProperty] = ns = new NameScope(),
+                    Width = 100,
+                    Height = 100,
+                    Content = new StackPanel
+                    {
+                        Children =
+                        {
+                            (tb = new TextBox
+                            {
+                                Name = "tb",
+                                Text = "foo",
+                            }),
+                            (lb = new ListBox
+                            {
+                                Items = items,
+                                ItemTemplate = new FuncDataTemplate<int>((_, _) =>
+                                    new Canvas
+                                    {
+                                        Width = 10,
+                                        Height = 10,
+                                        [!Control.TagProperty] = new Binding
+                                        {
+                                            ElementName = "tb",
+                                            Path = "Text",
+                                            NameScope = new WeakReference<INameScope>(ns),
+                                        }
+                                    })
+                            }),
+                        }
+                    }
+                };
+
+                tb.RegisterInNameScope(ns);
+
+                window.Show();
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                void AssertInitialItemState()
+                {
+                    var item0 = (ListBoxItem)lb.ItemContainerGenerator.Containers.First().ContainerControl;
+                    var canvas0 = (Canvas)item0.Presenter.Child;
+                    Assert.Equal("foo", canvas0.Tag);
+                }
+               
+                Assert.Equal(10, lb.ItemContainerGenerator.Containers.Count());
+                AssertInitialItemState();
+
+                items.Clear();
+                window.LayoutManager.ExecuteLayoutPass();
+
+                Assert.Empty(lb.ItemContainerGenerator.Containers);
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Canvas>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void HotKeyManager_Should_Release_Reference_When_Control_Detached()
+        {
+            using (Start())
+            {
+                Func<Window> run = () =>
+                {
+                    var gesture1 = new KeyGesture(Key.A, KeyModifiers.Control);
+                    var tl = new Window
+                    {
+                        Content = new ItemsRepeater(),
+                    };
+
+                    tl.Show();
+
+                    var button = new Button();
+                    tl.Content = button;
+                    tl.Template = CreateWindowTemplate();
+                    tl.ApplyTemplate();
+                    tl.Presenter.ApplyTemplate();
+                    HotKeyManager.SetHotKey(button, gesture1);
+
+                    // Detach the button from the logical tree, so there is no reference to it
+                    tl.Content = null;
+                    tl.ApplyTemplate();
+
+                    return tl;
+                };
+
+                var result = run();
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Button>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void HotKeyManager_Should_Release_Reference_When_Control_In_Item_Template_Detached()
+        {
+            using (Start())
+            {
+                Func<Window> run = () =>
+                {
+                    var gesture1 = new KeyGesture(Key.A, KeyModifiers.Control);
+
+                    var tl = new Window { SizeToContent = SizeToContent.WidthAndHeight, IsVisible = true };
+                    var lm = tl.LayoutManager;
+                    tl.Show();
+
+                    var keyGestures = new AvaloniaList<KeyGesture> { gesture1 };
+                    var listBox = new ListBox
+                    {
+                        Width = 100,
+                        Height = 100,
+                        VirtualizationMode = ItemVirtualizationMode.None,
+                        // Create a button with binding to the KeyGesture in the template and add it to references list
+                        ItemTemplate = new FuncDataTemplate(typeof(KeyGesture), (o, scope) =>
+                        {
+                            var keyGesture = o as KeyGesture;
+                            return new Button
+                            {
+                                DataContext = keyGesture,
+                                [!Button.HotKeyProperty] = new Binding("")
+                            };
+                        })
+                    };
+                    // Add the listbox and render it
+                    tl.Content = listBox;
+                    lm.ExecuteInitialLayoutPass();
+                    listBox.Items = keyGestures;
+                    lm.ExecuteLayoutPass();
+
+                    // Let the button detach when clearing the source items
+                    keyGestures.Clear();
+                    lm.ExecuteLayoutPass();
+
+                    // Add it again to double check,and render
+                    keyGestures.Add(gesture1);
+                    lm.ExecuteLayoutPass();
+
+                    keyGestures.Clear();
+                    lm.ExecuteLayoutPass();
+
+                    return tl;
+                };
+
+                var result = run();
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Button>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void ToolTip_Is_Freed()
+        {
+            using (Start())
+            {
+                Func<Window> run = () =>
+                {
+                    var window = new Window();
+                    var source = new Button
+                    {
+                        Template = new FuncControlTemplate<Button>((parent, _) =>
+                            new Decorator
+                            {
+                                [ToolTip.TipProperty] = new TextBlock
+                                {
+                                    [~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty)
+                                }
+                            }),
+                    };
+
+                    window.Content = source;
+                    window.Show();
+
+                    var templateChild = (Decorator)source.GetVisualChildren().Single();
+                    ToolTip.SetIsOpen(templateChild, true);
+
+                    ToolTip.SetIsOpen(templateChild, false);
+
+                    // Detach the button from the logical tree, so there is no reference to it
+                    window.Content = null;
+                    
+                    // Mock keep reference on a Popup via InvocationsCollection. So let's clear it before. 
+                    Mock.Get(window.PlatformImpl).Invocations.Clear();
+                    
+                    return window;
+                };
+
+                var result = run();
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                {
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TextBlock>()).ObjectsCount);
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<ToolTip>()).ObjectsCount);
+                });
+            }
+        }
+        
+        [Fact]
+        public void Flyout_Is_Freed()
+        {
+            using (Start())
+            {
+                Func<Window> run = () =>
+                {
+                    var window = new Window();
+                    var source = new Button
+                    {
+                        Template = new FuncControlTemplate<Button>((parent, _) =>
+                            new Button
+                            {
+                                Flyout = new Flyout
+                                {
+                                    Content = new TextBlock
+                                    {
+                                        [~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty)
+                                    }
+                                }
+                            }),
+                    };
+
+                    window.Content = source;
+                    window.Show();
+
+                    var templateChild = (Button)source.GetVisualChildren().Single();
+                    templateChild.Flyout!.ShowAt(templateChild);
+                    
+                    templateChild.Flyout!.Hide();
+
+                    // Detach the button from the logical tree, so there is no reference to it
+                    window.Content = null;
+
+                    // Mock keep reference on a Popup via InvocationsCollection. So let's clear it before. 
+                    Mock.Get(window.PlatformImpl).Invocations.Clear();
+                    
+                    return window;
+                };
+
+                var result = run();
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                {
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TextBlock>()).ObjectsCount);
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Flyout>()).ObjectsCount);
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Popup>()).ObjectsCount);
+                });
+            }
+        }
+        
+        private FuncControlTemplate CreateWindowTemplate()
+        {
+            return new FuncControlTemplate<Window>((parent, scope) =>
+            {
+                return new ContentPresenter
+                {
+                    Name = "PART_ContentPresenter",
+                    [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
+                }.RegisterInNameScope(scope);
+            });
+        }
+
         private IDisposable Start()
         {
-            return UnitTestApplication.Start(TestServices.StyledWindow.With(
-                focusManager: new FocusManager(),
-                keyboardDevice: () => new KeyboardDevice(),
-                inputManager: new InputManager()));
+            static void Cleanup()
+            {
+                // KeyboardDevice holds a reference to the focused item.
+                KeyboardDevice.Instance.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
+                
+                // Empty the dispatcher queue.
+                Dispatcher.UIThread.RunJobs();
+            }
+
+            return new CompositeDisposable
+            {
+                Disposable.Create(Cleanup),
+                UnitTestApplication.Start(TestServices.StyledWindow.With(
+                    focusManager: new FocusManager(),
+                    keyboardDevice: () => new KeyboardDevice(),
+                    inputManager: new InputManager()))
+            };
         }
 
+
         private class Node
         {
             public string Name { get; set; }
diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
index fceea56273..fc15ad8230 100644
--- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
+++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
@@ -13,14 +13,8 @@
   <Import Project="..\..\build\SharedVersion.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index 055de999e2..f4a4a2934f 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -617,6 +617,36 @@ namespace Avalonia.Markup.UnitTests.Data
             
             Assert.Equal(0, source.SubscriberCount);
         }
+        
+        [Fact]
+        public void Binding_Can_Resolve_Property_From_IReflectableType_Type()
+        {
+            var source = new DynamicReflectableType { ["Foo"] = "foo" };
+            var target = new TwoWayBindingTest { DataContext = source };
+            var binding = new Binding
+            {
+                Path = "Foo",
+            };
+
+            target.Bind(TwoWayBindingTest.TwoWayProperty, binding);
+
+            Assert.Equal("foo", target.TwoWay);
+            source["Foo"] = "bar";
+            Assert.Equal("bar", target.TwoWay);
+            target.TwoWay = "baz";
+            Assert.Equal("baz", source["Foo"]);
+        }
+
+        [Fact]
+        public void Binding_To_Types_Should_Work()
+        {
+            var type = typeof(string);
+            var textBlock = new TextBlock() { DataContext = type };
+            using (textBlock.Bind(TextBlock.TextProperty, new Binding("Name")))
+            {
+                Assert.Equal("String", textBlock.Text);
+            };
+        }
 
         private class StyledPropertyClass : AvaloniaObject
         {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Method.cs
new file mode 100644
index 0000000000..e613a178d5
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Method.cs
@@ -0,0 +1,32 @@
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Xunit;
+
+namespace Avalonia.Markup.UnitTests.Data
+{
+    public class BindingTests_Method
+    {
+        [Fact]
+        public void Binding_To_Private_Methods_Shouldnt_Work()
+        {
+            var vm = new TestClass();
+            var target = new Button
+            {
+                DataContext = vm,
+                [!Button.CommandProperty] = new Binding("MyMethod"),
+            };
+            target.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent));
+
+            Assert.False(vm.IsSet);
+        }
+
+
+        class TestClass
+        {
+            public bool IsSet { get; set; }
+            private void MyMethod() => IsSet = true;
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
index 37721badb0..f04b95aaff 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -1,16 +1,11 @@
-using System;
+using System.Linq;
 using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Moq;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Styling;
-using Xunit;
-using System.Reactive.Disposables;
-using Avalonia.UnitTests;
 using Avalonia.VisualTree;
-using System.Linq;
-using Avalonia.Markup.Data;
+using Xunit;
 
 namespace Avalonia.Markup.UnitTests.Data
 {
@@ -19,53 +14,57 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void OneWay_Binding_Should_Be_Set_Up()
         {
-            var target = CreateTarget();
-            var binding = new Binding
+            var source = new Button
             {
-                Mode = BindingMode.OneWay,
-                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Priority = BindingPriority.TemplatedParent,
-                Path = "Foo",
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.ContentProperty] = new Binding
+                        {
+                            Mode = BindingMode.OneWay,
+                            RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                            Path = "Content",
+                        }
+                    }),
             };
 
-            target.Object.Bind(TextBox.TextProperty, binding);
+            source.ApplyTemplate();
 
-            target.Verify(x => x.Bind(
-                TextBox.TextProperty, 
-                It.IsAny<IObservable<BindingValue<string>>>()));
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
+
+            Assert.Null(target.Content);
+            source.Content = "foo";
+            Assert.Equal("foo", target.Content);
+            source.Content = "bar";
+            Assert.Equal("bar", target.Content);
         }
 
         [Fact]
         public void TwoWay_Binding_Should_Be_Set_Up()
         {
-            var target = CreateTarget();
-            var binding = new Binding
+            var source = new Button
             {
-                Mode = BindingMode.TwoWay,
-                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Priority = BindingPriority.TemplatedParent,
-                Path = "Foo",
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.ContentProperty] = new Binding
+                        {
+                            Mode = BindingMode.TwoWay,
+                            RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                            Path = "Content",
+                        }
+                    }),
             };
 
-            target.Object.Bind(TextBox.TextProperty, binding);
-
-            target.Verify(x => x.Bind(
-                TextBox.TextProperty,
-                It.IsAny<IObservable<BindingValue<string>>>()));
-        }
+            source.ApplyTemplate();
 
-        private Mock<IControl> CreateTarget(
-            ITemplatedControl templatedParent = null,
-            string text = null)
-        {
-            var result = new Mock<IControl>();
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
 
-            result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue(TextBox.TextProperty)).Returns(text);
-            result.Setup(x => x.Bind(It.IsAny<DirectPropertyBase<string>>(), It.IsAny<IObservable<BindingValue<string>>>()))
-                .Returns(Disposable.Empty);
-            return result;
+            Assert.Null(target.Content);
+            source.Content = "foo";
+            Assert.Equal("foo", target.Content);
+            target.Content = "bar";
+            Assert.Equal("bar", source.Content);
         }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/DynamicReflectableType.cs b/tests/Avalonia.Markup.UnitTests/Data/DynamicReflectableType.cs
new file mode 100644
index 0000000000..3c57bd38cf
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/DynamicReflectableType.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using Moq;
+
+namespace Avalonia.Markup.UnitTests.Data;
+
+class DynamicReflectableType : IReflectableType, INotifyPropertyChanged, IEnumerable<KeyValuePair<string, object>>
+{
+    private Dictionary<string, object> _dic = new();
+
+    public TypeInfo GetTypeInfo()
+    {
+        return new FakeTypeInfo();
+    }
+
+    public void Add(string key, object value)
+    {
+        _dic.Add(key, value);
+        
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(key));
+    }
+
+    public object this[string key]
+    {
+        get => _dic[key];
+        set
+        {
+            _dic[key] = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(key));
+        }
+    }
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+    {
+        return _dic.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return ((IEnumerable)_dic).GetEnumerator();
+    }
+
+
+    class FakeTypeInfo : TypeInfo
+    {
+        protected override PropertyInfo GetPropertyImpl(string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types,
+            ParameterModifier[] modifiers)
+        {
+            var propInfo = new Mock<PropertyInfo>();
+            propInfo.SetupGet(x => x.Name).Returns(name);
+            propInfo.SetupGet(x => x.PropertyType).Returns(typeof(object));
+            propInfo.SetupGet(x => x.CanWrite).Returns(true);
+            propInfo.Setup(x => x.GetValue(It.IsAny<object>(), It.IsAny<object[]>()))
+                .Returns((object target, object [] _) => ((DynamicReflectableType)target)._dic.GetValueOrDefault(name));
+            propInfo.Setup(x => x.SetValue(It.IsAny<object>(), It.IsAny<object>(), It.IsAny<object[]>()))
+                .Callback((object target, object value, object [] _) =>
+                {
+                    ((DynamicReflectableType)target)._dic[name] = value;
+                });
+            return propInfo.Object;
+        }
+
+        #region NotSupported
+
+        
+        public override object[] GetCustomAttributes(bool inherit)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override bool IsDefined(Type attributeType, bool inherit)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Module Module { get; }
+        public override string Namespace { get; }
+        public override string Name { get; }
+        protected override TypeAttributes GetAttributeFlagsImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override ConstructorInfo GetConstructorImpl(BindingFlags bindingAttr, Binder binder, CallingConventions callConvention,
+            Type[] types, ParameterModifier[] modifiers)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override ConstructorInfo[] GetConstructors(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type GetElementType()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override EventInfo GetEvent(string name, BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override EventInfo[] GetEvents(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override FieldInfo GetField(string name, BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override FieldInfo[] GetFields(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override MethodInfo GetMethodImpl(string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention,
+            Type[] types, ParameterModifier[] modifiers)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override MethodInfo[] GetMethods(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override PropertyInfo[] GetProperties(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override object InvokeMember(string name, BindingFlags invokeAttr, Binder binder, object target, object[] args,
+            ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type UnderlyingSystemType { get; }
+
+        protected override bool IsArrayImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsByRefImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsCOMObjectImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsPointerImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsPrimitiveImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Assembly Assembly { get; }
+        public override string AssemblyQualifiedName { get; }
+        public override Type BaseType { get; }
+        public override string FullName { get; }
+        public override Guid GUID { get; }
+
+        
+
+        protected override bool HasElementTypeImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type GetNestedType(string name, BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type[] GetNestedTypes(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type GetInterface(string name, bool ignoreCase)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type[] GetInterfaces()
+        {
+            throw new NotSupportedException();
+        }
+        
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
index 51cb75a867..979dbec674 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
@@ -1,11 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Data.Converters;
+using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
 
@@ -90,6 +93,162 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.Equal("bar", source.Content);
         }
 
+        [Fact]
+        public void Should_Work_Inside_Of_Tooltip()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                var source = new Button
+                {
+                    Template = new FuncControlTemplate<Button>((parent, _) =>
+                        new Decorator
+                        {
+                            [ToolTip.TipProperty] = new TextBlock
+                            {
+                                [~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty)
+                            }
+                        }),
+                };
+
+                window.Content = source;
+                window.Show();
+                try
+                {
+                    var templateChild = (Decorator)source.GetVisualChildren().Single();
+                    ToolTip.SetIsOpen(templateChild, true);
+
+                    var target = (TextBlock)ToolTip.GetTip(templateChild)!;
+
+                    Assert.Null(target.Text);
+                    source.Content = "foo";
+                    Assert.Equal("foo", target.Text);
+                    source.Content = "bar";
+                    Assert.Equal("bar", target.Text);
+                }
+                finally
+                {
+                    window.Close();
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Work_Inside_Of_Popup()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                var source = new Button
+                {
+                    Template = new FuncControlTemplate<Button>((parent, _) =>
+                        new Popup
+                        {
+                            Child = new TextBlock
+                            {
+                                [~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty)
+                            }
+                        }),
+                };
+
+                window.Content = source;
+                window.Show();
+                try
+                {
+                    var popup = (Popup)source.GetVisualChildren().Single();
+                    popup.IsOpen = true;
+
+                    var target = (TextBlock)popup.Child!;
+
+                    target[~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty);
+                    Assert.Null(target.Text);
+                    source.Content = "foo";
+                    Assert.Equal("foo", target.Text);
+                    source.Content = "bar";
+                    Assert.Equal("bar", target.Text);
+                }
+                finally
+                {
+                    window.Close();
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Work_Inside_Of_Flyout()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                var source = new Button
+                {
+                    Template = new FuncControlTemplate<Button>((parent, _) =>
+                        new Button
+                        {
+                            Flyout = new Flyout
+                            {
+                                Content = new TextBlock
+                                {
+                                    [~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty)
+                                }
+                            }
+                        }),
+                };
+
+                window.Content = source;
+                window.Show();
+                try
+                {
+                    var templateChild = (Button)source.GetVisualChildren().Single();
+                    templateChild.Flyout!.ShowAt(templateChild);
+
+                    var target = (TextBlock)((Flyout)templateChild.Flyout).Content!;
+
+                    target[~TextBlock.TextProperty] = new TemplateBinding(ContentControl.ContentProperty);
+                    Assert.Null(target.Text);
+                    source.Content = "foo";
+                    Assert.Equal("foo", target.Text);
+                    source.Content = "bar";
+                    Assert.Equal("bar", target.Text);
+                }
+                finally
+                {
+                    window.Close();
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Pass_UnsetValue_To_MultiBinding_During_ApplyTemplate()
+        {
+            var converter = new MultiConverter();
+            var source = new Button
+            {
+                Content = "foo",
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.ContentProperty] = new MultiBinding
+                        {
+                            Converter = converter,
+                            Bindings =
+                            {
+                                new TemplateBinding(ContentControl.ContentProperty),
+                            }
+                        }
+                    }),
+            };
+
+            source.ApplyTemplate();
+
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
+
+            // #8672 was caused by TemplateBinding passing "unset" to the MultiBinding during
+            // ApplyTemplate as the TemplatedParent property doesn't get setup until after the
+            // binding is initiated.
+            Assert.Equal(new[] { "foo" }, converter.Values);
+        }
+
         private class PrefixConverter : IValueConverter
         {
             public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
@@ -120,5 +279,16 @@ namespace Avalonia.Markup.UnitTests.Data
                 return null;
             }
         }
+
+        private class MultiConverter : IMultiValueConverter
+        {
+            public List<object> Values { get; } = new();
+
+            public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
+            {
+                Values.AddRange(values);
+                return values.FirstOrDefault();
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Method.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Method.cs
index b0623aa456..0e499ff256 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Method.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Method.cs
@@ -19,12 +19,9 @@ namespace Avalonia.Markup.UnitTests.Parsers
 
             public int MethodWithReturn() => 0;
 
-            public int MethodWithReturnAndParameters(int i) => i;
+            public int MethodWithReturnAndParameter(object i) => (int)i;
 
             public static void StaticMethod() { }
-
-            public static void TooManyParameters(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9) { }
-            public static int TooManyParametersWithReturnType(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) => 1;
         }
 
         [Fact]
@@ -42,7 +39,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
         [Theory]
         [InlineData(nameof(TestObject.MethodWithoutReturn), typeof(Action))]
         [InlineData(nameof(TestObject.MethodWithReturn), typeof(Func<int>))]
-        [InlineData(nameof(TestObject.MethodWithReturnAndParameters), typeof(Func<int, int>))]
+        [InlineData(nameof(TestObject.MethodWithReturnAndParameter), typeof(Func<object, int>))]
         [InlineData(nameof(TestObject.StaticMethod), typeof(Action))]
         public async Task Should_Get_Method_WithCorrectDelegateType(string methodName, Type expectedType)
         {
@@ -59,30 +56,14 @@ namespace Avalonia.Markup.UnitTests.Parsers
         public async Task Can_Call_Method_Returned_From_Observer()
         {
             var data = new TestObject();
-            var observer = ExpressionObserverBuilder.Build(data, nameof(TestObject.MethodWithReturnAndParameters));
+            var observer = ExpressionObserverBuilder.Build(data, nameof(TestObject.MethodWithReturnAndParameter));
             var result = await observer.Take(1);
 
-            var callback = (Func<int, int>)result;
+            var callback = (Func<object, int>)result;
 
             Assert.Equal(1, callback(1));
 
             GC.KeepAlive(data);
         }
-
-        [Theory]
-        [InlineData(nameof(TestObject.TooManyParameters))]
-        [InlineData(nameof(TestObject.TooManyParametersWithReturnType))]
-        public async Task Should_Return_Error_Notification_If_Too_Many_Parameters(string methodName)
-        {
-            var data = new TestObject();
-            var observer = ExpressionObserverBuilder.Build(data, methodName);
-            var result = await observer.Take(1);
-
-            Assert.IsType<BindingNotification>(result);
-
-            Assert.Equal(BindingErrorType.Error, ((BindingNotification)result).ErrorType);
-
-            GC.KeepAlive(data);
-        }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
index 6fbf024ff1..b41f37eb3d 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
@@ -469,6 +469,144 @@ namespace Avalonia.Markup.UnitTests.Parsers
                 result);
         }
 
+        [Fact]
+        public void Nesting_Class()
+        {
+            var result = SelectorGrammar.Parse("^.foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Child_Class()
+        {
+            var result = SelectorGrammar.Parse("^ > .foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.ChildSyntax { },
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Descendant_Class()
+        {
+            var result = SelectorGrammar.Parse("^ .foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.DescendantSyntax { },
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Template_Class()
+        {
+            var result = SelectorGrammar.Parse("^ /template/ .foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.TemplateSyntax { },
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void OfType_Template_Nesting()
+        {
+            var result = SelectorGrammar.Parse("Button /template/ ^");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.OfTypeSyntax { TypeName = "Button" },
+                    new SelectorGrammar.TemplateSyntax { },
+                    new SelectorGrammar.NestingSyntax(),
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Property()
+        {
+            var result = SelectorGrammar.Parse("^[Foo=bar]");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.PropertySyntax { Property = "Foo", Value = "bar" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Not_Nesting()
+        {
+            var result = SelectorGrammar.Parse(":not(^)");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NotSyntax
+                    {
+                        Argument = new[] { new SelectorGrammar.NestingSyntax() },
+                    }
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_NthChild()
+        {
+            var result = SelectorGrammar.Parse("^:nth-child(2n+1)");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.NthChildSyntax()
+                    {
+                        Step = 2,
+                        Offset = 1
+                    }
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Comma_Nesting_Class()
+        {
+            var result = SelectorGrammar.Parse("^, ^.foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.CommaSyntax(),
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
         [Fact]
         public void Namespace_Alone_Fails()
         {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 14f6525dbe..7ff19e1049 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -16,15 +16,9 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -37,5 +31,10 @@
     <AvaloniaResource Include="Xaml\XamlIlClassWithPrecompiledXaml.xaml" />
     <AvaloniaResource Include="Xaml\XamlIlClassWithCustomProperty.xaml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Avalonia.IntegrationTests.Appium\PlatformFactAttribute.cs">
+      <Link>PlatformFactAttribute.cs</Link>
+    </Compile>
+  </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
index 33bf72014c..75e21a7138 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
@@ -137,6 +137,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
                 get { throw new NotImplementedException(); }
             }
 
+            public ControlTheme GetEffectiveTheme()
+            {
+                throw new NotImplementedException();
+            }
+
             public void DetachStyles()
             {
                 throw new NotImplementedException();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
index 7931912649..d51d6122cd 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
@@ -141,6 +141,28 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             }
         }
 
+        [Fact]
+        public void Binding_Method_Preserves_Correct_Order()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Button Name='button' Command='{Binding Method3}' CommandParameter='5'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new ViewModel();
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+                PerformClick(button);
+                Assert.Equal("Called Method with parameter of object type. Argument value is 5", vm.Value);
+            }
+        }
+
         [Fact]
         public void Binding_Method_To_Command_Collected()
         {
@@ -198,8 +220,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             public event PropertyChangedEventHandler PropertyChanged;
 
             public string Method() => Value = "Called";
-            public string Method1(int i) => Value = $"Called {i}";
+            public string Method1(object i) => Value = $"Called {i}";
             public string Method2(int i, int j) => Value = $"Called {i},{j}";
+            public string Method3() => Value = "Called";
+            public string Method3(object obj) => Value = $"Called Method with parameter of object type. Argument value is {obj}";
             public string Value { get; private set; } = "Not called";
 
             object _parameter;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
index 15c6f5877f..215ae4d54f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
@@ -1,18 +1,25 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Globalization;
+using System.Linq;
 using System.Reactive.Subjects;
-using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Data.Core;
+using Avalonia.Input;
 using Avalonia.Markup.Data;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.UnitTests;
-using XamlX;
 using Xunit;
 
 namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
@@ -96,6 +103,91 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 Assert.Equal(dataContext.StringProperty, textBlock.Text);
             }
         }
+        
+        [Fact]
+        public void ResolvesPathPassedByPropertyWithInnerItemTemplate()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:TestDataContext'>
+    <ItemsControl Name='itemsControl' Items='{CompiledBinding Path=ListProperty}'>
+	    <ItemsControl.ItemTemplate>
+		    <DataTemplate>
+			    <TextBlock />
+		    </DataTemplate>
+	    </ItemsControl.ItemTemplate>
+    </ItemsControl>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<ItemsControl>("itemsControl");
+
+                var dataContext = new TestDataContext
+                {
+                    ListProperty =
+                    {
+                        "Hello"
+                    } 
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.ListProperty, textBlock.Items);
+            }
+        }
+        
+        [Fact]
+        public void ResolvesDataTypeFromBindingProperty()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <TextBlock Text='{CompiledBinding StringProperty, DataType=local:TestDataContext}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, textBlock.Text);
+            }
+        }
+        
+        [Fact]
+        public void ResolvesDataTypeFromBindingProperty_TypeExtension()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <TextBlock Text='{CompiledBinding StringProperty, DataType={x:Type local:TestDataContext}}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, textBlock.Text);
+            }
+        }
 
         [Fact]
         public void ResolvesStreamTaskBindingCorrectly()
@@ -408,11 +500,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
         x:DataType='local:TestDataContext'>
     <ItemsControl Items='{CompiledBinding ListProperty}' Name='target'>
-        <ItemsControl.DataTemplates>
+        <ItemsControl.ItemTemplate>
             <DataTemplate>
                 <TextBlock Text='{CompiledBinding}' Name='textBlock' />
             </DataTemplate>
-        </ItemsControl.DataTemplates>
+        </ItemsControl.ItemTemplate>
     </ItemsControl>
 </Window>";
                 var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -453,7 +545,106 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 ThrowsXamlTransformException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
             }
         }
+        
+        [Fact]
+        public void IgnoresDataTemplateTypeFromDataTypePropertyIfXDataTypeDefined()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Window.DataTemplates>
+        <DataTemplate DataType='local:TestDataContextBaseClass' x:DataType='local:TestDataContext'>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl x:DataType='local:TestDataContext' Name='target' Content='{CompiledBinding}' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.StringProperty = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
+            }
+        }
+        
+        [Fact]
+        public void InfersCustomDataTemplateBasedOnAttribute()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Window.DataTemplates>
+        <local:CustomDataTemplate FancyDataType='local:TestDataContext'>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </local:CustomDataTemplate>
+    </Window.DataTemplates>
+    <ContentControl x:DataType='local:TestDataContext' Name='target' Content='{CompiledBinding}' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.StringProperty = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
+            }
+        }
+
+        [Fact]
+        public void InfersCustomDataTemplateBasedOnAttributeFromBaseClass()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Window.DataTemplates>
+        <local:CustomDataTemplateInherit FancyDataType='local:TestDataContext'>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </local:CustomDataTemplateInherit>
+    </Window.DataTemplates>
+    <ContentControl x:DataType='local:TestDataContext' Name='target' Content='{CompiledBinding}' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.StringProperty = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
 
+                Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
+            }
+        }
+        
         [Fact]
         public void ResolvesElementNameBinding()
         {
@@ -536,6 +727,64 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
 
+        [Fact]
+        public void ResolvesRelativeSourceBindingFromTemplate()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<ContentControl xmlns='https://github.com/avaloniaui'
+                Content='Hello'>
+    <ContentControl.Styles>
+        <Style Selector='ContentControl'>
+            <Setter Property='Template'>
+                <ControlTemplate>
+                    <ContentPresenter Content='{CompiledBinding Content, RelativeSource={RelativeSource TemplatedParent}}' />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ContentControl.Styles>
+</ContentControl>";
+
+                var contentControl = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
+                contentControl.Measure(new Size(10, 10));
+                
+                var result = contentControl.GetTemplateChildren().OfType<ContentPresenter>().First();
+                Assert.Equal("Hello", result.Content);
+            }
+        }
+        
+        [Fact]
+        public void ResolvesElementNameInTemplate()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<ContentControl xmlns='https://github.com/avaloniaui'
+                Content='Hello'>
+    <ContentControl.Styles>
+        <Style Selector='ContentControl'>
+            <Setter Property='Template'>
+                <ControlTemplate>
+                    <Panel>
+                        <TextBox Name='InnerTextBox' Text='Hello' />
+                        <ContentPresenter Content='{CompiledBinding Text, ElementName=InnerTextBox}' />
+                    </Panel>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ContentControl.Styles>
+</ContentControl>";
+
+                var contentControl = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
+                contentControl.Measure(new Size(10, 10));
+                
+                var result = contentControl.GetTemplateChildren().OfType<ContentPresenter>().First();
+                
+                Assert.Equal("Hello", result.Content);
+            }
+        }
+        
         [Fact]
         public void Binds_To_Source()
         {
@@ -1040,6 +1289,28 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 Assert.Equal("bar-" + typeof(TestDataContext).FullName, textBlock.Text);
             }
         }
+        
+        [Fact]
+        public void SupportCastToTypeInExpressionWithProperty_ExplicitPropertyCast()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='using:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions'>
+    <ContentControl Content='{CompiledBinding $parent.((local:IHasExplicitProperty)DataContext).ExplicitProperty}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.GetControl<ContentControl>("contentControl");
+
+                var dataContext = new TestDataContext();
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(((IHasExplicitProperty)dataContext).ExplicitProperty, contentControl.Content);
+            }
+        }
 
         [Fact]
         public void Binds_To_Self_Without_DataType()
@@ -1062,6 +1333,242 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
 
+        [Fact]
+        public void Binds_To_Self_In_Style()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+       
+    <Window.Styles>
+        <Style Selector='Button'>
+            <Setter Property='IsVisible' Value='{CompiledBinding $self.IsEnabled}' />
+        </Style>
+    </Window.Styles>
+
+    <Button Name='button' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                Assert.True(button.IsVisible);
+
+                button.IsEnabled = false;
+
+                Assert.False(button.IsVisible);
+            }
+        }
+
+        [Fact]
+        public void SupportsMethodBindingAsDelegate()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:MethodDataContext'>
+    <StackPanel>
+        <ContentControl Content='{CompiledBinding Action}' Name='action' />
+        <ContentControl Content='{CompiledBinding Func}' Name='func' />
+        <ContentControl Content='{CompiledBinding Action16}' Name='action16' />
+        <ContentControl Content='{CompiledBinding Func16}' Name='func16' />
+        <ContentControl Content='{CompiledBinding CustomDelegateTypeVoid}' Name='customvoid' />
+        <ContentControl Content='{CompiledBinding CustomDelegateTypeInt}' Name='customint' />
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                window.DataContext = new MethodDataContext();
+
+                Assert.IsAssignableFrom(typeof(Action), window.FindControl<ContentControl>("action").Content);
+                Assert.IsAssignableFrom(typeof(Func<int>), window.FindControl<ContentControl>("func").Content);
+                Assert.IsAssignableFrom(typeof(Action<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>), window.FindControl<ContentControl>("action16").Content);
+                Assert.IsAssignableFrom(typeof(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>), window.FindControl<ContentControl>("func16").Content);
+                Assert.True(typeof(Delegate).IsAssignableFrom(window.FindControl<ContentControl>("customvoid").Content.GetType()));
+                Assert.True(typeof(Delegate).IsAssignableFrom(window.FindControl<ContentControl>("customint").Content.GetType()));
+            }
+        }
+
+        [Fact]
+        public void Binding_Method_To_Command_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:MethodAsCommandDataContext'>
+    <Button Name='button' Command='{CompiledBinding Method}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new MethodAsCommandDataContext();
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(button.Command);
+                PerformClick(button);
+                Assert.Equal("Called", vm.Value);
+            }
+        }
+
+        [Fact]
+        public void Binding_Method_With_Parameter_To_Command_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:MethodAsCommandDataContext'>
+    <Button Name='button' Command='{CompiledBinding Method1}' CommandParameter='5'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new MethodAsCommandDataContext();
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(button.Command);
+                PerformClick(button);
+                Assert.Equal("Called 5", vm.Value);
+            }
+        }
+
+        [Fact]
+        public void Binding_Method_To_TextBlock_Text_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:MethodAsCommandDataContext'>
+    <TextBlock Name='textBlock' Text='{CompiledBinding Method}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+                var vm = new MethodAsCommandDataContext();
+
+                textBlock.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(textBlock.Text);
+            }
+        }
+
+
+        [Theory]
+        [InlineData(null, "Not called")]
+        [InlineData("A", "Do A")]
+        public void Binding_Method_With_Parameter_To_Command_CanExecute(object commandParameter, string result)
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:MethodAsCommandDataContext'>
+    <Button Name='button' Command='{CompiledBinding Do}' CommandParameter='{CompiledBinding Parameter, Mode=OneTime}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new MethodAsCommandDataContext()
+                {
+                    Parameter = commandParameter
+                };
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(button.Command);
+                PerformClick(button);
+                Assert.Equal(vm.Value, result);
+            }
+        }
+
+        [Fact]
+        public void Binding_Method_With_Parameter_To_Command_CanExecute_DependsOn()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:MethodAsCommandDataContext'>
+    <Button Name='button' Command='{CompiledBinding Do}' CommandParameter='{CompiledBinding Parameter, Mode=OneWay}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new MethodAsCommandDataContext()
+                {
+                    Parameter = null,
+                };
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(button.Command);
+
+                Assert.Equal(button.IsEffectivelyEnabled, false);
+
+                vm.Parameter = true;
+                Threading.Dispatcher.UIThread.RunJobs();
+
+                Assert.Equal(button.IsEffectivelyEnabled, true);
+            }
+        }
+
+        [Fact]
+        public void ResolvesDataTypeForAssignBinding()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<local:AssignBindingControl xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        x:DataType='local:TestDataContext'
+        X='{CompiledBinding StringProperty}' />";
+                var control = (AssignBindingControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var compiledPath = ((CompiledBindingExtension)control.X).Path;
+
+                var node = Assert.IsType<PropertyElement>(Assert.Single(compiledPath.Elements));
+                Assert.Equal(typeof(string), node.Property.PropertyType);
+            }
+        }
+        
+        [Fact]
+        public void ResolvesDataTypeForAssignBinding_FromBindingProperty()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<local:AssignBindingControl xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        X='{CompiledBinding StringProperty, DataType=local:TestDataContext}' />";
+                var control = (AssignBindingControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var compiledPath = ((CompiledBindingExtension)control.X).Path;
+
+                var node = Assert.IsType<PropertyElement>(Assert.Single(compiledPath.Elements));
+                Assert.Equal(typeof(string), node.Property.PropertyType);
+            }
+        }
+        
         void Throws(string type, Action cb)
         {
             try
@@ -1078,6 +1585,16 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
 
         void ThrowsXamlParseException(Action cb) => Throws("XamlParseException", cb);
         void ThrowsXamlTransformException(Action cb) => Throws("XamlTransformException", cb);
+
+
+        static void PerformClick(Button button)
+        {
+            button.RaiseEvent(new KeyEventArgs
+            {
+                RoutedEvent = InputElement.KeyDownEvent,
+                Key = Input.Key.Enter,
+            });
+        }
     }
     
     public interface INonIntegerIndexer
@@ -1096,6 +1613,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     public interface IHasPropertyDerived : IHasProperty
     { }
 
+    public interface IHasExplicitProperty
+    {
+        string ExplicitProperty { get; }
+    }
+
     public class AppendConverter : IValueConverter
     {
         public static IValueConverter Instance { get; } = new AppendConverter();
@@ -1113,7 +1635,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         public string StringProperty { get; set; }
     }
 
-    public class TestDataContext : IHasPropertyDerived
+    public class TestDataContextBaseClass {}
+    
+    public class TestDataContext : TestDataContextBaseClass, IHasPropertyDerived, IHasExplicitProperty
     {
         public string StringProperty { get; set; }
 
@@ -1133,6 +1657,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
 
         public INonIntegerIndexerDerived NonIntegerIndexerInterfaceProperty => NonIntegerIndexerProperty;
 
+        string IHasExplicitProperty.ExplicitProperty => "Hello"; 
+
+        public string ExplicitProperty => "Bye"; 
+
         public class NonIntegerIndexer : NotifyingBase, INonIntegerIndexerDerived
         {
             private readonly Dictionary<string, string> _storage = new Dictionary<string, string>();
@@ -1151,4 +1679,76 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
     }
+
+    public class MethodDataContext
+    {
+        public void Action() { }
+
+        public int Func() => 1;
+
+        public void Action16(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16) { }
+        public int Func16(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16) => i;
+        public void CustomDelegateTypeVoid(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16, int i17) { }
+        public int CustomDelegateTypeInt(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16, int i17) => i;
+    }
+
+    public class MethodAsCommandDataContext : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public string Method() => Value = "Called";
+        public string Method1(int i) => Value = $"Called {i}";
+        public string Method2(int i, int j) => Value = $"Called {i},{j}";
+        public string Value { get; private set; } = "Not called";
+
+        object _parameter;
+        public object Parameter
+        {
+            get
+            {
+                return _parameter;
+            }
+            set
+            {
+                if (_parameter == value)
+                {
+                    return;
+                }
+                _parameter = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Parameter)));
+            }
+        }
+
+        public void Do(object parameter)
+        {
+            Value = $"Do {parameter}";
+        }
+
+        [Metadata.DependsOn(nameof(Parameter))]
+        public bool CanDo(object parameter)
+        {
+            return ReferenceEquals(null, parameter) == false;
+        }
+    }
+
+    public class CustomDataTemplate : IDataTemplate
+    {
+        [DataType]
+        public Type FancyDataType { get; set; }
+
+        [Content]
+        [TemplateContent]
+        public object Content { get; set; }
+
+        public bool Match(object data) => FancyDataType?.IsInstanceOfType(data) ?? true;
+
+        public IControl Build(object data) => TemplateContent.Load(Content)?.Control;
+    }
+    
+    public class CustomDataTemplateInherit : CustomDataTemplate { }
+
+    public class AssignBindingControl : Control
+    {
+        [AssignBinding] public IBinding X { get; set; }
+    }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
index 592dbfc0d1..987725c314 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
@@ -845,7 +845,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.Equal("bar", border.Tag);
 
             var resourceProvider = (TrackingResourceProvider)window.Resources.MergedDictionaries[0];
-            Assert.Equal(new[] { "bar" }, resourceProvider.RequestedResources);
+            Assert.Contains("bar", resourceProvider.RequestedResources);
+            Assert.DoesNotContain("foo", resourceProvider.RequestedResources);
         }
 
         [Fact]
@@ -883,7 +884,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.Equal("bar", border.Tag);
 
             var resourceProvider = (TrackingResourceProvider)window.Resources.MergedDictionaries[0];
-            Assert.Equal(new[] { "bar" }, resourceProvider.RequestedResources);
+            Assert.Contains("bar", resourceProvider.RequestedResources);
+            Assert.DoesNotContain("foo", resourceProvider.RequestedResources);
         }
 
         private IDisposable StyledWindow(params (string, string)[] assets)
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OnFormFactorExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OnFormFactorExtensionTests.cs
new file mode 100644
index 0000000000..783e647738
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OnFormFactorExtensionTests.cs
@@ -0,0 +1,71 @@
+using Avalonia.Controls;
+using Avalonia.Platform;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;
+
+public class OnFormFactorExtensionTests : XamlTestBase
+{
+    [Fact]
+    public void Should_Resolve_Default_Value()
+    {
+        using (AvaloniaLocator.EnterScope())
+        {
+            AvaloniaLocator.CurrentMutable.Bind<IRuntimePlatform>()
+                .ToConstant(new TestRuntimePlatform(false, false));
+
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TextBlock Text='{OnFormFactor Default=""Hello World""}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var textBlock = (TextBlock)userControl.Content!;
+
+            Assert.Equal("Hello World", textBlock.Text);
+        }
+    }
+
+    [Theory]
+    [InlineData(false, true, "Im Mobile")]
+    [InlineData(true, false, "Im Desktop")]
+    [InlineData(false, false, "Default value")]
+    public void Should_Resolve_Expected_Value_Per_Platform(bool isDesktop, bool isMobile, string expectedResult)
+    {
+        using (AvaloniaLocator.EnterScope())
+        {
+            AvaloniaLocator.CurrentMutable.Bind<IRuntimePlatform>()
+                .ToConstant(new TestRuntimePlatform(isDesktop, isMobile));
+
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TextBlock Text='{OnFormFactor ""Default value"",
+                                 Mobile=""Im Mobile"", Desktop=""Im Desktop""}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var textBlock = (TextBlock)userControl.Content!;
+
+            Assert.Equal(expectedResult, textBlock.Text);
+        }
+    }
+
+    private class TestRuntimePlatform : StandardRuntimePlatform
+    {
+        private readonly bool _isDesktop;
+        private readonly bool _isMobile;
+
+        public TestRuntimePlatform(bool isDesktop, bool isMobile)
+        {
+            _isDesktop = isDesktop;
+            _isMobile = isMobile;
+        }
+
+        public override RuntimePlatformInfo GetRuntimeInfo()
+        {
+            return new RuntimePlatformInfo() { IsDesktop = _isDesktop, IsMobile = _isMobile };
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OnPlatformExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OnPlatformExtensionTests.cs
new file mode 100644
index 0000000000..1d37378010
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OnPlatformExtensionTests.cs
@@ -0,0 +1,75 @@
+using Avalonia.Controls;
+using Avalonia.Platform;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;
+
+public class OnPlatformExtensionTests : XamlTestBase
+{
+    [Fact]
+    public void Should_Resolve_Default_Value()
+    {
+        using (AvaloniaLocator.EnterScope())
+        {
+            AvaloniaLocator.CurrentMutable.Bind<IRuntimePlatform>()
+                .ToConstant(new TestRuntimePlatform(OperatingSystemType.Unknown));
+
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TextBlock Text='{OnPlatform Default=""Hello World""}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var textBlock = (TextBlock)userControl.Content!;
+
+            Assert.Equal("Hello World", textBlock.Text);
+        }
+    }
+
+    [Theory]
+    [InlineData(OperatingSystemType.WinNT, "Im Windows")]
+    [InlineData(OperatingSystemType.OSX, "Im macOS")]
+    [InlineData(OperatingSystemType.Linux, "Im Linux")]
+    [InlineData(OperatingSystemType.Android, "Im Android")]
+    [InlineData(OperatingSystemType.iOS, "Im iOS")]
+    [InlineData(OperatingSystemType.Browser, "Im Browser")]
+    [InlineData(OperatingSystemType.Unknown, "Default value")]
+    public void Should_Resolve_Expected_Value_Per_Platform(OperatingSystemType currentPlatform, string expectedResult)
+    {
+        using (AvaloniaLocator.EnterScope())
+        {
+            AvaloniaLocator.CurrentMutable.Bind<IRuntimePlatform>()
+                .ToConstant(new TestRuntimePlatform(currentPlatform));
+
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TextBlock Text='{OnPlatform ""Default value"",
+                                 Windows=""Im Windows"", macOS=""Im macOS"",
+                                 Linux=""Im Linux"", Android=""Im Android"",
+                                 iOS=""Im iOS"", Browser=""Im Browser""}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var textBlock = (TextBlock)userControl.Content!;
+
+            Assert.Equal(expectedResult, textBlock.Text);
+        }
+    }
+
+    private class TestRuntimePlatform : StandardRuntimePlatform
+    {
+        private readonly OperatingSystemType _operatingSystemType;
+
+        public TestRuntimePlatform(OperatingSystemType operatingSystemType)
+        {
+            _operatingSystemType = operatingSystemType;
+        }
+
+        public override RuntimePlatformInfo GetRuntimeInfo()
+        {
+            return new RuntimePlatformInfo() { OperatingSystem = _operatingSystemType };
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs
new file mode 100644
index 0000000000..2d1f961743
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs
@@ -0,0 +1,605 @@
+using System;
+using System.Reactive.Disposables;
+using System.Runtime.InteropServices;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;
+
+public class OptionsMarkupExtensionTests : XamlTestBase
+{
+    public static Func<object, bool> RaisedOption;
+    public static int? ObjectsCreated;
+
+    [Fact]
+    public void Resolve_Default_Value()
+    {
+        using var _ = SetupTestGlobals("default");
+
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           Text='{local:OptionsMarkupExtension Default=""Hello World""}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal("Hello World", textBlock.Text);
+    }
+
+    [Fact]
+    public void Resolve_Default_Value_From_Ctor()
+    {
+        using var _ = SetupTestGlobals("default");
+
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           Text='{local:OptionsMarkupExtension ""Hello World"", OptionB=""Im Android""}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal("Hello World", textBlock.Text);
+    }
+
+    [Fact]
+    public void Resolve_Implicit_Default_Value_Ref_Type()
+    {
+        using var _ = SetupTestGlobals("default");
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+             Tag='{local:OptionsMarkupExtension OptionA=""Hello World"", x:DataType=x:String}' />";
+
+        var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(null, userControl.Tag);
+    }
+
+    [Fact]
+    public void Resolve_Implicit_Default_Value_Val_Type()
+    {
+        using var _ = SetupTestGlobals("default");
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+             Height='{local:OptionsMarkupExtension OptionA=10}' />";
+
+        var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(0d, userControl.Height);
+    }
+
+    [Fact]
+    public void Resolve_Implicit_Default_Value_Avalonia_Val_Type()
+    {
+        using var _ = SetupTestGlobals("default");
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+             Margin='{local:OptionsMarkupExtension OptionA=10}' />";
+
+        var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(new Thickness(0), userControl.Margin);
+    }
+
+    [Theory]
+    [InlineData("option 1", "Im Option 1")]
+    [InlineData("option 2", "Im Option 2")]
+    [InlineData("3", "Im Option 3")]
+    [InlineData("unknown", "Default value")]
+    public void Resolve_Expected_Value_Per_Option(object option, string expectedResult)
+    {
+        using var _ = SetupTestGlobals(option);
+
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           Text='{local:OptionsMarkupExtension ""Default value"",
+                OptionA=""Im Option 1"", OptionB=""Im Option 2"",
+                OptionNumber=""Im Option 3""}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(expectedResult, textBlock.Text);
+    }
+
+    [Theory]
+    [InlineData("option 1", "Im Option 1")]
+    [InlineData("option 2", "Im Option 2")]
+    [InlineData("3", "Im Option 3")]
+    [InlineData("unknown", "Default value")]
+    public void Resolve_Expected_Value_Per_Option_Create_Single_Object(object option, string expectedResult)
+    {
+        using var _ = SetupTestGlobals(option);
+
+        var xaml = @"
+<ContentControl xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <ContentControl.Content>
+        <local:OptionsMarkupExtension>
+            <local:OptionsMarkupExtension.Default>
+                <local:ChildObject Name=""Default value"" />
+            </local:OptionsMarkupExtension.Default>
+            <local:OptionsMarkupExtension.OptionA>
+                <local:ChildObject Name=""Im Option 1"" />
+            </local:OptionsMarkupExtension.OptionA>
+            <local:OptionsMarkupExtension.OptionB>
+                <local:ChildObject Name=""Im Option 2"" />
+            </local:OptionsMarkupExtension.OptionB>
+            <local:OptionsMarkupExtension.OptionNumber>
+                <local:ChildObject Name=""Im Option 3"" />
+            </local:OptionsMarkupExtension.OptionNumber>
+        </local:OptionsMarkupExtension>
+    </ContentControl.Content>
+</ContentControl>";
+
+        var contentControl = (ContentControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+        var obj = Assert.IsType<ChildObject>(contentControl.Content);
+
+        Assert.Equal(expectedResult, obj.Name);
+        Assert.Equal(1, ObjectsCreated);
+    }
+
+    [Fact]
+    public void Convert_Bcl_Type()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<Border xmlns='https://github.com/avaloniaui'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        Height='{local:OptionsMarkupExtension OptionA=50.1}' />";
+
+        var border = (Border)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(50.1, border.Height);
+    }
+
+    [Fact]
+    public void Convert_Avalonia_Type()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<Border xmlns='https://github.com/avaloniaui'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        Padding='{local:OptionsMarkupExtension OptionA=""10, 8, 10, 8""}' />";
+
+        var border = (Border)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(new Thickness(10, 8, 10, 8), border.Padding);
+    }
+
+    [PlatformFact(TestPlatforms.Windows | TestPlatforms.Linux, "TypeArguments test is failing on macOS from SRE emit")]
+    public void Respect_Custom_TypeArgument()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           Tag='{local:OptionsMarkupExtensionWithGeneric Default=20, OptionA=""10, 10, 10, 10"", x:TypeArguments=Thickness}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(new Thickness(10, 10, 10, 10), textBlock.Tag);
+    }
+
+    [Fact]
+    public void Allow_Nester_Markup_Extensions()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Resources>
+        <SolidColorBrush x:Key='brush'>#ff506070</SolidColorBrush>
+    </UserControl.Resources>
+    <Border Background='{local:OptionsMarkupExtension OptionA={StaticResource brush}}'/>
+</UserControl>";
+
+        var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+        var border = (Border)userControl.Content!;
+
+        Assert.Equal(Color.Parse("#ff506070"), ((ISolidColorBrush)border.Background!).Color);
+    }
+
+    [Fact]
+    public void Allow_Nester_On_Platform_Markup_Extensions()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<Border xmlns='https://github.com/avaloniaui'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        Margin='{local:OptionsMarkupExtension OptionA={local:OptionsMarkupExtensionMinimal OptionA=""10,10,10,10""}}' />";
+
+        var border = (Border)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(new Thickness(10), border.Margin);
+    }
+
+    [Fact]
+    public void Support_Xml_Syntax()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<Border xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Border.Background>
+        <local:OptionsMarkupExtension>
+            <local:OptionsMarkupExtension.OptionA>
+                <SolidColorBrush Color='#ff506070' />
+            </local:OptionsMarkupExtension.OptionA>
+        </local:OptionsMarkupExtension>
+    </Border.Background>
+</Border>";
+
+        var border = (Border)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(Color.Parse("#ff506070"), ((ISolidColorBrush)border.Background!).Color);
+    }
+
+    [PlatformFact(TestPlatforms.Windows | TestPlatforms.Linux, "TypeArguments test is failing on macOS from SRE emit")]
+    public void Support_Xml_Syntax_With_Custom_TypeArguments()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<Border xmlns='https://github.com/avaloniaui'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Border.Tag>
+        <local:OptionsMarkupExtensionWithGeneric x:TypeArguments='Thickness' OptionA='10, 10, 10, 10' Default='20' />
+    </Border.Tag>
+</Border>";
+
+        var border = (Border)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(new Thickness(10, 10, 10, 10), border.Tag);
+    }
+
+    [Theory]
+    [InlineData("option 1", "#ff506070")]
+    [InlineData("3", "#000")]
+    public void Support_Special_On_Syntax(object option, string color)
+    {
+        using var _ = SetupTestGlobals(option);
+
+        var xaml = @"
+<Border xmlns='https://github.com/avaloniaui'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Border.Background>
+        <local:OptionsMarkupExtension>
+            <On Options='OptionA, OptionB'>
+                <SolidColorBrush Color='#ff506070' />
+            </On>
+            <On Options=' OptionNumber '>
+                <SolidColorBrush Color='#000' />
+            </On>
+        </local:OptionsMarkupExtension>
+    </Border.Background>
+</Border>";
+
+        var border = (Border)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal(Color.Parse(color), ((ISolidColorBrush)border.Background!).Color);
+    }
+
+    [Fact]
+    public void Support_Control_Inside_Xml_Syntax()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <local:OptionsMarkupExtension>
+        <local:OptionsMarkupExtension.OptionA>
+            <Button Content='Hello World' />
+        </local:OptionsMarkupExtension.OptionA>
+    </local:OptionsMarkupExtension>
+</UserControl>";
+
+        var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+        var button = (Button)userControl.Content!;
+
+        Assert.Equal("Hello World", button.Content);
+    }
+
+    [Fact]
+    public void Support_Default_Control_Inside_Xml_Syntax()
+    {
+        using var _ = SetupTestGlobals("unknown");
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <local:OptionsMarkupExtension>
+        <local:OptionsMarkupExtension.Default>
+            <Button Content='Hello World' />
+        </local:OptionsMarkupExtension.Default>
+    </local:OptionsMarkupExtension>
+</UserControl>";
+
+        var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+        var button = (Button)userControl.Content!;
+
+        Assert.Equal("Hello World", button.Content);
+    }
+
+    [Fact]
+    public void Support_Complex_Property_Setters_Dictionary()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Color x:Key='Color1'>Black</Color>
+    <local:OptionsMarkupExtension x:Key='MyKey'>
+        <local:OptionsMarkupExtension.OptionA>
+            <Button Content='Hello World' />
+        </local:OptionsMarkupExtension.OptionA>
+    </local:OptionsMarkupExtension>
+    <Color x:Key='Color2'>White</Color>
+</ResourceDictionary>";
+
+        var resourceDictionary = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+        var button = Assert.IsType<Button>(resourceDictionary["MyKey"]);
+        Assert.Equal("Hello World", button.Content);
+        Assert.Equal(Colors.Black, resourceDictionary["Color1"]);
+        Assert.Equal(Colors.White, resourceDictionary["Color2"]);
+    }
+
+    [Fact]
+    public void Support_Complex_Property_Setters_List()
+    {
+        using var _ = SetupTestGlobals("option 1");
+
+        var xaml = @"
+<Panel xmlns='https://github.com/avaloniaui'
+       xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+       xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TextBlock />
+    <local:OptionsMarkupExtension>
+        <local:OptionsMarkupExtension.OptionA>
+            <Button Content='Hello World' />
+        </local:OptionsMarkupExtension.OptionA>
+    </local:OptionsMarkupExtension>
+    <TextBox />
+</Panel>";
+
+        var panel = (Panel)AvaloniaRuntimeXamlLoader.Load(xaml);
+        Assert.Equal(3, panel.Children.Count);
+        Assert.IsType<Button>(panel.Children[1]);
+    }
+
+    [Theory]
+    [InlineData("option 1", "foo")]
+    [InlineData("option 2", "bar")]
+    public void BindingExtension_Works_Inside_Of_OptionsMarkupExtension(string option, string expected)
+    {
+        using var _ = SetupTestGlobals(option);
+
+        var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Resources>
+        <x:String x:Key='text'>foo</x:String>
+    </UserControl.Resources>
+
+    <TextBlock Name='textBlock' Text='{local:OptionsMarkupExtension OptionA={CompiledBinding Source={StaticResource text}}, OptionB=bar}'/>
+</UserControl>";
+
+        var window = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+        var textBlock = window.FindControl<TextBlock>("textBlock");
+
+        Assert.Equal(expected, textBlock.Text);
+    }
+
+    [Fact]
+    public void Resolve_Expected_Value_With_Method_Without_ServiceProvider()
+    {
+        using var _ = SetupTestGlobals(2);
+
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           Text='{local:OptionsMarkupExtensionNoServiceProvider OptionB=""Im Option 2""}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.Equal("Im Option 2", textBlock.Text);
+    }
+
+    [Fact]
+    public void Resolve_Expected_Value_Minimal_Extension()
+    {
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           IsVisible='{local:OptionsMarkupExtensionMinimal OptionA=True}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.True(textBlock.IsSet(Visual.IsVisibleProperty));
+        Assert.True(textBlock.IsVisible);
+    }
+
+    [Fact]
+    public void Resolve_Expected_Value_Extension_With_Property()
+    {
+        var xaml = @"
+<TextBlock xmlns='https://github.com/avaloniaui'
+           xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
+           xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+           IsVisible='{local:OptionsMarkupExtensionWithProperty OptionA=True, Property=5}' />";
+
+        var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+        Assert.True(textBlock.IsSet(Visual.IsVisibleProperty));
+        Assert.True(textBlock.IsVisible);
+    }
+
+    private static IDisposable SetupTestGlobals(object acceptedOption)
+    {
+        RaisedOption = o => o.Equals(acceptedOption);
+        ObjectsCreated = 0;
+        return Disposable.Create(() =>
+        {
+            RaisedOption = null;
+            ObjectsCreated = null;
+        });
+    }
+}
+
+public class OptionsMarkupExtension : OptionsMarkupExtensionBase<object, On>
+{
+    public OptionsMarkupExtension()
+    {
+
+    }
+
+    public OptionsMarkupExtension(object defaultValue)
+    {
+        Default = defaultValue;
+    }
+}
+
+public class OptionsMarkupExtension<TReturn> : OptionsMarkupExtensionBase<TReturn, On<TReturn>>
+{
+    public OptionsMarkupExtension()
+    {
+
+    }
+
+    public OptionsMarkupExtension(TReturn defaultValue)
+    {
+        Default = defaultValue;
+    }
+}
+
+public class OptionsMarkupExtensionBase<TReturn, TOn> : IAddChild<TOn>
+    where TOn : On<TReturn>
+{
+    [MarkupExtensionOption("option 1")]
+    public TReturn OptionA { get; set; }
+
+    [MarkupExtensionOption("option 2")]
+    public TReturn OptionB { get; set; }
+
+    [MarkupExtensionOption(3)]
+    public TReturn OptionNumber { get; set; }
+
+    [Content]
+    [MarkupExtensionDefaultOption]
+    public TReturn Default { get; set; }
+
+    public bool ShouldProvideOption(IServiceProvider serviceProvider, string option)
+    {
+        return OptionsMarkupExtensionTests.RaisedOption(option);
+    }
+
+    public TReturn ProvideValue(IServiceProvider serviceProvider) { throw null; }
+
+    public void AddChild(TOn child) {}
+}
+
+public class OptionsMarkupExtensionNoServiceProvider
+{
+    [MarkupExtensionOption(1)]
+    public object OptionA { get; set; }
+
+    [MarkupExtensionOption(2)]
+    public object OptionB { get; set; }
+
+    [Content]
+    [MarkupExtensionDefaultOption]
+    public object Default { get; set; }
+
+    public static bool ShouldProvideOption(int option)
+    {
+        return OptionsMarkupExtensionTests.RaisedOption(option);
+    }
+
+    public object ProvideValue(IServiceProvider serviceProvider) { throw null; }
+}
+
+public class OptionsMarkupExtensionMinimal
+{
+    [MarkupExtensionOption(11.0)]
+    public bool OptionA { get; set; }
+
+    public static bool ShouldProvideOption(double option) => option > 0;
+
+    public object ProvideValue() { throw null; }
+}
+
+public class OptionsMarkupExtensionWithProperty
+{
+    [MarkupExtensionOption(5)]
+    public bool OptionA { get; set; }
+
+    public int Property { get; set; }
+
+    public bool ShouldProvideOption(int option) => option == Property;
+
+    public object ProvideValue() { throw null; }
+}
+
+public class OptionsMarkupExtensionWithGeneric<TResult>
+{
+    [MarkupExtensionOption("option 1")]
+    public TResult OptionA { get; set; }
+
+    [Content]
+    [MarkupExtensionDefaultOption]
+    public TResult Default { get; set; }
+
+    public bool ShouldProvideOption(string option)
+    {
+        return OptionsMarkupExtensionTests.RaisedOption(option);
+    }
+
+    public TResult ProvideValue() { throw null; }
+}
+
+public class ChildObject
+{
+    public string Name { get; set; }
+
+    public ChildObject()
+    {
+        OptionsMarkupExtensionTests.ObjectsCreated++;
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/SetterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/SetterTests.cs
new file mode 100644
index 0000000000..6fc0f2d91c
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/SetterTests.cs
@@ -0,0 +1,51 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests;
+
+public class SetterTests : XamlTestBase
+{
+    [Fact]
+    public void SetterTargetType_Should_Understand_xType_Extensions()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            var xaml = @"
+<Animation xmlns='https://github.com/avaloniaui' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml' x:SetterTargetType='{x:Type ContentControl}'>
+    <KeyFrame>
+        <Setter Property='Content' Value='{Binding}'/>
+    </KeyFrame>
+    <KeyFrame>
+        <Setter Property='Content' Value='{Binding}'/>
+    </KeyFrame> 
+</Animation>";
+            var animation = (Animation.Animation)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var setter = (Setter)animation.Children[0].Setters[0];
+
+            Assert.Equal(typeof(ContentControl), setter.Property.OwnerType);
+        }
+    }
+
+    [Fact]
+    public void SetterTargetType_Should_Understand_Type_From_Xmlns()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            var xaml = @"
+<av:Animation xmlns:av='https://github.com/avaloniaui' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml' x:SetterTargetType='av:ContentControl'>
+    <av:KeyFrame>
+        <av:Setter Property='Content' Value='{av:Binding}'/>
+    </av:KeyFrame>
+    <av:KeyFrame>
+        <av:Setter Property='Content' Value='{av:Binding}'/>
+    </av:KeyFrame> 
+</av:Animation>";
+            var animation = (Animation.Animation)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var setter = (Setter)animation.Children[0].Setters[0];
+
+            Assert.Equal(typeof(ContentControl), setter.Property.OwnerType);
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index f20faa2287..af2435a52f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -16,6 +16,8 @@ using System.ComponentModel;
 using System.Linq;
 using System.Xml;
 using Xunit;
+using Avalonia.Controls.Documents;
+using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 {
@@ -47,12 +49,12 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         public void Attached_Property_Is_Set()
         {
             var xaml =
-        @"<ContentControl xmlns='https://github.com/avaloniaui' TextBlock.FontSize='21'/>";
+        @"<ContentControl xmlns='https://github.com/avaloniaui' TextElement.FontSize='21'/>";
 
             var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
             Assert.NotNull(target);
-            Assert.Equal(21.0, TextBlock.GetFontSize(target));
+            Assert.Equal(21.0, TextElement.GetFontSize(target));
         }
 
         [Fact]
@@ -90,13 +92,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             using (UnitTestApplication.Start(TestServices.MockWindowingPlatform))
             {
                 var xaml =
-            @"<Window xmlns='https://github.com/avaloniaui' TextBlock.FontSize='{Binding}'/>";
+            @"<Window xmlns='https://github.com/avaloniaui' TextElement.FontSize='{Binding}'/>";
 
                 var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 target.DataContext = 21.0;
 
-                Assert.Equal(21.0, TextBlock.GetFontSize(target));
+                Assert.Equal(21.0, TextElement.GetFontSize(target));
             }
         }
 
@@ -281,70 +283,6 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             Assert.Equal(expected4, grid.RowDefinitions[3].Height);
         }
 
-        [Fact]
-        public void ControlTemplate_With_Nested_Child_Is_Operational()
-        {
-            var xaml = @"
-<ControlTemplate xmlns='https://github.com/avaloniaui'>
-    <ContentControl Name='parent'>
-        <ContentControl Name='child' />
-    </ContentControl>
-</ControlTemplate>
-";
-            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
-
-            var parent = (ContentControl)template.Build(new ContentControl()).Control;
-
-            Assert.Equal("parent", parent.Name);
-
-            var child = parent.Content as ContentControl;
-
-            Assert.NotNull(child);
-
-            Assert.Equal("child", child.Name);
-        }
-
-        [Fact]
-        public void ControlTemplate_With_TargetType_Is_Operational()
-        {
-            var xaml = @"
-<ControlTemplate xmlns='https://github.com/avaloniaui' 
-                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-                 TargetType='{x:Type ContentControl}'>
-    <ContentPresenter Content='{TemplateBinding Content}' />
-</ControlTemplate>
-";
-            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
-
-            Assert.Equal(typeof(ContentControl), template.TargetType);
-
-            Assert.IsType(typeof(ContentPresenter), template.Build(new ContentControl()).Control);
-        }
-
-        [Fact]
-        public void ControlTemplate_With_Panel_Children_Are_Added()
-        {
-            var xaml = @"
-<ControlTemplate xmlns='https://github.com/avaloniaui'>
-    <Panel Name='panel'>
-        <ContentControl Name='Foo' />
-        <ContentControl Name='Bar' />
-    </Panel>
-</ControlTemplate>
-";
-            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
-
-            var panel = (Panel)template.Build(new ContentControl()).Control;
-
-            Assert.Equal(2, panel.Children.Count);
-
-            var foo = panel.Children[0];
-            var bar = panel.Children[1];
-
-            Assert.Equal("Foo", foo.Name);
-            Assert.Equal("Bar", bar.Name);
-        }
-
         [Fact]
         public void Named_x_Control_Is_Added_To_NameScope_Simple()
         {
@@ -361,7 +299,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Standart_TypeConverter_Is_Used()
+        public void Standard_TypeConverter_Is_Used()
         {
             var xaml = @"<UserControl xmlns='https://github.com/avaloniaui' Width='200.5' />";
 
@@ -528,7 +466,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml = @"
 <Styles xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <StyleInclude Source='avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml'/>
+    <StyleInclude Source='avares://Avalonia.Themes.Simple/Controls/UserControl.xaml'/>
 </Styles>";
 
                 var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
@@ -935,6 +873,51 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Should_Parse_Tip_With_Comment()
+        {
+            var xaml = @"
+                <TextBlock xmlns='https://github.com/avaloniaui' Text='TextBlock with tooltip'>
+                    <ToolTip.Tip>
+                        <!--Comment-->
+                        <ToolTip>
+                            Foo
+                        </ToolTip>
+                    </ToolTip.Tip>
+                </TextBlock>";
+
+            var textBlock = AvaloniaRuntimeXamlLoader.Parse<TextBlock>(xaml);
+
+            var toolTip = ToolTip.GetTip(textBlock) as ToolTip;
+
+            Assert.NotNull(toolTip);
+
+            Assert.Equal("Foo", toolTip.Content);
+        }
+
+        [Fact]
+        public void AddChild_Child_Is_Set()
+        {
+            var xaml = @"<ObjectWithAddChild  xmlns='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml'>Foo</ObjectWithAddChild>";
+
+            var target = AvaloniaRuntimeXamlLoader.Parse<ObjectWithAddChild>(xaml);
+
+            Assert.NotNull(target);
+            Assert.Equal("Foo", target.Child);
+        }
+
+        [Fact]
+        public void AddChildOfT_Child_Is_Set()
+        {
+            var xaml = @"<ObjectWithAddChildOfT  xmlns='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml'>Foo</ObjectWithAddChildOfT>";
+
+            var target = AvaloniaRuntimeXamlLoader.Parse<ObjectWithAddChildOfT>(xaml);
+
+            Assert.NotNull(target);
+            Assert.Null(target.Child);
+            Assert.Equal("Foo", target.Text);
+        }
+
         private class SelectedItemsViewModel : INotifyPropertyChanged
         {
             public string[] Items { get; set; }
@@ -954,6 +937,34 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
     }
+
+    public class ObjectWithAddChild : IAddChild
+    {
+        public object Child { get; set; }
+
+        void IAddChild.AddChild(object child)
+        {
+            Child = child;
+        }
+    }
+
+    public class ObjectWithAddChildOfT : IAddChild, IAddChild<string>
+    {
+        public string Text { get; set; }
+
+        public object Child { get; set; }
+
+        void IAddChild.AddChild(object child)
+        {
+            Child = child;
+        }
+
+        void IAddChild<string>.AddChild(string child)
+        {
+            Text = child;
+        }
+    }
+
     public class BasicTestsAttachedPropertyHolder
     {
         public static AvaloniaProperty<string> FooProperty =
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
index 8af638c5d7..bcda3f855a 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
@@ -183,6 +183,37 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_Self_In_Style_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+       
+    <Window.Styles>
+        <Style Selector='Button'>
+            <Setter Property='IsVisible' Value='{Binding $self.IsEnabled}' />
+        </Style>
+    </Window.Styles>
+
+    <Button Name='button' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                Assert.True(button.IsVisible);
+
+                button.IsEnabled = false;
+
+                Assert.False(button.IsVisible);
+            }
+        }
+
         [Fact]
         public void Stream_Binding_To_Observable_Works()
         {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
index 8188b212e1..affa292a7d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
@@ -74,18 +74,18 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'>
     <DockPanel>
         <TabStrip Name='strip' DockPanel.Dock='Top' Items='{Binding Items}' SelectedIndex='0'>
-          <TabStrip.DataTemplates>
+          <TabStrip.ItemTemplate>
             <DataTemplate>
               <TextBlock Text='{Binding Header}'/>
             </DataTemplate>
-          </TabStrip.DataTemplates>
+          </TabStrip.ItemTemplate>
         </TabStrip>
         <Carousel Name='carousel' Items='{Binding Items}' SelectedIndex='{Binding #strip.SelectedIndex}'>
-          <Carousel.DataTemplates>
+          <Carousel.ItemTemplate>
             <DataTemplate>
               <TextBlock Text='{Binding Detail}'/>
             </DataTemplate>
-          </Carousel.DataTemplates>
+          </Carousel.ItemTemplate>
         </Carousel>
     </DockPanel>
 </Window>";
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
new file mode 100644
index 0000000000..203ec5ee3b
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
@@ -0,0 +1,323 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Data;
+using Avalonia.Diagnostics;
+using Avalonia.Markup.Xaml.Templates;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class ControlTemplateTests : XamlTestBase
+    {
+        [Fact]
+        public void StyledProperties_Should_Be_Set_In_The_ControlTemplate()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:controls=""using:Avalonia.Markup.Xaml.UnitTests.Xaml"">
+    <Button>
+        <Button.Template>
+            <ControlTemplate>
+                <controls:ListBoxHierachyLine>
+                    <controls:ListBoxHierachyLine.LineDashStyle>
+                        <DashStyle Dashes=""2,2"" Offset=""1"" />
+                    </controls:ListBoxHierachyLine.LineDashStyle>
+                </controls:ListBoxHierachyLine>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+                var listBoxHierarchyLine = button.GetVisualChildren().ElementAt(0) as ListBoxHierachyLine;
+                Assert.Equal(1, listBoxHierarchyLine.LineDashStyle.Offset);
+                Assert.Equal(2, listBoxHierarchyLine.LineDashStyle.Dashes.Count);
+                Assert.Equal(2, listBoxHierarchyLine.LineDashStyle.Dashes[0]);
+                Assert.Equal(2, listBoxHierarchyLine.LineDashStyle.Dashes[1]);
+            }
+            
+        }
+
+        [Fact]
+        public void Inline_ControlTemplate_Styled_Values_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Button>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Background='Red'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void Style_ControlTemplate_Styled_Values_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='Button'>
+            <Setter Property='Template'>
+                <ControlTemplate>
+                    <ContentPresenter Name='PART_ContentPresenter'
+                                      Background='Red'/>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </Window.Styles>
+    <Button/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_Attached_Values_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Button>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  DockPanel.Dock='Top'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Dock.Top, DockPanel.GetDock(presenter));
+
+                var diagnostic = presenter.GetDiagnostic(DockPanel.DockProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_StaticResources_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='red'>Red</SolidColorBrush>
+    </Window.Resources>
+    <Button Content='Foo'>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Background='{StaticResource red}'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_DynamicResources_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='red'>Red</SolidColorBrush>
+    </Window.Resources>
+    <Button Content='Foo'>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Background='{DynamicResource red}'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_TemplateBindings_Are_Set_With_TemplatedParent_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Button Content='Foo'>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Content='{TemplateBinding Content}'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal("Foo", presenter.Content);
+
+                var diagnostic = presenter.GetDiagnostic(ContentPresenter.ContentProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_With_Nested_Child_Is_Operational()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui'>
+    <ContentControl Name='parent'>
+        <ContentControl Name='child' />
+    </ContentControl>
+</ControlTemplate>
+";
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
+
+            var parent = (ContentControl)template.Build(new ContentControl()).Control;
+
+            Assert.Equal("parent", parent.Name);
+
+            var child = parent.Content as ContentControl;
+
+            Assert.NotNull(child);
+
+            Assert.Equal("child", child.Name);
+        }
+
+        [Fact]
+        public void ControlTemplate_With_TargetType_Is_Operational()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui' 
+                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+                 TargetType='{x:Type ContentControl}'>
+    <ContentPresenter Content='{TemplateBinding Content}' />
+</ControlTemplate>
+";
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
+
+            Assert.Equal(typeof(ContentControl), template.TargetType);
+
+            Assert.IsType(typeof(ContentPresenter), template.Build(new ContentControl()).Control);
+        }
+
+        [Fact]
+        public void ControlTemplate_With_Panel_Children_Are_Added()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui'>
+    <Panel Name='panel'>
+        <ContentControl Name='Foo' />
+        <ContentControl Name='Bar' />
+    </Panel>
+</ControlTemplate>
+";
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
+
+            var panel = (Panel)template.Build(new ContentControl()).Control;
+
+            Assert.Equal(2, panel.Children.Count);
+
+            var foo = panel.Children[0];
+            var bar = panel.Children[1];
+
+            Assert.Equal("Foo", foo.Name);
+            Assert.Equal("Bar", bar.Name);
+        }
+    }
+    public class ListBoxHierachyLine : Panel
+    {
+        public static readonly StyledProperty<DashStyle> LineDashStyleProperty =
+        AvaloniaProperty.Register<ListBoxHierachyLine, DashStyle>(nameof(LineDashStyle));
+
+        public DashStyle LineDashStyle
+        {
+            get => GetValue(LineDashStyleProperty);
+            set => SetValue(LineDashStyleProperty, value);
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
new file mode 100644
index 0000000000..9eb48311df
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
@@ -0,0 +1,89 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class ControlThemeTests : XamlTestBase
+    {
+        [Fact]
+        public void ControlTheme_Can_Be_StaticResource()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = $@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:u='using:Avalonia.Markup.Xaml.UnitTests.Xaml'>
+    <Window.Resources>
+        {ControlThemeXaml}
+    </Window.Resources>
+
+    <u:TestTemplatedControl Theme='{{StaticResource MyTheme}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = Assert.IsType<TestTemplatedControl>(window.Content);
+
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                Assert.NotNull(button.Template);
+
+                var child = Assert.Single(button.GetVisualChildren());
+                var border = Assert.IsType<Border>(child);
+
+                Assert.Equal(Brushes.Red, border.Background);
+            }
+        }
+
+        [Fact]
+        public void ControlTheme_Can_Be_Set_In_Style()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = $@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:u='using:Avalonia.Markup.Xaml.UnitTests.Xaml'>
+    <Window.Resources>
+        {ControlThemeXaml}
+    </Window.Resources>
+
+    <Window.Styles>
+        <Style Selector='u|TestTemplatedControl'>
+            <Setter Property='Theme' Value='{{StaticResource MyTheme}}'/>
+        </Style>
+    </Window.Styles>
+
+    <u:TestTemplatedControl/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = Assert.IsType<TestTemplatedControl>(window.Content);
+
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                Assert.NotNull(button.Template);
+
+                var child = Assert.Single(button.GetVisualChildren());
+                var border = Assert.IsType<Border>(child);
+
+                Assert.Equal(Brushes.Red, border.Background);
+            }
+        }
+
+        private const string ControlThemeXaml = @"
+<ControlTheme x:Key='MyTheme' TargetType='u:TestTemplatedControl'>
+    <Setter Property='Template'>
+        <ControlTemplate>
+            <Border/>
+        </ControlTemplate>
+    </Setter>
+    <Style Selector='^ /template/ Border'>
+        <Setter Property='Background' Value='Red'/>
+    </Style>
+</ControlTheme>";
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
index 53881467e7..e005964ad0 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
@@ -1,5 +1,11 @@
+using System;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Markup.Xaml.Templates;
+using Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;
+using Avalonia.Metadata;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -89,6 +95,93 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void XDataType_Should_Be_Assigned_To_Clr_Property()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.DataTemplates>
+        <DataTemplate x:DataType='sys:String'>
+            <Canvas Name='foo'/>
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='Foo'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+                var template = (DataTemplate)window.DataTemplates.First();
+                
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+                
+                Assert.Equal(typeof(string), template.DataType);
+                Assert.IsType<Canvas>(target.Presenter.Child);
+            }
+        }
+        
+        [Fact]
+        public void XDataType_Should_Be_Ignored_If_DataType_Already_Set()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.DataTemplates>
+        <DataTemplate DataType='sys:String' x:DataType='UserControl'>
+            <Canvas Name='foo'/>
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='Foo'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.IsType<Canvas>(target.Presenter.Child);
+            }
+        }
+        
+        [Fact]
+        public void XDataType_Should_Be_Ignored_If_DataType_Has_Non_Standard_Name()
+        {
+            // We don't want DataType to be mapped to FancyDataType, avoid possible confusion.
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <ContentControl Name='target' Content='Foo'>
+        <ContentControl.ContentTemplate>
+            <local:CustomDataTemplate x:DataType='local:TestDataContext'>
+                <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+            </local:CustomDataTemplate>
+        </ContentControl.ContentTemplate>
+    </ContentControl>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+                
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                var dataTemplate = (CustomDataTemplate)target.ContentTemplate;
+                Assert.Null(dataTemplate.FancyDataType);
+            }
+        }
+        
         [Fact]
         public void Can_Set_DataContext_In_DataTemplate()
         {
@@ -132,5 +225,25 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Same(viewModel.Child.Child, canvas.DataContext);
             }
         }
+        
+        [Fact]
+        public void DataTemplates_Without_Type_Should_Throw()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.DataTemplates>
+        <DataTemplate>
+            <Canvas Name='foo'/>
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='Foo'/>
+</Window>";
+                Assert.Throws<InvalidOperationException>(() => (Window)AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
index cb37dea220..7ba21c4673 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             base.OnAttachedToLogicalTree(e);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             Order.Add($"Property {change.Property.Name} Changed");
             base.OnPropertyChanged(change);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
index 578fa888a3..5066341bbb 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Media;
+using Avalonia.Media.Immutable;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Xunit;
@@ -66,6 +67,212 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Item_Is_Added_To_ResourceDictionary_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <SolidColorBrush x:Key='Red' Color='Red' />
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+        
+        [Fact]
+        public void Item_Added_To_ResourceDictionary_Is_UnDeferred_On_Read()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <SolidColorBrush x:Key='Red' Color='Red' />
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+
+                Assert.IsType<SolidColorBrush>(resources["Red"]);
+                
+                Assert.False(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Window_Resources_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)window.Resources;
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Window_MergedDictionaries_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <SolidColorBrush x:Key='Red' Color='Red' />
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)window.Resources.MergedDictionaries[0];
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Style_Resources_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Style xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Style.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Style.Resources>
+</Style>";
+                var style = (Style)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)style.Resources;
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Styles_Resources_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Styles xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Styles.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Styles.Resources>
+</Styles>";
+                var style = (Styles)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)style.Resources;
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Can_Be_StaticReferenced_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+    <Button>
+        <Button.Resources>
+            <StaticResource x:Key='Red2' ResourceKey='Red' />
+        </Button.Resources>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var windowResources = (ResourceDictionary)window.Resources;
+                var buttonResources = (ResourceDictionary)((Button)window.Content!).Resources;
+                
+                Assert.True(windowResources.ContainsDeferredKey("Red"));
+                Assert.True(buttonResources.ContainsDeferredKey("Red2"));
+            }
+        }
+        
+        [Fact]
+        public void Item_StaticReferenced_Is_UnDeferred_On_Read()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+    <Button>
+        <Button.Resources>
+            <StaticResource x:Key='Red2' ResourceKey='Red' />
+        </Button.Resources>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var windowResources = (ResourceDictionary)window.Resources;
+                var buttonResources = (ResourceDictionary)((Button)window.Content!).Resources;
+                
+                Assert.IsType<SolidColorBrush>(buttonResources["Red2"]);
+                
+                Assert.False(windowResources.ContainsDeferredKey("Red"));
+                Assert.False(buttonResources.ContainsDeferredKey("Red2"));
+            }
+        }
+        
+        [Fact]
+        public void Value_Type_With_Parse_Converter_Should_Not_Be_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Color x:Key='Red'>Red</Color>
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.False(resources.ContainsDeferredKey("Red"));
+                Assert.IsType<Color>(resources["Red"]);
+            }
+        }
+        
+        [Fact]
+        public void Value_Type_With_Ctor_Converter_Should_Not_Be_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Thickness x:Key='Margin'>1 1 1 1</Thickness>
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.False(resources.ContainsDeferredKey("Margin"));
+                Assert.IsType<Thickness>(resources["Margin"]);
+            }
+        }
+
         private IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index 022ff0c3a4..682fc622b8 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -617,5 +617,35 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Colors.Red, ((ISolidColorBrush)foo.Background).Color);
             }
         }
+
+        [Fact]
+        public void Can_Use_Nested_Styles()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='Border'>
+            <Style Selector='^.foo'>
+                <Setter Property='Background' Value='Red'/>
+            </Style>
+        </Style>
+    </Window.Styles>
+    <StackPanel>
+        <Border Name='foo'/>
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var foo = window.FindControl<Border>("foo");
+
+                Assert.Null(foo.Background);
+
+                foo.Classes.Add("foo");
+
+                Assert.Equal(Colors.Red, ((ISolidColorBrush)foo.Background).Color);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs
new file mode 100644
index 0000000000..0c862bb66a
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class TestTemplatedControl : TemplatedControl
+    {
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
index 3fdac49f31..81e94bde4f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
@@ -14,12 +14,29 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
             {
-                var xaml = "<DataTemplates xmlns='https://github.com/avaloniaui'><TreeDataTemplate ItemsSource='{Binding}'/></DataTemplates>";
+                var xaml = "<DataTemplates xmlns='https://github.com/avaloniaui'><TreeDataTemplate DataType='Control' ItemsSource='{Binding}'/></DataTemplates>";
                 var templates = (DataTemplates)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var template = (TreeDataTemplate)(templates.First());
 
                 Assert.IsType<Binding>(template.ItemsSource);
             }                
         }
+        
+        [Fact]
+        public void XDataType_Should_Be_Assigned_To_Clr_Property()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
+            {
+                var xaml = @"
+<DataTemplates xmlns='https://github.com/avaloniaui'
+               xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TreeDataTemplate x:DataType='x:String' />
+</DataTemplates>";
+                var templates = (DataTemplates)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var template = (TreeDataTemplate)(templates.First());
+
+                Assert.Equal(typeof(string), template.DataType);
+            }                
+        }
     }
 }
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs
index c10f0ffcdb..196375fb40 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs
@@ -7,6 +7,7 @@ using System.Reactive;
 using System.Reactive.Subjects;
 using System.Reactive.Linq;
 using System.Collections.Generic;
+using System.IO;
 using System.Runtime.Serialization;
 using System.Threading;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -17,6 +18,7 @@ using Avalonia.UnitTests;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 using Avalonia;
+using Avalonia.Threading;
 using ReactiveUI;
 using DynamicData;
 using Xunit;
@@ -93,13 +95,23 @@ namespace Avalonia.ReactiveUI.UnitTests
                 var suspension = new AutoSuspendHelper(application.ApplicationLifetime);
                 RxApp.SuspensionHost.CreateNewAppState = () => new AppState { Example = "Foo" };
                 RxApp.SuspensionHost.ShouldPersistState.Subscribe(_ => shouldPersistReceived = true);
-                RxApp.SuspensionHost.SetupDefaultSuspendResume(new DummySuspensionDriver());
+                RxApp.SuspensionHost.SetupDefaultSuspendResume(new FakeSuspensionDriver());
                 suspension.OnFrameworkInitializationCompleted();
 
                 lifetime.Shutdown();
+                
                 Assert.True(shouldPersistReceived);
                 Assert.Equal("Foo", RxApp.SuspensionHost.GetAppState<AppState>().Example);
             }
         }
+
+        private class FakeSuspensionDriver : ISuspensionDriver
+        {
+            public IObservable<object> LoadState() => Observable.Empty<object>();
+
+            public IObservable<Unit> SaveState(object state) => Observable.Empty<Unit>();
+
+            public IObservable<Unit> InvalidateState() => Observable.Empty<Unit>();
+        }
     }
 }
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
index c66a3c4ba1..a4e669cb34 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
@@ -12,6 +12,7 @@ using Xunit;
 using Splat;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
 
 namespace Avalonia.ReactiveUI.UnitTests
 {
@@ -109,10 +110,12 @@ namespace Avalonia.ReactiveUI.UnitTests
 
             var fakeRenderedDecorator = new TestRoot();
             fakeRenderedDecorator.Child = userControl;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.True(activated[0]);
             Assert.Equal(1, activated.Count);
 
             fakeRenderedDecorator.Child = null;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.True(activated[0]);
             Assert.False(activated[1]);
             Assert.Equal(2, activated.Count);
@@ -139,9 +142,11 @@ namespace Avalonia.ReactiveUI.UnitTests
 
             var fakeRenderedDecorator = new TestRoot();
             fakeRenderedDecorator.Child = userControl;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.True(userControl.Active);
 
             fakeRenderedDecorator.Child = null;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.False(userControl.Active);
         }
 
@@ -154,9 +159,11 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Assert.False(window.Active);
 
                 window.Show();
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
                 Assert.True(window.Active);
 
                 window.Close();
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
                 Assert.False(window.Active);
             }
         }
@@ -171,9 +178,11 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Assert.False(viewModel.IsActivated);
 
                 window.Show();
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
                 Assert.True(viewModel.IsActivated);
 
                 window.Close();
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
                 Assert.False(viewModel.IsActivated);
             }
         }
@@ -187,9 +196,11 @@ namespace Avalonia.ReactiveUI.UnitTests
             Assert.False(viewModel.IsActivated);
 
             root.Child = control;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.True(viewModel.IsActivated);
 
             root.Child = null;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.False(viewModel.IsActivated);
         }
     }
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs
index 4dd60e21c5..4bf999bed0 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using ReactiveUI;
 using Splat;
@@ -69,12 +70,14 @@ namespace Avalonia.ReactiveUI.UnitTests
             Assert.False(view.ViewModel.IsActive);
 
             root.Child = view;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
 
             Assert.NotNull(view.ViewModel);
             Assert.NotNull(view.DataContext);
             Assert.True(view.ViewModel.IsActive);
 
             root.Child = null;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
 
             Assert.NotNull(view.ViewModel);
             Assert.NotNull(view.DataContext);
@@ -90,12 +93,14 @@ namespace Avalonia.ReactiveUI.UnitTests
             Assert.False(view.ViewModel.IsActive);
 
             root.Child = view;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
 
             Assert.NotNull(view.ViewModel);
             Assert.NotNull(view.DataContext);
             Assert.True(view.ViewModel.IsActive);
 
             root.Child = null;
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
 
             Assert.NotNull(view.ViewModel);
             Assert.NotNull(view.DataContext);
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs
index 18a8a33f09..a71a500ed9 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using ReactiveUI;
 using Splat;
@@ -72,12 +73,14 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Assert.False(view.ViewModel.IsActive);
 
                 view.Show();
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
 
                 Assert.NotNull(view.ViewModel);
                 Assert.NotNull(view.DataContext);
                 Assert.True(view.ViewModel.IsActive);
 
                 view.Close();
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
 
                 Assert.NotNull(view.ViewModel);
                 Assert.NotNull(view.DataContext);
@@ -96,12 +99,14 @@ namespace Avalonia.ReactiveUI.UnitTests
 
                 view.Show();
 
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
                 Assert.NotNull(view.ViewModel);
                 Assert.NotNull(view.DataContext);
                 Assert.True(view.ViewModel.IsActive);
 
                 view.Close();
 
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
                 Assert.NotNull(view.ViewModel);
                 Assert.NotNull(view.DataContext);
                 Assert.False(view.ViewModel.IsActive);
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs
index 244b5abc4e..56c7863861 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs
@@ -15,6 +15,7 @@ using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Reactive;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
 
 namespace Avalonia.ReactiveUI.UnitTests
 {
@@ -75,6 +76,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Child = host
             };
             
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.NotNull(host.Content);
             Assert.IsType<TextBlock>(host.Content);
             Assert.Equal(defaultContent, host.Content);
@@ -126,6 +128,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Child = host
             };
 
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.NotNull(host.Content);
             Assert.IsType<TextBlock>(host.Content);
             Assert.Equal(defaultContent, host.Content);
@@ -191,6 +194,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Child = host
             };
 
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.NotNull(host.Content);
             Assert.Equal(defaultContent, host.Content);
 
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
index 6ca617d2d4..daa3830b7d 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
@@ -12,14 +12,6 @@ namespace Avalonia.ReactiveUI.UnitTests
 {
     public class TransitioningContentControlTest
     {
-        [Fact]
-        public void Transitioning_Control_Should_Derive_Template_From_Content_Control()
-        {
-            var target = new TransitioningContentControl();
-            var stylable = (IStyledElement)target;
-            Assert.Equal(typeof(ContentControl),stylable.StyleKey);
-        }
-
         [Fact]
         public void Transitioning_Control_Template_Should_Be_Instantiated() 
         {
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs
index 858c476227..3d60e56c65 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using ReactiveUI;
 using Splat;
@@ -46,6 +47,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Child = host 
             };
             
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.NotNull(host.Content);
             Assert.Equal(typeof(TextBlock), host.Content.GetType());
             Assert.Equal(defaultContent, host.Content);
@@ -91,6 +93,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                 Child = host
             };
 
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
             Assert.NotNull(host.Content);
             Assert.Equal(typeof(TextBlock), host.Content.GetType());
             Assert.Equal(defaultContent, host.Content);
diff --git a/tests/Avalonia.RenderTests/Assets/NotoSansArabic-Regular.ttf b/tests/Avalonia.RenderTests/Assets/NotoSansArabic-Regular.ttf
new file mode 100644
index 0000000000..79359c460b
Binary files /dev/null and b/tests/Avalonia.RenderTests/Assets/NotoSansArabic-Regular.ttf differ
diff --git a/tests/Avalonia.RenderTests/ManualRenderTimer.cs b/tests/Avalonia.RenderTests/ManualRenderTimer.cs
new file mode 100644
index 0000000000..0dc994aaa5
--- /dev/null
+++ b/tests/Avalonia.RenderTests/ManualRenderTimer.cs
@@ -0,0 +1,19 @@
+using Avalonia.Rendering;
+using System.Threading.Tasks;
+using System;
+
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests
+#endif
+{
+    public class ManualRenderTimer : IRenderTimer
+    {
+        public event Action<TimeSpan> Tick;
+        public bool RunsInBackground => false;
+        public void TriggerTick() => Tick?.Invoke(TimeSpan.Zero);
+        public Task TriggerBackgroundTick() => Task.Run(TriggerTick);
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Media/BitmapTests.cs b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
index b629304b77..d52539c371 100644
--- a/tests/Avalonia.RenderTests/Media/BitmapTests.cs
+++ b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
@@ -102,9 +102,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         [InlineData(PixelFormat.Bgra8888), InlineData(PixelFormat.Rgba8888)]
         public void WriteableBitmapShouldBeUsable(PixelFormat fmt)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
             var writeableBitmap = new WriteableBitmap(new PixelSize(256, 256), new Vector(96, 96), fmt);
-#pragma warning restore CS0618 // Type or member is obsolete
 
             var data = new int[256 * 256];
             for (int y = 0; y < 256; y++)
diff --git a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
new file mode 100644
index 0000000000..06e46c1a06
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
@@ -0,0 +1,52 @@
+using Avalonia.Media;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+
+using Avalonia.Direct2D1.RenderTests;
+
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class GeometryDrawingTests : TestBase
+    {
+        public GeometryDrawingTests()
+            : base(@"Media\GeometryDrawing")
+        {
+        }
+
+        private GeometryDrawing CreateGeometryDrawing()
+        {
+            GeometryDrawing geometryDrawing = new GeometryDrawing();
+            EllipseGeometry ellipse = new EllipseGeometry();
+            ellipse.RadiusX = 100;
+            ellipse.RadiusY = 100;
+            geometryDrawing.Geometry = ellipse;
+            return geometryDrawing;
+        }
+
+        [Fact]
+        public void DrawingGeometry_WithPen()
+        {
+            GeometryDrawing geometryDrawing = CreateGeometryDrawing();
+            geometryDrawing.Pen = new Pen(new SolidColorBrush(Color.FromArgb(255, 0, 0, 0)), 10);
+
+            Assert.Equal(210, geometryDrawing.GetBounds().Height);
+            Assert.Equal(210, geometryDrawing.GetBounds().Width);
+
+        }
+
+        [Fact]
+        public void DrawingGeometry_WithoutPen()
+        {
+            GeometryDrawing geometryDrawing = CreateGeometryDrawing();
+
+            Assert.Equal(200, geometryDrawing.GetBounds().Height);
+            Assert.Equal(200, geometryDrawing.GetBounds().Width);
+        }
+
+
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs b/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
new file mode 100644
index 0000000000..31e485448e
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
@@ -0,0 +1,191 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class GlyphRunTests : TestBase
+    {
+        public GlyphRunTests()
+            : base(@"Media\GlyphRun")
+        {
+        }
+         
+        [Fact]
+        public async Task Should_Render_GlyphRun_Geometry()
+        {
+            var control = new GlyphRunGeometryControl
+            {
+                [TextElement.ForegroundProperty] = new LinearGradientBrush
+                {
+                    StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+                    EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+                    GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        }
+                }
+            };
+
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 190,
+                Height = 120,
+                Child = control
+            };
+
+            await RenderToFile(target);
+
+            CompareImages();
+        }
+
+        [Win32Fact("For consistent results")]
+        public async Task Should_Render_GlyphRun_UnPositioned()
+        {
+            var control = new UnPositionedGlyphRunControl
+            {
+                [TextElement.ForegroundProperty] = new LinearGradientBrush
+                {
+                    StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+                    EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+                    GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        }
+                }
+            };
+
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 190,
+                Height = 120,
+                Child = control
+            };
+
+            await RenderToFile(target);
+
+            CompareImages();
+        }
+
+        [Win32Fact("For consistent results")]
+        public async Task Should_Render_GlyphRun_Positioned()
+        {
+            var control = new PositionedGlyphRunControl
+            {
+                [TextElement.ForegroundProperty] = new LinearGradientBrush
+                {
+                    StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+                    EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+                    GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        }
+                }
+            };
+
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 190,
+                Height = 120,
+                Child = control
+            };
+
+            await RenderToFile(target);
+
+            CompareImages();
+        }
+
+        public class GlyphRunGeometryControl : Control
+        {
+            public GlyphRunGeometryControl()
+            {
+                var glyphTypeface = new Typeface(TestFontFamily).GlyphTypeface;
+
+                var glyphIndices = new[] { glyphTypeface.GetGlyph('A'), glyphTypeface.GetGlyph('B'), glyphTypeface.GetGlyph('C') };
+
+                var characters = new[] { 'A', 'B', 'C' };
+
+                var glyphRun = new GlyphRun(glyphTypeface, 100, characters, glyphIndices);
+
+                Geometry = glyphRun.BuildGeometry();
+            }
+
+           public Geometry Geometry { get; }
+
+            public override void Render(DrawingContext context)
+            {
+                var foreground = TextElement.GetForeground(this);
+
+                context.DrawGeometry(foreground, null, Geometry);
+            }
+        }
+
+        public class UnPositionedGlyphRunControl : Control
+        {
+            public UnPositionedGlyphRunControl()
+            {
+                var glyphTypeface = new Typeface(TestFontFamily).GlyphTypeface;
+
+                var glyphIndices = new[] { glyphTypeface.GetGlyph('A'), glyphTypeface.GetGlyph('B'), glyphTypeface.GetGlyph('C') };
+
+                var characters = new[] { 'A', 'B', 'C' };
+
+                GlyphRun = new GlyphRun(glyphTypeface, 100, characters, glyphIndices);
+            }
+
+            public GlyphRun GlyphRun { get; }
+
+            public override void Render(DrawingContext context)
+            {
+                var foreground = TextElement.GetForeground(this);
+
+                context.DrawGlyphRun(foreground, GlyphRun);
+            }
+        }
+
+        public class PositionedGlyphRunControl : Control
+        {
+            public PositionedGlyphRunControl()
+            {
+                var glyphTypeface = new Typeface(TestFontFamily).GlyphTypeface;
+
+                var glyphIndices = new[] { glyphTypeface.GetGlyph('A'), glyphTypeface.GetGlyph('B'), glyphTypeface.GetGlyph('C') };
+
+                var scale = 100.0 / glyphTypeface.Metrics.DesignEmHeight;
+
+                var advance = glyphTypeface.GetGlyphAdvance(glyphIndices[0]) * scale;
+
+                var advances = new[] { advance, advance, advance};
+
+                var characters = new[] { 'A', 'B', 'C' };
+
+                GlyphRun = new GlyphRun(glyphTypeface, 100, characters, glyphIndices, advances);
+            }
+
+            public GlyphRun GlyphRun { get; }
+
+            public override void Render(DrawingContext context)
+            {
+                var foreground = TextElement.GetForeground(this);
+
+                context.DrawGlyphRun(foreground, GlyphRun);
+            }
+        }
+
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
index 981ae0d0a4..b668f4d39e 100644
--- a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1,11 +1,8 @@
 using Avalonia.Media;
-using Avalonia.Platform;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Media.TextFormatting;
@@ -100,8 +97,8 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         {
             var fmt = Create(input, fontSize);
 
-            Assert.Equal(expWidth, fmt.Size.Width, 2);
-            Assert.Equal(expHeight, fmt.Size.Height, 2);
+            Assert.Equal(expWidth, fmt.Bounds.Width, 2);
+            Assert.Equal(expHeight, fmt.Bounds.Height, 2);
         }
 
         [Theory]
@@ -279,7 +276,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 Background = Brushes.White,
                 Child = new DrawnControl(c =>
                 {
-                    var textRect = new Rect(t.Size);
+                    var textRect = t.Bounds;
                     var bounds = new Rect(0, 0, 200, 200);
                     var rect = bounds.CenterRect(textRect);
                     c.DrawRectangle(Brushes.Yellow, null, rect);
@@ -311,7 +308,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 Background = Brushes.White,
                 Child = new DrawnControl(c =>
                 {
-                    var textRect = new Rect(t.Size);
+                    var textRect = t.Bounds;
                     var bounds = new Rect(0, 0, 200, 200);
                     var rect = bounds.CenterRect(textRect);
                     var rotate = Matrix.CreateTranslation(-100, -100) *
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index b70c721085..4d6b313ffc 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -1,17 +1,23 @@
 using System.IO;
 using System.Runtime.CompilerServices;
-using ImageMagick;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Rendering;
-
+using SixLabors.ImageSharp;
 using Xunit;
 using Avalonia.Platform;
 using System.Threading.Tasks;
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Disposables;
 using System.Threading;
 using Avalonia.Media;
+using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
+using SixLabors.ImageSharp.PixelFormats;
+using Image = SixLabors.ImageSharp.Image;
 #if AVALONIA_SKIA
 using Avalonia.Skia;
 #else
@@ -24,8 +30,6 @@ namespace Avalonia.Skia.RenderTests
 namespace Avalonia.Direct2D1.RenderTests
 #endif
 {
-    using Avalonia.PlatformSupport;
-
     public class TestBase
     {
 #if AVALONIA_SKIA
@@ -39,7 +43,7 @@ namespace Avalonia.Direct2D1.RenderTests
             new TestThreadingInterface();
 
         private static readonly IAssetLoader assetLoader = new AssetLoader();
-
+        
         static TestBase()
         {
 #if AVALONIA_SKIA
@@ -85,6 +89,7 @@ namespace Avalonia.Direct2D1.RenderTests
 
             var immediatePath = Path.Combine(OutputPath, testName + ".immediate.out.png");
             var deferredPath = Path.Combine(OutputPath, testName + ".deferred.out.png");
+            var compositedPath = Path.Combine(OutputPath, testName + ".composited.out.png");
             var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
             var pixelSize = new PixelSize((int)target.Width, (int)target.Height);
             var size = new Size(target.Width, target.Height);
@@ -97,7 +102,8 @@ namespace Avalonia.Direct2D1.RenderTests
                 bitmap.Render(target);
                 bitmap.Save(immediatePath);
             }
-
+            
+            
             using (var rtb = factory.CreateRenderTargetBitmap(pixelSize, dpiVector))
             using (var renderer = new DeferredRenderer(target, rtb))
             {
@@ -108,9 +114,30 @@ namespace Avalonia.Direct2D1.RenderTests
                 // Do the deferred render on a background thread to expose any threading errors in
                 // the deferred rendering path.
                 await Task.Run((Action)renderer.UnitTestRender);
+                threadingInterface.MainThread = Thread.CurrentThread;
 
                 rtb.Save(deferredPath);
             }
+
+            var timer = new ManualRenderTimer();
+
+            var compositor = new Compositor(new RenderLoop(timer, Dispatcher.UIThread), null);
+            using (var rtb = factory.CreateRenderTargetBitmap(pixelSize, dpiVector))
+            {
+                var root = new TestRenderRoot(dpiVector.X / 96, rtb);
+                using (var renderer = new CompositingRenderer(root, compositor) { RenderOnlyOnRenderThread = false})
+                {
+                    root.Initialize(renderer, target);
+                    renderer.Start();
+                    Dispatcher.UIThread.RunJobs();
+                    timer.TriggerTick();
+                }
+
+                // Free pools
+                for (var c = 0; c < 11; c++)
+                    TestThreadingInterface.RunTimers();
+                rtb.Save(compositedPath);
+            }
         }
 
         protected void CompareImages([CallerMemberName] string testName = "")
@@ -118,13 +145,16 @@ namespace Avalonia.Direct2D1.RenderTests
             var expectedPath = Path.Combine(OutputPath, testName + ".expected.png");
             var immediatePath = Path.Combine(OutputPath, testName + ".immediate.out.png");
             var deferredPath = Path.Combine(OutputPath, testName + ".deferred.out.png");
+            var compositedPath = Path.Combine(OutputPath, testName + ".composited.out.png");
 
-            using (var expected = new MagickImage(expectedPath))
-            using (var immediate = new MagickImage(immediatePath))
-            using (var deferred = new MagickImage(deferredPath))
+            using (var expected = Image.Load<Rgba32>(expectedPath))
+            using (var immediate = Image.Load<Rgba32>(immediatePath))
+            using (var deferred = Image.Load<Rgba32>(deferredPath))
+            using (var composited = Image.Load<Rgba32>(compositedPath))
             {
-                double immediateError = expected.Compare(immediate, ErrorMetric.RootMeanSquared);
-                double deferredError = expected.Compare(deferred, ErrorMetric.RootMeanSquared);
+                var immediateError = CompareImages(immediate, expected);
+                var deferredError = CompareImages(deferred, expected);
+                var compositedError = CompareImages(composited, expected);
 
                 if (immediateError > 0.022)
                 {
@@ -135,6 +165,11 @@ namespace Avalonia.Direct2D1.RenderTests
                 {
                     Assert.True(false, deferredPath + ": Error = " + deferredError);
                 }
+                
+                if (compositedError > 0.022)
+                {
+                    Assert.True(false, compositedPath + ": Error = " + compositedError);
+                }
             }
         }
 
@@ -143,10 +178,10 @@ namespace Avalonia.Direct2D1.RenderTests
             var expectedPath = Path.Combine(OutputPath, testName + ".expected.png");
             var actualPath = Path.Combine(OutputPath, testName + ".out.png");
 
-            using (var expected = new MagickImage(expectedPath))
-            using (var actual = new MagickImage(actualPath))
+            using (var expected = Image.Load<Rgba32>(expectedPath))
+            using (var actual = Image.Load<Rgba32>(actualPath))
             {
-                double immediateError = expected.Compare(actual, ErrorMetric.RootMeanSquared);
+                double immediateError = CompareImages(actual, expected);
 
                 if (immediateError > 0.022)
                 {
@@ -154,6 +189,53 @@ namespace Avalonia.Direct2D1.RenderTests
                 }
             }
         }
+        
+        /// <summary>
+        /// Calculates root mean square error for given two images.
+        /// Based roughly on ImageMagick implementation to ensure consistency.
+        /// </summary>
+        private static double CompareImages(Image<Rgba32> actual, Image<Rgba32> expected)
+        {
+            if (actual.Width != expected.Width || actual.Height != expected.Height)
+            {
+                throw new ArgumentException("Images have different resolutions");
+            }
+
+            var quantity = actual.Width * actual.Height;
+            double squaresError = 0;
+
+            const double scale = 1 / 255d;
+            
+            for (var x = 0; x < actual.Width; x++)
+            {
+                double localError = 0;
+                
+                for (var y = 0; y < actual.Height; y++)
+                {
+                    var expectedAlpha = expected[x, y].A * scale;
+                    var actualAlpha = actual[x, y].A * scale;
+                    
+                    var r = scale * (expectedAlpha * expected[x, y].R - actualAlpha * actual[x, y].R);
+                    var g = scale * (expectedAlpha * expected[x, y].G - actualAlpha * actual[x, y].G);
+                    var b = scale * (expectedAlpha * expected[x, y].B - actualAlpha * actual[x, y].B);
+                    var a = expectedAlpha - actualAlpha;
+
+                    var error = r * r + g * g + b * b + a * a;
+
+                    localError += error;
+                }
+
+                squaresError += localError;
+            }
+
+            var meanSquaresError = squaresError / quantity;
+
+            const int channelCount = 4;
+            
+            meanSquaresError = meanSquaresError / channelCount;
+            
+            return Math.Sqrt(meanSquaresError);
+        }
 
         private string GetTestsDirectory()
         {
@@ -187,9 +269,25 @@ namespace Avalonia.Direct2D1.RenderTests
                 // No-op
             }
 
+            private static List<Action> s_timers = new();
+            
+            public static void RunTimers()
+            {
+                lock (s_timers)
+                {
+                    foreach(var t in s_timers.ToList())
+                        t.Invoke();
+                }
+            }
+
             public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
             {
-                throw new NotImplementedException();
+                var act = () => tick();
+                lock (s_timers) s_timers.Add(act);
+                return Disposable.Create(() =>
+                {
+                    lock (s_timers) s_timers.Remove(act);
+                });
             }
         }
     }
diff --git a/tests/Avalonia.RenderTests/TestRenderRoot.cs b/tests/Avalonia.RenderTests/TestRenderRoot.cs
new file mode 100644
index 0000000000..8f2b324d9c
--- /dev/null
+++ b/tests/Avalonia.RenderTests/TestRenderRoot.cs
@@ -0,0 +1,48 @@
+using Avalonia.Rendering;
+using System.Threading.Tasks;
+using System;
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests
+#endif
+{
+    public class TestRenderRoot : Decorator, IRenderRoot
+    {
+        private readonly IRenderTarget _renderTarget;
+        public Size ClientSize { get; private set; }
+        public IRenderer Renderer { get; private set; }
+        public double RenderScaling { get; }
+
+        public TestRenderRoot(double scaling, IRenderTarget renderTarget)
+        {
+            _renderTarget = renderTarget;
+            RenderScaling = scaling;
+        }
+
+        public void Initialize(IRenderer renderer, Control child)
+        {
+            Renderer = renderer;
+            Child = child;
+            Width = child.Width;
+            Height = child.Height;
+            ClientSize = new Size(Width, Height);
+            Measure(ClientSize);
+            Arrange(new Rect(ClientSize));
+        }
+
+        public IRenderTarget CreateRenderTarget() => _renderTarget;
+
+        public void Invalidate(Rect rect)
+        {
+        }
+
+        public Point PointToClient(PixelPoint point) => point.ToPoint(RenderScaling);
+
+        public PixelPoint PointToScreen(Point point) => PixelPoint.FromPoint(point, RenderScaling);
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index 41c76dcd83..5e481f21c1 100644
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -10,24 +10,17 @@
     <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.DesktopRuntime\Avalonia.DesktopRuntime.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
+  <Import Project="..\..\build\ImageSharp.props" />
   <Import Project="..\..\build\SkiaSharp.props" />
   <Import Project="..\..\build\SharedVersion.props" />
 </Project>
diff --git a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
index e37cd25009..ccde66a50e 100644
--- a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
+++ b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
@@ -13,14 +13,8 @@
     <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
diff --git a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
index cc4b727bd9..a748f6cf00 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
@@ -15,14 +15,16 @@ namespace Avalonia.Skia.UnitTests.Media
 
         private readonly Typeface _defaultTypeface =
             new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Mono");
+        private readonly Typeface _arabicTypeface =
+           new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans Arabic");
         private readonly Typeface _italicTypeface =
-            new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans");
+            new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans", FontStyle.Italic);
         private readonly Typeface _emojiTypeface =
             new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Twitter Color Emoji");
 
         public CustomFontManagerImpl()
         {
-            _customTypefaces = new[] { _emojiTypeface, _italicTypeface, _defaultTypeface };
+            _customTypefaces = new[] { _emojiTypeface, _italicTypeface, _arabicTypeface, _defaultTypeface };
             _defaultFamilyName = _defaultTypeface.FontFamily.FamilyNames.PrimaryFamilyName;
         }
 
@@ -38,7 +40,8 @@ namespace Avalonia.Skia.UnitTests.Media
 
         private readonly string[] _bcp47 = { CultureInfo.CurrentCulture.ThreeLetterISOLanguageName, CultureInfo.CurrentCulture.TwoLetterISOLanguageName };
 
-        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily,
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontStretch fontStretch,
+            FontFamily fontFamily,
             CultureInfo culture, out Typeface typeface)
         {
             foreach (var customTypeface in _customTypefaces)
@@ -54,14 +57,14 @@ namespace Avalonia.Skia.UnitTests.Media
             }
 
             var fallback = SKFontManager.Default.MatchCharacter(fontFamily?.Name, (SKFontStyleWeight)fontWeight,
-                SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle, _bcp47, codepoint);
+                (SKFontStyleWidth)fontStretch, (SKFontStyleSlant)fontStyle, _bcp47, codepoint);
 
             typeface = new Typeface(fallback?.FamilyName ?? _defaultFamilyName, fontStyle, fontWeight);
 
             return true;
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphTypeface CreateGlyphTypeface(Typeface typeface)
         {
             SKTypeface skTypeface;
 
@@ -79,6 +82,12 @@ namespace Avalonia.Skia.UnitTests.Media
                         skTypeface = typefaceCollection.Get(typeface);
                         break;
                     }
+                case "Noto Sans Arabic":
+                    {
+                        var typefaceCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(_arabicTypeface.FontFamily);
+                        skTypeface = typefaceCollection.Get(typeface);
+                        break;
+                    }
                 case FontFamily.DefaultFontFamilyName:
                 case "Noto Mono":
                     {
@@ -94,7 +103,7 @@ namespace Avalonia.Skia.UnitTests.Media
                     }
             }
 
-            return new GlyphTypefaceImpl(skTypeface);
+            return new GlyphTypefaceImpl(skTypeface, FontSimulations.None);
         }
     }
 }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs b/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
index df286d709e..649e1fbf3d 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
@@ -33,15 +33,11 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             var fontManager = new FontManagerImpl();
 
-            //we need to have a valid font name different from the default one
-            string fontName = fontManager.GetInstalledFontFamilyNames().First();
-
             var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
-                new Typeface(new FontFamily($"A, B, {fontName}"), weight: FontWeight.Bold));
+                new Typeface(new FontFamily($"A, B, Arial"), weight: FontWeight.Bold));
 
             var skTypeface = glyphTypeface.Typeface;
-
-            Assert.Equal(fontName, skTypeface.FamilyName);
+            
             Assert.True(skTypeface.FontWeight >= 600);
         }
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
index 904f0935c4..3b9caa393e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
@@ -17,8 +17,9 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             using (Start())
             {
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, direction, CultureInfo.CurrentCulture);
                 var shapedBuffer =
-                    TextShaper.Current.ShapeText(text.AsMemory(), Typeface.Default.GlyphTypeface, 10, CultureInfo.CurrentCulture, direction);
+                    TextShaper.Current.ShapeText(text.AsMemory(), options);
 
                 var glyphRun = CreateGlyphRun(shapedBuffer);
 
@@ -59,8 +60,9 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             using (Start())
             {
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, direction, CultureInfo.CurrentCulture);
                 var shapedBuffer =
-                    TextShaper.Current.ShapeText(text.AsMemory(), Typeface.Default.GlyphTypeface, 10, CultureInfo.CurrentCulture, direction);
+                    TextShaper.Current.ShapeText(text.AsMemory(), options);
 
                 var glyphRun = CreateGlyphRun(shapedBuffer);
 
@@ -103,8 +105,9 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             using (Start())
             {
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, direction, CultureInfo.CurrentCulture);
                 var shapedBuffer =
-                   TextShaper.Current.ShapeText(text.AsMemory(), Typeface.Default.GlyphTypeface, 10, CultureInfo.CurrentCulture, direction);
+                   TextShaper.Current.ShapeText(text.AsMemory(), options);
 
                 var glyphRun = CreateGlyphRun(shapedBuffer);
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs b/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
index ddf4a36dcd..64050bd85e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Skia.UnitTests.Media
         }
         
         [Fact]
-        public void Should_Get_Null_For_Invalid_FamilyName()
+        public void Should_Get_Typeface_For_Invalid_FamilyName()
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
@@ -39,7 +39,24 @@ namespace Avalonia.Skia.UnitTests.Media
 
                 var typeface = notoMonoCollection.Get(new Typeface("ABC"));
                 
-                Assert.Null(typeface);
+                Assert.NotNull(typeface);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Typeface_For_Partial_FamilyName()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontFamily = new FontFamily("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#T");
+
+                var fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(fontFamily);
+
+                var typeface = fontCollection.Get(new Typeface(fontFamily));
+
+                Assert.NotNull(typeface);
+
+                Assert.Equal("Twitter Color Emoji", typeface.FamilyName);
             }
         }
     }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
index 2a20fdd9fe..005bcdf70e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
@@ -20,15 +20,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
         public TextRun GetTextRun(int textSourceIndex)
         {
-            if (textSourceIndex > 50)
+            if (textSourceIndex >= 50)
             {
                 return null;
             }
-            
-            if (textSourceIndex == 50)
-            {
-                return new TextEndOfParagraph();
-            }
 
             var index = textSourceIndex / 10;
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
index 65c342b065..dee4fe7f77 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
@@ -23,13 +23,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
             
             var runText = _text.Skip(textSourceIndex);
-            
-            if (runText.IsEmpty)
-            {
-                return new TextEndOfParagraph();
-            }
 
-            return new TextCharacters(runText, _defaultGenericPropertiesRunProperties);
+            return runText.IsEmpty ? null : new TextCharacters(runText, _defaultGenericPropertiesRunProperties);
         }
     }
 }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
index 326997328b..316926b00c 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
@@ -58,7 +58,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 Assert.Equal(5, textLine.TextRuns.Count);
 
-                Assert.Equal(50, textLine.TextRange.Length);
+                Assert.Equal(50, textLine.Length);
             }
         }
 
@@ -89,7 +89,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var textLine = formatter.FormatLine(textSource, 0, double.PositiveInfinity,
                     new GenericTextParagraphProperties(defaultProperties));
 
-                Assert.Equal(text.Length, textLine.TextRange.Length);
+                Assert.Equal(text.Length, textLine.Length);
 
                 for (var i = 0; i < GenericTextRunPropertiesRuns.Length; i++)
                 {
@@ -134,7 +134,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
 
                 const string text = "👍 👍 👍 👍";
-                
+
                 var textSource = new SingleBufferTextSource(text, defaultProperties);
 
                 var formatter = new TextFormatterImpl();
@@ -144,7 +144,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         new GenericTextParagraphProperties(defaultProperties));
 
                 Assert.Equal(1, textLine.TextRuns.Count);
-            } 
+            }
         }
 
         [Fact]
@@ -163,9 +163,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var textLine =
                     formatter.FormatLine(textSource, 0, double.PositiveInfinity,
                         new GenericTextParagraphProperties(defaultProperties));
-                
+
                 var firstRun = textLine.TextRuns[0];
-                
+
                 Assert.Equal(4, firstRun.Text.Length);
             }
         }
@@ -191,14 +191,14 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 {
                     var textLine =
                         formatter.FormatLine(textSource, currentPosition, 1,
-                            new GenericTextParagraphProperties(defaultProperties, textWrap : TextWrapping.WrapWithOverflow));
+                            new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.WrapWithOverflow));
 
                     if (text.Length - currentPosition > expectedCharactersPerLine)
                     {
-                        Assert.Equal(expectedCharactersPerLine, textLine.TextRange.Length);
+                        Assert.Equal(expectedCharactersPerLine, textLine.Length);
                     }
 
-                    currentPosition += textLine.TextRange.Length;
+                    currentPosition += textLine.Length;
 
                     numberOfLines++;
                 }
@@ -237,7 +237,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var glyph = typeface.GlyphTypeface.GetGlyph('a');
 
                 var advance = typeface.GlyphTypeface.GetGlyphAdvance(glyph) *
-                              (12.0 / typeface.GlyphTypeface.DesignEmHeight);
+                              (12.0 / typeface.GlyphTypeface.Metrics.DesignEmHeight);
 
                 var paragraphWidth = advance * numberOfCharactersPerLine;
 
@@ -249,16 +249,18 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         formatter.FormatLine(textSource, currentPosition, paragraphWidth,
                             new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.Wrap));
 
-                    Assert.True(expected.Contains(textLine.TextRange.End));
+                    var end = textLine.FirstTextSourceIndex + textLine.Length - 1;
+
+                    Assert.True(expected.Contains(end));
 
-                    var index = expected.IndexOf(textLine.TextRange.End);
+                    var index = expected.IndexOf(end);
 
                     for (var i = 0; i <= index; i++)
                     {
                         expected.RemoveAt(0);
                     }
 
-                    currentPosition += textLine.TextRange.Length;
+                    currentPosition += textLine.Length;
                 }
             }
         }
@@ -312,7 +314,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     Assert.True(textLine.Width <= 200);
 
-                    textSourceIndex += textLine.TextRange.Length;
+                    textSourceIndex += textLine.Length;
                 }
             }
         }
@@ -336,17 +338,17 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     var textLine =
                         formatter.FormatLine(textSource, textSourceIndex, 3, paragraphProperties);
 
-                    Assert.NotEqual(0, textLine.TextRange.Length);
+                    Assert.NotEqual(0, textLine.Length);
 
-                    textSourceIndex += textLine.TextRange.Length;
+                    textSourceIndex += textLine.Length;
                 }
 
                 Assert.Equal(text.Length, textSourceIndex);
             }
         }
 
-        [InlineData("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor",  
-            new []{ "Lorem ipsum ", "dolor sit amet, ", "consectetur ", "adipisicing elit, ", "sed do eiusmod "})]
+        [InlineData("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor",
+            new[] { "Lorem ipsum ", "dolor sit amet, ", "consectetur ", "adipisicing elit, ", "sed do eiusmod " })]
 
         [Theory]
         public void Should_Produce_Wrapped_And_Trimmed_Lines(string text, string[] expectedLines)
@@ -366,7 +368,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     new ValueSpan<TextRunProperties>(28, 28,
                         new GenericTextRunProperties(new Typeface("Verdana", FontStyle.Italic),32))
                 };
-                
+
                 var textSource = new FormattedTextSource(text.AsMemory(), defaultProperties, styleSpans);
 
                 var formatter = new TextFormatterImpl();
@@ -383,23 +385,23 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         formatter.FormatLine(textSource, currentPosition, 300,
                             new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.WrapWithOverflow));
 
-                    currentPosition += textLine.TextRange.Length;
+                    currentPosition += textLine.Length;
 
                     if (textLine.Width > 300 || currentHeight + textLine.Height > 240)
                     {
-                        textLine = textLine.Collapse(new TextTrailingWordEllipsis(300, defaultProperties));
+                        textLine = textLine.Collapse(new TextTrailingWordEllipsis(new ReadOnlySlice<char>(new[] { TextTrimming.DefaultEllipsisChar }), 300, defaultProperties));
                     }
-                    
+
                     currentHeight += textLine.Height;
 
-                    var currentText = text.Substring(textLine.TextRange.Start, textLine.TextRange.Length);
-                    
+                    var currentText = text.Substring(textLine.FirstTextSourceIndex, textLine.Length);
+
                     Assert.Equal(expectedLines[currentLineIndex], currentText);
 
                     currentLineIndex++;
                 }
-                
-                Assert.Equal(expectedLines.Length,currentLineIndex);
+
+                Assert.Equal(expectedLines.Length, currentLineIndex);
             }
         }
 
@@ -410,11 +412,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         [InlineData("0123456789", TextAlignment.Left, FlowDirection.RightToLeft)]
         [InlineData("0123456789", TextAlignment.Center, FlowDirection.RightToLeft)]
         [InlineData("0123456789", TextAlignment.Right, FlowDirection.RightToLeft)]
-        
+
         [InlineData("שנבגק", TextAlignment.Left, FlowDirection.RightToLeft)]
         [InlineData("שנבגק", TextAlignment.Center, FlowDirection.RightToLeft)]
         [InlineData("שנבגק", TextAlignment.Right, FlowDirection.RightToLeft)]
-        
+
         [Theory]
         public void Should_Align_TextLine(string text, TextAlignment textAlignment, FlowDirection flowDirection)
         {
@@ -423,45 +425,30 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
 
                 var paragraphProperties = new GenericTextParagraphProperties(flowDirection, textAlignment, true, true,
-                    defaultProperties, TextWrapping.NoWrap, 0, 0);
-                
+                    defaultProperties, TextWrapping.NoWrap, 0, 0, 0);
+
                 var textSource = new SingleBufferTextSource(text, defaultProperties);
                 var formatter = new TextFormatterImpl();
-                
+
                 var textLine =
                     formatter.FormatLine(textSource, 0, 100, paragraphProperties);
 
                 var expectedOffset = 0d;
 
-                if (flowDirection == FlowDirection.LeftToRight)
-                {
-                    switch (textAlignment)
-                    {
-                        case TextAlignment.Center:
-                            expectedOffset = 50 - textLine.Width / 2;
-                            break;
-                        case TextAlignment.Right:
-                            expectedOffset = 100 - textLine.WidthIncludingTrailingWhitespace;
-                            break;
-                    }
-                }
-                else
+                switch (textAlignment)
                 {
-                    switch (textAlignment)
-                    {
-                        case TextAlignment.Left:
-                            expectedOffset = 100 - textLine.WidthIncludingTrailingWhitespace;
-                            break;
-                        case TextAlignment.Center:
-                            expectedOffset = 50 - textLine.Width / 2;
-                            break;
-                    }
+                    case TextAlignment.Center:
+                        expectedOffset = 50 - textLine.Width / 2;
+                        break;
+                    case TextAlignment.Right:
+                        expectedOffset = 100 - textLine.WidthIncludingTrailingWhitespace;
+                        break;
                 }
 
                 Assert.Equal(expectedOffset, textLine.Start);
             }
         }
-        
+
         [Fact]
         public void Should_Wrap_Syriac()
         {
@@ -485,9 +472,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     var textLine =
                         formatter.FormatLine(textSource, textPosition, 50, paragraphProperties, lastBreak);
 
-                    Assert.Equal(textLine.TextRange.Length, textLine.TextRuns.Sum(x => x.TextSourceLength));
-                    
-                    textPosition += textLine.TextRange.Length;
+                    Assert.Equal(textLine.Length, textLine.TextRuns.Sum(x => x.TextSourceLength));
+
+                    textPosition += textLine.Length;
 
                     lastBreak = textLine.TextLineBreak;
                 }
@@ -501,14 +488,14 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             {
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
                 var paragraphProperties = new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.Wrap);
-                
+
                 var textSource = new SingleBufferTextSource("0123456789_0123456789_0123456789_0123456789", defaultProperties);
                 var formatter = new TextFormatterImpl();
-                
+
                 var textLine =
                     formatter.FormatLine(textSource, 0, 33, paragraphProperties);
-                
-                Assert.NotNull(textLine.TextLineBreak?.RemainingCharacters);
+
+                Assert.NotNull(textLine.TextLineBreak?.RemainingRuns);
             }
         }
 
@@ -522,12 +509,12 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             using (Start())
             {
                 var formatter = new TextFormatterImpl();
-                
+
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
 
                 var paragraphProperties =
                     new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.NoWrap);
-                
+
                 var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
 
                 var expectedTextLine = formatter.FormatLine(new SingleBufferTextSource(text, defaultProperties),
@@ -546,22 +533,114 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                             new ValueSpan<TextRunProperties>(i, j,
                                 new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
                         };
-                        
+
                         var textSource = new FormattedTextSource(text.AsMemory(), defaultProperties, spans);
-                
+
                         var textLine =
                             formatter.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
-                        
+
                         var shapedRuns = textLine.TextRuns.Cast<ShapedTextCharacters>().ToList();
 
                         var actualGlyphs = shapedRuns.SelectMany(x => x.GlyphRun.GlyphIndices).ToList();
-                        
+
                         Assert.Equal(expectedGlyphs, actualGlyphs);
                     }
                 }
             }
         }
 
+        [Fact]
+        public void Should_FormatLine_With_DrawableRuns()
+        {
+            var defaultRunProperties = new GenericTextRunProperties(Typeface.Default, foregroundBrush: Brushes.Black);
+            var paragraphProperties = new GenericTextParagraphProperties(defaultRunProperties);
+            var textSource = new CustomTextSource("Hello World ->");
+
+            using (Start())
+            {
+                var textLine =
+                    TextFormatter.Current.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
+
+                Assert.Equal(3, textLine.TextRuns.Count);
+
+                Assert.True(textLine.TextRuns[1] is RectangleRun);
+            }
+        }
+
+        [Fact]
+        public void Should_Format_With_EndOfLineRun()
+        {
+            using (Start())
+            {
+                var defaultRunProperties = new GenericTextRunProperties(Typeface.Default);
+                var paragraphProperties = new GenericTextParagraphProperties(defaultRunProperties);
+                var textSource = new EndOfLineTextSource();
+
+                var textLine =
+                    TextFormatter.Current.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
+
+                Assert.NotNull(textLine.TextLineBreak);
+
+                Assert.Equal(TextRun.DefaultTextSourceLength, textLine.Length);
+            }
+        }
+
+        private class EndOfLineTextSource : ITextSource
+        {
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                return new TextEndOfLine();
+            }
+        }
+
+        private class CustomTextSource : ITextSource
+        {
+            private readonly string _text;
+
+            public CustomTextSource(string text)
+            {
+                _text = text;
+            }
+
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                if (textSourceIndex >= _text.Length + TextRun.DefaultTextSourceLength + _text.Length)
+                {
+                    return null;
+                }
+
+                if (textSourceIndex == _text.Length)
+                {
+                    return new RectangleRun(new Rect(0, 0, 50, 50), Brushes.Green);
+                }
+
+                return new TextCharacters(_text.AsMemory(),
+                    new GenericTextRunProperties(Typeface.Default, foregroundBrush: Brushes.Black));
+            }
+        }
+
+        private class RectangleRun : DrawableTextRun
+        {
+            private readonly Rect _rect;
+            private readonly IBrush _fill;
+
+            public RectangleRun(Rect rect, IBrush fill)
+            {
+                _rect = rect;
+                _fill = fill;
+            }
+
+            public override Size Size => _rect.Size;
+            public override double Baseline => 0;
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {
+                using (drawingContext.PushPreTransform(Matrix.CreateTranslation(new Vector(origin.X, 0))))
+                {
+                    drawingContext.FillRectangle(_fill, _rect);
+                }
+            }
+        }
+
         public static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 595bcd4009..d6da2c77c4 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Media;
@@ -88,8 +89,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     textWrapping: TextWrapping.Wrap,
                     maxWidth: 200);
 
-                var expectedLines = expected.TextLines.Select(x => text.Substring(x.TextRange.Start,
-                    x.TextRange.Length)).ToList();
+                var expectedLines = expected.TextLines.Select(x => text.Substring(x.FirstTextSourceIndex,
+                    x.Length)).ToList();
 
                 var spans = new[]
                 {
@@ -106,8 +107,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     maxWidth: 200,
                     textStyleOverrides: spans);
 
-                var actualLines = actual.TextLines.Select(x => text.Substring(x.TextRange.Start,
-                    x.TextRange.Length)).ToList();
+                var actualLines = actual.TextLines.Select(x => text.Substring(x.FirstTextSourceIndex,
+                    x.Length)).ToList();
 
                 Assert.Equal(expectedLines.Count, actualLines.Count);
 
@@ -140,7 +141,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     black,
                     textWrapping: TextWrapping.Wrap);
 
-                var expectedGlyphs = expected.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>().SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
+                var expectedGlyphs = expected.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>()
+                    .SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
 
                 var outer = new GraphemeEnumerator(text.AsMemory());
                 var inner = new GraphemeEnumerator(text.AsMemory());
@@ -153,7 +155,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     {
                         j += inner.Current.Text.Length;
 
-                        if(j + i > text.Length)
+                        if (j + i > text.Length)
                         {
                             break;
                         }
@@ -172,7 +174,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                             textWrapping: TextWrapping.Wrap,
                             textStyleOverrides: spans);
 
-                        var actualGlyphs = actual.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>().SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
+                        var actualGlyphs = actual.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>()
+                            .SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
 
                         Assert.Equal(expectedGlyphs.Count, actualGlyphs.Count);
 
@@ -348,7 +351,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     12.0f,
                     Brushes.Black.ToImmutable());
 
-                Assert.Equal(MultiLineText.Length, layout.TextLines.Sum(x => x.TextRange.Length));
+                Assert.Equal(MultiLineText.Length, layout.TextLines.Sum(x => x.Length));
             }
         }
 
@@ -575,9 +578,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             {
                 var glyphTypeface = Typeface.Default.GlyphTypeface;
 
-                var emHeight = glyphTypeface.DesignEmHeight;
+                var emHeight = glyphTypeface.Metrics.DesignEmHeight;
 
-                var lineHeight = (glyphTypeface.Descent - glyphTypeface.Ascent) * (12.0 / emHeight);
+                var lineHeight = glyphTypeface.Metrics.LineSpacing * (12.0 / emHeight);
 
                 var layout = new TextLayout(
                     text,
@@ -588,7 +591,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 Assert.Equal(1, layout.TextLines.Count);
 
-                Assert.Equal(lineHeight, layout.Size.Height);
+                Assert.Equal(lineHeight, layout.Bounds.Height);
             }
         }
 
@@ -716,7 +719,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var selectedRect = rects[0];
 
-                Assert.Equal(selectedText.Size.Width, selectedRect.Width);
+                Assert.Equal(selectedText.Bounds.Width, selectedRect.Width);
             }
         }
 
@@ -736,7 +739,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var textLine = layout.TextLines[0];
 
                 var start = textLine.GetDistanceFromCharacterHit(new CharacterHit(5, 1));
-                
+
                 var end = textLine.GetDistanceFromCharacterHit(new CharacterHit(6, 1));
 
                 var rects = layout.HitTestTextRange(0, 7).ToArray();
@@ -744,7 +747,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(1, rects.Length);
 
                 var expected = rects[0];
-                
+
                 Assert.Equal(expected.Left, start);
                 Assert.Equal(expected.Right, end);
             }
@@ -813,14 +816,14 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         Assert.True(textLine.Width <= maxWidth);
 
                         var actual = new string(textLine.TextRuns.Cast<ShapedTextCharacters>().OrderBy(x => x.Text.Start).SelectMany(x => x.Text).ToArray());
-                        var expected = text.Substring(textLine.TextRange.Start, textLine.TextRange.Length);
+                        var expected = text.Substring(textLine.FirstTextSourceIndex, textLine.Length);
 
                         Assert.Equal(expected, actual);
-                    }                  
+                    }
                 }
             }
         }
-        
+
         [Fact]
         public void Should_Layout_Empty_String()
         {
@@ -831,8 +834,187 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     Typeface.Default,
                     12,
                     Brushes.Black);
-                
-                Assert.True(layout.Size.Height > 0);
+
+                Assert.True(layout.Bounds.Height > 0);
+            }
+        }
+
+        [Fact]
+        public void Should_HitTestPoint_RightToLeft()
+        {
+            using (Start())
+            {
+                var text = "אאא AAA";
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black,
+                    flowDirection: FlowDirection.RightToLeft);
+
+                var firstRun = layout.TextLines[0].TextRuns[0] as ShapedTextCharacters;
+
+                var hit = layout.HitTestPoint(new Point());
+
+                Assert.Equal(4, hit.TextPosition);
+
+                var currentX = 0.0;
+
+                for (var i = 0; i < firstRun.GlyphRun.GlyphClusters.Count; i++)
+                {
+                    var cluster = firstRun.GlyphRun.GlyphClusters[i];
+                    var advance = firstRun.GlyphRun.GlyphAdvances[i];
+
+                    hit = layout.HitTestPoint(new Point(currentX, 0));
+
+                    Assert.Equal(cluster, hit.TextPosition);
+
+                    var hitRange = layout.HitTestTextRange(hit.TextPosition, 1);
+
+                    var distance = hitRange.First().Left;
+
+                    Assert.Equal(currentX, distance);
+
+                    currentX += advance;
+                }
+
+                var secondRun = layout.TextLines[0].TextRuns[1] as ShapedTextCharacters;
+
+                hit = layout.HitTestPoint(new Point(firstRun.Size.Width, 0));
+
+                Assert.Equal(7, hit.TextPosition);
+
+                hit = layout.HitTestPoint(new Point(layout.TextLines[0].WidthIncludingTrailingWhitespace, 0));
+
+                Assert.Equal(0, hit.TextPosition);
+
+                currentX = firstRun.Size.Width + 0.5;
+
+                for (var i = 0; i < secondRun.GlyphRun.GlyphClusters.Count; i++)
+                {
+                    var cluster = secondRun.GlyphRun.GlyphClusters[i];
+                    var advance = secondRun.GlyphRun.GlyphAdvances[i];
+
+                    hit = layout.HitTestPoint(new Point(currentX, 0));
+
+                    Assert.Equal(cluster, hit.CharacterHit.FirstCharacterIndex);
+
+                    var hitRange = layout.HitTestTextRange(hit.CharacterHit.FirstCharacterIndex, hit.CharacterHit.TrailingLength);
+
+                    var distance = hitRange.First().Left + 0.5;
+
+                    Assert.Equal(currentX, distance);
+
+                    currentX += advance;
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance_RTL()
+        {
+            using (Start())
+            {
+                var text = "أَبْجَدِيَّة عَرَبِيَّة";
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black);
+
+                var textLine = layout.TextLines[0];
+
+                var firstRun = (ShapedTextCharacters)textLine.TextRuns[0];
+
+                var firstCluster = firstRun.ShapedBuffer.GlyphClusters[0];
+
+                var characterHit = textLine.GetCharacterHitFromDistance(0);
+
+                Assert.Equal(firstCluster, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(text.Length, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+
+                var distance = textLine.GetDistanceFromCharacterHit(characterHit);
+
+                Assert.Equal(0, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(characterHit.FirstCharacterIndex));
+
+                var firstAdvance = firstRun.ShapedBuffer.GlyphAdvances[0];
+
+                Assert.Equal(firstAdvance, distance, 5);
+
+                var rect = layout.HitTestTextPosition(22);
+
+                Assert.Equal(firstAdvance, rect.Left, 5);
+
+                rect = layout.HitTestTextPosition(23);
+
+                Assert.Equal(0, rect.Left, 5);
+
+            }
+        }
+
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance_RTL_With_TextStyles()
+        {
+            using (Start())
+            {
+                var text = "أَبْجَدِيَّة عَرَبِيَّة";
+
+                var i = 0;
+
+                var graphemeEnumerator = new GraphemeEnumerator(text.AsMemory());
+
+                while (graphemeEnumerator.MoveNext())
+                {
+                    var grapheme = graphemeEnumerator.Current;
+
+                    var textStyleOverrides = new[] { new ValueSpan<TextRunProperties>(i, grapheme.Text.Length, new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Red)) };
+
+                    i += grapheme.Text.Length;
+
+                    var layout = new TextLayout(
+                        text,
+                        Typeface.Default,
+                        12,
+                        Brushes.Black,
+                        textStyleOverrides: textStyleOverrides);
+
+                    var textLine = layout.TextLines[0];
+
+                    var shapedRuns = textLine.TextRuns.Cast<ShapedTextCharacters>().ToList();
+
+                    var clusters = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphClusters).ToList();
+
+                    var glyphAdvances = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphAdvances).ToList();
+
+                    var currentX = 0.0;
+
+                    var cluster = text.Length;
+
+                    for (int j = 0; j < clusters.Count - 1; j++)
+                    {                     
+                        var glyphAdvance = glyphAdvances[j];
+
+                        var characterHit = textLine.GetCharacterHitFromDistance(currentX);
+
+                        Assert.Equal(cluster, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+
+                        var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
+
+                        Assert.Equal(currentX, distance, 5);
+
+                        currentX += glyphAdvance;
+
+                        if(glyphAdvance > 0)
+                        {
+                            cluster = clusters[j];
+                        }
+                    }
+                }
             }
         }
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
index 8cb010f42b..87de9ed11f 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 {
     public class TextLineTests
     {
-        private static readonly string s_multiLineText = "012345678\r\r0123456789";
+        private const string s_multiLineText = "012345678\r\r0123456789";
 
         [Fact]
         public void Should_Get_First_CharacterHit()
@@ -35,9 +35,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var firstCharacterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(int.MinValue));
 
-                    Assert.Equal(textLine.TextRange.Start, firstCharacterHit.FirstCharacterIndex);
+                    Assert.Equal(textLine.FirstTextSourceIndex, firstCharacterHit.FirstCharacterIndex);
 
-                    currentIndex += textLine.TextRange.Length;
+                    currentIndex += textLine.Length;
                 }
             }
         }
@@ -63,19 +63,19 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var lastCharacterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(int.MaxValue));
 
-                    Assert.Equal(textLine.TextRange.Start + textLine.TextRange.Length,
+                    Assert.Equal(textLine.FirstTextSourceIndex + textLine.Length,
                         lastCharacterHit.FirstCharacterIndex + lastCharacterHit.TrailingLength);
 
-                    currentIndex += textLine.TextRange.Length;
+                    currentIndex += textLine.Length;
                 }
             }
         }
-        
+
         [Fact]
         public void Should_Get_Next_Caret_CharacterHit_Bidi()
         {
             const string text = "אבג 1 ABC";
-            
+
             using (Start())
             {
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
@@ -90,7 +90,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var clusters = new List<int>();
 
-                foreach (var textRun in textLine.TextRuns.OrderBy(x=> x.Text.Start))
+                foreach (var textRun in textLine.TextRuns.OrderBy(x => x.Text.Start))
                 {
                     var shapedRun = (ShapedTextCharacters)textRun;
 
@@ -98,7 +98,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         shapedRun.ShapedBuffer.GlyphClusters.Reverse() :
                         shapedRun.ShapedBuffer.GlyphClusters);
                 }
-                
+
                 var nextCharacterHit = new CharacterHit(0, clusters[1] - clusters[0]);
 
                 foreach (var cluster in clusters)
@@ -122,7 +122,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         public void Should_Get_Previous_Caret_CharacterHit_Bidi()
         {
             const string text = "אבג 1 ABC";
-            
+
             using (Start())
             {
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
@@ -137,7 +137,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var clusters = new List<int>();
 
-                foreach (var textRun in textLine.TextRuns.OrderBy(x=> x.Text.Start))
+                foreach (var textRun in textLine.TextRuns.OrderBy(x => x.Text.Start))
                 {
                     var shapedRun = (ShapedTextCharacters)textRun;
 
@@ -147,13 +147,13 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 }
 
                 clusters.Reverse();
-                
+
                 var nextCharacterHit = new CharacterHit(text.Length - 1);
 
                 foreach (var cluster in clusters)
                 {
                     var currentCaretIndex = nextCharacterHit.FirstCharacterIndex + nextCharacterHit.TrailingLength;
-                    
+
                     Assert.Equal(cluster, currentCaretIndex);
 
                     nextCharacterHit = textLine.GetPreviousCaretCharacterHit(nextCharacterHit);
@@ -168,7 +168,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(lastCharacterHit.TrailingLength, nextCharacterHit.TrailingLength);
             }
         }
-        
+
         [InlineData("𐐷𐐷𐐷𐐷𐐷")]
         [InlineData("01234567🎉\n")]
         [InlineData("𐐷1234")]
@@ -277,6 +277,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 firstCharacterHit = previousCharacterHit;
 
+                firstCharacterHit = textLine.GetPreviousCaretCharacterHit(firstCharacterHit);
+
                 previousCharacterHit = textLine.GetPreviousCaretCharacterHit(firstCharacterHit);
 
                 Assert.Equal(firstCharacterHit.FirstCharacterIndex, previousCharacterHit.FirstCharacterIndex);
@@ -322,7 +324,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     }
                 }
 
-                Assert.Equal(currentDistance,textLine.GetDistanceFromCharacterHit(new CharacterHit(s_multiLineText.Length)));
+                Assert.Equal(currentDistance, textLine.GetDistanceFromCharacterHit(new CharacterHit(s_multiLineText.Length)));
             }
         }
 
@@ -360,10 +362,29 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
-        [InlineData("01234 01234", 8, TextCollapsingStyle.TrailingCharacter, "01234 0\u2026")]
-        [InlineData("01234 01234", 8, TextCollapsingStyle.TrailingWord, "01234\u2026")]
+        public static IEnumerable<object[]> CollapsingData
+        {
+            get
+            {
+                yield return CreateData("01234 01234 01234", 120, TextTrimming.PrefixCharacterEllipsis, "01234 01\u20264 01234");
+                yield return CreateData("01234 01234", 58, TextTrimming.CharacterEllipsis, "01234 0\u2026");
+                yield return CreateData("01234 01234", 58, TextTrimming.WordEllipsis, "01234\u2026");
+                yield return CreateData("01234", 9, TextTrimming.CharacterEllipsis, "\u2026");
+                yield return CreateData("01234", 2, TextTrimming.CharacterEllipsis, "");
+
+                object[] CreateData(string text, double width, TextTrimming mode, string expected)
+                {
+                    return new object[]
+                    {
+                        text, width, mode, expected
+                    };
+                }
+            }
+        }
+
+        [MemberData(nameof(CollapsingData))]
         [Theory]
-        public void Should_Collapse_Line(string text, int numberOfCharacters, TextCollapsingStyle style, string expected)
+        public void Should_Collapse_Line(string text, double width, TextTrimming trimming, string expected)
         {
             using (Start())
             {
@@ -379,29 +400,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 Assert.False(textLine.HasCollapsed);
 
-                var glyphTypeface = Typeface.Default.GlyphTypeface;
-
-                var scale = defaultProperties.FontRenderingEmSize / glyphTypeface.DesignEmHeight;
-
-                var width = 1.0;
-
-                for (var i = 0; i < numberOfCharacters; i++)
-                {
-                    var glyph = glyphTypeface.GetGlyph(text[i]);
-
-                    width += glyphTypeface.GetGlyphAdvance(glyph) * scale;
-                }
-
-                TextCollapsingProperties collapsingProperties;
-
-                if (style == TextCollapsingStyle.TrailingCharacter)
-                {
-                    collapsingProperties = new TextTrailingCharacterEllipsis(width, defaultProperties);
-                }
-                else
-                {
-                    collapsingProperties = new TextTrailingWordEllipsis(width, defaultProperties);
-                }
+                TextCollapsingProperties collapsingProperties = trimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(width, defaultProperties));
 
                 var collapsedLine = textLine.Collapse(collapsingProperties);
 
@@ -419,24 +418,313 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         }
 
         [Fact]
-        public void TextLineBreak_Should_Contain_TextEndOfLine()
+        public void Should_Get_Next_CharacterHit_For_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(4, textLine.TextRuns.Count);
+
+                var currentHit = textLine.GetNextCaretCharacterHit(new CharacterHit(0));
+
+                Assert.Equal(1, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetNextCaretCharacterHit(currentHit);
+
+                Assert.Equal(2, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetNextCaretCharacterHit(currentHit);
+
+                Assert.Equal(3, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetNextCaretCharacterHit(currentHit);
+
+                Assert.Equal(3, currentHit.FirstCharacterIndex);
+                Assert.Equal(1, currentHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Previous_CharacterHit_For_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(4, textLine.TextRuns.Count);
+
+                var currentHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(3, 1));
+
+                Assert.Equal(3, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetPreviousCaretCharacterHit(currentHit);
+
+                Assert.Equal(2, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetPreviousCaretCharacterHit(currentHit);
+
+                Assert.Equal(1, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetPreviousCaretCharacterHit(currentHit);
+
+                Assert.Equal(0, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance_For_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var characterHit = textLine.GetCharacterHitFromDistance(50);
+
+                Assert.Equal(3, characterHit.FirstCharacterIndex);
+                Assert.Equal(1, characterHit.TrailingLength);
+
+                characterHit = textLine.GetCharacterHitFromDistance(32);
+
+                Assert.Equal(2, characterHit.FirstCharacterIndex);
+                Assert.Equal(1, characterHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Distance_From_CharacterHit_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(1));
+
+                Assert.Equal(14, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(2));
+
+                Assert.True(distance > 14);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Distance_From_CharacterHit_Mixed_TextBuffer()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new MixedTextBufferTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(10));
+
+                Assert.Equal(72.01171875, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(20));
+
+                Assert.Equal(144.0234375, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(30));
+
+                Assert.Equal(216.03515625, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(40));
+
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, distance);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_TextBounds_From_Mixed_TextBuffer()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new MixedTextBufferTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var textBounds = textLine.GetTextBounds(0, 10);
+
+                Assert.Equal(1, textBounds.Count);
+
+                Assert.Equal(72.01171875, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(0, 20);
+
+                Assert.Equal(2, textBounds.Count);
+
+                Assert.Equal(144.0234375, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 30);
+
+                Assert.Equal(3, textBounds.Count);
+
+                Assert.Equal(216.03515625, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 40);
+
+                Assert.Equal(4, textBounds.Count);
+
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+            }
+        }
+
+        [Fact]
+        public void Should_GetTextRange()
         {
+            var text = "שדגככעיחדגכAישדגשדגחייטYDASYWIWחיחלדשSAטויליHUHIUHUIDWKLאא'ק'קחליק/'וקןגגגלךשף'/קפוכדגכשדגשיח'/קטאגשד";
+
             using (Start())
             {
-                var defaultTextRunProperties =
-                    new GenericTextRunProperties(Typeface.Default);
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
 
-                const string text = "0123456789";
+                var textRuns = textLine.TextRuns.Cast<ShapedTextCharacters>().ToList();
 
-                var source = new SingleBufferTextSource(text, defaultTextRunProperties);
+                var lineWidth = textLine.WidthIncludingTrailingWhitespace;
 
-                var textParagraphProperties = new GenericTextParagraphProperties(defaultTextRunProperties);
+                var textBounds = textLine.GetTextBounds(0, text.Length);
 
-                var formatter = TextFormatter.Current;
+                TextBounds lastBounds = null;
 
-                var textLine = formatter.FormatLine(source, 0, double.PositiveInfinity, textParagraphProperties);
+                var runBounds = textBounds.SelectMany(x => x.TextRunBounds).ToList();
+
+                Assert.Equal(textRuns.Count, runBounds.Count);
+
+                for (var i = 0; i < textRuns.Count; i++)
+                {
+                    var run = textRuns[i];
+                    var bounds = runBounds[i];
+
+                    Assert.Equal(run.Text.Start, bounds.TextSourceCharacterIndex);
+                    Assert.Equal(run, bounds.TextRun);
+                    Assert.Equal(run.Size.Width, bounds.Rectangle.Width);
+                }
+
+                for (var i = 0; i < textBounds.Count; i++)
+                {
+                    var currentBounds = textBounds[i];
+
+                    if (lastBounds != null)
+                    {
+                        Assert.Equal(lastBounds.Rectangle.Right, currentBounds.Rectangle.Left);
+                    }
+
+                    var sumOfRunWidth = currentBounds.TextRunBounds.Sum(x => x.Rectangle.Width);
+
+                    Assert.Equal(sumOfRunWidth, currentBounds.Rectangle.Width);
+
+                    lastBounds = currentBounds;
+                }
+
+                var sumOfBoundsWidth = textBounds.Sum(x => x.Rectangle.Width);
+
+                Assert.Equal(lineWidth, sumOfBoundsWidth);
+            }
+        }
+
+        private class MixedTextBufferTextSource : ITextSource
+        {
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                switch (textSourceIndex)
+                {
+                    case 0:
+                        return new TextCharacters(new ReadOnlySlice<char>("aaaaaaaaaa".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    case 10:
+                        return new TextCharacters(new ReadOnlySlice<char>("bbbbbbbbbb".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    case 20:
+                        return new TextCharacters(new ReadOnlySlice<char>("cccccccccc".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    case 30:
+                        return new TextCharacters(new ReadOnlySlice<char>("dddddddddd".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        private class DrawableRunTextSource : ITextSource
+        {
+            const string Text = "_A_A";
+
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                switch (textSourceIndex)
+                {
+                    case 0:
+                        return new CustomDrawableRun();
+                    case 1:
+                        return new TextCharacters(new ReadOnlySlice<char>(Text.AsMemory(), 1, 1, 1), new GenericTextRunProperties(Typeface.Default));
+                    case 2:
+                        return new CustomDrawableRun();
+                    case 3:
+                        return new TextCharacters(new ReadOnlySlice<char>(Text.AsMemory(), 3, 1, 3), new GenericTextRunProperties(Typeface.Default));
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        private class CustomDrawableRun : DrawableTextRun
+        {
+            public override Size Size => new(14, 14);
+            public override double Baseline => 14;
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {
 
-                Assert.NotNull(textLine.TextLineBreak.TextEndOfLine);
             }
         }
 
@@ -452,29 +740,29 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             var shapedTextRuns = textLine.TextRuns.Cast<ShapedTextCharacters>().ToList();
 
             var lastCluster = -1;
-            
+
             foreach (var textRun in shapedTextRuns)
             {
                 var shapedBuffer = textRun.ShapedBuffer;
 
                 var currentClusters = shapedBuffer.GlyphClusters.ToList();
 
-                foreach (var currentCluster in currentClusters) 
+                foreach (var currentCluster in currentClusters)
                 {
                     if (lastCluster == currentCluster)
                     {
                         continue;
                     }
-                    
+
                     glyphClusters.Add(currentCluster);
 
                     lastCluster = currentCluster;
                 }
             }
-            
+
             return glyphClusters;
         }
-        
+
         private static List<Rect> BuildRects(TextLine textLine)
         {
             var rects = new List<Rect>();
@@ -489,11 +777,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             foreach (var textRun in shapedTextRuns)
             {
                 var shapedBuffer = textRun.ShapedBuffer;
-            
+
                 for (var index = 0; index < shapedBuffer.GlyphAdvances.Count; index++)
                 {
                     var currentCluster = shapedBuffer.GlyphClusters[index];
-                
+
                     var advance = shapedBuffer.GlyphAdvances[index];
 
                     if (lastCluster != currentCluster)
@@ -507,10 +795,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         rects.Remove(rect);
 
                         rect = rect.WithWidth(rect.Width + advance);
-                    
+
                         rects.Add(rect);
                     }
-                    
+
                     currentX += advance;
 
                     lastCluster = currentCluster;
@@ -520,6 +808,187 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             return rects;
         }
 
+
+        [Fact]
+        public void Should_Get_TextBounds_Mixed()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var text = "0123".AsMemory();
+                var shaperOption = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, 0, CultureInfo.CurrentCulture);
+
+                var firstRun = new ShapedTextCharacters(TextShaper.Current.ShapeText(new ReadOnlySlice<char>(text, 1, text.Length), shaperOption), defaultProperties);
+
+                var textRuns = new List<TextRun>
+                {
+                    new CustomDrawableRun(),
+                    firstRun,
+                    new CustomDrawableRun(),
+                    new ShapedTextCharacters(TextShaper.Current.ShapeText(new ReadOnlySlice<char>(text, text.Length + 2, text.Length), shaperOption), defaultProperties),
+                    new CustomDrawableRun(),
+                    new ShapedTextCharacters(TextShaper.Current.ShapeText(new ReadOnlySlice<char>(text, text.Length * 2 + 3, text.Length), shaperOption), defaultProperties)
+                };
+
+                var textSource = new FixedRunsTextSource(textRuns);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var textBounds = textLine.GetTextBounds(0, text.Length * 3 + 3);
+
+                Assert.Equal(6, textBounds.Count);
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 1);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(14, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(0, firstRun.Text.Length + 1);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width + 14, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(1, firstRun.Text.Length);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(1, firstRun.Text.Length + 1);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width + 14, textBounds.Sum(x => x.Rectangle.Width));
+            }
+        }
+
+        [Fact]
+        public void Should_Get_TextBounds_BiDi_LeftToRight()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var text = "אאא AAA";
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, 200,
+                        new GenericTextParagraphProperties(FlowDirection.LeftToRight, TextAlignment.Left, 
+                        true, true, defaultProperties, TextWrapping.NoWrap, 0, 0, 0));
+
+                var textBounds = textLine.GetTextBounds(0, 3);
+
+                var firstRun = textLine.TextRuns[0] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(3, 4);
+
+                var secondRun = textLine.TextRuns[1] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(secondRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 4);
+
+                Assert.Equal(2, textBounds.Count);
+
+                Assert.Equal(firstRun.Size.Width, textBounds[0].Rectangle.Width);           
+
+                Assert.Equal(7.201171875, textBounds[1].Rectangle.Width);
+
+                Assert.Equal(firstRun.Size.Width, textBounds[1].Rectangle.Left);             
+
+                textBounds = textLine.GetTextBounds(0, text.Length);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+            }
+        }
+
+        [Fact]
+        public void Should_Get_TextBounds_BiDi_RightToLeft()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var text = "אאא AAA";
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, 200,
+                        new GenericTextParagraphProperties(FlowDirection.RightToLeft, TextAlignment.Left, 
+                        true, true, defaultProperties, TextWrapping.NoWrap, 0, 0, 0));
+
+                var textBounds = textLine.GetTextBounds(0, 4);
+
+                var secondRun = textLine.TextRuns[1] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(secondRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(4, 3);
+
+                var firstRun = textLine.TextRuns[0] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+
+                Assert.Equal(3, textBounds[0].TextRunBounds.Sum(x=> x.Length));
+                Assert.Equal(firstRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 5);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(5, textBounds.Sum(x=> x.TextRunBounds.Sum(x => x.Length)));
+
+                Assert.Equal(secondRun.Size.Width, textBounds[1].Rectangle.Width);
+                Assert.Equal(7.201171875, textBounds[0].Rectangle.Width);
+                Assert.Equal(textLine.Start + 7.201171875, textBounds[0].Rectangle.Right);
+                Assert.Equal(textLine.Start + firstRun.Size.Width, textBounds[1].Rectangle.Left);
+
+                textBounds = textLine.GetTextBounds(0, text.Length);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(7, textBounds.Sum(x => x.TextRunBounds.Sum(x => x.Length)));
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+            }
+        }       
+
+        private class FixedRunsTextSource : ITextSource
+        {
+            private readonly IReadOnlyList<TextRun> _textRuns;
+
+            public FixedRunsTextSource(IReadOnlyList<TextRun> textRuns)
+            {
+                _textRuns = textRuns;
+            }
+
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                var currentPosition = 0;
+
+                foreach (var textRun in _textRuns)
+                {
+                    if (currentPosition == textSourceIndex)
+                    {
+                        return textRun;
+                    }
+
+                    currentPosition += textRun.TextSourceLength;
+                }
+
+                return null;
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
index 57676ad581..94933e334d 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
@@ -15,12 +15,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             using (Start())
             {
                 var text = "\n\r\n".AsMemory();
-
-                var shapedBuffer = TextShaper.Current.ShapeText(
-                    text,
-                    Typeface.Default.GlyphTypeface,
-                    12,
-                    CultureInfo.CurrentCulture, 0);
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 12,0, CultureInfo.CurrentCulture);
+                var shapedBuffer = TextShaper.Current.ShapeText(text, options);
                 
                 Assert.Equal(shapedBuffer.Text.Length, text.Length);
                 Assert.Equal(shapedBuffer.GlyphClusters.Count, text.Length);
@@ -29,7 +25,21 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(1, shapedBuffer.GlyphClusters[2]);
             }
         }
-        
+
+        [Fact]
+        public void Should_Apply_IncrementalTabWidth()
+        {
+            using (Start())
+            {
+                var text = "\t".AsMemory();
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 12, 0, CultureInfo.CurrentCulture, 100);
+                var shapedBuffer = TextShaper.Current.ShapeText(text, options);
+
+                Assert.Equal(shapedBuffer.Length, text.Length);
+                Assert.Equal(100, shapedBuffer.GlyphAdvances[0]);
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
deleted file mode 100644
index c5eb636a9a..0000000000
--- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <NoWarn>CS0067</NoWarn>
-    <IsTestProject>true</IsTestProject>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3bdb8a2f2e..0000000000
--- a/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Styling.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs b/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
deleted file mode 100644
index d91d1fab9e..0000000000
--- a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class ResourceDictionaryTests
-    {
-        [Fact]
-        public void Cannot_Add_Null_Key()
-        {
-            var target = new ResourceDictionary();
-            Assert.Throws<ArgumentNullException>(() => target.Add(null, "null"));
-        }
-
-        [Fact]
-        public void Can_Add_Null_Value()
-        {
-            var target = new ResourceDictionary();
-            target.Add("null", null);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource()
-        {
-            var target = new ResourceDictionary
-            {
-                { "foo", "bar" },
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource_From_Merged_Dictionary()
-        {
-            var target = new ResourceDictionary
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary
-                    {
-                        { "foo", "bar" },
-                    }
-                }
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource_From_Itself_Before_Merged_Dictionary()
-        {
-            var target = new ResourceDictionary
-            {
-                { "foo", "bar" },
-            };
-
-            target.MergedDictionaries.Add(new ResourceDictionary
-            {
-                { "foo", "baz" },
-            });
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource_From_Later_Merged_Dictionary()
-        {
-            var target = new ResourceDictionary
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary
-                    {
-                        { "foo", "bar" },
-                    },
-                    new ResourceDictionary
-                    {
-                        { "foo", "baz" },
-                    }
-                }
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("baz", result);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_AddOwner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary { { "foo", "bar" } };
-
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_RemoveOwner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary { { "foo", "bar" } };
-
-            ((IResourceProvider)target).AddOwner(host.Object);
-            host.Invocations.Clear();
-            ((IResourceProvider)target).RemoveOwner(host.Object);
-
-            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_Resource_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object);
-
-            host.Invocations.Clear();
-            target.Add("foo", "bar");
-
-            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object);
-
-            host.Invocations.Clear();
-            target.MergedDictionaries.Add(new ResourceDictionary
-            {
-                { "foo", "bar" },
-            });
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Once);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Not_Be_Called_On_Empty_MergedDictionary_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object);
-
-            host.Invocations.Clear();
-            target.MergedDictionaries.Add(new ResourceDictionary());
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Never);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Remove()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object)
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary { { "foo", "bar" } },
-                }
-            };
-
-            host.Invocations.Clear();
-            target.MergedDictionaries.RemoveAt(0);
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Once);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Resource_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object)
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary(),
-                }
-            };
-
-            host.Invocations.Clear();
-            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Once);
-        }
-
-        [Fact]
-        public void Sets_Added_MergedDictionary_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-
-            var target = new ResourceDictionary(host.Object);
-            target.MergedDictionaries.Add(new ResourceDictionary());
-
-            Assert.Same(host.Object, target.Owner);
-            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
-        }
-
-        [Fact]
-        public void AddOwner_Sets_MergedDictionary_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-
-            var target = new ResourceDictionary
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary(),
-                }
-            };
-
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            Assert.Same(host.Object, target.Owner);
-            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
-        }
-
-        [Fact]
-        public void RemoveOwner_Clears_MergedDictionary_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-
-            var target = new ResourceDictionary(host.Object)
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary(),
-                }
-            };
-
-            ((IResourceProvider)target).RemoveOwner(host.Object);
-
-            Assert.Null(target.Owner);
-            Assert.Null(((ResourceDictionary)target.MergedDictionaries[0]).Owner);
-        }
-
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
deleted file mode 100644
index d011c16ebb..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Child
-    {
-        [Fact]
-        public void Child_Matches_Control_When_It_Is_Child_OfType()
-        {
-            var parent = new TestLogical1();
-            var child = new TestLogical2();
-
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical2>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public void Child_Doesnt_Match_Control_When_It_Is_Grandchild_OfType()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public async Task Child_Matches_Control_When_It_Is_Child_OfType_And_Class()
-        {
-            var parent = new TestLogical1();
-            var child = new TestLogical2();
-
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Child().OfType<TestLogical2>();
-            var activator = selector.Match(child).Activator;
-            var result = new List<bool>();
-
-            Assert.False(await activator.Take(1));
-            parent.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-            parent.Classes.Remove("foo");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Child_Doesnt_Match_Control_When_It_Has_No_Parent()
-        {
-            var control = new TestLogical3();
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(control).Result);
-        }
-
-        [Fact]
-        public void Child_Selector_Should_Have_Correct_String_Representation()
-        {
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
-
-            Assert.Equal("TestLogical1 > TestLogical3", selector.ToString());
-        }
-
-        public abstract class TestLogical : Control
-        {
-            public ILogical LogicalParent
-            {
-                get => Parent;
-                set => ((ISetLogicalParent)this).SetParent(value);
-            }
-        }
-
-        public class TestLogical1 : TestLogical
-        {
-        }
-
-        public class TestLogical2 : TestLogical
-        {
-        }
-
-        public class TestLogical3 : TestLogical
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
deleted file mode 100644
index 72383501be..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Moq;
-using Avalonia.Controls;
-using Avalonia.Styling;
-using Xunit;
-using System.Collections.Generic;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Class
-    {
-        [Fact]
-        public void Class_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector).Class("foo");
-
-            Assert.Equal(".foo", target.ToString());
-        }
-
-        [Fact]
-        public void PesudoClass_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector).Class(":foo");
-
-            Assert.Equal(":foo", target.ToString());
-        }
-
-        [Fact]
-        public async Task Class_Matches_Control_With_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Doesnt_Match_Control_Without_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "bar" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.False(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Matches_Control_With_TemplatedParent()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-                TemplatedParent = new Mock<ITemplatedControl>().Object,
-            };
-
-            var target = default(Selector).Class("foo");
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Tracks_Additions()
-        {
-            var control = new Control1();
-
-            var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Tracks_Removals()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.True(await activator.Take(1));
-            control.Classes.Remove("foo");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Multiple_Classes()
-        {
-            var control = new Control1();
-            var target = default(Selector).Class("foo").Class("bar");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Classes.Add("foo");
-            Assert.False(await activator.Take(1));
-            control.Classes.Add("bar");
-            Assert.True(await activator.Take(1));
-            control.Classes.Remove("bar");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Only_Notifies_When_Result_Changes()
-        {
-            // Test for #1698
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator;
-            var result = new List<bool>();
-
-            using (activator.Subscribe(x => result.Add(x)))
-            {
-                control.Classes.Add("bar");
-                control.Classes.Remove("foo");
-            }
-
-            Assert.Equal(new[] { true, false }, result);
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
deleted file mode 100644
index aacf2ce223..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Descendant
-    {
-        [Fact]
-        public void Descendant_Matches_Control_When_It_Is_Child_OfType()
-        {
-            var parent = new TestLogical1();
-            var child = new TestLogical2();
-
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical2>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public void Descendant_Matches_Control_When_It_Is_Descendant_OfType()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical3>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public async Task Descendant_Matches_Control_When_It_Is_Descendant_OfType_And_Class()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            grandparent.Classes.Add("foo");
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator;
-
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Descendant_Doesnt_Match_Control_When_It_Is_Descendant_OfType_But_Wrong_Class()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            grandparent.Classes.Add("bar");
-            parent.LogicalParent = grandparent;
-            parent.Classes.Add("foo");
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator;
-
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Descendant_Matches_Any_Ancestor()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical1();
-            var child = new TestLogical3();
-
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            parent.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-            grandparent.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-            parent.Classes.Remove("foo");
-            Assert.True(await activator.Take(1));
-            grandparent.Classes.Remove("foo");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Descendant_Selector_Should_Have_Correct_String_Representation()
-        {
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-
-            Assert.Equal("TestLogical1.foo TestLogical3", selector.ToString());
-        }
-
-        public abstract class TestLogical : Control
-        {
-            public ILogical LogicalParent
-            {
-                get => Parent;
-                set => ((ISetLogicalParent)this).SetParent(value);
-            }
-        }
-
-        public class TestLogical1 : TestLogical
-        {
-        }
-
-        public class TestLogical2 : TestLogical
-        {
-        }
-
-        public class TestLogical3 : TestLogical
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
deleted file mode 100644
index 4436f02429..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Multiple
-    {
-        [Fact]
-        public void Named_Template_Child_Of_Control_With_Two_Classes()
-        {
-            var template = new FuncControlTemplate((parent, scope) =>
-            {
-                return new Border
-                {
-                    Name = "border",
-                }.RegisterInNameScope(scope);
-            });
-
-            var control = new Button
-            {
-                Template = template,
-            };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo")
-                .Class("bar")
-                .Template()
-                .Name("border");
-
-            var border = (Border)((IVisual)control).VisualChildren.Single();
-            var values = new List<bool>();
-            var match = selector.Match(border);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            match.Activator.Subscribe(x => values.Add(x));
-
-            Assert.Equal(new[] { false }, values);
-            control.Classes.AddRange(new[] { "foo", "bar" });
-            Assert.Equal(new[] { false, true }, values);
-            control.Classes.Remove("foo");
-            Assert.Equal(new[] { false, true, false }, values);
-        }
-
-        [Fact]
-        public void Named_OfType_Template_Child_Of_Control_With_Two_Classes_Wrong_Type()
-        {
-            var template = new FuncControlTemplate((parent, scope) =>
-            {
-                return new Border
-                {
-                    Name = "border",
-                }.RegisterInNameScope(scope);
-            });
-
-            var control = new Button
-            {
-                Template = template,
-            };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo")
-                .Class("bar")
-                .Template()
-                .OfType<TextBlock>()
-                .Name("baz");
-
-            var border = (Border)((IVisual)control).VisualChildren.Single();
-            var values = new List<bool>();
-            var match = selector.Match(border);
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
-        }
-
-        [Fact]
-        public void Control_With_Class_Descendent_Of_Control_With_Two_Classes()
-        {
-            var textBlock = new TextBlock();
-            var control = new Button { Content = textBlock };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo")
-                .Class("bar")
-                .Descendant()
-                .OfType<TextBlock>()
-                .Class("baz");
-
-            var values = new List<bool>();
-            var match = selector.Match(textBlock);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            match.Activator.Subscribe(x => values.Add(x));
-
-            Assert.Equal(new[] { false }, values);
-            control.Classes.AddRange(new[] { "foo", "bar" });
-            Assert.Equal(new[] { false }, values);
-            textBlock.Classes.Add("baz");
-            Assert.Equal(new[] { false, true }, values);
-        }
-
-        [Fact]
-        public void Named_Class_Template_Child_Of_Control()
-        {
-            var template = new FuncControlTemplate((parent, scope) =>
-            {
-                return new Border
-                {
-                    Name = "border",
-                }.RegisterInNameScope(scope);
-            });
-
-            var control = new Button
-            {
-                Template = template,
-            };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Template()
-                .Name("border")
-                .Class("foo");
-
-            var border = (Border)((IVisual)control).VisualChildren.Single();
-            var values = new List<bool>();
-            var match = selector.Match(border);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            match.Activator.Subscribe(x => values.Add(x));
-
-            Assert.Equal(new[] { false }, values);
-            border.Classes.AddRange(new[] { "foo" });
-            Assert.Equal(new[] { false, true }, values);
-            border.Classes.Remove("foo");
-            Assert.Equal(new[] { false, true, false }, values);
-        }
-
-        [Fact]
-        public async Task Nested_PropertyEquals()
-        {
-            var control = new Canvas();
-            var parent = new Border { Child = control };
-
-            var target = default(Selector)
-                .OfType<Border>()
-                .PropertyEquals(Border.TagProperty, "foo")
-                .Child()
-                .OfType<Canvas>()
-                .PropertyEquals(Canvas.TagProperty, "bar");
-
-            var match = target.Match(control);
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-
-            var activator = match.Activator;
-
-            Assert.False(await activator.Take(1));
-            control.Tag = "bar";
-            Assert.False(await activator.Take(1));
-            parent.Tag = "foo";
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public void TargetType_OfType()
-        {
-            var selector = default(Selector).OfType<Button>();
-
-            Assert.Equal(typeof(Button), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_OfType_Class()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo");
-
-            Assert.Equal(typeof(Button), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Is_Class()
-        {
-            var selector = default(Selector)
-                .Is<Button>()
-                .Class("foo");
-
-            Assert.Equal(typeof(Button), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Child()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Child()
-                .OfType<TextBlock>();
-
-            Assert.Equal(typeof(TextBlock), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Descendant()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Descendant()
-                .OfType<TextBlock>();
-
-            Assert.Equal(typeof(TextBlock), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Template()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Template()
-                .OfType<TextBlock>();
-
-            Assert.Equal(typeof(TextBlock), selector.TargetType);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
deleted file mode 100644
index 308070c52f..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Name
-    {
-        [Fact]
-        public void Name_Matches_Control_With_Correct_Name()
-        {
-            var control = new Control1 { Name = "foo" };
-            var target = default(Selector).Name("foo");
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Name_Doesnt_Match_Control_Of_Wrong_Name()
-        {
-            var control = new Control1 { Name = "foo" };
-            var target = default(Selector).Name("bar");
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Name_Doesnt_Match_Control_With_TemplatedParent()
-        {
-            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
-            var target = default(Selector).Name("foo");
-            var activator = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Name_Has_Correct_String_Representation()
-        {
-            var target = default(Selector).Name("foo");
-
-            Assert.Equal("#foo", target.ToString());
-        }
-
-        [Fact]
-        public void Type_And_Name_Has_Correct_String_Representation()
-        {
-            var target = default(Selector).OfType<Control1>().Name("foo");
-
-            Assert.Equal("Control1#foo", target.ToString());
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
deleted file mode 100644
index 23b711725a..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Not
-    {
-        [Fact]
-        public void Not_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector).Not(x => x.Class("foo"));
-
-            Assert.Equal(":not(.foo)", target.ToString());
-        }
-
-        [Fact]
-        public void Not_OfType_Matches_Control_Of_Incorrect_Type()
-        {
-            var control = new Control1();
-            var target = default(Selector).Not(x => x.OfType<Control1>());
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-        
-        [Fact]
-        public void Not_OfType_Doesnt_Match_Control_Of_Correct_Type()
-        {
-            var control = new Control2();
-            var target = default(Selector).Not(x => x.OfType<Control1>());
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public async Task Not_Class_Doesnt_Match_Control_With_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.False(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Not_Class_Matches_Control_Without_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "bar" },
-            };
-
-            var target = default(Selector).Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task OfType_Not_Class_Matches_Control_Without_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "bar" },
-            };
-
-            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public void OfType_Not_Class_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new Control2
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType()
-        {
-            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-
-        public class Control2 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthChild.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_NthChild.cs
deleted file mode 100644
index e1507be110..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthChild.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_NthChild
-    {
-        [Theory]
-        [InlineData(2, 0, ":nth-child(2n)")]
-        [InlineData(2, 1, ":nth-child(2n+1)")]
-        [InlineData(1, 0, ":nth-child(1n)")]
-        [InlineData(4, -1, ":nth-child(4n-1)")]
-        [InlineData(0, 1, ":nth-child(1)")]
-        [InlineData(0, -1, ":nth-child(-1)")]
-        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-child(2147483647n-2147483647)")]
-        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
-        {
-            var target = default(Selector).NthChild(step, offset);
-
-            Assert.Equal(expected, target.ToString());
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(2, 0);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(2, 1);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(4, -1);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(1, 2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(1, -1);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(0, 2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(0, -2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
-        {
-            Border b1, b2;
-            Button b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new Control[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Button(),
-                b4 = new Button()
-            });
-
-            var previous = default(Selector).OfType<Border>();
-            var target = previous.NthChild(2, 0);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.Null(target.Match(b3).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
-            Assert.Null(target.Match(b4).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
-        }
-
-        [Fact]
-        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
-        {
-            Border b1;
-            var contentControl = new ContentControl();
-            contentControl.Content = b1 = new Border();
-
-            var target = default(Selector).NthChild(1, 0);
-
-            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
-        }
-
-
-        [Theory] // http://nthmaster.com/
-        [InlineData(+0, 8, false, false, false, false, false, false, false, true , false, false, false)]
-        [InlineData(+1, 6, false, false, false, false, false, true , true , true , true , true , true )]
-        [InlineData(-1, 9, true , true , true , true , true , true , true , true , true , false, false)]
-        public async Task Nth_Child_Master_Com_Test_Sigle_Selector(
-            int step, int offset, params bool[] items)
-        {
-            var panel = new StackPanel();
-            panel.Children.AddRange(items.Select(_ => new Border()));
-
-            var previous = default(Selector).OfType<Border>();
-            var target = previous.NthChild(step, offset);
-
-            var results = new bool[items.Length];
-            for (int index = 0; index < items.Length; index++)
-            {
-                var border = panel.Children[index];
-                results[index] = await target.Match(border).Activator!.Take(1);
-            }
-
-            Assert.Equal(items, results);
-        }
-
-        [Theory] // http://nthmaster.com/
-        [InlineData(+1, 4, -1, 8, false, false, false, true , true , true , true , true , false, false, false)]
-        [InlineData(+3, 1, +2, 0, false, false, false, true , false, false, false, false, false, true , false)]
-        public async Task Nth_Child_Master_Com_Test_Double_Selector(
-            int step1, int offset1, int step2, int offset2, params bool[] items)
-        {
-            var panel = new StackPanel();
-            panel.Children.AddRange(items.Select(_ => new Border()));
-
-            var previous = default(Selector).OfType<Border>();
-            var middle = previous.NthChild(step1, offset1);
-            var target = middle.NthChild(step2, offset2);
-
-            var results = new bool[items.Length];
-            for (int index = 0; index < items.Length; index++)
-            {
-                var border = panel.Children[index];
-                results[index] = await target.Match(border).Activator!.Take(1);
-            }
-
-            Assert.Equal(items, results);
-        }
-
-        [Theory] // http://nthmaster.com/
-        [InlineData(+1, 2, 2, 1, -1, 9, false, false, true , false, true , false, true , false, true , false, false)]
-        public async Task Nth_Child_Master_Com_Test_Triple_Selector(
-            int step1, int offset1, int step2, int offset2, int step3, int offset3, params bool[] items)
-        {
-            var panel = new StackPanel();
-            panel.Children.AddRange(items.Select(_ => new Border()));
-
-            var previous = default(Selector).OfType<Border>();
-            var middle1 = previous.NthChild(step1, offset1);
-            var middle2 = middle1.NthChild(step2, offset2);
-            var target = middle2.NthChild(step3, offset3);
-
-            var results = new bool[items.Length];
-            for (int index = 0; index < items.Length; index++)
-            {
-                var border = panel.Children[index];
-                results[index] = await target.Match(border).Activator!.Take(1);
-            }
-
-            Assert.Equal(items, results);
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType()
-        {
-            var target = new NthChildSelector(default(Selector).OfType<Control1>(), 1, 0);
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthLastChild.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_NthLastChild.cs
deleted file mode 100644
index 00a99523c7..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthLastChild.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_NthLastChild
-    {
-        [Theory]
-        [InlineData(2, 0, ":nth-last-child(2n)")]
-        [InlineData(2, 1, ":nth-last-child(2n+1)")]
-        [InlineData(1, 0, ":nth-last-child(1n)")]
-        [InlineData(4, -1, ":nth-last-child(4n-1)")]
-        [InlineData(0, 1, ":nth-last-child(1)")]
-        [InlineData(0, -1, ":nth-last-child(-1)")]
-        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-last-child(2147483647n-2147483647)")]
-        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
-        {
-            var target = default(Selector).NthLastChild(step, offset);
-
-            Assert.Equal(expected, target.ToString());
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(2, 0);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(2, 1);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(4, -1);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(1, 2);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(1, -2);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(0, 2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(0, -2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
-        {
-            Border b1, b2;
-            Button b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new Control[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Button(),
-                b4 = new Button()
-            });
-
-            var previous = default(Selector).OfType<Border>();
-            var target = previous.NthLastChild(2, 0);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.Null(target.Match(b3).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
-            Assert.Null(target.Match(b4).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
-        }
-
-        [Fact]
-        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
-        {
-            Border b1;
-            var contentControl = new ContentControl();
-            contentControl.Content = b1 = new Border();
-
-            var target = default(Selector).NthLastChild(1, 0);
-
-            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType()
-        {
-            var target = new NthLastChildSelector(default(Selector).OfType<Control1>(), 1, 0);
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
deleted file mode 100644
index 2aef46575d..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_OfType
-    {
-        [Fact]
-        public void OfType_Matches_Control_Of_Correct_Type()
-        {
-            var control = new Control1();
-            var target = default(Selector).OfType<Control1>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void OfType_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new Control2();
-            var target = default(Selector).OfType<Control1>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void OfType_Class_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new Control2();
-            var target = default(Selector).OfType<Control1>().Class("foo");
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void OfType_Matches_Control_With_TemplatedParent()
-        {
-            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
-            var target = default(Selector).OfType<Control1>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        public class Control1 : Control
-        {
-        }
-
-        public class Control2 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
deleted file mode 100644
index 2b55482593..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Or
-    {
-        [Fact]
-        public void Or_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).OfType<Control2>().Class("bar"));
-
-            Assert.Equal("Control1.foo, Control2.bar", target.ToString());
-        }
-
-        [Fact]
-        public void Or_Selector_Matches_Control_Of_Correct_Type()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>(),
-                default(Selector).OfType<Control2>().Class("bar"));
-            var control = new Control1();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Or_Selector_Matches_Control_Of_Correct_Type_With_Class()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>(),
-                default(Selector).OfType<Control2>().Class("bar"));
-            var control = new Control2();
-
-            Assert.Equal(SelectorMatchResult.Sometimes, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Or_Selector_Doesnt_Match_Control_Of_Incorrect_Type()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>(),
-                default(Selector).OfType<Control2>().Class("bar"));
-            var control = new Control3();
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Or_Selector_Doesnt_Match_Control_With_Incorrect_Name()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Name("foo"),
-                default(Selector).OfType<Control2>().Name("foo"));
-            var control = new Control1 { Name = "bar" };
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType_When_Types_Same()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).OfType<Control1>().Class("bar"));
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        [Fact]
-        public void Returns_Common_TargetType()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).OfType<Control2>().Class("bar"));
-
-            Assert.Equal(typeof(Control), target.TargetType);
-        }
-
-        [Fact]
-        public void Returns_Null_TargetType_When_A_Selector_Has_No_TargetType()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).Class("bar"));
-
-            Assert.Equal(null, target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-
-        public class Control2 : Control
-        {
-        }
-
-        public class Control3 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
deleted file mode 100644
index 729b42196b..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_PropertyEquals
-    {
-        static SelectorTests_PropertyEquals()
-        {
-            //Ensure the attached properties are registered before run tests
-            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Grid).TypeHandle);
-            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Auth).TypeHandle);
-        }
-
-        class Auth
-        {
-            public readonly static AttachedProperty<string> NameProperty =
-                AvaloniaProperty.RegisterAttached<Auth, AvaloniaObject, string>("Name");
-
-            public static string GetName(AvaloniaObject avaloniaObject) =>
-                avaloniaObject.GetValue(NameProperty);
-
-            public static void SetName(AvaloniaObject avaloniaObject, string value) =>
-                avaloniaObject.SetValue(NameProperty, value);
-        }
-
-        [Fact]
-        public async Task PropertyEquals_Attached_Property_Matching_Value()
-        {
-            var target = new Markup.Parsers.SelectorParser((ns, type) =>
-            {
-                return (ns, type) switch
-                {
-                    ("", nameof(TextBlock)) => typeof(TextBlock),
-                    ("", nameof(Grid)) => typeof(Grid),
-                    _ => null
-                };
-            }).Parse("TextBlock[(Grid.Column)=1]");
-            
-
-            var control = new TextBlock();
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            Grid.SetColumn(control, 1);
-            Assert.True(await activator.Take(1));
-            Grid.SetColumn(control, 0);
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task PropertyEquals_Attached_Property_With_Namespace_Matching_Value()
-        {
-            var target = new Markup.Parsers.SelectorParser((ns, type) =>
-            {
-                return (ns, type) switch
-                {
-                    ("", nameof(TextBlock)) => typeof(TextBlock),
-                    ("l", nameof(Auth)) => typeof(Auth),
-                    _ => null
-                };
-            }).Parse("TextBlock[(l|Auth.Name)=Admin]");
-
-
-            var control = new TextBlock();
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            Auth.SetName(control, "Admin");
-            Assert.True(await activator.Take(1));
-            Auth.SetName(control, null);
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value()
-        {
-            var control = new TextBlock();
-            var target = default(Selector).PropertyEquals(TextBlock.TextProperty, "foo");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Text = "foo";
-            Assert.True(await activator.Take(1));
-            control.Text = null;
-            Assert.False(await activator.Take(1));
-        }
-
-        [Theory]
-        [InlineData("Bar", FooBar.Bar)]
-        [InlineData("352", 352)]
-        [InlineData("0.1", 0.1)]
-        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value_And_Different_Type(string literal, object value)
-        {
-            var control = new TextBlock();
-            var target = default(Selector).PropertyEquals(TextBlock.TagProperty, literal);
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Tag = value;
-            Assert.True(await activator.Take(1));
-            control.Tag = null;
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void OfType_PropertyEquals_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new TextBlock();
-            var target = default(Selector).OfType<Border>().PropertyEquals(TextBlock.TextProperty, "foo");
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void PropertyEquals_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector)
-                .OfType<TextBlock>()
-                .PropertyEquals(TextBlock.TextProperty, "foo");
-
-            Assert.Equal("TextBlock[Text=foo]", target.ToString());
-        }
-
-        private enum FooBar
-        {
-            Foo,
-            Bar
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
deleted file mode 100644
index 13cb2578cf..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Linq;
-using System.Reactive.Linq;
-using Moq;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-using Avalonia.Diagnostics;
-using Xunit;
-using System.Threading.Tasks;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Template
-    {
-        [Fact]
-        public void Control_In_Template_Is_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.GetVisualChildren().Single();
-            var selector = default(Selector)
-                .OfType(target.Object.GetType())
-                .Template()
-                .OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public void Control_Not_In_Template_Is_Not_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.GetVisualChildren().Single();
-            border.SetValue(Control.TemplatedParentProperty, null);
-            var selector = default(Selector)
-                .OfType(target.Object.GetType())
-                .Template()
-                .OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public void Control_In_Template_Of_Wrong_Type_Is_Not_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.GetVisualChildren().Single();
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Template()
-                .OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public void Nested_Control_In_Template_Is_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var textBlock = (TextBlock)target.Object.VisualChildren.Single().VisualChildren.Single();
-            var selector = default(Selector)
-                .OfType(target.Object.GetType())
-                .Template()
-                .OfType<TextBlock>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(textBlock).Result);
-        }
-
-        [Fact]
-        public void Control_In_Template_Is_Matched_With_TypeOf_TemplatedControl()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            var styleKey = templatedControl.Object.GetType();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.VisualChildren.Single();
-
-            var selector = default(Selector).OfType(styleKey).Template().OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public async Task Control_In_Template_Is_Matched_With_Correct_TypeOf_And_Class_Of_TemplatedControl()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            var styleKey = templatedControl.Object.GetType();
-            BuildVisualTree(target);
-
-            styleable.Setup(x => x.StyleKey).Returns(styleKey);
-            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
-            var border = (Border)target.Object.VisualChildren.Single();
-            var selector = default(Selector).OfType(styleKey).Class("foo").Template().OfType<Border>();
-            var activator = selector.Match(border).Activator;
-
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Control_In_Template_Is_Not_Matched_With_Correct_TypeOf_And_Wrong_Class_Of_TemplatedControl()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            styleable.Setup(x => x.Classes).Returns(new Classes("bar"));
-            var border = (Border)target.Object.VisualChildren.Single();
-            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
-            var activator = selector.Match(border).Activator;
-
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Nested_Selector_Is_Unsubscribed()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
-            var border = (Border)target.Object.VisualChildren.Single();
-            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
-            var activator = selector.Match(border).Activator;
-            var inccDebug = (INotifyCollectionChangedDebug)styleable.Object.Classes;
-
-            using (activator.Subscribe(_ => { }))
-            {
-                Assert.Single(inccDebug.GetCollectionChangedSubscribers());
-            }
-
-            Assert.Null(inccDebug.GetCollectionChangedSubscribers());
-        }
-
-        private void BuildVisualTree<T>(Mock<T> templatedControl) where T : class, IVisual
-        {
-            templatedControl.Setup(x => x.VisualChildren).Returns(new Controls.Controls
-            {
-                new Border
-                {
-                    [Control.TemplatedParentProperty] = templatedControl.Object,
-                    Child = new TextBlock
-                    {
-                        [Control.TemplatedParentProperty] = templatedControl.Object,
-                    },
-                },
-            });
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
deleted file mode 100644
index 901233801e..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using System;
-using System.Globalization;
-using System.Reactive.Subjects;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SetterTests
-    {
-        [Fact]
-        public void Cannot_Assign_Control_To_Value()
-        {
-            var target = new Setter();
-
-            Assert.Throws<InvalidOperationException>(() => target.Value = new Border());
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Binding_To_Property()
-        {
-            var control = new TextBlock();
-            var subject = new BehaviorSubject<object>("foo");
-            var descriptor = InstancedBinding.OneWay(subject);
-            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TextProperty, null, false) == descriptor);
-            var style = Mock.Of<IStyle>();
-            var setter = new Setter(TextBlock.TextProperty, binding);
-
-            setter.Instance(control).Start(false);
-
-            Assert.Equal("foo", control.Text);
-        }
-
-        [Fact]
-        public void Setter_Should_Handle_Binding_Producing_UnsetValue()
-        {
-            var control = new TextBlock();
-            var subject = new BehaviorSubject<object>(AvaloniaProperty.UnsetValue);
-            var descriptor = InstancedBinding.OneWay(subject);
-            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TagProperty, null, false) == descriptor);
-            var style = Mock.Of<IStyle>();
-            var setter = new Setter(TextBlock.TagProperty, binding);
-
-            setter.Instance(control).Start(false);
-
-            Assert.Equal("", control.Text);
-        }
-
-        [Fact]
-        public void Setter_Should_Materialize_Template_To_Property()
-        {
-            var control = new Decorator();
-            var template = new FuncTemplate<Canvas>(() => new Canvas());
-            var style = Mock.Of<IStyle>();
-            var setter = new Setter(Decorator.ChildProperty, template);
-
-            setter.Instance(control).Start(false);
-
-            Assert.IsType<Canvas>(control.Child);
-        }
-
-        [Fact]
-        public void Does_Not_Call_Converter_ConvertBack_On_OneWay_Binding()
-        {
-            var control = new Decorator { Name = "foo" };
-            var style = Mock.Of<IStyle>();
-            var binding = new Binding("Name", BindingMode.OneWay)
-            {
-                Converter = new TestConverter(),
-                RelativeSource = new RelativeSource(RelativeSourceMode.Self),
-            };
-            var setter = new Setter(Decorator.TagProperty, binding);
-
-            var instance = setter.Instance(control);
-            instance.Start(true);
-            instance.Activate();
-
-            Assert.Equal("foobar", control.Tag);
-
-            // Issue #1218 caused TestConverter.ConvertBack to throw here.
-            instance.Deactivate();
-            Assert.Null(control.Tag);
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Value_Without_Activator_With_Style_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, "foo");
-
-            setter.Instance(control.Object).Start(false);
-
-            control.Verify(x => x.SetValue(
-                TextBlock.TagProperty,
-                "foo",
-                BindingPriority.Style));
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Value_With_Activator_As_Binding_With_StyleTrigger_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, "foo");
-            var activator = new Subject<bool>();
-
-            var instance = setter.Instance(control.Object);
-            instance.Start(true);
-            instance.Activate();
-
-            control.Verify(x => x.Bind(
-                TextBlock.TagProperty,
-                It.IsAny<IObservable<BindingValue<object>>>(),
-                BindingPriority.StyleTrigger));
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Binding_Without_Activator_With_Style_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, CreateMockBinding(TextBlock.TagProperty));
-
-            setter.Instance(control.Object).Start(false);
-
-            control.Verify(x => x.Bind(
-                TextBlock.TagProperty,
-                It.IsAny<PropertySetterBindingInstance<object>>(),
-                BindingPriority.Style));
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Binding_With_Activator_With_StyleTrigger_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, CreateMockBinding(TextBlock.TagProperty));
-
-            var instance = setter.Instance(control.Object);
-            instance.Start(true);
-            instance.Activate();
-
-            control.Verify(x => x.Bind(
-                TextBlock.TagProperty,
-                It.IsAny<IObservable<BindingValue<object>>>(),
-                BindingPriority.StyleTrigger));
-        }
-
-        private IBinding CreateMockBinding(AvaloniaProperty property)
-        {
-            var subject = new Subject<object>();
-            var descriptor = InstancedBinding.OneWay(subject);
-            var binding = Mock.Of<IBinding>(x => 
-                x.Initiate(It.IsAny<IAvaloniaObject>(), property, null, false) == descriptor);
-            return binding;
-        }
-
-        private class TestConverter : IValueConverter
-        {
-            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                return value.ToString() + "bar";
-            }
-
-            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs b/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs
deleted file mode 100644
index 22f4db79d1..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Reactive;
-using Avalonia.Styling.Activators;
-
-namespace Avalonia.Styling.UnitTests
-{
-    internal static class StyleActivatorExtensions
-    {
-        public static IDisposable Subscribe(this IStyleActivator activator, Action<bool> action)
-        {
-            return activator.ToObservable().Subscribe(action);
-        }
-
-        public static async Task<bool> Take(this IStyleActivator activator, int value)
-        {
-            return await activator.ToObservable().Take(value);
-        }
-
-        public static IObservable<bool> ToObservable(this IStyleActivator activator)
-        {
-            if (activator == null)
-            {
-                throw new ArgumentNullException(nameof(activator));
-            }
-
-            return new ObservableAdapter(activator);
-        }
-
-        private class ObservableAdapter : LightweightObservableBase<bool>, IStyleActivatorSink
-        {
-            private readonly IStyleActivator _source;
-            
-            public ObservableAdapter(IStyleActivator source) => _source = source;
-            protected override void Initialize() => _source.Subscribe(this);
-            protected override void Deinitialize() => _source.Unsubscribe(this);
-
-            void IStyleActivatorSink.OnNext(bool value, int tag)
-            {
-                PublishNext(value);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
deleted file mode 100644
index 14710f44ba..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ /dev/null
@@ -1,750 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StyleTests
-    {
-        [Fact]
-        public void Style_With_Only_Type_Selector_Should_Update_Value()
-        {
-            Style style = new Style(x => x.OfType<Class1>())
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-
-            style.TryAttach(target, null);
-
-            Assert.Equal("Foo", target.Foo);
-        }
-
-        [Fact]
-        public void Style_With_Class_Selector_Should_Update_And_Restore_Value()
-        {
-            Style style = new Style(x => x.OfType<Class1>().Class("foo"))
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-
-            style.TryAttach(target, null);
-            Assert.Equal("foodefault", target.Foo);
-            target.Classes.Add("foo");
-            Assert.Equal("Foo", target.Foo);
-            target.Classes.Remove("foo");
-            Assert.Equal("foodefault", target.Foo);
-        }
-
-        [Fact]
-        public void Style_With_No_Selector_Should_Apply_To_Containing_Control()
-        {
-            Style style = new Style
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-
-            style.TryAttach(target, target);
-
-            Assert.Equal("Foo", target.Foo);
-        }
-
-        [Fact]
-        public void Style_With_No_Selector_Should_Not_Apply_To_Other_Control()
-        {
-            Style style = new Style
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-            var other = new Class1();
-
-            style.TryAttach(target, other);
-
-            Assert.Equal("foodefault", target.Foo);
-        }
-
-        [Fact]
-        public void LocalValue_Should_Override_Style()
-        {
-            Style style = new Style(x => x.OfType<Class1>())
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1
-            {
-                Foo = "Original",
-            };
-
-            style.TryAttach(target, null);
-            Assert.Equal("Original", target.Foo);
-        }
-
-        [Fact]
-        public void Later_Styles_Should_Override_Earlier()
-        {
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Foo"),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Bar"),
-                    },
-                }
-            };
-
-            var target = new Class1();
-
-            List<string> values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-
-            styles.TryAttach(target, null);
-            target.Classes.Add("foo");
-            target.Classes.Remove("foo");
-
-            Assert.Equal(new[] { "foodefault", "Foo", "Bar", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Later_Styles_Should_Override_Earlier_2()
-        {
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Foo"),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>().Class("bar"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Bar"),
-                    },
-                }
-            };
-
-            var target = new Class1();
-
-            List<string> values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-
-            styles.TryAttach(target, null);
-            target.Classes.Add("bar");
-            target.Classes.Add("foo");
-            target.Classes.Remove("foo");
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Later_Styles_Should_Override_Earlier_3()
-        {
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, new Binding("Foo")),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>().Class("bar"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, new Binding("Bar")),
-                    },
-                }
-            };
-
-            var target = new Class1
-            {
-                DataContext = new
-                {
-                    Foo = "Foo",
-                    Bar = "Bar",
-                }
-            };
-
-            List<string> values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-
-            styles.TryAttach(target, null);
-            target.Classes.Add("bar");
-            target.Classes.Add("foo");
-            target.Classes.Remove("foo");
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Attach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Foo"),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Bar"),
-                        },
-                    }
-                }
-            };
-
-            var values = new List<string>();
-            var target = new Class1();
-
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = target;
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Attach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Foo")),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Bar")),
-                        },
-                    }
-                }
-            };
-
-            var values = new List<string>();
-            var target = new Class1
-            {
-                DataContext = new
-                {
-                    Foo = "Foo",
-                    Bar = "Bar",
-                }
-            };
-
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = target;
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Foo"),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Bar"),
-                        },
-                    }
-                }
-            };
-
-            var target = new Class1();
-            root.Child = target;
-
-            var values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = null;
-
-            Assert.Equal(new[] { "Bar", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach_2()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>().Class("foo"))
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Foo"),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Bar"),
-                        },
-                    }
-                }
-            };
-
-            var target = new Class1 { Classes = { "foo" } };
-            root.Child = target;
-
-            var values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = null;
-
-            Assert.Equal(new[] { "Foo", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Detach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Foo")),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Bar")),
-                        },
-                    }
-                }
-            };
-
-            var target = new Class1
-            {
-                DataContext = new
-                {
-                    Foo = "Foo",
-                    Bar = "Bar",
-                }
-            };
-
-            root.Child = target;
-
-            var values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = null;
-
-            Assert.Equal(new[] { "Bar", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Template_In_Non_Matching_Style_Is_Not_Built()
-        {
-            var instantiationCount = 0;
-            var template = new FuncTemplate<Class1>(() =>
-            {
-                ++instantiationCount;
-                return new Class1();
-            });
-
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>())
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                }
-            };
-
-            var target = new Class1();
-            styles.TryAttach(target, null);
-
-            Assert.NotNull(target.Child);
-            Assert.Equal(1, instantiationCount);
-        }
-
-        [Fact]
-        public void Template_In_Inactive_Style_Is_Not_Built()
-        {
-            var instantiationCount = 0;
-            var template = new FuncTemplate<Class1>(() =>
-            {
-                ++instantiationCount;
-                return new Class1();
-            });
-
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>())
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>())
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                }
-            };
-
-            var target = new Class1();
-            target.BeginBatchUpdate();
-            styles.TryAttach(target, null);
-            target.EndBatchUpdate();
-
-            Assert.NotNull(target.Child);
-            Assert.Equal(1, instantiationCount);
-        }
-
-        [Fact]
-        public void Style_Should_Detach_When_Control_Removed_From_Logical_Tree()
-        {
-            Border border;
-
-            var style = new Style(x => x.OfType<Border>())
-            {
-                Setters =
-                {
-                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                }
-            };
-
-            var root = new TestRoot
-            {
-                Child = border = new Border(),
-            };
-
-            style.TryAttach(border, null);
-
-            Assert.Equal(new Thickness(4), border.BorderThickness);
-            root.Child = null;
-            Assert.Equal(new Thickness(0), border.BorderThickness);
-        }
-
-        [Fact]
-        public void Removing_Style_Should_Detach_From_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    { 
-                        new Style(x => x.OfType<Border>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                root.Styles.RemoveAt(0);
-                Assert.Equal(new Thickness(0), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Adding_Style_Should_Attach_To_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<Border>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                root.Styles.Add(new Style(x => x.OfType<Border>())
-                {
-                    Setters =
-                    {
-                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
-                    }
-                });
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(6), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Removing_Style_With_Nested_Style_Should_Detach_From_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Styles
-                        {
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                                }
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                root.Styles.RemoveAt(0);
-                Assert.Equal(new Thickness(0), border.BorderThickness);
-            }
-        }
-        
-        [Fact]
-        public void Adding_Nested_Style_Should_Attach_To_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Styles
-                        {
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                                }
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                ((Styles)root.Styles[0]).Add(new Style(x => x.OfType<Border>())
-                {
-                    Setters =
-                    {
-                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
-                    }
-                });
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(6), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Removing_Nested_Style_Should_Detach_From_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Styles
-                        {
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                                }
-                            },
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(6)),
-                                }
-                            },
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(6), border.BorderThickness);
-
-                ((Styles)root.Styles[0]).RemoveAt(1);
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Style();
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources_2()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Style();
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            host.Invocations.Clear();
-            ((IResourceProvider)target).AddOwner(host.Object);
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        private class Class1 : Control
-        {
-            public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
-
-            public static readonly StyledProperty<Class1> ChildProperty =
-                AvaloniaProperty.Register<Class1, Class1>(nameof(Child));
-
-            public string Foo
-            {
-                get { return GetValue(FooProperty); }
-                set { SetValue(FooProperty, value); }
-            }
-
-            public Class1 Child
-            {
-                get => GetValue(ChildProperty);
-                set => SetValue(ChildProperty, value);
-            }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
deleted file mode 100644
index fcbccba695..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
+++ /dev/null
@@ -1,638 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using Moq;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Xunit;
-using Avalonia.LogicalTree;
-using Avalonia.Controls;
-using System.ComponentModel;
-using Avalonia.Controls.Primitives;
-using Avalonia.Markup.Xaml.Templates;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StyledElementTests
-    {
-        [Fact]
-        public void Classes_Should_Initially_Be_Empty()
-        {
-            var target = new StyledElement();
-
-            Assert.Empty(target.Classes);
-        }
-
-        [Fact]
-        public void Setting_Parent_Should_Also_Set_InheritanceParent()
-        {
-            var parent = new Decorator();
-            var target = new TestControl();
-
-            parent.Child = target;
-
-            Assert.Equal(parent, target.Parent);
-            Assert.Equal(parent, target.InheritanceParent);
-        }
-
-        [Fact]
-        public void Setting_Parent_Should_Not_Set_InheritanceParent_If_Already_Set()
-        {
-            var parent = new Decorator();
-            var inheritanceParent = new Decorator();
-            var target = new TestControl();
-
-            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
-            parent.Child = target;
-
-            Assert.Equal(parent, target.Parent);
-            Assert.Equal(inheritanceParent, target.InheritanceParent);
-        }
-
-        [Fact]
-        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent()
-        {
-            var parent = new Decorator();
-            var target = new TestControl();
-
-            parent.Child = target;
-            parent.Child = null;
-
-            Assert.Null(target.InheritanceParent);
-        }
-
-        [Fact]
-        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent_When_Has_Different_InheritanceParent()
-        {
-            var parent = new Decorator();
-            var inheritanceParent = new Decorator();
-            var target = new TestControl();
-
-            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
-            parent.Child = target;
-            parent.Child = null;
-
-            Assert.Null(target.InheritanceParent);
-        }
-
-        [Fact]
-        public void Adding_Element_With_Null_Parent_To_Logical_Tree_Should_Throw()
-        {
-            var target = new Border();
-            var visualParent = new Panel();
-            var logicalParent = new Panel();
-            var root = new TestRoot();
-
-            // Set the logical parent...
-            ((ISetLogicalParent)target).SetParent(logicalParent);
-
-            // ...so that when it's added to `visualParent`, the parent won't be set again.
-            visualParent.Children.Add(target);
-
-            // Clear the logical parent. It's now a logical child of `visualParent` but doesn't have
-            // a logical parent itself.
-            ((ISetLogicalParent)target).SetParent(null);
-
-            // In this case, attaching the control to a logical tree should throw.
-            logicalParent.Children.Add(visualParent);
-            Assert.Throws<InvalidOperationException>(() => root.Child = logicalParent);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Be_Called_When_Added_To_Tree()
-        {
-            var root = new TestRoot();
-            var parent = new Border();
-            var child = new Border();
-            var grandchild = new Border();
-            var parentRaised = false;
-            var childRaised = false;
-            var grandchildRaised = false;
-
-            parent.AttachedToLogicalTree += (s, e) => parentRaised = true;
-            child.AttachedToLogicalTree += (s, e) => childRaised = true;
-            grandchild.AttachedToLogicalTree += (s, e) => grandchildRaised = true;
-
-            parent.Child = child;
-            child.Child = grandchild;
-
-            Assert.False(parentRaised);
-            Assert.False(childRaised);
-            Assert.False(grandchildRaised);
-
-            root.Child = parent;
-
-            Assert.True(parentRaised);
-            Assert.True(childRaised);
-            Assert.True(grandchildRaised);
-        }
-        
-        [Fact]
-        public void AttachedToLogicalTree_Should_Be_Called_Before_Parent_Change_Signalled()
-        {
-            var root = new TestRoot();
-            var child = new Border();
-            var raised = new List<string>();
-
-            child.AttachedToLogicalTree += (s, e) =>
-            {
-                Assert.Equal(root, child.Parent);
-                raised.Add("attached");
-            };
-
-            child.GetObservable(StyledElement.ParentProperty).Skip(1).Subscribe(_ => raised.Add("parent"));
-
-            root.Child = child;
-
-            Assert.Equal(new[] { "attached", "parent" }, raised);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
-        {
-            var globalStyles = Mock.Of<IGlobalStyles>();
-            var root = new TestRoot { StylingParent = globalStyles };
-            var child = new Border();
-            var raised = false;
-
-            child.AttachedToLogicalTree += (s, e) =>
-            {
-                Assert.Equal(root, e.Root);
-                raised = true;
-            };
-
-            root.Child = child;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Have_Source_Set()
-        {
-            var root = new TestRoot();
-            var canvas = new Canvas();
-            var border = new Border { Child = canvas };
-            var raised = 0;
-
-            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
-            {
-                Assert.Same(border, e.Source);
-                ++raised;
-            }
-
-            border.AttachedToLogicalTree += Attached;
-            canvas.AttachedToLogicalTree += Attached;
-
-            root.Child = border;
-
-            Assert.Equal(2, raised);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Have_Parent_Set()
-        {
-            var root = new TestRoot();
-            var canvas = new Canvas();
-            var border = new Border { Child = canvas };
-            var raised = 0;
-
-            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
-            {
-                Assert.Same(root, e.Parent);
-                ++raised;
-            }
-
-            border.AttachedToLogicalTree += Attached;
-            canvas.AttachedToLogicalTree += Attached;
-
-            root.Child = border;
-
-            Assert.Equal(2, raised);
-        }
-
-        [Fact]
-        public void DetachedFromLogicalTree_Should_Be_Called_When_Removed_From_Tree()
-        {
-            var root = new TestRoot();
-            var parent = new Border();
-            var child = new Border();
-            var grandchild = new Border();
-            var parentRaised = false;
-            var childRaised = false;
-            var grandchildRaised = false;
-
-            parent.Child = child;
-            child.Child = grandchild;
-            root.Child = parent;
-
-            parent.DetachedFromLogicalTree += (s, e) => parentRaised = true;
-            child.DetachedFromLogicalTree += (s, e) => childRaised = true;
-            grandchild.DetachedFromLogicalTree += (s, e) => grandchildRaised = true;
-
-            root.Child = null;
-
-            Assert.True(parentRaised);
-            Assert.True(childRaised);
-            Assert.True(grandchildRaised);
-        }
-
-        [Fact]
-        public void DetachedFromLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
-        {
-            var globalStyles = Mock.Of<IGlobalStyles>();
-            var root = new TestRoot { StylingParent = globalStyles };
-            var child = new Border();
-            var raised = false;
-
-            child.DetachedFromLogicalTree += (s, e) =>
-            {
-                Assert.Equal(root, e.Root);
-                raised = true;
-            };
-
-            root.Child = child;
-            root.Child = null;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Parent_Should_Be_Null_When_DetachedFromLogicalTree_Called()
-        {
-            var target = new TestControl();
-            var root = new TestRoot(target);
-            var called = 0;
-
-            target.DetachedFromLogicalTree += (s, e) =>
-            {
-                Assert.Null(target.Parent);
-                Assert.Null(target.InheritanceParent);
-                ++called;
-            };
-
-            root.Child = null;
-
-            Assert.Equal(1, called);
-        }
-
-        [Fact]
-        public void Adding_Tree_To_IStyleRoot_Should_Style_Controls()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var parent = new Border();
-                var child = new Border();
-                var grandchild = new Control();
-                var styler = new Mock<IStyler>();
-
-                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
-
-                parent.Child = child;
-                child.Child = grandchild;
-
-                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
-
-                root.Child = parent;
-
-                styler.Verify(x => x.ApplyStyles(parent), Times.Once());
-                styler.Verify(x => x.ApplyStyles(child), Times.Once());
-                styler.Verify(x => x.ApplyStyles(grandchild), Times.Once());
-            }
-        }
-
-        [Fact]
-        public void Styles_Not_Applied_Until_Initialization_Finished()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-                var styler = new Mock<IStyler>();
-
-                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
-
-                ((ISupportInitialize)child).BeginInit();
-                root.Child = child;
-                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
-
-                ((ISupportInitialize)child).EndInit();
-                styler.Verify(x => x.ApplyStyles(child), Times.Once());
-            }
-        }
-
-        [Fact]
-        public void Name_Cannot_Be_Set_After_Added_To_Logical_Tree()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-
-                root.Child = child;
-
-                Assert.Throws<InvalidOperationException>(() => child.Name = "foo");
-            }
-        }
-
-        [Fact]
-        public void Name_Can_Be_Set_While_Initializing()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-
-                child.BeginInit();
-                root.Child = child;
-                child.Name = "foo";
-                child.EndInit();
-            }
-        }
-
-        [Fact]
-        public void StyleInstance_Is_Disposed_When_Control_Removed_From_Logical_Tree()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-
-                root.Child = child;
-
-                var styleInstance = new Mock<IStyleInstance>();
-                ((IStyleable)child).StyleApplied(styleInstance.Object);
-
-                root.Child = null;
-
-                styleInstance.Verify(x => x.Dispose(), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void EndInit_Should_Raise_Initialized()
-        {
-            var root = new TestRoot();
-            var target = new Border();
-            var called = false;
-
-            target.Initialized += (s, e) => called = true;
-            ((ISupportInitialize)target).BeginInit();
-            root.Child = target;
-            ((ISupportInitialize)target).EndInit();
-
-            Assert.True(called);
-            Assert.True(target.IsInitialized);
-        }
-
-        [Fact]
-        public void Attaching_To_Visual_Tree_Should_Raise_Initialized()
-        {
-            var root = new TestRoot();
-            var target = new Border();
-            var called = false;
-
-            target.Initialized += (s, e) => called = true;
-            root.Child = target;
-
-            Assert.True(called);
-            Assert.True(target.IsInitialized);
-        }
-
-        [Fact]
-        public void DataContextChanged_Should_Be_Called()
-        {
-            var root = new TestStackPanel
-            {
-                Name = "root",
-                Children =
-                {
-                    new TestControl
-                    {
-                        Name = "a1",
-                        Child = new TestControl
-                        {
-                            Name = "b1",
-                        }
-                    },
-                    new TestControl
-                    {
-                        Name = "a2",
-                        DataContext = "foo",
-                    },
-                }
-            };
-
-            var called = new List<string>();
-            void Record(object sender, EventArgs e) => called.Add(((StyledElement)sender).Name);
-
-            root.DataContextChanged += Record;
-
-            foreach (TestControl c in root.GetLogicalDescendants())
-            {
-                c.DataContextChanged += Record;
-            }
-
-            root.DataContext = "foo";
-
-            Assert.Equal(new[] { "root", "a1", "b1", }, called);
-        }
-
-        [Fact]
-        public void DataContext_Notifications_Should_Be_Called_In_Correct_Order()
-        {
-            var root = new TestStackPanel
-            {
-                Name = "root",
-                Children =
-                {
-                    new TestControl
-                    {
-                        Name = "a1",
-                        Child = new TestControl
-                        {
-                            Name = "b1",
-                        }
-                    },
-                    new TestControl
-                    {
-                        Name = "a2",
-                        DataContext = "foo",
-                    },
-                }
-            };
-
-            var called = new List<string>();
-
-            foreach (IDataContextEvents c in root.GetSelfAndLogicalDescendants())
-            {
-                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((StyledElement)s).Name);
-                c.DataContextChanged += (s, e) => called.Add("changed " + ((StyledElement)s).Name);
-                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((StyledElement)s).Name);
-            }
-
-            root.DataContext = "foo";
-
-            Assert.Equal(
-                new[] 
-                {
-                    "begin root",
-                    "begin a1",
-                    "begin b1",
-                    "changed root",
-                    "changed a1",
-                    "changed b1",
-                    "end b1",
-                    "end a1",
-                    "end root",
-                },
-                called);
-        }
-
-        [Fact]
-        public void Resources_Owner_Is_Set()
-        {
-            var target = new TestControl();
-
-            Assert.Same(target, ((ResourceDictionary)target.Resources).Owner);
-        }
-
-        [Fact]
-        public void Assigned_Resources_Parent_Is_Set()
-        {
-            var resources = new Mock<IResourceDictionary>();
-            var target = new TestControl { Resources = resources.Object };
-
-            resources.Verify(x => x.AddOwner(target));
-        }
-
-        [Fact]
-        public void Assigning_Resources_Raises_ResourcesChanged()
-        {
-            var resources = new ResourceDictionary { { "foo", "bar" } };
-            var target = new TestControl();
-            var raised = 0;
-
-            target.ResourcesChanged += (s, e) => ++raised;
-            target.Resources = resources;
-
-            Assert.Equal(1, raised);
-        }
-
-        [Fact]
-        public void Styles_Owner_Is_Set()
-        {
-            var target = new TestControl();
-
-            Assert.Same(target, target.Styles.Owner);
-        }
-
-        [Fact]
-        public void Adding_To_Logical_Tree_Raises_ResourcesChanged()
-        {
-            var target = new TestRoot();
-            var parent = new Decorator { Resources = { { "foo", "bar" } } };
-            var raised = 0;
-
-            target.ResourcesChanged += (s, e) => ++raised;
-
-            parent.Child = target;
-
-            Assert.Equal(1, raised);
-        }
-
-        [Fact]
-        public void SetParent_Does_Not_Crash_Due_To_Reentrancy()
-        {
-            // Issue #3708
-            var app = UnitTestApplication.Start(TestServices.StyledWindow);
-
-            ContentControl target;
-            var root = new TestRoot
-            {
-                DataContext = false,
-                Child = target = new ContentControl
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<ContentControl>())
-                        {
-                            Setters =
-                            {
-                                new Setter(
-                                    ContentControl.ContentProperty,
-                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Enabled" })),
-                            },
-                        },
-                        new Style(x => x.OfType<ContentControl>().Class(":disabled"))
-                        {
-                            Setters =
-                            {
-                                new Setter(
-                                    ContentControl.ContentProperty,
-                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Disabled" })),
-                            },
-                        },
-                    },
-                    [!ContentControl.IsEnabledProperty] = new Binding(),
-                }
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(0, 0, 100, 100));
-
-            var textBlock = Assert.IsType<TextBlock>(target.Content);
-            Assert.Equal("Disabled", textBlock.Text);
-
-            // #3708 was crashing here with AvaloniaInternalException.
-            root.Child = null;
-        }
-
-        private interface IDataContextEvents
-        {
-            event EventHandler DataContextBeginUpdate;
-            event EventHandler DataContextChanged;
-            event EventHandler DataContextEndUpdate;
-        }
-
-        private class TestControl : Decorator, IDataContextEvents
-        {
-            public event EventHandler DataContextBeginUpdate;
-            public event EventHandler DataContextEndUpdate;
-
-            public new IAvaloniaObject InheritanceParent => base.InheritanceParent;
-
-            protected override void OnDataContextBeginUpdate()
-            {
-                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextBeginUpdate();
-            }
-
-            protected override void OnDataContextEndUpdate()
-            {
-                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextEndUpdate();
-            }
-        }
-
-        private class TestStackPanel : StackPanel, IDataContextEvents
-        {
-            public event EventHandler DataContextBeginUpdate;
-            public event EventHandler DataContextEndUpdate;
-
-            protected override void OnDataContextBeginUpdate()
-            {
-                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextBeginUpdate();
-            }
-
-            protected override void OnDataContextEndUpdate()
-            {
-                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextEndUpdate();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
deleted file mode 100644
index 05315380fd..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using System;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Templates;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Controls.UnitTests
-{
-    public class StyledElementTests_Resources
-    {
-        [Fact]
-        public void FindResource_Should_Find_Control_Resource()
-        {
-            var target = new StyledElement
-            {
-                Resources =
-                {
-                    { "foo", "foo-value" },
-                }
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Control_Resource_In_Parent()
-        {
-            Control target;
-
-            var root = new Decorator
-            {
-                Resources =
-                {
-                    { "foo", "foo-value" },
-                },
-                Child = target = new Control(),
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Application_Resource()
-        {
-            Control target;
-
-            var app = new Application
-            {
-                Resources =
-                {
-                    { "foo", "foo-value" },
-                },
-            };
-
-            var root = new TestRoot
-            {
-                Child = target = new Control(),
-                StylingParent = app,
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Style_Resource()
-        {
-            var target = new StyledElement
-            {
-                Styles =
-                {
-                    new Style
-                    {
-                        Resources =
-                        {
-                            { "foo", "foo-value" },
-                        }
-                    }
-                },
-                Resources =
-                {
-                    { "bar", "bar-value" },
-                },
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Styles_Resource()
-        {
-            var target = new StyledElement
-            {
-                Styles =
-                {
-                    new Styles
-                    {
-                        Resources =
-                        {
-                            { "foo", "foo-value" },
-                        }
-                    }
-                },
-                Resources =
-                {
-                    { "bar", "bar-value" },
-                },
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Application_Style_Resource()
-        {
-            Control target;
-
-            var app = new Application
-            {
-                Styles =
-                {
-                    new Style
-                    {
-                        Resources =
-                        {
-                            { "foo", "foo-value" },
-                        },
-                    }
-                },
-                Resources =
-                {
-                    { "bar", "bar-value" },
-                },
-            };
-
-            var root = new TestRoot
-            {
-                Child = target = new Control(),
-                StylingParent = app,
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void Adding_Resource_Should_Call_Raise_ResourceChanged_On_Logical_Children()
-        {
-            Border child;
-
-            var target = new ContentControl
-            {
-                Content = child = new Border(),
-                Template = ContentControlTemplate(),
-            };
-
-            var raisedOnTarget = false;
-            var raisedOnChild = false;
-
-            target.Measure(Size.Infinity);
-            target.ResourcesChanged += (_, __) => raisedOnTarget = true;
-            child.ResourcesChanged += (_, __) => raisedOnChild = true;
-
-            target.Resources.Add("foo", "bar");
-
-            Assert.True(raisedOnTarget);
-            Assert.True(raisedOnChild);
-        }
-
-        [Fact]
-        public void Adding_Resource_To_Styles_Should_Raise_ResourceChanged()
-        {
-            var target = new Decorator();
-            var raised = false;
-
-            target.ResourcesChanged += (_, __) => raised = true;
-            target.Styles.Resources.Add("foo", "bar");
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Adding_Resource_To_Nested_Style_Should_Raise_ResourceChanged()
-        {
-            Style style;
-            var target = new StyledElement
-            {
-                Styles =
-                {
-                    (style = new Style()),
-                }
-            };
-
-            var raised = false;
-
-            target.ResourcesChanged += (_, __) => raised = true;
-            style.Resources.Add("foo", "bar");
-
-            Assert.True(raised);
-        }
-
-        private IControlTemplate ContentControlTemplate()
-        {
-            return new FuncControlTemplate<ContentControl>((x, scope) =>
-                new ContentPresenter
-                {
-                    Name = "PART_ContentPresenter",
-                    [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
-                }.RegisterInNameScope(scope));
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StylesTests.cs b/tests/Avalonia.Styling.UnitTests/StylesTests.cs
deleted file mode 100644
index 88ab124e01..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StylesTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StylesTests
-    {
-        [Fact]
-        public void Adding_Style_Should_Set_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles(host.Object);
-            var style = new Mock<IStyle>();
-            var rp = style.As<IResourceProvider>();
-
-            host.Invocations.Clear();
-            target.Add(style.Object);
-
-            rp.Verify(x => x.AddOwner(host.Object));
-        }
-
-        [Fact]
-        public void Removing_Style_Should_Clear_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles(host.Object);
-            var style = new Mock<IStyle>();
-            var rp = style.As<IResourceProvider>();
-
-            host.Invocations.Clear();
-            target.Add(style.Object);
-            target.Remove(style.Object);
-
-            rp.Verify(x => x.RemoveOwner(host.Object));
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources_2()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            host.Invocations.Clear();
-            ((IResourceProvider)target).AddOwner(host.Object);
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Child_Style()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            var style = new Mock<IStyle>();
-            var resourceProvider = style.As<IResourceProvider>();
-            target.Add(style.Object);
-
-            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Child_Style_2()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-
-            var style = new Mock<IStyle>();
-            var resourceProvider = style.As<IResourceProvider>();
-            target.Add(style.Object);
-
-            host.Invocations.Clear();
-            ((IResourceProvider)target).AddOwner(host.Object);
-            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-        [Fact]
-        public void Finds_Resource_In_Merged_Dictionary()
-        {
-            var target = new Styles
-            {
-                Resources = new ResourceDictionary
-                {
-                    MergedDictionaries =
-                    {
-                        new ResourceDictionary
-                        {
-                            { "foo", "bar" },
-                        }
-                    }
-                }
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestObservable.cs b/tests/Avalonia.Styling.UnitTests/TestObservable.cs
deleted file mode 100644
index 7a07f12883..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestObservable.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class TestObservable : IObservable<bool>
-    {
-        public int SubscribedCount { get; private set; }
-
-        public IDisposable Subscribe(IObserver<bool> observer)
-        {
-            ++SubscribedCount;
-            observer.OnNext(true);
-            return Disposable.Create(() => --SubscribedCount);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestObserver.cs b/tests/Avalonia.Styling.UnitTests/TestObserver.cs
deleted file mode 100644
index c18fa8618f..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestObserver.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-
-namespace Avalonia.Styling.UnitTests
-{
-    internal class TestObserver<T> : IObserver<T>
-    {
-        private bool _hasValue;
-
-        private T _value;
-
-        public bool Completed { get; private set; }
-
-        public Exception Error { get; private set; }
-
-        public T GetValue()
-        {
-            if (!_hasValue)
-            {
-                throw new Exception("Observable provided no value.");
-            }
-
-            if (Completed)
-            {
-                throw new Exception("Observable completed unexpectedly.");
-            }
-
-            if (Error != null)
-            {
-                throw new Exception("Observable errored unexpectedly.");
-            }
-
-            _hasValue = false;
-            return _value;
-        }
-
-        public void OnCompleted()
-        {
-            Completed = true;
-        }
-
-        public void OnError(Exception error)
-        {
-            Error = error;
-        }
-
-        public void OnNext(T value)
-        {
-            if (!_hasValue)
-            {
-                _value = value;
-                _hasValue = true;
-            }
-            else
-            {
-                throw new Exception("Observable pushed more than one value.");
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestSelectors.cs b/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
deleted file mode 100644
index 44a087af19..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Avalonia.Styling;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public static class TestSelectors
-    {
-        public static Selector SubscribeCheck(this Selector selector)
-        {
-            throw new NotImplementedException();
-            //return new Selector(
-            //    selector,
-            //    control => new SelectorMatch(((TestControlBase)control).SubscribeCheckObservable),
-            //    "");
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestSubject.cs b/tests/Avalonia.Styling.UnitTests/TestSubject.cs
deleted file mode 100644
index 7550b545b6..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestSubject.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Disposables;
-
-namespace Avalonia.Styling.UnitTests
-{
-    internal class TestSubject<T> : IObserver<T>, IObservable<T>
-    {
-        private readonly T _initial;
-
-        private readonly List<IObserver<T>> _subscribers = new List<IObserver<T>>();
-
-        public TestSubject(T initial)
-        {
-            _initial = initial;
-        }
-
-        public int SubscriberCount => _subscribers.Count;
-
-        public void OnCompleted()
-        {
-            foreach (IObserver<T> subscriber in _subscribers.ToArray())
-            {
-                subscriber.OnCompleted();
-            }
-        }
-
-        public void OnError(Exception error)
-        {
-            foreach (IObserver<T> subscriber in _subscribers.ToArray())
-            {
-                subscriber.OnError(error);
-            }
-        }
-
-        public void OnNext(T value)
-        {
-            foreach (IObserver<T> subscriber in _subscribers.ToArray())
-            {
-                subscriber.OnNext(value);
-            }
-        }
-
-        public IDisposable Subscribe(IObserver<T> observer)
-        {
-            _subscribers.Add(observer);
-            observer.OnNext(_initial);
-            return Disposable.Create(() => _subscribers.Remove(observer));
-        }
-    }
-}
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index c3cf6cd8d3..cb6884cad8 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -14,18 +14,11 @@
     <EmbeddedResource Include="..\Avalonia.UnitTests\Assets\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
diff --git a/tests/Avalonia.UnitTests/HarfBuzzFontManagerImpl.cs b/tests/Avalonia.UnitTests/HarfBuzzFontManagerImpl.cs
index 002da66070..2b1685f358 100644
--- a/tests/Avalonia.UnitTests/HarfBuzzFontManagerImpl.cs
+++ b/tests/Avalonia.UnitTests/HarfBuzzFontManagerImpl.cs
@@ -36,8 +36,8 @@ namespace Avalonia.UnitTests
             return _customTypefaces.Select(x => x.FontFamily!.Name);
         }
 
-        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily,
-            CultureInfo culture, out Typeface fontKey)
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontStretch fontStretch,
+            FontFamily fontFamily, CultureInfo culture, out Typeface fontKey)
         {
             foreach (var customTypeface in _customTypefaces)
             {
@@ -58,15 +58,10 @@ namespace Avalonia.UnitTests
             return false;
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphTypeface CreateGlyphTypeface(Typeface typeface)
         {
             var fontFamily = typeface.FontFamily;
 
-            if (fontFamily == null)
-            {
-                return null;
-            }
-
             if (fontFamily.IsDefault)
             {
                 fontFamily = _defaultTypeface.FontFamily;
diff --git a/tests/Avalonia.UnitTests/HarfBuzzGlyphTypefaceImpl.cs b/tests/Avalonia.UnitTests/HarfBuzzGlyphTypefaceImpl.cs
index 32e0434cd4..5b11345f16 100644
--- a/tests/Avalonia.UnitTests/HarfBuzzGlyphTypefaceImpl.cs
+++ b/tests/Avalonia.UnitTests/HarfBuzzGlyphTypefaceImpl.cs
@@ -1,16 +1,16 @@
 using System;
 using System.IO;
-using Avalonia.Platform;
+using Avalonia.Media;
 using HarfBuzzSharp;
 
 namespace Avalonia.UnitTests
 {
-   public class HarfBuzzGlyphTypefaceImpl : IGlyphTypefaceImpl
+    public class HarfBuzzGlyphTypefaceImpl : IGlyphTypeface
     {
         private bool _isDisposed;
         private Blob _blob;
 
-        public HarfBuzzGlyphTypefaceImpl(Stream data, bool isFakeBold = false, bool isFakeItalic = false)
+        public HarfBuzzGlyphTypefaceImpl(Stream data)
         {
             _blob = Blob.FromStream(data);
             
@@ -21,70 +21,43 @@ namespace Avalonia.UnitTests
             Font.SetFunctionsOpenType();
 
             Font.GetScale(out var scale, out _);
-            
-            DesignEmHeight = (short)scale;
-
-            var metrics = Font.OpenTypeMetrics;
 
             const double defaultFontRenderingEmSize = 12.0;
 
-            Ascent = (int)(metrics.GetXVariation(OpenTypeMetricsTag.HorizontalAscender) / defaultFontRenderingEmSize * DesignEmHeight);
-
-            Descent = (int)(metrics.GetXVariation(OpenTypeMetricsTag.HorizontalDescender) / defaultFontRenderingEmSize * DesignEmHeight);
-
-            LineGap = (int)(metrics.GetXVariation(OpenTypeMetricsTag.HorizontalLineGap) / defaultFontRenderingEmSize * DesignEmHeight);
+            var metrics = Font.OpenTypeMetrics;
 
-            UnderlinePosition = (int)(metrics.GetXVariation(OpenTypeMetricsTag.UnderlineOffset) / defaultFontRenderingEmSize * DesignEmHeight);
+            Metrics = new FontMetrics
+            {
+                DesignEmHeight = (short)scale,
+                Ascent = (int)(metrics.GetXVariation(OpenTypeMetricsTag.HorizontalAscender) / defaultFontRenderingEmSize * scale),
+                Descent = (int)(metrics.GetXVariation(OpenTypeMetricsTag.HorizontalDescender) / defaultFontRenderingEmSize * scale),
+                LineGap = (int)(metrics.GetXVariation(OpenTypeMetricsTag.HorizontalLineGap) / defaultFontRenderingEmSize * scale),
 
-            UnderlineThickness = (int)(metrics.GetXVariation(OpenTypeMetricsTag.UnderlineSize) / defaultFontRenderingEmSize * DesignEmHeight);
+                UnderlinePosition = (int)(metrics.GetXVariation(OpenTypeMetricsTag.UnderlineOffset) / defaultFontRenderingEmSize * scale),
 
-            StrikethroughPosition = (int)(metrics.GetXVariation(OpenTypeMetricsTag.StrikeoutOffset) / defaultFontRenderingEmSize * DesignEmHeight);
+                UnderlineThickness = (int)(metrics.GetXVariation(OpenTypeMetricsTag.UnderlineSize) / defaultFontRenderingEmSize * scale),
 
-            StrikethroughThickness = (int)(metrics.GetXVariation(OpenTypeMetricsTag.StrikeoutSize) / defaultFontRenderingEmSize * DesignEmHeight);
+                StrikethroughPosition = (int)(metrics.GetXVariation(OpenTypeMetricsTag.StrikeoutOffset) / defaultFontRenderingEmSize * scale),
 
-            IsFixedPitch = GetGlyphAdvance(GetGlyph('a')) == GetGlyphAdvance(GetGlyph('b'));
+                StrikethroughThickness = (int)(metrics.GetXVariation(OpenTypeMetricsTag.StrikeoutSize) / defaultFontRenderingEmSize * scale),
 
-            IsFakeBold = isFakeBold;
+                IsFixedPitch = GetGlyphAdvance(GetGlyph('a')) == GetGlyphAdvance(GetGlyph('b'))
+            };           
 
-            IsFakeItalic = isFakeItalic;
+            GlyphCount = Face.GlyphCount;
         }
 
+        public FontMetrics Metrics { get; }
+
         public Face Face { get; }
 
         public Font Font { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public short DesignEmHeight { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int Ascent { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int Descent { get; }
+        public int GlyphCount { get; set; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int LineGap { get; }
+        public FontSimulations FontSimulations { get; }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int UnderlinePosition { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int UnderlineThickness { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int StrikethroughPosition { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public int StrikethroughThickness { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
-        public bool IsFixedPitch { get; }
-        
-        public bool IsFakeBold { get; }
-        
-        public bool IsFakeItalic { get; }
-
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public ushort GetGlyph(uint codepoint)
         {
             if (Font.TryGetGlyph(codepoint, out var glyph))
@@ -95,7 +68,21 @@ namespace Avalonia.UnitTests
             return 0;
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        public bool TryGetGlyph(uint codepoint,out ushort glyph)
+        {
+            glyph = 0;
+
+            if (Font.TryGetGlyph(codepoint, out var glyphId))
+            {
+                glyph = (ushort)glyphId;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints)
         {
             var glyphs = new ushort[codepoints.Length];
@@ -111,13 +98,13 @@ namespace Avalonia.UnitTests
             return glyphs;
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public int GetGlyphAdvance(ushort glyph)
         {
             return Font.GetHorizontalGlyphAdvance(glyph);
         }
 
-        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        /// <inheritdoc cref="IGlyphTypeface"/>
         public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs)
         {
             var glyphIndices = new uint[glyphs.Length];
@@ -130,6 +117,21 @@ namespace Avalonia.UnitTests
             return Font.GetHorizontalGlyphAdvances(glyphIndices);
         }
 
+        public bool TryGetTable(uint tag, out byte[] table)
+        {
+            table = null;
+            var blob = Face.ReferenceTable(tag);
+
+            if (blob.Length > 0)
+            {
+                table = blob.AsSpan().ToArray();
+
+                return true;
+            }
+
+            return false;
+        }
+
         private void Dispose(bool disposing)
         {
             if (_isDisposed)
@@ -154,5 +156,25 @@ namespace Avalonia.UnitTests
             Dispose(true);
             GC.SuppressFinalize(this);
         }
+
+        public bool TryGetGlyphMetrics(ushort glyph, out GlyphMetrics metrics)
+        {
+            metrics = default;
+
+            if (!Font.TryGetGlyphExtents(glyph, out var extents))
+            {
+                return false;
+            }
+
+            metrics = new GlyphMetrics
+            {
+                XBearing = extents.XBearing,
+                YBearing = extents.YBearing,
+                Width = extents.Width,
+                Height = extents.Height
+            };
+
+            return true;
+        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs b/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
index 8ad3284490..7b7488bd5a 100644
--- a/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
@@ -12,9 +11,13 @@ namespace Avalonia.UnitTests
 {
     public class HarfBuzzTextShaperImpl : ITextShaperImpl
     {
- public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+            var culture = options.Culture;
+
             using (var buffer = new Buffer())
             {
                 buffer.AddUtf16(text.Buffer.Span, text.Start, text.Length);
@@ -27,7 +30,7 @@ namespace Avalonia.UnitTests
 
                 buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);              
 
-                var font = ((HarfBuzzGlyphTypefaceImpl)typeface.PlatformImpl).Font;
+                var font = ((HarfBuzzGlyphTypefaceImpl)typeface).Font;
 
                 font.Shape(buffer);
 
@@ -77,7 +80,7 @@ namespace Avalonia.UnitTests
             
             var second = glyphInfos[length - 1];
 
-            if (!new Codepoint((int)second.Codepoint).IsBreakChar)
+            if (!new Codepoint(second.Codepoint).IsBreakChar)
             {
                 return;
             }
diff --git a/tests/Avalonia.UnitTests/ImmediateDispatcher.cs b/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
index 5f0d41590f..f6f3de3bc6 100644
--- a/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
+++ b/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 
@@ -16,39 +17,39 @@ namespace Avalonia.UnitTests
         }
 
         /// <inheritdoc/>
-        public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(Action action, DispatcherPriority priority)
         {
             action();
         }
 
         /// <inheritdoc/>
-        public void Post<T>(Action<T> action, T arg, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(SendOrPostCallback action, object arg, DispatcherPriority priority)
         {
             action(arg);
         }
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Action action, DispatcherPriority priority)
         {
             action();
             return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority)
         {
             var result = function();
             return Task.FromResult(result);
         }
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority)
         {
             return function();
         }
         
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority)
         {
             return function();
         }
diff --git a/tests/Avalonia.UnitTests/MockAssetLoader.cs b/tests/Avalonia.UnitTests/MockAssetLoader.cs
index f591ac445f..6fe8cd54f7 100644
--- a/tests/Avalonia.UnitTests/MockAssetLoader.cs
+++ b/tests/Avalonia.UnitTests/MockAssetLoader.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.UnitTests
 {
@@ -39,7 +40,9 @@ namespace Avalonia.UnitTests
 
         public IEnumerable<Uri> GetAssets(Uri uri, Uri baseUri)
         {
-            return _assets.Keys.Where(x => x.AbsolutePath.Contains(uri.AbsolutePath));
+            var absPath = uri.GetUnescapeAbsolutePath();
+            return _assets.Keys.Where(
+                x => x.GetUnescapeAbsolutePath().IndexOf(absPath, StringComparison.Ordinal) >= 0);
         }
 
         public void SetDefaultAssembly(Assembly asm)
diff --git a/tests/Avalonia.UnitTests/MockFontManagerImpl.cs b/tests/Avalonia.UnitTests/MockFontManagerImpl.cs
index ba3b346f1b..e9b923a367 100644
--- a/tests/Avalonia.UnitTests/MockFontManagerImpl.cs
+++ b/tests/Avalonia.UnitTests/MockFontManagerImpl.cs
@@ -24,7 +24,8 @@ namespace Avalonia.UnitTests
             return new[] { _defaultFamilyName };
         }
 
-        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily,
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, 
+            FontStretch fontStretch, FontFamily fontFamily,
             CultureInfo culture, out Typeface fontKey)
         {
             fontKey = new Typeface(_defaultFamilyName);
@@ -32,7 +33,7 @@ namespace Avalonia.UnitTests
             return false;
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphTypeface CreateGlyphTypeface(Typeface typeface)
         {
             return new MockGlyphTypeface();
         }
diff --git a/tests/Avalonia.UnitTests/MockGlyphRun.cs b/tests/Avalonia.UnitTests/MockGlyphRun.cs
new file mode 100644
index 0000000000..24948aff01
--- /dev/null
+++ b/tests/Avalonia.UnitTests/MockGlyphRun.cs
@@ -0,0 +1,12 @@
+using Avalonia.Platform;
+
+namespace Avalonia.UnitTests
+{
+    public class MockGlyphRun : IGlyphRunImpl
+    {
+        public void Dispose()
+        {
+            
+        }
+    }
+}
diff --git a/tests/Avalonia.UnitTests/MockGlyphTypeface.cs b/tests/Avalonia.UnitTests/MockGlyphTypeface.cs
index c9c59a6e32..bd9d8e5adf 100644
--- a/tests/Avalonia.UnitTests/MockGlyphTypeface.cs
+++ b/tests/Avalonia.UnitTests/MockGlyphTypeface.cs
@@ -1,19 +1,21 @@
 using System;
-using Avalonia.Platform;
+using Avalonia.Media;
 
 namespace Avalonia.UnitTests
 {
-    public class MockGlyphTypeface : IGlyphTypefaceImpl
+    public class MockGlyphTypeface : IGlyphTypeface
     {
-        public short DesignEmHeight => 10;
-        public int Ascent => 2;
-        public int Descent => 10;
-        public int LineGap { get; }
-        public int UnderlinePosition { get; }
-        public int UnderlineThickness { get; }
-        public int StrikethroughPosition { get; }
-        public int StrikethroughThickness { get; }
-        public bool IsFixedPitch { get; }
+        public FontMetrics Metrics => new FontMetrics
+        {
+            DesignEmHeight = 10,
+            Ascent = 2,
+            Descent = 10,
+            IsFixedPitch = true
+        };
+
+        public int GlyphCount => 1337;
+
+        public FontSimulations FontSimulations => throw new NotImplementedException();
 
         public ushort GetGlyph(uint codepoint)
         {
@@ -30,6 +32,13 @@ namespace Avalonia.UnitTests
             return 8;
         }
 
+        public bool TryGetGlyph(uint codepoint, out ushort glyph)
+        {
+            glyph = 8;
+
+            return true;
+        }
+
         public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs)
         {
             var advances = new int[glyphs.Length];
@@ -43,5 +52,22 @@ namespace Avalonia.UnitTests
         }
 
         public void Dispose() { }
+
+        public bool TryGetTable(uint tag, out byte[] table)
+        {
+            table = null;
+            return false;
+        }
+
+        public bool TryGetGlyphMetrics(ushort glyph, out GlyphMetrics metrics)
+        {
+            metrics = new GlyphMetrics
+            {
+                Width = 10,
+                Height = 10
+            };
+
+            return true;
+        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index 2858a9f228..0f951ed867 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
+using Avalonia.Rendering;
 using Moq;
 
 namespace Avalonia.UnitTests
@@ -25,9 +26,33 @@ namespace Avalonia.UnitTests
             return Mock.Of<IGeometryImpl>(x => x.Bounds == rect);
         }
 
+        class MockRenderTarget : IRenderTarget
+        {
+            public void Dispose()
+            {
+                
+            }
+
+            public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+            {
+                var m = new Mock<IDrawingContextImpl>();
+                m.Setup(c => c.CreateLayer(It.IsAny<Size>()))
+                    .Returns(() =>
+                        {
+                            var r = new Mock<IDrawingContextLayerImpl>();
+                            r.Setup(r => r.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()))
+                                .Returns(CreateDrawingContext(null));
+                            return r.Object;
+                        }
+                    );
+                return m.Object;
+
+            }
+        }
+        
         public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
         {
-            return Mock.Of<IRenderTarget>();
+            return new MockRenderTarget();
         }
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
@@ -117,11 +142,31 @@ namespace Avalonia.UnitTests
             throw new NotImplementedException();
         }
 
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
         {
             return Mock.Of<IGlyphRunImpl>();
         }
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
+        {
+            return Mock.Of<IGeometryImpl>();
+        }
+
+        public IGlyphRunBuffer AllocateGlyphRun(IGlyphTypeface glyphTypeface, float fontRenderingEmSize, int length)
+        {
+            return Mock.Of<IGlyphRunBuffer>();
+        }
+
+        public IHorizontalGlyphRunBuffer AllocateHorizontalGlyphRun(IGlyphTypeface glyphTypeface, float fontRenderingEmSize, int length)
+        {
+            return Mock.Of<IHorizontalGlyphRunBuffer>();
+        }
+
+        public IPositionedGlyphRunBuffer AllocatePositionedGlyphRun(IGlyphTypeface glyphTypeface, float fontRenderingEmSize, int length)
+        {
+            return Mock.Of<IPositionedGlyphRunBuffer>();
+        }
+
         public bool SupportsIndividualRoundRects { get; set; }
 
         public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
diff --git a/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs b/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs
index 864e2efbaf..9d039a386e 100644
--- a/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs
+++ b/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs
@@ -148,7 +148,7 @@ namespace Avalonia.UnitTests
 
             public bool FillContains(Point point)
             {
-                // Use the algorithm from http://www.blackpawn.com/texts/pointinpoly/default.html
+                // Use the algorithm from https://www.blackpawn.com/texts/pointinpoly/default.html
                 // to determine if the point is in the geometry (since it will always be convex in this situation)
                 for (int i = 0; i < points.Count; i++)
                 {
diff --git a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
index 3018c07819..7c34bd192e 100644
--- a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-using Avalonia.Media;
-using Avalonia.Media.TextFormatting;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -9,9 +7,12 @@ namespace Avalonia.UnitTests
 {
     public class MockTextShaperImpl : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+
             var shapedBuffer = new ShapedBuffer(text, text.Length, typeface, fontRenderingEmSize, bidiLevel);
 
             for (var i = 0; i < shapedBuffer.Length;)
@@ -21,7 +22,7 @@ namespace Avalonia.UnitTests
 
                 var glyphIndex = typeface.GetGlyph(codepoint);
 
-                shapedBuffer[i] = new GlyphInfo(glyphIndex, glyphCluster);
+                shapedBuffer[i] = new GlyphInfo(glyphIndex, glyphCluster, 10);
 
                 i += count;
             }
diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
index 317a1c50d6..e30f0fa5f3 100644
--- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
+++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
@@ -21,11 +21,11 @@ namespace Avalonia.UnitTests
             _popupImpl = popupImpl;
         }
 
-        public static Mock<IWindowImpl> CreateWindowMock()
+        public static Mock<IWindowImpl> CreateWindowMock(double initialWidth = 800, double initialHeight = 600)
         {
             var windowImpl = new Mock<IWindowImpl>();
             var position = new PixelPoint();
-            var clientSize = new Size(800, 600);
+            var clientSize = new Size(initialWidth,  initialHeight);
 
             windowImpl.SetupAllProperties();
             windowImpl.Setup(x => x.ClientSize).Returns(() => clientSize);
@@ -34,7 +34,6 @@ namespace Avalonia.UnitTests
             windowImpl.Setup(x => x.RenderScaling).Returns(1);
             windowImpl.Setup(x => x.Screen).Returns(CreateScreenMock().Object);
             windowImpl.Setup(x => x.Position).Returns(() => position);
-            SetupToplevel(windowImpl);
 
             windowImpl.Setup(x => x.CreatePopup()).Returns(() =>
             {
@@ -55,12 +54,18 @@ namespace Avalonia.UnitTests
             windowImpl.Setup(x => x.Resize(It.IsAny<Size>(), It.IsAny<PlatformResizeReason>()))
                 .Callback<Size, PlatformResizeReason>((x, y) =>
             {
-                clientSize = x.Constrain(s_screenSize);
-                windowImpl.Object.Resized?.Invoke(clientSize, y);
+                var constrainedSize = x.Constrain(s_screenSize);
+                
+                if (constrainedSize != clientSize)
+                {
+                    clientSize = constrainedSize;
+                    windowImpl.Object.Resized?.Invoke(clientSize, y);
+                }
             });
 
             windowImpl.Setup(x => x.Show(true, It.IsAny<bool>())).Callback(() =>
             {
+                windowImpl.Object.Resized?.Invoke(windowImpl.Object.ClientSize, PlatformResizeReason.Unspecified);
                 windowImpl.Object.Activated?.Invoke();
             });
 
@@ -89,8 +94,11 @@ namespace Avalonia.UnitTests
             popupImpl.Setup(x => x.MaxAutoSizeHint).Returns(s_screenSize);
             popupImpl.Setup(x => x.RenderScaling).Returns(1);
             popupImpl.Setup(x => x.PopupPositioner).Returns(positioner);
-            
-            SetupToplevel(popupImpl);
+
+            popupImpl.Setup(x => x.Dispose()).Callback(() =>
+            {
+                popupImpl.Object.Closed?.Invoke();
+            });
             
             return popupImpl;
         }
@@ -133,10 +141,5 @@ namespace Avalonia.UnitTests
         {
             return null;
         }
-
-        private static void SetupToplevel<T>(Mock<T> mock) where T : class, ITopLevelImpl
-        {
-            mock.SetupGet(x => x.MouseDevice).Returns(new MouseDevice());
-        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/MouseTestHelper.cs b/tests/Avalonia.UnitTests/MouseTestHelper.cs
index 6c2d6d4b62..06d53e9ff9 100644
--- a/tests/Avalonia.UnitTests/MouseTestHelper.cs
+++ b/tests/Avalonia.UnitTests/MouseTestHelper.cs
@@ -107,13 +107,13 @@ namespace Avalonia.UnitTests
         
         public void Enter(IInteractive target)
         {
-            target.RaiseEvent(new PointerEventArgs(InputElement.PointerEnterEvent, target, _pointer, (IVisual)target, default,
+            target.RaiseEvent(new PointerEventArgs(InputElement.PointerEnteredEvent, target, _pointer, (IVisual)target, default,
                 Timestamp(), new PointerPointProperties((RawInputModifiers)_pressedButtons, PointerUpdateKind.Other), KeyModifiers.None));
         }
 
         public void Leave(IInteractive target)
         {
-            target.RaiseEvent(new PointerEventArgs(InputElement.PointerLeaveEvent, target, _pointer, (IVisual)target, default,
+            target.RaiseEvent(new PointerEventArgs(InputElement.PointerExitedEvent, target, _pointer, (IVisual)target, default,
                 Timestamp(), new PointerPointProperties((RawInputModifiers)_pressedButtons, PointerUpdateKind.Other), KeyModifiers.None));
         }
 
diff --git a/tests/Avalonia.UnitTests/TestLogSink.cs b/tests/Avalonia.UnitTests/TestLogSink.cs
index e10292a59b..8b8084ca17 100644
--- a/tests/Avalonia.UnitTests/TestLogSink.cs
+++ b/tests/Avalonia.UnitTests/TestLogSink.cs
@@ -37,23 +37,6 @@ namespace Avalonia.UnitTests
             _callback(level, area, source, messageTemplate);
         }
 
-        public void Log<T0>(LogEventLevel level, string area, object source, string messageTemplate, T0 propertyValue0)
-        {
-            _callback(level, area, source, messageTemplate, propertyValue0);
-        }
-
-        public void Log<T0, T1>(LogEventLevel level, string area, object source, string messageTemplate,
-            T0 propertyValue0, T1 propertyValue1)
-        {
-            _callback(level, area, source, messageTemplate, propertyValue0, propertyValue1);
-        }
-
-        public void Log<T0, T1, T2>(LogEventLevel level, string area, object source, string messageTemplate,
-            T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
-        {
-            _callback(level, area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
-        }
-
         public void Log(LogEventLevel level, string area, object source, string messageTemplate,
             params object[] propertyValues)
         {
diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index 4601dd7e5b..138958512f 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -41,7 +41,7 @@ namespace Avalonia.UnitTests
             Child = child;
         }
 
-        public Size ClientSize { get; set; } = new Size(100, 100);
+        public Size ClientSize { get; set; } = new Size(1000, 1000);
 
         public Size MaxClientSize { get; set; } = Size.Infinity;
 
@@ -58,9 +58,7 @@ namespace Avalonia.UnitTests
         public IKeyboardNavigationHandler KeyboardNavigationHandler => null;
 
         public IInputElement PointerOverElement { get; set; }
-
-        public IMouseDevice MouseDevice { get; set; }
-
+        
         public bool ShowAccessKeys { get; set; }
 
         public IStyleHost StylingParent { get; set; }
@@ -110,5 +108,10 @@ namespace Avalonia.UnitTests
             }
             Visit(this, true);
         }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            return base.MeasureOverride(ClientSize);
+        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index 2c4ae06fb2..49da2794c1 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -5,9 +5,8 @@ using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.PlatformSupport;
 using Avalonia.Styling;
-using Avalonia.Themes.Default;
+using Avalonia.Themes.Simple;
 using Avalonia.Rendering;
 using System.Reactive.Concurrency;
 using System.Collections.Generic;
@@ -25,7 +24,7 @@ namespace Avalonia.UnitTests
             renderInterface: new MockPlatformRenderInterface(),
             standardCursorFactory: Mock.Of<ICursorFactory>(),
             styler: new Styler(),
-            theme: () => CreateDefaultTheme(),
+            theme: () => CreateSimpleTheme(),
             threadingInterface: Mock.Of<IPlatformThreadingInterface>(x => x.CurrentThreadIsLoopThread == true),
             fontManagerImpl: new MockFontManagerImpl(),
             textShaperImpl: new MockTextShaperImpl(),
@@ -53,7 +52,11 @@ namespace Avalonia.UnitTests
             focusManager: new FocusManager(),
             keyboardDevice: () => new KeyboardDevice(),
             keyboardNavigation: new KeyboardNavigationHandler(),
-            inputManager: new InputManager());
+            inputManager: new InputManager(),
+            assetLoader: new AssetLoader(),
+            renderInterface: new MockPlatformRenderInterface(),
+            fontManagerImpl: new MockFontManagerImpl(),
+            textShaperImpl: new MockTextShaperImpl());
 
         public static readonly TestServices RealStyler = new TestServices(
             styler: new Styler());
@@ -78,7 +81,7 @@ namespace Avalonia.UnitTests
             IScheduler scheduler = null,
             ICursorFactory standardCursorFactory = null,
             IStyler styler = null,
-            Func<Styles> theme = null,
+            Func<IStyle> theme = null,
             IPlatformThreadingInterface threadingInterface = null,
             IFontManagerImpl fontManagerImpl = null,
             ITextShaperImpl textShaperImpl = null,
@@ -119,7 +122,7 @@ namespace Avalonia.UnitTests
         public IScheduler Scheduler { get; }
         public ICursorFactory StandardCursorFactory { get; }
         public IStyler Styler { get; }
-        public Func<Styles> Theme { get; }
+        public Func<IStyle> Theme { get; }
         public IPlatformThreadingInterface ThreadingInterface { get; }
         public IWindowImpl WindowImpl { get; }
         public IWindowingPlatform WindowingPlatform { get; }
@@ -166,18 +169,9 @@ namespace Avalonia.UnitTests
                 windowImpl: windowImpl ?? WindowImpl);
         }
 
-        private static Styles CreateDefaultTheme()
+        private static IStyle CreateSimpleTheme()
         {
-            var result = new Styles
-            {
-                new DefaultTheme(),
-            };
-
-            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"));
-            result.Add(baseLight);
-
-            return result;
+            return new SimpleTheme { Mode = SimpleThemeMode.Light };
         }
 
         private static IPlatformRenderInterface CreateRenderInterfaceMock()
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index bb6e53d74f..260771c9ab 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -10,7 +10,6 @@ using System.Reactive.Disposables;
 using System.Reactive.Concurrency;
 using Avalonia.Input.Platform;
 using Avalonia.Animation;
-using Avalonia.PlatformSupport;
 
 namespace Avalonia.UnitTests
 {
@@ -72,12 +71,16 @@ namespace Avalonia.UnitTests
                 .Bind<IStyler>().ToConstant(Services.Styler)
                 .Bind<IWindowingPlatform>().ToConstant(Services.WindowingPlatform)
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
-            var styles = Services.Theme?.Invoke();
+            var theme = Services.Theme?.Invoke();
 
-            if (styles != null)
+            if (theme is Styles styles)
             {
                 Styles.AddRange(styles);
             }
+            else if (theme is not null)
+            {
+                Styles.Add(theme);
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
deleted file mode 100644
index 57de90114e..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
-  </ItemGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <EmbeddedResource Remove="..\Avalonia.RenderTests\Assets\NotoColorEmoji.ttf" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="Media\TextFormatting\BreakPairTable.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Media\TextFormatting\BreakPairTable.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
deleted file mode 100644
index 21633b1cec..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class CornerRadiusTests
-    {
-        [Fact]
-        public void Parse_Parses_Single_Uniform_Radius()
-        {
-            var result = CornerRadius.Parse("3.4");
-
-            Assert.Equal(new CornerRadius(3.4), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_Top_Bottom()
-        {
-            var result = CornerRadius.Parse("1.1,2.2");
-
-            Assert.Equal(new CornerRadius(1.1, 2.2), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_TopLeft_TopRight_BottomRight_BottomLeft()
-        {
-            var result = CornerRadius.Parse("1.1,2.2,3.3,4.4");
-
-            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
-        }
-
-        [Fact]
-        public void Parse_Accepts_Spaces()
-        {
-            var result = CornerRadius.Parse("1.1 2.2 3.3 4.4");
-
-            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs
deleted file mode 100644
index e3b703baf2..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class BoxShadowTests
-    {
-        [Fact]
-        public void BoxShadow_Should_Parse()
-        {
-            foreach (var extraSpaces in new[] { false, true })
-            foreach (var inset in new[] { false, true })
-                for (var componentCount = 2; componentCount < 5; componentCount++)
-                {
-                    var s = (inset ? "inset " : "") + "10 20";
-                    double blur = 0;
-                    double spread = 0;
-                    if (componentCount > 2)
-                    {
-                        s += " 30";
-                        blur = 30;
-                    }
-
-                    if (componentCount > 3)
-                    {
-                        s += " 40";
-                        spread = 40;
-                    }
-
-                    s += " red";
-
-                    if (extraSpaces)
-                        s = " " + s.Replace(" ", "  ") + "   ";
-
-                    var parsed = BoxShadow.Parse(s);
-                    Assert.Equal(inset, parsed.IsInset);
-                    Assert.Equal(10, parsed.OffsetX);
-                    Assert.Equal(20, parsed.OffsetY);
-                    Assert.Equal(blur, parsed.Blur);
-                    Assert.Equal(spread, parsed.Spread);
-                    Assert.Equal(Colors.Red, parsed.Color);
-                }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs
deleted file mode 100644
index 1a2f7732dd..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class BrushTests
-    {
-        [Fact]
-        public void Parse_Parses_RGB_Hash_Brush()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("#ff8844");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x88, result.Color.G);
-            Assert.Equal(0x44, result.Color.B);
-            Assert.Equal(0xff, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_ARGB_Hash_Brush()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("#40ff8844");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x88, result.Color.G);
-            Assert.Equal(0x44, result.Color.B);
-            Assert.Equal(0x40, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Brush_Lowercase()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("red");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x00, result.Color.G);
-            Assert.Equal(0x00, result.Color.B);
-            Assert.Equal(0xff, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Brush_Uppercase()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("RED");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x00, result.Color.G);
-            Assert.Equal(0x00, result.Color.B);
-            Assert.Equal(0xff, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_ToString_Named_Brush_Roundtrip()
-        {
-            const string expectedName = "Red";
-            var brush = (ISolidColorBrush)Brush.Parse(expectedName);
-            var name = brush.ToString();
-
-            Assert.Equal(expectedName, name);
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
-        {
-            Assert.Throws<FormatException>(() => Brush.Parse("#ff"));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
-        {
-            Assert.Throws<FormatException>(() => Brush.Parse("#ff5555555"));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
-        {
-            Assert.Throws<FormatException>(() => Brush.Parse("#ff808g80"));
-        }
-
-        [Fact]
-        public void Changing_Opacity_Raises_Invalidated()
-        {
-            var target = new SolidColorBrush();
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Opacity = 0.5;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs
deleted file mode 100644
index d68c2fd5fd..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class ColorTests
-    {
-        [Fact]
-        public void Parse_Parses_RGB_Hash_Color()
-        {
-            var result = Color.Parse("#ff8844");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_RGB_Hash_Color()
-        {
-            var success = Color.TryParse("#ff8844", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_RGB_Hash_Shorthand_Color()
-        {
-            var result = Color.Parse("#f84");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_RGB_Hash_Shorthand_Color()
-        {
-            var success = Color.TryParse("#f84", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_ARGB_Hash_Color()
-        {
-            var result = Color.Parse("#40ff8844");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x40, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_ARGB_Hash_Color()
-        {
-            var success = Color.TryParse("#40ff8844", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x40, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_ARGB_Hash_Shorthand_Color()
-        {
-            var result = Color.Parse("#4f84");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x44, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_ARGB_Hash_Shorthand_Color()
-        {
-            var success = Color.TryParse("#4f84", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x44, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Color_Lowercase()
-        {
-            var result = Color.Parse("red");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void TryParse_Parses_Named_Color_Lowercase()
-        {
-            var success = Color.TryParse("red", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Color_Uppercase()
-        {
-            var result = Color.Parse("RED");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void TryParse_Parses_Named_Color_Uppercase()
-        {
-            var success = Color.TryParse("RED", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse("#ff"));
-        }
-
-        [Fact]
-        public void TryParse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
-        {
-            Assert.False(Color.TryParse("#ff", out _));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse("#ff5555555"));
-        }
-
-        [Fact]
-        public void TryParse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
-        {
-            Assert.False(Color.TryParse("#ff5555555", out _));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse("#ff808g80"));
-        }
-
-        [Fact]
-        public void TryParse_Hex_Value_Doesnt_Accept_Invalid_Number()
-        {
-            Assert.False(Color.TryParse("#ff808g80", out _));
-        }
-
-        [Fact]
-        public void Parse_Throws_ArgumentNullException_For_Null_Input()
-        {
-            Assert.Throws<ArgumentNullException>(() => Color.Parse((string)null));
-        }
-
-        [Fact]
-        public void Parse_Throws_FormatException_For_Invalid_Input()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse(string.Empty));
-        }
-
-        [Theory]
-        [InlineData("")]
-        [InlineData(null)]
-        public void TryParse_Returns_False_For_Invalid_Input(string input)
-        {
-            Assert.False(Color.TryParse(input, out _));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs
deleted file mode 100644
index 8ed5e408fa..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Media.Fonts;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class FontFamilyTests
-    {
-        [Fact]
-        public void Should_Implicitly_Convert_String_To_FontFamily()
-        {
-            FontFamily fontFamily = "Arial";
-
-            Assert.Equal(new FontFamily("Arial"), fontFamily);
-        }
-
-        [InlineData("Font A")]
-        [InlineData("Font A, Font B")]
-        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        [Theory]
-        public void Should_Have_Equal_Hash(string s)
-        {
-            var fontFamily = new FontFamily(s);
-
-            Assert.Equal(new FontFamily(s).GetHashCode(), fontFamily.GetHashCode());
-        }
-
-        [InlineData("Font A, Font B", "Font B, Font A")]
-        [InlineData("Font A, Font B", "Font A, Font C")]
-        [Theory]
-        public void Should_Not_Have_Equal_Hash(string a, string b)
-        {
-            var fontFamily = new FontFamily(b);
-
-            Assert.NotEqual(new FontFamily(a).GetHashCode(), fontFamily.GetHashCode());
-        }
-
-        [InlineData("Font A")]
-        [InlineData("Font A, Font B")]
-        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        [Theory]
-        public void Should_Be_Equal(string s)
-        {
-            var fontFamily = new FontFamily(s);
-
-            Assert.Equal(new FontFamily(s), fontFamily);
-        }
-
-        [InlineData("Font A, Font B", "Font B, Font A")]
-        [InlineData("Font A, Font B", "Font A, Font C")]
-        [Theory]
-        public void Should_Not_Be_Equal(string a, string b)
-        {
-            var fontFamily = new FontFamily(b);
-
-            Assert.NotEqual(new FontFamily(a), fontFamily);
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_SystemFont_Name()
-        {
-            var fontFamily = FontFamily.Parse("Courier New");
-
-            Assert.Equal("Courier New", fontFamily.Name);
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_Fallbacks()
-        {
-            var fontFamily = FontFamily.Parse("Courier New, Times New Roman");
-
-            Assert.Equal("Courier New", fontFamily.Name);
-
-            Assert.Equal(2, fontFamily.FamilyNames.Count());
-
-            Assert.Equal("Times New Roman", fontFamily.FamilyNames.Last());
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_Resource_Folder()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
-
-            var key = new FontFamilyKey(source);
-
-            var fontFamily = FontFamily.Parse(source.OriginalString);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.Equal(key, fontFamily.Key);
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_Resource_Filename()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
-
-            var key = new FontFamilyKey(source);
-
-            var fontFamily = FontFamily.Parse(source.OriginalString);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.Equal(key, fontFamily.Key);
-        }
-
-        [Theory]
-        [InlineData("resm:Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        public void Should_Create_FontFamily_From_Uri(string name)
-        {
-            var fontFamily = new FontFamily(name);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.NotNull(fontFamily.Key);
-        }
-
-        [Theory]
-        [InlineData("resm:Avalonia.Visuals.UnitTests.Assets.Fonts", "#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts", "#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests", "/Assets/Fonts#MyFont")]
-        public void Should_Create_FontFamily_From_Uri_With_Base_Uri(string @base, string name)
-        {
-            var baseUri = new Uri(@base);
-
-            var fontFamily = new FontFamily(baseUri, name);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.NotNull(fontFamily.Key);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs
deleted file mode 100644
index a48639a426..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class FontManagerTests
-    {
-        [Fact]
-        public void Should_Create_Single_Instance_Typeface()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var fontFamily = new FontFamily("MyFont");
-
-                var typeface = new Typeface(fontFamily);
-
-                var glyphTypeface = FontManager.Current.GetOrAddGlyphTypeface(typeface);
-
-                Assert.Same(glyphTypeface, FontManager.Current.GetOrAddGlyphTypeface(typeface));
-            }
-        }
-
-        [Fact]
-        public void Should_Throw_When_Default_FamilyName_Is_Null()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface.With(fontManagerImpl: new MockFontManagerImpl(null))))
-            {
-                Assert.Throws<InvalidOperationException>(() => FontManager.Current);
-            }
-        }
-
-        [Fact]
-        public void Should_Use_FontManagerOptions_DefaultFamilyName()
-        {
-            var options = new FontManagerOptions { DefaultFamilyName = "MyFont" };
-
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
-                .With(fontManagerImpl: new MockFontManagerImpl())))
-            {
-                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
-
-                Assert.Equal("MyFont", FontManager.Current.DefaultFontFamilyName);
-            }
-        }
-
-        [Fact]
-        public void Should_Use_FontManagerOptions_FontFallback()
-        {
-            var options = new FontManagerOptions
-            {
-                FontFallbacks = new[]
-                {
-                    new FontFallback
-                    {
-                        FontFamily = new FontFamily("MyFont"), UnicodeRange = UnicodeRange.Default
-                    }
-                }
-            };
-
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
-                .With(fontManagerImpl: new MockFontManagerImpl())))
-            {
-                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
-
-                FontManager.Current.TryMatchCharacter(1, FontStyle.Normal, FontWeight.Normal, FontFamily.Default, null, out var typeface);
-
-                Assert.Equal("MyFont", typeface.FontFamily.Name);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
deleted file mode 100644
index f2fcd51629..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using Avalonia.Media.Fonts;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.Fonts
-{
-    public class FamilyNameCollectionTests
-    {
-        [Fact]
-        public void Exception_Should_Be_Thrown_If_Names_Is_Null()
-        {
-            Assert.Throws<ArgumentNullException>(() => new FamilyNameCollection(null));
-        }
-
-        [Fact]
-        public void Should_Be_Equal()
-        {
-            var familyNames = new FamilyNameCollection("Arial, Times New Roman");
-
-            Assert.Equal(new FamilyNameCollection("Arial, Times New Roman"), familyNames);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
deleted file mode 100644
index d99301ea6c..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Avalonia.Media.Fonts;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.Fonts
-{
-    public class FontFamilyKeyTests
-    {
-        [Fact]
-        public void Exception_Should_Be_Thrown_If_Source_Is_Null()
-        {
-            Assert.Throws<ArgumentNullException>(() => new FontFamilyKey(null));
-        }
-
-        [Fact]
-        public void Should_Initialize_With_Location()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
-
-            var fontFamilyKey = new FontFamilyKey(source);
-
-            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests"), fontFamilyKey.Source);
-        }
-
-        [Fact]
-        public void Should_Initialize_With_Location_And_Filename()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
-
-            var fontFamilyKey = new FontFamilyKey(source);
-
-            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf"), fontFamilyKey.Source);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
deleted file mode 100644
index a83c0562e7..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Media.Fonts;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.Fonts
-{
-    using System.Diagnostics;
-
-    public class FontFamilyLoaderTests : IDisposable
-    {
-        private const string FontName = "#MyFont";
-        private const string Assembly = "?assembly=Avalonia.Visuals.UnitTests";
-        private const string AssetLocation = "resm:Avalonia.Visuals.UnitTests.Assets";
-
-        private readonly IDisposable _testApplication;
-
-        public FontFamilyLoaderTests()
-        {
-            const string AssetMyFontRegular = AssetLocation + ".MyFont-Regular.ttf" + Assembly + FontName;
-            const string AssetMyFontBold = AssetLocation + ".MyFont-Bold.ttf" + Assembly + FontName;
-            const string AssetYourFont = AssetLocation + ".YourFont.ttf" + Assembly + FontName;
-
-            var fontAssets = new[]
-                                    {
-                                        (AssetMyFontRegular, "AssetData"),
-                                        (AssetMyFontBold, "AssetData"),
-                                        (AssetYourFont, "AssetData")
-                                    };
-
-            _testApplication = StartWithResources(fontAssets);
-        }
-
-        public void Dispose()
-        {
-            _testApplication.Dispose();
-        }
-
-        [Fact]
-        public void Should_Load_Single_FontAsset()
-        {
-            const string FontAsset = AssetLocation + ".MyFont-Regular.ttf" + Assembly + FontName;
-
-            var source = new Uri(FontAsset, UriKind.RelativeOrAbsolute);
-
-            var key = new FontFamilyKey(source);
-
-            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
-
-            Assert.Single(fontAssets);
-        }
-
-        [Fact]
-        public void Should_Load_Matching_Assets()
-        {
-            var source = new Uri(AssetLocation + ".MyFont-*.ttf" + Assembly + FontName, UriKind.RelativeOrAbsolute);
-
-            var key = new FontFamilyKey(source);
-
-            var fontAssets = FontFamilyLoader.LoadFontAssets(key).ToArray();
-
-            foreach (var fontAsset in fontAssets)
-            {
-                Debug.WriteLine(fontAsset);
-            }
-
-            Assert.Equal(2, fontAssets.Length);
-        }
-
-        [Fact]
-        public void Should_Load_Embedded_Font()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
-
-                var fontFamily = new FontFamily("resm:Avalonia.Visuals.UnitTests.Assets?assembly=Avalonia.Visuals.UnitTests#Noto Mono");
-
-                var fontAssets = FontFamilyLoader.LoadFontAssets(fontFamily.Key).ToArray();
-
-                Assert.NotEmpty(fontAssets);
-
-                foreach (var fontAsset in fontAssets)
-                {
-                    var stream = assetLoader.Open(fontAsset);
-
-                    Assert.NotNull(stream);
-                }
-            }
-        }
-
-        private static IDisposable StartWithResources(params (string, string)[] assets)
-        {
-            var assetLoader = new MockAssetLoader(assets);
-            var services = new TestServices(assetLoader: assetLoader, platform: new AppBuilder().RuntimePlatform);
-            return UnitTestApplication.Start(services);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryGroupTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GeometryGroupTests.cs
deleted file mode 100644
index 8f80238903..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/GeometryGroupTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class GeometryGroupTests
-    {
-        [Fact]
-        public void Children_Should_Have_Initial_Collection()
-        {
-            var target = new GeometryGroup();
-
-            Assert.NotNull(target.Children);
-        }
-
-        [Fact]
-        public void Children_Can_Be_Set_To_Null()
-        {
-            var target = new GeometryGroup();
-
-            target.Children = null;
-
-            Assert.Null(target.Children);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
deleted file mode 100644
index 7b1ed7f977..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class GeometryTests
-    {
-        [Fact]
-        public void Changing_AffectsGeometry_Property_Causes_PlatformImpl_To_Be_Updated()
-        {
-            var target = new TestGeometry();
-            var platformImpl = target.PlatformImpl;
-
-            target.Foo = true;
-
-            Assert.NotSame(platformImpl, target.PlatformImpl);
-        }
-
-        [Fact]
-        public void Changing_AffectsGeometry_Property_Causes_Changed_To_Be_Raised()
-        {
-            var target = new TestGeometry();
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            target.Foo = true;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Setting_Transform_Causes_Changed_To_Be_Raised()
-        {
-            var target = new TestGeometry();
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            target.Transform = new RotateTransform(45);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_Transform_Causes_Changed_To_Be_Raised()
-        {
-            var transform = new RotateTransform(45);
-            var target = new TestGeometry { Transform = transform };
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            transform.Angle = 90;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Removing_Transform_Causes_Changed_To_Be_Raised()
-        {
-            var transform = new RotateTransform(45);
-            var target = new TestGeometry { Transform = transform };
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            target.Transform = null;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Transform_Produces_Transformed_PlatformImpl()
-        {
-            var target = new TestGeometry();
-            var rotate = new RotateTransform(45);
-
-            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
-            target.Transform = rotate;
-            Assert.True(target.PlatformImpl is ITransformedGeometryImpl);
-            rotate.Angle = 0;
-            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
-        }
-
-        private class TestGeometry : Geometry
-        {
-            public static readonly StyledProperty<bool> FooProperty =
-                AvaloniaProperty.Register<TestGeometry, bool>(nameof(Foo));
-
-            static TestGeometry()
-            {
-                AffectsGeometry(FooProperty);
-            }
-
-            public bool Foo
-            {
-                get => GetValue(FooProperty);
-                set => SetValue(FooProperty, value);
-            }
-
-            public override Geometry Clone()
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override IGeometryImpl CreateDefiningGeometry()
-            {
-                return Mock.Of<IGeometryImpl>(
-                    x => x.WithTransform(It.IsAny<Matrix>()) == 
-                        Mock.Of<ITransformedGeometryImpl>(y =>
-                            y.SourceGeometry == x));
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs
deleted file mode 100644
index ba334fdb74..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class GlyphRunTests : TestWithServicesBase
-    {
-        public GlyphRunTests()
-        {
-            AvaloniaLocator.CurrentMutable
-                .Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0)]
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 3, 30)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 1, 0, 10)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 0, 20)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 1, 30)]
-        [Theory]
-        public void Should_Get_Distance_From_CharacterHit(double[] advances, int[] clusters, int start, int trailingLength, double expectedDistance)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters))
-            {
-                var characterHit = new CharacterHit(start, trailingLength);
-
-                var distance = glyphRun.GetDistanceFromCharacterHit(characterHit);
-
-                Assert.Equal(expectedDistance, distance);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 26.0, 0, 3, true)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 20.0, 1, 1, true)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 26.0, 2, 1, true)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 35.0, 2, 1, false)]
-        [Theory]
-        public void Should_Get_CharacterHit_FromDistance(double[] advances, int[] clusters, double distance, int start,
-            int trailingLengthExpected, bool isInsideExpected)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters))
-            {
-                var textBounds = glyphRun.GetCharacterHitFromDistance(distance, out var isInside);
-
-                Assert.Equal(start, textBounds.FirstCharacterIndex);
-
-                Assert.Equal(trailingLengthExpected, textBounds.TrailingLength);
-
-                Assert.Equal(isInsideExpected, isInside);
-            }
-        }
-
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, -1, 10, 1, 10)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, 15, 12, 1, 10)]
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 30.0)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 0, 1, 1, 1, 10.0)]
-        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 2, 1, 2, 20.0)]
-        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 1, 1, 2, 20.0)]
-        [InlineData(new double[] { 10, 0, 20, 10 }, new int[] { 3, 1, 1, 0 }, 1, 1, 1, 2, 20.0)]
-        [Theory]
-        public void Should_Find_Nearest_CharacterHit(double[] advances, int[] clusters, int bidiLevel,
-            int index, int expectedIndex, int expectedLength, double expectedWidth)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                var textBounds = glyphRun.FindNearestCharacterHit(index, out var width);
-
-                Assert.Equal(expectedIndex, textBounds.FirstCharacterIndex);
-
-                Assert.Equal(expectedLength, textBounds.TrailingLength);
-
-                Assert.Equal(expectedWidth, width, 2);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 0)]
-        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 1)]
-        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 0, 3, 1, 0)]
-        [InlineData(new double[] { 10, 0, 0, 30 }, new int[] { 3, 0, 0, 0 }, 3, 0, 3, 1, 1)]
-        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 1, 0, 4, 0, 0)]
-        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1, 0, 4, 0, 1)]
-        [Theory]
-        public void Should_Get_Next_CharacterHit(double[] advances,int[] clusters,
-            int firstCharacterIndex, int trailingLength,
-            int nextIndex, int nextLength,
-            int bidiLevel)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                var characterHit = glyphRun.GetNextCaretCharacterHit(new CharacterHit(firstCharacterIndex, trailingLength));
-
-                Assert.Equal(nextIndex, characterHit.FirstCharacterIndex);
-
-                Assert.Equal(nextLength, characterHit.TrailingLength);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 0)]
-        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 1)]
-        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 1, 3, 0, 0)]
-        [InlineData(new double[] { 0, 0, 30, 10 }, new int[] { 3, 0, 0, 0 }, 3, 1, 3, 0, 1)]
-        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 4, 1, 4, 0, 0)]
-        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 4, 1, 4, 0, 1)]
-        [Theory]
-        public void Should_Get_Previous_CharacterHit(double[] advances, int[] clusters,
-            int currentIndex, int currentLength,
-            int previousIndex, int previousLength,
-            int bidiLevel)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                var characterHit = glyphRun.GetPreviousCaretCharacterHit(new CharacterHit(currentIndex, currentLength));
-
-                Assert.Equal(previousIndex, characterHit.FirstCharacterIndex);
-
-                Assert.Equal(previousLength, characterHit.TrailingLength);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0)]
-        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 1)]
-        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 0, 0, 0, 3 }, 0)]
-        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 3, 0, 0, 0 }, 1)]
-        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 0, 1, 1, 1, 4 }, 0)]
-        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1)]
-        [Theory]
-        public void Should_Find_Glyph_Index(double[] advances, int[] clusters, int bidiLevel)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                if (glyphRun.IsLeftToRight)
-                {
-                    for (var i = 0; i < clusters.Length; i++)
-                    {
-                        var cluster = clusters[i];
-
-                        var found = glyphRun.FindGlyphIndex(cluster);
-
-                        var expected = i;
-
-                        while (expected - 1 >= 0 && clusters[expected - 1] == cluster)
-                        {
-                            expected--;
-                        }
-
-                        Assert.Equal(expected, found);
-                    }
-                }
-                else
-                {
-                    for (var i = clusters.Length - 1; i > 0; i--)
-                    {
-                        var cluster = clusters[i];
-
-                        var found = glyphRun.FindGlyphIndex(cluster);
-
-                        var expected = i;
-
-                        while (expected + 1 < clusters.Length && clusters[expected + 1] == cluster)
-                        {
-                            expected++;
-                        }
-
-                        Assert.Equal(expected, found);
-                    }
-                }
-            }
-        }
-
-        private static GlyphRun CreateGlyphRun(double[] glyphAdvances, int[] glyphClusters, int bidiLevel = 0)
-        {
-            var count = glyphAdvances.Length;
-            var glyphIndices = new ushort[count];
-
-            var start = bidiLevel == 0 ? glyphClusters[0] : glyphClusters[^1];
-
-            var characters = new ReadOnlySlice<char>(Enumerable.Repeat('a', count).ToArray(), start, count);
-
-            return new GlyphRun(new GlyphTypeface(new MockGlyphTypeface()), 10, characters, glyphIndices, glyphAdvances,
-                glyphClusters: glyphClusters, biDiLevel: bidiLevel);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs
deleted file mode 100644
index ff7b94105a..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class ImageBrushTests
-    {
-        [Fact]
-        public void Changing_Source_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new ImageBrush(bitmap1);
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Source = bitmap2;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs
deleted file mode 100644
index b3f78dfe8f..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class LinearGradientBrushTests
-    {
-        [Fact]
-        public void Changing_StartPoint_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.StartPoint = new RelativePoint();
-            target.Invalidated += (s, e) => raised = true;
-            target.StartPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_EndPoint_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.EndPoint = new RelativePoint();
-            target.Invalidated += (s, e) => raised = true;
-            target.EndPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_GradientStops_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
-            target.Invalidated += (s, e) => raised = true;
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Green, 0) };
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Adding_GradientStop_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
-            target.Invalidated += (s, e) => raised = true;
-            target.GradientStops.Add(new GradientStop(Colors.Green, 1));
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_GradientStop_Offset_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
-            target.Invalidated += (s, e) => raised = true;
-            target.GradientStops[0].Offset = 0.5;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
deleted file mode 100644
index 6ef48b6161..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class MatrixTests
-    {
-        [Fact]
-        public void Can_Parse()
-        {
-            var matrix = Matrix.Parse("1,2,3,-4,5 6");
-            var expected = new Matrix(1, 2, 3, -4, 5, 6);
-            Assert.Equal(expected, matrix);
-        }
-
-        [Fact]
-        public void Singular_Has_No_Inverse()
-        {
-            var matrix = new Matrix(0, 0, 0, 0, 0, 0);
-
-            Assert.False(matrix.HasInverse);
-        }
-
-        [Fact]
-        public void Identity_Has_Inverse()
-        {
-            var matrix = Matrix.Identity;
-
-            Assert.True(matrix.HasInverse);
-        }
-
-        [Fact]
-        public void Can_Decompose_Translation()
-        {
-            var matrix = Matrix.CreateTranslation(5, 10);
-
-            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
-
-            Assert.Equal(true, result);
-            Assert.Equal(5, decomposed.Translate.X);
-            Assert.Equal(10, decomposed.Translate.Y);
-        }
-
-        [Theory]
-        [InlineData(30d)]
-        [InlineData(0d)]
-        [InlineData(90d)]
-        [InlineData(270d)]
-        public void Can_Decompose_Angle(double angleDeg)
-        {
-            var angleRad = MathUtilities.Deg2Rad(angleDeg);
-
-            var matrix = Matrix.CreateRotation(angleRad);
-
-            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
-
-            Assert.Equal(true, result);
-
-            var expected = NormalizeAngle(angleRad);
-            var actual = NormalizeAngle(decomposed.Angle);
-
-            Assert.Equal(expected, actual, 4);
-        }
-
-        [Theory]
-        [InlineData(1d, 1d)]
-        [InlineData(-1d, 1d)]
-        [InlineData(1d, -1d)]
-        [InlineData(5d, 10d)]
-        public void Can_Decompose_Scale(double x, double y)
-        {
-            var matrix = Matrix.CreateScale(x, y);
-
-            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
-
-            Assert.Equal(true, result);
-            Assert.Equal(x, decomposed.Scale.X);
-            Assert.Equal(y, decomposed.Scale.Y);
-        }
-
-        private static double NormalizeAngle(double rad)
-        {
-            double twoPi = 2 * Math.PI;
-
-            while (rad < 0)
-            {
-                rad += twoPi;
-            }
-
-            while (rad > twoPi)
-            {
-                rad -= twoPi;
-            }
-
-            return rad;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
deleted file mode 100644
index ba8c490829..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-using Avalonia.Media;
-using Avalonia.Visuals.Platform;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    using System.Globalization;
-    using System.IO;
-    using Avalonia.Platform;
-    using Moq;
-
-    public class PathMarkupParserTests
-    {
-        [Fact]
-        public void Parses_Move()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M10 10");
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.Equal(new Point(10, 10), figure.StartPoint);
-            }
-        }
-
-        [Fact]
-        public void Parses_Line()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M0 0L10 10");
-
-                var figure = pathGeometry.Figures[0];
-
-                var segment = figure.Segments[0];
-
-                Assert.IsType<LineSegment>(segment);
-
-                var lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(10, 10), lineSegment.Point);
-            }
-        }
-
-        [Fact]
-        public void Parses_Close()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M0 0L10 10z");
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.True(figure.IsClosed);
-            }
-        }
-
-        [Fact]
-        public void Parses_FillMode_Before_Move()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("F 1M0,0");
-
-                Assert.Equal(FillRule.NonZero, pathGeometry.FillRule);
-            }
-        }
-
-        [Theory]
-        [InlineData("M0 0 10 10 20 20")]
-        [InlineData("M0,0 10,10 20,20")]
-        [InlineData("M0,0,10,10,20,20")]
-        public void Parses_Implicit_Line_Command_After_Move(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse(pathData);
-
-                var figure = pathGeometry.Figures[0];
-
-                var segment = figure.Segments[0];
-
-                Assert.IsType<LineSegment>(segment);
-
-                var lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(10, 10), lineSegment.Point);
-
-                segment = figure.Segments[1];
-
-                Assert.IsType<LineSegment>(segment);
-
-                lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(20, 20), lineSegment.Point);
-            }
-        }
-
-        [Theory]
-        [InlineData("m0 0 10 10 20 20")]
-        [InlineData("m0,0 10,10 20,20")]
-        [InlineData("m0,0,10,10,20,20")]
-        public void Parses_Implicit_Line_Command_After_Relative_Move(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse(pathData);
-
-                var figure = pathGeometry.Figures[0];
-
-                var segment = figure.Segments[0];
-
-                Assert.IsType<LineSegment>(segment);
-
-                var lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(10, 10), lineSegment.Point);
-
-                segment = figure.Segments[1];
-
-                Assert.IsType<LineSegment>(segment);
-
-                lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(30, 30), lineSegment.Point);
-            }
-        }
-
-        [Fact]
-        public void Parses_Scientific_Notation_Double()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M -1.01725E-005 -1.01725e-005");
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.Equal(
-                    new Point(
-                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture),
-                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture)),
-                    figure.StartPoint);
-            }
-        }
-
-        [Theory]
-        [InlineData("M5.5.5 5.5.5 5.5.5")]
-        [InlineData("F1M9.0771,11C9.1161,10.701,9.1801,10.352,9.3031,10L9.0001,10 9.0001,6.166 3.0001,9.767 3.0001,10 "
-                    + "9.99999999997669E-05,10 9.99999999997669E-05,0 3.0001,0 3.0001,0.234 9.0001,3.834 9.0001,0 "
-                    + "12.0001,0 12.0001,8.062C12.1861,8.043 12.3821,8.031 12.5941,8.031 15.3481,8.031 15.7961,9.826 "
-                    + "15.9201,11L16.0001,16 9.0001,16 9.0001,12.562 9.0001,11z")] // issue #1708
-        [InlineData("         M0 0")]
-        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z")] // issue #1107
-        [InlineData("M0 0L10 10z")]
-        [InlineData("M50 50 L100 100 L150 50")]
-        [InlineData("M50 50L100 100L150 50")]
-        [InlineData("M50,50 L100,100 L150,50")]
-        [InlineData("M50 50 L-10 -10 L10 50")]
-        [InlineData("M50 50L-10-10L10 50")]
-        [InlineData("M50 50 L100 100 L150 50zM50 50 L70 70 L120 50z")]
-        [InlineData("M 50 50 L 100 100 L 150 50")]
-        [InlineData("M50 50 L100 100 L150 50 H200 V100Z")]
-        [InlineData("M 80 200 A 100 50 45 1 0 100 50")]
-        [InlineData(
-            "F1 M 16.6309 18.6563C 17.1309 8.15625 29.8809 14.1563 29.8809 14.1563C 30.8809 11.1563 34.1308 11.4063" +
-            " 34.1308 11.4063C 33.5 12 34.6309 13.1563 34.6309 13.1563C 32.1309 13.1562 31.1309 14.9062 31.1309 14.9" +
-            "062C 41.1309 23.9062 32.6309 27.9063 32.6309 27.9062C 24.6309 24.9063 21.1309 22.1562 16.6309 18.6563 Z" +
-            " M 16.6309 19.9063C 21.6309 24.1563 25.1309 26.1562 31.6309 28.6562C 31.6309 28.6562 26.3809 39.1562 18" +
-            ".3809 36.1563C 18.3809 36.1563 18 38 16.3809 36.9063C 15 36 16.3809 34.9063 16.3809 34.9063C 16.3809 34" +
-            ".9063 10.1309 30.9062 16.6309 19.9063 Z ")]
-        [InlineData(
-            "F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 " +
-            "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 " +
-            "12.461,8.046C14.45,8.278,16,9.949,16,12")]
-        public void Should_Parse(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse(pathData);
-
-                Assert.True(true);
-            }
-        }
-
-        [Theory]
-        [InlineData("M0 0L10 10")]
-        [InlineData("M0 0L10 10z")]
-        [InlineData("M0 0L10 10 \n ")]
-        [InlineData("M0 0L10 10z \n ")]
-        [InlineData("M0 0L10 10 ")]
-        [InlineData("M0 0L10 10z ")]
-        public void Should_AlwaysEndFigure(string pathData)
-        {
-            var context = new Mock<IGeometryContext>();
-
-            using (var parser = new PathMarkupParser(context.Object))
-            {
-                parser.Parse(pathData);
-            }
-
-            context.Verify(v => v.EndFigure(It.IsAny<bool>()), Times.AtLeastOnce());
-        }
-
-        [Theory]
-        [InlineData("M 5.5, 5 L 5.5, 5 L 5.5, 5")]
-        [InlineData("F1 M 9.0771, 11 C 9.1161, 10.701 9.1801, 10.352 9.3031, 10 L 9.0001, 10 L 9.0001, 6.166 L 3.0001, 9.767 L 3.0001, 10 "
-            + "L 9.99999999997669E-05, 10 L 9.99999999997669E-05, 0 L 3.0001, 0 L 3.0001, 0.234 L 9.0001, 3.834 L 9.0001, 0 "
-            + "L 12.0001, 0 L 12.0001, 8.062 C 12.1861, 8.043 12.3821, 8.031 12.5941, 8.031 C 15.3481, 8.031 15.7961, 9.826 "
-            + "15.9201, 11 L 16.0001, 16 L 9.0001, 16 L 9.0001, 12.562 L 9.0001, 11Z")]
-        [InlineData("F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
-        [InlineData("M 0, 0 L 10, 10Z")]
-        [InlineData("M 50, 50 L 100, 100 L 150, 50")]
-        [InlineData("M 50, 50 L -10, -10 L 10, 50")]
-        [InlineData("M 50, 50 L 100, 100 L 150, 50Z M 50, 50 L 70, 70 L 120, 50Z")]
-        [InlineData("M 80, 200 A 100, 50 45 1 0 100, 50")]
-        [InlineData("F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
-            + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
-            + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
-        public void Parsed_Geometry_ToString_Should_Produce_Valid_Value(string pathData)
-        {
-            var target = PathGeometry.Parse(pathData);
-
-            string output = target.ToString();
-
-            Assert.Equal(pathData, output);
-        }
-
-        [Theory]
-        [InlineData("M5.5.5 5.5.5 5.5.5", "M 5.5, 0.5 L 5.5, 0.5 L 5.5, 0.5")]
-        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z", "F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
-        [InlineData("F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 "
-                    + "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 "
-                    + "12.461,8.046C14.45,8.278,16,9.949,16,12",
-                    "F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
-                    + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
-                    + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
-        public void Parsed_Geometry_ToString_Should_Format_Value(string pathData, string formattedPathData)
-        {
-            var target = PathGeometry.Parse(pathData);
-
-            string output = target.ToString();
-
-            Assert.Equal(formattedPathData, output);
-        }
-
-        [Theory]
-        [InlineData("0 0")]
-        [InlineData("j")]
-        public void Throws_InvalidDataException_On_None_Defined_Command(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                Assert.Throws<InvalidDataException>(() => parser.Parse(pathData));
-            }
-        }
-
-        [Fact]
-        public void CloseFigure_Should_Move_CurrentPoint_To_CreateFigurePoint()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M10,10L100,100Z m10,10");
-
-                Assert.Equal(2, pathGeometry.Figures.Count);
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.Equal(new Point(10, 10), figure.StartPoint);
-
-                Assert.Equal(true, figure.IsClosed);
-
-                Assert.Equal(new Point(100, 100), ((LineSegment)figure.Segments[0]).Point);
-
-                figure = pathGeometry.Figures[1];
-
-                Assert.Equal(new Point(20, 20), figure.StartPoint);
-            }
-        }
-
-        [Fact]
-        public void Should_Parse_Flags_Without_Separator()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("a.898.898 0 01.27.188");
-
-                var figure = pathGeometry.Figures[0];
-
-                var segments = figure.Segments;
-                
-                Assert.NotNull(segments);
-                
-                Assert.Equal(1, segments.Count);
-
-                var arcSegment = segments[0];
-
-                Assert.IsType<ArcSegment>(arcSegment);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs
deleted file mode 100644
index 0737b4dc88..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class PathSegmentTests
-    {
-        [Fact]
-        public void PathSegment_Triggers_Invalidation_On_Property_Change()
-        {
-            var targetSegment = new ArcSegment()
-            {
-                Size = new Size(10, 10),
-                Point = new Point(5, 5)
-            };
-
-            var target = new PathGeometry
-            {
-                Figures = new PathFigures
-                {
-                    new PathFigure { IsClosed = false, Segments = new PathSegments { targetSegment } }
-                }
-            };
-            
-            var changed = false;
-
-            target.Changed += (s, e) => changed = true;
-
-            targetSegment.Size = new Size(20, 20);
-
-            Assert.True(changed);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs
deleted file mode 100644
index 8c25019606..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class PenTests
-    {
-        [Fact]
-        public void Changing_Thickness_Raises_Invalidated()
-        {
-            var target = new Pen();
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Thickness = 18;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_Brush_Color_Raises_Invalidated()
-        {
-            var brush = new SolidColorBrush(Colors.Red);
-            var target = new Pen { Brush = brush };
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            brush.Color = Colors.Green;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_DashStyle_Dashes_Raises_Invalidated()
-        {
-            var dashes = new DashStyle();
-            var target = new Pen { DashStyle = dashes };
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            dashes.Dashes = new AvaloniaList<double> { 0.1, 0.2 };
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Adding_DashStyle_Dashes_Raises_Invalidated()
-        {
-            var dashes = new DashStyle();
-            var target = new Pen { DashStyle = dashes };
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            dashes.Dashes.Add(0.3);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Equality_Is_Implemented_Between_Immutable_And_Mutable_Pens()
-        {
-            var brush = new ImmutableSolidColorBrush(Colors.Red);
-            var target1 = new ImmutablePen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: (ImmutableDashStyle)DashStyle.Dash,
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-            var target2 = new Pen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: DashStyle.Dash,
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-
-            Assert.True(Equals(target1, target2));
-        }
-
-        [Fact]
-        public void Equality_Is_Implemented_Between_Mutable_And_Immutable_DashStyles()
-        {
-            var brush = new ImmutableSolidColorBrush(Colors.Red);
-            var target1 = new ImmutablePen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-            var target2 = new Pen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: new DashStyle(new[] { 0.1, 0.2 }, 5),
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-
-            Assert.True(Equals(target1, target2));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs
deleted file mode 100644
index c6da9b77e9..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class PixelRectTests
-    {
-        [Fact]
-        public void FromRect_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRect(rect, 1.5);
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-
-        [Fact]
-        public void FromRect_Vector_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRect(rect, new Vector(1.5, 1.5));
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-
-        [Fact]
-        public void FromRectWithDpi_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRectWithDpi(rect, 144);
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-
-        [Fact]
-        public void FromRectWithDpi_Vector_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRectWithDpi(rect, new Vector(144, 144));
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/RectTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/RectTests.cs
deleted file mode 100644
index cd0c7e1ace..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/RectTests.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class RectTests
-    {
-        [Fact]
-        public void Parse_Parses()
-        {
-            var rect = Rect.Parse("1,2 3,-4");
-            var expected = new Rect(1, 2, 3, -4);
-            Assert.Equal(expected, rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
deleted file mode 100644
index 5af1bb572e..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class RectangleGeometryTests
-    {
-        [Fact]
-        public void Rectangle_With_Transform_Can_Be_Changed()
-        {
-            using (UnitTestApplication.Start(GetServices()))
-            {
-                var target = new RectangleGeometry
-                {
-                    Rect = new Rect(0, 0, 100, 100),
-                    Transform = new RotateTransform(45),
-                };
-
-                target.Rect = new Rect(50, 50, 150, 150);
-            }
-        }
-
-        private TestServices GetServices()
-        {
-            var context = Mock.Of<IStreamGeometryContextImpl>();
-            var transformedGeometry = new Mock<ITransformedGeometryImpl>();
-            var streamGeometry = Mock.Of<IStreamGeometryImpl>(x => 
-                x.Open() == context &&
-                x.WithTransform(It.IsAny<Matrix>()) == transformedGeometry.Object);
-            var renderInterface = Mock.Of<IPlatformRenderInterface>(x =>
-                x.CreateStreamGeometry() == streamGeometry);
-            return new TestServices(renderInterface: renderInterface);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs
deleted file mode 100644
index bcf63f9660..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class SolidColorBrushTests
-    {
-        [Fact]
-        public void Changing_Color_Raises_Invalidated()
-        {
-            var target = new SolidColorBrush(Colors.Red);
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Color = Colors.Green;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs
deleted file mode 100644
index 60a41baaa7..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class TextDecorationTests
-    {
-        [Fact]
-        public void Should_Parse_TextDecorations()
-        {
-            var baseline = TextDecorationCollection.Parse("baseline");
-
-            Assert.Equal(TextDecorationLocation.Baseline, baseline[0].Location);
-
-            var underline = TextDecorationCollection.Parse("underline");
-
-            Assert.Equal(TextDecorationLocation.Underline, underline[0].Location);
-
-            var overline = TextDecorationCollection.Parse("overline");
-
-            Assert.Equal(TextDecorationLocation.Overline, overline[0].Location);
-
-            var strikethrough = TextDecorationCollection.Parse("strikethrough");
-
-            Assert.Equal(TextDecorationLocation.Strikethrough, strikethrough[0].Location);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
deleted file mode 100644
index f8a2abc716..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public class BiDiAlgorithmTests
-    {
-        private readonly ITestOutputHelper _outputHelper;
-
-        public BiDiAlgorithmTests(ITestOutputHelper outputHelper)
-        {
-            _outputHelper = outputHelper;
-        }
-        
-        [Fact(Skip = "Only run when the Unicode spec changes.")]
-        public void Should_Process()
-        {
-            var generator = new BiDiTestDataGenerator();
-            
-            foreach(var testData in generator)
-            {
-                Assert.True(Run(testData));
-            }
-        }
-        
-        private bool Run(BiDiTestData testData)
-        {
-            var bidi = BidiAlgorithm.Instance.Value;
-            
-            // Run the algorithm...
-            ArraySlice<sbyte> resultLevels;
-
-            bidi.Process(
-                testData.Classes,
-                ArraySlice<BidiPairedBracketType>.Empty,
-                ArraySlice<int>.Empty,
-                testData.ParagraphEmbeddingLevel,
-                false,
-                null,
-                null,
-                null);
-
-            resultLevels = bidi.ResolvedLevels;
-
-            // Check the results match
-            var pass = true;
-            
-            if (resultLevels.Length == testData.Levels.Length)
-            {
-                for (var i = 0; i < testData.Levels.Length; i++)
-                {
-                    if (testData.Levels[i] == -1)
-                    {
-                        continue;
-                    }
-
-                    if (resultLevels[i] != testData.Levels[i])
-                    {
-                        pass = false;
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                pass = false;
-            }
-
-            if (!pass)
-            {
-                _outputHelper.WriteLine($"Failed line {testData.LineNumber}");
-                _outputHelper.WriteLine($"        Data: {string.Join(" ", testData.Classes)}");
-                _outputHelper.WriteLine($" Embed Level: {testData.ParagraphEmbeddingLevel}");
-                _outputHelper.WriteLine($"    Expected: {string.Join(" ", testData.Levels)}");
-                _outputHelper.WriteLine($"      Actual: {string.Join(" ", resultLevels)}");
-
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
deleted file mode 100644
index 2f1064be21..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal class BiDiClassTestDataGenerator : IEnumerable<BiDiClassData>
-    {
-        private readonly List<BiDiClassData> _testData;
-
-        public BiDiClassTestDataGenerator()
-        {
-            _testData = ReadData();
-        }
-        
-        public IEnumerator<BiDiClassData> GetEnumerator()
-        {
-            return _testData.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-        
-        private static List<BiDiClassData> ReadData()
-        {
-            var testData = new List<BiDiClassData>();
-            
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiCharacterTest.txt");
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                        return testData;
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var lineNumber = 0;
-                        
-                        // Process each line
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            lineNumber++;
-                            
-                            if (line == null)
-                            {
-                                break;
-                            }
-
-                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-                            
-                            // Split into fields
-                            var fields = line.Split(';');
-
-                            // Parse field 0 - code points
-                            var codePoints = fields[0].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x, 16)).ToArray();
-
-                            // Parse field 1 - paragraph level
-                            var paragraphLevel = sbyte.Parse(fields[1]);
-
-                            // Parse field 2 - resolved paragraph level
-                            var resolvedParagraphLevel = sbyte.Parse(fields[2]);
-
-                            // Parse field 3 - resolved levels
-                            var resolvedLevels = fields[3].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => x == "x" ? (sbyte)-1 : Convert.ToSByte(x)).ToArray();
-
-                            // Parse field 4 - resolved levels
-                            var resolvedOrder = fields[4].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x)).ToArray();
-
-                            testData.Add(new BiDiClassData
-                            {
-                                LineNumber = lineNumber,
-                                CodePoints = codePoints,
-                                ParagraphLevel = paragraphLevel,
-                                ResolvedParagraphLevel = resolvedParagraphLevel,
-                                ResolvedLevels = resolvedLevels,
-                                ResolvedOrder = resolvedOrder
-                            });
-                        }
-                    }
-                }
-            }
-
-            return testData;
-        }
-        
-       
-    }
-    
-    internal struct BiDiClassData
-    {
-        public int LineNumber { get; set; }
-        public int[] CodePoints{ get; set; }
-        public sbyte ParagraphLevel{ get; set; }
-        public  sbyte ResolvedParagraphLevel{ get; set; }
-        public sbyte[] ResolvedLevels{ get; set; }
-        public int[] ResolvedOrder{ get; set; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTests.cs
deleted file mode 100644
index 1ed33e6132..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public class BiDiClassTests
-    {
-        private readonly ITestOutputHelper _outputHelper;
-
-        public BiDiClassTests(ITestOutputHelper outputHelper)
-        {
-            _outputHelper = outputHelper;
-        }
-    
-        [Fact(Skip = "Only run when the Unicode spec changes.")]
-        public void Should_Resolve()
-        {
-            var generator = new BiDiClassTestDataGenerator();
-
-            foreach (var testData in generator)
-            {
-                Assert.True(Run(testData));
-            }
-        }
-
-        private bool Run(BiDiClassData t)
-        {
-            var bidi = BidiAlgorithm.Instance.Value;
-            var bidiData = new BidiData(t.ParagraphLevel);
-        
-            var text = Encoding.UTF32.GetString(MemoryMarshal.Cast<int, byte>(t.CodePoints).ToArray());
-
-            // Append
-            bidiData.Append(text.AsMemory());
-
-            // Act
-            bidi.Process(bidiData);
-
-                var resultLevels = bidi.ResolvedLevels;
-            var resultParagraphLevel = bidi.ResolvedParagraphEmbeddingLevel;
-
-            // Assert
-            var passed = true;
-
-            if (t.ResolvedParagraphLevel != resultParagraphLevel)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < t.ResolvedLevels.Length; i++)
-            {
-                if (t.ResolvedLevels[i] == -1)
-                {
-                    continue;
-                }
-
-                if (t.ResolvedLevels[i] != resultLevels[i])
-                {
-                    passed = false;
-                    break;
-                }
-            }
-
-            if (passed)
-            {
-                return true;
-            }
-        
-            _outputHelper.WriteLine($"Failed line {t.LineNumber}");
-
-            _outputHelper.WriteLine(
-                $"             Code Points: {string.Join(" ", t.CodePoints.Select(x => x.ToString("X4")))}");
-
-            _outputHelper.WriteLine(
-                $"      Pair Bracket Types: {string.Join(" ", bidiData.PairedBracketTypes.Select(x => " " + x.ToString()))}");
-
-            _outputHelper.WriteLine(
-                $"     Pair Bracket Values: {string.Join(" ", bidiData.PairedBracketValues.Select(x => x.ToString("X4")))}");
-            _outputHelper.WriteLine($"             Embed Level: {t.ParagraphLevel}");
-            _outputHelper.WriteLine($"    Expected Embed Level: {t.ResolvedParagraphLevel}");
-            _outputHelper.WriteLine($"      Actual Embed Level: {resultParagraphLevel}");
-            _outputHelper.WriteLine($"          Directionality: {string.Join(" ", bidiData.Classes)}");
-            _outputHelper.WriteLine($"         Expected Levels: {string.Join(" ", t.ResolvedLevels)}");
-            _outputHelper.WriteLine($"           Actual Levels: {string.Join(" ", resultLevels)}");
-        
-            return false;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
deleted file mode 100644
index 4102de10ec..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using Avalonia.Media.TextFormatting.Unicode;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal class BiDiTestDataGenerator : IEnumerable<BiDiTestData>
-    {
-        private readonly List<BiDiTestData> _testData;
-
-        public BiDiTestDataGenerator()
-        {
-            _testData = ReadTestData();
-        }
-
-        public IEnumerator<BiDiTestData> GetEnumerator()
-        {
-            return _testData.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        private static List<BiDiTestData> ReadTestData()
-        {
-            var testData = new List<BiDiTestData>();
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiTest.txt");
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                        return testData;
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var lineNumber = 0;
-
-                        // Process each line
-                        int[] levels = null;
-
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            lineNumber++;
-
-                            if (line == null)
-                            {
-                                break;
-                            }
-
-                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            // Directive?
-                            if (line.StartsWith("@"))
-                            {
-                                if (line.StartsWith("@Levels:"))
-                                {
-                                    levels = line.Substring(8).Trim().Split(' ').Where(x => x.Length > 0).Select(x =>
-                                    {
-                                        if (x == "x")
-                                        {
-                                            return -1;
-                                        }
-
-                                        return int.Parse(x);
-
-                                    }).ToArray();
-                                }
-
-                                continue;
-                            }
-
-                            // Split data line
-                            var parts = line.Split(';');
-
-                            // Get the directions
-                            var directions = parts[0].Split(' ').Select(PropertyValueAliasHelper.GetBiDiClass)
-                                .ToArray();
-
-                            // Get the bit set
-                            var bitset = Convert.ToInt32(parts[1].Trim(), 16);
-
-                            for (var bit = 1; bit < 8; bit <<= 1)
-                            {
-                                if ((bitset & bit) == 0)
-                                {
-                                    continue;
-                                }
-
-                                sbyte paragraphEmbeddingLevel;
-
-                                switch (bit)
-                                {
-                                    case 1:
-                                        paragraphEmbeddingLevel = 2; // Auto
-                                        break;
-
-                                    case 2:
-                                        paragraphEmbeddingLevel = 0; // LTR
-                                        break;
-
-                                    case 4:
-                                        paragraphEmbeddingLevel = 1; // RTL
-                                        break;
-
-                                    default:
-                                        throw new NotSupportedException();
-                                }
-
-                                testData.Add(new BiDiTestData
-                                {
-                                    LineNumber = lineNumber,
-                                    Classes = directions,
-                                    ParagraphEmbeddingLevel = paragraphEmbeddingLevel,
-                                    Levels = levels
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-
-            return testData;
-        }
-    }
-
-    internal class BiDiTestData
-    {
-        public int LineNumber { get; set; }
-        public BidiClass[] Classes { get; set; }
-        public sbyte ParagraphEmbeddingLevel { get; set; }
-        public int[] Levels { get; set; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
deleted file mode 100644
index c074e5a1f1..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using Avalonia.Media.TextFormatting.Unicode;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public static class GraphemeBreakClassTrieGenerator
-    {
-        public static void Execute()
-        {
-            if (!Directory.Exists("Generated"))
-            {
-                Directory.CreateDirectory("Generated");
-            }
-
-            using (var stream = File.Create("Generated\\GraphemeBreak.trie"))
-            {
-                var trie = GenerateBreakTypeTrie();
-
-                trie.Save(stream);
-            }
-        }
-
-        private static UnicodeTrie GenerateBreakTypeTrie()
-        {
-            var trieBuilder = new UnicodeTrieBuilder();
-
-            var graphemeBreakData = ReadBreakData(Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/GraphemeBreakProperty.txt"));
-
-            var emojiBreakData = ReadBreakData(Path.Combine(UnicodeDataGenerator.Ucd, "emoji/emoji-data.txt"));
-
-            foreach (var breakData in new [] { graphemeBreakData, emojiBreakData })
-            {
-                foreach (var (start, end, graphemeBreakType) in breakData)
-                {
-                    if (!Enum.TryParse<GraphemeBreakClass>(graphemeBreakType, out var value))
-                    {
-                        continue;
-                    }
-
-                    if (start == end)
-                    {
-                        trieBuilder.Set(start, (uint)value);
-                    }
-                    else
-                    {
-                        trieBuilder.SetRange(start, end, (uint)value);
-                    }
-                }
-            }
-
-            return trieBuilder.Freeze();
-        }
-
-        public static List<(int, int, string)> ReadBreakData(string file)
-        {
-            var data = new List<(int, int, string)>();
-
-            var rx = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s*;\s*(\w+)\s*#.*", RegexOptions.Compiled);
-
-            using (var client = new HttpClient())
-            {
-                using (var result = client.GetAsync(file).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return data;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var match = rx.Match(line);
-
-                            if (!match.Success)
-                            {
-                                continue;
-                            }
-
-                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
-
-                            var end = start;
-
-                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
-                            {
-                                end = Convert.ToInt32(match.Groups[2].Value, 16);
-                            }
-
-                            var breakType = match.Groups[3].Value;
-
-                            data.Add((start, end, breakType));
-                        }
-                    }
-                }
-            }
-
-            return data;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
deleted file mode 100644
index 848b60b341..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    /// <summary>
-    ///     This class is intended for use when the Unicode spec changes. Otherwise the containing tests are redundant.
-    ///     To update the <c>GraphemeBreak.trie</c> run the <see cref="Should_Generate_Trie"/> test.
-    /// </summary>
-    public class GraphemeBreakClassTrieGeneratorTests
-    {
-        [Theory(Skip = "Only run when we update the trie.")]
-        [ClassData(typeof(GraphemeBreakTestDataGenerator))]
-        public void Should_Enumerate(string text, int expectedLength)
-        {
-            var textMemory = text.AsMemory();
-
-            var enumerator = new GraphemeEnumerator(textMemory);
-
-            Assert.True(enumerator.MoveNext());
-
-            Assert.Equal(expectedLength, enumerator.Current.Text.Length);
-        }
-
-        [Fact(Skip = "Only run when we update the trie.")]
-        public void Should_Enumerate_Other()
-        {
-            const string text = "ABCDEFGHIJ";
-
-            var textMemory = text.AsMemory();
-
-            var enumerator = new GraphemeEnumerator(textMemory);
-
-            var count = 0;
-
-            while (enumerator.MoveNext())
-            {
-                Assert.Equal(1, enumerator.Current.Text.Length);
-
-                count++;
-            }
-
-            Assert.Equal(10, count);
-        }
-
-        [Fact(Skip = "Only run when we update the trie.")]
-        public void Should_Generate_Trie()
-        {
-            GraphemeBreakClassTrieGenerator.Execute();
-        }
-
-        private class GraphemeBreakTestDataGenerator : TestDataGenerator
-        {
-            public GraphemeBreakTestDataGenerator() 
-                : base("auxiliary/GraphemeBreakTest.txt")
-            {
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
deleted file mode 100644
index a90be6d519..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public class LineBreakEnumeratorTests
-    {
-        private readonly ITestOutputHelper _outputHelper;
-        
-        public LineBreakEnumeratorTests(ITestOutputHelper outputHelper)
-        {
-            _outputHelper = outputHelper;
-        }
-        
-        [Fact]
-        public void BasicLatinTest()
-        {
-            var lineBreaker = new LineBreakEnumerator("Hello World\r\nThis is a test.".AsMemory());
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(6, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(13, lineBreaker.Current.PositionWrap);
-            Assert.True(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(18, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(21, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(23, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(28, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.False(lineBreaker.MoveNext());
-        }
-
-
-        [Fact]
-        public void ForwardTextWithOuterWhitespace()
-        {
-            var lineBreaker = new LineBreakEnumerator(" Apples Pears Bananas   ".AsMemory());
-            var positionsF = GetBreaks(lineBreaker);
-            Assert.Equal(1, positionsF[0].PositionWrap);
-            Assert.Equal(0, positionsF[0].PositionMeasure);
-            Assert.Equal(8, positionsF[1].PositionWrap);
-            Assert.Equal(7, positionsF[1].PositionMeasure);
-            Assert.Equal(14, positionsF[2].PositionWrap);
-            Assert.Equal(13, positionsF[2].PositionMeasure);
-            Assert.Equal(24, positionsF[3].PositionWrap);
-            Assert.Equal(21, positionsF[3].PositionMeasure);
-        }
-
-        private static List<LineBreak> GetBreaks(LineBreakEnumerator lineBreaker)
-        {
-            var breaks = new List<LineBreak>();
-
-            while (lineBreaker.MoveNext())
-            {
-                breaks.Add(lineBreaker.Current);
-            }
-
-            return breaks;
-        }
-
-        [Fact]
-        public void ForwardTest()
-        {
-            var lineBreaker = new LineBreakEnumerator("Apples Pears Bananas".AsMemory());
-
-            var positionsF = GetBreaks(lineBreaker);
-            Assert.Equal(7, positionsF[0].PositionWrap);
-            Assert.Equal(6, positionsF[0].PositionMeasure);
-            Assert.Equal(13, positionsF[1].PositionWrap);
-            Assert.Equal(12, positionsF[1].PositionMeasure);
-            Assert.Equal(20, positionsF[2].PositionWrap);
-            Assert.Equal(20, positionsF[2].PositionMeasure);
-        }
-
-        [Theory(Skip = "Only run when the Unicode spec changes.")]
-        [ClassData(typeof(LineBreakTestDataGenerator))]
-        public void ShouldFindBreaks(int lineNumber, int[] codePoints, int[] breakPoints)
-        {
-            var text = string.Join(null, codePoints.Select(char.ConvertFromUtf32));
-
-            var lineBreaker = new LineBreakEnumerator(text.AsMemory());
-
-            var foundBreaks = new List<int>();
-            
-            while (lineBreaker.MoveNext())
-            {
-                foundBreaks.Add(lineBreaker.Current.PositionWrap);
-            }
-            
-            // Check the same
-            var pass = true;
-
-            if (foundBreaks.Count != breakPoints.Length)
-            {
-                pass = false;
-            }
-            else
-            {
-                for (var i = 0; i < foundBreaks.Count; i++)
-                {
-                    if (foundBreaks[i] != breakPoints[i])
-                    {
-                        pass = false;
-                    }
-                }
-            }
-
-            if (!pass)
-            {
-                _outputHelper.WriteLine($"Failed test on line {lineNumber}");
-                _outputHelper.WriteLine("");
-                _outputHelper.WriteLine($"    Code Points: {string.Join(" ", codePoints)}");
-                _outputHelper.WriteLine($"Expected Breaks: {string.Join(" ", breakPoints)}");
-                _outputHelper.WriteLine($"  Actual Breaks: {string.Join(" ", foundBreaks)}");
-                _outputHelper.WriteLine($"           Text: {text}");
-                _outputHelper.WriteLine($"     Char Props: {string.Join(" ", codePoints.Select(x => new Codepoint(x).LineBreakClass))}");
-                _outputHelper.WriteLine("");
-            }
-            
-            Assert.True(pass);
-        }
-
-        private class LineBreakTestDataGenerator : IEnumerable<object[]>
-        {
-            private readonly List<object[]> _testData;
-
-            public LineBreakTestDataGenerator()
-            {
-                _testData = GenerateTestData();
-            }
-
-            public IEnumerator<object[]> GetEnumerator()
-            {
-                return _testData.GetEnumerator();
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            private static List<object[]> GenerateTestData()
-            {
-                // Process each line
-                var tests = new List<object[]>();
-
-                // Read the test file
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/LineBreakTest.txt");
-
-                using (var client = new HttpClient())
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return tests;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var lineNumber = 1;
-
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (line is null)
-                            {
-                                break;
-                            }
-
-                            // Get the line, remove comments
-                            line = line.Split('#')[0].Trim();
-
-                            // Ignore blank/comment only lines
-                            if (string.IsNullOrWhiteSpace(line))
-                            {
-                                lineNumber++;
-                                continue;
-                            }
-
-                            var codePoints = new List<int>();
-                            var breakPoints = new List<int>();
-
-                            // Parse the test
-                            var p = 0;
-
-                            while (p < line.Length)
-                            {
-                                // Ignore white space
-                                if (char.IsWhiteSpace(line[p]))
-                                {
-                                    p++;
-                                    continue;
-                                }
-
-                                if (line[p] == '×')
-                                {
-                                    p++;
-                                    continue;
-                                }
-
-                                if (line[p] == '÷')
-                                {
-                                    breakPoints.Add(codePoints.Select(x=> x > ushort.MaxValue ? 2 : 1).Sum());
-                                    p++;
-                                    continue;
-                                }
-
-                                var codePointPos = p;
-
-                                while (p < line.Length && IsHexDigit(line[p]))
-                                {
-                                    p++;
-                                }
-
-                                var codePointStr = line.Substring(codePointPos, p - codePointPos);
-                                var codePoint = Convert.ToInt32(codePointStr, 16);
-                                codePoints.Add(codePoint);
-                            }
-
-                            tests.Add(new object[] { lineNumber, codePoints.ToArray(), breakPoints.ToArray() });
-
-                            lineNumber++;
-                        }
-                    }
-                }
-
-                return tests;
-            }
-
-            private static bool IsHexDigit(char ch)
-            {
-                return char.IsDigit(ch) || (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f');
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs
deleted file mode 100644
index 058de909df..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public abstract class TestDataGenerator : IEnumerable<object[]>
-    {
-        private readonly string _fileName;
-        private readonly List<object[]> _testData;
-
-        protected TestDataGenerator(string fileName)
-        {
-            _fileName = fileName;
-            _testData = ReadTestData();
-        }
-
-        public IEnumerator<object[]> GetEnumerator()
-        {
-            return _testData.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        private List<object[]> ReadTestData()
-        {
-            var testData = new List<object[]>();
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, _fileName);
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                        return testData;
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (line == null)
-                            {
-                                break;
-                            }
-
-                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var elements = line.Split('#');
-
-                            elements = elements[0].Replace("÷\t", "÷").Trim('÷').Split('÷');
-
-                            var chars = elements[0].Replace(" × ", " ").Split(' ');
-
-                            var codepoints = chars.Where(x => x != "" && x != "×")
-                                .Select(x => Convert.ToInt32(x, 16)).ToArray();
-
-                            var text = string.Join(null, codepoints.Select(char.ConvertFromUtf32));
-
-                            var length = codepoints.Select(x => x > ushort.MaxValue ? 2 : 1).Sum();
-
-                            var data = new object[] { text, length };
-
-                            testData.Add(data);
-                        }
-                    }
-                }
-            }
-
-            return testData;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
deleted file mode 100644
index da9e494405..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
+++ /dev/null
@@ -1,439 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal static class UnicodeDataGenerator
-    {
-        public const string Ucd = "https://www.unicode.org/Public/13.0.0/ucd/";
-
-        public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries,out Dictionary<int, BiDiDataItem> biDiData)
-        {
-            biDiData = new Dictionary<int, BiDiDataItem>();
-
-            var biDiClassEntries =
-                UnicodeEnumsGenerator.CreateBiDiClassEnum();
-
-            var biDiClassMappings = CreateTagToIndexMappings(biDiClassEntries);
-
-            var biDiClassData = ReadBiDiData();
-
-            foreach (var (range, name) in biDiClassData)
-            {
-                var biDiClass = biDiClassMappings[name];
-
-                AddBiDiClassRange(biDiData, range, biDiClass);
-            }
-
-            var biDiPairedBracketTypeEntries = UnicodeEnumsGenerator.CreateBiDiPairedBracketTypeEnum();
-
-            var biDiPairedBracketTypeMappings = CreateTagToIndexMappings(biDiPairedBracketTypeEntries);
-
-            var biDiPairedBracketData = ReadBiDiPairedBracketData();
-            
-            foreach (var (range, name) in biDiPairedBracketData)
-            {
-                var bracketType = biDiPairedBracketTypeMappings[name];
-
-                AddBiDiBracket(biDiData, range, bracketType);
-            }
-            
-            var biDiTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
-            
-            foreach (var properties in biDiData.Values)
-            {
-                //[bracket]|[bracketType]|[biDiClass]
-                var value = (properties.BiDiClass << UnicodeData.BIDICLASS_SHIFT) |
-                            (properties.BracketType << UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT) | properties.Bracket;
-
-                biDiTrieBuilder.Set(properties.Codepoint, (uint)value);
-            }
-
-            biDiDataEntries = new BiDiDataEntries()
-            {
-                PairedBracketTypes = biDiPairedBracketTypeEntries, BiDiClasses = biDiClassEntries
-            };
-            
-            using (var stream = File.Create("Generated\\BiDi.trie"))
-            {
-                var trie = biDiTrieBuilder.Freeze();
-
-                trie.Save(stream);
-
-                return trie;
-            }
-        }
-
-        public static UnicodeTrie GenerateUnicodeDataTrie(out UnicodeDataEntries dataEntries, out Dictionary<int, UnicodeDataItem> unicodeData)
-        {
-            var generalCategoryEntries =
-                UnicodeEnumsGenerator.CreateGeneralCategoryEnum();
-
-            var generalCategoryMappings = CreateTagToIndexMappings(generalCategoryEntries);
-            
-            var scriptEntries = UnicodeEnumsGenerator.CreateScriptEnum();
-
-            var scriptMappings = CreateNameToIndexMappings(scriptEntries);
-            
-            var lineBreakClassEntries =
-                UnicodeEnumsGenerator.CreateLineBreakClassEnum();
-
-            var lineBreakClassMappings = CreateTagToIndexMappings(lineBreakClassEntries);
-
-            unicodeData = GetUnicodeData(generalCategoryMappings, scriptMappings, lineBreakClassMappings);
-            
-            var unicodeDataTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
-            
-            foreach (var properties in unicodeData.Values)
-            {
-                //[line break]|[biDi]|[script]|[category]
-                var value = (properties.LineBreakClass << UnicodeData.LINEBREAK_SHIFT) |
-                            (properties.Script << UnicodeData.SCRIPT_SHIFT) | properties.GeneralCategory;
-
-                unicodeDataTrieBuilder.Set(properties.Codepoint, (uint)value);
-            }
-
-            dataEntries = new UnicodeDataEntries
-            {
-                Scripts = scriptEntries,
-                GeneralCategories = generalCategoryEntries,
-                LineBreakClasses = lineBreakClassEntries
-            };
-
-            using (var stream = File.Create("Generated\\UnicodeData.trie"))
-            {
-                var trie = unicodeDataTrieBuilder.Freeze();
-
-                trie.Save(stream);
-                
-                return trie;
-            }
-        }
-
-        private static Dictionary<int, UnicodeDataItem> GetUnicodeData(IReadOnlyDictionary<string, int> generalCategoryMappings, 
-            IReadOnlyDictionary<string, int> scriptMappings, IReadOnlyDictionary<string, int> lineBreakClassMappings)
-        {
-            var unicodeData = new Dictionary<int, UnicodeDataItem>();
-            
-            var generalCategoryData = ReadGeneralCategoryData();
-
-            foreach (var (range, name) in generalCategoryData)
-            {
-                var generalCategory = generalCategoryMappings[name];
-
-                AddGeneralCategoryRange(unicodeData, range, generalCategory);
-            }
-            
-            var scriptData = ReadScriptData();
-
-            foreach (var (range, name) in scriptData)
-            {
-                var script = scriptMappings[name];
-
-                AddScriptRange(unicodeData, range, script);
-            }
-            
-            var lineBreakClassData = ReadLineBreakClassData();
-
-            foreach (var (range, name) in lineBreakClassData)
-            {
-                var lineBreakClass = lineBreakClassMappings[name];
-
-                AddLineBreakClassRange(unicodeData, range, lineBreakClass);
-            }
-
-            return unicodeData;
-        }
-
-        private static Dictionary<string, int> CreateTagToIndexMappings(IReadOnlyList<DataEntry> entries)
-        {
-            var mappings = new Dictionary<string, int>();
-
-            for (var i = 0; i < entries.Count; i++)
-            {
-                mappings.Add(entries[i].Tag, i);
-            }
-
-            return mappings;
-        }
-
-        private static Dictionary<string, int> CreateNameToIndexMappings(IReadOnlyList<DataEntry> entries)
-        {
-            var mappings = new Dictionary<string, int>();
-
-            for (var i = 0; i < entries.Count; i++)
-            {
-                mappings.Add(entries[i].Name, i);
-            }
-
-            return mappings;
-        }
-
-        private static void AddGeneralCategoryRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
-            int generalCategory)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, GeneralCategory = generalCategory });
-                }
-                else
-                {
-                    codepoints[i].GeneralCategory = generalCategory;
-                }
-            }
-        }
-
-        private static void AddScriptRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
-            int script)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, Script = script });
-                }
-                else
-                {
-                    codepoints[i].Script = script;
-                }
-            }
-        }
-
-        private static void AddBiDiClassRange(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
-            int biDiClass)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new BiDiDataItem { Codepoint = i, BiDiClass = biDiClass });
-                }
-                else
-                {
-                    codepoints[i].BiDiClass = biDiClass;
-                }
-            }
-        }
-
-        private static void AddBiDiBracket(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
-            int bracketType)
-        {
-            if (!codepoints.ContainsKey(range.Start))
-            {
-                codepoints.Add(range.Start,
-                    new BiDiDataItem { Codepoint = range.Start, Bracket = range.End, BracketType = bracketType });
-            }
-            else
-            {
-                var codepoint = codepoints[range.Start];
-
-                codepoint.Bracket = range.End;
-                codepoint.BracketType = bracketType;
-            }
-        }
-
-        private static void AddLineBreakClassRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
-            int lineBreakClass)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, LineBreakClass = lineBreakClass });
-                }
-                else
-                {
-                    codepoints[i].LineBreakClass = lineBreakClass;
-                }
-            }
-        }
-
-        public static List<(CodepointRange, string)> ReadGeneralCategoryData()
-        {
-            return ReadUnicodeData("extracted/DerivedGeneralCategory.txt");
-        }
-
-        public static List<(CodepointRange, string)> ReadScriptData()
-        {
-            return ReadUnicodeData("Scripts.txt");
-        }
-
-        public static List<(CodepointRange, string)> ReadBiDiData()
-        {
-            return ReadUnicodeData("extracted/DerivedBidiClass.txt");
-        }
-
-        public static List<(CodepointRange, string)> ReadLineBreakClassData()
-        {
-            return ReadUnicodeData("extracted/DerivedLineBreak.txt");
-        }
-        
-        public static List<(CodepointRange, string)> ReadBiDiPairedBracketData()
-        {
-            const string file = "BidiBrackets.txt";
-        
-            var data = new List<(CodepointRange, string)>();
-            
-            var regex = new Regex(@"^([0-9A-F]+);\s([0-9A-F]+);\s([ocn])");
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(Ucd, file);
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return data;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var match = regex.Match(line);
-
-                            if (!match.Success)
-                            {
-                                continue;
-                            }
-
-                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
-
-                            var end = start;
-
-                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
-                            {
-                                end = Convert.ToInt32(match.Groups[2].Value, 16);
-                            }
-
-                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
-                        }
-                    }
-                }
-            }
-
-            return data;
-        }
-
-        private static List<(CodepointRange, string)> ReadUnicodeData(string file)
-        {
-            var data = new List<(CodepointRange, string)>();
-
-            var regex = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+)\s+#.*", RegexOptions.Compiled);
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(Ucd, file);
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return data;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var match = regex.Match(line);
-
-                            if (!match.Success)
-                            {
-                                continue;
-                            }
-
-                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
-
-                            var end = start;
-
-                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
-                            {
-                                end = Convert.ToInt32(match.Groups[2].Value, 16);
-                            }
-
-                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
-                        }
-                    }
-                }
-            }
-
-            return data;
-        }
-
-        internal class UnicodeDataItem
-        {
-            public int Codepoint { get; set; }
-
-            public int Script { get; set; }
-
-            public int GeneralCategory { get; set; }
-
-            public int BiDiClass { get; set; }
-
-            public int LineBreakClass { get; set; }
-        }
-        
-        internal class BiDiDataItem
-        {
-            public int Codepoint { get; set; }
-
-            public int Bracket { get; set; }
-
-            public int BracketType { get; set; }
-
-            public int BiDiClass { get; set; }
-        }
-        
-
-    }
-    
-    internal class UnicodeDataEntries
-    {
-        public IReadOnlyList<DataEntry> Scripts { get; set; }
-        public IReadOnlyList<DataEntry> GeneralCategories{ get; set; }
-        public IReadOnlyList<DataEntry> LineBreakClasses{ get; set; }
-    }
-    
-    internal class BiDiDataEntries
-    {
-        public IReadOnlyList<DataEntry> PairedBracketTypes { get; set; }
-        public IReadOnlyList<DataEntry> BiDiClasses{ get; set; }
-    }
-
-    internal readonly struct CodepointRange
-    {
-        public CodepointRange(int start, int end)
-        {
-            Start = start;
-            End = end;
-        }
-
-        public int Start { get; }
-        public int End { get; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
deleted file mode 100644
index f122876322..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.IO;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public class UnicodeDataGeneratorTests
-    {
-        /// <summary>
-        ///     This test is used to generate all Unicode related types.
-        ///     We only need to run this when the Unicode spec changes.
-        /// </summary>
-        [Fact(Skip = "Only run when the Unicode spec changes.")]
-        public void Should_Generate_Data()
-        {
-            if (!Directory.Exists("Generated"))
-            {
-                Directory.CreateDirectory("Generated");
-            }
-
-            var unicodeDataTrie = UnicodeDataGenerator.GenerateUnicodeDataTrie(out var unicodeDataEntries, out var unicodeData);
-
-            foreach (var value in unicodeData.Values)
-            {
-                var data = unicodeDataTrie.Get(value.Codepoint);
-                
-                Assert.Equal(value.GeneralCategory, GetValue(data, 0, UnicodeData.CATEGORY_MASK));
-                
-                Assert.Equal(value.Script, GetValue(data, UnicodeData.SCRIPT_SHIFT, UnicodeData.SCRIPT_MASK));
-                
-                Assert.Equal(value.LineBreakClass, GetValue(data, UnicodeData.LINEBREAK_SHIFT, UnicodeData.LINEBREAK_MASK));
-            }
-            
-            var biDiTrie = UnicodeDataGenerator.GenerateBiDiTrie(out var biDiDataEntries, out var biDiData);
-
-            foreach (var value in biDiData.Values)
-            {
-                var data = biDiTrie.Get(value.Codepoint);
-                
-                Assert.Equal(value.Bracket, GetValue(data, 0, UnicodeData.BIDIPAIREDBRACKED_MASK));
-                
-                Assert.Equal(value.BracketType, GetValue(data, UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT, UnicodeData.BIDIPAIREDBRACKEDTYPE_MASK));
-                
-                Assert.Equal(value.BiDiClass, GetValue(data, UnicodeData.BIDICLASS_SHIFT, UnicodeData.BIDICLASS_MASK));
-            }
-            
-            UnicodeEnumsGenerator.CreatePropertyValueAliasHelper(unicodeDataEntries, biDiDataEntries);
-        }
-
-        private static int GetValue(uint value, int shift, int mask)
-        {
-            return (int)((value >> shift) & mask);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
deleted file mode 100644
index e483728423..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal static class UnicodeEnumsGenerator
-    {
-        public static List<DataEntry> CreateScriptEnum()
-        {
-            var entries = new List<DataEntry>
-            {
-                new DataEntry("Unknown", "Zzzz", string.Empty),
-                new DataEntry("Common", "Zyyy", string.Empty),
-                new DataEntry("Inherited", "Zinh", string.Empty)
-            };
-
-            ParseDataEntries("# Script (sc)", entries);
-
-            using (var stream = File.Create("Generated\\Script.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum Script");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        public static List<DataEntry> CreateGeneralCategoryEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("Other", "C", " Cc | Cf | Cn | Co | Cs") };
-
-            ParseDataEntries("# General_Category (gc)", entries);
-
-            using (var stream = File.Create("Generated\\GeneralCategory.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum GeneralCategory");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        public static List<DataEntry> CreateGraphemeBreakTypeEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("Other", "XX", string.Empty) };
-
-            ParseDataEntries("# Grapheme_Cluster_Break (GCB)", entries);
-
-            using (var stream = File.Create("Generated\\GraphemeBreakClass.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum GraphemeBreakClass");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("        ExtendedPictographic");
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        private static List<string> GenerateBreakPairTable()
-        {
-            var rows = new List<string[]>();
-
-            using (var stream =
-                typeof(UnicodeEnumsGenerator).Assembly.GetManifestResourceStream(
-                    "Avalonia.Visuals.UnitTests.Media.TextFormatting.BreakPairTable.txt"))
-            using (var reader = new StreamReader(stream))
-            {
-                while (!reader.EndOfStream)
-                {
-                    var line = reader.ReadLine();
-
-                    var columns = line.Split('\t');
-
-                    rows.Add(columns);
-                }
-            }
-
-            using (var stream = File.Create("Generated\\BreakPairTable.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    internal static class BreakPairTable");
-                writer.WriteLine("    {");
-
-                writer.WriteLine("        private static readonly byte[][] s_breakPairTable = ");
-                writer.WriteLine("            {");
-
-                for (var i = 1; i < rows.Count; i++)
-                {
-                    writer.Write("             new byte[] {");
-
-                    writer.Write($"{GetBreakPairType(rows[i][1])}");
-
-                    for (var index = 2; index < rows[i].Length; index++)
-                    {
-                        var column = rows[i][index];
-
-                        writer.Write($",{GetBreakPairType(column)}");
-                    }
-
-                    writer.Write("},");
-                    writer.Write(Environment.NewLine);
-                }
-                writer.WriteLine("        };");
-
-                writer.WriteLine();
-
-                writer.WriteLine("        public static PairBreakType Map(LineBreakClass first, LineBreakClass second)");
-                writer.WriteLine("        {");
-                writer.WriteLine("            return (PairBreakType)s_breakPairTable[(int)first][(int)second];");
-                writer.WriteLine("        }");
-
-                writer.WriteLine("    }");
-
-                writer.WriteLine();
-
-                writer.WriteLine("    internal enum PairBreakType : byte");
-                writer.WriteLine("    {");
-                writer.WriteLine("        DI = 0, // Direct break opportunity");
-                writer.WriteLine("        IN = 1, // Indirect break opportunity");
-                writer.WriteLine("        CI = 2, // Indirect break opportunity for combining marks");
-                writer.WriteLine("        CP = 3, // Prohibited break for combining marks");
-                writer.WriteLine("        PR = 4 // Prohibited break");
-                writer.WriteLine("    }");
-
-
-                writer.WriteLine("}");
-            }
-
-            return rows[0].Where(x => !string.IsNullOrEmpty(x)).ToList();
-        }
-
-        public const byte DI_BRK = 0; // Direct break opportunity
-        public const byte IN_BRK = 1; // Indirect break opportunity
-        public const byte CI_BRK = 2; // Indirect break opportunity for combining marks
-        public const byte CP_BRK = 3; // Prohibited break for combining marks
-        public const byte PR_BRK = 4; // Prohibited break
-
-        private static byte GetBreakPairType(string type)
-        {
-            switch (type)
-            {
-                case "_":
-                    return DI_BRK;
-                case "%":
-                    return IN_BRK;
-                case "#":
-                    return CI_BRK;
-                case "@":
-                    return CP_BRK;
-                case "^":
-                    return PR_BRK;
-                default:
-                    return byte.MaxValue;
-            }
-        }
-
-        public static List<DataEntry> CreateLineBreakClassEnum()
-        {
-            var usedLineBreakClasses = GenerateBreakPairTable();
-
-            var entries = new List<DataEntry> { new DataEntry("Unknown", "XX", string.Empty) };
-
-            ParseDataEntries("# Line_Break (lb)", entries);
-
-            var orderedLineBreakEntries = new Dictionary<string, DataEntry>();
-
-            foreach (var tag in usedLineBreakClasses)
-            {
-                var entry = entries.Single(x => x.Tag == tag);
-
-                orderedLineBreakEntries.Add(tag, entry);
-            }
-
-            foreach (var entry in entries)
-            {
-                if (orderedLineBreakEntries.ContainsKey(entry.Tag))
-                {
-                    continue;
-                }
-
-                orderedLineBreakEntries.Add(entry.Tag, entry);
-            }
-
-            using (var stream = File.Create("Generated\\LineBreakClass.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum LineBreakClass");
-                writer.WriteLine("    {");
-
-                foreach (var entry in orderedLineBreakEntries.Values)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return orderedLineBreakEntries.Values.ToList();
-        }
-
-        public static List<DataEntry> CreateBiDiClassEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("Left_To_Right", "L", string.Empty) };
-
-            ParseDataEntries("# Bidi_Class (bc)", entries);
-
-            using (var stream = File.Create("Generated\\BiDiClass.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum BiDiClass");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-        
-        public static List<DataEntry> CreateBiDiPairedBracketTypeEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("None", "n", string.Empty) };
-
-            ParseDataEntries("# Bidi_Paired_Bracket_Type (bpt)", entries);
-
-            using (var stream = File.Create("Generated\\BiDiPairedBracketType.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum BiDiPairedBracketType");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        public static void CreatePropertyValueAliasHelper(UnicodeDataEntries unicodeDataEntries, 
-            BiDiDataEntries biDiDataEntries)
-        {
-            using (var stream = File.Create("Generated\\PropertyValueAliasHelper.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("using System.Collections.Generic;");
-                writer.WriteLine();
-
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    internal static class PropertyValueAliasHelper");
-                writer.WriteLine("    {");
-
-                WritePropertyValueAliasGetTag(writer, unicodeDataEntries.Scripts, "Script", "Zzzz");
-
-                WritePropertyValueAlias(writer, unicodeDataEntries.Scripts, "Script", "Unknown");
-
-                WritePropertyValueAlias(writer, unicodeDataEntries.GeneralCategories, "GeneralCategory", "Other");
-                
-                WritePropertyValueAlias(writer, unicodeDataEntries.LineBreakClasses, "LineBreakClass", "Unknown");
-
-                WritePropertyValueAlias(writer, biDiDataEntries.PairedBracketTypes, "BiDiPairedBracketType", "None");
-                
-                WritePropertyValueAlias(writer, biDiDataEntries.BiDiClasses, "BiDiClass", "LeftToRight");
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-        }
-
-        public static void ParseDataEntries(string property, List<DataEntry> entries)
-        {
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "PropertyValueAliases.txt");
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            if (line != property)
-                            {
-                                continue;
-                            }
-
-                            reader.ReadLine();
-
-                            break;
-                        }
-
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line) || line.StartsWith("#"))
-                            {
-                                break;
-                            }
-
-                            var elements = line.Split(';');
-
-                            var tag = elements[1].Trim();
-
-                            elements = elements[2].Split('#');
-
-                            var name = elements[0].Trim();
-
-                            if (entries.Any(x => x.Name == name))
-                            {
-                                continue;
-                            }
-
-                            var comment = string.Empty;
-
-                            if (elements.Length > 1)
-                            {
-                                comment = elements[1];
-                            }
-
-                            var entry = new DataEntry(name, tag, comment);
-
-                            entries.Add(entry);
-                        }
-                    }
-                }
-            }
-        }
-
-        private static void WritePropertyValueAliasGetTag(TextWriter writer, IEnumerable<DataEntry> entries,
-            string typeName, string defaultValue)
-        {
-            writer.WriteLine(
-                $"        private static readonly Dictionary<{typeName}, string> s_{typeName.ToLower()}ToTag = ");
-            writer.WriteLine($"            new Dictionary<{typeName}, string>{{");
-
-            foreach (var entry in entries)
-            {
-                writer.WriteLine($"                {{ {typeName}.{entry.Name.Replace("_", "")}, \"{entry.Tag}\"}},");
-            }
-
-            writer.WriteLine("        };");
-
-            writer.WriteLine();
-
-            writer.WriteLine($"        public static string GetTag({typeName} {typeName.ToLower()})");
-            writer.WriteLine("        {");
-            writer.WriteLine($"            if(!s_{typeName.ToLower()}ToTag.ContainsKey({typeName.ToLower()}))");
-            writer.WriteLine("            {");
-            writer.WriteLine($"                return \"{defaultValue}\";");
-            writer.WriteLine("            }");
-            writer.WriteLine($"            return s_{typeName.ToLower()}ToTag[{typeName.ToLower()}];");
-            writer.WriteLine("        }");
-
-            writer.WriteLine();
-        }
-
-        private static void WritePropertyValueAlias(TextWriter writer, IEnumerable<DataEntry> entries, string typeName,
-            string defaultValue)
-        {
-            writer.WriteLine($"        private static readonly Dictionary<string, {typeName}> s_tagTo{typeName} = ");
-            writer.WriteLine($"            new Dictionary<string,{typeName}>{{");
-
-            foreach (var entry in entries)
-            {
-                writer.WriteLine($"                {{ \"{entry.Tag}\", {typeName}.{entry.Name.Replace("_", "")}}},");
-            }
-
-            writer.WriteLine("        };");
-
-            writer.WriteLine();
-
-            writer.WriteLine($"        public static {typeName} Get{typeName}(string tag)");
-            writer.WriteLine("        {");
-            writer.WriteLine($"            if(!s_tagTo{typeName}.ContainsKey(tag))");
-            writer.WriteLine("            {");
-            writer.WriteLine($"                return {typeName}.{defaultValue};");
-            writer.WriteLine("            }");
-            writer.WriteLine($"            return s_tagTo{typeName}[tag];");
-            writer.WriteLine("        }");
-
-            writer.WriteLine();
-        }
-    }
-
-    public readonly struct DataEntry
-    {
-        public DataEntry(string name, string tag, string comment)
-        {
-            Name = name;
-            Tag = tag;
-            Comment = comment;
-        }
-
-        public string Name { get; }
-        public string Tag { get; }
-        public string Comment { get; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
deleted file mode 100644
index e4f88706d8..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-using Avalonia.Media.Transformation;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class TransformOperationsTests
-    {
-        [Theory]
-        [InlineData("translate(10px)", 10d, 0d)]
-        [InlineData("translate(10px, 10px)", 10d, 10d)]
-        [InlineData("translate(0px, 10px)", 0d, 10d)]
-        [InlineData("translate(10px, 0px)", 10d, 0d)]
-        [InlineData("translateX(10px)", 10d, 0d)]
-        [InlineData("translateY(10px)", 0d, 10d)]
-        public void Can_Parse_Translation(string data, double x, double y)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Translate.X);
-            Assert.Equal(y, operations[0].Data.Translate.Y);
-        }
-
-        [Theory]
-        [InlineData("rotate(90deg)", 90d)]
-        [InlineData("rotate(0.5turn)", 180d)]
-        [InlineData("rotate(200grad)", 180d)]
-        [InlineData("rotate(3.14159265rad)", 180d)]
-        public void Can_Parse_Rotation(string data, double angleDeg)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(angleDeg), operations[0].Data.Rotate.Angle, 4);
-        }
-
-        [Theory]
-        [InlineData("scale(10)", 10d, 10d)]
-        [InlineData("scale(10, 10)", 10d, 10d)]
-        [InlineData("scale(0, 10)", 0d, 10d)]
-        [InlineData("scale(10, 0)", 10d, 0d)]
-        [InlineData("scaleX(10)", 10d, 1d)]
-        [InlineData("scaleY(10)", 1d, 10d)]
-        public void Can_Parse_Scale(string data, double x, double y)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Scale.X);
-            Assert.Equal(y, operations[0].Data.Scale.Y);
-        }
-
-        [Theory]
-        [InlineData("skew(90deg)", 90d, 0d)]
-        [InlineData("skew(0.5turn)", 180d, 0d)]
-        [InlineData("skew(200grad)", 180d, 0d)]
-        [InlineData("skew(3.14159265rad)", 180d, 0d)]
-        [InlineData("skewX(90deg)", 90d, 0d)]
-        [InlineData("skewX(0.5turn)", 180d, 0d)]
-        [InlineData("skewX(200grad)", 180d, 0d)]
-        [InlineData("skewX(3.14159265rad)", 180d, 0d)]
-        [InlineData("skew(0, 90deg)", 0d, 90d)]
-        [InlineData("skew(0, 0.5turn)", 0d, 180d)]
-        [InlineData("skew(0, 200grad)", 0d, 180d)]
-        [InlineData("skew(0, 3.14159265rad)", 0d, 180d)]
-        [InlineData("skewY(90deg)", 0d, 90d)]
-        [InlineData("skewY(0.5turn)", 0d, 180d)]
-        [InlineData("skewY(200grad)", 0d, 180d)]
-        [InlineData("skewY(3.14159265rad)", 0d, 180d)]
-        [InlineData("skew(90deg, 90deg)", 90d, 90d)]
-        [InlineData("skew(0.5turn, 0.5turn)", 180d, 180d)]
-        [InlineData("skew(200grad, 200grad)", 180d, 180d)]
-        [InlineData("skew(3.14159265rad, 3.14159265rad)", 180d, 180d)]
-        public void Can_Parse_Skew(string data, double x, double y)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X, 4);
-            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y, 4);
-        }
-
-        [Fact]
-        public void Can_Parse_Compound_Operations()
-        {
-            var data = "scale(1,2) translate(3px,4px) rotate(5deg) skew(6deg,7deg)";
-
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
-            Assert.Equal(1, operations[0].Data.Scale.X);
-            Assert.Equal(2, operations[0].Data.Scale.Y);
-
-            Assert.Equal(TransformOperation.OperationType.Translate, operations[1].Type);
-            Assert.Equal(3, operations[1].Data.Translate.X);
-            Assert.Equal(4, operations[1].Data.Translate.Y);
-
-            Assert.Equal(TransformOperation.OperationType.Rotate, operations[2].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(5), operations[2].Data.Rotate.Angle);
-
-            Assert.Equal(TransformOperation.OperationType.Skew, operations[3].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(6), operations[3].Data.Skew.X);
-            Assert.Equal(MathUtilities.Deg2Rad(7), operations[3].Data.Skew.Y);
-        }
-
-        [Fact]
-        public void Can_Parse_Matrix_Operation()
-        {
-            var data = "matrix(1,2,3,4,5,6)";
-
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
-
-            var expectedMatrix = new Matrix(1, 2, 3, 4, 5, 6);
-
-            Assert.Equal(expectedMatrix, operations[0].Matrix);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d, 0d)]
-        [InlineData(0.5d, 5d, 10d)]
-        [InlineData(1d, 0d, 20d)]
-        public void Can_Interpolate_Translation(double progress, double x, double y)
-        {
-            var from = TransformOperations.Parse("translateX(10px)");
-            var to = TransformOperations.Parse("translateY(20px)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Translate.X);
-            Assert.Equal(y, operations[0].Data.Translate.Y);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d, 1d)]
-        [InlineData(0.5d, 5.5d, 10.5d)]
-        [InlineData(1d, 1d, 20d)]
-        public void Can_Interpolate_Scale(double progress, double x, double y)
-        {
-            var from = TransformOperations.Parse("scaleX(10)");
-            var to = TransformOperations.Parse("scaleY(20)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Scale.X);
-            Assert.Equal(y, operations[0].Data.Scale.Y);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d, 0d)]
-        [InlineData(0.5d, 5d, 10d)]
-        [InlineData(1d, 0d, 20d)]
-        public void Can_Interpolate_Skew(double progress, double x, double y)
-        {
-            var from = TransformOperations.Parse("skewX(10deg)");
-            var to = TransformOperations.Parse("skewY(20deg)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X);
-            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d)]
-        [InlineData(0.5d, 15d)]
-        [InlineData(1d, 20d)]
-        public void Can_Interpolate_Rotation(double progress, double angle)
-        {
-            var from = TransformOperations.Parse("rotate(10deg)");
-            var to = TransformOperations.Parse("rotate(20deg)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(angle), operations[0].Data.Rotate.Angle);
-        }
-
-        [Fact]
-        public void Interpolation_Fallback_To_Matrix()
-        {
-            double progress = 0.5d;
-
-            var from = TransformOperations.Parse("rotate(45deg)");
-            var to = TransformOperations.Parse("translate(100px, 100px) rotate(1215deg)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
-        }
-
-        [Fact]
-        public void Order_Of_Operations_Is_Preserved_No_Prefix()
-        {
-            var from = TransformOperations.Parse("scale(1)");
-            var to = TransformOperations.Parse("translate(50px,50px) scale(0.5,0.5)");
-
-            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
-
-            Assert.True(interpolated_0.IsIdentity);
-
-            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
-
-            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 12.5, translateY: 12.5);
-
-            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
-
-            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 25, translateY: 25);
-        }
-
-        [Fact]
-        public void Order_Of_Operations_Is_Preserved_One_Prefix()
-        {
-            var from = TransformOperations.Parse("scale(1)");
-            var to = TransformOperations.Parse("scale(0.5,0.5) translate(50px,50px)");
-
-            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
-
-            Assert.True(interpolated_0.IsIdentity);
-
-            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
-
-            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 25.0, translateY: 25);
-
-            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
-
-            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 50, translateY: 50);
-        }
-
-        private static void AssertMatrix(Matrix matrix, double? angle = null, double? scaleX = null, double? scaleY = null, double? translateX = null, double? translateY = null)
-        {
-            Assert.True(Matrix.TryDecomposeTransform(matrix, out var composed));
-
-            if (angle.HasValue)
-            {
-                Assert.Equal(angle.Value, composed.Angle);
-            }
-
-            if (scaleX.HasValue)
-            {
-                Assert.Equal(scaleX.Value, composed.Scale.X);
-            }
-
-            if (scaleY.HasValue)
-            {
-                Assert.Equal(scaleY.Value, composed.Scale.Y);
-            }
-
-            if (translateX.HasValue)
-            {
-                Assert.Equal(translateX.Value, composed.Translate.X);
-            }
-
-            if (translateY.HasValue)
-            {
-                Assert.Equal(translateY.Value, composed.Translate.Y);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
deleted file mode 100644
index e526172622..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class TypefaceTests
-    {
-        [Fact]
-        public void Exception_Should_Be_Thrown_If_FontWeight_LessThanEqualTo_Zero()
-        {
-            Assert.Throws<ArgumentException>(() => new Typeface("foo", (FontStyle)12, 0));
-        }
-
-        [Fact]
-        public void Should_Be_Equal()
-        {
-            Assert.Equal(new Typeface("Font A"), new Typeface("Font A"));
-        }
-
-        [Fact]
-        public void Should_Have_Equal_Hash()
-        {
-            Assert.Equal(new Typeface("Font A").GetHashCode(), new Typeface("Font A").GetHashCode());
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2251cc6e92..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Visuals.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/RectTests.cs b/tests/Avalonia.Visuals.UnitTests/RectTests.cs
deleted file mode 100644
index a2b0569949..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RectTests.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RectTests
-    {
-        [Fact]
-        public void Union_Should_Return_Correct_Value_For_Intersecting_Rects()
-        {
-            var result = new Rect(0, 0, 100, 100).Union(new Rect(50, 50, 100, 100));
-
-            Assert.Equal(new Rect(0, 0, 150, 150), result);
-        }
-
-        [Fact]
-        public void Union_Should_Return_Correct_Value_For_NonIntersecting_Rects()
-        {
-            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 100, 100));
-
-            Assert.Equal(new Rect(0, 0, 250, 250), result);
-        }
-
-        [Fact]
-        public void Union_Should_Ignore_Empty_This_rect()
-        {
-            var result = new Rect(0, 0, 0, 0).Union(new Rect(150, 150, 100, 100));
-
-            Assert.Equal(new Rect(150, 150, 100, 100), result);
-        }
-
-        [Fact]
-        public void Union_Should_Ignore_Empty_Other_rect()
-        {
-            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 0, 0));
-
-            Assert.Equal(new Rect(0, 0, 100, 100), result);
-        }
-
-        [Fact]
-        public void Normalize_Should_Reverse_Negative_Size()
-        {
-            var result = new Rect(new Point(100, 100), new Point(0, 0)).Normalize();
-
-            Assert.Equal(new Rect(0, 0, 100, 100), result);
-        }
-
-        [Fact]
-        public void Normalize_Should_Make_Invalid_Rects_Empty()
-        {
-            var result = new Rect(
-                double.NegativeInfinity, double.PositiveInfinity, 
-                double.PositiveInfinity, double.PositiveInfinity)
-                .Normalize();
-
-            Assert.Equal(Rect.Empty, result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs
deleted file mode 100644
index c871b8ee87..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RelativePointTests
-    {
-        [Fact]
-        public void Parse_Should_Accept_Absolute_Value()
-        {
-            var result = RelativePoint.Parse("4,5");
-
-            Assert.Equal(new RelativePoint(4, 5, RelativeUnit.Absolute), result);
-        }
-
-        [Fact]
-        public void Parse_Should_Accept_Relative_Value()
-        {
-            var result = RelativePoint.Parse("25%, 50%");
-
-            Assert.Equal(new RelativePoint(0.25, 0.5, RelativeUnit.Relative), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
deleted file mode 100644
index bf3bf39367..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RelativeRectComparer : IEqualityComparer<RelativeRect>
-    {
-        public bool Equals(RelativeRect a, RelativeRect b)
-        {
-            return a.Unit == b.Unit &&
-                   Math.Round(a.Rect.X, 3) == Math.Round(b.Rect.X, 3) &&
-                   Math.Round(a.Rect.Y, 3) == Math.Round(b.Rect.Y, 3) &&
-                   Math.Round(a.Rect.Width, 3) == Math.Round(b.Rect.Width, 3) &&
-                   Math.Round(a.Rect.Height, 3) == Math.Round(b.Rect.Height, 3);
-        }
-
-        public int GetHashCode(RelativeRect obj)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
deleted file mode 100644
index 9753e0779a..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RelativeRectTests
-    {
-        private static readonly RelativeRectComparer Compare = new RelativeRectComparer();
-        
-        [Fact]
-        public void Parse_Should_Accept_Absolute_Value()
-        {
-            var result = RelativeRect.Parse("4,5,50,60");
-
-            Assert.Equal(new RelativeRect(4, 5, 50, 60, RelativeUnit.Absolute), result, Compare);
-        }
-
-        [Fact]
-        public void Parse_Should_Accept_Relative_Value()
-        {
-            var result = RelativeRect.Parse("10%, 20%, 40%, 70%");
-
-            Assert.Equal(new RelativeRect(0.1, 0.2, 0.4, 0.7, RelativeUnit.Relative), result, Compare);
-        }
-
-        [Fact]
-        public void Parse_Should_Throw_Mixed_Values()
-        {
-            Assert.Throws<FormatException>(() =>
-                RelativeRect.Parse("10%, 20%, 40, 70%"));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
deleted file mode 100644
index ba632b791a..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using Moq;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Xunit;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RenderTests_Culling
-    {
-        [Fact]
-        public void In_Bounds_Control_Should_Be_Rendered()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        (target = new TestControl
-                        {
-                            Width = 10, Height = 10, [Canvas.LeftProperty] = 98, [Canvas.TopProperty] = 98,
-                        })
-                    }
-                };
-
-                Render(container);
-
-                Assert.True(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Out_Of_Bounds_Control_Should_Not_Be_Rendered()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        (target = new TestControl
-                        {
-                            Width = 10,
-                            Height = 10,
-                            ClipToBounds = true,
-                            [Canvas.LeftProperty] = 110,
-                            [Canvas.TopProperty] = 110,
-                        })
-                    }
-                };
-
-                Render(container);
-
-                Assert.False(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Out_Of_Bounds_Child_Control_Should_Not_Be_Rendered()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        new Canvas
-                        {
-                            Width = 100,
-                            Height = 100,
-                            [Canvas.LeftProperty] = 50,
-                            [Canvas.TopProperty] = 50,
-                            Children =
-                            {
-                                (target = new TestControl
-                                {
-                                    Width = 10,
-                                    Height = 10,
-                                    ClipToBounds = true,
-                                    [Canvas.LeftProperty] = 50,
-                                    [Canvas.TopProperty] = 50,
-                                })
-                            }
-                        }
-                    }
-                };
-
-                Render(container);
-
-                Assert.False(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void RenderTransform_Should_Be_Respected()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        (target = new TestControl
-                        {
-                            Width = 10,
-                            Height = 10,
-                            [Canvas.LeftProperty] = 110,
-                            [Canvas.TopProperty] = 110,
-                            RenderTransform = new TranslateTransform(-100, -100),
-                        })
-                    }
-                };
-
-                Render(container);
-
-                Assert.True(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Negative_Margin_Should_Be_Respected()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        new Border
-                        {
-                            Margin = new Thickness(100, 100, 0, 0),
-                            Child = target = new TestControl
-                            {
-                                Width = 10, Height = 10, Margin = new Thickness(-100, -100, 0, 0),
-                            }
-                        }
-                    }
-                };
-
-                Render(container);
-
-                Assert.True(target.Rendered);
-            }
-        }
-
-        private void Render(IControl control)
-        {
-            var ctx = CreateDrawingContext();
-            control.Measure(Size.Infinity);
-            control.Arrange(new Rect(control.DesiredSize));
-            ImmediateRenderer.Render(control, ctx);
-        }
-
-        private DrawingContext CreateDrawingContext()
-        {
-            return new DrawingContext(Mock.Of<IDrawingContextImpl>());
-        }
-
-        private class TestControl : Control
-        {
-            public bool Rendered { get; private set; }
-
-            public override void Render(DrawingContext context)
-            {
-                Rendered = true;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs
deleted file mode 100644
index 3221f097ad..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    internal class CustomHitTestBorder : Border, ICustomHitTest
-    {
-        public bool HitTest(Point point)
-        {
-            // Move hit testing window halfway to the left
-            return Bounds
-                .WithX(Bounds.X - Bounds.Width / 2)  
-                .Contains(point);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
deleted file mode 100644
index e58eea42d8..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ /dev/null
@@ -1,782 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Subjects;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Threading;
-using Avalonia.UnitTests;
-using Avalonia.Visuals.Media.Imaging;
-using Avalonia.VisualTree;
-
-using Moq;
-
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class DeferredRendererTests
-    {
-        [Fact]
-        public void First_Frame_Calls_SceneBuilder_UpdateAll()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot();
-                var sceneBuilder = MockSceneBuilder(root);
-
-                CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
-
-                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
-            }
-        }
-
-        [Fact]
-        public void Frame_Does_Not_Call_SceneBuilder_If_No_Dirty_Controls()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-                var root = new TestRoot();
-                var sceneBuilder = MockSceneBuilder(root);
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder.Object);
-
-                target.Start();
-                IgnoreFirstFrame(target, sceneBuilder);
-                RunFrame(target);
-
-                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()), Times.Never);
-                sceneBuilder.Verify(x => x.Update(It.IsAny<Scene>(), It.IsAny<Visual>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Dirty_Controls_In_Order()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Border border;
-                Decorator decorator;
-                Canvas canvas;
-
-                var root = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border { Child = canvas = new Canvas() }
-                    }
-                };
-
-                var sceneBuilder = MockSceneBuilder(root);
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder.Object,
-                    dispatcher: dispatcher);
-
-                target.Start();
-                IgnoreFirstFrame(target, sceneBuilder);
-                target.AddDirty(border);
-                target.AddDirty(canvas);
-                target.AddDirty(root);
-                target.AddDirty(decorator);
-
-                var result = new List<IVisual>();
-
-                sceneBuilder.Setup(x => x.Update(It.IsAny<Scene>(), It.IsAny<IVisual>()))
-                    .Callback<Scene, IVisual>((_, v) => result.Add(v));
-
-                RunFrame(target);
-
-                Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
-            }
-        }
-
-        [Fact]
-        public void Should_Add_Dirty_Rect_On_Child_Remove()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Decorator decorator;
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border { Width = 50, Height = 50, Background = Brushes.Red, },
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                decorator.Child = null;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(decorator);
-                var dirty = scene.Layers[0].Dirty.ToList();
-
-                Assert.Equal(1, dirty.Count);
-                Assert.Equal(new Rect(25, 25, 50, 50), dirty[0]);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_Child_Remove_Insert()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                stack.Children.Remove(canvas2);
-                stack.Children.Insert(0, canvas2);
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_Child_Move()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                stack.Children.Move(1, 0);
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_ZIndex_Change()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children =
-                        {
-                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
-                        }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                canvas1.ZIndex = 3;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_ZIndex_Change_With_Dirty_Ancestor()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children =
-                        {
-                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
-                        }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                root.InvalidateVisual();
-                canvas1.ZIndex = 3;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Decorator moveFrom;
-                Decorator moveTo;
-                Canvas moveMe;
-
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            (moveFrom = new Decorator { Child = moveMe = new Canvas(), }),
-                            (moveTo = new Decorator()),
-                        }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                moveFrom.Child = null;
-                moveTo.Child = moveMe;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                var moveToNode = (VisualNode)scene.FindNode(moveTo);
-
-                Assert.Empty(moveFromNode.Children);
-                Assert.Equal(1, moveToNode.Children.Count);
-                Assert.Same(moveMe, moveToNode.Children[0].Visual);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent_And_New_Root()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Decorator moveFrom;
-                Decorator moveTo;
-                Canvas moveMe;
-
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children = { (moveFrom = new Decorator { Child = moveMe = new Canvas(), }) }
-                    }
-                };
-
-                var otherRoot = new TestRoot { Child = new StackPanel { Children = { (moveTo = new Decorator()) } } };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                var otherSceneBuilder = new SceneBuilder();
-
-                var otherTarget = new DeferredRenderer(
-                    otherRoot,
-                    loop.Object,
-                    sceneBuilder: otherSceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                otherRoot.Renderer = otherTarget;
-
-                target.Start();
-                otherTarget.Start();
-
-                RunFrame(target);
-                RunFrame(otherTarget);
-
-                moveFrom.Child = null;
-                moveTo.Child = moveMe;
-
-                RunFrame(target);
-                RunFrame(otherTarget);
-
-                var scene = target.UnitTestScene();
-                var otherScene = otherTarget.UnitTestScene();
-
-                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                var moveToNode = (VisualNode)otherScene.FindNode(moveTo);
-
-                Assert.Empty(moveFromNode.Children);
-                Assert.Equal(1, moveToNode.Children.Count);
-                Assert.Same(moveMe, moveToNode.Children[0].Visual);
-            }
-        }
-
-        [Fact]
-        public void Should_Push_Opacity_For_Controls_With_Less_Than_1_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot
-                {
-                    Width = 100, Height = 100, Child = new Border { Background = Brushes.Red, Opacity = 0.5, }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, root);
-                var animation = new BehaviorSubject<double>(0.5);
-
-                context.Verify(x => x.PushOpacity(0.5), Times.Once);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
-                context.Verify(x => x.PopOpacity(), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Draw_Controls_With_0_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border
-                    {
-                        Background = Brushes.Red,
-                        Opacity = 0,
-                        Child = new Border { Background = Brushes.Green, }
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, root);
-                var animation = new BehaviorSubject<double>(0.5);
-
-                context.Verify(x => x.PushOpacity(0.5), Times.Never);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Never);
-                context.Verify(x => x.PopOpacity(), Times.Never);
-            }
-        }
-
-        [Fact]
-        public void Should_Push_Opacity_Mask()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border { Background = Brushes.Red, OpacityMask = Brushes.Green, }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, root);
-                var animation = new BehaviorSubject<double>(0.5);
-
-                context.Verify(x => x.PushOpacityMask(Brushes.Green, new Rect(0, 0, 100, 100)), Times.Once);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
-                context.Verify(x => x.PopOpacityMask(), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Should_Create_Layer_For_Root()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot();
-                var rootLayer = new Mock<IRenderTargetBitmapImpl>();
-
-                var sceneBuilder = new Mock<ISceneBuilder>();
-
-                sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
-                    .Callback<Scene>(scene =>
-                    {
-                        scene.Size = root.ClientSize;
-                        scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
-                    });
-
-                var renderInterface = new Mock<IPlatformRenderInterface>();
-                var target = CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
-
-                Assert.Single(target.Layers);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Create_And_Delete_Layers_For_Controls_With_Animated_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border
-                    {
-                        Background = Brushes.Red,
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Green, Child = new Canvas(), Opacity = 0.9,
-                        }
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var timer = new Mock<IRenderTimer>();
-                var target = CreateTargetAndRunFrame(root, timer);
-
-                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-                RunFrame(target);
-
-                Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
-
-                animation.OnCompleted();
-                RunFrame(target);
-
-                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Not_Create_Layer_For_Childless_Control_With_Animated_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border
-                    {
-                        Background = Brushes.Red, Child = border = new Border { Background = Brushes.Green, }
-                    }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var timer = new Mock<IRenderTimer>();
-                var target = CreateTargetAndRunFrame(root, timer);
-
-                Assert.Single(target.Layers);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Not_Push_Opacity_For_Transparent_Layer_Root_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, border);
-
-                context.Verify(x => x.PushOpacity(0.5), Times.Never);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
-                context.Verify(x => x.PopOpacity(), Times.Never);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Draw_Transparent_Layer_With_Correct_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = Mock.Get(target.RenderTarget.CreateDrawingContext(null));
-                var borderLayer = target.Layers[border].Bitmap;
-
-                context.Verify(x => x.DrawBitmap(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>(),
-                    BitmapInterpolationMode.Default));
-            }
-        }
-
-        [Fact]
-        public void Can_Dirty_Control_In_SceneInvalidated()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border1;
-                Border border2;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            (border1 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
-                            (border2 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
-                        }
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var invalidated = false;
-
-                target.SceneInvalidated += (s, e) =>
-                {
-                    invalidated = true;
-                    target.AddDirty(border2);
-                };
-
-                target.AddDirty(border1);
-                target.Paint(new Rect(root.DesiredSize));
-
-                Assert.True(invalidated);
-                Assert.True(((IRenderLoopTask)target).NeedsUpdate);
-            }
-        }
-
-        private DeferredRenderer CreateTargetAndRunFrame(
-            TestRoot root,
-            Mock<IRenderTimer> timer = null,
-            ISceneBuilder sceneBuilder = null,
-            IDispatcher dispatcher = null)
-        {
-            timer = timer ?? new Mock<IRenderTimer>();
-            dispatcher = dispatcher ?? new ImmediateDispatcher();
-            var target = new DeferredRenderer(
-                root,
-                new RenderLoop(timer.Object, dispatcher),
-                sceneBuilder: sceneBuilder,
-                dispatcher: dispatcher);
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
-            return target;
-        }
-
-        private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
-        {
-            return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
-        }
-
-        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
-        {
-            RunFrame(task);
-            sceneBuilder.Invocations.Clear();
-        }
-
-        private void RunFrame(IRenderLoopTask task)
-        {
-            task.Update(TimeSpan.Zero);
-            task.Render();
-        }
-
-        private IRenderTargetBitmapImpl CreateLayer()
-        {
-            return Mock.Of<IRenderTargetBitmapImpl>(x =>
-                x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
-        }
-
-        private Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
-        {
-            var result = new Mock<ISceneBuilder>();
-            result.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
-                .Callback<Scene>(x => x.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)));
-            return result;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
deleted file mode 100644
index d24d183709..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ /dev/null
@@ -1,546 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Shapes;
-using Avalonia.Input;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class DeferredRendererTests_HitTesting
-    {
-        [Fact]
-        public void HitTest_Should_Find_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { root.Child }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Empty_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                Border visible;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        IsVisible = false,
-                        Child = visible = new Border
-                        {
-                            Background = Brushes.Red,
-                            HorizontalAlignment = HorizontalAlignment.Stretch,
-                            VerticalAlignment = VerticalAlignment.Stretch,
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
-
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { container.Children[1], container.Children[0] }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 75,
-                                Height = 75,
-                                ZIndex = 2,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { container.Children[2], container.Children[0], container.Children[1] }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        ClipToBounds = false,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Left,
-                                VerticalAlignment = VerticalAlignment.Top,
-                                Child = target = new Border
-                                {
-                                    Width = 50,
-                                    Height = 50,
-                                    Background = Brushes.Red,
-                                    HorizontalAlignment = HorizontalAlignment.Left,
-                                    VerticalAlignment = VerticalAlignment.Top,
-                                    RenderTransform = new TranslateTransform(110, 110),
-                                }
-                            },
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                container.Measure(Size.Infinity);
-                container.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
-
-                Assert.Equal(new IVisual[] { target, container }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            new Panel()
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                ClipToBounds = true,
-                                Children =
-                                {
-                                    (target = new Border()
-                                    {
-                                        Width = 100,
-                                        Height = 100,
-                                        Background = Brushes.Red,
-                                        Margin = new Thickness(0, -100, 0, 0)
-                                    })
-                                }
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
-
-                Assert.Equal(new[] { container }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Border item1;
-                Border item2;
-                ScrollContentPresenter scroll;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            (target = new Border()
-                            {
-                                Name = "b1",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                            }),
-                            new Border()
-                            {
-                                Name = "b2",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                Child = scroll = new ScrollContentPresenter()
-                                {
-                                    CanHorizontallyScroll = true,
-                                    CanVerticallyScroll = true,
-                                    Content = new StackPanel()
-                                    {
-                                        Children =
-                                        {
-                                            (item1 = new Border()
-                                            {
-                                                Name = "b3",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                            (item2 = new Border()
-                                            {
-                                                Name = "b4",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                };
-
-                scroll.UpdateChild();
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                
-                root.Renderer.Paint(Rect.Empty);
-                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-
-                Assert.Equal(item1, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-
-                Assert.Equal(target, result);
-
-                scroll.Offset = new Vector(0, 100);
-
-                // We don't have LayoutManager set up so do the layout pass manually.
-                scroll.Parent.InvalidateArrange();
-                container.InvalidateArrange();
-                container.Arrange(new Rect(container.DesiredSize));
-
-                root.Renderer.Paint(Rect.Empty);
-                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-                Assert.Equal(item2, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-                Assert.Equal(target, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Path_When_Outside_Fill()
-        {
-            using (TestApplication())
-            {
-                Path path;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = path = new Path
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Fill = Brushes.Red,
-                        Data = StreamGeometry.Parse("M100,0 L0,100 100,100")
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-                Assert.Equal(new[] { path }, result);
-
-                result = root.Renderer.HitTest(new Point(10, 10), root, null);
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Respect_Geometry_Clip()
-        {
-            using (TestApplication())
-            {
-                Border border;
-                Canvas canvas;
-                var root = new TestRoot
-                {
-                    Width = 400,
-                    Height = 400,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Red,
-                        Clip = StreamGeometry.Parse("M100,0 L0,100 100,100"),
-                        Width = 200,
-                        Height = 200,
-                        Child = canvas = new Canvas
-                        {
-                            Background = Brushes.Yellow,
-                            Margin = new Thickness(10),
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                Assert.Equal(new Rect(100, 100, 200, 200), border.Bounds);
-
-                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
-
-                var result = root.Renderer.HitTest(new Point(200, 200), root, null);
-                Assert.Equal(new IVisual[] { canvas, border }, result);
-
-                result = root.Renderer.HitTest(new Point(110, 110), root, null);
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Accommodate_ICustomHitTest()
-        {
-            using (TestApplication())
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 300,
-                    Height = 200,
-                    Child = border = new CustomHitTestBorder
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                }; 
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(75, 100), root, null);
-                Assert.Equal(new[] { border }, result);
-
-                result = root.Renderer.HitTest(new Point(125, 100), root, null);
-                Assert.Equal(new[] { border }, result);
-
-                result = root.Renderer.HitTest(new Point(175, 100), root, null);
-                Assert.Empty(result);
-            }
-        }
-
-        private IDisposable TestApplication()
-        {
-            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
deleted file mode 100644
index 6859b2b139..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class ImmediateRendererTests
-    {
-        [Fact]
-        public void AddDirty_Call_RenderRoot_Invalidate()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var visual = new Mock<Visual>();
-                var child = new Mock<Visual>() { CallBase = true };
-                var renderRoot = visual.As<IRenderRoot>();
-
-                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
-
-                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(10, 10, 100, 100));
-                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
-
-                var target = new ImmediateRenderer(visual.Object);
-
-                target.AddDirty(child.Object);
-
-                renderRoot.Verify(v => v.Invalidate(new Rect(10, 10, 100, 100)));
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void AddDirty_With_RenderTransform_Call_RenderRoot_Invalidate()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var visual = new Mock<Visual>();
-                var child = new Mock<Visual>() { CallBase = true };
-                var renderRoot = visual.As<IRenderRoot>();
-
-                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
-
-                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(100, 100, 100, 100));
-                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
-                child.Object.RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 };
-
-                var target = new ImmediateRenderer(visual.Object);
-
-                target.AddDirty(child.Object);
-
-                renderRoot.Verify(v => v.Invalidate(new Rect(50, 50, 200, 200)));
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void AddDirty_For_Child_Moved_Should_Invalidate_Previous_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var visual = new Mock<Visual>() { CallBase = true };
-                var child = new Mock<Visual>() { CallBase = true };
-                var renderRoot = visual.As<IRenderRoot>();
-                var renderTarget = visual.As<IRenderTarget>();
-
-                renderRoot.Setup(r => r.CreateRenderTarget()).Returns(renderTarget.Object);
-
-                renderTarget.Setup(r => r.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()))
-                    .Returns(Mock.Of<IDrawingContextImpl>());
-
-                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
-
-                visual.As<IVisual>().Setup(v => v.VisualChildren)
-                    .Returns(new AvaloniaList<IVisual>() { child.As<IVisual>().Object });
-
-                Rect childBounds = new Rect(0, 0, 100, 100);
-                child.As<IVisual>().Setup(v => v.Bounds).Returns(() => childBounds);
-                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
-                child.As<IVisual>().Setup(v => v.VisualChildren).Returns(new AvaloniaList<IVisual>());
-
-                var invalidationCalls = new List<Rect>();
-
-                renderRoot.Setup(v => v.Invalidate(It.IsAny<Rect>())).Callback<Rect>(v => invalidationCalls.Add(v));
-
-                var target = new ImmediateRenderer(visual.Object);
-
-                target.AddDirty(child.Object);
-
-                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[0]);
-
-                target.Paint(new Rect(0, 0, 100, 100));
-
-                //move child 100 pixels bottom/right
-                childBounds = new Rect(100, 100, 100, 100);
-
-                //renderer should invalidate old child bounds with new one
-                //as on old area there can be artifacts
-                target.AddDirty(child.Object);
-
-                //invalidate first old position
-                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[1]);
-
-                //then new position
-                Assert.Equal(new Rect(100, 100, 100, 100), invalidationCalls[2]);
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void Should_Render_Child_In_Parent_With_RenderTransform()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var targetMock = new Mock<Control>() { CallBase = true };
-                var target = targetMock.Object;
-                target.Width = 100;
-                target.Height = 50;
-
-                var child = new Panel()
-                {
-                    RenderTransform = new RotateTransform() { Angle = 90 },
-                    Children = { new Panel() { Children = { target } } }
-                };
-
-                var visualTarget = targetMock.As<IVisual>();
-                int rendered = 0;
-                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
-
-                var root = new TestRoot(child);
-                root.Renderer = new ImmediateRenderer(root);
-
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                root.Measure(new Size(50, 100));
-                root.Arrange(new Rect(new Size(50, 100)));
-
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.Equal(1, rendered);
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void Should_Render_Child_In_Parent_With_RenderTransform2()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var targetMock = new Mock<Control>() { CallBase = true };
-                var target = targetMock.Object;
-
-                target.Width = 100;
-                target.Height = 50;
-                target.HorizontalAlignment = HorizontalAlignment.Center;
-                target.VerticalAlignment = VerticalAlignment.Center;
-
-                var child = new Panel()
-                {
-                    RenderTransform = new RotateTransform() { Angle = 90 },
-                    Children = { new Panel() { Children = { target } } }
-                };
-
-                var visualTarget = targetMock.As<IVisual>();
-                int rendered = 0;
-                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
-
-                var root = new TestRoot(child);
-                root.Renderer = new ImmediateRenderer(root);
-
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                root.Measure(new Size(300, 100));
-                root.Arrange(new Rect(new Size(300, 100)));
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.Equal(1, rendered);
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Clip_Children_With_RenderTransform_When_In_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                const int RootWidth = 300;
-                const int RootHeight = 300;
-
-                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
-
-                var stackPanel = new StackPanel
-                {
-                    Orientation = Orientation.Horizontal,
-                    VerticalAlignment = VerticalAlignment.Top,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Margin = new Thickness(0, 10, 0, 0),
-                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
-                    RenderTransform = new TransformGroup
-                    {
-                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 240 } }
-                    }
-                };
-
-                rootGrid.Children.Add(stackPanel);
-
-                TestControl CreateControl()
-                    => new TestControl
-                    {
-                        Width = 80, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
-                    };
-
-                var control1 = CreateControl();
-                var control2 = CreateControl();
-                var control3 = CreateControl();
-
-                stackPanel.Children.Add(control1);
-                stackPanel.Children.Add(control2);
-                stackPanel.Children.Add(control3);
-
-                var root = new TestRoot(rootGrid);
-                root.Renderer = new ImmediateRenderer(root);
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                var rootSize = new Size(RootWidth, RootHeight);
-                root.Measure(rootSize);
-                root.Arrange(new Rect(rootSize));
-
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.True(control1.Rendered);
-                Assert.True(control2.Rendered);
-                Assert.True(control3.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Render_Clipped_Child_With_RenderTransform_When_Not_In_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                const int RootWidth = 300;
-                const int RootHeight = 300;
-
-                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
-
-                var stackPanel = new StackPanel
-                {
-                    Orientation = Orientation.Horizontal,
-                    VerticalAlignment = VerticalAlignment.Top,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Margin = new Thickness(0, 10, 0, 0),
-                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
-                    RenderTransform = new TransformGroup
-                    {
-                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 280 } }
-                    }
-                };
-
-                rootGrid.Children.Add(stackPanel);
-
-                TestControl CreateControl()
-                    => new TestControl
-                    {
-                        Width = 160, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
-                    };
-
-                var control1 = CreateControl();
-                var control2 = CreateControl();
-                var control3 = CreateControl();
-
-                stackPanel.Children.Add(control1);
-                stackPanel.Children.Add(control2);
-                stackPanel.Children.Add(control3);
-
-                var root = new TestRoot(rootGrid);
-                root.Renderer = new ImmediateRenderer(root);
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                var rootSize = new Size(RootWidth, RootHeight);
-                root.Measure(rootSize);
-                root.Arrange(new Rect(rootSize));
-
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.True(control1.Rendered);
-                Assert.True(control2.Rendered);
-                Assert.False(control3.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Static_Render_Method_Does_Not_Update_TransformedBounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var target = new Border();
-                var expected = new TransformedBounds(new Rect(1, 2, 3, 4), new Rect(4, 5, 6, 7), Matrix.CreateRotation(0.8));
-
-                ((IVisual)target).TransformedBounds = expected;
-
-                var renderTarget = Mock.Of<IRenderTarget>(x => 
-                    x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
-                ImmediateRenderer.Render(target, renderTarget);
-
-                Assert.Equal(expected, target.TransformedBounds);
-            }
-        }
-
-        private class TestControl : Control
-        {
-            public bool Rendered { get; private set; }
-
-            public override void Render(DrawingContext context)
-                => Rendered = true;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
deleted file mode 100644
index a3b0a0cdd5..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class ImmediateRendererTests_HitTesting
-    {
-        [Fact]
-        public void HitTest_Should_Find_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { root.Child, root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                Border visible;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        IsVisible = false,
-                        Child = visible = new Border
-                        {
-                            Background = Brushes.Red,
-                            HorizontalAlignment = HorizontalAlignment.Stretch,
-                            VerticalAlignment = VerticalAlignment.Stretch,
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
-
-                Assert.Equal(new[] { root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { container.Children[1], container.Children[0], container, root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 75,
-                                Height = 75,
-                                ZIndex = 2,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(
-                    new[] 
-                    {
-                        container.Children[2],
-                        container.Children[0],
-                        container.Children[1],
-                        container,
-                        root
-                    }, 
-                    result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        ClipToBounds = false,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Left,
-                                VerticalAlignment = VerticalAlignment.Top,
-                                Child = target = new Border
-                                {
-                                    Width = 50,
-                                    Height = 50,
-                                    Background = Brushes.Red,
-                                    HorizontalAlignment = HorizontalAlignment.Left,
-                                    VerticalAlignment = VerticalAlignment.Top,
-                                    RenderTransform = new TranslateTransform(110, 110),
-                                }
-                            },
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                container.Measure(Size.Infinity);
-                container.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
-
-                Assert.Equal(new IVisual[] { target, container }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            new Panel()
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                ClipToBounds = true,
-                                Children =
-                                {
-                                    (target = new Border()
-                                    {
-                                        Width = 100,
-                                        Height = 100,
-                                        Background = Brushes.Red,
-                                        Margin = new Thickness(0, -100, 0, 0)
-                                    })
-                                }
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
-
-                Assert.Equal(new IVisual[] { container, root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Border item1;
-                Border item2;
-                ScrollContentPresenter scroll;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            (target = new Border()
-                            {
-                                Name = "b1",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                            }),
-                            new Border()
-                            {
-                                Name = "b2",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                Child = scroll = new ScrollContentPresenter()
-                                {
-                                    CanHorizontallyScroll = true,
-                                    CanVerticallyScroll = true,
-                                    Content = new StackPanel()
-                                    {
-                                        Children =
-                                        {
-                                            (item1 = new Border()
-                                            {
-                                                Name = "b3",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                            (item2 = new Border()
-                                            {
-                                                Name = "b4",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                };
-
-                scroll.UpdateChild();
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-
-                Assert.Equal(item1, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-
-                Assert.Equal(target, result);
-
-                scroll.Offset = new Vector(0, 100);
-
-                // We don't have LayoutManager set up so do the layout pass manually.
-                scroll.Parent.InvalidateArrange();
-                container.InvalidateArrange();
-                container.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-                Assert.Equal(item2, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-                Assert.Equal(target, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Accommodate_ICustomHitTest()
-        {
-            using (TestApplication())
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 300,
-                    Height = 200,
-                    Child = border = new CustomHitTestBorder
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(75, 100), root, null).First();
-                Assert.Equal(border, result);
-
-                result = root.Renderer.HitTest(new Point(125, 100), root, null).First();
-                Assert.Equal(border, result);
-
-                result = root.Renderer.HitTest(new Point(175, 100), root, null).First();
-                Assert.Equal(root, result);
-            }
-        }
-
-        private IDisposable TestApplication()
-        {
-            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs
deleted file mode 100644
index e9aefc46e6..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Rendering;
-using Avalonia.Threading;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class RenderLoopTests
-    {
-        [Fact]
-        public void RenderLoop_Update_Runs_On_Dispatcher()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-
-            bool inDispatcher = false;
-
-            dispatcher.Setup(
-                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) =>
-                {
-                    inDispatcher = true;
-                    a();
-                    inDispatcher = false;
-                });
-
-            var timer = new Mock<IRenderTimer>();
-
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-
-            var renderTask = new Mock<IRenderLoopTask>();
-
-            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
-            renderTask.Setup(t => t.Update(It.IsAny<TimeSpan>()))
-                .Callback((TimeSpan _) => Assert.True(inDispatcher));
-
-            loop.Add(renderTask.Object);
-
-            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
-
-            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
-        }
-
-        [Fact]
-        public void RenderLoop_Does_Not_Update_When_No_Tasks_Need_Update()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-            dispatcher.Setup(
-                d => d.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) => a())
-                .Returns(Task.CompletedTask);
-
-            var timer = new Mock<IRenderTimer>();
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-            var renderTask = new Mock<IRenderLoopTask>();
-            renderTask.Setup(t => t.NeedsUpdate).Returns(false);
-
-            loop.Add(renderTask.Object);
-            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
-            
-            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Never());
-        }
-
-        [Fact]
-        public void RenderLoop_Render_Runs_Off_Dispatcher()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-            bool inDispatcher = false;
-            dispatcher.Setup(
-                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) =>
-                {
-                    inDispatcher = true;
-                    a();
-                    inDispatcher = false;
-                });
-
-            var timer = new Mock<IRenderTimer>();
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-
-            var renderTask = new Mock<IRenderLoopTask>();
-
-            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
-            renderTask.Setup(t => t.Render())
-                .Callback(() => Assert.False(inDispatcher));
-
-            loop.Add(renderTask.Object);
-            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
-
-            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
-        }
-        
-        [Fact]
-        public void RenderLoop_Passes_Tick_Count_To_Update()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-            dispatcher.Setup(
-                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) => a());
-
-            var timer = new Mock<IRenderTimer>();
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-            var renderTask = new Mock<IRenderLoopTask>();
-            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
-
-            loop.Add(renderTask.Object);
-            var time = new TimeSpan(123456789L);
-            timer.Raise(t => t.Tick += null, time);
-
-            renderTask.Verify(t => t.Update(time), Times.Once());
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
deleted file mode 100644
index 27aa0c55b5..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class DeferredDrawingContextImplTests
-    {
-        [Fact]
-        public void Should_Add_VisualNode()
-        {
-            var parent = new VisualNode(new TestRoot(), null);
-            var child = new VisualNode(Mock.Of<IVisual>(), parent);
-            var layers = new SceneLayers(parent.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            target.BeginUpdate(parent);
-            target.BeginUpdate(child);
-
-            Assert.Equal(1, parent.Children.Count);
-            Assert.Same(child, parent.Children[0]);
-        }
-
-        [Fact]
-        public void Should_Not_Replace_Identical_VisualNode()
-        {
-            var parent = new VisualNode(new TestRoot(), null);
-            var child = new VisualNode(Mock.Of<IVisual>(), parent);
-            var layers = new SceneLayers(parent.Visual);
-
-            parent.AddChild(child);
-
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            target.BeginUpdate(parent);
-            target.BeginUpdate(child);
-
-            Assert.Equal(1, parent.Children.Count);
-            Assert.Same(child, parent.Children[0]);
-        }
-
-        [Fact]
-        public void Should_Replace_Different_VisualNode()
-        {
-            var parent = new VisualNode(new TestRoot(), null);
-            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var layers = new SceneLayers(parent.Visual);
-
-            parent.AddChild(child1);
-
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            target.BeginUpdate(parent);
-            target.BeginUpdate(child2);
-
-            Assert.Equal(1, parent.Children.Count);
-            Assert.Same(child2, parent.Children[0]);
-        }
-
-        [Fact]
-        public void TrimChildren_Should_Trim_Children()
-        {
-            var root = new TestRoot();
-            var node = new VisualNode(root, null) { LayerRoot = root };
-
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-
-            var layers = new SceneLayers(root);
-            var target = new DeferredDrawingContextImpl(null, layers);
-            var child1 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
-            var child2 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
-
-            target.BeginUpdate(node);
-            using (target.BeginUpdate(child1)) { }
-            using (target.BeginUpdate(child2)) { }
-            target.TrimChildren();
-
-            Assert.Equal(2, node.Children.Count);
-        }
-
-        [Fact]
-        public void Should_Add_DrawOperations()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Red, new Pen(Brushes.Green, 1), new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void Should_Not_Replace_Identical_DrawOperation()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-            node.AddDrawOperation(operation);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.Same(operation.Item, node.DrawOperations.Single().Item);
-
-            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void Should_Replace_Different_DrawOperation()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-            node.AddDrawOperation(operation);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.NotSame(operation, node.DrawOperations.Single());
-
-            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void Should_Update_DirtyRects()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default);
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(new Rect(0, 0, 100, 100), layers.Single().Dirty.Single());
-        }
-
-        [Fact]
-        public void Should_Trim_DrawOperations()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            node.LayerRoot = node.Visual;
-
-            for (var i = 0; i < 4; ++i)
-            {
-                var drawOperation = new Mock<IDrawOperation>();
-                using (var r = RefCountable.Create(drawOperation.Object))
-                {
-                    node.AddDrawOperation(r);
-                }
-            }
-
-            var drawOperations = node.DrawOperations.Select(op => op.Item).ToList();
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 10, 100));
-                target.DrawRectangle(Brushes.Blue, null, new Rect(0, 0, 20, 100));
-            }
-
-            Assert.Equal(2, node.DrawOperations.Count);
-
-            foreach (var i in drawOperations)
-            {
-                Mock.Get(i).Verify(x => x.Dispose());
-            }
-        }
-
-        [Fact]
-        public void Trimmed_DrawOperations_Releases_Reference()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-            node.AddDrawOperation(operation);
-            Assert.Equal(2, operation.RefCount);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.NotSame(operation, node.DrawOperations.Single());
-            Assert.Equal(1, operation.RefCount);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
deleted file mode 100644
index 0cdc8827ad..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{  
-    public class DrawOperationTests
-    {
-        [Fact]
-        public void Empty_Bounds_Remain_Empty()
-        {
-            var target = new TestDrawOperation(Rect.Empty, Matrix.Identity, null);
-
-            Assert.Equal(Rect.Empty, target.Bounds);
-        }
-
-        [Theory]
-        [InlineData(10, 10, 10, 10, 1, 1, 1, 9, 9, 12, 12)]
-        [InlineData(10, 10, 10, 10, 1, 1, 2, 9, 9, 12, 12)]
-        [InlineData(10, 10, 10, 10, 1.5, 1.5, 1, 14, 14, 17, 17)]
-        public void Rectangle_Bounds_Are_Snapped_To_Pixels(
-            double x,
-            double y,
-            double width,
-            double height,
-            double scaleX,
-            double scaleY,
-            double? penThickness,
-            double expectedX,
-            double expectedY,
-            double expectedWidth,
-            double expectedHeight)
-        {
-            var target = new TestRectangleDrawOperation(
-                new Rect(x, y, width, height),
-                Matrix.CreateScale(scaleX, scaleY),
-                penThickness.HasValue ? new Pen(Brushes.Black, penThickness.Value) : null);
-            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), target.Bounds);
-        }
-
-        [Fact]
-        public void Image_Node_Releases_Reference_To_Bitmap_On_Dispose()
-        {
-            var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
-            var imageNode = new ImageNode(
-                Matrix.Identity,
-                bitmap,
-                1,
-                new Rect(1, 1, 1, 1),
-                new Rect(1, 1, 1, 1),
-                BitmapInterpolationMode.Default);
-
-            Assert.Equal(2, bitmap.RefCount);
-
-            imageNode.Dispose();
-
-            Assert.Equal(1, bitmap.RefCount);
-        }
-
-        [Fact]
-        public void HitTest_On_Geometry_Node_With_Zero_Transform_Does_Not_Throw()
-        {
-            var geometry = Mock.Of<IGeometryImpl>();
-            var geometryNode = new GeometryNode(
-                new Matrix(),
-                Brushes.Black,
-                null,
-                geometry, default);
-
-            geometryNode.HitTest(new Point());
-        }
-
-        private class TestRectangleDrawOperation : RectangleNode
-        {
-            public TestRectangleDrawOperation(Rect bounds, Matrix transform, Pen pen) 
-                : base(transform, pen.Brush, pen, bounds, new BoxShadows())
-            {
-
-            }
-
-            public override bool HitTest(Point p) => false;
-
-            public override void Render(IDrawingContextImpl context) { }
-        }
-
-        private class TestDrawOperation : DrawOperation
-        {
-            public TestDrawOperation(Rect bounds, Matrix transform, Pen pen)
-                :base(bounds, transform)
-            {
-            }
-
-            public override bool HitTest(Point p) => false;
-
-            public override void Render(IDrawingContextImpl context) { }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
deleted file mode 100644
index e317b43efc..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ /dev/null
@@ -1,991 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-using Avalonia.Layout;
-using Moq;
-using Avalonia.Platform;
-using System.Reactive.Subjects;
-using Avalonia.Data;
-using Avalonia.Utilities;
-using Avalonia.Media.Imaging;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public partial class SceneBuilderTests
-    {
-        [Fact]
-        public void Should_Build_Initial_Scene()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                TextBlock textBlock;
-                var tree = new TestRoot
-                {
-                    Child = border = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        Child = textBlock = new TextBlock
-                        {
-                            TextWrapping = TextWrapping.NoWrap,
-                            Text = "Hello World",
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                Assert.Same(tree, ((VisualNode)result.Root).LayerRoot);
-                Assert.Equal(1, result.Root.Children.Count);
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Same(borderNode, result.FindNode(border));
-                Assert.Same(border, borderNode.Visual);
-                Assert.Equal(1, borderNode.Children.Count);
-                Assert.Equal(1, borderNode.DrawOperations.Count);
-
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
-                Assert.Equal(Brushes.Red, backgroundNode.Brush);
-
-                var textBlockNode = borderNode.Children[0];
-                Assert.Same(textBlockNode, result.FindNode(textBlock));
-                Assert.Same(textBlock, textBlockNode.Visual);
-                Assert.Equal(1, textBlockNode.DrawOperations.Count);
-
-                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
-                Assert.NotNull(textNode.GlyphRun);
-            }
-        }
-
-        [Fact]
-        public void Should_Respect_Margin_For_ClipBounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 200,
-                    Height = 300,
-                    Child = new Border
-                    {
-                        Margin = new Thickness(10, 20, 30, 40),
-                        Child = canvas = new Canvas
-                        {
-                            ClipToBounds = true,
-                            Background = Brushes.AliceBlue,
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var canvasNode = result.FindNode(canvas);
-                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
-
-                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
-                result = result.CloneScene();
-                Assert.True(sceneBuilder.Update(result, canvas));
-
-                canvasNode = result.FindNode(canvas);
-                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void ClipBounds_Should_Be_Intersection_With_Parent_ClipBounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 200,
-                    Height = 300,
-                    Child = new Canvas
-                    {
-                        ClipToBounds = true,
-                        Width = 100,
-                        Height = 100,
-                        HorizontalAlignment = HorizontalAlignment.Left,
-                        VerticalAlignment = VerticalAlignment.Top,
-                        Children =
-                        {
-                            (border = new Border
-                            {
-                                Background = Brushes.AliceBlue,
-                                ClipToBounds = true,
-                                Width = 100,
-                                Height = 100,
-                                [Canvas.LeftProperty] = 50,
-                                [Canvas.TopProperty] = 50,
-                            })
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Descendent_ClipBounds_When_Margin_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 200,
-                    Height = 300,
-                    Child = canvas = new Canvas
-                    {
-                        ClipToBounds = true,
-                        Width = 100,
-                        Height = 100,
-                        HorizontalAlignment = HorizontalAlignment.Left,
-                        VerticalAlignment = VerticalAlignment.Top,
-                        Children =
-                        {
-                            (border = new Border
-                            {
-                                Background = Brushes.AliceBlue,
-                                ClipToBounds = true,
-                                Width = 100,
-                                Height = 100,
-                                [Canvas.LeftProperty] = 50,
-                                [Canvas.TopProperty] = 50,
-                            })
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
-
-                canvas.Width = canvas.Height = 125;
-                canvas.Measure(Size.Infinity);
-                canvas.Arrange(new Rect(tree.DesiredSize));
-
-                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
-                scene = scene.CloneScene();
-                Assert.True(sceneBuilder.Update(scene, canvas));
-
-                borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 75, 75), borderNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Should_Respect_ZIndex()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border front;
-                Border back;
-                var tree = new TestRoot
-                {
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (front = new Border
-                            {
-                                ZIndex = 1,
-                            }),
-                            (back = new Border
-                            {
-                                ZIndex = 0,
-                            }),
-                        }
-                    }
-                };
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var panelNode = result.FindNode(tree.Child);
-                var expected = new IVisual[] { back, front };
-                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
-                Assert.Equal(expected, actual);
-            }
-        }
-
-        [Fact]
-        public void Should_Respect_Uniform_ZIndex()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Panel panel;
-
-                var tree = new TestRoot
-                {
-                    Child = panel = new Panel()
-                };
-
-                for (var i = 0; i < 128; i++)
-                {
-                    panel.Children.Add(new Border());
-                }
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var panelNode = result.FindNode(tree.Child);
-                var expected = panel.Children.ToArray();
-                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
-                Assert.Equal(expected, actual);
-            }
-        }
-
-        [Fact]
-        public void ClipBounds_Should_Be_In_Global_Coordinates()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border target;
-                var tree = new TestRoot
-                {
-                    Child = new Decorator
-                    {
-                        Margin = new Thickness(24, 26),
-                        Child = target = new Border
-                        {
-                            ClipToBounds = true,
-                            Margin = new Thickness(26, 24),
-                            Width = 100,
-                            Height = 100,
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var targetNode = result.FindNode(target);
-
-                Assert.Equal(new Rect(50, 50, 100, 100), targetNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Transform_For_Control_With_RenderTransform_Should_Be_Correct_After_Update()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 400,
-                    Height = 200,
-                    Child = new Decorator
-                    {
-                        Width = 200,
-                        Height = 100,
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            HorizontalAlignment = HorizontalAlignment.Right,
-                            Width = 100,
-                            RenderTransform = new ScaleTransform(0.5, 1),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var expectedTransform = Matrix.CreateScale(0.5, 1) * Matrix.CreateTranslation(225, 50);
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(expectedTransform, borderNode.Transform);
-
-                scene = scene.CloneScene();
-                Assert.True(sceneBuilder.Update(scene, border));
-
-                borderNode = scene.FindNode(border);
-                Assert.Equal(expectedTransform, borderNode.Transform);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Border_Background_Node()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                TextBlock textBlock;
-                var tree = new TestRoot
-                {
-                    Child = border = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        Child = textBlock = new TextBlock
-                        {
-                            Foreground = Brushes.Green,
-                            Text = "Hello World",
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                var initialBackgroundNode = initial.FindNode(border).Children[0];
-                var initialTextNode = initial.FindNode(textBlock).DrawOperations[0];
-
-                Assert.NotNull(initialBackgroundNode);
-                Assert.NotNull(initialTextNode);
-
-                border.Background = Brushes.Green;
-
-                var result = initial.CloneScene();
-                sceneBuilder.Update(result, border);
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Same(border, borderNode.Visual);
-
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
-                Assert.NotSame(initialBackgroundNode, backgroundNode);
-                Assert.Equal(Brushes.Green, backgroundNode.Brush);
-
-                var textBlockNode = (VisualNode)borderNode.Children[0];
-                Assert.Same(textBlock, textBlockNode.Visual);
-
-                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
-                Assert.Same(initialTextNode.Item, textNode);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Added()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Red,
-                    }
-                };
-
-                Canvas canvas;
-                var decorator = new Decorator
-                {
-                    Child = canvas = new Canvas(),
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                border.Child = decorator;
-                var result = initial.CloneScene();
-
-                Assert.True(sceneBuilder.Update(result, decorator));
-
-                // Updating canvas should result in no-op as it should have been updated along 
-                // with decorator as part of the add opeation.
-                Assert.False(sceneBuilder.Update(result, canvas));
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Equal(1, borderNode.Children.Count);
-                Assert.Equal(1, borderNode.DrawOperations.Count);
-
-                var decoratorNode = (VisualNode)borderNode.Children[0];
-                Assert.Same(decorator, decoratorNode.Visual);
-                Assert.Same(decoratorNode, result.FindNode(decorator));
-
-                var canvasNode = (VisualNode)decoratorNode.Children[0];
-                Assert.Same(canvas, canvasNode.Visual);
-                Assert.Same(canvasNode, result.FindNode(canvas));
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Removed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                Decorator decorator;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Red,
-                        Child = decorator = new Decorator
-                        {
-                            Child = canvas = new Canvas
-                            {
-                                Background = Brushes.AliceBlue,
-                            }
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                border.Child = null;
-                var result = initial.CloneScene();
-
-                Assert.True(sceneBuilder.Update(result, decorator));
-                Assert.False(sceneBuilder.Update(result, canvas));
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Equal(0, borderNode.Children.Count);
-                Assert.Equal(1, borderNode.DrawOperations.Count);
-
-                Assert.Null(result.FindNode(decorator));
-                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Moved()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator moveFrom;
-                Decorator moveTo;
-                Canvas moveMe;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            (moveFrom = new Decorator
-                            {
-                                Child = moveMe = new Canvas(),
-                            }),
-                            (moveTo = new Decorator()),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                var moveToNode = (VisualNode)scene.FindNode(moveTo);
-
-                Assert.Equal(1, moveFromNode.Children.Count);
-                Assert.Same(moveMe, moveFromNode.Children[0].Visual);
-                Assert.Empty(moveToNode.Children);
-
-                moveFrom.Child = null;
-                moveTo.Child = moveMe;
-
-                scene = scene.CloneScene();
-                moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                moveToNode = (VisualNode)scene.FindNode(moveTo);
-
-                moveFromNode.SortChildren(scene);
-                moveToNode.SortChildren(scene);
-                sceneBuilder.Update(scene, moveFrom);
-                sceneBuilder.Update(scene, moveTo);
-                sceneBuilder.Update(scene, moveMe);
-
-                Assert.Empty(moveFromNode.Children);
-                Assert.Equal(1, moveToNode.Children.Count);
-                Assert.Same(moveMe, moveToNode.Children[0].Visual);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Made_Invisible()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                border.IsVisible = false;
-                var result = initial.CloneScene();
-
-                Assert.True(sceneBuilder.Update(result, border));
-                Assert.False(sceneBuilder.Update(result, canvas));
-
-                var decoratorNode = (VisualNode)result.Root.Children[0];
-                Assert.Equal(0, decoratorNode.Children.Count);
-
-                Assert.Null(result.FindNode(border));
-                Assert.Null(result.FindNode(canvas));
-                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Dispose_Active_VisualNode_When_Control_Reparented_And_Child_Made_Invisible()
-        {
-            // Issue #3115
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                StackPanel panel;
-                Border border1;
-                Border border2;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = panel = new StackPanel
-                    {
-                        Children =
-                        {
-                            (border1 = new Border
-                            {
-                                Background = Brushes.Red,
-                            }),
-                            (border2 = new Border
-                            {
-                                Background = Brushes.Green,
-                            }),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var decorator = new Decorator();
-                tree.Child = null;
-                decorator.Child = panel;
-                tree.Child = decorator;
-                border1.IsVisible = false;
-
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, decorator);
-
-                var panelNode = (VisualNode)scene.FindNode(panel);
-                Assert.Equal(2, panelNode.Children.Count);
-                Assert.False(panelNode.Children[0].Disposed);
-                Assert.False(panelNode.Children[1].Disposed);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_ClipBounds_For_Negative_Margin()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            ClipToBounds = true,
-                            Margin = new Thickness(0, -5, 0, 0),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(0, 5, 100, 95), borderNode.ClipBounds);
-
-                border.Margin = new Thickness(0, -8, 0, 0);
-                layout.ExecuteLayoutPass();
-
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, border);
-
-                borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(0, 2, 100, 98), borderNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Descendent_Tranform_When_Margin_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                var canvasNode = scene.FindNode(canvas);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
-
-                decorator.Margin = new Thickness(0, 20, 0, 0);
-                layout.ExecuteLayoutPass();
-
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, decorator);
-
-                borderNode = scene.FindNode(border);
-                canvasNode = scene.FindNode(canvas);
-                Assert.Equal(Matrix.CreateTranslation(0, 20), borderNode.Transform);
-                Assert.Equal(Matrix.CreateTranslation(0, 20), canvasNode.Transform);
-            }
-        }
-
-        [Fact]
-        public void DirtyRects_Should_Contain_Old_And_New_Bounds_When_Margin_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                var canvasNode = scene.FindNode(canvas);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
-
-                decorator.Margin = new Thickness(0, 20, 0, 0);
-                layout.ExecuteLayoutPass();
-
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, decorator);
-
-                var rects = scene.Layers.Single().Dirty.ToArray();
-                Assert.Equal(new[] { new Rect(0, 10, 100, 90) }, rects);
-            }
-        }
-
-        [Fact]
-        public void Resizing_Scene_Should_Add_DirtyRects()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Equal(new Size(100, 100), scene.Size);
-
-                tree.ClientSize = new Size(110, 120);
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, tree);
-
-                Assert.Equal(new Size(110, 120), scene.Size);
-
-                var expected = new[]
-                {
-                    new Rect(100, 0, 10, 100),
-                    new Rect(0, 100, 110, 20),
-                };
-
-                Assert.Equal(expected, scene.Layers[tree].Dirty.ToArray());
-                
-                // Layers are disabled. See #2244
-                // Assert.Equal(expected, scene.Layers[border].Dirty.ToArray());
-            }
-        }
-
-        [Fact]
-        public void Setting_Opacity_Should_Add_Descendent_Bounds_To_DirtyRects()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Width = 100,
-                            Height = 100,
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                decorator.Opacity = 0.5;
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, decorator);
-
-                Assert.NotEmpty(scene.Layers.Single().Dirty);
-                var dirty = scene.Layers.Single().Dirty.Single();
-                Assert.Equal(new Rect(0, 0, 100, 100), dirty);
-            }
-        }
-
-        [Fact]
-        public void Should_Set_GeometryClip()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
-                Decorator decorator;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Clip = clip,
-                    }
-                };
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var decoratorNode = scene.FindNode(decorator);
-                Assert.Same(clip.PlatformImpl, decoratorNode.GeometryClip);
-            }
-        }
-
-        [Fact]
-        public void Disposing_Scene_Releases_DrawOperation_References()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
-                    x => x.PixelSize == new PixelSize(100, 100) &&
-                    x.Dpi == new Vector(96, 96)));
-
-                Image img;
-                var tree = new TestRoot
-                {
-                    Child = img = new Image
-                    {
-                        Source = new Bitmap(bitmap),
-                        Height = 100,
-                        Width = 100
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(new Size(100, 100)));
-
-                Assert.Equal(2, bitmap.RefCount);
-                IRef<IDrawOperation> operation;
-
-                using (var scene = new Scene(tree))
-                {
-                    var sceneBuilder = new SceneBuilder();
-                    sceneBuilder.UpdateAll(scene);
-                    operation = scene.FindNode(img).DrawOperations[0];
-                    Assert.Equal(1, operation.RefCount);
-
-                    Assert.Equal(3, bitmap.RefCount);
-                }
-                Assert.Equal(0, operation.RefCount);
-                Assert.Equal(2, bitmap.RefCount);
-            }
-        }
-
-        [Fact]
-        public void Replacing_Control_Releases_DrawOperation_Reference()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
-                    x => x.PixelSize == new PixelSize(100, 100) &&
-                    x.Dpi == new Vector(96, 96)));
-
-                Image img;
-                var tree = new TestRoot
-                {
-                    Child = img = new Image
-                    {
-                        Source = new Bitmap(bitmap),
-                        Width = 100,
-                        Height = 100
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(new Size(100, 100)));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var operation = scene.FindNode(img).DrawOperations[0];
-
-                tree.Child = new Decorator();
-
-                using (var result = scene.CloneScene())
-                {
-                    sceneBuilder.Update(result, img);
-                    scene.Dispose();
-
-                    Assert.Equal(0, operation.RefCount);
-                    Assert.Equal(2, bitmap.RefCount);
-                }
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
deleted file mode 100644
index 19b4c7e606..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-using Avalonia.Layout;
-using System.Reactive.Subjects;
-using Avalonia.Data;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public partial class SceneBuilderTests
-    {
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Control_With_Animated_Opacity_And_Children_Should_Start_New_Layer()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas()
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var rootNode = (VisualNode)scene.Root;
-                var borderNode = (VisualNode)scene.FindNode(border);
-                var canvasNode = (VisualNode)scene.FindNode(canvas);
-
-                Assert.Same(tree, rootNode.LayerRoot);
-                Assert.Same(border, borderNode.LayerRoot);
-                Assert.Same(border, canvasNode.LayerRoot);
-                Assert.Equal(0.5, scene.Layers[border].Opacity);
-
-                Assert.Equal(2, scene.Layers.Count());
-                Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
-
-                animation.OnCompleted();
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, border);
-
-                rootNode = (VisualNode)scene.Root;
-                borderNode = (VisualNode)scene.FindNode(border);
-                canvasNode = (VisualNode)scene.FindNode(canvas);
-
-                Assert.Same(tree, rootNode.LayerRoot);
-                Assert.Same(tree, borderNode.LayerRoot);
-                Assert.Same(tree, canvasNode.LayerRoot);
-                Assert.Single(scene.Layers);
-
-                var rootDirty = scene.Layers[tree].Dirty;
-
-                Assert.Single(rootDirty);
-                Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Control_With_Animated_Opacity_And_No_Children_Should_Not_Start_New_Layer()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Single(scene.Layers);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas
-                            {
-                                Children = { new TextBlock() },
-                            }
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Equal(3, scene.Layers.Count);
-
-                decorator.Child = null;
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, border);
-
-                Assert.Equal(1, scene.Layers.Count);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Hiding_Transparent_Control_Should_Remove_Layers()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas
-                            {
-                                Children = { new TextBlock() },
-                            }
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Equal(3, scene.Layers.Count);
-
-                border.IsVisible = false;
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, border);
-
-                Assert.Equal(1, scene.Layers.Count);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void GeometryClip_Should_Affect_Child_Layers()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Clip = clip,
-                        Margin = new Thickness(12, 16),
-                        Child = border = new Border
-                        {
-                            Opacity = 0.5,
-                            Child = new Canvas(),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderLayer = scene.Layers[border];
-                Assert.Equal(
-                    Matrix.CreateTranslation(12, 16),
-                    ((MockStreamGeometryImpl)borderLayer.GeometryClip).Transform);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
deleted file mode 100644
index fac6e1ceb6..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class SceneLayersTests
-    {
-        [Fact]
-        public void Layers_Should_Be_Ordered()
-        {
-            Border border;
-            Decorator decorator;
-            var root = new TestRoot
-            {
-                Child = border = new Border
-                {
-                    Child = decorator = new Decorator(),
-                }
-            };
-
-            var target = new SceneLayers(root);
-            target.Add(root);
-            target.Add(decorator);
-            target.Add(border);
-
-            var result = target.Select(x => x.LayerRoot).ToArray();
-
-            Assert.Equal(new IVisual[] { root, border, decorator }, result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
deleted file mode 100644
index bba0c8b8f3..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class SceneTests
-    {
-        [Fact]
-        public void Cloning_Scene_Should_Retain_Layers_But_Not_DirtyRects()
-        {
-            Decorator decorator;
-            var tree = new TestRoot
-            {
-                Child = decorator = new Decorator(),
-            };
-
-            var scene = new Scene(tree);
-            scene.Layers.Add(tree);
-            scene.Layers.Add(decorator);
-
-            scene.Layers[tree].Dirty.Add(new Rect(0, 0, 100, 100));
-            scene.Layers[decorator].Dirty.Add(new Rect(0, 0, 50, 100));
-
-            scene = scene.CloneScene();
-            Assert.Equal(2, scene.Layers.Count());
-            Assert.Empty(scene.Layers[0].Dirty);
-            Assert.Empty(scene.Layers[1].Dirty);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
deleted file mode 100644
index 4ec3630053..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class VisualNodeTests
-    {
-        [Fact]
-        public void Empty_Children_Collections_Should_Be_Shared()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
-
-            Assert.Same(node1.Children, node2.Children);
-        }
-
-        [Fact]
-        public void Adding_Child_Should_Create_Collection()
-        {
-            var node = new VisualNode(Mock.Of<IVisual>(), null);
-            var collection = node.Children;
-
-            node.AddChild(Mock.Of<IVisualNode>(x => x.Parent == node));
-
-            Assert.NotSame(collection, node.Children);
-        }
-
-        [Fact]
-        public void Empty_DrawOperations_Collections_Should_Be_Shared()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
-
-            Assert.Same(node1.DrawOperations, node2.DrawOperations);
-        }
-
-        [Fact]
-        public void Adding_DrawOperation_Should_Create_Collection()
-        {
-            var node = new VisualNode(Mock.Of<IVisual>(), null);
-            var collection = node.DrawOperations;
-
-            node.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
-
-            Assert.NotSame(collection, node.DrawOperations);
-        }
-
-        [Fact]
-        public void Cloned_Nodes_Should_Share_DrawOperations_Collection()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            node1.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
-
-            var node2 = node1.Clone(null);
-
-            Assert.Same(node1.DrawOperations, node2.DrawOperations);
-        }
-
-        [Fact]
-        public void Adding_DrawOperation_To_Cloned_Node_Should_Create_New_Collection()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node1.AddDrawOperation(operation1);
-
-            var node2 = node1.Clone(null);
-            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node2.ReplaceDrawOperation(0, operation2);
-
-            Assert.NotSame(node1.DrawOperations, node2.DrawOperations);
-            Assert.Equal(1, node1.DrawOperations.Count);
-            Assert.Equal(1, node2.DrawOperations.Count);
-            Assert.Same(operation1.Item, node1.DrawOperations[0].Item);
-            Assert.Same(operation2.Item, node2.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void DrawOperations_In_Cloned_Node_Are_Cloned()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node1.AddDrawOperation(operation1);
-
-            var node2 = node1.Clone(null);
-            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node2.AddDrawOperation(operation2);
-            
-            Assert.Same(node1.DrawOperations[0].Item, node2.DrawOperations[0].Item);
-            Assert.NotSame(node1.DrawOperations[0], node2.DrawOperations[0]);
-        }
-
-        [Fact]
-        public void SortChildren_Does_Not_Throw_On_Null_Children()
-        {
-            var node = new VisualNode(Mock.Of<IVisual>(), null);
-            var scene = new Scene(Mock.Of<IVisual>());
-
-            node.SortChildren(scene);
-        }
-
-        [Fact]
-        public void TrimChildren_Should_Work_Correctly()
-        {
-            var parent = new VisualNode(Mock.Of<IVisual>(), null);
-            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var child3 = new VisualNode(Mock.Of<IVisual>(), parent);
-
-            parent.AddChild(child1);
-            parent.AddChild(child2);
-            parent.AddChild(child3);
-            parent.TrimChildren(2);
-
-            Assert.Equal(2, parent.Children.Count);
-            Assert.False(child1.Disposed);
-            Assert.False(child2.Disposed);
-            Assert.True(child3.Disposed);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
deleted file mode 100644
index 8d70b45842..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.Utilities
-{
-    public class TileBrushCalculatorTests
-    {
-        [Fact]
-        public void NoTile_Fill_1x()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Fill,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(100, 100));
-
-            Assert.False(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.DestinationRect);
-        }
-
-        [Fact]
-        public void NoTile_Fill_2x()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Fill,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(200, 200));
-
-            // TODO: This doesn't need an intermediate render target.
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 200, 200), result.DestinationRect);
-        }
-
-        [Fact]
-        public void NoTile_Uniform_CenterHoriz()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Uniform,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(200, 100));
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 200, 100), result.DestinationRect);
-            Assert.Equal(new Size(200, 100), result.IntermediateSize);
-            Assert.Equal(Matrix.CreateTranslation(50, 0), result.IntermediateTransform);
-        }
-
-        [Fact]
-        public void NoTile_Uniform_CenterVert()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Uniform,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(100, 200));
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 100, 200), result.DestinationRect);
-            Assert.Equal(new Size(100, 200), result.IntermediateSize);
-            Assert.Equal(Matrix.CreateTranslation(0, 50), result.IntermediateTransform);
-        }
-
-        [Fact]
-        public void NoTile_NoStretch_BottomRightQuarterDest()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.None,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
-                new Size(800, 800),
-                new Size(400, 400));
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 800, 800), result.SourceRect);
-            Assert.Equal(new Rect(200, 200, 200, 200), result.DestinationRect);
-            Assert.Equal(new Size(400, 400), result.IntermediateSize);
-            Assert.Equal(new Rect(200, 200, 200, 200), result.IntermediateClip);
-            Assert.Equal(Matrix.CreateTranslation(-100, -100), result.IntermediateTransform);
-        }
-
-        [Fact]
-        public void Tile_NoStretch_BottomRightQuarterSource_CenterQuarterDest()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.Tile,
-                Stretch.None,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
-                new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
-                new Size(800, 800),
-                new Size(400, 400));
-
-            var b = new VisualBrush
-            {
-                TileMode = TileMode.Tile,
-                Stretch = Stretch.None,
-                SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
-                DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
-                Visual = new Border { Width = 400, Height = 400 },
-            };
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(400, 400, 400, 400), result.SourceRect);
-            Assert.Equal(new Rect(100, 100, 200, 200), result.DestinationRect);
-            Assert.Equal(new Size(200, 200), result.IntermediateSize);
-            Assert.Equal(new Rect(0, 0, 200, 200), result.IntermediateClip);
-            Assert.Equal(Matrix.CreateTranslation(-500, -500), result.IntermediateTransform);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/SizeTests.cs b/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
deleted file mode 100644
index 96197785b9..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class SizeTests
-    {
-        [Fact]
-        public void Should_Produce_Correct_Aspect_Ratio()
-        {
-            var result = new Size(3, 2).AspectRatio;
-
-            Assert.Equal(1.5, result);
-        }
-
-        [Fact]
-        public void Dividing_Should_Produce_Scaling_Factor()
-        {
-            var result = new Size(15, 10) / new Size(5, 5);
-
-            Assert.Equal(new Vector(3, 2), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/TestVisual.cs b/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
deleted file mode 100644
index 29d61ddefc..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Rendering;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class ParamEventArgs<T> : EventArgs
-    {
-        public ParamEventArgs(T param)
-        {
-            Param = param;
-        }
-
-        public T Param { get; set; }
-    }
-
-    public class TestVisual : Visual
-    {
-        public IVisual Child
-        {
-            get
-            {
-                return ((IVisual)this).VisualChildren.FirstOrDefault();
-            }
-
-            set
-            {
-                if (Child != null)
-                {
-                    VisualChildren.Remove(Child);
-                }
-
-                if (value != null)
-                {
-                    VisualChildren.Add(value);
-                }
-            }
-        }
-
-        public void AddChild(Visual v)
-        {
-            VisualChildren.Add(v);
-        }
-
-        public void AddChildren(IEnumerable<Visual> v)
-        {
-            VisualChildren.AddRange(v);
-        }
-
-        public void RemoveChild(Visual v)
-        {
-            VisualChildren.Remove(v);
-        }
-
-        public void ClearChildren()
-        {
-            VisualChildren.Clear();
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
deleted file mode 100644
index e85a9d5b85..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class ThicknessTests
-    {
-        [Fact]
-        public void Parse_Parses_Single_Uniform_Size()
-        {
-            var result = Thickness.Parse("1.2");
-
-            Assert.Equal(new Thickness(1.2), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_Horizontal_Vertical()
-        {
-            var result = Thickness.Parse("1.2,3.4");
-
-            Assert.Equal(new Thickness(1.2, 3.4), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_Left_Top_Right_Bottom()
-        {
-            var result = Thickness.Parse("1.2, 3.4, 5, 6");
-
-            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
-        }
-
-        [Fact]
-        public void Parse_Accepts_Spaces()
-        {
-            var result = Thickness.Parse("1.2 3.4 5 6");
-
-            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs b/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs
deleted file mode 100644
index 1afd84e546..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Linq;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Utilities
-{
-    public class ReadOnlySpanTests
-    {
-        [Fact]
-        public void Should_Skip()
-        {
-            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var slice = new ReadOnlySlice<int>(buffer);
-
-            var skipped = slice.Skip(2);
-
-            var expected = buffer.Skip(2);
-
-            Assert.Equal(expected, skipped);
-        }
-
-        [Fact]
-        public void Should_Take()
-        {
-            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var slice = new ReadOnlySlice<int>(buffer);
-
-            var taken = slice.Take(8);
-
-            var expected = buffer.Take(8);
-
-            Assert.Equal(expected, taken);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VectorTests.cs b/tests/Avalonia.Visuals.UnitTests/VectorTests.cs
deleted file mode 100644
index f9a9e59436..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VectorTests.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Xunit;
-using Avalonia;
-using System;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class VectorTests
-    {
-        [Fact]
-        public void Length_Should_Return_Correct_Length_Of_Vector()
-        {
-            var vector = new Vector(2, 4);
-            var length = Math.Sqrt(2 * 2 + 4 * 4);
-
-            Assert.Equal(length, vector.Length);
-        }
-
-        [Fact]
-        public void Length_Squared_Should_Return_Correct_Length_Of_Vector()
-        {
-            var vectorA = new Vector(2, 4);
-            var squaredLengthA = 2 * 2 + 4 * 4;
-
-            Assert.Equal(squaredLengthA, vectorA.SquaredLength);
-        }
-
-        [Fact]
-        public void Normalize_Should_Return_Normalized_Vector()
-        {
-            // the length of a normalized vector must be 1
-
-            var vectorA = new Vector(13, 84);
-            var vectorB = new Vector(-34, 345);
-            var vectorC = new Vector(-34, -84);
-
-            Assert.Equal(1.0, vectorA.Normalize().Length);
-            Assert.Equal(1.0, vectorB.Normalize().Length);
-            Assert.Equal(1.0, vectorC.Normalize().Length);
-        }
-
-        [Fact]
-        public void Negate_Should_Return_Negated_Vector()
-        {
-            var vector = new Vector(2, 4);
-            var negated = new Vector(-2, -4);
-
-            Assert.Equal(negated, vector.Negate());
-        }
-
-        [Fact]
-        public void Dot_Should_Return_Correct_Value()
-        {
-            var a = new Vector(-6, 8.0);
-            var b = new Vector(5, 12.0);
-
-            Assert.Equal(66.0, Vector.Dot(a, b));
-        }
-
-        [Fact]
-        public void Cross_Should_Return_Correct_Value()
-        {
-            var a = new Vector(-6, 8.0);
-            var b = new Vector(5, 12.0);
-
-            Assert.Equal(-112.0, Vector.Cross(a, b));
-        }
-
-        [Fact]
-        public void Divied_By_Vector_Should_Return_Correct_Value()
-        {
-            var a = new Vector(10, 2);
-            var b = new Vector(5, 2);
-
-            var expected = new Vector(2, 1);
-
-            Assert.Equal(expected, Vector.Divide(a, b));
-        }
-
-        [Fact]
-        public void Divied_Should_Return_Correct_Value()
-        {
-            var vector = new Vector(10, 2);
-            var expected = new Vector(5, 1);
-
-            Assert.Equal(expected, Vector.Divide(vector, 2));
-        }
-
-        [Fact]
-        public void Multiply_By_Vector_Should_Return_Correct_Value()
-        {
-            var a = new Vector(10, 2);
-            var b = new Vector(2, 2);
-
-            var expected = new Vector(20, 4);
-
-            Assert.Equal(expected, Vector.Multiply(a, b));
-        }
-
-        [Fact]
-        public void Multiply_Should_Return_Correct_Value()
-        {
-            var vector = new Vector(10, 2);
-
-            var expected = new Vector(20, 4);
-
-            Assert.Equal(expected, Vector.Multiply(vector, 2));
-        }
-
-        [Fact]
-        public void Scale_Vector_Should_Be_Commutative()
-        {
-            var vector = new Vector(10, 2);
-
-            var expected = vector * 2;
-
-            Assert.Equal(expected, 2 * vector);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
deleted file mode 100644
index 781169cfa6..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class VisualExtensionsTests
-    {
-        [Fact]
-        public void FindAncestorOfType_Finds_Direct_Parent()
-        {
-            StackPanel target;
-
-            var root = new TestRoot
-            {
-                Child = target = new StackPanel()
-            };
-
-            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
-        }
-
-        [Fact]
-        public void FindAncestorOfType_Finds_Ancestor_Of_Nested_Child()
-        {
-            Button target;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new StackPanel
-                        {
-                            Children =
-                            {
-                                (target = new Button())
-                            }
-                        }
-                    }
-                }
-            };
-
-            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
-        }
-
-        [Fact]
-        public void FindDescendantOfType_Finds_Direct_Child()
-        {
-            StackPanel target;
-
-            var root = new TestRoot
-            {
-                Child = target = new StackPanel()
-            };
-
-            Assert.Equal(target, root.FindDescendantOfType<StackPanel>());
-        }
-
-        [Fact]
-        public void FindDescendantOfType_Finds_Nested_Child()
-        {
-            Button target;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new StackPanel
-                        {
-                            Children =
-                            {
-                                (target = new Button())
-                            }
-                        }
-                    }
-                }
-            };
-
-            Assert.Equal(target, root.FindDescendantOfType<Button>());
-        }
-
-        [Fact]
-        public void FindCommonVisualAncestor_First_Is_Parent_Of_Second()
-        {
-            Control left, right;
-
-            var root = new TestRoot
-            {
-                Child = left = new Decorator
-                {
-                    Child = right = new Decorator()
-                }
-            };
-
-            var ancestor = left.FindCommonVisualAncestor(right);
-            Assert.Equal(left, ancestor);
-
-            ancestor = right.FindCommonVisualAncestor(left);
-            Assert.Equal(left, ancestor);
-        }
-
-        [Fact]
-        public void FindCommonVisualAncestor_Two_Subtrees_Uniform_Height()
-        {
-            Control left, right;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = left = new Decorator()
-                            }
-                        },
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = right = new Decorator()
-                            }
-                        }
-                    }
-                }
-            };
-
-            var ancestor = left.FindCommonVisualAncestor(right);
-            Assert.Equal(root.Child, ancestor);
-
-            ancestor = right.FindCommonVisualAncestor(left);
-            Assert.Equal(root.Child, ancestor);
-        }
-
-        [Fact]
-        public void FindCommonVisualAncestor_Two_Subtrees_NonUniform_Height()
-        {
-            Control left, right;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = left = new Decorator()
-                            }
-                        },
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = new Decorator
-                                {
-                                    Child = right = new Decorator()
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-
-            var ancestor = left.FindCommonVisualAncestor(right);
-            Assert.Equal(root.Child, ancestor);
-
-            ancestor = right.FindCommonVisualAncestor(left);
-            Assert.Equal(root.Child, ancestor);
-        }
-
-        [Fact]
-        public void TranslatePoint_Should_Respect_RenderTransforms()
-        {
-            Border target;
-            var root = new TestRoot
-            {
-                Width = 100,
-                Height = 100,
-                Child = new Decorator
-                {
-                    Width = 50,
-                    Height = 50,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    RenderTransform = new TranslateTransform(25, 25),
-                    Child = target = new Border(),
-                }
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-
-            var result = target.TranslatePoint(new Point(0, 0), root);
-
-            Assert.Equal(new Point(50, 50), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
deleted file mode 100644
index 38131fbfca..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class VisualTests
-    {
-        [Fact]
-        public void Added_Child_Should_Have_VisualParent_Set()
-        {
-            var target = new TestVisual();
-            var child = new Visual();
-
-            target.AddChild(child);
-
-            Assert.Equal(target, child.GetVisualParent());
-        }
-
-        [Fact]
-        public void Added_Child_Should_Notify_VisualParent_Changed()
-        {
-            var target = new TestVisual();
-            var child = new TestVisual();
-            var parents = new List<IVisual>();
-
-            child.GetObservable(Visual.VisualParentProperty).Subscribe(x => parents.Add(x));
-            target.AddChild(child);
-            target.RemoveChild(child);
-
-            Assert.Equal(new IVisual[] { null, target, null }, parents);
-        }
-
-        [Fact]
-        public void Removed_Child_Should_Have_VisualParent_Cleared()
-        {
-            var target = new TestVisual();
-            var child = new Visual();
-
-            target.AddChild(child);
-            target.RemoveChild(child);
-
-            Assert.Null(child.GetVisualParent());
-        }
-
-        [Fact]
-        public void Clearing_Children_Should_Clear_VisualParent()
-        {
-            var children = new[] { new Visual(), new Visual() };
-            var target = new TestVisual();
-
-            target.AddChildren(children);
-            target.ClearChildren();
-
-            var result = children.Select(x => x.GetVisualParent()).ToList();
-
-            Assert.Equal(new Visual[] { null, null }, result);
-        }
-
-        [Fact]
-        public void Adding_Children_Should_Fire_OnAttachedToVisualTree()
-        {
-            var child2 = new Decorator();
-            var child1 = new Decorator { Child = child2 };
-            var root = new TestRoot();
-            var called1 = false;
-            var called2 = false;
-
-            child1.AttachedToVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called1 = true;
-            };
-
-            child2.AttachedToVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called2 = true;
-            };
-
-            root.Child = child1;
-
-            Assert.True(called1);
-            Assert.True(called2);
-        }
-
-        [Fact]
-        public void Removing_Children_Should_Fire_OnDetachedFromVisualTree()
-        {
-            var child2 = new Decorator();
-            var child1 = new Decorator { Child = child2 };
-            var root = new TestRoot();
-            var called1 = false;
-            var called2 = false;
-
-            root.Child = child1;
-
-            child1.DetachedFromVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called1 = true;
-            };
-
-            child2.DetachedFromVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called2 = true;
-            };
-
-            root.Child = null;
-
-            Assert.True(called1);
-            Assert.True(called2);
-        }
-
-        [Fact]
-        public void Root_Should_Retun_Self_As_VisualRoot()
-        {
-            var root = new TestRoot();
-
-            Assert.Same(root, ((IVisual)root).VisualRoot);
-        }
-
-        [Fact]
-        public void Descendants_Should_RetunVisualRoot()
-        {
-            var root = new TestRoot();
-            var child1 = new Decorator();
-            var child2 = new Decorator();
-
-            root.Child = child1;
-            child1.Child = child2;
-
-            Assert.Same(root, ((IVisual)child1).VisualRoot);
-            Assert.Same(root, ((IVisual)child2).VisualRoot);
-        }
-
-        [Fact]
-        public void Attaching_To_Visual_Tree_Should_Invalidate_Visual()
-        {
-            var renderer = new Mock<IRenderer>();
-            var child = new Decorator();
-            var root = new TestRoot
-            {
-                Renderer = renderer.Object,
-            };
-
-            root.Child = child;
-
-            renderer.Verify(x => x.AddDirty(child));
-        }
-
-        [Fact]
-        public void Detaching_From_Visual_Tree_Should_Invalidate_Visual()
-        {
-            var renderer = new Mock<IRenderer>();
-            var child = new Decorator();
-            var root = new TestRoot
-            {
-                Renderer = renderer.Object,
-            };
-
-            root.Child = child;
-            renderer.Invocations.Clear();
-            root.Child = null;
-
-            renderer.Verify(x => x.AddDirty(child));
-        }
-
-        [Fact]
-        public void Adding_Already_Parented_Control_Should_Throw()
-        {
-            var root1 = new TestRoot();
-            var root2 = new TestRoot();
-            var child = new Canvas();
-
-            root1.Child = child;
-
-            Assert.Throws<InvalidOperationException>(() => root2.Child = child);
-            Assert.Empty(root2.GetVisualChildren());
-        }
-
-        [Fact]
-        public void TransformToVisual_Should_Work()
-        {
-            var child = new Decorator { Width = 100, Height = 100 };
-            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(new Point(), root.DesiredSize));
-
-            var tr = child.TransformToVisual(root);
-
-            Assert.NotNull(tr);
-
-            var point = root.Bounds.TopLeft * tr;
-
-            //child is centered (400 - 100)/2
-            Assert.Equal(new Point(150, 150), point);
-        }
-
-        [Fact]
-        public void TransformToVisual_With_RenderTransform_Should_Work()
-        {
-            var child = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 }
-            };
-            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(new Point(), root.DesiredSize));
-
-            var tr = child.TransformToVisual(root);
-
-            Assert.NotNull(tr);
-
-            var point = root.Bounds.TopLeft * tr;
-
-            //child is centered (400 - 100*2 scale)/2
-            Assert.Equal(new Point(100, 100), point);
-        }
-
-        [Fact]
-        public void TransformToVisual_With_NonInvertible_RenderTransform_Should_Work()
-        {
-            var child = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                RenderTransform = new ScaleTransform() { ScaleX = 0, ScaleY = 0 }
-            };
-            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(new Point(), root.DesiredSize));
-
-            var tr = root.TransformToVisual(child);
-
-            Assert.Null(tr);
-        }
-
-        [Fact]
-        public void Should_Not_Log_Binding_Error_When_Not_Attached_To_Logical_Tree()
-        {
-            var target = new Decorator { DataContext = "foo" };
-            var called = false;
-
-            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
-            {
-                if (level >= Logging.LogEventLevel.Warning)
-                {
-                    called = true;
-                }
-            };
-
-            using (TestLogSink.Start(checkLogMessage))
-            {
-                target.Bind(Decorator.TagProperty, new Binding("Foo"));
-            }
-
-            Assert.False(called);
-        }
-
-        [Fact]
-        public void Should_Log_Binding_Error_When_Attached_To_Logical_Tree()
-        {
-            var target = new Decorator();
-            var root = new TestRoot { Child = target, DataContext = "foo" };
-            var called = false;
-
-            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
-            {
-                if (level >= Logging.LogEventLevel.Warning)
-                {
-                    called = true;
-                }
-            };
-
-            using (TestLogSink.Start(checkLogMessage))
-            {
-                target.Bind(Decorator.TagProperty, new Binding("Foo"));
-            }
-
-            Assert.True(called);
-        }
-
-        [Fact]
-        public void Changing_ZIndex_Should_InvalidateVisual()
-        {
-            Canvas canvas1;
-            var renderer = new Mock<IRenderer>();
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        (canvas1 = new Canvas()),
-                        new Canvas(),
-                    },
-                },
-            };
-
-            root.Renderer = renderer.Object;
-            canvas1.ZIndex = 10;
-
-            renderer.Verify(x => x.AddDirty(canvas1));
-        }
-
-        [Fact]
-        public void Changing_ZIndex_Should_Recalculate_Parent_Children()
-        {
-            Canvas canvas1;
-            StackPanel stackPanel;
-            var renderer = new Mock<IRenderer>();
-            var root = new TestRoot
-            {
-                Child = stackPanel = new StackPanel
-                {
-                    Children =
-                    {
-                        (canvas1 = new Canvas()),
-                        new Canvas(),
-                    },
-                },
-            };
-
-            root.Renderer = renderer.Object;
-            canvas1.ZIndex = 10;
-
-            renderer.Verify(x => x.RecalculateChildren(stackPanel));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
deleted file mode 100644
index 6100f2cb74..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Visuals.UnitTests.VisualTree
-{
-    class MockRenderInterface : IPlatformRenderInterface
-    {
-        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IStreamGeometryImpl CreateStreamGeometry()
-        {
-            return new MockStreamGeometry();
-        }
-
-        public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmap(Stream stream)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmap(string fileName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool SupportsIndividualRoundRects { get; set; }
-        public AlphaFormat DefaultAlphaFormat { get; }
-        public PixelFormat DefaultPixelFormat { get; }
-
-        public IFontManagerImpl CreateFontManager()
-        {
-            return new MockFontManagerImpl();
-        }
-
-        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat fmt, AlphaFormat alphaFormat)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateEllipseGeometry(Rect rect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateRectangleGeometry(Rect rect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        class MockStreamGeometry : IStreamGeometryImpl
-        {
-            private MockStreamGeometryContext _impl = new MockStreamGeometryContext();
-            public Rect Bounds
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            public double ContourLength { get; }
-
-            public IStreamGeometryImpl Clone()
-            {
-                return this;
-            }
-
-            public void Dispose()
-            {
-            }
-
-            public bool FillContains(Point point)
-            {
-                return _impl.FillContains(point);
-            }
-
-            public Rect GetRenderBounds(IPen pen)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IGeometryImpl Intersect(IGeometryImpl geometry)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IStreamGeometryContextImpl Open()
-            {
-                return _impl;
-            }
-
-            public bool StrokeContains(IPen pen, Point point)
-            {
-                throw new NotImplementedException();
-            }
-
-            public ITransformedGeometryImpl WithTransform(Matrix transform)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool TryGetPointAtDistance(double distance, out Point point)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry)
-            {
-                throw new NotImplementedException();
-            }
-
-            class MockStreamGeometryContext : IStreamGeometryContextImpl
-            {
-                private List<Point> points = new List<Point>();
-                public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void BeginFigure(Point startPoint, bool isFilled)
-                {
-                    points.Add(startPoint);
-                }
-
-                public void CubicBezierTo(Point point1, Point point2, Point point3)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void Dispose()
-                {
-                }
-
-                public void EndFigure(bool isClosed)
-                {
-                }
-
-                public void LineTo(Point point)
-                {
-                    points.Add(point);
-                }
-
-                public void QuadraticBezierTo(Point control, Point endPoint)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void SetFillRule(FillRule fillRule)
-                {
-                }
-
-                public bool FillContains(Point point)
-                {
-                    // Use the algorithm from http://www.blackpawn.com/texts/pointinpoly/default.html
-                    // to determine if the point is in the geometry (since it will always be convex in this situation)
-                    for (int i = 0; i < points.Count; i++)
-                    {
-                        var a = points[i];
-                        var b = points[(i + 1) % points.Count];
-                        var c = points[(i + 2) % points.Count];
-
-                        Vector v0 = c - a;
-                        Vector v1 = b - a;
-                        Vector v2 = point - a;
-
-                        var dot00 = v0 * v0;
-                        var dot01 = v0 * v1;
-                        var dot02 = v0 * v2;
-                        var dot11 = v1 * v1;
-                        var dot12 = v1 * v2;
-
-
-                        var invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
-                        var u = (dot11 * dot02 - dot01 * dot12) * invDenom;
-                        var v = (dot00 * dot12 - dot01 * dot02) * invDenom;
-                        if ((u >= 0) && (v >= 0) && (u + v < 1)) return true;
-                    }
-                    return false;
-                }
-            }
-        }
-    }
-
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
deleted file mode 100644
index 54d9ce40f0..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.VisualTree;
-using Avalonia.Rendering;
-using Xunit;
-using Avalonia.Media;
-using Moq;
-using Avalonia.UnitTests;
-using Avalonia.Platform;
-
-namespace Avalonia.Visuals.UnitTests.VisualTree
-{
-    public class TransformedBoundsTests
-    {
-        [Fact]
-        public void Should_Track_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var control = default(Rectangle);
-                var tree = new Decorator
-                {
-                    Padding = new Thickness(10),
-                    Child = new Decorator
-                    {
-                        Padding = new Thickness(5),
-                        Child = control = new Rectangle
-                        {
-                            Width = 15,
-                            Height = 15,
-                        },
-                    }
-                };
-
-                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(0, 0, 100, 100));
-                ImmediateRenderer.Render(tree, context, true);
-
-                var track = control.GetObservable(Visual.TransformedBoundsProperty);
-                var results = new List<TransformedBounds?>();
-                track.Subscribe(results.Add);
-
-                Assert.Equal(new Rect(0, 0, 15, 15), results[0].Value.Bounds);
-                Assert.Equal(Matrix.CreateTranslation(42, 42), results[0].Value.Transform);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
deleted file mode 100644
index 139a7925b1..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.VisualTree
-{
-    public class VisualExtensions_GetVisualsAt
-    {
-        [Fact]
-        public void Should_Find_Control()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new StackPanel
-                    {
-                        Background = Brushes.White,
-                        Children =
-                        {
-                            (target = new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Red,
-                            }),
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Green,
-                            }
-                        },
-                        Orientation = Orientation.Horizontal,
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = target.GetVisualsAt(new Point(50, 50));
-
-                Assert.Same(target, result.Single());
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Find_Sibling_Control()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new StackPanel
-                    {
-                        Background = Brushes.White,
-                        Children =
-                        {
-                            (target = new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Red,
-                            }),
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Green,
-                            }
-                        },
-                        Orientation = Orientation.Horizontal,
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = target.GetVisualsAt(new Point(150, 50));
-
-                Assert.Empty(result);
-            }
-        }
-
-        private IDisposable TestApplication()
-        {
-            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
-        }
-    }
-}
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
new file mode 100644
index 0000000000..52af0f5ab2
--- /dev/null
+++ b/tests/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
+</Project>
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
index c5a0a14e52..8ca7acb845 100644
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png and b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png
new file mode 100644
index 0000000000..004265112f
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png
new file mode 100644
index 0000000000..913266b652
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png
new file mode 100644
index 0000000000..913266b652
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
index c5a0a14e52..a76c6a5b2a 100644
Binary files a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png and b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png
new file mode 100644
index 0000000000..407b67b8a0
Binary files /dev/null and b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png
new file mode 100644
index 0000000000..4b8371541e
Binary files /dev/null and b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png
new file mode 100644
index 0000000000..4b8371541e
Binary files /dev/null and b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png differ